diff --git a/.github/CONTRIBUTING.md b/.github/CONTRIBUTING.md
index 43339372bcbc..98c8756f5856 100644
--- a/.github/CONTRIBUTING.md
+++ b/.github/CONTRIBUTING.md
@@ -29,7 +29,6 @@ pnpm dev
 Ordinary installs include native optional dependencies for the current OS and CPU only.
 Before a cross-architecture build (including `pnpm build:mac`, which produces both x64 and
 arm64 artifacts by default), run `pnpm install:release` to add the other CPU's variants.
-See [the install policy](../docs/reference/pnpm-install-policy.md).
 
 ## Branch Naming
 
diff --git a/.github/pull_request_template.md b/.github/pull_request_template.md
index 7cfc408ebf21..b1dac35c0d4f 100644
--- a/.github/pull_request_template.md
+++ b/.github/pull_request_template.md
@@ -11,6 +11,7 @@
 <!-- What problem does this solve, and why is this approach better than the alternatives you considered? -->
 
 ## Linked Issue
+
 _If you do not have one and are an outside contributors, your PR **wiil** be ignored. Refs is not sufficient. Link an actual issue_
 <!-- Link the issue this PR addresses, there should ALWAYS be one (for outside contributors) -->
 <!-- SPECIAL CASE: If you are a maintainer (member of stablyai org) AVOID opening needless issues. Only attach pre-existing ones -->
@@ -39,7 +40,7 @@ Fixes #
 
 ## Agent skill upstream boundary
 
-- [ ] Not applicable, or this change follows `docs/reference/agent-skill-sharing-upstream-boundary.md` and copies or mechanically translates no upstream skill-installer source, tests, fixtures, registry entries, path tables, comments, or documentation.
+- [ ] Not applicable, or this change copies or mechanically translates no upstream skill-installer source, tests, fixtures, registry entries, path tables, comments, or documentation.
 
 ## Notes
 
diff --git a/.github/workflows/ci-cache-warmup.yml b/.github/workflows/ci-cache-warmup.yml
index 39f1bb4b888b..49e85608d0e2 100644
--- a/.github/workflows/ci-cache-warmup.yml
+++ b/.github/workflows/ci-cache-warmup.yml
@@ -14,7 +14,7 @@ on:
       - '.github/actions/prepare-native-runtime/**'
       - '.github/actions/prepare-git-compatibility/**'
       - '.github/actions/prepare-headless-compiler/**'
-      - 'config/scripts/headless-detector-compiler-cache*'
+      - 'config/scripts/headless-detector-compiler-cache.mjs'
       - '.github/actions/prepare-linux-package-fixture/**'
       - 'config/docker/headless-serve-shutdown/**'
       - 'config/docker/cli-launch-contract/**'
@@ -44,12 +44,11 @@ on:
       - '.github/workflows/ci-cache-warmup.yml'
       - '.github/actions/prepare-git-compatibility/**'
       - '.github/actions/prepare-headless-compiler/**'
-      - 'config/scripts/headless-detector-compiler-cache*'
+      - 'config/scripts/headless-detector-compiler-cache.mjs'
       - '.github/actions/prepare-linux-package-fixture/**'
       - 'config/docker/headless-serve-shutdown/**'
       - 'config/docker/cli-launch-contract/**'
       - 'config/docker/daemon-shutdown-descendants/**'
-      - 'config/scripts/ci-cache-warmup-workflow.test.mjs'
 
 permissions:
   contents: read
diff --git a/.github/workflows/cloud-deploy-relay-production-same-cap-job.yml b/.github/workflows/cloud-deploy-relay-production-same-cap-job.yml
index ea21c4185f37..333c1baebe3d 100644
--- a/.github/workflows/cloud-deploy-relay-production-same-cap-job.yml
+++ b/.github/workflows/cloud-deploy-relay-production-same-cap-job.yml
@@ -30,7 +30,8 @@ jobs:
     if: ${{ github.ref == 'refs/heads/main' }}
     runs-on: blacksmith-2vcpu-ubuntu-2204
     # The pre-drain sample adds 3-8 min (20 at most); a timeout cancels the job and skips the failsafe.
-    timeout-minutes: 90
+    # A 1200000 drain step alone may take 50 min.
+    timeout-minutes: 120
     environment: production
     env:
       GCP_PROJECT_ID: onorca-cloud
@@ -53,8 +54,9 @@ jobs:
       # /v1/assign at hosts / window and is re-placed through the director's drain-return
       # lane. The wave validator admits only its closed set, and anything below the 300000
       # default only on US general cells: Asia drains are bound by their targets' accept
-      # rate. The transition wait below is the 15-min migration lease plus this window. A
-      # cell on an older image drains at once.
+      # rate. The transition wait below is the 15-min migration lease plus this window, plus
+      # its excess over 300000, since restart-safe waits a window of quiet after the drain. A
+      # cell on an older image drains at once, or refuses a window above 300000.
       DRAIN_PACE_WINDOW_MS: ${{ inputs.drain-pace-window-ms }}
     steps:
       - name: Require exact reusable-workflow configuration
@@ -499,8 +501,8 @@ jobs:
         if: ${{ inputs.mode == 'verify' }}
         run: echo 'Exact same-cap rollback point verified.'
 
-      # The sample can age the first one-hour token by up to 20 min; the drain's 20-min
-      # restart-safe wait gets a fresh one.
+      # The sample can age the first one-hour token by up to 20 min; the drain's restart-safe
+      # wait (20 min at the default pace, 50 at the slowest) gets a fresh one.
       - id: drain-auth
         if: ${{ inputs.mode != 'verify' && env.ROLLBACK_RESUME != 'true' }}
         uses: google-github-actions/auth@v2
@@ -517,6 +519,11 @@ jobs:
         env:
           ORCA_RELAY_ADMIN_ID_TOKEN: ${{ steps.drain-auth.outputs.id_token }}
         run: |
+          # Before any mutation: a cell whose image caps the pace below this one stops untouched.
+          node dev/scripts/prepare-relay-production-capacity-canary.mjs \
+            --director-origin "${DIRECTOR_ORIGIN}" --cell-origin "${CELL_ORIGIN}" \
+            --cell-id "${TARGET_CELL_ID}" --approved-cells same-cap --mode pace-check \
+            --pace-window-ms "${DRAIN_PACE_WINDOW_MS}"
           # Opens the window the report-only shadow health gate below judges this cell over.
           echo "drain-started-at=$(date -u +%FT%TZ)" >> "${GITHUB_OUTPUT}"
           echo "MUTATION_STARTED=true" >> "${GITHUB_ENV}"
@@ -555,7 +562,7 @@ jobs:
             --heartbeat either --admission migration-only --draining required \
             --activity restart-safe --expected-image-digests "${PREDECESSOR_IMAGE_DIGEST}" \
             --pace-window-ms "${DRAIN_PACE_WINDOW_MS}" \
-            --timeout-ms "$((900000 + DRAIN_PACE_WINDOW_MS))"
+            --timeout-ms "$((900000 + DRAIN_PACE_WINDOW_MS + (DRAIN_PACE_WINDOW_MS > 300000 ? DRAIN_PACE_WINDOW_MS - 300000 : 0)))"
           echo "drain-settled-at=$(date -u +%FT%TZ)" >> "${GITHUB_OUTPUT}"
 
       - id: capacity-auth
@@ -709,19 +716,31 @@ jobs:
         env:
           ORCA_RELAY_ADMIN_ID_TOKEN: ${{ steps.post-auth.outputs.id_token }}
         run: |
-          # A single transient 5xx (LB warm-up behind a fresh instance) must not
-          # fail a canary; 4xx (auth, generation mismatch) still fails fast.
+          # Rides out one DB stall: 5-7 s, then readiness grace and two 10 s LB
+          # health checks (c18, 10-07 18:49Z: 503 "no healthy upstream", healthy
+          # 16 s later). A cell still down after 60 s fails; other 4xx fail fast.
+          # Retried in this loop: the runner's 7.81 client (Ubuntu 22.04) never
+          # retries under --fail-with-body, so its --retry flags were inert.
           admin_post() {
-            local out="${RUNNER_TEMP}/$1.json"
-            if ! curl --fail-with-body --max-time 30 \
-              --retry 3 --retry-delay 2 --retry-connrefused --output "${out}" \
-              --request POST "$2" \
-              --header "Authorization: Bearer ${ORCA_RELAY_ADMIN_ID_TOKEN}" \
-              --header 'Content-Type: application/json' --data "$3"; then
-              cat "${out}" >&2
-              return 1
-            fi
-            cat "${out}"
+            local out="${RUNNER_TEMP}/$1.json" window=60 delay=5 status
+            local deadline=$((SECONDS + window))
+            while true; do
+              # A refused or timed-out attempt writes no body; never report the last one's.
+              rm -f "${out}"
+              status="$(curl --silent --show-error --max-time 30 --output "${out}" \
+                --write-out '%{http_code}' --request POST "$2" \
+                --header "Authorization: Bearer ${ORCA_RELAY_ADMIN_ID_TOKEN}" \
+                --header 'Content-Type: application/json' --data "$3")" || status=000
+              case "${status}" in
+                2??) cat "${out}"; return 0 ;;
+                000|408|429|5??) ((SECONDS + delay < deadline)) || break ;;
+                *) break ;;
+              esac
+              sleep "${delay}"
+            done
+            echo "admin_post $1: HTTP ${status}" >&2
+            cat "${out}" >&2 2>/dev/null || true
+            return 1
           }
           node dev/scripts/verify-relay-capacity-transition.mjs \
             --director-origin "${DIRECTOR_ORIGIN}" --cell-origin "${CELL_ORIGIN}" \
@@ -824,8 +843,8 @@ jobs:
         # read cost its full retry budget and can push the job past timeout-minutes, and a
         # cancelled job takes the whole wave with it. A healthy gate is already minutes of
         # serial reads, so both bounds sit above that: the script settles at seven minutes and
-        # reaching this eight is the pathological case. Eight on top of a ~14-minute cell still
-        # leaves the job's 90 minutes intact.
+        # reaching this eight is the pathological case. Eight on top of a cell of ~14 minutes
+        # (~45 at the slowest pace) still leaves the job's 120 minutes intact.
         timeout-minutes: 8
         env:
           DRAIN_STARTED_AT: ${{ steps.drain.outputs.drain-started-at }}
diff --git a/.github/workflows/cloud-deploy-relay-production-same-cap.yml b/.github/workflows/cloud-deploy-relay-production-same-cap.yml
index a4af4f2888d2..e30855b3a1ee 100644
--- a/.github/workflows/cloud-deploy-relay-production-same-cap.yml
+++ b/.github/workflows/cloud-deploy-relay-production-same-cap.yml
@@ -54,11 +54,11 @@ on:
         required: true
         type: string
       drain-pace-window-ms:
-        description: Window the cell spreads its drain over; below 300000 only for US general cells, named in the confirmation
+        description: Window the cell spreads its drain over; below 300000 only for US general cells; any other value named in the confirmation
         required: true
         default: '300000'
         type: choice
-        options: ['300000', '60000', '30000']
+        options: ['300000', '60000', '30000', '900000', '1200000']
       canary-run-id:
         description: Successful same-code canary in this rehome control generation; reusable across batches
         required: false
diff --git a/.github/workflows/e2e.yml b/.github/workflows/e2e.yml
index be2386e24471..2ac4365dcfb6 100644
--- a/.github/workflows/e2e.yml
+++ b/.github/workflows/e2e.yml
@@ -123,7 +123,8 @@ jobs:
           ORCA_E2E_APT_PACKAGES: build-essential python3
         run: &install_e2e_tools |
           read -r -a packages <<< "$ORCA_E2E_APT_PACKAGES"
-          for source in /etc/apt/sources.list /etc/apt/sources.list.d/*.list /etc/apt/sources.list.d/*.sources; do
+          # Why apt-mirrors.txt: runner images resolve mirror+file: sources through it, so editing the lists alone leaves Azure in use.
+          for source in /etc/apt/apt-mirrors.txt /etc/apt/sources.list /etc/apt/sources.list.d/*.list /etc/apt/sources.list.d/*.sources; do
             if [ -f "$source" ]; then
               sudo sed -i 's|https*://azure\.archive\.ubuntu\.com/ubuntu|https://archive.ubuntu.com/ubuntu|g' "$source"
             fi
@@ -134,7 +135,7 @@ jobs:
           Acquire::Retries "1";
           APTCONF
           timeout 120 sudo apt-get update
-          timeout 300 sudo apt-get install -y "${packages[@]}"
+          timeout 300 sudo apt-get install -y "${packages[@]}" || timeout 300 sudo apt-get install -y --fix-missing "${packages[@]}"
 
       - uses: ./.github/actions/install-node-dependencies
         with:
@@ -328,10 +329,12 @@ jobs:
               . != "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-reattach-home-partition.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-startup-local-shadow.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
diff --git a/.github/workflows/pr.yml b/.github/workflows/pr.yml
index 9539701a0755..0ae029fa7231 100644
--- a/.github/workflows/pr.yml
+++ b/.github/workflows/pr.yml
@@ -432,6 +432,8 @@ jobs:
           PREFLIGHT_PHASE_SELECTED: ${{ needs.code_paths.outputs.typecheck == 'true' }}
           PREFLIGHT_PRIOR_SUCCESS: ${{ job.status == 'success' }}
           ORCA_UNIT_SELECTION_MODE: ${{ vars.ORCA_UNIT_SELECTION_MODE || 'shadow' }}
+          # Set the repository variable to '5' to roll back full PR shards.
+          ORCA_UNIT_FULL_SHARD_COUNT: ${{ vars.ORCA_UNIT_FULL_SHARD_COUNT || '10' }}
         run: |
           if [ "$PREFLIGHT_PHASE_SELECTED" != true ] || [ "$PREFLIGHT_PRIOR_SUCCESS" != true ]; then exit 0; fi
           node config/scripts/ci-unit-plan.mjs
@@ -1088,7 +1090,15 @@ jobs:
       - name: Install Linux package tooling
         id: linux-package-tools
         background: true
-        run: sudo apt-get update && sudo apt-get install -y cpio rpm
+        run: |
+          # Use the shell lane's bounded refresh; required tooling installation stays fatal.
+          sudo tee /etc/apt/apt.conf.d/99-orca-package-tools >/dev/null <<'APTCONF'
+          Acquire::http::Timeout "15";
+          Acquire::https::Timeout "15";
+          Acquire::Retries "1";
+          APTCONF
+          timeout 120 sudo apt-get update || true
+          timeout 300 sudo apt-get install -y cpio rpm
 
       - name: Build package inputs
         run: |
@@ -1265,6 +1275,7 @@ jobs:
           src/main/wsl/wsl-runner.test.ts
           src/main/wsl/wsl-guest-environment.test.ts
           src/main/wsl/wsl-executable-path.win32.test.ts
+          src/main/claude-accounts/claude-profile-history-windows.test.ts
           src/main/wsl/wsl-w1-w3-contract.test.ts
           src/shared/source-scan/source-tree-scan.test.ts
           src/main/cli/wsl-cli-powershell-boundary.test.ts
diff --git a/.gitignore b/.gitignore
index 0d98fa169f45..e31f15b56bad 100644
--- a/.gitignore
+++ b/.gitignore
@@ -210,3 +210,5 @@ tests/e2e/.cross-version-checkouts/
 
 # Generated by the CI unit-test sequencer (and by reproducing a shard locally).
 ci-shards/
+# Local-only design/planning docs (not checked in).
+# locations below (assets, readme, STYLEGUIDE, and mobile terminal shortcut bar).
diff --git a/AGENTS.md b/AGENTS.md
index 694b54bdb3a5..8bc061d97af4 100644
--- a/AGENTS.md
+++ b/AGENTS.md
@@ -90,24 +90,24 @@ Orca targets macOS, Linux, and Windows. Keep all platform-dependent behavior beh
 - **Keyboard shortcuts**: Never hardcode `e.metaKey`. Use a platform check (`navigator.userAgent.includes('Mac')`) to pick `metaKey` on Mac and `ctrlKey` on Linux/Windows. Electron menu accelerators should use `CmdOrCtrl`.
 - **Shortcut labels in UI**: Display `⌘` / `⇧` on Mac and `Ctrl+` / `Shift+` on other platforms.
 - **File paths**: Use `path.join` or Electron/Node path utilities — never assume `/` or `\`.
-- **Windows terminal shells**: `--shell` picks the shell a terminal _is_; `--command` is typed into whatever shell the host spawned, so a shell choice routed through `command` silently becomes a child process. See [`docs/reference/windows-terminal-shell-selection.md`](./docs/reference/windows-terminal-shell-selection.md).
-- **Windows setup scripts**: the setup/issue-command runner is a `.cmd` batch file unless the script starts with a `#!` line — never derive that from the user's terminal-shell preference, and never launch a `.cmd` runner with a bare `cmd.exe /c` from a Git Bash pane (MSYS rewrites the `/c`). See [`docs/reference/windows-setup-shell.md`](./docs/reference/windows-setup-shell.md).
-- **Windows child processes**: start them through `runProcess`/`spawnProcess` in `src/shared/child-process/` — never `child_process` directly. It pins `windowsHide`, refuses `shell: true`, and encodes `.cmd`/`.bat` arguments so neither `CommandLineToArgvW` nor `cmd.exe` mangles them. Recognised npm/pnpm `.cmd` shims are resolved to their real target so the spawn skips `cmd.exe` entirely; see [`docs/reference/windows-cmd-shim-resolution.md`](./docs/reference/windows-cmd-shim-resolution.md) before adding a shim shape or debugging one.
+- **Windows terminal shells**: `--shell` picks the shell a terminal _is_; `--command` is typed into whatever shell the host spawned, so a shell choice routed through `command` silently becomes a child process.
+- **Windows setup scripts**: the setup/issue-command runner is a `.cmd` batch file unless the script starts with a `#!` line — never derive that from the user's terminal-shell preference, and never launch a `.cmd` runner with a bare `cmd.exe /c` from a Git Bash pane (MSYS rewrites the `/c`).
+- **Windows child processes**: start them through `runProcess`/`spawnProcess` in `src/shared/child-process/` — never `child_process` directly. It pins `windowsHide`, refuses `shell: true`, and encodes `.cmd`/`.bat` arguments so neither `CommandLineToArgvW` nor `cmd.exe` mangles them. Recognised npm/pnpm `.cmd` shims are resolved to their real target so the spawn skips `cmd.exe` entirely.
 - **Ripgrep**: Orca bundles `rg` for every platform, WSL, and SSH remotes. Spawn it through `spawnBundledRipgrep` (main) or `resolveRelayRipgrepCommand` (relay), never a bare `'rg'` — Windows resolves a bare name in the spawn cwd before PATH. Don't add git/readdir fallbacks locally; the relay's chain exists only for hosts an upload never reached.
-- **Windows process enumeration**: read the table through `src/main/windows/windows-process-table.ts`, never by forking `powershell.exe`. See [`docs/reference/windows-process-enumeration.md`](./docs/reference/windows-process-enumeration.md).
-- **Windows MSYS/Git Bash panes**: their children break away from the per-PTY job unless it is created without `JOB_OBJECT_LIMIT_BREAKAWAY_OK`, and a `conpty.node` built before that fix passes every existing gate. Before changing the per-PTY job or debugging `windows-msys-job.win32.test.ts`, read [`docs/reference/windows-msys-job-breakaway.md`](./docs/reference/windows-msys-job-breakaway.md).
-- **Windows daemon-host relocation**: the terminal daemon runs from a copy of the app runtime under `%LOCALAPPDATA%`, which is what survives an auto-update. Before touching that copy, its exe name, or the NSIS uninstall macro, read [`docs/reference/windows-daemon-host-relocation.md`](./docs/reference/windows-daemon-host-relocation.md).
-- **Windows EDR signal**: don't add `-ExecutionPolicy Bypass`, `-EncodedCommand`, `cmd.exe /c` with escaped free text, per-operation interpreter spawning, or runtime `Add-Type` compilation without reading [`docs/reference/windows-edr-posture.md`](./docs/reference/windows-edr-posture.md) first — behavioural EDR scores each of those, and being signed does not clear them. For file verdicts on the bytes we ship — antivirus false positives, and the vendor programs that clear a release before users meet the detection — see [`docs/reference/antivirus-prerelease-clearance.md`](./docs/reference/antivirus-prerelease-clearance.md).
-- **WSL commands**: build argv with `buildWslExecArgs` (always `--exec` — under `--`, `wsl.exe` expands `$name` in every argument and silently rewrites the script), and fence anything whose stdout you parse with `buildWslCapturedLoginShellCommand`, because the interactive login shell prints the distro banner to stdout. See [`docs/reference/wsl-command-execution.md`](./docs/reference/wsl-command-execution.md).
-- **Linux native modules**: keep the glibc floor at Ubuntu 20.04 / glibc 2.31. A module compiled from source on a newer runner can reference symbol versions absent on the floor and crash the app on startup. See [`docs/reference/linux-glibc-compatibility.md`](./docs/reference/linux-glibc-compatibility.md); packaging fails if a bundled native binary needs newer glibc.
+- **Windows process enumeration**: read the table through `src/main/windows/windows-process-table.ts`, never by forking `powershell.exe`.
+- **Windows MSYS/Git Bash panes**: their children break away from the per-PTY job unless it is created without `JOB_OBJECT_LIMIT_BREAKAWAY_OK`, and a `conpty.node` built before that fix passes every existing gate.
+- **Windows daemon-host relocation**: the terminal daemon runs from a copy of the app runtime under `%LOCALAPPDATA%`, which is what survives an auto-update.
+- **Windows EDR signal**: don't add `-ExecutionPolicy Bypass`, `-EncodedCommand`, `cmd.exe /c` with escaped free text, per-operation interpreter spawning, or runtime `Add-Type` compilation without reviewing the EDR impact first — behavioural EDR scores each of those, and being signed does not clear them.
+- **WSL commands**: build argv with `buildWslExecArgs` (always `--exec` — under `--`, `wsl.exe` expands `$name` in every argument and silently rewrites the script), and fence anything whose stdout you parse with `buildWslCapturedLoginShellCommand`, because the interactive login shell prints the distro banner to stdout.
+- **Linux native modules**: keep the glibc floor at Ubuntu 20.04 / glibc 2.31. A module compiled from source on a newer runner can reference symbol versions absent on the floor and crash the app on startup. Packaging fails if a bundled native binary needs newer glibc.
 
 ## Native Dependency Installs
 
-Ordinary `pnpm install` covers the host OS and CPU only. Before packaging for another architecture — including `pnpm build:mac`, which builds x64 and arm64 by default — run `pnpm install:release`. electron-builder only warns on a missing `extraResources` source, so the `beforePack` guard is what turns a thin install into a build failure instead of a silently broken artifact; see [`docs/reference/pnpm-install-policy.md`](./docs/reference/pnpm-install-policy.md).
+Ordinary `pnpm install` covers the host OS and CPU only. Before packaging for another architecture — including `pnpm build:mac`, which builds x64 and arm64 by default — run `pnpm install:release`. electron-builder only warns on a missing `extraResources` source, so the `beforePack` guard is what turns a thin install into a build failure instead of a silently broken artifact.
 
 ## SSH Use Case
 
-All changes must consider the SSH use case. Don't assume local-only execution. Before changing anything that reports on, stops, or lists remote work, follow [`docs/reference/ssh-execution-boundary.md`](./docs/reference/ssh-execution-boundary.md): the execution host owns everything that touches execution, and loss of contact is never evidence of process death — the verdict vocabulary is `live` / `unverifiable` / `exited`, with no synonyms.
+All changes must consider the SSH use case. Don't assume local-only execution. Before changing anything that reports on, stops, or lists remote work, the execution host owns everything that touches execution, and loss of contact is never evidence of process death — the verdict vocabulary is `live` / `unverifiable` / `exited`, with no synonyms.
 
 ## Folder Workspace Use Case
 
@@ -115,19 +115,19 @@ All changes must consider folder workspaces as well as git worktrees. Don't assu
 
 ## Agent Status
 
-The execution host owns agent status in one store, the hook server's, and every reader (sidebar, `worktree ps`, mobile, dashboard) subscribes to it. Before adding a producer, a cache, or a reader-side precedence rule, read [`docs/reference/agent-status-store.md`](./docs/reference/agent-status-store.md): new producers write into that store, and readers keep only presentation policy.
+The execution host owns agent status in one store, the hook server's, and every reader (sidebar, `worktree ps`, mobile, dashboard) subscribes to it. New producers write into that store, and readers keep only presentation policy.
 
 ## Agent Terminal Screens
 
-A rule that reads what an agent CLI paints on a terminal — readiness, blocked prompts, idle — must be written against a captured transcript, not a remembered screen. Record one with [`docs/reference/agent-pty-transcript-capture.md`](./docs/reference/agent-pty-transcript-capture.md), which keeps escapes and wrapping intact and scrubs account identifiers before they reach git. Antigravity readiness has no transcript yet and five failed attempts without one; before touching it, read [`docs/reference/antigravity-readiness-evidence.md`](./docs/reference/antigravity-readiness-evidence.md).
+A rule that reads what an agent CLI paints on a terminal — readiness, blocked prompts, idle — must be written against a captured transcript, not a remembered screen. Use `config/scripts/capture-agent-pty-transcript.mjs` to keep escapes and wrapping intact and scrub account identifiers before they reach git.
 
 ## Remote Wire Compatibility
 
-Clients and remote Orca servers update independently, so mixed versions are the normal state. Before changing anything a paired client and host exchange — RPC params, stream frames, or the content either side publishes over them — follow [`docs/reference/remote-wire-compatibility.md`](./docs/reference/remote-wire-compatibility.md). A new optional field is safe; a new stream opcode must be capability-negotiated because decoders drop unknown opcodes silently; and changing what the host publishes reaches old clients even with no wire change.
+Clients and remote Orca servers update independently, so mixed versions are the normal state. Before changing anything a paired client and host exchange — RPC params, stream frames, or the content either side publishes over them — preserve compatibility with older peers. A new optional field is safe; a new stream opcode must be capability-negotiated because decoders drop unknown opcodes silently; and changing what the host publishes reaches old clients even with no wire change.
 
 ## Git Binary Compatibility
 
-Orca runs the user's Git binary on native, WSL, and SSH hosts, which may all have different versions. Treat Git 2.25 as the core-workflow baseline and follow [`docs/reference/git-compatibility.md`](./docs/reference/git-compatibility.md).
+Orca runs the user's Git binary on native, WSL, and SSH hosts, which may all have different versions. Treat Git 2.25 as the core-workflow baseline.
 
 When adding or changing a Git command:
 
diff --git a/README.md b/README.md
index 5ed85162bb2d..b1b8f08b7bda 100644
--- a/README.md
+++ b/README.md
@@ -219,7 +219,6 @@ Works with **any CLI agent** — if it runs in a terminal, it runs in Orca.
 
 - **[Download from onOrca.dev](https://onorca.dev/download)**
 - Or grab a build directly: [macOS Apple Silicon](https://github.com/stablyai/orca/releases/latest/download/orca-macos-arm64.dmg) · [macOS Intel](https://github.com/stablyai/orca/releases/latest/download/orca-macos-x64.dmg) · [Windows (.exe)](https://github.com/stablyai/orca/releases/latest/download/orca-windows-setup.exe) · [Linux AppImage](https://github.com/stablyai/orca/releases/latest/download/orca-linux.AppImage) · [All builds](https://github.com/stablyai/orca/releases/latest)
-- Running `orca serve` on a headless Linux server? See the [headless Linux server guide](docs/reference/headless-linux-server.md).
 
 _Or via a package manager:_
 
diff --git a/cloud/apps/relay-ops/src/incident-monitor-sources.ts b/cloud/apps/relay-ops/src/incident-monitor-sources.ts
index 877b4bd59c56..9e041940af7f 100644
--- a/cloud/apps/relay-ops/src/incident-monitor-sources.ts
+++ b/cloud/apps/relay-ops/src/incident-monitor-sources.ts
@@ -144,6 +144,13 @@ export const GOOGLE_METRICS: GoogleMetricDefinition[] = [
       'resource.type="cloud_run_revision" AND metric.label."response_code_class"="5xx"',
     aggregation: 'window-sum',
     emptyIsZero: true
+  },
+  {
+    signal: 'auth.requests',
+    type: 'run.googleapis.com/request_count',
+    resourceFilter: 'resource.type="cloud_run_revision"',
+    aggregation: 'window-sum',
+    emptyIsZero: true
   }
 ]
 
diff --git a/cloud/apps/relay-ops/src/incident-monitor.test.ts b/cloud/apps/relay-ops/src/incident-monitor.test.ts
index a4b3b3fbd0c5..db1d8797d1c3 100644
--- a/cloud/apps/relay-ops/src/incident-monitor.test.ts
+++ b/cloud/apps/relay-ops/src/incident-monitor.test.ts
@@ -66,7 +66,8 @@ function healthySample(at = startedAt): IncidentSample {
           'director.memory': signal(0.3, at),
           'director.concurrency': signal(5, at),
           'director.errors': signal(0, at),
-          'auth.errors': signal(0, at)
+          'auth.errors': signal(0, at),
+          'auth.requests': signal(58_000, at)
         }
       },
       'relay-logs': {
@@ -287,15 +288,42 @@ describe('incident monitor evaluator', () => {
     expect(evaluateIncidentSample(excess, startedAt).failures).toContainEqual(
       expect.objectContaining({ signal: 'director.errors', observed: 16, threshold: 15 })
     )
-    const auth = healthySample()
-    auth.sources['cloud-monitoring']!.signals['auth.errors'] = signal(1)
-    expect(evaluateIncidentSample(auth, startedAt).status).toBe('freeze')
     const pressure = healthySample()
     pressure.sources['cloud-monitoring']!.signals['director.errors'] = signal(1)
     pressure.sources['cloud-monitoring']!.signals['cloud_sql.cpu'] = signal(0.81)
     expect(evaluateIncidentSample(pressure, startedAt).status).toBe('freeze')
   })
 
+  it('tolerates isolated auth errors but freezes on a burst or a high error ratio', () => {
+    const isolated = healthySample()
+    isolated.sources['cloud-monitoring']!.signals['auth.errors'] = signal(1)
+    expect(evaluateIncidentSample(isolated, startedAt).status).toBe('green')
+    isolated.sources['cloud-monitoring']!.signals['auth.errors'] = signal(2)
+    expect(evaluateIncidentSample(isolated, startedAt).status).toBe('green')
+
+    const burst = healthySample()
+    burst.sources['cloud-monitoring']!.signals['auth.errors'] = signal(3)
+    expect(evaluateIncidentSample(burst, startedAt).failures).toEqual([
+      expect.objectContaining({ signal: 'auth.errors', observed: 3, threshold: 2 })
+    ])
+
+    const ratio = healthySample()
+    ratio.sources['cloud-monitoring']!.signals['auth.errors'] = signal(2)
+    ratio.sources['cloud-monitoring']!.signals['auth.requests'] = signal(1_000)
+    expect(evaluateIncidentSample(ratio, startedAt).failures).toEqual([
+      expect.objectContaining({ signal: 'auth.error_ratio', observed: 0.002, threshold: 0.001 })
+    ])
+    ratio.sources['cloud-monitoring']!.signals['auth.requests'] = signal(0)
+    expect(evaluateIncidentSample(ratio, startedAt).status).toBe('freeze')
+
+    const unmeasured = healthySample()
+    unmeasured.sources['cloud-monitoring']!.signals['auth.errors'] = signal(1)
+    delete unmeasured.sources['cloud-monitoring']!.signals['auth.requests']
+    expect(evaluateIncidentSample(unmeasured, startedAt).failures).toEqual([
+      expect.objectContaining({ code: 'signal_missing', signal: 'auth.requests' })
+    ])
+  })
+
   it('freezes on SQL, director, relay pool, heartbeat, and migration breaches', () => {
     const sample = healthySample()
     sample.sources['cloud-monitoring']!.signals['cloud_sql.cpu'] = signal(0.81)
diff --git a/cloud/apps/relay-ops/src/incident-monitor.ts b/cloud/apps/relay-ops/src/incident-monitor.ts
index 22a2dc014fa9..94c7a4791498 100644
--- a/cloud/apps/relay-ops/src/incident-monitor.ts
+++ b/cloud/apps/relay-ops/src/incident-monitor.ts
@@ -121,7 +121,12 @@ export const INCIDENT_MONITOR_THRESHOLDS = {
   // real fault lands in the hundreds per window, an order of magnitude clear of
   // this bar.
   directorErrors: 15,
-  authErrors: 0,
+  // Why: 2, raised 2026-10-07 from 0. Auth answers ~58k requests per five minutes
+  // (24 h to 2026-10-07: min 44k) and logged two 5xx in that day, so a single 500 on
+  // the desktop sign-in callback froze the c13 and c28 waves with auth healthy. A real
+  // auth fault fails hundreds per window; the ratio bar keeps a near-idle auth strict.
+  authErrors: 2,
+  authErrorRatio: 0.001,
   // Why: 800 exceeded the 600 hard cap, so this could never trigger on a capped cell. 500 is
   // the ordinary admission limit a cell actually stops at (600 cap - 100 control-rebind reserve).
   cellConnections: 500,
@@ -437,6 +442,27 @@ function checkRule(
   }
 }
 
+// Why: a few errors are noise only against real traffic; with almost no requests they are the outage.
+function checkAuthErrorRatio(
+  failures: IncidentFailure[],
+  signals: Record<string, IncidentSignal>
+): void {
+  const errors = signals['auth.errors']?.value ?? 0
+  if (errors === 0) return
+  const requests = signals['auth.requests']
+  if (!requests) return addMissingSignal(failures, 'cloud-monitoring', 'auth.requests')
+  const ratio = requests.value > 0 ? errors / requests.value : Number.POSITIVE_INFINITY
+  if (ratio > INCIDENT_MONITOR_THRESHOLDS.authErrorRatio) {
+    failures.push({
+      code: 'threshold_max',
+      source: 'cloud-monitoring',
+      signal: 'auth.error_ratio',
+      observed: ratio,
+      threshold: INCIDENT_MONITOR_THRESHOLDS.authErrorRatio
+    })
+  }
+}
+
 function checkCell(
   failures: IncidentFailure[],
   sample: IncidentSample,
@@ -636,6 +662,8 @@ export function evaluateIncidentSample(
     const source = sample.sources[rule.source]
     if (source) checkRule(failures, rule.source, source.signals, rule)
   }
+  const monitoring = sample.sources['cloud-monitoring']
+  if (monitoring) checkAuthErrorRatio(failures, monitoring.signals)
   for (const cell of sample.cells) {
     checkCell(
       failures,
diff --git a/cloud/apps/relay/src/app.ts b/cloud/apps/relay/src/app.ts
index e88162dfd88f..46e364eeb0d6 100644
--- a/cloud/apps/relay/src/app.ts
+++ b/cloud/apps/relay/src/app.ts
@@ -73,8 +73,9 @@ const ASSIGNMENT_REJECTION_LOG_WINDOW_MS = 10_000
 // A release holds the row for about one lock timeout, so one second is enough.
 const ASSIGNMENT_ROW_BUSY_RETRY_AFTER_SECONDS = 1
 const REGION_CATALOG_CACHE_MS = 30_000
-// A drain that outlives the roll step it belongs to is an outage, not a pacing win.
-const DRAIN_PACE_WINDOW_MAX_MS = 5 * 60 * 1_000
+// A drain that outlives the roll step it belongs to is an outage, not a pacing win. The roll
+// step's timeout scales with the window, up to the same-cap wave's slowest pace.
+const DRAIN_PACE_WINDOW_MAX_MS = 20 * 60 * 1_000
 
 type AdmissionRejectionLogEntry = {
   route: 'assign' | 'resolve'
@@ -280,8 +281,14 @@ export function createRelayApp(
   })
 
   // Not /healthz: Google Front End reserves that path before the container.
+  // The drain pace cap is read before a roll isolates a cell, so a slower pace than the cell
+  // accepts stops with the cell untouched.
   app.get('/health', (context) =>
-    context.json({ ok: true, connectionCapacityProtocol: 2 })
+    context.json({
+      ok: true,
+      connectionCapacityProtocol: 2,
+      drainPaceWindowMaxMs: DRAIN_PACE_WINDOW_MAX_MS
+    })
   )
   app.get('/ready', async (context) => {
     if (!(await operations.ready())) return context.json({ error: 'dependency_unavailable' }, 503)
diff --git a/cloud/apps/relay/src/assignment-store.ts b/cloud/apps/relay/src/assignment-store.ts
index e082aaa72a56..007b71086157 100644
--- a/cloud/apps/relay/src/assignment-store.ts
+++ b/cloud/apps/relay/src/assignment-store.ts
@@ -71,6 +71,7 @@ import {
 } from './database.js'
 import type { RelayCellConfig } from './config.js'
 import type { CellLockHoldSite } from './cell-inventory-hold-samples.js'
+import { isPostgresPoolConnectFailure } from './postgres-pool-pressure.js'
 import type {
   RelayDatabase,
   RelayLockOptions,
@@ -80,10 +81,13 @@ import type {
 import type { RegionalRehomeSafetySnapshot } from './relay-observability.js'
 import {
   combineRegionalRehomeSafety,
+  nextRegionalRehomeSqlFailuresBreach,
   REGIONAL_REHOME_RECONNECTS_PER_CELL_LIMIT,
   REGIONAL_REHOME_SQL_FAILURES_PER_CELL_LIMIT,
   regionalRehomePoolPressure,
-  regionalRehomeSafetyFailure
+  regionalRehomeSafetyFailure,
+  regionalRehomeSqlFailuresSustained,
+  type RegionalRehomeSqlFailuresBreach
 } from './regional-rehome-safety.js'
 import {
   REGIONAL_REHOME_ARRIVAL_WINDOW_MS,
@@ -3755,6 +3759,7 @@ export class RelayAssignmentStore {
   }
 
   private idleRegionalCandidateCursor: IdleRehomeHostCursor = null
+  private regionalRehomeSqlFailuresBreach: RegionalRehomeSqlFailuresBreach = null
   private readonly regionalRehomePollTelemetry = new RegionalRehomePollTelemetry()
 
   async selectIdleRegionalRehomeCandidates(
@@ -3786,6 +3791,19 @@ export class RelayAssignmentStore {
       return gated('budget-closed')
     }
     const fleetSafety = await this.readRegionalRehomeFleetSafety(this.database, now)
+    const sqlBreach = nextRegionalRehomeSqlFailuresBreach(
+      this.regionalRehomeSqlFailuresBreach,
+      combineRegionalRehomeSafety(processSafety, fleetSafety).sqlFailures,
+      now
+    )
+    this.regionalRehomeSqlFailuresBreach = sqlBreach
+    // Source cells only pause on sql failures; the poll is the regular observer that latches.
+    if (sqlBreach && regionalRehomeSqlFailuresSustained(sqlBreach)) {
+      const event = await this.disableRegionalRehomeForSafety(this.database, now, 'sql_failures', fleetSafety)
+      if (event) console.warn(JSON.stringify({ ...event, sustainedMs: now - sqlBreach.since }))
+      this.regionalRehomeSqlFailuresBreach = null
+      return gated('fleet-safety')
+    }
     if (regionalRehomeFleetSafetyFailure(processSafety, fleetSafety, now)) return gated('fleet-safety')
     const startedAt = performance.now()
     const selection = await selectIdleRegionalRehomes({
@@ -3821,8 +3839,8 @@ export class RelayAssignmentStore {
       return { outcome: 'deferred', reason: 'cohort-closed' }
     }
     let safetyDisable: Record<string, string | number> | null = null
-    // Set on every fleet-safety failure, disable or not: the pause is durable
-    // and global either way, so no later candidate in this poll can get past it.
+    // Set on every fleet-safety failure, disable or not: the pause is global
+    // either way, so no later candidate in this poll can get past it.
     let safetyPaused = false
     let targetDeferral: RegionalRehomeTargetDeferral | null = null
     // Lock order: control, worker, host rows, then the target cell row alone,
@@ -4044,7 +4062,7 @@ export class RelayAssignmentStore {
     rows: readonly ControlRenewalRequest[],
     now: number
   ): Promise<ControlRenewalOutcome[]> {
-    if (rows.length === 1) return [await this.renewOneControlActivity(rows[0]!, now)]
+    if (rows.length === 1) return [await this.renewOneControlActivity(rows[0]!, now, 'priority')]
     if (this.database.dialect !== 'postgres') {
       // Correctness over throughput: the SQLite writer is serialized anyway, and
       // this is the dialect the unit suites run on.
@@ -4054,7 +4072,7 @@ export class RelayAssignmentStore {
     const outcomes = new Array<ControlRenewalOutcome>(rows.length)
     try {
       const parsed = readControlRenewalOutcomes(
-        await this.database.query(
+        await this.priorityQuery(
           CONTROL_RENEWAL_BATCH_SQL,
           controlRenewalBatchParams(ordered, now)
         ),
@@ -4073,6 +4091,9 @@ export class RelayAssignmentStore {
           message: String((error as { message?: unknown }).message)
         })
       )
+      // No connection at all: per-host statements would only queue up behind the
+      // same saturated pool, multiplying the load that starved this flush.
+      if (isPostgresPoolConnectFailure(error)) return outcomes.fill('database_error')
       await Promise.all(
         ordered.map(async (row) => {
           try {
@@ -4086,6 +4107,12 @@ export class RelayAssignmentStore {
     }
   }
 
+  private async priorityQuery(sql: string, params: unknown[]): Promise<SqlRow[]> {
+    return this.database.queryPriority
+      ? await this.database.queryPriority(sql, params)
+      : await this.database.query(sql, params)
+  }
+
   private async renewControlActivitiesInSeries(
     rows: readonly ControlRenewalRequest[],
     now: number
@@ -4104,14 +4131,15 @@ export class RelayAssignmentStore {
   // Returns the outcome; a driver or pool failure reaches the caller unchanged.
   private async renewOneControlActivity(
     row: ControlRenewalRequest,
-    now: number
+    now: number,
+    lane: 'general' | 'priority' = 'general'
   ): Promise<ControlRenewalOutcome> {
     if (this.database.dialect === 'postgres') {
+      const params = controlRenewalBatchParams([row], now)
       return readControlRenewalOutcomes(
-        await this.database.query(
-          CONTROL_RENEWAL_BATCH_SQL,
-          controlRenewalBatchParams([row], now)
-        ),
+        lane === 'priority'
+          ? await this.priorityQuery(CONTROL_RENEWAL_BATCH_SQL, params)
+          : await this.database.query(CONTROL_RENEWAL_BATCH_SQL, params),
         1
       )[0]!
     }
@@ -5968,7 +5996,9 @@ export class RelayAssignmentStore {
       input.now
     )
     if (safetyFailure) {
-      input.onSafetyDisabled(await this.pauseRegionalRehomeForSafety(
+      // A sql spike alone is usually one DB stall: pause this claim and leave
+      // the latch to the director's sustained-breach check.
+      input.onSafetyDisabled(safetyFailure === 'sql_failures' ? null : await this.pauseRegionalRehomeForSafety(
         transaction,
         input.worker,
         input.now,
@@ -6343,7 +6373,18 @@ export class RelayAssignmentStore {
     reason: string,
     fleetSafety: RegionalRehomeFleetSafety
   ): Promise<Record<string, string | number> | null> {
-    const disabled = await transaction.query(
+    const event = await this.disableRegionalRehomeForSafety(transaction, now, reason, fleetSafety)
+    await this.incrementRegionalRehomeWorkerFailure(transaction, worker, now)
+    return event
+  }
+
+  private async disableRegionalRehomeForSafety(
+    database: RelayDatabase,
+    now: number,
+    reason: string,
+    fleetSafety: RegionalRehomeFleetSafety
+  ): Promise<Record<string, string | number> | null> {
+    const disabled = await database.query(
       `UPDATE relay_region_rehome_control
        SET generation = generation + 1, enabled = 0, updated_at = ?
        WHERE control_id = 'global' AND enabled = 1
@@ -6353,27 +6394,23 @@ export class RelayAssignmentStore {
     // The durable disable is otherwise invisible: nothing else records why
     // claims stopped and inspection only shows enabled=false. Logged after
     // the transaction commits so a rollback cannot fabricate the record.
-    let event: Record<string, string | number> | null = null
-    if (disabled.length > 0) {
-      event = {
-        event: 'orca_relay_regional_rehome_safety_disabled',
-        reason,
-        controlGeneration: integer(disabled[0]!, 'generation'),
-        now,
-        requiredCells: fleetSafety.requiredCells,
-        missingCells: fleetSafety.missingCells,
-        observedAt: fleetSafety.observedAt,
-        sqlFailures: fleetSafety.sqlFailures,
-        reconnects: fleetSafety.reconnects,
-        maxReconnects: fleetSafety.maxReconnects,
-        controlActivityRecoveryFailures: fleetSafety.controlActivityRecoveryFailures,
-        databasePoolWaiting: fleetSafety.databasePoolWaiting,
-        databasePoolWaitersMax: fleetSafety.databasePoolWaitersMax,
-        databasePoolWaitMsMax: fleetSafety.databasePoolWaitMsMax
-      }
+    if (disabled.length === 0) return null
+    return {
+      event: 'orca_relay_regional_rehome_safety_disabled',
+      reason,
+      controlGeneration: integer(disabled[0]!, 'generation'),
+      now,
+      requiredCells: fleetSafety.requiredCells,
+      missingCells: fleetSafety.missingCells,
+      observedAt: fleetSafety.observedAt,
+      sqlFailures: fleetSafety.sqlFailures,
+      reconnects: fleetSafety.reconnects,
+      maxReconnects: fleetSafety.maxReconnects,
+      controlActivityRecoveryFailures: fleetSafety.controlActivityRecoveryFailures,
+      databasePoolWaiting: fleetSafety.databasePoolWaiting,
+      databasePoolWaitersMax: fleetSafety.databasePoolWaitersMax,
+      databasePoolWaitMsMax: fleetSafety.databasePoolWaitMsMax
     }
-    await this.incrementRegionalRehomeWorkerFailure(transaction, worker, now)
-    return event
   }
 
 
diff --git a/cloud/apps/relay/src/control-renewal-batch-store.test.ts b/cloud/apps/relay/src/control-renewal-batch-store.test.ts
index e3798a19ae22..25c039700238 100644
--- a/cloud/apps/relay/src/control-renewal-batch-store.test.ts
+++ b/cloud/apps/relay/src/control-renewal-batch-store.test.ts
@@ -27,6 +27,7 @@ class RenewalStatementProbe implements RelayDatabase {
   readonly dialect = 'postgres' as const
   readonly statements: Array<{ sql: string; params: unknown[] }> = []
   failuresRemaining = 0
+  failureMessage = 'canceling statement due to statement timeout'
 
   constructor(private readonly outcomeFor: (userId: string) => ControlRenewalOutcome) {}
 
@@ -34,7 +35,7 @@ class RenewalStatementProbe implements RelayDatabase {
     this.statements.push({ sql, params })
     if (this.failuresRemaining > 0) {
       this.failuresRemaining -= 1
-      throw new Error('canceling statement due to statement timeout')
+      throw new Error(this.failureMessage)
     }
     const userIds = params[0] as string[]
     return userIds.map((userId, index) => ({
@@ -149,6 +150,58 @@ describe('batched control renewals on PostgreSQL', () => {
     }
   })
 
+  it('runs the batch on the priority lane and the per-host fallback on the general one', async () => {
+    const probe = new RenewalStatementProbe(() => 'renewed')
+    probe.failuresRemaining = 1
+    const lanes: string[] = []
+    const database: RelayDatabase = {
+      dialect: 'postgres',
+      query: async (sql, params) => {
+        lanes.push('general')
+        return await probe.query(sql, params)
+      },
+      queryPriority: async (sql, params) => {
+        lanes.push('priority')
+        return await probe.query(sql, params)
+      },
+      queryLocked: async () => await probe.queryLocked(),
+      transaction: async () => await probe.transaction(),
+      close: async () => undefined
+    }
+    const store = new RelayAssignmentStore(database, () => now)
+    const warn = vi.spyOn(console, 'warn').mockImplementation(() => undefined)
+    try {
+      await store.renewControlActivities([
+        renewal('user-a', 'host000000000001'),
+        renewal('user-a', 'host000000000002')
+      ])
+
+      // A 200-row fallback would otherwise jump the whole general queue.
+      expect(lanes).toEqual(['priority', 'general', 'general'])
+    } finally {
+      warn.mockRestore()
+    }
+  })
+
+  it('does not fan out per host when the batch never got a connection', async () => {
+    const probe = new RenewalStatementProbe(() => 'renewed')
+    probe.failuresRemaining = 1
+    probe.failureMessage = 'timeout exceeded when trying to connect'
+    const store = new RelayAssignmentStore(probe, () => now)
+    const warn = vi.spyOn(console, 'warn').mockImplementation(() => undefined)
+    try {
+      const outcomes = await store.renewControlActivities([
+        renewal('user-a', 'host000000000001'),
+        renewal('user-a', 'host000000000002')
+      ])
+
+      expect(outcomes).toEqual(['database_error', 'database_error'])
+      expect(probe.statements).toHaveLength(1)
+    } finally {
+      warn.mockRestore()
+    }
+  })
+
   it('reports a host that fails its own fallback statement without touching the rest', async () => {
     const probe = new RenewalStatementProbe(() => 'renewed')
     probe.failuresRemaining = 2
diff --git a/cloud/apps/relay/src/database.ts b/cloud/apps/relay/src/database.ts
index 122dd3fc1c0e..a50d617ac0c3 100644
--- a/cloud/apps/relay/src/database.ts
+++ b/cloud/apps/relay/src/database.ts
@@ -8,6 +8,7 @@ import {
   emptyPostgresPoolPressureCounts,
   isPostgresPoolConnectFailure,
   PostgresPoolPressure,
+  type PostgresPoolLane,
   type PostgresPoolPressureCounts
 } from './postgres-pool-pressure.js'
 import { applyPostgresSchema } from './postgres-schema-startup.js'
@@ -71,6 +72,9 @@ export type RelayTransactionOptions = { reportRetries?: boolean }
 export interface RelayDatabase {
   readonly dialect?: 'sqlite' | 'postgres'
   query(sql: string, params?: unknown[]): Promise<SqlRow[]>
+  // Ahead of every queued query() for the next free connection; see
+  // PostgresPoolPressure. Absent means plain query().
+  queryPriority?(sql: string, params?: unknown[]): Promise<SqlRow[]>
   queryLocked(
     sql: string,
     params?: unknown[],
@@ -1058,11 +1062,23 @@ export class PostgresDatabase implements RelayDatabase {
   }
 
   async query(sql: string, params: unknown[] = []): Promise<SqlRow[]> {
+    return await this.queryOnLane('general', sql, params)
+  }
+
+  async queryPriority(sql: string, params: unknown[] = []): Promise<SqlRow[]> {
+    return await this.queryOnLane('priority', sql, params)
+  }
+
+  private async queryOnLane(
+    lane: PostgresPoolLane,
+    sql: string,
+    params: unknown[]
+  ): Promise<SqlRow[]> {
     const startedAt = performance.now()
     let phase: 'acquire' | 'execute' = 'acquire'
     let client: pg.PoolClient | undefined
     try {
-      client = await this.pressure.connect()
+      client = await this.pressure.connect(lane)
       phase = 'execute'
       const result = await client.query(postgresSql(sql), params)
       return returnsRows(sql) ? (result.rows as SqlRow[]) : [{ changes: result.rowCount ?? 0 }]
@@ -1173,6 +1189,10 @@ export class PostgresDatabase implements RelayDatabase {
   peekPoolPressure(): PostgresPoolPressureCounts {
     return this.pressure.peekCounts()
   }
+
+  poolOldestWaitMs(): number {
+    return this.pressure.oldestWaitMs()
+  }
 }
 
 export function consumeRelayDatabasePoolPressure(
@@ -1198,6 +1218,11 @@ export function readRelayDatabasePoolPressure(
     : emptyPostgresPoolPressureCounts()
 }
 
+// How long the longest-waiting pooled query has queued so far; 0 when none waits.
+export function readRelayDatabasePoolOldestWaitMs(database: RelayDatabase): number {
+  return database instanceof PostgresDatabase ? database.poolOldestWaitMs() : 0
+}
+
 export function absorbPostgresIdleClientErrors(pool: Pick<pg.Pool, 'on'>): void {
   pool.on('error', () => {
     // Why: node-postgres removes failed idle clients itself; leaving `error`
diff --git a/cloud/apps/relay/src/host-session-registry.test.ts b/cloud/apps/relay/src/host-session-registry.test.ts
index fcf73695b40a..912462620d03 100644
--- a/cloud/apps/relay/src/host-session-registry.test.ts
+++ b/cloud/apps/relay/src/host-session-registry.test.ts
@@ -18,7 +18,11 @@ import {
   type ControlRenewalOutcome,
   type ControlRenewalRequest
 } from './control-renewal-statement.js'
-import { HostSessionRegistry, type HostSession } from './host-session-registry.js'
+import {
+  HostSessionRegistry,
+  IDLE_REHOME_MIN_CONTROL_AGE_MS,
+  type HostSession
+} from './host-session-registry.js'
 import { relayHostLogDigest } from './relay-host-log-digest.js'
 import type { RelayRuntimeObserver } from './relay-observability.js'
 import {
@@ -1319,7 +1323,10 @@ describe('source-owned idle cutover', () => {
     sourceCellIncarnation: 'incarnation-1',
     targetCellId: 'target'
   }
-  async function source(store: Partial<RelayCredentialStore> = {}) {
+  async function source(
+    store: Partial<RelayCredentialStore> = {},
+    controlAgeMs = IDLE_REHOME_MIN_CONTROL_AGE_MS
+  ) {
     const h = createRegistry(vi.fn().mockResolvedValue('control:1'), store)
     const socket = new FakeSocket()
     h.registry.acceptControl(
@@ -1330,8 +1337,42 @@ describe('source-owned idle cutover', () => {
     )
     socket.removeAllListeners('message')
     await h.activate(socket as unknown as WebSocket, identity, null, 1, false, 1)
+    // Moves the clock without firing the heartbeat timers that would close the session.
+    vi.setSystemTime(Date.now() + controlAgeMs)
     return { ...h, socket, session: h.registry.get(request)! }
   }
+  it.each([
+    { controlAgeMs: 0, outcome: 'busy' },
+    { controlAgeMs: IDLE_REHOME_MIN_CONTROL_AGE_MS - 1, outcome: 'busy' },
+    { controlAgeMs: IDLE_REHOME_MIN_CONTROL_AGE_MS, outcome: 'committed' },
+    { controlAgeMs: 60 * 60 * 1000, outcome: 'committed' }
+  ])('answers $outcome for a control socket $controlAgeMs ms old', async (row) => {
+    const { controlAgeMs, outcome } = row
+    const h = await source({}, controlAgeMs)
+    const commit = vi.fn().mockResolvedValue({ outcome: 'committed' })
+    expect(
+      await h.registry.idleRehome(request, commit, vi.fn().mockResolvedValue('not-committed'))
+    ).toEqual({ outcome })
+    expect(commit).toHaveBeenCalledTimes(outcome === 'busy' ? 0 : 1)
+    expect(h.socket.close).toHaveBeenCalledTimes(outcome === 'busy' ? 0 : 1)
+  })
+  it('restarts the age when the host rebinds its control socket', async () => {
+    const h = await source()
+    const rebound = new FakeSocket()
+    h.registry.acceptControl(
+      rebound as unknown as WebSocket,
+      identity,
+      undefined,
+      new Set([RELAY_HOST_CAPABILITY_IDLE_REGIONAL_REHOME])
+    )
+    rebound.removeAllListeners('message')
+    await h.activate(rebound as unknown as WebSocket, identity, h.session, 1, true, 1)
+    const commit = vi.fn().mockResolvedValue({ outcome: 'committed' })
+    expect(
+      await h.registry.idleRehome(request, commit, vi.fn().mockResolvedValue('not-committed'))
+    ).toEqual({ outcome: 'busy' })
+    expect(commit).not.toHaveBeenCalled()
+  })
   it('keeps either established client busy until both actually leave', async () => {
     const h = await source()
     h.session.activeConnIds.add('phone')
diff --git a/cloud/apps/relay/src/host-session-registry.ts b/cloud/apps/relay/src/host-session-registry.ts
index 06cfb2d57ac3..5dfa4e27bdd1 100644
--- a/cloud/apps/relay/src/host-session-registry.ts
+++ b/cloud/apps/relay/src/host-session-registry.ts
@@ -76,6 +76,9 @@ const CONTROL_ACTIVITY_LEASE_MS =
   CONTROL_ACTIVITY_RENEWAL_INTERVAL_MS -
   RELAY_PROTOCOL_LIMITS.controlPingIntervalMs
 
+// Past the 135-150 s liveness close, so a host that wakes briefly then sleeps never gets a move.
+export const IDLE_REHOME_MIN_CONTROL_AGE_MS = 180_000
+
 export type HostSession = {
   identity: RelayTokenClaims
   readonly relayHostId: string
@@ -88,6 +91,8 @@ export type HostSession = {
   appVersion: string
   state: HostState
   socket: WebSocket | null
+  // When the current control socket was wired; a rebind restarts it.
+  controlWiredAt: number
   leaseExpiresAt: number
   orphanTimer: ReturnType<typeof setTimeout> | null
   heartbeatTimer: ReturnType<typeof setInterval> | null
@@ -268,7 +273,8 @@ export class HostSessionRegistry {
       (this.idleWork.get(input.relayHostId) ?? 0) !== 0 ||
       session.activeConnIds.size !== 0 ||
       session.activeSplices.size !== 0 ||
-      session.pendingConns.size !== 0
+      session.pendingConns.size !== 0 ||
+      this.now() - session.controlWiredAt < IDLE_REHOME_MIN_CONTROL_AGE_MS
     )
       return { outcome: 'busy' }
     const revision = session.authorityRevision
@@ -1260,6 +1266,7 @@ export class HostSessionRegistry {
       appVersion,
       state: 'active',
       socket,
+      controlWiredAt: this.now(),
       leaseExpiresAt: this.controlLeaseExpiresAt(),
       orphanTimer: null,
       heartbeatTimer: null,
@@ -1290,6 +1297,7 @@ export class HostSessionRegistry {
   private wireActiveControl(session: HostSession): void {
     const socket = session.socket!
     const wiredAt = this.now()
+    session.controlWiredAt = wiredAt
     // Why: pin the build to THIS socket. A rebind refreshes session.appVersion and
     // only then closes the predecessor, whose close event always lands after that
     // write, so reading it at log time would stamp the successor's build.
diff --git a/cloud/apps/relay/src/observed-relay-database.ts b/cloud/apps/relay/src/observed-relay-database.ts
index 5149c1c2dd97..7cae39fd0626 100644
--- a/cloud/apps/relay/src/observed-relay-database.ts
+++ b/cloud/apps/relay/src/observed-relay-database.ts
@@ -29,11 +29,21 @@ export function observeRelayDatabase(
         error instanceof Error &&
         error.message === 'database_lock_unavailable'
     )
+  const queryPriority = database.queryPriority?.bind(database)
   const commitWithFinal = database.commitWithFinal?.bind(database)
   return {
     dialect: database.dialect,
     query,
     queryLocked,
+    ...(queryPriority
+      ? {
+          queryPriority: (sql: string, params?: unknown[]): Promise<SqlRow[]> =>
+            timedRelayOperation(
+              () => queryPriority(sql, params),
+              (durationMs, success) => observer.recordSql(durationMs, success)
+            )
+        }
+      : {}),
     ...(commitWithFinal
       ? {
           commitWithFinal: (sql: string, params?: unknown[]): Promise<boolean> =>
diff --git a/cloud/apps/relay/src/postgres-pool-pressure.test.ts b/cloud/apps/relay/src/postgres-pool-pressure.test.ts
index 4a59dbfef975..ec3d90a40b01 100644
--- a/cloud/apps/relay/src/postgres-pool-pressure.test.ts
+++ b/cloud/apps/relay/src/postgres-pool-pressure.test.ts
@@ -1,6 +1,6 @@
 import { EventEmitter } from 'node:events'
 import { describe, expect, it, vi } from 'vitest'
-import { PostgresPoolPressure } from './postgres-pool-pressure.js'
+import { isPostgresPoolConnectTimeout, PostgresPoolPressure } from './postgres-pool-pressure.js'
 
 describe('PostgreSQL pool pressure', () => {
   it('reports current waiters and interval high-water marks', async () => {
@@ -47,4 +47,103 @@ describe('PostgreSQL pool pressure', () => {
       databasePoolWaitMsMax: 0
     })
   })
+
+  it('reads the oldest wait as it is now, not the interval maximum', async () => {
+    let now = 1_000
+    const pool = {
+      totalCount: 1,
+      idleCount: 0,
+      waitingCount: 0,
+      connect: vi.fn(() => {
+        pool.waitingCount++
+        return new Promise(() => {})
+      })
+    }
+    const pressure = new PostgresPoolPressure(pool as never, () => now)
+    expect(pressure.oldestWaitMs()).toBe(0)
+    void pressure.connect()
+    now = 2_600
+    expect(pressure.oldestWaitMs()).toBe(1_600)
+  })
+})
+
+describe('PostgreSQL pool priority lane', () => {
+  // pg-pool's acquire contract with a hand-driven supply of free connections.
+  function controlledPool(max: number, connectionTimeoutMillis = 0) {
+    const pending: Array<(client: unknown) => void> = []
+    const pool = {
+      options: { max, connectionTimeoutMillis },
+      totalCount: 0,
+      idleCount: 0,
+      waitingCount: 0,
+      connect: vi.fn(() => {
+        if (pool.totalCount < max) {
+          pool.totalCount++
+          return Promise.resolve(client())
+        }
+        pool.waitingCount++
+        return new Promise((resolve) => pending.push(resolve))
+      })
+    }
+    const client = () =>
+      Object.assign(new EventEmitter(), {
+        query: vi.fn(),
+        release: vi.fn(() => {
+          const next = pending.shift()
+          if (next) {
+            pool.waitingCount--
+            next(client())
+          } else pool.totalCount--
+        })
+      })
+    return pool
+  }
+
+  it('hands the next released connection to priority work ahead of queued general work', async () => {
+    const pool = controlledPool(2)
+    const pressure = new PostgresPoolPressure(pool as never)
+    const general = [await pressure.connect(), await pressure.connect()]
+    const order: string[] = []
+    const queuedGeneral = pressure.connect().then((client) => {
+      order.push('general')
+      return client
+    })
+    const priority = pressure.connect('priority').then((client) => {
+      order.push('priority')
+      return client
+    })
+    await Promise.resolve()
+    expect(pressure.peekCounts().databasePoolWaiting).toBe(2)
+
+    general[0]!.release()
+    const priorityClient = await priority
+    expect(order).toEqual(['priority'])
+    priorityClient.release()
+    const generalClient = await queuedGeneral
+    expect(order).toEqual(['priority', 'general'])
+    for (const client of [general[1]!, generalClient]) client.release()
+    expect(pool.totalCount).toBe(0)
+    expect(pressure.peekCounts().databasePoolWaiting).toBe(0)
+  })
+
+  it('fails a queued general caller with the pool timeout every classifier knows', async () => {
+    vi.useFakeTimers()
+    try {
+      const pressure = new PostgresPoolPressure(controlledPool(1, 2_000) as never)
+      const held = await pressure.connect()
+      const queued = pressure.connect().catch((error: unknown) => error)
+      await vi.advanceTimersByTimeAsync(2_000)
+
+      const error = await queued
+      expect(isPostgresPoolConnectTimeout(error)).toBe(true)
+      expect(pressure.peekCounts().databasePoolWaiting).toBe(0)
+      // The timed-out caller left the queue, so the slot goes to the next one in line.
+      held.release()
+      const next = await pressure.connect()
+      next.release()
+    } finally {
+      vi.useRealTimers()
+    }
+  })
+
 })
diff --git a/cloud/apps/relay/src/postgres-pool-pressure.ts b/cloud/apps/relay/src/postgres-pool-pressure.ts
index afeab79f5a12..190d02d27610 100644
--- a/cloud/apps/relay/src/postgres-pool-pressure.ts
+++ b/cloud/apps/relay/src/postgres-pool-pressure.ts
@@ -64,31 +64,100 @@ const emptyCounts = (): PostgresPoolPressureCounts => ({
   databasePoolWaitMsMax: 0
 })
 
+// `priority` work skips the general queue and takes the next connection any
+// caller releases, so a burst of general work cannot make it wait its turn.
+export type PostgresPoolLane = 'general' | 'priority'
+
+type GeneralLaneWaiter = {
+  grant: (releaseSlot: () => void) => void
+  timer: ReturnType<typeof setTimeout> | undefined
+}
+
 export class PostgresPoolPressure {
   private readonly waiters = new Map<symbol, number>()
   private waitersMax = 0
   private waitMsMax = 0
   private lastConsumed = emptyCounts()
+  // General work queues here, not in pg-pool, so pg-pool's own queue holds only
+  // priority callers. Holding a connection back instead would cost general
+  // throughput: one of 16 is the margin an asia-east2 drain release runs on.
+  private readonly generalCapacity: number
+  private generalInUse = 0
+  private readonly generalQueue: GeneralLaneWaiter[] = []
 
   constructor(
     private readonly pool: pg.Pool,
     private readonly now: () => number = Date.now
-  ) {}
-
-  async connect(): Promise<pg.PoolClient> {
-    const waitingBefore = this.pool.waitingCount
-    const connection = this.pool.connect()
-    if (this.pool.waitingCount <= waitingBefore) return await markedAcquire(connection)
+  ) {
+    this.generalCapacity = pool.options?.max ?? Infinity
+  }
 
-    const waiter = Symbol()
+  async connect(lane: PostgresPoolLane = 'general'): Promise<pg.PoolClient> {
     const startedAt = this.now()
-    this.waiters.set(waiter, startedAt)
-    this.waitersMax = Math.max(this.waitersMax, this.waiters.size)
+    let waiter: symbol | undefined
+    const markWaiting = (): void => {
+      if (waiter) return
+      waiter = Symbol()
+      this.waiters.set(waiter, startedAt)
+      this.waitersMax = Math.max(this.waitersMax, this.waiters.size)
+    }
     try {
-      return await markedAcquire(connection)
+      const slot = lane === 'priority' ? () => {} : this.takeGeneralSlot(markWaiting)
+      // Awaited only when queued: a free slot dials in this same turn.
+      const releaseSlot = typeof slot === 'function' ? slot : await slot
+      try {
+        const waitingBefore = this.pool.waitingCount
+        const connection = this.pool.connect()
+        if (this.pool.waitingCount > waitingBefore) markWaiting()
+        return await markedAcquire(connection, releaseSlot)
+      } catch (error) {
+        releaseSlot()
+        throw error
+      }
     } finally {
-      this.waitMsMax = Math.max(this.waitMsMax, this.now() - startedAt)
-      this.waiters.delete(waiter)
+      if (waiter) {
+        this.waitMsMax = Math.max(this.waitMsMax, this.now() - startedAt)
+        this.waiters.delete(waiter)
+      }
+    }
+  }
+
+  // FIFO, bounded by the pool's own acquire timeout so a queued caller fails
+  // exactly as it would have inside pg-pool, and every classifier still matches.
+  private takeGeneralSlot(markWaiting: () => void): (() => void) | Promise<() => void> {
+    if (this.generalInUse < this.generalCapacity && this.generalQueue.length === 0) {
+      this.generalInUse++
+      return this.generalSlotRelease()
+    }
+    markWaiting()
+    return new Promise((resolve, reject) => {
+      const queued: GeneralLaneWaiter = { grant: resolve, timer: undefined }
+      const timeoutMs = this.pool.options?.connectionTimeoutMillis ?? 0
+      if (timeoutMs > 0) {
+        queued.timer = setTimeout(() => {
+          const index = this.generalQueue.indexOf(queued)
+          if (index >= 0) this.generalQueue.splice(index, 1)
+          reject(new Error(POOL_CONNECT_TIMEOUT_MESSAGES[0]))
+        }, timeoutMs)
+        queued.timer.unref?.()
+      }
+      this.generalQueue.push(queued)
+    })
+  }
+
+  private generalSlotRelease(): () => void {
+    let released = false
+    return () => {
+      if (released) return
+      released = true
+      const next = this.generalQueue.shift()
+      if (!next) {
+        this.generalInUse--
+        return
+      }
+      // The slot passes straight to the next caller, so generalInUse is unchanged.
+      clearTimeout(next.timer)
+      next.grant(this.generalSlotRelease())
     }
   }
 
@@ -119,6 +188,12 @@ export class PostgresPoolPressure {
     }
   }
 
+  // Instantaneous, unlike peekCounts, which holds the last interval's maxima.
+  oldestWaitMs(): number {
+    if (this.waiters.size === 0) return 0
+    return Math.max(0, this.now() - Math.min(...this.waiters.values()))
+  }
+
   private readCounts(): PostgresPoolPressureCounts {
     const now = this.now()
     const oldestWaitMs =
@@ -134,7 +209,10 @@ export class PostgresPoolPressure {
   }
 }
 
-async function markedAcquire(connection: Promise<pg.PoolClient>): Promise<pg.PoolClient> {
+async function markedAcquire(
+  connection: Promise<pg.PoolClient>,
+  onRelease: () => void
+): Promise<pg.PoolClient> {
   let client: pg.PoolClient
   try {
     client = await connection
@@ -142,7 +220,7 @@ async function markedAcquire(connection: Promise<pg.PoolClient>): Promise<pg.Poo
     if (typeof error === 'object' && error !== null) poolAcquireFailures.add(error)
     throw error
   }
-  return guardCheckedOutClient(client)
+  return guardCheckedOutClient(client, onRelease)
 }
 
 // pg-pool strips its own `error` listener when it hands a client out
@@ -153,7 +231,7 @@ async function markedAcquire(connection: Promise<pg.PoolClient>): Promise<pg.Poo
 // process. `pool.on('error')` cannot cover this: pg-pool routes there only from
 // the idle listener. Every relay checkout awaits this function, so it is the
 // one seam that sees them all.
-function guardCheckedOutClient(client: pg.PoolClient): pg.PoolClient {
+function guardCheckedOutClient(client: pg.PoolClient, onRelease: () => void): pg.PoolClient {
   let failure: Error | undefined
   const onError = (error: Error) => {
     failure ??= error
@@ -171,7 +249,11 @@ function guardCheckedOutClient(client: pg.PoolClient): pg.PoolClient {
     client.removeListener('error', onError)
     // Passing the error makes pg-pool destroy the client instead of returning a
     // dead connection to the pool for the next caller to trip over.
-    release(releaseError ?? failure)
+    try {
+      release(releaseError ?? failure)
+    } finally {
+      onRelease()
+    }
   }
   return client
 }
diff --git a/cloud/apps/relay/src/postgres-priority-lane-postgres.test.ts b/cloud/apps/relay/src/postgres-priority-lane-postgres.test.ts
new file mode 100644
index 000000000000..7b0f55baf00c
--- /dev/null
+++ b/cloud/apps/relay/src/postgres-priority-lane-postgres.test.ts
@@ -0,0 +1,48 @@
+import { afterAll, describe, expect, it } from 'vitest'
+import type { PostgresDatabase } from './database.js'
+import { isPostgresPoolConnectTimeout } from './postgres-pool-pressure.js'
+import { openDelayedPostgresDatabase } from './test-fixtures/delayed-postgres-database.js'
+
+const databaseUrl = process.env.ORCA_RELAY_TEST_POSTGRES_URL
+const describePostgres = databaseUrl ? describe : describe.skip
+
+// The 2026-10-06 asia-east2 shape at test scale: a reconnect herd far wider
+// than the pool, every statement paying a cross-region round trip, and a
+// control renewal arriving behind it.
+describePostgres('PostgreSQL priority lane under a reconnect herd', () => {
+  const databases: PostgresDatabase[] = []
+  const delay = { enabled: true, delayMs: 400 }
+
+  afterAll(async () => {
+    delay.enabled = false
+    for (const database of databases) await database.close()
+  })
+
+  it('renews ahead of the herd while queued general work times out', async () => {
+    const database = openDelayedPostgresDatabase(databaseUrl!, delay, 4)
+    databases.push(database)
+    const herd = Array.from({ length: 40 }, () =>
+      database.query('SELECT 1').then(
+        () => 'ok',
+        (error: unknown) => (isPostgresPoolConnectTimeout(error) ? 'timeout' : 'other')
+      )
+    )
+    await new Promise((resolve) => setTimeout(resolve, 50))
+    const startedAt = performance.now()
+    const general = database
+      .query('SELECT 1 AS renewed')
+      .catch(() => undefined)
+      .then(() => performance.now() - startedAt)
+    const renewed = await database.queryPriority('SELECT 1 AS renewed')
+    const renewedMs = performance.now() - startedAt
+
+    expect(renewed).toEqual([{ renewed: 1 }])
+    // The next released connection plus one statement, never a turn in the herd's queue.
+    expect(renewedMs).toBeLessThan(1_500)
+    // The same statement on the general lane waits out the herd's acquire timeout.
+    expect(await general).toBeGreaterThan(1_900)
+    const outcomes = await Promise.all(herd)
+    expect(outcomes.filter((outcome) => outcome === 'timeout').length).toBeGreaterThan(20)
+    expect(outcomes).not.toContain('other')
+  }, 15_000)
+})
diff --git a/cloud/apps/relay/src/regional-host-drain-app.test.ts b/cloud/apps/relay/src/regional-host-drain-app.test.ts
index 38ebdd3f7096..06b19371bc81 100644
--- a/cloud/apps/relay/src/regional-host-drain-app.test.ts
+++ b/cloud/apps/relay/src/regional-host-drain-app.test.ts
@@ -734,7 +734,7 @@ describe('cell drain endpoint pacing', () => {
   })
 
   it('refuses a window that is negative, fractional, or past the cap', async () => {
-    for (const paceWindowMs of [-1, 1.5, 300_001]) {
+    for (const paceWindowMs of [-1, 1.5, 1_200_001]) {
       const { app, drain } = appWithDrain()
       const response = await postPath(app, '/v1/admin/drain', 'deploy-token', {
         v: 1,
@@ -751,10 +751,10 @@ describe('cell drain endpoint pacing', () => {
     const response = await postPath(app, '/v1/admin/drain', 'deploy-token', {
       v: 1,
       graceMs: 0,
-      paceWindowMs: 300_000
+      paceWindowMs: 1_200_000
     })
     expect(response.status).toBe(200)
-    expect(drain).toHaveBeenCalledWith(0, { paceWindowMs: 300_000 })
+    expect(drain).toHaveBeenCalledWith(0, { paceWindowMs: 1_200_000 })
   })
 
   it('still rejects an unauthenticated pacing request', async () => {
diff --git a/cloud/apps/relay/src/regional-rehome-postgres.test.ts b/cloud/apps/relay/src/regional-rehome-postgres.test.ts
index c1adbb912914..8cd1d28dbc18 100644
--- a/cloud/apps/relay/src/regional-rehome-postgres.test.ts
+++ b/cloud/apps/relay/src/regional-rehome-postgres.test.ts
@@ -415,9 +415,10 @@ describePostgres('PostgreSQL regional rehoming', () => {
     const claim = context.store.commitIdleRegionalRehome(request!, safety(context.now()))
 
     await expect(claim).resolves.toEqual({ outcome: 'deferred', reason: 'fleet-safety' })
+    // A sql spike alone pauses the claim; only the director's sustained check latches.
     expect(await context.store.inspectRegionalRehomeControl()).toMatchObject({
-      generation: 2,
-      enabled: false
+      generation: 1,
+      enabled: true
     })
     expect(
       await primary.query(
diff --git a/cloud/apps/relay/src/regional-rehome-safety.test.ts b/cloud/apps/relay/src/regional-rehome-safety.test.ts
index 4da072943d2b..38e6fa34d306 100644
--- a/cloud/apps/relay/src/regional-rehome-safety.test.ts
+++ b/cloud/apps/relay/src/regional-rehome-safety.test.ts
@@ -2,7 +2,12 @@ import { describe, expect, it } from 'vitest'
 import {
   REGIONAL_REHOME_RECONNECTS_PER_CELL_LIMIT,
   REGIONAL_REHOME_SQL_FAILURES_LIMIT,
-  regionalRehomeSafetyFailure
+  REGIONAL_REHOME_SQL_FAILURES_OBSERVATION_GAP_MS,
+  REGIONAL_REHOME_SQL_FAILURES_SUSTAIN_MS,
+  nextRegionalRehomeSqlFailuresBreach,
+  regionalRehomeSafetyFailure,
+  regionalRehomeSqlFailuresSustained,
+  type RegionalRehomeSqlFailuresBreach
 } from './regional-rehome-safety.js'
 
 const NOW = 1_787_900_000_000
@@ -129,3 +134,44 @@ describe('regionalRehomeSafetyFailure', () => {
     ).toBe('monitoring_stale')
   })
 })
+
+describe('regional rehome sql failure breach', () => {
+  const STORM = REGIONAL_REHOME_SQL_FAILURES_LIMIT + 1
+  function observe(samples: [at: number, sqlFailures: number][]): RegionalRehomeSqlFailuresBreach {
+    let breach: RegionalRehomeSqlFailuresBreach = null
+    for (const [at, sqlFailures] of samples) {
+      breach = nextRegionalRehomeSqlFailuresBreach(breach, sqlFailures, NOW + at)
+    }
+    return breach
+  }
+
+  it('does not sustain a single-stall spike', () => {
+    // 10-06 06:16Z: one 5-7 s stall published 396 for up to ~90 s.
+    const spike = observe([[0, 396], [30_000, 396], [60_000, 396], [90_000, 396]])
+    expect(spike && regionalRehomeSqlFailuresSustained(spike)).toBe(false)
+    expect(observe([[0, 396], [90_000, 396], [96_000, 0]])).toBeNull()
+  })
+
+  it('sustains a breach watched for the whole window', () => {
+    const samples: [number, number][] = []
+    for (let at = 0; at <= REGIONAL_REHOME_SQL_FAILURES_SUSTAIN_MS; at += 6_000) samples.push([at, STORM])
+    const breach = observe(samples)
+    expect(breach && regionalRehomeSqlFailuresSustained(breach)).toBe(true)
+  })
+
+  it('restarts the window after an unwatched gap', () => {
+    const breach = observe([
+      [0, STORM],
+      [REGIONAL_REHOME_SQL_FAILURES_OBSERVATION_GAP_MS + 1, STORM],
+      [REGIONAL_REHOME_SQL_FAILURES_OBSERVATION_GAP_MS + 30_000, STORM]
+    ])
+    expect(breach?.since).toBe(NOW + REGIONAL_REHOME_SQL_FAILURES_OBSERVATION_GAP_MS + 1)
+    expect(breach && regionalRehomeSqlFailuresSustained(breach)).toBe(false)
+  })
+
+  it('reports a latching reason over a concurrent sql spike', () => {
+    expect(
+      regionalRehomeSafetyFailure(safety({ sqlFailures: STORM, controlActivityRecoveryFailures: 1 }), NOW, 19)
+    ).toBe('control_recovery_failures')
+  })
+})
diff --git a/cloud/apps/relay/src/regional-rehome-safety.ts b/cloud/apps/relay/src/regional-rehome-safety.ts
index 072e82f76211..8caf2b26e054 100644
--- a/cloud/apps/relay/src/regional-rehome-safety.ts
+++ b/cloud/apps/relay/src/regional-rehome-safety.ts
@@ -54,16 +54,45 @@ export function regionalRehomeSafetyFailure(
   if (safety.observedAt === 0 || now - safety.observedAt > 60_000) {
     return 'monitoring_stale'
   }
-  if (safety.sqlFailures > REGIONAL_REHOME_SQL_FAILURES_LIMIT) return 'sql_failures'
   if (safety.controlActivityRecoveryFailures > 0) {
     return 'control_recovery_failures'
   }
   const reconnectLimit =
     Math.max(1, requiredCells) * REGIONAL_REHOME_RECONNECTS_PER_CELL_LIMIT
   if (safety.reconnects > reconnectLimit) return 'elevated_reconnects'
+  // Last, so 'sql_failures' means no latching reason also failed.
+  if (safety.sqlFailures > REGIONAL_REHOME_SQL_FAILURES_LIMIT) return 'sql_failures'
   return null
 }
 
+// The shared database stalls for 5-7 s about every 610 s, and one stall keeps
+// the published sum over the sql bar for up to ~90 s (two 30 s windows plus
+// heartbeat lag): 396 on 2026-10-06 latched rehome off fleet-wide. A breach
+// therefore pauses claims, and only one that outlasts a stall latches.
+export const REGIONAL_REHOME_SQL_FAILURES_SUSTAIN_MS = 150_000
+// The director polls every ~6 s; a longer silence means the breach was not watched.
+export const REGIONAL_REHOME_SQL_FAILURES_OBSERVATION_GAP_MS = 45_000
+
+export type RegionalRehomeSqlFailuresBreach = { since: number; lastSeenAt: number } | null
+
+export function nextRegionalRehomeSqlFailuresBreach(
+  breach: RegionalRehomeSqlFailuresBreach,
+  sqlFailures: number,
+  now: number
+): RegionalRehomeSqlFailuresBreach {
+  if (sqlFailures <= REGIONAL_REHOME_SQL_FAILURES_LIMIT) return null
+  if (!breach || now - breach.lastSeenAt > REGIONAL_REHOME_SQL_FAILURES_OBSERVATION_GAP_MS) {
+    return { since: now, lastSeenAt: now }
+  }
+  return { since: breach.since, lastSeenAt: now }
+}
+
+export function regionalRehomeSqlFailuresSustained(
+  breach: NonNullable<RegionalRehomeSqlFailuresBreach>
+): boolean {
+  return breach.lastSeenAt - breach.since >= REGIONAL_REHOME_SQL_FAILURES_SUSTAIN_MS
+}
+
 export function combineRegionalRehomeSafety(
   processSafety: RegionalRehomeSafetySnapshot,
   fleetSafety: RegionalRehomeSafetySnapshot
diff --git a/cloud/apps/relay/src/regional-rehome-store.test.ts b/cloud/apps/relay/src/regional-rehome-store.test.ts
index f53c1c429f03..5a7c1072d81e 100644
--- a/cloud/apps/relay/src/regional-rehome-store.test.ts
+++ b/cloud/apps/relay/src/regional-rehome-store.test.ts
@@ -16,7 +16,8 @@ import {
 } from './database.js'
 import {
   REGIONAL_REHOME_SQL_FAILURES_LIMIT,
-  REGIONAL_REHOME_SQL_FAILURES_PER_CELL_LIMIT
+  REGIONAL_REHOME_SQL_FAILURES_PER_CELL_LIMIT,
+  REGIONAL_REHOME_SQL_FAILURES_SUSTAIN_MS
 } from './regional-rehome-safety.js'
 import type { RegionalRehomeSafetySnapshot } from './relay-observability.js'
 
@@ -760,7 +761,7 @@ describe('regional rehome assignment state', () => {
     await context.database.close()
   })
 
-  it('atomically latches durable control off when candidate safety changes', async () => {
+  it('pauses the claim without latching when a sql spike lands between selection and commit', async () => {
     const context = await setup()
     await activatePreferredSource(context, {
       userId: 'user-1',
@@ -786,11 +787,87 @@ describe('regional rehome assignment state', () => {
       outcome: 'deferred',
       reason: 'fleet-safety'
     })
+    expect(await context.store.inspectRegionalRehomeControl()).toMatchObject({
+      generation: 1,
+      enabled: true
+    })
+    expect(
+      await context.database.query(`SELECT consecutive_failures FROM relay_region_rehome_worker_state`)
+    ).toEqual([{ consecutive_failures: 0 }])
+    expect(await context.database.query(`SELECT * FROM relay_assignment_migrations`)).toEqual([])
+    await context.database.close()
+  })
+
+  it('rides out a single-stall sql spike without latching the control off', async () => {
+    const context = await setup()
+    // 10-06 06:16Z: one stall put the fleet sum at 396 for about a minute.
+    for (let elapsed = 0; elapsed <= 90_000; elapsed += 6_000) {
+      await sqlFailuresHeartbeats(context, 396)
+      expect(await context.store.selectIdleRegionalRehomeCandidates(cleanSafety(context))).toEqual([])
+      context.advance(6_000)
+    }
+    await sqlFailuresHeartbeats(context, 0)
+    await activatePreferredSource(context, { userId: 'user-1', relayHostId: 'abcdefghijklmnop' })
+    expect(await context.store.selectIdleRegionalRehomeCandidates(cleanSafety(context))).toHaveLength(1)
+    // The next stall, ~610 s later, starts its own breach rather than extending the last one.
+    context.advance(500_000)
+    for (let elapsed = 0; elapsed <= 90_000; elapsed += 6_000) {
+      await sqlFailuresHeartbeats(context, 396)
+      await context.store.selectIdleRegionalRehomeCandidates(cleanSafety(context))
+      context.advance(6_000)
+    }
+    expect(await context.store.inspectRegionalRehomeControl()).toMatchObject({
+      generation: 1,
+      enabled: true
+    })
+    await context.database.close()
+  })
+
+  it('latches the control off when the sql breach outlasts a stall', async () => {
+    const context = await setup()
+    await activatePreferredSource(context, { userId: 'user-1', relayHostId: 'abcdefghijklmnop' })
+    const warnings = collectEventWarnings('orca_relay_regional_rehome_safety_disabled')
+    try {
+      for (let elapsed = 0; elapsed < REGIONAL_REHOME_SQL_FAILURES_SUSTAIN_MS; elapsed += 6_000) {
+        await sqlFailuresHeartbeats(context, REGIONAL_REHOME_SQL_FAILURES_LIMIT + 1)
+        await context.store.selectIdleRegionalRehomeCandidates(cleanSafety(context))
+        context.advance(6_000)
+      }
+      expect(await context.store.inspectRegionalRehomeControl()).toMatchObject({ enabled: true })
+      await sqlFailuresHeartbeats(context, REGIONAL_REHOME_SQL_FAILURES_LIMIT + 1)
+      expect(await context.store.selectIdleRegionalRehomeCandidates(cleanSafety(context))).toEqual([])
+    } finally {
+      warnings.restore()
+    }
+    expect(await context.store.inspectRegionalRehomeControl()).toMatchObject({
+      generation: 2,
+      enabled: false
+    })
+    expect(warnings.entries).toMatchObject([
+      { reason: 'sql_failures', controlGeneration: 2, sustainedMs: 150_000 }
+    ])
+    await context.database.close()
+  })
+
+  it('still latches on a non-sql reason that fails alongside a sql spike', async () => {
+    const context = await setup()
+    await activatePreferredSource(context, { userId: 'user-1', relayHostId: 'abcdefghijklmnop' })
+    const [candidate] = await context.store.selectIdleRegionalRehomeCandidates(cleanSafety(context))
+    expect(candidate).toBeDefined()
+    await context.database.query(
+      `UPDATE relay_cell_rehome_safety
+       SET sql_failures = ${REGIONAL_REHOME_SQL_FAILURES_LIMIT + 1}, control_activity_recovery_failures = 1
+       WHERE cell_id = ?`,
+      [target.id]
+    )
+    expect(await context.store.commitIdleRegionalRehome(candidate!, cleanSafety(context))).toEqual({
+      outcome: 'deferred',
+      reason: 'fleet-safety'
+    })
     expect(await context.store.inspectRegionalRehomeControl()).toMatchObject({
       generation: 2,
       enabled: false
     })
-    expect(await context.database.query(`SELECT * FROM relay_assignment_migrations`)).toEqual([])
     await context.database.close()
   })
 
@@ -1828,6 +1905,29 @@ async function freshHeartbeats(context: Context): Promise<void> {
   await heartbeat(context.store, target, targetIncarnation, 3, context.now(), safety)
 }
 
+function cleanSafety(context: Context): RegionalRehomeSafetySnapshot {
+  return {
+    observedAt: context.now(),
+    sqlFailures: 0,
+    reconnects: 0,
+    controlActivityRecoveryFailures: 0,
+    databasePoolWaiting: 0,
+    databasePoolWaitersMax: 0,
+    databasePoolWaitMsMax: 0
+  }
+}
+
+// Splits the fleet sum across both cells, each under the per-cell bar's scale.
+async function sqlFailuresHeartbeats(context: Context, fleetSqlFailures: number): Promise<void> {
+  const half = Math.floor(fleetSqlFailures / 2)
+  const safety = cleanSafety(context)
+  await heartbeat(context.store, source, sourceIncarnation, 3, context.now(), { ...safety, sqlFailures: half })
+  await heartbeat(context.store, target, targetIncarnation, 3, context.now(), {
+    ...safety,
+    sqlFailures: fleetSqlFailures - half
+  })
+}
+
 async function activatePreferredSource(
   context: Context,
   identity: { userId: string; relayHostId: string }
diff --git a/cloud/apps/relay/src/relay-host-hello-shed.test.ts b/cloud/apps/relay/src/relay-host-hello-shed.test.ts
new file mode 100644
index 000000000000..f5e116f5c9ce
--- /dev/null
+++ b/cloud/apps/relay/src/relay-host-hello-shed.test.ts
@@ -0,0 +1,189 @@
+import { createHash } from 'node:crypto'
+import { createServer, type Server } from 'node:http'
+import { createServer as createNetServer } from 'node:net'
+import { exportJWK, generateKeyPair, SignJWT } from 'jose'
+import nacl from 'tweetnacl'
+import { afterEach, describe, expect, it, vi } from 'vitest'
+import WebSocket from 'ws'
+import type { RelayConfig } from './config.js'
+import { PostgresDatabase } from './database.js'
+import { HostSessionRegistry } from './host-session-registry.js'
+import { createRelayServer, HOST_HELLO_SHED_OLDEST_WAIT_MS } from './relay-server.js'
+
+async function unusedPort(): Promise<number> {
+  const server = createNetServer()
+  await new Promise<void>((resolve) => server.listen(0, '127.0.0.1', resolve))
+  const address = server.address()
+  if (!address || typeof address === 'string') throw new Error('missing test port')
+  await new Promise<void>((resolve) => server.close(() => resolve()))
+  return address.port
+}
+
+// pg-pool's shape with every acquire stuck, so queued work only accumulates.
+function stalledPool() {
+  const pool = {
+    options: { max: 2, connectionTimeoutMillis: 0 },
+    totalCount: 2,
+    idleCount: 0,
+    waitingCount: 0,
+    connect: () => {
+      pool.waitingCount++
+      return new Promise<never>(() => {})
+    },
+    end: async () => undefined
+  }
+  return pool
+}
+
+function cellConfig(port: number, issuer: string): RelayConfig {
+  const relayUrl = `http://127.0.0.1:${port}`
+  return {
+    port,
+    publicUrl: relayUrl,
+    cellUrl: relayUrl,
+    authIssuer: issuer,
+    authAudience: 'orca-relay',
+    jwksUrl: issuer,
+    assignmentSigningKey: new Uint8Array(32),
+    role: 'cell',
+    cellId: 'production-gce-c3',
+    cells: [{ id: 'production-gce-c3', url: relayUrl, capacityRequests: 4_000 }],
+    adminAudience: `${relayUrl}/admin`,
+    deployServiceAccount: 'deploy@example.com',
+    runtimeServiceAccount: 'runtime@example.com',
+    connectionHardCap: 600,
+    connectionUnobservedBound: 60,
+    adminJwksUrl: `${issuer}/admin-jwks`,
+    databasePoolMax: 2,
+    publicAssignmentsEnabled: true,
+    publicAssignmentConcurrency: 1,
+    publicAssignmentQueueMax: 128,
+    publicAssignmentWaitMs: 4_000,
+    publicResolveConcurrency: 1,
+    publicResolveWaitMs: 5_000,
+    publicAssignmentRetryAfterSeconds: 5,
+    dataDir: './test-data'
+  }
+}
+
+describe('host hello shedding under database pool pressure', () => {
+  const cleanup: Array<() => Promise<void> | void> = []
+
+  afterEach(async () => {
+    for (const close of cleanup.splice(0).reverse()) await close()
+    vi.restoreAllMocks()
+  })
+
+  // A cell whose pool holds `waiters` stuck queries, and a clock the test moves.
+  async function startCell(waiters: number) {
+    vi.spyOn(console, 'log').mockImplementation(() => undefined)
+    const keys = await generateKeyPair('ES256')
+    const publicJwk = await exportJWK(keys.publicKey)
+    const jwksServer: Server = createServer((_request, response) => {
+      response.setHeader('content-type', 'application/json')
+      response.end(
+        JSON.stringify({ keys: [{ ...publicJwk, kid: 'test-key', alg: 'ES256', use: 'sig' }] })
+      )
+    })
+    await new Promise<void>((resolve) => jwksServer.listen(0, '127.0.0.1', resolve))
+    cleanup.push(() => new Promise<void>((resolve) => jwksServer.close(() => resolve())))
+    const jwksAddress = jwksServer.address()
+    if (!jwksAddress || typeof jwksAddress === 'string') throw new Error('missing JWKS address')
+    const issuer = `http://127.0.0.1:${jwksAddress.port}`
+
+    const realNow = Date.now()
+    let elapsedMs = 0
+    // Before the database exists, so the pool's wait clock reads it too.
+    vi.spyOn(Date, 'now').mockImplementation(() => realNow + elapsedMs)
+    const database = new PostgresDatabase(stalledPool() as never)
+    for (let index = 0; index < waiters; index++) void database.query('SELECT 1').catch(() => {})
+    const port = await unusedPort()
+    const relay = createRelayServer(cellConfig(port, issuer), database)
+    relay.server.listen(port, '127.0.0.1')
+    await new Promise<void>((resolve) => relay.server.once('listening', resolve))
+    cleanup.push(() => new Promise<void>((resolve) => relay.server.close(() => resolve())))
+
+    const hostId = createHash('sha256')
+      .update(nacl.box.keyPair().publicKey)
+      .digest('base64url')
+      .slice(0, 16)
+    const token = await new SignJWT({
+      prof: 'profile-1',
+      org: 'org-1',
+      purpose: 'host-control',
+      relayHostId: hostId
+    })
+      .setProtectedHeader({ alg: 'ES256', kid: 'test-key' })
+      .setIssuer(issuer)
+      .setAudience('orca-relay')
+      .setSubject('user-1')
+      .setIssuedAt()
+      .setExpirationTime('5m')
+      .sign(keys.privateKey)
+    return {
+      url: `ws://127.0.0.1:${port}/v1/host/control`,
+      token,
+      advance: (ms: number) => {
+        elapsedMs += ms
+      }
+    }
+  }
+
+  // Resolves with the refusal's status, or 101 once the upgrade is accepted.
+  async function dial(
+    cell: Awaited<ReturnType<typeof startCell>>
+  ): Promise<{ status: number; retryAfter?: string }> {
+    const socket = new WebSocket(cell.url, {
+      headers: { authorization: `Bearer ${cell.token}` },
+      perMessageDeflate: false
+    })
+    return await new Promise((resolve, reject) => {
+      socket.once('unexpected-response', (request, response) => {
+        resolve({ status: response.statusCode ?? 0, retryAfter: response.headers['retry-after'] })
+        request.destroy()
+      })
+      socket.once('open', () => {
+        resolve({ status: 101 })
+        socket.terminate()
+      })
+      socket.once('error', reject)
+    })
+  }
+
+  it('admits hellos behind a deep queue that is still moving', async () => {
+    const cell = await startCell(120)
+    cell.advance(HOST_HELLO_SHED_OLDEST_WAIT_MS - 300)
+
+    expect(await dial(cell)).toEqual({ status: 101 })
+  })
+
+  it('admits hellos behind one slow waiter', async () => {
+    // The test pool holds 2 connections, so a lone aged waiter is under the count floor.
+    const cell = await startCell(1)
+    cell.advance(HOST_HELLO_SHED_OLDEST_WAIT_MS * 2)
+
+    expect(await dial(cell)).toEqual({ status: 101 })
+  })
+
+  it('refuses a hello with a retryable 503 once a full queue has aged', async () => {
+    const cell = await startCell(2)
+    cell.advance(HOST_HELLO_SHED_OLDEST_WAIT_MS)
+
+    expect(await dial(cell)).toEqual({ status: 503, retryAfter: '2' })
+    // Shipped desktops dial with no unexpected-response listener, so the refusal
+    // reaches them as the ordinary connect error their retry backoff handles.
+    const desktop = new WebSocket(cell.url, {
+      headers: { authorization: `Bearer ${cell.token}` }
+    })
+    const error = await new Promise<Error>((resolve) => desktop.once('error', resolve))
+    expect(error.message).toBe('Unexpected server response: 503')
+  })
+
+  it('never refuses a rebind over a live control', async () => {
+    vi.spyOn(HostSessionRegistry.prototype, 'hasActiveControl').mockReturnValue(true)
+    const cell = await startCell(2)
+    cell.advance(HOST_HELLO_SHED_OLDEST_WAIT_MS * 2)
+
+    expect(await dial(cell)).toEqual({ status: 101 })
+  })
+})
diff --git a/cloud/apps/relay/src/relay-observability.ts b/cloud/apps/relay/src/relay-observability.ts
index 3638de915495..612beb0fa1ed 100644
--- a/cloud/apps/relay/src/relay-observability.ts
+++ b/cloud/apps/relay/src/relay-observability.ts
@@ -165,6 +165,7 @@ type RelayMetricDeltas = {
   controlRenewalFlushRowsMax: number
   controlActivityRecoveries: number
   controlActivityRecoveryFailures: number
+  hostHellosShed: number
 }
 
 // A host chooses how often it answers a ping, so the process-wide window is a
@@ -221,7 +222,8 @@ const emptyDeltas = (): RelayMetricDeltas => ({
   controlRenewalFlushLatenciesMs: [],
   controlRenewalFlushRowsMax: 0,
   controlActivityRecoveries: 0,
-  controlActivityRecoveryFailures: 0
+  controlActivityRecoveryFailures: 0,
+  hostHellosShed: 0
 })
 
 function ascending(values: number[]): number[] {
@@ -289,6 +291,10 @@ export class RelayObservability implements RelayRuntimeObserver {
     this.deltas.reconnects++
   }
 
+  recordHostHelloShed(): void {
+    this.deltas.hostHellosShed++
+  }
+
   recordAssignmentAdmission(outcome: AssignmentAdmissionOutcome): void {
     if (outcome === 'sticky') this.deltas.stickyAssignments++
     else if (outcome === 'sticky-rejected') this.deltas.stickyAssignmentRejections++
@@ -571,6 +577,7 @@ export class RelayObservability implements RelayRuntimeObserver {
         deltas.controlRenewalsByOutcome.control_activity_not_found ?? 0,
       controlActivityRecoveriesDelta: deltas.controlActivityRecoveries,
       controlActivityRecoveryFailuresDelta: deltas.controlActivityRecoveryFailures,
+      hostHellosShedDelta: deltas.hostHellosShed,
       // Meaning changed when renewals began batching: for a batched row this is
       // the flush's duration, not that row's own statement latency. The
       // per-flush fields below are the ones to read for statement cost.
diff --git a/cloud/apps/relay/src/relay-server.ts b/cloud/apps/relay/src/relay-server.ts
index de7f635ba708..70873e334c06 100644
--- a/cloud/apps/relay/src/relay-server.ts
+++ b/cloud/apps/relay/src/relay-server.ts
@@ -20,7 +20,11 @@ import { createRelayApp } from './app.js'
 import { RelayAssignmentStore } from './assignment-store.js'
 import type { RelayConfig } from './config.js'
 import { RelayCredentialStore } from './credential-store.js'
-import { readRelayDatabasePoolPressure, type RelayDatabase } from './database.js'
+import {
+  readRelayDatabasePoolOldestWaitMs,
+  readRelayDatabasePoolPressure,
+  type RelayDatabase
+} from './database.js'
 import { HostSessionRegistry } from './host-session-registry.js'
 import { observeRelayDatabase } from './observed-relay-database.js'
 import { RelayObservability } from './relay-observability.js'
@@ -41,8 +45,23 @@ function decodePathSegment(value: string): string | null {
   }
 }
 
-function rejectUpgrade(socket: NodeJS.WritableStream, status: number, message: string): void {
-  socket.write(`HTTP/1.1 ${status} ${message}\r\nConnection: close\r\nContent-Length: 0\r\n\r\n`)
+// Healthy cells peak at 2 waiters (p99, 2026-10-07). A head that has waited half
+// the 2 s acquire timeout with a whole pool's worth queued behind it means
+// hellos are already timing out; the count floor keeps one slow waiter from
+// tripping it. On 10-07 every window that met both also logged SQL failures.
+export const HOST_HELLO_SHED_OLDEST_WAIT_MS = 1_000
+const HOST_HELLO_SHED_RETRY_AFTER_SECONDS = 2
+
+function rejectUpgrade(
+  socket: NodeJS.WritableStream,
+  status: number,
+  message: string,
+  retryAfterSeconds?: number
+): void {
+  const retryAfter = retryAfterSeconds === undefined ? '' : `Retry-After: ${retryAfterSeconds}\r\n`
+  socket.write(
+    `HTTP/1.1 ${status} ${message}\r\n${retryAfter}Connection: close\r\nContent-Length: 0\r\n\r\n`
+  )
   if ('destroy' in socket && typeof socket.destroy === 'function') socket.destroy()
 }
 
@@ -508,6 +527,20 @@ export function createRelayServer(
         userId: identity.sub,
         relayHostId: identity.relayHostId
       })
+      // A hello costs several pooled queries, each failing after a 2 s wait. Shed
+      // only while the pool is already timing them out: the refused desktop gets
+      // the same connect error and backoff a timed-out hello gives it today, 2 s
+      // sooner (shipped desktops ignore Retry-After). A rebind over a live control
+      // is a lease rotation, not a reconnect, so it is never refused here.
+      if (
+        !isRebind &&
+        readRelayDatabasePoolPressure(database).databasePoolWaiting >= config.databasePoolMax &&
+        readRelayDatabasePoolOldestWaitMs(database) >= HOST_HELLO_SHED_OLDEST_WAIT_MS
+      ) {
+        observability.recordHostHelloShed()
+        rejectUpgrade(socket, 503, 'Service Unavailable', HOST_HELLO_SHED_RETRY_AFTER_SECONDS)
+        return
+      }
       const controlUpgrade = connectionLedger?.tryReserveControl(isRebind) ?? null
       if (
         (connectionLedger && !controlUpgrade) ||
diff --git a/cloud/apps/relay/src/relay.blackbox.test.ts b/cloud/apps/relay/src/relay.blackbox.test.ts
index 0202d964ee73..d2687dbcb472 100644
--- a/cloud/apps/relay/src/relay.blackbox.test.ts
+++ b/cloud/apps/relay/src/relay.blackbox.test.ts
@@ -408,7 +408,8 @@ describe('served relay URL', () => {
   it('exposes only /health, never /healthz', async () => {
     expect(await (await fetch(`${relayUrl}/health`)).json()).toEqual({
       ok: true,
-      connectionCapacityProtocol: 2
+      connectionCapacityProtocol: 2,
+      drainPaceWindowMaxMs: 1_200_000
     })
     expect(await (await fetch(`${relayUrl}/ready`)).json()).toEqual({ ok: true })
     expect((await fetch(`${relayUrl}/healthz`)).status).toBe(404)
diff --git a/cloud/dev/fixtures/terraform-root-partition/families.json b/cloud/dev/fixtures/terraform-root-partition/families.json
index 11e9db811a30..2d8ff0e8cd30 100644
--- a/cloud/dev/fixtures/terraform-root-partition/families.json
+++ b/cloud/dev/fixtures/terraform-root-partition/families.json
@@ -135,13 +135,16 @@
     "google_iam_workload_identity_pool_provider.github_staging_relay_capacity",
     "google_iam_workload_identity_pool_provider.github_staging_relay_deploy",
     "google_logging_metric.relay_cell_fix_level",
+    "google_logging_metric.relay_cell_pool_herd",
     "google_logging_metric.relay_incident",
     "google_logging_metric.relay_long_cell_inventory_hold",
     "google_logging_metric.relay_snapshot",
     "google_monitoring_alert_policy.relay_assignment_5xx",
     "google_monitoring_alert_policy.relay_assignment_edge_429",
+    "google_monitoring_alert_policy.relay_cell_control_close_burst",
     "google_monitoring_alert_policy.relay_cell_control_rtt",
     "google_monitoring_alert_policy.relay_cell_outdated_fix_level",
+    "google_monitoring_alert_policy.relay_cell_pool_herd",
     "google_monitoring_alert_policy.relay_cell_process_exit",
     "google_monitoring_alert_policy.relay_cloud_nat_port_drops",
     "google_monitoring_alert_policy.relay_cloud_sql_backends",
diff --git a/cloud/dev/scripts/prepare-relay-production-capacity-canary.mjs b/cloud/dev/scripts/prepare-relay-production-capacity-canary.mjs
index 5c3452e542cd..fb13cecc59fc 100644
--- a/cloud/dev/scripts/prepare-relay-production-capacity-canary.mjs
+++ b/cloud/dev/scripts/prepare-relay-production-capacity-canary.mjs
@@ -36,7 +36,10 @@ function cellOrigin(cellId) {
 const APPROVED_CELL_LISTS = { 'same-cap': SAME_CAP_CELLS }
 
 // Matches the cell's own cap on /v1/admin/drain.
-const MAX_PACE_WINDOW_MS = 5 * 60 * 1_000
+const MAX_PACE_WINDOW_MS = 20 * 60 * 1_000
+// Every paced image before the cap rose rejects a longer window with the same 400 an unpaced
+// image gives, and an unpaced drain is the opposite of what a slower window asked for.
+const LEGACY_MAX_PACE_WINDOW_MS = 5 * 60 * 1_000
 
 export function parseProductionCapacityCellArguments(argv) {
   const values = {}
@@ -46,8 +49,8 @@ export function parseProductionCapacityCellArguments(argv) {
     if (!key?.startsWith('--') || value === undefined) throw new Error('invalid arguments')
     values[key.slice(2)] = value
   }
-  if (!['isolate', 'drain', 'activate'].includes(values.mode)) {
-    throw new Error('--mode must be isolate, drain, or activate')
+  if (!['pace-check', 'isolate', 'drain', 'activate'].includes(values.mode)) {
+    throw new Error('--mode must be pace-check, isolate, drain, or activate')
   }
   const approvedList = values['approved-cells']
   if (approvedList !== undefined && !APPROVED_CELL_LISTS[approvedList]) {
@@ -75,7 +78,7 @@ export function parseProductionCapacityCellArguments(argv) {
     paceWindowMs < 0 ||
     paceWindowMs > MAX_PACE_WINDOW_MS
   ) {
-    throw new Error('--pace-window-ms must be an integer between 0 and 300000')
+    throw new Error('--pace-window-ms must be an integer between 0 and 1200000')
   }
   return {
     directorOrigin: DIRECTOR_ORIGIN,
@@ -92,8 +95,29 @@ async function responseJson(response, label) {
   return body
 }
 
+// Read-only, and run before the isolate: an image that does not advertise its cap has the
+// legacy one, so a slower pace stops here with the cell untouched instead of isolated.
+async function checkDrainPace(fetchImpl, config, wait) {
+  const health = await responseJson(
+    await fetchAdminOnceMore(fetchImpl, `${config.cellOrigin}/health`, {}, { wait }),
+    'cell health'
+  )
+  if (health.ok !== true) throw new Error('cell health is not ok')
+  const maxPaceWindowMs = Number.isSafeInteger(health.drainPaceWindowMaxMs)
+    ? health.drainPaceWindowMaxMs
+    : LEGACY_MAX_PACE_WINDOW_MS
+  if (config.paceWindowMs > maxPaceWindowMs) {
+    throw new Error(
+      `cell accepts drain paces up to ${maxPaceWindowMs} ms, not ${config.paceWindowMs} ms; ` +
+      'it was not isolated'
+    )
+  }
+  return { paceWindowMs: config.paceWindowMs, maxPaceWindowMs }
+}
+
 export async function prepareProductionCapacityCell(config, overrides = {}) {
   const fetchImpl = overrides.fetch ?? fetch
+  if (config.mode === 'pace-check') return await checkDrainPace(fetchImpl, config, overrides.wait)
   const token = overrides.token ?? process.env.ORCA_RELAY_ADMIN_ID_TOKEN
   if (!token || token.length > 8_192) throw new Error('admin identity token is unavailable')
   const postRaw = async (origin, path, body) =>
@@ -126,6 +150,11 @@ export async function prepareProductionCapacityCell(config, overrides = {}) {
       // An unpaced drain is the behaviour that cell already has, so fall back to it.
       if (paced.status !== 400) throw new Error(`/v1/admin/drain returned ${paced.status}`)
       await paced.json().catch(() => ({}))
+      if (paceWindowMs > LEGACY_MAX_PACE_WINDOW_MS) {
+        throw new Error(
+          `cell rejected a ${paceWindowMs} ms drain pace; refusing to drain faster than asked`
+        )
+      }
     }
     await postAt(config.cellOrigin, '/v1/admin/drain', { v: 1, graceMs: 0 })
     return { changed: false, drained: true, paceWindowMs: 0 }
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 020cd6ae553a..fb2ad53895be 100644
--- a/cloud/dev/scripts/prepare-relay-production-capacity-canary.test.mjs
+++ b/cloud/dev/scripts/prepare-relay-production-capacity-canary.test.mjs
@@ -231,6 +231,59 @@ describe('production Relay capacity cell admission', () => {
     ])
   })
 
+  it('refuses to fall back to an unpaced drain when the cell rejects a slower window', async () => {
+    for (const paceWindowMs of [900_000, 1_200_000]) {
+      const bodies = []
+      await assert.rejects(
+        prepareProductionCapacityCell(
+          { ...config, mode: 'drain', paceWindowMs },
+          {
+            token: 'token',
+            wait: async () => {},
+            fetch: async (_url, init) => {
+              bodies.push(JSON.parse(init.body))
+              return response({ error: 'invalid_request' }, 400)
+            }
+          }
+        ),
+        /refusing to drain faster than asked/
+      )
+      assert.deepEqual(bodies, [{ v: 1, graceMs: 0, paceWindowMs }])
+    }
+  })
+
+  it('stops a slower pace than an old-cap cell accepts before anything is isolated', async () => {
+    const check = async (health, paceWindowMs) => {
+      const requests = []
+      const result = prepareProductionCapacityCell(
+        { ...config, mode: 'pace-check', paceWindowMs },
+        {
+          wait: async () => {},
+          fetch: async (url, init) => {
+            requests.push({ path: new URL(url).pathname, method: init.method ?? 'GET' })
+            return response(health)
+          }
+        }
+      )
+      return { result, requests }
+    }
+    // Every image before the cap rose answers /health without it.
+    const old = { ok: true, connectionCapacityProtocol: 2 }
+    for (const pace of [900_000, 1_200_000]) {
+      const { result, requests } = await check(old, pace)
+      await assert.rejects(result, /up to 300000 ms, not \d+ ms; it was not isolated/)
+      assert.deepEqual(requests, [{ path: '/health', method: 'GET' }])
+    }
+    assert.deepEqual(await (await check(old, 300_000)).result, {
+      paceWindowMs: 300_000, maxPaceWindowMs: 300_000
+    })
+    const current = { ...old, drainPaceWindowMaxMs: 1_200_000 }
+    assert.deepEqual(await (await check(current, 1_200_000)).result, {
+      paceWindowMs: 1_200_000, maxPaceWindowMs: 1_200_000
+    })
+    await assert.rejects((await check({ ok: false }, 300_000)).result, /cell health is not ok/)
+  })
+
   it('fails a paced drain that the cell rejects for any other reason', async () => {
     await assert.rejects(
       prepareProductionCapacityCell(
@@ -253,10 +306,12 @@ describe('production Relay capacity cell admission', () => {
       '--mode', 'drain',
       '--pace-window-ms', value
     ]
-    for (const value of ['-1', '300001', '1.5', 'soon']) {
+    for (const value of ['-1', '1200001', '1.5', 'soon']) {
       assert.throws(() => parseProductionCapacityCellArguments(argv(value)), /pace-window-ms/)
     }
-    assert.equal(parseProductionCapacityCellArguments(argv('300000')).paceWindowMs, 300_000)
+    for (const value of [300_000, 900_000, 1_200_000]) {
+      assert.equal(parseProductionCapacityCellArguments(argv(String(value))).paceWindowMs, value)
+    }
   })
 
   it('restores only the selected cell to general admission', async () => {
diff --git a/cloud/dev/scripts/relay-admin-endpoint-retry-workflow.test.mjs b/cloud/dev/scripts/relay-admin-endpoint-retry-workflow.test.mjs
index 196fff9edf35..0f5845a732c3 100644
--- a/cloud/dev/scripts/relay-admin-endpoint-retry-workflow.test.mjs
+++ b/cloud/dev/scripts/relay-admin-endpoint-retry-workflow.test.mjs
@@ -1,5 +1,9 @@
 import assert from 'node:assert/strict'
-import { readFileSync } from 'node:fs'
+import { spawn } from 'node:child_process'
+import { mkdtempSync, readFileSync, rmSync } from 'node:fs'
+import { createServer } from 'node:http'
+import { tmpdir } from 'node:os'
+import { join } from 'node:path'
 import { test } from 'node:test'
 import { fileURLToPath } from 'node:url'
 import { relayWorkflowUrl } from './relay-repository.mjs'
@@ -13,13 +17,28 @@ function workflow(name) {
   return readFileSync(fileURLToPath(relayWorkflowUrl(name)), 'utf8')
 }
 
-// A single transient 5xx from a warming instance behind the global load balancer
-// must not fail a canary, so no admin endpoint may be read by a bare curl.
-test('no admin endpoint is reached by a curl without a bounded retry', () => {
+const VERIFY_STEP = 'name: Verify new incarnation, exact image, protocol, and durable safety'
+const STALL_WINDOW = 'local out="${RUNNER_TEMP}/$1.json" window=60 delay=5 status'
+
+function verifyStep() {
+  return workflow('deploy-relay-production-same-cap-job.yml')
+    .split(VERIFY_STEP)[1]
+    .split('\n      - name:')[0]
+}
+
+function verifyAdminPost() {
+  const step = verifyStep()
+  const start = step.indexOf('admin_post() {')
+  return step.slice(start, step.indexOf('\n          }', start) + '\n          }'.length)
+}
+
+// curl 7.81 (the Ubuntu 22.04 runners) never retries under --fail-with-body, so the
+// remaining --retry flags are inert and only the verify loop below really retries.
+// What holds for every admin curl: it is bounded and never retries a final 4xx.
+test('every admin curl is bounded and never retries a final 4xx', () => {
   for (const name of WORKFLOWS) {
     for (const invocation of workflow(name).split(/\bcurl\b/).slice(1)) {
       const flags = invocation.split('\n          }')[0]
-      assert.match(flags, /--retry 3 --retry-delay 2 --retry-connrefused/, name)
       assert.match(flags, /--max-time 30/, name)
       // --retry-all-errors would also retry 401, 403, and 409, which are final.
       assert.doesNotMatch(flags, /--retry-all-errors/, name)
@@ -39,5 +58,80 @@ test('every retried admin request captures only the final attempt body', () => {
     /TARGET_RUNTIME="\$\(admin_post target-runtime/,
     /TARGET_DIRECTOR_STATUS="\$\(admin_post target-cell-status/
   ]) assert.match(job, call)
-  assert.doesNotMatch(job, /\$\(curl /)
+  // The verify loop captures only the status code; its body goes to the file.
+  assert.doesNotMatch(job.replace(verifyAdminPost(), ''), /\$\(curl /)
+})
+
+// c18, 2026-10-07 18:49Z: a DB stall made the fresh cell answer 503 "no healthy upstream";
+// three 2 s retries gave up and the cell was healthy 16 s later.
+// 60 s covers a 7 s stall, 16 s readiness grace and two 10 s LB health checks.
+test('the post-roll verify outlasts one DB stall and its health-check recovery', () => {
+  assert.ok(verifyAdminPost().includes(STALL_WINDOW))
+  assert.match(verifyAdminPost(), /--max-time 30/)
+})
+
+// Runs the step's own admin_post, with its retry clock scaled down twelve-fold.
+async function runVerifyAdminPost(respond) {
+  const scaled = verifyAdminPost().replace('window=60 delay=5', 'window=5 delay=1')
+  assert.notEqual(scaled, verifyAdminPost())
+  let calls = 0
+  const startedAt = Date.now()
+  const server = createServer((request, response) => {
+    calls += 1
+    const { status, body, drop } = respond(Date.now() - startedAt)
+    if (drop) return void request.socket.destroy()
+    response.writeHead(status, { 'content-type': 'application/json' })
+    response.end(body)
+  })
+  await new Promise((resolve) => server.listen(0, '127.0.0.1', resolve))
+  const runnerTemp = mkdtempSync(join(tmpdir(), 'relay-verify-admin-post-'))
+  try {
+    const url = `http://127.0.0.1:${server.address().port}/v1/admin/runtime-status`
+    const child = spawn(
+      'bash',
+      ['-euo', 'pipefail', '-c', `${scaled}\nadmin_post target-runtime "${url}" '{"v":1}'`],
+      { env: { ...process.env, RUNNER_TEMP: runnerTemp, ORCA_RELAY_ADMIN_ID_TOKEN: 't' } }
+    )
+    let stdout = ''
+    let stderr = ''
+    child.stdout.on('data', (chunk) => { stdout += chunk })
+    child.stderr.on('data', (chunk) => { stderr += chunk })
+    const code = await new Promise((resolve) => child.on('close', resolve))
+    return { code, stdout, stderr, calls, elapsedMs: Date.now() - startedAt }
+  } finally {
+    server.close()
+    rmSync(runnerTemp, { recursive: true, force: true })
+  }
+}
+
+const UNHEALTHY = { status: 503, body: 'no healthy upstream' }
+
+test('the verify read recovers when the cell comes back inside the retry window', async () => {
+  const result = await runVerifyAdminPost((elapsedMs) =>
+    elapsedMs < 2_500 ? UNHEALTHY : { status: 200, body: '{"ok":true}' }
+  )
+  assert.equal(result.code, 0, result.stderr)
+  assert.equal(result.stdout, '{"ok":true}')
+  // The old three-retry budget would have given up here.
+  assert.ok(result.calls > 3, `calls ${result.calls}`)
+})
+
+test('the verify read still fails a cell that stays down past the window', async () => {
+  const result = await runVerifyAdminPost(() => UNHEALTHY)
+  assert.notEqual(result.code, 0)
+  assert.ok(result.elapsedMs >= 3_000, `gave up after ${result.elapsedMs} ms: ${result.stderr}`)
+  assert.ok(result.elapsedMs < 8_000, `bounded at ${result.elapsedMs} ms`)
+})
+
+test('the verify read fails a final 4xx without waiting out the window', async () => {
+  const result = await runVerifyAdminPost(() => ({ status: 409, body: '{"error":"generation"}' }))
+  assert.notEqual(result.code, 0)
+  assert.equal(result.calls, 1)
+})
+
+test('a final connection failure does not report the previous attempt body', async () => {
+  const result = await runVerifyAdminPost((elapsedMs) => (elapsedMs < 1_000 ? UNHEALTHY : { drop: true }))
+  assert.notEqual(result.code, 0)
+  assert.match(result.stderr, /admin_post target-runtime: HTTP 000/)
+  assert.doesNotMatch(result.stderr, /no healthy upstream/)
 })
diff --git a/cloud/dev/scripts/relay-production-same-cap-wave.mjs b/cloud/dev/scripts/relay-production-same-cap-wave.mjs
index 0b1a756615f6..cf666c7238d3 100644
--- a/cloud/dev/scripts/relay-production-same-cap-wave.mjs
+++ b/cloud/dev/scripts/relay-production-same-cap-wave.mjs
@@ -25,7 +25,8 @@ export function selectorWaveDelta(cellId) {
 // The cell spreads its drain sends evenly over this window (host-session-registry.ts drain), so
 // it sets the re-placement arrival rate: hosts / window. A closed set, stepped down one rung at a
 // time per cloud/docs/relay-workflows.md; the first entry is the default every wave used before.
-export const SAME_CAP_DRAIN_PACE_WINDOWS_MS = [300_000, 60_000, 30_000]
+// The slower windows are for cells whose 300 s drain browned out the database (c28, 10-07).
+export const SAME_CAP_DRAIN_PACE_WINDOWS_MS = [300_000, 60_000, 30_000, 900_000, 1_200_000]
 export const DEFAULT_SAME_CAP_DRAIN_PACE_WINDOW_MS = SAME_CAP_DRAIN_PACE_WINDOWS_MS[0]
 
 // Only US general cells may drain faster than the default. An Asia drain is bounded by its
@@ -46,7 +47,7 @@ export function drainPaceWindowMs(value, cellIds) {
       `drain pace window must be one of ${SAME_CAP_DRAIN_PACE_WINDOWS_MS.join(', ')} ms`
     )
   }
-  if (parsed !== DEFAULT_SAME_CAP_DRAIN_PACE_WINDOW_MS) {
+  if (parsed < DEFAULT_SAME_CAP_DRAIN_PACE_WINDOW_MS) {
     const slow = cellIds.filter((cell) => !SAME_CAP_FAST_DRAIN_PACE_CELLS.includes(cell))
     if (slow.length > 0) {
       throw new Error(
@@ -205,9 +206,9 @@ export function verifyCanaryAuthority(authority, expected, repositoryRoot) {
     )
   }
   // A batch rolls up to ten cells back to back, so a faster one needs a canary whose own drain
-  // passed; the default is what every wave ran before, and stays available to any canary.
+  // passed; the default and anything slower stay available to any canary.
   if (
-    batchPaceWindowMs !== DEFAULT_SAME_CAP_DRAIN_PACE_WINDOW_MS &&
+    batchPaceWindowMs < DEFAULT_SAME_CAP_DRAIN_PACE_WINDOW_MS &&
     authority.paceVerdict !== 'PASS'
   ) {
     throw new Error(
diff --git a/cloud/dev/scripts/relay-production-same-cap-wave.test.mjs b/cloud/dev/scripts/relay-production-same-cap-wave.test.mjs
index f292bc17a680..a9210812a3a9 100644
--- a/cloud/dev/scripts/relay-production-same-cap-wave.test.mjs
+++ b/cloud/dev/scripts/relay-production-same-cap-wave.test.mjs
@@ -634,16 +634,22 @@ function fastWave(overrides = {}) {
 }
 
 test('admits only the reviewed drain pace windows', () => {
-  assert.deepEqual(SAME_CAP_DRAIN_PACE_WINDOWS_MS, [300_000, 60_000, 30_000])
+  assert.deepEqual(
+    SAME_CAP_DRAIN_PACE_WINDOWS_MS,
+    [300_000, 60_000, 30_000, 900_000, 1_200_000]
+  )
   assert.equal(validateSameCapWave(fastWave()).drainPaceWindowMs, 60_000)
   assert.equal(validateSameCapWave(fastWave({
     drainPaceWindowMs: '30000',
     confirmation: `ROLL_RELAY_SAME_CAP ${targetDigest} ${usGeneral} drain-pace-window-ms=30000`
   })).drainPaceWindowMs, 30_000)
-  for (const pace of [undefined, '', '0', '120000', '299999', '600000', '60000.0', '060000', ' 60000']) {
+  for (const pace of [
+    undefined, '', '0', '120000', '299999', '600000', '60000.0', '060000', ' 60000',
+    '1200001', '1800000'
+  ]) {
     assert.throws(
       () => validateSameCapWave(fastWave({ drainPaceWindowMs: pace })),
-      /drain pace window must be one of 300000, 60000, 30000 ms/,
+      /drain pace window must be one of 300000, 60000, 30000, 900000, 1200000 ms/,
       String(pace)
     )
   }
@@ -684,6 +690,33 @@ test('keeps Asia and migration-only cells on the default pace', () => {
   })), /not production-gce-c17/)
 })
 
+test('admits the slower paces on every cell class, Asia and migration-only included', () => {
+  for (const pace of ['900000', '1200000']) {
+    for (const cellIds of [
+      usGeneral,
+      'production-gce-c28,production-gce-c29',
+      'production-gce-c8,production-gce-c29',
+      'production-gce-c17'
+    ]) {
+      const single = !cellIds.includes(',')
+      const wave = validateSameCapWave(fastWave({
+        cellIds,
+        ...(single ? { mode: 'canary-apply', canaryRunId: '' } : {}),
+        drainPaceWindowMs: pace,
+        confirmation: `ROLL_RELAY_SAME_CAP ${targetDigest} ${cellIds} drain-pace-window-ms=${pace}`
+      }))
+      assert.equal(wave.drainPaceWindowMs, Number(pace), `${cellIds} ${pace}`)
+    }
+    assert.throws(() => validateSameCapWave(fastWave({
+      mode: 'canary-apply',
+      canaryRunId: '',
+      cellIds: 'production-gce-c29',
+      drainPaceWindowMs: pace,
+      confirmation: `ROLL_RELAY_SAME_CAP ${targetDigest} production-gce-c29`
+    })), /confirmation does not match/)
+  }
+})
+
 test('binds a non-default pace into the confirmation, in both directions', () => {
   // A confirmation that does not name the pace is a confirmation of the default.
   assert.throws(() => validateSameCapWave(fastWave({
@@ -746,6 +779,17 @@ test('a canary authorizes batches at its own pace or slower, never faster', () =
   for (const pace of ['60000', '300000']) assert.equal(verify(seal('60000'), pace).cellId, 'production-gce-c7')
   assert.throws(() => verify(seal('60000'), '30000'), /drained over 60000 ms/)
   assert.throws(() => verify(seal('300000'), '60000'), /drained over 300000 ms/)
+  // Slower than the default needs no PASS, and a slow canary authorizes only slower-or-equal.
+  for (const pace of ['900000', '1200000']) {
+    assert.equal(verify(seal('300000'), pace).cellId, 'production-gce-c7')
+    assert.equal(verify(seal('300000', shadowReport('300000', 'WARN')), pace).cellId, 'production-gce-c7')
+    assert.equal(verify(seal('60000'), pace).cellId, 'production-gce-c7')
+  }
+  assert.equal(seal('1200000').drainPaceWindowMs, 1_200_000)
+  assert.equal(verify(seal('900000'), '1200000').cellId, 'production-gce-c7')
+  assert.equal(verify(seal('1200000'), '1200000').cellId, 'production-gce-c7')
+  assert.throws(() => verify(seal('900000'), '300000'), /drained over 900000 ms/)
+  assert.throws(() => verify(seal('1200000'), '900000'), /drained over 1200000 ms/)
   // An authority sealed before the pace was recorded proves nothing about it.
   const { drainPaceWindowMs: _dropped, ...unpaced } = seal('300000')
   assert.throws(() => verify({ ...unpaced, v: 1 }, '300000'), /does not match/)
@@ -865,8 +909,29 @@ test('the workflows offer exactly the closed set and scale the drain wait with i
   assert.match(job, /\n      DRAIN_PACE_WINDOW_MS: \$\{\{ inputs\.drain-pace-window-ms \}\}\n/)
   assert.doesNotMatch(job, /DRAIN_PACE_WINDOW_MS: '/)
   assert.match(job, /cell-class \\\n\s+--cell-id "\$\{TARGET_CELL_ID\}" --drain-pace-window-ms "\$\{DRAIN_PACE_WINDOW_MS\}"/)
-  // The 15-min migration lease plus the window: exactly today's 20 min at the default.
-  assert.match(job, /--timeout-ms "\$\(\(900000 \+ DRAIN_PACE_WINDOW_MS\)\)"/)
-  assert.equal(900_000 + SAME_CAP_DRAIN_PACE_WINDOWS_MS[0], 1_200_000)
-  assert.ok(Math.max(...SAME_CAP_DRAIN_PACE_WINDOWS_MS) === DEFAULT_SAME_CAP_DRAIN_PACE_WINDOW_MS)
+  // The 15-min migration lease plus the window, plus its excess over the default: restart-safe
+  // waits a whole window of quiet after the last send, so a slow drain needs about twice it.
+  const timeout = /--timeout-ms "\$\(\((.+)\)\)"\n/.exec(job)[1]
+  const timeoutMs = (pace) => Number(execFileSync(
+    'bash', ['-c', `DRAIN_PACE_WINDOW_MS=${pace}; echo $((${timeout}))`], { encoding: 'utf8' }
+  ))
+  // Exactly the timeouts every pace had before the slower ones existed.
+  for (const pace of [300_000, 60_000, 30_000]) assert.equal(timeoutMs(pace), 900_000 + pace)
+  for (const pace of SAME_CAP_DRAIN_PACE_WINDOWS_MS) {
+    assert.ok(timeoutMs(pace) >= 2 * pace + 600_000, String(pace))
+  }
+  assert.equal(timeoutMs(1_200_000), 3_000_000)
+  const slowest = timeoutMs(Math.max(...SAME_CAP_DRAIN_PACE_WINDOWS_MS))
+  // The rest of the job keeps the 70 min it had beside the old 20-min drain step in 90.
+  const jobMinutes = Number(/\n  rollout:\n(?:    [^\n]*\n)*?    timeout-minutes: (\d+)\n/.exec(job)[1])
+  assert.ok(jobMinutes * 60_000 >= slowest + 70 * 60_000)
+  // The drain step's fresh one-hour ID token must outlive its wait, with room for the drain call.
+  assert.ok(slowest + 5 * 60_000 <= 60 * 60_000)
+  // The pace check runs before the isolate and before the failsafe treats the cell as touched.
+  const drainStep = job.slice(job.indexOf('- name: Reversibly isolate and drain only the selected cell'))
+  const paceCheck = drainStep.indexOf('--mode pace-check')
+  assert.notEqual(paceCheck, -1)
+  assert.match(drainStep.slice(paceCheck, drainStep.indexOf('\n', paceCheck) + 80), /--pace-window-ms "\$\{DRAIN_PACE_WINDOW_MS\}"/)
+  assert.ok(paceCheck < drainStep.indexOf('MUTATION_STARTED=true'))
+  assert.ok(paceCheck < drainStep.indexOf('--mode isolate'))
 })
diff --git a/cloud/dev/scripts/relay-reconnect-herd-alerts.test.mjs b/cloud/dev/scripts/relay-reconnect-herd-alerts.test.mjs
new file mode 100644
index 000000000000..5cd3e5733bfa
--- /dev/null
+++ b/cloud/dev/scripts/relay-reconnect-herd-alerts.test.mjs
@@ -0,0 +1,45 @@
+import assert from 'node:assert/strict'
+import { readFileSync } from 'node:fs'
+import test from 'node:test'
+import { fileURLToPath } from 'node:url'
+
+// Why: both herd alerts key on text the relay writes (a log line and a runtime field). A rename on
+// either side silences the alert without failing anything.
+
+const read = (relative) => readFileSync(fileURLToPath(new URL(relative, import.meta.url)), 'utf8')
+const terraform = read('../../infra/terraform/relay-observability.tf')
+
+const block = (kind, name) => {
+  const body = new RegExp(`resource "${kind}" "${name}" \\{([\\s\\S]*?)\\n\\}`).exec(terraform)?.[1]
+  assert.ok(body, `${kind}.${name} not found in relay-observability.tf`)
+  return body
+}
+
+const incidentMetric = (key) => {
+  const body = new RegExp(`\\n    ${key} = \\{([\\s\\S]*?)\\n    \\}`).exec(terraform)?.[1]
+  assert.ok(body, `relay_incident_metrics.${key} not found`)
+  return body
+}
+
+test('the disconnect-burst metric matches the line a cell writes per control close', () => {
+  const emitter = read('../../apps/relay/src/host-session-registry.ts')
+  assert.match(emitter, /`\[orca-relay\] control closed host=\$\{/)
+  assert.match(emitter, /` code=\$\{code\} reason=\$\{/)
+  const metric = incidentMetric('cell_control_abnormal_closes')
+  assert.match(metric, /jsonPayload\.message:\\"\[orca-relay\] control closed \\"/)
+  assert.match(metric, /jsonPayload\.message:\\" code=1006 \\"/)
+  assert.match(metric, /logs\/cos_containers/)
+  const policy = block('google_monitoring_alert_policy', 'relay_cell_control_close_burst')
+  assert.match(policy, /orca_relay_cell_control_abnormal_closes/)
+  assert.match(policy, /group_by_fields\s*=\s*\["resource\.label\.\\"instance_id\\""\]/)
+})
+
+test('the pool-herd metric thresholds the interval maximum the relay emits', () => {
+  const emitter = read('../../apps/relay/src/postgres-pool-pressure.ts')
+  assert.match(emitter, /\bdatabasePoolWaitersMax: number\b/)
+  const metric = block('google_logging_metric', 'relay_cell_pool_herd')
+  // 200, not lower: single-cell stalls of 50-196 waiters recur daily; herds go past 200.
+  assert.match(metric, /jsonPayload\.databasePoolWaitersMax>200"/)
+  const policy = block('google_monitoring_alert_policy', 'relay_cell_pool_herd')
+  assert.match(policy, /threshold_value\s*=\s*0\n/)
+})
diff --git a/cloud/docs/relay-workflows.md b/cloud/docs/relay-workflows.md
index c66785a254af..faf404adf2a1 100644
--- a/cloud/docs/relay-workflows.md
+++ b/cloud/docs/relay-workflows.md
@@ -530,22 +530,34 @@ drained host re-dials the director as soon as it reads `drain`, so the window se
 arrival rate: hosts / window, about 1.8-2.7 hosts/s for a US cell at the default. The window also
 sets two waits: restart-safe needs an empty runtime for (ceil(window / 5 s) + 1) consecutive
 5-second samples, and the drain step's overall timeout is the 15-minute migration lease plus the
-window (20 minutes at the default).
+window, plus the window's excess over `300000` (20 minutes at the default, 50 at `1200000`).
+Because the quiet starts only once the last host has left, a drain step takes about twice the
+window: about 30 minutes at `900000` and 40 at `1200000`.
 
-- Allowed values are `300000` (the default, and every wave before this input), `60000`, and
-  `30000`. The wave validator refuses anything else, and each cell job checks again.
+- Allowed values are `300000` (the default, and every wave before this input), `60000`,
+  `30000`, `900000`, and `1200000`. The wave validator refuses anything else, and each cell job
+  checks again.
 - Below `300000` is for US general cells only (C7-C10, C13-C16, C19-C26, C32, C33). Asia drains
   are bound by the target cells' own accept rate (about 4-6 hosts/s per Asia cell), not by the
-  window. Migration-only cells hold no hosts. Both stay at `300000`.
+  window. Migration-only cells hold no hosts. Both stay at `300000` or slower.
+- `900000` and `1200000` are for any cell. They exist because c28's 1,901-host drain at `300000`
+  (about 6.3 hosts/s, 2026-10-07) held database lock time above its bar for about 10 minutes.
+  At `1200000` a 2,000-host Asia cell re-places about 1.7 hosts/s.
 - A non-default window must be named at the end of the confirmation, for example
   `ROLL_RELAY_SAME_CAP <target-digest> <cells> drain-pace-window-ms=60000`. A confirmation that
   names no window confirms `300000`, so a form left at another value fails closed.
 - A canary's authority records its window and its pace verdict (below). A batch may use that
   window or a slower one, never a faster one. A batch below `300000` also needs the canary's pace
-  verdict to be PASS. Stepping back to `300000` mid-ladder needs no new canary.
+  verdict to be PASS. Stepping back to `300000` or slower mid-ladder needs no new canary.
 - A cell on an image without paced drains rejects the window, and the job falls back to an
   unpaced drain. The job records what the cell accepted, and a canary that did not drain at its own
   window seals `UNVERIFIED`.
+- A window above `300000` needs the cell being drained to already run an image that accepts it
+  (the cap rose with this ladder's slow rungs). Before the isolate, the job reads the cap the cell
+  advertises on `/health` (`drainPaceWindowMaxMs`; an image without it has `300000`) and stops
+  with the cell untouched if the window is above it. Re-dispatch at `300000`, or after the cell's
+  next roll. If a cell still rejects the window at the drain, the job fails rather than drain
+  unpaced, and the cell stays isolated for an operator, as any failed cell does.
 
 **What judges a paced drain.** The shadow health gate (report only, after each cell) judges two
 checks the pace can move. Together they are the report's `paceVerdict`, which the canary seals:
diff --git a/cloud/infra/terraform/relay-observability.tf b/cloud/infra/terraform/relay-observability.tf
index a0a91a64addc..2e69003e3535 100644
--- a/cloud/infra/terraform/relay-observability.tf
+++ b/cloud/infra/terraform/relay-observability.tf
@@ -57,6 +57,14 @@ locals {
       description = "Cells whose reserved_requests disagreed with their lease units when reconciliation corrected them; should trend to zero."
       filter      = "((resource.type=\"cloud_run_revision\" AND (${local.relay_service_log_filter})) OR resource.type=\"gce_instance\") AND jsonPayload.event=\"orca_relay_reservation_drift\""
     }
+    # Why the cell's line and not the load balancer's: the LB writes a WebSocket's log entry at
+    # close but stamps it with the stream's start, and a log-based metric counts by that stamp. Of
+    # the 1,046 `internal_error` streams on 2026-10-06 18:34Z, 42 were stamped within 10 minutes of
+    # the drop; the median was 2.4 h earlier, so an LB-log rate never shows the pulse.
+    cell_control_abnormal_closes = {
+      description = "Desktop control sockets a GCE cell saw end with no close frame (1006), counted when they closed. Hundreds on one cell in a minute is the load balancer ending streams."
+      filter      = "resource.type=\"gce_instance\" AND logName=\"projects/${var.project_id}/logs/cos_containers\" AND jsonPayload.message:\"[orca-relay] control closed \" AND jsonPayload.message:\" code=1006 \""
+    }
   }
 
   relay_runtime_metrics = {
@@ -107,6 +115,7 @@ locals {
     db_waiters_max                     = { field = "databasePoolWaitersMax", description = "Maximum requests queued for a PostgreSQL connection during the interval." }
     db_oldest_wait_ms                  = { field = "databasePoolOldestWaitMs", description = "Current oldest PostgreSQL pool waiter age." }
     db_wait_ms_max                     = { field = "databasePoolWaitMsMax", description = "Maximum PostgreSQL pool wait during the interval." }
+    host_hellos_shed                   = { field = "hostHellosShedDelta", description = "Desktop control connections refused with a retryable 503 because the PostgreSQL pool queue was full." }
     cell_inventory_hold_ms_max         = { field = "cellInventoryHoldMsMax", description = "Longest cell-inventory lock hold in the interval." }
     cell_inventory_hold_ms_p95         = { field = "cellInventoryHoldMsP95", description = "Cell-inventory lock hold p95 in the interval; the bound is tuned against this." }
     cell_inventory_holds               = { field = "cellInventoryHolds", description = "Cell-inventory locks acquired in the interval; the percentiles above summarise these." }
@@ -928,6 +937,98 @@ resource "google_monitoring_alert_policy" "relay_director_cell_inventory_hold" {
   }
 }
 
+# The bar lives in the filter, as for the long-hold metric: an exponential bucket's percentile
+# interpolation would put any value from 128 to 255 above 200. Why 200: a healthy cell peaks at
+# 2 waiters (p99), but single-cell stalls of 50-196 recur several times a day and already time
+# out. 200 keeps those for the SQL-failure alerts and pages on herds. Since 2026-10-03 a bar of 50
+# was crossed in 84 episodes, 150 in 29, and 200 in 10, among them every known herd (10-03 17:50,
+# 10-05 06:26 and 18:22, 10-06 01:33 and 18:34, 10-07 20:00).
+resource "google_logging_metric" "relay_cell_pool_herd" {
+  project     = var.project_id
+  name        = "orca_relay_cell_pool_herd"
+  description = "Cell runtime samples in which more than 200 requests queued at once for a PostgreSQL connection."
+  filter      = "${local.relay_runtime_log_filter} AND jsonPayload.role=\"cell\" AND jsonPayload.databasePoolWaitersMax>200"
+
+  metric_descriptor {
+    metric_kind = "DELTA"
+    value_type  = "INT64"
+    unit        = "1"
+  }
+}
+
+resource "google_monitoring_alert_policy" "relay_cell_control_close_burst" {
+  project               = var.project_id
+  display_name          = "Orca Relay: cell desktop disconnect burst"
+  combiner              = "OR"
+  enabled               = true
+  notification_channels = var.relay_alert_notification_channels
+
+  conditions {
+    display_name = "Over 120 abnormal desktop control closes on one cell in a minute"
+
+    condition_threshold {
+      filter          = "resource.type=\"gce_instance\" AND metric.type=\"logging.googleapis.com/user/orca_relay_cell_control_abnormal_closes\""
+      comparison      = "COMPARISON_GT"
+      threshold_value = 120
+      duration        = "0s"
+
+      aggregations {
+        alignment_period     = "60s"
+        per_series_aligner   = "ALIGN_SUM"
+        cross_series_reducer = "REDUCE_SUM"
+        group_by_fields      = ["resource.label.\"instance_id\""]
+      }
+
+      trigger {
+        count = 1
+      }
+    }
+  }
+
+  documentation {
+    content   = "Over 120 desktop control sockets on one relay cell ended without a close frame (code 1006) in one minute. On 2026-10-06 at 18:34 UTC the asia-east2 cells logged 213-247 each in the minute Google's load balancer ended 1,046 of their streams, against a baseline of 6-49 per minute (US cells: 17 or fewer, all codes). Smaller pulses of about 60 per cell (01:33 and 20:40 UTC that day) stay under the bar. First response: read the load balancer logs for the same minute by `receiveTimestamp`, not `timestamp` (the LB stamps a WebSocket with its start), and bucket `jsonPayload.statusDetails`. If they show `internal_error` across several cells at once, the proxy ended the streams: record the timestamps for the Google support case, and do not drain, restart or resize the cell. If `Orca Relay: cell database pool herd` fired in the same minute, the reconnecting desktops overran the cell's database pool. Otherwise look at the cell itself: a crash or restart, the event loop, or memory."
+    mime_type = "text/markdown"
+  }
+
+  depends_on = [google_logging_metric.relay_incident]
+}
+
+resource "google_monitoring_alert_policy" "relay_cell_pool_herd" {
+  project               = var.project_id
+  display_name          = "Orca Relay: cell database pool herd"
+  combiner              = "OR"
+  enabled               = true
+  notification_channels = var.relay_alert_notification_channels
+
+  conditions {
+    display_name = "Over 200 requests queued for a PostgreSQL connection on one cell"
+
+    condition_threshold {
+      # The metric filter already drops samples at or under 200, so any value present is a breach.
+      filter          = "resource.type=\"gce_instance\" AND metric.type=\"logging.googleapis.com/user/${google_logging_metric.relay_cell_pool_herd.name}\""
+      comparison      = "COMPARISON_GT"
+      threshold_value = 0
+      duration        = "0s"
+
+      aggregations {
+        alignment_period     = "60s"
+        per_series_aligner   = "ALIGN_SUM"
+        cross_series_reducer = "REDUCE_SUM"
+        group_by_fields      = ["resource.label.\"instance_id\""]
+      }
+
+      trigger {
+        count = 1
+      }
+    }
+  }
+
+  documentation {
+    content   = "More than 200 requests on one relay cell queued at once for a PostgreSQL connection, and requests that wait 2 s fail. A healthy cell peaks at 2 waiters (p99 on 2026-10-07). Single-cell stalls of 50-196 waiters recur several times a day, mostly on the asia-east2 cells, whose every query crosses the Pacific. Each is about 30 seconds long and already timing requests out (96-367 SQL failures per 30-second sample at 184-196 on 2026-10-07). This bar leaves those to the SQL-failure alerts. Reconnect herds go well past 200 on several cells at once (2026-10-06 18:34 UTC: 233-527 on all five asia-east2 cells). Since 2026-10-03 this bar was crossed in 10 episodes. Six were herds across several cells, and four were a single cell at 201-228. This uses the interval maximum (`databasePoolWaitersMax`), so a herd shorter than the 30-second sample still shows. First response: check `Orca Relay: cell desktop disconnect burst` for the same minute. If it fired too, a mass disconnect caused this, so follow that policy and leave the database alone. If it did not, check Cloud SQL health and lock contention (`Orca Relay: lock timeout burst`) before touching the cell."
+    mime_type = "text/markdown"
+  }
+}
+
 resource "google_monitoring_alert_policy" "relay_lock_timeout_burst" {
   project               = var.project_id
   display_name          = "Orca Relay: lock timeout burst"
diff --git a/cloud/package.json b/cloud/package.json
index 272c532a10e7..e3a585ff858d 100644
--- a/cloud/package.json
+++ b/cloud/package.json
@@ -21,7 +21,7 @@
     "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-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",
+    "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-reconnect-herd-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/check-relay-same-cap-headroom.test.mjs 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/drive-relay-director-deploy.test.mjs dev/scripts/github-smoke-token.test.mjs dev/scripts/infra.test.mjs dev/scripts/measure-relay-drain-disconnect-gap.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-job-mode-conditions.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"
   },
diff --git a/config/electron-builder.config.cjs b/config/electron-builder.config.cjs
index c9429d6262e2..dfb04a2ee1d4 100644
--- a/config/electron-builder.config.cjs
+++ b/config/electron-builder.config.cjs
@@ -120,6 +120,12 @@ const skillFreshnessResources = {
   from: 'resources/skills',
   to: 'skills'
 }
+// Why a real directory: native-chat agents load this skill plugin by path (Claude --plugin-dir,
+// Codex skill roots), and neither can read inside app.asar.
+const nativeChatVisualsResource = {
+  from: 'resources/native-chat-visuals',
+  to: 'native-chat-visuals'
+}
 // Why: SSH relay deploy resolves bundles from process.resourcesPath in packaged
 // apps. Keeping relay assets as extraResources makes them real directories
 // instead of paths hidden inside app.asar.
@@ -151,6 +157,7 @@ const commonExtraResources = [
   ...bundledRipgrepExtraResources,
   bundledPluginResources,
   skillFreshnessResources,
+  nativeChatVisualsResource,
   emojiShortcodeDatasetResource
 ]
 // Why: native speech addons must be real files outside app.asar; copy only the
@@ -284,6 +291,7 @@ module.exports = {
     // it from process.resourcesPath; exclude the source copy from app.asar.
     '!resources/onboarding/feature-wall/**',
     '!resources/skills/**',
+    '!resources/native-chat-visuals/**',
     // Why: bundled plugins ship via extraResources to resources/plugins/launch;
     // packing the source tree into app.asar would duplicate those exact bytes.
     '!resources/plugins/launch/**',
diff --git a/config/reliability-gates.jsonc b/config/reliability-gates.jsonc
index 346fe9ee7d1b..a01d07a35659 100644
--- a/config/reliability-gates.jsonc
+++ b/config/reliability-gates.jsonc
@@ -325,24 +325,10 @@
         "terminal automation completion",
         "local and relayed cancellation"
       ],
-      "platforms": [
-        "macos",
-        "linux",
-        "windows"
-      ],
-      "providers": [
-        "local",
-        "ssh",
-        "wsl",
-        "remote-runtime"
-      ],
-      "coveredPlatforms": [
-        "macos"
-      ],
-      "coveredProviders": [
-        "local",
-        "remote-runtime"
-      ],
+      "platforms": ["macos", "linux", "windows"],
+      "providers": ["local", "ssh", "wsl", "remote-runtime"],
+      "coveredPlatforms": ["macos"],
+      "coveredProviders": ["local", "remote-runtime"],
       "coverageNotes": "Real HTTP hook ingress and relay forwarding, production runtime automation observer, and captured Claude native ready bytes run locally on macOS. SSH/WSL transport ownership is simulated; physical remote hosts and native Windows/Linux are not verified.",
       "motivatingLinks": [
         "https://github.com/stablyai/orca/pull/24878",
@@ -1456,7 +1442,7 @@
     },
     {
       "id": "agent-session.structured-send-at-most-once",
-      "title": "Ambiguous structured sends never become a second provider delivery",
+      "title": "One structured-send attempt dispatches once; a later Send is a new message",
       "maturity": "experimental",
       "protection": "partial",
       "owner": "agent-session-runtime",
@@ -1466,37 +1452,45 @@
       "providers": ["local", "ssh", "remote-runtime", "mobile"],
       "coveredPlatforms": ["macos"],
       "coveredProviders": ["local", "mobile"],
-      "coverageNotes": "Deterministic host, renderer, direct/Relay transport, and mobile hook tests cover durable identity, caller changes, journal loss, acknowledgement loss, expiry, and remount. The host code is execution-location neutral, but live SSH/remote runtimes and physical iOS/Android lifecycle are not exercised.",
+      "coverageNotes": "Deterministic host and direct/Relay transport tests cover per-operation duplicate protection, caller changes, missing host journal rows, acknowledgement loss, and expiry. Mobile tests cover new-action identity, remount, storage refusal, current attachment paths, and capability changes; renderer tests cover one request per send and the bounded hand-back. Live SSH/remote runtimes and physical iOS/Android lifecycle are not exercised.",
       "motivatingLinks": ["https://github.com/stablyai/orca/pull/20133"],
-      "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.",
+      "invariant": "One structured-send operation id causes at most one provider dispatch. Each user Send on phone or desktop is a new action with a fresh id and one request; neither automatically resends an ambiguous action. The host retains the original action's outcome, and a later phone Send remains possible with equal text, after remount, or when phone storage fails. Repeated transmission of the same operation remains protected by host deduplication.",
+      "oracle": "Inject adapter/RPC acknowledgement loss, caller replacement, logical-client close after response, auth recovery with a written request, missing host submissions, legacy pending rows, stale fences, expiry, mobile remount, and phone storage refusal. Assert at most one dispatch for repeated transmission of one operation. For a later phone Send, assert a fresh id and second delivery while the original host entry remains unknown; equal images use current uploaded paths and delivery fields follow current host capabilities.",
       "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/NativeChatStructuredSessionDelivery.test.tsx src/renderer/src/components/native-chat/NativeChatStructuredSessionDelivery.probe.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-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"
+        "ORCA_BACKGROUND_LAUNCH=1 pnpm test src/shared/agent-session-operation-ledger.test.ts src/shared/structured-agent-session-send-evidence.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/structured-agent-session-message-sender.test.ts src/renderer/src/components/native-chat/use-structured-agent-session.test.tsx src/renderer/src/lib/launch-structured-agent-session.test.ts",
+        "ORCA_BACKGROUND_LAUNCH=1 pnpm --dir mobile test ../mobile/src/session/mobile-structured-send-new-action.test.ts ../mobile/src/session/use-mobile-structured-agent-session-send.test.tsx ../mobile/src/session/use-mobile-structured-agent-session-queued.test.tsx ../mobile/src/session/mobile-structured-send-delivery.test.ts ../mobile/src/session/use-mobile-structured-agent-session-background-tasks.test.tsx ../mobile/src/session/use-mobile-structured-agent-session-newer-approval-send.test.tsx ../mobile/src/session/use-mobile-structured-agent-session-read-failure.test.tsx ../mobile/src/session/use-mobile-structured-agent-session.test.tsx ../mobile/src/session/use-mobile-structured-agent-session-prompt-cancel.test.tsx ../mobile/src/session/mobile-native-chat-image-attachment.test.ts ../mobile/src/session/use-mobile-native-chat-image-attachments.test.ts ../mobile/src/session/use-mobile-structured-native-chat-send-bridge.test.ts ../mobile/src/mobile-web-shell/page-storage-keys.test.ts ../mobile/src/mobile-web-shell/bridge/page-async-storage.test.ts ../mobile/src/mobile-web-shell/use-page-host-snapshot.test.tsx ../mobile/src/mobile-web-shell/bridge-host-init.test.ts ../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 --maxWorkers=2"
       ],
       "testFiles": [
         "src/shared/agent-session-operation-ledger.test.ts",
-        "src/shared/structured-agent-session-send-disposition.test.ts",
+        "src/shared/structured-agent-session-send-evidence.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/structured-agent-session-message-sender.test.ts",
         "src/renderer/src/components/native-chat/use-structured-agent-session.test.tsx",
-        "src/renderer/src/components/native-chat/NativeChatStructuredSessionDelivery.test.tsx",
-        "src/renderer/src/components/native-chat/NativeChatStructuredSessionDelivery.probe.test.tsx",
         "src/renderer/src/lib/launch-structured-agent-session.test.ts",
         "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-send-new-action.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"
+        "mobile/src/transport/stable-logical-rpc-client.test.ts",
+        "mobile/src/session/use-mobile-structured-agent-session-queued.test.tsx",
+        "mobile/src/session/use-mobile-structured-agent-session-background-tasks.test.tsx",
+        "mobile/src/session/use-mobile-structured-agent-session-newer-approval-send.test.tsx",
+        "mobile/src/session/use-mobile-structured-agent-session-read-failure.test.tsx",
+        "mobile/src/session/use-mobile-structured-agent-session-prompt-cancel.test.tsx",
+        "mobile/src/session/use-mobile-structured-native-chat-send-bridge.test.ts",
+        "mobile/src/mobile-web-shell/page-storage-keys.test.ts",
+        "mobile/src/mobile-web-shell/bridge/page-async-storage.test.ts",
+        "mobile/src/mobile-web-shell/use-page-host-snapshot.test.tsx",
+        "mobile/src/mobile-web-shell/bridge-host-init.test.ts"
       ],
       "assertionRefs": [
         {
@@ -1516,12 +1510,11 @@
         {
           "file": "mobile/src/session/use-mobile-structured-agent-session-send.test.tsx",
           "assertions": [
-            "keeps one id across acknowledgement loss and host unknown replays",
-            "reuses an ambiguous id after the session hook remounts",
-            "keeps an ambiguous id after the host replay window expires",
-            "reuses the original uploaded attachment identity after acknowledgement loss",
-            "keeps the send id after a pending-admission refusal",
-            "rotates after a %s pre-handler RPC refusal that proves the send did not run"
+            "a later Send owns a new id even when the earlier host answer was %s",
+            "keeps the original unknown host row while allowing another Send",
+            "does not replay an old action after remount",
+            "uses newly uploaded attachment paths for a new action with the same image",
+            "never reads an old phone journal, even when storage is full or unreadable"
           ]
         },
         {
@@ -1551,28 +1544,30 @@
           "assertions": ["keeps a synchronous pre-write relay failure definite"]
         },
         {
-          "file": "src/shared/structured-agent-session-send-disposition.test.ts",
-          "assertions": ["never rotates $state operation after its host tombstone expires"]
+          "file": "src/renderer/src/components/native-chat/structured-agent-session-message-sender.test.ts",
+          "assertions": [
+            "gives back at once, as unconfirmed, a send whose request threw, and never sends it again"
+          ]
         }
       ],
       "evidenceRuns": [
         {
-          "date": "2026-10-04",
+          "date": "2026-10-07",
           "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/NativeChatStructuredSessionDelivery.test.tsx src/renderer/src/components/native-chat/NativeChatStructuredSessionDelivery.probe.test.tsx src/renderer/src/lib/launch-structured-agent-session.test.ts",
+          "command": "ORCA_BACKGROUND_LAUNCH=1 pnpm --dir mobile test ../mobile/src/session/mobile-structured-send-new-action.test.ts ../mobile/src/session/use-mobile-structured-agent-session-send.test.tsx ../mobile/src/session/use-mobile-structured-agent-session-queued.test.tsx ../mobile/src/session/mobile-structured-send-delivery.test.ts ../mobile/src/session/use-mobile-structured-agent-session-background-tasks.test.tsx ../mobile/src/session/use-mobile-structured-agent-session-newer-approval-send.test.tsx ../mobile/src/session/use-mobile-structured-agent-session-read-failure.test.tsx ../mobile/src/session/use-mobile-structured-agent-session.test.tsx ../mobile/src/session/use-mobile-structured-agent-session-prompt-cancel.test.tsx ../mobile/src/session/mobile-native-chat-image-attachment.test.ts ../mobile/src/session/use-mobile-native-chat-image-attachments.test.ts ../mobile/src/session/use-mobile-structured-native-chat-send-bridge.test.ts ../mobile/src/mobile-web-shell/page-storage-keys.test.ts ../mobile/src/mobile-web-shell/bridge/page-async-storage.test.ts ../mobile/src/mobile-web-shell/use-page-host-snapshot.test.tsx ../mobile/src/mobile-web-shell/bridge-host-init.test.ts ../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 --maxWorkers=2",
           "result": "passed",
-          "durationSeconds": 42.3,
-          "summary": "Thirteen focused host, shared, renderer, and orchestration files passed 197 tests after the delivery probe tests moved to their own file."
+          "durationSeconds": 5.42,
+          "summary": "Nineteen focused mobile files passed 241 tests for fresh Send identity, remount, attachment paths, storage refusal, mixed host capabilities, queued cards, and written-request ambiguity."
         },
         {
-          "date": "2026-09-12",
+          "date": "2026-10-06",
           "runner": "local",
           "platform": "macos",
-          "command": "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-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",
+          "command": "ORCA_BACKGROUND_LAUNCH=1 pnpm test src/shared/agent-session-operation-ledger.test.ts src/shared/structured-agent-session-send-evidence.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/structured-agent-session-message-sender.test.ts src/renderer/src/components/native-chat/use-structured-agent-session.test.tsx src/renderer/src/lib/launch-structured-agent-session.test.ts",
           "result": "passed",
-          "durationSeconds": 2.37,
-          "summary": "Ten focused mobile session, attachment, and transport files passed 113 tests."
+          "durationSeconds": 14,
+          "summary": "Eleven focused host, shared, renderer, and orchestration files passed 173 tests after the desktop outbox gave way to the in-memory sender, which makes one request per send and never resends."
         }
       ],
       "runtimeBudget": {
@@ -1585,27 +1580,24 @@
       },
       "redGreenEvidence": {
         "status": "partial",
-        "evidence": "Four targeted failures were observed: spending the mobile id after acknowledgement loss made three retries use two ids; settling cross-caller recovery under the new caller left the original ledger row pending; returning no synthetic result for a legacy or crash-left pending row dispatched it as a new accepted send; and a8d3de8d20's blanket settlement rotated a stale-fence option id and failed the renderer invariant. The focused tests pass with the production fixes restored; a byte-identical old-production run is not recorded."
+        "evidence": "The exact phone acknowledgement-loss/later-equal-Send test fails twice with the original sender and classifier restored byte-for-byte: the second Send returns unknown under the earlier id. It passes with per-action identity. Existing host tests also pin cross-caller recovery, missing submissions, and legacy pending rows against repeat dispatch; those host paths were not changed."
       },
       "performanceBudget": {
         "required": true,
-        "evidence": "No polling, timers, subprocesses, or provider fanout were added. Each mobile journal mutation parses the bounded journal and performs at most one full AsyncStorage rewrite; entries retain hashes, ids, and original attachment paths, cap at 4,096, and fail closed at capacity. A first host send performs three serialized whole-store durable transactions: admission, the pre-effect unknown tombstone, and final settlement. Lease and fence admission now share one transaction with the operation row, so a transient pre-effect refusal leaves no row and, absent pruning, performs no store write. No capacity-scale host fsync or mobile AsyncStorage latency benchmark is recorded."
+        "evidence": "No polling, timers, subprocesses, or provider fanout were added. The phone send path no longer reads or writes AsyncStorage or hashes image contents. The existing host admission, pre-effect unknown record, and settlement transactions are unchanged. No capacity-scale host fsync benchmark is recorded."
       },
       "promotionCriteria": [
         "Soak both commands in CI with zero unexplained flakes.",
         "Add live physical-mobile and remote-runtime interruption evidence before claiming full provider coverage."
       ],
       "knownGaps": [
-        "A payload-keyed mobile ambiguity cannot distinguish retrying the original send from an intentional later send with identical content. It fails closed until authoritative settlement, so the claim that retention costs no liveness is false without a durable composer-action identity.",
-        "Clearing or externally corrupting desktop localStorage or mobile AsyncStorage can erase a client-owned ambiguous identity.",
-        "An ambiguous id retained past host tombstone expiry remains safely blocked rather than becoming live again.",
-        "A host crash after premarking the operation unknown but before journal append or provider dispatch can conservatively suppress a message that never reached the provider.",
-        "A replay synthesized from an operation row whose journal submission is missing is not republished into the journal; desktop stops automatic polling but remains safely blocked on that FIFO head.",
-        "The changed send guarantee is not capability-negotiated. New mobile clients fail closed across caller-identity change, but old clients can rotate an ambiguous id against a new host, and an old mobile client can interpret an ok response carrying unknown as accepted.",
-        "An ambiguous attachment retry depends on the original host temp path remaining usable when the first request never reached the host; if it is gone, the retry rejects rather than rotating.",
+        "Phone composer drafts remain in memory: killing the app between Send and host recording loses that text, as before.",
+        "A later intentional Send can deliver another copy of text from an earlier unknown action; the original action stays unresolved until the host can establish its outcome.",
+        "A host crash after recording the operation unknown but before journal append or provider dispatch can conservatively suppress an attempt that never reached the provider.",
+        "Older phone bundles retain their payload journal behavior until upgraded; legacy embedded-page storage access remains permitted.",
         "No live SSH, remote-runtime, physical iOS/Android, Linux, or Windows interruption run is recorded."
       ],
-      "demotionRule": "Keep experimental or demote if any ambiguous retry changes operation id, provider dispatch count exceeds one, durable identity is evicted by age or capacity, or the focused commands flake without a diagnosed harness defect."
+      "demotionRule": "Keep experimental or demote if one operation dispatches twice, uncertainty is reported as definite rejection, a later phone Send reuses the earlier action or is blocked by phone storage, or the focused commands flake without a diagnosed harness defect."
     },
     {
       "id": "agent-session.completed-turn-duration",
@@ -3788,9 +3780,7 @@
         },
         {
           "file": "src/main/system-resume-broadcast.test.ts",
-          "assertions": [
-            "publishes suspend and resume to main-process lifecycle consumers"
-          ]
+          "assertions": ["publishes suspend and resume to main-process lifecycle consumers"]
         },
         {
           "file": "src/main/system-power-lifecycle.test.ts",
@@ -5067,9 +5057,7 @@
         },
         {
           "file": "src/cli/runtime/serve-signal-exit-diagnostic.test.ts",
-          "assertions": [
-            "late update handoff failure cannot rearm termination after child exit"
-          ]
+          "assertions": ["late update handoff failure cannot rearm termination after child exit"]
         },
         {
           "file": "src/main/serve-update-handoff.test.ts",
@@ -5485,10 +5473,7 @@
       "coveredPlatforms": ["macos"],
       "coveredProviders": ["remote-runtime"],
       "coverageNotes": "Deterministic main-IPC contract tests cover disconnect-driven close delivery, exactly-once close, per-subscription teardown isolation against a failing socket close and a throwing liveness probe, containment of a throwing renderer send on the unguarded host-close path, and continued suppression of stale payloads from a retired transport. A headed paired-server journey (real Orca host plus a separate paired Orca desktop client) covers hidden-but-mounted reveal, cold-parked reveal, and cold-parked reveal across a disconnect/reconnect. Live Linux and Windows paired-server evidence and real sleep/wake transport loss remain uncollected.",
-      "motivatingLinks": [
-        "tests/e2e/paired-remote-terminal-parked-reveal-interactivity.spec.ts",
-        "docs/reference/headless-linux-server.md"
-      ],
+      "motivatingLinks": ["tests/e2e/paired-remote-terminal-parked-reveal-interactivity.spec.ts"],
       "invariant": "Every renderer-held runtime subscription receives exactly one terminal close event when its transport is retired, including when the retirement advanced the transport generation first, and a single failing teardown never abandons that environment's remaining subscriptions nor escapes into the transport that reported the close. Payload frames from a retired transport stay suppressed. A revealed remote terminal therefore reattaches over a live multiplex connection: its buffer restores, typed input reaches the host PTY, the echo paints without a tab flip, and the PTY converges on the revealed pane grid.",
       "oracle": "The main IPC contract test subscribes terminal.multiplex through the real handler, disconnects the environment, and asserts the renderer received exactly one {type: close} subscription event. Two isolation tests subscribe a second stream to the same environment and make the first one fail -- in its socket close, and in the liveness probe inside notifyClosed -- then assert the disconnect does not throw, both transports closed, and every close the renderer could still receive was delivered. A third drives a host-initiated close through the transport callback, which is the one notifyClosed call site with no surrounding guard, with a renderer send that throws, and asserts it cannot escape into the WebSocket close handler. A fourth test asserts that after retirement a late response frame is not forwarded and a late transport close does not re-send. The paired-server journey runs three reveal scenarios against one real host and one real paired desktop client, and for each records buffer restore, host-side receipt of the typed marker through an out-of-band host sink file, live paint without a tab flip, and PTY-versus-pane grid convergence.",
       "commands": [
@@ -12626,9 +12611,7 @@
         },
         {
           "file": "src/main/ipc/pty-startup-barrier-and-listing.test.ts",
-          "assertions": [
-            "global inventory starts local and SSH provider listings concurrently"
-          ]
+          "assertions": ["global inventory starts local and SSH provider listings concurrently"]
         },
         {
           "file": "src/renderer/src/components/status-bar/resource-session-inventory.test.ts",
@@ -21095,9 +21078,7 @@
         },
         {
           "file": "src/main/browser/agent-browser-bridge-tab-routing.test.ts",
-          "assertions": [
-            "closing a tab retires the exact named agent-browser session"
-          ]
+          "assertions": ["closing a tab retires the exact named agent-browser session"]
         },
         {
           "file": "src/main/startup/serve-signal-handlers.test.ts",
@@ -21536,9 +21517,7 @@
         },
         {
           "file": "config/scripts/verify-packaged-browser-participation.test.mjs",
-          "assertions": [
-            "reject missing, substituted, skipped and retried scenarios"
-          ]
+          "assertions": ["reject missing, substituted, skipped and retried scenarios"]
         }
       ],
       "evidenceRuns": [
@@ -21600,15 +21579,11 @@
         "gh run view 34074017928 --log",
         "pnpm exec playwright test --config tests/playwright.config.ts tests/e2e/terminal-hangul-terminating-digit-native.spec.ts --project=electron-headful --workers=1 --repeat-each=3 --retries=0 --reporter=list,json"
       ],
-      "testFiles": [
-        "tests/e2e/terminal-hangul-terminating-digit-native.spec.ts"
-      ],
+      "testFiles": ["tests/e2e/terminal-hangul-terminating-digit-native.spec.ts"],
       "assertionRefs": [
         {
           "file": "tests/e2e/terminal-hangul-terminating-digit-native.spec.ts",
-          "assertions": [
-            "a digit typed right after a Hangul syllable reaches the pty"
-          ]
+          "assertions": ["a digit typed right after a Hangul syllable reaches the pty"]
         }
       ],
       "evidenceRuns": [
diff --git a/config/scripts/build-orcad.mjs b/config/scripts/build-orcad.mjs
index cf1c744d3b4b..96a46677626f 100644
--- a/config/scripts/build-orcad.mjs
+++ b/config/scripts/build-orcad.mjs
@@ -1,9 +1,10 @@
 #!/usr/bin/env node
-// Package orcad for the pinned Node; keep module loading compatible with legacy Node launchers.
+// Package the server separately from its compatibility launcher.
 import { fork, spawnSync } from 'node:child_process'
 import { build } from 'esbuild'
 import {
   buildOrcadEntry,
+  buildOrcadLauncher,
   externalNativeAddons,
   ORCAD_EXTERNAL_MODULES,
   ORCAD_CHILD_ENTRY_POINTS
@@ -30,6 +31,8 @@ import {
   ORCAD_EMOJI_SHORTCODE_DATASET,
   ORCAD_FOREIGN_SQLITE_READER_ENTRY,
   ORCAD_PORT_SCAN_COMMAND_WORKER_ENTRY,
+  ORCAD_LAUNCHER_FILENAME,
+  ORCAD_SERVER_ENTRY_FILENAME,
   ORCAD_NODE_PTY_DIR,
   ORCAD_NODE_PTY_JS_ARTIFACTS,
   ORCAD_NODE_RUNTIME_MARKER_FILENAME,
@@ -67,7 +70,8 @@ const FOREIGN_SQLITE_READER_OUT_FILE = join(OUT_DIR, ORCAD_FOREIGN_SQLITE_READER
 // and `resolveWorkerEntryPath` looks for it next to the running bundle.
 const PORT_SCAN_WORKER_ENTRY = join(ROOT, ORCAD_CHILD_ENTRY_POINTS.portScanCommandWorker)
 const PORT_SCAN_WORKER_OUT_FILE = join(OUT_DIR, ORCAD_PORT_SCAN_COMMAND_WORKER_ENTRY)
-const OUT_FILE = join(OUT_DIR, 'orcad.js')
+const OUT_FILE = join(OUT_DIR, ORCAD_LAUNCHER_FILENAME)
+const SERVER_OUT_FILE = join(OUT_DIR, ORCAD_SERVER_ENTRY_FILENAME)
 const BUILD_TARGET = process.env.ORCAD_BUILD_TARGET
 if (!BUILD_TARGET) {
   throw new Error('ORCAD_BUILD_TARGET is required; run `pnpm build:orcad`')
@@ -189,6 +193,9 @@ if (existsSync(AGENT_BROWSER_SOURCE) && process.env.ORCAD_OMIT_AGENT_BROWSER !==
 cpSync(join(ROOT, 'resources', 'licenses', 'ripgrep'), join(OUT_DIR, 'ripgrep', 'licenses'), {
   recursive: true
 })
+cpSync(join(ROOT, 'resources', 'native-chat-visuals'), join(OUT_DIR, 'native-chat-visuals'), {
+  recursive: true
+})
 
 /** Why one call per child and not one `outdir` build: esbuild mirrors each entry's source
  *  directory under `outdir`, and both children must land flat beside orcad.js — that is where
@@ -226,7 +233,8 @@ const childResults = await Promise.all([
   )
 ])
 
-const result = await buildOrcadEntry(OUT_FILE)
+const result = await buildOrcadEntry(SERVER_OUT_FILE)
+const launcherResult = await buildOrcadLauncher(OUT_FILE)
 
 const output = Object.values(result.metafile.outputs).find(
   (o) => o.entryPoint === 'src/main/orcad/main.ts'
@@ -251,7 +259,11 @@ function collectImporters(metafiles, matches) {
   return importers
 }
 
-const metafiles = [result.metafile, ...childResults.map((child) => child.metafile)]
+const metafiles = [
+  launcherResult.metafile,
+  result.metafile,
+  ...childResults.map((child) => child.metafile)
+]
 const electronImporters = collectImporters(
   metafiles,
   (specifier) => specifier === 'electron' || specifier.startsWith('electron/')
@@ -291,7 +303,7 @@ if (graphErrors.length > 0) {
   // Node's uncaught-exception report echoes that whole line — which contains every string
   // literal in the bundle. A crash therefore "matches" any expected message, and a textual
   // assertion passes against a bundle that never loaded.
-  const smoke = spawnSync(process.execPath, [OUT_FILE, '--orcad-smoke-load-check'], {
+  const smoke = spawnSync(process.execPath, [SERVER_OUT_FILE, '--orcad-smoke-load-check'], {
     encoding: 'utf8',
     timeout: 60_000
   })
diff --git a/config/scripts/check-runtime-electron-ratchet.mjs b/config/scripts/check-runtime-electron-ratchet.mjs
index 8c20cb8e8c28..d3a86cbb210e 100644
--- a/config/scripts/check-runtime-electron-ratchet.mjs
+++ b/config/scripts/check-runtime-electron-ratchet.mjs
@@ -49,7 +49,9 @@ export const STRUCTURED_CHAT_LANES = [
   { directory: ['src', 'shared'] },
   { directory: ['src', 'main', 'runtime'], basename: /^(?:structured-|agent-session-)/ },
   { directory: ['src', 'main', 'provider-process'] },
-  { directory: ['src', 'main', 'acp'] }
+  { directory: ['src', 'main', 'acp'] },
+  { directory: ['src', 'main', 'jsonl-rpc'] },
+  { directory: ['src', 'main', 'pi'], basename: /^rpc-/ }
 ]
 
 export function collectStructuredChatEntryPoints(root = ROOT) {
diff --git a/config/scripts/check-runtime-electron-ratchet.test.mjs b/config/scripts/check-runtime-electron-ratchet.test.mjs
index 9f9e81f0f40b..82941bab2905 100644
--- a/config/scripts/check-runtime-electron-ratchet.test.mjs
+++ b/config/scripts/check-runtime-electron-ratchet.test.mjs
@@ -39,6 +39,8 @@ describe('structured chat coverage', () => {
     'src/main/runtime/structured-agent-session-host.ts': 'export {}',
     'src/main/provider-process/provider-process-teardown.ts': 'export {}',
     'src/main/acp/acp-structured-session-adapter.ts': 'export {}',
+    'src/main/jsonl-rpc/peer.ts': 'export {}',
+    'src/main/pi/rpc-launch.ts': 'export {}',
     'src/shared/agent-session-record.ts': 'export {}'
   }
 
@@ -55,7 +57,8 @@ describe('structured chat coverage', () => {
       'src/main/runtime/structured-agent-runtime-registrations.ts',
       'src/main/runtime/rpc/methods/structured-agent-session-agents.ts',
       'src/main/acp/adapter.ts',
-      'src/main/provider-process/worker.ts'
+      'src/main/provider-process/worker.ts',
+      'src/main/jsonl-rpc/nested/dialect.ts'
     ]
     const excluded = [
       'src/main/native-chat/reader.test.ts',
@@ -73,7 +76,10 @@ describe('structured chat coverage', () => {
       'src/main/runtime/orca-runtime-tests/structured-agent-session-host.ts',
       'src/shared/types.d.ts',
       'src/main/runtime/other.ts',
-      'src/main/runtime/rpc/methods/browser.ts'
+      'src/main/runtime/rpc/methods/browser.ts',
+      'src/main/jsonl-rpc/peer.test.ts',
+      'src/main/pi/rpc-launch.test.ts',
+      'src/main/pi/titlebar-extension-service.ts'
     ]
     const root = fixture(
       Object.fromEntries([...sources, ...excluded].map((file) => [file, 'export {}']))
@@ -90,7 +96,9 @@ describe('structured chat coverage', () => {
         Object.entries(requiredLanes).filter(([file]) => !file.startsWith(`${lane}/`))
       )
       expect(() => collectStructuredChatEntryPoints(fixture(without))).toThrow(`${lane} is missing`)
-      expect(collectStructuredChatEntryPoints(fixture(requiredLanes))).toHaveLength(7)
+      expect(collectStructuredChatEntryPoints(fixture(requiredLanes))).toHaveLength(
+        Object.keys(requiredLanes).length
+      )
     }
   )
 
@@ -101,6 +109,8 @@ describe('structured chat coverage', () => {
         ...requiredLanes,
         'src/main/acp/adapter.ts': "import 'acp-desktop-package'",
         'src/main/provider-process/worker.ts': "import 'provider-desktop-package'",
+        'src/main/jsonl-rpc/peer.ts': "import 'rpc-desktop-package'",
+        'src/main/pi/rpc-launch.ts': "import 'pi-desktop-package'",
         'node_modules/acp-desktop-package/package.json': JSON.stringify({
           main: 'index.js',
           sideEffects
@@ -110,12 +120,24 @@ describe('structured chat coverage', () => {
           main: 'index.js',
           sideEffects
         }),
-        'node_modules/provider-desktop-package/index.js': "require('electron')"
+        'node_modules/provider-desktop-package/index.js': "require('electron')",
+        'node_modules/rpc-desktop-package/package.json': JSON.stringify({
+          main: 'index.js',
+          sideEffects
+        }),
+        'node_modules/rpc-desktop-package/index.js': "require('electron')",
+        'node_modules/pi-desktop-package/package.json': JSON.stringify({
+          main: 'index.js',
+          sideEffects
+        }),
+        'node_modules/pi-desktop-package/index.js': "require('electron')"
       })
       const current = await collectElectronImporters(collectStructuredChatEntryPoints(root))
       expect(current.map((file) => file.split('/node_modules/').pop())).toEqual([
         'acp-desktop-package/index.js',
-        'provider-desktop-package/index.js'
+        'pi-desktop-package/index.js',
+        'provider-desktop-package/index.js',
+        'rpc-desktop-package/index.js'
       ])
     }
   )
diff --git a/config/scripts/check-runtime-launcher-protocol-ratchet.mjs b/config/scripts/check-runtime-launcher-protocol-ratchet.mjs
index a26a5d87aa31..d289819fe67b 100644
--- a/config/scripts/check-runtime-launcher-protocol-ratchet.mjs
+++ b/config/scripts/check-runtime-launcher-protocol-ratchet.mjs
@@ -12,6 +12,8 @@ import { DAEMON_PROTOCOL_SOURCE_PATH, parseDaemonProtocolFacts } from './daemon-
 export const RUNTIME_LAUNCHER_PATHS = [
   // orcad handoff to its bundled runtime, and the pinned runtimes it can hand off to.
   'src/main/orcad/orcad-bundled-runtime.ts',
+  'src/main/orcad/launcher.ts',
+  'config/scripts/orcad-entry-build.mjs',
   'src/shared/node-runtime-pin.ts',
   'src/main/ssh/pinned-runtime-materializer.ts',
   'src/main/ssh/runtime-archive-download.ts',
diff --git a/config/scripts/ci-cache-warmup-workflow.test.mjs b/config/scripts/ci-cache-warmup-workflow.test.mjs
index 01b6c214e5d2..5c626caa703e 100644
--- a/config/scripts/ci-cache-warmup-workflow.test.mjs
+++ b/config/scripts/ci-cache-warmup-workflow.test.mjs
@@ -85,6 +85,18 @@ it('lets scheduled warmers wait while pushes, PR updates, and manual runs can re
   })
 })
 
+it('keeps compiler changes validated without starting warmers for test-only edits', () => {
+  for (const event of ['push', 'pull_request']) {
+    const paths = workflow.on[event].paths
+    expect(paths).toContain('config/scripts/headless-detector-compiler-cache.mjs')
+    expect(paths).not.toContain('config/scripts/headless-detector-compiler-cache*')
+    expect(paths).not.toContain('config/scripts/headless-detector-compiler-cache.test.mjs')
+    expect(paths).not.toContain('config/scripts/ci-cache-warmup-workflow.test.mjs')
+    expect(paths).toContain('.github/workflows/ci-cache-warmup.yml')
+    expect(paths).toContain('.github/actions/prepare-headless-compiler/**')
+  }
+})
+
 it('warms and probes both Windows images with the persistence job runtime', () => {
   const job = workflow.jobs['warm-windows']
   expect(job.strategy.matrix.os).toEqual(
diff --git a/config/scripts/ci-e2e-job-selection.mjs b/config/scripts/ci-e2e-job-selection.mjs
index e2e207ce58bb..53747f9d496d 100644
--- a/config/scripts/ci-e2e-job-selection.mjs
+++ b/config/scripts/ci-e2e-job-selection.mjs
@@ -21,10 +21,12 @@ export const DOCKER_SSH_E2E_SPECS = [
   'tests/e2e/ssh-lost-kill-tab-resurrection.spec.ts',
   'tests/e2e/ssh-pi-compatible-agent-title.spec.ts',
   'tests/e2e/ssh-port-forward-lifecycle.spec.ts',
+  'tests/e2e/ssh-reattach-home-partition.spec.ts',
   'tests/e2e/ssh-reconnect-tab-destruction.spec.ts',
   'tests/e2e/ssh-restart-tab-accumulation.spec.ts',
   'tests/e2e/ssh-skill-installation.spec.ts',
   'tests/e2e/ssh-stale-resume-execution-host-scope.spec.ts',
+  'tests/e2e/ssh-startup-local-shadow.spec.ts',
   'tests/e2e/ssh-terminal-window-wake-stale-grid-repro.spec.ts',
   'tests/e2e/terminal-inline-images-ssh.spec.ts',
   'tests/e2e/ssh-docker-watcher-isolation.spec.ts',
diff --git a/config/scripts/ci-shard-timings.json b/config/scripts/ci-shard-timings.json
index 0badaf6a7583..41039fa66f34 100644
--- a/config/scripts/ci-shard-timings.json
+++ b/config/scripts/ci-shard-timings.json
@@ -7407,7 +7407,6 @@
       "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,
@@ -7632,7 +7631,6 @@
       "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,
diff --git a/config/scripts/ci-unit-plan.mjs b/config/scripts/ci-unit-plan.mjs
index 117231d99bc1..8b6ffebc8746 100644
--- a/config/scripts/ci-unit-plan.mjs
+++ b/config/scripts/ci-unit-plan.mjs
@@ -7,6 +7,11 @@ 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 requestedCount = env.ORCA_UNIT_FULL_SHARD_COUNT ?? String(FULL_SHARD_COUNT)
+  if (!['5', '10'].includes(requestedCount)) {
+    throw new Error('ORCA_UNIT_FULL_SHARD_COUNT must be 5 or 10')
+  }
+  const fullShardCount = Number(requestedCount)
   const files = discoverUnitFiles()
   let plan
   try {
@@ -28,7 +33,8 @@ export function prepareUnitPlan(env = process.env) {
       graph: collectUnitDependencyGraph,
       timings: readTimingBaseline('unit').timings,
       event,
-      mode: env.ORCA_UNIT_SELECTION_MODE
+      mode: env.ORCA_UNIT_SELECTION_MODE,
+      fullShardCount
     })
   } catch (error) {
     plan = {
@@ -39,9 +45,9 @@ export function prepareUnitPlan(env = process.env) {
       files,
       candidateFiles: files,
       executionFiles: files,
-      shards: Array.from({ length: FULL_SHARD_COUNT }, (_, index) => ({
+      shards: Array.from({ length: fullShardCount }, (_, index) => ({
         index: index + 1,
-        count: FULL_SHARD_COUNT
+        count: fullShardCount
       }))
     }
   }
diff --git a/config/scripts/ci-unit-plan.test.mjs b/config/scripts/ci-unit-plan.test.mjs
index eda7903ae1de..b5022628927f 100644
--- a/config/scripts/ci-unit-plan.test.mjs
+++ b/config/scripts/ci-unit-plan.test.mjs
@@ -77,3 +77,46 @@ it.each([true, false])(
     }
   }
 )
+
+it.each(['5', '10', 'invalid'])(
+  'validates the requested full shard count and keeps fallback coverage: %s',
+  (requestedCount) => {
+    const root = mkdtempSync(join(tmpdir(), 'orca-unit-count-'))
+    try {
+      mkdirSync(join(root, 'src'))
+      writeFileSync(join(root, 'src/retained.test.ts'), 'export const retained = true')
+      const eventPath = join(root, 'event.json')
+      writeFileSync(eventPath, '{}')
+      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_FULL_SHARD_COUNT: requestedCount,
+          GITHUB_EVENT_NAME: 'workflow_dispatch',
+          GITHUB_EVENT_PATH: eventPath,
+          ORCA_SHARD_SOURCE_SHA: 'full-count-fixture'
+        }
+      })
+      if (requestedCount === 'invalid') {
+        expect(result.code).not.toBe(0)
+        expect(result.stderr).toContain('ORCA_UNIT_FULL_SHARD_COUNT must be 5 or 10')
+        return
+      }
+      expect(result.code, result.stderr).toBe(0)
+      const plan = JSON.parse(readFileSync(join(root, 'ci-shards/unit-selection.json'), 'utf8'))
+      expect(plan.mode).toBe('shadow')
+      expect(plan.executionFiles).toEqual(['src/retained.test.ts'])
+      expect(plan.shards).toEqual(
+        Array.from({ length: Number(requestedCount) }, (_, index) => ({
+          index: index + 1,
+          count: Number(requestedCount)
+        }))
+      )
+    } finally {
+      rmSync(root, { recursive: true, force: true })
+    }
+  }
+)
diff --git a/config/scripts/ci-unit-selection-review.test.mjs b/config/scripts/ci-unit-selection-review.test.mjs
index ff8f4c385687..0e7536e0578b 100644
--- a/config/scripts/ci-unit-selection-review.test.mjs
+++ b/config/scripts/ci-unit-selection-review.test.mjs
@@ -53,3 +53,19 @@ it('does not call incomplete, duplicate, interrupted or selected evidence a full
     expect(reviewUnitSelection(rows).every((row) => !row.completeFullRun)).toBe(true)
   }
 })
+
+it('requires all ten full assignments exactly once for complete evidence', () => {
+  const files = Array.from({ length: 10 }, (_, index) => `retained-${index}.test.ts`)
+  const tenPlan = { ...plan, files, candidateFiles: files }
+  const records = files.map((file, index) => {
+    const row = record(index + 1, file, 'passed')
+    return {
+      ...row,
+      plan: tenPlan,
+      timing: { ...row.timing, shard: { index: index + 1, count: 10 } }
+    }
+  })
+  expect(reviewUnitSelection(records)[0].completeFullRun).toBe(true)
+  expect(reviewUnitSelection(records.slice(0, -1))[0].completeFullRun).toBe(false)
+  expect(reviewUnitSelection([...records.slice(0, -1), records[0]])[0].completeFullRun).toBe(false)
+})
diff --git a/config/scripts/ci-unit-selection.mjs b/config/scripts/ci-unit-selection.mjs
index b531ec069caa..0d2bbe68c29b 100644
--- a/config/scripts/ci-unit-selection.mjs
+++ b/config/scripts/ci-unit-selection.mjs
@@ -35,16 +35,25 @@ export function selectUnitFiles(files, changed, graphInput) {
 // 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.
+// Full PR workflows request ten; daily callers and selected drafts retain five.
 export const FULL_SHARD_COUNT = 5
 
-export function planUnitSelection({ files, changed, graph, timings, event, mode = 'shadow' }) {
+export function planUnitSelection({
+  files,
+  changed,
+  graph,
+  timings,
+  event,
+  mode = 'shadow',
+  fullShardCount = FULL_SHARD_COUNT
+}) {
   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
+    : fullShardCount
   return {
     version: 1,
     mode: selected ? 'selected' : 'shadow',
diff --git a/config/scripts/ci-unit-selection.test.mjs b/config/scripts/ci-unit-selection.test.mjs
index 2f2b7726111c..f3764a54c1bf 100644
--- a/config/scripts/ci-unit-selection.test.mjs
+++ b/config/scripts/ci-unit-selection.test.mjs
@@ -120,6 +120,42 @@ describe('conservative unit selection', () => {
     )
   })
 
+  it('uses ten complete PR shards while selected drafts retain the five-shard cap', () => {
+    const expandedSources = new Map(sources)
+    for (let index = 0; index < 5; index++) {
+      expandedSources.set(`src/additional-${index}.test.ts`, `import './leaf'`)
+    }
+    const expandedGraph = {
+      ...buildUnitDependencyGraph(expandedSources),
+      files: new Set(expandedSources.keys())
+    }
+    const expandedFiles = [...expandedSources.keys()]
+      .filter((file) => file.endsWith('.test.ts'))
+      .sort()
+    const base = {
+      files: expandedFiles,
+      changed: ['src/leaf.ts'],
+      graph: expandedGraph,
+      fullShardCount: 10
+    }
+    const full = planUnitSelection({ ...base, timings: {} })
+    expect(full.executionFiles).toEqual(expandedFiles)
+    expect(full.shards).toEqual(
+      Array.from({ length: 10 }, (_, index) => ({ index: index + 1, count: 10 }))
+    )
+    const selected = planUnitSelection({
+      ...base,
+      timings: Object.fromEntries(expandedFiles.map((file) => [file, 1_800_000])),
+      mode: 'selected',
+      event: { pull_request: { draft: true } }
+    })
+    expect(selected.shards).toHaveLength(5)
+    expect(selected.executionFiles).toEqual(
+      selectUnitFiles(expandedFiles, ['src/leaf.ts'], expandedGraph).files
+    )
+    expect(selected.executionFiles.length).toBeGreaterThan(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(
diff --git a/config/scripts/claude-account-windows-spawn-repro.mjs b/config/scripts/claude-account-windows-spawn-repro.mjs
deleted file mode 100644
index eaf04762e5ba..000000000000
--- a/config/scripts/claude-account-windows-spawn-repro.mjs
+++ /dev/null
@@ -1,342 +0,0 @@
-import { spawn } from 'node:child_process'
-import { mkdtemp, mkdir, readFile, rm, writeFile } from 'node:fs/promises'
-import { tmpdir } from 'node:os'
-import { join } from 'node:path'
-import { buildWindowsCommandInvocation } from '../../src/main/claude-accounts/windows-command-invocation.ts'
-
-const strategy = process.argv[2]
-if (!['baseline', 'candidate', 'explicit-cmd'].includes(strategy)) {
-  throw new Error(
-    'Usage: node config/scripts/claude-account-windows-spawn-repro.mjs <baseline|candidate|explicit-cmd>'
-  )
-}
-if (process.platform !== 'win32') {
-  throw new Error('This reproduction requires a physical Windows host.')
-}
-
-const expectedArgs = [
-  '',
-  'two words',
-  'amp&ersand',
-  'pipe|value',
-  'less<value',
-  'greater>value',
-  'caret^value',
-  'trailing\\',
-  'two-trailing\\\\',
-  '(parentheses)',
-  '100%',
-  '%ORCA_ARG_TRAP%',
-  'bang!value',
-  '한글-λ'
-]
-const tempRoot = await mkdtemp(join(tmpdir(), 'orca-claude-spawn-'))
-const reportedDir = join(tempRoot, 'Profile with spaces 한글')
-const reportedCapturePath = join(reportedDir, 'capture.json')
-const reportedPidPath = join(reportedDir, 'pids.json')
-const reportedShimPath = join(reportedDir, 'claude fixture.cmd')
-const reportedFixturePath = join(reportedDir, 'capture-child.cjs')
-const fixtureDir = join(tempRoot, 'Profile space & ^ (paren) %ORCA_PATH_TRAP% !bang! 한글')
-const capturePath = join(fixtureDir, 'capture.json')
-const pidPath = join(fixtureDir, 'pids.json')
-const shimPath = join(fixtureDir, 'claude fixture.cmd')
-const fixturePath = join(fixtureDir, 'capture-child.cjs')
-const fixtureEnv = {
-  ...process.env,
-  CLAUDE_CONFIG_DIR: join(fixtureDir, 'config space & ^ (paren) %ORCA_ENV_LITERAL% !bang! 한글'),
-  ORCA_ARG_TRAP: 'EXPANDED_ARG',
-  ORCA_PATH_TRAP: 'EXPANDED_PATH',
-  ORCA_FIXTURE_CAPTURE: capturePath,
-  ORCA_FIXTURE_PIDS: pidPath,
-  ORCA_FIXTURE_NODE: process.execPath
-}
-const reportedEnv = {
-  ...fixtureEnv,
-  CLAUDE_CONFIG_DIR: join(reportedDir, 'config with spaces 한글'),
-  ORCA_FIXTURE_CAPTURE: reportedCapturePath,
-  ORCA_FIXTURE_PIDS: reportedPidPath
-}
-
-function quoteForCandidate(value) {
-  return `"${value.replace(/"/g, '""')}"`
-}
-
-function launch(args, command = shimPath, env = fixtureEnv) {
-  if (strategy === 'baseline') {
-    return spawn(command, args, { cwd: tempRoot, env, shell: true, windowsHide: true })
-  }
-  if (strategy === 'candidate') {
-    return spawn(quoteForCandidate(command), args, {
-      cwd: tempRoot,
-      env,
-      shell: true,
-      windowsHide: true
-    })
-  }
-  const invocation = buildWindowsCommandInvocation(command, args)
-  return spawn(invocation.command, invocation.args, {
-    cwd: tempRoot,
-    env,
-    shell: false,
-    windowsVerbatimArguments: invocation.windowsVerbatimArguments,
-    windowsHide: true
-  })
-}
-
-function collect(child) {
-  return new Promise((resolve) => {
-    let stdout = ''
-    let stderr = ''
-    child.stdout?.on('data', (chunk) => (stdout += chunk.toString()))
-    child.stderr?.on('data', (chunk) => (stderr += chunk.toString()))
-    child.on('error', (error) => resolve({ code: null, stdout, stderr, error: error.message }))
-    child.on('close', (code) => resolve({ code, stdout, stderr, error: null }))
-  })
-}
-
-async function waitForFile(path, timeoutMs = 5_000) {
-  const deadline = Date.now() + timeoutMs
-  while (Date.now() < deadline) {
-    try {
-      return JSON.parse(await readFile(path, 'utf8'))
-    } catch {
-      await new Promise((resolve) => setTimeout(resolve, 25))
-    }
-  }
-  throw new Error(`Timed out waiting for fixture output: ${path}`)
-}
-
-async function taskExists(pid) {
-  const result = await collect(
-    spawn('tasklist.exe', ['/fi', `PID eq ${pid}`, '/fo', 'csv', '/nh'], {
-      windowsHide: true
-    })
-  )
-  if (result.error || result.code !== 0) {
-    throw new Error(`tasklist failed for PID ${pid}: ${result.error ?? result.stderr}`)
-  }
-  return result.stdout.includes(`"${pid}"`)
-}
-
-async function killTree(pid) {
-  const result = await collect(
-    spawn('taskkill.exe', ['/pid', String(pid), '/t', '/f'], { windowsHide: true })
-  )
-  if (result.error || result.code !== 0) {
-    throw new Error(`taskkill failed for PID ${pid}: ${result.error ?? result.stderr}`)
-  }
-}
-
-async function waitForTreeExit(pids, timeoutMs = 5_000) {
-  const deadline = Date.now() + timeoutMs
-  let alive = {}
-  do {
-    alive = Object.fromEntries(
-      await Promise.all(
-        Object.entries(pids).map(async ([name, pid]) => [name, await taskExists(pid)])
-      )
-    )
-    if (!Object.values(alive).some(Boolean)) {
-      return alive
-    }
-    await new Promise((resolve) => setTimeout(resolve, 50))
-  } while (Date.now() < deadline)
-  return alive
-}
-
-const results = {
-  strategy,
-  reportedPath: null,
-  pathMatrix: {},
-  argvMatrix: {},
-  hostilePathAndArgv: null,
-  error: null,
-  cancellation: null
-}
-const fixtureSource =
-  `const { spawn } = require('node:child_process')\n` +
-  `const { writeFileSync } = require('node:fs')\n` +
-  `if (process.argv[2] === '--exit-error') { process.stderr.write('fixture error: 한글 & ^ % !\\n'); process.exit(23) }\n` +
-  `if (process.argv[2] === '--linger') {\n` +
-  `  const grandchild = spawn(process.execPath, ['-e', 'setInterval(() => {}, 1000)'], { windowsHide: true })\n` +
-  `  writeFileSync(process.env.ORCA_FIXTURE_PIDS, JSON.stringify({ child: process.pid, grandchild: grandchild.pid }))\n` +
-  `  setInterval(() => {}, 1000)\n` +
-  `} else {\n` +
-  `  writeFileSync(process.env.ORCA_FIXTURE_CAPTURE, JSON.stringify({ argv: process.argv.slice(2), configDir: process.env.CLAUDE_CONFIG_DIR }))\n` +
-  `}\n`
-const shimSource = '@echo off\r\n"%ORCA_FIXTURE_NODE%" "%~dp0capture-child.cjs" %*\r\n'
-let lingeringShellPid = null
-try {
-  await mkdir(fixtureDir, { recursive: true })
-  await mkdir(reportedDir, { recursive: true })
-  await writeFile(fixturePath, fixtureSource, 'utf8')
-  await writeFile(shimPath, shimSource, 'utf8')
-  await writeFile(reportedFixturePath, fixtureSource, 'utf8')
-  await writeFile(reportedShimPath, shimSource, 'utf8')
-
-  const reportedArgs = ['auth', 'status', '--json']
-  const reportedRun = await collect(launch(reportedArgs, reportedShimPath, reportedEnv))
-  let reportedCapture = null
-  try {
-    reportedCapture = await waitForFile(reportedCapturePath, 1_000)
-  } catch {}
-  results.reportedPath = {
-    ...reportedRun,
-    actual: reportedCapture,
-    expected: { argv: reportedArgs, configDir: reportedEnv.CLAUDE_CONFIG_DIR },
-    pass:
-      reportedRun.code === 0 &&
-      JSON.stringify(reportedCapture) ===
-        JSON.stringify({ argv: reportedArgs, configDir: reportedEnv.CLAUDE_CONFIG_DIR })
-  }
-
-  for (const [name, segment] of Object.entries({
-    spaces: 'profile space',
-    ampersand: 'profile&name',
-    caret: 'profile^name',
-    parentheses: 'profile(name)',
-    percent: 'profile%ORCA_PATH_TRAP%',
-    bang: 'profile!name',
-    unicode: 'profile-한글-λ'
-  })) {
-    const directory = join(tempRoot, segment)
-    const captureFile = join(directory, 'capture.json')
-    const command = join(directory, 'claude fixture.cmd')
-    await mkdir(directory, { recursive: true })
-    await writeFile(join(directory, 'capture-child.cjs'), fixtureSource, 'utf8')
-    await writeFile(command, shimSource, 'utf8')
-    const env = {
-      ...fixtureEnv,
-      CLAUDE_CONFIG_DIR: join(directory, 'config'),
-      ORCA_FIXTURE_CAPTURE: captureFile
-    }
-    const run = await collect(launch(reportedArgs, command, env))
-    let actual = null
-    try {
-      actual = await waitForFile(captureFile, 500)
-    } catch {}
-    results.pathMatrix[name] = {
-      code: run.code,
-      stderr: run.stderr.trim(),
-      actual: actual?.argv ?? null,
-      pass: run.code === 0 && JSON.stringify(actual?.argv) === JSON.stringify(reportedArgs)
-    }
-  }
-
-  for (const [name, value] of Object.entries({
-    empty: '',
-    spaces: 'two words',
-    ampersand: 'amp&ersand',
-    pipe: 'pipe|value',
-    lessThan: 'less<value',
-    greaterThan: 'greater>value',
-    caret: 'caret^value',
-    trailingBackslash: 'trailing\\',
-    twoTrailingBackslashes: 'two-trailing\\\\',
-    parentheses: '(parentheses)',
-    percent: '%ORCA_ARG_TRAP%',
-    bang: 'bang!value',
-    unicode: '한글-λ'
-  })) {
-    const args = ['prefix', value, 'suffix']
-    const captureFile = join(reportedDir, `capture-${name}.json`)
-    const env = { ...reportedEnv, ORCA_FIXTURE_CAPTURE: captureFile }
-    const run = await collect(launch(args, reportedShimPath, env))
-    let actual = null
-    try {
-      actual = await waitForFile(captureFile, 500)
-    } catch {}
-    results.argvMatrix[name] = {
-      code: run.code,
-      stderr: run.stderr.trim(),
-      actual: actual?.argv ?? null,
-      pass: run.code === 0 && JSON.stringify(actual?.argv) === JSON.stringify(args)
-    }
-  }
-
-  const argvRun = await collect(launch(expectedArgs))
-  let capture = null
-  try {
-    capture = await waitForFile(capturePath, 1_000)
-  } catch {}
-  results.hostilePathAndArgv = {
-    ...argvRun,
-    actual: capture,
-    expected: { argv: expectedArgs, configDir: fixtureEnv.CLAUDE_CONFIG_DIR },
-    pass:
-      argvRun.code === 0 &&
-      JSON.stringify(capture) ===
-        JSON.stringify({ argv: expectedArgs, configDir: fixtureEnv.CLAUDE_CONFIG_DIR })
-  }
-
-  results.error = await collect(launch(['--exit-error'], reportedShimPath, reportedEnv))
-  results.error.pass =
-    results.error.code === 23 && results.error.stderr.includes('fixture error: 한글 & ^ % !')
-
-  const lingering = launch(['--linger'], reportedShimPath, reportedEnv)
-  lingeringShellPid = lingering.pid
-  const lingeringResult = collect(lingering)
-  try {
-    const pids = await waitForFile(reportedPidPath)
-    await killTree(lingering.pid)
-    const alive = await waitForTreeExit({
-      shell: lingering.pid,
-      child: pids.child,
-      grandchild: pids.grandchild
-    })
-    results.cancellation = {
-      shell: lingering.pid,
-      ...pids,
-      alive,
-      pass: !Object.values(alive).some(Boolean)
-    }
-  } catch (error) {
-    if (await taskExists(lingering.pid)) {
-      await killTree(lingering.pid)
-    }
-    const launchResult = await Promise.race([
-      lingeringResult,
-      new Promise((resolve) =>
-        setTimeout(
-          () => resolve({ code: null, error: 'fixture did not exit after cleanup' }),
-          5_000
-        )
-      )
-    ])
-    results.cancellation = {
-      shell: lingering.pid,
-      launchResult,
-      pass: false,
-      error: error instanceof Error ? error.message : String(error)
-    }
-  }
-} finally {
-  if (lingeringShellPid && (await taskExists(lingeringShellPid))) {
-    await killTree(lingeringShellPid)
-  }
-  try {
-    let pids
-    try {
-      pids = JSON.parse(await readFile(reportedPidPath, 'utf8'))
-    } catch {
-      pids = JSON.parse(await readFile(pidPath, 'utf8'))
-    }
-    for (const pid of [pids.child, pids.grandchild]) {
-      if (await taskExists(pid)) {
-        await killTree(pid)
-      }
-    }
-  } catch {}
-  await rm(tempRoot, { recursive: true, force: true })
-}
-
-console.log(JSON.stringify(results, null, 2))
-process.exitCode =
-  results.reportedPath?.pass &&
-  Object.values(results.pathMatrix).every((result) => result.pass) &&
-  Object.values(results.argvMatrix).every((result) => result.pass) &&
-  results.hostilePathAndArgv?.pass &&
-  results.error?.pass &&
-  results.cancellation?.pass
-    ? 0
-    : 1
diff --git a/config/scripts/headless-detector-compiler-cache.test.mjs b/config/scripts/headless-detector-compiler-cache.test.mjs
index 484807159a75..be7f7d2ba8ae 100644
--- a/config/scripts/headless-detector-compiler-cache.test.mjs
+++ b/config/scripts/headless-detector-compiler-cache.test.mjs
@@ -82,6 +82,11 @@ it('activates only the actual compiler packages and preserves import graph behav
       join(root, 'config', 'scripts', `${name}.mjs`)
     )
   }
+  mkdirSync(join(root, 'src', 'shared'), { recursive: true })
+  cpSync(
+    new URL('../../src/shared/orcad-artifacts.ts', import.meta.url),
+    join(root, 'src', 'shared', 'orcad-artifacts.ts')
+  )
   writeFileSync(
     join(root, 'entry.ts'),
     "import './first'; export * from './exports'; import('./dynamic'); require('./required'); import 'external-package'; import './native.node'"
diff --git a/config/scripts/mobile-mirrored-storage-write-path.test.mjs b/config/scripts/mobile-mirrored-storage-write-path.test.mjs
index d626677cbec9..b67c82ceea77 100644
--- a/config/scripts/mobile-mirrored-storage-write-path.test.mjs
+++ b/config/scripts/mobile-mirrored-storage-write-path.test.mjs
@@ -31,7 +31,6 @@ const MIRRORED_WRITERS = [
     keys: ['TERMINAL_ACCESSORY_LAYOUT_STORAGE_KEY']
   },
   { file: 'src/components/CustomKeyModal.tsx', keys: ['CUSTOM_ACCESSORY_KEYS_STORAGE_KEY'] },
-  { file: 'src/session/mobile-structured-send-operation-journal.ts', keys: ['STORAGE_KEY'] },
   {
     file: 'src/worktree/last-visited-worktree-repo.ts',
     keys: ['LAST_VISITED_WORKTREE_STORAGE_KEY']
diff --git a/config/scripts/mobile-web-app-session-render.test.mjs b/config/scripts/mobile-web-app-session-render.test.mjs
index 9bf1560141f4..a18ccf93c031 100644
--- a/config/scripts/mobile-web-app-session-render.test.mjs
+++ b/config/scripts/mobile-web-app-session-render.test.mjs
@@ -374,7 +374,6 @@ describeRender(
  * `mobile-web-app-screencast-lane-grant.test.mjs` derives from this closure.
  *
  * **The storage refusals a control makes.** The case above covers the writes a mount makes on its
- * own; a refusal a user's own write earns still needs the control. That chain is
- * `mobile/src/session/mobile-structured-send-page-storage-refusal.test.ts` end to end over the
- * real `page-async-storage`.
+ * own; store-level write refusals are covered by
+ * `mobile/src/mobile-web-shell/bridge/page-async-storage.test.ts`.
  */
diff --git a/config/scripts/mobile-web-bundle-packaging-workflow-contract.test.mjs b/config/scripts/mobile-web-bundle-packaging-workflow-contract.test.mjs
index dd8541d6425d..120e0c49e7d5 100644
--- a/config/scripts/mobile-web-bundle-packaging-workflow-contract.test.mjs
+++ b/config/scripts/mobile-web-bundle-packaging-workflow-contract.test.mjs
@@ -99,6 +99,7 @@ const EXPECTED_PACKAGING_JOBS = [
   'release-cut.yml build',
   'release-mac-build.yml build-mac',
   'win-crash-survival-e2e.yml crash-survival',
+  'win-orcad-serve-switch-e2e.yml serve-switch',
   'win-update-survival-e2e.yml survival',
   'windows-signing-rehearsal.yml rehearse'
 ]
diff --git a/config/scripts/node-pty-windows-pty-teardown-patch.test.mjs b/config/scripts/node-pty-windows-pty-teardown-patch.test.mjs
index d9ee133a70e3..fc0894d58f6b 100644
--- a/config/scripts/node-pty-windows-pty-teardown-patch.test.mjs
+++ b/config/scripts/node-pty-windows-pty-teardown-patch.test.mjs
@@ -10,8 +10,8 @@
 // Those numbers are the `!useConptyDll` branch, which is the branch a RELAY runs. Every desktop
 // site that opens a terminal pane sets `useConptyDll: true` and takes the other branch, where
 // upstream already destroys the input socket. The hidden rate-limit probe
-// (`src/main/rate-limits/claude-pty.ts`) does omit the option and so does run this hunk, but no
-// user-visible pane does. The divergence pinned below is about which
+// (`src/main/rate-limits/codex-pty-rate-limit-probe.ts`) does omit the option and so does run this
+// hunk, but no user-visible pane does. The divergence pinned below is about which
 // branch each host runs for terminals -- not about a regression in the panes users open.
 import { createRequire } from 'node:module'
 import { existsSync, mkdirSync, mkdtempSync, readFileSync, rmSync, writeFileSync } from 'node:fs'
diff --git a/config/scripts/node-server-change-scope.mjs b/config/scripts/node-server-change-scope.mjs
index 71e788867e1b..0499796eab17 100644
--- a/config/scripts/node-server-change-scope.mjs
+++ b/config/scripts/node-server-change-scope.mjs
@@ -65,10 +65,18 @@ export function discoverNodeServerTests(root = ROOT) {
 }
 
 export async function collectNodeServerInputs({ root = ROOT, entryPoints } = {}) {
-  const [{ build }, { externalNativeAddons, ORCAD_CHILD_ENTRY_POINTS, ORCAD_ENTRY_POINT }] =
-    await Promise.all([import('esbuild'), import('./orcad-entry-build.mjs')])
+  const [
+    { build },
+    {
+      externalNativeAddons,
+      ORCAD_CHILD_ENTRY_POINTS,
+      ORCAD_ENTRY_POINT,
+      ORCAD_LAUNCHER_ENTRY_POINT
+    }
+  ] = await Promise.all([import('esbuild'), import('./orcad-entry-build.mjs')])
   const entries = entryPoints ?? [
     ORCAD_ENTRY_POINT,
+    ORCAD_LAUNCHER_ENTRY_POINT,
     ...Object.values(ORCAD_CHILD_ENTRY_POINTS),
     ...BUILD_SCRIPTS,
     ...discoverNodeServerTests(root)
diff --git a/config/scripts/node-server-test-paths.mjs b/config/scripts/node-server-test-paths.mjs
index 8d9e8eb67102..9e51b23af9ce 100644
--- a/config/scripts/node-server-test-paths.mjs
+++ b/config/scripts/node-server-test-paths.mjs
@@ -31,6 +31,7 @@ export function nodeServerTestPaths({ artifact = false, crossRuntime = false } =
           'src/main/orcad/orcad-packaged-node-pty.integration.test.ts',
           'src/main/providers/agent-foreground-process-git-bash.win32.test.ts',
           'src/main/orcad/orcad-node-launcher.integration.test.ts',
+          'src/main/orcad/orcad-launcher-isolation.integration.test.ts',
           'src/main/orcad/orcad-stop-request-shutdown.integration.test.ts',
           'src/main/orcad/orcad-windows-conpty-breakaway.integration.test.ts',
           'src/main/orcad/orcad-serve-parity.integration.test.ts',
diff --git a/config/scripts/orcad-entry-build.mjs b/config/scripts/orcad-entry-build.mjs
index 90767764d21c..a746ac4bb5b2 100644
--- a/config/scripts/orcad-entry-build.mjs
+++ b/config/scripts/orcad-entry-build.mjs
@@ -1,9 +1,13 @@
 import { build } from 'esbuild'
-import { join } from 'node:path'
+import { createHash } from 'node:crypto'
+import { readFileSync } from 'node:fs'
+import { dirname, join } from 'node:path'
+import { ORCAD_SERVER_ENTRY_FILENAME } from '../../src/shared/orcad-artifacts.ts'
 
 const root = join(import.meta.dirname, '..', '..')
 
 export const ORCAD_ENTRY_POINT = 'src/main/orcad/main.ts'
+export const ORCAD_LAUNCHER_ENTRY_POINT = 'src/main/orcad/launcher.ts'
 export const ORCAD_CHILD_ENTRY_POINTS = {
   watcher: 'src/main/ipc/parcel-watcher-process-entry.ts',
   daemon: 'src/main/daemon/daemon-entry.ts',
@@ -50,3 +54,22 @@ export function buildOrcadEntry(outfile) {
     logLevel: 'error'
   })
 }
+
+export function buildOrcadLauncher(outfile) {
+  const serverSha256 = createHash('sha256')
+    .update(readFileSync(join(dirname(outfile), ORCAD_SERVER_ENTRY_FILENAME)))
+    .digest('hex')
+  return build({
+    entryPoints: [join(root, ORCAD_LAUNCHER_ENTRY_POINT)],
+    bundle: true,
+    platform: 'node',
+    target: 'node18',
+    format: 'cjs',
+    outfile,
+    metafile: true,
+    minify: true,
+    sourcemap: false,
+    define: { ORCAD_SERVER_SHA256: JSON.stringify(serverSha256) },
+    logLevel: 'error'
+  })
+}
diff --git a/config/scripts/orcad-prebuild-slot-contents.mjs b/config/scripts/orcad-prebuild-slot-contents.mjs
index 4084d9fcc20e..8a6482e6e854 100644
--- a/config/scripts/orcad-prebuild-slot-contents.mjs
+++ b/config/scripts/orcad-prebuild-slot-contents.mjs
@@ -17,8 +17,8 @@ const require = createRequire(import.meta.url)
 export const MANIFEST_SCHEMA_VERSION = 2
 
 /**
- * Node 18, the rung C host floor, supports N-API 8 (9 only from 18.17). Pinned here rather
- * than left to the headers' default so a header bump cannot silently raise it.
+ * Keep N-API 8 stable across bundled and host runtimes rather than using the headers'
+ * default, so a header bump cannot silently change the shipped addon ABI.
  */
 export const SLOT_NAPI_VERSION = 8
 
diff --git a/config/scripts/orcad-prebuild-slot-contents.test.mjs b/config/scripts/orcad-prebuild-slot-contents.test.mjs
index 720a0436c3ef..af6f3b45f5e4 100644
--- a/config/scripts/orcad-prebuild-slot-contents.test.mjs
+++ b/config/scripts/orcad-prebuild-slot-contents.test.mjs
@@ -57,7 +57,7 @@ const next = (slot, overrides = {}) => ({
 })
 
 describe('N-API pinning', () => {
-  it('pins N-API 8 so a host Node 18 (rung C) can load every slot', () => {
+  it('keeps the N-API 8 addon ABI stable across runtime upgrades', () => {
     expect(SLOT_NAPI_VERSION).toBe(8)
     // The client's rung C host-Node gate must ask for exactly what the slots are built against.
     expect(ORCAD_ADDON_NAPI_VERSION).toBe(SLOT_NAPI_VERSION)
diff --git a/config/scripts/orcad-terminal-smoke-change-scope.mjs b/config/scripts/orcad-terminal-smoke-change-scope.mjs
index 3ece0aa5b3a9..45df389a372e 100644
--- a/config/scripts/orcad-terminal-smoke-change-scope.mjs
+++ b/config/scripts/orcad-terminal-smoke-change-scope.mjs
@@ -1,10 +1,15 @@
 import { readFileSync } from 'node:fs'
 import { pathToFileURL } from 'node:url'
 import { classifyNodeServerChanges, collectNodeServerInputs } from './node-server-change-scope.mjs'
-import { ORCAD_CHILD_ENTRY_POINTS, ORCAD_ENTRY_POINT } from './orcad-entry-build.mjs'
+import {
+  ORCAD_CHILD_ENTRY_POINTS,
+  ORCAD_ENTRY_POINT,
+  ORCAD_LAUNCHER_ENTRY_POINT
+} from './orcad-entry-build.mjs'
 
 const ENTRY_POINTS = [
   ORCAD_ENTRY_POINT,
+  ORCAD_LAUNCHER_ENTRY_POINT,
   ...Object.values(ORCAD_CHILD_ENTRY_POINTS),
   'src/cli/index.ts',
   'config/scripts/build-orcad-node.mjs',
diff --git a/config/scripts/pr-code-change-scope-cross-version-send-path.test.mjs b/config/scripts/pr-code-change-scope-cross-version-send-path.test.mjs
index b263b86f7899..2e0cd5444675 100644
--- a/config/scripts/pr-code-change-scope-cross-version-send-path.test.mjs
+++ b/config/scripts/pr-code-change-scope-cross-version-send-path.test.mjs
@@ -8,7 +8,6 @@ describe('cross-version wire routing for the send path', () => {
     'src/shared/agent-session-wire-refusals.ts',
     'src/shared/structured-agent-session-mutation.ts',
     'src/shared/structured-agent-session-send-mutation.ts',
-    'src/shared/structured-agent-session-outbox.ts',
     'src/main/runtime/rpc/core.ts',
     'src/main/runtime/rpc/errors.ts',
     'src/main/runtime/rpc/rpc-streaming-dispatcher.ts',
@@ -23,9 +22,7 @@ describe('cross-version wire routing for the send path', () => {
   })
 
   it.each([
-    'src/shared/structured-agent-session-outbox-admission.ts',
-    'src/shared/structured-agent-session-outbox-delivery.ts',
-    'src/shared/structured-agent-session-outbox-stop-withdrawal.ts',
+    'src/shared/structured-agent-session-send-evidence.ts',
     'src/shared/structured-agent-session-composer.ts',
     'src/shared/structured-agent-session-reducer.ts',
     'src/main/runtime/orchestration/send-agent-turn.ts',
diff --git a/config/scripts/pr-code-change-scope.mjs b/config/scripts/pr-code-change-scope.mjs
index 8b7446c6be40..2688928f5266 100644
--- a/config/scripts/pr-code-change-scope.mjs
+++ b/config/scripts/pr-code-change-scope.mjs
@@ -193,7 +193,6 @@ const CROSS_VERSION_WIRE_PREFIXES = [
   // fingerprint the host's ledger and journal re-derive.
   'src/shared/structured-agent-session-mutation.ts',
   'src/shared/structured-agent-session-send-mutation.ts',
-  'src/shared/structured-agent-session-outbox.ts',
   'src/shared/agent-session-record',
   'src/shared/agent-session-provider-handle',
   'src/shared/agent-session-journal-',
diff --git a/config/scripts/pr-preflight-gates.test.mjs b/config/scripts/pr-preflight-gates.test.mjs
index 37b2b9230810..443457a426a7 100644
--- a/config/scripts/pr-preflight-gates.test.mjs
+++ b/config/scripts/pr-preflight-gates.test.mjs
@@ -32,6 +32,7 @@ it('shares one setup and runs the unchanged compiler after static checks finish'
     'node config/scripts/ci-unit-plan.mjs'
   ])
   expect(plan.env.ORCA_UNIT_SELECTION_MODE).toContain('vars.ORCA_UNIT_SELECTION_MODE')
+  expect(plan.env.ORCA_UNIT_FULL_SHARD_COUNT).toBe("${{ vars.ORCA_UNIT_FULL_SHARD_COUNT || '10' }}")
   expect(steps.indexOf(plan)).toBeLessThan(steps.indexOf(compiler))
   expect(steps.indexOf(compiler)).toBeGreaterThan(
     steps.findIndex((step) => step.wait?.includes('localization-extraction'))
diff --git a/config/scripts/pr-workflow-parallelism.test.mjs b/config/scripts/pr-workflow-parallelism.test.mjs
index 7bc063b1d421..6c5ae84429c5 100644
--- a/config/scripts/pr-workflow-parallelism.test.mjs
+++ b/config/scripts/pr-workflow-parallelism.test.mjs
@@ -224,6 +224,27 @@ describe('PR workflow parallelism', () => {
     expect(installStep.run).toMatch(/timeout \d+ sudo apt-get install/)
   })
 
+  it('bounds package tooling refresh and keeps required installation fatal', () => {
+    const steps = workflow.jobs.package.steps
+    const installStep = steps.find((step) => step.id === 'linux-package-tools')
+    const commands = installStep.run
+      .split('\n')
+      .filter((line) => !line.trim().startsWith('#'))
+      .join('\n')
+
+    expect(installStep.background).toBe(true)
+    expect(commands).toContain('Acquire::http::Timeout "15";')
+    expect(commands).toContain('Acquire::https::Timeout "15";')
+    expect(commands).toContain('Acquire::Retries "1";')
+    expect(commands).toMatch(/^timeout 120 sudo apt-get update \|\| true$/m)
+    expect(commands).toMatch(/^timeout 300 sudo apt-get install -y cpio rpm$/m)
+    expect(commands.trim().split('\n').at(-1)).toBe('timeout 300 sudo apt-get install -y cpio rpm')
+    expect(steps.find((step) => step.wait?.includes('linux-package-tools')).wait).toEqual([
+      'linux-package-tools',
+      'web-client'
+    ])
+  })
+
   it('keeps every real-zsh test in the dedicated shell lane', () => {
     const discoveredFiles = globSync(testFilePatterns)
       // Why this file is excluded: it carries the detector pattern as a literal
diff --git a/config/scripts/profile-state-worker-smoke.mjs b/config/scripts/profile-state-worker-smoke.mjs
index 9071417145dd..18ac442ddca6 100644
--- a/config/scripts/profile-state-worker-smoke.mjs
+++ b/config/scripts/profile-state-worker-smoke.mjs
@@ -11,6 +11,7 @@ import {
   ORCAD_PROFILE_PREFLIGHT_FLAG,
   parseOrcadProfilePreflight
 } from '../../src/shared/orcad-profile-preflight.ts'
+import { ORCAD_SERVER_ENTRY_FILENAME } from '../../src/shared/orcad-artifacts.ts'
 import { NODE_RUNTIME_PIN } from '../../src/shared/node-runtime-pin.ts'
 
 async function initializeFixture(directory, databasePath, profileId) {
@@ -88,7 +89,7 @@ export async function smokeProfileStateWorkers(outDir, { timeoutMs = 30_000, run
     const nonce = randomUUID()
     const result = runProcessSync({
       program: runtimePath,
-      args: [join(outDir, 'orcad.js'), ORCAD_PROFILE_PREFLIGHT_FLAG, nonce],
+      args: [join(outDir, ORCAD_SERVER_ENTRY_FILENAME), ORCAD_PROFILE_PREFLIGHT_FLAG, nonce],
       env: { ...process.env, ORCA_BACKGROUND_LAUNCH: '1' },
       timeoutMs,
       maxOutputBytes: 64 * 1024
diff --git a/config/scripts/run-node-server-tests.mjs b/config/scripts/run-node-server-tests.mjs
index 2183b9665503..948635f1c187 100644
--- a/config/scripts/run-node-server-tests.mjs
+++ b/config/scripts/run-node-server-tests.mjs
@@ -2,7 +2,10 @@
 import { join, resolve } from 'node:path'
 import { randomUUID } from 'node:crypto'
 import { globSync, readFileSync } from 'node:fs'
-import { ORCAD_VERSION_FILENAME } from '../../src/shared/orcad-artifacts.ts'
+import {
+  ORCAD_SERVER_ENTRY_FILENAME,
+  ORCAD_VERSION_FILENAME
+} from '../../src/shared/orcad-artifacts.ts'
 import { NODE_RUNTIME_PIN } from '../../src/shared/node-runtime-pin.ts'
 import {
   ORCAD_PROFILE_PREFLIGHT_FLAG,
@@ -60,7 +63,7 @@ if (artifact) {
   const nonce = randomUUID()
   const result = runProcessSync({
     program: runtimePath,
-    args: [join(packageDir, 'orcad.js'), ORCAD_PROFILE_PREFLIGHT_FLAG, nonce],
+    args: [join(packageDir, ORCAD_SERVER_ENTRY_FILENAME), ORCAD_PROFILE_PREFLIGHT_FLAG, nonce],
     cwd: root,
     env,
     timeoutMs: 90_000
diff --git a/config/scripts/run-ssh-docker-e2e.mjs b/config/scripts/run-ssh-docker-e2e.mjs
index 72fbbb9d44f2..502ddf8acad0 100644
--- a/config/scripts/run-ssh-docker-e2e.mjs
+++ b/config/scripts/run-ssh-docker-e2e.mjs
@@ -71,12 +71,15 @@ const result = spawnSync(
     'tests/e2e/ssh-docker-transport-drop-recovery.spec.ts',
     'tests/e2e/ssh-external-image-preview.spec.ts',
     'tests/e2e/ssh-lost-kill-tab-resurrection.spec.ts',
+    'tests/e2e/ssh-native-chat-phone-history.spec.ts',
     'tests/e2e/ssh-pi-compatible-agent-title.spec.ts',
     'tests/e2e/ssh-port-forward-lifecycle.spec.ts',
+    'tests/e2e/ssh-reattach-home-partition.spec.ts',
     'tests/e2e/ssh-reconnect-tab-destruction.spec.ts',
     'tests/e2e/ssh-restart-tab-accumulation.spec.ts',
     'tests/e2e/ssh-skill-installation.spec.ts',
     'tests/e2e/ssh-stale-resume-execution-host-scope.spec.ts',
+    'tests/e2e/ssh-startup-local-shadow.spec.ts',
     'tests/e2e/ssh-terminal-window-wake-stale-grid-repro.spec.ts',
     'tests/e2e/terminal-inline-images-ssh.spec.ts',
     '--config',
diff --git a/config/scripts/runtime-serve-terminal-smoke.mjs b/config/scripts/runtime-serve-terminal-smoke.mjs
index 2b23115859ca..0c43f7d60c1e 100644
--- a/config/scripts/runtime-serve-terminal-smoke.mjs
+++ b/config/scripts/runtime-serve-terminal-smoke.mjs
@@ -28,10 +28,14 @@ import { dirname, join, resolve } from 'node:path'
 import { pathToFileURL } from 'node:url'
 import { randomBytes } from 'node:crypto'
 import process from 'node:process'
+import { ORCAD_SERVER_ENTRY_FILENAME } from '../../src/shared/orcad-artifacts.ts'
+import { packagedNodeRuntimePath } from './build-orcad-node.mjs'
+import { currentTarget } from './server-build-target.mjs'
 
 const projectDir = resolve(import.meta.dirname, '../..')
 const serveEntry = join(projectDir, 'out', 'main', 'index.js')
-const ORCAD_ENTRY = join(projectDir, 'out', 'orcad', 'orcad.js')
+const ORCAD_DIR = join(projectDir, 'out', 'orcad')
+const ORCAD_ENTRY = join(ORCAD_DIR, ORCAD_SERVER_ENTRY_FILENAME)
 const READY_TIMEOUT_MS = 120_000
 const OUTPUT_TIMEOUT_MS = 30_000
 const SHUTDOWN_TIMEOUT_MS = 15_000
@@ -175,7 +179,7 @@ function resolveLaunch(userDataDir) {
   if (target === 'orcad') {
     return {
       label: `orcad (${ORCAD_ENTRY})`,
-      command: process.execPath,
+      command: packagedNodeRuntimePath(ORCAD_DIR, currentTarget()),
       args: [ORCAD_ENTRY, '--port', String(PORT), '--json'],
       env: { ORCA_USER_DATA: userDataDir }
     }
diff --git a/config/scripts/terminal-partial-escape-native-continuation.test.mjs b/config/scripts/terminal-partial-escape-native-continuation.test.mjs
new file mode 100644
index 000000000000..d42b0115c578
--- /dev/null
+++ b/config/scripts/terminal-partial-escape-native-continuation.test.mjs
@@ -0,0 +1,113 @@
+import { createRequire } from 'node:module'
+import { describe, expect, it } from 'vitest'
+import { advancePartialEscapeTail } from '../../src/shared/terminal-partial-escape-tail'
+
+const require = createRequire(import.meta.url)
+const { Terminal } = require(process.env.ORCA_PARTIAL_ESCAPE_HEADLESS ?? '@xterm/headless')
+const { SerializeAddon } = require('@xterm/addon-serialize')
+
+function model() {
+  const terminal = new Terminal({ cols: 40, rows: 6, allowProposedApi: true, logLevel: 'off' })
+  const serializer = new SerializeAddon()
+  terminal.loadAddon(serializer)
+  const effects = []
+  for (const id of [2, 7, 8, 52, 1337]) {
+    terminal.parser.registerOscHandler(id, (data) => {
+      effects.push(['osc', id, data])
+      return true
+    })
+  }
+  terminal.parser.registerDcsHandler({ final: 'q' }, (data) => {
+    effects.push(['dcs', data])
+    return true
+  })
+  terminal.onData((data) => effects.push(['reply', data]))
+  return { terminal, serializer, effects }
+}
+
+const write = (h, data) => h.terminal._core.writeSync(data)
+const state = (h) => h.terminal._core._inputHandler._parser.currentState
+const screen = (h) => {
+  const buffer = h.terminal.buffer.active
+  return {
+    cursor: [buffer.cursorX, buffer.cursorY],
+    rows: Array.from({ length: buffer.length }, (_, row) => {
+      const line = buffer.getLine(row)
+      return Array.from({ length: line.length }, (_, column) => {
+        const cell = line.getCell(column)
+        return [cell.getChars(), cell.getWidth(), cell.getFgColor(), cell.getBgColor()]
+      })
+    })
+  }
+}
+
+function compareContinuation(source, restored, prefix, continuation) {
+  source.terminal.reset()
+  restored.terminal.reset()
+  source.effects.length = 0
+  restored.effects.length = 0
+  write(source, `BEFORE${prefix}\x1b`)
+  const serialized = source.serializer.serialize()
+  const pending = advancePartialEscapeTail('', `BEFORE${prefix}\x1b`)
+  source.effects.length = 0
+  write(restored, serialized + pending)
+  expect(restored.effects, JSON.stringify({ prefix, continuation })).toEqual([])
+  expect(state(restored)).toBe(state(source))
+  write(source, continuation)
+  write(restored, continuation)
+  expect(screen(restored), JSON.stringify({ prefix, continuation })).toEqual(screen(source))
+  expect(state(restored)).toBe(state(source))
+  expect(restored.effects).toEqual(source.effects)
+}
+
+const prefixes = [
+  '\x1b]2;title',
+  '\x1b]7;file:///original',
+  '\x1b]8;;https://example.com',
+  '\x1b]52;c;aGVsbG8=',
+  '\x1b]1337;File=inline=1:AAAA',
+  '\x1bPqpayload',
+  '\x1b_Gpayload',
+  '\x1bXpayload',
+  '\x1b^payload'
+]
+
+describe('completed string continuation against the native terminal parser', () => {
+  it.each(prefixes)('matches uninterrupted output for every following byte after %j', (prefix) => {
+    const source = model()
+    const restored = model()
+    try {
+      for (let byte = 0; byte < 256; byte++) {
+        compareContinuation(source, restored, prefix, `${String.fromCharCode(byte)}AFTER`)
+      }
+    } finally {
+      source.terminal.dispose()
+      restored.terminal.dispose()
+    }
+  })
+
+  it.each([0, 32, 4095, 4096, 4097, 8192])(
+    'does not repeat completed side effects for a %i-character payload',
+    (length) => {
+      const source = model()
+      const restored = model()
+      try {
+        for (const introducer of ['\x1b]2;', '\x1b]7;', '\x1b]52;', '\x1bPq']) {
+          for (const continuation of [
+            '\\AFTER',
+            '[32mAFTER',
+            '\x18AFTER',
+            '\x1aAFTER',
+            '\x1b]7;file:///next\x07AFTER',
+            '\x1bPqnext\x1b\\AFTER'
+          ]) {
+            compareContinuation(source, restored, introducer + 'x'.repeat(length), continuation)
+          }
+        }
+      } finally {
+        source.terminal.dispose()
+        restored.terminal.dispose()
+      }
+    }
+  )
+})
diff --git a/config/scripts/vitest-node-runtime-files.mjs b/config/scripts/vitest-node-runtime-files.mjs
index 69e473c91d22..09029f3c6d21 100644
--- a/config/scripts/vitest-node-runtime-files.mjs
+++ b/config/scripts/vitest-node-runtime-files.mjs
@@ -6,6 +6,7 @@ export const NODE_RUNTIME_INCLUDE = [
   'config/scripts/cloud-security-history-workflow.test.mjs',
   'config/scripts/skill-recipe-shell.test.mjs',
   'src/main/ssh/ssh-relay-endpoint-incumbent-shell.integration.test.ts',
+  'src/main/ssh/ssh-remote-commands.test.ts',
   'src/shared/child-process/run-process.test.ts',
   'tests/e2e/cursor-quota-transport.unit.test.ts',
   'src/main/ai-vault-search/session-search-index-writer.test.ts',
@@ -83,6 +84,7 @@ export const NODE_RUNTIME_INCLUDE = [
   'src/main/runtime/structured-agent-session-startup-tab-restore.test.ts',
   'src/shared/remote-runtime-shared-control-connection.test.ts',
   'src/main/runtime/relay/relay-control-client.test.ts',
+  'src/main/ipc/filesystem-watcher-ignore-real.test.ts',
   'src/main/ipc/runtime-environment-preference.test.ts',
   'src/main/ipc/runtime-environment-transport-routing-tailscale-hint.test.ts',
   'src/renderer/src/components/emulator-pane/emulator-device-frame-visibility.test.tsx',
diff --git a/config/scripts/vitest-sqlite-runtime-files.mjs b/config/scripts/vitest-sqlite-runtime-files.mjs
index 0edefd1c8e2e..b48eed345b42 100644
--- a/config/scripts/vitest-sqlite-runtime-files.mjs
+++ b/config/scripts/vitest-sqlite-runtime-files.mjs
@@ -13,6 +13,7 @@ export const SQLITE_RUNTIME_INCLUDE = [
   'src/main/automations/refused-manual-run.test.ts',
   'src/main/automations/retained-run-reconciliation.test.ts',
   'src/main/automations/run-completion-watcher.test.ts',
+  'src/main/automations/service-late-agent-result.test.ts',
   'src/main/automations/service-precheck.test.ts',
   'src/main/automations/service.test.ts',
   'src/main/claude/claude-api-retry-idle-sweep.test.ts',
@@ -32,9 +33,12 @@ export const SQLITE_RUNTIME_INCLUDE = [
   'src/main/codex/codex-structured-journal-turn-settles-once-journal.test.ts',
   'src/main/codex/codex-structured-question-order.test.ts',
   'src/main/ipc/pty/ipc/spawn-commit-ssh-lease-cardinality.test.ts',
+  'src/main/ipc/repos/folder-workspace-attachment-handlers.test.ts',
   'src/main/ipc/ssh-host-partition-session-export.test.ts',
   'src/main/ipc/ssh-host-server-on-connect-wiring.test.ts',
   'src/main/ipc/ssh-managed-server-move-conversion.test.ts',
+  'src/main/native-chat/agent-session-attachments/agent-session-attachment-claims.test.ts',
+  'src/main/native-chat/agent-session-attachments/agent-session-attachment-sweep.test.ts',
   'src/main/native-chat/agent-session-wire/agent-session-history-byte-accounting.test.ts',
   'src/main/native-chat/agent-session-wire/agent-session-history-conversation-window.test.ts',
   'src/main/native-chat/agent-session-wire/agent-session-history-forward-read-budget.test.ts',
@@ -42,10 +46,12 @@ export const SQLITE_RUNTIME_INCLUDE = [
   'src/main/native-chat/agent-session-wire/agent-session-stop-note-projection.test.ts',
   'src/main/native-chat/agent-session-wire/structured-agent-session-accept-then-deliver.test.ts',
   'src/main/native-chat/agent-session-wire/structured-agent-session-acquisition-options.test.ts',
+  'src/main/native-chat/agent-session-wire/structured-agent-session-acquisition-runtime-stamp.test.ts',
   'src/main/native-chat/agent-session-wire/structured-agent-session-adopted-import.test.ts',
   'src/main/native-chat/agent-session-wire/structured-agent-session-append-delivery.test.ts',
   'src/main/native-chat/agent-session-wire/structured-agent-session-at-rest-commands.test.ts',
   'src/main/native-chat/agent-session-wire/structured-agent-session-attach-reconciliation.test.ts',
+  'src/main/native-chat/agent-session-wire/structured-agent-session-attachment-admission.test.ts',
   'src/main/native-chat/agent-session-wire/structured-agent-session-claude-compact-stop.test.ts',
   'src/main/native-chat/agent-session-wire/structured-agent-session-claude-echo-working.test.ts',
   'src/main/native-chat/agent-session-wire/structured-agent-session-claude-hung-start-stop.test.ts',
@@ -118,6 +124,7 @@ export const SQLITE_RUNTIME_INCLUDE = [
   'src/main/native-chat/agent-session-wire/structured-agent-session-send-preparation.test.ts',
   'src/main/native-chat/agent-session-wire/structured-agent-session-send-restarts-failed-start.test.ts',
   'src/main/native-chat/agent-session-wire/structured-agent-session-settled-attach-retry.test.ts',
+  'src/main/native-chat/agent-session-wire/structured-agent-session-shutdown-cut-row.test.ts',
   'src/main/native-chat/agent-session-wire/structured-agent-session-stale-turn-verdict.test.ts',
   'src/main/native-chat/agent-session-wire/structured-agent-session-start-failure-writer.test.ts',
   'src/main/native-chat/agent-session-wire/structured-agent-session-startup-reconcile-failure.test.ts',
@@ -144,7 +151,9 @@ export const SQLITE_RUNTIME_INCLUDE = [
   'src/main/native-chat/agent-session-wire/structured-agent-session-wedged-profile-migration.test.ts',
   'src/main/native-chat/agent-session-wire/structured-agent-session-wire-admission.test.ts',
   'src/main/native-chat/agent-session-wire/structured-conversation-command.test.ts',
+  'src/main/opencode/opencode-acp-stored-messages.test.ts',
   'src/main/orcad/orcad-automations.test.ts',
+  'src/main/pi/rpc-launch-resolution.test.ts',
   'src/main/runtime/agent-session-conversation-clear-commit.test.ts',
   'src/main/runtime/agent-session-conversation-name-store.test.ts',
   'src/main/runtime/agent-session-death-evidence-persistence.test.ts',
@@ -155,6 +164,7 @@ export const SQLITE_RUNTIME_INCLUDE = [
   'src/main/runtime/agent-session-record-store-tab-table.test.ts',
   'src/main/runtime/agent-session-record-store.test.ts',
   'src/main/runtime/agent-session-released-reservation-replay.test.ts',
+  'src/main/runtime/agent-session-runtime-attribution.test.ts',
   'src/main/runtime/agent-session-store-transactions.test.ts',
   'src/main/runtime/agent-session-unsaved-creation-supersession.test.ts',
   'src/main/runtime/automation-change-publication.test.ts',
@@ -187,6 +197,7 @@ export const SQLITE_RUNTIME_INCLUDE = [
   'src/main/runtime/structured-agent-session-rollback-compatibility.test.ts',
   'src/main/runtime/structured-agent-session-spawn-token-descendants.test.ts',
   'src/main/runtime/structured-agent-session-startup-reconcile.test.ts',
+  'src/main/runtime/structured-claude-attachment-grant.test.ts',
   'src/main/runtime/structured-claude-pending-rewind.test.ts',
   'src/main/ssh-expired-lease-pane-readoption.test.ts',
   'src/main/ssh-reattach-pane-cardinality.test.ts',
diff --git a/config/update-translation.txt b/config/update-translation.txt
index 11097556bf0a..3f574c6de8d7 100644
--- a/config/update-translation.txt
+++ b/config/update-translation.txt
@@ -121,3 +121,39 @@ Method (reproducible):
 - Gates: catalog verify, coverage --check, extraction, runtime-catalog pass; 296 locale
   tests pass (policy, zh-round5, generic-terms, etc.).
 
+## Scan 2026-10-07
+
+- HEAD scanned: de4ee59cba (origin/main; branch rebased onto it). Base: d3943c6d81
+  (the 2026-10-05 scan's HEAD). Window: d3943c6d81 .. HEAD (244 commits). Note: the last
+  5 commits that landed during the scan touch no locale catalog and add no en key.
+- Gates before fix: catalog verify PASS, coverage --check PASS (13 allowlisted), extraction
+  PASS, runtime-catalog PASS. No unkeyed strings and en.json in sync; the gap was
+  target-locale coverage only.
+- Delta since base: 331 new en keys (native-chat incl. rewind/composer/notices/visuals,
+  managed servers + SSH move, settings appearance chat, project board/views, markdown
+  callouts, media preview), 33 removed, 15 changed en values. All five locales were
+  missing the SAME 187 keys; es one extra (TerminalErrorToast.heldByPreviousRelay) —
+  177 vs 176. 11 of the 187 are intentionally untranslated provider credit-balance keys
+  pinned by provider-credit-balance-locales.test.ts (#25408). Translated the remaining
+  176 new keys x5 (es 177).
+- Changed-value review: the 15 new English values were already reflected in the locales,
+  except the two `Settings.*` unsaved-AI-settings keys, which still read "AI changes" /
+  "移動" from the retired "Git AI Author changes" wording — fixed in es/fr/ja (and the
+  ko/zh "them" pronoun re-pointed at the settings).
+- Applied 176 new keys x5 (+1 es) via apply-translation-delta.mjs (the pipeline repaired
+  ja 新しい->新規, エージェント->Agent, retry/待っている; ko/es/zh needed none). Strictly
+  additive: +881 keys, 0 removed.
+- Gates after fix: catalog verify PASS (all five 15566/15577; the 11 omissions are the
+  pinned balance keys), coverage --check PASS (13 allowlisted), extraction PASS,
+  runtime-catalog PASS, locale vitest suites PASS (43 files, 386 tests).
+- Reviews (3 of max 4 rounds; round 0 = 5 parallel translators, then 5 reviewers/round):
+  R1 applied 14 (es {{sources}} agreement via a parse-safe rephrase + informal-tú register
+  + idiomatic port-forward copy; fr rewind pronoun/coordination; ja MT artifacts the
+  pipeline's 新しい/待っている rewrites introduced, "Host locked" phase label, hostNewer
+  comparison sense, deltaMove missing object; ko old-chat wording + comma-splice; zh
+  sourceChanged until-clause + older-chat wording).
+  R2 applied 13 (all-locale unsaved-AI-settings staleness; es structuredCopy usted->tú;
+  fr {{sources}} agreement, pane->volet, comma-splice; ja outcome.deferred referent).
+  R3 sign-off clean on all five locales (0 errors, 0 warns; placeholders byte-identical,
+  0 untranslated leftovers, agent/proxy terminology verified).
+
diff --git a/config/vitest.performance.config.ts b/config/vitest.performance.config.ts
index 9d739cbd52bd..0a219a6a2573 100644
--- a/config/vitest.performance.config.ts
+++ b/config/vitest.performance.config.ts
@@ -2,6 +2,7 @@ import { existsSync } from 'node:fs'
 import { resolve } from 'node:path'
 import { defineConfig } from 'vitest/config'
 import baseConfig from './vitest.config'
+import { nodeRuntimePool } from './scripts/vitest-node-runtime-pool'
 
 const contracts = [
   'src/main/sqlite/sync-database.test.ts',
@@ -27,6 +28,9 @@ export default defineConfig({
   ...baseConfig,
   test: {
     ...baseConfig.test,
+    // Project-level includes otherwise override this contract-only selection.
+    projects: undefined,
+    ...(process.versions.bun ? { pool: 'node-runtime', poolRunner: nodeRuntimePool } : {}),
     include: contracts,
     fileParallelism: false,
     retry: 0
diff --git a/docs/assets/readme-downloads.svg b/docs/assets/readme-downloads.svg
index f895d9dc38a5..73c3c5db4caa 100644
--- a/docs/assets/readme-downloads.svg
+++ b/docs/assets/readme-downloads.svg
@@ -1,5 +1,5 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="106" height="20" role="img" aria-label="downloads: 96m">
-  <title>downloads: 96m</title>
+<svg xmlns="http://www.w3.org/2000/svg" width="106" height="20" role="img" aria-label="downloads: 98m">
+  <title>downloads: 98m</title>
   <linearGradient id="s" x2="0" y2="100%">
     <stop offset="0" stop-color="#bbb" stop-opacity=".1"/>
     <stop offset="1" stop-opacity=".1"/>
@@ -15,7 +15,7 @@
   <g fill="#fff" text-anchor="middle" font-family="Verdana,Geneva,DejaVu Sans,sans-serif" text-rendering="geometricPrecision" font-size="11">
     <text x="37" y="15" fill="#010101" fill-opacity=".3">downloads</text>
     <text x="37" y="14">downloads</text>
-    <text x="90" y="15" fill="#010101" fill-opacity=".3">96m</text>
-    <text x="90" y="14">96m</text>
+    <text x="90" y="15" fill="#010101" fill-opacity=".3">98m</text>
+    <text x="90" y="14">98m</text>
   </g>
 </svg>
diff --git a/docs/readme/README.fr.md b/docs/readme/README.fr.md
index a3edc79aa0c2..51b66b41cc85 100644
--- a/docs/readme/README.fr.md
+++ b/docs/readme/README.fr.md
@@ -222,7 +222,6 @@ Fonctionne avec **n'importe quel agent CLI** — s'il tourne dans un terminal, i
 - **[Télécharger depuis onOrca.dev](https://onorca.dev/download)**
 - Ou récupérez un build directement : [macOS Apple Silicon](https://github.com/stablyai/orca/releases/latest/download/orca-macos-arm64.dmg) · [macOS Intel](https://github.com/stablyai/orca/releases/latest/download/orca-macos-x64.dmg) · [Windows (.exe)](https://github.com/stablyai/orca/releases/download/v1.4.147-rc.3/orca-windows-setup.exe) · [Linux AppImage](https://github.com/stablyai/orca/releases/latest/download/orca-linux.AppImage) · [Tous les builds](https://github.com/stablyai/orca/releases/latest)
 - **Sous Windows :** utilisez la [dernière RC (`v1.4.147-rc.3`)](https://github.com/stablyai/orca/releases#release-v1.4.147-rc.3) — elle inclut des correctifs Windows absents de la stable.
-- Vous lancez `orca serve` sur un serveur Linux headless ? Consultez le [guide serveur Linux headless](../reference/headless-linux-server.md).
 
 _Ou via un gestionnaire de paquets :_
 
diff --git a/docs/readme/README.ko.md b/docs/readme/README.ko.md
index e3bda3709e0a..345c5a70f604 100644
--- a/docs/readme/README.ko.md
+++ b/docs/readme/README.ko.md
@@ -217,7 +217,6 @@ diff의 어느 줄에든 코멘트를 남기고 에이전트에게 바로 보내
 
 - **[onOrca.dev에서 다운로드](https://onorca.dev/download)**
 - 또는 빌드를 직접 받기: [macOS Apple Silicon](https://github.com/stablyai/orca/releases/latest/download/orca-macos-arm64.dmg) · [macOS Intel](https://github.com/stablyai/orca/releases/latest/download/orca-macos-x64.dmg) · [Windows (.exe)](https://github.com/stablyai/orca/releases/latest/download/orca-windows-setup.exe) · [Linux AppImage](https://github.com/stablyai/orca/releases/latest/download/orca-linux.AppImage) · [전체 빌드](https://github.com/stablyai/orca/releases/latest)
-- headless Linux 서버에서 `orca serve`를 실행하시나요? [Headless Linux 서버 가이드](../reference/headless-linux-server.md)를 확인하세요.
 
 _또는 패키지 매니저로 설치:_
 
diff --git a/docs/readme/README.pt.md b/docs/readme/README.pt.md
index 5c53089cb0a5..387faf13f1bc 100644
--- a/docs/readme/README.pt.md
+++ b/docs/readme/README.pt.md
@@ -217,7 +217,6 @@ Funciona com **qualquer agente CLI** — se roda em um terminal, roda no Orca.
 
 - **[Baixe em onOrca.dev](https://onorca.dev/download)**
 - Ou baixe um build diretamente: [macOS Apple Silicon](https://github.com/stablyai/orca/releases/latest/download/orca-macos-arm64.dmg) · [macOS Intel](https://github.com/stablyai/orca/releases/latest/download/orca-macos-x64.dmg) · [Windows (.exe)](https://github.com/stablyai/orca/releases/latest/download/orca-windows-setup.exe) · [Linux AppImage](https://github.com/stablyai/orca/releases/latest/download/orca-linux.AppImage) · [Todos os builds](https://github.com/stablyai/orca/releases/latest)
-- Rodando `orca serve` em um servidor Linux headless? Veja o [guia de servidor Linux headless](../reference/headless-linux-server.md).
 
 _Ou por um gerenciador de pacotes:_
 
diff --git a/docs/reference/admin-agent-skill-sharing.md b/docs/reference/admin-agent-skill-sharing.md
deleted file mode 100644
index 1ea9a65d8ef5..000000000000
--- a/docs/reference/admin-agent-skill-sharing.md
+++ /dev/null
@@ -1,97 +0,0 @@
-# Administer agent skill sharing
-
-This guide describes the first-release access, lifecycle, retention, and recovery contract for
-Orca skill sharing. The operator runbook remains the source of truth for incident commands and
-environment-specific procedures.
-
-## Access model
-
-- Shared bundles are unlisted bearer resources. Orca provides no public browse, search, recipient
-  inventory, or package index.
-- Anyone with an active, unexpired link can inspect the package and request a short-lived download
-  grant without signing in.
-- Publishing, package/version management, owned-link inventory, revocation, and deletion require
-  an authenticated package owner with current organization access.
-- Missing, expired, revoked, deleted, and unauthorized resources return the same non-disclosing
-  response.
-- Desktop and remote runtimes receive no GCP identity or long-lived storage credential.
-
-The durable share ID is a credential. Do not put it in tickets, logs, analytics, or support
-bundles. Use revocation if a link may have reached an unintended recipient.
-
-## Revocation and deletion
-
-Revoking a share immediately blocks new resolution and download grants. A generation-bound grant
-issued before revocation can work until its five-minute expiry. Already installed skills remain on
-recipient machines.
-
-Package deletion follows this order:
-
-1. Mark the package deleted and revoke its active shares.
-2. Dereference retained versions transactionally.
-3. Delete only an object generation that no retained version references.
-4. Reconcile bounded pending deletions after partial database or GCS failures.
-
-A version cannot be deleted while an active pinned share references it. Deletion uses the exact
-recorded GCS generation and never overwrites an immutable published key.
-
-## User and organization departure
-
-Packages belong to an owner tenant and record the publishing user. In an organization tenant,
-another current member can manage the package after its publisher leaves; Orca does not rewrite
-the recorded creator. Removing a user does not automatically revoke the organization's links,
-delete packages, or remove installed copies.
-
-Before deleting an organization tenant:
-
-1. Disable new grants for the tenant.
-2. Have an authorized operator inventory and revoke active shares.
-3. Decide whether packages transfer to another authorized owner, remain retained, or are deleted.
-4. Resolve legal hold, erasure, and audit-retention requirements.
-5. Apply the coordinated metadata and object lifecycle; do not bypass reference checks.
-
-The product does not yet encode a universal ownership-transfer or legal-retention policy. Privacy,
-security, and the organization owner must approve the applicable policy before external rollout.
-Until that decision is recorded, preserve metadata and soft-deleted generations rather than
-guessing.
-
-## Retention contract
-
-| Data                                   | Default behavior                                          |
-| -------------------------------------- | --------------------------------------------------------- |
-| Upload policy and pending upload row   | Expires after 15 minutes                                  |
-| Abandoned `uploads/` quarantine object | Deleted by GCS after one day                              |
-| Published immutable package object     | No age-based deletion; retained while referenced          |
-| Issued download grant                  | Expires after five minutes                                |
-| Deleted package object                 | Recoverable through GCS soft delete for seven days        |
-| PostgreSQL metadata                    | Covered by backups and seven-day point-in-time recovery   |
-| Installed recipient copy               | Independent local data; Cloud deletion does not remove it |
-| Audit event                            | Follows the approved audit-retention policy               |
-
-Organization retention, legal hold, and erasure requirements take precedence over product rollback
-retention. Product deletion is not a legal-hold mechanism.
-
-## Audit and privacy
-
-Audit records may include package/version IDs, actor IDs, event category, outcome, and timestamp.
-They must not include skill contents, filenames, manifests, organization membership lists, local
-paths, durable share URLs, upload policies, download grants, or credentials. Anonymous abuse
-controls must not persist raw requester IP addresses.
-
-Normal Cloud logs are limited to route, method, status, duration, and bounded failure categories.
-Use seeded privacy canaries when validating staging logs and diagnostic exports.
-
-## Recovery and incident controls
-
-Upload, download, and remote-install operations have independent kill switches. Disable the
-narrowest affected operation; existing local discovery and installs continue to work.
-
-Coordinate PostgreSQL point-in-time recovery with GCS generation recovery. Restore metadata into
-an isolated database, identify exact referenced generations, restore only matching soft-deleted
-objects, verify archive and package identities, then transactionally repoint metadata. Keep grants
-disabled until bearer preview and a generation-bound download pass.
-
-See the Orca Cloud `docs/skill-sharing-runbook.md` for deployment controls, reconciliation,
-saturation, signing failures, database outages, and the guarded restore workflow. Security
-invariants and unresolved release gates are recorded in
-[Agent skill sharing threat model](./agent-skill-sharing-threat-model.md).
diff --git a/docs/reference/agent-pty-transcript-capture.md b/docs/reference/agent-pty-transcript-capture.md
deleted file mode 100644
index 4b0f41c46d30..000000000000
--- a/docs/reference/agent-pty-transcript-capture.md
+++ /dev/null
@@ -1,131 +0,0 @@
-# Capturing an agent PTY transcript
-
-Orca's readiness and blocked-prompt rules are text rules over what an agent CLI paints on a
-terminal. They are only as good as the screens they were written against. This is how to record
-one, byte for byte, so a rule can be pinned to evidence instead of to a remembered screen.
-
-Related: [`antigravity-readiness-evidence.md`](./antigravity-readiness-evidence.md) names the
-specific Antigravity transcripts that are still missing and what each one decides.
-
-## The recorder
-
-```
-node config/scripts/capture-agent-pty-transcript.mjs --name <fixture-name> [options] -- <command> [args...]
-```
-
-It allocates a real PTY, spawns the agent inside it, mirrors the session to your terminal so you
-can drive it by hand, and appends every byte it receives to
-`src/main/runtime/__fixtures__/<fixture-name>.txt`. It does not strip escapes, fold `\r`, rewrap
-lines, or normalise anything — the file is what the terminal received.
-
-- **Ending a capture:** press <kbd>Ctrl</kbd>+<kbd>]</kbd>. The recorder consumes that key and
-  never forwards it, which is the only way to end a capture _while a dialog still owns the
-  screen_. Quitting the agent instead would first dismiss the dialog you came to record.
-- `--cols N --rows M` pin the PTY size (default: your terminal's). Wrapping is part of the
-  evidence, so record the size — the sidecar does it for you.
-- `--duration S` stops unattended after S seconds, for a screen that needs no interaction.
-- `--send "<ms>:<text>"` types into the PTY at a fixed offset, repeatable, with `\r` `\n` `\t` `\e`
-  escapes. A dialog capture has to be driven, and an unattended run (CI, or an agent) has no TTY to
-  type into; the keystrokes ride the same PTY a human's would. For example, the committed
-  `antigravity-dialog-model-picker.txt` was recorded with
-  `--duration 24 --send "14000:/model" --send "16000:\r"`, which leaves the picker owning the
-  screen when the capture stops.
-- `--note "<text>"` records the account type, plan, model and CLI version in the sidecar.
-- `--out <path>` writes outside the fixture directory (use it for a first dry run).
-
-Each capture also writes `<fixture-name>.meta.json` with the timestamp, platform, command,
-PTY size, note and exit code. Commit it with the transcript; the version and account type behind
-a screen are not recoverable from the bytes.
-
-**Prerequisite:** `node-pty` must be built for plain Node:
-
-```
-node config/scripts/ensure-native-runtime.mjs --runtime=node
-```
-
-Orca itself does not need to be running, and the recorder never touches Orca state.
-
-### Platform notes
-
-- **macOS / Linux:** nothing special. `TERM=xterm-256color` is set for the child.
-- **Windows:** run it from Windows Terminal / PowerShell, not a Git Bash (MSYS) pane — MSYS
-  rewrites arguments that start with `/`, which mangles the `cmd.exe /c` hand-off. A `.cmd` or
-  `.bat` agent shim cannot be spawned by node-pty directly, so the recorder routes those through
-  `cmd.exe` for you.
-- **WSL:** capture _inside_ the distro (run the recorder from the distro's checkout). Recording
-  `wsl.exe` from the Windows side adds the login-shell banner to the transcript.
-- **SSH:** record on the execution host. A transcript recorded locally is not evidence about what
-  a remote agent prints.
-
-## Privacy: scrub before committing
-
-A live agent screen routinely contains things that must not enter git history:
-
-| Scrub                                                                  | Why                                                  |
-| ---------------------------------------------------------------------- | ---------------------------------------------------- |
-| Account email / sign-in identifier                                     | The account row on a ready screen prints it verbatim |
-| Org, tenant or team name                                               | Identifies a customer                                |
-| Machine hostname and OS username                                       | Appear in prompts, paths and the OSC title           |
-| Absolute home paths (`/Users/<you>`, `C:\Users\<you>`)                 | Contain the username                                 |
-| JWTs, `AIza…` keys, `1//…` refresh tokens, `Bearer …`, `sk-…`, `ghp_…` | Live credentials; a sign-in screen can echo one      |
-| Private repo, branch and ticket names                                  | Leak roadmap detail                                  |
-| Anything you pasted into the agent during the capture                  | You typed it; it is in the transcript                |
-
-The recorder scans the file as soon as the capture ends and prints every hit with a line and
-column. To scrub:
-
-```
-node config/scripts/capture-agent-pty-transcript.mjs --scan src/main/runtime/__fixtures__/<name>.txt --redact
-```
-
-Redaction replaces each finding with a **same-length** placeholder (`u…u@example.com`, `XXXX…`).
-Length matters: a transcript's value is its exact wrapping and column alignment, and a shorter
-replacement reflows the screen and destroys the evidence.
-
-### Verify it is gone
-
-1. `node config/scripts/capture-agent-pty-transcript.mjs --scan src/main/runtime/__fixtures__/<name>.txt`
-   must print `clean` and exit `0`. It recognises its own placeholders, so a scrubbed file passes.
-2. Grep for the specifics the scanner cannot know:
-   `rg -n -i -- "$(whoami)|<your-email>|<your-org>|<your-hostname>" src/main/runtime/__fixtures__/<name>.txt`
-3. Read it once with escapes visible: `LC_ALL=C cat -v src/main/runtime/__fixtures__/<name>.txt`.
-   The scanner matches shapes; only a human catches a project name.
-4. Check the sidecar too — `--note` text is free-form and is committed.
-
-`config/scripts/pty-transcript-secret-scan.test.mjs` re-scans every committed
-`__fixtures__/*.txt`, so a transcript that skips step 1 fails the suite.
-
-## Consuming a transcript in a test
-
-Feed the raw bytes through the runtime rather than into a matcher directly: escape handling,
-tail retention and title tracking all live in `onPtyData`, and a rule tested on pre-normalised
-text is tested on something no pane ever sees.
-
-`src/main/runtime/agent-transcript-pane-test-harness.ts` builds the pane;
-`src/main/runtime/terminal-interactive-wait-visibility.test.ts` (cursor-agent) and
-`src/main/runtime/antigravity-readiness-transcripts.test.ts` (Antigravity) are examples. An agent
-whose readiness is read off the live screen gets its suite from
-`src/main/runtime/screen-ruled-agent-transcript-suite.ts`.
-
-## Worked example: the Antigravity captures
-
-The six committed `antigravity-*.txt` fixtures were recorded this way on macOS against
-`agy` 1.1.25. Two points generalise:
-
-- **Reach a state without mutating the operator's config.** The ready-screen captures ran in a
-  directory the CLI already trusted, so no trust answer was written. Where a dialog could only be
-  reached by signing the operator out or deleting their settings, it was left uncaptured and
-  recorded as such rather than forced.
-- **An environment variable is a legitimate capture knob** where a setting is not.
-  `AGY_CLI_HIDE_ACCOUNT_INFO=1` produced a second ready screen with no account row, which is
-  evidence no amount of reasoning about the first screen could have supplied. It changes nothing
-  on disk.
-
-## Known gap in the existing captures
-
-The three `cursor-agent-*.txt` fixtures contain **no escape bytes and no carriage returns**.
-Whatever produced them went through a renderer and a clipboard, so they preserve wording and
-box-drawing glyphs but not the caret, the cursor moves, the repaints, or whether the CLI uses the
-alternate screen buffer. They are good enough for the wording-based rules built on them and are
-not evidence for anything else. New captures made with this recorder keep those bytes; the
-Antigravity scaffold asserts their presence so a pasted screen cannot pass as a capture.
diff --git a/docs/reference/agent-session-search-contract.md b/docs/reference/agent-session-search-contract.md
deleted file mode 100644
index daaef0fb618c..000000000000
--- a/docs/reference/agent-session-search-contract.md
+++ /dev/null
@@ -1,172 +0,0 @@
-# Agent session search contract
-
-`AiVaultSearchRequest`, `AiVaultSearchResponse`, `AiVaultSearchHit`, and
-`AiVaultSearchStatus` are defined in `src/shared/ai-vault-search-types.ts` and
-validated by `src/shared/ai-vault-search-contract.ts`.
-
-## Search and pagination
-
-- Tool output beyond 3,072 characters per row is not indexed and not searchable; user and assistant text is indexed in full.
-- A page cursor outstanding during a retention purge is refused once as `stale-cursor`; the client re-issues page 1.
-- A phrase match across a chunk boundary of a long message is not supported.
-
-`aiVault.searchSessions(request)` accepts `query`, optional `scope`
-(`conversation` or `all`, default `all`), `freshness` (`indexed` or
-`wait-until-current`, default `indexed`), `limit`, opaque `cursor`, `filters`,
-and `debug` (default false). Conversation scope searches user and assistant text.
-Filters accept `agents`, `scopePaths`, ISO `since`, and `sort` (`relevance` or
-`newest`). Paths refer to the execution host and work for folders without Git.
-Legacy `tier` and `refresh` fields are accepted and discarded; they do not change
-the defaults. Limits use the engine's resolver: default 20, integers clamped to
-1–100, fractional numbers use the default. Long queries reach the engine so it
-can report truncation rather than fail validation.
-
-Results contain `kind: 'results'`, `hits`, `page: { cursor, hasMore }`,
-`generation`, `truncated: { candidates, snippets, query, freshness }`, and
-`durationMs`. `snippets` is a count; the other truncation fields are booleans.
-`durationMs` measures the engine search, excluding any reconciliation wait.
-`debug: true` adds `debug: { route, repairedTerms?, plannerReport }`; the report
-contains `route`, optional `repairedTerms`, and `scope`. Diagnostics never appear
-at the top level. Status is never attached to search results.
-
-A cursor belongs to one query, one host's index generation, and an opaque persisted
-index incarnation. Query, scope, filters, and sorting must remain the same; page
-size may change. Writes that advance the generation can invalidate it, including
-retention purges. Clearing or rebuilding the database invalidates it even when the
-new generation counter matches. A refused cursor yields
-`{ kind: 'stale-cursor', generation, expectedGeneration? }` and the
-client discards it and issues page 1 without a cursor. Reusing that refused cursor
-continues to fail; there is no server-side cursor acknowledgement state.
-Malformed cursors and cursors for a different query yield
-`{ kind: 'malformed-cursor' }`. Generation checks also reject a first page if the
-index changes during retrieval. Generation is a fence, not a retained snapshot:
-a client cannot ask the host to recreate a previous generation.
-
-Pages are per host only. Ordering is local to that host's query. Clients must
-discard cursors when changing hosts. All-computers search, merged ordering,
-per-host aggregate outcomes, and merged cursors are deferred to a separate PR.
-That follow-up must define generation fencing, page-size changes, unavailable
-hosts, and bounded parallel retrieval before exposing a combined result list.
-
-## Execution host routing
-
-Search and status address one execution host: `local`, `ssh:<target>`, or
-`runtime:<environmentId>`. An omitted host means this desktop's local index.
-Invalid IDs and `all` are refused; neither can widen a request to other hosts.
-
-- `local` searches this machine's index over desktop IPC.
-- `ssh:<target>` asks that relay session and nothing else.
-- `runtime:<environmentId>` asks that paired runtime over its RPC. A paired
-  runtime answers for itself and never forwards through another desktop.
-
-Each hit may carry `executionHostId`. The desktop stamps remote answers with
-the host it addressed rather than trusting an ID returned by that host.
-Local answers and older hosts may omit attribution.
-
-## Evidence and exposure
-
-Each hit carries agent, session ID, title, cwd, branch, updated time, message
-count, score, source, and evidence. Evidence contains snippet, role, and timestamp;
-it is null for operator-only matches that have no text evidence. Snippet matches
-use `[[` and `]]` markers. Source presence is `present`, `unverifiable`, or
-`missing`; the current engine emits the first two. Loss of contact does not prove
-a source missing.
-
-`redactForTransport(hit, transport)` is the exposure policy:
-
-| Transport                                 | filePath / codexHome                 | resumeCommand                     | Status `degradedRoots[].root` |
-| ----------------------------------------- | ------------------------------------ | --------------------------------- | ----------------------------- |
-| Desktop IPC on the same machine           | Included when known, under source    | Included only for present sources | Included                      |
-| Runtime RPC on the same machine           | Included when known, under source    | Included only for present sources | Included                      |
-| Relay or paired runtime/web/mobile client | Withheld; source keeps presence only | Withheld                          | Withheld                      |
-
-`cwd`, titles, snippets, and other hit metadata remain visible to paired clients.
-Snippets cross the authenticated transport as indexed; this contract does not
-apply an observability redactor to transcript content. A missing Codex home is
-omitted. Resume commands reuse the command stored by the transcript reader,
-constructed by the sidebar's `buildAiVaultResumeCommand`; this layer does not
-construct commands or execute them. The runtime uses its authenticated
-`clientKind` context to distinguish paired clients from same-machine RPC, never
-a request-supplied locality flag. The receiving remote client also applies the
-same exposure function.
-
-## Status, freshness, and availability
-
-`aiVault.searchStatus()` returns `enabled`, `phase` (`idle`, `indexing`, `current`,
-`degraded`, or `closed`), `filesIndexed`, `filesDue`, `filesFailed`, `degradedRoots`
-(`root` and `reason`), `lastReconcileAt`, `lastSweepCompletedAt`, and `generation`.
-Times are milliseconds since epoch or null. These are the indexer's observations;
-an indexed row is not a new filesystem verification. A degraded root's `root` and
-raw `reason` can both contain host filesystem paths. Desktop IPC and same-machine runtime RPC receive the full diagnostic;
-relay and paired clients receive only the fixed reason "Source root could not
-be verified." for each degraded root. The array length retains the count.
-
-`wait-until-current` calls `service.reconcile()` before searching. The adapter
-uses `indexer.reconcile({ full: false })`. After five seconds the endpoint searches
-anyway and sets `truncated.freshness: true` on results. It does not cancel the
-host's reconciliation. Completion before the deadline leaves the flag false;
-a reconciliation error before the deadline propagates. The indexer's bounded
-recent pass is not a promise that the entire historical corpus was swept.
-
-Search unavailability is a value:
-`{ kind: 'unavailable', reason: 'disabled' | 'not-ready' | 'no-service' }`.
-No registered service returns `no-service`. Status without a service has
-`enabled: false`, `phase: 'idle'`, zero counts and generation, empty degraded roots,
-and null timestamps. This is a sentinel for an absent service, not a claim of an
-empty, current index. A registered service may report disabled or not-ready.
-
-## Boundaries and compatibility
-
-- Desktop: `aiVault:searchSessions` and `aiVault:searchStatus`, via preload.
-- Runtime and relay: `aiVault.searchSessions` and `aiVault.searchStatus`.
-- CLI: `orca search` calls both over the runtime RPC, against the host that
-  `--environment` / `--pairing-code` selects and no other. It reuses
-  `createSessionSearchClient`, so an old host's refusal reaches the caller as
-  `unavailable/no-service` rather than an error, and needs no new capability.
-  In an Orca SSH terminal, the forwarded CLI defaults to the controlling Orca
-  runtime's index. `--path` filters that index; it does not select the SSH host.
-  `--environment` / `--pairing-code` can explicitly select a paired runtime.
-- Desktop preload optionally accepts an execution host scope as a separate
-  routing argument. It addresses exactly that host; missing connections never
-  fall back to the local index. The web preload addresses its own paired runtime,
-  answers `all` and any other host with
-  `unavailable/no-service` rather than an error.
-
-Requests and responses are parsed where received from another process. Existing
-relay JSON-RPC request/response framing needs no new stream opcode. Following the
-existing relay method probe pattern, an old host's explicit `-32601` refusal (or
-runtime `method_not_found`) maps to `unavailable/no-service` on the client; status
-uses the absent-service sentinel above. Transport failures, authentication errors,
-and invalid payloads remain errors. Unknown request fields are stripped for wire
-compatibility.
-
-The process-local `setSessionSearchService(service | null)` registry connects
-these endpoints to the production service installed by PR 3b. Desktop indexing
-runs in the scanner child; orcad and the SSH relay register their own in-process
-services. Registration alone does not grant consent.
-
-## Desktop index controls (PR8)
-
-Settings → Agent Session History controls this desktop's persisted
-`aiVaultSearch { enabled, historyDays }` policy. It stays local even when another
-execution host is selected. Paired clients cannot grant consent or clear an index
-through this surface; SSH relay registration remains disabled without a separate
-host consent mechanism.
-
-`aiVault.clearSearchIndex()` is a no-argument desktop-only preload operation over
-`aiVault:clearSearchIndex`. It addresses the local scanner child, not the selected
-remote host. The child's existing interactive request lane executes `searchClear`
-through `SessionSearchInstance.clear()`: close the indexer and database handles,
-remove the SQLite database and sidecars, then reconstruct only if consent remains
-enabled. Errors propagate to the settings pane. This operation never deletes
-original transcripts. There is no new runtime or relay method. Opaque cursors also
-carry a persistent database identity: clearing creates a new identity, so a
-pre-clear or legacy cursor returns `stale-cursor` even if the rebuilt numeric
-generation happens to match. Reopening the same database preserves its identity.
-
-Disabling closes the indexer and keeps the index copy; clearing deletes the copy.
-Changing retention reuses the existing close-and-construct policy application.
-The settings pane reads status only while enabled and visible, polls only an
-observed indexing phase, and stops on completion or error. Opening the pane,
-changing policy, or pressing Refresh obtains a new observation. The indexer's own
-schedule does not depend on the pane.
diff --git a/docs/reference/agent-session-search-query-tuning.md b/docs/reference/agent-session-search-query-tuning.md
deleted file mode 100644
index e7895e0382d6..000000000000
--- a/docs/reference/agent-session-search-query-tuning.md
+++ /dev/null
@@ -1,229 +0,0 @@
-# Agent session search: query tuning
-
-What a search costs, and what the knobs in `src/main/ai-vault-search/session-search-engine.ts`
-buy. Every number here comes from `config/scripts/session-search-query-benchmark.ts`
-over the synthetic corpus in `session-search-synthetic-corpus.ts`, except the
-`conversation_fts` shoot-out, which writes its own corpus because the answer
-turns on how much of a transcript is tool output. Nothing in this file was
-measured against a real transcript, and neither benchmark must ever be pointed
-at one.
-
-## Running it
-
-The benchmark is a top-level-await module that imports the main-process tree by
-extensionless path, so it needs a bundler-backed runner rather than bare `node`:
-
-```sh
-cat > src/main/ai-vault-search/zz-bench.test.ts <<'EOF'
-import { it } from 'vitest'
-it('runs', { timeout: 1_800_000 }, async () => {
-  await import('../../../config/scripts/session-search-query-benchmark')
-})
-EOF
-BENCH_OUT=/tmp/ss-query-bench.json pnpm test src/main/ai-vault-search/zz-bench.test.ts
-rm src/main/ai-vault-search/zz-bench.test.ts
-```
-
-The `conversation_fts` shoot-out below runs the same way, importing
-`config/scripts/session-search-conversation-fts-benchmark` instead, with
-`CORPUS_MB` and `TOOL_SHARE` to size and shape its corpus. `config/scripts` is
-not inside any typecheck project, so while that throwaway test exists `tsc`
-reports TS6307 for each script it pulls in; delete it and the run is clean
-again.
-
-`BENCH_OUT` exists because vitest intercepts `console.log`; the report is written
-to that path as well as printed.
-
-## Scope: what the second FTS table buys a reader
-
-Corpus: 40 synthetic Claude transcripts, 10.5 MB, 9,600 messages, indexed through
-the real store. Eight queries, one per rung of the route ladder plus the two
-shapes that skip it; 5 warm-up runs and 25 samples each. Apple silicon, warm page
-cache, machine otherwise idle. Milliseconds, and p95 over 25 samples moves
-several milliseconds run to run if anything else is competing for the disk.
-
-| Scope          | p50  | p95  |
-| -------------- | ---- | ---- |
-| `all`          | 7.22 | 8.94 |
-| `conversation` | 5.33 | 7.86 |
-
-Per query, `all` then `conversation` (p50 / p95):
-
-| Query                                            | `all`        | `conversation` |
-| ------------------------------------------------ | ------------ | -------------- |
-| `"terminal reattach"` (phrase)                   | 5.24 / 8.42  | 2.97 / 3.24    |
-| `resolveTerminalPath` (identifier)               | 7.55 / 8.94  | 6.47 / 6.72    |
-| `src/main/…/session-transcript-reader.ts` (path) | 8.69 / 10.12 | 7.78 / 8.04    |
-| `why is the daemon snapshot stale` (prose)       | 7.84 / 8.57  | 5.90 / 7.01    |
-| `reattahc worktre` (typo repair)                 | 7.30 / 7.39  | 5.53 / 5.89    |
-| `index` (common term)                            | 5.45 / 5.66  | 3.81 / 4.02    |
-| `repo:app-3` (operator only)                     | 0.12 / 0.16  | 0.10 / 0.10    |
-| `worktree` scoped to one cwd                     | 1.47 / 1.63  | 1.25 / 1.49    |
-
-Reading it:
-
-- `conversation` is about 1.4x faster at p50 and 1.1x at p95, and it is a column
-  filter over the same table rather than a table of its own. Narrowing to the
-  two prose columns is what buys the gap: fewer postings to score. It is also
-  the scope where a match is something a person wrote rather than something a
-  tool printed.
-- A `scopePaths` query is the cheapest real search on the page. It is the one
-  narrowing SQL can express exactly, so it seeks `sessions_cwd_key` and hands
-  ranking a small candidate set.
-- The operator-only figure is a floor, not a typical cost. `repo:` and `path:`
-  are applied in JS over retrieved rows (see `session-search-row-filter` for why
-  they cannot be pushed into SQL), so their cost tracks how many sessions the
-  walk has to read before it fills a candidate set. This corpus has 40 sessions,
-  which is one page of that walk; an index where few sessions match the operator
-  will read up to the ceiling in `session-search-retrieval` instead.
-
-## What the conversation scope costs at real corpus size
-
-`conversation` was a second FTS table holding a copy of the two prose columns.
-It is a column filter now — `{user_text assistant_text}: (…)` with bm25 weights
-that zero the other two — and PR 2 deleted the table on the strength of the
-shoot-out this section used to hold: the filter came in at 1.16-1.36x the p95 of
-the dedicated table, under the 2x bar, while the table cost a tenth of the index
-to maintain. What follows is what the shipped schema actually does, measured
-again on the same corpus after the table went and tool rows were capped.
-
-Corpus: Claude transcripts from `config/scripts/session-search-tool-heavy-corpus.ts`,
-105 MB, indexed through the real store, at two points in the 80-97% band a real
-transcript tree sits in. Half the tokens in tool output are words the
-conversation also uses, so a conversation term really does have postings the
-filter must discard. Twenty queries per rung, both scopes interleaved query by
-query, warm cache; `config/scripts/session-search-scope-benchmark.ts`, run twice.
-
-| Tool share | Rung   | `all` p50 / p95 | `conversation` p50 / p95 |
-| ---------- | ------ | --------------- | ------------------------ |
-| 86%        | phrase | 16.69 / 17.48   | 13.08 / 13.52            |
-| 86%        | or     | 31.91 / 35.74   | 22.25 / 23.87            |
-| 86%        | and    | 70.04 / 74.00   | 53.47 / 59.39            |
-| 93%        | phrase | 9.14 / 13.36    | 7.23 / 8.51              |
-| 93%        | or     | 16.46 / 18.70   | 12.34 / 14.88            |
-| 93%        | and    | 39.65 / 43.44   | 31.05 / 32.92            |
-
-Three things to read out of it.
-
-**The filter is a win, not a cost.** Every rung is faster narrow than wide, by
-1.2x to 1.4x at p50. The shoot-out compared the filter against a table built for
-exactly this query; against the wide table it replaces, it does what the second
-table did, which is read fewer postings.
-
-**The `and` rung is where the corpus size shows.** Those queries are eight terms,
-chosen so no ordered run that long occurs and the phrase rung has to miss; a
-real two-term AND sits nearer the phrase row. It is also the noisiest: the
-second run's p95 reached 140 ms on one bucket, which is what twenty samples of a
-70 ms query buys. Read the p50 column.
-
-**The index is far smaller than the shoot-out's was.** 57 MB at 93% tool output
-and 103 MB at 86%, against roughly 150 MB for `messages_fts` alone before PR 2
-capped an indexed tool row at 3,072 characters. Most of a tool-heavy transcript
-is now not in the index at all, which moves every number above and is the larger
-effect of the two.
-
-What is **not** measured here is relevance, and the column filter does carry one
-ranking difference the deleted table did not. FTS5's bm25 normalises by the
-whole row's length and has no per-column length, so two rows with identical
-prose score differently when one also holds tool output. The rowid set is
-unchanged, which is what the deletion was decided on; the order within it can
-move. `session-search-engine.test.ts` pins the direction.
-
-## `sessionCandidateLimit`
-
-The reviewer's F13: this is a tunable default, not a constant. It bounds how many
-sessions the SQL hands ranking, so it bounds both retrieval cost and how deep a
-caller can page before the answer simply stops.
-
-The limit only costs anything once more sessions match than the limit allows, so
-this is measured over a second corpus: 2,500 one-turn transcripts, 10.9 MB, every
-one of them matching the query. Limits are interleaved sample by sample, because
-run back to back the first configuration pays for every page the OS cache had not
-seen and the ordering alone moves p95 further than the limit does.
-
-| Limit | p50   | p95   | Pages of 20 a caller can reach |
-| ----- | ----- | ----- | ------------------------------ |
-| 200   | 6.85  | 7.21  | 10                             |
-| 600   | 7.93  | 8.36  | 30                             |
-| 1200  | 9.55  | 10.53 | 60                             |
-| 2400  | 12.32 | 13.45 | 120                            |
-
-600 is the default: it costs about 16% over 200 at p50 and buys three times the
-reachable depth, and the curve only turns steep past 1200. A host with a much
-larger index can raise it; the result's `truncated.candidates` says when the limit
-was the thing that cut the answer, so a caller never has to guess.
-
-What is **not** measured here is relevance. These numbers say what a limit costs,
-not what it retrieves. The MRR figures quoted in the BM25 weights
-(`session-search-retrieval.ts`) and in the identifier shadow column
-(`session-search-identifier-split.ts`) come from the original retrieval shoot-out
-on real transcripts and are not reproducible from this repository. Any change to
-the limit justified on relevance grounds needs an eval set, not this benchmark.
-
-## What typo repair costs
-
-The repair is the one rung whose cost tracks the size of the vocabulary rather
-than the size of a result. It only runs for a term the scope has no posting for,
-so an ordinary query never pays it; a query of nonsense pays it once per term.
-
-Measured over a synthetic vocabulary of 1.6 M distinct terms, every term in two
-rows so none is filtered out:
-
-| Query                                  | p50    |
-| -------------------------------------- | ------ |
-| one known term (no repair)             | 11 ms  |
-| one unknown term                       | 10 ms  |
-| 39 unknown 12-character terms (480 ch) | 387 ms |
-| 12 unknown 40-character terms          | 99 ms  |
-
-Two things follow. The cost is linear in unknown terms and in vocabulary size,
-and `search` is synchronous, so a 512-character query of nonsense holds the
-thread for a third of a second on an index that large. And the scoped-count fix
-made this cheaper rather than dearer — it was 737 ms before — because ordering
-the vocabulary scan by term drops the sort that ordering by `doc` required, and
-the counts it added are at most eight bounded probes per prefix. A cap on
-unknown terms per query is recorded as a follow-up in the split plan.
-
-## Page warmup, dropped
-
-PR 2 deferred `warm()` — a sliced read of `messages` that pulls its pages into
-the OS cache before the first query — to whoever knew which pages a read
-touches. It is not re-added here, for two reasons. The measurement that
-justified it (first query 1.3 s to 0.45 s) was on a 4 GB index, and neither
-corpus in this file is within an order of magnitude of that, so PR 4 cannot
-show a win: removing the call moved the 10.5 MB corpus's p50 by less than the
-run-to-run spread. And it is a cancellable background pass, which needs an owner
-with a lifecycle; a query library that holds no timers has nothing to hang the
-`stopped()` on, and a fire-and-forget async read from a synchronous `search` is
-a rejection nothing can supervise. It belongs with the indexer in PR 3b, which
-already owns starting and stopping work.
-
-## Not settled here
-
-Which process may open, unlink and rebuild the index is PR 3b's decision. A
-second handle that finds an older schema version replaces the file while a live
-store keeps answering from the unlinked inode, and this PR is what first makes
-that reachable, because it is the first thing that reads. What PR 4 does is
-refuse to make it worse. The engine restores its derived vocabulary and generation
-triggers before a search. A missing `messages_fts` fails clearly; the connection
-owner must rebuild the source index. There is no degraded-search capability state
-or query logging. Logging can be added by a caller when an evaluation consumer exists.
-
-Each search checks the generation before retrieval and after its final content
-read. A concurrent commit rejects the page with `stale-generation`, including a
-first page without a cursor. The caller can retry from page one. No long-lived
-read transaction is needed, and a mixed page is never returned as a valid snapshot.
-
-Repository/path operators are applied before a phrase or AND route is accepted.
-Candidate truncation is reported by the rung that answered, not by every rung
-tried. Each rung of the ladder matches a superset of the one before it, so a
-rung that reached its cap with no eligible sessions is always followed by one
-that reaches it too: a full candidate set stays explicit either way.
-
-The phrase and AND rungs run for prose as well as for literal-looking input,
-over the query's tokens as typed rather than the stop-word-stripped OR body. A
-sentence pasted out of a transcript is ordinary words in order; over OR its
-common words fill the candidate limit with recent sessions and the old session
-holding the sentence never reaches ranking. The cost is two FTS queries that
-usually miss, which on the corpus above sits inside this harness's run-to-run
-noise. A one-token query still takes the rung only when it looked literal.
diff --git a/docs/reference/agent-skill-provider-paths.md b/docs/reference/agent-skill-provider-paths.md
deleted file mode 100644
index 293229ad70e5..000000000000
--- a/docs/reference/agent-skill-provider-paths.md
+++ /dev/null
@@ -1,38 +0,0 @@
-# Agent skill provider paths
-
-Last verified: 2026-08-11.
-
-V1 supports only providers whose paths are independently established by official documentation.
-The registry is deliberately small; it is not copied or synchronized from a community path table.
-
-| Provider | Detection | Global canonical support | Workspace support | Orca placement |
-| --- | --- | --- | --- | --- |
-| Codex | `codex` CLI found through Orca's host-owned PATH detection | Reads `$HOME/.agents/skills` directly | Reads `.agents/skills` from the current directory through the repository root | Canonical copy only |
-| Claude Code | `claude` CLI found through Orca's host-owned PATH detection | Reads `$HOME/.claude/skills` | Reads `.claude/skills` from the launch directory through the repository root, plus nested directories as files are accessed | Relative directory symlink on POSIX, directory junction on Windows, or verified independent-copy fallback |
-
-Codex locations and symlink behavior are documented in the official OpenAI documentation:
-[Build skills](https://learn.chatgpt.com/docs/build-skills#where-codex-loads-local-skills).
-
-Claude Code locations, precedence, parent traversal, live detection, and symlink behavior are
-documented in the official Anthropic documentation:
-[Extend Claude with skills](https://code.claude.com/docs/en/skills#where-skills-live).
-
-Codex therefore needs no provider-specific placement. Claude Code does not document
-`.agents/skills` as a discovery root, so Orca reconciles its documented `.claude/skills` path back
-to the canonical copy. Orca never replaces a path it does not own. If alias creation is unavailable,
-the verified copy fallback is tracked in the install receipt so update and removal can detect drift.
-
-## Registry change process
-
-Every registry change requires normal code review and all of the following evidence:
-
-1. Link current official provider documentation for global and workspace paths.
-2. Record whether the provider reads `.agents/skills` directly and its documented link behavior.
-3. Verify global and folder-workspace discovery on macOS, Linux, native Windows, and WSL where the
-   provider supports those platforms.
-4. Exercise local, paired-runtime, and SSH host-owned path resolution.
-5. Test alias denial, broken owned aliases, independent-copy drift, update, rollback, and removal.
-6. Update mixed-version capability evidence if the placement contract changes.
-
-Do not add automated upstream path-table synchronization. A provider release that changes discovery
-semantics must enter through this review process.
diff --git a/docs/reference/agent-skill-sharing-threat-model.md b/docs/reference/agent-skill-sharing-threat-model.md
deleted file mode 100644
index efccfd7119b3..000000000000
--- a/docs/reference/agent-skill-sharing-threat-model.md
+++ /dev/null
@@ -1,101 +0,0 @@
-# Agent skill sharing threat model
-
-Status: implementation baseline for security and privacy review. This document does not constitute
-security approval.
-
-## Scope and trust model
-
-This model covers private skill packaging, Orca Cloud publication and authorization, durable share
-resolution, local and remote installation, provider placement, update, rollback, removal, and
-operator recovery. It applies to macOS, Linux, native Windows, WSL, paired Orca runtimes, and SSH
-targets.
-
-Private means unlisted: an unpredictable active share ID is a bearer credential, while publication
-and management remain access-controlled to authenticated Orca users and organizations. V1 is not
-end-to-end encrypted from Orca Cloud operators. A skill is code from its author: `SKILL.md` can
-change agent behavior and packaged scripts may be executed later by a user or agent, although the
-installer itself never executes package content.
-
-## Protected assets
-
-- Skill contents, filenames, manifests, package metadata, release notes, and author identity.
-- Organization membership, selected-user ACLs, durable share identifiers, and package existence.
-- Signed upload policies, download grants, authentication tokens, database credentials, and GCP
-  service identities.
-- Existing local skills, provider configuration, user modifications, provenance, and transaction
-  recovery state.
-- Cloud package metadata, immutable object generations, audit records, and deletion state.
-- Availability and cost of Cloud Run, Cloud SQL, GCS, connected runtimes, and local filesystems.
-
-## Actors and boundaries
-
-Actors include an authorized publisher, an authorized recipient, an authenticated but unauthorized
-Orca user, a malicious skill author, a compromised renderer, an untrusted remote RPC caller, an
-attacker controlling a network endpoint, and an operator with GCP or database access.
-
-Trust boundaries are:
-
-1. Source skill directory to the owner-private package staging directory.
-2. Desktop renderer to the main process and its authenticated Cloud client.
-3. Orca client to a paired runtime or SSH host across independently versioned protocols.
-4. Orca Cloud API authorization to short-lived GCS access.
-5. GCS quarantine to validated immutable publication and PostgreSQL metadata.
-6. Extracted staging to canonical destination and provider placements.
-7. Local diagnostic records to a user-reviewed support-bundle upload.
-8. Terraform and deployment identities to staging and production resources.
-
-## Security invariants
-
-- Package identity is deterministic and binds normalized paths, exact bytes, executable state, and
-  immutable package/version IDs.
-- Publication and installation accept only the `manifest.json` plus `skill/` envelope and never
-  execute archive content.
-- Archive validation completes before destination mutation.
-- Destination paths are resolved by the runtime that owns the host or workspace.
-- Unowned or modified local content is never silently replaced or deleted.
-- Final GCS objects are immutable, generation-fenced, and reachable only through fresh ACL checks
-  followed by short-lived grants.
-- No remote caller can turn a desktop-local path into remote filesystem authority.
-- Interrupted transactions converge to a verified old or requested version.
-- Logs and support bundles exclude package contents and private authorization or filesystem data.
-- Cloud sharing, downloading, and remote installation have independent kill switches.
-
-## Threat register
-
-| ID    | Threat                                                                                                                                            | Required controls and current evidence                                                                                                                                                                                                                                                                                                        | Residual release gate                                                                    |
-| ----- | ------------------------------------------------------------------------------------------------------------------------------------------------- | --------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | ---------------------------------------------------------------------------------------- |
-| TM-01 | Source changes after preview or a link swaps bytes during packaging.                                                                              | Observe the specific source directory, copy without following links, re-observe staged bytes, compare every identity, and bind preview to the final digest. Source-drift and link/special-file tests cover rejection and cleanup.                                                                                                             | Repeat race and permission tests on every supported filesystem.                          |
-| TM-02 | Archive traversal, drive paths, links, devices, duplicate paths, Unicode/case collisions, or decompression/resource exhaustion escape staging.    | Streaming parser rejects unsafe entry classes and normalized collisions; compressed, extracted, entry, file, depth, and per-file limits are enforced during parsing and extraction. Boundary, malformed, checksum, and fuzz tests run before destination mutation.                                                                            | Keep package safety suites required in release CI.                                       |
-| TM-03 | A forged manifest lies about names, bytes, executable state, or package identity.                                                                 | Parse the manifest before trusting entries, require `skill/SKILL.md`, hash extracted bytes independently, recompute package identity, and compare package/version IDs and digest.                                                                                                                                                             | Cross-platform identical-byte digest evidence remains required.                          |
-| TM-04 | A client chooses another home, workspace, WSL distro, SSH path, or escapes a destination root.                                                    | The executing runtime resolves home and workspace identities, realpath-checks directories, uses platform-native joins, and rejects client-supplied remote paths. `local-file` ingress is trusted in-process only.                                                                                                                             | Real SSH and mixed-version topology tests remain required.                               |
-| TM-05 | Installation overwrites or deletion removes unowned or locally modified content.                                                                  | Planner distinguishes missing, unchanged, clean, modified, unowned, external-link, broken-link, and collision states. Provenance lives outside installed content. Replacement requires an explicit conflict decision; removal revalidates ownership and digest.                                                                               | Complete the remaining real junction, external-link, copy-drift, and permission matrix.  |
-| TM-06 | A crash between renames or receipt publication loses both old and new versions.                                                                   | Same-filesystem staging, durable journals, backups, flushed receipt replacement, bounded recovery, and ownership tokens protect every commit boundary. Failure injection covers every journal transition.                                                                                                                                     | Real process termination and disk/antivirus contention tests remain required.            |
-| TM-07 | A grant leaks through redirects, userinfo, an insecure scheme, DNS/host confusion, or an oversized stream.                                        | Cloud requests reject redirects. Package downloads require configured origins and HTTPS, reject URL credentials and cross-origin redirects, cap redirect count, recheck expiry, stream exact expected bytes, and verify archive/package digests.                                                                                              | Validate approved production origins and exercise malicious network cases in staging.    |
-| TM-08 | Reuse of an upload ID, wrong tenant, wrong key, stale generation, or quarantine object publishes attacker-selected bytes.                         | Random tenant-bound upload rows, signed POST conditions, expiry, exact metadata/key/type/size validation, generation-fenced reads, streamed validation, and idempotent finalization fail closed.                                                                                                                                              | Staging GCS integration must cover stale generations and lifecycle deletion.             |
-| TM-09 | IDOR, stale organization membership, or a guessed identifier exposes package management data or bearer-protected content.                         | Management requests authenticate and re-evaluate current ownership. Recipient preview and grants require the exact unpredictable, active bearer share ID and ignore legacy ACL rows. Not-found responses hide unauthorized existence.                                                                                                         | Human authorization review and organization-departure policy approval remain required.   |
-| TM-10 | Content-addressed deduplication discloses another tenant's package through response shape or timing.                                              | Tenant-scoped APIs never expose GCS keys, generations, or whether an object already existed; existing-object reuse verifies both archive and logical package identity. Cross-tenant tests prove identical archives use separate tenant-hashed objects and response shapes disclose no reuse.                                                  | Keep tenant-isolation and response-disclosure coverage required in release CI.           |
-| TM-11 | A compromised renderer, old client, or arbitrary RPC caller sends credentials, local paths, unknown opcodes, or unsupported operations to a host. | Main owns auth tokens and grants; remote requests use strict schemas and capabilities; package transfer is separate from install; no stream opcode was added; mixed versions fail with update-required results.                                                                                                                               | Real client-newer/server-newer and SSH parity gates remain required.                     |
-| TM-12 | Transfer replay, overlap, disconnect, or abandoned staging consumes disk or commits different bytes.                                              | Session count, idle time, total bytes, and chunk size are bounded. Offsets are monotonic, identical retry is idempotent, changed replay fails, commit hashes the exact staged file, and cancellation/disconnect cleanup is bounded.                                                                                                           | Exercise offline-GCS and real disconnects at every transfer boundary.                    |
-| TM-13 | Provider aliases or junctions escape canonical storage or point at external content.                                                              | POSIX aliases are relative from real parents, Windows junctions use absolute canonical targets, targets are revalidated, and unowned/broken/external links are conflicts. Copy fallback is independently hashed and receipt-owned. Real Windows and WSL coverage includes existing, broken, external, denied, and drifted placement behavior. | Preserve the physical placement matrix in release coverage.                              |
-| TM-14 | Skill instructions or scripts are mistaken for trusted Orca code or executed during install.                                                      | Share/install previews identify author, organization, scripts, executable files, digest, and version. Installation never runs scripts. Trust copy says the package is code from its author.                                                                                                                                                   | Security and design must approve the final trust wording and accessibility behavior.     |
-| TM-15 | Telemetry, logs, or support bundles leak instructions, filenames, paths, ACLs, grants, policies, or credentials.                                  | Desktop install diagnostics map values to bounded categories before tracing. Deployed staging logs contain route templates and bounded request metadata only, and the logging exclusion removes bearer URLs. Support-bundle tests inject private canaries and prove they are absent from collected output.                                    | Preserve deployed-log and support-bundle privacy checks for future changes.              |
-| TM-16 | Permissive staging permissions expose package bytes to another local user.                                                                        | Package archives, downloads, extraction, relayed uploads, locks, journals, and receipts use owner-private modes on POSIX; Windows uses owner-profile paths and inherited ACLs. Existing POSIX download roots are tightened before use. Real Windows, WSL, Ubuntu-floor, and SSH validation passed.                                            | Preserve owner-private staging checks across supported hosts.                            |
-| TM-17 | Deletion, revocation, retention, or user departure leaves unauthorized grants or unrecoverable metadata/blob divergence.                          | Revocation blocks new grants immediately; existing grants expire within five minutes. Database references govern final deletion, quarantine lifecycle cleans abandonment, and GCS soft delete supplies recovery. Local installs remain independent.                                                                                           | Approve departure/legal-retention policy and exercise coordinated database/GCS recovery. |
-| TM-18 | Broad IAM, public bucket access, service-account keys, or a compromised deployment identity bypasses application authorization.                   | Uniform bucket access, public-access prevention, bucket-scoped object access, service-account-scoped signing, skill-secret-only access, Cloud SQL client role, no desktop IAM, and no long-lived keys are Terraform-defined.                                                                                                                  | Review the staging and production plans and verify live IAM before rollout.              |
-| TM-19 | Unbounded validation or request concurrency causes memory, CPU, database, storage, or egress denial of service.                                   | Fixed streaming buffers, package limits, per-instance finalization semaphore, rate/quota limits, bounded transfer sessions, Cloud Run instance limits, lifecycle cleanup, and independent kill switches constrain work.                                                                                                                       | Complete load testing, dashboards, alerts, and budget thresholds.                        |
-| TM-20 | Operator recovery, diagnostics, or legal workflows bypass tenant isolation or leak content.                                                       | Runbooks require generation-specific recovery, coordinated PostgreSQL/GCS restoration, audited lifecycle actions, and no package contents in normal logs.                                                                                                                                                                                     | Security/privacy approval and restricted break-glass procedure remain required.          |
-
-## Required review evidence
-
-Security and privacy approval must not rely on this document alone. Reviewers need:
-
-- Package/admission schemas and stable failure categories.
-- Archive parser, extraction containment, transaction, provenance, and removal tests.
-- Cloud authorization, object-generation, tenant-isolation, deletion, and recovery tests.
-- Terraform plans plus live staging IAM, bucket, Cloud Run, Secret Manager, and Cloud SQL evidence.
-- Real macOS, Linux-floor, Windows, WSL, paired-runtime, mixed-version, and SSH results.
-- Captured staging logs, metrics, traces, and support bundles with seeded private canaries absent.
-- Load-test results and independently tested upload, download, and remote-install kill switches.
-
-Approval owners record findings and accepted residual risks outside this implementation document.
-The external rollout gate remains closed until those findings are resolved or explicitly accepted.
diff --git a/docs/reference/agent-skill-sharing-upstream-boundary.md b/docs/reference/agent-skill-sharing-upstream-boundary.md
deleted file mode 100644
index bf2323d2895d..000000000000
--- a/docs/reference/agent-skill-sharing-upstream-boundary.md
+++ /dev/null
@@ -1,43 +0,0 @@
-# Agent skill sharing upstream boundary
-
-Status: proposed for formal engineering and legal review.
-
-Date: 2026-08-11.
-
-## Context
-
-Orca needs private, durable, cross-machine skill sharing with bounded archive ingestion,
-host-owned destination resolution, crash-safe transactions, provenance, and mixed-version remote
-support. `vercel-labs/skills` exposes a CLI and does not provide the Cloud authorization or local
-transaction contract Orca requires.
-
-The behavioral assessment used upstream commit
-`c6f69c631292444cc541ac6d91e2226b0ff247da`.
-
-## Decision
-
-Orca implements its package, Cloud, installation, provider-placement, and recovery behavior
-independently. The upstream project is a behavioral reference only.
-
-Do not copy or mechanically translate upstream source, tests, fixtures, registry entries, provider
-path tables, comments, or documentation. Derive provider paths from official provider
-documentation and verify them with real installations. Orca does not depend on the upstream CLI,
-npm package, or an unsupported programmatic API.
-
-If a future change proposes incorporating upstream material, stop and review the exact material,
-license, attribution, notices, and maintenance implications before implementation or merge.
-
-## Consequences
-
-- Orca owns stability, security, compatibility, and maintenance of this narrower installer.
-- There is no automatic upstream synchronization job.
-- Similar behavior is acceptable when independently derived from requirements and official
-  provider contracts; textual or structural copying is not.
-- Provider registry changes require normal code review plus official-documentation and real-host
-  evidence.
-- The pull request template requires reviewers to confirm this boundary for relevant changes.
-
-## Review record
-
-Product chose the reference-only approach during planning. Formal engineering and legal reviewers
-remain to be named before external rollout.
diff --git a/docs/reference/agent-status-store.md b/docs/reference/agent-status-store.md
deleted file mode 100644
index 912b14d51fe9..000000000000
--- a/docs/reference/agent-status-store.md
+++ /dev/null
@@ -1,577 +0,0 @@
-# Agent status store
-
-## Status
-
-The current boundary is PR 2A: structured sessions use the hook server's fully
-scoped canonical store; unbound PTY/relay evidence remains in an isolated legacy
-adapter. Do not remove the renderer bridge or its publication filters in this
-slice: they still carry native-chat child rows.
-
-The sections below record the original 2026-09-09 rollout. Its PR 1a and PR 1b
-have landed; its proposed PR 2/3 sequence is superseded by that boundary:
-
-1. main-only: every producer writes into one store and `worktree ps` reads it,
-   split into 1a (structured sessions join the store) and 1b (the runtime's
-   duplicate retained store is deleted);
-2. renderer: the sidebar becomes a subscriber and stops re-deriving rows;
-3. shared: one worktree-status rollup and one freshness rule for every reader.
-
-## The problem this solves
-
-Orca shows "what is this agent doing" in four places: the desktop sidebar, the
-`orca worktree ps` command, the mobile app, and the agent dashboard. Before
-#19217 those readers did not even share their inputs. After #19217 they share
-the structured-session mapping and nothing else.
-
-An audit on 2026-09-09 found six producers and three consumers, and three
-separate copies of the same row inside the main process alone:
-
-| Main-process copy                 | Keyed by  | Owned by                                                                          | Persisted          | Evicted                                        |
-| --------------------------------- | --------- | --------------------------------------------------------------------------------- | ------------------ | ---------------------------------------------- |
-| hook server `lastStatusByPaneKey` | paneKey   | `src/main/agent-hooks/server.ts`                                                  | `last-status.json` | tab close, pty exit, hydrate, worktree removal |
-| runtime `RuntimeAgentRowStore`    | paneKey   | `runtime-agent-row-store.ts` (deleted in PR 1b)                                   | no                 | pty exit only                                  |
-| structured feed `published`       | sessionId | `src/main/native-chat/agent-session-wire/structured-agent-session-status-feed.ts` | no                 | never (a broadcast cache)                      |
-
-The second copy is a duplicate write: the OSC status parsed in main is
-forwarded to the hook server _and_ retained in the runtime store from the same
-call (`orca-runtime-create-terminal-side-effect-command-code-detector.ts`).
-The third copy is keyed differently and never reaches the hook server at all,
-which is why `worktree ps` grew its own adapter for it in #19217.
-
-Each reader then applies its own precedence and freshness rules, so the same
-pane can legitimately read differently on the desktop, on the phone, and in
-the CLI.
-
-## The rule
-
-**The execution host owns agent status, in one store, and every reader
-subscribes to it.** This follows the boundary in
-[`ssh-execution-boundary.md`](./ssh-execution-boundary.md): the host that runs
-the process is the only party that can observe it, and the client is never
-authoritative for execution state.
-
-Three consequences:
-
-- One store per execution host. A remote host keeps its own store and the
-  client mirrors it down, as the web-session mirror already does. Mirroring is
-  not merging: a client never writes its observations back to a host.
-- Precedence is decided once, at write time, with provenance recorded on the
-  row. Readers never re-adjudicate hook versus terminal versus structured.
-- Readers keep only presentation policy and user facts: the 30-minute display
-  decay, acknowledgements, dismissals, unread. Those stay reader-side but
-  become one shared implementation (PR 3).
-
-## The store already exists
-
-The hook server's state is that store today for every PTY-based agent. The
-audit established:
-
-- hook HTTP posts, the WSL and SSH relay receivers, and main's own OSC parse
-  all converge on the same `applyNormalizedStatus` path, stamped with the
-  authority id `main-agent-hooks`;
-- it alone holds pane authority: launch tokens and their hashed commitments,
-  retired-pane fences, pane-key aliases, per-connection ordering watermarks,
-  and the evidence-age map that must outlive a transport clear;
-- it alone persists, with a seven-day hydrate window and the
-  `restoredUnconfirmed` stamp that keeps a hydrated row from ever reading as
-  live truth;
-- it already fans out to both renderer windows over `agentStatus:set` and
-  `agentStatus:clear`, and serves `agentStatus:getSnapshot`.
-
-Nothing else in main carries those guarantees, and building a second store
-with them would be the wrong direction. So the design is not "add a store". It
-is: **route the two producers that bypass the hook server through it, then
-delete the copies.**
-
-## PR 1a: structured sessions publish into the store
-
-No renderer behavior changes. The sidebar keeps receiving the same IPC events
-it receives today, plus structured-session rows it currently derives itself.
-
-### Structured sessions publish into the hook server
-
-The structured feed keeps its job of projecting a session's journal into a
-summary and streaming it to subscribers. On every publish it additionally
-ingests the summary into the hook server as a status row:
-
-| Row field                                           | From                                                                                                                                                                                                                                    |
-| --------------------------------------------------- | --------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
-| `paneKey`                                           | `structuredAgentSessionPaneKey(tabId, sessionId)`, the key the renderer already uses; its leaf is UUID-shaped so pane-key validation accepts it                                                                                         |
-| `tabId`                                             | `structuredAgentSessionTabId(sessionId)`                                                                                                                                                                                                |
-| `worktreeId`                                        | `summary.workspaceId` (a folder workspace id is a valid value)                                                                                                                                                                          |
-| `state`                                             | `structuredAgentSessionAgentStatus(summary).state`: the lead's own status folded with the live child records the store holds for the session (not the summary's task list), so a settled lead whose subagent still runs reads `working` |
-| `workingMode`                                       | `'monitoring'` from the same fold when watch loops are the only live child work; omitted otherwise, which clears it on the row                                                                                                          |
-| `mainAgent`                                         | the main agent's own state before the fold, its last-turn verdict (`summary.turnOutcome`, present only while idle) and its own clock; see "The main agent fact" below                                                                   |
-| `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 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). A turn the provider gave no outcome reads as its
-host-observed end through `agentTurnVerdict`: `interruption` for an `interrupted`
-lifecycle, `unconfirmed` for an `unverifiable` one. It is derived on each read,
-never journaled. 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.
-
-Dropping the session from the host's map and dropping its row are one
-operation, `forgetStructuredAgentSession`. The store keeps a row until told,
-and a host-owned row bypasses the staleness check, so a deletion path that
-forgot the row would strand a permanently working-looking agent.
-
-Two rules the ingest must keep:
-
-- **Never persist a structured row.** The journal is the durable truth for a
-  structured session and the host republishes on restore. A structured row in
-  `last-status.json` would hydrate as `restoredUnconfirmed` and then fight the
-  live republish. The serializer skips rows carrying `structuredHost`, and
-  hydrate drops any such row found on disk. Applying one therefore also skips
-  the persist schedule: the walk and stringify could only reproduce the file
-  that is already on disk, once per debounce window for every streaming chat.
-- **Never let it fight a hook row.** A structured session has no PTY, so no
-  hook or OSC event carries its pane key. The ingest still goes through the
-  disposition gate so a retired pane key is refused like any other.
-
-Applying one does still run both status fan-outs, and that is intended rather
-than incidental. `notifyStatusChangeListeners` is what feeds
-`agentAwakeService`'s power-save blocker, and `subscribeEnrichedStatus` is what
-feeds `AgentSessionTransitionRecorder`'s stats, so joining the store enrolls
-native chats in both. A working native chat is real work and should hold the
-machine awake exactly like a PTY agent does.
-
-The drop side routes through `dropStatusEntry`, not `clearPaneState`: a
-pane-status-clear reaches the renderer, and until PR 2 the renderer's own feed
-bridge is that pane key's writer. It also passes `preserveResumeIdentity:
-false` — the `providerSessionOnly` remnant a dismissed pane keeps exists so the
-agent can be resumed in that pane, and a structured session has no pane and
-keeps its resume identity in the record store. Like every other
-`dropStatusEntry` caller, it emits no pane clear, so a session dropped
-mid-`working` leaves `AgentSessionTransitionRecorder` holding an open stats
-session until its LRU evicts it; that gap is shared with the user-dismissal
-path and is not specific to structured rows.
-
-The ingest lives in the feed, not in `structured-agent-session-host.ts`, which
-sits at the file-length cap.
-
-### `worktree ps` becomes a reader
-
-The structured adapter added in #19217 is deleted, and structured rows reach
-`worktree ps` through the same snapshot as every other row. The
-retained-versus-hook reconciliation in `collectRuntimeWorktreePtyAgentSources`
-stayed until PR 1b removed the store that fed it. What this step settles is
-the admission gate that decides which rows a worktree listing may show:
-
-- a hook or OSC row needs its tab mirrored or a connected pty, as today, and
-  SSH rows stay exempt because their tabs may exist only remotely;
-- a row carrying `structuredHost` is admitted while the host holds the session, and
-  the host's drop on close is what removes it. No tab-mirror requirement: a
-  structured session's tab lives in the renderer's own tab state, and a
-  headless host has no renderer to mirror it from. That argument only holds if
-  the headless host is itself wired to the store, which is a separate
-  obligation per entry point: the Electron hosts (desktop and `orca serve`)
-  share `main-process-runtime-service.ts`, and `orcad` constructs its own
-  runtime in `src/main/orcad/orcad-entry.ts`. A host missing that wiring lists
-  no agents at all, not just no structured ones, because `worktree ps` reads
-  the same snapshot for every row.
-
-The freshness bypass for host-owned structured rows already exists in
-`isFreshNonDoneAgentStatus`; with the flag now on the row it becomes the only
-path, and the hand-rolled check in `runtime-worktree-agent-rows.ts` goes.
-
-### Wire compatibility
-
-`AgentStatusIpcPayload` gains one optional field, `structuredHost`, and the
-`worktree ps` row gains `structuredHostOwned`. Under rule 1 of
-[`remote-wire-compatibility.md`](./remote-wire-compatibility.md) both are safe:
-an old client ignores them. `worktree ps` rows keep their shape and vocabulary,
-so the mobile app sees no change.
-
-Until PR 2 the main process does not forward structured rows to the renderer
-over `agentStatus:set` or `agentStatus:getSnapshot`. The renderer's feed
-bridge still writes those rows itself, and forwarding them too would give one
-pane key two writers. Removing that filter is the first step of PR 2.
-
-### The main agent fact
-
-Claude, Codex and Grok hook rows and structured-session rows publish the combined
-`state` and, beside it, the main agent's own state as `payload.mainAgent`. Other agents'
-rows and terminal-title-only rows carry none, and readers fall back to `state`:
-
-```ts
-mainAgent?: { state: AgentStatusState; outcome?: AgentTurnOutcome; stateStartedAt: number }
-```
-
-`state` still answers "what should the user see" and folds live child work in,
-so a settled main agent whose subagent still runs reads `working`. `mainAgent` answers
-"what is the main agent itself doing", which the fold used to destroy at publish
-time; every guard that reconstructed a fragment of it (`fromChildWork`, the
-persisted `claudeLeadBoundaryChildOnly` flag) now reads `mainAgent` instead of a
-stored copy. A Claude row whose `mainAgent` is `done` while a child agent still
-works (including a child's permission wait) refuses OSC, which carries no child
-identity; the children's own lifecycle hooks settle it. `outcome` is the recorded verdict on
-the main agent's most recent finished turn, present only while `mainAgent.state` is
-`done`. It is reported by the provider, or is a `cancellation` Orca inferred
-from the user's own interrupt keystroke, or a `superseded` the host recorded when
-a newer request replaced a structured Claude turn before it ended (it names no
-sender, and sets no legacy flag), or, on a structured row whose turn the
-provider gave no verdict, is what the host observed of its end: `interruption`
-(a proven death nobody asked for) or `unconfirmed` (an end it cannot prove,
-never success). The journal's turn outcome, by contrast, stores only recorded verdicts: the provider's, a `cancellation`, or the host's `superseded`; `interruption` and `unconfirmed` are derived from the turn's lifecycle state and never stored. A plain end of turn carries none, because absent
-means unknown and a provider that omits its interrupt flag must not turn a
-cancel into a success.
-In the Claude hook lane the cancellation comes primarily from Orca's own
-inferred interrupt (`markClaudeLeadTurnInterrupted`), because current Claude
-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 fault marks the
-agent failed whatever the combined state, because it is news the user must see
-even while subagents run: a `failure`, and an `interruption`, a turn cut short
-by anything other than the user or a newer request. A user's stop (`cancellation`)
-marks it interrupted, drawn in the muted tone with the row text "Interrupted by user";
-a turn a newer request replaced (`superseded`) marks it interrupted in the same muted
-tone with the row text "Interrupted"; and `unconfirmed` marks it unconfirmed, all only
-on a `done` row, so a stopped
-or finished main agent with live child work still reads working. The folded
-turn header follows the same mark: "Failed after N", "Interrupted after N", or
-"Worked for N".
-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 an unconfirmed end, then a user's 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 an unconfirmed end. 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, an interruption and an
-unconfirmed end like a cancellation (`agentTurnEndedUncleanly`). Attention
-(completion time, Smart Sort, sticky retention, Cmd+J Recent) demotes only a
-turn ended on purpose, the user's stop or a newer request that replaced it
-(`agentTurnEndedOnPurpose`); a failure, an interruption or
-an unconfirmed end 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
-payload; hydration maps an older row's `claudeLeadBoundaryChildOnly: true`
-onto `mainAgent: { state: 'done' }` when the row has no `mainAgent`, and never writes the
-flag again. Hydration seeds the Claude main agent record straight from a saved
-`mainAgent` that is `done`, so the children's drain can still settle the row after
-a restart. `claudeRunningNonAgentTask` is persisted alongside because it is the one
-child-work fact `mainAgent` cannot express: a shell running beside the main agent,
-whose liveness hydration does not restore. Hydration seeds only a row that says
-`false`; a row silent about it stays unseeded. The row builder pairs the two facts in
-one place: a listener event restates the shell fact, and any other write (an OSC
-repaint, an inferred answer) keeps it only while `mainAgent` is unchanged. A child's
-sticky permission prompt still records the main agent's own progress and background
-evidence in the held row, and pushes the held row to subscribers when `mainAgent` changes.
-
-Every lane, Codex included, combines through the fold. A child waiting on a
-human is a fold input (`childWorkLiveness: 'waiting'`, derived from the child's
-own `waiting` state; a child's `blocked` means it failed and stays live work)
-and makes the row wait whatever the main agent is doing, unless the main agent
-is itself asking. The Codex hook lane feeds it from its child transcripts, and
-the structured lanes from child records, which read `waiting` for a Codex child
-thread's approval or input flag and for a Claude subagent's open permission
-request. Known
-divergences, pinned by name in the parity table
-(`src/shared/main-agent-status-parity.test.ts`) where they are reachable, so a
-reader does not mistake them for drift:
-
-- The Claude hook lane holds a child's permission wait in one slot on the
-  displaced main agent record (`waitingAgentId`, `stateBeforeWait`), not on
-  the child. It publishes the displaced state as `mainAgent`, but the next
-  main agent event overwrites the slot, so the row stops reading `waiting`
-  while the child is still asking, and a second asking child replaces the
-  first.
-- In the structured lane a child's pending prompt also makes the session
-  `attention`, which reads as the main agent's own `blocked`: one needs-input
-  state whoever asked. A Claude subagent reads `waiting` only while the
-  journal holds its card pending: from after the card's row is written until
-  just before anyone closes it, so every publish that shows the child waiting
-  also shows the session's `attention`, and the row never reads `waiting` for
-  a Claude subagent's request.
-- The Codex hook lane drops its roster on a root `Stop` when it tracks no
-  child transcripts, so a still-running or still-asking child stops holding
-  the row.
-
-How the main agent's turn ended is not a fold input. A cancel is a verdict on
-the main agent, carried as `mainAgent.outcome: 'cancellation'` (and, for
-readers that predate `mainAgent`, as the row's `interrupted` flag on a `done`
-row); it never retires a shell, scheduled check or subagent the turn left
-running. That work leaves the row only when its own inventory omits it or the
-session ends, so a cancelled turn with a still-running shell reads
-`monitoring` in every lane, and the parity table in
-`src/shared/main-agent-status-parity.test.ts` drives that story through all of
-them. The same rule governs the cancel Orca infers from Ctrl+C: for any row
-that publishes `mainAgent`, the inference is admitted only when
-`mainAgent.state` is `working`, so Orca does not treat a Ctrl+C at the idle
-prompt of a row held open by child work as a turn cancel (Codex also keeps the
-child-evidence guard, and a row without `mainAgent` keeps only that guard).
-The keypress itself is not inert, though: measured live, Claude 2.1.280 stops
-its background subagents on a single idle-prompt Ctrl+C (shells survive) and
-Codex 0.156.1 quits outright, so refusing the inference can leave the row
-showing a subagent its CLI already stopped. The synthesized row is the fold
-of the cancelled main agent with the child work the pane's owner can see: the
-local listener's roster for a local pane, the row's own subagents and shell fact
-for a relayed one, whose provider records live on the relay.
-
-The store holds that verdict against restatements that predate it
-(`server-cancel-verdict-latch.ts`), because a relay never learns of a cancel
-the desktop infers and some TUIs emit late same-turn hooks. The hold is read
-off the row (`mainAgent.outcome: 'cancellation'`), never stored beside it, and
-dies on a new turn (a main agent prompt submission, a changed or explicit
-prompt, a session start) or the provider's own settled `mainAgent`. Child and
-replayed events under the hold keep the cancelled main agent and are re-folded
-with their own child evidence.
-
-## PR 1b: the runtime's retained row store is deleted
-
-Landed. `RuntimeAgentRowStore` is gone, and with it the retained-versus-hook
-reconciliation in `collectRuntimeWorktreePtyAgentSources`. The hook server's
-store is now the only main-process copy of a PTY agent's row.
-
-### The five call sites
-
-| Call site                                                                      | Before                                                          | After                                                                                              |
-| ------------------------------------------------------------------------------ | --------------------------------------------------------------- | -------------------------------------------------------------------------------------------------- |
-| `orca-runtime-create-terminal-side-effect-command-code-detector.ts` `retain()` | second write of the OSC payload already sent to the hook server | deleted; the event now carries the pane's `terminalHandle` and the hook ingest keeps the only copy |
-| `...command-code-detector.ts` `clearPty()`                                     | drops rows on pty exit                                          | deleted; pane teardown already clears the hook row                                                 |
-| `orca-runtime-get-worktree-ps.ts` `values()`                                   | fed `retainedSnapshots`                                         | deleted; the reader keeps only `hookSnapshots`                                                     |
-| `orca-runtime-serialize-agent-prompt-submission.ts` `getFreshExplicit()`       | retained row first, hook rows second                            | `selectFreshExplicitAgentStatus`, hook rows only                                                   |
-| `orca-runtime-prune-mobile-session-tab-group-layout.ts` `getFreshForMobile()`  | pane key, then pty id                                           | `selectFreshAgentRowForMobileTab`: pane key, then `terminalHandle`                                 |
-
-Both readers moved into `runtime-hook-agent-row-selection.ts`, which also owns
-`RuntimeAgentRowSnapshot` now that nothing retains one.
-
-### `terminalHandle` is the row's join back to its terminal
-
-The retained store's only real extra was the pty id, and two readers used it.
-The plan said to stamp the event's `ptyId` into `terminalHandle`; that was
-wrong. A terminal handle (`term_<uuid>`) and a pty id are different
-identifiers, and `getFreshExplicit` was already comparing hook rows against a
-real handle. What landed instead:
-
-- `AgentHookEventPayload` and the runtime's terminal-status event gained an
-  optional `terminalHandle`. The detector resolves it once per chunk through
-  `getAgentStatusTerminalHandleForPaneKey` — the same lookup the renderer-facing
-  IPC boundary already runs for every row, so the two surfaces cannot disagree
-  about which terminal a pane is.
-- `applyNormalizedStatus` carries the handle forward when an incoming event
-  resolves none. Only main's OSC parse can resolve one, so an HTTP hook post for
-  the same pane would otherwise erase it.
-- It is never persisted. A handle belongs to the runtime that issued it, and a
-  hydrated one could only rejoin a row to somebody else's terminal.
-- `toAgentStatusIpcPayload` publishes it, which also makes `getFreshExplicit`'s
-  long-dead handle comparison live: the runtime reads raw snapshot rows, and
-  before this nothing ever stamped the field on them.
-
-`worktree ps` uses it too. `ConnectedPtyEvidence` traded its flat `ptyIds` set
-for `ptyIdByTerminalHandle`, so a row still resolves the connected PTY behind
-it — which is both the working-terminal rollup's match key and the last rescue
-for a row whose pane binding was nulled by a controller incarnation change.
-
-### The change detector had to move with the store
-
-`retain()` was not only a store: its boolean return was the signal that
-republished `session.tabs` for a status-only transition, which no title change
-covers (#7970). `hook-status-session-tabs-invalidation.ts` already mirrors that
-projection change set, including restore provenance and terminal-handle joins,
-so the replacement was to route the signal off the store rather than build a
-second comparator.
-`installHookStatusSessionTabsRepublish` now owns all three arms — enriched
-status, pane clear, and the status-drop tap a dismissal emits — and both hosts
-install it.
-
-### Both hosts, not just the desktop one
-
-`orcad` constructed its runtime with no `onTerminalAgentStatus`, so main's OSC
-parse never reached the store there and the retained copy was the only carrier.
-Deleting it without wiring orcad would have made a headless host list no PTY
-agents at all. `orcad-entry.ts` now binds the producer and installs the
-republish signal, alongside the snapshot and structured sink it already had.
-
-### The intended behavior change
-
-A row the user dismisses on the desktop leaves `worktree ps` and the phone at
-once, instead of lingering until the pty exits. One store means one dismissal.
-
-Legacy numeric pane keys remain a bounded compatibility case. Persisted layouts
-register aliases to their stable leaf owners; an in-process OSC observation may
-also retain a numeric key only when the runtime supplies the matching tab, PTY,
-and terminal handle. HTTP and relay ingress still require a stable key or a
-registered alias, and numeric rows are never persisted.
-
-## PR 2: the renderer subscribes
-
-With structured rows arriving over `agentStatus:set`, the renderer's
-`StructuredAgentSessionStatusBridge` no longer needs to write status; its
-unmount cleanup becomes a tab-close signal to the host. The IPC applicator is
-the single writer for observed status. The 2026-09-09 audit sorted the other
-writers:
-
-| Writer                                                            | Disposition                                                                                              |
-| ----------------------------------------------------------------- | -------------------------------------------------------------------------------------------------------- |
-| Command Code output seeds, parked-pane seeds, pty-exit removal    | delete; main already emits the same facts                                                                |
-| structured bridge status writes                                   | delete; main now publishes the row                                                                       |
-| structured bridge failed-start row (the host refused the create)  | keep; a refused create leaves the host no session, so the bridge writes it from the launch record        |
-| launch placeholder seeds (a user launched an agent with a prompt) | keep for now; main holds the launch config and can seed later                                            |
-| dismissal, acknowledgement, unmount                               | keep; user facts and component lifecycle                                                                 |
-| remote-runtime OSC parse (bytes never transit local main)         | keep, fenced behind the host's published row once the host is new enough; rule 3 of the wire doc applies |
-| web-session mirror receipt clock                                  | keep; the decay rule needs both clocks from one machine                                                  |
-
-The Command Code done-settle window is renderer policy with no main
-equivalent. PR 2 either moves it into main's detector or leaves it, and says
-which.
-
-## PR 3: one rollup, one clock
-
-The worktree card status is derived three times: `lib/worktree-status.ts` in
-the renderer, `runtime-worktree-status-projection.ts` in main, and
-`agent-row-display.ts` in mobile, which hand-copies the 30-minute constant.
-PR 3 moves the rollup and the decay into `src/shared` and makes all three
-call it.
-
-## Readiness reads the store
-
-`terminal wait --for tui-idle` is a reader too. Before STA-9100 hook state
-reached it only through the `<Agent> ready` titles the window writes, so a
-headless `orca serve` never saw it (#16095). Now an agent whose rule file says
-`profile.hooks: "authoritative"` (OpenCode, OpenCode 2, Pi, OMP) or
-`"turn-end"` (Codex) has its fresh row read straight from the store, through the same
-`selectFreshExplicitAgentStatusRow` join prompt-receipt verification uses
-(`src/main/runtime/tui-idle-hook-lane.ts`):
-
-- the main agent's turn, not the combined row, decides: `mainAgent.state` when
-  published, so a subagent's Stop does not end the lead turn. `done` settles
-  the wait, `working` holds it, and a permission wait never settles. The tail's
-  blocked text goes through the existing permission arbiter with the turn as
-  its explicit status, so a denied prompt's dialog left in the tail no longer
-  blocks a turn the hook says ended;
-- the row joins on any pane key or terminal handle the PTY owns; a pane neither
-  reaches, a stale or restored row, a session-start `done`, a row from before
-  the PTY respawned, and a `done` received before the pane's latest input all
-  leave the decision to the screen and text rules, which is also how startup
-  readiness works before an agent's first hook. The input is the PTY run's
-  `lastInputAt` (`terminal-run-facts.ts`), which both write funnels record, so
-  a key the user typed counts like a prompt Orca sent: the next turn's first
-  hook may still be in flight, and an agent restarted in the same shell has
-  not posted one. A shell command marker is no process boundary: Pi paints
-  OSC 133 zones itself;
-- every other agent stays `identity-only`: Claude sends no event when an
-  approval is denied or Esc stops a tool, so its row can sit at `waiting` or
-  `working` forever, and the rules keep deciding;
-- Codex is `turn-end`: only a `done` decides (it settles the wait), and a
-  `working` or permission row leaves the decision to the rules. Before its
-  `Interrupt` hook an Esc mid-turn can leave the row `working`, and an older
-  TUI can hand its hooks to a newer shared app server, so no version check
-  tells which Codex posts it. A `done` is a real turn end on every version, so
-  trusting only that one keeps the headless gain (no quiet window after the
-  turn) without letting a missing cancel hang the wait.
-
-The titles stay for display; remote clients read them.
-
-## What does not change
-
-- The hook scripts, the OSC 9999 wire format, and the relay protocol.
-- The status vocabulary. `working / blocked / done` for rows,
-  `working / attention / idle` for structured summaries, mapped once.
-- The `live / unverifiable / exited` verdicts for remote work. Loss of contact
-  clears nothing; the SSH exemptions in the admission gate stay.
-- Hydration honesty: a restored non-done row is `restoredUnconfirmed` and is
-  never fresh.
-
-## PR 1b reliability contract
-
-- **Invariant (`agent-session.status-host-ownership`):** each execution host has
-  one agent-status store; OSC, hooks, and structured sessions write it, while
-  desktop, `worktree ps`, and mobile only project it. Dismissal, certified PTY
-  exit, and provider-generation replacement remove the same row everywhere;
-  transport loss alone removes nothing.
-- **Failure source:** the deleted runtime row store duplicated OSC observations,
-  keyed them by a different terminal identity, and outlived a dismissal from the
-  hook store. Relay replay could also make old evidence look fresh when readers
-  used its new delivery timestamp.
-- **Oracle:** one OSC observation appears through the hook snapshot in
-  `worktree ps` and mobile, and one store dismissal removes it from both without
-  stopping the PTY. Focused tests also require leaf/incarnation-handle rejoin,
-  legacy numeric-pane compatibility, certified-exit and provider-generation
-  cleanup, evidence-age freshness, and exactly-once startup/stop teardown.
-- **Gate:** `terminal-performance.osc-status-scan-budget` covers the unchanged
-  bounded OSC parser and the runtime projection. There is not yet a dedicated
-  blocking multi-surface status-store gate; the focused suites below are the
-  accepted gap until they accumulate reliability-gate soak evidence.
-- **Provider/platform coverage:** local and daemon-backed PTYs are covered by
-  runtime tests, and SSH relay loss/replay semantics by relay integration tests.
-  The projection is shared by git worktrees and folder workspaces. WSL uses the
-  same store and admission code but has no live run here; Linux and Windows
-  runtime execution, native mobile clients, and mixed-version paired clients
-  remain validation gaps.
-- **Performance budget:** publication stays event-driven with no new polling or
-  subprocesses. One mobile projection clones the status snapshot once, builds
-  pane/handle indexes once, and has a deterministic call-count test; lifecycle
-  cleanup is bounded by the existing status and handle inventories, and orcad
-  tests prove listeners clean up once on failed startup and repeated stop.
-- **Diagnostics:** existing hook-listener errors name the pane and PTY, while
-  status-store tests pin delivery versus evidence clocks. No new telemetry or
-  raw terminal data is emitted.
-- **Residual gaps:** rendered Electron/mobile behavior, live SSH reconnect, and
-  Linux/Windows/WSL execution require the platform QA pass. The current
-  cross-version gate does not cover `session.tabs` content.
-
-## Verification
-
-- Unit: ingest a structured summary and read it back through
-  `getStatusSnapshot`, `worktree ps`, and the mobile projection; assert the
-  serializer never writes a row carrying `structuredHost`; assert a hydrated
-  file that somehow contains one is dropped.
-- Unit: the `worktree ps` suites written against the retained store are rewired
-  to a real `AgentHookServer` (`agent-status-store-wiring.test-fixture.ts`)
-  rather than deleted, so each still asserts the listing behavior it named. The
-  dismissal change is pinned end to end in
-  `orca-runtime-tests/worktree-ps-agent-row-dismissal.spec.ts`, which fails with
-  the retained store restored.
-- Live: the parity check from #19217 (working, done, close, reload) repeated
-  against the merged store, with both surfaces read from the one row.
-
-## Retired OMP pane recovery
-
-A desktop renderer retirement carries an optional UUID through the existing
-`agentStatus:retirePaneAuthority` IPC message. The hook server retains it with
-its bounded retirement fence. A validated live OMP new turn consumes that UUID
-and echoes `authorityRestartId` only in the live notification. Cached rows,
-persistence and startup replay never carry the acknowledgement. Older peers
-omit or ignore it and retain explicit attach restoration.
-
-The renderer keeps the UUID in its existing non-persisted retirement tombstone;
-every re-retirement mints a new one. A matching acknowledgement may clear that
-tombstone only with a successful status write for the existing pane and matching
-workspace/connection. Closed tombstones remain `true`, including after the tab
-LRU evicts its entry. Closing a retired physical alias revokes its whole group.
-This is control-plane retirement correlation, not a second agent-status store.
-
-Fallback restores the hook server's recorded status aliases through the existing
-attach-restoration path. The accepted renderer write restores the matching status
-alias routes too, preserving group membership for the next retirement. It does
-not restore orchestration or launch credentials.
-It is scoped to the requesting desktop renderer. A different window's retirement
-UUID cannot be cleared by the acknowledgement, and web mirrors keep their existing
-host-snapshot/attach behavior.
diff --git a/docs/reference/antigravity-native-accounts.md b/docs/reference/antigravity-native-accounts.md
deleted file mode 100644
index 29fe943afded..000000000000
--- a/docs/reference/antigravity-native-accounts.md
+++ /dev/null
@@ -1,90 +0,0 @@
-# Native Antigravity Accounts
-
-Accounts reads the credential authority on the runtime that owns execution. A client chooses
-an owning Orca runtime and a host/distro target before sending an operation; it never replaces
-the client's Mac Keychain item for another host. The RPC capability is
-`accounts.antigravity-native.v1`. Older paired hosts are refused before account mutations.
-The RPC returns account summaries only, never credential JSON, access tokens or refresh tokens.
-Displayed quota is tied to the subject and authentication method observed during its refresh;
-an external identity change hides the previous account's quota without an automatic fetch.
-
-## Supported authority
-
-Normal macOS agy uses service `gemini`, account `antigravity`. Its go-keyring values use the
-base64 or legacy hex wrapper. Orca passes writes through `security -i` stdin, validates bounded
-output and reads the entire native value back. The command buffer limit is checked before
-writing. A missing native item falls back to the CLI-specific
-`~/.gemini/antigravity-cli/antigravity-oauth-token` file. The distinct legacy jetski fallback
-is not imported.
-
-The compiled CLI bypasses keyring storage when SSH/WSL environment detectors or WSL kernel
-identity apply. A runtime running under that evidenced bypass reads/writes its own CLI file;
-it does not contact the client keychain. The file must be private and regular. A macOS
-`cache/antigravity-keyring-unavailable` marker makes authority uncertain: Orca refuses instead
-of assuming that the keychain or file wins.
-
-Native Windows Credential Manager, native Linux Secret Service, and operations directed from
-Windows Orca to a selected WSL distro are explicitly unsupported pending verified adapters.
-Windows file bypass is also refused until private ACL protection is verified.
-Windows' `gemini:antigravity` raw blob and 2560-byte limit are different from the Mac wrapper;
-Linux uses the login collection with `service=gemini`, `username=antigravity`. No dependency,
-PowerShell compilation, credential-home flag, or cross-host fallback is invented here.
-A separate SSH relay has no Accounts RPC; use a paired owning runtime that implements it.
-
-## Identity and snapshots
-
-A Google ID token supplies the normalized Google issuer and stable subject. The authentication
-method also scopes identity. The label uses a verified email when available; email is never the
-identity key. Account record IDs are random and survive token, expiry, refresh-token and email
-rotation. Profiles without a stable subject can be displayed but cannot be saved for switching.
-
-Snapshots preserve the exact native JSON, including fields that Orca does not interpret. The
-host's vault under `userData/antigravity-accounts/vault` requires meaningful OS encryption and
-private permissions. Weak or unavailable encryption is refused. Unreadable/corrupt ciphertext
-is preserved; it is never treated as an empty vault. This does not migrate the experimental
-candidate's incompatible array vault or token-hash IDs.
-
-One host service serializes Add, Select, Remove, launch checks and refresh reconciliation.
-It re-reads the vault after asynchronous native reads and captures external CLI refreshes into
-the same stable account. Selection reconciles the outgoing snapshot, checks the expected native
-bytes before writing, and checks native readback before publishing the selected ID. It avoids
-writing an old snapshot over an already-active account. The current or selected account cannot
-be removed; deletion checks the latest native value again before committing.
-
-A selected account is checked before new Orca PTY launches, including desktop daemon and
-headless runtime paths. An externally changed native identity blocks the launch and asks the
-user to select again. Existing sessions can retain their original credentials in memory.
-Shell commands typed manually into a running terminal are outside the Orca launch guard.
-
-## Sign-in and concurrency limits
-
-Sign-in uses the supported ordinary agy browser/code flow. Users run agy on the owning host;
-to add a different account they use its `/logout` command, complete the next sign-in, then save
-the actual resulting account in Orca. This implementation does not advertise an Orca-managed
-login or invent an agy `login`/`--login` flag. Browser completion and a second real Google
-account remain user-driven; tests do not sign out or change the developer's real native item.
-
-Native keyring does not expose compare-and-swap. Orca's queue serializes its own calls, and
-bounded before/after checks detect observed conflicts; another independently running agy or
-Orca process can still write between the final check and the write or launch. A failed
-verification may mean the native item changed but selection was not persisted. Refresh and
-explicit selection resolve that state; automatic rollback could destroy a newer CLI refresh
-and is deliberately avoided. The file backend has the same external-writer limit.
-
-## Evidence and contributor credit
-
-The foundation adapts the reviewed codec/macOS adapter from #21784 and account-service concepts
-from #21797 (nwparker), with fresh identity, persistence, serialization and conflict handling.
-The signed-in Accounts card and quota-error visibility acknowledge #19588 by @artile; quota
-transport is reused from current main rather than its obsolete extraction code. Targeted
-multi-account UI/target concepts acknowledge #23761 by @Tai-DT, replacing its placeholder login
-and unused settings selection. The Accounts legacy-Gemini clarification acknowledges #21682
-and the original relevant migration contribution by @siddqamar, as requested in #17345.
-No stale development stack was cherry-picked.
-
-Live proof uses a disposable Mac service/account item, a fully isolated hidden Electron home,
-and synthetic accounts. A private task-only copy was also selected through the real service;
-installed agy 1.2.14 consumed that verified file credential under its SSH bypass and returned
-`command.name=usage`, `num_turns=0`, no conversation. The real native item remained unchanged.
-This proves the Mac adapter mechanics and actual CLI file authority, not a second-account
-native-keychain switch, native Windows/Linux switching, or WSL/SSH relay deployment.
diff --git a/docs/reference/antigravity-readiness-evidence.md b/docs/reference/antigravity-readiness-evidence.md
deleted file mode 100644
index 18317d7e5cec..000000000000
--- a/docs/reference/antigravity-readiness-evidence.md
+++ /dev/null
@@ -1,332 +0,0 @@
-# Antigravity readiness: what the transcripts show
-
-Antigravity readiness lives in `src/main/runtime/agent-state-rules/antigravity.json`: a screen rule
-over the trusted grid, and a text anchor that runs the named scan
-`findAntigravityComposerIndex` (`agent-state-rules/antigravity-text-composer.ts`) over the
-line-folded tail when no trusted grid exists. That text scan decides whether a pane is ready for a
-prompt from its tail alone. It has been written five times, each version tuned
-against a five-line screen typed from memory into a `.spec.ts` fixture. Three of the first four
-were found worse than the bug they replaced, and the fifth was reverted.
-
-Real transcripts now exist. They were recorded from a live `agy` on macOS with
-[`agent-pty-transcript-capture.md`](./agent-pty-transcript-capture.md) and are committed under
-`src/main/runtime/__fixtures__/`. `src/main/runtime/antigravity-readiness-transcripts.test.ts`
-replays them through the runtime.
-
-**Headline (STA-8741, agy 1.2.14): readiness is now read off the live screen, not the text tail.**
-The screen's bottom four rows at an idle composer are rule, caret, rule, `? for shortcuts`. The
-caret alone is not enough: agy keeps it painted mid-turn and behind the `/model` picker. The hint
-row is what changes. [Attempt seven](#attempt-seven-the-live-screen-sta-8741) has the recordings;
-the sections after it are the 1.2.0 history that led there.
-
-## Attempt seven: the live screen (STA-8741)
-
-Recorded 2026-09-30 on macOS with `agy` 1.2.14 (binary and banner agree), a signed-in Google
-account, `AGY_CLI_HIDE_ACCOUNT_INFO=1`, in an already-trusted workspace. All are 120x40 except
-where the name says otherwise. `src/main/runtime/antigravity-screen-readiness-transcripts.test.ts`
-replays them.
-
-| Fixture (`antigravity-1-2-14-*.txt`) | Screen at the end                                   | Screen rule |
-| ------------------------------------ | --------------------------------------------------- | ----------- |
-| `ready`                              | settled startup, bare `>`                           | ready       |
-| `ready-accept-edits`                 | `> Accept-edits mode: …` (`--mode accept-edits`)    | ready       |
-| `ready-plan`                         | `> Plan mode: …` (`--mode plan`)                    | ready       |
-| `ready-80x24`                        | settled startup on an 80x24 PTY                     | ready       |
-| `picker-dismissed`                   | `/model` opened, then Esc                           | ready       |
-| `turn-ended`                         | a short turn has ended                              | ready       |
-| `model-picker`                       | `Switch Model` open; the bare `>` is still above it | not ready   |
-| `command-palette`                    | `> /` with the palette, hint `esc to cancel`        | not ready   |
-| `busy-thinking`                      | `Generating...` spinner, bare `>`, `esc to cancel`  | not ready   |
-| `busy-streaming`                     | answer streaming, bare `>`, `esc to cancel`         | not ready   |
-| `trust-dialog`                       | untrusted folder, alternate-screen trust menu       | not ready   |
-| `draft`                              | unsent text in the composer; the hint row is blank  | not ready   |
-
-What they show:
-
-- **The text tail misses three ready screens.** On `ready-accept-edits`, `ready-plan` and
-  `turn-ended` the line-folded tail never satisfies `findAntigravityComposerIndex`; the screen
-  rule does. (`turn-ended` is the 1.2.14 form of the old `busy-turn-ended` known defect.)
-- **A caret rule is wrong on the screen.** The grid keeps the bare `>` through a turn and behind
-  the picker. The text tail happened to lose it mid-turn (section 8); the screen does not.
-- **The rule can read ready for a moment mid-turn.** Replayed in 64-byte chunks, the submit repaint
-  clears the composer a moment before `? for shortcuts` becomes `esc to cancel`. So a pane with an
-  output clock is held to the same 3s quiescence as Codex (tier 1b in `tui-idle-evidence.ts`); an
-  idle agy goes silent within a second and a turn keeps repainting its spinner. A restored pane with no
-  clock settles from the screen alone.
-- **A name-only title settled the picker.** With the pane titled `agy`, the old ranking reached
-  its weak title lane and settled with `/model` open. When a trustworthy screen exists it now
-  decides, and that lane stays shut.
-- **A mismatched grid garbles the chrome.** At 80x24, 100x30 or 60x20 the 120x40 recordings lose
-  the four-row shape, and resizing the model does not make the TUI repaint. So the live screen
-  counts only when its grid matches the PTY's reported size and is not a reflow the TUI never
-  repainted for (a re-attach that learned the real size late; a later PTY resize off that size
-  repaints it). Otherwise every pre-existing lane (text rules, title, quiet process) decides, as
-  before this change.
-- **A readable screen outranks the text.** When the grid is trustworthy and refuses, the text rules
-  do not overrule it, in the ready-prompt tier or the quiet one; they decide only when there is no
-  trustworthy grid. The recorded picker-dismissed text over a model-picker screen proves it.
-
-The visible-read probe's Antigravity branch is retired. It read the provider screen with a looser
-rule (any caret after the banner) whenever the pane was Antigravity. The probe now runs the shared
-rule for every screen-ruled agent, only for a pane with no output clock. A clocked pane settles
-through the poll. The probe's screen read is the draft-blanking read projection, so it restores the
-blanked composer row before the rule reads it (Cline's `❯ Ask anything...` otherwise reads as a
-bare `❯`).
-
-Still not captured: a tool-permission prompt (the operator's `toolPermission` is
-`always-proceed`, and changing it means editing their settings), and the sign-in, theme, privacy and
-update dialogs, for the reasons in the table below. Windows and Linux are unrecorded.
-
-The 1.2.0 fixtures below were recorded before the recorder stopped writing ahead of shutdown. Their
-last bytes are agy's exit teardown (`ESC[J ESC[?2004l`), so their final screens have no hint row.
-
-## Versions
-
-| Thing                     | Value                         |
-| ------------------------- | ----------------------------- |
-| `agy --version`           | `1.1.25`                      |
-| Banner printed by the TUI | `Antigravity CLI 1.2.0`       |
-| Captured                  | 2026-09-10, macOS, 120x40 PTY |
-
-The binary and its own banner disagree. Any rule keyed to a version string must read the banner,
-not `--version`, and must tolerate the two disagreeing.
-
-## What the captures are
-
-| Fixture                                      | What it is                                                |
-| -------------------------------------------- | --------------------------------------------------------- |
-| `antigravity-ready-api-key-gemini-model.txt` | Ready screen, API-key identity, Gemini 3.7 Flash (Low)    |
-| `antigravity-ready-account-info-hidden.txt`  | The same ready screen with `AGY_CLI_HIDE_ACCOUNT_INFO=1`  |
-| `antigravity-dialog-trust-workspace.txt`     | Workspace trust dialog, live and unanswered               |
-| `antigravity-dialog-model-picker.txt`        | `/model` picker, live and unanswered                      |
-| `antigravity-dialog-command-palette.txt`     | Slash-command palette, live and unanswered                |
-| `antigravity-dialog-dismissed.txt`           | `/model` picker dismissed with esc, then settled          |
-| `antigravity-busy-mid-turn.txt`              | A real turn, recording stopped while the spinner was live |
-| `antigravity-busy-turn-ended.txt`            | The same turn after it ended and the composer returned    |
-
-## What could not be captured, and why
-
-Nothing below was faked. Each is a case the recorder could not reach without changing the
-operator's account state or configuration, which is out of bounds.
-
-| Missing                                     | Why                                                                                                                                                                                        |
-| ------------------------------------------- | ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------ |
-| `antigravity-ready-business-non-gemini.txt` | This machine has no OAuth session — the CLI prints _"You are currently not signed in"_ and authenticates from `GEMINI_API_KEY`. Reaching a Business ready screen means signing someone in. |
-| A non-Gemini model on any ready screen      | `agy models` offers 11 models, all Gemini, and `settings.json` pins `modelProvider: gemini`. A non-Gemini row is not reachable from this account.                                          |
-| `antigravity-dialog-sign-in.txt`            | Unsetting `GEMINI_API_KEY` does not reach the sign-in dialog; the CLI refuses to start because `modelProvider` is pinned. Reaching it means editing the operator's `settings.json`.        |
-| `antigravity-dialog-theme-picker.txt`       | There is no `/theme` command in 1.2.0 (`Unknown command: /theme`). The picker appears only in first-run onboarding, which means deleting the operator's config.                            |
-| `antigravity-dialog-privacy-notice.txt`     | First-run onboarding, as above.                                                                                                                                                            |
-| `antigravity-dialog-update-banner.txt`      | Cannot be forced; no update was pending during the session.                                                                                                                                |
-
-Each remains as a named, skipping case in the suite so it is visible rather than forgotten.
-
-## What the transcripts show
-
-### 1. The ready screen's model row is not at the start of a line
-
-The ready screen prints a block-glyph logo down the left, and the identity, model and path rows are
-painted **on the same physical lines as the logo**. What Orca derives is:
-
-```
-▀▀▀▀▀▀       Gemini API key
-▀▀▀▀▀▀▀▀      Gemini 3.7 Flash (Low)
-▄▀▀    ▀▀▄     ~
-```
-
-The earlier detector required `normalized.startsWith('gemini', trimmedStart)` on a trimmed line. The
-trimmed line starts with `▀`, so that rule never matched. The shipped detector uses the bare
-composer caret instead. Measured three ways on the real screen:
-
-| Input                                                  | `isKnownReadyPromptPreview` |
-| ------------------------------------------------------ | --------------------------- |
-| Real ready screen                                      | `true`                      |
-| The same screen with the logo glyphs stripped          | `true`                      |
-| Real ready screen followed by the live `/model` picker | `false`                     |
-
-So the logo — decoration, and suppressible with `AGY_CLI_HIDE_LOGO` — no longer decides readiness,
-and the live dialog cannot reuse the stale composer caret as a ready signal.
-
-### 2. The dialog used to satisfy the model rule
-
-`/model` prints its options one per line:
-
-```
-Gemini 3.8 Flash
-> Gemini 3.7 Flash (current)
-Gemini 3.1 Pro
-```
-
-Those lines _do_ begin with `Gemini`, and a bare `>` composer line sits earlier in the same tail
-from before the picker opened. Both halves of the old rule were satisfied **while a dialog owned the
-screen**, and the pane read ready. The shipped detector now recognizes the active `Switch Model`
-surface and rejects that stale caret until it sees `Exited /model command`.
-
-### 3. `>` is the dialog selection marker, not only the composer caret
-
-Every dialog uses `>` to mark the highlighted row: `> Yes, I trust this folder`,
-`> Gemini 3.7 Flash (current)`, `> /add-dir`. The idle composer is a line whose whole trimmed
-content is `>`. That distinction is the only thing separating them, which means the relaxation
-proposed in PRs #15840 and #15852 — accept any line _beginning_ with `>` — would make the trust
-dialog and the model picker read as ready. On 1.2.0 the idle composer is a bare `>`; those PRs'
-1.1.17 mode-banner claim could not be reproduced here and may be mode-specific.
-
-### 4. There is no email account row, and the row can be switched off entirely
-
-For an API-key user the identity row reads literally `Gemini API key`. There is no `@`, no
-domain, nothing an account-row rule can key on. Separately, `AGY_CLI_HIDE_ACCOUNT_INFO=1` — a
-supported environment variable in the binary — removes the row from a fully ready screen, which
-`antigravity-ready-account-info-hidden.txt` captures.
-
-### 5. Dialogs are drawn two different ways, and the banner is never reprinted
-
-The trust dialog and the sign-in splash take the **alternate screen** (`ESC[?1049h` … `ESC[?1049l`).
-The model picker and command palette are drawn **in place on the main screen** with erase-to-EOL.
-After dismissal the CLI prints `⎿ Exited /model command` and redraws the composer — it does **not**
-reprint the banner. The header stays where it was at startup.
-
-### 6. Rows are positioned with cursor addressing, not newlines
-
-The status row is written with absolute and relative moves (`ESC[13;99H`, `ESC[83X ESC[83C`), so
-`? for shortcuts` and `Gemini 3.7 Flash · low` end up on one derived line. Any rule that assumes
-one screen row equals one `\n`-delimited line is reading a different document than the user sees.
-
-## 8. Busy frames park the caret exactly like idle frames — the spinner is what differs
-
-The frame that ends a turn-in-progress and the frame that ends an idle screen park the cursor with
-the **same bytes**. Only the hint row differs, and the park erases it:
-
-```
-idle:  ? for shortcuts ESC[83X ESC[83C Gemini 3.7 Flash · low  CR ESC[2A ESC[2C ESC[?25h
-busy:  esc to cancel   ESC[85X ESC[85C Gemini 3.7 Flash · low  CR ESC[2A ESC[2C ESC[?25h
-```
-
-So a rule that keys on "the caret is the last thing in the tail" cannot tell busy from idle **on the
-frame alone**. What saves it is what comes next. Each spinner tick is its own repaint with its own
-park, two rows higher than the frame's:
-
-```
-ESC[?25l CR ESC[2A ⣯  Generating    ESC[11D ESC[?25h
-ESC[?25l CR ESC[2A ⣟  Generating.   ESC[12D ESC[?25h
-```
-
-That second `CR ESC[2A` splices the composer row away, so the retained tail during a live turn ends
-on the spinner row, not on the caret. Measured on `antigravity-busy-mid-turn.txt`:
-
-| Capture                                      | last retained line | bare `>` line present |
-| -------------------------------------------- | ------------------ | --------------------- |
-| `antigravity-ready-api-key-gemini-model.txt` | `>`                | **yes**               |
-| `antigravity-busy-mid-turn.txt`              | `⣟  Generating...` | **no**                |
-
-**Consequence for a caret-based rule:** it already answers "not ready" for a real mid-turn capture,
-because there is no bare caret in the tail to match. A constructed input that keeps the park bytes
-and only edits the status text is not faithful to a live turn — a live turn has a spinner row
-repainting _below_ the composer.
-
-**The residual window, and the clause it implies.** Between a frame park and the next spinner tick
-the tail does end on the bare caret and is indistinguishable from idle. The gap is one tick
-interval. Any readiness path gated on sustained quiescence is safe, because ticks keep arriving and
-the pane is never quiet; a path that only inspects retained text is not. For those paths the
-evidence supports one clause, and only one:
-
-> **A braille glyph (U+2800–U+28FF) on the last visible line of the retained tail means working.**
-
-That predicate already exists in this file for cursor-agent (`CURSOR_BUSY_SPINNER_RE`) and should be
-reused rather than reinvented. It must be scoped to the **last visible line**, not the whole tail:
-a first-run transcript prints `⠾ Signing in...` during startup, which would otherwise pin a ready
-screen as busy forever.
-
-Nothing else in the capture distinguishes the two states. The hint row (`esc to cancel` versus
-`? for shortcuts`) is erased by the park in both cases, the park offsets are identical, and
-`ESC[?25l`/`ESC[?25h` fencing appears around every repaint, idle or busy.
-
-## Confirmed / refuted, by attempt
-
-Evidence column names the fixture; all quoted text is from the committed transcripts.
-
-### Attempt 1 — the rule at HEAD
-
-| #    | Claim                                                    | Verdict                     | Evidence                                                                                                                                                 |
-| ---- | -------------------------------------------------------- | --------------------------- | -------------------------------------------------------------------------------------------------------------------------------------------------------- |
-| 1.1  | A ready screen prints the banner `Antigravity CLI`       | **Confirmed**               | `Antigravity CLI 1.2.0` in both ready fixtures                                                                                                           |
-| 1.1b | …and its last occurrence in the tail is the live one     | **Refuted**                 | The trust dialog's own body says _"Antigravity CLI requires permission to read, edit, and execute files here"_, so `lastIndexOf` lands inside the dialog |
-| 1.2  | The model row begins with the vendor word `Gemini`       | **Refuted**                 | `▀▀▀▀▀▀▀▀      Gemini 3.7 Flash (Low)` — the logo precedes it; never at line start                                                                       |
-| 1.3  | The caret line's whole trimmed content is `>`            | **Confirmed** on 1.2.0 idle | bare `>` in both ready fixtures                                                                                                                          |
-| 1.3b | …and only the composer prints `>`                        | **Refuted**                 | `> Yes, I trust this folder`, `> Gemini 3.7 Flash (current)`, `> /add-dir`                                                                               |
-| 1.4  | A ready screen prints the workspace path on its own line | **Refuted**                 | the path shares its line with logo glyphs (`▄▀▀    ▀▀▄     ~`)                                                                                           |
-
-### Attempt 2 (loop 1) — blacklist the model line
-
-| #   | Claim                                      | Verdict     | Evidence                                                                                                         |
-| --- | ------------------------------------------ | ----------- | ---------------------------------------------------------------------------------------------------------------- |
-| 2.1 | Dialog model-row wording is enumerable     | **Refuted** | the palette lists 50+ commands with free-form descriptions; the picker prints whatever models the account offers |
-| 2.2 | A dialog never reproduces a real model row | **Refuted** | the `/model` picker prints four real model rows, one per line, at line start                                     |
-
-### Attempt 3 (loop 2) — structural ordering on `headerIndex`
-
-| #   | Claim                                              | Verdict                            | Evidence                                                                                             |
-| --- | -------------------------------------------------- | ---------------------------------- | ---------------------------------------------------------------------------------------------------- |
-| 3.1 | A live dialog is printed below the ready chrome    | **Confirmed** for in-place dialogs | picker and palette append below the composer                                                         |
-| 3.2 | The banner is reprinted when a dialog is dismissed | **Refuted**                        | `antigravity-dialog-dismissed.txt` shows `⎿ Exited /model command` and a redrawn composer, no banner |
-| 3.3 | Antigravity does not use the alternate screen      | **Refuted**                        | `ESC[?1049h` opens the trust dialog and the sign-in splash                                           |
-| 3.4 | No full repaint per keystroke                      | **Partly refuted**                 | typing `/mod` repaints the palette region on each keystroke with `ESC[K`                             |
-
-Because of 3.2, `headerIndex` cannot be the anchor: it never advances. Ordering can only be
-expressed against the model/caret positions, which is what 1.2 and 1.3b just invalidated.
-
-### Attempt 4 (loop 3) — require a positive account row
-
-| #   | Claim                                                | Verdict                | Evidence                                                                                                                    |
-| --- | ---------------------------------------------------- | ---------------------- | --------------------------------------------------------------------------------------------------------------------------- |
-| 4.1 | Every ready screen prints an account row             | **Refuted, twice**     | API-key identity prints `Gemini API key` (no `@`); `AGY_CLI_HIDE_ACCOUNT_INFO=1` removes the row entirely                   |
-| 4.2 | A startup dialog never contains an `@`-and-`.` token | **Not reachable here** | none of the captured dialogs contains one, but the palette shows free-form skill descriptions, which are user-authored text |
-| 4.3 | The account row is distinguishable from prose        | **Refuted**            | the row is not a distinct line; it shares one with the logo                                                                 |
-
-### Attempt 5 (PR #19749, reverted) — ordering + account row
-
-| #   | Claim                                                    | Verdict     | Evidence                                                                                                                                                                                           |
-| --- | -------------------------------------------------------- | ----------- | -------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
-| 5.1 | Ordering plus an account row separates ready from dialog | **Refuted** | the account row is optional (4.1) and the ordering anchor never moves (3.2)                                                                                                                        |
-| 5.2 | Executing both builds was sufficient verification        | **Refuted** | the executed input was the hand-written fixture, so the check reproduced the fixture's assumptions. The real screen disagrees with that fixture on the model row, the path row and the account row |
-| 5.3 | The wedge is a model-name problem                        | **Refuted** | it is a line-start problem. Even `Gemini 3.7 Flash (Low)` — a Gemini model — fails, because a logo glyph precedes it                                                                               |
-
-### Cross-cutting
-
-| #   | Question                                                   | Answer                                                                                                                          |
-| --- | ---------------------------------------------------------- | ------------------------------------------------------------------------------------------------------------------------------- |
-| X1  | Does `agy` set an OSC title distinguishing busy from idle? | **No.** Not one OSC title sequence appears in any capture. Title-based readiness is unavailable for this agent                  |
-| X2  | Does it repaint with bare `\r`?                            | **Yes**, constantly, plus `ESC[K` and absolute cursor moves                                                                     |
-| X3  | Does the caret survive in the tail?                        | **Yes** — a bare `>` line is present in every ready capture                                                                     |
-| X4  | Banner-to-caret distance                                   | ~8 derived lines on a 120x40 PTY; the banner falls outside the 6-line preview window, so only the full retained tail can see it |
-| X5  | Pane title on the trust screen versus ready                | Identical: none                                                                                                                 |
-
-## Attempt six is shipped
-
-Yes — but not as a variation on any of the five. Every one of them refined a predicate over
-`\n`-delimited lines, and that is the layer where the evidence says the information is not.
-
-What the captures support and the shipped detector now does:
-
-- **The one stable, dialog-free ready marker is a line whose entire trimmed content is `>`.** It is
-  present in every ready capture and absent from every dialog capture, because a dialog's `>` always
-  carries its selected row's label. This is a much narrower rule than any attempt used, and it is
-  the only one that survived contact with the transcripts.
-- **Drop the model-row requirement.** The model rows match dialogs and not the ready screen, so
-  keeping that requirement inverted the detector.
-- **Do not require an account row.** It is optional by environment variable and carries no email for
-  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`.
-- **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.
-
-What is still unknown and should be captured: the sign-in, theme, privacy and update dialogs, and
-any ready screen where the composer is not idle (accept-edits and plan mode, which PRs #15840 and
-#15852 describe from a screenshot). A bare-`>` rule is only as good as the claim that those modes
-still end on a bare `>`; that claim is untested.
-
-The honest summary is that this is a screen-shaped problem being solved with line-shaped tools. A
-rule over the derived tail can be made much better than what ships today, but the durable fix is to
-ask the terminal emulator what the bottom row of the screen actually is, rather than inferring it
-from a byte stream that was written with cursor addressing. Attempt seven does that.
diff --git a/docs/reference/antivirus-prerelease-clearance.md b/docs/reference/antivirus-prerelease-clearance.md
deleted file mode 100644
index 9efcfb3aaa01..000000000000
--- a/docs/reference/antivirus-prerelease-clearance.md
+++ /dev/null
@@ -1,117 +0,0 @@
-# Antivirus clearance for future releases
-
-Orca collects a steady stream of antivirus and EDR false positives — see the
-tracking issue for the current grouping. This document covers the part of that
-problem worth engineering effort: **stopping the next release from being
-flagged.**
-
-Clearing a *historic* release is explicitly not a goal. A user sitting on a
-flagged build should update to a cleared one, not wait for a vendor to whitelist
-a version we no longer ship. Retroactive submissions cost the same effort per
-vendor and expire the moment we cut a new version.
-
-For the behavioural side of the problem — the process-tree shapes EDR scores,
-which no whitelist fixes — read
-[`windows-edr-posture.md`](./windows-edr-posture.md) instead. This document is
-about file verdicts on the bytes we ship.
-
-## The two mechanisms, and only one of them scales
-
-**Sample submission** clears one build. You send the flagged file to a vendor's
-analyst portal, they confirm it is clean, and the verdict is dropped from their
-next definition update. This is reactive and per-release: cutting a new version
-produces new bytes, new hashes, and a fresh chance of the same heuristic firing.
-Doing this every release, across every vendor, is not sustainable.
-
-**Signer and product whitelisting** clears every future build. The vendor
-records the publisher identity or enrolls the product in a dynamic allowlist, and
-subsequent releases inherit that trust without another submission. Enrollment is
-one-time work per vendor, and it is the only lever that scales with our release
-cadence.
-
-Prefer enrollment. Use submission only to clear a live incident while enrollment
-is pending, and only for a release users are actually expected to install.
-
-## Prerequisites that make enrollment possible
-
-None of these programs will accept an unsigned or anonymous binary, so these
-come first:
-
-1. **Every shipped PE is Authenticode-signed, and CI fails the release if not.**
-   Done as of v1.4.217 — the release workflow requires a valid SignPath
-   Foundation signature on the inner binaries and no longer fails open.
-2. **Every shipped PE carries real provenance** — company, product, version,
-   description, and an explicit `asInvoker` manifest. An anonymous binary scores
-   worse than an identified one, and several portals reject submissions that
-   carry no version metadata.
-3. **One stable signer identity.** Vendor allowlists key on the certificate
-   subject. Rotating signers resets accrued reputation, so a certificate change
-   is a re-enrollment event, not a transparent swap.
-
-## Vendor programs
-
-Enrollment state is deliberately left as a task here rather than asserted — fill
-each in as it is confirmed, and record the account that owns it so a lapsed
-enrollment is traceable.
-
-| Vendor                    | Mechanism                                                                    | Scope                    | State |
-| ------------------------- | ---------------------------------------------------------------------------- | ------------------------ | ----- |
-| **VirusTotal**            | Monitor — paid; builds rescanned daily, developer and vendor both notified     | ~70 engines at once      | TODO  |
-| **Microsoft**             | Defender Security Intelligence submission, as a software developer            | Defender, Defender FP EP | TODO  |
-| **Microsoft**             | Trusted Signing, or an EV certificate, for SmartScreen and Smart App Control  | Reputation gates         | TODO  |
-| **Kaspersky**             | Whitelist Program — vendors submit builds for the Dynamic Allowlist           | Endpoint, all platforms  | TODO  |
-| **Trend Micro**           | Certified Safe Software Service — pre-release software whitelisting           | Endpoint, Virus Buster   | TODO  |
-| **Bitdefender**           | False-positive submission for software vendors                                | Endpoint, ATD            | TODO  |
-| **Avast / AVG / Norton**  | Gen Digital false-positive and whitelisting channels                          | Consumer suites          | TODO  |
-| **ESET**                  | False-positive sample submission                                             | Endpoint                 | TODO  |
-| **Tencent iOA**           | No public developer channel found; needs a support relationship               | iOA, macOS and Windows   | TODO  |
-
-VirusTotal Monitor is the highest-leverage single entry, because it is the only
-channel built for exactly this workflow: uploads sit in a private store, get
-rescanned daily against every engine's current signatures, and when one flags a
-file **both we and that vendor are notified automatically**. Pre-publish upload
-is a supported use, which is precisely the future-release posture we want. It is
-a paid service, monetised on developers and free to the antivirus vendors.
-
-Be honest about its limit: VirusTotal states plainly that Monitor is not a free
-pass to get a file whitelisted. Vendors sometimes keep a detection. What it
-reliably buys is *early notice and a real contact path* instead of discovering a
-verdict from a user's issue report weeks later.
-
-Do not treat a plain VirusTotal *scan* as equivalent. A scan tells us a verdict
-exists; Monitor is what routes it to someone who can drop it.
-
-If the subscription is not worth it, the free fallback is the community-maintained
-false-positive contact directory (`yaronelh/False-Positive-Center` on GitHub),
-which collects the submission addresses and forms each vendor actually reads.
-That replaces the hardest part of a submission — finding the right contact — but
-keeps the per-release effort that Monitor removes.
-
-## Where this lands in the release flow
-
-The check belongs at RC time, not after a stable cut — a verdict discovered after
-publication is a verdict users already hit.
-
-`config/scripts/scan-release-artifacts-antivirus.mjs` reports the current
-detection state of built artifacts by hash. Run it against an RC's artifacts, and
-treat any engine verdict as a release-blocking question rather than an automatic
-stop: these are third-party ML classifiers, so a hard gate on their output would
-fail the release for reasons outside our control. Read the report, decide, and
-submit if the flagged build is one we intend to ship.
-
-The script looks up hashes by default and never transmits artifact bytes. Passing
-`--upload` sends the file to VirusTotal, which distributes samples to partner
-vendors — that is the intended outcome for clearance work, but it is a
-publication, so it stays opt-in and out of any automated path.
-
-## What not to do
-
-- **Do not ask users to add exclusions** as the resolution. It suppresses the
-  symptom on one machine, and in several reports here the exclusion did not even
-  hold because the detection was behavioural rather than path-based.
-- **Do not dispute a verdict without a sample.** Every report worth acting on in
-  this project came with a hash that we verified bit-identical to the published
-  release asset. That verification is what makes a submission credible.
-- **Do not chase a vendor whose detection we cannot reproduce or name.** Route
-  those back to the reporter for the detection string and the exact flagged path
-  first.
diff --git a/docs/reference/ci-demand-rollout.md b/docs/reference/ci-demand-rollout.md
deleted file mode 100644
index d8092ef412f8..000000000000
--- a/docs/reference/ci-demand-rollout.md
+++ /dev/null
@@ -1,173 +0,0 @@
-# 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, since replaced by the
-pinned-Node headless lanes). 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                                                          |
-| Headless Node persistence              | Deferred until ready                       | Linux x64 for ordinary runtime changes; explicit platform families or all six for sensitive inputs | All six platforms for relevant main pushes; full nightly qualification at 11:30 UTC |
-| Headless Node glibc/musl qualification | Deferred until ready                       | Linux-specific or full qualification, after persistence succeeds                                   | Both architectures for relevant main pushes and nightly qualification               |
-| E2E                                    | Existing targeted routing                  | Existing targeted routing                                                                          | One complete run at 17:00 UTC                                                       |
-
-Headless draft updates carry no verdict; readiness starts the checks. Relevant
-ready PRs retain Linux x64 smoke coverage. Explicit Windows or macOS paths add both
-architectures in that family, while Linux paths add Linux ARM and the glibc/musl
-lanes. Root/toolchain inputs, native build inputs, shared execution/storage paths,
-SSH, providers and relay changes retain every platform. Missing or incomplete
-change evidence and failed import analysis also retain full qualification.
-Unrelated changes skip through the dependency classifier. Relevant main pushes
-qualify all six platforms and both Linux compatibility architectures; detection
-uses the whole push before qualification can supersede an older relevant run.
-
-The detector checks known build inputs with the pinned Node toolchain first.
-Other paths install dependencies for import analysis; an uncertain result never
-skips qualification. This changes setup cost, not the qualification policy.
-
-Windows server prebuilds are cached separately by architecture and pinned build
-inputs, including the runner image. Only successful qualification on main publishes
-them. Consumers validate the payload and still run the pinned-Node load/spawn smoke;
-a cache miss or invalid payload builds fresh. Nightly, manual and release builds
-remain fresh. No native artifact is shared across platforms or ABIs.
-
-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.
-
-The daemon running-work test imports the shared probe directly, with the daemon's
-process inspector supplied as its callback. The renderer keeps its existing
-adapter and forwarding tests. This removes a mocked renderer dependency from the
-headless graph without changing the probe algorithm or skipping backend tests.
-At validation, the graph fell from 6,018 inputs (1,070 renderer inputs) to 4,879
-inputs (no renderer inputs), including nine added shared-probe cases. Renderer
-adapter changes no longer qualify the headless matrix; shared probe and daemon
-test changes still do. Future actual renderer imports remain discoverable.
-
-## Unit selection rollout
-
-PR planning runs alongside typechecking after their shared dependency setup; an
-explicit join publishes its artifact before the unit matrix can start. Static
-analysis's Node 24 install also prepares the native cache before matrix fan-out.
-The daily compatibility workflow retains its separate planner and cache primer.
-
-`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
deleted file mode 100644
index aa8146649bb9..000000000000
--- a/docs/reference/ci-runner-efficiency.md
+++ /dev/null
@@ -1,2629 +0,0 @@
-# CI efficiency and runner capacity
-
-The [September 28 demand rollout](ci-demand-rollout.md) documents staged checks,
-unit-selection evidence, headless runtime qualification, review cancellation and daily occupancy reports.
-
-## Headless server follow-up
-
-[PR #24527](https://github.com/stablyai/orca/pull/24527) adds dependency detection to
-main pushes. Unrelated pushes skip qualification; relevant pushes still run all
-six persistence targets and five Linux compatibility jobs. Explicit Windows or
-Mac PR paths select both architectures plus a Linux smoke, while shared
-execution/storage changes, SSH/provider/relay inputs, native inputs, manifests, and incomplete evidence
-retain the full matrix. Main pushes use the same validated exact Windows slot
-cache as PRs; nightly and release builds still compile freshly.
-
-Main detection runs cannot cancel each other. Only eligible qualification jobs
-share main concurrency groups, so an unrelated push cannot cancel needed tests.
-Release templates, explicit refs, and nightly runs remain isolated.
-
-Draft PRs have no server verdict, so their detector is also skipped. The existing
-`ready_for_review` event performs detection and qualification once the PR is ready.
-This removes the checkout and dependency installation for a result whose platform
-jobs were already ineligible.
-
-The glibc 2.28 prerequisite step checks all five tools before installing anything.
-The pinned ARM image already supplies them, including Git 2.55.0 built under
-`/usr/local/bin`; installing the Git RPM does not change the Git on PATH. A
-missing-tool fallback still installs the original package list and disables EPEL
-for that one command. In
-the baseline x64 log, EPEL metadata took 4 minutes 50 seconds to download although
-every installed package came from AlmaLinux BaseOS or AppStream. The package list,
-compiler image, libc floor, native smoke, and persistence tests stay unchanged.
-The [DNF command reference](https://dnf.readthedocs.io/en/stable/command_ref.html)
-defines `--disablerepo` as a temporary command-level filter, so later commands
-retain the image's repository configuration.
-
-The [PR qualification run](https://github.com/stablyai/orca/actions/runs/36972824276/job/110734327685)
-passed the x64 floor native smoke and persistence suite. Its prerequisite step
-finished within GitHub's one-second timing resolution, compared with 5 minutes
-37 seconds in the baseline job; the supplied tools needed no package install.
-This measures that step, not the complete workflow or its queue time.
-
-A [completed main run](https://github.com/stablyai/orca/actions/runs/36962172614)
-used 42 aggregate runner-minutes across 11 test jobs. The
-[latest daily demand report](https://github.com/stablyai/orca/actions/runs/36965354205)
-estimates 34.9 headless runner-hours, including 23.4 in cancelled runs. These are
-baseline observations; post-merge savings have not yet been measured.
-
-## October 4 clock, byte and import test fixtures
-
-These changes retain production behavior, original case names and platform
-outcomes. The paired pilots use three alternating one-worker Node 24 invocations
-on Ubuntu 24 ARM. Every median below is a complete focused test invocation;
-they do not establish whole-shard savings or queue-delay improvements.
-
-| Workload                                             | Baseline median | Candidate median | Reduction | Hosted evidence                                                          |
-| ---------------------------------------------------- | --------------- | ---------------- | --------- | ------------------------------------------------------------------------ |
-| Codex settlement and Claude stop deadlines, 35 cases | 35.914s         | 10.142s          | 71.8%     | [37186232658](https://github.com/stablyai/orca/actions/runs/37186232658) |
-| Native-chat delivery, 15 cases                       | 22.321s         | 7.376s           | 67.0%     | [37183731823](https://github.com/stablyai/orca/actions/runs/37183731823) |
-| Six profile-storage byte suites, 118 cases           | 12.629s         | 9.978s           | 21.0%     | [37183141654](https://github.com/stablyai/orca/actions/runs/37183141654) |
-| Encrypted account storage, six cases                 | 18.277s         | 0.958s           | 94.8%     | [37184007241](https://github.com/stablyai/orca/actions/runs/37184007241) |
-| SSH remote commands, 27 cases                        | 6.840s          | 6.078s           | 11.1%     | [37184454532](https://github.com/stablyai/orca/actions/runs/37184454532) |
-| OpenCode subscription, 28 cases                      | 47.347s         | 6.284s           | 86.7%     | [37184858823](https://github.com/stablyai/orca/actions/runs/37184858823) |
-| Window-service attachment, 31 cases                  | 11.910s         | 1.619s           | 86.4%     | [37186340840](https://github.com/stablyai/orca/actions/runs/37186340840) |
-| OpenCode 2 TUI ownership, 41 cases                   | 16.811s         | 2.429s           | 85.6%     | [37187699312](https://github.com/stablyai/orca/actions/runs/37187699312) |
-| Title-send authorization, nine cases                 | 29.545s         | 12.995s          | 56.0%     | [37188423318](https://github.com/stablyai/orca/actions/runs/37188423318) |
-| Range selection, 15 cases                            | 9.737s          | 7.130s           | 26.8%     | [37188996198](https://github.com/stablyai/orca/actions/runs/37188996198) |
-
-Provider tests wait for the real fake-child write/ready barrier and drain the
-host stream before installing a scoped parent clock. The original 2.5/5-second
-Codex and 3-second Claude deadlines remain; before/at assertions check their
-boundaries. Early rejection and refusal resolve without waiting on an unreachable
-barrier; finally and suite teardown restore clocks and spies even after a native
-Vitest timeout. Four healthy failure-path controls pass; old-helper hangs and
-removed teardown are caught. Missing-child failure retains a real ten-second observation window.
-Six faults for early/late stop deadlines, late queued resend and missing child
-output fail the intended assertions. Native-chat tests still use the real React
-outbox hooks. Their scoped clock retains probe, retry, churn and target-switch
-windows, drains async act work, and unmounts before clock restoration. All eight
-hook faults fail; two boundary faults pass the old coarse tests and fail the new
-before/at assertions. Node/web typecheck, lint and formatting pass.
-
-Native Buffer.equals replaces deep per-byte assertion traversal. It checks the
-complete original bytes and length; fixtures, SQLite operations, encryption and
-processes are unchanged. The six profile suites retain 114 passes and four
-existing Linux case-sensitivity skips; all 118 pass locally on macOS. Seven
-profile last-byte/length faults and two encrypted-vault last-byte/length faults
-fail their exact byte assertions. All six encrypted-vault cases still exercise
-52 accounts near the 4 MiB encrypted cap, refused growth, restart/readback and
-private permissions.
-
-The old SSH fixture created 15,197 short stage paths but never exceeded the real
-1,048,576 UTF-16-character transport tail cap; its two valid entries also left
-the 64-result assertion vacuous. The replacement uses about 1,300 real excluded
-stage directories under long Unicode path components, a real shell channel and
-the production execCommand limiter. Actual find output exceeds that cap, while
-the generated filter retains both original valid entries. A separate population
-of 65 valid directories proves the first-64 limit and native find ordering. File,
-symlink, nested-install and failed-enumeration checks remain. All 27 case outcomes
-match across treatments (23 passes and four unavailable PowerShell 5.1 skips on
-the hosted image). Eight cap, ordering, filtering and failure faults are caught.
-Paths use platform utilities; local PowerShell availability retains its original
-skip policy. The deadline and SSH fixtures reuse existing process/stream code.
-OpenCode subscription tests batch only uninterrupted fixture writes between the
-original observation barriers. Both SQLite schema versions keep every row, rowid,
-read cap, poll, clock position and case. No durability pragma or production code
-changes. All 28 cases pass in every pair. Separate captures compare ordered
-schema and rows, transaction state, pragmas, signals, page requests/results and
-subscriber callbacks: 124,754,101 payload bytes match, canonical digest
-`ba0eb6f09281746071d73fae88e2e8eb45332f36892b90998b374b1b8c59b3e3`.
-Missing rows, collapsed frontier rowids, read-cap overruns, missing commit and
-missing rollback each fail the intended case in both schemas. Positive rollback
-controls pass. The unmeasured full-suite timing report ranked this fixture at
-134.229 seconds; the paired 47.347-second figure above is the relevant focused
-baseline, and the two figures must not be mixed into a claimed saving.
-
-Window attachment tests mock five unrelated registrar modules using their actual
-types. The existing window ownership, reload, media permission, native file drop,
-hydration barrier and updater scheduling cases remain real. Exact store/runtime/
-window arguments and daemon registration after the PTY handler are now asserted;
-nine actual production wiring/order faults fail. The registrar implementations
-retain separate handler tests. Concrete existing stubs moved to one fixture to
-stay within the line limit. All 31 cases and statuses match across all pairs. The
-final source differs from the timed source only by a required type-assertion
-safety comment.
-OpenCode 2 TUI tests use a scoped async clock only after the first real native
-module import. The unchanged generated plugin runs against the existing fake TUI
-and fetch. Original poll, permission, retry, preview, slow POST and endpoint
-windows remain. Before/at assertions pin the 100 ms poll, 500 ms permission,
-120 ms slow POST and 5-second endpoint boundaries. All 41 original case outcomes
-match. Separate ordered captures preserve 678 TUI/event rows and 362 complete
-POST start/completion rows; wall timestamps and cross-stream interleaving are
-excluded from equivalence. Eleven generated-source faults fail their intended
-identity, reload, order, deadline or timer-cleanup assertions. Four import/setup/
-disposer rejection and timeout controls confirm restoration of clocks, fetch,
-argv and environment. Teardown holds its fake clock through bounded native cleanup and pending-timer checks, then restores real clocks. The [teardown qualification](https://github.com/stablyai/orca/actions/runs/37195736834) passes all 41 cases and 12 failure and restoration control invocations, including interval and retry leaks missed by the earlier teardown.
-Title-send authorization tests retain real terminal creation, graph binding and
-positive evidence paths. Negative process-evidence probes use scoped clocks
-after setup: both 150 ms polling loops retain their 6,500 ms budget, crossed at
-6,600 ms, and the send guard retains its 1,050 ms deadline. Before/at assertions
-check 6,599/6,600 and 1,049/1,050 ms. All nine original cases remain. Actual
-early/late wrapper and guard deadlines, false spinner identity and unknown-agent
-authorization faults fail their intended assertions; native clocks and runtime
-instance spies are restored after each failure.
-Range-selection tests stub only the saved-note send menu, which their empty
-comment populations never render. A facade typed from the actual menu props
-throws if invoked, and an afterEach assertion verifies no call with unconditional
-mock clearing in finally. The real hook, Monaco constants/model, line and range
-drag behavior, draft-card lifecycle and open-inline-card chord remain. All 15
-original test bodies are byte-unchanged. Three actual range/hunk/draft faults
-fail their original assertions; a real draft-render menu call hits the facade
-and sentinel, and an outer cleanup check proves mock state cleared after failure.
-The actual saved-note menu retains its independent component tests.
-
-## October 2 headless detector compiler cache
-
-The deferred detector already avoids dependency setup for known build inputs.
-For changes that need import analysis, the collector marks package imports external;
-only esbuild and its platform binary are needed. A small compiler archive can replace
-root dependency setup for this analysis, while qualification jobs still install normally.
-
-The existing Linux x64 warmer packs these two packages after its frozen,
-script-free, policy-checked install. Only main publishes. Readers use an exact key
-covering Node/platform/architecture, manifests, install policy, patches and the cache
-implementation. The producer and reader use the same archive path. File hashes,
-identity and a compiler smoke are checked before availability is reported; missing,
-invalid or failed restores use the original full installer. Graph analysis retains
-its existing conservative full-qualification verdict on errors.
-
-A [three-pair hosted comparison](https://github.com/stablyai/orca/actions/runs/37071724200)
-passed on Ubuntu x64 with Node 24.21.0 and esbuild 0.28.2. Every pair produced the
-same 6,018 source inputs. Sample 2 ran the compiler-only treatment first; samples 1
-and 3 ran the existing installer first. Each used a fresh dependency tree, and the
-compiler treatment required a real cache hit and validated its bytes and smoke.
-
-| Sample | Full installer + graph | Compiler restore + graph | Paired saving |
-| ------ | ---------------------- | ------------------------ | ------------- |
-| 1      | 11.730s                | 2.805s                   | 8.925s        |
-| 2      | 14.702s                | 4.706s                   | 9.996s        |
-| 3      | 14.666s                | 3.750s                   | 10.916s       |
-
-The median paired saving is 9.996 seconds. Inter-step overhead, archive transfer,
-validation and the real graph are included. Checkout, initial Node setup, dependency
-resets, seed work, post-job cache saves, tests and queues are excluded. These are
-warm detector measurements, not whole-workflow or billing savings. The trial uses
-the same package layout and validation as the production helper; production also
-resolves its policy fingerprint. Cold or changed identities still install fully.
-
-## SSH Windows slot reuse
-
-The SSH Windows host workflow uses the same server-slot preparation action as
-headless qualification. Its four PR jobs can restore the exact slot published by
-fully qualified main runs, then validate its inventory and hashes and run the
-required-slot and pinned-Node smoke checks. Misses or invalid payloads compile
-freshly. Only main headless qualification publishes; manual SSH qualification
-still builds freshly. Both sshd versions, both architectures, all three host
-cells, the process-table addon build, and the template/relay builds remain.
-
-The action is part of the cache fingerprint, so this extraction starts a new
-namespace that needs a successful main seed. The existing hosted measurements
-below suggest about 160 aggregate runner-seconds saved across four warm SSH jobs;
-that is a conditional estimate, not a measured improvement of this consumer.
-Private sshd installation and host execution still dominate this workflow.
-
-## Prepared relay addon reuse
-
-A [completed SSH Windows run](https://github.com/stablyai/orca/actions/runs/36972043877)
-rebuilt the process-table relay addon after native dependency preparation. From
-its builder's start message to the validated staged artifact, x64 took 85.5 seconds
-and ARM64 took 135.6 seconds. These are single-run observations, not medians.
-
-An opt-in reuse path checks the same binary architecture, patched reader and
-launcher exports as staging, then runs the existing native-load and CreationTime
-probe. Repaired source or incomplete evidence requires a fresh build. SSH PRs
-request reuse only following an exact prepared native-cache hit; manual SSH and
-all release builders retain fresh compilation. Subsequent staging checks still
-run. Hosted validation and the reuse interval remain to be measured.
-
-## Windows root download stores: registry installs finish sooner
-
-Three paired samples on each Windows architecture compared the existing exact
-main download-store restore with a fresh registry install. Each treatment used a
-fresh dependency tree, store and pnpm metadata, with registry-first ordering in
-sample 2. Both restored the same policy-checked verification record before timing.
-All six pairs used Node 24.21.0 and pnpm 12.8.1; manifest digests and installed
-lockfile digests matched, and both retained frozen, script-free installation.
-
-| Runner        | Cached totals (seconds)     | Registry totals (seconds)   | Paired median saving |
-| ------------- | --------------------------- | --------------------------- | -------------------- |
-| Windows x64   | 26.820 / 28.885 / 27.751    | 13.644 / 14.126 / 12.908    | 14.759 seconds       |
-| Windows ARM64 | 216.540 / 288.492 / 189.342 | 119.856 / 238.562 / 115.611 | 73.731 seconds       |
-
-The x64 samples are the three successful Windows 2022 jobs in
-[run 37064549378](https://github.com/stablyai/orca/actions/runs/37064549378).
-Its ARM cleanup guard rejected pnpm's setup-owned store path before measurement;
-those incomplete ARM jobs are excluded. The corrected
-[ARM-only run](https://github.com/stablyai/orca/actions/runs/37065220916) passed all
-three samples. Earlier rejected measurements also stopped before installation
-because an optional config file was absent; none count toward these timings.
-
-Intervals include actual store lookup/restore, inter-step overhead and root
-installation. Checkout, toolchain setup, tree/store reset, verification-record
-restoration and native preparation are excluded. ARM variation is substantial;
-these samples do not measure whole-workflow, queue or billing savings.
-
-Root-only Windows x64/ARM64 PR installs now skip the download-store restore.
-The existing x64 mixed-install exception remains. An explicit store opt-out also
-lets Windows headless persistence and SSH jobs avoid the archive on main or
-manual runs. Frozen installs, verification records, native caches and every
-qualification check remain. Other lockfile sets and platforms keep their
-existing policy. Default non-PR writers, including the warmer, still seed stores
-for direct setup-node consumers and workflows that run package scripts.
-
-## October 2 Linux root store comparison
-
-A [six-job hosted comparison](https://github.com/stablyai/orca/actions/runs/37073978443)
-measured the actual main root-store archive against direct registry installation,
-with three fresh-runner pairs on each Linux architecture. All six jobs passed.
-The middle sample on each architecture reversed treatment order. Between treatments,
-the driver removed the dependency tree, store and pnpm metadata, then restored the
-same policy-checked verification record before timing. Frozen, script-free installs
-preserved policy files and produced identical installed lockfile digests in each pair.
-
-| Architecture/sample | Store restore + install | Direct registry install | Paired saving |
-| ------------------- | ----------------------- | ----------------------- | ------------- |
-| x64 / 1             | 6.516s                  | 5.372s                  | 1.144s        |
-| x64 / 2             | 6.743s                  | 3.950s                  | 2.793s        |
-| x64 / 3             | 6.600s                  | 3.985s                  | 2.615s        |
-| ARM64 / 1           | 7.632s                  | 3.346s                  | 4.286s        |
-| ARM64 / 2           | 5.504s                  | 3.575s                  | 1.929s        |
-| ARM64 / 3           | 5.450s                  | 3.364s                  | 2.086s        |
-
-Median paired savings are 2.615 seconds on x64 and 2.086 seconds on ARM64; means
-are 2.184 and 2.767 seconds. Both used Node 24.21.0 and pnpm 12.8.1. Actual store
-lookup/transfer/restore, inter-step overhead and installation are timed. Checkout,
-initial toolchain/dependency setup, preparing the existing process wrapper,
-dependency resets, verification-record restores, native work, tests, post-job cache
-saves and queues are excluded. Package services have already been used by initial
-setup. These are warm-policy setup measurements, not workflow or billing savings.
-
-The shared installer consequently skips root-only Linux x64/ARM64 store restores
-on PRs. It still installs and checks every package through pnpm. Mixed mobile and
-custom lockfile sets, other architectures, verification/native caches,
-main store writers and release installation policies keep their existing behavior.
-The measured Windows exceptions remain. Mac restores were retained at this stage;
-the following comparison supersedes that policy. No periodic job or cache is added.
-
-## October 2 macOS root store comparison
-
-A [six-job hosted comparison](https://github.com/stablyai/orca/actions/runs/37078232553)
-used the same paired method on macOS 15 Intel and Apple Silicon. All six jobs
-passed with actual main store cache hits. The middle sample reversed treatment
-order. Each treatment started with a reset dependency tree, store and pnpm
-metadata, followed by the same verification-record restore. Policy files and
-installed lockfile digests matched within every pair.
-
-| Architecture/sample | Store restore + install | Direct registry install | Paired saving |
-| ------------------- | ----------------------- | ----------------------- | ------------- |
-| x64 / 1             | 87.270s                 | 60.584s                 | 26.686s       |
-| x64 / 2             | 103.280s                | 52.640s                 | 50.640s       |
-| x64 / 3             | 61.564s                 | 40.768s                 | 20.796s       |
-| ARM64 / 1           | 26.024s                 | 14.375s                 | 11.649s       |
-| ARM64 / 2           | 37.000s                 | 19.726s                 | 17.274s       |
-| ARM64 / 3           | 34.616s                 | 14.888s                 | 19.728s       |
-
-Median paired savings are 26.686 seconds on x64 and 17.274 seconds on ARM64;
-means are 32.707 and 16.217 seconds. Node matched within each pair: 24.19.0 on
-Intel and 24.20.0 on Apple Silicon, as resolved by the existing installer. Both
-used pnpm 12.8.1. Timing includes actual cache lookup/transfer/restore, inter-step
-overhead and installation. Checkout, initial setup, process-wrapper preparation,
-resets, verification restores, native work, tests, cache saves and queues are
-excluded. Initial setup has already used package services. These measurements
-do not establish whole-workflow or billing savings.
-
-The existing root-only PR exception now also covers macOS x64/ARM64. Frozen,
-script-free installs and pnpm policy checks still run. Mixed/custom lockfile sets,
-other architectures, verification/native caches, main/manual store writers and
-release installation policies retain their existing behavior. No periodic job
-or cache is added.
-
-## October 2 store producers: keep caches without downloading hits
-
-The optional `cache-pnpm-store-lookup-only` installer input uses
-[`actions/cache` lookup-only](https://github.com/actions/cache#inputs) on non-PR
-runs. An exact hit refreshes cache access without extracting the archive; a miss
-still installs from the registry and publishes the populated store at successful
-job completion. The default remains the existing `setup-node` cache behavior.
-The four Linux/Windows dependency warmers and Linux/macOS persistence producers
-opt in. Windows persistence retains its existing store opt-out, and PR restore
-policies are unchanged. This adds no recurring job or extra cache family.
-
-A [tiny framework control](https://github.com/stablyai/orca/actions/runs/37082688033)
-proved that lookup left the payload absent, refreshed the existing cache's access
-time, and published a miss that a fresh job restored. A
-[nested composite control](https://github.com/stablyai/orca/actions/runs/37084946789)
-then saved and restored a fresh payload using the actual environment-path pattern.
-The installer exports its resolved store path through `GITHUB_ENV`: twice-nested composite post-job saves
-cannot resolve their internal step outputs. The primary key is captured
-by the cache action before cleanup. Paths, architecture and lockfile keys match
-`setup-node`, so existing default-branch archives remain reusable.
-
-The [six-platform installer screen](https://github.com/stablyai/orca/actions/runs/37084946789),
-[Linux repeats](https://github.com/stablyai/orca/actions/runs/37085164277), and
-[corrected Windows repeats](https://github.com/stablyai/orca/actions/runs/37085248976)
-compared the complete shared installer, including toolchain setup, cache actions,
-policy verification, frozen installation and native probes where requested.
-Each treatment reset dependencies, the store, pnpm metadata and the Windows
-registry build directory. Treatment order reversed across architectures and
-repeats. Every qualified pair required real main store cache hits, matching
-policy/installed-lockfile digests and Node/pnpm versions, plus exact native-cache
-hits on Linux and Windows. The initial Windows x64 screen stopped before timing
-because its benchmark guard rejected the standard `D:\.pnpm-store` path; that
-unqualified job is excluded.
-
-| Platform / sample        | Restore + installer | Lookup + installer | Paired saving |
-| ------------------------ | ------------------: | -----------------: | ------------: |
-| macOS ARM64              |             37.785s |            20.024s |       17.761s |
-| macOS x64                |             75.610s |            46.638s |       28.972s |
-| Linux ARM64 / 1          |             10.005s |             7.242s |        2.763s |
-| Linux ARM64 / 2          |              8.817s |             6.672s |        2.145s |
-| Linux ARM64 / 3          |              8.800s |             6.581s |        2.219s |
-| Linux x64 / 1            |             12.309s |             9.735s |        2.574s |
-| Linux x64 / 2            |             10.131s |             8.690s |        1.441s |
-| Linux x64 / 3            |             13.741s |             9.485s |        4.256s |
-| Windows ARM64 / repeat 1 |            145.818s |            78.729s |       67.089s |
-| Windows ARM64 / repeat 2 |            152.730s |           106.475s |       46.255s |
-| Windows ARM64 / screen   |            294.092s |           193.957s |      100.135s |
-| Windows x64 / 1          |             30.936s |            20.256s |       10.680s |
-| Windows x64 / 2          |             31.021s |            20.098s |       10.923s |
-
-All 13 qualified pairs improved. Median paired savings were 2.574 seconds on
-Linux x64, 2.219 on Linux ARM64, 10.802 on Windows x64 and 67.089 on Windows
-ARM64. Each macOS architecture had one pair; its 28.972 / 17.761 second savings
-are a screen, supported by the earlier three-pair root-store comparisons.
-
-All pairs used pnpm 12.8.1. Node was 24.21.0 on Linux and Windows, 24.19.0 on
-macOS Intel and 24.20.0 on macOS ARM. Source dependency policies were frozen for
-this screen; later main dependency changes do not extend these measurements.
-Timing excludes checkout, initial service/bootstrap use, wrapper compilation,
-resets, result validation, post-job saves and queues. These are installation
-measurements, not whole-workflow or billing savings. Cold publication is verified
-separately by the small controls; no large synthetic store cache was uploaded.
-
-## October 1 Windows and dependency cache follow-up
-
-[PR #24355](https://github.com/stablyai/orca/pull/24355) merged at `197ea3a3`.
-The [next hosted trial](https://github.com/stablyai/orca/actions/runs/36917210453)
-ran four alternating pairs on each Windows architecture and both Mac
-architectures. All six jobs passed. The exact temporary workflow and drivers
-remain available at `ab24952ab5af0f7d8e53a544896ac2486edfb244`; completed trial
-tooling is removed from ordinary PR CI.
-
-### Windows server slots
-
-The existing dependency-native cache and the server's N-API 8 slot serve different
-consumers. Cache the small server slot separately, using the exact compiler image,
-architecture, dependency/patch/runtime inputs and compilation/validation source.
-PR and main-push qualification restore it. Nightly qualification still compiles
-freshly; main saves after persistence/lifecycle tests and the existing x64 Node 18 handoff.
-Templates and explicit-ref calls continue to compile freshly.
-
-| Hosted runner    | Fresh build median | Restore median | Difference |
-| ---------------- | ------------------ | -------------- | ---------- |
-| Windows 2022 x64 | 18.624s            | 4.677s         | 13.947s    |
-| Windows 11 ARM64 | 72.002s            | 6.111s         | 65.891s    |
-
-Both used Node 24.21.0. Each comparison includes actual GitHub cache restoration,
-inter-step time, payload validation, required-slot checks and pinned-Node load/spawn
-smoke. Every fresh build uses the builder's freshly cleared compilation directory.
-Dependency installation, initial seed work, shared download warmup, full qualification
-tests and queues are outside these timing intervals. The x64 payload was 2,935,529
-bytes and ARM64 3,533,557 bytes. These are conditional warm-hit gains, rather than a
-whole-workflow improvement or the roughly 95–117 seconds seen in earlier cold samples.
-
-Restored bytes must match current module/version/headers/N-API/host metadata,
-the complete inventory and hashes, and current vendored ConPTY files. Existing
-patch, PE architecture, post-baseline N-API and MSYS breakaway checks are reused.
-Failed or partial restoration and invalid payloads clear only `out/orcad-prebuilds`
-and fall back to normal compilation. Both fresh seeds and fresh restored consumers
-passed the full existing Windows qualification; x64 also passed Node 18 handoff.
-The final key additionally includes the ten transitive process-wrapper sources.
-
-A bounded sample of 50 first-parent main commits through `197ea3a3` had 45 of 49
-adjacent transitions with identical source inputs, including those ten files.
-This one-day sample holds the new validator and runner image constant. Actual
-image rotation, seed availability and changed PR inputs can reduce reuse.
-
-Keep the original Windows native dependency preparation: artifact-mode tests still
-import checkout `node-pty`, registry and process-reader addons, and the Windows
-artifact builder stages the patched process reader. The cached server slot does
-not replace those dependencies.
-
-### pnpm verification records
-
-Reuse pnpm's existing policy-checked record on Windows x64/ARM64 and Mac Intel,
-while retaining Linux's existing behavior. The exact OS/architecture/pnpm/policy
-key, explicit opt-out, frozen installs and main-only production writes remain.
-Each treatment resets links and registry metadata, retains the identical warm
-download store, and checks unchanged manifests, installed versions and installed
-lockfile bytes. Every platform passed real missing/corrupt-record fallback and
-changed-policy/changed-integrity rejection controls, plus authentic cross-path reuse.
-
-| Platform               | Baseline install | Cached install | Baseline interval | Cached interval |
-| ---------------------- | ---------------- | -------------- | ----------------- | --------------- |
-| Windows x64            | 13.105s          | 9.767s         | 17.717s           | 15.146s         |
-| Windows ARM64          | 96.723s          | 88.443s        | 164.620s          | 157.877s        |
-| Mac Intel              | 31.368s          | 21.042s        | 47.727s           | 41.302s         |
-| Mac ARM, kept disabled | 11.419s          | 8.086s         | 17.905s           | 15.787s         |
-
-Install columns time pnpm alone. Interval columns also include link reset,
-path validation, real cache restoration and inter-step overhead; they exclude
-seed setup, parity checks and queues. Key-resolution overhead is outside the paired
-trial; the real Windows ARM production-shaped step took 0.296s. Windows ARM's first
-pair was slower with the record, while the next three improved, so its median is
-not a guaranteed per-job saving. Macs used their hosted Node 24.19.0 Intel and
-24.20.0 ARM toolchains; Windows used 24.21.0, and all used pnpm 12.0.0.
-
-An earlier complete Mac ARM trial saved only 0.681s in its interval median.
-That small, variable margin does not justify enabling the extra lookup there.
-Only the tiny pnpm-owned record is restored; registry metadata and download-store
-policy are unchanged. Changing the shared action also produces a one-time cold
-native dependency cache key, whose existing hash includes the action bytes.
-
-### Further local screens rejected
-
-A fixed 256-file, 2,471-case cohort preserved every result in twelve invocations.
-Lazy per-file user data showed a noisy 2.0% wall difference with no setup-time
-improvement; combining DOM setup was 1.8% slower. A separate seven-file leaf-import
-screen preserved all 50 assertions and public/hook controls, saving only 0.903
-worker-seconds while elapsed time rose 2.55%. All experiments were reverted.
-Documentation-result reuse also lacked positive eligible demand in the bounded
-sample, and the apparent example changed the actual tested merge/base inputs.
-These results do not justify adding a new coverage-selection or result-reuse policy.
-
-## October 1 PR concurrency follow-up
-
-### Where the next gains are
-
-The [September 30 demand report](https://github.com/stablyai/orca/actions/runs/36816009362)
-samples 282 of 4,194 runs across workflow/conclusion strata. It estimates full job
-duration for runs created in the reporting window, rather than occupancy clipped
-to that window. PR CI accounts for about 537 runner-hours, including about 321
-hours of unit shards, 73 hours of E2E, 41 hours of Windows packaging, 35 hours of
-Linux packaging, 18 hours of static analysis, and 11 hours of typechecking. These
-are weighted estimates, not exact billing totals. Unassigned and incomplete jobs
-are excluded. The report predates the merged planning/setup change below.
-
-The [full reference run](https://github.com/stablyai/orca/actions/runs/36841821670)
-ran 10,310 files exactly once. Across its five shards Vitest reports about 5,063
-worker-seconds importing modules, 2,838 running tests, 685 transforming source,
-267 setting up tests, and 390 preparing environments. Workers overlap, so these
-figures cannot be added to predict job elapsed time. They identify repeated
-imports and real-time test waits as larger targets than line-count reporting,
-which uses about 1.1 runner-hours in the same demand sample.
-
-Parallel steps share the job's CPU and memory. Their
-[background/wait support](https://github.blog/changelog/2026-06-25-actions-steps-can-now-be-run-in-parallel/)
-saves repeated runner setup when independent checks fit together, but does not
-increase machine resources or the account's concurrent-job allowance. Cheap
-preflight checks still gate expensive unit and package jobs.
-
-Organization metadata reported the Team plan on October 1. GitHub documents
-[60 standard concurrent jobs by default](https://docs.github.com/en/actions/reference/limits#job-concurrency-limits-for-github-hosted-runners)
-and allows support requests for increases. The effective configured allowance
-was not exposed by the API. A seven-second, repository-only sample at 10:48 UTC
-found 32 queued jobs and 70 assigned job records marked in progress, including
-one Blacksmith label. Those non-atomic records, runner turnover, other repositories
-and provider labels cannot establish the actual allowance or simultaneous usage.
-These changes reduce demand; they do not change account settings. If queues
-remain, ask GitHub Support to confirm the effective organization limit before
-choosing a larger allowance or paid runners.
-
-The [follow-up PR](https://github.com/stablyai/orca/pull/24355) measures virtual
-readiness deadlines in captured-transcript tests, E2E allocations with no general
-consumer, renderer projection, native setup, Docker fixtures, and Windows store
-restoration. Alternating hosted comparisons check output parity. Completed
-benchmark workflows and drivers are removed; their trial commits retain the
-exact reproduction code.
-
-A [three-pair hosted transcript comparison](https://github.com/stablyai/orca/actions/runs/36849458799)
-on one four-worker ARM runner measured baseline invocations at 127.001 / 114.307 /
-114.265 seconds, versus 28.903 / 28.663 / 28.455 seconds with virtual readiness
-deadlines. Median elapsed time for these five files fell about 75%. All 259
-original named tests passed in every baseline and candidate, and candidates
-also passed three repaint checks. Summed test-body time fell from a median 325.85
-to 31.80 worker-seconds. This comparison includes Vitest startup/import work but
-excludes checkout, dependency setup, and queues; it is not a measured percentage
-improvement in the full unit matrix. Real emulator setup and drains remain real,
-and the same captured bytes, readiness/refusal deadlines, and assertions run.
-
-The same hosted trial passed three forced Electron native rebuilds while the
-external node-gyp path pointed to a nonexistent file. A separate fresh consumer
-then restored the native cache, required a real hit, and passed the existing
-Electron binary probe. The Linux Node-runtime workaround remains intact.
-
-For a network-only E2E selection in that trial, both dedicated network jobs
-passed. The previous allocations consumed 87 seconds for the Electron build,
-34 for the native primer, and 67 for a general job whose log confirmed that
-every selected spec belonged to a dedicated lane. The candidate skipped those
-three jobs before runner allocation, avoiding 188 runner-seconds in this case.
-This single-case measurement excludes queues and does not predict savings for
-mixed selections; the existing dedicated SSH, IME, and ordinary E2E routes remain.
-
-A [controlled cancellation trial](https://github.com/stablyai/orca/actions/runs/36853246785)
-verified both condition outcomes. After intentional cancellation, `always()`
-started another 60-second follow-up, while `!cancelled()` skipped it. Cleanup
-and artifact uploads succeeded in both treatments. A separate deliberately
-failed test still ran its later `!cancelled()` test and cleanup. The 60 seconds
-are synthetic condition evidence, not a measurement of a real SSH test's cost.
-Completed comparison workflows are removed after recording their evidence;
-the exact drivers and workflow remain reproducible at the trial's source commit.
-
-The [first full PR validation](https://github.com/stablyai/orca/actions/runs/36849458648)
-passed all five unit shards and both Linux/Windows package checks. Its reports
-contain 10,326 unique files, each once, with zero unhandled errors. Full shard
-job durations ranged from 544 to 581 seconds. They ran a different merged source
-on different allocations from the earlier reference, so comparing their totals
-does not establish an end-to-end speedup. The alternating transcript comparison
-above is the controlled timing evidence.
-
-The [updated full PR validation](https://github.com/stablyai/orca/actions/runs/36855833565)
-passed all required gates and both package checks. All 10,335 discovered files
-appear once across five passing timing reports, with zero unhandled errors;
-122 modules have the existing expected skipped status. Named merge-tree discovery
-and saved assignment replay match both successful validation runs. The latest
-unit jobs took 520–558 seconds. Refreshing weights with that same measurement set
-would reduce the largest projected load from 1,756.706 to 1,708.187 worker-seconds
-(2.76%), while retaining the same 8,540.831 total. Applying the earlier successful
-run's proposed weights to the latest measurements improves the maximum only
-1.54% and the median 0.68%. These small, variable projections do not establish
-an elapsed-time gain, so the existing weights remain.
-
-A [three-pair Windows store comparison](https://github.com/stablyai/orca/actions/runs/36853246494)
-used fresh dependency trees, stores and pnpm metadata before each treatment. The
-middle pair reversed order. Cached totals include archive restoration and both
-unchanged frozen installs; the mobile install ran every existing postinstall
-generator. Setup/reset time and runner queues are excluded.
-
-| Pair | First treatment | Cached total | Registry total | Registry saving |
-| ---- | --------------- | ------------ | -------------- | --------------- |
-| 1    | Cached          | 71.092s      | 37.500s        | 33.592s         |
-| 2    | Registry        | 73.556s      | 39.935s        | 33.621s         |
-| 3    | Cached          | 75.660s      | 37.001s        | 38.659s         |
-
-Treatment medians were 73.556s cached and 37.500s registry; median paired saving
-was 33.621s. Cache restore and step overhead alone cost a median 27.955s. Policy
-and all six generated-output digests matched across all six treatments. Windows
-x64 PR jobs using the mixed root/mobile key now skip its download-store restore;
-PRs already skip store saves. Root-only Windows stores, Windows ARM64/x86, other
-operating systems, non-PR writers, native/Electron caches and frozen-install policy retain their existing
-behavior. The trial covers this mixed install on Windows 2022, not every Windows
-dependency key or a whole PR's elapsed time.
-
-A [three-pair daemon fixture comparison](https://github.com/stablyai/orca/actions/runs/36853246776)
-reset Docker build caches and the fixture/base image before every treatment.
-Warm totals include the existing action's archive restore/load and the unchanged
-daemon descendant oracle; reset time and runner queues are excluded. The middle
-pair again reversed order.
-
-| Pair | First treatment | Cold total | Warm total | Warm saving |
-| ---- | --------------- | ---------- | ---------- | ----------- |
-| 1    | Cold            | 28.984s    | 20.673s    | 8.311s      |
-| 2    | Warm            | 21.798s    | 28.953s    | -7.155s     |
-| 3    | Cold            | 28.964s    | 17.614s    | 11.350s     |
-
-Treatment medians were 28.964s cold and 20.673s warm; median paired saving was
-8.311s. Oracle medians fell from 28.886s to 4.907s, while archive restore/load
-cost 13.025–24.024s (15.766s median) for a 714,643,456-byte archive. BuildKit
-confirmed warm provisioning was cached and cold provisioning was not; every
-treatment used the same immutable base image, reaped the descendant and kept
-the canary alive. The PR keeps restoration in the background during root/mobile
-installation. One serial pair was slower, so the roughly 24s oracle reduction
-is not a guaranteed total runner saving. The drivers and exact workflows remain
-available at source commit `9231d1be6c76ccc1d2fef741a4e68ae29735a5c8`.
-
-A [three-pair AppImage compression comparison](https://github.com/stablyai/orca/actions/runs/36855833100)
-packaged the same complete Linux x64 app with the pinned 1.0.3 toolset and
-mksquashfs 4.6.1. Each timing includes the private app copy, electron-builder
-and blockmap generation. Tool download, app compilation, extraction, parity
-checks and queues are excluded; the middle pair reversed order.
-
-| Pair | First treatment | Default zstd 15 | PR zstd 3 | Saving  |
-| ---- | --------------- | --------------- | --------- | ------- |
-| 1    | Default         | 22.580s         | 11.760s   | 10.820s |
-| 2    | PR              | 22.612s         | 12.560s   | 10.052s |
-| 3    | Default         | 22.512s         | 11.815s   | 10.697s |
-
-Median packaging time fell from 22.580s to 11.815s (47.7%); median package size
-grew from 213,873,601 to 237,570,611 bytes (11.1%). All six extracted manifests
-matched every path, byte, mode and symlink target: 4,096 files and 601,194,650
-file bytes. The runtime prefix matched the pinned runtime exactly, and stored
-SquashFS options confirmed the actual level-3 override. All static checks passed;
-the representative baseline and candidate each passed the unchanged headless
-and CLI journeys, including all entrypoints and both shutdown signals. The
-directory build passed the existing glibc floor checks on all 19 native binaries.
-
-Only the PR Linux x64 AppImage child receives the private tool overlay. It resolves
-the existing custom-tool override first, checks the pinned tool/version and zstd
-configuration, and reuses the original runtime, validator and libraries. Cleanup
-waits for every package worker even on failure. Release settings, Linux ARM,
-Debian/RPM packaging and all native/package gates retain their existing behavior.
-The isolated AppImage result does not establish the full three-format job's gain.
-
-The same hosted comparison projected one already-built renderer three times per
-treatment, again alternating order. Baseline times were 8.079 / 8.219 / 8.129s;
-candidate times were 2.568 / 2.477 / 2.403s. Median projection fell from 8.129s to
-2.477s (69.5%, 5.653s saved). All six web snapshots matched all 1,137 files and
-51,957,014 bytes, and the renderer input remained unchanged after every run.
-These timings include the projector process but exclude renderer compilation,
-checkout, setup and queues. The drivers and workflow remain available at source
-commit `8ba5c9bf9f734d585f5e89945519aef4f607face`.
-
-Two local cache screens do not justify enabling Node's compile cache. A 96-file
-screen with an explicit worker flush produced a small, noisy difference. A larger
-256-file screen retained all 2,088 tests: baseline elapsed times were
-54.630 / 55.105 / 55.171 seconds, fresh caches 53.719 / 54.577, and a warm cache
-53.732. The roughly 1.7% median difference is too small to justify cache transfer
-and another test hook without stronger hosted evidence.
-
-Vitest 4.1.11's experimental filesystem module cache is more promising locally,
-but raw reuse is unsafe. A 96-file screen fell from about 8.4 to 5.9 seconds with
-a warm cache, while a cold cache cost about 3%. Negative controls then reproduced
-false passes after adding a preferred import extension, retargeting a symlink,
-changing package exports, or changing transform inputs. Cache-disabled controls
-failed correctly. A cache key must cover resolution and transform inputs as well
-as file contents before any production trial; source hashes alone do not suffice.
-
-Affected-test selection remains in shadow mode. Its first merge was September
-28, so October 1 cannot satisfy the documented week of evidence. Seven sampled
-complete reference reports included one red run, but only two evaluated a smaller
-candidate set; each omitted about 177–179 worker-seconds out of 8,073–8,392. Five
-full fallbacks are not selection-validation evidence, and two other sampled red
-runs had no review artifact. These samples support keeping the conservative
-policy, rather than claiming that omitting roughly 12% of files would omit the
-same fraction of work.
-
-### Shared planning and typechecking
-
-PR planning now shares checkout and dependency setup with typechecking. Planning
-runs in the background, with an explicit failure-propagating join before its
-artifact is published. Static analysis remains on a separate runner. Its existing
-native dependency install is pinned to Node 24 so it also fills the unit matrix's
-native cache, replacing the separate conditional PR primer. Daily Node 24/26
-reference planning and priming remain independent.
-
-The planner also avoids constructing the import graph when global changes or
-missing change evidence already require the full suite. This keeps the same
-fallback reason, discovery list and execution coverage. Five PR unit shards,
-static/type gates, package checks and the shadow-selection policy are retained.
-
-A [three-sample hosted comparison](https://github.com/stablyai/orca/actions/runs/36833782900)
-measured standalone type jobs at 35 / 26 / 42 seconds and planning jobs at
-36 / 25 / 24 seconds. Shared type/planning jobs took 38 / 37 / 27 seconds.
-The sum of the separate job medians fell from 60 to 37 seconds. Using that estimate with
-the 139-second median static job models about 12% less preflight occupancy.
-This is not a measured reduction in total CI time or queue delay. All twelve
-plans matched, and three deliberately fresh native-cache producers were reused
-by three successful consumers with the real native dependency probe.
-
-After updating to the current main branch, a
-[six-pair alternating comparison](https://github.com/stablyai/orca/actions/runs/36840171700)
-reset compiler state before every measurement. Direct compiler/planner command
-time was 11.59 / 11.31 / 10.96 seconds sequentially versus
-6.82 / 6.52 / 6.33 seconds together with restored state. With state deleted,
-it was 67.36 / 67.05 / 61.75 versus 55.52 / 60.06 / 55.68 seconds.
-All commands passed and plans matched within each comparison. These command
-timings exclude setup and queues; compiler variation contributes to the cold
-difference. The retained arrangement showed no cold compiler penalty.
-
-The sequential gate in [October 4 shared PR preflight capacity](#october-4-shared-pr-preflight-capacity) supersedes the earlier rejection below.
-
-Combining static analysis too was rejected. An
-[alternating same-runner comparison](https://github.com/stablyai/orca/actions/runs/36835091650)
-saved runner occupancy, but cold compilation slowed from 61–64 to 83–89 seconds
-under contention. The combined gate would finish roughly 40 seconds after the
-separate static gate. An
-[earlier-compiler trial](https://github.com/stablyai/orca/actions/runs/36837523594)
-did not remove that penalty. Small localization scheduling changes also lacked
-a repeatable gain. The temporary pilot workflows and benchmark tooling are
-available in those runs' commits, rather than retained in normal PR CI.
-
-Line-count reporting stays separate: it uses a small runner and trusted scripts
-with PR write permissions. Sharing that job's credentials with PR-source checks
-would provide little resource benefit. Reducing unit shards would trade saved
-setup for a longer critical path; enabling selected tests requires the existing
-week of representative shadow evidence.
-
-## 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
-  lookup proves that the same PR head, tested merge commit, and workflow commit
-  already completed successfully. A changed base, missing proof, failed lookup,
-  or still-running check falls back to the full checks. Advisory tests retain
-  their normal readiness routing. The mobile and line-count workflows have no
-  draft-dependent work, so they no longer run again when a draft becomes ready.
-- Route the headless-runtime matrix using the actual headless build and selected tests'
-  transitive imports, with conservative inclusion for dynamic workers, native
-  inputs, fixtures, and toolchain changes. A graph failure runs the full matrix;
-  manual dispatch still runs all ten platform jobs. The shared test selectors
-  retain the same 85 files. Unrelated shard timings and mobile-test tooling can
-  skip the matrix; shared shortcut definitions remain real runtime dependencies
-  and still run it. Building the graph does not execute the imported modules.
-- Restore pnpm stores on PRs using setup-node's existing key and store path,
-  without publishing more PR-private copies. Non-PR setup-node caching and
-  native/TypeScript caches keep their existing behavior. A missing main store
-  still installs with the frozen lockfile. The mixed root/mobile store may miss
-  repeatedly because the existing main warmer only seeds the root lockfile.
-- Batch only the PowerShell quota-fixture reservations within each test, using
-  the original generated scripts in fresh local scopes. Commands under test
-  retain separate processes, real file identities, and existing race assertions.
-  A traced local run confirms 44 PowerShell starts become 24, with all 21 cases
-  passing. Alternating after/before/after elapsed times were 50.00/59.28/37.00
-  seconds on a shared macOS arm64 host; that variance does not justify a precise
-  percentage or hosted runner-time claim. Test budgets and worker counts are
-  unchanged.
-
-The reproducible pnpm-store comparison is
-`ORCA_BACKGROUND_LAUNCH=1 node config/scripts/ci-pnpm-store-benchmark.mjs --samples=3`.
-On macOS arm64 with BSD tar, three alternating fresh-store pairs eliminated a
-median 332,746,995-byte archive per miss. Median install time was 17.33 seconds
-before and 16.94 after; the removed archive step alone took 53.51 seconds.
-Those local disk/CPU measurements exclude uploads and are not a prediction of
-Linux or Windows hosted savings. Restore cost is common to both policies.
-
-## September 26 verification
-
-[PR #23053](https://github.com/stablyai/orca/pull/23053) was merged before its
-latest full run finished. That run,
-[36221874572](https://github.com/stablyai/orca/actions/runs/36221874572), ultimately
-failed the mobile pending-frame precondition, just as the previous run had.
-All eight unit shards passed, but the aggregate did not. An unchanged assertion
-was not enough evidence to label the failure an unrelated flake.
-
-Main subsequently received the deterministic frame hold in PR #22635. The real
-terminal refit now queues a frame that the recorder holds until disposal has
-finished, then releases surviving work against a remounted terminal. This
-follow-up adds a negative control: cancellation is disabled only during disposal,
-and the same recorder must report a document-owned callback after disposal.
-The normal case retains its pending-work and zero-leak assertions. Both cases
-passed five fresh headless Chromium runs locally; the complete terminal-render
-file passed all 13 tests. Browser dependencies were required, so these were real
-render checks rather than skipped bundles.
-
-Unit model tests now import Monaco's editor API directly, preserving real models
-and undo stacks without loading every language contribution. The registry bridge
-requires only the editor and URI interfaces it actually uses. The full application
-still imports its existing Monaco entry point; no production runtime behavior,
-assertions, worker counts, timeouts or isolation settings changed.
-A controlled local comparison (macOS arm64, Node 26.6.0, Vitest 4.1.11,
-`--maxWorkers=1` only for this comparison) kept six files and all 32 tests.
-Three warm original samples took 14.53/12.84/11.62 seconds; three editor-API
-samples took 12.95/9.81/7.99 seconds, alternating back to the original imports
-between measurements. Median elapsed time fell 12.84 to 9.81 seconds (23.6%);
-median import time fell 10.73 to 7.94 seconds (26.0%). The initial cold original
-sample, 20.29 seconds, is excluded. Shared-host variance remains; this is a
-focused measurement, not a claim of a 23.6% improvement to the full unit suite.
-
-The default-branch warmer
-[36221917346](https://github.com/stablyai/orca/actions/runs/36221917346) successfully
-published native modules and TypeScript state. Fresh PRs
-[#23101](https://github.com/stablyai/orca/pull/23101) and
-[#23104](https://github.com/stablyai/orca/pull/23104) restored both on their first
-runs. Scope inventories showed neither PR had a private copy; the TypeScript
-key existed only on main. Native restore took 0.45/0.54 seconds; TypeScript restore
-took 0.38/1.31 seconds, with compiler steps of 8/39 seconds versus the warmer's
-80-second cold compiler step. PR #23104 used the prefix fallback after its base
-advanced, confirming reuse across commits as well as PRs.
-
-The same warmer saved a 22.5 MB Git cache, but the exact key disappeared before
-it was reused. Quota eviction is plausible, not proven: the usage API reported
-17.48 GiB while a separate live 100-entry sample contained 15.15 GiB of pnpm
-stores alone. These rapidly changing inventories are not atomic. The root-only
-warmer does not seed the root-plus-mobile download-store key used by static
-analysis, so both fresh PRs saved another roughly 350 MiB store. Controlling that
-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 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).
-
-## 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
-
-The current queue is a bigger part of PR latency than setup. Successful full PR
-[36212793136](https://github.com/stablyai/orca/actions/runs/36212793136) used
-**74.6 aggregate runner-minutes**, including **55.5** for its eight unit shards.
-Those jobs ran for 315–448 seconds but waited 229–1,076 seconds to start. The
-three-second final `verify` job waited another 264 seconds. These are observed
-job creation-to-start and start-to-completion intervals, not billing figures.
-
-This follow-up keeps the existing tests, isolation, eight unit shards, platform
-coverage, and release behavior:
-
-- Make the reusable unit-test call and final aggregate respect cancellation.
-  Their old `always()` conditions kept superseded work alive despite workflow
-  cancellation. In [36215475069](https://github.com/stablyai/orca/actions/runs/36215475069),
-  a newer push cancelled ordinary jobs while all eight unit shards remained
-  queued and the replacement workflow remained pending. `!cancelled()` still
-  evaluates after failed/skipped dependencies, without resisting cancellation.
-  Two other superseded PR runs reproduced this: at 04:27 UTC on September 26,
-  [36216165253](https://github.com/stablyai/orca/actions/runs/36216165253) and
-  [36215543186](https://github.com/stablyai/orca/actions/runs/36215543186) still held
-  11 runners, with two more obsolete jobs queued. They had consumed another
-  71.3 runner-minutes after replacement pushes. After rechecking current PR heads
-  and replacement runs, both obsolete runs were force-cancelled; their replacements
-  left the blocked pending state.
-- Combine root/README guards with change detection. A real sparse checkout kept
-  all 29,487 index entries while materializing only 12 files (192 KB). This
-  eliminates one runner allocation and checkout per PR. README link checks still
-  see tracked targets outside the working tree and run on docs-only PRs.
-- Use free `ubuntu-slim` containers for small guard/aggregate/API jobs; trial
-  free `ubuntu-24.04-arm` for typechecking, which needs no native runtime.
-  Both share the account's standard concurrency limit. Different labels do
-  **not** grant extra concurrent jobs; hosted timings determine their value.
-- Cancel superseded PR attempts in the Git termination, Pi owner, and Pi provider
-  runtime workflows, retaining independent manual runs.
-- Fetch only complete HEAD ancestry for cloud secret scanning. The old checkout
-  fetched every branch and tag and took 55 seconds in
-  [36214130174](https://github.com/stablyai/orca/actions/runs/36214130174).
-  Real Git fixtures prove both merge parents and deleted historical contents
-  still produce the identical scanned patches.
-- Remove the cloud lockfile from the eight unit shards' download-cache key; the
-  dedicated relay integration job still includes it. Record actual per-file
-  environment, setup, import, and test durations for the existing shard planner.
-  Shard 4 spent 535 worker-seconds importing and 357 executing tests; a uniform
-  per-file import estimate misses that cost. See [timing refresh](../../config/scripts/ci-shard-timings.md).
-- Seed Node 24 native modules, the pinned Git compatibility binary, and TypeScript
-  state on the default branch when dependency/toolchain inputs change, with
-  scheduled recovery (originally hourly; now every six hours). One ten-minute-bounded hosted job
-  reuses existing cache keys and skips typechecking an already-cached commit.
-  New PRs can restore default-branch caches, while caches saved by another PR
-  are inaccessible. The audit found 80 entries totaling 10.67 GiB, including
-  9.31 GiB of pnpm stores, but no main-branch Node 24 native or TypeScript state.
-  Seven PRs held separate copies of the same pnpm key (2.36 GB combined).
-  Git preparation now has one shared action with the unchanged cache key,
-  checksum, and build command. In
-  [36212101873](https://github.com/stablyai/orca/actions/runs/36212101873), a new PR
-  spent 40 seconds compiling the same Git 2.25.5 binary; main-branch warming
-  makes that cache available to new PRs too.
-
-The hosted trial also removes repeated work in mobile bundle checks. The
-builder keeps private snapshots of the default real output for read-only checks
-(15 identical builds become two), and haptics checks reuse each route closure
-(32 builds become eight). Determinism, custom inputs, malformed routes, stale
-outputs, and tampered manifests retain independent builds. A mutation regression
-proves Buffer/manifest consumers cannot change another assertion's fixture.
-The grant census reuses parsed references for unchanged file contents, still
-reads source every time, and has a real-file edit invalidation regression.
-The first hosted mobile lane used 400 seconds for its 448 tests; the grant
-census alone took 259 seconds. Locally, the same one-worker invocation of the
-three changed files fell from 243.07 seconds (101 passing tests) to 49.49 seconds
-(103 passing tests). Hosted run
-[36217238462](https://github.com/stablyai/orca/actions/runs/36217238462) retained
-the same 43 files and passed all 450 tests: the original 448 plus two regressions.
-Its test step fell from 400.26 to 205.17 seconds, and the complete job fell from
-498 to 298 seconds (40% less runner time). Builder, haptics, and grant-census file
-times fell from 73.70/88.94/258.58 seconds to 29.24/32.98/22.58 seconds.
-The later default-worker verification retained the same 450-test coverage, but
-its unchanged terminal-render test failed twice on the pre-existing timing
-assertion that a frame must be pending at disposal (`expected 0 to be greater
-than 0`). Its other 449 tests passed; no mobile source or assertion was relaxed.
-
-A four-worker experiment reduced aggregate unit job time from 3,386 to 3,133
-seconds (7.5%), but the repeat run exceeded the palette matcher's existing
-180ms performance budget at 235ms. The override was removed; retain Vitest's
-default worker count, isolation, timeouts, retries, and coverage. The first trial
-also found an outdated hook-order snapshot after main added three layout-persistence
-hooks. That snapshot was refreshed only after comparing the exact old and merged
-hook sequences. Final verification is linked from
-[PR #23053](https://github.com/stablyai/orca/pull/23053). Failed timing reports
-never replace the checked-in baseline.
-
-No account settings, paid services, or runner entitlements changed. Standard
-public-repository runners remain free. GitHub documents plan concurrency limits
-of Free 20, Pro 40, Team 60, Enterprise 500, and permits support requests for
-increases. The organization's actual entitlement was not exposed by the API.
-See [runner specifications](https://docs.github.com/en/actions/reference/runners/github-hosted-runners)
-and [concurrency limits](https://docs.github.com/en/actions/reference/limits).
-
-Hosted observations from [PR run 36215718607](https://github.com/stablyai/orca/actions/runs/36215718607):
-
-| Check                                     | Earlier sample |        Trial | Result               |
-| ----------------------------------------- | -------------: | -----------: | -------------------- |
-| Detection plus repository guards          |  54s, two jobs | 26s, one job | Passed               |
-| Typecheck (whole job)                     |       109s x64 |      81s ARM | Passed               |
-| Typecheck command, cold incremental state |        76s x64 |      51s ARM | Passed               |
-| Cloud secret scan (whole job)             |            69s |          55s | Passed               |
-| Cloud checkout/history fetch              |            55s |          40s | Identical scan scope |
-
-The [warmup trial](https://github.com/stablyai/orca/actions/runs/36215718295)
-passed in 54 seconds. Its x64 compiler restored the ARM job's incremental state
-and rechecked the same source in eight seconds. Unit shard 3 subsequently
-restored its pnpm/native cache keys successfully. Actual sharing across different
-PRs requires the producer to land on the default branch; this trial validates
-commands and key compatibility, not a completed default-branch rollout.
-The follow-up warmup built the Git binary in 40 seconds; the PR Git check restored
-that exact key and passed in 62 seconds overall. Its TypeScript refresh took
-seven seconds after restoring earlier incremental state.
-
-These are small observational samples from different revisions, not controlled
-benchmarks. The cold typecheck log confirms an incremental-cache miss. Queue
-changes must be separated from active duration and concurrent account traffic.
-At the time of that trial, checked-in shard weights were unchanged; the September
-26 refresh above now uses the complete successful unit reports.
-
-## September 5 audit
-
-Audit date: September 5, 2026. No paid capacity or provider configuration changed.
-
-## Measurements and changes
-
-Three recent successful PR runs used 54.6–64.9 aggregate runner minutes:
-[33998366568](https://github.com/stablyai/orca/actions/runs/33998366568),
-[33998220287](https://github.com/stablyai/orca/actions/runs/33998220287), and
-[33998181502](https://github.com/stablyai/orca/actions/runs/33998181502).
-These are sums of active job durations, excluding skipped jobs; they are not
-billing minutes or queue time. This small sample is not a historical average.
-
-- Consolidate E2E routing into the existing code-path detector. The removed
-  detector occupied 20–22 seconds and required another runner allocation and
-  full-history checkout per nondraft code PR. The same routing commands remain,
-  including SSH and native IME selection; actual E2E results remain advisory.
-  A routing-script error now fails the required code-path detector.
-- Use gzip for PR-only Debian/RPM artifacts. The two sampled Linux packaging
-  jobs took 8m10s and 8m19s overall; one spent 3m47s in electron-builder. Its
-  default Debian/RPM compression is xz. PR artifacts are inspected on the same
-  runner, so their download size offers no benefit. Keep all AppImage, Debian,
-  RPM, payload, launcher, and shutdown checks. Release compression is unchanged.
-  Hosted validation in [33999422341](https://github.com/stablyai/orca/actions/runs/33999422341)
-  reduced the package-build step to 2m13s and the full Linux job to 6m17s, with
-  all existing checks passing. This is a small observational sample.
-- Cancel superseded Mobile Checks and Skill update round-trip PR runs. The
-  skill matrix has 13 jobs. Preserve non-cancelling main/merge-group skill runs,
-  with separate concurrency groups per event.
-- Reuse the existing script-free root dependency action in Mobile Checks,
-  including the pnpm cache keyed by both root and mobile lockfiles. The root
-  install remains necessary because mobile types import root dependencies.
-
-The repository already has eight unit shards, path-scoped platform checks,
-native caches, one shared E2E build, PR cancellation, incremental TypeScript
-caching, and changed-spec E2E routing. Increasing shards would increase setup
-work and simultaneous runner demand. Do not adjust the count without comparing
-critical-path time and aggregate job time on the same commit.
-
-## Follow-up savings
-
-- Move the hourly main/release freshness lookup to a five-minute Ubuntu
-  preflight without a checkout. In unchanged run
-  [33986205749](https://github.com/stablyai/orca/actions/runs/33986205749),
-  Blacksmith macOS was occupied for 40 seconds, including a 30-second checkout,
-  before skipping. The new job-level gate avoids that Mac allocation. Actual
-  builds gain an Ubuntu scheduling hop; pin the Mac checkout and downstream
-  Windows identity to the SHA that the preflight checked.
-- Avoid global `npm install -g node-gyp` for validated Linux Node-runtime cache
-  hits. Use the existing native-module load/provenance check before skipping;
-  misses, broken addons, and Electron jobs still install the rebuild toolchain.
-  The action file participates in cache keys, so this rollout creates fresh
-  native caches once. No measured warm-cache seconds are claimed yet.
-
-## Runner recommendations
-
-The repository is **public**, verified using the GitHub API. Standard
-GitHub-hosted Linux, Windows, and macOS runners have free compute minutes for
-public repositories. Queue pressure and third-party provider allowances still
-matter; artifact storage and larger runners have separate billing rules.
-See [GitHub Actions billing](https://docs.github.com/en/billing/concepts/product-billing/github-actions).
-
-1. Keep standard GitHub-hosted runners as the default. Ask GitHub Support for a
-   higher concurrent-job limit before paying for more capacity. The documented
-   standard limits depend on the account plan (Free: 20 total/5 macOS; Team:
-   60/5; Enterprise: 500/50), and increases are subject to approval. The actual
-   account entitlement was not verified. See [limits](https://docs.github.com/en/actions/reference/limits).
-2. Reserve existing Blacksmith allowance for macOS if that is the priority.
-   Blacksmith documents 3,000 free x64 2-vCPU-equivalent minutes per organization;
-   a 6-vCPU Mac minute consumes 20 equivalents, or 150 actual Mac minutes if
-   it uses the entire free pool. Cloud workflows also use Blacksmith Linux.
-   Moving Linux to hosted GitHub saves shared allowance, but does not necessarily
-   free Mac hardware capacity. Account-specific contracts and usage were not
-   inspected. See [Blacksmith runners](https://docs.blacksmith.sh/blacksmith-runners/overview).
-3. Treat Ubicloud as an optional small Linux overflow trial. Its documented
-   $2.50 monthly credit buys 1,250 premium 2-vCPU minutes at $0.002/minute, or
-   2,000 standard 2-vCPU minutes at $0.00125/minute. New accounts default to
-   premium and require a credit card. No enforceable hard spending cap was
-   verified, so changing runner labels cannot guarantee the no-spend constraint.
-   One PR's roughly 55–65 runner minutes also makes clear how small this pool
-   is relative to repository activity (hardware speeds differ).
-   See [pricing](https://ubicloud.com/docs/about/pricing) and
-   [setup](https://ubicloud.com/docs/github-actions-integration/quickstart).
-
-### A bounded Ubicloud candidate
-
-The Linux leg of `performance-contracts.yml` took 48 seconds in
-[33994756657](https://github.com/stablyai/orca/actions/runs/33994756657).
-Its daily schedule and 20-minute timeout make it a small candidate: 31 ordinary
-scheduled attempts permit at most 620 job-runtime minutes, before runner
-startup/cleanup billing. Actual timings on Ubicloud's 2-vCPU hardware still need
-measurement; the GitHub timing is only a sizing reference.
-
-If enabled later, route only the first attempt of the scheduled Linux job to
-Ubicloud; keep PRs, manual dispatches, reruns, and macOS/Windows on GitHub. This
-avoids spending the allowance on unpredictable PR volume. Check other account
-usage and available credit before enabling; a workflow timeout is not an
-account-wide billing cap. On September 5, the organization's GitHub App
-installation list contained Blacksmith but no Ubicloud installation, so this
-follow-up leaves runner selection on GitHub rather than queueing work against
-an unprovisioned label.
-
-## Machines that also run coding agents
-
-Do not register the credentialed host directly as a public-PR runner. A PR can
-execute arbitrary build/test code, and a persistent host lets it access local
-credentials or affect subsequent jobs. Docker alone is not adequate isolation
-when it exposes the host home, Docker socket, SSH agent, or office network.
-
-A possible no-new-hardware experiment is a disposable VM per job, preferably on
-a dedicated spare machine, with a just-in-time single-job runner, no shared
-home/keychain/SSH agent or host mounts, restricted network access, and CPU/RAM
-limits that leave room for coding agents. Destroy the VM after every job;
-ephemeral runner registration by itself does not clean the machine. Start with
-trusted branch/manual workloads and keep public fork PRs on hosted runners.
-Provisioning and ongoing patching are real operational costs even when the
-machine is already owned. See GitHub's
-[self-hosted runner security guidance](https://docs.github.com/en/actions/security-for-github-actions/security-guides/security-hardening-for-github-actions).
-
-## Release waits
-
-The latest successful sampled Windows release used 13m59s of a 21m56s job in
-signing wait/download steps. The same release held an Ubuntu job for 11m38s
-polling the isolated Mac build. These are stronger occupancy opportunities than
-small checkout savings, especially when approval takes hours.
-
-[Windows signing without occupying a runner](windows-signing-runner-time.md)
-describes a staged, same-run design, required protected environments, and
-rehearsal criteria. No callback integration or protected Windows signing
-environments currently exist. An environment-gated design adds a GitHub
-approval after each SignPath approval and changes the current automatic inner
-signing timeout fallback; those are explicit release-policy decisions, so this
-PR leaves production signing behavior unchanged.
-
-## Second audit and hosted trials
-
-- Cloud Verify ran 100 times in a sampled 39-hour window (84 PR and 16 push
-  runs). Move its four Ubuntu 22.04 jobs from Blacksmith to standard hosted
-  Ubuntu 22.04, preserving Postgres, secret scanning, build, tests, and Terraform
-  validation. Baseline [34001538145](https://github.com/stablyai/orca/actions/runs/34001538145)
-  used 64/72/26/19 seconds for security/test/build/Terraform respectively.
-  This conserves the shared provider allowance; hosted latency must be checked.
-- Keep full tag history for the 13-job skill round-trip matrix, but fetch blobs
-  lazily. Only two historical SKILL.md files are materialized. Baseline
-  [33999994876](https://github.com/stablyai/orca/actions/runs/33999994876)
-  spent 42–84 seconds per checkout, about 14 aggregate runner minutes. A hosted
-  trial must verify historical blob fetches on all three operating systems.
-- Use the existing Electron/native dependency cache for native IME CI. Keep
-  both deterministic boundary and real IBus tests. Add pnpm store caching to
-  terminal perf and release golden/evidence lanes; retain their raw installs
-  because manually selected older refs may not contain the shared action.
-- Disable ZIP recompression only for already-compressed NSIS installers sent
-  to SignPath. Installer contents, release compression, and signing stay intact.
-- Advance existing placement and startup deadlines with scoped fake timers in
-  three renderer test files. All 34 tests pass in 62 ms of local test execution,
-  versus 65.182 seconds in the sampled hosted baseline. Imports and transforms
-  still dominate invocation time; this is not a claim of equal PR wall savings.
-
-Eight unit shards already have balanced 260–296-second sample durations.
-Reducing shards or removing test isolation lacks evidence of a net gain. Real
-subprocess tests intentionally cover lifecycle behavior and retain real clocks.
-The 14-way E2E split retains headroom after earlier 12-way timeouts. Lowering
-coverage or schedule frequency is outside this efficiency pass. Cache complexity
-for a seven-second docs install is unlikely to pay back. Release build reuse
-across modes risks differing telemetry identities and native platform artifacts.
-
-Terminal Perf's baseline [33955846492](https://github.com/stablyai/orca/actions/runs/33955846492)
-failed waiting 30 seconds for workspaceSessionReady in its shared-page fixture,
-before measuring terminal performance. Compare hosted trials against that known
-failure rather than attributing it to dependency cache changes.
-
-Hosted trials for the second audit:
-
-- [Cloud Verify 34002295216](https://github.com/stablyai/orca/actions/runs/34002295216)
-  passed all four jobs on standard hosted Ubuntu: security 57s, test 102s, build
-  35s, Terraform 19s. The test lane is 30s slower than the Blacksmith sample;
-  retain this modest latency tradeoff to conserve shared allowance.
-- [Skill matrix 34002295221](https://github.com/stablyai/orca/actions/runs/34002295221)
-  passed all 13 legs, including historical blob materialization. Checkout took
-  18–20s on Linux, 39–45s on macOS, and 49–58s on Windows, versus the earlier
-  42–84s range across platforms. These are observational samples.
-- [Native IME 34002299594](https://github.com/stablyai/orca/actions/runs/34002299594)
-  passed both deterministic and real IBus checks. Shared dependency setup took
-  29s, versus 35s for the old install/toolchain steps in the sampled baseline.
-- Native-IME-only source/spec changes no longer allocate the reusable E2E
-  build, cache, and consumer jobs just to filter out the native spec. The
-  separate native workflow still runs; SSH-only and mixed spec lists still
-  allocate the reusable workflow. Routing contracts exercise these cases.
-- [Hourly 34001816449](https://github.com/stablyai/orca/actions/runs/34001816449)
-  exercised the new five-second preflight and successfully published macOS.
-  The Windows follow-up failed in its unchanged input-vetting fetch because
-  remote refs differ only by case on its case-insensitive filesystem. The
-  requested SHA was correct; this does not validate an unchanged-main skip yet.
-
-Moving the daily Mac freshness check has lower expected value than hourly:
-only one potential idle allocation per day, and active development usually
-requires that build. Defer another release-graph change until skip frequency
-justifies it. The substantive remaining release occupancy opportunity is the
-separately documented asynchronous signing policy decision.
-
-## Persistent Vitest transform cache: rejected for now
-
-A local 96-file import-heavy sample with Vitest 4.1.11 took 8.31/8.53 seconds
-without its filesystem module cache, 8.63/8.69 seconds cold, and 5.91/5.91
-seconds warm: about 30% faster warm. The cache held 3,770 modules and 83 MiB.
-These timings exclude hosted cache transfer and do not establish a PR saving.
-
-Correctness probes found eight changes that incorrectly kept a test passing
-against the old transformed import or compiler output:
-
-| Change after warming                                              | Raw cache  | Startup fingerprint |
-| ----------------------------------------------------------------- | ---------- | ------------------- |
-| Add preferred `value.js` beside previously resolved `value.ts`    | False pass | Correctly fails     |
-| Retarget a source symlink while its old target still exists       | False pass | Correctly fails     |
-| Change an inlined package's `exports` to another existing file    | False pass | Correctly fails     |
-| Add a preferred extension in a generated source directory         | False pass | Correctly fails     |
-| Change TypeScript's JSX factory in `tsconfig.json`                | False pass | Correctly fails     |
-| Create the preferred file from setup after startup fingerprinting | False pass | False pass          |
-| Add a preferred file inside an external symlinked directory       | False pass | False pass          |
-| Change an external file read by a transform plugin                | False pass | False pass          |
-
-The fingerprint included file names/types, symlink targets, package/config/
-TypeScript metadata contents, and effective alias/define options. Following
-external symlink inventories and hashing declared transform inputs repaired the
-last two rows, but did not repair files created after fingerprinting. All ten
-cache-disabled changed-input controls failed correctly; initial and repeated
-warm controls passed. Effective alias and simple define changes also invalidated
-correctly without the added fingerprint.
-
-The [Vitest 4.1.11 documentation](https://github.com/vitest-dev/vitest/blob/v4.1.11/docs/config/experimental.md#known-issues)
-documents incomplete plugin-input tracking. Its
-[cache implementation](https://github.com/vitest-dev/vitest/blob/v4.1.11/packages/vitest/src/node/cache/fsModuleCache.ts)
-hashes the module and selected configuration, but retains previously resolved
-import URLs. [Upstream fix #11381](https://github.com/vitest-dev/vitest/pull/11381)
-merged September 29 and revalidates those URLs. A disposable Vitest 5.0.3 probe,
-which contains that fix, reproduced all eight false-pass categories: the old
-target still exists, so checking its resolved URL misses a newly preferred file
-or changed package export. Upgrading alone does not make reuse safe.
-
-To reproduce the simplest negative control outside the worktree:
-
-1. Create `value.ts` containing `export const value = 1`, and a test importing
-   `./value` and asserting `expect(value).toBe(1)`. Use an isolated config/cache,
-   one fork worker, `ORCA_BACKGROUND_LAUNCH=1`, and
-   `NODE_DISABLE_COMPILE_CACHE=1`.
-2. Run the installed CLI with `--experimental.fsModuleCache=true` to warm it.
-   Add `value.js` containing `export const value = 2`; retain `value.ts` and the
-   unchanged test. The same cached invocation incorrectly passes.
-3. Repeat with `--experimental.fsModuleCache=false`. The assertion correctly
-   fails. Vitest 5 uses `--fsModuleCache` for the equivalent controls.
-4. For the startup-inventory control, use unchanged setup code that creates
-   `value.js` only when a runtime environment switch is enabled. Remove that
-   file before each invocation/fingerprint; warm with the switch off, then run
-   with it on. The cached importer still points at `value.ts`, while the fresh
-   module graph correctly fails. This is an additional persistent-cache error,
-   not a claim that normal in-process module reuse supports arbitrary mutation.
-
-Orca currently resolves only pinned Vitest/Vite built-in transform plugins.
-Its setup files install runtime guards/shims and temporary user data, rather
-than custom transforms. A narrower policy could cache only proven immutable
-source/dependency inputs and leave tests, setup, virtual modules, external
-fixtures, and unknown plugins cold. That requires a validated transitive input
-boundary and mutation policy; hashing every source tree on each lookup would
-also spend the gain. Until that policy and hosted transfer cost are measured,
-the local warm result does not justify adding a persistent cache to CI.
-
-## Test fixture imports: reuse the existing narrow builder
-
-The pointer-drag test imported only `makeWorktree` from `store-test-helpers`,
-which also loads the real store slices. Its existing identical export in
-`worktrees-slice-test-fixtures` supplies the same defaults without that graph.
-Changing this single import preserves the five tests, fork workers,
-isolation, and disabled filesystem/Node compile caches.
-
-Three local interleaved before/after pairs took 2.066/2.047/2.031 seconds versus
-0.351/0.388/0.353 seconds: the isolated median fell 82.7%, from 2.047 to 0.353
-seconds. Transformed modules fell from 1,086 to 15. This is an isolated test
-result, not a whole-shard estimate: other tests need the store modules anyway.
-A broader 20-file screening sample saved only 0.295 seconds at its median,
-which does not justify splitting the fixture module across those consumers.
-
-Two further import-only reuses passed the same six-run controls. The kanban
-lane test mocks its card component, so switching its builder import reduced
-the isolated median from 2.202 to 0.495 seconds (77.5%) and transformed modules
-from 1,082 to 13, with all six tests unchanged. The autosave fixture needs
-the real editor slice, but not every store slice: the same import change across
-its three consuming suites reduced the median from 3.027 to 1.301 seconds
-(57.0%), with 1,107 to 320 modules and all 17 tests unchanged. These
-results also measure isolated file groups; they are not additive shard savings.
-The remaining inspected builder-only imports already load the full store as
-their subject, or use builders whose defaults differ from existing exports.
-
-## Vitest threads: retain forks after the scoped pilot
-
-Three local interleaved comparisons kept four workers, `isolate: true`, both
-persistent caches disabled, and the same test assertions/module graph. The
-94-file happy-dom renderer cohort passed all 570 tests: forks took
-17.480/17.382/17.657 seconds and threads 15.048/14.890/15.013 seconds, a 14.1%
-median reduction. A 23-file shared JavaScript cohort passed all 248 tests,
-with its median falling from 1.435 to 1.274 seconds (11.2%). No main-process
-module or native addon loaded; guards reject native loading, `chdir`, and
-process signals. These Mac/Node 24 timings motivated the hosted comparison.
-
-The [pinned Vitest pool documentation](https://github.com/vitest-dev/vitest/blob/v4.1.11/docs/config/pool.md)
-defaults to forks and documents thread limitations around process APIs and
-native libraries. [Node's worker documentation](https://nodejs.org/docs/latest-v24.x/api/worker_threads.html#new-workerfilename-options)
-also excludes V8 flags from worker `execArgv`. Orca's `--expose-gc` worker flag
-fails with `ERR_WORKER_INVALID_EXEC_ARGV` under threads. The experiment starts
-both parent processes with that flag, retains it on fork workers, and removes
-it only from thread worker arguments; GC availability is checked in every
-test environment. Process, native, lifecycle, and GC-retention tests stay out
-of this comparison.
-
-The [hosted pilot](https://github.com/stablyai/orca/actions/runs/36855833033)
-passed on Linux ARM64, four CPUs, Node 24.21.0, and Ubuntu image
-`20260927.135.1`. Three alternating pairs preserved source hashes and complete
-module graphs, with no main-process module or native addon loaded:
-
-| Audited cohort                         | Forks, seconds           | Threads, seconds         | Median saving         |
-| -------------------------------------- | ------------------------ | ------------------------ | --------------------- |
-| 94 renderer files / 570 tests          | 48.591 / 48.144 / 47.299 | 42.486 / 42.402 / 42.221 | 5.742 seconds (11.9%) |
-| 23 shared JavaScript files / 248 tests | 3.386 / 3.330 / 3.424    | 3.203 / 3.237 / 3.278    | 0.149 seconds (4.4%)  |
-
-Each timed group also included two isolation sentinels: totals were 96 files /
-572 tests and 25 files / 250 tests, respectively, with no skips.
-Their graph hashes matched in every pair (4,015 and 251 modules). Separate
-single-worker positive controls passed both sentinels in each pool. With
-isolation disabled, the second sentinel correctly failed on leaked state.
-Missing GC failed setup, and native loading, `chdir`, and process-signal probes
-failed at the guard in both pools. Those expected failures did not pass silently.
-
-The fixed 117-file sample accounts for about 1.5% of the baseline's aggregate
-module time; its isolated gains are not a whole-suite estimate. Maintaining
-that exact file list for this benefit is not justified. A broader route needs
-a safe eligibility policy, Node 26/Windows evidence, and a mixed full-shard
-comparison: separate Vitest projects can repeat shared transforms and erase
-the pool-startup saving. A renderer path alone does not prove that future
-imports avoid process or native behavior. Production retains forks, and the
-temporary workflow, driver, and cohort list were removed after measurement.
-
-## Oxlint scan consolidation: rejected
-
-The [hosted comparison](https://github.com/stablyai/orca/actions/runs/36855833063)
-used one Linux ARM64/four-CPU runner, Node 24.21.0, and three alternating
-baseline/candidate pairs. The baseline kept root lint and anti-slop in parallel,
-then native and type-aware audits in parallel. The candidate merged the first
-three scans and ran the unchanged type-aware audit alongside them.
-
-| Pair/order         | Baseline stage | Candidate stage | Change |
-| ------------------ | -------------- | --------------- | ------ |
-| 1: baseline first  | 49.409 s       | 53.197 s        | +7.7%  |
-| 2: candidate first | 50.249 s       | 60.297 s        | +20.0% |
-| 3: baseline first  | 50.040 s       | 56.672 s        | +13.3% |
-| Median             | 50.040 s       | 56.672 s        | +13.3% |
-
-These complete stage timings include anti-slop synchronization in both variants
-and candidate configuration generation. Candidate preparation took only
-0.141–0.255 seconds. The unchanged type-aware scan took 16.386–17.279 seconds
-in the baseline wave, versus 33.561–55.736 seconds beside the merged scan;
-these timings are consistent with contention on the four-CPU runner.
-
-The corrected local Mac/16-CPU comparison had reduced the median from 16.676
-to 14.381 seconds (13.8%). Both comparisons limited each Oxlint invocation to
-four threads and used identical source configuration hashes. The hosted result
-shows why the local gain did not justify adoption on the actual CI runner.
-
-Coverage controls passed: the merged scan matched the exact 28,621-file union
-with no missing or extra files. Thirty-one fault fixture files produced the
-exact 16-diagnostic union, including all seven active root JavaScript rules.
-Eighteen focused controls preserved nested-mobile exemptions, type-aware
-exclusions, and exit behavior. The native audit's warnings still failed its
-original `--deny-warnings` gate and became errors in the merged scan; root
-warnings remained non-fatal. Every full-repository scan passed cleanly.
-
-Keep the existing production waves. The temporary workflow and 601-line
-benchmark driver were removed after recording this rejected result.
-
-## Native cache ownership: retain the extraction
-
-Native restoration, toolchain recovery, and preparation now belong to
-`.github/actions/prepare-native-runtime/action.yml`. The installer forwards
-its requested key and three build paths; Windows packaging saves the Node
-build before calling the same action for Electron. Existing native load,
-patched-build, Windows job-ownership, registry, and process-table probes remain
-unchanged on restored consumers. Exact keys still separate OS/image or Linux
-container libc, architecture, runtime, resolved Node version, and actual pnpm
-version, without partial-key restoration.
-
-The source hash covers the dedicated action, `pnpm-lock.yaml`,
-`pnpm-workspace.yaml`, `.npmrc`, `.pnpmfile.cjs`, both native dependency patches,
-and these complete build/probe inputs:
-
-- `config/scripts/ensure-native-runtime.mjs`, `rebuild-native-deps.mjs`,
-  `node-pty-job-ownership.cjs`, `windows-pe-machine.cjs`,
-  `windows-process-tree-gyp-rebuild.mjs`, and
-  `windows-process-tree-creation-time.cjs`;
-- `config/scripts/install-electron-package-binary.mjs`,
-  `electron-platform-path.mjs`, `zip-extractor-command.mjs`,
-  `shared-electron-dist-cache.mjs`, `space-sharing-copy.mjs`, and
-  `src/shared/zip-extractor-command.ts`;
-- `native/windows-registry/src/addon.cc`, `binding.gyp`, `package.json`, and
-  `index.js`.
-
-The patches are `config/patches/node-pty@1.1.0.patch` and
-`config/patches/@vscode__windows-process-tree@0.8.0.patch`. Root app version and
-script metadata are excluded; installed package versions remain owned by the
-full lockfile, and the external node-gyp pin belongs to the native action.
-A negative control changing only the installer's
-pnpm verification condition preserves the native key and paths. Every declared
-native input mutation changes the key, and main warming watches those inputs.
-
-This policy creates one cold namespace. The bounded 50-head main sample has
-49 adjacent transitions and three native-key changes under both the old and
-expanded policies: the added node-pty helper export still invalidates #24448.
-There is no measured historical net saving.
-
-The [cold warming run](https://github.com/stablyai/orca/actions/runs/36945655208/attempts/1)
-published all four exact Node keys, and its
-[warm rerun](https://github.com/stablyai/orca/actions/runs/36945655208/attempts/2)
-restored them on fresh runners with the same frozen inputs, Node 24.21.0, and
-pnpm 12.0.0. All five jobs passed in both attempts. These times cover the entire
-native action: runtime validation, key resolution, restore, any toolchain
-recovery, and the unchanged native preparation probes.
-
-| Native Node lane | Cold action | Warm action | Cold post-job save |
-| ---------------- | ----------- | ----------- | ------------------ |
-| Linux x64        | 18.288 s    | 0.993 s     | 0.387 s            |
-| Linux ARM64      | 11.540 s    | 1.062 s     | 1.113 s            |
-| Windows x64      | 104.482 s   | 1.381 s     | 2.424 s            |
-| Windows ARM64    | 256.662 s   | 3.832 s     | 1.243 s            |
-
-Cold Windows jobs rebuilt all three native addons. Warm jobs loaded and probed
-the restored builds; Linux also ran the existing check-only probe before
-skipping the external node-gyp installation. Warm post-job steps recognized
-their primary keys and did not save again. An earlier trial exposed unavailable
-nested composite outputs during post-job saving; both cache variants now use
-the same literal path inventory as the requested output, and the fixed cold
-jobs published their caches without missing-path warnings.
-
-Both [PR package jobs](https://github.com/stablyai/orca/actions/runs/36945659474)
-passed. Windows packaging consumed the same-run Node seed in 1.374 seconds
-before its Node tests and Electron transition. Its Electron cache initially
-missed while the modules were already healthy, so that stage does not establish
-an avoided compilation. Linux's Electron cache was also published, and all 19
-bundled native binaries passed the existing glibc floor check.
-
-The [first six-platform headless run](https://github.com/stablyai/orca/actions/runs/36945658897)
-ran every persistence lane: five passed, while Mac Intel failed waiting for a
-cancel-test worker's ready file before its 500 ms timeout. That lane deliberately
-uses `native-runtime: none`; its separate slot build and smoke passed. The failure
-blocked the five downstream Linux glibc/musl qualifications, so this run does not
-establish complete headless qualification. All six persistence lanes, Node 18
-handoffs, and Linux floor/musl gates remain; final qualification is tracked in
-the [PR's latest checks](https://github.com/stablyai/orca/pull/24476/checks).
-
-These are single cold/warm observations, not paired medians or a measured
-whole-workflow saving. They demonstrate usable exact-key reuse after publication;
-future savings depend on cache availability and unchanged native inputs. The
-trial seeds belong to this PR's merge ref. Other PRs require a main-branch seed
-after merging this new namespace; the existing main-push and scheduled warming
-jobs provide that seed.
-
-## Separate mobile install verification: retain the current policy
-
-Three local paired pnpm 12 mobile installs reduced the median from 17.155 to
-15.871 seconds, a 1.284-second difference before cache transfer and postinstall
-scripts. That narrow margin does not establish a net hosted saving, so the
-separate mobile verification record was not adopted.
-
-## Unit shard weights: retain the current allocation
-
-The latest five shard wall times were 526/495/503/508/510 seconds. Reweighting
-projected roughly a 4% reduction in the slowest shard without reducing total
-CPU work; the evidence across runs was weak. That estimate does not justify
-changing allocation, so the current weights remain.
-
-## Serializer oracle allocations: retain the change
-
-The serializer round-trip oracle now reloads one xterm cell per buffer traversal
-and writes flag digits directly, avoiding fresh cell objects and flag arrays for
-every comparison. Independent replay terminals, cell descriptors, transcript
-fixtures, resize schedules, ConPTY modes and seeds remain unchanged.
-
-The [hosted comparison](https://github.com/stablyai/orca/actions/runs/36944080887)
-used one Ubuntu 24.04 ARM64 runner, image 20260927.135.1, Node 24.21.0 and one
-isolated fork. The baseline formatter was frozen from f69052e. Byte-parity capture
-ran separately; these three alternating pairs had no payload instrumentation.
-Times cover the complete Vitest invocation, including startup and shutdown.
-
-| Pair/order         | Baseline | Candidate | Change |
-| ------------------ | -------- | --------- | ------ |
-| 1: baseline first  | 70.631 s | 61.661 s  | -12.7% |
-| 2: candidate first | 70.619 s | 62.284 s  | -11.8% |
-| 3: baseline first  | 70.750 s | 62.091 s  | -12.2% |
-| Median             | 70.631 s | 62.091 s  | -12.1% |
-
-Median test-body time fell from 69.519 to 60.953 seconds. All eight full-cohort
-invocations preserved the same 89 passes and two existing conditional skips
-across three files. Separate baseline/candidate captures produced identical
-95,017,559-byte payloads for all 1,435 scenarios and 7,649 checkpoints, with zero
-source crashes; both SHA256 hashes matched the local captures.
-
-Seven focused controls compare against the original allocating oracle, including
-all 128 text-flag combinations, styled blanks, wide cells, cell reuse and immutable
-snapshots. Five deliberate faults were detected: stale cell contents, a missing
-bold flag, changed empty-cell policy, removed scratch reuse and a source-parser
-crash. The last control also proved that crash returns enter the capture.
-
-This measures the three-file oracle cohort. Whole-shard timings include other
-test bodies, imports and transforms, so a whole-suite saving needs separate
-measurement.
-
-## Cache warming: let scheduled ticks wait for active work
-
-The hourly warmer previously cancelled an active warmer, even when both used
-the same source. On October 2, the [merge-triggered run](https://github.com/stablyai/orca/actions/runs/36965832780)
-at 8ff6296 was interrupted by the [hourly run](https://github.com/stablyai/orca/actions/runs/36966367896)
-at the same commit. The Windows ARM dependency installation had run for 356
-seconds before cancellation; its native verification was skipped. The other
-four lanes had already succeeded.
-
-Scheduled events now wait in the existing concurrency group. Push, PR and manual
-events still replace active work. This keeps one active workflow and the default
-single pending slot, using GitHub's documented
-[conditional cancellation](https://docs.github.com/en/actions/how-tos/write-workflows/choose-when-workflows-run/control-workflow-concurrency).
-All cache probes, platforms and publication rules remain.
-
-This avoids the observed discarded installation. It does not remove the next
-scheduled run or its repeated successful lanes, and pending replacement still
-applies regardless of the cancellation expression. The bounded 20-run sample
-contains this collision; it does not establish a recurring or whole-CI saving.
-
-## Cache warming: six-hour recovery interval
-
-Scheduled warming now runs at 00:41, 06:41, 12:41 and 18:41 UTC instead of hourly.
-Main pushes that change cache inputs still seed immediately, and manual dispatch
-remains available. All five jobs, probes, keys and publication rules remain.
-This removes 20 scheduled workflows and 100 scheduled job starts per day (83%).
-
-Four consecutive October 2 scheduled runs used the same source. The
-[18:50 UTC run](https://github.com/stablyai/orca/actions/runs/37050194510) used 474
-aggregate runner-seconds across five jobs, including 242 seconds on Windows ARM.
-That job restored exact package, verification and native caches; package-store
-restore alone took about 70 seconds. Repeating that observed duration twenty
-fewer times would avoid about 158 runner-minutes daily, but this one-run estimate
-is not a billing forecast or measured post-rollout saving.
-
-The longer interval can delay background repair after eviction or runner-image
-changes. Existing consumers retain cold-cache installation/build fallback, and
-normal cache reads update last access. Storage was near the repository limit
-when audited, so retention and unchanged hit rates are not guaranteed. Observe
-misses before reducing the recovery frequency further.
-
-## Daemon shutdown fixture: remove build tools after compilation
-
-The fixture now removes compiler and Python build dependencies, plus npm and
-node-gyp caches, in the same Docker layer that installs node-pty. It restores the base image's manual
-package marks, keeps procps and util-linux, and retains the packages owning the
-shared libraries used by Node and the actually loaded PTY addon. This extends
-the [official Node image's package-ownership approach](https://github.com/nodejs/docker-node/blob/main/22/bookworm-slim/Dockerfile)
-to native addons. Dependency checks and a real PTY spawn fail the build if cleanup
-breaks the runtime.
-
-The [hosted comparison](https://github.com/stablyai/orca/actions/runs/36969120786)
-used Ubuntu x64, Docker 28.0.4 and the same resolved Node 22.23.3 base digest for
-both images. All 3,418 common entries under `/usr/local` retained their bytes,
-modes and symlink targets; all seven resolved runtime libraries matched. Only
-two directory-only Python paths disappeared. The 52 removed Debian packages
-were build dependencies; retained package versions stayed identical.
-
-| Image payload      | Baseline      | Candidate     | Reduction |
-| ------------------ | ------------- | ------------- | --------- |
-| Docker archive     | 714,643,456 B | 329,967,616 B | 53.8%     |
-| Compressed archive | 205,819,558 B | 91,888,840 B  | 55.4%     |
-
-Each timed arm started a separate Docker daemon with an empty image store,
-decompressed the archive, loaded it, rebuilt from its inline cache and ran the
-unchanged descendant/canary shutdown check. Every provisioning layer was cached.
-
-| Pair/order         | Baseline | Candidate | Saving  |
-| ------------------ | -------- | --------- | ------- |
-| 1: baseline first  | 16.320 s | 10.198 s  | 6.122 s |
-| 2: candidate first | 16.389 s | 10.141 s  | 6.248 s |
-| 3: baseline first  | 16.351 s | 10.223 s  | 6.129 s |
-| Median             | 16.351 s | 10.198 s  | 6.153 s |
-
-Median decompression fell from 1.059 to 0.493 seconds and loading from 10.723 to
-5.125 seconds. Cached rebuild and shutdown times stayed close. Both seed images
-and all six restored consumers passed the original shutdown/canary assertions;
-both deliberate no-op disposal controls failed with the descendant still live.
-Byte and retained-directory mode faults also failed the inventory comparator.
-All six owned daemons stopped gracefully without a forced kill.
-
-These private daemons used separate classic overlay2 stores and the untouched
-host containerd service. Production storage settings were not captured, the
-filesystem cache was not flushed, and network transfer is excluded. Production
-restores overlap dependency installation, so this 37.6% fixture-sequence saving
-does not establish a six-second PR wall-time improvement. Single cold image
-builds took 19.313 and 22.623 seconds. The Dockerfile change creates one new
-fixture key; the existing main warmer seeds it after merge.
-
-## WebRTC egress fixture: avoid GPU initialization for the data channel
-
-The Linux-only probe disables hardware acceleration before Electron readiness.
-It still creates two independent processes/profiles, a real data channel, offer
-and local description, and checks the exact proxy and UDP policy. The three-second
-host observation, 500 ms drain and 20/30/45-second deadlines remain unchanged.
-
-Two fresh Ubuntu x64 runners compared three alternating pairs each, with identical
-phase instrumentation. The [first trial](https://github.com/stablyai/orca/actions/runs/36967511524)
-started with the baseline; the [second trial](https://github.com/stablyai/orca/actions/runs/36969120786)
-started with the candidate. Their first baseline peer constructors took 4.059
-and 2.546 seconds and logged the GPU command-buffer error seen in an earlier
-package timeout. In the second trial, that baseline delay followed the cold
-candidate's 2.3 ms constructor. Every candidate constructor took 2.0–2.6 ms.
-
-Typical process time stayed near 8.3 seconds: baseline/candidate medians were
-8.288/8.273 seconds in the first trial and 8.298/8.380 in the reverse trial.
-The evidence supports removing an avoidable startup delay, without a measured
-typical throughput gain or an estimate of future timeout frequency.
-
-All 12 full case invocations preserved actual unprotected UDP and zero protected
-UDP. Both trials rejected seven faults: missing policy, a packet at 2.9 seconds,
-a packet during the drain, a missing peer factory or local description, a broken
-packet counter and a hung renderer. The original assertions and deadlines caught
-each fault. The normal package gate runs the uninstrumented fixture.
-
-## Remote resync fixture: keep coalesced frames in one decoder pass
-
-The first [full PR run](https://github.com/stablyai/orca/actions/runs/36971375340)
-passed both package jobs but failed one remote-workspace ordering assertion:
-it observed revisions `[2, 3]` where the fixture expected `[3]`. The decoder can
-yield between two frames after its four-millisecond work budget. Under slow
-scheduling, the first response's promise can publish revision 2 before the
-second frame's revision 3 notification is dispatched.
-
-The fixture now holds its delivery clock at the actual timestamp from multiplexer
-construction through the first coalesced-buffer delivery, following the existing
-decoder test pattern. It restores the clock before asynchronous assertions and
-again before disposal. All four source/order cases retain their exact cache,
-publication, client-identity and follow-up-read assertions. Production decoding,
-its fairness budget and remote messages are unchanged.
-
-Normal focused runs passed all 18 tests. Advancing the clock by four milliseconds
-per call reproduced `[2, 3]` in both original response-first cases; the fixed
-fixture passed all 18 under the same control. Removing the freeze reproduced both
-failures. Bypassing the production read-safety guard still caused `[3, 2]` rollback
-in all four ordering cases and eight failing tests overall. All controls preserved
-the same 18 test identities. This corrects a reproducible fixture assumption;
-one CI failure does not establish a failure-rate reduction.
-
-## Windows server cache metadata: retain the current key
-
-The bounded 50-head main sample ending at 8ff6296 contained no root package
-metadata changes. Removing app-version metadata from the Windows server cache
-key would not improve reuse in that sample, so the key remains unchanged.
-
-## Windows ARM SSH: prepare the inbox capability during independent builds
-
-The ARM inbox lane starts guarded Windows capability preparation after the pure
-provisioning self-test and waits for it before any private SSH server or host cell
-runs. Dependency installation and the unchanged native artifacts can run during
-that preparation. Preview and x64 lanes keep their existing serial provisioning;
-the registered background step completes without mutation in those lanes.
-
-The preparation and the foreground provider use the same installer and isolation
-guards. The receipt must match the source, run, attempt, runner, image and native
-architecture. The foreground provider still reads the installed capability and
-verifies every native binary and Microsoft signature. Account ownership, ACLs,
-DefaultShell, private service identity, host cells and cleanup remain independent
-checks. A background failure propagates through the unconditional native wait.
-
-Two full four-lane pairs used frozen source refs and the same dependency and
-native-install policy. The [first baseline](https://github.com/stablyai/orca/actions/runs/36986929163)
-ran before the [first candidate](https://github.com/stablyai/orca/actions/runs/36986970976);
-the [second candidate](https://github.com/stablyai/orca/actions/runs/36991232037)
-was dispatched before the [second baseline](https://github.com/stablyai/orca/actions/runs/36991234729).
-Runner image versions matched within each platform in both pairs.
-
-| Active job, seconds | First baseline | First candidate | Second baseline | Second candidate |
-| ------------------- | -------------: | --------------: | --------------: | ---------------: |
-| ARM inbox           |          2,403 |           1,644 |           2,353 |            1,667 |
-| ARM preview         |          1,002 |             935 |             886 |              872 |
-| x64 inbox           |            636 |             732 |             616 |              620 |
-| x64 preview         |            562 |             561 |             623 |              566 |
-
-The ARM inbox observations improved by 759 and 686 seconds. Baseline dependency
-installation and artifact builds consumed 501 and 498 seconds before capability
-installation could start. Candidate capability installation ran during that
-work, but also took about 261 and 232 seconds less than the baseline. Candidate
-dependency installation was slower, particularly in the second pair. These
-observations support overlap on ARM; they do not establish a guaranteed 11–13
-minute saving, a reduction in queue time, or the cause of installer variability.
-The x64 lane showed no repeatable gain, so it keeps serial preparation.
-
-All 16 actual Windows providers and 48 host-cell verdicts passed across the two
-pairs. Receipts verify native machine identity, private service absence, owned
-process exit, account removal and key removal. Loaded profile disposition remains
-separate from those required cleanup checks. Hosted execution also verified the
-native background/wait syntax; older actionlint versions do not recognize it.
-
-### Overlap the private profile observation budgets
-
-After service deletion and owned process exit, profile cleanup polls each owned
-SID with its own full 30-second monotonic budget. Independent budgets now run
-together. Every deletion follows a fresh targeted read; loaded profiles remain
-for disposable VM destruction. Service identity, PID ownership, process exit,
-account removal and key removal still fail the complete provider on error.
-
-The maintained diagnostics self-test executes the actual cleanup try/catch with
-scoped Windows API and clock controls. Eight positive cases cover full windows,
-late unload, reload, query overhead, mixed states and missing SIDs; ten specific
-failure cases cover foreign profiles and the required cleanup gates. Disposable
-shortened-deadline and stale-snapshot mutations fail those controls. A separate
-mocked real-clock observation took 30.179 seconds for three loaded profiles,
-compared with about 90 seconds for serial full budgets. This measures polling,
-not an actual Windows provider or the entire job.
-
-The third profile no longer gains incidental extra time while earlier profiles
-consume their budgets. A profile unloading at 45 seconds may therefore remain
-where serial cleanup removed it. This uses the existing disposable-VM fallback;
-it does not remove a loaded profile or relax mandatory account/key cleanup.
-Hosted qualification of the combined workflow remains pending.
-
-## Coordinator mail tests: advance observation windows without removing them
-
-Six cases advance their original six 1,500 ms and ten 100 ms observation windows
-with a scoped clock. Real filesystem, SQLite, journal, RPC and runtime work still
-finishes asynchronously. The original journal-read gate and all counter and
-operation assertions remain. Cancellation during delayed startup and the
-Date-only age case retain real timers. Teardown stops the host and closes the
-database before advancing the known 2,000 ms orphan repair, then asserts no fake
-timers remain and restores the clock in `finally`.
-
-Two opposite-order local pairs passed the same 23 cases and unchanged source
-hashes. Selected-case totals fell from 13.674 to 3.318 seconds and from 13.276 to
-6.323 seconds. Whole-file test totals fell from 24.845 to 10.829 seconds and from
-21.500 to 19.410 seconds. Process wall times were 41.488/37.810 seconds and
-42.140/78.450 seconds; the reverse candidate spent 56.31 seconds importing under
-unrelated local load. Local process-wall savings were inconclusive.
-
-The later [hosted x64 and ARM comparison](https://github.com/stablyai/orca/actions/runs/37001891871)
-passed the same 23 cases in `structured-chat-coordinator-mail.test.ts` in both
-orders on each architecture, with frozen case and policy hashes. Median full-file
-wall time was 33.506 → 23.149 seconds on x64 and 33.438 → 22.504 seconds on ARM.
-Median test-body totals were 19.329 → 9.343 and 19.695 → 9.103 seconds, respectively.
-These measurements qualify this file; they do not measure whole-PR time.
-
-Injected extra deliveries at 1,499 ms and 99 ms still fail the original assertions
-in both clock modes. The latter candidate fails the unchanged journal-read gate
-with the same extra provider start. A separate control confirms the orphan repair
-actually executes against the closed database and leaves no fake timers. The
-change retains all 121 original expectation sites and adds one teardown check;
-it does not shorten the runtime's observation interval or claim a whole-PR gain.
-
-## Stub child shutdown clocks: Codex and Claude
-
-[Merged Codex change #24893](https://github.com/stablyai/orca/pull/24893) scopes timeout
-clocks to two synthetic-child cases in `codex-app-server-connection.test.ts`.
-The full platform graceful deadline and 1,000 ms forced wait remain; the test
-waits for the actual stub SIGKILL before advancing the forced window. Streams,
-process-table reads, Date and immediate callbacks remain real. Fault controls
-still detect late exit, missing EPIPE, missing exit proof and unwanted notification.
-
-The [hosted ARM comparison](https://github.com/stablyai/orca/actions/runs/37074124526)
-passed the same 32 full-file cases in baseline/candidate and candidate/baseline
-order. File wall times were 13.671 / 13.674 seconds originally and 1.658 / 1.649
-seconds with scoped clocks. Installer time is excluded; generated caches remain
-across the disclosed order. Real-child coverage and production shutdown code remain.
-
-[Merged Claude change #24897](https://github.com/stablyai/orca/pull/24897) changes only
-two synthetic-child cases in `claude-agent-sdk-exit-proof.test.ts`. Both full
-33-case runs passed, including the unchanged five real-child cases. In one local
-macOS pair, the two bodies took 2,503 / 1,502 ms originally and 1.37 / 0.39 ms with
-scoped clocks. They cross a real immediate callback before advancing the complete
-1,500 ms graceful and 1,000 ms forced windows, restore timers in `finally`, and
-retain the original false exit verdicts. Fault controls detect either deadline
-shortened by one millisecond, an unproved true verdict and a leftover timer.
-[Normal PR CI](https://github.com/stablyai/orca/actions/runs/37075819218) passed;
-these local body measurements do not establish hosted or whole-PR time savings.
-
-## Sequential static analysis and typecheck: retain separate jobs
-
-The earlier recommendation below is superseded by [October 4 shared PR preflight capacity](#october-4-shared-pr-preflight-capacity).
-
-A four-trial hosted screen kept the slim router unchanged and compared the two
-independent ARM jobs with one ARM job running their unchanged checks sequentially.
-The [compiler/planner census](https://github.com/stablyai/orca/actions/runs/37069472888)
-matched all compiler inputs and the full 10,477-file unit inventory in separate,
-shared root-only and shared mixed-install states. The [safety qualification](https://github.com/stablyai/orca/actions/runs/37075043747)
-verified native joins after compiler failure and a real late action-post failure;
-all four guarded downstream sentinels skipped and the audit passed.
-
-| Trial                                                          | Mode     | Active ARM seconds | Router finish to heavy finish, seconds |
-| -------------------------------------------------------------- | -------- | -----------------: | -------------------------------------: |
-| [1](https://github.com/stablyai/orca/actions/runs/37075574191) | Separate |                157 |                                    124 |
-| [2](https://github.com/stablyai/orca/actions/runs/37075887937) | Combined |                134 |                                    150 |
-| [3](https://github.com/stablyai/orca/actions/runs/37076222202) | Combined |                129 |                                    134 |
-| [4](https://github.com/stablyai/orca/actions/runs/37076786281) | Separate |                159 |                                    194 |
-
-Both pairs saved active ARM time: 23 and 30 seconds, or 14.6% and 18.9%, with one
-heavy admission instead of two. The active critical path was 15 and 8 seconds
-longer. Downstream eligibility changed by +26 and −60 seconds; observed ready-to-start
-delay differences of +11 and −68 seconds explain that reversal. Created-to-start
-delay is recorded separately and does not establish a quota or queue cause.
-
-Retain separate jobs for now. This screen shows a capacity saving, with a longer
-active critical path and no repeatable latency gain. All trials used frozen
-`cc73c8e1a72b0e9ee9c29e57458ce307f5f019c2` source, manual workflow dispatches,
-Node 24.21.0 and the same four exact primary cache hits. Main's later
-[Linux PR root-store policy change #24896](https://github.com/stablyai/orca/pull/24896)
-is outside this screen. The trial ran actual heavy checks and proved unit and both
-package eligibility, without launching those downstream matrices or measuring a
-whole-PR speedup.
-
-## Linux headless runtime build overlap
-
-The historical pinned Bun artifact now builds in a native background step while
-current native preparation and Node bundling run in the foreground. An
-unconditional join precedes the unchanged artifact and cross-runtime tests. Bun
-setup stays Linux-only; other platforms register and join a successful no-op.
-The producer publishes step outputs consumed only by those tests. The existing
-selector, native floors, template builders and cache policies remain.
-
-A [hosted alternating comparison](https://github.com/stablyai/orca/actions/runs/37072923774)
-ran four serial/overlap arms on each of two Linux VMs:
-
-| Architecture | Serial preparation, seconds | Overlapped preparation, seconds |
-| ------------ | --------------------------: | ------------------------------: |
-| x64          |             20.831 / 19.576 |                 11.149 / 10.914 |
-| ARM64        |             15.155 / 14.396 |                   8.566 / 8.553 |
-
-Every arm passed the same 961 cases across 92 files: 930 passed and 31 skipped.
-Both cross-runtime persistence cases passed. The two live daemon-handover cases
-kept their existing protocol-version skips. All four x64 arms passed actual Node
-18 loading and pinned-runtime handoff. Installed/source inputs and artifact
-inventories matched; each normal owned-process ledger was clean before cleanup.
-Common native compiler warmup preceded timing and retained its generated Python
-caches in the strict installed ledger. These are preparation savings of 5.8–9.7
-seconds, excluding setup, cold installs, runner start delays and whole-PR time.
-
-Actual [Bun failure](https://github.com/stablyai/orca/actions/runs/37078015921) and
-[Node failure](https://github.com/stablyai/orca/actions/runs/37078021568) controls
-qualified genuine compiler errors with fresh live opposite builders, native joins,
-skipped consumers, restored inputs and verified exits. A [normal cancellation
-control](https://github.com/stablyai/orca/actions/runs/37079655167) received SIGINT
-while the actual Bun builder was freshly live; both builders and the detached
-owned child had simultaneous earlier readiness. All three native joins had terminal dispositions of cancelled, success and
-cancelled, and every consumer skipped. The temporary observer retired its owned processes;
-the collector independently verified their absence and unchanged inputs. This
-proves signal delivery and observer-owned retirement, without establishing
-runner-only descendant cleanup at the join. The unchanged historical builder
-starts finite build/smoke work, and its children retain GitHub's normal orphan
-tracking marker.
-
-Earlier cancellation trials remain excluded from live-build qualification: one
-collector stopped its observer before signal routing, and the corrected trial
-received the signal after both builders finished. The qualifying trial requested
-normal cancellation earlier in the same preparation sequence to account for
-observed delivery delay; no workload, wait or proof predicate was shortened.
-
-## October 3 Terminal Perf dependency preparation
-
-The daily/manual Terminal Perf workflow still installed current dependencies through
-raw lifecycle scripts and a global node-gyp installation. Its historical `ref`
-input also accepts revisions that lack the shared installer, so replacing that
-path unconditionally would break older runs. The current-profile path now uses
-the existing shared installer with explicit Electron preparation and archive
-caching. A guard requires GitHub-hosted Linux x64, Node 24/pnpm 12.8.1, the
-native-only root postinstall and the needed local action inputs/files. Other
-profiles and historical revisions keep their original frozen install.
-
-The [hosted comparison](https://github.com/stablyai/orca/actions/runs/37101695800)
-ran both preparation paths in each of two Linux x64 jobs, reversing their order.
-Legacy/shared preparation took 25.164/16.956 seconds and 27.434/18.032 seconds:
-8.208 and 9.402 seconds saved. Both used Node 24.21.0, pnpm 12.8.1 and Electron
-43.7.5. Both shared native-module cache lookups missed, so this improvement did
-not depend on a warm native build. Electron archive and root pnpm cache lookups
-hit. Dependency trees, pnpm data and Electron archives were reset between paths;
-compiler headers and external services were not. Bootstrap, resets, validation,
-post-job cleanup, queueing and the production guard step are outside those times.
-These are preparation measurements, not whole-workflow or billing savings.
-
-Both paths passed a native-module probe inside the actual Electron executable
-with `ELECTRON_RUN_AS_NODE=1`, and built the same Electron-vite e2e application.
-The candidate's 18 focused routing/fallback tests, workflow actionlint and changed
-code-quality checks passed. Performance tests, budgets and report uploads remain
-unchanged. The [existing October 2 run](https://github.com/stablyai/orca/actions/runs/36985792125)
-failed the same-workspace 50/100-terminal budgets (46.9/50.2 ms against 25 ms).
-This dependency change does not claim to resolve those application regressions.
-
-The [full candidate integration](https://github.com/stablyai/orca/actions/runs/37104625474)
-passed on `df71ad849cd854a232f7063562785563743b641a`: current preparation was
-selected, its native cache missed and rebuilt, the app built and all 32 report
-annotation rows passed the unchanged budget checker. The downloaded report also
-passed the same checker locally. This is integration evidence; it does not
-attribute application latency changes to dependency preparation. Subsequent
-rebases resolved report documentation and incorporated fixture teardown fixes.
-Workflow, installer-action and toolchain content stayed unchanged. Main also
-added an import and a Windows-only MSBuild setting to the native-runtime script:
-the imported helper has no top-level side effects, and the Linux rebuild branch
-is unchanged. Focused tests verify its Linux/macOS no-op behavior. Final-head PR
-checks qualify separately.
-
-## October 4 reusable cells for terminal context scans
-
-Terminal cursor-context scans now request one reusable cell per invocation when
-the adapter offers getNullCell, and pass it through all unchanged text/style
-scans. Adapters without that optional method keep the existing allocating path.
-The scratch cell is local and no cell reference escapes into returned context.
-Browser composer/readiness text, colors, bold flags and wrapping are unchanged.
-
-Three alternating one-worker ARM pairs in
-[37182789677](https://github.com/stablyai/orca/actions/runs/37182789677)
-ran all 19 original cases from readiness census suite 2. Baseline complete
-invocations were 37.141 / 37.879 / 37.090 seconds; candidate invocations were
-33.887 / 33.387 / 32.916 seconds. Median 37.141 to 33.387 seconds saves 10.1%.
-This is a focused workload measurement, not a whole-shard or queue-delay claim.
-
-Separate baseline/candidate captures retained all 192 cases across six census
-suites. Every context and visible projection matched: 643,926 of each, with
-7,465,308,324 complete length-prefixed payload bytes hashed per test/type/order.
-The canonical capture digest was
-`f7440c0f1b5bbb57127cd29245530029415c8e9e243c1744359f330b3c7ace19`.
-These captures run outside the timing samples. All 41 cursor/composer/browser
-consumer checks passed. Seven faults for lost dim filtering, wide continuation,
-bold prompt, custom foreground, wrap preservation, adapter fallback and scratch
-reuse failed their intended assertions. Node and web typecheck, lint and format
-passed. Two added controls prove per-call scratch lifetime and adapter parity.
-
-## October 3 producer follow-up: automatic selection for the measured profile
-
-The first producer rollout in [#24927](https://github.com/stablyai/orca/pull/24927)
-passed all 46 PR checks, all five manual warmers and all 11 manual Headless
-qualifications on `a2c489c0cca5e46d24333a4d40ba910af0de0208`. The same root installer
-also serves recurring unit, browser and performance workflows that had not opted
-in. The follow-up defaults the existing input to `auto`, reusing lookup mode for
-non-PR root-only installs on GitHub-hosted Linux/macOS/Windows x64/ARM64 runners,
-with no job container, the manifest's Node 24/pnpm 12.8.1 profile and no conflicting
-Node override. Explicit `true` and `false` retain their previous meanings. Mixed
-lockfiles, other toolchains, containers and self-hosted runners retain full cache
-restoration; PR policies are unchanged. The manifest check runs only when the
-context is potentially eligible, before setup-node chooses its cache behavior.
-
-A second cleanup audit distinguished nesting depth. The
-[twice-nested control](https://github.com/stablyai/orca/actions/runs/37087090689)
-published the environment-path payload and lost the output-path payload with an
-`Input required and not supplied: path` warning. The
-[direct control](https://github.com/stablyai/orca/actions/runs/37087211236) published
-and restored both payloads. Current Electron archive callers are direct, so they
-need no cache-path change. Keeping the producer's exported path also makes its
-new lookup mode safe for callers that nest the shared installer. These tiny
-controls establish publication behavior, not installer time savings.
-
-The [actual automatic-mode cold publisher control](https://github.com/stablyai/orca/actions/runs/37097980789)
-passed both jobs on `7b8858bdc8f`. A twice-nested wrapper called the installer
-without overriding its default input. The writer selected lookup, missed its
-unique root-lockfile key, completed the frozen policy-checked install and saved
-that key during cleanup. A fresh reader restored the exact key and installed the
-same dependency successfully. The fixture retained the manifest toolchain and
-applicable workspace policies; its one dependency keeps the publication check
-small. Two earlier trials failed fixture assertions (the pnpm multi-document
-header placement, then its empty cache-miss output), and are excluded. This proves
-automatic selection and cold publication, not a new timing result. Local
-verification passed eight suites / 184 tests, the changed-code quality gate and
-compiled-composite actionlint.
-
-## October 4 shared PR preflight capacity
-
-Static analysis and the unchanged compiler now share one ARM runner and guarded
-Node 24 install. Static checks finish and all background work joins before the
-compiler starts; unit planning still overlaps compilation. Each phase keeps its
-classifier output. Successful no-op background bodies register every required
-join when a phase is unselected or an earlier step failed. Unit and package
-consumers depend on physical job success, including action cleanup.
-
-Three counterbalanced pairs in
-[37180613601](https://github.com/stablyai/orca/actions/runs/37180613601)
-used the same frozen checkout `f199a20c3acd`, Node 24.21.0, pnpm 12.8.1,
-policy hashes, native cache hits, warm TypeScript cache and 10,787-file unit plan.
-Both arms used the PR root-only download-store policy. Total active job time was
-152 / 153 / 151 seconds separately and 138 / 133 / 129 combined. Excluding the
-extra measurement-only evidence steps gives 151 / 151 / 149 versus
-136 / 132 / 128 seconds: median 151 to 132, saving 19 seconds (12.6%).
-Two heavy runner admissions become one. This saves capacity; it does not prove a
-whole-PR latency or queue gain. The median active dependency barrier increases
-from 116 to 132 seconds because compilation follows static checks.
-
-The separate physical-failure run
-[37180755694](https://github.com/stablyai/orca/actions/runs/37180755694)
-proved that an included TypeScript error failed the actual compiler, its planner
-still joined, and unit/package admissions skipped. A registered late action post
-failure also blocked both consumers after successful foreground checks and
-published shards. All 12 unselected/prior-failure no-op backgrounds joined, and
-the downstream audit passed. Local workflow contracts passed 239 tests across
-12 suites; lint and formatting passed.
-
-## October 3 retired-cache collection observation
-
-The same owner-collection assertion failed in unit shard 3 of
-[37098089274](https://github.com/stablyai/orca/actions/runs/37098089274/attempts/1)
-and [37100365037](https://github.com/stablyai/orca/actions/runs/37100365037/attempts/1),
-requiring a full shard retry despite the focused suite passing locally. Its
-three-turn collection budget was shorter than the six-turn plus final yield
-pattern already used by the GitLab known-host retirement tests.
-
-The fixture now uses that existing observation budget. All seven tests, their assertions,
-expiry clocks and production code are unchanged. The focused suite passes. A
-local fault control changed only the production timer callback to hold its owner
-strongly: the owner-collection assertion failed, with the other six tests passing.
-The source was restored afterward. Extra collection turns therefore preserve the
-strong-retention oracle. Hosted qualification is still required; these observations
-do not prove a particular VM-retention cause or quantify avoided retries.
-
-## October 4 terminal oracle execution
-
-Three measured test-support changes preserve the original seeds, payloads,
-chunk boundaries and meaningful assertions. Serializer comparisons reuse cells
-and format only the first mismatch instead of allocating descriptors for every
-cell. The terminal parity writer submits every original chunk in FIFO order and
-awaits the final parser callback. The independent legacy frame oracle memoizes
-measured code-point widths. Its discarded algebra-only case never called
-production and still passed when production always threw.
-
-Three alternating one-worker hosted ARM pairs measured complete invocations:
-
-| Cohort                                   | Baseline median | Candidate median | Saving |
-| ---------------------------------------- | --------------- | ---------------- | ------ |
-| Serializer replay/fuzz/descriptor checks | 71.675s         | 46.581s          | 35.0%  |
-| Emulator/reconciliation/color parity     | 24.095s         | 5.411s           | 77.5%  |
-| Frame equivalence                        | 18.472s         | 13.736s          | 25.6%  |
-
-[37180517143](https://github.com/stablyai/orca/actions/runs/37180517143)
-retained 116 timed serializer passes and three existing/paired-control skips.
-Separate captures matched all 190,796,645 raw bytes over 1,611 scenarios and
-8,617 checkpoints (SHA256 `00ab219cfb31456af2ecd5e766d1b82d47abc751f6f2de0d7f795e36a936d3c7`),
-including complete outputs and diagnostic payloads. Twenty candidate controls
-passed; formatting/color/blank/clipping fault controls detected regressions.
-
-[37181073275](https://github.com/stablyai/orca/actions/runs/37181073275)
-retained all 16 parity cases and default fuzz counts. Captures matched 2,325
-batches, 28,182 original chunks and 1,698,285 input bytes, with identical
-terminal state and serialization per terminal/batch. Independent terminal
-completion order differs, so comparison uses canonical per-terminal ordering
-(SHA256 `c38ac1dbbefb9f6dc33ecfe7c495d65b707c1664614544622af93cfc1850e421`).
-All 73 callback/parser/other-consumer controls passed; first-callback, reversed
-chunks, missing empty boundary and early-completion faults failed.
-
-The frame candidate passed all 19 retained cases directly against the original
-uncached legacy oracle, preserving 4,000 short and 800 near-cap seeded trials.
-Sequence, surrogate width, byte width and span-transform faults failed real
-assertions. A part-array alternative was rejected after adding time locally.
-Hosted Node typecheck passed. These are focused workload savings, not measured
-whole-shard or queue-delay improvements; application behavior is unchanged.
-
-## October 3 unit-selection evidence: include failed references
-
-The caller's `needs.test.result == 'success'` condition prevented the advisory
-collector from reading failed unit runs, despite the reviewer's existing support
-for failed tests. A six-run screen from the October 3 occupancy sample found only
-one review artifact; it was a full fallback, so it did not validate selection.
-Missing artifacts cannot establish that selection catches red tests.
-
-The caller now permits both success and failure while excluding cancellation and
-skipped tests. The collector remains advisory and absent from `verify` dependencies.
-Incomplete, interrupted or inconsistent shard records still cannot become complete
-reference evidence. Existing omitted-failure tests preserve that negative control.
-
-The five artifacts from failed [run 37098089274, attempt 1](https://github.com/stablyai/orca/actions/runs/37098089274/attempts/1)
-were reviewed locally using the unchanged script. It recognized a complete failed
-reference covering 10,606 files and 9,270,307 worker-ms. Its candidate was the full
-fallback, so `selectionEvaluated` remained false and no selection promotion is
-justified by this control. Focused workflow/reviewer checks passed 24 tests,
-including actual caller-expression outcomes for success, failure, skipped and
-cancelled states. This repair supplies needed evidence for a later optimization;
-it claims no runner-time savings and does not enable selected tests.
-
-The updated caller also passed the hosted red-run control in
-[37100365037](https://github.com/stablyai/orca/actions/runs/37100365037).
-The collector succeeded after one unit shard failed, while required verification
-remained red. Its review recognized all five shards as a complete reference
-(10,608 files, 8,965,977 worker-ms). This was again a full fallback with
-`selectionEvaluated: false`, not evidence for enabling selected tests.
-
-## October 4 runtime imports and recovery fixtures
-
-Three helper-only tests now import the existing terminal modules directly rather
-than initializing the runtime service. Ten copied-loop cases never exercised
-runtime memoization: they passed with its cache, timestamp update or prune
-invalidation disabled. Two actual helper checks remain. The existing runtime
-prune suite now exercises real leaf cache reuse, split prompt timestamps,
-ordinary output, fresh prompts and detection after retained-history eviction.
-Each of those three production faults fails a real runtime assertion.
-
-Recovery tests now seed three exact fixture variants once, after the seed child
-has closed. Each crash still receives an independent byte-for-byte copy of the
-entire database/WAL family and remapped paths. Buffer.equals retains exact byte
-comparison without recursive matcher overhead. All 46 original crash boundaries
-and retries remain. Four additional copy-isolation/WAL checks run, and teardown
-requires that all seed bytes remain unchanged after the full suite.
-
-Three alternating one-worker hosted ARM pairs in
-[37182181976](https://github.com/stablyai/orca/actions/runs/37182181976)
-measured these complete invocations:
-
-| Cohort                            | Baseline seconds         | Candidate seconds        | Median saving |
-| --------------------------------- | ------------------------ | ------------------------ | ------------- |
-| Three imports only, same 15 tests | 19.257 / 19.167 / 19.363 | 1.769 / 1.768 / 1.768    | 90.8%         |
-| Final four-file runtime cohort    | 22.312 / 22.122 / 21.969 | 13.494 / 13.793 / 13.601 | 38.5%         |
-| Recovery crash boundaries         | 24.082 / 24.075 / 24.814 | 8.061 / 8.105 / 9.074    | 66.3%         |
-
-The final runtime cohort has seven real cases versus 16 including the copied
-loops; its new runtime case is included in candidate timing. Recovery has 50
-passes versus the original 46. Hosted Node typecheck passed. Recovery faults for
-last-byte database/WAL corruption, shared database paths, missing WAL copies and
-accepted/unaccepted seed collision failed the intended assertions. These are
-focused workload savings, not measured whole-shard or queue-delay gains.
-
-An independent local cache screen left both caches disabled. Across 14 unchanged
-files and 92 cases, a warm Vitest transform cache reduced median invocation time
-3.090 to 1.948 seconds, excluding archive costs; its cold arm increased time to
-3.281 seconds. Node compilation caching showed no gain. Controls reproduced stale
-transforms after TypeScript configuration or plugin-option changes, so persisted
-reuse requires a complete transform-input stamp and hosted net-cost evidence.
-A separate 130,000-pane leaf-collection optimization was restored: its complete
-migration-file timing stayed within noise. The regression fixture remains.
-
-## October 3 removal fixture cleanup ordering
-
-[37105566358](https://github.com/stablyai/orca/actions/runs/37105566358)
-failed unit shard 4 with `ENOTEMPTY` removing the failed-removal fixture's temporary
-directory; the other four shards passed. A client's removal reply intentionally
-precedes the detached job's final record persistence. This fixture reset tracking
-and removed the directory before waiting for that persistence, allowing a writer
-to race cleanup. Its teardown now awaits the existing settlement helper before
-resetting tracking or deleting the fixture. Production removal behavior and all
-assertions are unchanged.
-
-All 1,348 runtime tests passed (one existing skip). A temporary controlled queue
-held the final record write after the client replied: waiting before reset stayed
-pending and passed; resetting before waiting lost the tracked job and failed the
-same ordering assertion. The gate was released, both controls drained the captured
-job, and the instrumentation was removed. Changed-code quality passed. This proves
-the teardown ordering mechanism, not a measured avoided-retry saving. Final-head
-hosted qualification remains required.
-
-## October 4 store oracle and retention fixtures
-
-The randomized in-place-store test validated the copying oracle twice after
-accepted mutations and compared snapshots through the same production parser.
-Its 5,000-step retention fixture generated enough tombstones to hit the count
-limit, but never reached the 4,096-revision age boundary.
-
-The test retains all four seeds and 1,500 mutations per seed, removes the duplicate
-validation, and projects snapshots directly from the copying oracle's validated
-maps. Separate fixtures now check the revision before, at and after expiry and
-count overflow. Production code is unchanged.
-
-Three alternating one-worker pairs on `ubuntu-24.04-arm` in
-[37180517143](https://github.com/stablyai/orca/actions/runs/37180517143)
-measured baseline invocation times 33.551 / 33.304 / 33.529 seconds and candidate
-13.848 / 13.816 / 13.875 seconds: median 33.529 to 13.848 seconds, saving 19.681
-seconds (58.7%). Baseline passed seven tests; candidate passed eight. This is a
-focused test saving, not a measured whole-shard or queue-delay change.
-
-Hosted Node typecheck passed. Separate fault controls failed the intended
-assertion for early, late and disabled age expiry, disabled count compaction,
-and a snapshot that drops child descriptions. The description fault passes with
-the original parser-sharing oracle and fails with the independent projection.
-
-## October 4 Git contention and remaining readiness waits
-
-The full Git admission benchmark compared a disabled arm with no correctness
-assertions to an enabled arm with structural ledger checks. Its default CI test
-now saturates the real base and headroom budgets with FIFO-gated child processes,
-queues older background and newer interactive work, releases base slots, and
-requires interactive priority, matching outputs and complete permit release.
-The full original diagnostic remains opt-in through
-`ORCA_GIT_ADMISSION_STORM_MEASUREMENT=1`; both opt-in tests passed locally.
-The existing Windows real-Git parity tests remain unchanged; this fixture retains
-its existing POSIX platform scope.
-
-Two remaining Antigravity transcript tests used real 5,000ms refusal windows.
-They now use the existing scoped `waitForTranscriptIdle` timer harness after the
-emulator drains. All 60 tests, original captured transcripts, deadlines and
-readiness assertions remain.
-
-Three alternating one-worker hosted ARM pairs in
-[37180614492](https://github.com/stablyai/orca/actions/runs/37180614492)
-measured these complete focused invocations:
-
-| Suite                 | Baseline seconds         | Candidate seconds        | Median saving   |
-| --------------------- | ------------------------ | ------------------------ | --------------- |
-| Git admission storm   | 26.619 / 26.635 / 26.582 | 1.017 / 1.018 / 1.016    | 25.602s (96.2%) |
-| Antigravity readiness | 27.347 / 27.910 / 27.550 | 13.855 / 13.894 / 13.800 | 13.695s (49.7%) |
-
-Each candidate passed its original meaningful checks. Hosted Node typecheck
-passed. Separate scheduler faults for bypassed admission, withheld release and
-FIFO-only priority failed the queued-contention or interactive-start assertion.
-Two additional local transcript faults failed the original picker-rejection and
-repaint-readiness assertions. These are focused suite savings; whole-shard time
-and queue delay were not measured by this experiment.
-
-## October 4 aggregate unit-test comparison
-
-A [counterbalanced hosted comparison](https://github.com/stablyai/orca/actions/runs/37197643399)
-measured 128.605 seconds less summed test-process time (4.36%) and a 37.694-second
-reduction in the slowest shard (5.98%). It compares the accepted optimizations
-with their original file snapshots on the same source, five fixed shard
-assignments, Node 24, Ubuntu ARM and four workers per process. This is one paired
-trial, not a population estimate or a measurement of PR queue delay.
-
-| Test process                  | Original snapshots | Accepted optimizations |
-| ----------------------------- | ------------------ | ---------------------- |
-| Shard 1                       | 574.221s           | 533.116s               |
-| Shard 2                       | 572.553s           | 569.593s               |
-| Shard 3                       | 630.629s           | 592.935s               |
-| Shard 4                       | 565.412s           | 546.759s               |
-| Shard 5                       | 609.410s           | 581.218s               |
-| Sum: runner time during tests | 2952.225s          | 2823.621s              |
-| Maximum: test critical path   | 630.629s           | 592.935s               |
-
-Both arms cover exactly 10,838 timed modules on source `9574c8adb253` and tree
-`4d5487e8b827`. One added eight-case batching qualification passes in a separate
-0.770-second invocation outside the table, completing the 10,839-module ordinary
-census. The complete timed case and outcome
-comparison accounts for eight approved coverage changes: 105,231 original cases
-versus 105,242 candidate cases. Removed copied simulations and an algebra-only
-case are accompanied by real runtime, retention, recovery and reusable-cell
-regressions. No unexpected case or outcome difference is accepted.
-
-Each arm starts with distinct empty transform and result caches; Node compilation
-caching is disabled. Cold-cache execution ordering remains Vitest's default and
-can change with source size. Source snapshots, assignments, raw reports and case outcomes
-are checked. Only three case-title fields containing random temporary paths or
-a UUID use stable identities, bound to the exact two test-source hashes; raw
-titles remain in the artifacts.
-
-The five dependency setups total 84.284 seconds and are shared by both arms.
-The actual paired jobs consumed 5,969 seconds and spanned 2,031 seconds from the
-first start to the last completion. Those job figures include both treatments,
-setup, uploads and staggered starts; they cannot be assigned to either arm or
-used as a workflow saving. The table measures test-process wall time, not CPU
-time or the complete CI workflow. Focused-suite percentages elsewhere in this
-report are separate measurements and must not be summed into these results.
-
-The [earlier aggregate trial](https://github.com/stablyai/orca/actions/runs/37193799646)
-is rejected because a real test failed; its timings do not qualify a gain. Two
-local invocations sharing one XDG directory reproduced the Muse refresher failure.
-The fixture now isolates and restores that setting in both arms. The historical
-serializer case ledger was also independently corrected from the original source
-before this fresh trial; its seven original cases and twenty candidate cases are
-an explicit coverage change rather than an assumed equal census.
-
-## October 4 shard-weight holdouts
-
-Fresh shard weights were generated with the production importer from a complete
-successful run of the accepted source. Two subsequent hosted holdouts used those
-same weights and assignments without retraining. The
-[first pair](https://github.com/stablyai/orca/actions/runs/37199891967) alternated
-existing and fresh assignments across the five jobs; the
-[second pair](https://github.com/stablyai/orca/actions/runs/37201939057) reversed
-each job's treatment order.
-
-| Test-process measurement | First: existing | First: fresh | Reversed: existing | Reversed: fresh |
-| ------------------------ | --------------- | ------------ | ------------------ | --------------- |
-| Sum across five shards   | 2813.595s       | 2776.421s    | 2924.689s          | 2878.481s       |
-| Maximum shard wall       | 578.735s        | 584.709s     | 603.995s           | 614.408s        |
-
-Fresh weights reduced summed test-process time by 1.32% and 1.58%, but increased
-the slowest shard's time by 1.03% and 1.72%. The small capacity saving comes with
-a repeated critical-path regression, so the existing weights remain. The 3.01%
-improvement projected from training module durations is not a measured speed
-gain.
-
-Every arm covers the same 10,839 modules and 105,250 case outcomes on source
-`9574c8adb253`, tree `4d5487e8b827`, Node 24.21.0, Ubuntu ARM and four workers.
-Both trials use cold caches and the same training data, weights, plans and case
-identity rules. Complete raw reports, assignments, hashes and opposite treatment
-orders are checked before combining the results. Two pairs supply no statistical
-confidence or account-wide queue measurement. The second run's jobs started 119
-seconds apart; that stagger and the paired jobs' setup and upload costs are
-separate from the treatment timings above.
-
-## October 4 remaining unit-test opportunities
-
-The audit retained real child-process, PTY, SSH and crash-boundary tests. It
-removed copied simulations or algebra-only cases after fault controls showed
-that they could pass with production behavior broken. The retained or replacement
-tests exercise production behavior directly. The focused timings in this report
-use the final qualified checks. They must not be added together to estimate a
-whole-workflow saving.
-
-Several further changes did not justify promotion:
-
-- A synchronous readiness-clock screen retained all 49 shard cases and their
-  outcomes, but complete invocation time changed only from 34.210 to 33.518
-  seconds in one local pair. That 2% result was too small to ship without a
-  stronger result; the original implementation remains.
-- A larger local transform-cache screen reduced warm test execution. Separately
-  measured medians for warm tests (17.251 seconds), extraction (3.539 seconds) and
-  archive creation (3.092 seconds) sum to 23.882 seconds, versus 23.473 seconds
-  with caching disabled. This component estimate excludes transfer costs; it is not an
-  end-to-end measurement. Unkeyed plugin options, inherited configuration and
-  import priority also produced stale reuse. Persisted test transforms remain
-  disabled.
-- Two successful full-run shadow references identified about 1.9% of
-  recorded worker time as omittable. That is advisory worker time, not measured
-  runner occupancy. It does not supply the failed-reference evidence or a
-  complete selected-run comparison needed to enable test selection.
-- Six sampled failed PR runs contained no failed unit job that could trigger
-  unit-matrix fail-fast. Successful unit siblings of failures in other jobs
-  cannot be counted as savings from that policy. The sample is too small to
-  establish a population-wide rate, and the policy remains unchanged.
-
-These screens reject the examined changes; they do not establish that every
-future optimization is exhausted. Shorter admitted jobs and one shared preflight
-reduce demand on the existing runner allowance. They do not increase that
-allowance or prove lower queue delay under different account traffic.
-
-## October 5 remaining import, diagnostic and checkout work
-
-The [hosted comparison](https://github.com/stablyai/orca/actions/runs/37247027814)
-used three alternating pairs per treatment at source
-`b18b174cd463f852051dc22adc8478b82dee4d1f`. Focused tests ran as fresh one-worker
-processes on the four-core, 16 GB Linux ARM runner with Node 24.21.0, pnpm 12.8.1
-and Vitest 4.1.11; persisted transforms and Node compile caches were disabled.
-
-| Work                                              | Original median | Candidate median | Median paired saving |
-| ------------------------------------------------- | --------------- | ---------------- | -------------------- |
-| Real incumbent-process test file                  | 16.478s         | 5.976s           | 10.520s              |
-| Commentable-line lifecycle test file              | 9.595s          | 6.880s           | 2.714s               |
-| Agent-status diagnostic plus semantic test cohort | 11.547s         | 8.235s           | 3.361s               |
-| Windows x64 SSH checkout                          | 22.052s         | 16.884s          | 5.020s               |
-| Windows ARM SSH checkout                          | 46.758s         | 33.910s          | 13.456s              |
-
-The incumbent cases own distinct sockets, shim directories and process groups.
-Running them concurrently preserves all nine outcomes and every real five-second
-lsof deadline. Both original and candidate still reject an unreaped helper and
-false claims of clean enumeration. Fault receipts prove the actual modified probe
-was imported and all owned helpers, groups, sockets and directories were cleaned.
-The Windows platform gate retains all nine skips.
-
-The renderer lifecycle tests keep their six original bodies and real decorator,
-zone and model behavior. Only the unrelated saved-note delivery menu is replaced
-by a typed throwing facade. Its cleanup assertion rejects unexpected use. Actual
-faults in memoization, value-equal refreshes and model replacement still fail their
-original assertions; a real menu call fails the facade and the cleanup guard.
-
-The agent-status benchmark reports counters and timings but asserts only a
-nonempty status map and positive elapsed time. It remains available through
-`ORCA_BACKGROUND_LAUNCH=1 pnpm exec vitest run --config config/vitest.agent-status-benchmark.config.ts`.
-Ordinary discovery removes exactly that reporting test. Its 15 meaningful routing,
-index-retention and batch cases remain unchanged. Three real production faults
-pass the old reporting test and fail those retained contracts. Manual execution
-preserves its JSON schema and all nine deterministic counters at 423 worktrees,
-634 tabs and 1,000 events.
-
-Windows SSH hosts retain complete main, shared, relay, type, configuration,
-native, resource and test trees, plus root files. Six actual checkouts per
-architecture pinned candidate source `ce69b84d675b0a8b4763b03329c9d6549ac723f1`;
-all 16,568 retained files match the full checkout's contents, modes and index.
-The original 5,209 required inputs and six further inputs added by the source
-rebase are present. Local full/sparse builds match 54 generated artifacts;
-explicit test discovery is identical. Missing imported source, a named test or a
-required descriptor still fails. Full Windows native/provisioning lanes remain
-a separate qualification gate.
-
-Test timings exclude dependency setup, checkout and queues. Checkout timings
-include the action and shell/runner observation boundaries but exclude later
-builds and provisioning. These scoped savings must not be summed or treated as
-measured changes to full-shard occupancy or PR latency.
-
-## October 5 mobile typecheck overlap
-
-The [hosted comparison](https://github.com/stablyai/orca/actions/runs/37249591578)
-ran three alternating pairs on the four-core, 16 GB Linux ARM runner, with Node
-24.21.0 and TypeScript 6.0.3. The production compiler and test-typecheck ratchet
-use installed tools after dependency installation. Both resolved compiler
-programs have `noEmit: true`, with no incremental, composite or build-info writes.
-The change moves the existing unconditional production join after the foreground
-ratchet and before tests; it changes no compiler command or failure policy.
-
-| Complete typecheck stage | Original serial | Overlapped |
-| ------------------------ | --------------- | ---------- |
-| Pair 1                   | 68.284s         | 41.582s    |
-| Pair 2, reversed order   | 65.385s         | 41.042s    |
-| Pair 3                   | 64.240s         | 40.418s    |
-| Median                   | 65.385s         | 41.042s    |
-
-The median paired saving is 24.343 seconds, or 37.2% of this stage. The stage
-bracket includes native background/wait boundaries and observation overhead,
-but excludes dependency installation and the later test suite. All six stages
-preserve the three workers' compiler/ratchet verdicts and stdout/stderr hashes.
-The test compiler's existing diagnostics remain subject to the unchanged
-ratchet. Neither compiler attempted native loading or recorded filesystem
-mutations. Maximum aggregate owned-process RSS sampled every 200 milliseconds
-was 5.137 GiB; this is a sampled value rather than a kernel peak. The ratchet now
-runs even when the concurrently running production compiler later fails.
-
-Two real, independent type faults still prevent tests from starting. The
-production fault preserves the unaffected ratchet and child output; the test
-fault preserves the production output and fails the ratchet. Their explicit
-control receipts pass even though their intentionally failing jobs are allowed
-to finish collecting evidence.
-
-The separate [external cancellation control](https://github.com/stablyai/orca/actions/runs/37251289372)
-held the two real installed compiler entrypoints before checking, while retaining
-the production-background/ratchet-foreground topology. All three owned workers
-were observed alive 14.275 seconds before the cancellation request. Both native
-step outcomes became cancelled, tests did not start, and the runner's final
-cleanup log names all three exact worker PIDs. The attempted earlier assertion
-of PID absence failed: GitHub performs orphan cleanup after the always-tail
-observer and artifact upload. Post-cleanup absence was not observed and is not
-claimed. This control supplies no compiler-completion or timing measurement.
-
-## October 5 explicit RPC registry test setup
-
-The [hosted comparison](https://github.com/stablyai/orca/actions/runs/37251277897)
-ran three alternating pairs of the complete 156-file mixed cohort on source
-`d1e08ddd666e3099fc51c79f01f0305f5162186d`, using four workers on the four-core
-Linux ARM runner, Node 24.21.0, pnpm 12.8.1 and Vitest 4.1.11. Persisted module
-transforms and Node compile caches were disabled. All 153 candidate test files
-pass explicit method lists to their dispatchers. A shared throwing fixture
-prevents those tests from loading the unused default method catalog and rejects
-any accidental iteration of it. The three real catalog subjects remain
-unchanged and run beside the candidate subjects in every arm.
-
-| Complete cohort process | Original | Candidate | Paired saving |
-| ----------------------- | -------- | --------- | ------------- |
-| Pair 1                  | 142.184s | 89.238s   | 52.946s       |
-| Pair 2, reversed order  | 142.833s | 88.933s   | 53.900s       |
-| Pair 3                  | 141.274s | 90.186s   | 51.088s       |
-| Median                  | 142.184s | 89.238s   | 52.946s       |
-
-The median paired saving is 37.2% of this fixed cohort. All six arms preserve
-the complete ordered ledger, including duplicate parameterized case names:
-1,469 passes and one existing setup-dependent skip, totaling 1,470 outcomes.
-The real catalog subjects contribute 63 of those cases. Candidate bodies and
-assertions are unchanged. One file at its line limit uses the dispatch method's
-parameter type in place of its equivalent type-only import; its emitted code
-matches the measured candidate.
-
-Seventeen control invocations preserve actual terminal-handler fault detection,
-reject unexpected default-catalog consumption, and still detect a missing real
-catalog registration. A plain consumption counter prevents global mock-history
-resets from erasing the guard; actual `clearAllMocks` and `resetAllMocks` controls
-demonstrate that distinction and preserve unrelated call history. The isolated
-driver restores all source files after success, faults and a real cancellation.
-Independent review also confirms all 153 candidate sources, the fixture, three
-catalog subjects and declared qualification inputs survive the rebase unchanged.
-
-These are fresh-process wall times for this cohort, excluding dependency setup,
-queues and other test shards. They do not measure full-shard balance, total PR
-runner demand, or a change to the dashboard's PR runtime percentiles.
-
-## October 5 fused terminal cursor row scans
-
-Readiness checks repeatedly read terminal rows to recognize composer text.
-The shared reader now collects undimmed text and the first visible glyph's style
-in one pass. The cursor suffix remains a separate scan; dim glyph attributes,
-empty cells, wide characters and wrapped spaces keep their existing behavior.
-No grid data is retained between calls.
-
-The [hosted comparison](https://github.com/stablyai/orca/actions/runs/37263358478)
-used source `1bec53ceb23b5f296a38ffa0e085778d32fc7849`, Linux ARM,
-Node 24.21.0, pnpm 12.8.1 and one worker. All six fresh processes ran the same
-49-case readiness census module, with separate empty Vite caches, filesystem
-transform caching disabled and Node compile caching disabled.
-
-| Complete focused process | Original | Candidate | Paired saving |
-| ------------------------ | -------- | --------- | ------------- |
-| Pair 1                   | 66.412s  | 60.464s   | 5.948s        |
-| Pair 2, reversed order   | 66.880s  | 61.061s   | 5.819s        |
-| Pair 3                   | 68.056s  | 65.821s   | 2.234s        |
-
-The median paired saving is 5.819 seconds, or 8.7% of this fixed workload.
-All 294 timed case outcomes passed. Separate qualification preserves complete
-context/composer outputs on 98 recordings and the logical cursor/projection
-outputs of all 192 Runtime census cases. Nine actual scanner faults fail the
-intended assertions; the 89-case IME/composer slice also passes. Blank-row tests
-bound cell reads to 72 instead of the original 132 for a 12-column, five-row grid,
-with and without a reusable cell adapter.
-
-The raw timer-driven polling trace differed and was excluded from equivalence
-evidence. Logical per-frame output captures match; no raw polling-count equality
-is claimed. These measurements exclude setup, queues and other modules and do
-not establish a change in full-shard balance, PR percentiles or runner demand.
-
-## October 5 Qoder test import guards
-
-The direct Qoder Runtime tests now import the existing unused-default-RPC guard
-before their Runtime fixture. Their complete test bodies remain unchanged.
-The guard rejects an unexpected registry access instead of loading the full
-default-method graph. The three real registry catalogs remain unmocked.
-
-The [hosted comparison](https://github.com/stablyai/orca/actions/runs/37266875139)
-used fixed source `1bec53ceb23b5f296a38ffa0e085778d32fc7849`, Linux ARM,
-Node 24.21.0, pnpm 12.8.1 and four isolated fork workers. Every fresh process ran
-both Qoder files and all three catalogs: 85 cases across five files. Each invocation
-used a distinct empty Vite cache, with results, filesystem transform and Node
-compile caching disabled. All 510 timed outcomes passed.
-
-| Complete five-file process | Original | Candidate | Paired saving |
-| -------------------------- | -------- | --------- | ------------- |
-| Pair 1                     | 17.677s  | 16.323s   | 1.354s        |
-| Pair 2, reversed order     | 16.827s  | 16.021s   | 0.806s        |
-| Pair 3                     | 17.324s  | 16.211s   | 1.113s        |
-
-The median paired saving is 1.113 seconds, or 6.4% of this fixed workload.
-Separate actual faults in retained launch recipes, Qoder command selection and
-method registration fail the same intended assertions before and after the
-imports. Generated launch IDs and shifted stack lines differ in the raw failure
-messages; they were preserved and are not claimed byte-identical.
-
-The single hosted trial occupied 134 runner-seconds including all six samples,
-shared setup and upload. That is trial cost, not a production saving. These
-focused process measurements do not establish full-shard savings, PR runtime
-percentiles, queue relief or a change in the organization's runner allowance.
-
-## October 5 localization gate work
-
-The localization coverage audit now classifies only AST nodes that can emit string
-parts, and reuses the class-property exclusion set. It still visits every child and
-handles JSX text separately. The extraction scope skips only source extensions and
-test paths explicitly excluded by the real extractor configuration. Catalogs,
-assets, unknown extensions, configuration changes and mixed production changes
-still select extraction; both sides of a rename remain covered.
-
-The [hosted comparison](https://github.com/stablyai/orca/actions/runs/37360932616)
-used fixed source `761d63a4e52ff7915d4432c004df13182db63010`, Linux ARM,
-Node 24.21.0 and pnpm 12.8.1. Dependency setup was shared outside the samples.
-Each timed check was a fresh process with Node compile caching disabled.
-
-| Complete coverage audit | Original | Candidate | Paired saving |
-| ----------------------- | -------- | --------- | ------------- |
-| Pair 1                  | 9.182s   | 4.924s    | 4.258s        |
-| Pair 2, reversed order  | 9.133s   | 4.924s    | 4.209s        |
-| Pair 3                  | 8.930s   | 4.924s    | 4.007s        |
-
-The median paired saving is 4.209 seconds, or
-46.1% of this audit. All three pairs improved; the original range was
-0.252 seconds. Complete JSON finding inventories match byte-for-byte,
-including all 13 findings and their source locations. All 53 candidate tests pass.
-Four real audit mutations fail their intended assertions. An ignored test fixture
-passes the real extraction gate; renaming it into production source selects the
-gate and fails on the deliberately missing translation key.
-
-For an existing ignored test path, three conditional comparisons avoid a median
-27.628 seconds of extraction work. Original arms really run the full gate
-and pass; candidate extraction arms are explicitly `not_selected`. The routing
-tests pin the actual extractor inputs and exclusions, so configuration drift fails
-the tests. This saving applies only when every changed source path is ignored.
-
-Relay integration also omits desktop native preparation and the Electron archive
-cache. Its existing two files use Node's SQLite, HTTP and WebSocket paths; general
-unit shards retain their desktop setup. The existing 16 relay cases pass locally
-on Node 24.20.0 and 26.7.0. Removed setup work is not a measured timing saving.
-
-These comparisons exclude queues and other checks. Extraction already overlaps
-other preflight work, so conditional avoidance does not translate directly into
-preflight wall time. No change to full-PR percentiles or the concurrency allowance
-is established.
diff --git a/docs/reference/cline-and-prime-agent-readiness-evidence.md b/docs/reference/cline-and-prime-agent-readiness-evidence.md
deleted file mode 100644
index 6509c185f7b0..000000000000
--- a/docs/reference/cline-and-prime-agent-readiness-evidence.md
+++ /dev/null
@@ -1,85 +0,0 @@
-# Cline and Prime Agent readiness: what the transcripts show
-
-Both agents paint their composer with cursor addressing on the alternate screen, so the line-folded
-text tail cannot see it (#23268, #22153). Their readiness is read off the live screen by the
-`composer_ready` rules in `src/main/runtime/agent-state-rules/cline.json` and `prime-agent.json`,
-through the same tiering as
-Antigravity ([`antigravity-readiness-evidence.md`](./antigravity-readiness-evidence.md)): a pane
-with an output clock is believed only once quiet, and when a trustworthy screen exists it decides,
-so the quiet-process lane cannot settle a dialog it cannot see. Without a readable screen (a
-re-attached pane whose grid is untrusted) both keep the quiet-process lane they had before; no
-rest-signal entry closes it. Recordings follow
-[`agent-pty-transcript-capture.md`](./agent-pty-transcript-capture.md) and are replayed by
-`cline-screen-readiness-transcripts.test.ts` and `prime-agent-screen-readiness-transcripts.test.ts`.
-
-## Cline
-
-Recorded 2026-09-30 on macOS, `cline` 3.0.66, OpenRouter's free router, with an isolated
-`--config`/`--data-dir`. `cline-3-0-65-win32-startup.txt` is a Windows capture from PR #23269.
-
-| Fixture (`cline-3-0-66-*.txt`) | Screen at the end                                   | Rule        |
-| ------------------------------ | --------------------------------------------------- | ----------- |
-| `ready`, `ready-80x24`         | startup composer, `❯ What can I do for you?`        | ready       |
-| `ready-plan`                   | Plan mode, `❯ Plan something...`                    | ready       |
-| `turn-ended`                   | after a turn, `❯ Ask anything...`                   | ready       |
-| `promo`                        | "Introducing Cline Desktop" drawn over the composer | not ready   |
-| `permission`                   | `Approve tool call?` with `[y] Approve [n] Deny`    | not ready   |
-| `slash-menu`                   | `❯ /` with the command list under it                | not ready   |
-| `draft`                        | unsent text in the composer                         | not ready   |
-| `busy-streaming`               | a reply streaming, spinner scrolled off the top     | reads ready |
-
-- **The streaming screen is the idle screen.** Once a long reply scrolls its spinner row away, the
-  grid is the same composer box as at rest. Only quiescence separates them. A clockless restored
-  pane still settles from the screen, like Antigravity and Prime: `onPtyData` stamps
-  `lastOutputAt` on every chunk, so a streaming pane has a clock from its first byte after attach,
-  and only a pane that has printed nothing since attach is judged on the screen alone. A reply that
-  stalls for 3s with its spinner off screen would read ready; that is not captured and not ruled
-  out.
-- **The placeholder is not fixed.** It changes with mode and history, so the rule accepts the three
-  captured placeholders and nothing else. A typed draft looks the same to the read projection, which
-  is why screen-ruled agents read raw rows (`readScreenRuledLines`, which also requires the PTY's
-  own grid). Every other agent keeps `readLiveTerminalScreenLines` exactly as before: replaying all
-  93 other fixture/grid pairs frame by frame gives identical verdicts on this branch and its base.
-- **The promo popup appears about 40ms after the composer** and returns on each launch until it
-  is dismissed once (`cli-notices.json`). The quiet lane covers that race; the popup carries no
-  blocked wording.
-- **The approval prompt is quiet and unworded.** No blocked rule matches it, so before the screen
-  decided, the quiet-process lane would have settled it. That lane stays open only while the pane
-  has no readable screen.
-- **Windows:** the reported bug (#23268) is Windows, where the text tail reorders rows. Only the
-  3.0.65 contributor capture covers it, and it reads ready from the screen. The rule depends on
-  rendered rows, not byte order, but no Windows turn or dialog is recorded.
-
-## Prime Agent
-
-Recorded 2026-09-30 on macOS, `prime-agent` 0.9.8, OpenRouter
-`inclusionai/ling-3.0-flash-sante:free`, with an isolated `HOME` (the first-launch question only
-reappears in a fresh one). `prime-agent-0-9-5-*.txt` are 120x35 captures from PR #22154.
-
-| Fixture (`prime-agent-0-9-8-*.txt`) | Screen at the end                              | Rule      |
-| ----------------------------------- | ---------------------------------------------- | --------- |
-| `ready`, `ready-80x24`              | bare `>` over the `← manage` footer            | ready     |
-| `ready-after-question`              | trace question answered "Not now"              | ready     |
-| `turn-ended`, `tool-turn`           | a turn (one with a Python tool call) has ended | ready     |
-| `trace-question`                    | animated "Share agent traces" question         | not ready |
-| `slash-menu`                        | `>  /` with the command list                   | not ready |
-| `busy-streaming`                    | `⠦ Writing · 6s` status row above the composer | not ready |
-| `draft`                             | unsent text in the composer                    | not ready |
-
-- **The footer and caret stay up mid-turn.** Only the braille status row Prime keeps directly above
-  them says a turn is running, so the rule vetoes on it.
-- **The rule reads ready for moments it should not.** Replayed in 64-byte chunks, Prime erases that
-  status row before redrawing it, and on first launch it paints the idle composer a few tens of
-  milliseconds before the trace question covers it. Both are covered by quiescence: the spinner and the question's
-  animation repaint continuously, and an idle Prime is silent.
-- **No permission prompt exists to capture.** With default settings Prime ran the tool call without
-  asking.
-- **Why the Prime captures are large.** Prime does no cell diffing. Each synchronized frame
-  (`ESC[?2026h`…`ESC[?2026l`) erases and rewrites every row it touches, so a streaming turn costs
-  about 4 KB per spinner tick or token (337 frames, 8,593 `ESC[2K` in 1.45 MB). The first-launch
-  welcome animates a full-screen dotted background with a colour code per glyph, about 10 KB a
-  frame at roughly ten frames a second. `busy-streaming` and `trace-question` are truncated to the
-  first frame that shows the screen their tests need (see each `.meta.json`).
-  `ready-after-question` cannot be: the animation precedes the answer, and truncation only drops
-  the end.
-- 0.9.4's `← agents/resume` layout is not supported; the rule needs 0.9.5 or later.
diff --git a/docs/reference/codebuddy-harness.md b/docs/reference/codebuddy-harness.md
deleted file mode 100644
index e59eaec855ed..000000000000
--- a/docs/reference/codebuddy-harness.md
+++ /dev/null
@@ -1,44 +0,0 @@
-# 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/deepseek-build-observation.md b/docs/reference/deepseek-build-observation.md
deleted file mode 100644
index 50686cf308d6..000000000000
--- a/docs/reference/deepseek-build-observation.md
+++ /dev/null
@@ -1,28 +0,0 @@
-# DeepSeek Build terminal identity
-
-DeepSeek Build is the third-party [`innocarpe/deepseek-build`](https://github.com/innocarpe/deepseek-build) product, published as `@innocarpe/deepseek-build`. It is distinct from official DeepSeek Harness (`@deepseek-ai/dsh`), Reasonix, DSH Console and generic DeepSeek TUI wrappers.
-
-Orca recognizes manually started Build terminals through its existing process and title observations. `TerminalAgent` includes `dsb`; the launchable `TuiAgent` registry does not. No Build launcher, hook, readiness profile, resume command or history reader is registered. Existing generic terminal input remains available.
-
-The source and actual macOS release were checked at **v6.9.0**, source commit `74df67a56988e9a32845c4565cc62b021ea68c7d`. The darwin-arm64 release tarball SHA-256 is `a57f225a537fc5c027ac4592e3f37f7bdc28cc2d6e27a366934511ea565cb874`.
-
-- `package.json` publishes `dsb.js` and `deepseek-build.js` npm shims; the native child is `deepseek-build-agent`.
-- `crates/dsb-cli/src/main.rs` separates the full-screen entry from `run`. Global value options such as `--cwd` can precede `run`; those invocations remain excluded from interactive recognition.
-- `crates/dsb-cli/src/agent_launch.rs` emits the product OSC 0 title. The vendored pager's `notifications/title.rs` composes spinner, activity and product segments with ` - ` separators.
-- The committed `dsb-6-9-0-folder` PTY fixture records the released binary's welcome screen and actual title in an isolated home and plain folder. It makes no successful-authentication or completed-model-turn claim. Its runtime test feeds raw chunks through `onPtyData` with foreground inspection unavailable.
-
-Explicit native owner markers retain their existing precedence. A Claude task merely mentioning Build is not a Build identity. Runtime publication reuses the existing optional `agentIdentity` string; no new RPC, stream opcode or status producer is added. Older hosts can omit identity, while older readers retain their existing unknown-agent handling. Execution-host process/title observations work without a Git repository; local source tests do not establish native Windows, Linux or SSH device coverage.
-
-For rendered proof, isolate both Electron and the actual PTY. On macOS, `login(1)` can replace the shell's inherited home. Test-only `ORCA_DISABLE_MACOS_LOGIN_SHELL=1` avoids that wrapper; do not change production launch policy for a proof. Require a nonce-bound file written by a helper executed in the spawned PTY, containing its actual `HOME`, `USERPROFILE`, `DEEPSEEK_BUILD_HOME`, `GROK_HOME` and trust-RPC flag, and verify it before agent launch. A terminal-text assertion can match command echo and is not isolation evidence. Explicit provider environment at the final execution boundary protects the test even after shell startup.
-
-The observation-type propagation and title/process recognition adapt Wooseong Kim's (`innocarpe`) [PR #23485](https://github.com/stablyai/orca/pull/23485), with source-backed corrections for the second npm shim and value options before `run`. Keep that predecessor open until a reviewed successor merges.
-
-Independent review follow-up: upstream 6.9.0 outer `Commands::Agent` forwards native PagerArgs options. Native `-p`/`--single` (alias `--print`), `--prompt-json` and `--prompt-file` are one-shot forms and are excluded from interactive process/foreground identity, including equals/compact short forms, npm wrappers and preceding value options. Positional interactive prompt text, native option values and the native `--` terminator stay distinct. Actual release native `--help` confirms exposed flags; source alias and forwarding are pinned above.
-
-Title follow-up confines Gemini identity/normalization and status sniffing before inspecting Build activity text. A verified Build title uses its leading own braille frame for working and leading `⚠ Action Required - ` for permission; embedded Gemini glyphs in activity/session/cwd text do not change its identity or status. Source-backed frame tests cover wrapped and alert variants, plus OSC input through the actual runtime/listing path. Native Gemini and other provider corpus contracts stay covered.
-
-Actual released outer `dsb agent -- --help` prints the native TUI help (`outer-forwarded-help.txt`), confirming Clap consumes the outer separator before forwarding. The observer distinguishes this from the native `--`: `dsb agent -- --print task` is one-shot, whereas `dsb agent -- -- --print` and direct native `-- --print` retain literal interactive prompt text.
-
-Native grammar follow-up: only the outer wrapper's `run` subcommand is one-shot. Native `deepseek-build-agent run`, forwarded `dsb agent run`, and `--leader-socket run` remain interactive; the last consumes `run` as a path value. Native `-c` is boolean, so Clap accepts `-cp task` and `-cptask` as continue plus single-turn prompt. Attached `-m`/`-r`/`-s`/`-w` values (including after `c`) do not expose a prompt flag. The released binary accepted the five review argument topologies with `--help` under an executed private-child environment assertion (`native-grammar-oracle.json`); this proves parsing/help, not successful model generation.
-
-Attached prompt values can begin with hyphens: native `-p-` and `-cp--print` consume `-` and `--print` as the single-turn prompt. The observer accepts the entire remainder after `p`, while the attached m/r/s/w value shields stay covered. The released native binary and outer `agent` wrapper accepted both forms with `--help` in a nonce-asserted private child (`attached-p-oracle.json`).
diff --git a/docs/reference/dsh-harness-integration.md b/docs/reference/dsh-harness-integration.md
deleted file mode 100644
index 9a850e069001..000000000000
--- a/docs/reference/dsh-harness-integration.md
+++ /dev/null
@@ -1,44 +0,0 @@
-# DeepSeek Harness integration
-
-Orca detects the community `@deepseek-harness-tui/dsh-tui` launcher (`dsh-tui`, alias
-`dst`) and requires the official `@deepseek-ai/dsh` executable too. The launcher
-boots the `dsh-tui` profile; Orca passes `.` to select the current workspace and
-reach its composer on the first launch. The official Harness does not bundle this community TUI.
-DSH Console and DeepSeek Build are separate products and are not interchangeable
-with this launch contract.
-
-The official DSH 0.2 CLI accepts both `dsh --profile headless` and `dsh headless`.
-Orca excludes the known `web`, `headless`, `sdk`, `sdk-minimal`, `acp`, and `desktop`
-profiles from interactive process recognition, along with plugin management and
-configuration dumps. Custom profile names remain eligible because profiles are
-user configurable. Only launcher arguments are inspected; app prompts, resume IDs,
-and patch filenames cannot change the selected profile's identity.
-
-Status hooks use the official `@deepseek-ai/dsh-hooks-claude-code` plugin, installed
-as an owned block in `$DSH_HOME/cordis.patch.yml`. User entries outside the block are
-preserved. Local installation respects `DSH_HOME`; the existing SSH installer uses
-the execution host's default `~/.dsh` because SFTP cannot read its environment.
-Hooks report session start, prompt submission, tool start/end, and stopping through
-Orca's host status store. Approval has no dedicated hook; it is not inferred from
-an uncaptured screen. Subagent lifecycle events are ignored for parent-pane status.
-
-DSH 0.2 still emits an empty `transcript_path` in Claude-compatible hooks. Its
-session persistence defaults to compressed JSONL under `$DSH_HOME/sessions`.
-Orca can resume a hook-associated session through `dsh-tui --resume <id>`, but
-currently does not discover DSH logs in Agent Session History. Resume support alone
-does not establish transcript-history support.
-
-## Reproduce the official launcher check
-
-Install `@deepseek-ai/dsh@0.2.0-rc.2` into a disposable prefix, then run:
-
-```sh
-ORCA_BACKGROUND_LAUNCH=1 ORCA_REAL_DSH_CLI=/path/to/prefix/node_modules/.bin/dsh \
-  pnpm test src/shared/dsh-real-cli.test.ts
-```
-
-The opt-in test checks published version, composed profile configurations, and
-headless help in an isolated home and working folder without a model request.
-Interactive readiness is separately pinned to the captured community TUI transcript
-in `src/main/runtime/__fixtures__/dsh-tui-ready-no-key.txt`; that older capture is
-not proof of current TUI compatibility or paid generation.
diff --git a/docs/reference/git-compatibility.md b/docs/reference/git-compatibility.md
deleted file mode 100644
index bbfb4a848766..000000000000
--- a/docs/reference/git-compatibility.md
+++ /dev/null
@@ -1,94 +0,0 @@
-# Git Compatibility Policy
-
-## Scope
-
-Orca executes the user's Git binary on three kinds of execution host: native,
-WSL, and SSH. Each host can have a different Git version, so compatibility
-state must be scoped to the host that actually runs the command.
-
-Git 2.25 is the core-workflow compatibility baseline for command selection. It
-is the oldest line that covers Orca's baseline use of porcelain v2, `branch
---show-current`, `restore`, and sparse checkout. Optional features that need a
-newer Git must degrade safely and cache the missing capability. Orca does not
-currently block older Git at startup, but new command construction should not
-assume features introduced after this baseline.
-
-## Capability Rules
-
-When a newer Git feature materially improves correctness or performance:
-
-1. Keep a baseline-compatible command or parser as the fallback.
-2. Detect rejection with a narrow predicate for that option or subcommand.
-3. Run the preferred command through `GitCapabilityCache` so a rejection is
-   remembered for the native host, WSL distro, or SSH provider that produced it.
-4. Retry after the cache interval so an in-place Git upgrade self-heals without
-   restarting Orca.
-5. Test the first fallback, later calls that skip the rejected probe, concurrent
-   probe coalescing, and execution-host isolation where applicable.
-
-Do not branch only on a parsed `git --version`. Vendor builds can backport
-features, and wrappers can report a host version that differs from the binary
-used inside WSL or SSH. A behavior probe plus a precise fallback is the final
-authority.
-
-## Current Capabilities
-
-| Capability                  | Preferred behavior                                                      | Compatibility behavior                                                                                                                                                                                     |
-| --------------------------- | ----------------------------------------------------------------------- | ---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
-| `fetch-no-write-fetch-head` | Fetch a private rebase ref without changing worktree-local `FETCH_HEAD` | Serialize all Orca fetch/pull operations per worktree Git directory before Git 2.29                                                                                                                        |
-| `worktree-list-z`           | NUL-delimited worktree paths with `prunable` marks                      | Line-block parser for Git before `worktree list -z` (2.36); the `prunable`/`locked` annotations still parse on Git 2.31–2.35, and a path-existence probe restores `prunable` detection for Git before 2.31 |
-| `worktree-add-lock-reason`  | Create a prepared checkout with its ownership marker already present    | Before Git 2.33, add without checkout, then exclusively create the same reason marker before materializing files                                                                                           |
-| `rev-parse-path-format`     | Absolute repo metadata paths                                            | Resolve legacy relative output against the scanned repo                                                                                                                                                    |
-| `for-each-ref-exclude`      | Exclude remote HEAD before the output limit                             | Request extra refs, then filter remote HEAD in Orca                                                                                                                                                        |
-| `merge-tree-write-tree`     | Derive real-merge conflicts and no-op tree proofs                       | Omit the conflict summary and keep conservative branch cleanup behavior before Git 2.38                                                                                                                    |
-| `merge-tree-merge-base`     | Supply the already-resolved merge base                                  | Use the older two-commit `merge-tree --write-tree` form                                                                                                                                                    |
-
-Prepared creation registers and locks without checking out files while its shared
-exact-base fetch runs. A cancellable in-process barrier waits for fetch settlement,
-including offline failure, then resolves the current commit OID on the owning host
-and materializes files once. Existing preparations queue a tip refresh on that same
-barrier before a create can claim them. Finalization still resolves the latest base
-and runs the post-checkout hook only when attaching the requested branch. This uses
-baseline-compatible `rev-parse` and `reset --hard`; the barrier never enters Git
-transport options or the remote wire.
-
-### Placeholders That Fail Open
-
-`GitCapabilityCache` records commands Git _rejects_. A `git log --format`
-placeholder Git does not know is not rejected: Git echoes it verbatim and exits
-zero, so there is no error to remember and no probe to cache. Ask for both forms
-in one record and pick at parse time.
-
-| Placeholder     | Preferred behavior                                                                        | Compatibility behavior                                                                                                          |
-| --------------- | ----------------------------------------------------------------------------------------- | ------------------------------------------------------------------------------------------------------------------------------- |
-| `%(decorate:…)` | Git 2.43 separates commit decorations with `\x1f`, so ref names containing commas survive | The same record also carries `%D` (Git 2.10); an unexpanded `%(decorate` placeholder selects it, at the cost of comma-splitting |
-
-## Why Not `simple-git`
-
-`simple-git` is a process wrapper around the installed Git binary. Its custom
-options and `raw` API pass arguments through to Git, so it cannot make a newer
-flag work on an older binary or choose Orca's semantic fallback automatically.
-It provides version reporting and subprocess queueing, but Orca already needs
-its own WSL/SSH routing, cancellation, tracing, redaction, process cleanup, and
-bounded output handling. Replacing the runner would move—not remove—the
-capability problem.
-
-## CI Contract
-
-PR checks run the capability contract against real Git 2.25.5, 2.38.1, and
-2.49.1 binaries. This spans the pre-2.29 serialized `FETCH_HEAD` fallback, the transitional
-`merge-tree --write-tree` behavior before `--merge-base`, and current Git.
-
-The three lanes run in parallel and each Git call in the container lanes costs a
-container start, so their wall clock is runner contention, not Git. Build the
-2.25.5 binary and pull the images before the lanes start: anything heavy left
-running alongside them is charged to whichever boundary case is in flight and
-surfaces as a Vitest timeout rather than as a slow setup step.
-
-The idle maintenance contract also verifies `multi-pack-index write` and packed
-object reads. The command arrived in Git 2.20 and needs no newer-Git fallback;
-Orca uses only index metadata writes, respecting `core.multiPackIndex=false`.
-
-Keep the unit tests alongside that matrix. They cover concurrent probes,
-native/WSL/SSH/relay isolation, and error-stream shapes that a single real
-binary invocation cannot exercise deterministically.
diff --git a/docs/reference/headless-linux-server.md b/docs/reference/headless-linux-server.md
deleted file mode 100644
index 8bbfc0af6d80..000000000000
--- a/docs/reference/headless-linux-server.md
+++ /dev/null
@@ -1,1019 +0,0 @@
-# Headless Linux Server
-
-Use this guide when you want to run `orca serve` on a Linux machine without a
-desktop session, such as an Ubuntu VPS or a remote build box.
-
-`orca serve` starts the Orca runtime without opening the desktop window. On
-Linux, the packaged AppImage still needs the libraries that Electron expects at
-startup. Current Orca builds start Xvfb automatically for `orca serve` when no
-`DISPLAY` is set, but Xvfb must be installed first. A separate D-Bus session is
-not required. When `DISPLAY` is set, Orca uses that display instead of starting
-a competing Xvfb process, provided the display is usable: its socket must exist,
-and if an X lock file is present it must name a running process. A `DISPLAY`
-whose lock names a dead process is refused rather than replaced, and `orca serve`
-exits — unset `DISPLAY` to let Orca start its own Xvfb. A socket published with
-no lock at all (a container bind-mounting `/tmp/.X11-unix`, or WSLg) is accepted.
-
-The supported deployment matrix covers Ubuntu 20.04, 22.04, and 24.04 and
-current Debian stable — anything with glibc 2.31 or newer (see
-[Linux glibc compatibility](./linux-glibc-compatibility.md)). Package names can
-differ on other Debian-derived releases.
-
-## Ubuntu and Debian prerequisites
-
-Install the CLI tools, Xvfb, and the shared libraries Electron links against.
-A minimal server or container image ships none of the Electron libraries, and
-`orca serve` then fails before Electron starts:
-
-```bash
-sudo apt-get update
-sudo apt-get install -y \
-  curl file jq xvfb zlib1g-dev ca-certificates git \
-  libgtk-3-0t64 libnss3 libatk1.0-0t64 libatk-bridge2.0-0t64 libgbm1 libasound2t64 \
-  libxtst6 libcups2t64 libdrm2 libxkbcommon0 libpango-1.0-0 libcairo2 libatspi2.0-0t64 \
-  libxcomposite1 libxdamage1 libxfixes3 libxrandr2 libxrender1 libx11-xcb1 \
-  libxcb-dri3-0 libxss1
-```
-
-That command is for Ubuntu 24.04 and newer and Debian 13 and newer. Those
-releases carried out the 64-bit `time_t` transition, which renamed six of the
-packages with a `t64` suffix. On Ubuntu 20.04, Ubuntu 22.04, and Debian 12,
-substitute the unsuffixed names:
-
-- `libgtk-3-0t64` becomes `libgtk-3-0`
-- `libatk1.0-0t64` becomes `libatk1.0-0`
-- `libatk-bridge2.0-0t64` becomes `libatk-bridge2.0-0`
-- `libasound2t64` becomes `libasound2`
-- `libcups2t64` becomes `libcups2`
-- `libatspi2.0-0t64` becomes `libatspi2.0-0`
-
-The other names are identical on every supported release. The substitution is not
-symmetric, so use the list that matches the release. A `t64` name on Ubuntu 20.04,
-Ubuntu 22.04, or Debian 12 fails immediately with `E: Unable to locate package
-libgtk-3-0t64`. In the other direction the old names mostly still resolve, because
-each renamed package declares `Provides:` its unsuffixed name — except `libasound2`
-on Ubuntu 24.04, where `liboss4-salsa-asound2` in `universe` claims that name too.
-apt will not choose between two providers and exits with `E: Package 'libasound2'
-has no installation candidate`, which aborts the entire install line and leaves none
-of the libraries installed.
-
-On Ubuntu 20.04 and 22.04, install `libfuse2` to execute the AppImage through
-FUSE. On Ubuntu 24.04 and Debian 13 the package is `libfuse2t64`, though the plain
-`libfuse2` name also resolves there because nothing else provides it. FUSE is
-optional: without it, use the AppImage's supported extraction path. CLI
-registration does this once automatically, so registered commands do not need
-FUSE.
-
-Download and make the AppImage executable:
-
-```bash
-sudo mkdir -p /opt/orca
-sudo curl -L https://github.com/stablyai/orca/releases/latest/download/orca-linux.AppImage \
-  -o /opt/orca/orca-linux.AppImage
-sudo chmod +x /opt/orca/orca-linux.AppImage
-```
-
-To extract it without FUSE, run the extraction as root because the installation
-directory is root-owned:
-
-```bash
-cd /opt/orca
-sudo ./orca-linux.AppImage --appimage-extract
-sudo chmod -R a+rX /opt/orca/squashfs-root
-/opt/orca/squashfs-root/AppRun serve --port 6768
-```
-
-The `chmod` is required whenever the extraction runs as a different user than
-the server: `--appimage-extract` creates `squashfs-root` as `drwx------` owned by
-the extracting user, so anyone else — including a dedicated service user — cannot
-even traverse it, and the run fails before Electron starts.
-
-Docker commonly has no FUSE device. Use `--appimage-extract` once or
-`--appimage-extract-and-run`; neither requires a privileged container. The
-extract-and-run wrapper can print extracted paths before Orca starts, so
-automation that requires stdout to contain only the ready JSON should extract
-once and invoke `squashfs-root/AppRun`.
-
-If `Xvfb` was installed somewhere other than `/usr/bin`, confirm systemd can
-find it later:
-
-```bash
-command -v Xvfb
-```
-
-## Run In The Foreground
-
-Start with a foreground run before creating a service:
-
-```bash
-LIBGL_ALWAYS_SOFTWARE=1 /opt/orca/orca-linux.AppImage serve --port 6768
-```
-
-For remote clients, pass the address they should use to reach this server. A
-Tailscale address is usually the safest option for private servers:
-
-```bash
-LIBGL_ALWAYS_SOFTWARE=1 /opt/orca/orca-linux.AppImage serve \
-  --port 6768 \
-  --pairing-address 100.64.1.20
-```
-
-`--pairing-address` is only the address advertised to clients. It does not
-change the listener bind address. Orca binds its WebSocket listener, then
-combines the actual bound port with the advertised host when the address omits
-a port. Use a reachable LAN/Tailscale hostname or IP, or a complete reverse
-proxy URL such as `https://orca.example.com/runtime` (`http(s)` is normalized
-to `ws(s)`). Wildcard addresses such as `*`, `0.0.0.0`, and `::` cannot be
-advertised.
-
-The command writes one ready block to stdout after the listener bind and
-pairing initialization complete:
-
-```text
-Orca server ready
-Bound endpoint: ws://0.0.0.0:6768
-Advertised endpoint: ws://100.64.1.20:6768
-Pairing URL: orca://pair?code=...
-```
-
-For supervisors, request the versioned single-line JSON contract:
-
-```bash
-/opt/orca/orca-linux.AppImage serve --port 6768 \
-  --pairing-address 100.64.1.20 --json
-```
-
-The actual output is one compact line; this example is pretty-printed for
-readability:
-
-```json
-{
-  "type": "orca_server_ready",
-  "schemaVersion": 1,
-  "runtimeId": "...",
-  "endpoint": "ws://0.0.0.0:6768",
-  "boundEndpoint": "ws://0.0.0.0:6768",
-  "advertisedEndpoint": "ws://100.64.1.20:6768",
-  "managedWslCliReconciliation": "settled",
-  "pairing": {
-    "available": true,
-    "url": "orca://pair?code=...",
-    "endpoint": "ws://100.64.1.20:6768",
-    "deviceId": "...",
-    "webClientUrl": "...",
-    "scope": "runtime",
-    "qr": null
-  }
-}
-```
-
-`endpoint` remains a compatibility alias for `boundEndpoint`; new automation
-should use the explicit bound and advertised fields.
-
-When the server remains usable but cannot mint an offer, `pairing` remains an
-object with `available:false`, a stable `reason`, and operator `guidance`; it is
-never silently omitted. `--recipe-json` is stricter and exits with that reason
-because its contract requires a pairing URL. Stop a foreground server with
-`Ctrl+C`. Stable reasons are `disabled_by_operator`, `websocket_unavailable`,
-`device_registry_unavailable`, `e2ee_key_unavailable`, and
-`invalid_advertised_endpoint`.
-
-## Systemd Service
-
-Create a dedicated service user and install directory. Run the service as this
-user instead of root so the AppImage can keep Chromium's sandbox enabled. Keep
-the install directory root-owned: the service needs to read and execute the
-AppImage, but must not be able to replace it or the rollback artifacts.
-
-```bash
-sudo useradd --system --create-home --shell /usr/sbin/nologin orca
-sudo chown root:root /opt/orca /opt/orca/orca-linux.AppImage
-sudo chmod 755 /opt/orca /opt/orca/orca-linux.AppImage
-# Only if you ran --appimage-extract: extraction leaves squashfs-root root-only.
-sudo chmod -R a+rX /opt/orca/squashfs-root
-```
-
-The last line matters because the two halves of this guide combine badly without
-it. `--appimage-extract` writes `squashfs-root` as `drwx------ root root`, so the
-`orca` service user cannot read or traverse the extracted tree and the unit fails
-at startup. `chmod 755 /opt/orca` alone does not reach into it.
-
-For most hosts, one `orca serve` service is enough because Orca starts Xvfb on
-display `:99` when no display exists:
-
-```ini
-# /etc/systemd/system/orca-serve.service
-[Unit]
-Description=Orca runtime server
-After=network-online.target
-Wants=network-online.target
-StartLimitIntervalSec=300
-StartLimitBurst=5
-
-[Service]
-Type=simple
-User=orca
-WorkingDirectory=/home/orca
-Environment=LIBGL_ALWAYS_SOFTWARE=1
-ExecStart=/opt/orca/orca-linux.AppImage serve --port 6768 --pairing-address 100.64.1.20
-StandardOutput=journal
-StandardError=journal
-KillMode=mixed
-Restart=on-failure
-RestartPreventExitStatus=3
-RestartSec=5
-
-[Install]
-WantedBy=multi-user.target
-```
-
-Replace `100.64.1.20` with the LAN, Tailscale, tunnel, or public hostname that
-clients should use.
-
-`KillMode=mixed` sends the graceful stop signal only to Orca's main process,
-then `SIGKILL`s whatever is still in the cgroup the instant that main process
-exits — `TimeoutStopSec` only governs how long systemd waits for the main
-process itself, never a grace window for the cgroup's remains. This lets Orca
-keep its owned Xvfb alive until Electron disconnects cleanly.
-
-The detached terminal daemon is preserved by a different mechanism: it is
-launched through `systemd-run --user --scope`, so it and its PTYs live in their
-own transient `orca-daemon-<launch-nonce>.scope` unit rather than in
-`orca-serve.service`'s cgroup. A `systemctl stop` or `restart` of this unit
-leaves that scope running, so live terminals and agent processes survive the
-restart and the successor adopts them.
-
-That requires a reachable systemd **user** manager for the service account.
-With `User=orca` and no interactive login there is none by default, so enable
-lingering once:
-
-```bash
-sudo loginctl enable-linger orca
-```
-
-Without it — or on a host without systemd as PID 1, or without `systemd-run`
-on `PATH` — the daemon falls back to launching directly inside
-`orca-serve.service`'s cgroup, and is then killed when the stop completes:
-every `systemctl stop` or `restart` ends live terminals and agent processes,
-even though their persisted layout and terminal history remain. Check which
-case a running host is in with the `cgroupUnit` field of the daemon health
-payload: a `orca-daemon-*.scope` value means isolated, `null` means the
-unscoped fallback.
-
-None of this applies inside a Docker container. There the capability probe
-fails closed (no `/run/systemd/system`), but that is the least of it: a
-`docker restart` tears down the container's PID namespace, so no in-container
-setting — lingering, kill mode, or scope — preserves the daemon or its PTYs
-across it. Run the container with `--init` so a real PID 1 reaps exited PTY
-subprocesses; without it, Orca is PID 1 and those children accumulate as
-zombies because nothing reaps them.
-
-Exit status `3` means another process already owns this userData profile, so
-`RestartPreventExitStatus=3` stops the unit instead of retrying a launch that
-cannot succeed. Any other permanent startup fault is capped at 5 starts per
-5 minutes; systemd's defaults (10s window, 5 starts) can never trip at
-`RestartSec=5`, which is how one bad launch could restart thousands of times.
-The start limit counts operator-initiated starts too, so once it trips systemd
-refuses a plain `systemctl start` until the 5-minute window rolls over. Run
-`sudo systemctl reset-failed orca-serve.service` first to clear it — the
-[Upgrade](#upgrade-steps) and [Roll back](#roll-back) scripts already do.
-On systemd older than 230 those two directives are spelled
-`StartLimitInterval=`/`StartLimitBurst=` and belong in `[Service]`; Ubuntu
-20.04, Orca's oldest supported base, ships systemd 245.
-
-Enable the service:
-
-```bash
-sudo systemctl daemon-reload
-sudo systemctl enable --now orca-serve.service
-sudo journalctl -u orca-serve.service -f
-```
-
-`journalctl -o cat` removes journal metadata but still mixes the service's
-stdout and stderr. Parse each line as JSON and require the readiness type and
-schema before treating the service as ready:
-
-```bash
-sudo journalctl -u orca-serve.service -o cat \
-  | jq -Rrc 'fromjson? | select(.type == "orca_server_ready" and .schemaVersion == 1)'
-```
-
-A bounded health check should require that contract within its startup timeout;
-otherwise inspect earlier diagnostics for the precise pairing reason, listener
-error, or missing library.
-
-## Managed Xvfb Service
-
-If you prefer to own the virtual display lifecycle in systemd, run Xvfb as a
-separate service and set `DISPLAY=:99` for Orca.
-
-```ini
-# /etc/systemd/system/orca-xvfb.service
-[Unit]
-Description=Virtual X display for Orca
-After=network-online.target
-Wants=network-online.target
-
-[Service]
-Type=simple
-ExecStart=/usr/bin/Xvfb :99 -screen 0 1280x1024x24 -nolisten tcp
-Restart=on-failure
-RestartSec=5
-
-[Install]
-WantedBy=multi-user.target
-```
-
-If `command -v Xvfb` returned a different path, update `ExecStart` to that
-absolute path.
-
-Then add the display dependency to the Orca service:
-
-```ini
-# /etc/systemd/system/orca-serve.service
-[Unit]
-Description=Orca runtime server
-After=network-online.target orca-xvfb.service
-Wants=network-online.target orca-xvfb.service
-StartLimitIntervalSec=300
-StartLimitBurst=5
-
-[Service]
-Type=simple
-User=orca
-WorkingDirectory=/home/orca
-Environment=DISPLAY=:99
-Environment=LIBGL_ALWAYS_SOFTWARE=1
-ExecStart=/opt/orca/orca-linux.AppImage serve --port 6768 --pairing-address 100.64.1.20
-KillMode=mixed
-Restart=on-failure
-RestartPreventExitStatus=3
-RestartSec=5
-
-[Install]
-WantedBy=multi-user.target
-```
-
-`KillMode=mixed` matters as much here as in the single-service unit: without it
-the unit silently defaults to `KillMode=control-group`, which `SIGTERM`s the
-whole cgroup at once and then stalls the full `TimeoutStopSec` before the
-`SIGKILL`.
-
-Enable both units:
-
-```bash
-sudo systemctl daemon-reload
-sudo systemctl enable --now orca-xvfb.service orca-serve.service
-```
-
-## CLI Install Note
-
-The registered Linux CLI command is `orca-ide`, not `orca`, to avoid shadowing
-the GNOME Orca screen reader. Desktop-managed terminals receive a
-terminal-scoped bare-`orca` shim. A packaged headless `orca serve` also makes a
-best-effort dispatcher at `$HOME/.local/bin/orca` for the service user's own
-shell, so the Claude Teams launcher can resolve its bare command; it does not
-replace another user's `orca`. From an ordinary shell outside that service
-user's managed environment, substitute `orca-ide` for `orca` in commands below.
-
-On a headless host, you do not need to open the desktop UI just to run the
-server. Invoke the AppImage directly:
-
-```bash
-/opt/orca/orca-linux.AppImage serve --help
-```
-
-Running an AppImage as root requires Chromium's `--no-sandbox` switch before
-the command:
-
-```bash
-/opt/orca/orca-linux.AppImage --no-sandbox serve --port 6768
-```
-
-This disables a security boundary. Prefer a dedicated unprivileged service
-user, especially when the listener is reachable beyond localhost.
-
-The Linux CLI is named `orca-ide`, not `orca`, so it never shadows the GNOME
-Orca screen reader at `/usr/bin/orca`. The `.deb` and `.rpm` packages put
-`orca-ide` on `PATH` themselves at install time; with the AppImage it arrives
-as `~/.local/bin/orca-ide` when the CLI is registered.
-
-A packaged `orca serve` start also writes a bare `orca` into `~/.local/bin`
-that execs the same launcher, which is why the skills commands below can be
-typed as `orca`. It writes it while starting, so it is never the command that
-starts the server — the first launch is `orca-ide serve`, or the AppImage
-invoked directly as above. The write is best-effort: it is gated on a packaged
-build, it is skipped when no bundled launcher resolves, and it is skipped when
-a file Orca does not own already holds that name (ownership is a marker on the
-second line of the file). A host that really does run the screen reader keeps
-its own `orca`.
-
-## Pairing troubleshooting
-
-- A pairing offer is a capability containing a device credential and E2EE
-  material. Share it only with the intended client and do not put it in proxy
-  access logs.
-- `boundEndpoint` is where the process listens; `advertisedEndpoint` is what a
-  client dials. A valid-looking offer still cannot connect if DNS, firewall,
-  Docker port publishing, Tailscale policy, or a reverse proxy does not route
-  the advertised endpoint to the bound port.
-- An omitted advertised port uses the actual bound port, including a fallback
-  port selected after a collision. An explicit proxy port is preserved. A port
-  mismatch therefore means the supplied external routing is wrong, not that
-  Orca changes it.
-- Reverse proxies must support WebSocket upgrade and route the advertised path.
-  Use `wss://` or `https://` when TLS terminates at the proxy; do not advertise
-  `ws://` through an HTTPS-only endpoint.
-- Hostnames, IPv4, bracketed IPv6, and raw IPv6 literals are supported. IPv6
-  still requires an IPv6-reachable listener/network path.
-- Background push notifications to a paired phone do not fire from a headless
-  server: agent-completion detection runs in the desktop renderer, which is not started in serve
-  mode, so nothing reaches the push gateway even though the phone
-  registers successfully.
-- `xvfb-run` and `dbus-run-session -- xvfb-run` remain valid diagnostic launch
-  shapes, but neither should be needed when `Xvfb` is installed and no display
-  is configured. Repeated D-Bus messages without a ready block indicate startup
-  did not reach serve mode; confirm the AppImage version and exact argument
-  order, especially `--no-sandbox serve`.
-
-If you later install the desktop CLI from Orca settings, use that CLI for normal
-shell workflows. Keep the AppImage path in systemd so service restarts do not
-depend on an interactive shell profile.
-
-## Upgrade
-
-`orca serve` never updates itself. In headless mode Orca wires up no auto-updater
-at all — the built-in updater only runs in the desktop GUI, and no paired mobile
-or web client can trigger it remotely. Upgrading is always a deliberate step:
-replace the AppImage and restart the service.
-
-Two facts make the persisted-state transition predictable:
-
-- **State lives in the service user's home, not next to the binary.** Persisted
-  data is under `/home/orca/.config/` (Orca uses both an `orca` and an `Orca`
-  directory there), fully independent of `/opt/orca/orca-linux.AppImage`.
-  Replacing the binary never touches projects, worktree metadata, terminal
-  history, orchestration state, or paired-device keys — so mobile and web
-  clients reconnect after an upgrade without re-pairing.
-- **New builds migrate old state on load.** Orca imports older `orca-data.json`
-  into each profile's `profile-state.db`, so a forward upgrade needs no manual
-  data step. Normal writes, shutdown and profile switching save SQLite; they
-  no longer refresh the legacy JSON file.
-
-These guarantees preserve live processes only when the daemon is in its own
-`orca-daemon-*.scope`, as reported by `health.terminalDaemon.cgroupUnit`. The
-unscoped fallback remains destructive: a service restart kills every terminal
-and agent in the service cgroup; an agent conversation may be resumable, but
-its current process and any in-flight command are gone. Treat a stop as
-destructive unless `health.terminalDaemon.cgroupUnit` names an
-`orca-daemon-*.scope` on that host.
-
-When `cgroupUnit` is `null` or unverifiable, immediately before stopping the
-service, obtain a fresh census as the service's
-OS account and home. Use the installer's absolute launcher path so `sudo`'s
-`secure_path` cannot hide a per-user registration:
-`sudo -Hu orca /home/orca/.local/bin/orca-ide terminal list --json`.
-Replace both `orca` and `/home/orca` with the service account and home used by
-your unit; for an extracted deployment, use its absolute `resources/bin/orca-ide`
-launcher instead. Proceed only when the result is
-untruncated, has an explicit `hostScope`, covers every execution host affected
-by this service stop, and lists no terminals on those hosts. Every
-`omittedHostIds` entry must be explicitly accounted for outside this service's
-execution boundary. 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`, so defer the restart. Do not allow new work between that census
-and the stop; Orca does not yet provide an atomic census-and-stop fence.
-
-Rolling back is the case that needs care — see [Roll back](#roll-back).
-
-### Record the version you deploy
-
-The bundled CLI launcher prints the Orca build with `orca-ide --version`. For an
-extracted deployment, that launcher is
-`squashfs-root/resources/bin/orca-ide`; deb/rpm installs and CLI registration put
-it on `PATH`. Do not use `orca-linux.AppImage --version` for this audit because
-Electron owns the direct binary's version flags and may report its own runtime
-version. For an AppImage service, choose a release tag explicitly and record it
-next to the binary. The steps below keep that record in `/opt/orca/VERSION`.
-
-### Upgrade steps
-
-Never download straight onto `/opt/orca/orca-linux.AppImage`. The AppImage is
-FUSE-mounted, so overwriting it in place while the service runs can crash or
-corrupt the live process — and even with the service stopped, a failed or partial
-download would clobber the working binary. Instead download to a temporary name
-on the same filesystem, verify it, then swap it in with an atomic rename.
-
-Check capacity before starting:
-
-```bash
-sudo chown root:root /opt/orca
-sudo chmod 755 /opt/orca
-sudo test ! -L /opt/orca/orca-linux.AppImage
-sudo chown root:root /opt/orca/orca-linux.AppImage
-sudo chmod 755 /opt/orca/orca-linux.AppImage
-# Clear predictable staging names left by an older attempt after locking the directory
-sudo rm -f /opt/orca/orca-linux.AppImage.new /opt/orca/VERSION.new \
-  /opt/orca/orca-linux.AppImage.recovering /opt/orca/VERSION.recovering
-sudo du -sh /home/orca/.config
-df -h /opt/orca /home/orca
-```
-
-`/opt/orca` needs room for the compressed Orca profile archive, the staged
-build, and the rollback binary. A rollback extracts the old profile and preserves
-the post-upgrade Orca profile directories, so `/home` needs room for both copies.
-
-Run the following block as one Bash script so its fail-fast and recovery traps
-remain active for the whole operation:
-
-```bash
-set -euo pipefail
-
-# Replace this example with the release tag you intend to deploy
-ORCA_VERSION=v1.4.147
-
-# Select the release asset on the server where Orca runs
-case "$(uname -m)" in
-  x86_64)
-    ORCA_ASSET=orca-linux.AppImage
-    ORCA_FILE_MACHINE=x86-64
-    ;;
-  aarch64 | arm64)
-    ORCA_ASSET=orca-linux-arm64.AppImage
-    ORCA_FILE_MACHINE='ARM aarch64'
-    ;;
-  *)
-    echo "Unsupported architecture: $(uname -m)" >&2
-    exit 1
-    ;;
-esac
-
-ORCA_ROLLBACK_NEW=
-ORCA_ROLLBACK=
-ORCA_SERVICE_STOPPED=0
-ORCA_BINARY_PROMOTED=0
-recover_failed_upgrade() {
-  exit_status=$?
-  trap - EXIT
-  set +e
-  if ((exit_status != 0)); then
-    sudo rm -f /opt/orca/orca-linux.AppImage.new /opt/orca/VERSION.new \
-      /opt/orca/orca-linux.AppImage.recovering /opt/orca/VERSION.recovering
-  fi
-  if ((exit_status != 0)) && [[ -n "$ORCA_ROLLBACK_NEW" ]] && \
-    sudo test -d "$ORCA_ROLLBACK_NEW"; then
-    sudo rm -rf -- "$ORCA_ROLLBACK_NEW"
-  fi
-  if ((exit_status != 0 && ORCA_SERVICE_STOPPED)); then
-    recovery_ok=1
-    if ((ORCA_BINARY_PROMOTED)); then
-      if ! sudo cp -a "$ORCA_ROLLBACK/orca-linux.AppImage" \
-        /opt/orca/orca-linux.AppImage.recovering || \
-        ! sudo mv -f /opt/orca/orca-linux.AppImage.recovering \
-          /opt/orca/orca-linux.AppImage; then
-        recovery_ok=0
-      fi
-      if sudo test -f "$ORCA_ROLLBACK/VERSION"; then
-        if ! sudo cp -a "$ORCA_ROLLBACK/VERSION" /opt/orca/VERSION.recovering || \
-          ! sudo mv -f /opt/orca/VERSION.recovering /opt/orca/VERSION; then
-          recovery_ok=0
-        fi
-      elif ! sudo rm -f /opt/orca/VERSION; then
-        recovery_ok=0
-      fi
-    fi
-    sudo rm -f /opt/orca/orca-linux.AppImage.recovering \
-      /opt/orca/VERSION.recovering
-    if ((recovery_ok)); then
-      # A tripped StartLimitBurst refuses a plain start
-      sudo systemctl reset-failed orca-serve.service || true
-      sudo systemctl start orca-serve.service || true
-    else
-      echo 'Upgrade recovery failed; service remains stopped' >&2
-    fi
-  fi
-  exit "$exit_status"
-}
-trap recover_failed_upgrade EXIT
-
-# 1. Stage and verify the new build while the server stays online
-sudo curl -fL --retry 3 "https://github.com/stablyai/orca/releases/download/${ORCA_VERSION}/${ORCA_ASSET}" \
-  -o /opt/orca/orca-linux.AppImage.new
-sudo chown root:root /opt/orca/orca-linux.AppImage.new
-sudo chmod 755 /opt/orca/orca-linux.AppImage.new
-
-# Both checks must match; either grep stops this fail-fast block otherwise
-ORCA_FILE_INFO=$(LC_ALL=C file /opt/orca/orca-linux.AppImage.new)
-grep 'ELF .* executable' <<<"$ORCA_FILE_INFO"
-grep -F "$ORCA_FILE_MACHINE" <<<"$ORCA_FILE_INFO"
-
-# 2. Assemble the prior binary and version in a root-only rollback bundle
-ORCA_ROLLBACK_BASE=/opt/orca/orca-rollback-$(date +%F-%H%M%S-%N)
-ORCA_ROLLBACK_NEW=${ORCA_ROLLBACK_BASE}.new
-ORCA_ROLLBACK=${ORCA_ROLLBACK_BASE}.ready
-sudo install -d -m 700 "$ORCA_ROLLBACK_NEW"
-sudo cp -a /opt/orca/orca-linux.AppImage "$ORCA_ROLLBACK_NEW/orca-linux.AppImage"
-if sudo test -f /opt/orca/VERSION; then
-  sudo cp -a /opt/orca/VERSION "$ORCA_ROLLBACK_NEW/VERSION"
-fi
-
-# Stage the new version record before the stop window
-printf '%s\n' "$ORCA_VERSION" | sudo tee /opt/orca/VERSION.new >/dev/null
-sudo chown root:root /opt/orca/VERSION.new
-sudo chmod 644 /opt/orca/VERSION.new
-
-# 3. Stop the server so the profile backup is consistent
-ORCA_SERVICE_STOPPED=1
-sudo systemctl stop orca-serve.service
-
-# Add only Orca-owned profile directories, then publish the complete bundle
-ORCA_PROFILE_DIRS=()
-for profile_dir in orca Orca; do
-  if sudo test -L "/home/orca/.config/$profile_dir"; then
-    echo "Refusing symlinked Orca profile: /home/orca/.config/$profile_dir" >&2
-    exit 1
-  fi
-  if sudo test -d "/home/orca/.config/$profile_dir"; then
-    if [[ "$profile_dir" == Orca ]] && \
-      sudo test /home/orca/.config/orca -ef /home/orca/.config/Orca; then
-      continue
-    fi
-    ORCA_PROFILE_DIRS+=("$profile_dir")
-  fi
-done
-if ((${#ORCA_PROFILE_DIRS[@]} == 0)); then
-  echo 'No Orca profile directory found under /home/orca/.config' >&2
-  exit 1
-fi
-sudo tar czf "$ORCA_ROLLBACK_NEW/profile.tgz" \
-  -C /home/orca/.config "${ORCA_PROFILE_DIRS[@]}"
-sudo chmod 600 "$ORCA_ROLLBACK_NEW/profile.tgz"
-sudo mv "$ORCA_ROLLBACK_NEW" "$ORCA_ROLLBACK"
-
-# 4. Atomically replace the binary and version record, then start
-ORCA_BINARY_PROMOTED=1
-sudo mv -f /opt/orca/orca-linux.AppImage.new /opt/orca/orca-linux.AppImage
-sudo mv -f /opt/orca/VERSION.new /opt/orca/VERSION
-# Clears a start-limit hit left by the version being replaced
-sudo systemctl reset-failed orca-serve.service
-sudo systemctl start orca-serve.service
-ORCA_SERVICE_STOPPED=0
-trap - EXIT
-```
-
-The profile archive created in step 3 captures both Orca profile directory names
-when present without rewinding unrelated tools under `/home/orca/.config`. The
-`.ready` suffix is published only after the prior binary, version record, and
-profile archive are complete. If you run the managed Xvfb unit, only
-`orca-serve.service` needs restarting — leave `orca-xvfb.service` running.
-
-### Verify
-
-```bash
-sudo journalctl -u orca-serve.service -f
-```
-
-A healthy start prints one `Orca server ready` block with the actual bound and
-advertised endpoints. Verify those values rather than assuming the configured
-port, because a collision can select a fallback port.
-Confirm a client reconnects before you discard the backup. The timestamped
-rollback bundles are not pruned automatically. After the new version satisfies
-your retention policy, select and inspect the newest complete bundle before
-removing it:
-
-```bash
-shopt -s nullglob
-ORCA_ROLLBACK_SETS=(/opt/orca/orca-rollback-*.ready)
-((${#ORCA_ROLLBACK_SETS[@]} > 0))
-ORCA_ROLLBACK=${ORCA_ROLLBACK_SETS[${#ORCA_ROLLBACK_SETS[@]} - 1]}
-printf 'Removing rollback bundle: %s\n' "$ORCA_ROLLBACK"
-sudo test -d "$ORCA_ROLLBACK"
-sudo rm -rf -- "$ORCA_ROLLBACK"
-```
-
-Each `.ready` directory is a self-contained rollback generation; never combine
-files from different bundles.
-
-### Roll back
-
-A rollback is **not** binary-only safe. New builds save profile state in
-SQLite, while a JSON-only build would read a stale legacy `orca-data.json`.
-The rollback below restores the complete pre-upgrade profile directories from
-step 3 and swaps the binary back. It deliberately returns to the pre-upgrade
-state rather than preserving changes made since the upgrade. Run this block
-as one Bash script:
-
-To preserve the latest state when moving to a JSON-only build, stop the service
-and use the newer build's CLI to run
-`orca profile state rollback --latest-json --profile-id <id>` for **every**
-profile the older build may open, then install the older binary manually.
-Without `--profile-id`, the command prepares only the active profile. This
-explicit handoff archives the SQLite authority and publishes the current JSON;
-ordinary exports write revisioned `.sqlite-export.N.json` files and do not
-prepare a downgrade. Orca's updater refuses JSON-only targets automatically.
-
-```bash
-set -euo pipefail
-
-# Select and validate one complete generation before taking the service offline
-shopt -s nullglob
-ORCA_ROLLBACK_SETS=(/opt/orca/orca-rollback-*.ready)
-((${#ORCA_ROLLBACK_SETS[@]} > 0))
-ORCA_ROLLBACK=${ORCA_ROLLBACK_SETS[${#ORCA_ROLLBACK_SETS[@]} - 1]}
-sudo test -f "$ORCA_ROLLBACK/orca-linux.AppImage"
-sudo tar tzf "$ORCA_ROLLBACK/profile.tgz" >/dev/null
-
-# Extract and validate the old profile while the current server stays online
-sudo test ! -L /home
-ORCA_HOME_OWNER=$(sudo stat -c %u /home)
-ORCA_HOME_MODE=$(sudo stat -c %a /home)
-if [[ "$ORCA_HOME_OWNER" != 0 ]] || ((8#$ORCA_HOME_MODE & 0022)) || \
-  sudo -u orca test -w /home; then
-  echo 'Refusing rollback because /home is not root-controlled' >&2
-  exit 1
-fi
-ORCA_RESTORE=$(sudo mktemp -d /home/.orca-restore.XXXXXX)
-ORCA_SERVICE_STOPPED=0
-ORCA_MOVED_CURRENT_DIRS=()
-ORCA_INSTALLED_RESTORE_DIRS=()
-ORCA_CURRENT_BINARY_MOVED=0
-ORCA_CURRENT_VERSION_MOVED=0
-ORCA_VERSION_REPLACEMENT_STARTED=0
-ORCA_POST_UPGRADE=
-ORCA_ROLLBACK_BINARY_STAGED=
-ORCA_ROLLBACK_VERSION_STAGED=
-ORCA_ROLLBACK_HAS_VERSION=0
-restart_after_rollback_error() {
-  exit_status=$?
-  trap - EXIT
-  set +e
-  if ((exit_status != 0 && ORCA_SERVICE_STOPPED)); then
-    recovery_ok=1
-    if ((${#ORCA_INSTALLED_RESTORE_DIRS[@]})); then
-      for profile_dir in "${ORCA_INSTALLED_RESTORE_DIRS[@]}"; do
-        if sudo test -d "/home/orca/.config/$profile_dir"; then
-          if ! sudo mv "/home/orca/.config/$profile_dir" \
-            "$ORCA_RESTORE/$profile_dir.failed"; then
-            recovery_ok=0
-          fi
-        fi
-      done
-    fi
-    if ((${#ORCA_MOVED_CURRENT_DIRS[@]})); then
-      for profile_dir in "${ORCA_MOVED_CURRENT_DIRS[@]}"; do
-        if sudo test -d "$ORCA_POST_UPGRADE/$profile_dir"; then
-          if ! sudo mv "$ORCA_POST_UPGRADE/$profile_dir" /home/orca/.config/; then
-            recovery_ok=0
-          fi
-        elif ! sudo test -d "/home/orca/.config/$profile_dir"; then
-          recovery_ok=0
-        fi
-      done
-    fi
-    if [[ -n "$ORCA_POST_UPGRADE" ]]; then
-      sudo rmdir "$ORCA_POST_UPGRADE" 2>/dev/null || true
-    fi
-    if ((ORCA_CURRENT_BINARY_MOVED)); then
-      if sudo test -f "$ORCA_CURRENT_BINARY"; then
-        if ! sudo mv -f "$ORCA_CURRENT_BINARY" /opt/orca/orca-linux.AppImage; then
-          recovery_ok=0
-        fi
-      elif ! sudo test -f /opt/orca/orca-linux.AppImage; then
-        recovery_ok=0
-      fi
-    fi
-    if ((ORCA_CURRENT_VERSION_MOVED)); then
-      if sudo test -f "$ORCA_CURRENT_VERSION"; then
-        if ! sudo mv -f "$ORCA_CURRENT_VERSION" /opt/orca/VERSION; then
-          recovery_ok=0
-        fi
-      elif ! sudo test -f /opt/orca/VERSION; then
-        recovery_ok=0
-      fi
-    elif ((ORCA_VERSION_REPLACEMENT_STARTED)); then
-      if ! sudo rm -f /opt/orca/VERSION; then
-        recovery_ok=0
-      fi
-    fi
-    if ((recovery_ok)); then
-      # A tripped StartLimitBurst refuses a plain start
-      sudo systemctl reset-failed orca-serve.service || true
-      sudo systemctl start orca-serve.service || true
-    else
-      echo 'Rollback recovery failed; service remains stopped' >&2
-    fi
-  fi
-  if [[ -n "$ORCA_ROLLBACK_BINARY_STAGED" ]]; then
-    sudo rm -f -- "$ORCA_ROLLBACK_BINARY_STAGED"
-  fi
-  if [[ -n "$ORCA_ROLLBACK_VERSION_STAGED" ]]; then
-    sudo rm -f -- "$ORCA_ROLLBACK_VERSION_STAGED"
-  fi
-  sudo rm -rf -- "$ORCA_RESTORE"
-  exit "$exit_status"
-}
-trap restart_after_rollback_error EXIT
-
-if [[ "$(sudo stat -c %d "$ORCA_RESTORE")" != \
-  "$(sudo stat -c %d /home/orca/.config)" ]]; then
-  echo 'Refusing rollback because staging and the Orca profile are on different filesystems' >&2
-  exit 1
-fi
-sudo tar xzf "$ORCA_ROLLBACK/profile.tgz" -C "$ORCA_RESTORE"
-ORCA_RESTORE_DIRS=()
-for profile_dir in orca Orca; do
-  if sudo test -L "$ORCA_RESTORE/$profile_dir"; then
-    echo "Rollback bundle contains a symlinked profile: $profile_dir" >&2
-    exit 1
-  fi
-  if sudo test -d "$ORCA_RESTORE/$profile_dir"; then
-    if [[ "$profile_dir" == Orca ]] && \
-      sudo test "$ORCA_RESTORE/orca" -ef "$ORCA_RESTORE/Orca"; then
-      continue
-    fi
-    ORCA_RESTORE_DIRS+=("$profile_dir")
-  fi
-done
-if ((${#ORCA_RESTORE_DIRS[@]} == 0)); then
-  echo "Rollback bundle has no Orca profile directories: $ORCA_ROLLBACK" >&2
-  exit 1
-fi
-for profile_dir in "${ORCA_RESTORE_DIRS[@]}"; do
-  sudo chown -R orca:orca "$ORCA_RESTORE/$profile_dir"
-done
-
-ORCA_ROLLBACK_STAMP=$(date +%F-%H%M%S-%N)
-ORCA_ROLLBACK_BINARY_STAGED=/opt/orca/orca-linux.AppImage.rollback-staged-$ORCA_ROLLBACK_STAMP
-sudo cp -a "$ORCA_ROLLBACK/orca-linux.AppImage" "$ORCA_ROLLBACK_BINARY_STAGED"
-if sudo test -f "$ORCA_ROLLBACK/VERSION"; then
-  ORCA_ROLLBACK_HAS_VERSION=1
-  ORCA_ROLLBACK_VERSION_STAGED=/opt/orca/VERSION.rollback-staged-$ORCA_ROLLBACK_STAMP
-  sudo cp -a "$ORCA_ROLLBACK/VERSION" "$ORCA_ROLLBACK_VERSION_STAGED"
-fi
-
-ORCA_SERVICE_STOPPED=1
-sudo systemctl stop orca-serve.service
-
-# Preserve and replace only Orca-owned profile directories
-ORCA_CURRENT_DIRS=()
-for profile_dir in orca Orca; do
-  if sudo test -L "/home/orca/.config/$profile_dir"; then
-    echo "Refusing symlinked Orca profile: /home/orca/.config/$profile_dir" >&2
-    exit 1
-  fi
-  if sudo test -d "/home/orca/.config/$profile_dir"; then
-    if [[ "$profile_dir" == Orca ]] && \
-      sudo test /home/orca/.config/orca -ef /home/orca/.config/Orca; then
-      continue
-    fi
-    ORCA_CURRENT_DIRS+=("$profile_dir")
-  fi
-done
-ORCA_POST_UPGRADE=/home/orca/.config/orca-rollback-$ORCA_ROLLBACK_STAMP
-sudo install -d -o orca -g orca -m 700 "$ORCA_POST_UPGRADE"
-if ((${#ORCA_CURRENT_DIRS[@]})); then
-  for profile_dir in "${ORCA_CURRENT_DIRS[@]}"; do
-    ORCA_MOVED_CURRENT_DIRS+=("$profile_dir")
-    sudo mv "/home/orca/.config/$profile_dir" "$ORCA_POST_UPGRADE/"
-  done
-fi
-for profile_dir in "${ORCA_RESTORE_DIRS[@]}"; do
-  ORCA_INSTALLED_RESTORE_DIRS+=("$profile_dir")
-  sudo mv "$ORCA_RESTORE/$profile_dir" /home/orca/.config/
-done
-
-ORCA_CURRENT_BINARY=/opt/orca/orca-linux.AppImage.rollback-current-$ORCA_ROLLBACK_STAMP
-ORCA_CURRENT_BINARY_MOVED=1
-sudo mv /opt/orca/orca-linux.AppImage "$ORCA_CURRENT_BINARY"
-sudo mv -f "$ORCA_ROLLBACK_BINARY_STAGED" /opt/orca/orca-linux.AppImage
-
-ORCA_CURRENT_VERSION=/opt/orca/VERSION.rollback-current-$ORCA_ROLLBACK_STAMP
-if sudo test -f /opt/orca/VERSION; then
-  ORCA_CURRENT_VERSION_MOVED=1
-  sudo mv /opt/orca/VERSION "$ORCA_CURRENT_VERSION"
-fi
-ORCA_VERSION_REPLACEMENT_STARTED=1
-if ((ORCA_ROLLBACK_HAS_VERSION)); then
-  sudo mv -f "$ORCA_ROLLBACK_VERSION_STAGED" /opt/orca/VERSION
-else
-  sudo rm -f /opt/orca/VERSION
-fi
-# The crash-looping build you are rolling back from tripped StartLimitBurst
-sudo systemctl reset-failed orca-serve.service
-sudo systemctl start orca-serve.service
-ORCA_SERVICE_STOPPED=0
-sudo rm -rf -- "$ORCA_RESTORE"
-trap - EXIT
-```
-
-Restoring the complete backup is required for this rollback procedure: swapping
-only the binary leaves the newer SQLite authority and stale legacy JSON in
-place. Keep the pre-upgrade backup until the new version is proven
-on your host. The `orca-rollback-*` directory inside `.config` is also retained
-deliberately. The post-upgrade binary and version record are retained in
-`/opt/orca` with the same `rollback-current-<timestamp>` suffix. Inspect these
-artifacts and remove them according to your retention policy after the rollback
-is resolved.
-
-## Installing Agent Skills Without A Desktop
-
-Orca's agent skills (CLI usage, orchestration, computer use, etc.) are normally
-installed from Orca Settings, which pre-fills an `npx skills add ... --global`
-command in a terminal for you to run. A headless host has no Settings UI, so
-use `orca skills install` instead:
-
-```bash
-orca skills install                                      # list installable skills
-orca skills install --skill orca-cli --skill orchestration # install globally (default)
-orca skills install --skill orca-cli --local              # install into the current project only
-orca skills install --all                                 # install every bundled skill
-orca skills install --all --dry-run                       # print the npx command without running it
-```
-
-This resolves the same `npx skills add <repo> --skill <name> ...` command
-Settings would show you (adding `--global` unless `--local` is passed), then
-runs it and forwards its output and exit code. It requires `node`/`npx` on the
-host; it does not need a running Orca runtime.
-
-Unlike the command Settings shows, the spawned one adds `npx --yes` and `-y`.
-Without them the `skills` CLI opens an interactive agent picker and blocks
-forever on any allocated TTY — which includes a normal `ssh` session. Use
-`--dry-run` to see the exact command that will run.
-
-Settings keeps that picker deliberately, because choosing which agents get a
-skill is a real decision. A headless run cannot answer it, so instead of dropping
-the choice Orca makes it explicitly: it passes an `--agent` list built from the
-coding agents it detects on the host, plus the shared `.agents/skills` directory
-it reads itself. Left to decide on its own with no agent detected, the `skills`
-CLI installs into all ~75 agents it knows and leaves a config directory for each.
-Override the targets yourself, or narrow to the shared directory alone:
-
-```bash
-orca skills install --skill orca-cli --agent claude-code,codex
-orca skills install --skill orca-cli --agent universal
-```
-
-If Orca detects no agent at all, `orca skills install` stops and asks for
-`--agent` rather than guessing.
-
-To refresh already-installed skills, `orca skills update` mirrors the same
-selection flags (`--skill`, `--all`, `--local`, `--dry-run`) and resolves to
-`npx skills update <names...>` with a matching scope flag — `--global`, or
-`--project` when you pass `--local`:
-
-```bash
-orca skills update --all                                  # update every bundled skill globally
-orca skills update --skill orca-cli --dry-run             # print the npx command without running it
-```
-
-`orca skills update` only refreshes skills that are already installed — it exits
-0 without doing anything for a skill that is missing, so install it first. More
-generally, a 0 exit means the `skills` CLI ran without erroring, not that it
-wrote anything; read its output to confirm what changed.
-
-`--json` covers the skill listing and `--dry-run`. A real run streams the
-`skills` CLI's own non-JSON output and rejects `--json`.
-
-Both commands install onto the machine that runs them. In an Orca SSH workspace
-or the WSL bridge the `orca` shim forwards commands to the Orca host, so they
-refuse to run there and print the command to run on the machine you want.
-
-## Troubleshooting
-
-- `dlopen(): error loading libfuse.so.2`: install `libfuse2`.
-- `Missing X server or $DISPLAY`: install `xvfb`, or start the managed Xvfb
-  service and set `DISPLAY=:99`.
-- `[serve] Xvfb failed to start` or `[serve] Could not start Xvfb`: confirm
-  `command -v Xvfb` and that it is on the service `PATH`.
-- GPU or DRI warnings on a VPS: keep `LIBGL_ALWAYS_SOFTWARE=1` in the service
-  environment.
-- Chromium sandbox errors: confirm the service is running as the non-root
-  `orca` user and that `/opt/orca` is readable by that user, including
-  `/opt/orca/squashfs-root` if you extracted the AppImage.
-- Clients cannot connect: make sure `--pairing-address` is an address reachable
-  from the client, and make sure firewalls allow the selected `--port`.
-- Journal shows `Another Orca instance is already running for this userData
-profile` and the unit exits `3`: another process already owns the profile, so
-  `RestartPreventExitStatus=3` leaves the unit `failed` on purpose. Find the
-  owner with `systemctl status orca-serve` and `pgrep -af orca`. Stop it (or
-  keep it and leave the unit down), then run
-  `sudo systemctl reset-failed orca-serve && sudo systemctl start orca-serve` —
-  `reset-failed` clears the failed state and any start-limit counter. If no owner
-  exists, the lock is stale (Chromium recorded a pid that
-  has since been reused): remove `SingletonLock` and `SingletonSocket` from the
-  userData directory and start again. If an earlier crash-loop already leaked
-  AppImage mounts, list them with `findmnt -rn -t fuse.orca-linux.AppImage` and
-  release only the ones with no live owner using `fusermount -uz <target>` (or
-  `umount -l <target>`), leaving the running instance's mount alone.
-- Service crash-loops right after an upgrade: use [Roll back](#roll-back) with
-  the pre-upgrade `.ready` bundle. Do not rerun the upgrade first; doing so would
-  make the crashing version the next rollback binary. The loop trips
-  `StartLimitBurst`, so any manual `systemctl start` outside that script needs
-  `sudo systemctl reset-failed orca-serve.service` first.
-- Diagnosing other missing libraries: extract the AppImage without launching it
-  with `./orca-linux.AppImage --appimage-extract`, then run
-  `ldd squashfs-root/orca-ide` to list any shared libraries the host is missing.
-  The Electron binary is `orca-ide`, not `orca`; `ldd` on a path that does not
-  exist prints nothing and exits cleanly, which reads as a clean result in
-  exactly the situation where you are hunting a missing library.
diff --git a/docs/reference/ime-regression-checklist.md b/docs/reference/ime-regression-checklist.md
deleted file mode 100644
index bad36127dd53..000000000000
--- a/docs/reference/ime-regression-checklist.md
+++ /dev/null
@@ -1,146 +0,0 @@
-# IME Regression Checklist
-
-## Follow-up issue ledger
-
-These reports define durable acceptance contracts, not only the symptoms from
-one machine.
-
-| Issue                                                                                                                         | Root cause                                                                                                                                                                                 | Ownership invariant                                                                                                                                                                                                                                                                                                                                             | Required evidence                                                                                                                                                                                                                                                                                            |
-| ----------------------------------------------------------------------------------------------------------------------------- | ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------ | --------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------ |
-| [#16911](https://github.com/stablyai/orca/issues/16911) Native Chat preedit overwritten by streaming or attachment settlement | React reconciliation or an asynchronously resolved attachment writes an application draft while the browser owns the composing textarea; duplicate settlement can then re-adopt stale DOM. | From `compositionstart` until the first `compositionend` or blur, the browser owns the textarea. Resolved paths queue at the shared semantic sink; settlement adopts the browser DOM before flushing once.                                                                                                                                                      | Repeated stale streaming rerenders preserve the element and preedit; idle external drafts still synchronize; concurrent SSH completions preserve completion order and duplicates; both settlement orders run once; disable discards queued work; blur does not steal focus; native composition commits once. |
-| [#16949](https://github.com/stablyai/orca/issues/16949) terminal preedit has no visible cursor                                | The opaque composition overlay covers the renderer cursor; at the final cell an over-wide inline preedit can also place its caret beyond the clipped screen.                               | The existing xterm `CompositionHelper` owns a visible caret after the preedit and before any row remainder; final-cell composition end-aligns within the screen while mid-line composition stays left-anchored.                                                                                                                                                 | Start, update, arbitrary-width final-cell containment, mid-line remainder placement, cleanup, and update-without-start are covered; preview and normal terminals inherit the live cursor theme.                                                                                                              |
-| [#16950](https://github.com/stablyai/orca/issues/16950) typing diagnostic records no CJK samples                              | The probe observes echoing keydowns but not reconciled composition commits, then guesses which queued input owns opaque TUI output.                                                        | A reconciled composition is observed even when `compositionend.data` is empty; only an isolated input enters exact percentiles, while overlap or a dropped-input gap produces one aggregate ambiguous burst.                                                                                                                                                    | Recorded Linux IBus empty-data commit, isolated direct and IME samples, mixed-source ambiguity, timeout/cap gaps, UTF-8 output bytes, and stop/drain cleanup are covered.                                                                                                                                    |
-| [#17104](https://github.com/stablyai/orca/issues/17104) Korean preedit repeats the Codex placeholder                          | Generic xterm row-tail reproduction exposed an application-semantic Codex or Claude composer placeholder that presentation style cannot identify safely.                                   | Xterm always preserves generic covered row text. Orca's existing structural composer classifier masks only a verified placeholder during the exact active composition session; repaint reclassification runs only while composing, and end, blur, or disposal clears ownership, class, and listeners. Arbitrary dim output and shell lookalikes remain visible. | Codex prompt/footer and Claude prompt/frame classification, arbitrary all-dim and shell-lookalike negatives, repaint entry and exit, end/blur/disposal cleanup, and rendered Electron proof at cursor column 2 preserving generic row text are covered.                                                      |
-
-## Preedit cell advances (#19315)
-
-Single-codepoint CJK graphemes use the active Unicode provider's cell width and
-measured font advance. Ordinary inline spans preserve browser bidi and baseline
-layout; equal corrections share a run. Keep glyphs unscaled and the underline,
-caret, and candidate textarea aligned with the rendered preedit. Appending ASCII,
-emoji, or another script must not change an existing CJK prefix's correction.
-Combining sequences, emoji, other scripts, and whitespace retain native shaping.
-Font loading, typography changes, and renderer metric changes must update an open
-composition; row-tail repaints preserve its unchanged nodes.
-
-Cold font measurements and styled runs share a fixed work budget. Repeated CJK
-can remain one corrected run; after the budget is exhausted, the remaining text
-keeps its native advance. This deliberately leaves the original spacing mismatch
-in the tail of unusually varied long compositions, without switching the prefix
-back to native spacing or rebuilding thousands of spans.
-
-`terminal-ime-xterm-preedit-cell-grid.test.ts` covers text preservation, native
-clusters, lifecycle, and bounded work. `terminal-ime-preedit-cell-grid.spec.ts`
-checks rendered glyph origins, caret/textarea geometry, underlines, font changes,
-and native shaping at DPR 1, 1.25, and 2 with WebGL on/off.
-`terminal-ime-preedit-continuity.spec.ts` covers mixed suffixes and budget crossings.
-These checks use Chromium composition through CDP; they do not replace native OS
-IME evidence.
-
-## Bounded-state and ownership contracts
-
-Every transient collection and ownership tracker must have an explicit lifetime and bound:
-
-- Native Chat uses `NATIVE_FILE_DROP_MAX_PATHS` (`256`). If a resolved completion would cross the cap, the whole batch is rejected atomically and the overflow notice remains visible through settlement; accepted paths keep order and duplicates. The queue is cleared before re-entry and on disable or pane-owner remount.
-- The terminal placeholder mask tracks one scalar `activeSessionId` because xterm renders one composition view. A newer start supersedes an older one, a stale end cannot clear the latest owner, and blur or disposal clears it. The composition route keeps its per-ID reference-counted map intentionally for transport ownership; it is not replaced by the scalar.
-- Typing diagnostics cap pending and ignored echo candidates at `MAX_PENDING_ECHO_CANDIDATES` (`64`), cap pending user-input signals, drain timed-out candidates, and clear all series on pane detach. Overflow becomes an explicitly ambiguous burst rather than an arbitrary attribution.
-
-## Native Chat asynchronous attachment settlement
-
-Attachment resolution is an external semantic write, including local file
-selection, pasted-image temp saves, and SSH uploads. While composition is active,
-it must not replace the browser-owned textarea value.
-
-- Start two concurrent SSH uploads, resolve the second first, and return one path
-  twice. Preserve completion order and both duplicates.
-- On the first settlement event, adopt the browser DOM before flushing queued
-  paths. Exercise `compositionend` then blur and blur then `compositionend` in
-  one React batch; both orders must adopt and flush exactly once.
-- If the composer becomes disabled before an upload resolves or before the queue
-  flushes, discard that result.
-- If `compositionend` is omitted, blur performs the same one-time settlement
-  without focusing the textarea or stealing focus back.
-
-## Cross-platform verification
-
-Synthetic DOM events prove Orca's event and rendering contracts, but they do
-not exercise the operating system's input method. Changes must also cover:
-
-| Environment | Native evidence                                                                                                                                                                      |
-| ----------- | ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------ |
-| macOS       | A native Korean 2-set composition in Native Chat and a terminal; preedit survives external renders, the caret remains visible, and commit occurs once.                               |
-| Windows     | Microsoft Korean IME over an untouched Codex placeholder; the preedit is the only visible text, the placeholder returns after cancel, and ordinary mid-line content remains visible. |
-| Linux / SSH | IBus Hangul with an SSH-hosted PTY; an empty-data `compositionend` still produces one diagnostic sample and one committed syllable.                                                  |
-
-For remote evidence, `live` means the owning host reported the current
-verification session or process identity. `exited` requires positive
-host-owned evidence that the same identity terminated or is absent. Any
-transport failure, stale identity, timeout, or inability to ask the owning host
-makes the result `unverifiable`; it is never evidence that the composition or
-PTY process exited.
-
-## Code elegance gate
-
-Each fix must pass all of these checks:
-
-- Reuse the component that already owns the state or overlay; do not install a
-  second composition state machine.
-- Make browser, renderer, and PTY ownership boundaries explicit. Provisional
-  text must not leak into committed state or PTY input.
-- Route local selection, pasted-image temp saves, and SSH upload results through
-  one resolved-attachment sink; queue semantic paths, never whole draft snapshots.
-- Keep correctness changes separate from unrelated micro-optimizations.
-- Use bounded per-composition state and work. Dispose every listener, timer,
-  observer, and DOM node with its owner.
-- Preserve ordinary Latin input, mixed styled terminal content, local and SSH
-  PTYs, preview terminals, and folder workspaces with paired negative tests.
-- Keep platform quirks behind event contracts or runtime platform checks; do
-  not branch on an IME vendor, language, or terminal agent name.
-- Treat the canonical xterm source patch as the only hand-edited source, then
-  regenerate its bundle patch and lockfile together.
-- Prefer deterministic replay or state-transition tests. Native evidence is a
-  second layer, never a substitute for regression coverage.
-
-## Enter in application text fields (#25035)
-
-Use `Input`, `Textarea`, or `CommandInput` for styled fields. Existing unstyled
-fields with keyboard actions use `ImeInput` / `ImeTextarea` from
-`lib/ime-text-field.tsx`; those preserve the DOM element, styles, refs, and
-composition callbacks. They share `useImeEnterGestureOwnership` and keep
-IME-owned keys out of both field actions and bubbling form/menu shortcuts.
-Overlay primitives also reject IME-marked Escape in document capture, where
-field-level propagation guards cannot intercept dismissal.
-Do not add a second tracker at a call site already using a guarded field.
-Native Chat and the File Explorer inline name field retain their existing
-trackers because they also own specialized composition or element lifetimes.
-
-Required cases:
-
-- `isComposing`, `keyCode: 229` without `isComposing`, and `Process/229` must
-  never submit, choose a suggestion, or dismiss the field.
-- The unmarked Enter redispatch stays owned on either side of keyup, including
-  a `Process/229` release. A
-  subsequent ordinary typing/navigation key ends that carry immediately;
-  hidden renderers may defer animation frames, and typing a filename suffix
-  must not cause the next deliberate Enter to disappear.
-- Composition callbacks, blur, refs, and keyed remount cleanup still work.
-  Normal Enter, modifier submits, and Shift+Enter newlines remain available.
-- Test the actual shared field when a consumer delegates IME handling to it;
-  a mock that replaces `CommandInput` with a raw input removes the protection.
-
-`ime-text-field.test.tsx` covers primitives, raw fields, parent handlers, and
-command selection. File Explorer component tests cover all three operations
-and input replacement. `file-explorer-ime-enter.spec.ts` drives Chromium
-composition in New File, New Folder, and Rename in a folder workspace, then
-checks the complete name in the Explorer and on disk, with both continued typing
-and a redispatch followed by deliberate Enter. Overlay tests cover IME Escape
-and ordinary dismissal; Markdown tests preserve an unmarked save shortcut while
-composition state lingers. These are CDP event
-contracts, not native OS keyboard evidence.
-
-The audit also covers settings and title fields, issue/review creation and
-pickers, comments and annotations, search fields, Native Chat questions,
-notebook execution shortcuts, and Markdown menu handlers. Terminal input keeps
-its existing xterm/PTY ownership; mobile native fields use `onSubmitEditing`
-instead of desktop DOM keydown actions. Remote workspaces use the same renderer
-fields; file-operation routing and mixed-version wire contracts are unchanged.
diff --git a/docs/reference/linux-glibc-compatibility.md b/docs/reference/linux-glibc-compatibility.md
deleted file mode 100644
index f1dcdda47109..000000000000
--- a/docs/reference/linux-glibc-compatibility.md
+++ /dev/null
@@ -1,182 +0,0 @@
-# Linux glibc Compatibility
-
-Orca's Linux builds target **stock Ubuntu 20.04 and newer** — glibc 2.31 and
-libstdc++ `GLIBCXX_3.4.28` (also Debian 11, RHEL 9), on both x64 and arm64.
-Packaging enforces this floor automatically; keep it in mind when adding or
-upgrading native dependencies. (The optional speech feature is the one
-exception — see below.)
-
-## Local package build prerequisites
-
-`pnpm run build:linux` produces AppImage, deb, and RPM artifacts. The RPM target
-requires `rpmbuild` on `PATH`; install `rpm` on Ubuntu/Debian, `rpm-build` on
-Fedora/RHEL, or `rpm` through Homebrew on macOS, then verify it with
-`rpmbuild --version` before packaging. Cross-host builds have the same
-requirement.
-
-## Why this needs attention
-
-A native module (`.node`) links against the glibc of the machine that compiled
-it. Our release CI compiles node-pty from source on GitHub's `ubuntu-latest`
-runner, whose glibc rises over time as the image is bumped. A binary compiled on
-a newer glibc can reference symbol versions that do not exist on an older target,
-and the dynamic loader then refuses to load it:
-
-```
-/lib/x86_64-linux-gnu/libc.so.6: version `GLIBC_2.34' not found (required by .../pty.node)
-```
-
-Because the Orca main process loads node-pty at startup, that failure crashes the
-whole app before a window appears — this is exactly what shipped in v1.4.150 and
-broke launch on Ubuntu 20.04 ([#9902](https://github.com/stablyai/orca/issues/9902)).
-
-The specific trap is glibc's 2.32–2.34 "libpthread/libutil merge", which moved
-several long-stable functions into libc under brand-new symbol versions:
-
-| Symbol            | New version  | node-pty use            |
-| ----------------- | ------------ | ----------------------- |
-| `pthread_sigmask` | `GLIBC_2.32` | reset child signal mask |
-| `openpty`         | `GLIBC_2.34` | allocate the pty        |
-| `forkpty`         | `GLIBC_2.34` | fork the shell          |
-
-Electron itself (glibc 2.25) and the other bundled native modules
-(`sherpa-onnx`, `@parcel/watcher`, both prebuilt on old glibc) stay well under
-the floor, so node-pty was the sole blocker.
-
-## How we keep the floor
-
-**1. Pin the relocated symbols (the fix).**
-[`config/patches/node-pty@1.1.0.patch`](../../config/patches/node-pty@1.1.0.patch)
-adds a `.symver` shim in `src/unix/pty.cc` that binds `openpty`, `forkpty`, and
-`pthread_sigmask` to their pre-merge version node — `GLIBC_2.2.5` on x64,
-`GLIBC_2.17` on arm64 (each architecture's baseline glibc). glibc still ships
-those as compatibility aliases, so the reference resolves on both new build hosts
-and old targets.
-
-The catch: gcc defaults to `--as-needed` and, since the pinned symbols now
-resolve from libc's compat aliases at build time, it drops `libutil`/`libpthread`
-from `DT_NEEDED`. On the target those libraries are where the symbols actually
-live, so the patch's `binding.gyp` `ldflags` force
-`-Wl,--no-as-needed,-l:libutil.so.1,-l:libpthread.so.0` back into `DT_NEEDED`.
-The shim is guarded by `#if defined(__linux__)`; macOS and Windows are untouched.
-
-**2. Gate packaging (the regression guard).**
-[`config/scripts/verify-linux-glibc-floor.cjs`](../../config/scripts/verify-linux-glibc-floor.cjs)
-runs in the electron-builder `afterPack` hook for Linux. It reads every bundled
-native binary's version needs (`objdump -p` "Version References" — the
-authoritative load-time list, which also captures symbol-less markers like
-`GLIBC_ABI_DT_RELR`) and fails the build if any strong `GLIBC_`/`GLIBCXX_`/
-`CXXABI_` node is newer than stock Ubuntu 20.04 provides, naming the file and the
-offending node. Weak needs are ignored (the loader tolerates them). It also
-asserts the flip side of the `.symver` fix: any binary that imports
-`openpty`/`forkpty` must keep `libutil.so.1` in `DT_NEEDED` — otherwise the
-pinned `openpty@GLIBC_2.2.5` resolves from libc's compat alias at build time (so
-the version check passes) yet fails to load on 20.04, where those functions live
-only in libutil. A future runner bump, a new native dependency, or a dropped
-ldflag therefore fails the release build instead of shipping a Linux app that
-crashes on launch.
-
-> The gate is a static invariant, not an integration test. The load path was
-> verified by hand for this fix (real Ubuntu 20.04, x64 + arm64: `require`
-> node-pty and spawn a shell). A CI smoke test that loads the packaged
-> `pty.node` in a glibc-2.31 container and spawns a shell is the recommended
-> follow-up — it would make the load path self-verifying and stay valid even if
-> the build ever moves to an old-glibc sysroot.
-
-The one carve-out is the `sherpa-onnx` speech prebuilt, which already requires
-`GLIBCXX_3.4.29` (GCC 11). It loads lazily in the speech worker
-(`src/main/speech/stt-worker.ts`), never at app launch, so it is exempt from the
-libstdc++ floor — its glibc needs are still checked. Speech-to-text therefore
-needs a host with libstdc++ from GCC 11+ (Ubuntu 21.10 / 22.04 LTS or newer); the
-app itself still launches on stock 20.04.
-
-**3. Check before loading, on hosts that ship without a compiler (`orcad`).**
-The two gates above protect the packaged desktop app, where the binary is built and
-verified by the same pipeline. `orcad` is deployed to hosts Orca never built on, so it
-adds a runtime precondition
-([`src/main/orcad/node-pty-precondition.ts`](../../src/main/orcad/node-pty-precondition.ts)),
-run from `main.ts` before anything requires `node-pty`. It loads the addon in a **child
-process**, so a binary the loader refuses — or one that aborts outright — is data rather
-than this process's death, and the operator gets a sentence naming the host's libc, its
-Node ABI, its prebuild slot and the command to run. A proven-unloadable binary exits 78
-(`EX_CONFIG`) instead of reaching the `require`; a probe that never answered is reported
-as unverifiable and boots anyway, because a silent probe is not evidence. Whatever it
-finds is published in `status.get`'s `degradations[]` under `terminal_unavailable`.
-
-**4. Ship the binary, built from patched sources.**
-[`config/scripts/build-orcad-prebuilds.mjs`](../../config/scripts/build-orcad-prebuilds.mjs)
-(`pnpm run build:orcad-prebuilds`, before `build:orcad`, which copies its target's slot into
-the package's `node_modules/node-pty/build/Release`) compiles node-pty for the current
-host against the pinned Node's hash-verified headers at N-API 8, and files it under
-`out/orcad-prebuilds/<slot>/`, where a slot is `linux-{x64,arm64}-{glibc,musl}`,
-`darwin-{x64,arm64}` or `win32-{x64,arm64}`. Its `manifest.json` records each file's
-sha256, the N-API level and, for glibc slots, the highest `GLIBC_` version the binary
-needs; the loader checks N-API, libc, arch and that glibc version before it installs a
-slot. glibc slots are built in a `manylinux_2_28` (AlmaLinux 8) container and pass the
-same gate at a **glibc 2.28 / `GLIBCXX_3.4.25`** floor instead of the desktop's 2.31, because
-the pinned Node they ship beside already runs on 2.28 and a 2.31 slot would leave 2.28–2.30
-hosts with a runtime but no terminal (design D6). The container's gcc-toolset supplies C++20
-and links newer libstdc++ symbols statically, so the slot needs only RHEL 8's system
-libstdc++. musl slots skip the gate, since they never meet glibc's libraries. libc is part
-of the slot name because node-pty's own loader falls back to `prebuilds/<platform>-<arch>`
-and cannot tell glibc from musl — a glibc binary parked there is loaded on Alpine and dies at `dlopen`.
-The script refuses to compile a tree where `config/patches/node-pty@1.1.0.patch` is not
-applied: without the patch the prebuilt is a #9902 crash shipped as an artifact rather
-than a first-connect error. CI runs it once per slot inside the matching container
-(`--slot=` forces the label), merges the trees, and `--require-slots` fails a release with
-a hole in the matrix; `--require-slots <slot>` checks one slot's files against their
-hashes and `--smoke` loads it under the pinned Node and spawns a PTY
-(`.github/workflows/node-server-tests.yml` runs both on every slot's runner).
-
-The opt-in `linux-x64-glibc217` compat slot (rung B, not part of the default matrix) is
-built in `manylinux2014_x86_64` (glibc 2.17, devtoolset C++20) with `-static-libstdc++`,
-gated at a glibc 2.17 floor, refused if `libstdc++.so`/`libgcc_s.so` remains in
-`DT_NEEDED`, and smoked under the unofficial glibc-217 Node pinned in
-`NODE_RUNTIME_COMPAT_ASSETS`. Nothing installs it yet: the loader and the SSH deploy
-still choose only default slots.
-
-## Adding or upgrading a native dependency
-
-- Prefer packages that ship prebuilt binaries compiled against an old toolchain
-  (manylinux / `glibc 2.17`-class), like `@parcel/watcher`.
-- For a module we compile from source, if the gate flags it, either pin the
-  offending symbols the way node-pty does, or build it in an old-glibc container.
-- To check locally on a Linux host, list what a binary requires (skipping the
-  weak `0x02`-flagged needs the loader tolerates):
-
-  ```bash
-  objdump -p path/to/module.node | sed -n '/Version References/,/^$/p'
-  ```
-
-  No strong `GLIBC_` node may exceed `2.31`, and no `GLIBCXX_`/`CXXABI_` node may
-  exceed `3.4.28`/`1.3.12` — what stock Ubuntu 20.04 ships.
-
-## Runtime floor: the `environ` race below glibc 2.41 (Electron ≥ 43.7.0)
-
-Separate from the build floor above, one glibc runtime bug constrains which
-Electron we may ship. Before glibc 2.41, `setenv`/`unsetenv` reallocate the
-`environ` array and **free** the old one, so a concurrent `getenv()` on another
-thread reads freed memory. Ubuntu 20.04–24.04 (2.31–2.39) are all below that
-line, so every Linux target we support is exposed.
-
-Electron 43.5.0 made that latent race reachable on every launch: it started
-setting `GDK_GL=disable` around `gtk_init()` and unsetting it right after, while
-in the same change moving FontConfig warm-up onto a thread-pool thread that runs
-concurrently and calls `getenv()` constantly
-([electron#53070](https://github.com/electron/electron/pull/53070)). The result
-is a browser-process use-after-free about a second into startup — no window, no
-GPU child involved, and the corruption surfaces wherever the next allocation
-lands, which is why reports name unrelated frames (`gtk_widget_realize`,
-libxcb-dri3, FontConfig/expat). Orca 1.4.199/1.4.200 shipped that runtime and
-died on launch on Ubuntu + NVIDIA/X11
-([#20081](https://github.com/stablyai/orca/issues/20081)).
-
-Electron 43.7.0 fixes it by overriding `setenv`/`unsetenv`/`putenv`/`clearenv`
-so a published `environ` is never freed, deferring to glibc on 2.41+
-([electron#53491](https://github.com/electron/electron/pull/53491), backported
-to 42/43/44/45). **Do not downgrade Electron below 43.7.0, or move to another
-line, without confirming that backport is in the target release** —
-`config/scripts/electron-runtime-floor.test.ts` fails the suite if the pin drops
-below the floor. Orca itself writes `process.env` during early startup
-(`patchPackagedProcessPath`, `configureOrcaUserDataPathEnv`,
-`hydrate-shell-path`), so it is a first-class trigger, not just a bystander.
diff --git a/docs/reference/macos-press-and-hold.md b/docs/reference/macos-press-and-hold.md
deleted file mode 100644
index 946a1ff71250..000000000000
--- a/docs/reference/macos-press-and-hold.md
+++ /dev/null
@@ -1,58 +0,0 @@
-# macOS press-and-hold and key repeat
-
-macOS opens the accent picker when a key is held unless an application opts out in its preferences
-domain. That prevents held keys from repeating in terminal applications such as vim. On the first
-eligible launch, Orca writes:
-
-```sh
-defaults write com.stablyai.orca ApplePressAndHoldEnabled -bool false
-```
-
-The write is scoped to Orca's packaged bundle domain. Bare Electron development bundles and
-non-macOS platforms are left untouched. A fresh write is conservatively treated as taking effect
-on the next launch.
-
-## Precedence and decision record
-
-Orca checks for an explicit domain value before writing. Either `true` or `false` is treated as a
-user choice and preserved. Only an unset key receives the `false` default.
-
-The decision is stored once in
-`<userData>/macos-press-and-hold-default.json`. An `applied` or
-`kept-user-preference` decision prevents future launches from touching the domain again.
-Probe and write failures remain retryable so a transient failure does not permanently disable the
-fix.
-
-`defaults read <domain> <key>` is used instead of
-`systemPreferences.getUserDefault`: the Electron API cannot distinguish an unset key from an
-explicit `false`. Only the missing-key exit status is interpreted as unset; spawn failures,
-timeouts, and other exit statuses leave the preference alone.
-
-## Restoring the accent picker
-
-Set the preference explicitly, then restart Orca:
-
-```sh
-defaults write com.stablyai.orca ApplePressAndHoldEnabled -bool true
-```
-
-After Orca has recorded its one-time decision, deleting the key also restores the macOS default
-without Orca recreating it:
-
-```sh
-defaults delete com.stablyai.orca ApplePressAndHoldEnabled
-```
-
-Development and prerelease channels may use a channel-suffixed Orca bundle identifier; use that
-domain instead when applicable.
-
-## Reverting
-
-Deleting the startup code is not enough. AppKit reads the persisted preference, so a code revert
-must also arrange to delete the key for users who ran an affected build.
-
-## Test coverage
-
-Unit tests cover platform guards, explicit-value preservation, retry behavior, domain ownership,
-record persistence, and subprocess exit interpretation on CI. A macOS-only test additionally pins
-the real `defaults(1)` behavior, but current PR CI does not execute tests on macOS.
diff --git a/docs/reference/malformed-worktree-registration-removal.md b/docs/reference/malformed-worktree-registration-removal.md
deleted file mode 100644
index 34a32e58caf7..000000000000
--- a/docs/reference/malformed-worktree-registration-removal.md
+++ /dev/null
@@ -1,43 +0,0 @@
-# Malformed worktree registration removal
-
-Git can report a linked worktree at `<checkout>/.git` when its administrative
-`gitdir` backlink incorrectly ends in `.git/.git`. That reproduces #17316's
-validation error. The reproduction establishes the malformed registration, not
-which program created it; current OMP uses ordinary `git worktree add`.
-
-Orca's desktop and runtime removal entry points use registration-only recovery
-when Git positively marks the row prunable, the row has a named local branch and
-HEAD, it is neither main nor locked, and the execution filesystem confirms the
-selected `.git` path is a regular file. Missing or unknown evidence does not
-permit this recovery. A symlink or directory is not a regular-file proof.
-
-Recovery reuses `git worktree prune` followed by a strict worktree listing that
-must confirm the selected registration is gone. It does not delete the selected
-file, infer a parent path for deletion, or delete the branch. Archive hooks and
-checkout teardown are skipped because the selected row is not a checkout.
-
-Two consequences are intentional:
-
-- Git's prune also clears other stale, unlocked registrations in the repository;
-  it is not a path-scoped command. Live and locked registrations remain Git's
-  responsibility, and Orca verifies that the requested registration disappeared.
-- The surviving checkout's `.git` file points at removed administrative metadata.
-  Files and its named branch are preserved; recovery removes the broken navigation
-  entry and does not repair or claim to restore that checkout.
-
-Native and WSL checks use the existing execution-filesystem accessor. WSL prune
-and verification use the same selected distro. Paired runtimes run the recovery
-on their owning host. Direct SSH does not enter this local recovery: its current
-provider has no registration-only removal operation, and a failed remote removal
-never authorizes a local fallback.
-
-The Git commands already exist in the 2.25-compatible cleanup path. On an older
-Git that cannot positively attest this file-shaped registration as prunable, Orca
-refuses this recovery. Deferred deletion independently rejects non-directory and
-symlink targets, so force cannot move a `.git` file into deletion trash.
-
-Regression coverage is in `worktree-prunable-git-file.test.ts`,
-`worktrees-removal-recovery.test.ts`, and
-`worktree-deferred-removal-real-git.test.ts`. The latter reproduces the exact
-malformation against the installed Git binary in a disposable repository and
-checks surviving file contents, branch HEAD, and removed registration.
diff --git a/docs/reference/managed-data-accounts.md b/docs/reference/managed-data-accounts.md
deleted file mode 100644
index c0a78d001d51..000000000000
--- a/docs/reference/managed-data-accounts.md
+++ /dev/null
@@ -1,23 +0,0 @@
-# Managed OpenCode and Devin accounts
-
-Run enrollment in a terminal on the machine running Orca:
-
-```sh
-orca account add --agent opencode --label Work
-orca account add --agent opencode --integration opencode-go --label Work
-orca account add --agent devin --label Work
-orca account list --agent opencode --json
-orca account select --agent opencode --account <id>
-orca account select --agent opencode --account system
-orca account rm --agent opencode --account <id>
-```
-
-OpenCode enrollment requires OpenCode 2 and runs its official `auth login --standalone` command. Devin runs `auth login --force-manual-token-flow`; obtain the enrollment token through Devin's supported login flow. These commands neither reuse a guessed token nor sign out the system account. Settings → AI Provider Accounts provides the enrollment command, refresh, selection, and removal for the selected Orca host.
-
-Each profile belongs to the execution host. OpenCode's SQLite credentials and Devin's credential TOML stay in private Orca user-data directories. Enrollment isolates XDG data/config/cache/state, copies only authenticated credentials, and then deletes the temporary directory. OpenCode capture rejects databases containing conversations and includes SQLite WAL contents. RPC summaries contain labels, IDs, and integration names, never tokens or credential paths. Only the authenticated local runtime socket can import a credential directory; paired clients cannot ask the host to read arbitrary paths.
-
-Selection affects newly launched explicit OpenCode/Devin commands and agent launches. It redirects XDG data and state; OpenCode inline-auth/database overrides cannot bypass the profile. Shell wrappers restore this selection after user startup files. Existing provider configuration and environment-based integrations remain available. Running terminals retain their current profile. Stop agents before removing a profile: removal also deletes conversations created in that private profile, without changing the system login.
-
-For SSH, enroll by running the command on a headless Orca runtime on the remote machine. The remote runtime owns its profiles and selection; a desktop client's credential paths never cross SSH. Direct SSH relay launches and Windows-hosted WSL panes do not consume the desktop host's profiles. Run a headless runtime inside that execution environment instead. Folder workspaces use the same host account store as git worktrees. Older Orca hosts reject new operations before login through capability negotiation.
-
-Validation covers OpenCode 2.0.16 on macOS and Linux arm64, including isolated official enrollment, selected and System background-terminal credential checks, reselection, and profile deletion. Linux checks used the Node headless runtime in an Ubuntu 24.04 container. Devin 3000.10.31 saved-login recognition was checked on macOS. Fresh Devin manual-token enrollment, a physical SSH host, Linux desktop UI, Windows, and Windows-hosted WSL still require verification.
diff --git a/docs/reference/monaco-language-associations.md b/docs/reference/monaco-language-associations.md
deleted file mode 100644
index ee985d859597..000000000000
--- a/docs/reference/monaco-language-associations.md
+++ /dev/null
@@ -1,34 +0,0 @@
-# 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, plus curated Ruby associations in the generator.
-Those add `.rake`, `.ru`, `.jbuilder`, `.thor`, `Guardfile`, `Capfile`, `Podfile`,
-`Brewfile` and `Vagrantfile` to the existing Ruby grammar. Change these in
-`config/scripts/generate-monaco-associations.mjs`, not the generated JSON.
-Regenerate after changing the curated associations or 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 and curated associations. 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/omp-fresh-launch.md b/docs/reference/omp-fresh-launch.md
deleted file mode 100644
index ea6679381725..000000000000
--- a/docs/reference/omp-fresh-launch.md
+++ /dev/null
@@ -1,51 +0,0 @@
-# Fresh OMP launches
-
-Orca's new-session and draft launch plans apply a one-time `--config` overlay
-containing `autoResume: false`. OMP's configured session directory, settings,
-authentication and extensions remain in their usual locations. Saved launch
-configuration omits the overlay so explicit resume keeps its normal semantics.
-Custom commands with session selectors, unknown flags, positional arguments or
-shell compounds are left unchanged.
-
-The execution host creates the overlay. Local and WSL terminals use Orca userData
-(with WSLENV path translation); SSH relays use their own managed directory. Config
-creation is independent of status-hook preferences and does not require plugin
-source installation. An unavailable file produces a terminal diagnostic and skips
-OMP. Filesystem failures do not prevent unrelated agents or bare shells starting.
-
-The guard invokes OMP in the current shell, preserving functions, aliases and the
-managed status wrapper. A nonzero agent exit never triggers a second launch.
-POSIX commands also support fish; environment presence is checked before expansion
-so an old host under `set -u` reports the same missing-settings diagnostic.
-
-## Mixed versions
-
-The existing command and environment transport carries the launch unchanged; no
-new RPC or stream opcode is introduced. A new host exports the path before shell
-startup, including bare shells that receive an OMP command later. An old client
-continues its existing launch behavior on a new host. A new fresh-launch command
-on an old host without the managed environment fails visibly and requests a host
-update and terminal restart. It must not silently fall back to OMP auto-resume.
-
-## Verification
-
-`src/shared/omp-fresh-launch-shell.test.ts` runs actual available bash, zsh and fish
-shells, checking exact argv, a single invocation, nonzero exit, deleted settings
-and an absent environment variable. `src/relay/omp-fresh-launch-environment.test.ts`
-checks the guarded command through relay environment assembly and the actual OMP
-shell wrapper, retaining both extension and config arguments and prefill.
-Local host assembly tests recognize guarded POSIX, cmd and PowerShell commands.
-
-Run the actual OMP storage smoke against a read-only OMP checkout:
-
-```sh
-ORCA_BACKGROUND_LAUNCH=1 bun tests/tools/omp-fresh-session-runtime-smoke.mjs /path/to/oh-my-pi
-```
-
-For Windows, bundle `tests/tools/omp-fresh-launch-windows-smoke.ts` with
-`bun build --target=node --outfile=/tmp/omp-fresh-windows-smoke.mjs`, transfer the
-bundle to the host and run it using Node with `ORCA_BACKGROUND_LAUNCH=1`.
-The smoke uses temporary files and process-local environment only. Both cmd and
-PowerShell must pass existing/missing/unset/directory settings cases, preserving
-exit 17 for the single successful launch and returning exit 1 without launching
-when settings are unavailable. This passed on Windows host `awin` on 2026-09-14.
diff --git a/docs/reference/omp-history-titles.md b/docs/reference/omp-history-titles.md
deleted file mode 100644
index f238574ef2a0..000000000000
--- a/docs/reference/omp-history-titles.md
+++ /dev/null
@@ -1,34 +0,0 @@
-# OMP history titles
-
-The message-graph scanner uses persisted OMP names ahead of the first user prompt:
-`session.title`, version-1 `title` slots, `title_change.title`, and legacy
-`session_info.name`. Empty or unsupported metadata leaves the previous name or
-prompt fallback intact. Non-OMP graph parsing keeps its existing title policy.
-
-Explicit user names outrank automatic names. Within the same source, timestamps
-prevent the current first-line title slot from being replaced by older rename
-entries later in the file. Newer appended renames still update the row. Legacy
-records without timestamps retain file-order handling.
-
-The graph fold stores title authority alongside the existing accumulator. Clones
-retain it without sharing mutable accumulator or preview state, while preserving
-the existing identity and message-consumer contracts. Cached append parsing uses
-the normal durable offset; no extra scan, process, poll or watcher is introduced.
-
-The parser is shared by local and remote content readers and uses transcript data
-from the execution host. It performs no client-side path lookup and changes no
-wire shape. Folder workspaces require no git metadata.
-
-Run actual persistence and cache validation with a read-only OMP checkout:
-
-```sh
-ORCA_BACKGROUND_LAUNCH=1 bun tests/tools/omp-history-title-smoke.mjs /path/to/oh-my-pi
-```
-
-The smoke persists a first prompt, performs a real OMP user rename, and verifies
-both cold and incrementally cached scans. It checks one full parse, one append
-parse and identical-object reuse on an unchanged scan. All home/config/data roots
-are disposable; no model requests are made.
-
-This is the OMP subset of the history-name behavior proposed in PR #15696 by
-Brennan Benson. Pi naming and title changes in the terminal are separate concerns.
diff --git a/docs/reference/omp-resume-transcript-locator.md b/docs/reference/omp-resume-transcript-locator.md
deleted file mode 100644
index 75e38b798cbb..000000000000
--- a/docs/reference/omp-resume-transcript-locator.md
+++ /dev/null
@@ -1,28 +0,0 @@
-# OMP recorded transcript resume
-
-A sleeping OMP session can retain its transcript path from a hook without an
-explicit `launchConfig.ompResumeFilePath`. Both cold-restore startup and generic
-sleeping-session launch already forward the provider metadata to
-`getAgentResumeArgv`; that builder must keep the recorded path.
-
-Resolution order is explicit launch path, recorded transcript path, then UUID.
-The existing shell-aware builder quotes the selected argument for the execution
-host. An older metadata record without a path retains UUID fallback. OMP provider
-claim keys and equality remain UUID-based, so a later hook adding the path does
-not create a second automatic-resume identity.
-
-`tests/tools/omp-resume-transcript-locator-smoke.mjs` creates an actual OMP session
-outside its default session store. UUID lookup fails there; the absolute path and
-Orca's generated argv resume the original session. Run it with Bun and a read-only
-OMP checkout as argv[2], under `ORCA_BACKGROUND_LAUNCH=1`. It uses a disposable home
-and makes no model requests.
-
-This bounded correction follows the resume-locator portion of
-[PR #16276](https://github.com/stablyai/orca/pull/16276) by @CodeHourra. It does not
-adopt that PR's reattach injection or title changes. The reattach proposal treats
-missing snapshot/replay as permission to type a resume command, but
-`daemon-pty-spawn-result.ts` explicitly permits `isReattach: true` without a
-snapshot. That payload absence is not positive evidence of a newly created shell.
-The proposal also adds the path to OMP claim identity, which separates UUID-only
-metadata from a later path-enriched record for the same provider session. Those
-changes require separate evidence and are outside this patch's review scope.
diff --git a/docs/reference/omp-runtime-session-provenance.md b/docs/reference/omp-runtime-session-provenance.md
deleted file mode 100644
index 8d6e33577d97..000000000000
--- a/docs/reference/omp-runtime-session-provenance.md
+++ /dev/null
@@ -1,23 +0,0 @@
-# OMP runtime session provenance
-
-OMP computes whether a runtime session is a task child, but the released
-`ExtensionContext` does not expose that value. The status extension therefore uses
-the session manager's parent header and nested task transcript path only when a
-root owner is already known. A nested transcript with no known owner remains
-eligible because it may have been resumed directly as the pane's main session.
-
-The remaining child-first case is inherently ambiguous to Orca: task children and
-resumed child transcripts have the same public session-manager shape. A complete
-child-first fence requires OMP to expose its computed `agentKind` through
-`ExtensionRunner.createContext`; until then the conservative fallback avoids
-silencing valid resumed sessions.
-
-Older runtimes retain the manager-identity guard. That guard assumes the main
-session reaches Orca's callback before any child. An earlier user extension can
-initialize a child during session_start and violate that assumption. Keep the
-ownership merge assessment conditional until the runtime API is available and the
-combined flow is validated. Neither callback timeouts, UI presence, nor transcript
-paths establish runtime ownership.
-
-The guard remains scoped to one pane and launch token. It does not define how
-several independent SDK/ACP roots sharing one process and pane should be attributed.
diff --git a/docs/reference/omp-session-roots.md b/docs/reference/omp-session-roots.md
deleted file mode 100644
index 481d5f205c21..000000000000
--- a/docs/reference/omp-session-roots.md
+++ /dev/null
@@ -1,53 +0,0 @@
-# OMP transcript roots
-
-Native chat lookup, history discovery and the history path allowlist use
-`src/main/ai-vault/omp-session-root.ts` on the execution host. The resolver follows
-the active runtime environment rather than scanning every profile.
-
-The behavior matches OMP's `packages/utils/src/dirs.ts`:
-
-- On Linux and macOS, an existing `$XDG_DATA_HOME/omp` selects that app's `sessions`
-  directory, even when legacy transcripts coexist. The sessions directory itself
-  need not exist yet. There is no implicit `~/.local/share` fallback.
-- A named profile uses XDG only when its own `omp/profiles/<name>` path exists;
-  otherwise it uses the profile's config-root `agent/sessions` directory.
-- `OMP_PROFILE` takes precedence over `PI_PROFILE`, including an explicitly empty
-  canonical value. Named profiles ignore custom `PI_CODING_AGENT_DIR` values.
-  Default mode respects custom agent directories, except an inherited agent path
-  derived from the lower-priority profile. `PI_CONFIG_DIR` selects the config root
-  relative to the owning host's home, as upstream specifies.
-- Orca retains its legacy `OMP_CODING_AGENT_DIR` sessions-root override and prefix
-  normalization. Explicit scan roots override environment discovery. Empty or
-  filesystem-root scan overrides and invalid profile names refuse discovery;
-  they never fall back to a different profile or the process working directory.
-
-The desktop scanner child allowlist forwards only the required directory/profile
-variables. SSH relay discovery still builds legacy roots from its host-owned home
-and does not gain XDG/profile discovery here. Client XDG/profile values are not
-applied to WSL home roots. Exact hook
-paths and existing WSL attestation/refusal remain authoritative. No wire fields
-or opcodes change; older clients receive the existing session record shape.
-
-This resolves environment-visible configuration. Per-command `--profile` choices
-or directory values loaded only inside the agent are not inferred by a runtime
-that never received them; hook-reported transcript paths remain the exact route.
-
-Run the read-only upstream parity smoke with:
-
-```sh
-ORCA_BACKGROUND_LAUNCH=1 bun tests/tools/omp-session-root-upstream-smoke.mjs /path/to/oh-my-pi
-```
-
-The smoke uses disposable home/data roots and compares Orca's result with OMP's
-actual directory resolver. It makes no model requests. Unit tests also cover
-Windows XDG exclusion, legacy override normalization and refusal paths.
-
-For actual persistence-to-reader validation, run:
-
-```sh
-ORCA_BACKGROUND_LAUNCH=1 bun tests/tools/omp-transcript-root-reader-smoke.mjs /path/to/oh-my-pi
-```
-
-This creates default and named-profile transcripts through OMP's SessionManager,
-with legacy directories still present, then resolves and decodes each by session
-ID through Orca's native reader. All files use disposable roots; no model runs.
diff --git a/docs/reference/omp-startup-keyboard-query.md b/docs/reference/omp-startup-keyboard-query.md
deleted file mode 100644
index 7a675e4e0b26..000000000000
--- a/docs/reference/omp-startup-keyboard-query.md
+++ /dev/null
@@ -1,15 +0,0 @@
-# OMP startup keyboard capability query
-
-OMP's ProcessTerminal sends `CSI ? u` and then a DA1 sentinel before selecting its keyboard encoding. A fresh desktop terminal already advertises Kitty support, but a direct New Tab launch can query before that renderer owns replies. Previously startup ingress answered only OSC color queries.
-
-The renderer now supplies optional `terminalKittyKeyboardProtocol: true` from its actual xterm `vtExtensions.kittyKeyboard` setting. The existing local/SSH/paired spawn route places it in startup ingress as optional `kittyKeyboardProtocol`. Missing or false capability leaves behavior unchanged, including panes that deliberately withhold Kitty on native Windows. The ingress version and stream opcodes do not change. Terminal creation accepts additive fields, but host-authoritative `terminal.createAgentSession` and `terminal.ensureAgentSession` use strict schemas. Clients send the keyboard flag on those methods only after the host advertises `agent-session.keyboard.v1`. The negotiated payload stays fixed across launch retries; old hosts receive the original payload and retain the renderer fallback. New hosts accept older clients that omit the flag. Paired background launches use the same negotiated support and default paired-terminal advertisement; legacy terminal creation receives the additive flag.
-
-Source ingress answers only the exact first `CSI ? u` before its deadline/renderer handoff. It uses the existing mode tracker for preceding flag pushes and the existing reply-delivery echo guard. Its transformed source span consumes the query once, while the following DA1 and Kitty mode-setting bytes retain their sequence ranges and reach the renderer. Keyboard intent does not require theme colors. Color and Kitty authority end independently: answering both colors does not end Kitty handling, and ConPTY's persistent color ownership does not retain Kitty ownership after handoff.
-
-Run the actual OMP protocol smoke with a read-only reference checkout:
-
-```sh
-ORCA_BACKGROUND_LAUNCH=1 bun tests/tools/omp-startup-keyboard-smoke.mjs /path/to/oh-my-pi > /tmp/omp-startup-keyboard.json
-```
-
-This uses OMP's real ProcessTerminal with intercepted process-local stdin/stdout, a disposable HOME, and no model call. It verifies negotiation before any renderer attaches, a single reply, preserved mode push, and contiguous raw sequence coverage. It does not constitute live Windows/SSH or rendered shortcut proof.
diff --git a/docs/reference/omp-status-input-redaction.md b/docs/reference/omp-status-input-redaction.md
deleted file mode 100644
index 80df07dbb6c1..000000000000
--- a/docs/reference/omp-status-input-redaction.md
+++ /dev/null
@@ -1,39 +0,0 @@
-# Pi/OMP status tool-input redaction
-
-Generated tool_call and tool_execution_start hooks sanitize inputs on the agent's
-execution host before passing them to the existing status transport. Inputs that
-reference `.ssh`, `.ssh-mcp`, `.mcp-secrets.env`, or
-`.omp-backups-archive/omp-bak-keyfile` become `{ redacted: true }`. Matching includes
-nested values, property names, Windows separators, case variants and shell token
-boundaries. Sibling names such as `.ssh-backup` remain ordinary data.
-
-The sanitizer copies data descriptors into objects without prototypes. It never
-passes the source object's toJSON or getters to the transport. Cycles, accessors,
-class instances, symbols, functions and non-JSON primitives redact the whole input.
-Repeated ordinary object references are allowed. Depth, visited values, reserved
-array slots (including holes) and inspected text have conservative bounds to avoid
-moving unbounded work into synchronous JSON serialization.
-
-This policy targets credential-path references in status tool inputs. It does not
-scan transcript files, tool outputs, prompts or arbitrary secret values, and does
-not erase previously persisted status. Proxy reflection traps can still run when
-JavaScript inspects a proxy; the sanitizer is not an isolation boundary against a
-malicious extension in the same process.
-
-Ordinary question envelopes and preview input shapes remain unchanged. Older
-clients already accept object-valued tool_input; no RPC fields or opcodes change.
-The same generated code runs on local, WSL and SSH agent hosts; no local filesystem
-lookup or substitution is introduced. Folder workspaces require no special path.
-
-This follows PR #9554's credential-reference policy, with descriptor copying and
-bounded serialization correcting its validation-then-original-object approach.
-
-Run the actual OMP loader/native HTTP smoke with a read-only checkout:
-
-```sh
-ORCA_BACKGROUND_LAUNCH=1 bun tests/tools/omp-status-input-redaction-smoke.mjs /path/to/oh-my-pi
-```
-
-It loads Orca's generated extension through OMP, invokes synthetic tool events,
-and inspects three real loopback HTTP payloads. Home/config/data roots are
-disposable; it makes no model requests and does not claim an interactive tool run.
diff --git a/docs/reference/orcad-operations.md b/docs/reference/orcad-operations.md
deleted file mode 100644
index 961b7fa1e004..000000000000
--- a/docs/reference/orcad-operations.md
+++ /dev/null
@@ -1,399 +0,0 @@
-# Running orcad
-
-`orcad` is the Orca runtime served from plain Node. This is the contract between it and
-whatever supervises it: what it binds, what it owns on disk, who restarts what, and what its
-readiness payload actually proves.
-
-## Two long-lived processes, not one
-
-A deployment is **orcad** plus **the terminal daemon**.
-
-|            | orcad                            | terminal daemon                       |
-| ---------- | -------------------------------- | ------------------------------------- |
-| Started by | the supervisor                   | orcad, detached                       |
-| Owns       | RPC, git, worktrees, persistence | every local PTY                       |
-| Lifetime   | one supervised run               | detached from orcad, not its service  |
-| Endpoint   | `ws://<bind>:<port>`             | `<data-root>/daemon/daemon-v<N>.sock` |
-
-orcad detaches the daemon and calls `disconnectDaemon()`, never `shutdownDaemon()`. The
-built-in remote deployment path stops only the recorded orcad PID, so the daemon and its PTYs
-survive. The successor adopts the current endpoint and routes supported previous protocol
-versions through legacy adapters. This makes a PID-scoped update, rollback or restart
-non-destructive to live work.
-
-Process detachment is not service isolation. A daemon that orcad launches directly, and every
-PTY it owns, remain in the same systemd service cgroup. `KillMode=mixed` does **not** preserve
-them: it sends the graceful stop signal only to the main process, then sends `SIGKILL` to every
-process remaining in the cgroup the moment that main process exits — `TimeoutStopSec` never gets
-the chance to apply. `KillMode=control-group` is destructive too. `KillMode=process` leaves
-service-owned processes unmanaged and is not a supported preservation mechanism.
-
-Service-restart survival therefore requires a separately supervised cgroup, and orcad now asks
-for one: on Linux it launches the daemon through `systemd-run --user --scope`, which places the
-daemon and its PTYs in their own transient `orca-daemon-<launch-nonce>.scope` unit under the
-user slice instead of the caller's service cgroup. A stop or restart of the service unit then
-leaves that scope — and the live terminals in it — running, and the successor adopts the
-endpoint as it always has.
-
-A newly launched private daemon scope also follows the daemon's own lifetime. A small
-detached shell holds an input pipe from the daemon; after that pipe closes and `/proc`
-confirms the daemon PID is gone, it asks the user manager to stop that exact scope.
-Systemd sends remaining processes SIGTERM and escalates after five seconds. This includes
-children that double-forked or called `setsid` and can no longer be found by parent PID.
-Disconnecting or restarting the runtime does not close the pipe: the daemon owns it.
-
-The cleanup only arms on a fresh scoped launch with a matching launch nonce. Adopted
-legacy scopes can contain GUI processes and are never armed retroactively. Unscoped
-launches and children deliberately moved into another systemd unit remain outside this
-cleanup. `nohup`, `disown`, and `tmux` alone do not move a process out of its cgroup, so
-those children now end when their terminal daemon dies. Work intended to outlive that
-daemon needs its own service or scope.
-
-The scope is requested only where it can work. All of these must hold:
-
-- **Linux with systemd as PID 1** (`/run/systemd/system` exists).
-- **A reachable user bus** — a connectable `bus` socket in the per-UID runtime dir
-  (`/run/user/<uid>`, or whatever `XDG_RUNTIME_DIR` points at). For a service account that is
-  not otherwise logged in, that means `loginctl enable-linger <user>`; a unit whose
-  `RuntimeDirectory=` hardening moves `XDG_RUNTIME_DIR` off the per-UID path is handled, because
-  the real per-UID path is probed first.
-- **`systemd-run` on `PATH`** and answering `--version`.
-
-Any of those missing, or a `StartTransientUnit` call that fails anyway, falls back to the
-direct launch — and in that unscoped fallback case the paragraph above still describes reality:
-the daemon shares the service cgroup and a combined-unit stop ends live terminals. Read the
-`cgroupUnit` field in the daemon health payload to tell the two cases apart on a running host;
-it is populated from `/proc/self/cgroup`, so it reports the isolation the daemon actually has
-rather than what the launcher intended.
-
-## `orca serve` on this machine
-
-`orca serve` runs on the local orcad slot by default. The CLI asks the app's
-`out/main/orcad/orcad-local-serve-selection-entry.js` (run as plain Node on the app's executable)
-which host to use. Any reason orcad cannot serve falls back to Electron serve with one
-`[serve] using Electron serve: <reason>` line on stderr. Those reasons are: no slot for this host,
-no template in the install, the pinned Node could not be fetched, or a failed native preflight.
-
-- `ORCA_SERVE_RUNTIME=electron` keeps Electron serve and skips the question. `orcad` (or unset) is
-  the default, and any other value falls back with a reason.
-- Packaged macOS stays on Electron: only Electron serve, supervised by the CLI, can take a remote
-  app update there, and orcad has no updater. Recipe-JSON serve has no handoff and uses orcad.
-- Windows serves on orcad too. Both hosts share `<userData>\daemon`, so the daemon pipe name
-  (hashed from that path) is the same, and the relocated Electron daemon host changes only the
-  executable, not the pipe. The `orcad-serve-mode-switch-windows` e2e job checks D7 there, in the
-  daily run and on PRs routed to it; it does not block merges.
-
-The slot and its pinned Node live under the desktop's `<userData>/orcad-artifacts`.
-
-## Bind policy
-
-`--bind <literal-ip>`, **default `127.0.0.1`**.
-
-Only literal IPs are accepted; hostnames are refused because DNS would decide which
-interface got bound. `localhost` maps to `127.0.0.1`. `0.0.0.0` / `::` are the explicit
-opt-ins to network reach, and the startup log says so on every launch.
-
-The bind is **pinned**, not defaulted. Two things widen the desktop's listener on their own —
-`orca serve`'s wide default, and a startup where some device has connected before — and an
-unattended host's exposure must be exactly what the operator asked for on every launch. A
-mobile pairing offer, which normally rebinds to all interfaces, is refused while the bind is
-pinned to loopback and reports `network_exposure_failed` rather than advertising an endpoint
-nothing can reach.
-
-Under the shipping design a client reaches a remote orcad over an SSH local port-forward, so
-loopback is the correct default and the pairing credential travels over SSH.
-
-A host whose sshd refuses forwarding (`AllowTcpForwarding no`) is reached through the stdio
-bridge instead: the client keeps the same local port, and each connection to it opens one SSH
-exec channel running a small script on the host's pinned Node that dials orcad's loopback port.
-Windows hosts run it as the host script's `stdio-bridge` op and frame bytes as base64 lines,
-because a PowerShell DefaultShell re-decodes native output. Bridges are capped below OpenSSH's
-default `MaxSessions` of 10 per connection; further connections wait for a free one. The choice
-is made each time the tunnel starts (`orcad-managed-tunnel-transport.ts`), so nothing is
-recorded per host, and only a host where even the bridge cannot run keeps the relay, recorded as
-`ssh_tunnel_unavailable`.
-
-## Data root and the instance lock
-
-The data root is `$ORCA_USER_DATA`, else `$XDG_DATA_HOME/Orca`, else `~/.orca`.
-
-Before the profile index or the store is touched, orcad takes `<data-root>/orcad.lock`.
-It refuses to start when:
-
-| Code                                   | Meaning                                                       |
-| -------------------------------------- | ------------------------------------------------------------- |
-| `orcad_data_root_wrong_owner`          | the root is owned by another uid (POSIX)                      |
-| `orcad_data_root_shared`               | the root is group/world accessible and could not be tightened |
-| `orcad_instance_lock_held`             | another live orcad owns this root                             |
-| `orcad_instance_lock_foreign_identity` | the lock belongs to a different identity                      |
-| `orcad_data_root_unusable`             | the root cannot be created, stat'd or written                 |
-
-A root that is merely too permissive and that we own is tightened to `0700` rather than
-refused — orcad stores credentials there unsealed (no OS keyring on this host), so the goal
-is a private root, and refusing when we could just fix it helps nobody. We refuse when the
-permissions are not ours to fix. Windows has no owner or mode check, because ACLs are not
-expressible as a POSIX mode and `statSync().mode` there reports a synthesized one. Instead
-orcad restricts the root's ACL to its own user with `icacls` (the same verified restriction
-`secure-file.ts` applies to credential files) and refuses with `orcad_data_root_shared` when
-that cannot be applied.
-
-A dead holder's record is reclaimed (PID plus process start time, so a recycled PID does not
-read as alive). On Windows the start time is the kernel creation time read through the
-process-tree addon the slot stages; without the addon it is null and the PID alone fences,
-which errs toward "held". A record belonging to a different identity is never reclaimed.
-
-**The lock scopes one role — who is the runtime.** It deliberately says nothing about the
-daemon, which lives under `<data-root>/daemon` and fences its own endpoint with its own PID
-record. A lock that asked "is any process using this root" would refuse exactly the restarts
-a live daemon makes worthwhile.
-
-## Supervision
-
-### Process-scoped and cgroup-wide stops
-
-The built-in remote updater performs a PID-scoped stop and keeps the daemon's install version
-pinned while it owns sessions. A combined-unit systemd stop or restart is different: unless the
-daemon holds a durable cgroup scope of its own (see
-[Two long-lived processes, not one](#two-long-lived-processes-not-one)), it reaps the daemon and
-every live terminal after the graceful window. Treat a stop as destructive unless
-`health.terminalDaemon.cgroupUnit` names an `orca-daemon-*.scope` on that host.
-
-Before a cgroup-wide stop, obtain a fresh `orca-ide terminal list --json` result using the same OS
-account and home as the daemon. Invoke the installer's absolute launcher path so `sudo`'s
-`secure_path` cannot hide a per-user registration (for example,
-`sudo -Hu orca /home/orca/.local/bin/orca-ide terminal list --json`). Replace both `orca` and
-`/home/orca` with the service account and home used by the unit; an extracted deployment may use
-its absolute `resources/bin/orca-ide` launcher instead. A safe empty census is untruncated, has an explicit `hostScope`, covers every
-execution host affected by the stop, and lists no terminals on those hosts. Every
-`omittedHostIds` entry must be explicitly accounted for outside the target service's execution
-boundary. 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,
-truncation, a failed request or lost contact makes the result `unverifiable`: defer the stop. Do
-not admit new work after the census. Orca does not yet provide an atomic census-and-stop fence.
-
-### Who supervises orcad
-
-An external supervisor (systemd, launchd, a process manager). orcad conforms to it:
-
-- **Readiness.** One JSON line on stdout (`--json`), `type: "orca_server_ready"`, published
-  after the listener is bound and the daemon verdict is in. There is no separate readiness
-  socket; the line is the signal. Set the supervisor's start timeout generously — the daemon
-  launch has its own retries and can take tens of seconds on a cold host.
-- **Shutdown.** `SIGTERM` or `SIGINT` starts one graceful stop. Repeated signals share
-  that stop because a supervisor may signal both the launcher and its child. A 15s deadline
-  exits with code 1 if teardown stalls. The bundled runtime also stops gracefully if its
-  launcher's IPC channel closes. On POSIX, both the launcher and runtime ignore `SIGHUP`,
-  so terminal hangups do not stop a headless host. Use `SIGTERM` or `SIGINT` to stop it.
-- **Stop requests.** A file stops orcad the same way `SIGTERM` does, without a PID that may
-  since have been reused by another process:
-  - `.orcad-stop-request` beside `orcad.js` in the running slot. orcad deletes it and stops.
-  - An instance-bound request in the data root, named
-    `.orcad-managed-stop-request.<sha256 of the instance lock nonce>`. orcad stops only when it
-    names this orcad's version, runtime ID, PID, start time and lock nonce, and while the
-    instance lock still holds that record. The file is kept as evidence.
-  - `orcad --complete-managed-stop '<request JSON>'` writes that request, waits for the
-    instance to exit, and prints one JSON line whose `verdict` is `live`, `unverifiable` or
-    `exited`. `exited` needs proof: no process with that PID, or a PID whose start time shows
-    it now belongs to another process. On `exited` it writes
-    `<data-root>/orcad-stop-receipts/<transactionId>.json`. It exits 0 whenever it printed a
-    verdict, 64 for a malformed invocation, and 1 for a failure before any verdict, which is
-    never evidence of exit.
-  - A request with `retireIdleDaemon: true` asks orcad to retire the terminal daemon too. This
-    is best effort and never blocks or fails the stop:
-    - The daemon is retired only when it proves it owns no live session across every
-      generation.
-    - A busy daemon (`live`) or one whose state cannot be proven (`unverifiable`) stays up with
-      its terminals, and orcad reopens new-terminal admission before exiting.
-    - The completed-stop receipt records `retirement` as `retired`, `live` or `unverifiable`.
-      If orcad exits without recording an outcome, the receipt says `unverifiable`.
-  - `orcad --cancel-managed-stop '<request JSON>'` withdraws a request orcad has not acted on.
-    orcad and the canceller each try to create `<transactionId>.decision.json` exclusively,
-    so exactly one wins. `canceled` means orcad keeps running and the request file is removed;
-    `dispatched` means orcad already began stopping, and only the completion can say how it
-    ended.
-  - A build advertises all of the above with `health.stopRequests: 1` in its readiness line.
-    Clients stop such a build through the slot request file and older builds with `SIGTERM`,
-    after corroborating the PID with readiness either way. A launch clears a slot request
-    that the previous process never consumed.
-- **Decommissioning a managed slot.** An Orca client decommissions through the same activation
-  journal and fence as deploy and rollback. It refuses while the terminal census reports live
-  or uncounted terminals, stops the instance with a managed request that also asks to retire
-  the daemon, and records that no version is active only after `exited` is proven. A stop
-  that did not finish is cancelled; if orcad already acted on it, or the host cannot answer,
-  the fence stays for recovery.
-- **Instance lock.** `<data-root>/orcad.lock` names the running orcad. A record that is
-  unreadable, malformed or over 64 KiB is never reclaimed: orcad exits 78 until an operator
-  removes it. A shutdown whose teardown failed keeps the lock until the process exits, so a
-  second orcad cannot start beside a writer that may still be running.
-- **Exit codes.**
-
-  | Code | Meaning                                                      | Supervisor should    |
-  | ---- | ------------------------------------------------------------ | -------------------- |
-  | 0    | clean shutdown                                               | restart per policy   |
-  | 1    | startup or shutdown failure                                  | restart with backoff |
-  | 78   | configuration fault (bind address, data root, instance lock) | **not** restart      |
-
-  78 is `EX_CONFIG`. Put it in systemd's `RestartPreventExitStatus`: restarting on a data
-  root owned by someone else is a restart-spin, not a recovery.
-
-- **Logs.** orcad writes human-readable diagnostics to **stderr** and its readiness contract
-  to **stdout**; the supervisor owns capture and rotation. The daemon, being detached, writes
-  its own NDJSON lifecycle log to `<data-root>/logs/daemon.log` (suppressed by
-  `ORCA_DIAGNOSTICS_DISABLED=1`). Rotation of that file is not implemented — see
-  [What is not covered](#what-is-not-covered). orcad records every trace span it emits
-  (git commands, worktree paths, terminal spawns, structured-chat failures and the rest) to
-  `<data-root>/logs/orcad.trace.ndjson`, rotated at 10 MB × 10 files, private to its user and
-  redacted for secret-shaped strings. It stays on the host: a desktop's diagnostics bundle does
-  not collect it. `ORCA_DIAGNOSTICS_DISABLED=1` turns it off, and a logs folder orcad cannot
-  open leaves it off with one stderr warning rather than stopping orcad.
-
-### orcad supervising the daemon
-
-- **Launch.** On Linux, through `systemd-run --user --scope` so the daemon gets its own
-  transient cgroup and survives a service-unit restart; everywhere else, and wherever that
-  scope is unavailable, forked detached. Either way it runs `daemon-entry.js` beside
-  `orcad.js` with its own PID record, token and socket under `<data-root>/daemon`.
-- **Adoption before spawn.** A daemon already answering the endpoint is adopted, not
-  replaced, unless it is unhealthy, foreign, or built from a superseded bundle _and_ owns no
-  live sessions. Replacing a healthy daemon kills its PTYs, so code freshness always defers
-  to live work.
-- **Restart.** The adapter respawns the daemon on death, transparently to callers.
-- **Crash-loop containment.** At most **5 launches per 60s rolling window** per orcad run;
-  past that, launches are refused with `daemon_crash_loop` and terminals fail with that
-  message instead of the process forking forever. The window slides, so a repaired host
-  recovers without restarting orcad. An operator-initiated daemon restart clears it — that
-  is the deliberate "try again".
-- **No macOS login-session watch.** That watch retires the daemon when the spawning GUI login
-  session dies. An orcad daemon must survive its SSH session ending.
-- **Shutdown.** orcad never stops the daemon. A daemon that was never adopted retires itself
-  after its adoption window; an adopted one stays resident (see Decommissioning).
-
-### Decommissioning
-
-After a PID-scoped stop, an adopted daemon stays resident so the next orcad can reattach. A
-combined-unit systemd stop also leaves a scope-isolated daemon resident, but kills one that
-fell back to the service cgroup. To retire a process-scoped deployment, apply the census rule
-above, stop orcad, then stop the daemon named by `health.terminalDaemon.pid`.
-Only report it `exited` after verification on the execution host; loss of contact is
-`unverifiable`.
-
-### Windows hosts
-
-What differs on a Windows SSH host, and what deliberately does not:
-
-- **Stop path.** A signal is TerminateProcess on Windows: no flush, no lock release. The
-  slot's `.orcad-stop-request` file (and the managed, instance-bound request) is therefore the
-  only graceful stop. A detached orcad receives no console control events, so the listener
-  (`fs.watch` plus a one-second poll) is what stops it; the packaged-slot test proves it exits
-  cleanly within the 15 s shutdown deadline on every server lane, Windows included.
-- **Exit proof.** `--complete-managed-stop` proves a reused PID by the addon's creation time.
-  Without the addon a live PID stays `live` or `unverifiable`, never `exited`.
-- **Daemon endpoint.** The terminal daemon listens on a named pipe
-  (`\\?\pipe\orca-terminal-host-v<protocol>-<suffix>`), not a socket under the data root.
-- **Leaving sshd's job.** orcad is started outside the SSH session's kill-on-close job, so the
-  daemon it forks inherits no such job and outlives the connection the same way.
-- **Per-PTY jobs.** Each ConPTY child gets its own job (`windows-pty-job.ts`), and Git Bash /
-  MSYS panes follow [`windows-msys-job-breakaway.md`](./windows-msys-job-breakaway.md)
-  unchanged. A ConPTY smoke test runs inside a process started exactly that way (breakaway,
-  no window) on the Windows server lanes.
-- **No daemon-host relocation.** The desktop copies its runtime to `%LOCALAPPDATA%` because
-  the NSIS updater deletes the install directory under a running daemon
-  ([`windows-daemon-host-relocation.md`](./windows-daemon-host-relocation.md)). orcad slots are
-  versioned directories that nothing deletes while a process runs from them: Windows refuses
-  to delete a running image, and GC treats an in-use slot as live.
-
-## Idle exit (client-managed orcad only)
-
-An orcad that a desktop client launched over SSH stops itself, like the relay, once its host has
-been unused for 15 minutes. The client's launch sets `ORCA_ORCAD_MANAGED_ACTIVATION_ROOT`; an
-orcad started by hand, by a supervisor, or as a paired server never carries it and never idles
-out.
-
-"Unused" means every one of these held on every check for the whole period:
-
-- no client socket open and no RPC request running;
-- no terminal in the PTY provider, and the daemon answered with zero live sessions (a daemon
-  that does not answer keeps orcad up);
-- no agent reporting `working`;
-- no staged migration into this server;
-- no enabled automation and no automation run still in flight (nothing on the host would start
-  orcad again for the next scheduled run, so a server with an enabled automation never idles out);
-- no activation fence on the host (an update, rollback, decommission or recovery in flight).
-
-The stop is the ordinary graceful shutdown, which disconnects from the daemon and never shuts it
-down, so it cannot kill a terminal. It then asks the daemon to retire only if the daemon itself
-proves it holds no session. Before stopping, orcad writes `<data-root>/orcad-idle-stop.json`;
-the next start reports it once as `health.previousIdleStop` and removes it, so a later crash is
-never read as an idle stop. A managed start with no record reports `previousIdleStop: null`.
-
-The client starts a stopped server again, whatever stopped it (an idle stop, a kill, a host
-reboot): on every connect, on every fresh tunnel (including after the client wakes from sleep),
-and before a call through an environment the client restored at launch. A server that does not
-answer is checked on the host; only a proven exit starts the activated slot, under the activation
-fence, and the status line shows "Starting managed server…". A daemon that survived is adopted
-with its terminals; after a reboot both start fresh. A process that is live or cannot be proven
-gone is left alone, and a start that fails keeps the host managed with the reason and orcad.log's
-tail, never as a verdict about its terminals. `ORCA_E2E_ORCAD_IDLE_TIMEOUT_MS` shortens the idle
-period for tests; the client forwards it to the servers it launches.
-
-## Health
-
-The readiness payload carries a `health` object:
-
-```
-buildHash    sha256 (16 hex) of the running orcad bundle — build identity that a version
-             string cannot give, so a rollback that did not replace the file is visible
-buildVersion ORCA_VERSION
-nodeVersion  / nodeAbi   process.versions.node / .modules — the ABI native addons must match
-platform / arch / pid
-terminalDaemon:
-  state              live | degraded | absent
-  ownsFreshSessions  whether NEW terminals are daemon-owned; this supports PID-scoped
-                     restart recovery, not supervisor or service-cgroup isolation
-  pid                the live daemon's pid, from its own PID record
-  buildVersion       the build the LIVE daemon was forked from (may legitimately predate
-                     this orcad after an update — reporting orcad's version for both would
-                     hide exactly that)
-  entryPath / protocolVersion
-  selfTest { ok, coverage, verdict, durationMs }
-```
-
-### What the self-test proves
-
-`selfTest` runs `checkDaemonHealth` against the daemon's socket. It is green only when the
-daemon **opened its socket, completed the protocol handshake, and ran `ptySpawnHealth` — a
-real short-lived PTY spawned inside the daemon's own process**. It therefore spans both
-processes: orcad drives it, the daemon performs it, the verdict crosses the socket.
-
-- `coverage: 'pty-spawn'` — the full round trip above.
-- `coverage: 'handshake'` — **win32 only**, where `checkPtySpawnHealth` returns without
-  spawning anything. A green verdict there covers the handshake and nothing more. It is
-  reported separately rather than folded into `ok` so nobody reads it as a PTY round trip.
-
-`state` is `live` only when the self-test passed **and** `ownsFreshSessions` is true. A
-daemon that answers but has fallen back to local spawning for new terminals is `degraded`,
-because those terminals die with orcad. A daemon that answered and then failed its spawn
-probe is also `degraded`, not `absent`: it still holds live sessions, and calling those
-exited would be the verdict `ssh-execution-boundary.md` forbids guessing.
-
-## What is not covered
-
-Named here so nothing reads as implemented that is not:
-
-- **A continuous health endpoint.** `health` is published once, in the readiness payload. A
-  supervisor's periodic liveness/readiness probe needs an HTTP or RPC surface over the same
-  `collectOrcadHealth()`; that surface does not exist yet.
-- **Supervision of an unscoped fallback daemon.** When the durable `systemd-run --user --scope`
-  launch is unavailable (see [above](#two-long-lived-processes-not-one)) orcad and its daemon
-  share one service cgroup, and a combined-unit stop cannot preserve live terminals. There is
-  no mechanism that re-isolates such a daemon after the fact.
-- **libc slot.** There is no honest health value to publish until native libc detection owns
-  it.
-- **`degradations[]`.** The readiness contract does not publish this collection yet.
-- **Credential administration** (list / revoke / rotate devices, expiring pending offers,
-  structured security logging).
-- **Pinned-port fail-closed.** A pinned `--port` still falls back to an OS-assigned port on
-  conflict.
-- **Reconciling `webClientUrl` with reachability** under the loopback default.
-- **State-schema rollback rules.**
-- **Daemon log rotation.** `<data-root>/logs/daemon.log` grows unbounded.
diff --git a/docs/reference/orchestration-configured-agent-aliases.md b/docs/reference/orchestration-configured-agent-aliases.md
deleted file mode 100644
index 2dc95ccd100f..000000000000
--- a/docs/reference/orchestration-configured-agent-aliases.md
+++ /dev/null
@@ -1,22 +0,0 @@
-# Configured command aliases for orchestration workers
-
-A worker can use the name of a direct executable configured in **Settings → Agents**.
-Choose the built-in agent whose command-line interface the executable implements,
-then set that agent's command override to the executable name or quoted full path.
-For example, configure Codex's command as `codex-fugu`, then select it with
-`orca orchestration worker-start --agent codex-fugu` and the normal placement options.
-
-The execution host resolves its own configuration. Launch receipts use the canonical
-agent (`codex` in this example), and model/effort handling reuses that agent's existing
-launch rules. A receipt records applied launch preferences; it does not prove provider
-entitlement, successful generation, or an arbitrary vendor's model selection behavior.
-
-Aliases require a single executable token. Commands containing interpreter arguments,
-environment assignments, or shell wrappers are not aliases. Multiple built-in agents
-configured with the same executable name are ambiguous and require the canonical agent
-ID. Disabled launchers remain disabled. An unconfigured name is refused even if it is
-on PATH; Orca cannot infer a compatible launch interface from a process name.
-
-The same rule applies to folder workspaces and git worktrees. For a remote worker,
-configure the command on its execution host. Older hosts may refuse aliases they do not
-support. Configuring a command does not create new status producers or grant permissions.
diff --git a/docs/reference/pnpm-install-policy.md b/docs/reference/pnpm-install-policy.md
deleted file mode 100644
index 6e53ecac77a9..000000000000
--- a/docs/reference/pnpm-install-policy.md
+++ /dev/null
@@ -1,92 +0,0 @@
-# Native dependency install policy
-
-Ordinary `pnpm install` installs optional native dependencies for the current OS
-and CPU only. This applies to local development and root-project CI jobs,
-including jobs using `.github/actions/install-node-dependencies`. Mobile and
-cloud projects with their own workspace configuration are separate.
-
-The one cross-target build in the repo is macOS: `pnpm build:mac` and the four
-macOS packaging workflows produce both x64 and arm64 artifacts from an arm64
-runner. Before packaging for another architecture, widen the CPU set:
-
-```sh
-pnpm install:release
-```
-
-This runs `pnpm install --frozen-lockfile --cpu=current,x64,arm64`. It never
-widens the OS set: every packaging job runs on a runner whose OS matches its
-target, so cross-OS installs are never needed. The macOS workflows pass
-`--cpu=current,x64,arm64` directly; Windows and Linux packaging jobs use a plain
-host-only `pnpm install --frozen-lockfile`. Keeping `current` in the list
-preserves the host's build tools alongside the target resources. An install for
-another target does not itself cross-compile native addons.
-
-## Packaging guard
-
-electron-builder only logs a warning for a missing `extraResources` source and
-continues, so without a check a foreign-architecture slice would ship silently
-broken. `beforePack` in
-[`config/electron-builder.config.cjs`](../../config/electron-builder.config.cjs)
-therefore calls `assertPackagedNativeVariantsInstalled` in
-[`config/packaged-runtime-node-modules.cjs`](../../config/packaged-runtime-node-modules.cjs),
-which fails the build when the target platform/architecture's native variants
-are not installed: `sherpa-onnx-*`, `@parcel/watcher-*`, and on Windows the
-node-gyp addon `@vscode/windows-process-tree`. The error names every missing
-package and gives the remedy that fits: another architecture's variants come
-from `pnpm install:release`, the Windows addon does not (see below).
-
-Windows packaging requires a Windows host. `@vscode/windows-process-tree` is an
-`os: win32` npm addon, so it is installed only where that matches;
-`@orca/windows-registry` is a workspace package that links on every host, but
-its native binary is still compiled only on Windows. Both are compiled only by
-the Windows-only rebuild in `config/scripts/rebuild-native-deps.mjs`
-(`allowBuilds` in `pnpm-workspace.yaml` keeps pnpm itself from running node-gyp
-for them). The guard checks `@vscode/windows-process-tree` alone because the
-workspace link is present everywhere and proves nothing. `pnpm install:release`
-does not help on macOS or Linux because it does not widen the OS set.
-
-Tests that inspect installed Windows addons and their packaging closure run on
-Windows, where those dependencies are required. The PR Windows lane explicitly
-includes them. Loading the packaging config tolerates absent Windows addons; only
-`beforePack` rejects Windows packaging until they are installed. Patch-source
-assertions, fixture tests, and the isolated real patch-install test continue to
-run on other hosts.
-
-## Existing checkouts
-
-A narrowing incremental install can leave previously installed variants behind.
-Stop development processes using this checkout, remove **this checkout's**
-`node_modules`, then run `pnpm install --frozen-lockfile` to obtain a fresh host
-install. Do not use `--force`: pnpm 12 documents that it installs optional
-packages even when their OS/CPU/libc do not match. The shared pnpm download store
-is separate; this change does not clear it.
-
-## Measurement: macOS arm64, pnpm 12.0.0
-
-Measured 2026-09-12 with the same package manifest, lockfile, patch files, and
-existing download store in two fresh install directories, both with
-`--frozen-lockfile --ignore-scripts --offline`. One used the earlier broad
-policy (`--os=current,darwin,linux,win32 --cpu=current,x64,arm64`); the other
-used `--os=current --cpu=current`. Numbers are logical file bytes in the virtual
-store, **not unique disk usage**: pnpm hardlinks and APFS clones may share
-storage.
-
-| Measure                                    | Broad install |  Host install |             Reduction |
-| ------------------------------------------ | ------------: | ------------: | --------------------: |
-| Package directories                        |         1,296 |         1,206 |                    90 |
-| Regular files                              |        53,972 |        52,915 |                 1,057 |
-| Logical package bytes                      | 2,485,153,773 | 1,159,396,649 | 1,325,757,124 (53.3%) |
-| Logical package GiB                        |          2.31 |          1.08 |                  1.23 |
-| Install wall time, single warm-cache trial |       11.98 s |       11.25 s |                0.73 s |
-
-| Native family       | Broad MiB | Host MiB |
-| ------------------- | --------: | -------: |
-| Canvas              |     235.7 |     25.8 |
-| Sherpa speech       |     235.2 |     71.6 |
-| oxlint and tsgolint |     234.0 |     32.7 |
-| SWC                 |     225.8 |     24.4 |
-| TypeScript          |     158.4 |     26.2 |
-
-Electron downloads and native rebuild outputs are absent from both trials. The
-single warm-cache timing pair does not establish a speedup, and Linux/Windows
-results were not measured; do not present the macOS numbers as CI savings.
diff --git a/docs/reference/qoder-integration.md b/docs/reference/qoder-integration.md
deleted file mode 100644
index 5aa5c55147e3..000000000000
--- a/docs/reference/qoder-integration.md
+++ /dev/null
@@ -1,90 +0,0 @@
-# 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.
-
-Every launch Orca starts (New Tab, workspace and draft launches, automations)
-pre-trusts the workspace at spawn while the agent-wide "Trust the folder when
-Orca starts an agent" setting is on. A hand-typed `qodercli` in a plain terminal
-can still show Qoder's trust dialog.
-
-## 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/relay-regional-placement.md b/docs/reference/relay-regional-placement.md
deleted file mode 100644
index 2e984ab0789d..000000000000
--- a/docs/reference/relay-regional-placement.md
+++ /dev/null
@@ -1,39 +0,0 @@
-# Relay regional placement
-
-Orca selects a Relay region in the Electron main process before requesting a new assignment. The
-director publishes an allowlisted region catalog containing only HTTPS cell subdomains of that
-director. Orca discards one warm-up `/health` request per probe origin — a cold request pays TCP and
-TLS setup that can exceed the round trip it measures — then takes three bounded samples and compares
-regions by their minimum. A wide spread still rejects a region, but only a genuinely flapping one.
-The stable choice is cached for 24 hours, and a cached region changes only when the alternative is
-materially faster.
-
-A region wins only against a measured competitor. If any region in the catalog is rejected or cannot
-be measured, Orca sends no hint rather than selecting the sole survivor. Sending no hint is not
-neutral placement: the director assigns `preferredRegion ?? RELAY_DEFAULT_REGION`, and the default
-is `us-central1`. So an `asia-east2` user whose `us-central1` probe fails or flaps once is placed in
-`us-central1` for that refresh. That trade is accepted because the relay database is
-`us-central1`-only, and it is bounded: the withheld hint is cached for one hour, not the 24 hours a
-chosen region gets, so the next hour re-measures. An origin that fails its warm-up probe is dropped
-before the sampling rounds, so an unreachable region costs one probe timeout rather than four.
-
-After a control socket registers, Orca probes the cell it actually landed on, once per cell URL per
-process. The cache is deleted only when it names a region other than the best measured one and the
-assigned cell is more than three times slower than that region — a far cell under a cache that still
-names the best region means the director declined the hint, and re-measuring would return the same
-answer. Self-heal skips an absent, expired, or no-hint cache, and never runs under
-`ORCA_RELAY_REGION_OVERRIDE`.
-
-The assignment request sends only `preferredRegion`. It does not send latency, IP address, country,
-pairing data, or credentials. Catalog, probe, and cache failures fall back to an assignment without
-a region preference. A rolled-back director that rejects the new field is retried once without
-only that field while preserving reconnect behavior.
-
-The selection measures the desktop network path. Folder workspaces and SSH workspaces share the
-same local broker and do not run probes on remote hosts. The phone continues to connect to the
-exact cell URL in the desktop pairing payload, so its location is not measured independently and
-no mobile protocol update is required.
-
-For deterministic local diagnostics, set `ORCA_RELAY_REGION_OVERRIDE` to `us-central1` or
-`asia-east2` before launching Orca. The override is not an end-user setting and is not written to
-the preference cache.
diff --git a/docs/reference/remote-wire-compatibility.md b/docs/reference/remote-wire-compatibility.md
deleted file mode 100644
index 6e3be37219d1..000000000000
--- a/docs/reference/remote-wire-compatibility.md
+++ /dev/null
@@ -1,397 +0,0 @@
-# Remote wire compatibility
-
-Orca's remote-server feature pairs a desktop client to a remote Orca runtime, and
-users update the two independently. **Mixed versions are the normal state**, not an
-edge case. This page is the contract for changing anything a paired client and host
-exchange: the runtime RPC envelope, the terminal binary stream, and the content
-either side publishes over them.
-
-`src/shared/protocol-version.ts` says when to bump `RUNTIME_PROTOCOL_VERSION`. This
-page covers the changes that do _not_ bump it and are therefore easy to get wrong.
-
-## Rule 1 — a new optional JSON field on an existing frame is safe
-
-Every JSON payload is parsed with a decoder that ignores unknown keys (zod `.strip()`
-on RPC params, `JSON.parse` on stream frames). An older peer that has never heard of
-the field simply does not read it.
-
-Safe:
-
-```ts
-// host adds a field; older clients ignore it
-encodeTerminalStreamJson({ kind, cols, rows, hiddenOutputReason })
-```
-
-**The field is safe only for as long as every reader treats it as optional.** The
-moment a newer client _requires_ it, that client is broken against every host that
-predates the field — which is the same defect as removing a field, just discovered
-later. If new behavior depends on the field being present, that is Rule 2: negotiate
-it, or make the reader fall back.
-
-## Rule 2 — a new stream opcode is NOT safe; negotiate it
-
-`decodeTerminalStreamFrame` returns `null` for an opcode it does not know, and
-`runtime-rpc.ts` drops that frame without an error:
-
-```ts
-const frame = decodeTerminalStreamFrame(bytes)
-if (!frame) {
-  return // silently dropped — the sender never learns
-}
-```
-
-So a new opcode sent to an older peer does not fail loudly. It vanishes, and the
-feature behind it appears to hang. Input sent under a new opcode is swallowed.
-
-A new opcode must be announced in the subscribe handshake and sent only after the
-peer confirms it. The existing pattern is `SetOutputPaused` (opcode 16):
-
-- the client advertises support in the `Subscribe` frame's `capabilities`;
-- the host echoes `capabilities: { outputPause: 1 }` on the `subscribed` event;
-- the client sends opcode 16 only after that echo (`stream.supportsOutputPause`);
-- the host only acts on opcode 16 when it negotiated it (`stream.supportsOutputPause`).
-
-Reuse an existing opcode with a new optional payload field (Rule 1) whenever that
-expresses the change; reach for a new opcode only when framing genuinely differs.
-
-Opcode numbers are permanent. See the `Ack = 13` and `ClaimViewport = 14` comments
-in `src/shared/terminal-stream-protocol.ts` for why a shipped number cannot be
-reused even if the feature behind it is removed.
-
-## Rule 3 — changing what the host publishes breaks old clients with no wire change
-
-The frame shape can be untouched and the skew still real, because clients react to
-frame _content_. PR #12641 is the worked example: the host stopped synthesizing a
-finished agent status, and clients running older code saw different content in an
-identical frame.
-
-Treat these as wire changes even though nothing in the codec moves:
-
-- a field the host stops populating (an old client reading it now sees `undefined`);
-- a value whose meaning, units, or nullability changes;
-- content the host stops synthesizing, trims, or starts deriving from a new source;
-- a frame the host stops sending, or starts sending, on an existing path.
-
-If old clients cannot interpret the new projection correctly, gate it behind a
-runtime capability the same way Rule 2 gates an opcode.
-
-## Rule 4 — an enum arm set is a wire surface; unknown arms must degrade, never reject
-
-A closed `z.enum` in a client-side reply schema is a version claim: it asserts the host
-will never send an arm this build has not heard of. A newer host that adds one arm then
-has its whole reply refused, or has the row carrying it silently dropped, even though
-every member the client actually reads is present and well-formed.
-
-Declare the arm set open instead, with `openEnum` in `src/shared/zod-salvage.ts`:
-
-```ts
-// unknown arm degrades to a member the reader already handles; a non-string stays fatal
-status: openEnum(GIT_BRANCH_COMPARE_STATUS, 'error')
-```
-
-Do not reach for `.catch()`. It swallows absence and the wrong type as well, which turns
-a member the reader depends on into a silent default.
-
-A fallback does not have to be an arm. `git.status`'s `area` is the worked example:
-`staged`, `unstaged` and `untracked` each grant an affordance, so coercing an unknown area
-to one of them offers stage, unstage or commit against a row the client cannot place. It
-degrades to absent instead, which withholds all three — every reader is an equality check
-against a known arm, so the row lands in no section — while keeping the row itself. That
-last part is the point. Dropping the row would also drop it from the unresolved-conflict
-gate, and a conflicted worktree that looks clean is granted a hosted-review create it
-should not have. Withholding an affordance is a degrade; removing the evidence a gate
-reads is not.
-
-A fallback is only ever allowed to shape a _reading_. If the member is sent back to the
-host — a token the client echoes into a later call's params — pass it through as
-`z.string()` and let the send site keep it verbatim. `hostedReview`'s `provider` is the
-case: the eligibility reply names it and the create call returns it, so an
-`openEnum(..., 'unsupported')` there does not soften how the client reads a newer host's
-provider, it puts `unsupported` on the wire and makes that host refuse its own. A
-reply-schema fallback must never shape a param. Gate on the token instead, where the
-client decides what it is willing to do with an arm it does not know.
-
-## Worktree activation belongs to a viewer
-
-Worktree creation and activation default to the host desktop for host/CLI requests,
-and to the caller for paired desktop/web requests. Mobile creation still activates
-the host renderer to provision setup and default tabs. A headless host does not
-borrow a paired client's view. Catalog and session updates continue to reach every
-subscriber independently of navigation.
-Headless host/CLI creates provision their shells, setup, and default tabs on the
-execution host in the background, without depending on an observer to open them.
-The same fallback applies when an attached host renderer is unavailable or
-reloading, including explicit `all` requests that target the host; availability is
-checked after creation, rather than before its awaits.
-
-`activateWorktree` client events carry an optional `navigation` field. Only explicit
-`clients` or `all` requests publish these events; updated clients ignore events
-without that address, including implicit broadcasts from older hosts. This is an
-optional JSON field (Rule 1): older clients ignore it and still understand explicit
-activation. The new host's default publication changes deliberately remove implicit
-navigation for older clients too, rather than retaining the unwanted behavior.
-An older host cannot express explicit follow intent to an updated client, so that
-client must open the workspace itself.
-Accepted navigation is also fenced through repository/worktree discovery; bridge
-cleanup, reconnection, or re-pairing revokes any activation still awaiting a fetch.
-
-Older CLIs hardcode `navigation: 'all'` for `--activate` and `--run-hooks`. The host
-recognizes their `cliProvenanceRequest` and normalizes that automatic target to
-`host`. An API caller without the CLI marker can still explicitly request `clients`
-or `all`. Neither creation nor activation navigates remote clients by default.
-
-Coverage: `multi-client-navigation-isolation.integration.test.ts` exercises real
-paired WebSocket clients and host/headless creation, the renderer bridge tests
-exercise older unaddressed publications, and
-`paired-worktree-activation-isolation.spec.ts` checks a paired desktop remaining in
-a local workspace while its remote catalog updates.
-
-## Session search agent negotiation
-
-`aiVault.searchStatus` optionally advertises `supportedAgents`; current search clients
-send their own `supportedAgents` with `aiVault.searchSessions`. These are string lists,
-so a future provider name does not make a peer reject the capability reply. The client
-narrows explicit agent filters to the host's list before calling its request parser.
-The host narrows retrieval to the client's list before publishing a page.
-
-A peer without this field uses the frozen v1.4.211 search vocabulary. The existing
-`supportsQoderHistory` flag proves CodeBuddy, ZCode, and Qoder support;
-`supportsJcodeHistory` independently proves Jcode support. An explicit list takes
-precedence over both flags. If only the status method is missing, the client still
-searches the conservative legacy subset; other status errors propagate. Empty host
-intersections keep the requested filters and use the existing no-match scope, so
-consent, readiness, and unknown-scope results retain their normal precedence.
-Local IPC advertises this build's full list, and every remote leg negotiates separately.
-
-## Enforcement
-
-`tests/e2e/cross-version-wire/cross-version-terminal-wire.unit.test.ts` runs the real
-host RPC methods and the real renderer multiplexer from two builds against each
-other — current working tree against the newest release tag, in both skew
-directions — over one scripted terminal journey (subscribe, input, hide/reveal
-snapshot, drop, reconnect).
-
-Run it with:
-
-```bash
-pnpm exec vitest run --config config/vitest.config.ts tests/e2e/cross-version-wire/cross-version-terminal-wire.unit.test.ts
-```
-
-It fails when a frame is refused by the receiving build's decoder (Rule 2), when the
-observed frame sequence changes (Rule 3), or when published snapshot content or
-negotiated capabilities differ from the contract. Repeated frame shapes are compared
-by corresponding journey occurrence (initial, reveal, reconnect), so a field removed
-from one occurrence cannot hide behind a sibling that still publishes it. Adding an
-optional field keeps the suite green (Rule 1); making a client depend on that field
-turns the new-client/old-host pairing red.
-
-### Never write down what the old side has
-
-The baseline is whichever release tag is newest, so it moves on every cut. An
-expectation of the form "the old side does not have X" — a `not.toHaveProperty`, a
-`not.toContain`, a hard-coded field list — stops being true the first time a release
-ships X. The suite then reddens on whatever pull request is in flight, with no code
-change anywhere, and the job trains people to ignore it. That is worse than no test,
-because a rolling baseline eventually contains every additive field the wire has, and
-adding one is the sanctioned way to evolve it.
-
-Derive the expectation from the baseline that was actually checked out:
-
-- for a published frame, pair each build against a client of its own version and
-  compare the skewed pairing against that same-version reference, so the expectation
-  is whatever that build publishes today. Compare repeated frames by corresponding
-  occurrence with `comparePublishedFieldOccurrences` in
-  `tests/e2e/cross-version-wire/published-field-shape.ts`; never union keys across
-  initial, reveal, and reconnect frames, because a sibling can mask one occurrence's
-  removed field;
-- for a negotiated surface, read the old build's advertised capabilities and
-  registered method names from its checkout, and assert they agree with each other
-  rather than asserting the old build lacks them;
-- for a "client too old to know X", derive that client's advertised list by removing
-  X from the baseline's own list, so the gate stays exercised after X ships.
-
-Name the direction in the assertion. `new client against old server` and `old client
-against new server` fail for different reasons, and the host is the only side that
-authors a published frame — the terminal `terminalOwner` false positive on 2026-08-29
-was misread as a new client sending an unknown field when the old server was
-publishing it. Two things are still safe to state literally: the current build's own
-contract, and an invariant that holds for every version.
-
-Pinning a legacy ref is the fallback when a contract genuinely needs a release from
-before a feature shipped, as `cross-version-browser-placement.unit.test.ts` does with
-`LEGACY_BROWSER_PLACEMENT_RELEASE_REF`. It does not rot on a cut, but it is
-hand-maintained, so prefer deriving.
-
-`tests/e2e/cross-version-wire/cross-version-agent-session-wire.unit.test.ts` pairs the
-same two builds over the structured `agentSession.*` surface. Because a released build
-cannot name a capability string its own source never contains, the old side's advertised
-list and registered method names are read from the extracted checkout rather than
-hand-written. It covers the three skews that surface can fail on:
-
-- an old client — advertising the baseline's list minus this capability — is told the
-  whole surface does not exist and reaches no host method;
-- a new client against the old dispatcher always gets an answer rather than silence,
-  and `method_not_found` for every method that release does not register, so the
-  absence is visible during negotiation instead of by calling;
-- a cursor survives a host restart: a reattach at the client's fence is refused as stale
-  with the live one attached, a write still carrying that fence is delivered (writes are
-  named by their target, and every released client still sends a fence), and resuming from
-  the held cursor replays only what it missed.
-
-Run it with:
-
-```bash
-pnpm exec vitest run --config config/vitest.config.ts tests/e2e/cross-version-wire/cross-version-agent-session-wire.unit.test.ts
-```
-
-The harness covers the terminal stream and the structured agent-session surface. It does
-**not** cover the session-tab sync channel, legacy agent-session publications, file or Git
-RPCs, mobile/E2EE framing, or the relay transport. A change on those paths still needs its
-own reasoning against the three rules above.
-
-## Worked example: `agentWait` on terminal and worker reads
-
-`terminal.show`, `orchestration.workerShow` and `orchestration.federationShow` carry an
-optional `agentWait` naming a pane parked on a prompt only a human can answer. It is Rule 1 —
-a new optional field — but it has a second state that Rule 1 alone does not describe, and
-getting that wrong turns a skew into a false "nothing is blocked".
-
-- **present object** — this pane is waiting, with the evidence that proved it.
-- **present `null`** — the host evaluated this pane and nothing proves a wait.
-- **absent** — the host never evaluated it: it predates the field, the worker identity was
-  unverifiable, the pane was unreadable, or the agent probe did not answer in time.
-
-A new client against an old host sees the field absent, which is why absence must read as
-_unknown_ and never as _not waiting_. Collapsing absent into `null` at any hop — including a
-convenience `?? null` in an RPC handler — makes an old or unreachable peer indistinguishable
-from a healthy idle worker, which is the exact failure the field exists to remove.
-
-An old client against a new host ignores the key, as Rule 1 allows. New members added to
-`RuntimeTerminalWaitBlockedReason` are also Rule 1: no consumer switches exhaustively on it,
-and both the CLI and worker-start interpolate it as an opaque string.
-
-## Worked example: the `turn` journal item and its transitional downgrade
-
-The structured chat journal records a turn as a first-class item,
-`{ kind: 'turn', turnId, state, userItemId?, startedAt?, completedAt?, durationMs? }`, where it
-used to write `{ kind: 'status', text, turnLifecycle }`. Nothing in the codec moves, but it is
-Rule 3: a client that predates the item does not know the kind and renders it as a text bubble
-with no text. So the item is gated on a client capability, `agent-session.turn-item.v1`.
-
-The gate lives at the RPC boundary only, in
-`src/main/runtime/rpc/methods/structured-agent-session-turn-item-capability.ts`, composed
-around `agentSession.history` and `agentSession.subscribe` next to the background-task
-projection. A client that does not advertise the capability receives every `turn` item
-rewritten to the legacy status form with the full lifecycle under `turnLifecycle`; a client that
-advertises it, and any in-process caller, receives the canonical body. The journal, the status
-feed, and every host-side reader keep the `turn` item; `readAgentJournalTurn` in
-`src/shared/agent-session-turn-record.ts` reads either form, so a new client against an old
-host that still writes the status row also works.
-
-An old client against a new host sees the status row it always did. A new client against an old
-host advertises a capability the host ignores and reads the status row through the shared
-reader. The downgrade is transitional: once no supported release lacks the capability, delete
-the projection module and the capability check, and leave the reader.
-
-The cross-version suite derives the old client's list by removing this capability from the
-baseline's own list, per the rule above, so the downgrade stays exercised after a release ships
-it.
-
-## Known debt: JSON-RPC errors drop Node's string code
-
-An error raised on an SSH host crosses the relay as JSON-RPC, and
-`ssh-channel-multiplexer` rebuilds it with the TRANSPORT's numeric `code`. Node's
-string code — `'ENOENT'`, `'EACCES'` — does not survive, so a caller on this side
-cannot ask what kind of failure it was.
-
-`isENOENT` in `src/main/ipc/filesystem-path-containment.ts` pays for that by also
-matching Node's canonical message text, which is what makes remote worktree creation
-work. The cost is that a host can make an unrelated failure read as "absent" by
-putting that sentence in a message.
-
-The exit is Rule 1: carry the original string code in a new optional field on the
-error payload and read that instead. An old host omits it and the message match still
-covers them; once hosts that send it are the floor, the message match can be deleted
-rather than lived with at its ~10 call sites. Narrowing `isENOENT` back to `.code`
-without doing this reinstates the bug — the transport has already overwritten it.
-
-## Known hazard: clients ignore host-published failure fields on client-placed pages
-
-`RuntimeMobileSessionBrowserTab` — the browser tab a host publishes on the session-tab sync
-channel — permits `placement`, `loadError` and `certificateFailure` together. But for a tab
-whose `placement.kind` is `'client'` the engine runs in the client's own app: the failure is
-raised by the local guest webview, and the host has no view of it (`RuntimeBrowserClientPage`,
-what the registry actually publishes from, carries neither field). Clients from
-this version on therefore refuse host ownership of both records for client-placed pages
-(`web-session-tabs-sync.ts`, the `placement?.kind !== 'client'` carve-outs) — without that,
-each metadata snapshot deletes the locally recorded failure and the page's failure overlay
-disappears mid-navigation.
-
-The hazard is forward-facing and Rule 3 shaped. A host that later starts publishing
-`loadError` or `certificateFailure` for a client-placed page reaches these clients as content
-they silently drop, so the host would see no error and no effect. Publishing it has to be
-capability-gated, with the carve-out narrowed to clients that did not negotiate the
-capability. Note the cross-version harness does not exercise the session-tab sync channel, so
-nothing fails if this is forgotten — this note is the only record.
-
-A related carve-out covers `title`, `url`, `loading`, `canGoBack` and `canGoForward`
-(`resolveMirroredBrowserPageContent`), and for those the hazard is already live rather than
-forward-facing: the host does publish them, from a `RuntimeBrowserClientPage` it can only learn
-about second-hand through the client's own `browser.clientHost.pageMetadata` calls. Its copy
-therefore starts at the registry defaults (`'Browser'`, the create-time url), and while those
-publishes are failing it never leaves them.
-
-That copy is not simply behind, though, and a client must not treat it as such. When a lease
-reattaches, the host refreshes the page from the client host's own inventory
-(`runtime-browser-client-page-recovery.ts`), which reads the live guest — so it can be strictly
-fresher than a local row whose pane is unmounted and whose metadata publisher was disposed with
-it. A client that ignores the host url is relying on its own guest to re-answer on remount,
-which `ClientHostedBrowserPagePane`'s mount-time `syncNavigation` is what makes true.
-
-These five are therefore refused only by the client whose guest actually runs the page:
-`placement.browserHostClientId` is compared against this client's own host id
-(`readBrowserClientHostId`). Main stamps that id into the guest-hosting window's
-`additionalArguments` at creation, and the preload reads it back out of its own argv — the answer
-has to be there before the first snapshot is interpreted, which is earlier than any IPC handler a
-renderer could wait on. Every other viewer — a second desktop, the web client, which installs no
-page renderer at all, the dashboard pop-out, which is deliberately left unstamped — keeps tracking
-the host, which is the only reason a mirrored viewer shows anything but its first snapshot
-forever. Improving what a _second_ client sees still means fixing the publish, not the carve-out;
-the carve-out no longer stands in the way of it.
-
-The two failure fields above are deliberately left on the looser `placement?.kind !== 'client'`
-predicate. It is unobservable today — the host publishes neither field for a client-placed page at
-all, so a mirror has nothing to take either way. If the capability-gated publish this section
-anticipates ever lands, narrow them the same way rather than by placement kind: a mirror should
-take a failure it cannot otherwise see, and only the hosting client should refuse it.
-
-## Known hazard: on the mobile surface a scope refusal is not a missing method
-
-The agent-session harness above asserts that a peer probing an unknown method is told
-`method_not_found`. That holds for the runtime-scoped surface and **not for the mobile one**.
-
-`runtime-rpc-websocket-dispatch.ts` checks `MOBILE_RPC_METHOD_ALLOWLIST` and answers
-`forbidden` _before_ it calls the dispatcher. A method a desktop predates is on neither the
-allowlist nor the registry, and the gate answers first, so a phone never sees
-`method_not_found` for it. `method_not_found` would reach a mobile-scoped device only for a
-method that is allowlisted but unregistered, and `src/main/runtime/mobile-rpc-allowlist.test.ts`
-requires every method the phone calls to be both, so that combination cannot ship. The reverse
-— a registered method that no release has allowlisted yet — is the skew that does occur.
-
-So a phone-side "is this host new enough to serve X?" probe must read **both** codes as
-absence. Keying it on `method_not_found` alone compiles and passes every same-version test
-while never firing. The Files and Git fallbacks have read both since they shipped
-(`isMobileMethodUnavailableError`, `isMobileGitUnavailable`); the Relay pairing probes were the
-outlier, and the cost was a write-once direct-relay upgrade journal, holding a pending resume
-secret, that an old desktop could never retire
-(`mobile/src/transport/pairing-relay-rpc-unavailable.ts`, with the gate pinned desktop-side by
-`src/main/runtime/runtime-rpc-mobile-unknown-method-scope-refusal.test.ts`).
-
-Widening is safe only where `forbidden` cannot also mean a real authorization failure. Prove
-that per probe rather than globally: the pairing handlers cannot emit it (an unwired provider
-answers `runtime_error`), a bad or revoked token answers `unauthorized`, and the gate is one
-of only two places in `src/main` that emits the code at all. A probe whose handler _can_
-refuse by authorization must not be widened.
-
-The cross-version harness dispatches as a mobile client but calls the dispatcher directly, so
-it never runs this gate and nothing reddens if any of the above is forgotten.
diff --git a/docs/reference/renderer-agent-status-performance.md b/docs/reference/renderer-agent-status-performance.md
deleted file mode 100644
index cffad695d25a..000000000000
--- a/docs/reference/renderer-agent-status-performance.md
+++ /dev/null
@@ -1,340 +0,0 @@
-# Renderer agent-status performance
-
-## Status
-
-This design is adopted for the renderer's high-frequency agent-status path. It
-keeps the existing event semantics while bounding the amount of synchronous
-store fanout performed for one IPC burst.
-
-It lands in slices. This document and the `bench:idle-cpu` harness land first so
-the store changes can be reviewed against a baseline someone else measured. Until
-the store slice lands, the `setAgentStatuses` / `transactAgentStatuses` actions
-and the agent-status write workload described below are not yet on `main`; the
-harness measures scale, listener census, and raw publication fanout only.
-
-## Context
-
-Orca can display a large expanded worktree lineage inside one virtualized list
-row. Virtualizing the root row does not virtualize its descendants, so a
-100-worktree lineage can mount 100 `WorktreeCard` instances at once.
-
-Agent-status IPC events are bursty. The renderer already groups live events into
-a 33 ms window, but the original flush applied every queued event with a
-separate Zustand write. Zustand synchronously visits every listener for every
-publication. The resulting work therefore grew with both the number of status
-events and the number of mounted subscriptions:
-
-```text
-burst work ~= status events x store listeners x selector work
-```
-
-A production trace captured the renderer repeatedly entering
-`flushLiveAgentStatusBurst -> applyAgentStatus -> setAgentStatus -> setState`
-through `Set.forEach`. A deterministic 100-worktree fixture reproduces the
-structural multiplier; see "Baseline on `main`" below for the currently measured
-listener count and publication cost.
-
-The production app later recovered substantially when all configured remote
-hosts were removed. Host removal can stop relay/reconnect traffic, remove
-mounted remote worktrees, or both, depending on host type and removal options.
-That observation identifies remote presence as the production trigger but does
-not by itself distinguish traffic volume from mounted-listener fanout.
-
-A read-only reconnect audit ruled out systematic double status emission from a
-full PTY replay: replay bytes bypass OSC status parsing. Reconnect still causes
-a full terminal-buffer repaint for every attached remote pane, which is a
-separate source of renderer work and remains a follow-up investigation.
-
-## Goals
-
-- Keep a large expanded lineage responsive during dense agent-status traffic.
-- Preserve every ordered status transition, including repeated updates for one
-  pane inside the same burst.
-- Publish agent-status state once for a deferred live burst.
-- Preserve selector identity and child render isolation.
-- Make the regression reproducible without relying on a user's production data.
-
-## Non-goals
-
-- Changing the client/server status payload or remote protocol.
-- Deduplicating status events by pane.
-- Changing agent freshness, retention, history, title, completion, or provider
-  session behavior.
-- Changing remote reconnect, PTY replay, or terminal repaint behavior.
-- Redesigning lineage presentation or collapsing worktrees automatically.
-
-## Design
-
-### Bound mounted subscription fanout
-
-Sidebar components select cohesive state bundles with shallow equality instead
-of registering one listener per field. Derived arrays and maps retain their
-existing shallow identity behavior so unrelated store writes do not rerender a
-card. Full agent-list mode keeps its child-level subscription boundary; compact
-mode passes the already selected rows to avoid selecting the same inputs twice.
-
-The deterministic 100-worktree fixture pins the resulting listener budget:
-
-| Surface                        | Listener budget |
-| ------------------------------ | --------------: |
-| Worktree card state and caches |               2 |
-| Agent-row inputs               |               1 |
-| Worktree activity status       |               1 |
-| Closed context menu            |               1 |
-
-Unmount tests require the listener count to return to its prior baseline. In the
-bundled prototype, the fixture without seeded agents fell from 8,518 listeners
-to 1,218; with 100 visible agent rows the candidate mounted 1,618. Compare
-against the census in "Baseline on `main`", which the harness reports directly.
-
-### Share working-spinner phase without synchronous mount queries
-
-Working rows keep the existing compositor-driven CSS animation and shared
-visual phase. `animationstart` anchors each animation to document time zero.
-Deferring the animation query until that event avoids a synchronous style flush
-at each mount and restores the shared phase after `display:none` or a motion
-preference change. A negative mount-time delay cannot preserve that phase after
-an animation restarts.
-
-### Bound spinner animation overhead
-
-Working rings keep compositor-driven CSS animation, but repeat the animation
-once per day rather than once per second. The same 12 steps per second now
-avoid recurring React animation-iteration dispatch. The existing stationary
-wrapper and ring rendering stay unchanged. Offscreen containment was evaluated
-and rejected after a pixel regression at low zoom on 1x displays.
-
-The history, isolated measurements, full-app workspace/agent/subagent benchmark,
-and limitations are documented in [Spinner rendering performance](./spinner-rendering-performance.md).
-
-### Fold a burst in event order
-
-The store exposes the single-update action and two batch forms:
-
-- `setAgentStatus(paneKey, payload, ...)` retains the positional single-update
-  API for the immediate live path.
-- `setAgentStatuses(updates)` applies a prebuilt ordered list, while
-  `transactAgentStatuses(operation)` lets IPC derive each update against the
-  exact staged state before the single commit.
-
-Both entry points reuse the same single-update state transition. The batch
-reducer passes each resulting state into the next update, so a sequence such as
-`working -> waiting -> done` retains the same history and timestamps as three
-sequential calls. Updates are never keyed or deduplicated before the fold.
-
-The live IPC queue is spliced before it is processed. This preserves the
-existing reentrancy guarantee: a synchronous subscriber can enqueue another
-event without causing the current queue to be drained recursively. The first
-event outside an active burst remains immediate; events accumulated within the
-33 ms window are applied as one ordered transaction. Startup snapshots and
-bounded pending-hydration retries use the same transaction path instead of
-publishing once per restored pane.
-
-Each transaction builds pane-routing ownership once with the same first-match
-semantics as the standalone resolver. Split-layout leaf membership is indexed
-once per layout root, so a large snapshot performs linear tab and leaf work
-instead of rescanning every mounted worktree for every pane.
-
-### Run effects after the transaction
-
-Generated-title work that requires committed state is deferred until after the
-transaction. Accepted updates also request freshness scheduling; the outer batch
-coalesces those requests and schedules the shared freshness timer once after its
-single commit. Generated-title requests are folded in event order and published
-together, including first-write and forced-replacement semantics. Resolved tab
-titles are projected while the transaction folds, then final title changes are
-published together. Completion-triggered review refreshes remain deferred
-microtasks.
-
-Bulk title application preserves event order and duplicate-tab behavior while
-indexing owners once, cloning each changed owner array once, and replacing each
-top-level map once. This keeps the post-commit title phase linear in mounted
-tabs plus changed titles.
-
-This separation is important: invoking store actions from inside a Zustand
-updater would re-enter the store, while running an effect before the commit
-would let it observe stale state.
-
-## Semantic invariants
-
-Sequential and batched application must agree on:
-
-- live and retained agent maps;
-- state history, `updatedAt`, and `stateStartedAt`;
-- agent identity, model, prompt, tools, assistant messages, and subagents;
-- orchestration and provider-session continuity;
-- sleeping-session and launch-config recovery records;
-- retired/closed-pane rejection and inherited-status suppression;
-- retention cleanup and live-map eviction;
-- `agentStatusEpoch` and `sortEpoch`;
-- automation completion observation across intermediate transitions;
-- generated-title inputs, freshness scheduling, and completion refreshes.
-
-Equivalence tests use fixed timestamps and include repeated same-pane
-transitions. A publication-count test subscribes to the real store and requires
-one notification for a non-empty batch and none for an empty batch.
-
-## Benchmark contract
-
-The benchmark launches an E2E-mode Electron build with the store exposed only
-for instrumentation. It creates 100 worktrees in one expanded lineage, verifies
-100 mounted cards, captures the store listener census, and then applies seeded
-ordered agent-status traffic through the real store action.
-
-The benchmark measures the synchronous store action, not the live IPC leading
-edge or post-commit notification path. A real-store snapshot test covers the
-end-to-end budget for 100 panes with auto-generated titles enabled: one status,
-one bulk generated-title, and one bulk resolved-title publication. Disabling
-generated titles removes that middle publication, independent of pane count.
-
-The artifact records only fixed diagnostic fields needed for comparison:
-
-- requested and completed batches and updates;
-- store action calls and observed publications;
-- elapsed time, throughput, and scheduling drift;
-- final-state verification;
-- renderer mean, p95, and maximum CPU;
-- renderer timer drift and long tasks;
-- mounted-card and listener counts.
-
-Raw process inventories, temporary paths, pane identifiers, and DOM text are
-diagnostic-only and must not be embedded in the shareable report.
-
-Run baseline and candidate on the same machine and OS with the same Electron
-build mode. CPU samples from macOS and Linux are comparable within that
-constraint; Windows process CPU collection currently cannot support this
-comparison.
-
-## Harness
-
-`pnpm run bench:idle-cpu` drives `config/scripts/run-idle-cpu-benchmark.mjs`,
-which composes four modules:
-
-| Module                                | Responsibility                                                                                    |
-| ------------------------------------- | ------------------------------------------------------------------------------------------------- |
-| `idle-cpu-renderer-scale-fixture.mjs` | Seeds the lineage, agent rows, and sidebar view state; takes the mounted-card and listener census |
-| `idle-cpu-renderer-timing-probe.mjs`  | In-page timer drift and long-task probe; runs the no-op publication workload                      |
-| `idle-cpu-process-sampling.mjs`       | Classifies the Electron process tree and samples per-role CPU/RSS                                 |
-| `idle-cpu-synthetic-spinners.mjs`     | Measurement-only visible spinners                                                                 |
-
-The sampling window extends past `--sample-ms` until the workload settles, and
-fails the run rather than reporting a truncated window if the workload overruns
-the guard. That is why a 2,000-publication run reports a measured window longer
-than the requested one.
-
-`--zustand-publications` publishes an empty partial through the real store, so
-each publication costs exactly one full subscriber visit and nothing else. It
-isolates the `listeners x selector work` half of the burst-cost model from
-agent-status payload work, and it is store-API independent — it measures the
-same thing before and after the batching slice.
-
-The agent-status write workload (`--agent-status-batches`,
-`--agent-status-write-mode`) is not in this harness yet. It depends on
-`setAgentStatuses`, so it lands with the store slice.
-
-## Baseline on `main`
-
-Measured on `main` at `077f5a11cd4` (macOS, arm64, 16 CPUs), Electron built with
-`electron-vite --mode e2e`, headless, 100 worktrees at lineage depth 99 with 100
-seeded agent rows, 10 s warmup and a 30 s sampling window.
-
-Fixture scale is confirmed by the census rather than assumed: 100 store
-worktrees, 100 mounted cards, 100 mounted agent rows, and **9,279 store
-listeners**. That listener count is the multiplier the design targets.
-
-2,000 no-op store publications at a 1 ms cadence, three repetitions. The
-listener census was 9,279 in every run.
-
-| Measure                  |      Median | Runs                           |
-| ------------------------ | ----------: | ------------------------------ |
-| Wall time to complete    | 12,325.7 ms | 13,148.6 / 12,325.7 / 11,870.5 |
-| p50 scheduling drift     |  5,150.3 ms | 5,432.3 / 5,150.3 / 4,945.2    |
-| p95 scheduling drift     |  9,802.9 ms | 10,570.4 / 9,802.9 / 9,390.0   |
-| Renderer mean CPU        |      18.25% | 20.25 / 18.25 / 15.88          |
-| Renderer p95 CPU         |      32.59% | 40.07 / 32.59 / 31.28          |
-| Renderer timer drift p95 |      7.0 ms | 7.3 / 5.3 / 7.0                |
-
-2,000 publications requested over 2 s take about 12 s, so the renderer sustains
-roughly 160 publications per second at this scale. Each publication is
-individually short - the long-task observer recorded zero entries in all three
-runs - so the cost surfaces as scheduling drift and sustained CPU rather than as
-discrete long tasks. Compare drift and CPU here, not long-task counts.
-
-The idle control at the same scale with `--zustand-publications 0` reports 6.63%
-renderer mean CPU, 17.11% p95, and 1.6 ms p95 timer drift. Roughly 11.6 points
-of mean renderer CPU are therefore attributable to publication fanout rather than
-to the mounted fixture itself. 200 spinner animations run in both cases, so the
-control also bounds the animation cost out of the comparison.
-
-Reproduce with:
-
-```bash
-pnpm run bench:idle-cpu -- --worktrees 100 --lineage-depth 99 \
-  --agents-per-worktree 1 --warmup-ms 10000 --sample-ms 30000 \
-  --zustand-publications 2000 --zustand-publication-interval-ms 1 \
-  --output /tmp/idle-cpu-baseline.json
-```
-
-## Results
-
-Three repetitions used 100 mounted worktrees, lineage depth 99, 100 seeded
-agent rows, and verified final state. Medians from the regenerated evidence set
-are:
-
-| Single 2,000-update burst | Sequential |    Batched |
-| ------------------------- | ---------: | ---------: |
-| Status-state publications |      2,000 |          1 |
-| Store action time         | 3,692.0 ms |   188.7 ms |
-| Update throughput         |    541.7/s | 10,598.8/s |
-| Renderer mean CPU         |      36.2% |       2.9% |
-| Renderer p95 CPU          |     107.3% |       8.2% |
-| p95 long task             |   4,653 ms |     216 ms |
-
-The direct store transaction performs 99.95% fewer status-state publications,
-spends 94.9% less time in the store action, and processes updates 19.6 times
-faster. Renderer mean CPU falls 92.0%, renderer p95 CPU falls 92.4%, and the p95
-long task falls 95.4%.
-
-The 60-burst × 32-update case at 33 ms is a sustained saturation stress, not a
-real-time production SLO. Publications fall from 1,920 to 60 and median store
-action time falls from 2,791.9 ms to 323.3 ms. Median completion time falls from
-5,298.2 ms to 2,710.6 ms, p95 scheduling drift falls from 3,073.0 ms to 664.9
-ms, and long-task count falls from 57 to 1. Renderer p95 CPU remains saturated
-and noisy in this cadence, so it is not used as the discriminating measure.
-
-The 20-pane artificial OpenCode regression passes with 12.4 ms median key echo,
-25.2 ms worst key echo, 19.4 ms maximum timer drift, and zero dropped renderer
-backlogs.
-
-These figures come from the bundled prototype and are restated here as the
-target. They are re-measured with the harness when the store slice lands.
-
-## Acceptance criteria
-
-- The 100-worktree fixture stays at or below the pinned listener budgets.
-- A deferred transaction performs one status-state publication while preserving
-  ordered final state, including live-map eviction at the 500-row cap.
-- A 100-pane startup snapshot performs one status and one bulk resolved-title
-  publication with generated titles disabled; enabling generated titles adds at
-  most one ordered bulk publication while preserving final statuses and titles.
-- Sequential-versus-batch equivalence tests pass across same-pane transitions
-  and side-effect-bearing updates.
-- Renderer CPU tails and scheduling drift improve in repeated candidate runs.
-- The 20-pane artificial terminal test reports no dropped output backlog and no
-  material typing-latency regression.
-- Web typecheck, focused unit tests, lint, max-lines ratchet, and E2E build pass.
-
-## Compatibility
-
-This is renderer-local. It adds no RPC field, stream opcode, persisted data, Git
-command, or provider-specific contract. Native, WSL, SSH, relay, folder
-workspace, and git-worktree status events enter the same renderer action. Mixed
-client/server versions therefore need no capability negotiation.
-
-## Failure containment
-
-The first live event remains immediate. Startup replay and bounded pending
-retries fold synchronously without waiting for the 33 ms live-burst window, but
-publish their accepted updates together. Empty batches are no-ops. If an update
-is stale or targets retired authority, the reducer skips only that update and
-continues folding later events in order.
diff --git a/docs/reference/runtime-file-base64-padding.md b/docs/reference/runtime-file-base64-padding.md
deleted file mode 100644
index 3715855eaa02..000000000000
--- a/docs/reference/runtime-file-base64-padding.md
+++ /dev/null
@@ -1,92 +0,0 @@
-# Runtime file Base64 padding
-
-Padded runtime file writes must have a length divisible by four. Empty strings and
-unpadded Base64 with length modulo four equal to zero, two, or three remain valid.
-The change rejects exactly the previously accepted strings containing trailing
-padding whose total length modulo four is two or three. It does not enforce
-canonical unused pad bits or change the alphabet.
-
-## Boundary evidence
-
-| Input                     | Before | After  |
-| ------------------------- | ------ | ------ |
-| `A=`                      | Accept | Reject |
-| `AA==`                    | Accept | Accept |
-| `AAA=`                    | Accept | Accept |
-| `AAAA`                    | Accept | Accept |
-| `''`                      | Accept | Accept |
-| `A`                       | Reject | Reject |
-| `==`                      | Accept | Reject |
-| `AA=A` (interior padding) | Reject | Reject |
-| `AA=`                     | Accept | Reject |
-| `A==`                     | Accept | Reject |
-| `AAAA==`                  | Accept | Reject |
-| `AA`, `AAA` (unpadded)    | Accept | Accept |
-
-`Buffer.from('A=', 'base64')` decodes to zero bytes. Rejecting malformed padding at
-the RPC boundary prevents an accepted request from silently writing different bytes.
-
-## Caller census
-
-| Caller / surface                                                                                       | Reachability and compatibility verdict                                                                                                                                                                                                                                                                                                  |
-| ------------------------------------------------------------------------------------------------------ | --------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
-| Desktop `runtime-file-import-client.ts` → `uploadRuntimeFileWithoutClobber` → `writeRuntimeBase64File` | The only production producer of `files.writeBase64` and `files.writeBase64Chunk`. Staging in `filesystem-runtime-upload-staging.ts` encodes the complete file with `buffer.toString('base64')`; newly rejected values cannot be produced.                                                                                               |
-| Desktop single-frame uploads                                                                           | Sends the staged string unchanged when its length is at most 512 × 1024 characters. Standard Node Base64 always has length divisible by four. Empty files remain accepted.                                                                                                                                                              |
-| Desktop chunked uploads                                                                                | Slices the encoded stream at 512 × 1024 = 524,288 characters, divisible by four. Every offset and every complete chunk is quartet-aligned. The final chunk is the difference of two multiples of four, including when it ends in `=` or `==`. No separately assembled final chunk or per-chunk padding is added.                        |
-| Web implementation of `stageExternalPathsForRuntimeUpload`                                             | Returns an empty source list; no file-write payload is produced.                                                                                                                                                                                                                                                                        |
-| Mobile file editor                                                                                     | Uses `files.writeTerminalArtifact` with text content and its separate schema. Does not reach this predicate.                                                                                                                                                                                                                            |
-| Mobile clipboard / image attachments                                                                   | Uses `clipboard.startImageUpload`, `clipboard.appendImageUploadChunk`, `clipboard.commitImageUpload`, and the `clipboard.saveImageAsTempFile` fallback. Their validator is `isValidBase64` in `clipboard-params.ts`, not `isValidRuntimeFileBase64`. Unchanged, including the mobile normalizer's existing permissive padding behavior. |
-| CLI                                                                                                    | No producer of either Base64 file-write method. File commands in `src/cli/handlers/file.ts` call `files.open` / `files.openDiff`; other CLI RPC call sites do not construct Base64 file writes.                                                                                                                                         |
-| Generated params catalog                                                                               | References both schemas; `RpcParams` consumers use inferred types. Mobile's entry point is `export type` only, so no new client-side parsing occurs.                                                                                                                                                                                    |
-| RPC dispatch                                                                                           | `files-mutation-methods.ts` registers both schemas. The chunk schema extends the whole-file schema; these are the only runtime consumers of the predicate. Direct runtime/provider calls do not parse these schemas.                                                                                                                    |
-
-Repository-wide searches covered method names, schema names, the predicate and its
-pattern, and all callers of the upload/staging functions. Targeted history search
-on `HEAD` under `mobile/src` found no introduction/removal of the affected methods
-or predicate. The local release refs `mobile-ios-v0.0.27` and `mobile-v0.0.13` also
-contain no callers of either Base64 file-write method; the iOS ref uses the separate
-clipboard and terminal-artifact methods above. No shipped mobile producer of a
-newly rejected value was found in this source/history audit.
-
-## Remote and workspace compatibility
-
-Old desktop clients using the audited producer send valid quartets to a new host.
-A new client still sends the same bytes to an old host. No method, field, opcode,
-or host-published content changes. This follows the mixed-version requirements in
-[remote-wire-compatibility.md](./remote-wire-compatibility.md).
-
-The RPC validation runs before workspace resolution and provider selection, so the
-same rule applies to folder workspaces, git worktrees, local hosts, and SSH hosts.
-SSH ownership fences and provider writes are unchanged. Arbitrary external RPC
-callers sending malformed padding will now receive a validation error; valid
-padded and unpadded payloads remain accepted.
-
-## Regression evidence
-
-`src/main/runtime/rpc/methods/files-base64-padding.test.ts` exercises both actual RPC
-registrations, asserts rejected input never reaches the writer, and verifies
-accepted content is forwarded unchanged. With the original predicate, the test
-run produced **16 failed / 16 passed**; all 16 failures were newly rejected padding
-shapes accepted by the old implementation. This was run before editing the predicate.
-
-The existing desktop external-import test now uses a final `AA==` chunk after a
-524,288-character first chunk, pinning padded final-chunk forwarding in the real
-upload path. No producer changes or clipboard validation changes were necessary.
-
-## Validation results
-
-All test/typecheck commands used `ORCA_BACKGROUND_LAUNCH=1`.
-
-- `pnpm tc`: exit 0; all root typecheck projects passed.
-- `pnpm exec vitest run src/main/runtime/rpc`: 277 files passed, one failed;
-  2,419 tests passed, two timed out, one skipped. Both timeouts were in the unchanged
-  `terminal-output-frame-chunks-equivalence.test.ts` (5s surrogate-range test and
-  30s 800-payload fuzz test).
-- `pnpm --dir mobile typecheck`: exit 0 (`tsc --noEmit`).
-- `pnpm run check:code-quality:changed`: exit 0; code quality, type-aware code
-  quality, and React Doctor each reported zero new findings across three source files.
-- Focused run with `--config config/vitest.config.ts --maxWorkers=2`: all three
-  files / 58 tests passed, covering padding, desktop external imports, and the
-  terminal-output equivalence file that timed out in the initial run.
-- Full RPC rerun with `--maxWorkers=2`: exit 0; all 278 files passed,
-  2,421 tests passed and one skipped (198.34s). No timeout overrides were needed.
diff --git a/docs/reference/sharing-agent-skills.md b/docs/reference/sharing-agent-skills.md
deleted file mode 100644
index 9b9b53706a3a..000000000000
--- a/docs/reference/sharing-agent-skills.md
+++ /dev/null
@@ -1,88 +0,0 @@
-# Share and install agent skills
-
-Orca can put one skill or a bundle of skills behind one unlisted, revocable link. Shared bundles
-do not appear in search, a catalog, or a public index. Anyone who has an active link can inspect
-and install its contents without signing in, so treat the link like a credential.
-
-## Share skills
-
-Publishing and link management require an Orca account in the desktop app.
-
-1. Open **Skills** and choose **Share skills**.
-2. Select one or more skills. One link can contain a large collection, such as 30 skills.
-3. Review the bundle name, included skills and files, scripts, executable files, digest, account,
-   and optional release notes.
-4. Choose **Publish skill**, **Publish bundle**, or **Publish new version**, then copy the link.
-
-Orca publishes an immutable version. Later changes do not silently alter a link's current bytes;
-publish a new version to update the Cloud package.
-
-Use **Settings → Share Skills** to copy or revoke active links. Revocation blocks new previews and
-download grants. A grant issued immediately before revocation can remain usable for up to five
-minutes, and revocation does not remove copies that recipients already installed.
-
-## Install from a link
-
-Opening an Orca skill link shows a preview before changing any files. You can also open **Skills**,
-choose **Install from link**, and paste the URL.
-
-1. Verify the author and organization.
-2. Review the version, release notes, included skills, scripts, executable files, and digest.
-3. Select all skills or only the ones you want.
-4. Choose the destination machine and either global or workspace scope.
-5. Review new, unchanged, updated, and conflicting skills, then choose **Install N skills**.
-
-Supported destinations include the local machine, paired Orca runtimes, WSL, and SSH hosts. The
-destination runtime resolves its own home and workspace paths, so folder workspaces and remote
-filesystems do not borrow paths from the client machine.
-
-Orca keeps one canonical installed copy and places it where supported agents can discover it.
-Current provider coverage is documented in
-[Agent skill provider paths](./agent-skill-provider-paths.md).
-
-## Conflicts, updates, and rollback
-
-**Keep local** is the default when an existing skill differs. Orca replaces modified content only
-after you explicitly choose to discard it.
-
-Open **Skills → Manage installs** to inspect managed skills and their immutable version history.
-Installing the latest version performs an update; selecting an older retained version performs a
-rollback. Both use the same protected install transaction. If a bundle changes between versions,
-Orca updates only the selected skills that still exist in that version.
-
-An interrupted install is recovered on restart. If Orca reports a conflict or partial result,
-review the named skill and retry; completed skills do not need to be installed again.
-
-## Remove an installed skill
-
-Use **Skills → Manage installs → Remove**. Orca removes only copies and provider placements that it
-owns and can verify. Modified or unowned files are preserved and reported. Discarding modified
-content requires a separate explicit confirmation.
-
-Removing a local install does not revoke its share or delete its Cloud package. Likewise,
-revoking or deleting Cloud data does not reach into recipients' machines.
-
-## Retention and deletion
-
-- Upload grants expire after 15 minutes.
-- Abandoned upload bytes are removed from quarantine after one day.
-- Published versions have no automatic age-based deletion.
-- Deleting a package revokes its links before unreferenced objects are deleted.
-- Deleted GCS objects remain operator-recoverable through a seven-day soft-delete window.
-- Installed copies remain until someone removes them on each destination machine.
-
-Organization legal or retention requirements can override normal rollback and deletion timing.
-
-## Trust and privacy
-
-A skill is code from its author. `SKILL.md` can change agent behavior, and included scripts or
-executables may run later when a person or agent uses the skill. Orca validates the package and
-never executes its contents during installation, but you should install only from people you trust
-and review unexpected scripts or executable files.
-
-Orca records bounded operational identifiers and outcomes. Normal logs, telemetry, and support
-bundles exclude skill contents, filenames, manifests, local paths, share URLs, upload policies,
-download grants, credentials, and access lists.
-
-If a link no longer works, ask its owner for an active link. Missing, expired, revoked, and deleted
-links intentionally show the same response so Orca does not disclose private package existence.
diff --git a/docs/reference/spinner-rendering-performance.md b/docs/reference/spinner-rendering-performance.md
deleted file mode 100644
index 4340027474b7..000000000000
--- a/docs/reference/spinner-rendering-performance.md
+++ /dev/null
@@ -1,203 +0,0 @@
-# Spinner rendering performance
-
-## ELI5
-
-Imagine a wheel that tells the front desk every time it completes a lap. The
-front desk is also handling your typing. CSS already turns the wheel for us,
-but React still receives its once-per-second lap notifications.
-
-We put a day's worth of laps into one animation. The wheel moves at the same
-speed, while sending one lap notification a day. Drawing visible wheels still
-costs something. This removes recurring bookkeeping from the input thread; it
-does not make rendering or the rest of Orca free.
-
-## How this builds on earlier changes
-
-| Change                                                                               | What it achieved                                                                      | Remaining cost                                                                        |
-| ------------------------------------------------------------------------------------ | ------------------------------------------------------------------------------------- | ------------------------------------------------------------------------------------- |
-| [#9380](https://github.com/stablyai/orca/pull/9380): shared JavaScript clock         | Reduced frame-pipeline CPU in the original one-agent measurement                      | Wrote each spinner's style 12 times per second on the input thread                    |
-| [#12359](https://github.com/stablyai/orca/pull/12359): compositor CSS rotation       | Removed those recurring JavaScript style writes; fixed the reported typing regression | React still receives CSS iteration events                                             |
-| [#13987](https://github.com/stablyai/orca/pull/13987): synchronize on animationstart | Avoided a synchronous style query at every mount                                      | Steady-state animation overhead stayed the same                                       |
-| This change                                                                          | Preserves both later fixes and removes almost all iteration boundaries                | Compositing, other app work, mount/reveal work, and a daily iteration boundary remain |
-
-The historical measurements in #12359 reported 41 rings causing about 490 style
-writes per second, with typing input-delay p90 of 363 ms versus 19 ms when those
-writes stopped. Those are historical production measurements, not numbers from
-this benchmark or a direct comparison with today's app.
-
-## Implementation
-
-The production change is entirely in CSS. `AgentWorkingSpinner`, its callers,
-markup, border, animation-start handler, and reduced-motion behavior stay the
-same. No DOM node, pseudo-element, containment boundary, timer, observer, or
-JavaScript animation loop is added.
-
-The transform travels 86,400 turns in 86,400 seconds with 1,036,800 steps: exactly
-one revolution and 12 steps per second. `animationstart` sets `startTime = 0` as
-before, preserving shared phase after mount and animation restart. The step
-count is a timing-function parameter, not a million-entry keyframe list.
-
-React installs delegated `animationiteration` listeners even when the component
-has no iteration handler. A native 2.2-second trace of 200 isolated rings counted
-400 iteration events and 800 JavaScript calls before the change, versus zero of
-either with the long cycle. That trace installed no animation-event listener.
-These are event dispatches, not component rerenders or 400 separate OS wakeups.
-
-## Full-app benchmark
-
-The opt-in Playwright benchmark launches a fresh, hidden Orca app for each
-scenario. It creates real Git workspaces and seeds working statuses through the
-existing renderer fixture, including in-process subagent data. It renders the
-normal sidebar, virtualizer, lineage, agent rows, tabs, and terminal.
-
-| Scenario      | Git workspaces | Root agents | Subagents | Mounted / visible rings | Layout                                       |
-| ------------- | -------------: | ----------: | --------: | ----------------------: | -------------------------------------------- |
-| `one-agent`   |              1 |           1 |         0 |                   3 / 3 | One working agent                            |
-| `one-family`  |              1 |           2 |         4 |                   8 / 8 | All family rows expanded                     |
-| `200-flat`    |            200 |         400 |       800 |                162 / 15 | Normal virtualization; 23 workspaces mounted |
-| `200-lineage` |            200 |         400 |       800 |              1,401 / 15 | Expanded lineage; all 200 workspaces mounted |
-
-Measurement-only styles switch between the original one-second cycle and the
-new long cycle on the same elements. The real React root, callers, status data,
-and app stay the same. The reported run alternates A/B and B/A, with four
-ten-second CPU samples per variant after warmup. CPU samples use cumulative
-Electron process CPU and CDP main-thread task/script/style/layout metrics. No
-renderer polling, screenshots, or benchmark iteration listeners run during
-those CPU windows. No samples are discarded.
-
-Typing is measured separately using the existing paced terminal-typing probe:
-64 keys at 113 ms cadence, twice per variant, after two seconds of warmup with
-status traffic. Status updates arrive in groups of up to eight every 200 ms.
-Keys pass through the DOM, real PTY, and xterm. A sidecar timestamps arrival at
-the PTY, and a bounded terminal-buffer scan observes each echo. Missing input
-or echoes fail the benchmark. Echo measurements include the 10 ms scan interval;
-they do not measure native display presentation. Native animation traces also
-run separately from CPU and typing samples.
-
-The statuses are deterministic test data, not hundreds of paid model sessions.
-The test exercises UI cost under agent-status traffic, not the compute or network
-cost of model inference, SSH traffic, or hundreds of streaming PTYs.
-
-## Results
-
-CPU values are medians of four samples. "CPU ms/s" means milliseconds of
-processor time used in one wall-clock second: 100 ms/s is about 10% of one CPU
-core. Renderer + GPU-process CPU includes their other app work and CPU used by
-the graphics process; it is not GPU hardware utilization or whole-machine CPU.
-The main thread handles input and is included in renderer CPU, not extra work.
-Echo p90 means 90% of sampled keys were observed within that time; ranges show
-the two runs, not confidence intervals. No keys or echoes were missing.
-
-| Scenario      | Renderer + GPU CPU ms/s, old → new | Main-thread ms/s, old → new | Echo p90 ms, old → new |
-| ------------- | ---------------------------------: | --------------------------: | ---------------------- |
-| `one-agent`   |                        37.0 → 38.2 |                   5.4 → 3.5 | 19 → 18–19             |
-| `one-family`  |                        46.2 → 44.6 |                   7.8 → 4.4 | 17–19 → 18–19          |
-| `200-flat`    |                      141.6 → 122.8 |                 28.2 → 16.3 | 26–28 → 26–28          |
-| `200-lineage` |                      324.6 → 295.6 |                140.8 → 70.0 | 159–239 → 93–160       |
-
-The consistent gain is less main-thread work: about 35%, 43%, 42%, and 50%
-less in these four scenarios. Native 2.2-second traces counted 6, 16, 324, and
-2,802 iteration events before, and zero in each new variant, without adding an
-iteration listener. That avoided work also exists in Orca itself, independently
-of the isolated fixture and CPU noise.
-
-Total CPU was roughly unchanged in the one-worktree cases. In this run it fell
-13% with normal virtualization and 9% with expanded lineage; seven of eight
-paired large-case CPU samples favored the change. These percentages are not
-universal: a shorter three-variant ablation measured flat-list CPU at 89.0 ms/s before and
-108.0 ms/s with the long cycle, while main-thread time still fell from 26.3 to
-17.4 ms/s. The repeatable main-thread reduction is stronger evidence than a
-single total-CPU percentage.
-
-Typing was similar in the small and flat-list cases. Expanded-lineage echo p90
-improved in the final run, but a shorter ablation had similar before/after
-latencies. No general typing speedup or statistical non-regression guarantee
-is established by these short experiments.
-
-### All CPU samples
-
-Values are rounded to one decimal and listed by round, with no outliers removed.
-The first new small-case samples were higher than their paired baselines; they
-remain included. CPU and typing were sampled separately.
-
-| Scenario      | Version | Renderer + GPU CPU ms/s    | Main-thread ms/s           |
-| ------------- | ------- | -------------------------- | -------------------------- |
-| `one-agent`   | Old     | 37.8, 36.2, 26.2, 39.6     | 6.5, 5.2, 4.8, 5.7         |
-| `one-agent`   | New     | 53.3, 35.8, 37.5, 39.0     | 6.7, 2.8, 3.0, 4.1         |
-| `one-family`  | Old     | 46.3, 46.1, 47.9, 44.6     | 7.8, 7.6, 9.8, 7.7         |
-| `one-family`  | New     | 53.8, 45.4, 42.5, 43.8     | 6.8, 4.5, 3.1, 4.3         |
-| `200-flat`    | Old     | 142.4, 140.8, 147.0, 136.5 | 28.3, 28.1, 32.2, 27.0     |
-| `200-flat`    | New     | 122.9, 97.2, 122.7, 126.7  | 19.2, 10.7, 16.6, 16.0     |
-| `200-lineage` | Old     | 317.9, 385.2, 315.9, 331.2 | 134.4, 159.6, 133.9, 147.3 |
-| `200-lineage` | New     | 318.6, 256.9, 296.5, 294.7 | 89.2, 60.8, 71.6, 68.3     |
-
-## Reproduce
-
-```sh
-ORCA_BACKGROUND_LAUNCH=1 pnpm bench:spinners --sample-ms=5000
-ORCA_BACKGROUND_LAUNCH=1 pnpm bench:spinners --verify-only --scale-factor=1
-ORCA_BACKGROUND_LAUNCH=1 pnpm bench:spinners --verify-only --scale-factor=2
-ORCA_BACKGROUND_LAUNCH=1 ORCA_SPINNER_BENCH=1 ORCA_SPINNER_KEYS=64 \
-  pnpm test:e2e spinner-workspace-perf.spec.ts --workers=1
-```
-
-The full-app command rebuilds in `e2e` mode. For a fresh build already made with
-`pnpm exec electron-vite build --mode e2e`, `SKIP_BUILD=1` reuses it. Do not reuse
-an old launch-policy build. `ORCA_SPINNER_SAMPLE_MS`, `ORCA_SPINNER_ROUNDS`,
-`ORCA_SPINNER_KEYS`, `ORCA_SPINNER_KEY_CADENCE_MS`, `ORCA_SPINNER_VARIANTS`, and
-`ORCA_SPINNER_OUTPUT` control the experiment. `ORCA_SPINNER_CPU=0` repeats only
-typing; `--grep one-agent` selects one scenario. Reports, native traces, typing
-sidecars, and CDP screenshots are written under `.bench-fixtures/`. Run one
-benchmark at a time, without concurrent builds or tests.
-
-The optional `contained` variant retains the rejected offscreen experiment for
-ablation. It adds `content-visibility:auto` to the existing wrapper through
-measurement-only styles. It is not enabled in production or the default
-benchmark comparison.
-
-## Visual and behavioral checks
-
-Both 1x and 2x display-density checks passed 720 ring comparisons each: 6/8 px
-rings, light/dark themes, supported zoom extremes, all 12 phases, long elapsed
-times, and the daily wrap. The comparison pauses each animation and sets its
-`currentTime`, so the long-elapsed and daily-wrap cases exercise the deterministic
-style path rather than a running compositor animation. Against that path the
-tolerance is one channel level for floating-point antialias rounding. A running
-animation at multi-hour ages can differ by a few channels on the ring edge — a
-fraction-of-a-pixel antialias difference at large accumulated angles, not a phase
-or shape change. Checks also cover shared phase, reduced motion, initial offscreen
-reveal, repeated scroll-away/reveal, and `display:none` restoration.
-
-## Limits and rejected approaches
-
-Adding `content-visibility:auto` to the existing stationary wrapper saved more
-CPU at large mounted counts, but a 1x display check found a one-pixel shift at
-the minimum UI zoom. That containment change is excluded. A previous
-pseudo-element version also regressed typing latency in the virtualized list.
-Neither prototype's CPU or typing numbers describe the final patch.
-
-An initial typing run used a 100 ms key cadence, which can repeatedly align with
-200 ms status bursts. Follow-up runs use 113 ms, more keys, and two seconds of
-warmup under status traffic. This reduces timing bias; it does not excuse a
-regression. CPU measurements run separately and do not depend on key cadence.
-
-An early isolated test suggested a 31% process-CPU reduction that a longer audit
-did not reproduce. The longer isolated audit measured original 104.04 versus
-long-cycle 92.32 CPU ms/s, and main-thread 10.08 versus 0.24 ms/s. A fixture with
-every ring far offscreen and containment enabled could also approach idle; that
-is not representative of Orca with visible animations. Neither result justifies
-claiming "free spinners" or a universal CPU percentage. Virtualized, unmounted
-rows already cost nothing, and this patch does not add offscreen culling.
-
-All local measurements use an Apple M4 (10 cores), macOS, Electron 43.4.1 /
-Chromium 150.0.7871.224. Native windows stay hidden and unfocused;
-benchmark-only settings disable background throttling to exercise the frame
-pipeline. These are not visible-window power measurements. No battery benefit
-is established. Linux/Windows need their own runtime measurements. The
-renderer-only change does not alter SSH execution, wire data, status semantics,
-Git operations, or folder-workspace ownership.
-
-Animated PNGs, masks, layer promotion, CSS sprites, individual `rotate`, and
-containment on the rotating element were also explored. Shared images added
-raster work and regressed the single-ring case; sprites reintroduced per-frame
-style work. They did not meet the appearance and responsiveness requirements.
diff --git a/docs/reference/ssh-execution-boundary.md b/docs/reference/ssh-execution-boundary.md
deleted file mode 100644
index 62ecb83838d7..000000000000
--- a/docs/reference/ssh-execution-boundary.md
+++ /dev/null
@@ -1,129 +0,0 @@
-# SSH Execution Boundary
-
-How Orca splits work between your machine and an SSH host, what survives a disconnect, and how to keep `unverifiable` distinct from `exited`. Nothing under `docs/` stated this before; agents and humans were inferring it from error strings and getting it wrong.
-
-## The rule
-
-**The execution host owns everything that touches execution** — tools, credentials, identity, environment, processes, and artifacts. The client owns the UI, transport, and Orca control-plane state, but is not authoritative for execution state.
-
-Two consequences, both non-negotiable:
-
-1. **No silent substitution.** An operation on a remote `repoPath` must never fall back to running on the client. A missing SSH provider is not permission to answer locally — a local run can answer for the _wrong repository_.
-2. **No asserting what you cannot observe.** Loss of contact is not evidence of `exited`. Report `unverifiable`, never `exited`.
-
-The vocabulary is fixed: **`live` / `unverifiable` / `exited`**, taken from the incumbent `UnstoppedPtyVerdict`. Do not introduce synonyms, and never collapse `unverifiable` into either neighbour. `exited` requires positive evidence of absence from the host that owns the process; a transport failure can only ever produce `unverifiable`.
-
-Rule 1 is stated at `src/main/source-control/repo-default-branch.ts:76-78`, `src/main/repo-worktrees.ts:45-48`, `OrcaRuntimeService.probeWorktreeDrift` in `src/main/runtime/orca-runtime.ts`, and `src/renderer/src/lib/connection-context.ts:22-24`. It is enforced throughout `src/main/runtime/orca-runtime-git.ts` by `requireRuntimeGitProvider` in `src/main/runtime/runtime-git-command-target.ts`, and throughout the runtime filesystem commands by `requireRuntimeFileProvider` in `src/main/runtime/runtime-file-command-target.ts`. Both route on the target's resolved `executionHostId` rather than on a repo row's `connectionId`: they throw the provider-unavailable message when an SSH host has no registered provider, throw `ExecutionHostNotDispatchableError` for a `runtime:` host this process does not execute, and return `null` only for `local`. Grep those names for the current call sites rather than trusting a count.
-
-`src/main/runtime/unstopped-pty-verification.ts:12-16` is the reference implementation of rule 2: it keeps `live` / `unverifiable` / `exited` as three distinct verdicts, and treats "we could not ask" as its own answer.
-
-## What runs where
-
-| Concern                                                        | Executes on        | Notes                                                                |
-| -------------------------------------------------------------- | ------------------ | -------------------------------------------------------------------- |
-| PTYs, agent CLIs                                               | **remote**         | children of the detached relay daemon, not of the ssh channel        |
-| git (status, diff, log, fetch, push, commit, branch, worktree) | **remote**         | via `src/relay/git-handler.ts`                                       |
-| filesystem, watching, search                                   | **remote**         |                                                                      |
-| repo setup hooks (`--setup`)                                   | **remote**         | identical policy to local                                            |
-| commit-message / PR-field AI generation                        | **remote**         | uses the remote agent CLI and its auth                               |
-| `gh` / GitHub API, `glab` / GitLab                             | **client**         | inconsistent with the rule; PRs carry the client's identity          |
-| the `orca` CLI inside a remote terminal                        | **client runtime** | control plane only — your files and processes stay remote; see below |
-
-## Survival: what a disconnect does _not_ do
-
-By default, remote work survives your machine going away. The relay is a detached daemon (`nohup … </dev/null &`), its handler in `src/relay/relay.ts` ignores `SIGHUP`, the PTY is its child rather than the ssh channel's, and quitting Orca is a **detach, not a dispose** (`src/main/ssh/ssh-relay-session.ts:901-915`). Sleep additionally pushes `graceTimeSeconds: 0` to un-bound any running grace window.
-
-Two ways remote work _can_ actually stop:
-
-- **A bounded grace period.** The shipped default is `0` = keep alive until reset. If "keep terminals alive until reset" is unchecked, the configurable range is **60s–7d** and the form defaults to **24h**. The countdown starts when the client disconnects, after which the relay SIGKILLs every PTY. Note the asymmetry: sleep protects you, but ordinary disconnect and app quit do not. No command reports which setting is in effect for a target, so at N hours since disconnect you cannot tell "unlimited" from "24h with 7 left" — treat the remote as `unverifiable`, not `exited`.
-- **Host-acknowledged explicit user action** — End Remote Terminals, Reset Relay, removing the target, or closing the tab. When the host cannot acknowledge the request, closing a tab or removing a target may clear only client state; the remote verdict remains `unverifiable`.
-
-Reconnect re-attaches to the same live PTYs and replays a bounded buffer (`REPLAY_BUFFER_MAX`, a 102,400-code-unit tail). Output beyond that while you were away is lost to the client even though the process was never interrupted: **the transcript is truncated; the work stays `live`.**
-
-## Updating Orca strands relay-backed terminals
-
-There is a third outcome that is neither of the two above, and the vocabulary matters: the work does not stop, it becomes unreachable through the new build's own relay.
-
-The relay's install directory — and therefore its socket path — is namespaced by a content hash of the relay bundle (`computeRemoteRelayDir` in `src/main/ssh/ssh-relay-versioned-install.ts`, consumed by `resolveRemoteInstallState` in `src/main/ssh/ssh-relay-deploy.ts`), and the daemon refuses any client whose bundle hash differs (`handleDaemonHandshakeFrame` in `src/relay/relay-handshake.ts`, exit `EXIT_CODE_VERSION_MISMATCH` 42). Two builds whose relay protocol is byte-identical still refuse each other. So the first reconnect after an app update deploys a new relay at a path the incumbent was never listening on, and this build's own bridge cannot reach the incumbent. The incumbent's own bridge can: its version directory still holds its `relay.js` and `.version`, so `relay.js --connect` run from there presents its own hash by construction. Each deploy takes a census of this target's older endpoints (`startPreviousRelayCensus` in `src/main/ssh/ssh-previous-relay-terminals.ts`); while one is live or unverifiable, a not-found reattach keeps its lease and answers `SSH_PTY_HELD_BY_PREVIOUS_RELAY` instead of expiring. On POSIX hosts the pane is then reattached through that older bridge (`SshLegacyRelayRoute` in `src/main/ssh/ssh-legacy-relay-route.ts`), which takes the PTY owner role without output flow control, and every later operation on that PTY id is routed there (`src/main/providers/ssh-pty-legacy-relay-delegation.ts`). When the last pane it serves exits, the route hangs up and the incumbent's own grace retires it. On Windows the census probes each older version directory's pipe for the target (`src/main/ssh/ssh-previous-relay-windows-census.ts`), and a census that cannot run or does not know the host platform counts as `unverifiable`, never as "no older relay". The connect-time host census, which decides whether a host may convert to a managed server before any relay session exists, instead lists every `orca-relay-*` pipe on a Windows machine and maps each to the relay instance that owns it through that instance's credential file or pipe marker, whichever desktop launched it (`src/main/ssh/ssh-host-relay-windows-inventory.ts`); a pipe no directory accounts for counts as `unverifiable` unless the host proves it another account's. The migration terminal gate (`assessOrcadMigrationTerminals`) answers `exited` only from a complete inventory: every relay session answered, or, with no session, a host census proved the endpoints idle. A missing or failed inventory is `unverifiable` even when this desktop leases nothing. Where no route can be opened — Windows named pipes, a socket relocated under the short `/tmp` base, a bridge that fails — the PTY stays `unverifiable`: the pane says it is still running under the previous Orca version, and is never respawned. The old relay keeps its directory pinned against GC while its socket is live (`hasLiveRelaySocket` in `src/main/ssh/remote-install-gc.ts`). See #13852: on POSIX hosts that is no longer a dead end, because a terminal held by a previous relay version now resumes in its pane through that relay's own bridge.
-
-The peer model does not have this failure, and that is the concrete reason behind "One host, one model" below. The daemon's endpoint is namespaced by a **semantic protocol version** rather than a build (`daemon-v<N>.sock`, from `getDaemonSocketPath` in `src/main/daemon/daemon-spawner.ts`), every earlier protocol version stays attachable (`PROTOCOL_VERSION` in `src/main/daemon/daemon-protocol-version.ts`), and a daemon holding live sessions is preserved across a version change instead of replaced (`shouldPreserveDaemonWithLiveSessions` in `src/main/daemon/daemon-replacement-preflight.ts`).
-
-## Control plane
-
-On an SSH host, `orca` is a shim (`~/.orca-relay/bin/orca`) that proxies **back to the client's runtime** over the relay socket. Your repository, processes, and files remain remote — only the control plane is on the client. This is correct for an SSH target, but it has a consequence worth stating plainly:
-
-> When the client disconnects, every `orca …` command run on the SSH host fails with `No owning Orca client is connected to the relay`. The PTY stays `live`; its control plane does not.
-
-Orchestration state (Runs, Tasks, Dispatches, mailboxes) is client-resident for the same reason. An agent on an SSH host should not depend on `orca` for anything it must finish while you are away. **Commit and push early** — unpushed work on a remote box is unavailable to the client until it reconnects.
-
-## Distinguishing `unverifiable` from `exited`
-
-A verdict needs evidence from the host that owns the process. Apply these tests in order.
-
-**Was the signal produced by the owning host, or by the client's own bookkeeping?** Absence from a client-side set, a lookup that threw, a socket that closed, a command that timed out — none of these observe the process. They are `unverifiable` by construction, whatever the field is named.
-
-**Did every remote PTY on that target go quiet at once?** A transport drop takes them all together. Simultaneous silence across a host indicates a lost link, not simultaneous death.
-
-**Does the termination event match the current identity?** A host-delivered exit for the live PTY incarnation and provider generation, while its siblings still report, establishes `exited`. A stale event, an event for a superseded incarnation, or one quiet terminal with no host evidence does not.
-
-**Did the answer carry its evidence, or only the same wording?** `pty.attach` refuses with `PTY "<id>" not found` both for a pid the relay probed and found gone and for an id its session map never had — which is every id minted before a relay restart, since ids carry a per-start mint epoch. Only the probed refusal carries `PTY_ATTACH_PROVEN_EXITED_MARKER` (`src/shared/pty-attach-absence-evidence.ts`) and reaches the client as `SshPtyProvenExitedOnRelayError`; the unmarked union arrives as `SshPtyAbsentFromRelayError`, which licenses retiring the client's own route to the PTY and nothing more. A missing marker is never evidence — an older relay omits it too.
-
-**Is a returned status actually a claim of success?** An operation that reports failure may have succeeded, and one that reports success may not have run — check the durable state it should have changed rather than trusting the return.
-
-Anything short of positive host evidence is `unverifiable`. Reporting it as `exited` is the error this document exists to prevent: it orphans live work and can cold-start a duplicate over the same worktree.
-
-## Host contact is a different question from process liveness
-
-The `live` / `unverifiable` / `exited` triple above answers one question: is this PTY running. It has
-no synonyms, and nothing below adds any.
-
-A second, narrower question — can we currently reach the host at all, and what is its last answer
-worth — is answered by `RuntimeHostContact` (`src/shared/runtime-host-contact.ts`), whose arms are
-`live` / `unverifiable` / `refused` / `retired`. These are **not** extra process verdicts and must
-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
-  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
-reader that needs a process verdict must still get it from the host that owns the process, by the
-tests above.
-
-Why the extra arms exist at all: the renderer previously expressed every non-answer as one nullable
-`status`, so a probe in flight, a probe that failed, a host that refused us and a retired pairing
-all reached readers as the same `null` — and readers spent that `null` on decisions of very
-different weight, including destructive ones. Folding `refused` and `retired` back into
-`unverifiable` to match this document's triple would recreate exactly that collapse. The vocabularies
-are deliberately separate because the questions are.
-
-## Deciding a remote pane is idle
-
-The orphan-PTY sweep is the one flow that turns an observation into a SIGKILL, so its idleness evidence has to be measured against the same thing the signal reaches. It is not the terminal.
-
-`forceKillPosixPtyProcessGroups` (`src/main/pty/posix-pty-process-groups.ts`) collects every process group on the pane's tty and `killpg`s each one. The blast radius is therefore _(process groups on the tty) × (members of those groups, wherever they are)_, and the second factor is not bounded by the terminal at all. Two facts make that gap reachable:
-
-- **Job control can be off.** With `set +m` a background job does not get its own process group — it keeps the shell's. `ps` then shows one process group on the tty, running a build. Nothing in a tty-shaped predicate can see it.
-- **A group member can leave the terminal.** `ioctl(TIOCNOTTY)` without `setsid` drops the controlling terminal but keeps the pgid, so the process reports `tpgid == -1`, never appears in `ps -t <tty>`, and is still killed by `killpg(shellPgid)`. A double-forked grandchild similarly keeps the pgid while reparenting to pid 1, so no walk by `ppid` from the PTY root can name it either.
-
-So `shellOwnsEveryTtyProcessGroup` (`src/main/providers/agent-foreground-process-batch.ts`) requires both measurements: every process group on the tty is the shell's own with none stopped, **and** the shell's own process group has no other member anywhere in the host's process table. The name is tty-shaped for wire-compatibility reasons only.
-
-Two residuals remain, and neither is removable here. The capture is a snapshot, so work started between the `ps` and the signal is invisible — bounded by `RELAY_PTY_SWEEP_MAX_EVIDENCE_AGE_MS` on the reading side, not eliminated. And a process the host's own `ps` cannot enumerate (another PID namespace, `hidepid=2`, a table truncated by a permission boundary) is unobservable while `killpg` still reaches it.
-
-The general rule this instantiates: **evidence must be measured in the unit the destructive action operates on.** Evidence in a different unit is `unverifiable` no matter how precise it looks.
-
-## Reading artifacts instead of process state
-
-Artifacts are stronger evidence than liveness signals, but they answer a narrower question than they appear to.
-
-A matching commit from `git ls-remote --heads origin <branch>` or a PR head lookup proves **that commit reached the remote** — not that the current run pushed it, and not that the latest work was included. An absent result proves nothing was found, not that nothing was pushed: the ref may have been deleted, the PR closed, or the query may simply have failed.
-
-A listing is only evidence about the hosts it actually covered. When a result does not name its scope, an empty answer is not evidence that nothing is running elsewhere. A clean **local** worktree says nothing at all about the remote one.
-
-## One host, one model
-
-An SSH host and a paired runtime (`orca environment`) imply opposite boundaries: the first is a dumb execution host driven by your client, the second is a peer that owns its own control plane. Registering the same machine both ways splits its worktrees across two identities, makes `terminal list` return different sets depending on `--environment`, and reliably confuses both humans and agents. Pick one per machine.
-
-For work that must continue while you are offline, use the peer/headless-runtime model on the remote host instead of the direct-SSH model. Its control plane is host-local, and its daemon-backed PTYs can stay `live` across a PID-scoped runtime restart so the runtime can reattach. A service manager that reaps the runtime's cgroup, or an explicit daemon shutdown, makes them `exited`; see [Running orcad](./orcad-operations.md#process-scoped-and-cgroup-wide-stops). Do not register the same machine through both models. A detached agent process outside Orca can also survive a control-plane outage, but it has no stdin, so its instructions cannot be amended mid-run.
diff --git a/docs/reference/ssh-host-key-verification.md b/docs/reference/ssh-host-key-verification.md
deleted file mode 100644
index 73955bdc7df5..000000000000
--- a/docs/reference/ssh-host-key-verification.md
+++ /dev/null
@@ -1,424 +0,0 @@
-# SSH host key verification (STA-4319)
-
-Revised after security and migration review. Where a first draft was wrong, the correction is kept
-visible rather than quietly edited out — the reasoning matters for anyone changing this later.
-
-## The defect
-
-`src/main/ssh/ssh-connection.ts:1184` installs a `hostVerifier` that records a SHA-256 fingerprint
-and then `return true`. Every ssh2 connection accepts every host key. There is no `known_hosts`
-consult, no trust record, and no change detection anywhere in `src/main/ssh/`. There is exactly one
-ssh2 `Client` construction site, so the fix has a single chokepoint.
-
-Scope is per-connection, not per-feature: one `SshConnection` per target serves exec, SFTP, port
-forwarding, the filesystem watcher and relay deploy.
-
-### Threat model, corrected
-
-Traffic is still encrypted, so a passive observer gets nothing. The exposure is an **active**
-attacker who can redirect the connection — ARP/DNS spoofing, hostile Wi-Fi, a hijacked internal name.
-
-Three corrections to the first draft:
-
-- **Jump hosts are NOT the worst case; they are already safe.** `shouldUseSystemSshTransport`
-  (`ssh-transport-selection.ts:71-91`) returns true for exactly the conditions under which
-  `resolveEffectiveProxy` (`ssh-proxy-command.ts:17-38`) returns a proxy — the two branch on the same
-  inputs in the same order — and `attemptConnect` returns unconditionally after the system probe
-  (`ssh-connection.ts:670-673`). So ProxyJump/ProxyCommand go through OpenSSH and are already
-  verified. The ssh2 proxy-spawn at `:697` is effectively unreachable. Good news for migration, and
-  the first draft's motivating example was simply wrong.
-- **Agent forwarding was overstated.** `agentForward` is gated on the user's `ForwardAgent yes`
-  (`ssh-connection-utils.ts:203-205`). `config.agent` is always set, but that is agent _auth_, whose
-  signatures bind the session id and cannot be replayed onward. The risk applies to users who opted
-  into `ForwardAgent`, not everyone.
-- **Credential theft was understated, and the relay claim was backwards.** `isAgentFallbackError`
-  treats _any_ auth error as agent fallback (`ssh-connection-utils.ts:59-61`), so a MITM that rejects
-  publickey walks the user to the password prompt (`ssh-connection.ts:844`) and the private-key
-  **passphrase** prompt (`:834`), and `cachedPassword` is replayed without prompting on every
-  reconnect (`:709`). Meanwhile the relay upload matters less than assumed — the attacker already
-  owns their machine. The real client-side impact is the **return** direction: the attacker becomes
-  the host our workspace trusts, driving relay protocol frames, landing SFTP content in local
-  worktrees, and feeding agent-hook payloads in.
-
-## Decisions
-
-### D1. Read the user's `known_hosts`; write only to our own store
-
-Consult the user's real `known_hosts` as a trust source — most developers already have their hosts
-there from `ssh` and `git`, which is the entire migration story. Do **not** write to it: that file is
-shared with every other SSH tool on the machine, and appending brings line-endings, permissions,
-concurrent writers, and a corruption blast radius well beyond us.
-
-Two consequences to own rather than discover:
-
-- **Revocation does not propagate into our store.** `ssh-keygen -R host` clears `known_hosts` but not
-  our record. That is survivable for the ordinary rotation, because a `known_hosts` MATCH is now
-  decided before our store's mismatch — running the remedy we print and reconnecting works, which it
-  did not when the store was consulted first. What it does not cure is a host we only ever knew
-  ourselves, never written to `known_hosts`: there is no `ssh-keygen -R` for that one, so the
-  rejection names the store file directly. The "forget" action (D5) replaces that with a button; its
-  helper is deliberately absent until then, since an exported API nothing can reach is unverified in
-  production. Mismatch messaging must keep naming which source disagreed.
-- **`ssh -G` on the HOME-divergent `-F` path suppresses `/etc/ssh/ssh_config`**
-  (`ssh-g-config-resolution.ts:44-52`), hiding site-wide `StrictHostKeyChecking yes` and
-  `GlobalKnownHostsFile`. On that path we must fail **strict**, never laxer than `ssh` would.
-
-  There is no `ssh`-only way out of this: `-F /dev/null` does NOT invert the exclusion, it reports
-  built-in defaults, so a probe built on it looks permissive on every machine. Verified against
-  OpenSSH 10.2p1. So the file is read directly, answering a deliberately weaker question — _could_
-  the site config be restricting host keys — where anything ambiguous (unreadable, an unresolvable
-  `Include`, the directive present at all) keeps the refusal. Only a site config that demonstrably
-  says nothing about host keys clears it, which is what stops the rule punishing every devcontainer,
-  `su` shell and Nix shell.
-
-### D2. Ask `ssh -G`, do not reimplement config resolution
-
-`ssh -G` reports `userknownhostsfile`, `globalknownhostsfile`, `stricthostkeychecking`,
-`checkhostip`, `hostkeyalgorithms`, `fingerprinthash`, `hashknownhosts`, `updatehostkeys` and
-**`hostkeyalias`** — with `Match` and `Include` already applied. `resolveWithSshG` exists and simply
-does not read them yet.
-
-`userknownhostsfile` is a space-separated list on one line, may contain `~`, and may contain
-double-quoted paths with spaces. When `ssh -G` is unavailable (no `ssh`, non-zero exit, >5s timeout)
-fall back to `~/.ssh/known_hosts` + `known_hosts2` — never to accept.
-
-`HostKeyAlias` must be honoured: users tunnelling bastions through `localhost:port` depend on it and
-would otherwise hit spurious mismatches. It appears nowhere in `src/main/ssh/` today.
-
-**Lookup key.** Config resolution uses `configHost || label` (`ssh-connection.ts:660`) while ssh2
-dials `effectiveHost` (`ssh-connection-utils.ts:188`). The `known_hosts` lookup must use
-`HostKeyAlias` if set, else the **resolved hostname** — keying on the Orca label would miss every
-existing entry.
-
-**Two ordered lookup passes, not one candidate set.** Verified against OpenSSH 10.2p1: a non-default
-port looks up `[host]:port` first, and if that finds nothing it retries the **bare** host. Crucially,
-on that second pass a wrong key is downgraded to `unknown` rather than reported as changed. So the
-passes are `[['[host]:port'], ['host']]`, and the fallback pass can only yield `match` or `unknown`.
-Collapsing them into one set would give a spurious first-contact prompt to anyone who has a bare
-line and connects on a non-default port; treating the fallback as authoritative would raise a false
-change-of-key alarm.
-
-**The entry condition to that second pass is the part that bites.** ssh runs it only when the
-port-qualified lookup matched no plain entry of ANY key type — not "no match". Gating it on
-"no match and no same-type mismatch" reaches the bare line when an off-port entry of another type
-exists, and returns `match` where ssh prints `IDENTIFICATION HAS CHANGED`: an accept-a-changed-key
-path, reproduced live. And the observations from each pass must not leak into the other, or an entry
-found only on the fallback refuses a host ssh accepts as first contact.
-
-**`HostKeyAlias` suppresses the port entirely.** ssh looks the alias up bare and never brackets it,
-so an alias gets ONE pass regardless of port. Combined with the rule above, a stale `[alias]:port`
-line would otherwise block the bare lookup ssh actually performs — turning the bastion case this
-feature cites `HostKeyAlias` for into a hard failure.
-
-**Hashed entries hash the candidate form, not the bare host** — `[example.com]:2222` is what gets
-HMAC'd for a bracketed entry, so each candidate must be hashed separately.
-
-**Multiple files union.** Any exact hit in any file wins; a disagreeing entry in another file does
-not make it a mismatch. Confirmed live in both orderings.
-
-**A `@cert-authority` line whose key equals the presented plain host key is not a match** — a CA line
-only validates certificates. A normal line alongside it still decides. But ssh's verdict for a
-CA-covered host presenting a plain key is `HOST_NEW`, not a failure: it connects. See D4.
-
-### D3. Six outcomes, and type scoping is only safe with algorithm ordering
-
-`match | mismatch | revoked | ca-only | unknown-type-known-host | unknown`.
-
-Mismatch is scoped to the same key type: a host with only an RSA entry that presents ed25519 is not
-"changed". Without scoping we would false-alarm nearly every RSA-era user on their first upgraded
-connect, training them to dismiss the one warning that matters.
-
-> **Corrected against a live client.** The premise above is wrong about OpenSSH, though the
-> conclusion survives. `check_key_in_hostkeys` is not type-scoped at all: ANY non-marker entry for
-> the host that is not byte-equal produces `HOST_CHANGED`. Verified on 127.0.0.1:2223 — `known_hosts`
-> holding only `ssh-rsa` against an ed25519-only server prints `IDENTIFICATION HAS CHANGED` and
-> refuses. So ssh does not avoid the false alarm by scoping; it avoids the _situation_ via
-> `order_hostkeyalgs`, and hard-fails when the situation arises anyway. Our split into `mismatch`
-> and `unknown-type-known-host` therefore only chooses the wording — both refuse, which is ssh's
-> action. What the ordering below buys us is what it buys ssh: the situation mostly never arises.
-
-**But scoping alone is a downgrade vector, and this is the correction that most changes the design.**
-OpenSSH is safe here only because `order_hostkeyalgs()` reorders the client's proposed host-key
-algorithms to put the types already in `known_hosts` first, and RFC 4253 gives the _client's_ order
-priority — so a server cannot choose a type the client deprioritised. ssh2 negotiates ed25519 first
-regardless. An attacker who cannot forge the RSA key on file simply presents ed25519 and receives a
-friendly first-contact prompt instead of a hard failure.
-
-Therefore: **set ssh2's `algorithms.serverHostKey` to lead with the key types already known for that
-host.** Type scoping without algorithm ordering is not a safe design.
-
-And when the presented type is unknown _while other types are known for this host_, that is
-`unknown-type-known-host` — never a plain TOFU prompt. It must say we already hold a different key
-for this host.
-
-### D4. Outcomes
-
-- **match** → connect silently.
-- **unknown** → trust-on-first-use (see the phasing below for whether that is silent or prompted).
-- **mismatch** → hard fail, no override in the failure surface.
-- **revoked** → hard fail, always.
-- **ca-only** → ~~hard fail~~ **REVERSED: treated as first contact.** See below.
-- **unknown-type-known-host** → treat as suspicious, not first contact.
-
-`StrictHostKeyChecking` is honoured: `no`/`off` accepts unknown but **never persists** and still
-hard-fails changed and revoked; `accept-new` persists silently; `yes` denies unknown.
-
-> **`ssh -G` does not report the spelling the user wrote.** StrictHostKeyChecking is rendered through
-> `fmt_multistate_int`, which prints the first entry of `multistate_strict_hostkey`, and that table
-> lists true/false before yes/no. So `yes` arrives as `true`, `no` and `off` both as `false`; only
-> `ask` and `accept-new` pass through unchanged. Matching on `yes`/`no`/`off` matches nothing a real
-> config can produce. `UpdateHostKeys` has the same shape (`true`, not `yes`).
-
-**ca-only, reversed after review.** The rejection was stricter than ssh, and the blast radius was
-mispriced. An SSH CA user holds ONE line — very often `@cert-authority *` — which matches every
-candidate, so EVERY target failed, not just CA-signed ones, including on-demand runtime VMs, and
-`StrictHostKeyChecking=no` did not help. `ORCA_SSH_FORCE_SYSTEM_TRANSPORT=1` is read from the
-process environment, which an Electron app launched from the Dock or Start Menu does not have, so
-the documented escape was unreachable for exactly the people who needed it. And OpenSSH's own
-verdict for a CA-covered host presenting a plain key is `HOST_NEW`: it connects. ssh2 cannot
-validate certificates at all, so refusing conceded nothing ssh was not already conceding.
-
-The residual risk is accepted, not resolved: for a CA-protected host we take a plain key we cannot
-tie to the CA. Certificate support is Phase 2 work. The `ca-only` outcome is still produced and
-carried through the decision so the log shows a CA line was involved.
-
-**An unreadable known_hosts connects but records nothing.** A file that EXISTS and will not open is
-the absence of evidence, and the common trigger is not exotic — a Windows OneDrive Known Folder Move
-placeholder while offline fails with a cloud-file error, not ENOENT. Refusing there broke an
-ordinary corporate laptop while blaming a config file that was fine, and was asymmetric with our own
-store, which degrades to "nothing trusted" and connects. ssh warns and treats the host as unknown;
-so do we — but we write no record, so a first contact we could not check never becomes durable
-trust. An ABSENT file is not this case: that is the normal state for a fresh profile and genuinely
-means nothing is known.
-
-### D5. Recovery must not live in the failure dialog
-
-A "forget this host key" button _in_ the mismatch dialog is D4's rejected "trust anyway" with one
-extra click. Recovery lives in target settings: a separate, deliberate surface, no auto-retry, and it
-shows the stored fingerprint so the user is choosing knowingly.
-
-Offer it only when **our** store is what disagreed; when `known_hosts` disagrees, forgetting our
-record cannot unblock the connect. Messages, written to avoid naming internals:
-
-> **Ours disagreed** — "The host key for `build-01` changed since you last connected from Orca. If you
-> rebuilt or reprovisioned this machine, this is expected." → _Forget the saved key_ / _Cancel_
-
-> **`known_hosts` disagreed** — "The host key for `build-01` does not match the entry in
-> `~/.ssh/known_hosts`. `ssh` and `git` will refuse this host too. Run `ssh-keygen -R build-01`." →
-> no button, because a button would not help.
-
-### D6. Never prompt on a background reconnect
-
-A prompt only means something when a human initiated the connect. `userInitiated` does not exist on
-the connect path today and must be threaded through `connect → attemptConnect → doSsh2Connect`,
-defaulting **false**.
-
-Two traps: `useAutomationDispatchEvents.ts:203` and `pty-connection.ts:857` reach `ssh:connect`
-without a human click — automation must pass `false`, but **terminal-pane focus reconnects must count
-as user-initiated** or terminals die silently. And the denial string must avoid "authentication
-failed"/"permission denied", or `isAgentFallbackError`/`isAuthError`
-(`ssh-connection-utils.ts:46-61`) misclassifies it and the reconnect ladder retries a decision that
-will never change.
-
-### D7. Fail closed — three known fail-open shapes
-
-1. The existing generation/disposed guard at `:1185` has the fail-open shape today: skip recording,
-   still `return true`. Post-fix that branch must **deny**.
-2. A synchronous throw inside the verifier may not be caught by ssh2 — wrap and `verify(false)`.
-3. Any non-`undefined` return accepts immediately (see Traps).
-
-Plus: no prompt channel registered → deny (the load-bearing default lives in `doSsh2Connect`, not in
-IPC, so a caller that forgets to wire it cannot accidentally accept); no window → deny; timeout →
-deny; dialog dismissed → deny.
-
-### D8. Store shape and scope
-
-Accepted keys are scoped to **host + port + key type**, not target id — aliases point at different
-machines, two targets can name one machine, and a re-created target must not lose trust.
-
-The store is a **dedicated file**, not the main persistence blob (`persistence.ts:7088`): a settings
-restore or rollback must not silently reset trust. Accept and mismatch events are logged.
-
-`hostKeyFingerprint` is now security-relevant _and_ wire-relevant — it is an isolation namespace sent
-to the host (`ssh-relay-session.ts:1298`, `managed-hook-owner-identity.ts:187`). It is `undefined` on
-the system transport, so **no trust logic may key off it**, and its format must not change (see
-Traps).
-
-## Phasing — ship the defence before the dialog
-
-Review made the case that the riskiest part of this change is not the security model but the modal.
-Startup restore fires eager connects for _all_ previously-active targets in parallel (`App.tsx:1041`)
-with a 15s timeout, while a prompt would live 120s — N unknown hosts means N stacked dialogs
-outliving the timeout that already deferred them. Runtime-owned ephemeral VMs
-(`ephemeral-vm-runtime-ssh.ts:31`) dial a freshly provisioned host with a brand-new key on every
-launch. Paired-web connects run on the _host desktop_ (`runtime/rpc/methods/ssh.ts:32`), so the
-dialog would open on someone else's screen while the web user watches a spinner.
-
-**Phase 1 — no new modal.** Consult `known_hosts` + our store. `match` connects. `unknown` persists
-silently with `accept-new` semantics and a passive notification naming the host and fingerprint.
-`mismatch` (same type) and `revoked` hard-fail. This is the entire MITM defence with zero prompts,
-zero startup storms and zero web hang.
-
-**Phase 2** — the TOFU dialog, `StrictHostKeyChecking` honouring, `ca-only`, `userInitiated`
-plumbing, and the D5 settings surface.
-
-Carve-outs required before Phase 1 ships:
-
-- **Runtime-owned ephemeral targets are exempt from persistence** — a new key every launch is
-  expected, not suspicious, and recording one would accumulate a row per launch that eventually
-  reads as a spurious change. Implemented via `target.owner?.type === 'on-demand-runtime'`.
-- **RPC-originated connects: NOT needed in Phase 1, required in Phase 2.** The review asked for
-  these to fail fast rather than leave a paired-web user watching a spinner for the 120s prompt
-  timeout. That hang is only reachable if a prompt exists, and Phase 1 has none — the decision
-  function is pinned by a test asserting it never returns `prompt`. An RPC connect therefore behaves
-  exactly like a local one: it accepts and records on first contact, or fails immediately with the
-  host-key reason. Adding a fail-fast path now would introduce a failure mode for a hang that cannot
-  occur. It becomes load-bearing the moment the dialog lands, and is listed in Phase 2.
-
-  Worth noting for Phase 2: `runtime/rpc/methods/ssh.ts` already swallows the specific error and
-  rethrows `getPublicSshError(status)`, so a web client sees a generic failure rather than the
-  host-key reason. Pre-existing, but it means the Phase 2 message will not reach the web user
-  without a change there too.
-
-## Traps
-
-Each of these makes the fix silently do nothing. All confirmed in our tree.
-
-1. **An `async` verifier defeats it entirely.** ssh2 does
-   `const ret = hashCb(key, verify); if (ret !== undefined) verify(ret)`. An async function returns a
-   Promise — not `undefined`, and truthy — so ssh2 accepts before our callback settles.
-2. **Do not set ssh2's `hostHash`.** It hands the callback a hex digest and discards the raw blob we
-   must compare — and it would change `hostKeyFingerprint`'s format, which is a cross-version state
-   break, not a local refactor.
-3. **The existing test mock calls `hostVerifier(key)` with one argument** and ignores the return
-   (`ssh-connection.test.ts:86-91`). Under an async verifier every connect test there breaks. The
-   mock must change — flagged deliberately, not rewritten silently.
-4. **Validate the blob**: embedded algorithm name must match the line's key-type field; reject empty
-   decodes, empty salts, and hashed entries whose hash is not 20 bytes.
-5. **`ssh-relay-live-connect.test.ts:59`** constructs a connection with no credential callback —
-   headless with no prompt channel must deny, not hang.
-
-## Scope
-
-**In scope, corrected:** IPv6 literals and `[host]:port` bracket parsing. Review was right that this
-is a _parser_ requirement, not a scope call — getting it wrong means hosts `ssh` knows come back
-`unknown`, which is the prompt-training harm D3 exists to avoid.
-
-**Out of scope, with consequences stated:**
-
-- **`CheckHostIP`** — OpenSSH defaults it off; we form candidates from the hostname only.
-- **WSL** — `src/main/ssh/` has no WSL awareness; a distro's `known_hosts` is unreachable, so WSL
-  users get first-contact treatment for hosts they already verified.
-- **`UpdateHostKeys`** — we read it and use nothing, so we never learn a rotated key, which makes D5
-  the routine path for key rotation rather than an exception.
-- **Moving SFTP to the system transport** — correct direction, separate change.
-
-## Test plan
-
-**Parser** (against the file format, not our code's shape): plain lines, `host,host2` lists,
-`[host]:port` used only when port ≠ 22, IPv6 literals, hashed `|1|salt|hash` with a real computable
-vector, `@revoked`, `@cert-authority`, `*`/`?` globs, `!` negation vetoing a whole line, unrecognised
-`@marker` skipping the line, malformed lines skipped not fatal, multiple keys per host, CRLF, blank
-lines, comments, user file and global file disagreeing.
-
-**Decision function**: all six outcomes; type scoping; revocation resolved before match regardless of
-line order; every `StrictHostKeyChecking` value; `no`/`off` never persists.
-
-**Algorithm ordering**: `algorithms.serverHostKey` leads with types on file — the test that makes D3
-safe rather than merely scoped.
-
-**Wiring**: unknown persists (Phase 1) without a prompt; match never notifies; mismatch fails with no
-accept path; revoked fails; background reconnect denies; aborted connect settles pending verify
-false; no prompt channel denies; runtime-owned targets are exempt; the denial string does not match
-`isAuthError`; and — catching the worst regression — **the verifier returns nothing**, so a refactor
-to `async` reddens a test rather than reaching a user.
-
-**Checked against a live client, not just the file format.** Two assumptions the design leans on were
-verified by running an OpenSSH 10.2p1 client against a real `sshd` on `127.0.0.1:2222` and recording
-its verdict:
-
-- **The bare-host fallback pass never reports a change.** With `StrictHostKeyChecking=accept-new`, a
-  bare line holding a _different_ key, dialed on a non-default port, made ssh connect and append a
-  new `[127.0.0.1]:2222` line — first contact, no `IDENTIFICATION HAS CHANGED`. Reporting `mismatch`
-  on that pass would refuse hosts ssh connects to happily, and would have looked like the cautious
-  choice.
-- **`unknown-type-known-host` is ssh's own behaviour.** known_hosts holding `ssh-rsa` while the
-  server offers ed25519 makes ssh print `IDENTIFICATION HAS CHANGED` and refuse. So the rejection is
-  neither stricter nor laxer than ssh — and treating it as first contact, which a naive type-scoped
-  lookup does, is the laxer mistake. It also means `ssh-keygen -R` is the right remedy to name there.
-
-## What Phase 1 shipped, and what review changed
-
-The design above survived implementation. Every defect found afterwards was in the wiring, and the
-pattern is worth recording because it repeats: **each one made us either blind or unusable, never
-subtly wrong.**
-
-Fixed after review:
-
-1. **Our own store was type-downgradable.** The inline lookup filtered by key type first and could
-   only answer match/mismatch/unknown, so a record of a _different_ type read as `unknown`. D3's
-   downgrade, applied to the records we create ourselves. Stored types now also feed the algorithm
-   ordering — without that the guard is only half present.
-2. **We keyed on the Orca label.** `ssh -G` echoes its own argument back as `hostname` when no Host
-   block matches, so for a manual target `resolved.hostname` _is_ the label — the one name D2
-   forbids. We consulted no entries at all.
-3. **A refused key still walked the credential ladder.** ssh2 reports a denial as a generic auth
-   failure, so we went on to prompt for the passphrase and hand it to the host we had just refused.
-   Rejections are now a typed error recognised before any fallback.
-4. **Fail-closed nearly became fail-always.** "No readable `known_hosts`" counted a _missing_ file the
-   same as an unreadable one, so a profile that had never connected — everyone's first run — would
-   have been refused, and the suite passed only because dev machines have a `known_hosts`.
-5. **Ephemeral runtimes were refused for a policy they cannot satisfy.** The carve-out sat below the
-   incomplete-sources check, so a HOME-divergent environment turned on-demand runtimes off entirely.
-
-A second review round, run against a live OpenSSH client and sshd rather than against the source,
-found five more — and the pattern held: the two that mattered most were both cases where we refused
-a host `ssh` connects to, and the worst single defect was that **`StrictHostKeyChecking` had never
-been read correctly at all**, so a config saying `yes` was silently accepted AND persisted. See the
-D2/D3/D4 corrections above. The lesson worth keeping: every one of these was invisible to unit tests
-that fed the code the value a human writes, rather than the value the tool emits.
-
-## Action items (STA-4319)
-
-**Where the message actually lands.** Traced end to end, because a rejection the user cannot read is
-a half-shipped feature. Fixed in this branch: the settings card clamped it to one line with no
-tooltip, and the terminal reconnect overlay never asked for it at all. Still open:
-
-- **The "Remote Hosts" status bar shows only `Error`.** `SshTargetStatusRow` does not receive the
-  error, so the status bar is a dead end for the most likely place a user notices the failure.
-- **"Connect again" is the wrong advice for a decision that will never change.** The terminal overlay
-  now prints the reason underneath, but its call to action still invites an action that cannot
-  succeed. Telling a permanent rejection from a transient fault in the renderer needs a typed reason
-  on the wire rather than a string — a remote-wire-compatibility decision, so deliberately deferred.
-- **Toasts carry Electron's `Error invoking remote method 'ssh:connect':` prefix.** The repo has
-  strippers for exactly this; no SSH call site uses one. Also worth noting sonner auto-dismisses in
-  4s, which is short for a message ending in a command the user is meant to copy.
-
-**Before Phase 2:**
-
-- **`UpdateHostKeys` (out of scope above, now the highest-value gap).** We read it and use nothing,
-  so a rotated key is a hard failure the user must resolve by hand. Combined with D5 this is the
-  routine path for key rotation, and it will be the most common way a legitimate user meets a
-  rejection. Decide whether Phase 2 honours it or D5's recovery surface absorbs it.
-- **The web user never sees the reason.** `runtime/rpc/methods/ssh.ts` rethrows
-  `getPublicSshError(status)` on all three paths, and push events are redacted through
-  `getPublicSshState`, so a paired-web client always sees exactly `SSH connection unavailable`.
-  Pre-existing, but it makes the Phase 2 dialog message unreachable there without a change. Note the
-  redaction is not web-only: any target owned by a paired runtime environment is redacted, so a
-  _desktop_ user viewing a remote-Orca-server-owned host gets the same generic string.
-- **RPC fail-fast** becomes load-bearing the moment the dialog exists (see Phasing).
-
-**Known gaps that Phase 1 accepts, listed so they are choices and not surprises:**
-
-- **WSL** — a distro's `known_hosts` is unreachable, so WSL users get first-contact treatment for
-  hosts they already verified through `ssh` inside the distro.
-- **`CheckHostIP`** — candidates are formed from the hostname only.
-- **Certificate validation** is still absent — a CA-covered host is now accepted on first contact
-  rather than refused (D4), so those users connect, but the CA itself verifies nothing for us.
-- **`DEFAULT_SERVER_HOST_KEY_ALGORITHMS`** is a hand-copy of an ssh2 internal. A test pins it, so an
-  ssh2 upgrade that changes it fails CI rather than shipping — but the pin has to be honoured, not
-  deleted, because ssh2 throws `Unsupported algorithm` and every target stops connecting.
-
-**Rollout:** the first release carrying this is the first time Orca can refuse an SSH connection at
-all. Worth a staged rollout or a kill switch: the failure modes we could not find are, by the shape
-of the five above, far more likely to be "a legitimate host is refused" than "a bad key is accepted".
diff --git a/docs/reference/ssh-reconnect-source-recovery.md b/docs/reference/ssh-reconnect-source-recovery.md
deleted file mode 100644
index e8c12cf51895..000000000000
--- a/docs/reference/ssh-reconnect-source-recovery.md
+++ /dev/null
@@ -1,159 +0,0 @@
-# SSH reconnect: why the pane retry gets a byte tail, and what would actually change it
-
-Status: investigation result. The obvious follow-up to PR #14844 was traced and **rejected**, and
-tracing it turned up the actual root cause: checkpointed source recovery has never run on an SSH
-reconnect. Both are recorded here — the rejected shape so nobody re-proposes it, and the verified
-cause with the fix it implies.
-
-## The shape of the problem
-
-A reconnect remounts the pane (`tab.generation` is its React key), so the xterm is disposed with its
-buffer and something must repaint it. Today that is a **byte tail**: `reattachSshPtySession` sends
-`requireReplay: true` and the relay returns `RecentPtyOutputBuffer.read()` — the last 100KB, read
-non-destructively, with no notion of what this client already consumed.
-
-Two costs follow. Main's `@xterm/headless` model never sees those bytes (the tail bypasses
-`onPtyData`), so it is stale by exactly the outage — which is what forces
-`sshReconnectPaintsFromModel` to restrict the grid repaint to the alternate screen. And a shell loses
-outage output past 100KB permanently.
-
-## The proposal that does not work
-
-"Make the pane-retry path request source recovery like `reattachKnownPtys` does." Mechanically this
-is trivial — `sourceRecovery` is already an optional `pty.attach` param the relay parses, Path C
-already calls the same `requestSshPtyAttach` helper and already parses the response field. The
-required checkpoint state also survives a transport drop, in the module-level `recoveryByTarget` map
-(`ssh-pty-consumer-recovery.ts:17`), reachable from `connectionId` because `connectionId === targetId`.
-
-It still fails, three ways:
-
-1. **The relay answers `'existing'` before it looks at the recovery argument.**
-   `relay-pty-source-publication.ts:99-109` short-circuits on a same-`clientId` attach, and a
-   reconnected client presents the same id — see the root-cause section below, where this turns out
-   to be the whole story rather than an obstacle specific to this proposal.
-2. **A failed `reattachKnownPtys` deletes the checkpoint on purpose** (`ssh-relay-session.ts:3006-3007`)
-   and detaches the lease (`:3008`). The pane retry runs _after_ that, so it would present
-   `checkpointUnavailable`, which the relay converts to `restoreRequired`
-   (`relay-pty-source-publication.ts:124-130`) and the provider converts to
-   `SSH_SESSION_EXPIRED_ERROR` (`ssh-pty-provider.ts:103-107`). We would trade a blank-pane-with-tail
-   for a **killed session**.
-3. **Wrong payload shape.** Recovery replays only the post-checkpoint delta
-   `(acceptedSourceEndSu → receivedEndSu]`. The byte tail is a screen snapshot for a _fresh, empty_
-   xterm. Even a successful recovery returns roughly nothing in the common case, and the pane stays
-   blank.
-
-These two mechanisms answer different questions. Recovery keeps main's model whole; the tail repaints
-a new terminal. Substituting one for the other is a category error.
-
-## A correction worth recording
-
-The motivating argument was "`requireReplay` is optional, so older relays ignore it and still show
-blank panes." **That is wrong for the SSH relay.** The client deploys and launches its own relay
-build into a version-scoped directory (`ssh-relay-deploy.ts:231`, `:594`), and `validateGrant`
-rejects any grant whose `serverBuildId` differs from the expected one
-(`ssh-pty-consumer-session.ts:58-65`, rationale in-code: _"client and relay ship in one build"_).
-Client and SSH relay are version-locked; mixed versions do not occur on this channel. The
-independent-update rule in `remote-wire-compatibility.md` still governs remote _runtime_ hosts — just
-not this one.
-
-So there is no old-host population to rescue, and the urgency that argument created was false.
-
-## ANSWERED: checkpointed recovery never runs on an SSH reconnect
-
-The question above was "does the reconnecting client present a new `clientId`?" It does not, and the
-consequence is that the whole checkpoint mechanism is dead on this path. Every link verified:
-
-1. **The client keeps its id.** A reconnect calls `Dispatcher.setWrite`
-   (`src/relay/dispatcher.ts:149-157`), which reuses `this.primaryClient` — including its `id` — and
-   replaces only the writer. The dispatcher refuses to detach the primary. This is already stated
-   in-repo at `src/relay/pty-handler.ts:1736-1742`.
-2. **So `activate()` short-circuits.** `relay-pty-source-publication.ts:99` tests
-   `current?.clientId === context.clientId` and returns `'existing'` at `:108`. The `rotateDelivery`
-   recovery path at `:118-142` is reachable **only** when the ids differ — i.e. never, here.
-3. **So the relay returns no `sourceRecovery`.**
-4. **So the client abandons.** `finishSourceRecovery` (`ssh-relay-session.ts:2766-2785`) fails its
-   `!pendingRecovery` guard, calls `abandonPtySourceRecovery`, and returns false — which cancels the
-   delivery and deletes the checkpoint (`:3006-3008`).
-5. **So the pane retry opens fresh and gets the byte tail**, via the `requireReplay` fix.
-
-The byte tail is therefore not a fallback. It is the only path that has ever run for an SSH
-reconnect, and the flow-control/checkpoint machinery is inert on this path.
-
-That also explains the original blank-pane bug exactly: the relay concluded "this client already
-holds the stream" because, by its own identity rule, it does.
-
-### The fix this implies
-
-Give a reconnected primary a distinguishable identity — a transport generation on the client record,
-bumped in `setWrite` — and have `activate()` compare it alongside `clientId`, so a reconnect takes
-`rotateDelivery` instead of `'existing'`.
-
-Why this is the tractable shape:
-
-- **No wire change.** `RequestContext`, `setWrite` and the publication are all relay-internal.
-- **No compatibility exposure.** Client and relay ship in one build and are version-locked.
-- **It does not disturb the invariant that broke three earlier attempts.** Deliveries still outlive
-  their clients; nothing retires on `onClientDetached`. The delivery is _rotated on re-attach_,
-  which is what the recovery design already intends and what its tests already cover.
-
-**UNVERIFIED and to be checked before implementing:** that `rotateDelivery`'s preconditions hold at
-that moment (the checkpoint's `deliveryToken`, `clientGeneration`, `ownerGeneration` and
-`ptyIncarnation` must match the live identity, `:124-128`); that `outputFlowControl` is granted on
-the reconnected session; and what a rotation implies for the _renderer_, which still remounts with an
-empty xterm and needs a screen, not a post-checkpoint delta. Recovery keeps main's model whole — it
-does not by itself repaint a fresh terminal, so the tail may still be wanted for the pane even once
-the model stops going stale.
-
-## Do not start at `onClientDetached`
-
-Three attempts failed there, each plausible until run:
-
-- Retiring the delivery on `dispatcher.onClientDetached` **breaks checkpoint recovery** (10 tests).
-  A delivery outliving its client is deliberate — it is what lets a client resume from a checkpoint.
-- Retiring without `session.cancelDelivery()` orphans the credit ledger's one-upstream-owner slot;
-  the next open throws `PTY source delivery already has an upstream owner`. Seen live as a toast and
-  a blank pane.
-- Comparing `record.identity.clientGeneration` to the request is impossible: that value is
-  client-supplied via `pty.openClient`, and `RequestContext` carries no generation of its own.
-
-## The lead that survives
-
-`reattachRejectedPty` (`ssh-relay-session.ts:1957-2004`) is an existing **single-PTY** entry point
-into the `reattachKnownPtys` machinery, taking `(relayPtyId, mux, providerGeneration, mode)` and
-driving recovery with `targetedDeliveryRecovery`. If per-pane recovery is wanted, that is the hook —
-and it does not involve the pane-retry path at all. Unverified whether it is reachable at the moment
-the renderer retries.
-
-## Preconditions, unchanged
-
-The SSH e2e lane must be green and triggering on **source** changes before any of this is attempted.
-It was skipping for 15 specs; four regressions reached a user during that window.
-
-## Resolved: a disposed pane killed its successor's new shell
-
-A pane rebuilt during its first spawn uses the same reservation key, so main can return the
-same PTY to both transports (#19386, #22578). The disposed transport must keep that shell
-while its tab and layout leaf remain and its execution host's workspace is not being deleted.
-A live transport refusing the id still retires it (#11003). This applies to local, WSL and SSH
-IPC terminals; the remote-runtime transport has no corresponding kill.
-
-The remount trigger in the Scan-22 user report remains unknown. A retained shell can outlive
-its tab if the tab closes before a successor binds it; keeping potentially owned work follows
-the SSH execution boundary.
-
-## Open: the pane behind a preserved tab does not always rebind
-
-The merge now keeps a local tab the host has never been told about, so the tab and its title survive
-a reconnect. The reattach behind it does not, reliably — measured at three runs in four against the
-Docker-SSH lane. When it misses, the store holds the tab, the tab bar renders it, and the pane never
-rebinds: the "frozen tab" shape the original report described, one layer down from the deletion that
-used to cause it.
-
-Deliberately NOT asserted in `ssh-reconnect-tab-destruction.spec.ts`. A one-in-four flake in the lane
-that exists to catch this class costs more than it proves — the lane stops being trusted, which is
-exactly how the earlier silent-skip failure happened. Tab survival is asserted there and is
-deterministic; the liveness gap is recorded here instead.
-
-Worth checking first, since it is the same shape as everything else in this file: the tab is absent
-from the host snapshot, so whatever drives the per-tab reattach after an apply may simply not know to
-reattach a tab the snapshot never mentioned.
diff --git a/docs/reference/task-provider-identity-validation.md b/docs/reference/task-provider-identity-validation.md
deleted file mode 100644
index 4dba0760aabe..000000000000
--- a/docs/reference/task-provider-identity-validation.md
+++ /dev/null
@@ -1,81 +0,0 @@
-# Task provider identity RPC validation
-
-The automation RPC identity schema follows `src/shared/task-provider-identity.ts`,
-re-exported by `src/shared/task-source-context.ts`. Only GitHub requires fields beyond
-`provider`: `owner` and `repo` are strings, and `host` is optional. GitLab, Linear,
-and Jira fields are optional nullable strings. Requiring a GitLab project or a
-Linear workspace/Jira site would contradict the domain type and account-wide scopes.
-
-The discriminated union validates these existing field types without trimming,
-coercing, or stripping identity fields. Unknown fields pass through as they did under
-`z.custom`, including fields from newer clients. Absent and explicit-null identities
-remain distinct. The schema does not infer providers from owner/repo or require a
-git worktree, repository slug, or local execution host for a source context.
-
-## Producer census
-
-Paths below are relative to the repository root. Searches covered production
-`providerIdentity`, `TaskProviderIdentity`, `sourceContext`, and
-`linkedTaskSourceContext` uses across desktop, shared code, mobile, and CLI.
-
-| Producer or forwarding path                                                                | Populated verdict                                                                                                                                                                                                            |
-| ------------------------------------------------------------------------------------------ | ---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
-| `src/shared/project-host-setup-projection.ts`: `getProjectProviderIdentity`                | GitHub owner/repo populated together, or no identity. Supplies project identities consumed by desktop and migration.                                                                                                         |
-| `src/renderer/src/components/task-page-source-context.tsx`: `getTaskPageRepoSourceContext` | GitHub fields populated through projection, or null. GitLab uses explicit provider and `buildGitLabProviderIdentity`; projectId/project/webUrl populated, namespace can be null.                                             |
-| Same file: `buildGitLabProviderIdentity`                                                   | GitLab fields come from project path/host; missing path components become null. No required GitLab field is invented.                                                                                                        |
-| `src/renderer/src/hooks/composer-state/source-context-state.ts`                            | Derived GitHub context carries a complete project identity or null. Jira folder/project-group context explicitly has null identity. Draft/linked contexts are forwarded.                                                     |
-| `src/renderer/src/components/use-task-page-source-availability.ts`                         | Linear workspaceId/name and Jira siteId/URL can be null for account-wide selections; team/project fields are not populated. Valid under the existing optional-field contract.                                                |
-| `src/renderer/src/components/task-page-jira-item-source-context.ts`                        | Bound issue context populates siteId, siteUrl, projectKey.                                                                                                                                                                   |
-| `src/renderer/src/components/new-workspace/use-jira-url-source.ts`                         | Bound URL issue context populates siteId, siteUrl, projectKey.                                                                                                                                                               |
-| `src/renderer/src/components/worktree-jump-palette-create-worktree.ts`                     | Linear teamId/key populated; workspaceId/name may be null.                                                                                                                                                                   |
-| `src/shared/task-source-context.ts`: normalize/build functions                             | GitHub missing owner/repo becomes null identity; other providers' missing fields become null. Provider mismatch becomes null, never an inferred provider.                                                                    |
-| `src/cli/handlers/automation-handler-flags.ts`, `src/cli/handlers/automations.ts`          | Explicit JSON source-context input is normalized before create/update. GitHub fields populated or null identity; other fields nullable. Omitted/null context preserved by flag handling.                                     |
-| `src/main/persistence/scheduling-automations/automation-context-migration.ts`              | Builds source context from projected complete GitHub identity, or null context.                                                                                                                                              |
-| Desktop automation save/scoped-list/host clients and web transport                         | Forward existing source contexts, not new identity constructors. `automation-orca-save.ts` forwards the current automation context or null. Legacy arbitrary malformed RPC input is deliberately rejected by the new schema. |
-| Mobile                                                                                     | No task-provider identity/source-context constructor or sender found. `mobile/src/components/new-workspace-project-targets.ts` uses project identity solely for display.                                                     |
-
-## Compatibility evidence and limits
-
-Read `docs/reference/remote-wire-compatibility.md` before changing validation.
-A source search against release tag `v1.4.199` also finds no mobile
-`sourceContext`/`linkedTaskSourceContext` sender; its sole `providerIdentity` use
-is the display-only project target above. The released CLI flag reader also calls
-`normalizeTaskSourceContext`. This is source-level evidence for the checked release,
-not a claim to have executed every historical mobile binary.
-
-No shipped mobile producer with a newly rejected payload was found. No new required
-field was added to the domain contract. GitLab, Linear, and Jira discriminant-only
-identities remain valid. Folder-workspace null/absent identities remain valid on
-both local and SSH hosts. No execution/status logic or client-side parsing changed.
-
-## Regression evidence
-
-`src/main/runtime/rpc/methods/task-provider-identity.test.ts` checks unchanged valid
-identities for all four providers, required GitHub fields, every declared field's
-type, optional/null non-GitHub fields, unknown-field preservation, explicit GitLab
-discrimination with owner/repo present, local/SSH folder contexts, and update patches.
-
-The focused run passed 81 tests. Temporarily replacing GitHub's field validators
-with optional `z.unknown()` validators (discriminant-only acceptance) caused 17
-failures and 64 passes. The mutation was restored before running the gates.
-
-Counts re-measured at `cf4f77f` after the blank-field commit added seven tests;
-the earlier 74/16/58 figures described the commit before it.
-
-## Gate results
-
-All commands ran with `ORCA_BACKGROUND_LAUNCH=1`.
-
-- `pnpm tc`: exit 0; completed the repository typecheck runner.
-- `pnpm exec vitest run src/main/runtime/rpc`: exit 1; 277 files passed,
-  one failed; 2,462 tests passed, one failed, one skipped. The only failure was
-  the unrelated `structured-agent-session-adoption-replay.test.ts` hitting its
-  5,000 ms timeout. All identity tests passed.
-- `pnpm --dir mobile typecheck`: exit 0; `tsc --noEmit` passed.
-- `pnpm run check:code-quality:changed`: exit 0; zero new code-quality,
-  type-aware, or React Doctor findings across the two changed code files.
-- Isolated retry of `structured-agent-session-adoption-replay.test.ts`: exit 0;
-  one test passed, with the test body completing in 358 ms.
-- Full RPC retry with `pnpm exec vitest run src/main/runtime/rpc --maxWorkers=4`:
-  exit 0; all 278 files passed, 2,470 tests passed, one skipped (97.24 seconds).
-  The bounded-concurrency rerun resolved the timeout without changing test code.
diff --git a/docs/reference/terminal-artifact-grant-integrity.md b/docs/reference/terminal-artifact-grant-integrity.md
deleted file mode 100644
index ea04d35deeff..000000000000
--- a/docs/reference/terminal-artifact-grant-integrity.md
+++ /dev/null
@@ -1,85 +0,0 @@
-# Terminal artifact grant integrity
-
-Clicking a path in terminal output mints a short-lived grant over one file in a
-world-writable temp directory. Between minting the grant and using it, anything on the
-host can replace that file. This page is the contract for the checks that catch such a
-replacement — and, more importantly, for the windows they do **not** close.
-
-Read this before weakening a check in
-`src/main/runtime/runtime-file-commands-terminal-artifact-access.ts`, before assuming
-the sequence is atomic, or before extending the guarantee to remote hosts.
-
-## The stat identity is weaker than it looks
-
-A grant pins the file as `dev:ino:nlink:size:mtimeMs`. Four of those five fields
-survive an unlink-and-recreate at the same path, measured on Linux (Node 24) by
-replaying that exact sequence:
-
-| Field     | After `rm` + recreate in the same directory                              |
-| --------- | ------------------------------------------------------------------------ |
-| `dev`     | unchanged — same filesystem                                              |
-| `ino`     | **reused 100% of the time** (3000/3000); ext4 hands back the freed inode |
-| `nlink`   | `1` before and after                                                     |
-| `size`    | unchanged whenever the replacement is the same length                    |
-| `mtimeMs` | **quantised to 1 ms** — the kernel's coarse clock advances once a tick   |
-
-So for a same-length replacement the whole identity string collapses to a 1 ms
-timestamp race. The full string collided in 63.7% of back-to-back iterations, 19.8%
-with a 0.5 ms gap, and 0% at ≥1 ms. The same probe on macOS collided 0 times in 2000 —
-no inode reuse, nanosecond mtimes — which is why this only ever showed up on Linux CI.
-
-`ino` contributes no discriminating power against the exact case it is there to catch.
-Do not add `ctimeMs` or `birthtimeMs` hoping to fix this: they come from the same
-coarse clock and collide in the same window. `bigint: true` stats do not help either —
-the precision loss is in the stored kernel timestamp, not in Node's `Number`.
-
-## The content digest sits alongside the identity, and cannot replace it
-
-Local grants also pin a sha256 of the artifact's bytes, read from the **same open
-handle** as the stat so the two describe one inode with no gap between them.
-
-The identity string stays exactly as it is because it is a wire contract, not a
-host-local detail: `src/relay/fs-handler-terminal-artifact.ts` recomputes that same
-`dev:ino:nlink:size:mtimeMs` format field-for-field from its own stat and compares it
-against the `expectedStatIdentity` the host sends. Changing the format would have a new
-host publishing a string an older relay can never reproduce, failing every remote
-artifact read as `terminal_file_grant_stale` — a break that reaches old peers with no
-wire-schema change at all. See [remote wire compatibility](./remote-wire-compatibility.md).
-
-## What is still open
-
-The digest narrows these checks. It does not make any of them atomic.
-
-- **Read and preview — closed.** The bytes returned to the caller are the same
-  in-memory buffer that was digested, with no re-read in between, and the handle pins
-  the inode for the whole operation. A swap landing after the `open` leaves the handle
-  on the granted inode, so the granted content is what is served; a swap landing before
-  it fails the digest.
-- **Write — a window survives.** Between the final pre-rename verification and the
-  `rename()` itself, the target path can still be swapped, and the rename clobbers
-  whatever is there. POSIX `rename()` has no "only if the target is still inode X"
-  form; Linux's `renameat2(RENAME_EXCHANGE)` would close it but is not portable and is
-  not exposed by Node. Narrowing this further means changing the commit strategy, not
-  adding another check before it.
-- **Artifacts over 10 MB fall back to stat-only.** They digest to `null`, so only the
-  identity guards them. Nothing leaks: every read, preview, and write path rejects on
-  size before reading. The weakness is unreachable, not fixed — a later cap change
-  could expose it.
-- **Remote and SSH grants are untouched.** They keep the stat-only check, with the full
-  1 ms weakness on whatever filesystem the relay runs. Closing it needs a negotiated
-  capability so an older relay is never sent a digest it cannot verify.
-
-## What is proven, and what is inferred
-
-The filesystem numbers above are direct measurements. That identical stats plus changed
-content previously returned the swapped bytes, and now do not, is pinned by
-`orca-runtime-files-terminal-artifact-swap-detection.test.ts`, which replays the first
-stat seen for a path so the collision is deterministic rather than a 1 ms coin flip.
-
-The join between the two is a chain, not a single observation. This defect surfaced as
-an intermittent failure of `orca-runtime-files-terminal-artifact-io.test.ts` on
-`rejects stale absolute terminal artifact previews before returning changed content`,
-which swaps an 8-byte artifact for 8 different bytes. No one has instrumented a Linux
-runner to prove that a specific CI failure was a same-tick mtime collision; the
-conclusion rests on every ingredient being measured separately. Treat it accordingly if
-a future failure does not fit.
diff --git a/docs/reference/terminal-perf-latency-investigation.md b/docs/reference/terminal-perf-latency-investigation.md
deleted file mode 100644
index 4e61ab3529c1..000000000000
--- a/docs/reference/terminal-perf-latency-investigation.md
+++ /dev/null
@@ -1,106 +0,0 @@
-# Terminal latency investigation (2026-09-21)
-
-The September 21 scheduled report has five latency violations: three restores
-above 1,000 ms, a worst key around 2,091 ms, and timer drift around 2,034 ms.
-These remain failures under the [historically calibrated budgets](terminal-perf-report-budgets.md).
-Passing the looser Electron assertions does not establish that the report passed.
-
-## Historical boundary
-
-Slow restores predate September: the July 20 scheduled run measured a 1,226.6 ms
-Latin restore; August 1 measured 1,492 ms. Earlier June/July logs did not contain
-usable summary rows and their artifacts expired. There is no established good/bad
-application revision boundary, and no completed git bisect. A newly visible report
-failure is not, by itself, evidence of a newly introduced application regression.
-
-The scheduled workflow uses one Playwright worker. Parallel Electron workers do
-not explain these particular failures. Repeated macOS runs did not reproduce the
-Linux stalls (15 targeted samples: restore 136–236 ms, hidden worst key ≤23.6 ms).
-
-## Controlled Linux experiments
-
-All comparisons use the same application build within their run, one worker,
-real PTYs, and the original terminal workload. Diagnostic tracing can perturb
-measurements, so it identifies the mechanism rather than setting new budgets.
-
-| Comparison | Evidence | Finding |
-| --- | --- | --- |
-| Default versus disabled background throttling | [35657300611](https://github.com/stablyai/orca/actions/runs/35657300611) | 14/20 restores exceed 1 second; four typing measurements approach 1 second. `setBackgroundThrottling(false)` does not remove the stalls. |
-| Native browser trace | [35658595456](https://github.com/stablyai/orca/actions/runs/35658595456) | Renderer waits roughly 960–1,010 ms in `LayerTreeHost::WaitForCommitCompletion`. Some typing samples contain consecutive waits. |
-| Current flags versus flags preceding `c64777d1bcd` versus SwiftShader | [35659601151](https://github.com/stablyai/orca/actions/runs/35659601151) | All three configurations still trigger undrawn-frame throttling. Reverting the May 26 flags is not a demonstrated fix. |
-
-In the graphics comparison, current flags had one of six restores above 1 second;
-the earlier flags had three and a 1,036 ms worst key. SwiftShader had six measured
-restores between 301 and 396 ms, but still contained one-second native waits after
-the restore measurement ended, and one 202 ms timer-drift violation. Its faster
-restore numbers are insufficient evidence of a fix.
-
-## Native mechanism
-
-The trace shows the renderer blocked inside:
-
-```
-ProxyMain::BeginMainFrame
-  Commit
-    ProxyMain::BeginMainFrame::commit
-      LayerTreeHost::WaitForCommitCompletion
-```
-
-During the gap, Viz repeatedly emits `SendBeginFrameDecision` with
-`reason: ThrottleUndrawnFrames` and `should_send: false`. The graphics comparison
-recorded 346 such decisions with current flags, 626 with the earlier flags, and
-401 with SwiftShader. Raster work was already ready before the wait ended.
-
-The [matching Chromium source](https://github.com/chromium/chromium/blob/150.0.7871.250/components/viz/service/frame_sinks/compositor_frame_sink_support.cc)
-limits begin frames to once per second when too many submitted frames remain
-undrawn. Input can block the renderer waiting for the next compositor commit;
-this is not a one-second xterm parse or proof of a second of CPU consumption.
-The same throttle is present in Chromium 148.0.7778.218 (Electron 42.3.3) and
-146.0.7680.177. This source comparison does not prove identical runtime behavior.
-
-## Visibility control
-
-[Run 35660847455](https://github.com/stablyai/orca/actions/runs/35660847455)
-compared ten hidden-window samples with ten visible-window samples on the same
-isolated Xvfb runner, using SwiftShader in both modes. Actual window visibility
-was recorded. The background terminal panes remained hidden in both modes.
-
-| Measurement | Hidden window | Visible window |
-| --- | ---: | ---: |
-| Undrawn-frame throttle decisions | 1,251 | 0 |
-| Largest worst-key latency | 3,062.8 ms | 30.5 ms |
-| Largest timer drift | 3,111.8 ms | 67.0 ms |
-| Restore range | 213.8–1,862.2 ms (9 completed) | 223.4–734.3 ms (10 completed) |
-| Electron tests passed | 9/10 | 10/10 |
-
-All ten visible-window samples satisfy the existing latency limits. This isolates
-the never-presented Linux test window as the trigger for the reproduced native
-stalls. It does not establish a newly introduced application-code regression or
-prove that every historical outlier had the same cause.
-
-## Full scale validation
-
-[Run 35662787327](https://github.com/stablyai/orca/actions/runs/35662787327)
-passed all 21 scenarios and all 32 strict report rows, with zero skipped,
-unexpected, or retried tests. All 21 scenarios recorded successful isolated-display
-presentation. This run restored the original graphics flags and removed profiling.
-
-| Metric | Largest measurement | Unchanged report limit |
-| --- | ---: | ---: |
-| Median typing | 15.5 ms | 25 ms |
-| Worst key | 45.7 ms | 300 ms |
-| Hidden-output restore | 395.7 ms | 1,000 ms |
-| Worktree revisit | 50.3 ms | 300 ms |
-| Scroll | 54.7 ms | 150 ms |
-
-Timer drift and queue/drop checks also passed. Coverage includes 100-pane
-same-workspace and cross-workspace redraws, 50 real PTYs under held-ACK pressure,
-and the original plain/Latin/title/rich-model hidden-output scenarios. No workload
-or performance limit changed.
-
-The correction presents the benchmark window only when explicitly enabled inside
-`xvfb-run` on a GitHub-hosted Linux runner. Ordinary local automation stays
-windowless; production launch policy and hidden-terminal delivery remain unchanged.
-For comparable Linux latency evidence, use the Terminal Perf workflow: a never-
-presented local Linux window can still encounter the same compositor throttle.
-Temporary profiling hooks and the comparison workflow were removed before the PR.
diff --git a/docs/reference/terminal-perf-report-budgets.md b/docs/reference/terminal-perf-report-budgets.md
deleted file mode 100644
index 54d26c3d2a51..000000000000
--- a/docs/reference/terminal-perf-report-budgets.md
+++ /dev/null
@@ -1,59 +0,0 @@
-# Terminal performance report budgets
-
-The saved-report gate is a performance regression gate, deliberately stricter than
-some Electron test timeouts. Passing the Electron suite does not establish that a
-slow sample is acceptable. CLI and HTML reports use the same policy in
-`config/scripts/terminal-perf-report-budgets.mjs`.
-
-## Historical evidence (2026-09-21)
-
-Sample: 11 full scheduled Ubuntu runs, 32 annotation rows per run, August 1 through
-September 21 (352 rows). Runs include failures, rather than selecting only green
-runs. These are samples across different revisions and shared runners, not a
-controlled A/B experiment or a statistical tail-latency estimate. Original June
-logs returned HTTP 410 and could not establish an original baseline.
-
-Values below are milliseconds except peak queue chars (JavaScript character
-counts, not process memory bytes). Maximum median spans every typing scenario;
-peak queue spans the active/revisit ACK-pressure scenarios.
-
-| Date / run                                                              | Baseline median | Maximum typing median | Latin restore | Hidden 25-pane worst key | Peak queue chars |
-| ----------------------------------------------------------------------- | --------------: | --------------------: | ------------: | -----------------------: | ---------------: |
-| [2026-08-01](https://github.com/stablyai/orca/actions/runs/30693362353) |            11.7 |                  12.7 |        1492.0 |                     61.2 |          1867776 |
-| [2026-08-03](https://github.com/stablyai/orca/actions/runs/30802935899) |             7.1 |                   9.4 |         414.0 |                     12.8 |           294912 |
-| [2026-08-15](https://github.com/stablyai/orca/actions/runs/31875140053) |             8.9 |                  13.8 |        1297.5 |                     15.4 |          2523136 |
-| [2026-08-24](https://github.com/stablyai/orca/actions/runs/32708128219) |            12.2 |                  12.2 |         463.6 |                     16.3 |          3227648 |
-| [2026-09-01](https://github.com/stablyai/orca/actions/runs/33488510218) |             6.6 |                   6.8 |         302.2 |                     11.5 |           360448 |
-| [2026-09-07](https://github.com/stablyai/orca/actions/runs/34102348134) |             7.5 |                  11.3 |         328.2 |                    269.6 |          2818048 |
-| [2026-09-11](https://github.com/stablyai/orca/actions/runs/34580494139) |             9.5 |                  10.4 |         233.5 |                    186.2 |          2441216 |
-| [2026-09-15](https://github.com/stablyai/orca/actions/runs/34948597774) |            10.3 |                  12.6 |         282.2 |                   1178.4 |          2818048 |
-| [2026-09-17](https://github.com/stablyai/orca/actions/runs/35201162712) |            10.3 |                  12.7 |        1182.2 |                     15.7 |          2998272 |
-| [2026-09-19](https://github.com/stablyai/orca/actions/runs/35432611564) |             7.6 |                  10.3 |         236.7 |                   1435.5 |          2588672 |
-| [2026-09-21](https://github.com/stablyai/orca/actions/runs/35579708852) |             7.8 |                  11.6 |        1640.7 |                   2090.6 |          2523136 |
-
-## Decisions
-
-- Median typing: **25 ms**, tightened from 75 ms. The largest observed median was
-  13.8 ms, leaving about 81% headroom without accepting a sustained 5x slowdown.
-- Worst key: retain **300 ms**, including stress scenarios. Typical per-scenario
-  worst-key samples were tens of milliseconds; isolated 1–3 second samples are
-  failures to investigate, not a reason to adopt the e2e 3–3.5 second ceiling.
-- Revisit: retain **300 ms**. Median of the 11 revisit samples was 160.7 ms;
-  the 1,030.2 ms outlier remains a failure.
-- Restore: retain **1,000 ms**. Median restore per scenario ranged from 123 to
-  493.9 ms. Observed outliers up to 1,706.4 ms do not justify a 4 second budget.
-- Timer drift: retain **150 ms** and the pre-existing **3,500 ms** allowance only
-  for injected same/cross-workspace redraw scenarios. No new scenario receives
-  the broad allowance. This retains the CLI gate's existing policy in HTML too.
-- Scroll: retain **150 ms**. Dropped backlogs: retain **zero**.
-- Current queue: retain **2 Mi characters** everywhere. Only the transient peak
-  in active/revisit ACK-pressure scenarios gets **3.5 Mi characters** (3,670,016).
-  The maximum observed peak was 3,227,648 (3.08 Mi), leaving about 14% headroom.
-  The old 2 Mi peak budget rejects ordinary deliberately held-ACK bursts; the
-  proposed 5 Mi e2e ceiling was unnecessarily loose. Other scenarios keep 2 Mi.
-
-For the linked September 21 report, the two peak-queue failures are corrected;
-the three slow restores, worst-key stall, and timer stall still fail. This change
-does not claim to fix those stalls or make that run green. Re-evaluate future
-budget changes against recorded measurements; do not set limits just above a new
-failure or mirror relaxed test timeouts.
diff --git a/docs/reference/terminal-startup-timing.md b/docs/reference/terminal-startup-timing.md
deleted file mode 100644
index bf79200fdfcb..000000000000
--- a/docs/reference/terminal-startup-timing.md
+++ /dev/null
@@ -1,30 +0,0 @@
-# Terminal startup timing
-
-For #19333, enable the renderer's opt-in recorder in its DevTools console before opening a new terminal:
-
-```js
-localStorage.setItem('orca:terminal-startup-timing', '1')
-```
-
-Remove the key to disable it. Existing sessions are unaffected. To capture the existing host spawn phases, start the host with `ORCA_PTY_SPAWN_TIMING=1`. Do not restart a host with active work just to enable diagnostics.
-
-The renderer emits one `terminal_startup_timing` breadcrumb per transport callback generation through the existing local diagnostic channel. In `main.trace.ndjson`, find the `renderer.breadcrumb` record whose `breadcrumb.name` matches. The host's existing console timing line also becomes a `pty.spawn.timing` trace record. Correlate available PTY IDs; renderer generation distinguishes retries. Compare elapsed durations within each process, not wall clocks across hosts.
-
-Renderer offsets are monotonic milliseconds from callback-generation creation immediately before a transport operation:
-
-| Field | Observation |
-|---|---|
-| connected | Transport connection callback accepted for the current generation |
-| liveData | First nonempty live delivery, including control-only output |
-| submitted | First live batch sent to the renderer output scheduler |
-| writeStarted | Scheduler invokes the batch's pre-write callback |
-| parsed | Xterm invokes that batch's completion callback |
-| renderEvent | First public xterm render event after the batch starts writing |
-
-A render event can precede the parse callback. These observations do not establish the first printable glyph, physical screen presentation, React mount time or click-to-paint latency. Replay and synthetic reset writes do not claim the first live batch. A replay or resize can still contribute to a render event after a live write, so the event is temporal evidence rather than attribution to exact content. Hidden or restored panes may never submit a live batch; missing fields remain missing. A queue-cap warning can inherit the pre-write callback while discarding the original batch’s parse callback. In that case writeStarted/renderEvent describe incomplete pre-write activity, not successful delivery of the original batch; outcome cannot be observed without parsed.
-
-The recorder ends after connection, parse and render observations, or on replacement, disposal, error or a ten-second diagnostic deadline. It retains only phase numbers and identifiers, with one timer and at most one render listener while enabled. It does not retain terminal text, commands, credentials or transcript buffers. Disabled recording adds no listeners or timers.
-
-Host `phaseDurations` preserve the current phase boundaries: the timer starts after initial ownership lookups and logs before all commit/serializer work finishes. `totalMs` is that measured interval, not full IPC latency. `provider_spawn` includes provider call and surrounding reconciliation; it is not raw process creation time. The enclosing trace record is a diagnostic snapshot, not a span covering that interval.
-
-Reliability invariant: diagnostics must not change terminal output, delivery credits, provider ownership or spawn outcome. Failure source: Windows OMP first-paint report #19333. Oracle: opt-in recorder tests distinguish queued, parsed and render milestones; existing live-delivery and synchronized-output suites preserve output behavior. No matching startup diagnostic reliability gate exists; full click-to-physical-presentation remains an explicit validation gap. Native, daemon, WSL and SSH execution remain host-owned; this adds no wire fields or remote process queries. Mobile has no recorder change. macOS/Linux/Windows renderer timing uses the same public xterm events; physical-device timing requires a separate capture.
diff --git a/docs/reference/windows-cmd-shim-resolution.md b/docs/reference/windows-cmd-shim-resolution.md
deleted file mode 100644
index c17380e800d9..000000000000
--- a/docs/reference/windows-cmd-shim-resolution.md
+++ /dev/null
@@ -1,77 +0,0 @@
-# Resolving Windows `.cmd` shims past cmd.exe
-
-Node refuses to spawn a `.cmd`/`.bat` target without a shell (the
-CVE-2024-27980 mitigation), so `resolveSpawn` has to make `cmd.exe` the program
-and hand it `/d /v:off /s /c "<caret-escaped argv>"`. For an agent CLI that
-means a long `cmd.exe /c` line whose caret-escaped payload is natural-language
-prompt text — which Microsoft Defender for Endpoint's command-line model scores
-as obfuscation. `codex.cmd` appeared in the spawn cluster of an MDE incident
-against Orca for exactly this reason.
-
-`src/shared/child-process/windows-cmd-shim-resolution.ts` sidesteps it. npm's
-`cmd-shim` and pnpm's `@zkochan/cmd-shim` generate files whose entire body is
-"find a Node interpreter and run this script". Reading one lets `resolveSpawn`
-spawn `node.exe <script> <args…>` directly: no cmd.exe in the tree, and no
-caret escaping at all.
-
-## What resolution changes
-
-Only `runProcess` / `spawnProcess` callers. Two things people expect it to
-cover, and it does not:
-
-- **The interactive terminal.** `src/main/daemon/pty-subprocess/native-pty-spawn.ts`
-  calls `pty.spawn` directly, so typing `codex` in an Orca terminal is
-  completely unaffected.
-- **Orca's own hook wrappers** (`codex-hook.cmd` and friends). These are batch
-  files Orca writes, matching none of the generator shapes, so they keep the
-  cmd.exe path. They are addressable — we generate them — but not by this
-  module.
-
-## Adding a shape
-
-Four shapes are recognised, each transcribed verbatim from a real install into
-`src/shared/child-process/__fixtures__/windows-cmd-shim-bodies.ts`. If you add a
-fifth, add its real body there too. A shape guessed from documentation is not
-evidence.
-
-The rule for the parser is all-or-nothing: the whole canonicalised body must
-match end to end, and anything unrecognised returns null and keeps the cmd.exe
-path. **A mis-resolution silently runs the wrong program or drops arguments,
-which is far worse than an EDR alert** — when in doubt, refuse.
-
-Resolution also refuses a captured path that is absolute, drive-relative
-(`D:evil.js` — `win32.isAbsolute` says false, but `win32.resolve` leaves the
-shim directory), or contains `% ^ & | < > " :` or a line break; a script or
-target that is not on disk; an interpreter-less target that is not `.exe`/`.com`;
-and a program path that is not absolute.
-
-Refusing every `:` cannot cause a false refusal. Windows reserves the character
-within a path segment, so a relative path cannot contain one — the only
-spellings that can are drive-qualified, an alternate data stream (`a.js:zone`),
-or a `\\?\` device path, and the last is already refused as absolute.
-
-## Kill switch
-
-Set **`ORCA_DISABLE_CMD_SHIM_RESOLUTION`** to any non-empty value in the
-environment a child is spawned with, and every `.cmd` goes back through
-`cmd.exe /c` unchanged. It is read from the spawn's own environment, so
-exporting it before launching Orca disables resolution process-wide.
-
-Use it to confirm a suspected mis-resolution: run the failing operation with and
-without it. Identical behaviour means resolution is not the cause. If it is,
-report the shim's body — the parser is only allowed to recognise shapes we have
-seen for real.
-
-## Behaviour that changes, deliberately
-
-A resolved shim is not merely a quieter spelling of the cmd.exe path. Two limits
-of `cmd.exe` disappear with it:
-
-- An argument containing `\r`/`\n` was rejected outright, because cmd ends its
-  command at a raw line break whatever the quote state. Multi-line agent prompts
-  now work.
-- A command line over 8191 characters returned `The command line is too long.`
-  Long prompts now work.
-
-Both are improvements, but they are behaviour changes: an unresolved shim still
-hits both limits, so a caller must not assume every `.cmd` accepts them.
diff --git a/docs/reference/windows-daemon-host-relocation.md b/docs/reference/windows-daemon-host-relocation.md
deleted file mode 100644
index c5cb34e8ab54..000000000000
--- a/docs/reference/windows-daemon-host-relocation.md
+++ /dev/null
@@ -1,132 +0,0 @@
-# Windows daemon-host relocation
-
-On Windows the terminal daemon does not run from the install directory. Before it forks the
-daemon, Orca materializes a trimmed copy of its own runtime under
-`%LOCALAPPDATA%\Orca\daemon-host\<app version>\` and forks the daemon from there
-(`src/main/daemon/daemon-host-relocation.ts`). This is what keeps live terminals alive across an
-auto-update and across a crash of the main process.
-
-Read this before changing the copy plan, the host exe name, the LOCALAPPDATA layout, or
-`config/nsis/orca-installer-hooks.nsh`.
-
-## What the relocation actually escapes
-
-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
-branches:
-
-| Branch   | Condition                                                                                                       | Selector                                                                                                                                                              |
-| -------- | --------------------------------------------------------------------------------------------------------------- | --------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
-| 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 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.
-
-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)
-
-The host exe keeps the app exe's own file name (`daemonHostExeName()` returns
-`basename(process.execPath)`), so the relocated image is a byte-for-byte copy of the app binary
-under its original name.
-
-An earlier revision copied it as `orca-terminal-daemon.exe` specifically so the fallback
-`taskkill /IM Orca.exe` could not match. That bought survival on the rare no-PowerShell host and
-cost a textbook defence-evasion signature: _a process copies its own image into a user-writable
-directory under a different name so a kill-by-image-name cannot match it, then runs detached and
-survives the installer._ Microsoft Defender for Endpoint flagged it as MITRE **T1036
-(Masquerading)**, and — because it is the process every other flagged action is attributed to — it
-acted as a reputation multiplier on unrelated findings. No VS Code fork does this.
-
-Trading the fallback branch for the name is the right trade:
-
-- On the primary branch nothing changes: the daemon still survives the update.
-- On the fallback branch the daemon is killed with the app and terminals **cold-restore** on
-  relaunch. That is the documented pre-relocation behaviour, a first-class outcome the update
-  harness already asserts (`--expect cold-restore`), not a failure.
-- Relocation is fail-open end to end anyway: any materialization failure returns `null` and the
-  caller forks the install-dir host.
-
-One new failure mode comes with it, on the fallback branch only. The daemon now matches
-`FIND_PROCESS` under the app's image name, so it enters electron-builder's retry loop
-(`allowOnlyOneInstallerInstance.nsh:136-141`). If the `taskkill` there fails to end it — an elevated
-or otherwise unkillable host — the loop reaches `MessageBox ... /SD IDCANCEL` and `Quit`s, aborting a
-silent update rather than completing it. Under the old distinct name the daemon was invisible to
-that loop. Low probability (fallback branch _and_ an unkillable daemon), but it is a real new path.
-
-What this does **not** buy. Two things bound the win honestly:
-
-- The strongest T1036 indicator is a PE-resource-vs-disk-name mismatch, and it was **never firing**:
-  the shipped binary's `OriginalFilename` is empty (only `InternalName = Orca` is set), so there was
-  no embedded name for the old disk name to contradict.
-- The remaining behaviour — a signed app copying its own ~225 MB image into user-writable
-  `%LOCALAPPDATA%` and running it detached under `ELECTRON_RUN_AS_NODE=1` — is still execution from
-  a non-standard user-writable location, which maps to **T1036.005** and is a standard heuristic on
-  its own.
-
-So this removes a real but partial signal. Expect the score to drop; do not expect the process to
-stop being scored.
-
-## Options that were rejected
-
-| Option                                                                        | Why not                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                  |
-| ----------------------------------------------------------------------------- | -------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
-| Materialize the tree from the NSIS installer                                  | The daemon host is ~246 MB. Writing it at install time doubles install footprint and lengthens the window in which the app is down during a silent update. Worse, on a per-machine install (`INSTALL_MODE_PER_ALL_USERS`) the installer runs as the installing admin, so `$LOCALAPPDATA` is the wrong user's — every other user still needs the runtime path, which means the runtime self-copy stays in the product and the signal is only made rarer.                                                                                                  |
-| Ship a second signed `orca-terminal-daemon.exe` in the installer              | `Orca.exe` is 235,555,328 bytes (224.6 MiB). electron-builder's NSIS uses solid LZMA with a 64 MB dictionary, so a second copy 224 MB downstream does not dedupe; the compressed installer grows by roughly a whole compressed Electron binary, paid by every user on every update download. It also does not remove the runtime copy — the helper still has to reach `%LOCALAPPDATA%` to escape the sweep — so it buys the same signal reduction as the verbatim copy at a large download cost.                                                         |
-| Override `customCheckAppRunning` to force a path-scoped kill on both branches | Cheap to write (~6 lines: `!include "getProcessInfo.nsh"`, `Var pid`, and a macro that pins `IsPowerShellAvailable`, reusing upstream's dialog, retry loop and elevated handling) — but wrong at any size. Forcing the PowerShell branch on a host where PowerShell is genuinely absent makes `FIND_PROCESS` and `KILL_PROCESS` silently no-op, so the installer proceeds with the **real app** still running and its files in use. That is a worse outcome than the cold restore it would prevent, so this is not worth doing ever, not merely not now. |
-| Hardlink instead of copy                                                      | Avoids the 246 MB entirely and is not a "copy" at all, but is NTFS-and-same-volume-only and introduces fresh failure modes (link counts, AV interception, cross-volume installs). Worth revisiting deliberately, not as part of a signal fix.                                                                                                                                                                                                                                                                                                            |
-
-## Invariants to preserve
-
-- The host exe name is **derived from `process.execPath`**, never a literal. A future
-  `executableName` or dev-channel rename must follow automatically; pinning a name of our own is
-  how the mismatch creeps back.
-- The daemon is identified by **PID and command line**, never by image name — in the product
-  (`daemon-pid-file-parse`, `daemon-process-inspection`) and in the harness
-  (`tests/tools/win-update-e2e/daemon-processes.mjs`). Nothing may start matching on the exe name.
-- `config/nsis/orca-installer-hooks.nsh` kills the daemon by image name. That now also matches the
-  app's own exe, which is correct on a genuine uninstall — the product is being removed — but its
-  `${isUpdated}` guard must stay: electron-builder runs the uninstaller during every update's
-  `uninstallOldVersion`, and killing the daemon there defeats the whole feature. The legacy
-  `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, 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`. 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
-  `cold-restore` profiles.
-
-All four are `workflow_dispatch`-only (the two update workflows also carry a push trigger pinned to
-one historical feature branch), so they must be dispatched by hand against this branch before
-merging a change here — which requires the workflow files to already exist on `main`.
diff --git a/docs/reference/windows-edr-posture.md b/docs/reference/windows-edr-posture.md
deleted file mode 100644
index 39bb20388e84..000000000000
--- a/docs/reference/windows-edr-posture.md
+++ /dev/null
@@ -1,562 +0,0 @@
-# Windows EDR signal surface
-
-Orca's Windows process tree is shaped like the thing behavioural EDR is built to
-find. An enterprise Windows 11 / Intune tenant opened **six Microsoft Defender
-for Endpoint incidents against Orca 1.4.192 in eight days**. All six fired as
-active incidents and stayed open; three closed only because a human classified
-them by hand in the portal. Defender never downgraded or closed one on its own.
-
-None were signature hits. Every one was behavioural process-tree scoring, and
-two escalated to multi-stage incidents carrying ATT&CK tactic mappings
-(Execution, Collection).
-
-The framing this document keeps throughout, because both halves matter:
-
-> **Defender is not malfunctioning. It is describing the code accurately.** Orca
-> really does copy its own signed image under a different name, really did read
-> every process's memory on a timer, really does run base64-encoded PowerShell
-> with the execution policy bypassed, and really does take screenshots and
-> synthesise input from a runtime-compiled assembly. Each of those is a
-> deliberate engineering choice with issue history behind it. The problem is not
-> that the capabilities are illegitimate — it is that their **behavioural
-> signature overlaps with attack techniques**, and an EDR scoring behaviour
-> cannot see the difference.
-
-Do not read this as a bug report against Defender, and do not read it as a claim
-that Orca is malware. It is a map of which of our behaviours are legible to an
-EDR as attack-technique-shaped, why each one exists, and what engineers and
-administrators can do about it.
-
-## What the tenant actually saw
-
-Four independent evidence clusters, from six incidents:
-
-| Cluster           | Incidents | Evidence                                                                                                                              |
-| ----------------- | --------- | ------------------------------------------------------------------------------------------------------------------------------------- |
-| **Update**        | A, B, C   | `orca-windows-setup.exe` → `old-uninstaller.exe`, `Uninstall Orca.exe` (electron-builder generates these; they are in no repo file)   |
-| **Spawn**         | all six   | `Orca.exe` → `orca-terminal-daemon.exe` → `powershell.exe` / `pwsh.exe` / `cmd.exe` / `reg.exe` → `claude.exe`, `gh.exe`, `codex.cmd` |
-| **Process table** | D         | "suspicious memory activity" — `OpenProcess` plus a PEB read against every process on a repeating cadence                             |
-| **Computer use**  | E, F      | `runtime.ps1`, `computer-sidecar.js`, many `operation.json`, a burst of ~10 short-lived `powershell.exe`                              |
-
-Incident E is the one to look at hardest: 5 alerts, 37 evidence items, ATT&CK
-**Execution + Collection**, and a description reading _"Screenshots were taken
-unexpectedly on this device… Screen capture code was found in a script launched
-by powershell.exe."_ Incident F added _"suspicious MSIL code"_, from the
-`Add-Type -TypeDefinition` that recompiles inline C# P/Invoke on every
-operation.
-
-In the update cluster the uninstaller is genuinely `NotSigned`, while `Orca.exe`
-and `orca-terminal-daemon.exe` report `Valid CN=SignPath Foundation`.
-
-## The behaviours, and why each one exists
-
-### The daemon runs from a copy of our own image
-
-`src/main/daemon/daemon-host-relocation.ts` copies the Electron runtime into
-`%LOCALAPPDATA%\Orca\daemon-host\<version>\` and forks the terminal daemon from
-there.
-
-It exists because the NSIS installer deletes the old install directory and force-
-kills every process imaged under it. Without relocation, an auto-update kills the
-terminal daemon and every live terminal with it. The copy is a run-as-node
-`Orca.exe` rather than `node.exe` so there is no console flash and asar still
-resolves; `config/nsis/orca-installer-hooks.nsh` reaps it on a real uninstall
-(guarded by `${isUpdated}` so an update's `uninstallOldVersion` never fires it).
-
-**At the time of these incidents the copy was also renamed** to
-`orca-terminal-daemon.exe`, the image name every incident here reports, and
-`DAEMON_HOST_EXE_NAME`'s comment stated the reason without varnish: _"so the NSIS
-updater's `taskkill /IM Orca.exe` can't match it."_ The rename has since been
-removed; the copy now keeps the app exe's own file name, because the updater's
-kill sweep is path-scoped on every host that has PowerShell and the rename only
-ever bought the no-PowerShell fallback. See
-[`windows-daemon-host-relocation.md`](./windows-daemon-host-relocation.md).
-
-**How an EDR reads it: MITRE T1036, masquerading** — and, for what remains,
-**T1036.005**. A signed executable copied out of the install directory into
-`%LOCALAPPDATA%` under a different name, which then spawns shells, matches the
-textbook description closely enough that no behavioural engine can be expected to
-score it low. Dropping the rename removes that literal indicator but not the
-underlying shape: execution from a non-standard user-writable location is scored
-on its own. Note also that the strongest form of the T1036 signal was never
-present here — the shipped binary's `OriginalFilename` is empty, so there was no
-embedded name for the old disk name to contradict.
-
-### Every process gets a handle, on a timer
-
-`src/main/windows/windows-process-table.ts` takes a Toolhelp32 snapshot under one
-of **two** flag sets: identity (`None | CreationTime`) for callers that read only
-pid, ppid and name, and detailed (`+ CommandLine`) for callers that match on a
-command line. pid, ppid and name come out of the snapshot itself and open
-nothing, so an identity scan opens nothing at all. `CommandLine` is what opens a
-handle: the addon calls `GetProcessCommandLine` per process, which opens
-`PROCESS_QUERY_LIMITED_INFORMATION` — the same right Task Manager takes — and
-asks the kernel for the string. Upstream it opened
-`PROCESS_QUERY_INFORMATION | PROCESS_VM_READ` and walked the PEB with three
-`ReadProcessMemory` calls (`src/process_commandline.cc:32,41-47` in the vendored
-`@vscode/windows-process-tree` 0.8.0 source that `config/patches/` patches).
-
-`Memory` is retired as of this change, and that is a real reduction: it made
-`GetProcessMemoryUsage` open a **second** `PROCESS_QUERY_INFORMATION |
-PROCESS_VM_READ` handle per process for a `GetProcessMemoryInfo` call whose
-result no caller read (`src/process.cc:47-63`). Dropping it halves the handles
-opened per snapshot. On its own it removed no memory read — both handles carried
-`PROCESS_VM_READ` at the time — so it composes with the patch below rather than
-substituting for it.
-
-It exists because seven independent readers used to fork `powershell.exe` for a
-`Get-CimInstance Win32_Process` scan. That cost, measured: a PowerShell
-Transcription policy recorded **~289 GB across 1.4 million files** because a scan
-ran every ~2 seconds (#15209); a Group Policy or AV block turned a query into
-"unavailable", which callers read as "no evidence", which is how a PTY tree
-survived its own teardown (#9045, #10475); and the scan cost ~700 ms per pane, so
-panes multiplied it (#15036). The native snapshot answers the same question in
-15.9 ms against 706 ms for CIM — p50, measured on Windows 11 at 1050 processes.
-See
-[`windows-process-enumeration.md`](./windows-process-enumeration.md).
-
-Asking for fewer fields is cheaper, and each caller now asks for the smallest set
-that answers it. There are exactly **two** TTL-cached snapshots, one per flag
-set, never one per caller: the fan-out the cache exists to remove is one scan per
-_caller_, and each reader still serves every caller wanting its flag set, so a
-32-wide teardown still collapses into one scan of each. Teardown identity and the
-owner probe select the identity set and therefore open no handles; the per-pane
-foreground tracker genuinely needs a command line and still pays for one. A third
-cache would need a third flag set, not a third caller. Measured at 492 processes,
-p50: identity 6.3 ms, detailed 12.3 ms — see
-[`windows-process-enumeration.md`](./windows-process-enumeration.md).
-
-**How an EDR read it:** a cross-process handle plus a remote memory read against
-every process on the box, repeating on a cadence, is the read half of the
-telemetry that credential dumping and process injection produce. MDE surfaced it
-as "suspicious memory activity".
-
-**The memory read is gone.** A fourth hunk in
-`config/patches/@vscode__windows-process-tree@0.8.0.patch` has
-`GetProcessCommandLine` call `NtQueryInformationProcess` with
-`ProcessCommandLineInformation` (class 60, Windows 8.1+; Electron's floor is
-Windows 10), which returns a `UNICODE_STRING` the kernel builds and needs only
-`PROCESS_QUERY_LIMITED_INFORMATION`. Measured on ~540 processes, per detailed
-scan: `ReadProcessMemory` 1128 → **0**, desired access `0x0410` → `0x1000`, with
-byte-identical command lines on every process both readers recovered. There is no
-PEB fallback to reinstate it — a hooked `ntdll` answering
-`STATUS_INVALID_INFO_CLASS` for one target would have flipped a process-wide,
-one-way switch back to `PROCESS_VM_READ` on exactly the machines this exists for.
-
-Because the property is the _absence_ of an import, it is checkable on the
-artifact rather than the source: `inspectWindowsProcessTreeAddon()` answers
-`clean` / `unpatched` / `missing`, and the rebuild, `ensure-native-runtime.mjs`,
-the relay build and `loadWindowsProcessTree()` all key on it. That check is load-
-bearing because the published tarball ships a _loadable_ prebuilt built from
-unpatched source, so "it required cleanly" is not evidence.
-
-What to declare to administrators is now one
-`PROCESS_QUERY_LIMITED_INFORMATION` handle per process on a detailed snapshot and
-no remote memory access at all; an identity snapshot opens nothing. What this
-does not narrow is _which_ processes are asked — a detailed scan still queries
-every pid, including `lsass.exe`. Restricting the command-line pass to Orca's own
-subtree needs job-object membership as its source of truth (a ppid-derived
-allowlist would miss the detached, reparented descendants of #9045 and #10475),
-and remains unclaimed work.
-
-### Encoded, policy-bypassing PowerShell
-
-Three sites are named in the incident analysis:
-
-- `src/relay/windows-port-scan.ts` ran
-  `-NoProfile -NonInteractive -ExecutionPolicy Bypass -EncodedCommand` over a
-  `Get-NetTCPConnection -State Listen` script to find dev-server ports.
-  Enumerating listening ports is **MITRE T1049**, network service discovery, and
-  doing it through an encoded policy-bypassed shell is the aggravating factor
-  rather than the finding itself. The ordinary scan now starts no PowerShell at
-  all — `netstat.exe -ano`, with the owning process name projected off the shared
-  native table — and that payload survives only as the last-resort fallback, as
-  `-Command` with no policy override.
-- `src/main/daemon/shell-ready.ts` uses `-EncodedCommand` for the OSC 133
-  bootstrap.
-- `src/main/agent-hooks/windows-powershell-hook-launcher.ts` wraps managed hooks.
-
-**No site spells the pair any more.** `src/main/ssh/ssh-remote-powershell.ts`,
-`src/shared/setup-agent-sequencing.ts`,
-`src/shared/windows-cmd-runner-delayed-launch.ts` and
-`src/shared/windows-interactive-login-spawn.ts` each dropped
-`-ExecutionPolicy Bypass` as a measured no-op: the policy gates script _files_,
-never `-EncodedCommand`. Where the bypass was load-bearing it moved in-payload as
-a process-scope `Set-ExecutionPolicy` (`setup-agent-sequencing.ts`), which is the
-pattern to copy rather than restoring the switch — the switch loses to a GPO
-scope anyway, so it never covered the locked-down case.
-
-What remains is `-EncodedCommand` without the bypass: the PTY bootstraps
-(`src/main/daemon/shell-ready.ts`, `src/main/providers/local-pty-shell-ready.ts`,
-`src/main/providers/windows-shell-args.ts`), the hook wrappers
-(`src/main/agent-hooks/windows-powershell-hook-launcher.ts` and its callers
-`src/main/agent-hooks/runtime-home-hook-command.ts`,
-`src/main/agent-hooks/installer-utils.ts`, and `src/main/claude/hook-settings.ts`
-— that last one only as a _fallback_ since #18875, see below),
-`src/main/runtime/windows-default-route-interfaces.ts`,
-`src/main/runtime/orchestration/setup-completion-signal.ts`,
-`src/shared/hermes-startup-query.ts`, and the four ex-bypass sites above.
-`src/main/runtime/windows-mobile-firewall.ts` encodes a script and launches it
-_elevated_ through `Start-Process -Verb RunAs`, which is a stronger shape than
-any of those; only that hop is encoded, because `-ArgumentList` re-splits an
-unquoted parameter string on whitespace.
-
-One site still spells `-ExecutionPolicy Bypass` with **no** encoding, the weaker
-signal: `src/main/cli/wsl-cli-scripts.ts` (`-File`, and it is a real script
-file, so the switch is not a no-op there). Every Orca-managed WSL terminal now
-reaches it by default on each CLI call (`docs/reference/wsl-managed-cli.md`), not
-only after the user registers the WSL CLI. `src/main/system-fonts.ts` dropped it
-for plain `-Command`; `src/shared/secure-path-windows-acl.ts` no longer runs
-PowerShell at all, having moved to `icacls.exe`; and computer use now asks for
-`-ExecutionPolicy RemoteSigned` in
-`src/main/computer/windows-powershell-execution-policy.ts`, falling back to
-`Bypass` only after a policy-blocked start.
-
-Regenerate with `rg -- '-EncodedCommand|-ExecutionPolicy' src/` rather than
-trusting the lists above, and note that a raw grep under-reports: the hook sites
-reach `-EncodedCommand` through `wrapWindowsPowerShellEncodedCommand` and never
-spell the flag themselves.
-
-Encoding is not gratuitous: it shields paths and switches from `cmd.exe` and MSYS
-rewriting (#6078, #14815), which is a real class of corruption. But
-`-EncodedCommand` is a first-class Defender alert title ("Suspicious PowerShell
-command line"), and base64 raises the score rather than lowering it, because it
-denies the analyser the payload it would otherwise clear.
-
-The hook launcher is prior art worth knowing about. #16003 measured, on a
-reporting Kaspersky host, that `-WindowStyle Hidden` paired with
-`-EncodedCommand` was denied at `CreateProcess` with exit 126 regardless of
-payload — `exit 0` was denied too. The fix was to stop _spelling_ the flags:
-`WINDOWS_POWERSHELL_HOOK_SWITCHES` is now just `-NoProfile`, and separately, in
-#16576, the execution policy bypass moved in-payload as a process-scope
-`Set-ExecutionPolicy` — a real command-line signal reduction, though #16003's
-measured denial keyed on `-WindowStyle Hidden` + `-EncodedCommand`, not on the
-bypass. It is also honest that the underlying behaviour did not change.
-
-Copy the pattern, but copy its caveat too. `windows-powershell-hook-launcher.ts`
-records that dropping `-WindowStyle Hidden` was a real tradeoff whose suppression
-"was never measured" and "remains unverified on a real box". Reducing spelled
-flags is the right instinct; treat any specific claim about what a removed flag
-was doing as unproven until someone measures it.
-
-### `cmd.exe /c` carrying caret-escaped free text
-
-`buildWindowsCmdShimCommandLine` in
-`src/shared/child-process/windows-command-line.ts` builds `/d /v:off /s /c "…"`
-for the `.cmd` and `.bat` targets Windows can only start through `cmd.exe`
-(`codex.cmd` being the one that matters). Because cmd expands `%VAR%` even inside
-a quoted token, each `%` is broken with `"^%"`.
-
-The escaping is not decorative. Measured on Windows 11 against a real `.cmd`
-shim, `["a b", 'c"d', "e%F%g", "h&i", "j^k"]` came back as `["a b", 'c"d',
-"e^%F^%g", "h"]` — the `&` truncated the argument _and_ ran the remainder as a
-command.
-
-**How an EDR reads it:** caret escaping is the canonical obfuscation marker in
-`cmd.exe` command lines, and the free text being escaped here is an agent prompt,
-so the line is long, high-entropy, and attacker-shaped. It is the exact input an
-obfuscated-command-line detector is tuned on.
-
-### The spawn tree itself
-
-`Orca.exe` → the relocated daemon host (`orca-terminal-daemon.exe` in the builds
-these incidents cover, `Orca.exe` since) → a shell → an agent CLI is what a
-terminal multiplexer for coding agents _is_. `reg.exe` appears from
-`src/main/win32-utils.ts`,
-`src/main/agent-hooks/managed-hook-owner-identity.ts` and
-`src/relay/pty-shell-utils.ts` (reading the OpenSSH `DefaultShell`).
-
-Nothing here is avoidable in principle. What is controllable is depth and
-breadth: every interpreter hop between Orca and the thing the user asked for adds
-a scored edge, which is why the shipped doctrine of #15520 and #15595 is to
-_shorten the interpreter chain_ rather than to hide a window.
-
-#18875 is a worked example of that doctrine. The Claude Code lifecycle hook was
-registered as `powershell.exe -NoProfile -EncodedCommand <...>` whose entire
-decoded payload was a `Test-Path` and a call to `~/.orca/agent-hooks/claude-hook.cmd`.
-It now registers the bare script path itself, with no shell operators, so `bash ->
-powershell -> cmd -> curl` became `bash -> cmd -> curl` and one
-`powershell.exe -EncodedCommand` per hook event — a first-class Defender alert
-title — leaves the tree. The reporting box fired ~6 900 of them in five days,
-70% from Claude sessions that were not running under Orca at all and whose hook
-exits at its first `ORCA_PANE_KEY` guard.
-
-What is measured is latency and the hop count, nothing else: median 471 ms ->
-213 ms per event idle, and 656 ms -> 296 ms (p95 696 ms -> 337 ms) under 10-way
-concurrency, invoked as Claude Code invokes it. **No EDR verdict on either tree
-was measured**, so claim the removed `-EncodedCommand` spelling and the shorter
-chain, not a score. `cmd.exe` remains in the tree, spelled by MSYS's own `.cmd`
-spawn rather than by us — the doc's one "unavoidable for `.cmd`/`.bat`" case,
-carrying only an absolute path, with no caret escaping, no
-encoding and no free text. The encoded launcher is still the shape for profile
-paths the shells cannot carry bare (a space, `%`, `^`, `&`, non-ASCII, a UNC
-profile).
-
-The direct shape first shipped as `<path> || echo {}`, gated on Git Bash being
-resolvable. That gate guessed at a choice Claude Code makes on its own: it runs
-hooks under Windows PowerShell 5.1 when it picks PowerShell, and 5.1 rejects `||`
-(parse error, exit 1), so every hook failed (STA-8913). The registered command is
-now the bare path, which parses in Git Bash, cmd.exe, pwsh and PowerShell 5.1.
-The neutral `{}` for a missing payload lives in the `claude-hook.cmd` entry, which
-hands off to `claude-hook-impl.cmd` in the same `cmd.exe`; a deleted entry is an
-ordinary non-blocking hook error (never exit 2) until the next install rewrites it.
-Compat consumers such as cursor-agent and Devin import `~/.claude/settings.json`
-and run `command` through their own launcher (the payload carries a
-`DEVIN_PROJECT_DIR` skip for that); one that cannot start a `.cmd` at all still
-gets a launch failure. Before widening the direct shape to another agent, measure
-that consumer's host.
-
-### Computer use: screen capture, synthetic input, runtime-compiled MSIL
-
-`native/computer-use-windows/runtime.ps1` is a large PowerShell script.
-`src/main/computer/desktop-script-provider-bridge.ts` launches it as
-`powershell.exe -NoLogo -NoProfile -NonInteractive -ExecutionPolicy RemoteSigned
--File runtime.ps1 <operation.json>`, retrying once at `Bypass` only if the start
-comes back policy-blocked — **once per operation**, with
-`desktop-script-provider-client.ts` writing a fresh `operation.json` into a new
-temp directory each time. On every launch the script runs `Add-Type
--TypeDefinition` over inline C# that P/Invokes `SendInput` and the window APIs,
-then captures the screen through `Graphics.CopyFromScreen`.
-
-That is four separate high-signal behaviours stacked in one process:
-
-| Behaviour                                     | How it is scored                                              |
-| --------------------------------------------- | ------------------------------------------------------------- |
-| `Graphics.CopyFromScreen`                     | **MITRE T1113**, screen capture — Collection tactic           |
-| `SendInput` synthetic keyboard/mouse          | input synthesis against other applications                    |
-| `Add-Type -TypeDefinition` on every operation | MSIL compiled at runtime; incident F's "suspicious MSIL code" |
-| One `powershell.exe` per operation            | a burst of short-lived interpreters under one parent          |
-
-The bottom two rows are the two the incident text named directly, and they are
-also the two a persistent runtime host would remove: a long-lived helper compiles
-its P/Invoke stubs once and answers operations over a channel, so neither the
-MSIL recompilation nor the interpreter burst repeats. A change doing that is in
-flight and unmerged at the time of writing; check the code rather than this
-paragraph for what the shipped build does. Screen capture and `SendInput` are
-inherent to the feature and no refactor removes them.
-
-### SSH hosts: upload-stage file identity and runtime-store GC
-
-These run on the _remote_ Windows host over SSH, not on the desktop, but the
-host's EDR scores them the same way.
-
-The relay upload stage fences each slot with the directory's file ID (volume
-serial plus file index). That used to come from `Add-Type -TypeDefinition` over
-a P/Invoke of `GetFileInformationByHandle`, compiled in every stage command. When
-the relay runs on Orca's pinned Node (design D5), node.exe is already hashed
-against the pin and has run once, so the stage commands now ask it instead:
-`src/main/ssh/ssh-relay-upload-stage-windows-commands.ts` runs
-`node.exe -e <fixed script> -- <path>`, a fixed `fs.lstatSync(..., { bigint: true })`
-with the path as an argument. libuv fills `dev` and `ino` from the same volume
-serial and file index, so both readers write the same `vol:high:low` lowercase
-hex, and identity files are compared after normalising hex spelling. An old
-client can recover a stage a new one reserved, and the reverse.
-
-Two alternatives were rejected:
-
-- **PowerShell alone.** Neither .NET Framework (Windows PowerShell 5.1) nor .NET
-  exposes a file index without P/Invoke, which is what `Add-Type` compiles.
-  `fsutil file queryfileid` would spawn another binary per lookup and prints a
-  different format, which would break mixed-version recovery.
-- **Host Node.** Relays still on the host's own Node (rung C and the legacy
-  path) keep the `Add-Type` helper, because Orca has not verified that binary.
-  That is the one remaining `Add-Type` site on SSH hosts; it goes when those
-  rungs do.
-
-A lookup costs one short-lived node.exe per existing stage directory the command
-inspects, usually one or two. It is not a loop over the whole pool.
-
-Runtime-store GC (`src/main/ssh/remote-node-runtime-store-windows.ts`) reads the
-store in one PowerShell invocation. It learns which runtimes are in use from a
-single `Get-CimInstance Win32_Process` query, filtered on an image path under
-`runtimes\`. It never matches on the image name, so another program's node.exe
-holds nothing. WMI refuses a standard user's SSH logon, so a refusal falls back to
-`Get-Process`, which reads the image path of the account's own processes — the
-only ones running from its store. If both fail, no process check has run and the
-pass keeps everything. Windows itself also refuses to delete a running image, which is a
-second safeguard.
-
-### SSH hosts: starting the relay outside the session
-
-Win32-OpenSSH puts each session's shell in a job with
-`JOB_OBJECT_LIMIT_KILL_ON_JOB_CLOSE | JOB_OBJECT_LIMIT_BREAKAWAY_OK`
-(`contrib/win32/win32compat/w32-doexec.c`, unchanged since 2018), so the relay
-must leave that job to outlive the connection. It used to leave through WMI
-`Win32_Process.Create`, which is both an EDR-scored remote-execution shape
-(T1047) and refused to a standard user's network logon unless an administrator
-grants Remote Enable on `root\cimv2`.
-
-Now `relay.js --windows-breakaway-launch` runs once per launch on the same
-node.exe and calls `spawnOutsideJob` in the staged process-tree addon
-(`src/process_launch.cc` in the patch): one `CreateProcessW` with
-`CREATE_BREAKAWAY_FROM_JOB`, and a handle list that passes only the relay's
-three stdio handles, so no SSH channel pipe is inherited. libuv never passes that
-flag, so Node alone cannot do this. WMI remains only as the fallback for a relay
-built without the addon or a job that refuses breakaway, and a refusal there is
-reported as `ORCA_RELAY_LAUNCH_REFUSED`. The Windows SSH-host lanes run with no
-WMI grant and assert the breakaway route.
-
-`orcad.js` exposes the same launcher (`src/shared/windows-breakaway-launcher.ts`)
-with **no** WMI fallback: a host that cannot break away refuses the orcad launch.
-Windows orcad operations start **no PowerShell**: sshd's DefaultShell runs the
-pinned `node.exe` directly with plain path arguments, against one content-addressed
-host script staged beside the slots (`src/main/ssh/orcad-windows-host-script.ts`).
-Only a `node.exe` path that itself needs quoting (a profile name with a space)
-falls back to one unencoded `powershell.exe -Command`. The launch waits for
-readiness host-side, one exec per 20 s at most, rather than re-running an exec
-every 500 ms.
-
-## Signing is not the gate
-
-The most useful calibration in the whole incident set came from the reporter's
-own machine: **Antigravity IDE's main executable is `NotSigned` and was not
-flagged, while Orca's is signed and was flagged six times.** Their conclusion:
-_"signing is not the gate here — behaviour is."_
-
-The mechanism is that Defender reputation is signer **plus prevalence**, and
-prevalence is keyed on **file hash**. A widely installed unsigned binary clears
-on install count alone. Orca's signature is a free OV certificate from SignPath
-Foundation (`config/electron-builder.config.cjs` sets
-`win.signtoolOptions.publisherName`; `config/scripts/verify-windows-inner-signature.mjs`
-pins `CN=SignPath Foundation, O=SignPath Foundation, L=Lewes, S=Delaware, C=US`),
-shared across many OSS projects, with no independent SmartScreen or MAPS
-reputation of its own. Every release ships new hashes, so whatever prevalence a
-build accumulates resets on the next update. Dev channels ship unsigned by
-design, because SignPath's approval waits cannot fit a dev cadence
-(`config/scripts/verify-dev-channel-packaging.mjs`).
-
-Signing the uninstaller is worth doing — an unsigned `old-uninstaller.exe`
-running under a signed installer is a gratuitous contribution to the update
-cluster — but do not expect it to change the behavioural verdict. The three
-non-update clusters contain no unsigned binary at all.
-
-## What we do not know
-
-Two limits the incident analysis recorded, kept here rather than smoothed over:
-
-- **No data on Hermes.** Nothing in this document describes how Hermes behaves
-  under the same tenant policy — though `src/shared/hermes-startup-query.ts` does
-  spell `-EncodedCommand`, so the gap is telemetry, not surface.
-- **Antigravity not being flagged is absence of evidence, not proof.** It is one
-  reporter's recollection from one machine, not a measurement. It is strong
-  enough to falsify "the problem is that we are not signed well enough"; it is
-  not strong enough to support a positive claim about how Defender scores that
-  product.
-
-Add to those: this is one tenant with one policy configuration. Whether the same
-build scores the same way elsewhere is unmeasured.
-
-## Guidance for engineers
-
-Fixes for several of the shapes above are in flight in separate changes; nothing
-in this section should be read as a statement that a given site has already
-changed. Check the code before relying on it.
-
-The checklist. On Windows, do not reach for:
-
-| Don't                                         | Instead                                                                                                                             |
-| --------------------------------------------- | ----------------------------------------------------------------------------------------------------------------------------------- |
-| `-ExecutionPolicy Bypass` on the command line | Set the policy in-payload at process scope, as `windows-powershell-hook-launcher.ts` does, or do not run a `.ps1` at all            |
-| `-EncodedCommand`                             | A temp `.ps1` with an argument, or no PowerShell hop: prefer a native API or an existing Node path                                  |
-| `cmd.exe /c` carrying escaped free text       | Spawn the real target directly. `cmd.exe` is only unavoidable for `.cmd`/`.bat`; keep free text out of the line where you can       |
-| Forking `powershell.exe` to read system state | The native reader — [`windows-process-enumeration.md`](./windows-process-enumeration.md) is the standing rule for the process table |
-| A process per operation in a loop             | One long-lived helper with a request channel. A burst of short-lived interpreters under one parent is itself the signal             |
-| `Add-Type -TypeDefinition` at runtime         | A precompiled, signed assembly, or a native helper                                                                                  |
-| Copying our own image under a different name  | Copy it verbatim — [`windows-daemon-host-relocation.md`](./windows-daemon-host-relocation.md) (done for the daemon host)            |
-| Deriving a script runner from a UI preference | [`windows-setup-shell.md`](./windows-setup-shell.md) — the script declares its own interpreter                                      |
-
-Two framing rules that outlast the table:
-
-- **Shorten the interpreter chain.** Each hop between Orca and the user's actual
-  target is a scored edge and a place for AV to deny a `CreateProcess`. This is
-  the shipped doctrine of #15520 and #15595.
-- **Do not spell a flag you can avoid spelling.** #16003 measured a denial that
-  was independent of the payload and keyed purely on the switch combination on
-  the command line. What is on the line is itself the detection surface.
-
-## Guidance for administrators deploying Orca
-
-### Path exclusions alone will not silence these
-
-This is the single most important operational point, and it is the one most
-commonly got wrong. The six incidents are **MDE EDR behavioural alerts**.
-Defender Antivirus path exclusions suppress _scan_ detections; they do not
-suppress EDR behavioural alerts the same way. Adding
-`%LOCALAPPDATA%\Programs\orca\` to the AV exclusion list and expecting the
-incidents to stop will not work.
-
-### What actually stops incidents being created
-
-An **MDE alert suppression rule** scoped to the process tree. Build it in
-Microsoft 365 Defender (Settings → Endpoints → Alert suppression), conditioned
-on:
-
-- **Alert titles** — `A suspicious file was observed` and
-  `Suspicious PowerShell command line`, plus any further titles your tenant
-  actually produced. Take the titles from your own incidents rather than from
-  this list.
-- **File paths** — `Orca.exe` and `orca-terminal-daemon.exe` under
-  `%LOCALAPPDATA%\Programs\orca\` and `%LOCALAPPDATA%\Orca\daemon-host\`.
-
-Scope it as narrowly as your tenant will tolerate, and review it when Orca
-updates: the `daemon-host` path carries a `<version>` segment, so a rule pinned
-to one version will silently stop matching. Two traps in that path in particular.
-Materialization stages into a `<version>.staging-<hex>` sibling before renaming
-it into place, so an exact-version rule misses the tree **mid-update** — which is
-precisely when the update-cluster incidents fire. And the root falls back to the
-Electron `userData` path when `LOCALAPPDATA` is unset, so
-`%LOCALAPPDATA%\Orca\daemon-host\` is the normal location rather than a
-guaranteed one. Prefer a prefix match on `…\Orca\daemon-host\` over a rule
-pinned to one full path.
-
-Add AV path exclusions for those two directories as well — they cut scan cost on
-a tree that is rewritten on every update — but understand the division of
-labour. The exclusions reduce scanning; **the suppression rule is what stops
-incidents being created.**
-
-### Check your ASR rules
-
-Check whether the tenant has the Attack Surface Reduction rule **"Block
-executable files from running unless they meet a prevalence, age, or trusted list
-criterion"** enabled. If it is, that alone explains a freshly signed Orca build
-being hit immediately after every update: each release ships new hashes, so every
-build starts at zero prevalence and zero age no matter how it is signed. Either
-allowlist the Orca install paths for that rule or expect a hit on each update.
-
-### Expect the alerts to recur after each update
-
-Prevalence is keyed on file hash. An update replaces the hashes, the reputation
-starts over, and a suppression rule is the only thing carrying across.
-
-## Computer use: decide before you deploy
-
-Read this section before enabling computer use on a monitored endpoint, not
-after.
-
-> **On a monitored endpoint, an alert reading "Screenshots were taken
-> unexpectedly on this device" is not the kind of finding a SOC dismisses on
-> sight.**
-
-Incident E is the shape to expect: 5 alerts, 37 evidence items, a multi-stage
-incident mapped to ATT&CK **Execution + Collection**, and a description naming
-screen capture found in a script launched by `powershell.exe`. Incident F adds
-runtime-compiled MSIL to the same tree.
-
-Every part of that is an accurate description of what the feature does. Orca's
-computer use takes screenshots, synthesises keyboard and mouse input into other
-applications, and compiles the P/Invoke stubs it needs at runtime. An
-organisation that monitors for Collection-tactic activity — and any organisation
-running MDE with default incident creation does — will see it, and will see it
-as Collection.
-
-So decide deliberately, in advance:
-
-- **Allowlist it**, with a suppression rule covering the computer-use tree
-  (`powershell.exe` with `-File …\runtime.ps1`) as well as the base Orca paths,
-  and tell your SOC what it is before the first incident rather than during it.
-- **Or leave it disabled** on monitored endpoints.
-
-What does not work is deploying it un-triaged and handling the incidents
-reactively. By the time a Collection-tactic incident is open, an analyst is
-already reading a description of screenshots being taken without the user's
-knowledge, and the burden of proof has moved to you.
diff --git a/docs/reference/windows-msys-job-breakaway.md b/docs/reference/windows-msys-job-breakaway.md
deleted file mode 100644
index 7265293bd1be..000000000000
--- a/docs/reference/windows-msys-job-breakaway.md
+++ /dev/null
@@ -1,165 +0,0 @@
-# Why an MSYS pane's children escape the per-PTY job
-
-Every child started from a Git Bash / MSYS2 / Cygwin pane leaves the pane's job
-object unless the job is created **without** `JOB_OBJECT_LIMIT_BREAKAWAY_OK`.
-`terminatePtyJob` then reports `terminated` and leaves the child running — the
-orphan that holds a worktree directory open.
-
-The denial is already in `config/patches/node-pty@1.1.0.patch`
-(`usesCygwinRuntime`, added in #19068). This page records the measurement
-behind it, because the failure mode it prevents is indistinguishable from a
-stale native addon and the gates of the day could not tell the two apart.
-
-## The mechanism
-
-The MSYS/Cygwin runtime asks for `CREATE_BREAKAWAY_FROM_JOB` on the
-`CreateProcessW` inside its `spawn`/`exec` path. A job that carries
-`JOB_OBJECT_LIMIT_BREAKAWAY_OK` grants it, so the child is created outside the
-job; a job without that limit denies it with `ERROR_ACCESS_DENIED`, and the
-runtime retries without the flag rather than failing the spawn. `fork` is not
-affected — forked Cygwin processes stay in the job either way.
-
-Measured on Windows 11 `10.0.26200.9168`, Git `2.55.0.windows.3`,
-bash `5.3.15(1)-release`, node `v24.18.0`, `useConptyDll: true`, for
-`node-pty.spawn('C:\Program Files\Git\bin\bash.exe', ['--noprofile','--norc','-i'])`
-— `+J` / `-J` is membership of the per-PTY job, read with
-`QueryInformationJobObject(JobObjectBasicProcessIdList)`:
-
-```
-bin\bash.exe            +J   ConPTY shell (assigned by node-pty)
- └ ..\usr\bin\bash.exe  +J   launcher hand-off, plain CreateProcess
-    └ usr\bin\bash.exe  +J   Cygwin fork for the typed command
-       └ node.exe       -J   Cygwin exec -- ESCAPES HERE
-```
-
-`bin\bash.exe` is a 47 KB launcher, not an MSYS binary: `C:\Program Files\Git\bin`
-holds only `bash.exe`, `git.exe` and `sh.exe`, with no `msys-2.0.dll`. Its
-hand-off to `bin\..\usr\bin\bash.exe` is an ordinary `CreateProcess` and keeps
-job membership. Only the MSYS runtime's own spawn breaks away.
-
-The shell-replacement shape (`bash -c 'exec "$BASH" --noprofile --norc -i'`)
-loses membership one step earlier, at the `exec`, and everything below inherits
-the loss:
-
-```
-bin\bash.exe            +J
- └ ..\usr\bin\bash.exe  +J
-    └ usr\bin\bash.exe  -J   Cygwin exec -- ESCAPES HERE
-       └ usr\bin\bash   -J
-          └ node.exe    -J
-```
-
-Both shapes leak. The `exec` is not the cause; it only moves the escape earlier.
-
-## The A/B that pins it
-
-One source tree, one toolchain, one variable — `usesCygwinRuntime` forced to
-`false` so the per-PTY job keeps `JOB_OBJECT_LIMIT_BREAKAWAY_OK`:
-
-| per-PTY job limit      | `listPtyJobProcessIds` | child reaped by `terminatePtyJob` | runs |
-| ---------------------- | ---------------------- | --------------------------------- | ---- |
-| `BREAKAWAY_OK` set     | 2 pids, child absent   | no                                | 0/2  |
-| `BREAKAWAY_OK` cleared | 5 pids, child present  | yes                               | 4/4  |
-
-The job **is** the right boundary. With breakaway denied it holds the whole MSYS
-tree, including the child that detached from the console, and one
-`terminateJob` reaps all of it. No alternative tracking mechanism is needed.
-
-Denying breakaway did not break ordinary launches from the pane: `git`,
-`cmd //c`, an absolute-path `node`, a `&`-backgrounded job with `disown`, and
-`where.exe` all returned 0 with no `Access is denied`, identically to the
-breakaway-allowed control. Untested: a **non-Cygwin** program that itself passes
-`CREATE_BREAKAWAY_FROM_JOB` (installers, updaters) and therefore has no runtime
-to retry for it. That needs a helper that calls `CreateProcess` with the flag;
-`start /b` does not exercise it (it uses `CREATE_NEW_CONSOLE`).
-
-## A stale addon looks exactly like the bug
-
-`config/scripts/node-pty-job-ownership.cjs` used to assert only that
-`terminateJob`, `listJobProcessIds` and `assignCurrentProcessToJob` are
-exported. All three predate #19068, so a `conpty.node` built before it passed
-every gate: `isPtyJobOwnershipAvailable()` returned true and
-`windows-pty-job.win32.test.ts` passed 6/6, while
-`windows-msys-job.win32.test.ts` failed with a two-pid job list that read as a
-source defect rather than a build-freshness one.
-
-When that test fails, check the binary before the code:
-
-```js
-// UTF-16LE, because usesCygwinRuntime holds the literals
-readFileSync(conptyNodePath).includes(Buffer.from('msys-2.0.dll', 'utf16le'))
-```
-
-False means the addon predates the fix; rebuild node-pty from patched source.
-Note that a git worktree sharing `node_modules` with its main checkout shares
-that checkout's `build/Release/conpty.node`, so pinning the _source_ to a commit
-does not pin the _addon_.
-
-The gate asserts that marker, the way `stagedRelayAddonIsUnpatched()` in
-`src/main/windows/windows-process-table.ts` already sniffs a patched addon by a
-binary import name. Symbol presence cannot distinguish patch revisions; a marker
-can.
-
-Because the marker is a literal in `conpty.cc` and the gate's copy of it is a
-separate constant, `ensure-native-runtime-job-ownership.test.mjs` asserts the
-patch still adds `L"msys-2.0.dll"` to that file. Without that, editing the patch
-would turn the gate into a permanent false positive that fails every correctly
-rebuilt addon and tells the developer to do the one thing that cannot help.
-
-## A stale source tree looks exactly like a stale addon
-
-`rebuild-native-deps.mjs` rejects a marker-less addon in its Electron probe and
-again after the rebuild, so an unpatched `build/Release/conpty.node` is never
-left in place silently. But the rebuild compiles whatever `node_modules/node-pty`
-holds, and pnpm materializes that from the patch only at install time. On a
-checkout whose `node_modules` predates the denial, `--force` compiles for
-minutes and rewrites `conpty.node` byte-identical and unpatched; measured on a
-Windows dev checkout, same size, new mtime, marker still absent. The
-post-rebuild gate then said "rebuild from source", which was the step that had
-just run.
-
-So the script reads `src/win/conpty.cc` before it compiles: if the source does
-not carry `L"msys-2.0.dll"`, it stops before the rebuild and says to run
-`pnpm install`, which re-applies the current patch. If the patch itself lacks
-the literal, the checkout predates the denial and a reinstall cannot help.
-
-## Every path the loader can fall through to
-
-`loadNativeModule` tries `build/Release`, then `build/Debug`, then
-`prebuilds/win32-<arch>`, each relative to node-pty's root and then to `lib/`,
-swallowing every failure in between. A require of a wrong-architecture `.node`
-is one of those failures, so the candidate that runs is the first one the target
-arch can actually load. The published prebuild is always the last candidate and
-never carries the patch:
-
-| package              | `build/Release`               | prebuild pruned? | what the app loads |
-| -------------------- | ----------------------------- | ---------------- | ------------------ |
-| same host, same arch | patched                       | yes              | `build/Release`    |
-| cross host           | absent, cannot be cross-built | no               | the prebuild       |
-| cross arch, built    | patched, target arch          | yes              | `build/Release`    |
-| cross arch, failed   | the host's arch               | no               | the prebuild       |
-
-`beforeBuild` runs `rebuild-native-deps.mjs --platform=win32 --arch=<target>`, so
-a cross-arch slice normally does get a patched `build/Release` for the target —
-row three is a correct package. `prunePackagedNodePty` asks the same question the
-loader does, reading the PE machine of `build/Release` rather than comparing
-`electronArch` to `process.arch`, so row three's leftover prebuild goes. Keying
-off the host arch kept it: unreached in the normal case, but still the binary the
-loader takes if `build/Release` ever fails to load for an unrelated reason — an
-AV quarantine, a missing dependency — which is the silent fall-through this whole
-gate exists to close. Rows two and four keep the prebuild because it is the only
-thing there the target could load. Measured on Windows 11 x64 with the VS 2022
-ARM64 cross toolset: `node-gyp rebuild --arch=arm64` does emit a `conpty.node`
-with machine `0xaa64`, so row three is a real package shape — but as of this
-writing no release produces it, because `electron-builder --win` is run without
-an arch and packages x64 only.
-
-The verifier still does not key on presence: the prune is the step it is
-checking, and `build/Debug` is never pruned, so an unmarked file beside a
-correct `build/Release` cannot by itself separate row three from row four, and
-failing on one would reject a correct package with advice its builder could not
-act on. `verifyPackagedConptyBreakawayMarker` instead resolves the
-addon the way the loader does — first candidate whose PE `IMAGE_FILE_HEADER`
-machine matches the target — and checks the marker on that one. A package with
-no candidate at all, or none of the target's architecture, is refused: it has no
-ConPTY backend to load.
diff --git a/docs/reference/windows-process-enumeration.md b/docs/reference/windows-process-enumeration.md
deleted file mode 100644
index 432a1fe4690d..000000000000
--- a/docs/reference/windows-process-enumeration.md
+++ /dev/null
@@ -1,672 +0,0 @@
-# Reading the Windows process table
-
-Orca needs three things from the Windows process table: who a PID's parent is
-(descendant walks and teardown identity), what a process is running (agent
-recognition), and how much memory/CPU it uses (Resource Manager).
-
-Node cannot answer the first one without native code. That is why seven
-independent readers existed, each forking `powershell.exe` to run
-`Get-CimInstance Win32_Process`, with a `wmic` fallback that Windows 11 24H2 has
-since removed.
-
-## Use the native snapshot
-
-`src/main/windows/windows-process-table.ts` is the only module that may read the
-table. It wraps a Toolhelp32 snapshot from `@vscode/windows-process-tree`.
-
-```ts
-import {
-  readWindowsProcessIdentityTable,
-  readWindowsProcessIdentityTableFresh,
-  readWindowsProcessTable,
-  readWindowsProcessTableFresh
-} from '../windows/windows-process-table'
-```
-
-Each pair is a shared TTL cache plus a `Fresh` variant that starts its scan
-after the call. Use `Fresh` for teardown identity, where a cached row can
-predate the exit it is being asked about, and the cached one for anything
-periodic.
-
-All four **reject** when the table cannot be read. Do not convert that into an
-empty array. An empty table is a claim that nothing is running, and callers act
-on that claim by declaring a tree dead or a shell childless. "Unavailable" has
-to stay distinguishable from "empty" — collapsing the two is how a PTY tree
-survived its own teardown (#9045).
-
-## Two flag sets: ask for a command line only if you read one
-
-Neither flag is a wider column on the same query. Each is a separate
-per-process syscall sequence, and they are not equally expensive to the EDR
-watching:
-
-- `CommandLine` (`process_commandline.cc`) —
-  `OpenProcess(PROCESS_QUERY_LIMITED_INFORMATION)`, then
-  `NtQueryInformationProcess(ProcessCommandLineInformation)` twice: once to size
-  the buffer, once to fill it. The kernel builds the string, so no address space
-  is opened or read. It used to walk the target's PEB with three chained
-  `ReadProcessMemory` calls; the patched addon no longer contains that primitive.
-- `Memory` (`process.cc`) — retired. It took a **second** `OpenProcess`, and that
-  one carried `PROCESS_VM_READ`, which it acquired and never used.
-
-Measured here (541 processes, 405 openable), per detailed scan, before → after
-dropping `Memory`: `OpenProcess` 1082 → 541. That halving is all the `Memory`
-drop bought on its own — both handles carried `PROCESS_VM_READ` at the time, so
-it moved the PEB traffic not at all. Replacing the PEB walk with the kernel
-query is what took `PROCESS_VM_READ` and `ReadProcessMemory` out of the addon
-altogether; the two changes compose, and neither substitutes for the other.
-
-So be precise about what these two flag sets buy now. A detailed scan is one
-`OpenProcess(PROCESS_QUERY_LIMITED_INFORMATION)` per process and no memory
-access at all. What the split buys on top of that is the handle itself: an
-identity scan opens nothing.
-
-So the module exposes two snapshots, and the row types differ so a cheap caller
-cannot read what its flag set did not pay for:
-
-| reader                                     | row type                    | flags                  | per-process handles |
-| ------------------------------------------ | --------------------------- | ---------------------- | ------------------- |
-| `readWindowsProcessIdentityTable[Fresh]()` | `WindowsProcessIdentityRow` | `None \| CreationTime` | none                |
-| `readWindowsProcessTable[Fresh]()`         | `WindowsProcessRow`         | `+ CommandLine`        | one `OpenProcess`   |
-
-`Memory` is requested by neither. Nothing reads a working set off this table —
-`windows-process-resource-collector.ts` runs its own sweep because it needs
-commit and CPU counters in the same pass, and the addon stores `WorkingSetSize`
-into a `DWORD` so anything above 4 GB wraps anyway.
-
-Measured on Windows 11 with 492 processes (p50 / p95):
-
-|                                  | p50     | p95     |
-| -------------------------------- | ------- | ------- |
-| identity (pid + ppid + name)     | 6.3 ms  | 7.0 ms  |
-| detailed (+ command line)        | 12.3 ms | 13.4 ms |
-| _retired_ (+ memory)             | 13.1 ms | 14.1 ms |
-| `Get-CimInstance` via PowerShell | 706 ms  | 723 ms  |
-
-There are exactly **two** caches, never one per caller. The fan-out this module
-exists to prevent is one scan per _caller_, and each reader still serves every
-caller wanting its flag set, so a 32-wide teardown still collapses into one scan
-of each. A third cache would need a third flag set, not a third caller.
-
-### Only one native read may be in flight, ever
-
-This is the price of having two flag sets, and it is not optional.
-
-The npm wrapper **coalesces rather than queues**. `getRawProcessList` pushes the
-callback onto one list and calls the addon only when no request is in progress,
-so a second concurrent caller's `flags` are **discarded** and it is handed the
-first caller's rows. Measured against the real addon: issue identity first, both
-callers get the same array, 0 of 541 rows carry a command line. A detailed read
-that overlaps an identity read therefore returns a table with **every command
-line empty**, and agent recognition reads that as "no agent" — silently, and
-only under concurrency.
-
-Nothing else in this module prevents that. Each snapshot cache single-flights
-only within itself (`inFlight` is a closure per reader), and the wedge set
-latches only _after_ a read misses its 3 s deadline, so through the healthy
-~12 ms of a scan neither excludes the other. Overlap is the normal state rather
-than an edge case: other panes keep polling detailed at 750 ms while a teardown
-takes identity snapshots, and `codex-structured-turn-processes.ts` issues fresh
-detailed scans on turn stop.
-
-`nativeReadGate` serializes every native read across both flag sets. It is also
-what makes the relay's bare addon safe: `adaptAddon` has no queue at all, and
-two simultaneous `CreateToolhelp32Snapshot` calls are the crash the vendor's
-queue exists to prevent. Every link settles — a wedged read still rejects on its
-deadline — so a waiter is never stranded; it re-checks the wedge and rejects.
-
-Because only one native call is ever outstanding, the wedge gate and the 3 s
-deadline stay **shared** and retention stays bounded at exactly one callback,
-not one per reader. Read ids are module-global and monotonic, so a late callback
-can only clear its own wedge.
-
-`resetNativeReaderState` **chains** onto the gate rather than replacing it. A
-replacement would let a waiter still holding the old chain run beside a read
-queued on the new one; every link settles within the deadline, so chaining costs
-a bounded wait and keeps the exclusion whole. That path is test-only, which is
-exactly why it matters — it would otherwise hand a suite two concurrent calls
-into its own mock, the condition these tests exist to detect.
-
-### Testing this module: assert a positive property, on the right mock
-
-Three defects have now shipped in this file's tests, all the same shape — a case
-that passed for a reason other than the one it claimed to check:
-
-1. A loader that built a **fresh mock per call**, so the coalescing it was meant
-   to reproduce could never happen.
-2. An identity-side assertion of only `!('command' in row)`, which a correctly
-   flagged read and a coalesced one satisfy equally, so the test would go green
-   on the very regression it guards.
-3. A concurrency assertion placed on the **coalescing** mock, whose own
-   `requestInProgress` latch means it can never report more than one call in
-   flight — so it held whether or not this module excluded anything, and passed
-   against a read gate that had genuinely lost exclusion.
-
-The third arrived in the fix for the first two, which is the point: this is not a
-mistake you make once.
-
-So: assert what each flag set **did** get, not only what it lacks, and put those
-assertions in the helper both orderings run through, or the reverse order keeps
-the blind spot. The identity set is checked on `creationTimeMs` because that is
-the field it exists to carry. Keep both that check and the flags-array check —
-they catch **different** failures and neither is redundant. The flags array
-catches a read served another flag set's rows (the coalescing bug); the
-positional `creationTimeMs` check catches field shaping — identity dropping
-`CreationTime` from its flags, or `toIdentityRow` failing to forward it — which
-no flags assertion would notice.
-
-And pick the mock to match the claim. The coalescing mock models the npm
-wrapper's queue semantics and is the only place to assert those. Concurrency has
-to be measured against the bare-addon mock, which has no queue and so makes
-re-entry observable.
-
-With no native binding there is only one scan to run and it is the 1.4 s
-PowerShell one, so the identity view rides the detailed snapshot — projected
-through `toIdentityRow`, so an identity row carries no command line on any host.
-
-### Which callers need which
-
-| caller                                     | reads                             | flag set |
-| ------------------------------------------ | --------------------------------- | -------- |
-| `windows-agent-foreground-process.ts`      | `command` (agent recognition)     | detailed |
-| `local-workspace-platform-port-scanner.ts` | `command` (port attribution)      | detailed |
-| `codex-structured-turn-processes.ts`       | `command` (turn-process identity) | detailed |
-| `structured-tui-process-identity.ts`       | `command` (child match)           | detailed |
-| `windows-pty-root-identity.ts`             | `pid` / `ppid` only               | identity |
-| `agent-session-process-identity-probe.ts`  | `creationTimeMs` only             | identity |
-| `relay/windows-port-scan.ts`               | `name` (port owner label)         | detailed |
-
-`windows-port-scan.ts` is the one mismatch in the table: it reads only `pid` and
-`name`, which the identity set answers, but it calls the detailed reader. On a
-host with a live pane that costs nothing extra — the detailed snapshot is
-already cached — and on a headless relay it pays for a command line no caller
-reads. Left as-is deliberately, because moving it to identity would trade that
-for a second scan whenever a pane is polling; revisit if the relay ever scans
-ports without one.
-
-The per-pane foreground tracker is the hot one (750 ms / 2 s cadence) and it
-genuinely needs the command line, so the repeating per-process `OpenProcess` is
-not something the split removes. What the split removes is that handle from
-teardown identity and from the owner probe, which now open nothing.
-
-### `creationTimeMs` does not exist on any shipped build
-
-Nothing in the repo supplies a `CreationTime` flag. The package enum is
-`None`/`Memory`/`CommandLine`, `process_worker.cc` emits no `creationTimeMs`,
-the vendored patch adds none, and `adaptAddon`'s `PROCESS_DATA_FLAG` lacks the
-bit. So `creationTimeMs` is always `undefined` in production and
-`isWindowsProcessStartTimeAvailable()` is always `false` — a latent product gap
-that predates the split and needs its own owner.
-
-Two consequences. `IDENTITY_PROJECTION.flags` evaluates to `0` today, so the
-identity reader really does open zero handles. And
-`agent-session-process-identity-probe.ts` early-returns on
-`isWindowsProcessStartTimeAvailable()` rather than scanning the whole table to
-produce `null`. Do not build anything on Windows start time working.
-
-Those CIM numbers are from a 1050-process host. The scan scales with process
-count: on a 1486-process Windows SSH host it measured **1.36 s** and produced
-**4.8 MiB** of JSON, against the fallback's 3 s and 8 MiB limits. Both limits
-match the pre-#15749 reader, so relay hosts are at parity rather than newly at
-risk — but the headroom is roughly 2x on time and 1.7x on bytes, not the ~4x the
-706 ms figure implies. On overflow the output is truncated, the JSON fails to
-parse, and the read rejects, so a busy host loses the table rather than
-receiving a wrong one.
-
-## When a read wedges
-
-The vendored reader pushes every callback onto a module-global queue and drains
-that queue only when the request holding its `requestInProgress` latch
-completes. If a Toolhelp32 snapshot never comes back — an EDR hook, a restricted
-token, a worker that dies — the latch is stuck for the life of the process and
-every later call parks another closure in that queue.
-
-Two guards, and they work together:
-
-- a **3 s deadline** on each read, so a caller gets a rejection instead of a
-  promise that never settles;
-- a **sticky wedge**: once a read misses its deadline and has not called back,
-  the module refuses every further read until that read's callback fires.
-
-The wedge used to be a 30 s cooldown that let one probe through per window. That
-bounded the _rate_ of new callbacks but not the total: a permanently wedged
-reader retained one more closure every 30 s for as long as the app ran, and each
-probe also blocked its caller for the full 3 s deadline first. Gating on the
-outstanding read instead bounds retention at exactly one callback, and gives up
-nothing on recovery — a probe queued behind the latch could never have observed
-recovery anyway, whereas the stuck callback firing is the drain itself. On the
-relay's bare addon, which has no queue of its own, it is also what keeps Orca
-from re-entering `CreateToolhelp32Snapshot` while a call is still running.
-
-That last part is not just tidiness. The addon runs each read as a
-`Napi::AsyncWorker`, so a wedged read holds a libuv threadpool slot for good. On
-the relay the JS queue is not there to absorb the retries, so one probe per
-window would have pinned all four default threads inside ~2 minutes — hanging
-every async `fs` and DNS call in that process, not only the process table.
-
-A wedge does **not** engage the PowerShell fallback; see the next section for
-why only absence does.
-
-## The relay has no binding, and falls back
-
-Relay deployment installs only `node-pty` and `@parcel/watcher` on the remote
-host (`RELAY_NATIVE_DEPS` in `src/main/ssh/ssh-relay-deploy.ts`), so a Windows
-machine used as an SSH host has no `@vscode/windows-process-tree` at all. It is
-not added there on purpose. Both ways of installing it fail, and both were
-checked on a real Windows SSH host with 1486 processes:
-
-**Installing it normally rebuilds from source, and that build fails.** The
-tarball carries a `binding.gyp`, so npm runs `node-gyp rebuild` regardless of
-what is already compiled inside it. On a host that _already had_ MSVC Build
-Tools 2022 installed, that build still failed:
-
-```
-error MSB8040: Spectre-mitigated libraries are required for this project.
-```
-
-That is the requirement the `binding.gyp` hunk of our patch deletes, and the
-patch cannot reach a remote host — pnpm patches do not cross SSH. Relay deploy
-would then break outright rather than degrade: `installNativeDeps` throws on
-failure, and the toolchain-skip retry is gated to Linux.
-
-**Skipping the build and using the shipped binary returns a truncated table.**
-Contrary to what this file used to claim, the published 0.8.0 tarball _does_
-contain `build/Release/windows_process_tree.node` — an MSVC build directory that
-looks accidentally published (`.obj` and `.tlog` files ship with it). It is
-N-API, so it loads on any modern Node. But it predates our patch and still has
-the `process_count < 1024` cap, so on that 1486-process host:
-
-```
-LOADED OK
-rows=1024
-selfPid=21964 present=false
-```
-
-Exactly 1024 rows, with the querying process itself among the missing. The
-self-presence guard rejects that, so the fallback engages anyway — but only on
-hosts busy enough to cross the cap. That is worse than no binding at all: it
-works on a quiet machine and fails silently under load, which is precisely the
-shape of bug that survives testing.
-
-So the constraint is not that no binary exists to ship. It is that the only
-binary available to ship is the broken one, and building the good one needs a
-toolchain the remote does not have.
-
-Instead, `windows-process-table.ts` falls back to
-`readWindowsProcessRowsWithCim` (`windows-process-table-cim-scan.ts`), the
-`Get-CimInstance` scan this module replaced. The gate is deliberately narrow:
-
-- it engages **only** when the module cannot be required, never when a loaded
-  module fails, wedges, or returns an unreadable table — a present-but-failing
-  reader must not silently start forking a shell at the caller's poll rate;
-- a fallback that also fails still rejects, so "unavailable" never degrades into
-  "nothing is running";
-- the scan applies the same self-presence guard as the native path.
-
-`src/main/ssh/relay-native-dependency-coverage.test.ts` asserts that every
-native addon reachable from the relay entry is either installed on relay hosts
-or listed there with the reason its absence is safe. That test exists because
-#15749 shipped this gap: the relay tests injected a fake module through
-`__setWindowsProcessTreeLoaderForTests`, so nothing exercised the real require.
-
-## Shipping the native reader to a relay anyway
-
-The scan is the floor, not the destination: it costs ~1.4 s and a `powershell.exe`
-where the addon costs ~57 ms. Release builds therefore compile the addon and ship
-it as an optional relay artifact.
-
-`config/scripts/build-windows-process-tree-relay-addon.mjs` builds it from the
-source pnpm has already patched, on a Windows runner, and refuses to run if
-any patch hunk is missing — the Spectre hunk fails loudly, the 1024-process
-hunk fails _silently_, and the relative gyp path dies at configure on Windows.
-The source is checked rather than the install trusted. It also reads the PE
-machine field of the output, because a cross-build that quietly emitted host
-arch would ship a binary the target cannot load.
-
-Windows arm64 cross-compiles from the x64 runner — verified on real hardware,
-producing `IMAGE_FILE_MACHINE_ARM64` (0xaa64) against x64's 0x8664. It needs the
-optional _MSVC v143 ARM64 build tools_ component; without it node-gyp fails with
-`MSB8020`, which is why the addon build runs before the long packaging step.
-`ORCA_REQUIRE_RELAY_NATIVE_ADDONS` is a per-arch list so a future arch can be
-added best-effort before it is promoted to required.
-
-`windows-process-table.ts` binds the bare addon directly rather than the package
-wrapper. That wrapper adds only a queue over `getProcessList`, and that queue is
-the wedge described above — it latches a module-global `requestInProgress` with
-no try/catch. This module already holds a single-flight and a deadline, so going
-straight to the addon drops the duplicate.
-
-The artifact is optional in `RELAY_ARTIFACTS`: hashed when present, so a relay
-carrying it never shares an immutable directory with one that does not, and
-never probed, because requiring a file only a Windows build machine can produce
-would make a correct relay read as MISSING and redeploy forever. A local build
-on another OS has no addon, so its Windows relays use the scan.
-
-Every desktop package ships relays for Windows hosts, not just the Windows
-installer, and the addon also carries the relay launcher (`spawnOutsideJob`,
-see `windows-edr-posture.md`). So one Windows job,
-`.github/workflows/relay-windows-process-tree.yml`, compiles both arches and
-uploads the `relay-windows-process-tree` artifact. The release and dev-channel
-macOS and Linux packaging jobs download it into `.build/windows-process-tree`
-and set `ORCA_REQUIRE_RELAY_NATIVE_ADDONS=x64,arm64`, as the Windows jobs do.
-`config/scripts/relay-windows-process-tree-staging.mjs` checks each staged
-binary for its PE machine, the missing `ReadProcessMemory` import, and the
-`spawnOutsideJob` export. Without that last check a pre-launcher build from an
-old `.build` dir or cached artifact would pass. A required arch that fails any
-check fails the build. An unrequired one (a local build) is left out, and that
-relay uses the scan and the WMI launch fallback.
-
-## Why the package is patched
-
-`config/patches/@vscode__windows-process-tree@0.8.0.patch` carries six changes.
-
-1. **Spectre mitigation.** The upstream `binding.gyp` requires Spectre-mitigated
-   libraries, which Orca's Windows build agents do not install. `node-pty` is
-   patched the same way for the same reason.
-2. **The 1024-process cap.** `GetRawProcessList` stopped after 1024 entries.
-   Measured on a real host with 1051 processes, the module returned exactly
-   1024 and the querying process was itself among the 27 missing. A truncated
-   snapshot silently hides the descendants a teardown is trying to reap — the
-   exact failure the native path exists to remove.
-3. **Absolute `node-addon-api` gyp path.** `require('node-addon-api').targets`
-   is cwd-relative. node-gyp on Windows evaluates it from the pnpm store
-   realpath, then loads the relative path from the `node_modules` symlink, so
-   `node_addon_api.gyp` resolves outside the repo and hourly Windows builds
-   die at configure. `node-pty` is patched the same way for the same reason.
-4. **No PEB reads, no `PROCESS_VM_READ`.** See below.
-5. **The `CreationTime` flag (4).** Upstream exposes no process start time.
-   Structured Claude and Codex chat no longer depend on it; the owner probe and
-   the orcad runtime preflight still read it. `GetProcessCreationTime` opens
-   `PROCESS_QUERY_LIMITED_INFORMATION` and converts `GetProcessTimes`' FILETIME
-   to Unix ms; a process that denies the handle is emitted with the field
-   absent, never zero, because callers must be able to tell "cannot identify"
-   from a timestamp.
-6. **`supportedProcessDataFlags`.** `addon.cc` exports the flag bits the
-   compiled binary understands, and `lib/index.js` re-exports it.
-
-   Why a separate hunk and not just the enum: unlike `node-pty`, this package
-   publishes a prebuilt `.node` at the same `build/Release/` path node-gyp
-   writes to. pnpm patches the source tree and leaves that prebuilt alone, so a
-   host can hold a patched `lib/index.js` — `ProcessDataFlag.CreationTime` and
-   all — over a binary that ignores flag 4. CI produced exactly that: the gate
-   read available and every row came back without `creationTimeMs`. Neither a
-   load check nor a path check can see the difference, so the binary has to say
-   so itself.
-
-   Two readers depend on it. `isWindowsProcessStartTimeAvailable()` returns
-   false unless this bit is set, so the owner probe never scans the whole table
-   for times it cannot get (the Windows Claude descendant snapshot that once
-   relied on it is gone). And `windows-process-tree-creation-time.cjs`
-   asserts it during install, which is what forces a from-source rebuild —
-   the same role `node-pty-job-ownership.cjs` plays for node-pty's job exports.
-
-The typings claim `commandLine` is truncated at 512 characters. Measured, it is
-not: the longest observed on a real host was 26,059.
-
-### The command line comes from the kernel, not the target's memory
-
-Upstream, `GetProcessCommandLine` opens every process with
-`PROCESS_QUERY_INFORMATION | PROCESS_VM_READ` and issues three chained
-`ReadProcessMemory` calls — PEB, `RTL_USER_PROCESS_PARAMETERS`, then the string
-— to recover the command line. Walking another process's address space for
-credentials-adjacent data on a repeating timer is what a credential dumper does,
-so Defender for Endpoint scores it as such regardless of intent. Nothing about
-the flag sets above changes that; only removing the read does.
-
-Windows 8.1 added `NtQueryInformationProcess`'s `ProcessCommandLineInformation`
-class (60), which returns the same string as a `UNICODE_STRING` the kernel
-builds, needing only `PROCESS_QUERY_LIMITED_INFORMATION`. Electron's floor is
-Windows 10, so every OS Orca supports has it. The entry point is resolved with
-`GetProcAddress` on `ntdll.dll` — it has no import library — and the size is
-probed with a null-buffer call that answers `STATUS_INFO_LENGTH_MISMATCH`.
-
-The same hunk drops `PROCESS_VM_READ` from `GetProcessMemoryUsage` and
-`GetCpuUsage`, which acquired it and never read an address space:
-`GetProcessMemoryInfo` and `GetProcessTimes` are satisfied by
-`PROCESS_QUERY_LIMITED_INFORMATION`. Measured, both return identical values
-under the weaker right on every process that opens at all.
-
-Measured on Windows 11, ~540 processes, counted in-process by replacing the
-addon's import table entries with counting stubs:
-
-| per `CommandLine` scan | before                                    | after                                  |
-| ---------------------- | ----------------------------------------- | -------------------------------------- |
-| `OpenProcess` calls    | 543                                       | 543                                    |
-| desired access         | `0x0410` (`VM_READ \| QUERY_INFORMATION`) | `0x1000` (`QUERY_LIMITED_INFORMATION`) |
-| `ReadProcessMemory`    | 1128                                      | **0**                                  |
-| p50 / p95              | 13.5 / 14.5 ms                            | 12.3 / 13.5 ms                         |
-
-Command lines were byte-identical on every process both readers recovered
-(405/405, and 399/399 and 376/376 on other runs), including a 24,087-character
-argv with embedded quotes, non-ASCII characters and trailing whitespace, and a
-WOW64 target. The weaker right is also a strict superset in reach: three
-processes that refused `PROCESS_QUERY_INFORMATION | PROCESS_VM_READ` granted
-`PROCESS_QUERY_LIMITED_INFORMATION`, and none went the other way.
-
-### There is no PEB fallback, deliberately
-
-An earlier revision kept the PEB reader for a kernel without class 60, behind a
-latch. That was wrong, and the reason is worth recording: `ClassifyQueryFailure`
-mapped `STATUS_INVALID_INFO_CLASS` / `NOT_SUPPORTED` / `NOT_IMPLEMENTED` from
-**any single target** onto a process-wide, one-way switch back to
-`PROCESS_VM_READ` plus three `ReadProcessMemory` per pid per scan, for the life
-of the process, with nothing observable from JS.
-
-The environment this reader exists for is one where an EDR hooks `ntdll`. A hook
-that returns `STATUS_INVALID_INFO_CLASS` for a class it does not recognise would
-have silently reinstated the exact primitive the patch removes, on precisely the
-machines it was written for — and one stray status from one process was enough.
-The same applies under Wine or any instrumented `ntdll`.
-
-So the fallback is gone rather than guarded. `GetProcessCommandLine` returns
-false and leaves the command line empty, which is already a normal outcome
-(`WindowsProcessRow.command` is documented as empty when a process denies a
-query handle, and callers fall back to the image name). Degrading to no command
-line is recoverable; silently resuming address-space reads is not.
-
-This also makes the property checkable on the artifact rather than the source:
-the patched reader never calls `ReadProcessMemory`, so the symbol is absent from
-the compiled addon's import table. `inspectWindowsProcessTreeAddon()` in
-`config/scripts/windows-process-tree-gyp-rebuild.mjs` is that check, and it is
-the only way to tell the two binaries apart — see below. It answers
-`clean` / `unpatched` / `missing` rather than a boolean, because a binary that is
-not there has not been cleared, and a caller reading `false` as “verified” would
-pass exactly the thing the check exists to catch.
-
-Because the returned `UNICODE_STRING` comes from that same hookable boundary,
-its `Buffer` and `Length` are bounds-checked against the allocation before the
-characters are encoded, and the probed size is capped at the header plus 64 KiB
-(`Length` is a `USHORT`) so a bogus size cannot turn into a `bad_alloc` that
-fails an entire scan instead of one process.
-
-### The published tarball ships a loadable unpatched prebuilt
-
-`@vscode/windows-process-tree@0.8.0` publishes
-`build/Release/windows_process_tree.node` in the tarball. It is node-addon-api,
-so it is ABI-stable and loads cleanly under both Node and Electron — and it was
-built from unpatched source, so it performs 1179 `ReadProcessMemory` calls and
-opens every process at `0x0410` per scan.
-
-That matters because `allowBuilds` is `false` for this package and CI installs
-with `--ignore-scripts`, so nothing compiles it at install time. A `require()`
-health check cannot tell the two binaries apart, and a rebuild that is skipped —
-`rebuild-native-deps.mjs` soft-exits 0 on a Windows file lock during postinstall
-— leaves the upstream prebuilt in place and cached.
-
-Four checks close that, all keyed on the absent `ReadProcessMemory` import:
-
-- `ensureWindowsProcessTreeCommandLinePatch()` deletes a binary that still has
-  it, so a skipped rebuild fails loudly instead of using the prebuilt;
-- `ensure-native-runtime.mjs` treats such a binary as a load failure, which is
-  what triggers the rebuild;
-- the relay build asserts it on the artifact it just produced;
-- `loadWindowsProcessTree()` asserts it again on the addon staged beside a relay
-  bundle and refuses to bind one that still imports the symbol, falling back to
-  the CIM scan. The build-time assertion is not enough on its own: a bundle and
-  the addon beside it redeploy independently, so a host that has not taken a new
-  bundle keeps whatever `.node` is already there.
-
-What none of this does is narrow _which_ processes are asked. A detailed scan
-still queries every pid, including `lsass.exe`; it now asks with the same right
-Task Manager uses instead of `PROCESS_VM_READ`. Restricting the command-line
-pass to Orca's own subtree is the complementary change, and it belongs with the
-identity/detailed reader split rather than here — a ppid-derived allowlist would
-miss exactly the detached, reparented descendants the trackers exist to find
-(#9045, #10475), so it needs the job-object membership as its source of truth.
-
-## Packaging
-
-The addon is Windows-only, so it follows the same contract as
-`@orca/windows-registry` (asserted by
-`config/scripts/package-electron-runtime-contract.test.mjs`):
-
-- an `optionalDependency`, so a macOS/Linux install tolerates its absence;
-- **not** enabled in `allowBuilds` in `pnpm-workspace.yaml` — pnpm installs optional dependencies
-  on every host, and macOS/Linux must never run `node-gyp` for it;
-- listed in the win32 branch of `rebuild-native-deps.mjs` and
-  `ensure-native-runtime.mjs`;
-- copied into the packaged `node_modules` for win32 only.
-
-The relay's copy is a separate artifact staged beside the bundle, so a relay host
-only picks up a rebuilt addon on redeploy. Until then it keeps whatever binary it
-already has, which is why the addon is checked again at load.
-
-## What the snapshot does not provide
-
-`CreationDate` (process start time) now has an equivalent — `creationTimeMs`,
-above — but only inside this module. Daemon identity, managed-hook ownership and
-CPU accounting in the memory collector still read a start time through their own
-queries; those callers are not migrated.
-
-Committed private bytes have no equivalent either, and the one memory value the
-addon can produce is unusable for the sizes Orca now sees: `process.cc` stores
-`pmc.WorkingSetSize` into a `DWORD`, so anything above 4 GB wraps — which is why
-neither flag set asks for it. That is the second reason
-`windows-process-resource-collector.ts` still runs its own
-`Get-CimInstance` sweep — it needs `PageFileUsage` (commit) and the CPU-time
-counters in the same pass. Migrating it to the native table would cost both, and
-it is why this module no longer sets the `Memory` flag at all: the field had no
-reader, and asking for it opened a handle per process on every snapshot.
-
-Start time is a proxy for identity, not identity. For the process trees Orca
-itself spawns the durable answer is still an inherited handle: a job object
-names the tree Orca created, so no start-time comparison is needed. The
-`creationTimeMs` this snapshot now carries is for the trees Orca did **not**
-create the handle for — a recovered agent session, a descendant walked out of
-the table — where a bare PID is all there is to re-identify.
-
-Do not adopt `getProcessCpuUsage()` from the package. It takes both CPU samples
-inside one call with a blocking `Sleep(1000)` in the middle, which would hold a
-libuv threadpool slot for a full second out of the Resource Manager's two-second
-poll.
-
-## Owning a PTY's process tree
-
-`src/main/windows/windows-pty-job.ts` is the counterpart to reading the table:
-it answers "is this tree mine, and how do I kill it?" with a handle instead of
-an inference.
-
-node-pty is patched (`config/patches/node-pty@1.1.0.patch`) to create a job
-object per ConPTY and assign the shell to it under `CREATE_SUSPENDED`, before
-the shell can spawn anything. Assigning after the fact leaves a window in which
-a fast child escapes the job.
-
-- `terminatePtyJob(proc)` — one `TerminateJobObject` call for the whole tree.
-- `listPtyJobProcessIds(proc)` — the live pids under a tree that is still
-  tracked, including children that detached from the console.
-
-Measured on Windows 11 against a shell whose grandchild was spawned `detached`:
-job membership was `[shell, grandchild]` and one call killed both. Neither a
-parent-pid walk nor `GetConsoleProcessList` sees that grandchild — it leaves
-the console and reparents, which is what left `claude.exe`/`node.exe`/`cmd.exe`
-holding worktree directories open (#9045, #10475, #10897).
-
-The per-PTY job deliberately does **not** set
-`JOB_OBJECT_LIMIT_KILL_ON_JOB_CLOSE`. Measured on Windows 11: with that flag,
-releasing the handle when the shell exits also kills whatever the user left
-running, so typing `exit` in a pane reaped a `start /b` server that used to
-survive. The job exists to make an _explicit_ teardown exact, not to redefine
-what a clean exit means.
-
-Git Bash needs one additional restriction. The Cygwin runtime — and the MSYS2
-fork of it that Git for Windows ships — reads `JOB_OBJECT_LIMIT_BREAKAWAY_OK`
-off its own job and then adds `CREATE_BREAKAWAY_FROM_JOB` to **every** child it
-spawns when that flag is set (`spawn.cc`, there since 2011), so offering
-breakaway hands the whole tree its escape. The per-PTY job therefore omits
-`BREAKAWAY_OK` whenever `msys-2.0.dll` or `cygwin1.dll` sits on the shell's DLL
-search path — beside the executable, or under `usr/bin` for Git's `bin`
-launcher. Native shells keep explicit breakaway. Denying it costs Cygwin
-nothing, because it _pre-checks_ the limit rather than retrying, so no spawn
-fails; but a _native_ program that passes `CREATE_BREAKAWAY_FROM_JOB` itself
-inside such a pane now gets `ERROR_ACCESS_DENIED`. `nohup` and `disown` are
-unaffected — they are Cygwin signal/session concepts, unrelated to job
-membership. The daemon's host job is unchanged.
-
-Reaping a dead daemon's shells (#9195, #10415) is therefore a **second, nested
-job**, not this one. The terminal daemon assigns itself to a kill-on-close job
-at startup (`assignHostProcessToKillOnCloseJob`); children inherit membership,
-so every pty is covered and the per-PTY jobs nest inside it. Its handle is
-released only when the daemon process dies, so a crashed daemon reaps its tree
-without changing what a clean shell exit means.
-
-The split is the point. One job answers "kill exactly this pane's tree, now";
-the other answers "do not strand anything if the host dies". Trying to get both
-from one job is what reaped users' backgrounded work on a clean `exit`.
-
-It belongs to the daemon and never to the app: an app-main crash must still
-leave sessions alive, which `.github/workflows/win-crash-survival-e2e.yml`
-asserts. The app spawns the daemon `detached` and is itself in no job, so
-nothing is inherited across that boundary.
-
-The consequence is that a PTY hosted by the app rather than the daemon gets a
-per-PTY job but no crash reaping. That is deliberate — the alternative is a
-kill-on-close job on the app, which is exactly what the crash-survival
-guarantee forbids.
-
-Once the shell exits, node-pty drops its handle record and closes the job, so a
-terminated tree reports `null` rather than `[]`. Null means _unverifiable_ in
-the sense of [`ssh-execution-boundary.md`](./ssh-execution-boundary.md) — no job
-support, not a ConPTY, or no longer tracked. It is never evidence that
-processes died.
-
-Both functions report `unavailable` / `null` rather than a false success when a
-pty has no job — an outer job without `JOB_OBJECT_LIMIT_BREAKAWAY_OK` (some EDR
-and container hosts) can refuse the assignment, and a pty started before this
-build has none. Callers must fall back, not conclude the tree is gone. That
-conflation is the original bug.
-
-### Known limitation: the baton table is not synchronised
-
-node-pty keeps its per-terminal handles in a plain `std::vector` and erases from
-it on a detached exit thread, while `get_pty_baton` is called from the main JS
-thread. That race predates this change — `PtyResize`, `PtyClear` and `PtyKill`
-all read the table the same way — but `terminatePtyJob` adds an instance of it:
-the exit thread can close `hJob` between the lookup and `TerminateJobObject`.
-
-Losing that race normally just returns `FALSE`, which surfaces as `unavailable`
-and falls back. The case that would not be benign is a recycled `HANDLE` value,
-where the call could reach a different job in the same process. Fixing it
-properly means synchronising node-pty's handle table rather than adding a lock
-around one accessor, so it is deliberately left alone here.
-
-### The patch must actually be compiled
-
-node-pty prefers its upstream prebuild and only builds from source when
-`npm_config_build_from_source` is set or no prebuild exists for the platform.
-The Windows prebuild does **not** contain this patch, so a plain `pnpm install`
-on Windows yields a node-pty without the job-object exports — and
-`terminatePtyJob` then reports `unavailable` on every call, which is
-indistinguishable from a correctly degraded build.
-
-Packaging is unaffected: `rebuild-native-deps.mjs` rebuilds node-pty from source
-for Electron and restores the ConPTY runtime files that a bare `node-gyp
-rebuild` skips. The gap is the **node-runtime test environment**, which is why
-the Windows CI job rebuilds from source before running the win32 suites.
-
-`isPtyJobOwnershipAvailable()` exists for exactly this: the win32 suite asserts
-it is true before asserting anything else, so an unpatched binary fails loudly
-instead of passing every case vacuously. That guard is what caught this.
-
-`requiresPatchedNodePtySourceBuild()` in `ensure-native-runtime.mjs` now covers
-win32 as well, and `pnpm rebuild node-pty` sets `npm_config_build_from_source`
-so the patched source build actually replaces the upstream prebuild.
diff --git a/docs/reference/windows-setup-shell.md b/docs/reference/windows-setup-shell.md
deleted file mode 100644
index 5e7e33ca0de4..000000000000
--- a/docs/reference/windows-setup-shell.md
+++ /dev/null
@@ -1,86 +0,0 @@
-# Windows setup-runner shell
-
-On native Windows, Orca writes the `orca.yaml` setup script (and the issue command) to a generated
-runner file and types a launch command into a terminal. The runner is a **`.cmd` batch file by
-default**, exactly as it has been since setup hooks shipped.
-
-A script opts into bash by starting with a `#!` interpreter line:
-
-```yaml
-scripts:
-  setup: |
-    #!/usr/bin/env bash
-    [ -f .env ] || cp .env.example .env
-    pnpm install
-```
-
-Without that line the script keeps running under `cmd.exe`:
-
-```yaml
-scripts:
-  setup: |
-    copy .env.example .env
-    xcopy /E assets dist
-```
-
-## Why the script declares it, not the terminal preference
-
-`terminalWindowsShell` says which shell _interactive terminals_ open in. It says nothing about the
-language a project's setup script is written in. Deriving the runner from it had two consequences:
-
-- Windows users with batch-syntax setup scripts silently switched to bash on upgrade, so `copy`,
-  `xcopy`, `set VAR=value`, and `if errorlevel 1` stopped working.
-- Two people on the same repo got different interpreters for the same `orca.yaml`, so no project
-  could write a setup script that worked for all of its Windows contributors.
-
-A `#!` line is per-project, explicit, and identical for everyone who checks the repo out.
-
-The same rule applies to the per-user setup command in **Settings → repository hooks**
-(`repo.hookSettings.scripts.setup`): it is merged into the same script that reaches the runner, so a
-POSIX one-liner stored there needs its own `#!` line to run under bash on Windows.
-
-## What the `#!` line does and does not select
-
-The generated runner is always executed by bash (`bash <runner>`; Git Bash on native Windows), on
-every platform. The `#!` line therefore does two things:
-
-- It declares the script is written for a POSIX shell, which is what selects the bash runner.
-- Its option flags are replayed with `set`, so `#!/usr/bin/env -S bash -euo pipefail` really does
-  get `pipefail`. Without that replay the flags would be silently dropped, because `bash <runner>`
-  never parses the interpreter line. Only the flags `set` itself accepts
-  (`[--abefhkmnptuvxBCHP] [-o option]`) are replayed; invocation-only ones such as `-l` are
-  dropped, because `set -l` exits 2 and would abort the runner before its first line.
-
-The interpreter name itself is not honored beyond "is this a POSIX shell": `#!/bin/sh` and
-`#!/bin/zsh` scripts run under bash, exactly as they already did on macOS and Linux.
-
-## Requirements for the bash runner
-
-A `#!` line only takes effect when Orca can actually launch bash from the configured terminal — the
-terminal shell must resolve to Git Bash (`resolveWindowsGitBashShellPath`). The generated runner
-uses MSYS `/c/...` paths, which Cygwin and the WSL shim do not accept, and the launch command is
-typed into whatever shell the terminal opened with.
-
-When bash is not available (a PowerShell/cmd terminal, or an SSH-to-Windows host, which always uses
-the remote's `.cmd` runner) the `#!` script is **not** executed under cmd. The generated `.cmd`
-runner prints why and exits 1, because running the interpreter-agnostic prefix of a bash script
-(`pnpm install`, `git submodule update`) and only failing at the first bash-only line leaves a
-half-set-up worktree that looks finished.
-
-## Launching a `.cmd` runner from a Git Bash terminal
-
-The runner format and the shell that types the launch command are independent: a Git Bash terminal
-with a batch-syntax setup script gets a `.cmd` runner launched from a bash pane. `cmd.exe /c
-"C:\..."` cannot be used there — MSYS rewrites the bare `/c` switch into a drive path, so cmd opens
-interactively and the runner never executes (issue #6896). Those launches reuse the PowerShell
-`ProcessStartInfo` launcher (`buildWindowsCmdRunnerDelayedLaunchCommand`), which carries the switch
-and the runner path outside the command line. `WorktreeSetupLaunch.shell` therefore describes the
-launching pane; the runner file's `.cmd`/`.sh` extension describes the format.
-
-The `wait-for-setup` gate follows the same split. The pane types the gate and already quoted the
-agent startup command for itself, so a `.cmd` runner launched from a Git Bash pane still gets the
-bash gate — PowerShell's `Invoke-Expression` cannot parse POSIX `'\''` escaping. The gate wraps the
-same `ProcessStartInfo` launcher, so the batch runner is never handed to bash.
-
-WSL worktrees and non-Windows platforms are unaffected: they always use the bash runner. SSH hosts
-choose their runner from the remote path format, never from local Windows preferences.
diff --git a/docs/reference/windows-signing-runner-time.md b/docs/reference/windows-signing-runner-time.md
deleted file mode 100644
index fb02ba6bdca4..000000000000
--- a/docs/reference/windows-signing-runner-time.md
+++ /dev/null
@@ -1,137 +0,0 @@
-# Windows signing without occupying a runner during approval
-
-Status: implementation proposal; production signing behavior is unchanged.
-
-## Measured cost
-
-In [release run 33821033674](https://github.com/stablyai/orca/actions/runs/33821033674)
-(September 4, 2026), the Windows job took 21m56s. The inner-binary download step
-took 13m19s and the installer download step took 40s: 13m59s, or 64% of the job,
-was spent in the signing download/wait steps. These durations include the
-download itself, so they are an upper bound on removable idle time, not a
-prediction of net savings after transferring state between jobs.
-
-`release-cut.yml` submits both requests with `wait-for-completion: false`, but
-then invokes `Get-SignedArtifact` on the same Windows runner with one-hour and
-four-hour completion timeouts. The six-hour job timeout accommodates both
-waits. Changing the submission flag again, polling less often, or running the
-wait inside a container does not release the runner slot.
-
-This is runner occupancy, not a billing estimate. Standard GitHub-hosted
-runners in a public repository may be free; removing the waits still releases
-concurrency for other work. Check actual billing before assigning dollar savings.
-
-The same release also occupied an Ubuntu runner for 11m38s while
-`run-release-mac-build-workflow.mjs` waited on the isolated macOS workflow.
-That is a separate orchestration optimization. Windows development-channel
-builds deliberately ship unsigned and have no SignPath wait to remove.
-
-## Proposed execution graph
-
-Keep all Windows stages in the original `release-cut.yml` run to preserve the
-current SignPath GitHub artifact provenance boundary:
-
-1. `build-windows` builds and uploads the unpacked app, original installer,
-   updater metadata, and inner-signing manifest. It submits the inner request,
-   sends the existing notification, exposes the request ID, and finishes.
-2. `package-windows` depends on that job and uses a protected environment named
-   `windows-inner-signing`. Its runner is allocated only after GitHub approval.
-   It restores the exact build, downloads the signed binaries with a short,
-   bounded completion wait, applies the existing signature restoration and
-   signed `elevate.exe` cache replacement, builds the NSIS installer, uploads it,
-   submits the second signing request, notifies approvers, and finishes.
-3. `finalize-windows` depends on packaging and uses a second protected environment
-   named `windows-installer-signing`. After approval it downloads the signed
-   installer, regenerates its blockmap and `latest.yml`, runs existing outer and
-   inner signature checks, uploads evidence, and uploads the assets to the draft.
-4. `publish-release` depends on finalization as well as the existing Linux, macOS,
-   and blocking release gates. It remains the only job that publishes the draft.
-
-The approver signs in SignPath, waits for that request to finish, and then
-approves the corresponding pending GitHub job. Each notification should link
-to both places and explain the order. GitHub approval is an extra action;
-approving in SignPath alone does not release an environment gate.
-
-## Required configuration
-
-The repository environments were inspected through the GitHub API on
-September 5, 2026. Neither Windows environment exists. `adhoc-mac-build` has no
-protection rules; it cannot be reused as an approval gate. No SignPath callback
-handler was found in the repository's workflows, scripts, application, or cloud
-code.
-
-Before enabling the graph:
-
-1. Create both environments in repository Settings → Environments.
-2. Add the release approvers as required reviewers for each environment. Decide
-   whether a release initiator may approve their own job, and configure that
-   consistently with the existing SignPath policy.
-3. Restrict deployment branches to the trusted refs used to dispatch release
-   workflows, and check that the release workflow's ref passes the restriction.
-   The workflow ref and the checked-out release tag are different concepts.
-4. Read back both environments through the API and verify that
-   `required_reviewers` rules exist before changing the release graph. Merely
-   referring to a new environment name in YAML can create an unprotected
-   environment and silently leave the wait on the runner.
-5. Add a preflight assertion for those rules so accidental removal fails before
-   any signing request is submitted. Verify the API access required for this
-   assertion using the release workflow's token; do not assume an administrator's
-   local `gh` access proves workflow-token access.
-
-An automatic alternative requires a SignPath completion callback and an
-authenticated integration that releases the corresponding deployment gate.
-Confirm the Foundation plan supports the necessary callback before choosing
-that architecture. Do not introduce a long-running GitHub polling job as the
-callback substitute: it would continue occupying a slot.
-
-## State and failure contracts
-
-- Use artifacts from this exact run and attempt, with a manifest containing the
-  tag, tag commit SHA, workflow SHA, request IDs, artifact IDs, and SHA-256 hashes.
-  Artifact names alone are insufficient. Preserve the original unsigned
-  installer for the existing inner-signing fallback.
-- Restore `dist/win-unpacked`, the staging list, the installer, and updater
-  metadata as one checkpoint. Use an archive to preserve the tree. Do not ship
-  a fresh rebuild of the app after approving a different binary tree.
-- Each new Windows runner needs the pinned Node/pnpm toolchain, build
-  dependencies, SignPath module, and electron-builder tool cache. The second
-  runner must populate the NSIS cache before replacing `elevate.exe`; the old
-  code assumes the first installer build already populated that cache.
-- Retain checkout-from-tag behavior and the existing support for release tags
-  that predate the composite action. Explicitly restore new orchestration code
-  from the workflow SHA when necessary.
-- Preserve the rule that rerunning a workflow never submits a new signing
-  request. A resume must consume the recorded request and artifacts. Test failed
-  stage reruns, whole-workflow reruns, and missing/expired checkpoints separately.
-- Keep installer signature checks blocking. Keep inner verification evidence
-  and its current warning-only policy unless changed in a separate decision.
-- Resolve the current one-hour inner-signing fallback deliberately: an
-  environment approval can remain pending longer than one hour and rejection
-  skips dependent jobs. It cannot reproduce the existing automatic timeout
-  fallback by itself. A first migration should explicitly document the new
-  manual release/cancellation behavior; silently treating rejected approval as
-  permission to ship is not acceptable.
-- Keep the release-wide concurrency lock while the graph waits, preventing
-  another release from overtaking this draft. This saves worker occupancy, but
-  does not shorten the serialized release queue's human approval time.
-
-## Validation before production
-
-First adapt `windows-signing-rehearsal.yml` to exercise the same staged code
-using the auto-approved test-signing policy. Then run a manual rehearsal with
-the protected environments and confirm that pending approval has no allocated
-Windows runner. Verify signed bytes through the existing extraction-based
-installer checks, not only the outer installer signature.
-
-Cover approval before SignPath completion, rejected approval, missing signed
-files, changed checkpoint hashes, lost checkpoints, expired artifacts, failed
-packaging, and stage reruns without duplicate submissions. Confirm no release
-becomes public until all platform and signature gates pass. Compare transferred
-artifact/setup time with the original 13m59s wait sample to measure net savings.
-
-A separate `workflow_dispatch` continuation can avoid environment provisioning,
-but changes this design substantially: the original release run finishes,
-workflow-level concurrency no longer protects the pending draft, and SignPath
-must accept artifacts assembled from a prior run. That option needs a durable
-release state machine and provenance validation before production use; it is
-not a drop-in replacement for the two download steps.
diff --git a/docs/reference/windows-terminal-shell-selection.md b/docs/reference/windows-terminal-shell-selection.md
deleted file mode 100644
index b0e361c54476..000000000000
--- a/docs/reference/windows-terminal-shell-selection.md
+++ /dev/null
@@ -1,54 +0,0 @@
-# Windows terminal shell selection
-
-Two different things can put `cmd.exe` on a Windows terminal, and only one of them makes the
-terminal _be_ cmd.
-
-- **`--shell` / `shellOverride`** names the executable the PTY is spawned as. The terminal's own
-  process is that shell for its whole life.
-- **`--command` / `startupCommand`** is text the provider types into whatever shell it spawned.
-  `--command cmd.exe` therefore starts cmd as a **child** of the host's default shell.
-
-The difference is invisible until the child exits. Leaving that cmd returns the caller's handle to
-a Git Bash or PowerShell prompt it never asked for, and anything that keyed off "this terminal is
-cmd" is now wrong — while `terminal list` still shows one connected, healthy terminal, because the
-PTY never changed.
-
-## Why the runtime path needed its own fix
-
-There are two spawn preflights, and they are twins:
-
-- `src/main/ipc/pty/ipc/spawn-preflight.ts` — renderer/IPC spawns (a terminal tab in the app).
-- `src/main/ipc/pty/runtime/spawn-preflight.ts` — runtime spawns: `terminal.create` from the CLI,
-  headless `orca serve`, and every paired remote environment.
-
-Only the IPC twin read the caller's requested shell. The runtime twin passed a literal `undefined`,
-so a runtime-created terminal could only ever be the host's default shell. `orca terminal create
---command cmd.exe` against a Windows environment had no way to say "be cmd" — it could only type
-`cmd.exe` into Git Bash. `src/main/ipc/pty/pty-spawn-shell-override-parity.test.ts` pins the pair.
-
-## Rules
-
-- A caller choosing a shell passes `--shell`; a caller running a program passes `--command`. Do not
-  route a shell choice through `command` — it looks like it worked.
-- The allowlist is `isSupportedWindowsShellOverride` in `src/shared/windows-terminal-shell.ts`, and
-  it is the reason `--shell` cannot name an arbitrary executable. The CLI, the `terminal.create`
-  RPC schema, and the relay all check the same set; add a shell in one place only.
-- Bare shell names only. A path or anything with arguments is refused, so `--shell` can never carry
-  a command line into `pty.spawn`.
-- A host that predates `--shell` STRIPS it (`terminal.create` params are a zod object, which drops
-  unknown keys) and answers with a healthy terminal running its default shell — a reply that reads
-  as success. So the CLI gates on `TERMINAL_CREATE_SHELL_SELECTION_RUNTIME_CAPABILITY` and refuses
-  before creating anything, rather than creating the wrong shell quietly.
-- `--shell` is Windows-only, and a host that cannot apply it REFUSES the create
-  (`terminalShellOverrideRefusal`). macOS and Linux execution hosts spawn the login shell, and a
-  terminal routed over SSH resolves its shell on the SSH host, whose platform and installed shells
-  this runtime cannot see. Refusing is the point: spawning the default shell and reporting success
-  is the failure `--shell` exists to remove.
-- A project's execution runtime decides which MACHINE the shell runs on, so it outranks a
-  per-terminal pick — but it outranks it by REFUSING, not by rewriting. A `--shell` that
-  contradicts the project runtime (a Windows shell on a WSL project, or a WSL name on a
-  Windows-host project) is refused. `resolveLocalWindowsTerminalRuntimeOptions` would otherwise
-  rewrite the value — a WSL project forces `wsl.exe`, a Windows-host project discards a WSL name in
-  favour of `COMSPEC` — and hand back a terminal running something the caller never asked for. It
-  also splits an agent launch's quoting from the shell that receives it: POSIX-quoted args typed
-  into cmd, or cmd-quoted args typed into a WSL shell.
diff --git a/docs/reference/worktree-scan-fingerprint.md b/docs/reference/worktree-scan-fingerprint.md
deleted file mode 100644
index fa0e26dac203..000000000000
--- a/docs/reference/worktree-scan-fingerprint.md
+++ /dev/null
@@ -1,274 +0,0 @@
-# Steady-state worktree rescan: Git-admin fingerprint gate
-
-## Status
-
-Adopted for the main-process worktree resolution cache
-(`OrcaRuntimeService.listRepoWorktreesForResolution`). It keeps the existing
-30-second freshness contract for externally created, removed, moved, locked, and
-re-checked-out worktrees while removing the `git worktree list` subprocess that
-previously ran for every registered repository every 30 seconds.
-
-## Context
-
-A production trace (10 registered repositories, 3 h 27 min) recorded 4,272
-`git worktree` invocations and 8,663 total Git subprocesses. The invocations
-arrived in full-fleet sweeps roughly every 30.5 s — one sweep per repository per
-`WORKTREE_SCAN_CACHE_TTL_MS`.
-
-### What actually expires the cache
-
-The originating report assumed some specific terminal/status/orchestration
-request was invalidating the 30-second cache. That is not what happens, and the
-distinction changes the fix:
-
-- `resolvedWorktreeCache` (the whole-fleet snapshot) has a **1-second** TTL
-  (`RESOLVED_WORKTREE_CACHE_TTL_MS`). Any caller polling faster than 1 Hz
-  recomputes the snapshot.
-- `computeResolvedWorktrees` fans out over **every** registered repo
-  (`src/main/runtime/orca-runtime.ts`), calling
-  `listRepoWorktreesForResolution` per repo.
-- That per-repo call is backed by `worktreeScanCache` with a **30-second** TTL.
-  When it expires, the next poll shells out.
-
-So no request "expires" the 30-second cache. It expires on wall-clock time, and
-whichever poller arrives first afterwards pays a full-fleet `git worktree list`
-fan-out. The many high-frequency callers — `listTerminals` without a selector,
-`showTerminal`, `getWorktreePs`, `listManagedWorktrees`,
-`resolveWorktreeSelector`, orchestration authority refresh — only determine
-_who_ pays, not _how often_. Steady-state subprocess volume is therefore
-`repos / 30 s`, independent of poll rate, which is exactly the observed
-~1 sweep / 30.5 s.
-
-The in-Orca mutation surface is already event-driven: create, remove, rename,
-folder-rename, sparse edits, repo add/update/remove, SSH reconnect, and
-mixed-version remote invalidation all call
-`invalidateWorktreeScanCacheForRepo` / `invalidateResolvedWorktreeCache`
-(≈40 call sites). The 30-second TTL exists for exactly one reason: discovering
-worktree changes made **outside** Orca (`git worktree add/remove/move/prune`,
-`git checkout` in another worktree, `rm -rf` of a worktree directory).
-
-That is a filesystem question, and the filesystem can answer it without a
-subprocess.
-
-## Goals
-
-- Remove the periodic all-repository `git worktree list` fan-out in steady
-  state.
-- Preserve the current ≈30 s discovery latency for externally created, removed,
-  moved, pruned, locked/unlocked, and re-checked-out worktrees.
-- Keep a bounded reconciliation so anything the cheap probe cannot observe still
-  converges.
-- Change nothing for SSH repos, WSL-routed repos, folder workspaces, bare repos,
-  or hosts where the probe cannot resolve Git's admin layout.
-- Fail open: any probe error must behave exactly like today (run the real scan).
-
-## Non-goals
-
-- Changing `RESOLVED_WORKTREE_CACHE_TTL_MS` or the whole-fleet snapshot shape.
-- Changing the renderer-facing `worktrees:list` / `worktrees:listAll` IPC scan
-  cache in `src/main/ipc/worktrees.ts` (separate 5 s cache, invalidated by
-  `registerWorktreeChangeInvalidator`, not a polling source in the trace).
-- Scoping `resolveWorktreeSelector` to a single repository. See
-  "Rejected alternatives".
-- Adding a filesystem watcher per repository.
-- Any wire/RPC/persisted-schema change.
-
-## Design
-
-Introduce a cheap, subprocess-free **Git worktree admin fingerprint** for a
-local repository, and consult it before re-running a scan whose TTL has expired.
-
-### Fingerprint inputs
-
-`readRepoWorktreeAdminFingerprint(repoPath)` in
-`src/main/runtime/repo-worktree-admin-fingerprint.ts` resolves the repo's Git
-common directory without a subprocess (read `.git`; if it is a `gitdir:` file,
-follow it and then its `commondir`; if `.git` is absent, treat `repoPath` as a
-bare gitdir), then records:
-
-| Input                                              | External change it catches                                    |
-| -------------------------------------------------- | ------------------------------------------------------------- |
-| sorted entry names of `<commonDir>/worktrees`      | `worktree add`, `worktree remove`, `worktree prune`           |
-| existence of `repoPath`                            | main checkout deleted                                         |
-| `<commonDir>/packed-refs` mtime + size             | a tip moved while its loose ref is packed away                |
-| `<commonDir>/reftable` mtime + size                | a tip moved under the reftable backend                        |
-| per checkout: `HEAD` contents                      | branch switch, detach (the detached oid is in HEAD itself)    |
-| per checkout: contents of the ref HEAD names       | a plain `git commit`, `reset`, or `fetch` that moves the tip  |
-| per entry: `gitdir` contents                       | `worktree move`, `worktree repair`                            |
-| per entry: `locked` presence                       | `worktree lock` / `unlock`                                    |
-| per entry: existence of the path named by `gitdir` | a worktree directory deleted with `rm -rf` (flips `prunable`) |
-
-"per checkout" covers the main worktree and each linked worktree. Reading the
-ref HEAD names is what makes an ordinary commit visible: committing rewrites
-`refs/heads/<branch>` and leaves `HEAD` untouched, but moves the oid
-`git worktree list --porcelain` prints. A symref target is only followed when it
-is a relative path under `refs/`, so a hand-edited `HEAD` cannot steer the probe
-outside the ref store.
-
-Every input is a `stat`, `readdir`, or small `readFile` on an already-hot inode,
-and the fingerprint depends on nothing but the repo path — no prior scan result
-is threaded in. Per-repo fan-out is capped at 8 concurrent linked-worktree
-probes, mirroring `SPARSE_CHECKOUT_DETECTION_CONCURRENCY`. A 10-repo fleet with
-10 worktrees each costs a few hundred filesystem calls per 30 s window versus 10
-process spawns; the spawns dominate by orders of magnitude, and process-table
-churn was the reported symptom.
-
-The fingerprint is a NUL-delimited string; any read failure yields `null`, which
-the caller treats as "cannot prove unchanged".
-
-### Cache decision
-
-`listRepoWorktreesForResolution` gains one branch on the expired-TTL path:
-
-```text
-cached entry exists, same generation + runtimeKey, TTL expired
-  └─ probe eligible? (no connectionId, no wslDistro, fingerprint recorded)
-       ├─ no  → real scan (today's behaviour)
-       └─ yes → read fingerprint now
-            ├─ null or different              → real scan
-            ├─ equal, last real scan < 5 min  → extend TTL, no subprocess
-            └─ equal, last real scan ≥ 5 min  → real scan (bounded reconcile)
-```
-
-`WORKTREE_SCAN_ADMIN_RECONCILE_INTERVAL_MS` is 5 min, matching the existing
-`WORKTREE_SCAN_AGENT_SCRATCH_TTL_MS` precedent. A cached result whose scan
-failed (`ok: false`) is never extended, so a transient Git failure still retries
-on the 30 s TTL.
-
-### Git version compatibility
-
-Every path the probe reads is part of Git's on-disk layout well before the 2.25
-baseline in [`git-compatibility.md`](./git-compatibility.md): `.git` as a
-directory or `gitdir:` file, `commondir`, `worktrees/<name>/{HEAD,gitdir,locked}`,
-`packed-refs`, and loose `refs/`. `reftable` arrived in 2.45; on older Git it
-simply stats as missing, which is a stable value and therefore harmless. No new
-Git command is introduced — this change only skips one.
-
-Agent-scratch repos already carry a 5-minute scan TTL
-(`WORKTREE_SCAN_AGENT_SCRATCH_TTL_MS`), which equals the reconciliation
-interval, so the gate never fires for them and their behaviour is unchanged.
-
-### Ordering
-
-The fingerprint stored with a scan result is captured **before** the scan runs.
-A mutation landing while the scan is in flight therefore leaves the stored
-fingerprint stale-by-construction, so the next probe sees a difference and
-rescans. Capturing after the scan would let that mutation be masked forever.
-
-### Interaction with existing invalidation
-
-Untouched. `invalidateWorktreeScanCacheForRepo` deletes the entry (fingerprint
-included) and bumps the generation, so every event-driven path still forces a
-real scan on the next read. The fingerprint only ever _extends_ an entry that
-the TTL alone would have refreshed.
-
-## Freshness budget
-
-| Change                                                                | Before            | After             |
-| --------------------------------------------------------------------- | ----------------- | ----------------- |
-| Orca-initiated create/remove/rename/sparse/repo edit                  | immediate (event) | immediate (event) |
-| SSH reconnect / provider generation bump                              | immediate (event) | immediate (event) |
-| External `worktree add/remove/move/prune/lock`                        | ≤ 30 s            | ≤ 30 s            |
-| External `git checkout` / `commit` / `reset` in any worktree          | ≤ 30 s            | ≤ 30 s            |
-| External `rm -rf <worktree>`                                          | ≤ 30 s            | ≤ 30 s            |
-| External sparse-checkout pattern edit                                 | ≤ 30 s            | ≤ 5 min           |
-| Packed/reftable tip moved within one mtime tick at an equal file size | ≤ 30 s            | ≤ 5 min           |
-| SSH / WSL repos, folder workspaces                                    | unchanged         | unchanged         |
-
-The two regressions are bounded by the reconciliation interval and are both
-changes Orca does not make itself.
-
-### Main-thread cost
-
-Both the scan and the probe are asynchronous, so neither "runs on the main
-thread" in the naive sense — but they are not equally free there. Measured on
-macOS with a 1 ms interval sampling event-loop lag while each ran 30 times
-against a repo with 20 linked worktrees:
-
-|                     | wall per call | main-thread stall per call | worst single stall |
-| ------------------- | ------------- | -------------------------- | ------------------ |
-| `git worktree list` | 18.66 ms      | 2.69 ms                    | 3.02 ms            |
-| fingerprint probe   | 1.66 ms       | 0.01 ms                    | 0.04 ms            |
-
-`fs/promises` dispatches to libuv's threadpool, so ~99 % of the probe's latency
-is off-thread. Spawning Git does not: `uv_spawn`, fd and pipe setup, and stdout
-collection and decoding are real synchronous main-process work. Ten repos
-refreshing together therefore cost ≈27 ms of event-loop stall per sweep before
-this change and ≈0.1 ms after — this reduces main-thread pressure rather than
-adding to it, which is why moving either side onto a worker thread would not
-help.
-
-### Residual risk
-
-A repo registered at a UNC path (`\\wsl$\...`) but executed by the local Windows
-Git runtime is still probed, because it is not WSL-routed from Orca's point of
-view. The probe is correct there and strictly cheaper than the subprocess it
-replaces, but its filesystem calls cross the 9p boundary like the existing
-sparse-checkout probes already do.
-
-## Measured effect
-
-`src/main/runtime/worktree-scan-admin-fingerprint-gate.test.ts` drives the
-reported steady state — 10 idle local repos, a caller polling at 1 Hz for 30
-simulated minutes — and counts `git worktree list` invocations:
-
-|                          | `git worktree list` per 30 min | per hour |
-| ------------------------ | ------------------------------ | -------- |
-| TTL only (before)        | 600                            | 1,200    |
-| fingerprint gate (after) | 60                             | 120      |
-
-A 90 % reduction, with the remainder being the bounded reconciliation. Repos
-with genuine external activity keep rescanning at the 30 s cadence because the
-fingerprint flips.
-
-Extrapolating to the original trace's shape (10 repos, 3 h 27 min): 4,272
-`git worktree` invocations would become ≈427.
-
-## Rejected alternatives
-
-**Raise `WORKTREE_SCAN_CACHE_TTL_MS` to 5 min.** One line, same subprocess
-reduction, but it degrades _every_ external-change latency to 5 min, including
-the common "I ran `git worktree add` in a terminal" case. The fingerprint buys
-the same reduction without that regression.
-
-**Per-repo `fs.watch` on `<commonDir>/worktrees`.** Lower latency, but adds
-persistent watcher handles per repo, inherits recursive-watch platform
-differences, and would need its own dormancy/rearm story. The existing watcher
-infrastructure is scoped to workspace files; extending it to Git admin dirs is a
-larger change with a worse risk profile for the same steady-state win.
-
-**Scope `resolveWorktreeSelector` to the owning repository.** The original brief
-asks for this. `listTerminals` already avoids the fan-out for explicit worktree
-ids via `buildResolvedWorktreeFromId` +
-`listKnownResolvedWorktreesForExplicitTarget`. Extending that to
-`resolveWorktreeSelector` means splitting the highest-fan-in method in the
-runtime (38 call sites) and rebuilding lineage projection for a repo subset —
-material regression risk. Once the fingerprint gate lands, the remaining
-fan-out cost for a targeted call is a batch of stats, not a subprocess, so the
-gain no longer justifies the risk. Tracked as follow-up, not in this change.
-
-## Test plan
-
-`src/main/runtime/repo-worktree-admin-fingerprint.test.ts` (real temp dirs, real
-`git` binary — a mocked filesystem would only restate the assumptions):
-
-- stable across repeated reads with no change
-- changes after `worktree add`, `worktree remove`, `worktree move`,
-  `worktree lock`, `checkout` in a linked worktree, `checkout` in the main
-  worktree, a commit in either, and `rm -rf` of a worktree directory
-- still tracks a tip whose loose ref has been packed away by `git pack-refs`
-- a linked worktree path and the main repo path produce the same fingerprint
-- a bare repo resolves through its own gitdir and still tracks `worktree add`
-- `null` for a non-Git directory and for a missing path
-
-`src/main/runtime/worktree-scan-admin-fingerprint-gate.test.ts`:
-
-- unchanged fingerprint suppresses the rescan past the 30 s TTL and re-arms it
-- changed fingerprint rescans at the 30 s TTL
-- the 5-minute reconciliation forces a rescan while the fingerprint is unchanged
-- `notifyBranchRenamed` (event invalidation) still forces an immediate rescan
-- a `null` fingerprint (probe failure) falls back to scanning
-- SSH repos never consult the probe
-- a failed scan is never extended
-- concurrent callers share one probe and one scan
-- the 1 Hz / 10-repo workload measurement above
diff --git a/docs/reference/wsl-command-execution.md b/docs/reference/wsl-command-execution.md
deleted file mode 100644
index 3a2de5492330..000000000000
--- a/docs/reference/wsl-command-execution.md
+++ /dev/null
@@ -1,173 +0,0 @@
-# Running commands inside WSL
-
-Two properties of `wsl.exe` decide how every guest invocation has to be written. Both are silent
-when you get them wrong: the command still runs and still exits 0, it just returns the wrong bytes.
-Those are sections 1 and 2. A closing section answers the question that running Orca's writes
-inside a distro raises next: what happens to the distro's disk image.
-
-## 1. Always `--exec`, never `--`
-
-`wsl.exe -d <distro> -- <argv>` expands `$name` in **every argument** against the guest environment
-before the guest runs. This is `wsl.exe` itself, not the guest shell — it happens with no shell in
-the command at all:
-
-```
-$ wsl.exe -d Ubuntu-24.04 --      /usr/bin/printf %s '$HOME'
-/home/you
-$ wsl.exe -d Ubuntu-24.04 --exec  /usr/bin/printf %s '$HOME'
-$HOME
-```
-
-So under `--`, a script means something other than what it says. `awk '{print $2}'` reaches the
-guest as `awk '{print }'` and prints the whole line; a positional `"$1"`, a shell local, and a
-`"\$literal"` are blanked or rewritten the same way. (Expansions with no `$` are unaffected — a
-`sed` backreference like `s/(a)(b)/\2\1/` survives either way.) Escaping `$` on the Windows side
-cannot fix this reliably — an earlier attempt skipped every `$` preceded by a backslash, which is
-exactly the case a POSIX script uses to mean a literal dollar.
-
-Build argv with `buildWslExecArgs()` in `src/shared/wsl-login-shell-command.ts`. A test walks the
-tree and fails if the `--` form reappears.
-
-The `--` inside `sh -s -- <path>` is a _shell_ argument separator and is unrelated; leave it alone.
-
-## 2. Machine-read output must be fenced
-
-Orca runs guest commands through the distro user's **interactive** login shell (`-ilc` for
-bash/zsh) because that is the only shell that reads `~/.bashrc`, where `nvm`, `mise` and `asdf`
-install their PATH entries. Dropping `-i` would break tool detection for those users.
-
-The cost is that an interactive shell also runs the distro's rc/motd, and that output goes to
-**stdout** — the same stream the answer arrives on. Stock Ubuntu 24.04 needs no customization to
-reproduce it:
-
-```
-$ wsl.exe -d Ubuntu-24.04 --exec bash -ilc 'git --version'
-To run a command as administrator (user "root"), use "sudo <command>".
-See "man sudo_root" for details.
-
-git version 2.43.0
-```
-
-Any caller that parses stdout must use `buildWslCapturedLoginShellCommand()`, which fences the
-payload and returns a matching `readStdout`. `.trim()` does not help: the banner is a prefix, not
-surrounding whitespace, so a stat probe compared against `"directory"` simply never matches.
-
-The fence carries a per-call nonce so that `cat`-ing a file whose contents happen to quote a marker
-is not truncated, and it preserves the payload's exit status so `exit 2` → `ENOENT` mappings keep
-working.
-
-**Do not fence a command that `exec`s into a long-running program** (`codex app-server`, an
-interactive terminal). It never reaches the closing fence, and there the shell's own output either
-belongs to the program or is what the user wants to see.
-
-## Prefer no shell at all
-
-When a caller only needs a known binary with a known environment, skip the login shell entirely and
-run the binary directly:
-
-```
-wsl.exe -d <distro> --exec /usr/bin/env PATH=… HOME=… /usr/bin/git -C <dir> status
-```
-
-This is what the direct-git read path does. It is immune to both problems above by construction and
-avoids paying login-shell startup on every call, which also sidesteps profiles that block or print.
-Resolve the PATH/HOME once through a fenced probe, cache it per distro, then use this form.
-
-## Disk: the distro VHDX only grows
-
-Everything above puts Orca's writes inside the distro, which raises a separate question. WSL2 keeps
-the entire guest filesystem in a single dynamically-expanding `ext4.vhdx`. Deleting files inside
-the distro does free the blocks — for ext4 to reuse — but the host-visible `.vhdx` does not shrink
-on its own.
-
-### Finding the file
-
-The path depends on how the distro was installed, so do not assume one:
-
-| Install method         | `ext4.vhdx` lives under                                   |
-| ---------------------- | --------------------------------------------------------- |
-| recent `wsl --install` | `%LOCALAPPDATA%\wsl\{guid}\`                              |
-| Microsoft Store        | `%LOCALAPPDATA%\Packages\<PackageFamilyName>\LocalState\` |
-| `wsl --import`         | wherever the operator pointed it                          |
-
-The install-agnostic answer is the registry, which records every distro's directory as `BasePath`:
-
-```powershell
-Get-ChildItem HKCU:\Software\Microsoft\Windows\CurrentVersion\Lxss |
-  ForEach-Object { Get-ItemProperty $_.PSPath } |
-  Select-Object DistributionName, BasePath
-```
-
-### Measured behavior
-
-WSL 2.7.11.0 / Ubuntu-24.04, one machine. Sizes are **size on disk** — allocated bytes, via
-`GetCompressedFileSize`, not the logical file length. That distinction matters below: on this
-machine the vhdx was not sparse, so the two numbers were identical, but on a sparse vhdx the
-logical size stays pinned at the high-water mark while only size on disk falls when space is
-reclaimed. Measure the wrong one and reclaim looks like it did nothing.
-
-| Step                               | `ext4.vhdx` size on disk (bytes) |
-| ---------------------------------- | -------------------------------- |
-| baseline                           | 21,673,017,344                   |
-| write 1 GiB                        | 22,746,759,168                   |
-| delete it                          | 22,746,759,168                   |
-| write a fresh incompressible 1 GiB | 22,746,759,168                   |
-| hold 3 GiB live at once            | 24,894,242,816                   |
-
-The fourth row is the point: the second gigabyte cost zero growth, because ext4 handed it the
-blocks the first one freed. Only exceeding the previous peak moved the file.
-
-### Reclaiming space
-
-Sparse mode lets the guest hand freed blocks back to the host, so the file can shrink instead of
-only growing. Two preconditions, both easy to miss: the distro has to be stopped (the vhdx cannot
-be converted while it is mounted), and `wsl --manage` exists only on WSL 2.5 and newer — check with
-`wsl --version`.
-
-```
-wsl --terminate <distro>
-wsl --manage <distro> --set-sparse true
-```
-
-The equivalent for distros not yet created is `sparseVhd = true` under `[experimental]` in
-`%UserProfile%\.wslconfig` — that file lives in the Windows user profile, **not** inside the distro
-and not at `~/.wslconfig`, and does not exist until you create it.
-
-Neither touches slack that already exists. For that, shut WSL down and compact the file by hand
-from an **elevated** prompt. `compact vdisk` on its own fails because no virtual disk is selected,
-so the `select` and the read-only `attach` are required, not optional:
-
-```
-wsl --shutdown
-diskpart
-DISKPART> select vdisk file="C:\path\to\ext4.vhdx"
-DISKPART> attach vdisk readonly
-DISKPART> compact vdisk
-DISKPART> detach vdisk
-DISKPART> exit
-```
-
-Two caveats, neither verified here: field reports say `compact vdisk` is a no-op on a vhdx that is
-already sparse (convert back with `--set-sparse false` first), and sparse mode's runtime cost was
-not measured. Microsoft's [disk-space guide](https://learn.microsoft.com/windows/wsl/disk-space)
-carries the current locate/expand/compact procedure and the `--manage` version floor;
-[`.wslconfig`](https://learn.microsoft.com/windows/wsl/wsl-config) carries `sparseVhd`. Enabling
-sparse mode and compacting are both per-machine decisions; Orca does not make either.
-
-On the measured machine the vhdx was **not** sparse: `fsutil sparse queryflag` reported "NOT set as
-sparse", and no `%UserProfile%\.wslconfig` existed to opt in. Microsoft documents `sparseVhd` as
-defaulting to `false`, so that is the expected state rather than a local quirk — but the flag is
-per-vhdx, set when the disk is created or by an explicit conversion, so check your own distro
-rather than assuming either way.
-
-### What this means for Orca
-
-A vhdx that grows as speculative worktree preparation and mirrored worktrees write into the distro
-is expected. Its size is monotonically non-decreasing and roughly tracks peak concurrent usage —
-but it can drift above peak, and the measurement above is the best case for reuse: the second
-gigabyte was allocated immediately after the first was freed, out of the same block group. Under
-sustained churn — many worktrees created and removed over weeks, no `fstrim`/discard, sparse off —
-allocation spreads and the file settles higher than live peak.
-
-So growth on its own is not evidence of a leak. Growth well above live peak usage is worth
-investigating, and is the case the reclaim steps above address.
diff --git a/docs/reference/wsl-managed-cli.md b/docs/reference/wsl-managed-cli.md
deleted file mode 100644
index 8ae3b61aa62e..000000000000
--- a/docs/reference/wsl-managed-cli.md
+++ /dev/null
@@ -1,37 +0,0 @@
-# CLI access in Orca-managed WSL shells
-
-A WSL terminal on a Windows host gets this app's CLI (`orca-ide` packaged,
-`orca-dev` in development) on its PATH with nothing installed in the guest:
-`~/.local/bin`, shell profiles, and the Windows user PATH are untouched. External
-WSL shells still need Settings → General registration.
-
-1. **Host.** `buildPtyHostEnv` calls `getManagedWslCliDir` for WSL panes only. It
-   writes a launcher and PowerShell bridge (reusing `wsl-cli-scripts.ts`) under
-   `<userData>/wsl-managed-cli/<content hash>` and exports `ORCA_WSL_CLI_DIR`.
-   Content addressing follows `shell-wrapper-content-address.ts`: builds sharing
-   user data never overwrite each other, and a present file is complete because
-   each one lands by rename. Old directories are not collected.
-2. **Crossing.** `addOrcaWslInteropEnv` adds `ORCA_WSL_CLI_DIR/p`, so both the
-   daemon and in-process spawn paths translate it with the distro's own mounts.
-3. **Guest.** `WSL_MANAGED_CLI_PATH_RESTORE` runs after user startup files in the
-   bash rcfile and the local zsh first-prompt hook, which run once per Orca shell.
-   It leads PATH with the directory when `$ORCA_WSL_CLI_DIR/$ORCA_CLI_COMMAND` is
-   executable, and otherwise prints one warning. Other login shells get no CLI;
-   nothing blocks a shell.
-
-The colocated launcher finds its bridge beside itself and PowerShell by Windows
-path, so neither guest PATH nor the automount root matters. The bridge pins this
-app's user-data directory and is written with a UTF-8 BOM so Windows PowerShell 5.1
-reads non-ASCII paths correctly. It clears `ORCA_WSL_CLI_DIR`, which WSLENV maps
-back to Windows, so an app the CLI starts never inherits it. In development it runs
-Electron as Node on `out/cli/index.js` directly, with the environment
-`buildWindowsDevLauncher` sets (`ORCA_APP_EXECUTABLE`, stashed `NODE_OPTIONS`).
-Otherwise it launches its child exactly like the registered bridge.
-
-A missing runtime (logged once) or a failed write (logged per spawn) leaves
-`ORCA_WSL_CLI_DIR` unset. A terminal daemon from an older build adds no WSLENV
-entry, so its WSL panes lack the CLI until the daemon restarts.
-
-Run the opt-in end-to-end test on Windows with `ORCA_BACKGROUND_LAUNCH=1`,
-`ORCA_TEST_MANAGED_WSL=1`, and optionally `ORCA_TEST_WSL_DISTRO=<distro>`. The zsh
-case skips when the distro lacks `zsh` or `script`.
diff --git a/docs/reference/wsl-probe-failure-semantics.md b/docs/reference/wsl-probe-failure-semantics.md
deleted file mode 100644
index 9660e2d1eed0..000000000000
--- a/docs/reference/wsl-probe-failure-semantics.md
+++ /dev/null
@@ -1,66 +0,0 @@
-# WSL probe failure semantics
-
-A WSL probe answers a question about a distro: is `git` installed, what is
-`$HOME`, which distros are running. Every one of those probes can fail for a
-reason that has nothing to do with the answer — the distro is booting, `wsl.exe`
-is slow under load, the VM was just shut down.
-
-The recurring bug in this subsystem is reporting that failure as a negative
-answer.
-
-## The shape
-
-```ts
-try {
-  await execCommandInWslOrThrow(target, `${shellQuote(command)} --version`)
-  return true
-} catch {
-  return false // "not installed" and "could not ask" are now the same value
-}
-```
-
-Nothing downstream can tell those two apart, because by this point they aren't
-two things.
-
-## Why it keeps shipping
-
-Swallowing on its own is survivable. An uncached caller asks again a moment
-later and the answer corrects itself, so the bug stays invisible in review and
-in manual testing.
-
-It becomes user-visible when the swallowed value is **cached** or used to
-**gate discovery**. Then a distro that was busy for one second reports no git,
-or no agent sessions, until the app is relaunched. The failure is sticky,
-silent, and indistinguishable from the real thing.
-
-Three instances so far:
-
-| Where                                | What the user saw                                                                                                                       | Status                                                                |
-| ------------------------------------ | --------------------------------------------------------------------------------------------------------------------------------------- | --------------------------------------------------------------------- |
-| Preflight CLI probes                 | Caching the result would have pinned "git not installed" until relaunch                                                                 | Bounded entry ([#17350](https://github.com/stablyai/orca/pull/17350)) |
-| `glab auth status` fallback into WSL | Idle VM woken repeatedly for users who never touch GitLab                                                                               | Open ([#8941](https://github.com/stablyai/orca/issues/8941))          |
-| `listRunningWslDistrosAsync`         | Fails closed to `[]` with no last-known-good, polled every 2s — a persistently broken `wsl.exe` makes every WSL session vanish app-wide | Open (PR #17072 review)                                               |
-
-## What to do instead
-
-Pick the cheapest option that fits the call site.
-
-1. **Don't pin it.** If the probe is cheap and uncached, swallowing is fine —
-   the next call self-heals. This is what most of `src/` legitimately does.
-2. **Bound the entry.** If you cache, give it a TTL so a transient failure
-   expires instead of lasting the session. Cheap, no signature change, and what
-   [#17350](https://github.com/stablyai/orca/pull/17350) does.
-3. **Keep last-known-good.** If the probe gates discovery, fall back to the
-   previous successful answer on failure rather than to empty. `listWslDistrosAsync`
-   in `src/main/wsl.ts` already does this — `listRunningWslDistrosAsync`, added
-   beside it, does not.
-4. **Propagate the third state.** The durable fix: return
-   `present | absent | unreachable` instead of a boolean, so a caller cannot
-   accidentally treat "could not ask" as "no". This reaches past WSL into shared
-   exec code and hasn't been done.
-
-Whichever you pick, document why the fallback is safe for callers to cache or use for discovery.
-
-## Reviewing failure fallbacks
-
-Review the caller as well as the catch: whether a fallback is cached or gates discovery is a dataflow question. Returning `false`, `[]`, or `null` after a failure can be safe for some operations, but a WSL probe must preserve the distinction between absence and a distro that could not be reached. Prefer behavioral tests that exercise probe failure, discovery, caching, and recovery together.
diff --git a/docs/reference/wsl-runner-verification.md b/docs/reference/wsl-runner-verification.md
deleted file mode 100644
index 2838fb93cad5..000000000000
--- a/docs/reference/wsl-runner-verification.md
+++ /dev/null
@@ -1,27 +0,0 @@
-# Verifying the W1–W3 Windows/WSL work
-
-Unit and real-binary tests cover Windows and WSL behavior.
-
-## 1. Unit — runs everywhere, every PR
-
-| Suite                                             | Pins                                                                                                                                                          |
-| ------------------------------------------------- | ------------------------------------------------------------------------------------------------------------------------------------------------------------- |
-| `src/main/wsl/wsl-runner.test.ts`                 | Separator, lane selection, fencing, WSLENV, guest cwd, script interpreter, budget split, refusal on unresolved PATH                                           |
-| `src/main/wsl/wsl-guest-environment.test.ts`      | Burst collapse, per-distro isolation, malformed-payload rejection, transient vs permanent, retry windows, joiner budget                                       |
-| `src/main/wsl/wsl-w1-w3-contract.test.ts`         | The W1→W3 chain end to end: absolute `wsl.exe`, argv array, bounded call, no `--`, script byte-identical, WSLENV, no shell on probe, login PATH still applied |
-| `src/shared/source-scan/source-tree-scan.test.ts` | The guard helpers. A guard that under-reports is worse than none                                                                                              |
-
-## 2. Real-binary — the assertions nothing else can make
-
-**Windows CI** (`package (windows)` job in `pr.yml`) rebuilds node-pty from patched source and runs the `win32` suites against a real ConPTY: a real detached grandchild, a real job kill, and the inverse — a clean `exit` must leave backgrounded work alone.
-
-**Real WSL distro** — not in CI; WSL isn't available on hosted runners.
-
-```
-ORCA_REAL_WSL_RUNNER_TEST=1 ORCA_WSL_TEST_DISTRO=Ubuntu-24.04 \
-  pnpm vitest run src/main/wsl/wsl-runner.wsl.test.ts
-```
-
-It appends `sleep 60` to the distro's `~/.profile` and asserts the probe lane still answers inside its budget — **#14288 reproduced, not simulated** — then restores the profile. Also covers banner stripping, a script carrying quotes and `$` arriving byte-identical, WSLENV crossing, and guest cwd.
-
-Run this before shipping a change to `src/main/wsl/`. It is the only evidence that the probe lane does what the workstream claims, and it has already gone stale once against a runner change while passing in CI, because CI skips it.
diff --git a/docs/reference/xterm-patch-regeneration.md b/docs/reference/xterm-patch-regeneration.md
deleted file mode 100644
index 3197de33f20e..000000000000
--- a/docs/reference/xterm-patch-regeneration.md
+++ /dev/null
@@ -1,320 +0,0 @@
-# xterm Patch Regeneration
-
-## Scope
-
-Orca ships `@xterm/xterm` with four source changes it needs and upstream has
-not taken: the IME composition hooks, the `xterm-composition-*` custom events
-they raise, the `ICompositionHelper` surface those hooks widen, and a `SortedList`
-fix. pnpm applies them through `config/patches/@xterm__xterm@<version>.patch`.
-
-That patch touches eight files. Four are hand-authored source
-(`src/browser/CoreBrowserTerminal.ts`, `src/browser/Types.ts`,
-`src/browser/input/CompositionHelper.ts`, `src/common/SortedList.ts`) and four
-are the build output those sources produce (`lib/xterm.js`, `lib/xterm.mjs`,
-and both sourcemaps). The bundle half is 7.3 MB of minified code. It is
-generated, and this document exists so nobody edits it by hand.
-
-The two halves are the same edits diffed two ways, so the generator requires
-them to match byte for byte on every source file. A hunk the shipped patch
-cannot name — upstream's `.npmignore` strips `src/**/*.test.ts` — would be
-dropped by the next `--write`, so it fails the run instead.
-
-`config/patches/xterm-src/@xterm__xterm@<version>.src.patch` is the source of
-truth. Everything else is derived from it by
-`config/scripts/regenerate-xterm-patches.mjs`, which is pinned to the exact
-upstream commit the published tarball was built from.
-
-`@xterm/addon-webgl`, `@xterm/addon-search`, `@xterm/addon-serialize` and `@xterm/addon-image` are
-generated the same way, from their own source patches under
-`config/patches/xterm-src/`. Their entries differ only in `packageDir` and build
-steps; everything below applies to all five. `@xterm/addon-ligatures` is the one
-patch still written by hand — see [Known Gaps](#known-gaps).
-
-The image patch bounds pending Kitty decoders by their maximum WASM capacity
-and caps transmitted image blobs by byte size. Both use the configured storage
-budget; upstream's displayed-pixel budget does not cover these allocations.
-Byte-budget eviction drops unplaced payloads first, so a new upload cannot erase a
-visible image while abandoned blobs still hold budget; displayed images go only
-when that is not enough, because the cap is a hard bound. The incoming image is
-always stored, so the cap overshoots by at most one payload rather than dropping
-an image the protocol already acked as `OK`. Orca uses fixed 32 MB storage and
-8 MiB sequence limits, not arbitrary addon configurations.
-`config/scripts/xterm-image-memory-contract.test.mjs` exercises the installed
-bundle with unfinished uploads, chunk continuation, both eviction orders and
-disposal.
-The patch also bounds decompression before joining decoded chunks, validates PNG
-dimensions before native decoding, and closes stale asynchronous image results
-after reset, disable or disposal. `config/scripts/xterm-image-lifecycle-contract.test.mjs`
-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
-
-1. Never edit `config/patches/@xterm__*@<version>.patch`. Edit the source
-   patch and regenerate.
-2. Never edit `lib/` inside a patched `node_modules` tree and re-run
-   `pnpm patch-commit`. That is how bundle hunks stop matching their sources.
-3. Every source change must land together with the regenerated bundle hunks and
-   the `pnpm-lock.yaml` hash bump, in one commit.
-4. The upstream commit lives in `config/patches/xterm-upstream.json`, not in a
-   comment. A version bump that leaves it stale fails the generator, it does not
-   silently patch the wrong tree.
-5. Sourcemaps move with the bundle, and are never silently omitted. The patch
-   moves the code, so dropping only the map hunks would ship offsets pointing at
-   the wrong lines. `sourcemaps.policy` accepts `include` and nothing else: it
-   costs about 5.8 MB of the emitted patch and is required because
-   `src/renderer/src/components/terminal-pane/terminal-ime-xterm-transaction-events.test.ts`
-   reads `lib/*.map` and asserts the mapped `Version.ts` matches the runtime
-   version. Deleting the maps was once an option; the code that did it was
-   removed as unreachable, so re-adding the policy means re-adding that code.
-6. `--check` is the authority on the lockfile, not `pnpm install`. pnpm writes the
-   patch hash in two places — `patchedDependencies` and every resolution key that
-   depends on the patched package — and on a warm store it will leave the
-   resolution keys at their previous value while reporting success. That installs
-   locally and drifts on CI's cold store. For a version bump, follow the **Version
-   Bumps** workflow through step 5 (the final `--check`); if it reports a stale hash
-   after an install, rerun `--write`. For a source-only edit, the four-step workflow
-   above ends at `--check`.
-
-## Workflow
-
-```sh
-# 1. Edit the source hunks.
-$EDITOR config/patches/xterm-src/@xterm__xterm@6.1.0-beta.303.src.patch
-
-# 2. Rebuild the bundle hunks, the full patch, and the lockfile hash.
-node config/scripts/regenerate-xterm-patches.mjs --write
-
-# 3. Reinstall so node_modules picks up the new patch hash.
-pnpm install
-
-# 4. Confirm the tree is self-consistent.
-node config/scripts/regenerate-xterm-patches.mjs --check
-```
-
-Editing a patch file by hand is awkward for anything larger than a one-liner.
-For a substantial change, work in the generator's own checkout instead — after
-any run it is left at the pinned commit with the source patch applied:
-
-```sh
-node config/scripts/regenerate-xterm-patches.mjs --check --work-dir=/tmp/xterm
-$EDITOR /tmp/xterm/upstream/src/browser/input/CompositionHelper.ts
-git -C /tmp/xterm/upstream diff -- src/ > config/patches/xterm-src/@xterm__xterm@6.1.0-beta.303.src.patch
-node config/scripts/regenerate-xterm-patches.mjs --write --work-dir=/tmp/xterm
-```
-
-For an addon, edit under `addons/<name>/` and take the diff from that directory
-with `--relative`, so the patch is rooted at the package the way the published
-tarball is:
-
-```sh
-$EDITOR /tmp/xterm/upstream/addons/addon-webgl/src/TextureAtlas.ts
-git -C /tmp/xterm/upstream/addons/addon-webgl diff --relative -- src/ \
-  > config/patches/xterm-src/@xterm__addon-webgl@0.20.0-beta.299.src.patch
-```
-
-`--write` rewrites the source patch into the canonical form it would emit on a
-re-diff, so a hand-produced `git diff` gets normalized on the first run rather
-than fighting `--check` forever.
-
-Run the checkout outside this repository. A build tree underneath it makes
-`tsgo` walk up into Orca's own `node_modules` and fail with `TS2300: Duplicate
-identifier`, which is a symptom of where the tree sits and not of the patch.
-
-## How the Commit Is Known
-
-Upstream `bin/publish.js` sets `packageJson.commit` before `npm publish`, so
-each published tarball names the commit that built it. The generator asserts
-that stamp against `xterm-upstream.json` and then compares the tarball's `src/`
-against the checkout file by file. Only `src/common/Version.ts` may differ,
-because `publish.js` rewrites the version immediately before packaging; the
-generator applies the same stamp.
-
-That pair of checks is what makes the rebuild trustworthy. Without them a wrong
-commit would still produce a plausible-looking 7 MB patch.
-
-## Build Order
-
-Upstream's publish path is `npm ci` → stamp `Version.ts` → `npm run package`.
-`npm run package` runs webpack for `lib/xterm.js` and then, via `postpackage`,
-`bin/esbuild_all.mjs --prod` for `lib/xterm.mjs`.
-
-An addon needs three steps, in this order, and the first is easy to miss:
-
-1. **root `npm run build`.** The addon's own `npm run build` is
-   `tsgo -p .` against a tsconfig whose `files` and `include` are both empty and
-   which only lists project references. In `-p` mode tsgo does not build
-   references, so it succeeds while emitting nothing, and the addon's webpack
-   then fails on a missing `./out/`. The root build is what populates it.
-2. **addon `npm run package`** — the addon's own webpack, which emits the CJS
-   `lib/addon-*.js`. The root `package` script never builds this.
-3. **root `npm run esbuild-package`** — `bin/esbuild_all.mjs --prod`, which emits
-   the ESM `lib/addon-*.mjs` for every addon at once.
-
-**Do not run `npm run setup` after the packaging build.** `setup` is the
-development esbuild pass with `minify: false`. Running it afterwards overwrites
-`lib/xterm.mjs` with an unminified bundle and a map that no longer matches, and
-the resulting patch is silently wrong — the failure mode is a `.mjs` that is
-50% larger than the published one, which is easy to miss inside a 7 MB diff.
-`forbiddenBuildScripts` in the manifest encodes this and the generator refuses
-to run a build step that names one of those scripts.
-
-The generator also builds the _unmodified_ commit first and asserts that it
-reproduces the published `lib/` byte for byte before it emits anything. A
-toolchain or build-order problem therefore surfaces as an explicit "did not
-reproduce the published bundles" error rather than as 7 MB of mystery diff.
-
-## Recovering From Hand-Edited Bundles
-
-Between 2026-08-09 and 2026-08-17 this harness did not exist, and four fixes
-landed by editing the minified bundles directly. The tell is code no minifier
-emits: `const` in an otherwise `let`-only bundle, and identifiers like `$rl`,
-`$hp`, `$tid`.
-
-Recovery is not a rewrite. The hand-edits were applied to `src/` as well, so the
-source hunks in the shipped patch were already correct and `--write` re-derives
-the bundles from them. What changes is cosmetic and expected:
-
-- Hand-written locals collapse back into minifier names, which shifts esbuild's
-  frequency-ordered allocation and can swap two short names bundle-wide (`i`↔`t`
-  in the `.mjs`, `w`↔`y` in the `.js`). Most differing lines are the same length.
-- Hand-written equivalents normalize to what the toolchain actually emits
-  (`!!x` back to `Boolean(x)`, an escaped `\u200E` back to the literal
-  character).
-
-To confirm a regeneration is semantically a no-op rather than a revert, compare
-identifier multisets between the old and new bundle instead of reading the diff:
-every name that is not a single-letter minifier local should appear the same
-number of times in both. Anything else is a real change and needs explaining.
-
-## The Lockfile Moves With the Patch
-
-pnpm derives the `patchedDependencies` hash in `pnpm-lock.yaml` — and the
-`.pnpm/@xterm+xterm@<version>_patch_hash=<hash>/` store directory name — from
-the sha256 of the patch file itself. A regenerated patch without the lockfile
-bump fails `pnpm install --frozen-lockfile` on every machine except the
-author's. `--write` makes that edit; `--check` fails if it is missing.
-
-`config/scripts/regenerate-xterm-patches.test.mjs` asserts the same thing
-without a network or a build, so the ordinary test job catches lockfile drift
-in milliseconds even though the full rebuild runs in its own CI lane.
-
-## Toolchain Pin
-
-`toolchain` in the manifest records what upstream's `package-lock.json` resolves
-at the pinned commit, and the generator fails if `npm ci` produces something
-else. The entry that matters is `@typescript/native-preview`
-(`tsgo`), which upstream pins to a **dated development build** —
-`7.0.0-dev.20260521.1` at the time of writing. It is a real published version
-and npm does not prune old releases, but it is the one dependency of this scheme
-that is not a stable release.
-
-If that version ever becomes unresolvable the generator fails with a toolchain
-error naming it. Recovery is to move the pin to the next upstream commit whose
-`package-lock.json` resolves, re-verify that the rebuild still reproduces the
-published bundles, and regenerate. The committed patch keeps working the whole
-time — only regeneration is blocked, so this is never an outage.
-
-## Patch Path Rooting
-
-A published tarball is rooted at the package, so an addon's patch names
-`src/TextureAtlas.ts`, not `addons/addon-webgl/src/TextureAtlas.ts`. Two places
-have to agree with that, and both fail silently if they do not:
-
-- The checkout diff passes `--relative`, which must sit **before** the `--`
-  separator in `CHECKOUT_DIFF_FLAGS`. After it, git reads it as a pathspec and
-  keeps repo-root-relative paths, and every source hunk then falls out of the
-  emitted patch.
-- `git apply` runs from the repo root with `--directory=<packageDir>`. Run from
-  a subdirectory instead, git still resolves patch paths from the repo root,
-  skips every hunk, and **exits 0**. The generator guards this by failing when
-  applying a source patch leaves the checkout unchanged.
-
-## Version Bumps
-
-Upstream publishes each package only when its own output changes, so the four
-packages carry different beta numbers while sharing one commit — at the time of
-writing `@xterm/xterm@6.1.0-beta.303` and `@xterm/headless@6.1.0-beta.302` are
-both built from `d3e32b3`. Match on `package.json.commit`, never on the version
-string; `xterm-user-scrolling-contract.test.ts` asserts that pairing for
-headless and core.
-
-Bumping `@xterm/xterm` is:
-
-1. Update the version in `package.json` and run `pnpm install`.
-2. Rename both patch files to the new version and update `patch`,
-   `sourcePatch`, and `version` in `xterm-upstream.json`.
-3. Update `upstream.commit` to the `commit` field of the new tarball's
-   `package.json`, and `toolchain` to whatever the new `package-lock.json`
-   resolves.
-4. `node config/scripts/regenerate-xterm-patches.mjs --write`.
-5. `pnpm install`, then `--check`. On a bump the lockfile has no entry under the
-   new key yet, so `--write` reports the gap and leaves the hash to `pnpm
-install`; `--check` is what proves the two agree afterwards.
-
-Step 4 is where a real upstream conflict shows up: `git apply` of the source
-patch fails against the new tree. Resolve it in the checkout, re-diff, and
-rerun. The bundle hunks need no attention at any point.
-
-## Why Not Vendor a Fork
-
-A vendored `@xterm/xterm` fork removes the patch entirely, but it moves Orca off
-the published package, so every upstream beta becomes a merge rather than a
-version bump, and Orca inherits responsibility for building and publishing a
-package it does not own. The patch is four small source hunks against a commit
-that reproduces byte for byte; a fork is a much larger standing cost for the
-same result.
-
-## Why Not Handle Composition at Runtime
-
-`CompositionHelper` hooks four private call sites upstream of `onData`, and
-`SortedList` has no public surface at all. There is no supported extension point
-that reaches either, so a runtime shim would mean reaching into `_core`
-internals that upstream renames freely between betas. The patch is the smaller
-risk.
-
-## CI Contract
-
-`xterm_patch_sync` in `.github/workflows/pr.yml` runs
-`regenerate-xterm-patches.mjs --check` on every PR and is part of the `verify`
-aggregate. It clones the pinned commit, installs upstream's toolchain, builds
-twice, and byte-compares the result against the committed patch. Both builds and
-the diff together are about eight seconds; `npm ci` for upstream's toolchain is
-what the job actually spends its minutes on, and the cache key is the manifest.
-
-`config/scripts/regenerate-xterm-patches.test.mjs` covers the pure pieces —
-pnpm's diff flags and normalization, hunk splitting, round-trip stability, the
-commit and build-order assertions, and lockfile coupling — with no network and
-no build, so they run in the ordinary test shards.
-
-## Known Gaps
-
-`@xterm/addon-ligatures` is still patched by hand, and can stay that way: the
-patch is a fifteen-line `package.json` edit that repoints `module` and adds an
-`exports` block, touching no bundle and no sourcemap. Nothing about it is
-generated, so there is nothing for this harness to verify.
-
-The addons were folded into this manifest on 2026-08-29. Before that they were
-hand-edited minified bundles carrying a literal `/* PATCH(orca): ... */` comment
-inside minified code, parser round-trip artifacts (`!0` printed back as `true`,
-locals renamed `i` → `i5`), and no `.map` hunks at all — so both shipped
-sourcemaps whose offsets did not match the bundle beside them. All four
-`@xterm/addon-webgl` artifacts and all four `@xterm/addon-serialize` artifacts
-now reproduce byte for byte from the pinned commit, which is what closed it.
-
-The one thing still unproven is that this holds across upstream revisions rather
-than at this commit. `addon-serialize.js.map` did not reproduce on the first
-attempt here; the cause was a stale `out/` from a wrong build order, not
-upstream nondeterminism, and it reproduced exactly once the root build ran
-first. Treat a future non-reproducing artifact as a build-order bug until proven
-otherwise.
diff --git a/mobile/patches/react-native-webview@13.16.2.patch b/mobile/patches/react-native-webview@13.16.2.patch
index 963f8884f381..574cddd8b8d0 100644
--- a/mobile/patches/react-native-webview@13.16.2.patch
+++ b/mobile/patches/react-native-webview@13.16.2.patch
@@ -1,3 +1,46 @@
+diff --git a/android/src/main/java/com/reactnativecommunity/webview/RNCWebView.java b/android/src/main/java/com/reactnativecommunity/webview/RNCWebView.java
+index 80c68034b193a47bedb56ca527352de9548e8ac6..977c068a74c88c0322fca2a4bbffab8bc1ba719d 100644
+--- a/android/src/main/java/com/reactnativecommunity/webview/RNCWebView.java
++++ b/android/src/main/java/com/reactnativecommunity/webview/RNCWebView.java
+@@ -253,6 +253,12 @@ public class RNCWebView extends WebView implements LifecycleEventListener {
+             this.bridgeListener = new WebViewCompat.WebMessageListener() {
+               @Override
+               public void onPostMessage(@NonNull WebView view, @NonNull WebMessageCompat message, @NonNull Uri sourceOrigin, boolean isMainFrame, @NonNull JavaScriptReplyProxy replyProxy) {
++                // Orca: only the page's own document may message the app. A subframe (for example agent
++                // HTML in a sandboxed iframe) reaches this listener too, and getData() throws for a
++                // non-string message.
++                if (!isMainFrame || message.getType() != WebMessageCompat.TYPE_STRING) {
++                  return;
++                }
+                 RNCWebView.this.onMessage(message.getData(), sourceOrigin.toString());
+               }
+             };
+diff --git a/apple/RNCWebViewImpl.m b/apple/RNCWebViewImpl.m
+index 7f5c24d6e2cfb26eddbc513bf17a81c24a7273e2..d70cb58a3c81cb22bd549a2c37340ba53853cfcf 100644
+--- a/apple/RNCWebViewImpl.m
++++ b/apple/RNCWebViewImpl.m
+@@ -776,12 +776,21 @@ - (void)userContentController:(WKUserContentController *)userContentController
+       didReceiveScriptMessage:(WKScriptMessage *)message
+ {
+   if ([message.name isEqualToString:HistoryShimName]) {
++    // Orca: the history shim is the page's own script; a subframe or non-string body is not it.
++    if (!message.frameInfo.isMainFrame || ![message.body isKindOfClass:[NSString class]]) {
++      return;
++    }
+     if (_onLoadingFinish) {
+       NSMutableDictionary<NSString *, id> *event = [self baseEvent];
+       [event addEntriesFromDictionary: @{@"navigationType": message.body}];
+       _onLoadingFinish(event);
+     }
+   } else if ([message.name isEqualToString:MessageHandlerName]) {
++    // Orca: only the page's own document may message the app. A subframe (for example agent HTML in
++    // a sandboxed iframe) reaches this handler too, and a non-string body is not a message.
++    if (!message.frameInfo.isMainFrame || ![message.body isKindOfClass:[NSString class]]) {
++      return;
++    }
+     if (_onMessage) {
+       NSMutableDictionary<NSString *, id> *event = [self baseEvent];
+       [event addEntriesFromDictionary: @{@"data": message.body}];
 diff --git a/index.d.ts b/index.d.ts
 index 10b9c145b920a6a2ba1fb09bd72150328fafe211..626a67a3d6aca587ee9e74a52b799a2c50b4c52b 100644
 --- a/index.d.ts
diff --git a/mobile/pnpm-lock.yaml b/mobile/pnpm-lock.yaml
index a4410dba951d..f313d75e0b3e 100644
--- a/mobile/pnpm-lock.yaml
+++ b/mobile/pnpm-lock.yaml
@@ -174,7 +174,7 @@ patchedDependencies:
   '@xterm/addon-webgl@0.20.0-beta.299': 94687e89a0115e6e6aa102837f986debdc029c091527ee5eb4a4e17ceaf9473e
   expo-notifications@55.0.27: ce20843a3daad4185d7e8571788fa323ba4d11984936188790858650a61749c0
   query-string@9.5.1: 8624f1beedd0705bfdaf287519ed6363662a0c96f01fd594508b34583bf30d8b
-  react-native-webview@13.16.2: de6761dfa76a5491a23e49f1262566a8831cab26736a336fdffc5d4e7d05ff27
+  react-native-webview@13.16.2: 55b7bce35c78ee1a50c4b99ad65b52982f3cfa73da6f61d0853c4d03219eec06
   react-native@0.83.10: 44876634a8efbb0f2c3f66cd4332be170ec821d1cbfc0264ac80680983e8513d
 
 importers:
@@ -318,7 +318,7 @@ importers:
         version: 0.21.3(react-dom@19.2.8(react@19.2.8))(react@19.2.8)
       react-native-webview:
         specifier: 13.16.2
-        version: 13.16.2(patch_hash=de6761dfa76a5491a23e49f1262566a8831cab26736a336fdffc5d4e7d05ff27)(react-native@0.83.10(patch_hash=44876634a8efbb0f2c3f66cd4332be170ec821d1cbfc0264ac80680983e8513d)(@babel/core@7.29.7(supports-color@8.1.1))(@react-native/metro-config@0.85.2(@babel/core@7.29.7(supports-color@8.1.1))(supports-color@8.1.1))(@types/react@19.2.18)(react@19.2.8)(supports-color@8.1.1))(react@19.2.8)
+        version: 13.16.2(patch_hash=55b7bce35c78ee1a50c4b99ad65b52982f3cfa73da6f61d0853c4d03219eec06)(react-native@0.83.10(patch_hash=44876634a8efbb0f2c3f66cd4332be170ec821d1cbfc0264ac80680983e8513d)(@babel/core@7.29.7(supports-color@8.1.1))(@react-native/metro-config@0.85.2(@babel/core@7.29.7(supports-color@8.1.1))(supports-color@8.1.1))(@types/react@19.2.18)(react@19.2.8)(supports-color@8.1.1))(react@19.2.8)
       react-native-worklets:
         specifier: ^0.8.3
         version: 0.8.3(@babel/core@7.29.7(supports-color@8.1.1))(@react-native/metro-config@0.85.2(@babel/core@7.29.7(supports-color@8.1.1))(supports-color@8.1.1))(react-native@0.83.10(patch_hash=44876634a8efbb0f2c3f66cd4332be170ec821d1cbfc0264ac80680983e8513d)(@babel/core@7.29.7(supports-color@8.1.1))(@react-native/metro-config@0.85.2(@babel/core@7.29.7(supports-color@8.1.1))(supports-color@8.1.1))(@types/react@19.2.18)(react@19.2.8)(supports-color@8.1.1))(react@19.2.8)(supports-color@8.1.1)
@@ -12264,7 +12264,7 @@ snapshots:
     optionalDependencies:
       '@expo/dom-webview': 55.0.6(expo@55.0.31)(react-native@0.83.10(patch_hash=44876634a8efbb0f2c3f66cd4332be170ec821d1cbfc0264ac80680983e8513d)(@babel/core@7.29.7(supports-color@8.1.1))(@react-native/metro-config@0.85.2(@babel/core@7.29.7(supports-color@8.1.1))(supports-color@8.1.1))(@types/react@19.2.18)(react@19.2.8)(supports-color@8.1.1))(react@19.2.8)
       '@expo/metro-runtime': 55.0.12(@expo/dom-webview@55.0.6)(expo@55.0.31)(react-dom@19.2.8(react@19.2.8))(react-native@0.83.10(patch_hash=44876634a8efbb0f2c3f66cd4332be170ec821d1cbfc0264ac80680983e8513d)(@babel/core@7.29.7(supports-color@8.1.1))(@react-native/metro-config@0.85.2(@babel/core@7.29.7(supports-color@8.1.1))(supports-color@8.1.1))(@types/react@19.2.18)(react@19.2.8)(supports-color@8.1.1))(react@19.2.8)
-      react-native-webview: 13.16.2(patch_hash=de6761dfa76a5491a23e49f1262566a8831cab26736a336fdffc5d4e7d05ff27)(react-native@0.83.10(patch_hash=44876634a8efbb0f2c3f66cd4332be170ec821d1cbfc0264ac80680983e8513d)(@babel/core@7.29.7(supports-color@8.1.1))(@react-native/metro-config@0.85.2(@babel/core@7.29.7(supports-color@8.1.1))(supports-color@8.1.1))(@types/react@19.2.18)(react@19.2.8)(supports-color@8.1.1))(react@19.2.8)
+      react-native-webview: 13.16.2(patch_hash=55b7bce35c78ee1a50c4b99ad65b52982f3cfa73da6f61d0853c4d03219eec06)(react-native@0.83.10(patch_hash=44876634a8efbb0f2c3f66cd4332be170ec821d1cbfc0264ac80680983e8513d)(@babel/core@7.29.7(supports-color@8.1.1))(@react-native/metro-config@0.85.2(@babel/core@7.29.7(supports-color@8.1.1))(supports-color@8.1.1))(@types/react@19.2.18)(react@19.2.8)(supports-color@8.1.1))(react@19.2.8)
     transitivePeerDependencies:
       - '@babel/core'
       - bufferutil
@@ -14375,7 +14375,7 @@ snapshots:
     transitivePeerDependencies:
       - encoding
 
-  react-native-webview@13.16.2(patch_hash=de6761dfa76a5491a23e49f1262566a8831cab26736a336fdffc5d4e7d05ff27)(react-native@0.83.10(patch_hash=44876634a8efbb0f2c3f66cd4332be170ec821d1cbfc0264ac80680983e8513d)(@babel/core@7.29.7(supports-color@8.1.1))(@react-native/metro-config@0.85.2(@babel/core@7.29.7(supports-color@8.1.1))(supports-color@8.1.1))(@types/react@19.2.18)(react@19.2.8)(supports-color@8.1.1))(react@19.2.8):
+  react-native-webview@13.16.2(patch_hash=55b7bce35c78ee1a50c4b99ad65b52982f3cfa73da6f61d0853c4d03219eec06)(react-native@0.83.10(patch_hash=44876634a8efbb0f2c3f66cd4332be170ec821d1cbfc0264ac80680983e8513d)(@babel/core@7.29.7(supports-color@8.1.1))(@react-native/metro-config@0.85.2(@babel/core@7.29.7(supports-color@8.1.1))(supports-color@8.1.1))(@types/react@19.2.18)(react@19.2.8)(supports-color@8.1.1))(react@19.2.8):
     dependencies:
       '@typescript/native-preview': 7.0.0-dev.20260707.2
       escape-string-regexp: 4.0.0
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 f09b32c7e780..d0260d6b1091 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
@@ -4,15 +4,6 @@
   "family": "nativeChat.image-upload",
   "namedDeltas": [],
   "values": {
-    "2ec71b490683": {
-      "name": "image-uploaded",
-      "ordinal": 8,
-      "value": {
-        "contentFingerprint": "f75f583c67e2aaf12284c94d09b56e3caa9d7b93b71565d2fd3e09ef635cef8d",
-        "path": "/tmp/img-1.png",
-        "previewUri": "data:image/png;base64,AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA"
-      }
-    },
     "2fd17c25e4d0": {
       "name": "clipboard.startImageUpload#2",
       "ordinal": 9,
@@ -49,6 +40,14 @@
         }
       }
     },
+    "31f4965e4ed4": {
+      "name": "image-uploaded",
+      "ordinal": 8,
+      "value": {
+        "path": "/tmp/img-1.png",
+        "previewUri": "data:image/png;base64,AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA"
+      }
+    },
     "6696a47819e1": {
       "name": "clipboard.startImageUpload#1",
       "ordinal": 3,
@@ -204,7 +203,7 @@
             "two": "765ab192e1a5"
           },
           "state": "b2b1a4389f58",
-          "effects": ["994fccf9b305", "2ec71b490683"]
+          "effects": ["994fccf9b305", "31f4965e4ed4"]
         }
       }
     ]
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 32c13ce5d338..dd67c8a4a19f 100644
--- a/mobile/rpc-foundation/goldens/native-chat-image-upload-single.json
+++ b/mobile/rpc-foundation/goldens/native-chat-image-upload-single.json
@@ -4,13 +4,23 @@
   "family": "nativeChat.image-upload",
   "namedDeltas": [],
   "values": {
-    "5c7ed03288e6": {
+    "0d87f193fb59": {
+      "status": "fulfilled",
+      "startedAt": 0,
+      "settledAt": 0,
+      "value": [
+        {
+          "path": "/tmp/img-1.png",
+          "previewUri": "file:///a.png"
+        }
+      ]
+    },
+    "15d714ff61ff": {
       "failure": {
         "$rpc": "null"
       },
       "uploaded": [
         {
-          "contentFingerprint": "f75f583c67e2aaf12284c94d09b56e3caa9d7b93b71565d2fd3e09ef635cef8d",
           "path": "/tmp/img-1.png",
           "previewUri": "file:///a.png"
         }
@@ -71,17 +81,13 @@
       "ordinal": 1,
       "value": {}
     },
-    "9a61808dee44": {
-      "status": "fulfilled",
-      "startedAt": 0,
-      "settledAt": 0,
-      "value": [
-        {
-          "contentFingerprint": "f75f583c67e2aaf12284c94d09b56e3caa9d7b93b71565d2fd3e09ef635cef8d",
-          "path": "/tmp/img-1.png",
-          "previewUri": "file:///a.png"
-        }
-      ]
+    "dd123d00d140": {
+      "name": "image-uploaded",
+      "ordinal": 8,
+      "value": {
+        "path": "/tmp/img-1.png",
+        "previewUri": "file:///a.png"
+      }
     },
     "ec8f73d25f26": {
       "name": "clipboard.commitImageUpload#1",
@@ -150,15 +156,6 @@
           }
         }
       }
-    },
-    "f4c66fc96af9": {
-      "name": "image-uploaded",
-      "ordinal": 8,
-      "value": {
-        "contentFingerprint": "f75f583c67e2aaf12284c94d09b56e3caa9d7b93b71565d2fd3e09ef635cef8d",
-        "path": "/tmp/img-1.png",
-        "previewUri": "file:///a.png"
-      }
     }
   },
   "recording": {
@@ -170,10 +167,10 @@
           "sender": ["7c2e3ea286aa", "f05e4695ffa3", "ec8f73d25f26"],
           "payloads": ["6696a47819e1", "814ccd56a769", "8452698ac11a"],
           "settlements": {
-            "normal": "9a61808dee44"
+            "normal": "0d87f193fb59"
           },
-          "state": "5c7ed03288e6",
-          "effects": ["994fccf9b305", "f4c66fc96af9"]
+          "state": "15d714ff61ff",
+          "effects": ["994fccf9b305", "dd123d00d140"]
         }
       }
     ]
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 8d7643ed0e11..3581f44ea229 100644
--- a/mobile/rpc-foundation/goldens/native-chat-image-upload-two.json
+++ b/mobile/rpc-foundation/goldens/native-chat-image-upload-two.json
@@ -4,41 +4,14 @@
   "family": "nativeChat.image-upload",
   "namedDeltas": [],
   "values": {
-    "147a6d6af2f1": {
-      "name": "image-uploaded",
-      "ordinal": 15,
-      "value": {
-        "contentFingerprint": "f75f583c67e2aaf12284c94d09b56e3caa9d7b93b71565d2fd3e09ef635cef8d",
-        "path": "/tmp/img-2.png",
-        "previewUri": "file:///b.png"
-      }
-    },
-    "2ec71b490683": {
+    "31f4965e4ed4": {
       "name": "image-uploaded",
       "ordinal": 8,
       "value": {
-        "contentFingerprint": "f75f583c67e2aaf12284c94d09b56e3caa9d7b93b71565d2fd3e09ef635cef8d",
         "path": "/tmp/img-1.png",
         "previewUri": "data:image/png;base64,AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA"
       }
     },
-    "4a3413975ca6": {
-      "status": "fulfilled",
-      "startedAt": 0,
-      "settledAt": 0,
-      "value": [
-        {
-          "contentFingerprint": "f75f583c67e2aaf12284c94d09b56e3caa9d7b93b71565d2fd3e09ef635cef8d",
-          "path": "/tmp/img-1.png",
-          "previewUri": "data:image/png;base64,AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA"
-        },
-        {
-          "contentFingerprint": "f75f583c67e2aaf12284c94d09b56e3caa9d7b93b71565d2fd3e09ef635cef8d",
-          "path": "/tmp/img-2.png",
-          "previewUri": "file:///b.png"
-        }
-      ]
-    },
     "5c19acb9611e": {
       "name": "clipboard.commitImageUpload#2",
       "ordinal": 13,
@@ -121,18 +94,16 @@
       "ordinal": 7,
       "json": "{\"id\":\"frame-3\",\"deviceToken\":\"recording-device\",\"method\":\"clipboard.commitImageUpload\",\"params\":{\"uploadId\":\"upload-1\"}}"
     },
-    "8d51e9899739": {
-      "failure": {
-        "$rpc": "null"
-      },
-      "uploaded": [
+    "87c17cf78a60": {
+      "status": "fulfilled",
+      "startedAt": 0,
+      "settledAt": 0,
+      "value": [
         {
-          "contentFingerprint": "f75f583c67e2aaf12284c94d09b56e3caa9d7b93b71565d2fd3e09ef635cef8d",
           "path": "/tmp/img-1.png",
           "previewUri": "data:image/png;base64,AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA"
         },
         {
-          "contentFingerprint": "f75f583c67e2aaf12284c94d09b56e3caa9d7b93b71565d2fd3e09ef635cef8d",
           "path": "/tmp/img-2.png",
           "previewUri": "file:///b.png"
         }
@@ -224,6 +195,14 @@
         }
       }
     },
+    "d7dc1460b465": {
+      "name": "image-uploaded",
+      "ordinal": 15,
+      "value": {
+        "path": "/tmp/img-2.png",
+        "previewUri": "file:///b.png"
+      }
+    },
     "e74ddb684ed1": {
       "name": "clipboard.startImageUpload#2",
       "ordinal": 10,
@@ -296,6 +275,21 @@
           }
         }
       }
+    },
+    "f6cdfabc3790": {
+      "failure": {
+        "$rpc": "null"
+      },
+      "uploaded": [
+        {
+          "path": "/tmp/img-1.png",
+          "previewUri": "data:image/png;base64,AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA"
+        },
+        {
+          "path": "/tmp/img-2.png",
+          "previewUri": "file:///b.png"
+        }
+      ]
     }
   },
   "recording": {
@@ -321,10 +315,10 @@
             "a77c2409e01f"
           ],
           "settlements": {
-            "two": "4a3413975ca6"
+            "two": "87c17cf78a60"
           },
-          "state": "8d51e9899739",
-          "effects": ["994fccf9b305", "2ec71b490683", "147a6d6af2f1"]
+          "state": "f6cdfabc3790",
+          "effects": ["994fccf9b305", "31f4965e4ed4", "d7dc1460b465"]
         }
       }
     ]
diff --git a/mobile/src/components/AgentStateDot.tsx b/mobile/src/components/AgentStateDot.tsx
index 0450afa81663..387c247c11a3 100644
--- a/mobile/src/components/AgentStateDot.tsx
+++ b/mobile/src/components/AgentStateDot.tsx
@@ -19,9 +19,11 @@ const DOT_COLORS: Record<Exclude<AgentDotState, 'working' | 'monitoring'>, strin
   unconfirmed: colors.statusAmber,
   idle: 'rgba(115,115,115,0.4)'
 }
-const WORKING_COLOR = '#eab308'
+export const AGENT_WORKING_COLOR = '#eab308'
 
-export function AgentStateDot({ state }: { state: AgentDotState }) {
+/** `unverifiable` is a child row's lost contact: desktop's dashed amber ring, a missing-evidence
+ *  mark rather than a state claim. */
+export function AgentStateDot({ state }: { state: AgentDotState | 'unverifiable' }) {
   const rotate = useWorkingRingRotation(state === 'working')
 
   if (state === 'working') {
@@ -35,7 +37,15 @@ export function AgentStateDot({ state }: { state: AgentDotState }) {
   if (state === 'monitoring') {
     return (
       <View style={styles.wrapper} accessibilityLabel="Monitoring background tasks">
-        <Activity size={10} color={WORKING_COLOR} />
+        <Activity size={10} color={AGENT_WORKING_COLOR} />
+      </View>
+    )
+  }
+
+  if (state === 'unverifiable') {
+    return (
+      <View style={styles.wrapper} accessibilityLabel="No recent update">
+        <View style={styles.dashedRing} />
       </View>
     )
   }
@@ -50,12 +60,20 @@ export function AgentStateDot({ state }: { state: AgentDotState }) {
 const styles = StyleSheet.create({
   wrapper: { width: 10, height: 10, alignItems: 'center', justifyContent: 'center' },
   dot: { width: 6, height: 6, borderRadius: 3 },
+  dashedRing: {
+    width: 8,
+    height: 8,
+    borderRadius: 4,
+    borderWidth: 1.5,
+    borderStyle: 'dashed',
+    borderColor: colors.statusAmber
+  },
   spinner: {
     width: 6,
     height: 6,
     borderRadius: 3,
     borderWidth: 1.5,
-    borderColor: WORKING_COLOR,
+    borderColor: AGENT_WORKING_COLOR,
     borderTopColor: 'transparent'
   }
 })
diff --git a/mobile/src/components/MobileMarkdown.tsx b/mobile/src/components/MobileMarkdown.tsx
index 0022daf8d73f..31c92d8c9eb0 100644
--- a/mobile/src/components/MobileMarkdown.tsx
+++ b/mobile/src/components/MobileMarkdown.tsx
@@ -13,7 +13,6 @@ import {
   type ReactNode
 } from 'react'
 import { Pressable, ScrollView, Text as NativeText, View, type TextProps } from 'react-native'
-import { normalizeMobileMarkdownPreviewHtml } from './mobile-markdown-preview-html'
 import { styles } from './mobile-markdown-styles'
 import {
   detectFilePathSegments,
@@ -26,7 +25,8 @@ import {
   trimAutolinkTrailingPunctuation
 } from './markdown-inline-token-rules'
 import { isMobileMermaidLanguage } from './mobile-mermaid-language'
-import { parseMobileMarkdown } from './mobile-markdown-parser'
+import { useMobileMarkdownBlocks } from './use-mobile-markdown-blocks'
+import type { NativeChatVisualDirective } from '../../../src/shared/native-chat-visual-directive'
 import { MermaidDiagram } from './pr-sidebar/MermaidDiagram'
 
 type Props = {
@@ -44,6 +44,9 @@ type Props = {
    *  optional :line(:col) suffix). Omitted on screens with no file viewer, where
    *  paths render as plain text (no behavior change). */
   onOpenFile?: (pathText: string) => void
+  /** Native-chat assistant prose only: renders `::orca-visual{...}` directive lines. Without it,
+   *  a directive line is ordinary text. Must be referentially stable (this component is memoized). */
+  renderVisual?: (directive: NativeChatVisualDirective, index: number) => ReactNode
 }
 
 const MAX_TABLE_ROWS = 40
@@ -233,14 +236,14 @@ function MobileMarkdownContent({
   fallback = '',
   rangeSelectable = false,
   textScale = 1,
-  onOpenFile
+  onOpenFile,
+  renderVisual
 }: Props) {
   // Interactive children own their touches and must forward the row action.
   const setup = useContext(MarkdownTextContext)
   const rowLongPress = setup.androidTranscript ? setup.onLongPress : undefined
   const text = content?.trim() ?? ''
-  const previewText = useMemo(() => normalizeMobileMarkdownPreviewHtml(text), [text])
-  const blocks = useMemo(() => parseMobileMarkdown(previewText), [previewText])
+  const { blocks, directives } = useMobileMarkdownBlocks(text, renderVisual !== undefined)
   // Scale prose sizes; inline spans inherit fontSize from the wrapping Text.
   const scaled = (size: number): { fontSize: number; lineHeight: number } | null =>
     textScale !== 1 ? { fontSize: size * textScale, lineHeight: (size + 6) * textScale } : null
@@ -259,6 +262,14 @@ function MobileMarkdownContent({
   return (
     <View style={styles.root}>
       {blocks.map((block, index) => {
+        if (block.type === 'visual') {
+          const directive = directives[block.index]
+          return directive && renderVisual ? (
+            <Fragment key={`visual:${block.index}:${directive.file}`}>
+              {renderVisual(directive, block.index)}
+            </Fragment>
+          ) : null
+        }
         if (block.type === 'heading') {
           return (
             <MarkdownText
diff --git a/mobile/src/components/WorktreeAgentRow.tsx b/mobile/src/components/WorktreeAgentRow.tsx
index cd8e10b3454e..ad9deaee5410 100644
--- a/mobile/src/components/WorktreeAgentRow.tsx
+++ b/mobile/src/components/WorktreeAgentRow.tsx
@@ -1,6 +1,7 @@
 import { memo } from 'react'
 import { StyleSheet, Text, View } from 'react-native'
 import type { RuntimeWorktreeAgentRow } from '../../../src/shared/runtime-types'
+import { withoutNativeChatVisualDirectiveLines } from '../../../src/shared/native-chat-visual-directive'
 import { colors, spacing } from '../theme/mobile-theme'
 import {
   agentDisplayLabel,
@@ -26,7 +27,15 @@ type Props = {
 // Mirrors desktop DashboardAgentRow's compact in-card layout.
 function WorktreeAgentRowComponent({ agent, depth, now, unvisited }: Props) {
   const dotState = agentDotState(agent, now)
-  const label = agentDisplayLabel(agent, now)
+  // A visual line renders only in the transcript; the row shows the words around it, and a reply
+  // that is only a visual falls back like an empty one.
+  const reply = agent.lastAssistantMessage
+  const label = agentDisplayLabel(
+    reply
+      ? { ...agent, lastAssistantMessage: withoutNativeChatVisualDirectiveLines(reply) }
+      : agent,
+    now
+  )
   const ts = formatTimeAgo(agentRowTimeAt(agent), now)
 
   return (
diff --git a/mobile/src/components/WorktreeAgentRow.visual-line.test.tsx b/mobile/src/components/WorktreeAgentRow.visual-line.test.tsx
new file mode 100644
index 000000000000..e32be5b8fab9
--- /dev/null
+++ b/mobile/src/components/WorktreeAgentRow.visual-line.test.tsx
@@ -0,0 +1,59 @@
+import { createElement } from 'react'
+import { act, create, type ReactTestRenderer } from 'react-test-renderer'
+import { afterEach, describe, expect, it, vi } from 'vitest'
+import type { RuntimeWorktreeAgentRow } from '../../../src/shared/runtime-types'
+import { WorktreeAgentRow } from './WorktreeAgentRow'
+
+vi.mock('react-native', () => ({
+  StyleSheet: { create: <T,>(styles: T) => styles },
+  Text: 'Text',
+  View: 'View'
+}))
+vi.mock('./AgentStateDot', () => ({ AgentStateDot: () => null }))
+vi.mock('./MobileAgentIcon', () => ({ MobileAgentIcon: () => null }))
+
+function agent(lastAssistantMessage: string | null): RuntimeWorktreeAgentRow {
+  return {
+    paneKey: 'tab:leaf',
+    parentPaneKey: null,
+    state: 'done',
+    agentType: 'claude',
+    prompt: 'Show usage by day',
+    taskTitle: null,
+    displayName: null,
+    lastAssistantMessage,
+    toolName: null,
+    toolInput: null,
+    interrupted: false,
+    stateStartedAt: 1_000,
+    updatedAt: 1_000
+  }
+}
+
+describe('WorktreeAgentRow visual lines', () => {
+  let renderer: ReactTestRenderer | null = null
+
+  afterEach(() => {
+    act(() => renderer?.unmount())
+    renderer = null
+  })
+
+  function label(row: RuntimeWorktreeAgentRow): string {
+    act(() => {
+      renderer = create(
+        createElement(WorktreeAgentRow, { agent: row, depth: 0, now: 2_000, unvisited: false })
+      )
+    })
+    return String(renderer!.root.findAll((node) => String(node.type) === 'Text')[0]!.props.children)
+  }
+
+  it('shows the words around a visual line, never the line itself', () => {
+    expect(label(agent('Here it is.\n::orca-visual{file="usage.html"}\nSunday dips.'))).toBe(
+      'Here it is.\nSunday dips.'
+    )
+  })
+
+  it('falls back to the prompt when the reply is only a visual', () => {
+    expect(label(agent('::orca-visual{file="usage.html" title="Usage"}'))).toBe('Show usage by day')
+  })
+})
diff --git a/mobile/src/components/inline-script-json.ts b/mobile/src/components/inline-script-json.ts
new file mode 100644
index 000000000000..cf81bc6d91b4
--- /dev/null
+++ b/mobile/src/components/inline-script-json.ts
@@ -0,0 +1,17 @@
+// JSON.stringify escapes quotes and control chars but leaves `<`, `>`, `&`, and
+// the U+2028/U+2029 line separators raw — so a value containing `</script>` would
+// close the inline <script> this is spliced into and let the rest execute as
+// markup. These characters only ever appear inside JSON string literals, so
+// escaping them to \uXXXX is always valid and always parses back to the exact
+// original text inside the WebView.
+export function encodeJsonForScript(json: string): string {
+  return json.replace(
+    /[<>&\u2028\u2029]/g,
+    (char) => `\\u${char.charCodeAt(0).toString(16).padStart(4, '0')}`
+  )
+}
+
+/** A value as a JavaScript literal safe to splice into an inline <script>. */
+export function inlineScriptLiteral(value: unknown): string {
+  return encodeJsonForScript(JSON.stringify(value))
+}
diff --git a/mobile/src/components/mobile-markdown-parser.ts b/mobile/src/components/mobile-markdown-parser.ts
index 4227f2a7da68..8c56bd7516d7 100644
--- a/mobile/src/components/mobile-markdown-parser.ts
+++ b/mobile/src/components/mobile-markdown-parser.ts
@@ -1,4 +1,5 @@
 import { isTableSeparator, splitTableRow } from './rich-markdown/markdown-table-rows'
+import { mobileMarkdownVisualPlaceholderIndex } from './mobile-markdown-visual-lines'
 
 export type MobileMarkdownBlock =
   | { type: 'paragraph'; text: string }
@@ -9,11 +10,17 @@ export type MobileMarkdownBlock =
   | { type: 'image'; alt: string; url: string }
   | { type: 'table'; headers: string[]; rows: string[][] }
   | { type: 'rule' }
+  /** A native-chat visual directive; `index` is its position in the protected directive list. */
+  | { type: 'visual'; index: number }
 
 const HEADING = /^(#{1,6})\s+(.+)$/
 const CODE_FENCE = /^```([A-Za-z0-9_-]+)?\s*$/
 
-export function parseMobileMarkdown(content: string): MobileMarkdownBlock[] {
+/** `visualCount`: how many directive placeholders `protectMobileMarkdownVisualLines` left in
+ *  `content`; zero (the default) leaves every line to the ordinary rules. */
+export function parseMobileMarkdown(content: string, visualCount = 0): MobileMarkdownBlock[] {
+  const visualIndex = (line: string): number | null =>
+    visualCount > 0 ? mobileMarkdownVisualPlaceholderIndex(line, visualCount) : null
   const lines = content.replace(/\r\n?/g, '\n').split('\n')
   const blocks: MobileMarkdownBlock[] = []
   let index = 0
@@ -42,6 +49,13 @@ export function parseMobileMarkdown(content: string): MobileMarkdownBlock[] {
       continue
     }
 
+    const visual = visualIndex(line)
+    if (visual !== null) {
+      blocks.push({ type: 'visual', index: visual })
+      index += 1
+      continue
+    }
+
     if (/^\s*(-{3,}|\*{3,}|_{3,})\s*$/.test(line)) {
       blocks.push({ type: 'rule' })
       index += 1
@@ -116,7 +130,8 @@ export function parseMobileMarkdown(content: string): MobileMarkdownBlock[] {
       !HEADING.test(lines[index] ?? '') &&
       !/^>\s?/.test(lines[index] ?? '') &&
       !/^\s*(?:[-*+]|\d+[.)])\s+/.test(lines[index] ?? '') &&
-      !/^\s*(-{3,}|\*{3,}|_{3,})\s*$/.test(lines[index] ?? '')
+      !/^\s*(-{3,}|\*{3,}|_{3,})\s*$/.test(lines[index] ?? '') &&
+      visualIndex(lines[index] ?? '') === null
     ) {
       paragraph.push(lines[index] ?? '')
       index += 1
diff --git a/mobile/src/components/mobile-markdown-visual-lines.test.ts b/mobile/src/components/mobile-markdown-visual-lines.test.ts
new file mode 100644
index 000000000000..61fd60ad45eb
--- /dev/null
+++ b/mobile/src/components/mobile-markdown-visual-lines.test.ts
@@ -0,0 +1,90 @@
+import { describe, expect, it } from 'vitest'
+import { NATIVE_CHAT_VISUAL_MAX_PER_MESSAGE } from '../../../src/shared/native-chat-visual-directive'
+import { normalizeMobileMarkdownPreviewHtml } from './mobile-markdown-preview-html'
+import { parseMobileMarkdown } from './mobile-markdown-parser'
+import { protectMobileMarkdownVisualLines } from './mobile-markdown-visual-lines'
+
+/** The same steps MobileMarkdown runs when a transcript renders visuals. */
+function blocksOf(content: string) {
+  const { text, directives } = protectMobileMarkdownVisualLines(content)
+  return {
+    directives,
+    blocks: parseMobileMarkdown(normalizeMobileMarkdownPreviewHtml(text), directives.length)
+  }
+}
+
+describe('native-chat visual lines in mobile markdown', () => {
+  it('turns a directive line into its own block between prose', () => {
+    const { directives, blocks } = blocksOf(
+      'Here is the chart.\n::orca-visual{file="usage-3f2a.html" title="Usage"}\nIt shows a dip.'
+    )
+    expect(directives).toEqual([{ file: 'usage-3f2a.html', title: 'Usage' }])
+    expect(blocks).toEqual([
+      { type: 'paragraph', text: 'Here is the chart.' },
+      { type: 'visual', index: 0 },
+      { type: 'paragraph', text: 'It shows a dip.' }
+    ])
+  })
+
+  it('keeps the title exactly as written, before entity decoding and tag stripping', () => {
+    const { directives } = blocksOf('::orca-visual{file="a.html" title="<b>Q1</b> &amp; Q2"}')
+    expect(directives).toEqual([{ file: 'a.html', title: '<b>Q1</b> &amp; Q2' }])
+  })
+
+  it('accepts CRLF line endings and up to three leading spaces', () => {
+    const { blocks } = blocksOf('intro\r\n   ::orca-visual{file="a.html"}\r\nend')
+    expect(blocks.map((block) => block.type)).toEqual(['paragraph', 'visual', 'paragraph'])
+  })
+
+  it('leaves directives inside fenced code, quotes, list items and inline code as text', () => {
+    const fenced = blocksOf('```md\n::orca-visual{file="a.html"}\n```')
+    expect(fenced.directives).toEqual([])
+    expect(fenced.blocks).toEqual([
+      { type: 'code', text: '::orca-visual{file="a.html"}', language: 'md', closed: true }
+    ])
+    expect(blocksOf('> ::orca-visual{file="a.html"}').directives).toEqual([])
+    expect(blocksOf('- ::orca-visual{file="a.html"}').directives).toEqual([])
+    expect(blocksOf('see `::orca-visual{file="a.html"}`').directives).toEqual([])
+    expect(blocksOf('    ::orca-visual{file="a.html"}').directives).toEqual([])
+  })
+
+  it('resumes recognizing directives after a fence closes', () => {
+    const { directives } = blocksOf('```\ncode\n```\n::orca-visual{file="after.html"}')
+    expect(directives).toEqual([{ file: 'after.html', title: null }])
+  })
+
+  it('leaves malformed or path-like directives as literal text', () => {
+    for (const line of [
+      '::orca-visual{file="../secret.html"}',
+      '::orca-visual{file="a.html" file="b.html"}',
+      '::orca-visual{file="a.htm"}',
+      '::orca-visual{file="a.html"',
+      '::orca-visual{file="a.html"} trailing words'
+    ]) {
+      const { directives, blocks } = blocksOf(line)
+      expect(directives, line).toEqual([])
+      expect(blocks, line).toEqual([{ type: 'paragraph', text: line }])
+    }
+  })
+
+  it('renders directives past the per-message cap as text', () => {
+    const lines = Array.from(
+      { length: NATIVE_CHAT_VISUAL_MAX_PER_MESSAGE + 1 },
+      (_, index) => `::orca-visual{file="v${index}.html"}`
+    )
+    const { directives, blocks } = blocksOf(lines.join('\n'))
+    expect(directives).toHaveLength(NATIVE_CHAT_VISUAL_MAX_PER_MESSAGE)
+    expect(blocks.at(-1)).toEqual({ type: 'paragraph', text: lines.at(-1) })
+  })
+
+  it('renders no visuals for text that already spells a placeholder', () => {
+    const { directives } = blocksOf('\uE000ORCA_VISUAL_0\uE000\n::orca-visual{file="a.html"}')
+    expect(directives).toEqual([])
+  })
+
+  it('never treats a placeholder-looking line as a visual when none were protected', () => {
+    expect(parseMobileMarkdown('\uE000ORCA_VISUAL_0\uE000')).toEqual([
+      { type: 'paragraph', text: '\uE000ORCA_VISUAL_0\uE000' }
+    ])
+  })
+})
diff --git a/mobile/src/components/mobile-markdown-visual-lines.ts b/mobile/src/components/mobile-markdown-visual-lines.ts
new file mode 100644
index 000000000000..56ab8c14d900
--- /dev/null
+++ b/mobile/src/components/mobile-markdown-visual-lines.ts
@@ -0,0 +1,69 @@
+import {
+  NATIVE_CHAT_VISUAL_MAX_PER_MESSAGE,
+  parseNativeChatVisualDirectiveLine,
+  type NativeChatVisualDirective
+} from '../../../src/shared/native-chat-visual-directive'
+
+/** Same fence shapes the block parser opens and closes on, so a directive inside code stays code. */
+const CODE_FENCE_OPEN = /^```([A-Za-z0-9_-]+)?\s*$/
+const CODE_FENCE_CLOSE = /^```\s*$/
+// Private-use delimiters, as the preview normalizer's own code placeholders use.
+const PLACEHOLDER_PREFIX = '\uE000ORCA_VISUAL_'
+const PLACEHOLDER = /^\uE000ORCA_VISUAL_(\d+)\uE000$/
+
+export type MobileMarkdownVisualLines = {
+  /** The content with each recognized directive line replaced by a placeholder line. */
+  text: string
+  directives: NativeChatVisualDirective[]
+}
+
+function placeholderFor(index: number): string {
+  return `${PLACEHOLDER_PREFIX}${index}\uE000`
+}
+
+/**
+ * Lifts native-chat visual directive lines out of assistant prose before preview normalization,
+ * which decodes entities and strips tags and would otherwise rewrite a title. Only top-level lines
+ * outside fenced code count; quotes and list items never start with the marker. Past the per-message
+ * cap a directive stays literal text.
+ */
+export function protectMobileMarkdownVisualLines(content: string): MobileMarkdownVisualLines {
+  // Text that already spells a placeholder would alias a real one; it renders no visuals at all.
+  if (content.includes(PLACEHOLDER_PREFIX)) {
+    return { text: content, directives: [] }
+  }
+  const lines = content.replace(/\r\n?/g, '\n').split('\n')
+  const directives: NativeChatVisualDirective[] = []
+  let inFence = false
+  const next = lines.map((line) => {
+    if (inFence) {
+      inFence = !CODE_FENCE_CLOSE.test(line)
+      return line
+    }
+    if (CODE_FENCE_OPEN.test(line)) {
+      inFence = true
+      return line
+    }
+    if (directives.length >= NATIVE_CHAT_VISUAL_MAX_PER_MESSAGE) {
+      return line
+    }
+    const directive = parseNativeChatVisualDirectiveLine(line)
+    if (!directive) {
+      return line
+    }
+    directives.push(directive)
+    // Blank lines around it make the directive its own block, splitting any paragraph it was in.
+    return `\n${placeholderFor(directives.length - 1)}\n`
+  })
+  return { text: next.join('\n'), directives }
+}
+
+/** The directive index a parsed line stands for, or null for any other line. */
+export function mobileMarkdownVisualPlaceholderIndex(line: string, count: number): number | null {
+  const match = PLACEHOLDER.exec(line.trim())
+  if (!match) {
+    return null
+  }
+  const index = Number(match[1])
+  return index < count ? index : null
+}
diff --git a/mobile/src/components/pr-sidebar/MermaidDiagram.tsx b/mobile/src/components/pr-sidebar/MermaidDiagram.tsx
index ac5dd9aa3b9a..b7dbe3c28355 100644
--- a/mobile/src/components/pr-sidebar/MermaidDiagram.tsx
+++ b/mobile/src/components/pr-sidebar/MermaidDiagram.tsx
@@ -4,6 +4,7 @@ import { WebView } from 'react-native-webview'
 import { colors, radii, spacing, typography } from '../../theme/mobile-theme'
 import { MERMAID_DIAGRAM_CONFIG } from './mermaid-diagram-config'
 import { MERMAID_ENGINE_JS } from './mermaid-webview-engine.generated'
+import { encodeJsonForScript } from '../inline-script-json'
 
 export type MermaidDiagramProps = {
   source: string
@@ -79,19 +80,6 @@ function MermaidFallback({ source, base }: MermaidDiagramProps) {
   )
 }
 
-// JSON.stringify escapes quotes and control chars but leaves `<`, `>`, `&`, and
-// the U+2028/U+2029 line separators raw — so a value containing `</script>` would
-// close the inline <script> this is spliced into and let the rest execute as
-// markup. These characters only ever appear inside JSON string literals, so
-// escaping them to \uXXXX is always valid and always parses back to the exact
-// original text inside the WebView.
-function encodeJsonForScript(json: string): string {
-  return json.replace(
-    /[<>&\u2028\u2029]/g,
-    (char) => `\\u${char.charCodeAt(0).toString(16).padStart(4, '0')}`
-  )
-}
-
 // Diagram source is untrusted: agent output, PR and chat content.
 function encodeSourceForScript(source: string): string {
   return encodeJsonForScript(JSON.stringify(source))
diff --git a/mobile/src/components/use-mobile-markdown-blocks.ts b/mobile/src/components/use-mobile-markdown-blocks.ts
new file mode 100644
index 000000000000..05074eefcaca
--- /dev/null
+++ b/mobile/src/components/use-mobile-markdown-blocks.ts
@@ -0,0 +1,28 @@
+import { useMemo } from 'react'
+import type { NativeChatVisualDirective } from '../../../src/shared/native-chat-visual-directive'
+import { normalizeMobileMarkdownPreviewHtml } from './mobile-markdown-preview-html'
+import { parseMobileMarkdown, type MobileMarkdownBlock } from './mobile-markdown-parser'
+import { protectMobileMarkdownVisualLines } from './mobile-markdown-visual-lines'
+
+const NO_DIRECTIVES: NativeChatVisualDirective[] = []
+
+/** The blocks MobileMarkdown draws; with `visuals`, directive lines become `visual` blocks. */
+export function useMobileMarkdownBlocks(
+  text: string,
+  visuals: boolean
+): { blocks: MobileMarkdownBlock[]; directives: NativeChatVisualDirective[] } {
+  const visualLines = useMemo(
+    () => (visuals ? protectMobileMarkdownVisualLines(text) : null),
+    [text, visuals]
+  )
+  const previewText = useMemo(
+    () => normalizeMobileMarkdownPreviewHtml(visualLines?.text ?? text),
+    [visualLines, text]
+  )
+  const directives = visualLines?.directives ?? NO_DIRECTIVES
+  const blocks = useMemo(
+    () => parseMobileMarkdown(previewText, directives.length),
+    [previewText, directives.length]
+  )
+  return { blocks, directives }
+}
diff --git a/mobile/src/hooks/use-now.ts b/mobile/src/hooks/use-now.ts
index df3029a4e600..bd3747220b0d 100644
--- a/mobile/src/hooks/use-now.ts
+++ b/mobile/src/hooks/use-now.ts
@@ -2,7 +2,8 @@ import { useEffect, useRef, useState, useSyncExternalStore } from 'react'
 import { AppState, type AppStateStatus } from 'react-native'
 
 const appStateListeners = new Set<() => void>()
-let currentAppState: AppStateStatus | null = AppState.currentState
+// Read on first subscribe, so importing this module never touches AppState.
+let currentAppState: AppStateStatus | null = null
 let appStateSubscription: ReturnType<typeof AppState.addEventListener> | null = null
 
 function subscribeToAppState(listener: () => void): () => void {
diff --git a/mobile/src/mobile-web-shell/page-storage-keys.ts b/mobile/src/mobile-web-shell/page-storage-keys.ts
index fc77cfe27e4d..42c5dce890cb 100644
--- a/mobile/src/mobile-web-shell/page-storage-keys.ts
+++ b/mobile/src/mobile-web-shell/page-storage-keys.ts
@@ -29,7 +29,7 @@ export const PAGE_STORAGE_EXACT_KEYS = [
   'orca:custom-accessory-keys',
   /** Whether a supported agent session opens on the terminal or the native chat. */
   'orca:defaultSessionView',
-  /** The durable send journal: which `agentSession.send` operation ids are still unsettled. */
+  /** Legacy journal access for embedded pages served by older hosts. */
   'orca:mobileStructuredSendOperations:v1',
   /** The terminal's text scale, which pinch-to-zoom writes. */
   'orca:terminalTextScale',
diff --git a/mobile/src/session/MobileNativeChatAsk.test.tsx b/mobile/src/session/MobileNativeChatAsk.test.tsx
new file mode 100644
index 000000000000..85dc36d5901e
--- /dev/null
+++ b/mobile/src/session/MobileNativeChatAsk.test.tsx
@@ -0,0 +1,128 @@
+import { createElement } from 'react'
+import { act, create, type ReactTestRenderer } from 'react-test-renderer'
+import { afterEach, describe, expect, it, vi } from 'vitest'
+import type { AskPrompt } from '../../../src/shared/native-chat-ask'
+import { NATIVE_CHAT_QUESTION_AUTO_ADVANCE_MS } from '../../../src/shared/native-chat-question-auto-advance'
+import { MobileNativeChatAsk } from './MobileNativeChatAsk'
+
+vi.mock('react-native', () => ({
+  Keyboard: { dismiss: () => {} },
+  Pressable: 'Pressable',
+  ScrollView: 'ScrollView',
+  StyleSheet: { create: (styles: unknown) => styles, hairlineWidth: 1 },
+  Text: 'Text',
+  TextInput: 'TextInput',
+  View: 'View',
+  Platform: { OS: 'ios', select: (o: Record<string, unknown>) => o.ios }
+}))
+vi.mock('lucide-react-native', () => ({ Check: 'Check', ChevronDown: 'ChevronDown', X: 'X' }))
+
+const indent = {
+  question: 'Tabs or spaces?',
+  multiSelect: false,
+  options: [{ label: 'Tabs' }, { label: 'Spaces' }]
+}
+const fruit = {
+  question: 'Which fruit?',
+  multiSelect: false,
+  options: [{ label: 'Apple' }, { label: 'Banana' }]
+}
+
+let tree: ReactTestRenderer
+
+function render(prompt: AskPrompt, onAnswer = vi.fn(async () => true)): typeof onAnswer {
+  vi.useFakeTimers()
+  act(() => {
+    tree = create(
+      createElement(MobileNativeChatAsk, { prompt, onAnswer, onCancel: async () => true })
+    )
+  })
+  return onAnswer
+}
+
+function press(label: string): void {
+  const row = tree.root.find((node) => node.props.label === label)
+  act(() => row.props.onPress())
+}
+
+async function passAutoAdvanceBeat(): Promise<void> {
+  await act(async () => {
+    await vi.advanceTimersByTimeAsync(NATIVE_CHAT_QUESTION_AUTO_ADVANCE_MS)
+  })
+}
+
+// The react-native mock above renders host components as plain strings.
+const isHost = (node: { type: unknown }, name: string): boolean => node.type === name
+
+const shows = (text: string): boolean =>
+  tree.root.findAll((node) => isHost(node, 'Text') && node.props.children === text).length > 0
+
+afterEach(() => {
+  act(() => tree.unmount())
+  vi.useRealTimers()
+})
+
+describe('MobileNativeChatAsk single-select auto-advance', () => {
+  it('moves to the next question after a pick and sends after the last one', async () => {
+    const onAnswer = render({ questions: [indent, fruit] })
+
+    press('Spaces')
+    expect(shows('Tabs or spaces?')).toBe(true)
+    await passAutoAdvanceBeat()
+    expect(shows('Which fruit?')).toBe(true)
+    expect(onAnswer).not.toHaveBeenCalled()
+    press('Apple')
+    await passAutoAdvanceBeat()
+
+    expect(onAnswer).toHaveBeenCalledExactlyOnceWith([{ indices: [1] }, { indices: [0] }])
+  })
+
+  it('waits for the typed text when "Other…" is picked', async () => {
+    const onAnswer = render({ questions: [indent] })
+
+    press('Other…')
+    await passAutoAdvanceBeat()
+
+    expect(onAnswer).not.toHaveBeenCalled()
+  })
+
+  it('waits for Submit on a multi-select question', async () => {
+    const onAnswer = render({ questions: [{ ...fruit, multiSelect: true }] })
+
+    press('Apple')
+    await passAutoAdvanceBeat()
+
+    expect(onAnswer).not.toHaveBeenCalled()
+  })
+
+  it('holds its choices while an answer is being delivered', async () => {
+    const onAnswer = render(
+      { questions: [indent] },
+      vi.fn(() => new Promise<boolean>(() => {}))
+    )
+    const row = (label: string) => tree.root.find((node) => node.props.label === label)
+
+    press('Tabs')
+    await passAutoAdvanceBeat()
+    press('Spaces')
+    await passAutoAdvanceBeat()
+
+    expect(row('Spaces').props).toMatchObject({ selected: false, disabled: true })
+    expect(row('Tabs').props.selected).toBe(true)
+    expect(onAnswer).toHaveBeenCalledExactlyOnceWith([{ indices: [0] }])
+  })
+
+  it('sends nothing when the question is cancelled before the pick moves on', async () => {
+    const onAnswer = render({ questions: [indent] })
+
+    press('Spaces')
+    const cancel = tree.root.find(
+      (node) =>
+        isHost(node, 'Pressable') && node.findAll((n) => n.props.children === 'Cancel').length > 0
+    )
+    await act(async () => cancel.props.onPress())
+    await passAutoAdvanceBeat()
+
+    expect(onAnswer).not.toHaveBeenCalled()
+  })
+})
diff --git a/mobile/src/session/MobileNativeChatAsk.tsx b/mobile/src/session/MobileNativeChatAsk.tsx
index 228b266de9ec..afc6ff214b8e 100644
--- a/mobile/src/session/MobileNativeChatAsk.tsx
+++ b/mobile/src/session/MobileNativeChatAsk.tsx
@@ -5,6 +5,7 @@ import type { AskAnswerSelection, AskPrompt } from '../../../src/shared/native-c
 import { colors, radii, spacing, typography } from '../theme/mobile-theme'
 import { TEXT_INPUT_FONT_SIZE } from '../platform/text-input-font-size'
 import { MobileNativeChatCardHeaderAction } from './MobileNativeChatCardHeaderAction'
+import { useMobileNativeChatAskAutoAdvance } from './use-mobile-native-chat-ask-auto-advance'
 
 type Props = {
   prompt: AskPrompt
@@ -22,7 +23,8 @@ const OTHER = -1
 
 /** Native renderer for an agent's AskUserQuestion prompt as a wizard: one
  *  question per step with tabs across the top, a Next button that advances (Send
- *  on the last step), and a Cancel that dismisses the prompt. Neutral styling
+ *  on the last step), and a Cancel that dismisses the prompt. A single-select pick
+ *  moves on by itself, as on desktop. Neutral styling
  *  with a subtle green accent on the active choice to match the rest of the app. */
 export function MobileNativeChatAsk({
   prompt,
@@ -35,18 +37,28 @@ export function MobileNativeChatAsk({
   const [otherText, setOtherText] = useState<string[]>(() => prompt.questions.map(() => ''))
   const [submitting, setSubmitting] = useState(false)
   const submittingRef = useRef(false)
+  const autoAdvance = useMobileNativeChatAskAutoAdvance()
 
+  // A single-select option answers the question, so the card moves on after a beat that shows
+  // it chosen; "Other…" still needs its text.
   const toggle = (qi: number, optIndex: number, multi: boolean): void => {
-    setSelections((prev) => {
-      const next = prev.map((s) => [...s])
-      const cur = next[qi] ?? []
-      if (multi) {
-        next[qi] = cur.includes(optIndex) ? cur.filter((i) => i !== optIndex) : [...cur, optIndex]
-      } else {
-        next[qi] = cur.includes(optIndex) ? [] : [optIndex]
-      }
-      return next
-    })
+    // The ref, not `submitting`: a tap can land before the render that disables the rows.
+    if (submittingRef.current) {
+      return
+    }
+    const cur = selections[qi] ?? []
+    const picked = !cur.includes(optIndex)
+    const chosen = !picked
+      ? cur.filter((i) => i !== optIndex)
+      : multi
+        ? [...cur, optIndex]
+        : [optIndex]
+    const next = selections.map((s, i) => (i === qi ? chosen : s))
+    setSelections(next)
+    autoAdvance.cancel()
+    if (picked && !multi && optIndex !== OTHER) {
+      autoAdvance.schedule(() => void advance(next))
+    }
   }
 
   const setOther = (qi: number, value: string): void => {
@@ -57,15 +69,16 @@ export function MobileNativeChatAsk({
     })
   }
 
-  const selectionFor = (qi: number): AskAnswerSelection => {
-    const picked = (selections[qi] ?? []).filter((i) => i !== OTHER)
-    const other = (selections[qi] ?? []).includes(OTHER) ? (otherText[qi] ?? '').trim() : ''
+  // `sel` is an explicit snapshot so a just-made pick isn't lost to the async setState.
+  const selectionFor = (qi: number, sel = selections): AskAnswerSelection => {
+    const picked = (sel[qi] ?? []).filter((i) => i !== OTHER)
+    const other = (sel[qi] ?? []).includes(OTHER) ? (otherText[qi] ?? '').trim() : ''
     return other ? { indices: picked, other } : { indices: picked }
   }
 
-  const isAnswered = (qi: number): boolean => {
-    const sel = selectionFor(qi)
-    return sel.indices.length > 0 || (sel.other ?? '').length > 0
+  const isAnswered = (qi: number, sel = selections): boolean => {
+    const answer = selectionFor(qi, sel)
+    return answer.indices.length > 0 || (answer.other ?? '').length > 0
   }
 
   const total = prompt.questions.length
@@ -82,23 +95,24 @@ export function MobileNativeChatAsk({
   )
   const canAdvance = !submitting && (isLast ? allAnswered : currentAnswered)
 
-  const submit = async (): Promise<void> => {
-    if (!allAnswered || submittingRef.current) {
+  const submit = async (sel: number[][]): Promise<void> => {
+    if (!prompt.questions.every((_, i) => isAnswered(i, sel)) || submittingRef.current) {
       return
     }
     submittingRef.current = true
     setSubmitting(true)
     try {
-      await onAnswer(prompt.questions.map((_, i) => selectionFor(i)))
+      await onAnswer(prompt.questions.map((_, i) => selectionFor(i, sel)))
     } finally {
       submittingRef.current = false
       setSubmitting(false)
     }
   }
 
-  const advance = async (): Promise<void> => {
+  const advance = async (sel = selections): Promise<void> => {
+    autoAdvance.cancel()
     if (isLast) {
-      await submit()
+      await submit(sel)
     } else {
       setIndex((i) => Math.min(i + 1, total - 1))
     }
@@ -121,7 +135,11 @@ export function MobileNativeChatAsk({
             <Pressable
               key={i}
               style={[styles.tab, i === index && styles.tabActive]}
-              onPress={() => setIndex(i)}
+              disabled={submitting}
+              onPress={() => {
+                autoAdvance.cancel()
+                setIndex(i)
+              }}
             >
               <Text style={[styles.tabText, i === index && styles.tabTextActive]} numberOfLines={1}>
                 {qq.header || `Step ${i + 1}`}
@@ -137,7 +155,16 @@ export function MobileNativeChatAsk({
       <ScrollView style={styles.scroll} keyboardShouldPersistTaps="always">
         <View style={styles.questionRow}>
           <Text style={styles.questionText}>{q.question}</Text>
-          <MobileNativeChatCardHeaderAction onCollapse={onCollapse} disabled={submitting} />
+          <MobileNativeChatCardHeaderAction
+            onCollapse={
+              onCollapse &&
+              (() => {
+                autoAdvance.cancel()
+                onCollapse()
+              })
+            }
+            disabled={submitting}
+          />
         </View>
         {q.options.map((opt, optIndex) => (
           <OptionRow
@@ -146,6 +173,7 @@ export function MobileNativeChatAsk({
             description={opt.description}
             selected={(selections[index] ?? []).includes(optIndex)}
             multi={q.multiSelect}
+            disabled={submitting}
             onPress={() => toggle(index, optIndex, q.multiSelect)}
           />
         ))}
@@ -153,6 +181,7 @@ export function MobileNativeChatAsk({
           label="Other…"
           selected={otherSelected}
           multi={q.multiSelect}
+          disabled={submitting}
           onPress={() => toggle(index, OTHER, q.multiSelect)}
         />
         {otherSelected ? (
@@ -172,6 +201,7 @@ export function MobileNativeChatAsk({
         <Pressable
           style={styles.cancel}
           onPress={async () => {
+            autoAdvance.cancel()
             if (!submittingRef.current && onCancel) {
               submittingRef.current = true
               setSubmitting(true)
@@ -195,7 +225,7 @@ export function MobileNativeChatAsk({
         ) : null}
         <Pressable
           style={[styles.next, !canAdvance && styles.nextDisabled]}
-          onPress={advance}
+          onPress={() => void advance()}
           disabled={!canAdvance}
         >
           <Text style={[styles.nextText, !canAdvance && styles.nextTextDisabled]}>
@@ -212,16 +242,22 @@ function OptionRow({
   description,
   selected,
   multi,
+  disabled,
   onPress
 }: {
   label: string
   description?: string
   selected: boolean
   multi?: boolean
+  disabled: boolean
   onPress: () => void
 }): React.JSX.Element {
   return (
-    <Pressable style={[styles.option, selected && styles.optionSelected]} onPress={onPress}>
+    <Pressable
+      style={[styles.option, selected && styles.optionSelected]}
+      disabled={disabled}
+      onPress={onPress}
+    >
       {/* Multi-select reads as a checkbox (square); single-select as a radio (circle). */}
       <View
         style={[
diff --git a/mobile/src/session/MobileNativeChatBackgroundTasks.test.tsx b/mobile/src/session/MobileNativeChatBackgroundTasks.test.tsx
new file mode 100644
index 000000000000..5d582b111a3f
--- /dev/null
+++ b/mobile/src/session/MobileNativeChatBackgroundTasks.test.tsx
@@ -0,0 +1,399 @@
+import { createElement } from 'react'
+import { act, create, type ReactTestInstance, type ReactTestRenderer } from 'react-test-renderer'
+import { afterEach, describe, expect, it, vi } from 'vitest'
+import { agentChildRowContextForSessionStream } from '../../../src/shared/agent-child-row-stream-context'
+import type { AgentChildWorkView } from '../../../src/shared/agent-status-child-work-view'
+import type { AgentSessionBackgroundTaskState } from '../../../src/shared/agent-session-wire'
+import { structuredSessionBackgroundTasksView } from '../../../src/shared/structured-session-background-tasks-view'
+import { MobileNativeChatBackgroundTasks } from './MobileNativeChatBackgroundTasks'
+
+const NOW = 10_000_000
+const windowWidth = vi.hoisted(() => ({ value: 430 }))
+
+vi.mock('react-native', () => ({
+  Dimensions: { get: () => ({ width: windowWidth.value, height: 900 }) },
+  Pressable: 'Pressable',
+  ScrollView: 'ScrollView',
+  StyleSheet: { create: (styles: unknown) => styles, hairlineWidth: 1 },
+  Text: 'Text',
+  View: 'View'
+}))
+vi.mock('lucide-react-native', () => ({
+  Activity: 'Activity',
+  Bot: 'Bot',
+  ChevronDown: 'ChevronDown',
+  CircleHelp: 'CircleHelp',
+  SquareTerminal: 'SquareTerminal',
+  Workflow: 'Workflow'
+}))
+vi.mock('../components/AgentStateDot', () => ({
+  AGENT_WORKING_COLOR: '#eab308',
+  AgentStateDot: 'AgentStateDot'
+}))
+vi.mock('../hooks/use-now', () => ({ useNow: () => NOW }))
+
+function view(id: string, overrides: Partial<AgentChildWorkView> = {}): AgentChildWorkView {
+  return {
+    id,
+    providerId: `task-${id}`,
+    kind: 'agent',
+    description: `review ${id}`,
+    state: 'working',
+    membership: 'live',
+    firstObservedAt: NOW - 65_000,
+    observedAt: NOW - 1_000,
+    stoppable: true,
+    invocation: { invocationId: `spawn-${id}`, generation: 1 },
+    ...overrides
+  }
+}
+
+type Props = Parameters<typeof MobileNativeChatBackgroundTasks>[0]
+
+function tasksFor(
+  state: AgentSessionBackgroundTaskState | null,
+  options: {
+    streamLive?: boolean
+    hostClockOffsetMs?: number
+    stop?: (taskId?: string) => Promise<unknown>
+  } = {}
+): Props['tasks'] {
+  return {
+    view: structuredSessionBackgroundTasksView(state, null),
+    rowContext: agentChildRowContextForSessionStream(
+      options.streamLive ?? true,
+      options.hostClockOffsetMs ?? 0
+    ),
+    sessionKey: 'session-a',
+    stop: options.stop ?? vi.fn(async () => undefined)
+  }
+}
+
+describe('MobileNativeChatBackgroundTasks', () => {
+  let renderer: ReactTestRenderer | null = null
+
+  afterEach(() => {
+    act(() => renderer?.unmount())
+    renderer = null
+    windowWidth.value = 430
+  })
+
+  function mount(tasks: Props['tasks']): ReactTestRenderer {
+    act(() => renderer?.unmount())
+    const mounted = create(createElement('View'))
+    renderer = mounted
+    act(() => {
+      mounted.update(createElement(MobileNativeChatBackgroundTasks, { tasks }))
+    })
+    return mounted
+  }
+
+  function textOf(node: ReactTestInstance): string {
+    return node.children
+      .map((child) => (typeof child === 'string' ? child : textOf(child)))
+      .join('')
+  }
+
+  function styleOf(node: ReactTestInstance): Record<string, unknown> {
+    const rendered: unknown =
+      typeof node.props.style === 'function'
+        ? node.props.style({ pressed: false })
+        : node.props.style
+    const parts = Array.isArray(rendered) ? rendered : [rendered]
+    return Object.assign(
+      {},
+      ...parts.filter(
+        (part): part is Record<string, unknown> => typeof part === 'object' && part !== null
+      )
+    )
+  }
+
+  function header(mounted: ReactTestRenderer): ReactTestInstance {
+    return mounted.root.findAll(
+      (node) =>
+        String(node.type) === 'Pressable' && node.props.accessibilityState?.expanded !== undefined
+    )[0]!
+  }
+
+  function expand(mounted: ReactTestRenderer): void {
+    act(() => header(mounted).props.onPress())
+  }
+
+  function stopButtons(mounted: ReactTestRenderer): ReactTestInstance[] {
+    return mounted.root.findAll(
+      (node) =>
+        String(node.type) === 'Pressable' &&
+        typeof node.props.accessibilityLabel === 'string' &&
+        node.props.accessibilityLabel.startsWith('Stop')
+    )
+  }
+
+  it('draws nothing while no child work runs', () => {
+    expect(mount(tasksFor(null)).toJSON()).toBeNull()
+    expect(
+      mount(
+        tasksFor({ state: 'monitoring', settledTasks: [{ id: 'old', kind: 'agent' }] })
+      ).toJSON()
+    ).toBeNull()
+  })
+
+  it('counts by kind on a wide strip and drops to a total once narrow', () => {
+    const mounted = mount(
+      tasksFor({
+        state: 'monitoring',
+        children: [view('a'), view('b'), view('s', { kind: 'command', description: 'npm test' })]
+      })
+    )
+    expect(header(mounted).props.accessibilityLabel).toBe('2 agents · 1 shell')
+    const strip = mounted.root.find((node) => node.props.testID === 'background-tasks-strip')
+    act(() => strip.props.onLayout({ nativeEvent: { layout: { width: 343 } } }))
+    expect(header(mounted).props.accessibilityLabel).toBe('3 background tasks')
+  })
+
+  it('starts narrow on a phone-width window, as desktop starts from its viewport', () => {
+    windowWidth.value = 375
+    const mounted = mount(
+      tasksFor({
+        state: 'monitoring',
+        children: [view('a'), view('s', { kind: 'command', description: 'npm test' })]
+      })
+    )
+    expect(header(mounted).props.accessibilityLabel).toBe('2 background tasks')
+  })
+
+  it('leads with a waiting agent and its reason', () => {
+    const mounted = mount(
+      tasksFor({ state: 'monitoring', children: [view('a', { state: 'waiting' })] })
+    )
+    expect(header(mounted).props.accessibilityLabel).toBe('1 agent waiting — needs approval')
+  })
+
+  it('opens to rows grouped by kind, with tokens and elapsed', () => {
+    const mounted = mount(
+      tasksFor({ state: 'monitoring', children: [view('a', { totalTokens: 18_130 })] })
+    )
+    expect(
+      mounted.root.findAll((node) => node.props.testID === 'background-task-row')
+    ).toHaveLength(0)
+    expand(mounted)
+    const rows = mounted.root.findAll((node) => node.props.testID === 'background-task-row')
+    expect(rows.map(textOf)).toEqual(['review a · Agent18.1k · 1m 5s'])
+    // Uppercased by style, so a screen reader hears the word itself.
+    const label = mounted.root.find(
+      (node) => String(node.type) === 'Text' && node.props.children === 'Agents'
+    )
+    expect(label.props.style).toMatchObject({ textTransform: 'uppercase' })
+  })
+
+  it('keeps the collapsed header compact and requests a 44pt hit rectangle', () => {
+    const mounted = mount(tasksFor({ state: 'monitoring', children: [view('a')] }))
+    const toggle = header(mounted)
+    const style = styleOf(toggle)
+    expect(style.minHeight).toBe(36)
+    expect(toggle.props.hitSlop).toBe(4)
+    // Requested geometry only: the native parent can bound hitSlop.
+    expect(Number(style.minHeight) + 2 * toggle.props.hitSlop).toBe(44)
+    expect(style.height).toBeUndefined()
+    expect(style.maxHeight).toBeUndefined()
+    expect(toggle.props.accessibilityState.expanded).toBe(false)
+    expand(mounted)
+    expect(header(mounted).props.accessibilityState.expanded).toBe(true)
+    expand(mounted)
+    expect(header(mounted).props.accessibilityState.expanded).toBe(false)
+  })
+
+  it('uses compact rows and Stop controls with tight group spacing', () => {
+    const mounted = mount(
+      tasksFor({ state: 'monitoring', supportsTaskStop: true, children: [view('a'), view('b')] })
+    )
+    expand(mounted)
+    const rows = mounted.root.findAll((node) => node.props.testID === 'background-task-row')
+    expect(rows).toHaveLength(2)
+    for (const row of rows) {
+      expect(row.type).toBe('View')
+      expect(row.props.hitSlop).toBeUndefined()
+      expect(styleOf(row).minHeight).toBe(32)
+    }
+    const stops = stopButtons(mounted)
+    expect(stops).toHaveLength(2)
+    for (const stop of stops) {
+      const style = styleOf(stop)
+      expect(style).toMatchObject({ minHeight: 32, minWidth: 44 })
+      expect(stop.props.hitSlop).toBe(6)
+      expect(Number(style.minHeight) + 2 * stop.props.hitSlop).toBe(44)
+    }
+    const label = mounted.root.find(
+      (node) => String(node.type) === 'Text' && node.props.children === 'Agents'
+    )
+    expect(label.parent?.props.style).toMatchObject({ paddingTop: 4, paddingBottom: 4 })
+    expect(styleOf(label).paddingBottom).toBe(2)
+  })
+
+  it('lets compact content grow with Dynamic Type and ellipsizes single-line fields', () => {
+    windowWidth.value = 320
+    const mounted = mount(
+      tasksFor({
+        state: 'monitoring',
+        supportsTaskStop: true,
+        children: [view('a', { state: 'waiting', description: 'A long agent task '.repeat(20) })]
+      })
+    )
+    expand(mounted)
+    const row = mounted.root.find((node) => node.props.testID === 'background-task-row')
+    const rowText = row.find(
+      (node) => String(node.type) === 'Text' && node.props.numberOfLines === 1
+    )
+    expect(rowText.props.ellipsizeMode).toBe('tail')
+    expect(styleOf(rowText)).toMatchObject({ flex: 1, minWidth: 0, fontSize: 12 })
+    const headerTexts = header(mounted).findAll((node) => String(node.type) === 'Text')
+    for (const text of headerTexts) {
+      expect(text.props).toMatchObject({ numberOfLines: 1, ellipsizeMode: 'tail' })
+      expect(styleOf(text)).toMatchObject({ flexShrink: 1, fontSize: 12 })
+    }
+    for (const node of mounted.root.findAll((node) =>
+      ['View', 'Text', 'Pressable'].includes(String(node.type))
+    )) {
+      expect(styleOf(node).height).toBeUndefined()
+      expect(styleOf(node).maxHeight).toBeUndefined()
+      expect(styleOf(node).lineHeight).toBeUndefined()
+      if (String(node.type) === 'Text') {
+        expect(node.props.allowFontScaling).not.toBe(false)
+        expect(node.props.maxFontSizeMultiplier).toBeUndefined()
+      }
+    }
+  })
+
+  it('stops one row by its provider id and holds its button while the Stop is on its way', async () => {
+    let finish: () => void = () => {}
+    const stop = vi.fn(() => new Promise<void>((resolve) => (finish = resolve)))
+    const mounted = mount(
+      tasksFor(
+        {
+          state: 'monitoring',
+          supportsTaskStop: true,
+          children: [view('a'), view('b', { stoppable: false })]
+        },
+        { stop }
+      )
+    )
+    expand(mounted)
+    const buttons = stopButtons(mounted)
+    expect(buttons.map((button) => button.props.accessibilityLabel)).toEqual(['Stop review a'])
+    act(() => buttons[0]!.props.onPress())
+    act(() => buttons[0]!.props.onPress())
+    expect(stop).toHaveBeenCalledTimes(1)
+    expect(stop).toHaveBeenCalledWith('task-a')
+    expect(stopButtons(mounted)[0]!.props.disabled).toBe(true)
+    await act(async () => finish())
+    expect(stopButtons(mounted)[0]!.props.disabled).toBe(false)
+  })
+
+  it('offers Stop all only to a host with no per-row stop that still accepts one', async () => {
+    let finish: () => void = () => {}
+    const stop = vi.fn(() => new Promise<void>((resolve) => (finish = resolve)))
+    const fallback = mount(tasksFor({ state: 'monitoring', children: [view('a')] }, { stop }))
+    expand(fallback)
+    expect(stopButtons(fallback).map((button) => button.props.accessibilityLabel)).toEqual([
+      'Stop background tasks'
+    ])
+    const button = stopButtons(fallback)[0]!
+    expect(styleOf(button)).toMatchObject({ minHeight: 32, minWidth: 44 })
+    expect(button.props.hitSlop).toBe(6)
+    expect(Number(styleOf(button).minHeight) + 2 * button.props.hitSlop).toBe(44)
+    act(() => button.props.onPress())
+    act(() => button.props.onPress())
+    expect(stop).toHaveBeenCalledTimes(1)
+    expect(stop).toHaveBeenCalledWith(undefined)
+    expect(stopButtons(fallback)[0]!.props.disabled).toBe(true)
+    await act(async () => finish())
+    expect(stopButtons(fallback)[0]!.props.disabled).toBe(false)
+    const none = mount(
+      tasksFor({ state: 'monitoring', supportsStopAll: false, children: [view('a')] })
+    )
+    expand(none)
+    expect(stopButtons(none)).toEqual([])
+  })
+
+  it("reads an older host's task roster when it publishes no child views", () => {
+    const mounted = mount(
+      tasksFor({
+        state: 'monitoring',
+        tasks: [
+          { id: 'a', kind: 'agent', state: 'working', startedAt: NOW - 1_000 },
+          { id: 'b', kind: 'agent', state: 'waiting', startedAt: NOW - 1_000 }
+        ]
+      })
+    )
+    expect(header(mounted).props.accessibilityLabel).toBe('2 agents — 1 working, 1 waiting')
+    expand(mounted)
+    expect(
+      mounted.root.findAll((node) => node.props.testID === 'background-task-row').map(textOf)
+    ).toEqual(['Background agent1s', 'Background agent · needs approval1s'])
+  })
+
+  it("reads elapsed on the host's clock when the phone's runs ahead", () => {
+    // The phone is 30 s ahead of the host that stamped the child's start.
+    const mounted = mount(
+      tasksFor(
+        { state: 'monitoring', children: [view('a', { totalTokens: 900 })] },
+        { hostClockOffsetMs: 30_000 }
+      )
+    )
+    expand(mounted)
+    expect(
+      mounted.root.findAll((node) => node.props.testID === 'background-task-row').map(textOf)
+    ).toEqual(['review a · Agent900 · 35s'])
+  })
+
+  it('starts narrow when the window less its margins is narrow', () => {
+    windowWidth.value = 400
+    const mounted = mount(
+      tasksFor({
+        state: 'monitoring',
+        children: [view('a'), view('s', { kind: 'command', description: 'npm test' })]
+      })
+    )
+    expect(header(mounted).props.accessibilityLabel).toBe('2 background tasks')
+  })
+
+  it('keeps one kind in its state forms on a phone-width strip', () => {
+    windowWidth.value = 375
+    const waiting = mount(
+      tasksFor({
+        state: 'monitoring',
+        children: [view('a', { state: 'waiting' }), view('b', { state: 'waiting' })]
+      })
+    )
+    expect(header(waiting).props.accessibilityLabel).toBe('2 agents waiting — needs approval')
+    const mixed = mount(
+      tasksFor({ state: 'monitoring', children: [view('a'), view('b', { state: 'waiting' })] })
+    )
+    expect(header(mixed).props.accessibilityLabel).toBe('2 agents — 1 working, 1 waiting')
+  })
+
+  it('cuts the header off on one line on the smallest phones, never wrapping it', () => {
+    windowWidth.value = 320
+    const mounted = mount(
+      tasksFor({
+        state: 'monitoring',
+        children: [view('a'), view('b', { state: 'waiting' }), view('c', { state: 'unverifiable' })]
+      })
+    )
+    const texts = header(mounted).findAll((node) => String(node.type) === 'Text')
+    expect(texts.length).toBeGreaterThan(0)
+    expect(texts.map((text) => [text.props.numberOfLines, text.props.ellipsizeMode])).toEqual(
+      texts.map(() => [1, 'tail'])
+    )
+  })
+
+  it('claims no live work once the stream is lost', () => {
+    const mounted = mount(
+      tasksFor({ state: 'monitoring', children: [view('a'), view('b')] }, { streamLive: false })
+    )
+    expect(header(mounted).props.accessibilityLabel).toBe('2 agents with status unavailable')
+    expand(mounted)
+    const dots = mounted.root.findAll((node) => String(node.type) === 'AgentStateDot')
+    expect(dots.map((dot) => dot.props.state)).toEqual(['unverifiable', 'unverifiable'])
+    expect(textOf(mounted.root)).toContain('review a · No update in 0m')
+  })
+})
diff --git a/mobile/src/session/MobileNativeChatBackgroundTasks.tsx b/mobile/src/session/MobileNativeChatBackgroundTasks.tsx
new file mode 100644
index 000000000000..33dd4807ede5
--- /dev/null
+++ b/mobile/src/session/MobileNativeChatBackgroundTasks.tsx
@@ -0,0 +1,420 @@
+import { memo, useMemo, useRef, useState } from 'react'
+import {
+  Dimensions,
+  type LayoutChangeEvent,
+  Pressable,
+  ScrollView,
+  StyleSheet,
+  Text,
+  View
+} from 'react-native'
+import {
+  Activity,
+  Bot,
+  ChevronDown,
+  CircleHelp,
+  SquareTerminal,
+  Workflow
+} from 'lucide-react-native'
+import type { AgentChildRowModel } from '../../../src/shared/agent-child-row-model'
+import type { AgentSessionBackgroundTask } from '../../../src/shared/agent-session-wire'
+import { sayBackgroundTaskEnglish as say } from '../../../src/shared/background-task-copy'
+import {
+  backgroundTasksHeaderContent,
+  backgroundTasksHeaderText,
+  NARROW_BACKGROUND_TASKS_STRIP_REM
+} from '../../../src/shared/background-task-header-content'
+import {
+  backgroundTaskGroupLabel,
+  backgroundTaskRowMeta,
+  backgroundTaskRowStopId,
+  backgroundTasksStripTicks,
+  buildBackgroundTaskGroups,
+  buildBackgroundTaskGroupsFromViews
+} from '../../../src/shared/background-task-roster'
+import { AGENT_WORKING_COLOR, AgentStateDot } from '../components/AgentStateDot'
+import { useNow } from '../hooks/use-now'
+import { colors, radii, spacing, typography } from '../theme/mobile-theme'
+import type { MobileStructuredBackgroundTasks } from './use-mobile-structured-background-tasks'
+import { mobileAgentChildRowName, mobileAgentChildRowText } from './mobile-agent-child-row-text'
+
+type TaskKind = AgentSessionBackgroundTask['kind']
+
+function KindIcon({ kind, size }: { kind: TaskKind; size: number }): React.JSX.Element {
+  const props = { size, color: kindIconColor(kind), strokeWidth: 2 }
+  switch (kind) {
+    case 'agent':
+      return <Bot {...props} />
+    case 'command':
+      return <SquareTerminal {...props} />
+    case 'monitor':
+      return <Activity {...props} />
+    case 'workflow':
+      return <Workflow {...props} />
+    case 'unknown':
+      return <CircleHelp {...props} />
+  }
+}
+
+// React Native has no root font; its points stand in for desktop's 16 px rem.
+const NARROW_STRIP_WIDTH = NARROW_BACKGROUND_TASKS_STRIP_REM * 16
+
+// Monitoring is drawn in the same amber everywhere it shows; the other kinds are plain markers.
+function kindIconColor(kind: TaskKind): string {
+  return kind === 'monitor' ? AGENT_WORKING_COLOR : colors.textMuted
+}
+
+type Stopping = { taskIds: ReadonlySet<string>; all: boolean }
+const NOT_STOPPING: Stopping = { taskIds: new Set(), all: false }
+
+function TaskRow({
+  row,
+  now,
+  hostNow,
+  supportsTaskStop,
+  stopping,
+  onStop
+}: {
+  row: AgentChildRowModel
+  now: number
+  /** `now` on the host's clock, which stamps every elapsed anchor. */
+  hostNow: number
+  supportsTaskStop: boolean
+  stopping: Stopping
+  onStop: (taskId: string) => void
+}): React.JSX.Element {
+  const { lead, trail } = mobileAgentChildRowText(row, now)
+  const meta = backgroundTaskRowMeta(row, hostNow)
+  const stopId = backgroundTaskRowStopId(row, supportsTaskStop)
+  const busy = stopId !== null && stopping.taskIds.has(stopId)
+  return (
+    <>
+      <View testID="background-task-row" style={styles.row}>
+        <KindIcon kind={row.kind} size={14} />
+        <AgentStateDot state={row.displayState} />
+        <Text style={styles.rowText} numberOfLines={1} ellipsizeMode="tail">
+          <Text style={styles.lead}>{lead}</Text>
+          {trail ? <Text style={styles.trail}>{` · ${trail}`}</Text> : null}
+        </Text>
+        {meta ? (
+          // Reticks every second; screen readers hear the row's state, not its clock.
+          <Text style={styles.meta} importantForAccessibility="no" accessibilityElementsHidden>
+            {meta}
+          </Text>
+        ) : null}
+        {stopId !== null ? (
+          <Pressable
+            accessibilityRole="button"
+            accessibilityLabel={say('stopTask', { value0: mobileAgentChildRowName(row) })}
+            accessibilityState={{ disabled: busy }}
+            disabled={busy}
+            hitSlop={6}
+            style={({ pressed }) => [
+              styles.textAction,
+              pressed && styles.pressed,
+              busy && styles.disabled
+            ]}
+            onPress={() => onStop(stopId)}
+          >
+            <Text style={styles.actionLabel}>{say('stop')}</Text>
+          </Pressable>
+        ) : null}
+      </View>
+      {row.owned.length > 0 ? (
+        // Work a child owns (its shell, a nested agent) reads beneath it, not in its kind's group.
+        <View style={styles.owned}>
+          {row.owned.map((owned) => (
+            <TaskRow
+              key={owned.id}
+              row={owned}
+              now={now}
+              hostNow={hostNow}
+              supportsTaskStop={supportsTaskStop}
+              stopping={stopping}
+              onStop={onStop}
+            />
+          ))}
+        </View>
+      ) : null}
+    </>
+  )
+}
+
+/** The session's running child work — agents, shells, monitors, workflows — as one collapsible box
+ *  above the composer. Desktop parity: `NativeChatBackgroundTasksStatus`, from the same host roster
+ *  and the same shared grouping, header and Stop rules. Mounted per conversation, so its open and
+ *  stopping state outlive the moment a sequential fan-out's roster empties between children. */
+function MobileNativeChatBackgroundTasksImpl({
+  tasks
+}: {
+  tasks: MobileStructuredBackgroundTasks
+}): React.JSX.Element | null {
+  const { view, rowContext, stop } = tasks
+  const [expanded, setExpanded] = useState(false)
+  // Before the first layout, the window less the strip's own margins, so it opens in its final form.
+  const [narrow, setNarrow] = useState(
+    () => Dimensions.get('window').width - 2 * spacing.lg < NARROW_STRIP_WIDTH
+  )
+  const [stopping, setStopping] = useState<Stopping>(NOT_STOPPING)
+  const stoppingRef = useRef(NOT_STOPPING)
+  const groups = useMemo(
+    () =>
+      view.children !== undefined
+        ? buildBackgroundTaskGroupsFromViews(view.children, rowContext)
+        : buildBackgroundTaskGroups(view.tasks, view.settledTasks, say),
+    [view.children, view.tasks, view.settledTasks, rowContext]
+  )
+  const now = useNow(1_000, view.show && backgroundTasksStripTicks(groups, expanded))
+  if (!view.show) {
+    return null
+  }
+  // Elapsed anchors are host-stamped; read them on the host's clock, as the turn bar's start is.
+  const hostNow = now - rowContext.hostClockOffsetMs
+  const header = backgroundTasksHeaderContent(groups, { narrow, now: hostNow }, say)
+
+  const updateStopping = (next: Stopping): void => {
+    stoppingRef.current = next
+    setStopping(next)
+  }
+  // A press already on its way holds its button; the ref closes the same-frame double tap.
+  const onStop = (taskId?: string): void => {
+    const current = stoppingRef.current
+    if (taskId ? current.taskIds.has(taskId) : current.all) {
+      return
+    }
+    updateStopping({
+      taskIds: taskId ? new Set([...current.taskIds, taskId]) : current.taskIds,
+      all: taskId ? current.all : true
+    })
+    void stop(taskId).finally(() => {
+      const latest = stoppingRef.current
+      const taskIds = new Set(latest.taskIds)
+      if (taskId) {
+        taskIds.delete(taskId)
+      }
+      updateStopping({ taskIds, all: taskId ? latest.all : false })
+    })
+  }
+  const onLayout = (event: LayoutChangeEvent): void => {
+    setNarrow(event.nativeEvent.layout.width < NARROW_STRIP_WIDTH)
+  }
+
+  return (
+    <View style={styles.list} onLayout={onLayout} testID="background-tasks-strip">
+      <View style={styles.box}>
+        <Pressable
+          accessibilityRole="button"
+          accessibilityState={{ expanded }}
+          accessibilityLabel={backgroundTasksHeaderText(header)}
+          hitSlop={spacing.xs}
+          style={({ pressed }) => [styles.header, pressed && styles.pressed]}
+          onPress={() => setExpanded(!expanded)}
+        >
+          <View style={styles.headerText}>
+            {header.segments.map((segment, index) => {
+              return (
+                <View key={segment.kind ?? 'total'} style={styles.segment}>
+                  {index > 0 ? <Text style={styles.separator}>·</Text> : null}
+                  {segment.kind ? (
+                    // The turn owns the voice: same icons, dimmed until it ends.
+                    <View style={view.isMonitoring ? undefined : styles.dimmed}>
+                      <KindIcon kind={segment.kind} size={12} />
+                    </View>
+                  ) : null}
+                  <Text style={styles.segmentText} numberOfLines={1} ellipsizeMode="tail">
+                    {segment.text}
+                  </Text>
+                </View>
+              )
+            })}
+            {header.detail ? (
+              <Text style={styles.detail} numberOfLines={1} ellipsizeMode="tail">
+                {header.segments.length > 0 ? `— ${header.detail}` : header.detail}
+              </Text>
+            ) : null}
+          </View>
+          <View style={expanded ? styles.caretOpen : undefined}>
+            <ChevronDown size={14} color={colors.textMuted} strokeWidth={2} />
+          </View>
+        </Pressable>
+        {expanded ? (
+          <ScrollView style={styles.body} nestedScrollEnabled>
+            {groups.length > 0 ? (
+              groups.map((group) => (
+                <View key={group.kind} style={styles.group}>
+                  <Text style={styles.groupLabel}>{backgroundTaskGroupLabel(group.kind, say)}</Text>
+                  {group.tasks.map((entry) => (
+                    <TaskRow
+                      key={entry.row.id}
+                      row={entry.row}
+                      now={now}
+                      hostNow={hostNow}
+                      supportsTaskStop={view.supportsStop}
+                      stopping={stopping}
+                      onStop={onStop}
+                    />
+                  ))}
+                </View>
+              ))
+            ) : (
+              <Text style={styles.unavailable}>{say('detailsUnavailable')}</Text>
+            )}
+            {!view.supportsStop && view.supportsStopAll ? (
+              <Pressable
+                accessibilityRole="button"
+                accessibilityLabel={say('stopAll')}
+                accessibilityState={{ disabled: stopping.all }}
+                disabled={stopping.all}
+                hitSlop={6}
+                style={({ pressed }) => [
+                  styles.textAction,
+                  styles.stopAll,
+                  pressed && styles.pressed,
+                  stopping.all && styles.disabled
+                ]}
+                onPress={() => onStop()}
+              >
+                <Text style={styles.actionLabel}>{say('stop')}</Text>
+              </Pressable>
+            ) : null}
+          </ScrollView>
+        ) : null}
+      </View>
+    </View>
+  )
+}
+
+export const MobileNativeChatBackgroundTasks = memo(MobileNativeChatBackgroundTasksImpl)
+
+// hitSlop requests 44pt hit rects; compact native parent bounds still limit their reach.
+const MIN_TOUCH_TARGET = 44
+
+const styles = StyleSheet.create({
+  list: {
+    marginHorizontal: spacing.lg,
+    marginVertical: spacing.xs
+  },
+  box: {
+    backgroundColor: colors.bgPanel,
+    borderRadius: radii.row,
+    borderWidth: StyleSheet.hairlineWidth,
+    borderColor: colors.borderSubtle,
+    overflow: 'hidden'
+  },
+  header: {
+    minHeight: 36,
+    flexDirection: 'row',
+    alignItems: 'center',
+    gap: spacing.sm,
+    paddingHorizontal: spacing.md
+  },
+  headerText: {
+    flex: 1,
+    minWidth: 0,
+    flexDirection: 'row',
+    alignItems: 'center',
+    gap: spacing.xs,
+    overflow: 'hidden'
+  },
+  // Every piece may shrink, so large Dynamic Type ellipsizes the header instead of clipping it.
+  segment: {
+    flexDirection: 'row',
+    alignItems: 'center',
+    gap: spacing.xs,
+    flexShrink: 1,
+    minWidth: 0
+  },
+  separator: {
+    color: colors.textMuted,
+    fontSize: typography.metaSize
+  },
+  segmentText: {
+    flexShrink: 1,
+    color: colors.textPrimary,
+    fontSize: typography.metaSize,
+    fontWeight: '500'
+  },
+  detail: {
+    flexShrink: 1,
+    color: colors.textMuted,
+    fontSize: typography.metaSize
+  },
+  dimmed: {
+    opacity: 0.4
+  },
+  caretOpen: {
+    transform: [{ rotate: '180deg' }]
+  },
+  body: {
+    maxHeight: 220,
+    borderTopWidth: StyleSheet.hairlineWidth,
+    borderTopColor: colors.borderSubtle
+  },
+  group: {
+    paddingHorizontal: spacing.md,
+    paddingTop: spacing.xs,
+    paddingBottom: spacing.xs
+  },
+  groupLabel: {
+    color: colors.textMuted,
+    fontSize: 10,
+    fontFamily: typography.monoFamily,
+    letterSpacing: 0.8,
+    textTransform: 'uppercase',
+    paddingBottom: spacing.xs / 2
+  },
+  row: {
+    minHeight: 32,
+    flexDirection: 'row',
+    alignItems: 'center',
+    gap: spacing.sm
+  },
+  owned: {
+    marginLeft: spacing.lg
+  },
+  rowText: {
+    flex: 1,
+    minWidth: 0,
+    fontSize: typography.metaSize
+  },
+  lead: {
+    color: colors.textPrimary,
+    fontWeight: '500'
+  },
+  trail: {
+    color: colors.textMuted
+  },
+  meta: {
+    color: colors.textMuted,
+    fontSize: 10,
+    fontFamily: typography.monoFamily
+  },
+  unavailable: {
+    color: colors.textMuted,
+    fontSize: typography.metaSize,
+    padding: spacing.md
+  },
+  textAction: {
+    minHeight: 32,
+    minWidth: MIN_TOUCH_TARGET,
+    alignItems: 'center',
+    justifyContent: 'center',
+    paddingHorizontal: spacing.sm,
+    borderRadius: radii.button
+  },
+  stopAll: {
+    alignSelf: 'flex-start',
+    marginHorizontal: spacing.sm
+  },
+  actionLabel: {
+    color: colors.textPrimary,
+    fontSize: typography.metaSize,
+    fontWeight: '500'
+  },
+  pressed: {
+    backgroundColor: colors.bgRaised
+  },
+  disabled: {
+    opacity: 0.5
+  }
+})
diff --git a/mobile/src/session/MobileNativeChatMessage.subagent-group.test.tsx b/mobile/src/session/MobileNativeChatMessage.subagent-group.test.tsx
new file mode 100644
index 000000000000..c4a4e48b5081
--- /dev/null
+++ b/mobile/src/session/MobileNativeChatMessage.subagent-group.test.tsx
@@ -0,0 +1,198 @@
+// A spawn group's roster row on the phone: drawn from the host's live block, replacing its frozen
+// sentence only when it can draw, outside the settled-tools collapse, and opened by group id from
+// state the transcript holds.
+
+import { createElement, type ReactNode } from 'react'
+import { act, create, type ReactTestInstance, type ReactTestRenderer } from 'react-test-renderer'
+import { afterEach, describe, expect, it, vi } from 'vitest'
+import type {
+  NativeChatMessage,
+  NativeChatSubagentEntry
+} from '../../../src/shared/native-chat-types'
+import { Harness, Result, userMessage } from './use-mobile-native-chat-turn-disclosure.test-fixture'
+
+vi.mock('react-native', async () => {
+  const React = await import('react')
+  const Text = ({ children, ...props }: { children?: ReactNode }): ReactNode =>
+    React.createElement('Text', props, children)
+  return {
+    Image: 'Image',
+    Platform: { OS: 'ios' },
+    Pressable: 'Pressable',
+    ScrollView: 'ScrollView',
+    Text,
+    View: ({ children, ...props }: { children?: ReactNode }) =>
+      React.createElement('View', props, children),
+    StyleSheet: { create: (styles: unknown) => styles, hairlineWidth: 1 },
+    Animated: { Value: class {}, timing: () => ({ start: vi.fn() }) }
+  }
+})
+vi.mock('expo-clipboard', () => ({ setStringAsync: vi.fn() }))
+vi.mock('lucide-react-native', () => ({
+  Bot: 'Bot',
+  Brain: 'Brain',
+  ChevronDown: 'ChevronDown',
+  ChevronRight: 'ChevronRight',
+  SquareChevronRight: 'SquareChevronRight',
+  SquareTerminal: 'SquareTerminal',
+  Wrench: 'Wrench'
+}))
+vi.mock('../components/MobileMarkdown', () => ({ MobileMarkdown: 'MobileMarkdown' }))
+vi.mock('./MobileNativeChatMessageActionsSheet', () => ({
+  MobileNativeChatMessageActionsSheet: 'MessageActionsSheet'
+}))
+vi.mock('../hooks/use-now', () => ({ useNow: () => 70_000 }))
+
+import { MobileNativeChatMessage } from './MobileNativeChatMessage'
+
+function roster(
+  agents: NativeChatSubagentEntry[],
+  sentence: string | null = 'Kicked off 2 subagents'
+): NativeChatMessage {
+  return {
+    id: 'spawn',
+    role: 'system',
+    blocks: [
+      ...(sentence === null ? [] : [{ type: 'text' as const, text: sentence }]),
+      { type: 'subagent-group', groupId: 'group-1', agents }
+    ],
+    timestamp: null,
+    source: 'transcript'
+  }
+}
+
+const WORKING: NativeChatSubagentEntry[] = [
+  { id: 'a', label: 'review', state: 'working', startedAt: 10_000 },
+  { id: 'b', label: 'tests', state: 'working', startedAt: 10_000 }
+]
+const FINISHED: NativeChatSubagentEntry[] = [
+  { id: 'a', label: 'review', state: 'completed', startedAt: 0, settledAt: 60_000, tokens: 9_000 },
+  { id: 'b', label: 'tests', state: 'failed', startedAt: 0, settledAt: 62_000, tokens: 3_000 }
+]
+
+// The View mock is a component around a host node; match the host alone so nothing counts twice.
+function byTestId(node: ReactTestInstance, testID: string): boolean {
+  return typeof node.type === 'string' && node.props.testID === testID
+}
+
+function textOf(node: ReactTestInstance): string {
+  return node.children.map((child) => (typeof child === 'string' ? child : textOf(child))).join('')
+}
+
+describe('mobile transcript roster row', () => {
+  let renderer: ReactTestRenderer | null = null
+
+  afterEach(() => {
+    act(() => renderer?.unmount())
+    renderer = null
+  })
+
+  function render(
+    message: NativeChatMessage,
+    props: Record<string, unknown> = {}
+  ): ReactTestRenderer {
+    act(() => {
+      renderer = create(createElement(MobileNativeChatMessage, { message, ...props }))
+    })
+    return renderer!
+  }
+
+  const markdown = (tree: ReactTestRenderer): unknown[] =>
+    tree.root.findAll((node) => String(node.type) === 'MobileMarkdown').map((n) => n.props.content)
+  const group = (tree: ReactTestRenderer): ReactTestInstance[] =>
+    tree.root.findAll((node) => byTestId(node, 'subagent-group'))
+
+  it("draws the host's live group in place of its frozen sentence", () => {
+    const tree = render(roster(WORKING))
+    expect(markdown(tree)).toEqual([])
+    expect(group(tree)).toHaveLength(1)
+    expect(textOf(group(tree)[0]!)).toBe('Kicked off 2 subagents2 working · 1m 0s')
+  })
+
+  it('reads the settled verdict, run length and tokens', () => {
+    const tree = render(roster(FINISHED, 'Ran 2 subagents (1 failed)'))
+    expect(markdown(tree)).toEqual([])
+    expect(textOf(group(tree)[0]!)).toBe('Ran 2 subagents1 failed · 1m 2s · 12k tokens')
+  })
+
+  it('speaks the header whole, its clock only once the group stops counting', () => {
+    const label = (tree: ReactTestRenderer): unknown =>
+      group(tree)[0]!.findAll((node) => String(node.type) === 'Pressable')[0]!.props
+        .accessibilityLabel
+    expect(label(render(roster(WORKING)))).toBe('Kicked off 2 subagents · 2 working')
+    const alerted: NativeChatSubagentEntry[] = [
+      ...WORKING,
+      { id: 'c', label: 'lint', state: 'failed', startedAt: 0, settledAt: 5_000 }
+    ]
+    expect(label(render(roster(alerted)))).toBe('Kicked off 3 subagents · 2 working +1 failed')
+    expect(label(render(roster(FINISHED)))).toBe('Ran 2 subagents · 1 failed · 1m 2s · 12k tokens')
+  })
+
+  it('keeps the sentence when there is no group it can draw', () => {
+    const textOnly: NativeChatMessage = {
+      id: 'spawn',
+      role: 'system',
+      blocks: [{ type: 'text', text: 'Ran 2 subagents' }],
+      timestamp: null,
+      source: 'transcript'
+    }
+    expect(markdown(render(textOnly))).toEqual(['Ran 2 subagents'])
+    const childless = render(roster([], 'Ran 2 subagents'))
+    expect(markdown(childless)).toEqual(['Ran 2 subagents'])
+    expect(group(childless)).toEqual([])
+  })
+
+  it('keeps real text beside a group', () => {
+    expect(markdown(render(roster(WORKING, 'Delegating the review.')))).toEqual([
+      'Delegating the review.'
+    ])
+  })
+
+  it('stays visible once its turn settles, outside the tool-run collapse', () => {
+    const tree = render(roster(FINISHED, null), {
+      structuredActivityUi: true,
+      activeTurnIsWorking: false,
+      turnExpanded: false
+    })
+    expect(group(tree)).toHaveLength(1)
+  })
+
+  it('lists each child when the transcript holds it open, and asks to toggle by group id', () => {
+    const onToggleSubagentGroup = vi.fn()
+    const closed = render(roster(FINISHED), { onToggleSubagentGroup })
+    expect(closed.root.findAll((node) => byTestId(node, 'subagent-group-entry'))).toEqual([])
+    const header = group(closed)[0]!.findAll((node) => String(node.type) === 'Pressable')[0]!
+    act(() => header.props.onPress())
+    expect(onToggleSubagentGroup).toHaveBeenCalledWith('group-1')
+
+    const open = render(roster(FINISHED), {
+      subagentGroupsOpen: new Set(['group-1']),
+      onToggleSubagentGroup
+    })
+    expect(open.root.findAll((node) => byTestId(node, 'subagent-group-entry')).map(textOf)).toEqual(
+      ['reviewcompleted · 9k', 'testsfailed · 3k']
+    )
+  })
+})
+
+describe('transcript-held roster disclosure', () => {
+  let renderer: ReactTestRenderer | null = null
+
+  afterEach(() => {
+    act(() => renderer?.unmount())
+    renderer = null
+  })
+
+  it('opens a group by id and hands the open set to roster rows only', () => {
+    const messages = [userMessage('ask'), roster(WORKING)]
+    act(() => {
+      renderer = create(createElement(Harness, { messages, enabled: true, isWorking: false }))
+    })
+    const disclosure = () => renderer!.root.findByType(Result).props.disclosure
+    const rowFor = (index: number) => disclosure().resolveRow(index, messages[index]!)
+    expect(rowFor(0).subagentGroupsOpen).toBeUndefined()
+    expect(rowFor(1).subagentGroupsOpen?.has('group-1')).toBe(false)
+    act(() => rowFor(1).onToggleSubagentGroup('group-1'))
+    expect(rowFor(1).subagentGroupsOpen?.has('group-1')).toBe(true)
+  })
+})
diff --git a/mobile/src/session/MobileNativeChatMessage.tsx b/mobile/src/session/MobileNativeChatMessage.tsx
index 1d61a8117ed4..54607be26ac0 100644
--- a/mobile/src/session/MobileNativeChatMessage.tsx
+++ b/mobile/src/session/MobileNativeChatMessage.tsx
@@ -1,12 +1,20 @@
 import { MobileSelectableText as Text } from '../components/MobileSelectableText'
-import { memo, useCallback, useState } from 'react'
+import { memo, useCallback, useContext, useState } from 'react'
 import { Image, Text as NativeText, View } from 'react-native'
 import { INLINE_TEXT_SELECTION } from '../components/inline-text-selection'
 import { MobileNativeChatMessageActionsSheet } from './MobileNativeChatMessageActionsSheet'
 import { MobileNativeChatLongPressContent as Content } from './MobileNativeChatLongPressContent'
 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 {
+  isImageRefBlock,
+  isSubagentGroupBlock,
+  isTextBlock
+} from '../../../src/shared/native-chat-types'
+import {
+  isRenderableSubagentGroup,
+  withoutSubagentGroupTwins
+} from '../../../src/shared/native-chat-subagent-summary'
 import {
   AGENT_SESSION_HOST_STATUS_COPY,
   isAgentSessionHostStatusPresentation
@@ -16,22 +24,34 @@ import { MobileMarkdown } from '../components/MobileMarkdown'
 import { deriveNativeChatRowContent } from '../../../src/shared/native-chat-row-content'
 import { MobileNativeChatReasoningRow } from './MobileNativeChatReasoningRow'
 import { MobileNativeChatTurnStatus } from './MobileNativeChatTurnStatus'
+import { MobileNativeChatSubagentGroup } from './MobileNativeChatSubagentGroup'
 import { ToolRun } from './MobileNativeChatToolRun'
 import type { NativeChatTurnStatus } from './use-mobile-native-chat-turn-status'
 import { isRenderableImageUri } from './mobile-native-chat-image-preview'
 import { styles, TEXT_SIZE } from './mobile-native-chat-message-styles'
 import { agentMessageAttribution } from './mobile-agent-message-attribution'
+import { withoutPendingNativeChatVisualDirectiveTail } from '../../../src/shared/native-chat-visual-directive'
+import {
+  MobileNativeChatVisualContext,
+  type MobileNativeChatVisualRender
+} from './mobile-native-chat-visual-context'
 
 function Prose({
   block,
   invert,
   fontScale,
   onOpenFile,
-  onLongPress
+  onLongPress,
+  renderVisual,
+  holdPendingVisual = false
 }: {
   block: NativeChatBlock
   invert?: boolean
   fontScale: number
+  /** Assistant prose of a structured chat only. */
+  renderVisual?: MobileNativeChatVisualRender
+  /** The reply may still be growing: a directive still being typed at its tail is held back. */
+  holdPendingVisual?: boolean
   onOpenFile?: (relativePath: string) => void
   /** Android only: routes a long press on a link span to the row's actions sheet. */
   onLongPress?: () => void
@@ -61,7 +81,12 @@ function Prose({
     }
     return (
       <MobileMarkdown
-        content={block.text}
+        content={
+          holdPendingVisual && renderVisual
+            ? withoutPendingNativeChatVisualDirectiveTail(block.text)
+            : block.text
+        }
+        renderVisual={renderVisual}
         rangeSelectable
         textScale={1.25 * fontScale}
         onOpenFile={onOpenFile}
@@ -94,6 +119,7 @@ function Prose({
 
 function MobileNativeChatMessageImpl({
   message,
+  mayStillGrow = false,
   toolsExpanded = false,
   fontScale = 1,
   onOpenFile,
@@ -106,9 +132,13 @@ function MobileNativeChatMessageImpl({
   structuredActivityUi = false,
   reasoningIsLive = false,
   reasoningExpanded,
-  onToggleReasoning
+  onToggleReasoning,
+  subagentGroupsOpen,
+  onToggleSubagentGroup
 }: {
   message: NativeChatMessage
+  /** The newest assistant row of a live turn with no prompt open: its last text may still grow. */
+  mayStillGrow?: boolean
   toolsExpanded?: boolean
   /** Multiplies all chat text sizes for pinch-to-zoom (1 = no change). */
   fontScale?: number
@@ -132,6 +162,9 @@ function MobileNativeChatMessageImpl({
   /** The transcript-held disclosure of a reasoning row; one stable handler takes its key. */
   reasoningExpanded?: boolean
   onToggleReasoning?: (key: string) => void
+  /** The roster groups the reader opened, held by the transcript; only a roster row gets it. */
+  subagentGroupsOpen?: ReadonlySet<string>
+  onToggleSubagentGroup?: (groupId: string) => void
 }): React.JSX.Element {
   // Another agent's message is set apart from the person's bubble, left-aligned and named.
   const attribution = agentMessageAttribution('Message from', message.from)
@@ -160,6 +193,12 @@ function MobileNativeChatMessageImpl({
   // Keep the memoized Markdown context stable as the message streams.
   const openActions = useCallback(() => setActionsOpen(true), [])
   const onLongPress = INLINE_TEXT_SELECTION ? undefined : openActions
+  const renderVisual = useContext(MobileNativeChatVisualContext) ?? undefined
+  // Structured replies grow in place: only the last block of the newest row may still be typing.
+  const growingBlock =
+    message.role === 'assistant' && mayStillGrow && activeTurnIsWorking === true
+      ? message.blocks.at(-1)
+      : undefined
 
   const statusRow = turnStatus ? (
     <MobileNativeChatTurnStatus
@@ -220,16 +259,29 @@ function MobileNativeChatMessageImpl({
               {attribution}
             </Text>
           ) : null}
-          {prose.map((block, index) => (
-            <Prose
-              key={index}
-              block={block}
-              invert={isUser}
-              fontScale={fontScale}
-              onOpenFile={onOpenFile}
-              onLongPress={onLongPress}
-            />
-          ))}
+          {/* A roster draws as its group row, which replaces its frozen sentence; it is not tool
+              activity, so it stays out of the settled-tools collapse. */}
+          {withoutSubagentGroupTwins(prose).map((block, index) =>
+            isSubagentGroupBlock(block) && isRenderableSubagentGroup(block) ? (
+              <MobileNativeChatSubagentGroup
+                key={`subagent-group:${block.groupId}`}
+                block={block}
+                open={subagentGroupsOpen?.has(block.groupId) === true}
+                onToggle={onToggleSubagentGroup}
+              />
+            ) : (
+              <Prose
+                key={index}
+                block={block}
+                invert={isUser}
+                fontScale={fontScale}
+                onOpenFile={onOpenFile}
+                onLongPress={onLongPress}
+                renderVisual={message.role === 'assistant' ? renderVisual : undefined}
+                holdPendingVisual={block === growingBlock}
+              />
+            )
+          )}
           {showToolRun ? (
             <ToolRun
               // Why: a global toggle intentionally resets all per-run/per-line
diff --git a/mobile/src/session/MobileNativeChatOverlay.test.ts b/mobile/src/session/MobileNativeChatOverlay.test.ts
index 23edda19a50e..d03c7741259d 100644
--- a/mobile/src/session/MobileNativeChatOverlay.test.ts
+++ b/mobile/src/session/MobileNativeChatOverlay.test.ts
@@ -12,6 +12,10 @@ vi.mock('react-native', () => ({
 
 vi.mock('./MobileNativeChatView', () => ({ MobileNativeChatView: 'ChatView' }))
 vi.mock('./MobileNativeChatQueuedMessages', () => ({ MobileNativeChatQueuedMessages: 'Queued' }))
+vi.mock('./MobileNativeChatBackgroundTasks', () => ({
+  MobileNativeChatBackgroundTasks: 'BackgroundTasks'
+}))
+vi.mock('./MobileNativeChatVisual', () => ({ useMobileNativeChatVisualRenderer: () => null }))
 
 function assistantTurn(id: string, text: string): NativeChatMessage {
   return { id, role: 'assistant', blocks: [{ type: 'text', text }], timestamp: 0, source: 'hook' }
@@ -206,7 +210,8 @@ describe("MobileNativeChatOverlay while a person's Stop ends the turn", () => {
       renderer = create(overlayElement(tick))
     })
     const view = renderer!.root.find((node) => node.type === 'ChatView')
-    return view.props.queuedSlot?.cards?.props?.steerHeld
+    // The tray's second child is the queued box; the first is the child-work strip.
+    return view.props.composerTray?.content?.props?.children?.[1]?.props?.steerHeld
   }
 
   it("holds the queued cards' Steer while the agent works and the host says Stopping", async () => {
diff --git a/mobile/src/session/MobileNativeChatOverlay.tsx b/mobile/src/session/MobileNativeChatOverlay.tsx
index 7d392e810da1..b3390766b75f 100644
--- a/mobile/src/session/MobileNativeChatOverlay.tsx
+++ b/mobile/src/session/MobileNativeChatOverlay.tsx
@@ -5,7 +5,9 @@ import { foldMobileNativeChatMessages } from './mobile-native-chat-render-data'
 import type { MobileNativeChatImageAttachments } from './use-mobile-native-chat-image-attachments'
 import type { MobileNativeChatController } from './use-mobile-native-chat-controller'
 import { useMobileNativeChatStreamingBubble } from './use-mobile-native-chat-streaming-bubble'
-import { useMobileNativeChatQueuedSlot } from './use-mobile-native-chat-queued-slot'
+import { useMobileNativeChatComposerTray } from './use-mobile-native-chat-composer-tray'
+import { useMobileNativeChatVisualRenderer } from './MobileNativeChatVisual'
+import { MobileNativeChatVisualContext } from './mobile-native-chat-visual-context'
 
 type Props = {
   controller: MobileNativeChatController
@@ -61,83 +63,89 @@ export function MobileNativeChatOverlay({
     controller.nativeChatStreamLive
   )
   const queued = controller.nativeChatQueued
-  const queuedSlot = useMobileNativeChatQueuedSlot({
-    cards: queued.cards,
-    onSend: queued.send,
-    onDelete: queued.delete,
-    onEdit: queued.edit,
-    pause: queued.pause,
-    onResume: queued.resume,
-    sessionKey: queued.sessionKey,
-    // Nothing steers into a turn a Stop is ending; the host holds such a send until it ends.
-    // The indicator's `stopping` is the display status, decided once in the session hook.
-    steerHeld: controller.nativeChatTurnIndicator?.stopping === true
+  const composerTray = useMobileNativeChatComposerTray({
+    queued: {
+      cards: queued.cards,
+      onSend: queued.send,
+      onDelete: queued.delete,
+      onEdit: queued.edit,
+      pause: queued.pause,
+      onResume: queued.resume,
+      sessionKey: queued.sessionKey,
+      // Nothing steers into a turn a Stop is ending; the host holds such a send until it ends.
+      // The indicator's `stopping` is the display status, decided once in the session hook.
+      steerHeld: controller.nativeChatTurnIndicator?.stopping === true
+    },
+    backgroundTasks: controller.nativeChatBackgroundTasks
   })
+  const visuals = useMobileNativeChatVisualRenderer(controller.nativeChatVisualSource)
   if (!controller.showNativeChat) {
     return null
   }
   return (
     <View style={styles.overlay}>
-      <MobileNativeChatView
-        messages={session.messages}
-        folded={folded}
-        status={session.status}
-        error={session.error}
-        readFailedFinally={session.readFailedFinally === true}
-        agent={controller.nativeChatAgent}
-        agentWorking={controller.nativeChatAgentWorking}
-        canStop={controller.nativeChatCanStop}
-        structuredActivityUi={controller.nativeChatStructured}
-        turnIndicator={controller.nativeChatTurnIndicator}
-        workingStartedAt={controller.nativeChatWorkingStartedAt}
-        settledTurns={controller.nativeChatSettledTurns}
-        turnJournal={controller.nativeChatTurnJournal}
-        streaming={streaming}
-        onStop={controller.handleNativeChatStop}
-        ask={controller.nativeChatAsk}
-        askKey={controller.nativeChatAskKey}
-        promptKey={controller.nativeChatPromptKey}
-        onDismissAsk={controller.dismissNativeChatAsk}
-        onAnswerAsk={controller.handleNativeChatAnswerAsk}
-        onCancelAsk={controller.handleNativeChatCancelAsk}
-        onCancelPrompt={controller.handleNativeChatCancelPrompt}
-        onCollapseAsk={controller.collapseNativeChatAsk}
-        onCollapsePrompt={controller.collapseNativeChatPrompt}
-        collapsedPrompt={controller.nativeChatCollapsedPrompt}
-        question={controller.nativeChatQuestion}
-        onAnswerQuestion={controller.handleNativeChatQuestionAnswer}
-        permission={controller.nativeChatPermission}
-        onRespondPermission={controller.handleNativeChatRespondPermission}
-        queuedSlot={queuedSlot}
-        onOpenFile={onOpenFile}
-        hasMore={session.hasMore}
-        loadingEarlier={session.loadingEarlier}
-        onLoadEarlier={session.loadEarlier}
-        onSend={images.sendNativeChat}
-        sendSurfaceId={sendSurfaceId}
-        getSendCompletionGeneration={getSendCompletionGeneration}
-        getComposerEditGeneration={controller.getChatComposerEditGeneration}
-        pending={controller.chatPending}
-        imagePreviewsByMessageId={controller.chatImagePreviewsByMessageId}
-        composerText={controller.chatComposerText}
-        onComposerTextChange={controller.setChatComposerText}
-        onAttachImage={() => void images.attachImage('library')}
-        attachments={images.attachments}
-        onRemoveAttachment={images.removeAttachment}
-        isAttaching={images.isAttaching}
-        onMicPress={onMicPress}
-        micActive={micActive}
-        dictationMode={dictationMode}
-        onMicPressIn={onMicPressIn}
-        onMicPressOut={onMicPressOut}
-        inputLockReason={inputLockReason}
-        sendErrorMessage={sendErrorMessage}
-        onClearSendError={onClearSendError}
-        filePaths={controller.nativeChatFilePaths}
-        onNeedFiles={controller.loadNativeChatFiles}
-        sessionOptions={controller.nativeChatSessionOptions}
-        keyboardInset={keyboardInset}
-      />
+      <MobileNativeChatVisualContext.Provider value={visuals}>
+        <MobileNativeChatView
+          messages={session.messages}
+          folded={folded}
+          status={session.status}
+          error={session.error}
+          readFailedFinally={session.readFailedFinally === true}
+          agent={controller.nativeChatAgent}
+          agentWorking={controller.nativeChatAgentWorking}
+          canStop={controller.nativeChatCanStop}
+          structuredActivityUi={controller.nativeChatStructured}
+          turnIndicator={controller.nativeChatTurnIndicator}
+          workingStartedAt={controller.nativeChatWorkingStartedAt}
+          settledTurns={controller.nativeChatSettledTurns}
+          turnJournal={controller.nativeChatTurnJournal}
+          streaming={streaming}
+          onStop={controller.handleNativeChatStop}
+          ask={controller.nativeChatAsk}
+          askKey={controller.nativeChatAskKey}
+          promptKey={controller.nativeChatPromptKey}
+          onDismissAsk={controller.dismissNativeChatAsk}
+          onAnswerAsk={controller.handleNativeChatAnswerAsk}
+          onCancelAsk={controller.handleNativeChatCancelAsk}
+          onCancelPrompt={controller.handleNativeChatCancelPrompt}
+          onCollapseAsk={controller.collapseNativeChatAsk}
+          onCollapsePrompt={controller.collapseNativeChatPrompt}
+          collapsedPrompt={controller.nativeChatCollapsedPrompt}
+          question={controller.nativeChatQuestion}
+          onAnswerQuestion={controller.handleNativeChatQuestionAnswer}
+          permission={controller.nativeChatPermission}
+          onRespondPermission={controller.handleNativeChatRespondPermission}
+          composerTray={composerTray}
+          onOpenFile={onOpenFile}
+          hasMore={session.hasMore}
+          loadingEarlier={session.loadingEarlier}
+          onLoadEarlier={session.loadEarlier}
+          onSend={images.sendNativeChat}
+          sendSurfaceId={sendSurfaceId}
+          getSendCompletionGeneration={getSendCompletionGeneration}
+          getComposerEditGeneration={controller.getChatComposerEditGeneration}
+          pending={controller.chatPending}
+          imagePreviewsByMessageId={controller.chatImagePreviewsByMessageId}
+          composerText={controller.chatComposerText}
+          onComposerTextChange={controller.setChatComposerText}
+          onAttachImage={() => void images.attachImage('library')}
+          attachments={images.attachments}
+          onRemoveAttachment={images.removeAttachment}
+          isAttaching={images.isAttaching}
+          onMicPress={onMicPress}
+          micActive={micActive}
+          dictationMode={dictationMode}
+          onMicPressIn={onMicPressIn}
+          onMicPressOut={onMicPressOut}
+          inputLockReason={inputLockReason}
+          sendErrorMessage={sendErrorMessage}
+          onClearSendError={onClearSendError}
+          filePaths={controller.nativeChatFilePaths}
+          onNeedFiles={controller.loadNativeChatFiles}
+          sessionOptions={controller.nativeChatSessionOptions}
+          keyboardInset={keyboardInset}
+        />
+      </MobileNativeChatVisualContext.Provider>
     </View>
   )
 }
diff --git a/mobile/src/session/MobileNativeChatQuestion.test.tsx b/mobile/src/session/MobileNativeChatQuestion.test.tsx
index 5c877dabb3ff..dc4ff2034930 100644
--- a/mobile/src/session/MobileNativeChatQuestion.test.tsx
+++ b/mobile/src/session/MobileNativeChatQuestion.test.tsx
@@ -129,4 +129,71 @@ describe('MobileNativeChatQuestion', () => {
     await act(async () => cancel.props.onPress())
     expect(onCancel).toHaveBeenCalledWith({ itemId: 'question-1', expectedRevision: 7 })
   })
+
+  it('prefills an editor and sends its whitespace unchanged', async () => {
+    const onAnswer = vi.fn(async () => true)
+    await act(async () => {
+      renderer = create(
+        createElement(MobileNativeChatQuestion, {
+          question: {
+            question: 'Edit the draft',
+            options: [],
+            multiSelect: false,
+            optionTokens: [],
+            freeTextToken: 'editor-token',
+            freeTextInput: {
+              allowEmpty: true,
+              multiline: true,
+              initialValue: '  draft\n',
+              placeholder: 'Write here'
+            }
+          },
+          onAnswer
+        })
+      )
+    })
+
+    const input = renderer.root.findByType('TextInput')
+    expect(input.props).toMatchObject({
+      value: '  draft\n',
+      placeholder: 'Write here',
+      multiline: true
+    })
+    await act(async () => input.props.onChangeText('  \n '))
+    const send = renderer.root.findByProps({ accessibilityLabel: 'Send reply' })
+    expect(send.props.disabled).toBe(false)
+    await act(async () => send.props.onPress())
+    expect(onAnswer).toHaveBeenCalledWith(`editor-token:${encodeURIComponent('  \n ')}`)
+  })
+
+  it('sends an empty allowed answer and still disables an empty legacy answer', async () => {
+    const onAnswer = vi.fn(async () => true)
+    const question = {
+      question: 'Input',
+      options: [],
+      multiSelect: false,
+      optionTokens: [],
+      freeTextToken: 'input-token'
+    }
+    await act(async () => {
+      renderer = create(
+        createElement(MobileNativeChatQuestion, {
+          question: { ...question, freeTextInput: { allowEmpty: true, multiline: false } },
+          onAnswer
+        })
+      )
+    })
+    const send = renderer.root.findByProps({ accessibilityLabel: 'Send reply' })
+    expect(renderer.root.findByType('TextInput').props.multiline).toBe(false)
+    expect(send.props.disabled).toBe(false)
+    await act(async () => send.props.onPress())
+    expect(onAnswer).toHaveBeenCalledWith('input-token:')
+
+    await act(async () =>
+      renderer.update(createElement(MobileNativeChatQuestion, { question, onAnswer }))
+    )
+    expect(renderer.root.findByProps({ accessibilityLabel: 'Send reply' }).props.disabled).toBe(
+      true
+    )
+  })
 })
diff --git a/mobile/src/session/MobileNativeChatQuestion.tsx b/mobile/src/session/MobileNativeChatQuestion.tsx
index 314e3efd4a12..35dcd568bf22 100644
--- a/mobile/src/session/MobileNativeChatQuestion.tsx
+++ b/mobile/src/session/MobileNativeChatQuestion.tsx
@@ -30,13 +30,13 @@ export function MobileNativeChatQuestion({
   onCollapse
 }: Props): React.JSX.Element {
   const [selectedOptionIndexes, setSelectedOptionIndexes] = useState<number[]>([])
-  const [freeText, setFreeText] = useState('')
+  const [freeText, setFreeText] = useState(() => question.freeTextInput?.initialValue ?? '')
   const [sending, setSending] = useState(false)
   const sendingRef = useRef(false)
   const allowOther = question.allowOther !== false
 
   const hasOptions = question.options.length > 0
-  const trimmedFreeText = freeText.trim()
+  const answerText = question.freeTextInput?.allowEmpty ? freeText : freeText.trim()
 
   const toggle = (optionIndex: number): void => {
     setSelectedOptionIndexes((prev) =>
@@ -72,8 +72,8 @@ export function MobileNativeChatQuestion({
       return
     }
     const answer =
-      question.freeTextToken && trimmedFreeText.length > 0
-        ? formatQuestionAnswerWithOtherByIndexes(question, selectedOptionIndexes, trimmedFreeText)
+      question.freeTextToken && answerText.length > 0
+        ? formatQuestionAnswerWithOtherByIndexes(question, selectedOptionIndexes, answerText)
         : formatQuestionAnswerByIndexes(question, selectedOptionIndexes)
     if (await sendAnswer(answer)) {
       setFreeText('')
@@ -81,20 +81,21 @@ export function MobileNativeChatQuestion({
   }
 
   const submitFreeText = async (): Promise<void> => {
-    if (trimmedFreeText.length === 0) {
+    if (!allowOther || (answerText.length === 0 && !question.freeTextInput?.allowEmpty)) {
       return
     }
     const answer =
       question.multiSelect && question.freeTextToken && selectedOptionIndexes.length > 0
-        ? formatQuestionAnswerWithOtherByIndexes(question, selectedOptionIndexes, trimmedFreeText)
-        : formatQuestionFreeTextAnswer(question, trimmedFreeText)
+        ? formatQuestionAnswerWithOtherByIndexes(question, selectedOptionIndexes, answerText)
+        : formatQuestionFreeTextAnswer(question, answerText)
     if (await sendAnswer(answer)) {
       setFreeText('')
     }
   }
 
   const canSubmitMulti = selectedOptionIndexes.length > 0 && !sending
-  const canSendFreeText = allowOther && trimmedFreeText.length > 0 && !sending
+  const canSendFreeText =
+    allowOther && (answerText.length > 0 || question.freeTextInput?.allowEmpty === true) && !sending
 
   // Stable keys for option rows even if an agent repeats a label.
   const optionRows = useMemo(
@@ -178,12 +179,15 @@ export function MobileNativeChatQuestion({
             style={mobileNativeChatInputStyles.freeInput}
             value={freeText}
             onChangeText={setFreeText}
-            placeholder={hasOptions ? 'Or type a reply…' : 'Type your reply…'}
+            placeholder={
+              question.freeTextInput?.placeholder ??
+              (hasOptions ? 'Or type a reply…' : 'Type your reply…')
+            }
             placeholderTextColor={colors.textMuted}
             selectionColor={colors.accentBlue}
             onSubmitEditing={submitFreeText}
             returnKeyType="send"
-            multiline
+            multiline={question.freeTextInput?.multiline ?? true}
           />
           <Pressable
             accessibilityLabel="Send reply"
diff --git a/mobile/src/session/MobileNativeChatQueuedMessages.test.tsx b/mobile/src/session/MobileNativeChatQueuedMessages.test.tsx
index 3ea59e635e22..5eb53046128b 100644
--- a/mobile/src/session/MobileNativeChatQueuedMessages.test.tsx
+++ b/mobile/src/session/MobileNativeChatQueuedMessages.test.tsx
@@ -281,8 +281,7 @@ describe('MobileNativeChatQueuedMessages', () => {
 
     it('heads the box with why the queue is paused, for each reason', async () => {
       const rows: readonly [AgentSessionQueuePause['reason'], string][] = [
-        ['stopped', 'Queue paused because you interrupted'],
-        ['cleared', 'Queue paused after you cleared the conversation']
+        ['stopped', 'Queue paused because you interrupted']
       ]
       for (const [reason, label] of rows) {
         const mounted = await mountPaused({ pause: { reason } })
diff --git a/mobile/src/session/MobileNativeChatQueuedMessages.tsx b/mobile/src/session/MobileNativeChatQueuedMessages.tsx
index f600781dde51..fa44fdd01fda 100644
--- a/mobile/src/session/MobileNativeChatQueuedMessages.tsx
+++ b/mobile/src/session/MobileNativeChatQueuedMessages.tsx
@@ -26,7 +26,7 @@ const RESUME_KEY = '\u0000resume'
 export type MobileNativeChatQueuedMessagesProps = {
   cards?: MobileQueuedMessageCard[]
   /** Steer for a waiting card, the paused queue's included; plain Send for a card held on its own
-   *  (its send failed, or the host kept it unsent), or a returned one. */
+   *  (its send failed), or a returned one. */
   onSend?: (messageId: string) => Promise<boolean>
   onDelete?: (messageId: string) => Promise<boolean>
   /** Copy the card's text into the composer, then delete the card. */
diff --git a/mobile/src/session/MobileNativeChatSubagentGroup.tsx b/mobile/src/session/MobileNativeChatSubagentGroup.tsx
new file mode 100644
index 000000000000..62ec177723fc
--- /dev/null
+++ b/mobile/src/session/MobileNativeChatSubagentGroup.tsx
@@ -0,0 +1,200 @@
+import { Pressable, StyleSheet, Text, View, type ViewStyle } from 'react-native'
+import { Bot, ChevronRight } from 'lucide-react-native'
+import {
+  formatSubagentTokens,
+  nativeChatSubagentGroupHeader,
+  sayNativeChatSubagentGroupEnglish as say,
+  subagentStateLabel
+} from '../../../src/shared/native-chat-subagent-group-header'
+import { normalizeSubagentState } from '../../../src/shared/native-chat-subagent-summary'
+import { formatNativeChatDuration } from '../../../src/shared/native-chat-turn-status'
+import type {
+  NativeChatSubagentGroupBlock,
+  NativeChatSubagentState
+} from '../../../src/shared/native-chat-types'
+import { useNow } from '../hooks/use-now'
+import { colors, spacing, typography } from '../theme/mobile-theme'
+
+// Desktop's StatusDot tones: the working and failed states speak; every settled one stays muted.
+function stateDotStyle(state: NativeChatSubagentState): ViewStyle {
+  switch (state) {
+    case 'working':
+      return { backgroundColor: colors.textPrimary }
+    case 'failed':
+      return { backgroundColor: colors.statusRed }
+    case 'idle':
+      return { backgroundColor: colors.textMuted, opacity: 0.4 }
+    case 'completed':
+      return { backgroundColor: colors.textMuted, opacity: 0.6 }
+    case 'stopped':
+    case 'unverifiable':
+      return { backgroundColor: colors.textMuted }
+  }
+}
+
+/** Leaf so the 1 s clock re-renders only the digits, never the row or its message. */
+function Elapsed({
+  startedAt,
+  settledAt,
+  counting
+}: {
+  startedAt: number
+  settledAt: number | null
+  counting: boolean
+}): React.JSX.Element {
+  const now = useNow(1_000, counting)
+  const end = counting ? now : (settledAt ?? now)
+  return <>{formatNativeChatDuration(Math.max(0, (end - startedAt) / 1000))}</>
+}
+
+/** One spawn group's row: how many children work, their settled verdict, how long and how many
+ *  tokens, with one line per child under it. Live because the host rewrites the row in place, and
+ *  drawn exactly as the journal recorded it — a turn boundary is never evidence a child stopped.
+ *  Desktop parity: `NativeChatSubagentRun`, from the same shared header; a child's own rows do not
+ *  open here, so its line is not a control. */
+export function MobileNativeChatSubagentGroup({
+  block,
+  open,
+  onToggle
+}: {
+  block: NativeChatSubagentGroupBlock
+  /** Held by the transcript, keyed by group, so a recycled list row keeps it. */
+  open: boolean
+  onToggle?: (groupId: string) => void
+}): React.JSX.Element | null {
+  const header = nativeChatSubagentGroupHeader(block.agents, say)
+  if (header.total === 0) {
+    return null
+  }
+  const { working, headline, verdictState, verdict, alertState, alert, clockStartedAt } = header
+  // Spoken whole, as the live line's is: a working group's clock would otherwise make the live
+  // region re-read the row every second (nested Text spans cannot opt out on their own).
+  const settledElapsed =
+    !working && clockStartedAt !== null && header.settledAt !== null
+      ? formatNativeChatDuration(Math.max(0, (header.settledAt - clockStartedAt) / 1000))
+      : null
+  const accessibilityLabel = [
+    headline,
+    alert === null ? verdict : `${verdict} +${alert}`,
+    settledElapsed,
+    header.tokens
+  ]
+    .filter((part): part is string => part !== null)
+    .join(' · ')
+  return (
+    <View testID="subagent-group" style={styles.group}>
+      <Pressable
+        accessibilityRole="button"
+        accessibilityState={{ expanded: open }}
+        accessibilityLabel={accessibilityLabel}
+        accessibilityLiveRegion="polite"
+        hitSlop={6}
+        style={({ pressed }) => [styles.header, pressed && styles.pressed]}
+        onPress={() => onToggle?.(block.groupId)}
+      >
+        <Bot size={14} color={colors.textMuted} strokeWidth={2} />
+        <View style={[styles.dot, stateDotStyle(alertState ?? verdictState)]} />
+        <Text style={[styles.headline, working && styles.headlineWorking]} numberOfLines={1}>
+          {headline}
+        </Text>
+        {/* Wraps under itself rather than pushing the headline or chevron out of a phone row. */}
+        <Text style={styles.verdict}>
+          {verdict}
+          {alert === null ? null : ` +${alert}`}
+          {clockStartedAt !== null ? (
+            <>
+              {' · '}
+              <Elapsed startedAt={clockStartedAt} settledAt={header.settledAt} counting={working} />
+            </>
+          ) : null}
+          {header.tokens !== null ? ` · ${header.tokens}` : null}
+        </Text>
+        <View style={open ? styles.caretOpen : undefined}>
+          <ChevronRight size={14} color={colors.textMuted} strokeWidth={2} />
+        </View>
+      </Pressable>
+      {open
+        ? block.agents.map((agent) => {
+            const state = normalizeSubagentState(agent.state)
+            return (
+              <View key={agent.id} testID="subagent-group-entry" style={styles.entry}>
+                <View style={[styles.dot, stateDotStyle(state)]} />
+                <Text
+                  style={[styles.entryLabel, state === 'idle' && styles.entryLabelIdle]}
+                  numberOfLines={1}
+                >
+                  {agent.label}
+                </Text>
+                <Text style={styles.entryState} numberOfLines={1}>
+                  {subagentStateLabel(state, 1, 1, say)}
+                  {typeof agent.tokens === 'number'
+                    ? ` · ${formatSubagentTokens(agent.tokens)}`
+                    : null}
+                </Text>
+              </View>
+            )
+          })
+        : null}
+    </View>
+  )
+}
+
+const styles = StyleSheet.create({
+  group: {
+    paddingVertical: spacing.xs
+  },
+  header: {
+    minHeight: 28,
+    flexDirection: 'row',
+    alignItems: 'center',
+    gap: spacing.sm
+  },
+  pressed: {
+    opacity: 0.6
+  },
+  dot: {
+    width: 6,
+    height: 6,
+    borderRadius: 3
+  },
+  headline: {
+    flexShrink: 0,
+    maxWidth: '60%',
+    color: colors.textMuted,
+    fontSize: typography.bodySize
+  },
+  headlineWorking: {
+    color: colors.textPrimary
+  },
+  verdict: {
+    flex: 1,
+    minWidth: 0,
+    textAlign: 'right',
+    color: colors.textMuted,
+    fontSize: typography.metaSize
+  },
+  entryState: {
+    marginLeft: 'auto',
+    flexShrink: 0,
+    color: colors.textMuted,
+    fontSize: typography.metaSize
+  },
+  caretOpen: {
+    transform: [{ rotate: '90deg' }]
+  },
+  entry: {
+    minHeight: 24,
+    flexDirection: 'row',
+    alignItems: 'center',
+    gap: spacing.sm,
+    paddingLeft: spacing.lg + spacing.xs
+  },
+  entryLabel: {
+    flexShrink: 1,
+    color: colors.textPrimary,
+    fontSize: typography.metaSize
+  },
+  entryLabelIdle: {
+    color: colors.textMuted
+  }
+})
diff --git a/mobile/src/session/MobileNativeChatView.tsx b/mobile/src/session/MobileNativeChatView.tsx
index 0bb2bb268427..b926e17390b4 100644
--- a/mobile/src/session/MobileNativeChatView.tsx
+++ b/mobile/src/session/MobileNativeChatView.tsx
@@ -39,7 +39,7 @@ import { MobileAgentWorkingIndicator } from './MobileAgentWorkingIndicator'
 import type { PendingNativeChatImage } from './mobile-native-chat-image-attachment'
 import { MobileNativeChatComposer } from './MobileNativeChatComposer'
 import { MobileNativeChatPromptCard } from './MobileNativeChatPromptCard'
-import { NO_QUEUED_SLOT, type MobileQueuedSlotProps } from './use-mobile-native-chat-queued-slot'
+import { NO_COMPOSER_TRAY, type ComposerTrayProps } from './use-mobile-native-chat-composer-tray'
 import type { MobileChatPermission } from './mobile-native-chat-permission'
 import type { MobileChatQuestion } from './mobile-native-chat-question'
 import type { MobileNativeChatSessionOptionPickersProps } from './MobileNativeChatSessionOptionPickers'
@@ -50,7 +50,7 @@ import type { MobileNativeChatStatus } from './use-mobile-native-chat-session'
  *  terminal subscription has not acknowledged its input lease yet. */
 export type MobileNativeChatInputLockReason = 'disconnected' | 'waiting'
 
-type Props = MobileQueuedSlotProps & {
+type Props = ComposerTrayProps & {
   /** Raw transcript, only for telling "still loading" from "loaded and empty". */
   messages: NativeChatMessage[]
   /** `messages` with noise stripped and tool turns folded in, from the overlay. */
@@ -206,7 +206,7 @@ export function MobileNativeChatView({
   permission,
   promptKey,
   onRespondPermission,
-  queuedSlot: { cards: queuedCards, composerInputRef: inputRef } = NO_QUEUED_SLOT,
+  composerTray: { content: trayContent, composerInputRef: inputRef } = NO_COMPOSER_TRAY,
   onOpenFile,
   keyboardInset = 0
 }: Props): React.JSX.Element {
@@ -404,7 +404,7 @@ export function MobileNativeChatView({
           ) : null}
         </GestureHandlerRootView>
       )}
-      {queuedCards}
+      {trayContent}
       <MobileNativeChatPromptCard
         key={promptKey ?? undefined}
         {...{ ask, askKey, onDismissAsk, onAnswerAsk, onCancelAsk, onCancelPrompt, onCollapseAsk }}
diff --git a/mobile/src/session/MobileNativeChatVisual.tsx b/mobile/src/session/MobileNativeChatVisual.tsx
new file mode 100644
index 000000000000..352e3cd7cdd6
--- /dev/null
+++ b/mobile/src/session/MobileNativeChatVisual.tsx
@@ -0,0 +1,189 @@
+import { memo, useCallback, useMemo, useState } from 'react'
+import { ActivityIndicator, Modal, Pressable, StyleSheet, Text, View } from 'react-native'
+import { useSafeAreaInsets } from 'react-native-safe-area-context'
+import { Maximize2, X } from 'lucide-react-native'
+import type { NativeChatVisualDirective } from '../../../src/shared/native-chat-visual-directive'
+import { colors, radii, spacing, typography } from '../theme/mobile-theme'
+import type { MobileNativeChatVisualSource } from './mobile-native-chat-visual-read'
+import { MOBILE_NATIVE_CHAT_VISUAL_INITIAL_HEIGHT } from './mobile-native-chat-visual-host-document'
+import { MobileNativeChatVisualFrame } from './MobileNativeChatVisualFrame'
+import { useMobileNativeChatVisual } from './use-mobile-native-chat-visual'
+import type { MobileNativeChatVisualRender } from './mobile-native-chat-visual-context'
+
+const DEFAULT_TITLE = 'Visualization'
+
+/** The quiet reserved space a visual takes while it loads. */
+function MobileNativeChatVisualPlaceholder() {
+  return (
+    <View style={[styles.frame, styles.placeholder]}>
+      <ActivityIndicator size="small" color={colors.textMuted} />
+    </View>
+  )
+}
+
+/** The transcript's visual renderer for a structured chat's source; null without one. */
+export function useMobileNativeChatVisualRenderer(
+  source: MobileNativeChatVisualSource | null
+): MobileNativeChatVisualRender | null {
+  return useMemo(
+    () =>
+      source
+        ? (directive) => <MobileNativeChatVisual directive={directive} source={source} />
+        : null,
+    [source]
+  )
+}
+
+/** A `::orca-visual{...}` line in a finished assistant reply, rendered from the chat's host. */
+export const MobileNativeChatVisual = memo(function MobileNativeChatVisual({
+  directive,
+  source
+}: {
+  directive: NativeChatVisualDirective
+  source: MobileNativeChatVisualSource
+}) {
+  const { state, retry } = useMobileNativeChatVisual(source, directive.file)
+  // A frame that navigated away or kept crashing; cleared by the reader's retry.
+  const [frameFailed, setFrameFailed] = useState(false)
+  const [fullscreen, setFullscreen] = useState(false)
+  const title = directive.title ?? DEFAULT_TITLE
+  const onFrameFailed = useCallback(() => {
+    setFrameFailed(true)
+    setFullscreen(false)
+  }, [])
+  const onRetry = useCallback(() => {
+    setFrameFailed(false)
+    retry()
+  }, [retry])
+  const closeFullscreen = useCallback(() => setFullscreen(false), [])
+
+  if (state.kind === 'loading') {
+    return <MobileNativeChatVisualPlaceholder />
+  }
+  if (state.kind === 'unavailable' || frameFailed) {
+    return (
+      <Pressable
+        onPress={onRetry}
+        accessibilityRole="button"
+        accessibilityLabel="Visualization unavailable"
+        accessibilityHint="Tries to load it again"
+        style={styles.unavailable}
+      >
+        <Text style={styles.unavailableText}>Visualization unavailable</Text>
+      </Pressable>
+    )
+  }
+  return (
+    <View style={styles.frame}>
+      <MobileNativeChatVisualFrame
+        html={state.html}
+        title={title}
+        mode="inline"
+        onFailed={onFrameFailed}
+      />
+      <Pressable
+        onPress={() => setFullscreen(true)}
+        accessibilityRole="button"
+        accessibilityLabel={`Open ${title} full screen`}
+        hitSlop={8}
+        style={styles.openButton}
+      >
+        <Maximize2 size={14} color={colors.textSecondary} strokeWidth={2.2} />
+      </Pressable>
+      {fullscreen ? (
+        <MobileNativeChatVisualFullscreen
+          html={state.html}
+          title={title}
+          onClose={closeFullscreen}
+          onFailed={onFrameFailed}
+        />
+      ) : null}
+    </View>
+  )
+})
+
+function MobileNativeChatVisualFullscreen({
+  html,
+  title,
+  onClose,
+  onFailed
+}: {
+  html: string
+  title: string
+  onClose: () => void
+  onFailed: () => void
+}) {
+  const insets = useSafeAreaInsets()
+  return (
+    <Modal visible animationType="slide" presentationStyle="fullScreen" onRequestClose={onClose}>
+      <View style={[styles.sheet, { paddingTop: insets.top, paddingBottom: insets.bottom }]}>
+        <View style={styles.sheetHeader}>
+          <Text style={styles.sheetTitle} numberOfLines={1}>
+            {title}
+          </Text>
+          <Pressable
+            onPress={onClose}
+            accessibilityRole="button"
+            accessibilityLabel="Close"
+            hitSlop={8}
+            style={styles.closeButton}
+          >
+            <X size={18} color={colors.textSecondary} strokeWidth={2.2} />
+          </Pressable>
+        </View>
+        <MobileNativeChatVisualFrame
+          html={html}
+          title={title}
+          mode="fullscreen"
+          onFailed={onFailed}
+        />
+      </View>
+    </Modal>
+  )
+}
+
+const styles = StyleSheet.create({
+  frame: {
+    borderWidth: StyleSheet.hairlineWidth,
+    borderColor: colors.borderSubtle,
+    borderRadius: radii.row,
+    marginBottom: spacing.sm,
+    overflow: 'hidden'
+  },
+  placeholder: {
+    height: MOBILE_NATIVE_CHAT_VISUAL_INITIAL_HEIGHT,
+    alignItems: 'center',
+    justifyContent: 'center'
+  },
+  unavailable: { marginBottom: spacing.sm, paddingVertical: spacing.xs },
+  unavailableText: { color: colors.textMuted, fontSize: typography.metaSize },
+  openButton: {
+    position: 'absolute',
+    top: spacing.xs,
+    right: spacing.xs,
+    width: 28,
+    height: 28,
+    borderRadius: 14,
+    alignItems: 'center',
+    justifyContent: 'center',
+    backgroundColor: colors.bgPanel,
+    borderWidth: StyleSheet.hairlineWidth,
+    borderColor: colors.borderSubtle
+  },
+  sheet: { flex: 1, backgroundColor: colors.bgBase },
+  sheetHeader: {
+    flexDirection: 'row',
+    alignItems: 'center',
+    paddingHorizontal: spacing.md,
+    paddingVertical: spacing.sm,
+    borderBottomWidth: StyleSheet.hairlineWidth,
+    borderBottomColor: colors.borderSubtle
+  },
+  sheetTitle: {
+    flex: 1,
+    color: colors.textPrimary,
+    fontSize: typography.bodySize,
+    fontWeight: '600'
+  },
+  closeButton: { padding: spacing.xs }
+})
diff --git a/mobile/src/session/MobileNativeChatVisualFrame.tsx b/mobile/src/session/MobileNativeChatVisualFrame.tsx
new file mode 100644
index 000000000000..386d5e39f3da
--- /dev/null
+++ b/mobile/src/session/MobileNativeChatVisualFrame.tsx
@@ -0,0 +1,200 @@
+import { memo, useCallback, useEffect, useMemo, useRef, useState } from 'react'
+import { StyleSheet } from 'react-native'
+import { WebView, type WebViewMessageEvent } from 'react-native-webview'
+import type { ShouldStartLoadRequest } from 'react-native-webview/lib/WebViewTypes'
+import * as ExpoCrypto from 'expo-crypto'
+import { buildNativeChatVisualDocument } from '../../../src/shared/native-chat-visual-shell'
+import { createNativeChatVisualHeightGovernor } from '../../../src/shared/native-chat-visual-height-governor'
+import { openExternalLink } from '../platform/external-link'
+import {
+  MOBILE_NATIVE_CHAT_VISUAL_LINK_INTERVAL_MS,
+  readMobileNativeChatVisualBridgeMessage
+} from './mobile-native-chat-visual-bridge'
+import {
+  buildMobileNativeChatVisualHostDocument,
+  MOBILE_NATIVE_CHAT_VISUAL_APPLY_HEIGHT,
+  MOBILE_NATIVE_CHAT_VISUAL_INITIAL_HEIGHT,
+  type MobileNativeChatVisualHostMode
+} from './mobile-native-chat-visual-host-document'
+import { MOBILE_NATIVE_CHAT_VISUAL_THEME } from './mobile-native-chat-visual-theme'
+
+export type MobileNativeChatVisualFrameProps = {
+  html: string
+  title: string
+  mode: MobileNativeChatVisualHostMode
+  /** The frame cannot show this visual (it navigated away, or its web process keeps dying). */
+  onFailed: () => void
+}
+
+/** One automatic reload after the web process dies; a page that kills it again is unavailable. */
+const MAX_PROCESS_RESTARTS = 1
+
+function randomHex(): string {
+  return Array.from(ExpoCrypto.getRandomBytes(16), (byte) =>
+    byte.toString(16).padStart(2, '0')
+  ).join('')
+}
+
+// Only the host document and its srcdoc child load, plus in-page anchors within them. A visual's
+// links reach the app through the bridge instead, so every other navigation is refused, not opened.
+function allowsLoad(request: ShouldStartLoadRequest): boolean {
+  const url = request.url.split('#', 1)[0]
+  return url === 'about:blank' || url === 'about:srcdoc'
+}
+
+/**
+ * One visual in a WebView: a trusted host document with the author HTML in an opaque sandboxed
+ * child (see `buildMobileNativeChatVisualHostDocument`). The app accepts exactly two requests from
+ * it, each token- and channel-checked here: a height, which the shared governor turns into the
+ * frame's height, and an http(s) link to open.
+ */
+export const MobileNativeChatVisualFrame = memo(function MobileNativeChatVisualFrame({
+  html,
+  title,
+  mode,
+  onFailed
+}: MobileNativeChatVisualFrameProps) {
+  const webView = useRef<WebView>(null)
+  const [token] = useState(randomHex)
+  const [generation, setGeneration] = useState(0)
+  const [height, setHeight] = useState(MOBILE_NATIVE_CHAT_VISUAL_INITIAL_HEIGHT)
+  const restarts = useRef(0)
+  const lastLinkAt = useRef(-Infinity)
+
+  const built = useMemo(() => {
+    const channel = randomHex()
+    const visualDocument = buildNativeChatVisualDocument({
+      html,
+      channel,
+      theme: MOBILE_NATIVE_CHAT_VISUAL_THEME
+    })
+    return {
+      channel,
+      source: {
+        html: buildMobileNativeChatVisualHostDocument({
+          visualDocument,
+          channel,
+          token,
+          title,
+          mode
+        })
+      }
+    }
+  }, [html, token, title, mode])
+
+  // A fresh governor per loaded document; reports queue behind a deferral rather than pile up.
+  const sizing = useRef<{
+    governor: ReturnType<typeof createNativeChatVisualHeightGovernor>
+    latest: number | null
+    deferred: ReturnType<typeof setTimeout> | null
+  }>({ governor: createNativeChatVisualHeightGovernor(), latest: null, deferred: null })
+  useEffect(() => {
+    const state = sizing.current
+    state.governor = createNativeChatVisualHeightGovernor()
+    state.latest = null
+    return () => {
+      if (state.deferred) {
+        clearTimeout(state.deferred)
+        state.deferred = null
+      }
+    }
+  }, [built, generation])
+
+  const applyHeight = useCallback(() => {
+    const state = sizing.current
+    state.deferred = null
+    if (state.latest === null) {
+      return
+    }
+    const decision = state.governor.decide(state.latest, Date.now())
+    if (decision.kind === 'apply') {
+      setHeight(decision.height)
+      webView.current?.injectJavaScript(
+        `window.${MOBILE_NATIVE_CHAT_VISUAL_APPLY_HEIGHT}(${decision.height}); true;`
+      )
+    } else if (decision.kind === 'defer') {
+      state.deferred = setTimeout(applyHeight, decision.retryInMs)
+    }
+  }, [])
+
+  const onMessage = useCallback(
+    (event: WebViewMessageEvent) => {
+      const message = readMobileNativeChatVisualBridgeMessage(
+        event.nativeEvent.data,
+        token,
+        built.channel
+      )
+      if (!message) {
+        return
+      }
+      if (message.kind === 'escaped') {
+        onFailed()
+        return
+      }
+      if (message.kind === 'size') {
+        if (mode === 'inline') {
+          sizing.current.latest = message.height
+          if (!sizing.current.deferred) {
+            applyHeight()
+          }
+        }
+        return
+      }
+      const now = Date.now()
+      if (now - lastLinkAt.current < MOBILE_NATIVE_CHAT_VISUAL_LINK_INTERVAL_MS) {
+        return
+      }
+      lastLinkAt.current = now
+      openExternalLink(message.url)
+    },
+    [token, built.channel, mode, applyHeight, onFailed]
+  )
+
+  const restart = useCallback(() => {
+    if (restarts.current >= MAX_PROCESS_RESTARTS) {
+      onFailed()
+      return
+    }
+    restarts.current += 1
+    setHeight(MOBILE_NATIVE_CHAT_VISUAL_INITIAL_HEIGHT)
+    setGeneration((value) => value + 1)
+  }, [onFailed])
+
+  return (
+    <WebView
+      key={generation}
+      ref={webView}
+      source={built.source}
+      style={mode === 'inline' ? [styles.inline, { height }] : styles.fullscreen}
+      accessibilityLabel={title}
+      // '*' so every navigation reaches `allowsLoad`: an origin outside this list is opened in the
+      // system browser by the WebView library itself, with no gesture check.
+      originWhitelist={['*']}
+      onShouldStartLoadWithRequest={allowsLoad}
+      javaScriptEnabled
+      javaScriptCanOpenWindowsAutomatically={false}
+      setSupportMultipleWindows={false}
+      domStorageEnabled={false}
+      allowFileAccess={false}
+      allowsLinkPreview={false}
+      mediaCapturePermissionGrantType="deny"
+      mixedContentMode="never"
+      // Android scales WebView text by the system font size; the page lays itself out.
+      textZoom={100}
+      scrollEnabled={false}
+      bounces={false}
+      showsVerticalScrollIndicator={false}
+      showsHorizontalScrollIndicator={false}
+      onMessage={onMessage}
+      onError={onFailed}
+      onHttpError={onFailed}
+      onContentProcessDidTerminate={restart}
+      onRenderProcessGone={restart}
+    />
+  )
+})
+
+const styles = StyleSheet.create({
+  inline: { width: '100%', backgroundColor: 'transparent' },
+  fullscreen: { flex: 1, backgroundColor: 'transparent' }
+})
diff --git a/mobile/src/session/MobileNativeChatVisualFrame.web.tsx b/mobile/src/session/MobileNativeChatVisualFrame.web.tsx
new file mode 100644
index 000000000000..2848d2126ca3
--- /dev/null
+++ b/mobile/src/session/MobileNativeChatVisualFrame.web.tsx
@@ -0,0 +1,59 @@
+import { memo, useMemo } from 'react'
+import { StyleSheet, View } from 'react-native'
+import { buildNativeChatVisualDocument } from '../../../src/shared/native-chat-visual-shell'
+// The native component's own prop type, so a change to it fails here rather than drifting.
+import type { MobileNativeChatVisualFrameProps } from './MobileNativeChatVisualFrame'
+import { MOBILE_NATIVE_CHAT_VISUAL_THEME } from './mobile-native-chat-visual-theme'
+
+/** No script runs, so nothing reports a height; a fixed frame the visual scrolls inside. */
+const SEALED_INLINE_HEIGHT = 320
+
+/**
+ * Web sibling, inside the hybrid shell's page: the visual rendered sealed, with no script.
+ *
+ * The page is served under the shell's response-header policy (`script-src 'self'`,
+ * `frame-src 'none'`), and a `srcdoc` frame inherits that policy, so a visual's inline scripts
+ * cannot run here without loosening the page's own policy. Static markup, CSS and images still
+ * render; script-drawn charts do not. An empty `sandbox` keeps the frame an opaque origin that runs
+ * nothing and navigates nothing, as the page's HTML preview does.
+ */
+export const MobileNativeChatVisualFrame = memo(function MobileNativeChatVisualFrame({
+  html,
+  title,
+  mode
+}: MobileNativeChatVisualFrameProps) {
+  // No script runs in this frame, so nothing ever reports on this channel.
+  const document = useMemo(
+    () =>
+      buildNativeChatVisualDocument({
+        html,
+        channel: 'sealed',
+        theme: MOBILE_NATIVE_CHAT_VISUAL_THEME
+      }),
+    [html]
+  )
+  return (
+    <View style={mode === 'inline' ? styles.inline : styles.fullscreen}>
+      <iframe
+        title={title}
+        sandbox=""
+        srcDoc={document}
+        referrerPolicy="no-referrer"
+        style={IFRAME_STYLE}
+      />
+    </View>
+  )
+})
+
+/** A DOM style, not a `StyleSheet` entry: this element is an `iframe` and not a react-native view. */
+const IFRAME_STYLE = {
+  border: 'none',
+  width: '100%',
+  height: '100%',
+  backgroundColor: 'transparent'
+} as const
+
+const styles = StyleSheet.create({
+  inline: { width: '100%', height: SEALED_INLINE_HEIGHT },
+  fullscreen: { flex: 1 }
+})
diff --git a/mobile/src/session/__mocks__/mobile-prompt-controller.ts b/mobile/src/session/__mocks__/mobile-prompt-controller.ts
index 397c4483ef29..0c34182ec844 100644
--- a/mobile/src/session/__mocks__/mobile-prompt-controller.ts
+++ b/mobile/src/session/__mocks__/mobile-prompt-controller.ts
@@ -66,6 +66,7 @@ vi.mock('lucide-react-native', () =>
   )
 )
 vi.mock('../MobileNativeChatMessage', () => ({ MobileNativeChatMessage: 'ChatMessage' }))
+vi.mock('../MobileNativeChatVisual', () => ({ useMobileNativeChatVisualRenderer: () => null }))
 vi.mock('../MobileNativeChatLiveLine', () => ({ MobileNativeChatLiveLine: 'LiveStatus' }))
 vi.mock('../MobileNativeChatAsk', () => ({ MobileNativeChatAsk: 'ChatAsk' }))
 vi.mock('../MobileAgentWorkingIndicator', () => ({
@@ -138,9 +139,9 @@ vi.mock('../use-mobile-native-chat-session-option-controller', () => ({
 vi.mock('../use-mobile-native-chat-file-search', () => ({
   useMobileNativeChatFileSearch: () => ({ nativeChatFilePaths: [], loadNativeChatFiles: vi.fn() })
 }))
-vi.mock('../use-mobile-native-chat-queued-slot', () => ({
-  NO_QUEUED_SLOT: {},
-  useMobileNativeChatQueuedSlot: () => ({})
+vi.mock('../use-mobile-native-chat-composer-tray', () => ({
+  NO_COMPOSER_TRAY: {},
+  useMobileNativeChatComposerTray: () => ({})
 }))
 vi.mock('../use-mobile-native-chat-streaming-bubble', () => ({
   useMobileNativeChatStreamingBubble: () => null
diff --git a/mobile/src/session/mobile-agent-child-row-text.ts b/mobile/src/session/mobile-agent-child-row-text.ts
new file mode 100644
index 000000000000..8920045a548e
--- /dev/null
+++ b/mobile/src/session/mobile-agent-child-row-text.ts
@@ -0,0 +1,71 @@
+// The phone's words for one child row: the shared row model decides what it says (name, detail,
+// lead order); this only puts each detail kind into English, as desktop's agent rows phrase it.
+
+import {
+  agentChildRowLeadTrail,
+  agentChildRowName
+} from '../../../src/shared/agent-child-row-lead-trail'
+import type { AgentChildRowModel } from '../../../src/shared/agent-child-row-model'
+import type { AgentChildDisplayState } from '../../../src/shared/agent-status-child-work-display'
+import { formatAgentTypeLabel } from '../../../src/shared/agent-type-label'
+import { sayBackgroundTaskEnglish } from '../../../src/shared/background-task-copy'
+import {
+  backgroundTaskStateReason,
+  backgroundTaskStateWord
+} from '../../../src/shared/background-task-roster'
+import { agentStateLabel } from '../worktree/agent-row-display'
+
+// Mobile's agent-row words for every state they cover; only child rows reach `unverifiable`.
+export function mobileAgentChildStateLabel(state: AgentChildDisplayState): string {
+  return state === 'unverifiable' ? 'No recent update' : agentStateLabel(state)
+}
+
+/** Coarse `34m` / `2h` / `3d`, floored so it never overstates the gap (desktop's no-update form). */
+function compactDuration(deltaMs: number): string {
+  const minutes = Math.max(0, Math.floor(deltaMs / 60_000))
+  if (minutes < 60) {
+    return `${minutes}m`
+  }
+  const hours = Math.floor(minutes / 60)
+  return hours < 24 ? `${hours}h` : `${Math.floor(hours / 24)}d`
+}
+
+function detailText(row: AgentChildRowModel, now: number): string {
+  const detail = row.detail
+  if (!detail) {
+    return ''
+  }
+  switch (detail.kind) {
+    case 'operation': {
+      const toolName = detail.toolName.trim()
+      const input = detail.input?.trim() ?? ''
+      return toolName && input ? `${toolName}: ${input}` : toolName
+    }
+    case 'monitoring':
+      return mobileAgentChildStateLabel('monitoring')
+    case 'message':
+      return detail.text
+    case 'ended':
+      return 'Ended'
+    case 'no-update':
+      return `No update in ${compactDuration(now - row.recencyAt)}`
+    case 'role':
+      return formatAgentTypeLabel(detail.agentType)
+    case 'reason':
+      return (
+        backgroundTaskStateReason(detail.state, sayBackgroundTaskEnglish) ??
+        backgroundTaskStateWord(detail.state, sayBackgroundTaskEnglish)
+      )
+  }
+}
+
+export function mobileAgentChildRowName(row: AgentChildRowModel): string {
+  return agentChildRowName(row, mobileAgentChildStateLabel)
+}
+
+export function mobileAgentChildRowText(
+  row: AgentChildRowModel,
+  now: number
+): { lead: string; trail: string } {
+  return agentChildRowLeadTrail(row, mobileAgentChildRowName(row), detailText(row, now))
+}
diff --git a/mobile/src/session/mobile-markdown-document-lifetime.test.ts b/mobile/src/session/mobile-markdown-document-lifetime.test.ts
new file mode 100644
index 000000000000..9df5d567ac5f
--- /dev/null
+++ b/mobile/src/session/mobile-markdown-document-lifetime.test.ts
@@ -0,0 +1,203 @@
+import { randomBytes } from 'node:crypto'
+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, MobileSessionTab } from './mobile-session-route-types'
+import { useMobileSessionDocumentReaders } from './use-mobile-session-document-readers'
+import { useMobileSessionCloseActions } from './use-mobile-session-close-actions'
+
+type ReaderScope = Parameters<typeof useMobileSessionDocumentReaders>[0]
+type CloseScope = Parameters<typeof useMobileSessionCloseActions>[0]
+
+function success(content: string): RpcResponse {
+  return {
+    id: 'read',
+    ok: true,
+    result: { content, version: 'version', isDirty: false, editable: false },
+    _meta: { runtimeId: 'host' }
+  }
+}
+
+function mountDocuments(readReply: () => Promise<RpcResponse>) {
+  let docs = new Map<string, MarkdownDocState>()
+  const tabs: { current: MobileSessionTab[] } = { current: [] }
+  const setDocs: ReaderScope['setMarkdownDocs'] = (update) => {
+    docs = typeof update === 'function' ? update(docs) : update
+  }
+  const closeReply = vi.fn(async (): Promise<RpcResponse> => success(''))
+  const client = {
+    sendRequest: vi.fn(async (method: string): Promise<RpcResponse> =>
+      method === 'markdown.readTab' || method === 'files.read' ? readReply() : closeReply()
+    )
+  }
+  let readers: ReturnType<typeof useMobileSessionDocumentReaders> | undefined
+  let close: ReturnType<typeof useMobileSessionCloseActions> | undefined
+  const hook = hookMount(() => {
+    readers = useMobileSessionDocumentReaders(
+      mountFixture<ReaderScope>({
+        worktreeId: 'folder-workspace',
+        client,
+        setMarkdownDocs: setDocs,
+        setFileDocs: () => {}
+      })
+    )
+    close = useMobileSessionCloseActions(
+      mountFixture<CloseScope>({
+        worktreeId: 'folder-workspace',
+        client,
+        sessionTabsRef: tabs,
+        setSessionTabs: () => {},
+        setFileDocs: () => {},
+        setMarkdownDocs: setDocs,
+        reconcileBufferedDraftsRef: { current: () => {} },
+        closedTabTombstonesRef: { current: new Map() },
+        activeSessionTabIdRef: { current: null },
+        selectedSessionTabIdRef: { current: null },
+        activeSessionTabTypeRef: { current: null },
+        activeHandleRef: { current: null },
+        setActiveSessionTabId: () => {},
+        setActiveHandle: () => {}
+      })
+    )
+  })
+  hook.mount()
+  const tab = (id: string) =>
+    mountFixture<Extract<MobileSessionTab, { type: 'markdown' }>>({
+      type: 'markdown',
+      id,
+      relativePath: `${id}.md`,
+      isDirty: false
+    })
+  return {
+    get docs() {
+      return docs
+    },
+    closeReply,
+    unmount: hook.unmount,
+    read(id: string) {
+      const target = tab(id)
+      tabs.current = [target]
+      return performHookAction(() => readers?.readMarkdownTab(target))
+    },
+    close(id: string) {
+      return performHookAction(() => close?.handleCloseSessionTab(tab(id)))
+    },
+    dirty(id: string) {
+      const doc = docs.get(id)
+      if (doc?.status !== 'ready') {
+        throw new Error('Missing ready document')
+      }
+      docs.set(id, { ...doc, localContent: 'phone draft', isDirty: true })
+    }
+  }
+}
+
+function delayedReply() {
+  let resolve: (reply: RpcResponse) => void = () => {}
+  const promise = new Promise<RpcResponse>((done) => {
+    resolve = done
+  })
+  return { promise, resolve }
+}
+
+describe('mobile Markdown document lifetime', () => {
+  it('releases 40 MiB of clean content after twenty reads and successful closes', async () => {
+    const h = mountDocuments(async () => success(randomBytes(1536 * 1024).toString('base64')))
+    try {
+      for (let index = 0; index < 20; index += 1) {
+        await h.read(`tab-${index}`)
+        const doc = h.docs.get(`tab-${index}`)
+        expect(doc?.status === 'ready' && Buffer.byteLength(doc.content)).toBe(2 * 1024 * 1024)
+        await h.close(`tab-${index}`)
+      }
+      expect(h.docs.size).toBe(0)
+    } finally {
+      h.unmount()
+    }
+  })
+
+  it.each(['success', 'failure', 'disk fallback'])(
+    'keeps a closed read released after a late %s',
+    async (kind) => {
+      const delayed = delayedReply()
+      const readReply = vi
+        .fn()
+        .mockReturnValueOnce(delayed.promise)
+        .mockResolvedValue(success('disk'))
+      const h = mountDocuments(readReply)
+      try {
+        const reading = h.read('closed')
+        await h.close('closed')
+        delayed.resolve(
+          kind === 'success'
+            ? success('late')
+            : {
+                id: 'read',
+                ok: false,
+                error: {
+                  code: kind === 'disk fallback' ? 'renderer_unavailable' : 'tab_not_found',
+                  message: 'Unavailable'
+                },
+                _meta: { runtimeId: 'host' }
+              }
+        )
+        await reading
+        expect(h.docs.size).toBe(0)
+        if (kind === 'disk fallback') {
+          expect(readReply).toHaveBeenCalledTimes(2)
+        }
+      } finally {
+        h.unmount()
+      }
+    }
+  )
+
+  it('retains the document when the host refuses close', async () => {
+    const h = mountDocuments(async () => success('kept'))
+    try {
+      await h.read('kept')
+      const doc = h.docs.get('kept')
+      h.closeReply.mockResolvedValue({
+        id: 'close',
+        ok: false,
+        error: { code: 'refused', message: 'Refused' },
+        _meta: { runtimeId: 'host' }
+      })
+      await h.close('kept')
+      expect(h.docs.get('kept')).toBe(doc)
+    } finally {
+      h.unmount()
+    }
+  })
+
+  it('preserves unsaved phone drafts after close', async () => {
+    const h = mountDocuments(async () => success('original'))
+    try {
+      await h.read('draft')
+      h.dirty('draft')
+      const draft = h.docs.get('draft')
+      await h.close('draft')
+      expect(h.docs.get('draft')).toBe(draft)
+    } finally {
+      h.unmount()
+    }
+  })
+
+  it('keeps a newer read when an older request finishes later', async () => {
+    const old = delayedReply()
+    const h = mountDocuments(
+      vi.fn().mockReturnValueOnce(old.promise).mockResolvedValue(success('new'))
+    )
+    try {
+      const first = h.read('same')
+      await h.read('same')
+      const current = h.docs.get('same')
+      old.resolve(success('old'))
+      await first
+      expect(h.docs.get('same')).toBe(current)
+    } finally {
+      h.unmount()
+    }
+  })
+})
diff --git a/mobile/src/session/mobile-native-chat-controller-contract.ts b/mobile/src/session/mobile-native-chat-controller-contract.ts
index fab3838d3682..74980499eb9c 100644
--- a/mobile/src/session/mobile-native-chat-controller-contract.ts
+++ b/mobile/src/session/mobile-native-chat-controller-contract.ts
@@ -13,9 +13,11 @@ import type {
 import type { NativeChatTurnJournal } from '../../../src/shared/native-chat-turn-membership'
 import type { MobileNativeChatSendOutcome } from './mobile-native-chat-send'
 import type { MobileStructuredQueuedMessageControls } from './use-mobile-structured-queued-message-controls'
+import type { MobileStructuredBackgroundTasks } from './use-mobile-structured-background-tasks'
 import type { MobileNativeChatPendingMessage } from './use-mobile-native-chat-drafts'
 import type { useMobileNativeChatSession } from './use-mobile-native-chat-session'
 import type { MobileNativeChatSessionOptionPickersProps } from './MobileNativeChatSessionOptionPickers'
+import type { MobileNativeChatVisualSource } from './mobile-native-chat-visual-read'
 
 export type MobileNativeChatController = {
   /** Whether a tab's effective view is chat (per-tab override, else the default). */
@@ -33,6 +35,8 @@ export type MobileNativeChatController = {
   nativeChatSession: ReturnType<typeof useMobileNativeChatSession>
   /** Structured lane: drives the per-turn status row and live tool progress. */
   nativeChatStructured: boolean
+  /** Structured lane with a live client: where the transcript's visuals are read from. */
+  nativeChatVisualSource: MobileNativeChatVisualSource | null
   nativeChatAgentWorking: boolean
   /** What labels the live turn's one indicator row; null off the structured lane. */
   nativeChatTurnIndicator: NativeChatLiveTurnIndicator | null
@@ -77,6 +81,8 @@ export type MobileNativeChatController = {
   /** Host-held queued drafts shown as cards above the composer (structured lane; any host
    *  that publishes them). */
   nativeChatQueued: MobileStructuredQueuedMessageControls
+  /** Running child work shown in a strip above the composer; null off the structured lane. */
+  nativeChatBackgroundTasks: MobileStructuredBackgroundTasks | null
   nativeChatFilePaths: string[]
   loadNativeChatFiles: (query: string) => void
   handleNativeChatQuestionAnswer: (text: string) => Promise<boolean>
@@ -93,7 +99,6 @@ export type MobileNativeChatController = {
       id?: string
       path: string
       previewUri: string
-      contentFingerprint?: string
     }[]
   ) => Promise<MobileNativeChatSendOutcome>
   /** Launch-context text still parked on the agent's TUI input line, or null.
diff --git a/mobile/src/session/mobile-native-chat-image-attachment.test.ts b/mobile/src/session/mobile-native-chat-image-attachment.test.ts
index 93f78434516e..f6565c322894 100644
--- a/mobile/src/session/mobile-native-chat-image-attachment.test.ts
+++ b/mobile/src/session/mobile-native-chat-image-attachment.test.ts
@@ -53,8 +53,7 @@ describe('uploadMobileNativeChatImages', () => {
     expect(result).toEqual([
       {
         path: '/tmp/orca-attach.png',
-        previewUri: 'file:///photo.jpg',
-        contentFingerprint: expect.stringMatching(/^[0-9a-f]{64}$/)
+        previewUri: 'file:///photo.jpg'
       }
     ])
     // Native chat defers the paste to submit — nothing is sent to the terminal here.
@@ -94,18 +93,15 @@ describe('uploadMobileNativeChatImages', () => {
     expect(result).toEqual([
       {
         path: '/tmp/a.png',
-        previewUri: 'file:///a.jpg',
-        contentFingerprint: expect.stringMatching(/^[0-9a-f]{64}$/)
+        previewUri: 'file:///a.jpg'
       },
       {
         path: '/tmp/b.png',
-        previewUri: 'file:///b.jpg',
-        contentFingerprint: expect.stringMatching(/^[0-9a-f]{64}$/)
+        previewUri: 'file:///b.jpg'
       },
       {
         path: '/tmp/c.png',
-        previewUri: 'file:///c.jpg',
-        contentFingerprint: expect.stringMatching(/^[0-9a-f]{64}$/)
+        previewUri: 'file:///c.jpg'
       }
     ])
     expect(order).toEqual([
@@ -154,8 +150,7 @@ describe('uploadMobileNativeChatImages', () => {
     expect(onImageUploaded).toHaveBeenCalledOnce()
     expect(onImageUploaded).toHaveBeenCalledWith({
       path: '/tmp/a.png',
-      previewUri: 'file:///a.jpg',
-      contentFingerprint: expect.stringMatching(/^[0-9a-f]{64}$/)
+      previewUri: 'file:///a.jpg'
     })
   })
 
@@ -171,8 +166,7 @@ describe('uploadMobileNativeChatImages', () => {
     expect(result).toEqual([
       {
         path: '/tmp/x.png',
-        previewUri: 'data:image/png;base64,BBBB',
-        contentFingerprint: expect.stringMatching(/^[0-9a-f]{64}$/)
+        previewUri: 'data:image/png;base64,BBBB'
       }
     ])
   })
diff --git a/mobile/src/session/mobile-native-chat-image-attachment.ts b/mobile/src/session/mobile-native-chat-image-attachment.ts
index e40076463258..3f0febbec349 100644
--- a/mobile/src/session/mobile-native-chat-image-attachment.ts
+++ b/mobile/src/session/mobile-native-chat-image-attachment.ts
@@ -1,6 +1,5 @@
 import { saveMobileClipboardImageAsTempFile } from './mobile-clipboard-image'
 import type { MobileClipboardImageRpcSender } from './mobile-clipboard-image-operations'
-import { structuredAgentSessionDomainFingerprint } from '../../../src/shared/structured-agent-session-mutation'
 // Type-only import so this module (and its unit test) stays free of the expo/
 // react-native picker chain; the concrete `pickImage` is injected by the hook.
 import type { MobileImageSource, PickedMobileImage } from './mobile-image-source-picker'
@@ -12,16 +11,6 @@ export type PendingNativeChatImage = {
   readonly id: string
   readonly path: string
   readonly previewUri: string
-  /** Stable across repeat uploads of the same bytes; never contains the image. */
-  readonly contentFingerprint?: string
-}
-
-export function mobileNativeChatImageContentFingerprint(base64: string): string {
-  return structuredAgentSessionDomainFingerprint({
-    domain: 'mobile.nativeChat.image',
-    sessionId: '',
-    fields: { base64 }
-  })
 }
 
 export function appendPendingNativeChatImages(
@@ -84,8 +73,7 @@ export async function uploadMobileNativeChatImages(
     const previewUri = image.uri ?? `data:image/png;base64,${image.base64}`
     const result = {
       path,
-      previewUri,
-      contentFingerprint: mobileNativeChatImageContentFingerprint(image.base64)
+      previewUri
     }
     uploaded.push(result)
     onImageUploaded?.(result)
diff --git a/mobile/src/session/mobile-native-chat-merged-snapshot-parity-hooks.test.tsx b/mobile/src/session/mobile-native-chat-merged-snapshot-parity-hooks.test.tsx
index 065df61ea190..f24470234903 100644
--- a/mobile/src/session/mobile-native-chat-merged-snapshot-parity-hooks.test.tsx
+++ b/mobile/src/session/mobile-native-chat-merged-snapshot-parity-hooks.test.tsx
@@ -64,6 +64,7 @@ vi.mock('./MobileNativeChatMessage', () => ({ MobileNativeChatMessage: 'ChatMess
 vi.mock('./MobileNativeChatLiveLine', () => ({ MobileNativeChatLiveLine: 'LiveStatus' }))
 vi.mock('./MobileNativeChatComposer', () => ({ MobileNativeChatComposer: 'Composer' }))
 vi.mock('./MobileNativeChatQueuedMessages', () => ({ MobileNativeChatQueuedMessages: 'Queued' }))
+vi.mock('./MobileNativeChatVisual', () => ({ useMobileNativeChatVisualRenderer: () => null }))
 vi.mock('../components/ActionSheetModal', () => ({ ActionSheetModal: 'ActionSheetModal' }))
 vi.mock('./MobileNativeChatAsk', () => ({ MobileNativeChatAsk: 'ChatAsk' }))
 vi.mock('./MobileNativeChatPermission', () => ({ MobileNativeChatPermission: 'ChatPermission' }))
diff --git a/mobile/src/session/mobile-native-chat-message-plain-text.test.ts b/mobile/src/session/mobile-native-chat-message-plain-text.test.ts
index b115cab82683..5c7962dd1d92 100644
--- a/mobile/src/session/mobile-native-chat-message-plain-text.test.ts
+++ b/mobile/src/session/mobile-native-chat-message-plain-text.test.ts
@@ -24,6 +24,14 @@ describe('nativeChatMessagePlainText', () => {
     ).toBe(AGENT_SESSION_HOST_STATUS_COPY['history-item-too-large'])
   })
 
+  it('leaves a visual line out of the copied prose, but not one inside a code fence', () => {
+    const text =
+      'Chart:\n::orca-visual{file="usage.html"}\nDone.\n```\n::orca-visual{file="x.html"}\n```'
+    expect(nativeChatMessagePlainText({ blocks: [{ type: 'text', text }] })).toBe(
+      'Chart:\nDone.\n```\n::orca-visual{file="x.html"}\n```'
+    )
+  })
+
   it('is empty for a message with no prose', () => {
     expect(
       nativeChatMessagePlainText({ blocks: [{ type: 'tool-call', name: 'Read', input: {} }] })
diff --git a/mobile/src/session/mobile-native-chat-message-plain-text.ts b/mobile/src/session/mobile-native-chat-message-plain-text.ts
index 40ca75dfaf62..944e57dffed0 100644
--- a/mobile/src/session/mobile-native-chat-message-plain-text.ts
+++ b/mobile/src/session/mobile-native-chat-message-plain-text.ts
@@ -3,6 +3,7 @@ import {
   isAgentSessionHostStatusPresentation
 } from '../../../src/shared/agent-session-host-status-rows'
 import { isTextBlock } from '../../../src/shared/native-chat-types'
+import { withoutNativeChatVisualDirectiveLines } from '../../../src/shared/native-chat-visual-directive'
 import type { NativeChatMessage } from '../../../src/shared/native-chat-types'
 
 /** Copy the displayed prose, excluding tool activity and image attachments. */
@@ -13,7 +14,8 @@ export function nativeChatMessagePlainText(message: Pick<NativeChatMessage, 'blo
     .map((block) =>
       isAgentSessionHostStatusPresentation(block.presentation)
         ? AGENT_SESSION_HOST_STATUS_COPY[block.presentation]
-        : block.text
+        : // A visual line is not prose; only the transcript can show it.
+          withoutNativeChatVisualDirectiveLines(block.text)
     )
     .filter((text) => text.trim().length > 0)
     .join('\n\n')
diff --git a/mobile/src/session/mobile-native-chat-message-visuals.test.ts b/mobile/src/session/mobile-native-chat-message-visuals.test.ts
new file mode 100644
index 000000000000..b0eda2cdfa59
--- /dev/null
+++ b/mobile/src/session/mobile-native-chat-message-visuals.test.ts
@@ -0,0 +1,154 @@
+import { createElement, type ReactNode } from 'react'
+import { act, create, type ReactTestRenderer } from 'react-test-renderer'
+import { afterEach, describe, expect, it, vi } from 'vitest'
+import type { NativeChatMessage } from '../../../src/shared/native-chat-types'
+import {
+  MobileNativeChatVisualContext,
+  type MobileNativeChatVisualRender
+} from './mobile-native-chat-visual-context'
+
+vi.mock('react-native', async () => {
+  const React = await import('react')
+  const Text = ({ children, ...props }: { children?: ReactNode }): ReactNode =>
+    React.createElement('Text', props, children)
+  return {
+    ActivityIndicator: 'ActivityIndicator',
+    Animated: {
+      Text,
+      Value: class {
+        setValue(): void {}
+      },
+      loop: (animation: unknown) => animation,
+      sequence: () => ({ start: vi.fn(), stop: vi.fn() }),
+      timing: () => ({ start: vi.fn(), stop: vi.fn() })
+    },
+    Image: 'Image',
+    Platform: { OS: 'ios' },
+    Pressable: 'Pressable',
+    ScrollView: ({ children, ...props }: { children?: ReactNode }) =>
+      React.createElement('ScrollView', props, children),
+    Text,
+    View: ({ children, ...props }: { children?: ReactNode }) =>
+      React.createElement('View', props, children),
+    StyleSheet: { create: (styles: unknown) => styles, hairlineWidth: 1 }
+  }
+})
+vi.mock('expo-clipboard', () => ({ setStringAsync: vi.fn() }))
+vi.mock('lucide-react-native', () => ({
+  ArrowUp: 'ArrowUp',
+  Brain: 'Brain',
+  ChevronDown: 'ChevronDown',
+  Copy: 'Copy',
+  SquareChevronRight: 'SquareChevronRight',
+  SquareTerminal: 'SquareTerminal',
+  Wrench: 'Wrench',
+  ChevronRight: 'ChevronRight'
+}))
+vi.mock('../components/MobileMarkdown', () => ({ MobileMarkdown: 'MobileMarkdown' }))
+vi.mock('./MobileNativeChatMessageActionsSheet', () => ({
+  MobileNativeChatMessageActionsSheet: 'MessageActionsSheet'
+}))
+
+import { MobileNativeChatMessage } from './MobileNativeChatMessage'
+
+const renderVisual: MobileNativeChatVisualRender = () => 'visual'
+
+function message(id: string, role: NativeChatMessage['role'], text: string): NativeChatMessage {
+  return { id, role, blocks: [{ type: 'text', text }], timestamp: null, source: 'transcript' }
+}
+
+describe('MobileNativeChatMessage visuals', () => {
+  let renderer: ReactTestRenderer | null = null
+
+  afterEach(() => {
+    act(() => renderer?.unmount())
+    renderer = null
+  })
+
+  function markdownProps(
+    row: NativeChatMessage,
+    options: {
+      visuals?: MobileNativeChatVisualRender | null
+      activeTurnIsWorking?: boolean
+      mayStillGrow?: boolean
+    } = {}
+  ): Record<string, unknown> {
+    act(() => {
+      renderer = create(
+        createElement(
+          MobileNativeChatVisualContext.Provider,
+          { value: options.visuals === undefined ? renderVisual : options.visuals },
+          createElement(MobileNativeChatMessage, {
+            message: row,
+            activeTurnIsWorking: options.activeTurnIsWorking,
+            mayStillGrow: options.mayStillGrow ?? true
+          })
+        )
+      )
+    })
+    return renderer!.root.find((node) => String(node.type) === 'MobileMarkdown').props
+  }
+
+  it("renders a finished assistant reply's directives through the transcript renderer", () => {
+    const props = markdownProps(message('a1', 'assistant', '::orca-visual{file="a.html"}'))
+    expect(props.renderVisual).toBe(renderVisual)
+    expect(props.content).toBe('::orca-visual{file="a.html"}')
+  })
+
+  it('hides a directive still being typed while its turn works, and mounts finished lines', () => {
+    const props = markdownProps(
+      message(
+        'a1',
+        'assistant',
+        '::orca-visual{file="done.html"}\nChart below.\n::orca-visual{file="usage"}'
+      ),
+      { activeTurnIsWorking: true }
+    )
+    expect(props.renderVisual).toBe(renderVisual)
+    expect(props.content).toBe('::orca-visual{file="done.html"}\nChart below.\n')
+  })
+
+  it('shows an earlier finished row of a working turn in full', () => {
+    const text = 'Pick one:\n::orca-visual{file="options.html"}'
+    expect(
+      markdownProps(message('a0', 'assistant', text), {
+        activeTurnIsWorking: true,
+        mayStillGrow: false
+      }).content
+    ).toBe(text)
+  })
+
+  it('holds back only the last block of the row: text followed by a tool call is finished', () => {
+    const text = 'Options:\n::orca-visual{file="options'
+    const row: NativeChatMessage = {
+      id: 'a1',
+      role: 'assistant',
+      blocks: [
+        { type: 'text', text },
+        { type: 'tool-call', name: 'AskUserQuestion', input: {} }
+      ],
+      timestamp: null,
+      source: 'transcript'
+    }
+    expect(markdownProps(row, { activeTurnIsWorking: true }).content).toBe(text)
+  })
+
+  it('shows the whole reply once its turn settles', () => {
+    const text = 'Chart below.\n::orca-visual{file="usage'
+    expect(markdownProps(message('a1', 'assistant', text)).content).toBe(text)
+  })
+
+  it('leaves directives as text where the chat has no visual source', () => {
+    const props = markdownProps(message('a1', 'assistant', '::orca-visual{file="a.html"}'), {
+      visuals: null,
+      activeTurnIsWorking: true
+    })
+    expect(props.renderVisual).toBeUndefined()
+    expect(props.content).toBe('::orca-visual{file="a.html"}')
+  })
+
+  it('never renders visuals in system rows', () => {
+    const props = markdownProps(message('s1', 'system', '::orca-visual{file="a.html"}'))
+    expect(props.renderVisual).toBeUndefined()
+  })
+})
diff --git a/mobile/src/session/mobile-native-chat-question.test.ts b/mobile/src/session/mobile-native-chat-question.test.ts
index 079e661e5451..04961f850578 100644
--- a/mobile/src/session/mobile-native-chat-question.test.ts
+++ b/mobile/src/session/mobile-native-chat-question.test.ts
@@ -148,6 +148,21 @@ describe('formatQuestionAnswer', () => {
       formatQuestionFreeTextAnswer({ ...numbered, freeTextToken: 'target' }, '  hi there  ')
     ).toBe(`target:${encodeURIComponent('hi there')}`)
   })
+
+  it('encodes empty and whitespace answers only when allowed', () => {
+    const withInput: MobileChatQuestion = {
+      ...numbered,
+      freeTextToken: 'target',
+      freeTextInput: { allowEmpty: true }
+    }
+    expect(formatQuestionFreeTextAnswer(withInput, '')).toBe('target:')
+    expect(formatQuestionFreeTextAnswer(withInput, '  \n ')).toBe(
+      `target:${encodeURIComponent('  \n ')}`
+    )
+    expect(formatQuestionFreeTextAnswer({ ...withInput, freeTextInput: undefined }, '  \n ')).toBe(
+      ''
+    )
+  })
 })
 
 describe('mobileChatQuestionKey', () => {
diff --git a/mobile/src/session/mobile-native-chat-question.ts b/mobile/src/session/mobile-native-chat-question.ts
index 66ebb75919f1..d32b335138ff 100644
--- a/mobile/src/session/mobile-native-chat-question.ts
+++ b/mobile/src/session/mobile-native-chat-question.ts
@@ -3,6 +3,8 @@
 // have no structured signal, so we parse the text conservatively and only treat
 // it as a question when a clear option list is present.
 
+import type { AgentJournalFreeTextInput } from '../../../src/shared/agent-session-journal-types'
+
 export type MobileChatQuestion = {
   question: string
   /** Structured prompt identity, present only for durable host prompts. */
@@ -19,6 +21,7 @@ export type MobileChatQuestion = {
   optionDescriptions?: (string | undefined)[]
   /** Opaque prefix used when free-text answers must target a specific prompt. */
   freeTextToken?: string
+  freeTextInput?: AgentJournalFreeTextInput
 }
 
 export function mobileChatQuestionKey(question: MobileChatQuestion): string {
@@ -203,11 +206,13 @@ export function formatQuestionAnswer(question: MobileChatQuestion, selected: str
 }
 
 export function formatQuestionFreeTextAnswer(question: MobileChatQuestion, text: string): string {
-  const trimmed = text.trim()
-  if (trimmed.length === 0) {
+  const answer = question.freeTextInput?.allowEmpty ? text : text.trim()
+  if (answer.length === 0 && !question.freeTextInput?.allowEmpty) {
     return ''
   }
   return question.freeTextToken
-    ? `${question.freeTextToken}:${encodeURIComponent(trimmed)}`
-    : formatQuestionAnswer(question, [trimmed])
+    ? `${question.freeTextToken}:${encodeURIComponent(answer)}`
+    : question.freeTextInput?.allowEmpty
+      ? answer
+      : formatQuestionAnswer(question, [answer])
 }
diff --git a/mobile/src/session/mobile-native-chat-render-data.ts b/mobile/src/session/mobile-native-chat-render-data.ts
index 58fec6363100..01e8900c0e57 100644
--- a/mobile/src/session/mobile-native-chat-render-data.ts
+++ b/mobile/src/session/mobile-native-chat-render-data.ts
@@ -55,7 +55,7 @@ export type MobileNativeChatPendingItem = {
 
 export function foldMobileNativeChatMessages(messages: NativeChatMessage[]): NativeChatMessage[] {
   // The conversation only: a subagent's rows are that subagent's, and mobile shows
-  // each spawn as its roster's one line rather than the child's own rows.
+  // each spawn as its roster row (one line per child) rather than the child's own rows.
   // Normalize first (desktop assembler parity): image marker turns fold into
   // image-ref blocks instead of rendering as raw `[Image: …]` text. An unrecognised event
   // with no words of its own is stored, not drawn; mobile draws no task list, so a plan update
diff --git a/mobile/src/session/mobile-native-chat-stopped-before-start.test.tsx b/mobile/src/session/mobile-native-chat-stopped-before-start.test.tsx
index fda3b94f18f4..8d7d2cc56591 100644
--- a/mobile/src/session/mobile-native-chat-stopped-before-start.test.tsx
+++ b/mobile/src/session/mobile-native-chat-stopped-before-start.test.tsx
@@ -174,7 +174,7 @@ describe('a send a Stop took back before the agent started it, on the phone', ()
       renderer = create(createElement(MobileNativeChatMessage, { message: messages[3]! }))
     })
     expect(renderer!.root.findAllByType(MobileMarkdown).map((node) => node.props.content)).toEqual([
-      'Stopped before the agent started'
+      'Stopped manually'
     ])
   })
 })
diff --git a/mobile/src/session/mobile-native-chat-visual-bridge.test.ts b/mobile/src/session/mobile-native-chat-visual-bridge.test.ts
new file mode 100644
index 000000000000..315eef8491b6
--- /dev/null
+++ b/mobile/src/session/mobile-native-chat-visual-bridge.test.ts
@@ -0,0 +1,104 @@
+import { describe, expect, it } from 'vitest'
+import {
+  NATIVE_CHAT_VISUAL_OPEN_LINK_TYPE,
+  NATIVE_CHAT_VISUAL_SIZE_TYPE
+} from '../../../src/shared/native-chat-visual-shell'
+import { readMobileNativeChatVisualBridgeMessage } from './mobile-native-chat-visual-bridge'
+import { buildMobileNativeChatVisualHostDocument } from './mobile-native-chat-visual-host-document'
+
+const TOKEN = 'f'.repeat(32)
+const CHANNEL = 'c'.repeat(32)
+
+function frame(data: Record<string, unknown>, token: string = TOKEN): string {
+  return JSON.stringify({ token, kind: 'frame', data: { channel: CHANNEL, ...data } })
+}
+
+function read(raw: unknown) {
+  return readMobileNativeChatVisualBridgeMessage(raw, TOKEN, CHANNEL)
+}
+
+describe('readMobileNativeChatVisualBridgeMessage', () => {
+  it('accepts a size report and an http(s) link relayed by the host document', () => {
+    expect(read(frame({ type: NATIVE_CHAT_VISUAL_SIZE_TYPE, height: 312.4 }))).toEqual({
+      kind: 'size',
+      height: 312.4
+    })
+    expect(
+      read(frame({ type: NATIVE_CHAT_VISUAL_OPEN_LINK_TYPE, url: 'https://example.com/a?b=c' }))
+    ).toEqual({ kind: 'open-link', url: 'https://example.com/a?b=c' })
+    expect(read(JSON.stringify({ token: TOKEN, kind: 'escaped' }))).toEqual({ kind: 'escaped' })
+  })
+
+  it('drops a message without this frame token or from another channel', () => {
+    const size = { type: NATIVE_CHAT_VISUAL_SIZE_TYPE, height: 300 }
+    expect(read(frame(size, 'other'))).toBeNull()
+    expect(read(JSON.stringify({ kind: 'frame', data: { channel: CHANNEL, ...size } }))).toBeNull()
+    expect(read(JSON.stringify({ kind: 'escaped' }))).toBeNull()
+    expect(read(frame({ ...size, channel: 'another-visual' }))).toBeNull()
+  })
+
+  it('drops links that are not plain http(s)', () => {
+    for (const url of [
+      'javascript:alert(1)',
+      'file:///etc/passwd',
+      'orca://open',
+      'data:text/html,hi',
+      `https://example.com/${'a'.repeat(3000)}`,
+      42
+    ]) {
+      expect(read(frame({ type: NATIVE_CHAT_VISUAL_OPEN_LINK_TYPE, url })), String(url)).toBeNull()
+    }
+  })
+
+  it('drops non-finite heights, unknown requests, non-strings, junk and oversized messages', () => {
+    for (const height of [Number.NaN, Number.POSITIVE_INFINITY, -1, '300', null]) {
+      expect(read(frame({ type: NATIVE_CHAT_VISUAL_SIZE_TYPE, height })), String(height)).toBeNull()
+    }
+    expect(read(frame({ type: 'orca-visual-navigate' }))).toBeNull()
+    expect(read('not json')).toBeNull()
+    expect(read(null)).toBeNull()
+    expect(read(undefined)).toBeNull()
+    expect(
+      read(frame({ type: NATIVE_CHAT_VISUAL_SIZE_TYPE, height: 300, pad: 'x'.repeat(9000) }))
+    ).toBeNull()
+  })
+})
+
+describe('buildMobileNativeChatVisualHostDocument', () => {
+  const build = (visualDocument: string) =>
+    buildMobileNativeChatVisualHostDocument({
+      visualDocument,
+      channel: CHANNEL,
+      token: TOKEN,
+      title: 'Usage </script><script>alert(1)</script>',
+      mode: 'inline'
+    })
+
+  it('puts the visual in an opaque frame that may only run scripts', () => {
+    const document = build('<p>hi</p>')
+    expect(document).toContain("frame.setAttribute('sandbox', 'allow-scripts')")
+    expect(document).not.toMatch(/allow-same-origin|allow-popups|allow-top-navigation|allow-forms/)
+    expect(document.indexOf('Content-Security-Policy')).toBeLessThan(document.indexOf('<script>'))
+  })
+
+  it('keeps the inline frame from scrolling so a drag on it scrolls the transcript', () => {
+    expect(build('<p>hi</p>')).toContain("if (!C.fullscreen) frame.setAttribute('scrolling', 'no')")
+  })
+
+  it('embeds the visual and title as script literals that cannot close the host script', () => {
+    const document = build('</script><script>window.ReactNativeWebView.postMessage("x")</script>')
+    // One script element: the host's own.
+    expect(document.match(/<script>/g)).toHaveLength(1)
+    expect(document.match(/<\/script>/g)).toHaveLength(1)
+  })
+
+  it('relays only the child window on its own channel, links only with focus and activation', () => {
+    const document = build('<p>hi</p>')
+    expect(document).toContain('event.source !== frame.contentWindow')
+    expect(document).toContain('data.channel !== C.channel')
+    expect(document).toContain(JSON.stringify(CHANNEL))
+    expect(document).toContain('document.activeElement !== frame')
+    expect(document).toContain('activation.isActive')
+    expect(document).toContain(JSON.stringify(TOKEN))
+  })
+})
diff --git a/mobile/src/session/mobile-native-chat-visual-bridge.ts b/mobile/src/session/mobile-native-chat-visual-bridge.ts
new file mode 100644
index 000000000000..77415e29d7c3
--- /dev/null
+++ b/mobile/src/session/mobile-native-chat-visual-bridge.ts
@@ -0,0 +1,51 @@
+import {
+  readNativeChatVisualFrameMessage,
+  type NativeChatVisualFrameMessage
+} from '../../../src/shared/native-chat-visual-shell'
+
+export type MobileNativeChatVisualBridgeEvent =
+  | NativeChatVisualFrameMessage
+  /** The visual navigated its frame away from its own document; the host document removed it. */
+  | { kind: 'escaped' }
+
+const MAX_BRIDGE_MESSAGE_LENGTH = 8 * 1024
+/** A link request is a deliberate tap; the app opens at most one per interval. */
+export const MOBILE_NATIVE_CHAT_VISUAL_LINK_INTERVAL_MS = 1_000
+
+/**
+ * The app's side of the visual bridge: a message counts only if it carries this frame's token
+ * (which only the trusted host document holds) and is one of the two requests a visual may make,
+ * from this visual's channel. Everything else, including a well-formed message without the token,
+ * is dropped.
+ */
+export function readMobileNativeChatVisualBridgeMessage(
+  raw: unknown,
+  token: string,
+  channel: string
+): MobileNativeChatVisualBridgeEvent | null {
+  if (typeof raw !== 'string' || raw.length > MAX_BRIDGE_MESSAGE_LENGTH) {
+    return null
+  }
+  let message: unknown
+  try {
+    message = JSON.parse(raw)
+  } catch {
+    return null
+  }
+  if (
+    typeof message !== 'object' ||
+    message === null ||
+    !('token' in message) ||
+    message.token !== token ||
+    !('kind' in message)
+  ) {
+    return null
+  }
+  if (message.kind === 'escaped') {
+    return { kind: 'escaped' }
+  }
+  if (message.kind === 'frame' && 'data' in message) {
+    return readNativeChatVisualFrameMessage(message.data, channel)
+  }
+  return null
+}
diff --git a/mobile/src/session/mobile-native-chat-visual-context.ts b/mobile/src/session/mobile-native-chat-visual-context.ts
new file mode 100644
index 000000000000..abbf936d7494
--- /dev/null
+++ b/mobile/src/session/mobile-native-chat-visual-context.ts
@@ -0,0 +1,15 @@
+import { createContext, type ReactNode } from 'react'
+import type { NativeChatVisualDirective } from '../../../src/shared/native-chat-visual-directive'
+
+export type MobileNativeChatVisualRender = (
+  directive: NativeChatVisualDirective,
+  index: number
+) => ReactNode
+
+/**
+ * How this transcript renders `::orca-visual` lines, or null where it cannot (no structured chat or
+ * no client). Rows read only this, so they never import the WebView frame themselves.
+ */
+export const MobileNativeChatVisualContext = createContext<MobileNativeChatVisualRender | null>(
+  null
+)
diff --git a/mobile/src/session/mobile-native-chat-visual-host-document.ts b/mobile/src/session/mobile-native-chat-visual-host-document.ts
new file mode 100644
index 000000000000..b051c62b62d1
--- /dev/null
+++ b/mobile/src/session/mobile-native-chat-visual-host-document.ts
@@ -0,0 +1,132 @@
+import {
+  NATIVE_CHAT_VISUAL_CSP,
+  NATIVE_CHAT_VISUAL_OPEN_LINK_TYPE,
+  NATIVE_CHAT_VISUAL_SIZE_TYPE
+} from '../../../src/shared/native-chat-visual-shell'
+import { inlineScriptLiteral } from '../components/inline-script-json'
+
+/** `inline` sizes the frame to the height the app applies; `fullscreen` fills the screen and scrolls. */
+export type MobileNativeChatVisualHostMode = 'inline' | 'fullscreen'
+
+export const MOBILE_NATIVE_CHAT_VISUAL_INITIAL_HEIGHT = 160
+
+/** The host page's function the app calls to size the frame to a height it has decided. */
+export const MOBILE_NATIVE_CHAT_VISUAL_APPLY_HEIGHT = '__orcaVisualApplyHeight'
+
+// The host forwards at most one size report per interval (the latest wins) and one link per window.
+const SIZE_FORWARD_INTERVAL_MS = 100
+const LINK_WINDOW_MS = 5_000
+
+/**
+ * The trusted document the WebView loads. A native WebView's top document gets no `sandbox`, so
+ * the author HTML never runs here: it runs in an opaque `sandbox="allow-scripts"` srcdoc child, and
+ * this document is the only one the app listens to (the WebView patch drops messages from any frame
+ * but the main one).
+ *
+ * - It relays only messages whose `source` is the child's window, as data for the app to validate,
+ *   and stamps them with `token`, which the child never sees.
+ * - A link request is relayed only while the child frame holds focus and the page holds user
+ *   activation, and at most once per activation window.
+ * - A second `load` of the child means it navigated away from its document: the frame is removed
+ *   and the app told, so a replacement document never inherits the frame.
+ * - It never sizes the frame from a report itself; the app decides heights and calls back.
+ * - Inline, the frame does not scroll, so a drag that starts on it scrolls the transcript.
+ *
+ * The child inherits this document's policy (a srcdoc frame has no URL of its own) and adds the
+ * same policy from its own meta, so this document carries the visual policy too.
+ */
+export function buildMobileNativeChatVisualHostDocument(input: {
+  visualDocument: string
+  /** The channel the visual document was built with; only messages on it are relayed. */
+  channel: string
+  token: string
+  title: string
+  mode: MobileNativeChatVisualHostMode
+}): string {
+  const frameHeight =
+    input.mode === 'fullscreen' ? '100vh' : `${MOBILE_NATIVE_CHAT_VISUAL_INITIAL_HEIGHT}px`
+  const constants = inlineScriptLiteral({
+    token: input.token,
+    channel: input.channel,
+    fullscreen: input.mode === 'fullscreen',
+    title: input.title,
+    size: NATIVE_CHAT_VISUAL_SIZE_TYPE,
+    link: NATIVE_CHAT_VISUAL_OPEN_LINK_TYPE,
+    applyHeight: MOBILE_NATIVE_CHAT_VISUAL_APPLY_HEIGHT,
+    sizeIntervalMs: SIZE_FORWARD_INTERVAL_MS,
+    linkWindowMs: LINK_WINDOW_MS
+  })
+  return `<!doctype html>
+<html>
+<head>
+<meta charset="utf-8">
+<meta http-equiv="Content-Security-Policy" content="${NATIVE_CHAT_VISUAL_CSP}">
+<meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1">
+<style>html,body{margin:0;padding:0;background:transparent;overflow:hidden}iframe{display:block;border:0;width:100%;height:${frameHeight};background:transparent}</style>
+</head>
+<body>
+<script>
+(function () {
+'use strict'
+var C = ${constants}
+var channel = window.ReactNativeWebView
+function send(message) {
+  message.token = C.token
+  if (channel) channel.postMessage(JSON.stringify(message))
+}
+var frame = document.createElement('iframe')
+frame.setAttribute('sandbox', 'allow-scripts')
+frame.setAttribute('referrerpolicy', 'no-referrer')
+frame.setAttribute('allow', "camera 'none'; microphone 'none'; geolocation 'none'; clipboard-read 'none'; clipboard-write 'none'; display-capture 'none'")
+frame.setAttribute('title', C.title)
+// iOS gives a scrollable frame its own scroll view, which takes a drag meant for the transcript;
+// inline the frame is sized to its content (full screen still scrolls).
+if (!C.fullscreen) frame.setAttribute('scrolling', 'no')
+var loads = 0
+frame.addEventListener('load', function () {
+  loads += 1
+  if (loads > 1) {
+    frame.remove()
+    send({ kind: 'escaped' })
+  }
+})
+window[C.applyHeight] = function (height) {
+  if (!C.fullscreen && typeof height === 'number' && isFinite(height)) frame.style.height = height + 'px'
+}
+var pendingSize = null
+var sizeTimer = null
+function flushSize() {
+  sizeTimer = null
+  if (pendingSize === null) return
+  send({ kind: 'frame', data: pendingSize })
+  pendingSize = null
+}
+var lastLinkAt = -Infinity
+window.addEventListener('message', function (event) {
+  if (!frame.contentWindow || event.source !== frame.contentWindow) return
+  var data = event.data
+  // The visual chooses every field, so only an exact channel match is relayed, as the host's own copy.
+  if (!data || typeof data !== 'object' || data.channel !== C.channel) return
+  if (data.type === C.size) {
+    if (C.fullscreen) return
+    pendingSize = { type: C.size, channel: C.channel, height: Number(data.height) }
+    if (sizeTimer === null) sizeTimer = setTimeout(flushSize, C.sizeIntervalMs)
+    return
+  }
+  if (data.type === C.link) {
+    var activation = navigator.userActivation
+    var now = Date.now()
+    if (document.activeElement !== frame || !activation || !activation.isActive) return
+    if (typeof data.url !== 'string' || data.url.length > 4096) return
+    if (now - lastLinkAt < C.linkWindowMs) return
+    lastLinkAt = now
+    send({ kind: 'frame', data: { type: C.link, channel: C.channel, url: data.url } })
+  }
+})
+frame.srcdoc = ${inlineScriptLiteral(input.visualDocument)}
+document.body.appendChild(frame)
+})()
+</script>
+</body>
+</html>`
+}
diff --git a/mobile/src/session/mobile-native-chat-visual-read.test.ts b/mobile/src/session/mobile-native-chat-visual-read.test.ts
new file mode 100644
index 000000000000..7ff33904ba0f
--- /dev/null
+++ b/mobile/src/session/mobile-native-chat-visual-read.test.ts
@@ -0,0 +1,200 @@
+import { afterEach, describe, expect, it, vi } from 'vitest'
+import type { RpcClient } from '../transport/rpc-client'
+import type { RpcResponse } from '../transport/types'
+import {
+  cachedMobileNativeChatVisual,
+  readMobileNativeChatVisual,
+  resetMobileNativeChatVisualCacheForTest,
+  type MobileNativeChatVisualSource
+} from './mobile-native-chat-visual-read'
+
+const REVISION_A = 'a'.repeat(32)
+const REVISION_B = 'b'.repeat(32)
+
+function success(result: unknown): RpcResponse {
+  return { id: '1', ok: true, result }
+}
+
+function failure(code: string): RpcResponse {
+  return { id: '1', ok: false, error: { code, message: code } }
+}
+
+function sourceWith(sendRequest: ReturnType<typeof vi.fn>): MobileNativeChatVisualSource {
+  // oxlint-disable-next-line typescript/consistent-type-assertions -- SAFETY: the reader calls only sendRequest; the rest of RpcClient is connection lifecycle it never touches.
+  const client = { sendRequest } as unknown as RpcClient
+  return { client, sessionId: 'session-1' }
+}
+
+afterEach(() => {
+  resetMobileNativeChatVisualCacheForTest()
+})
+
+describe('readMobileNativeChatVisual', () => {
+  it('reads the visual by session and bare file name, then caches it', async () => {
+    const sendRequest = vi
+      .fn()
+      .mockResolvedValue(success({ ok: true, revision: REVISION_A, sizeBytes: 3, html: '<p>' }))
+    const source = sourceWith(sendRequest)
+
+    await expect(readMobileNativeChatVisual(source, 'chart.html')).resolves.toEqual({
+      kind: 'ready',
+      html: '<p>',
+      revision: REVISION_A
+    })
+    expect(sendRequest).toHaveBeenCalledWith(
+      'agentSession.readVisual',
+      { sessionId: 'session-1', file: 'chart.html' },
+      expect.objectContaining({ timeoutMs: expect.any(Number) })
+    )
+    expect(cachedMobileNativeChatVisual(source, 'chart.html')).toEqual({
+      html: '<p>',
+      revision: REVISION_A
+    })
+  })
+
+  it('revalidates with the held revision and keeps the cached bytes on unchanged', async () => {
+    const sendRequest = vi
+      .fn()
+      .mockResolvedValueOnce(success({ ok: true, revision: REVISION_A, sizeBytes: 3, html: '<p>' }))
+      .mockResolvedValueOnce(
+        success({ ok: true, revision: REVISION_A, sizeBytes: 3, unchanged: true })
+      )
+    const source = sourceWith(sendRequest)
+    await readMobileNativeChatVisual(source, 'chart.html')
+
+    await expect(readMobileNativeChatVisual(source, 'chart.html')).resolves.toEqual({
+      kind: 'ready',
+      html: '<p>',
+      revision: REVISION_A
+    })
+    expect(sendRequest.mock.calls[1]?.[1]).toEqual({
+      sessionId: 'session-1',
+      file: 'chart.html',
+      knownRevision: REVISION_A
+    })
+  })
+
+  it('replaces the cached bytes when the host has a new revision', async () => {
+    const sendRequest = vi
+      .fn()
+      .mockResolvedValueOnce(success({ ok: true, revision: REVISION_A, sizeBytes: 3, html: '<p>' }))
+      .mockResolvedValueOnce(
+        success({ ok: true, revision: REVISION_B, sizeBytes: 4, html: '<hr>' })
+      )
+    const source = sourceWith(sendRequest)
+    await readMobileNativeChatVisual(source, 'chart.html')
+    await readMobileNativeChatVisual(source, 'chart.html')
+    expect(cachedMobileNativeChatVisual(source, 'chart.html')?.revision).toBe(REVISION_B)
+  })
+
+  it('drops the cached bytes when the host refuses a visual it served before', async () => {
+    const source = sourceWith(
+      vi
+        .fn()
+        .mockResolvedValueOnce(
+          success({ ok: true, revision: REVISION_A, sizeBytes: 3, html: '<p>' })
+        )
+        .mockResolvedValueOnce(success({ ok: false, error: 'not_found' }))
+    )
+    await readMobileNativeChatVisual(source, 'chart.html')
+    await expect(readMobileNativeChatVisual(source, 'chart.html')).resolves.toEqual({
+      kind: 'refused'
+    })
+    expect(cachedMobileNativeChatVisual(source, 'chart.html')).toBeNull()
+  })
+
+  it('reads a host verdict and an older host as refused', async () => {
+    for (const response of [
+      success({ ok: false, error: 'not_found' }),
+      success({ ok: false, error: 'some_future_error' }),
+      failure('method_not_found'),
+      failure('forbidden')
+    ]) {
+      resetMobileNativeChatVisualCacheForTest()
+      const source = sourceWith(vi.fn().mockResolvedValue(response))
+      await expect(readMobileNativeChatVisual(source, 'chart.html')).resolves.toEqual({
+        kind: 'refused'
+      })
+    }
+  })
+
+  it('reads an error reply and a malformed reply as no verdict, keeping the cache', async () => {
+    for (const response of [
+      failure('runtime_error'),
+      success({ ok: true, revision: 'not-hex', html: '' }),
+      success('<html>')
+    ]) {
+      resetMobileNativeChatVisualCacheForTest()
+      const sendRequest = vi
+        .fn()
+        .mockResolvedValueOnce(
+          success({ ok: true, revision: REVISION_A, sizeBytes: 3, html: '<p>' })
+        )
+        .mockResolvedValueOnce(response)
+      const source = sourceWith(sendRequest)
+      await readMobileNativeChatVisual(source, 'chart.html')
+      await expect(readMobileNativeChatVisual(source, 'chart.html')).resolves.toEqual({
+        kind: 'unreachable'
+      })
+      expect(cachedMobileNativeChatVisual(source, 'chart.html')).not.toBeNull()
+    }
+  })
+
+  it('reads a transport failure as unreachable, never as refused', async () => {
+    const source = sourceWith(vi.fn().mockRejectedValue(new Error('socket closed')))
+    await expect(readMobileNativeChatVisual(source, 'chart.html')).resolves.toEqual({
+      kind: 'unreachable'
+    })
+  })
+
+  it('treats an unchanged answer for a revision it never sent as unreachable and drops the entry', async () => {
+    const source = sourceWith(
+      vi.fn().mockResolvedValue(success({ ok: true, revision: REVISION_A, unchanged: true }))
+    )
+    await expect(readMobileNativeChatVisual(source, 'chart.html')).resolves.toEqual({
+      kind: 'unreachable'
+    })
+    expect(cachedMobileNativeChatVisual(source, 'chart.html')).toBeNull()
+  })
+
+  it('shares one request between concurrent reads of the same visual', async () => {
+    let resolve: (response: RpcResponse) => void = () => {}
+    const sendRequest = vi.fn(
+      () =>
+        new Promise<RpcResponse>((settle) => {
+          resolve = settle
+        })
+    )
+    const source = sourceWith(sendRequest)
+    const first = readMobileNativeChatVisual(source, 'chart.html')
+    const second = readMobileNativeChatVisual(source, 'chart.html')
+    resolve(success({ ok: true, revision: REVISION_A, sizeBytes: 3, html: '<p>' }))
+    await expect(Promise.all([first, second])).resolves.toHaveLength(2)
+    expect(sendRequest).toHaveBeenCalledTimes(1)
+  })
+
+  it('keys the cache by client and session, so another host or chat never sees this one', async () => {
+    const source = sourceWith(
+      vi
+        .fn()
+        .mockResolvedValue(success({ ok: true, revision: REVISION_A, sizeBytes: 3, html: '<p>' }))
+    )
+    await readMobileNativeChatVisual(source, 'chart.html')
+    expect(cachedMobileNativeChatVisual({ ...source, sessionId: 'other' }, 'chart.html')).toBeNull()
+    const otherHost = sourceWith(vi.fn()).client
+    expect(cachedMobileNativeChatVisual({ ...source, client: otherHost }, 'chart.html')).toBeNull()
+  })
+
+  it('evicts the oldest visuals past the entry bound', async () => {
+    const source = sourceWith(
+      vi
+        .fn()
+        .mockResolvedValue(success({ ok: true, revision: REVISION_A, sizeBytes: 3, html: '<p>' }))
+    )
+    for (let index = 0; index < 17; index += 1) {
+      await readMobileNativeChatVisual(source, `v${index}.html`)
+    }
+    expect(cachedMobileNativeChatVisual(source, 'v0.html')).toBeNull()
+    expect(cachedMobileNativeChatVisual(source, 'v16.html')).not.toBeNull()
+  })
+})
diff --git a/mobile/src/session/mobile-native-chat-visual-read.ts b/mobile/src/session/mobile-native-chat-visual-read.ts
new file mode 100644
index 000000000000..7b46618a4f4e
--- /dev/null
+++ b/mobile/src/session/mobile-native-chat-visual-read.ts
@@ -0,0 +1,169 @@
+import { z } from 'zod'
+import { NATIVE_CHAT_VISUAL_MAX_BYTES } from '../../../src/shared/native-chat-visual-directive'
+import { bindDeferredRpcOperation, defineRpcOperation } from '../transport/rpc-operation'
+import { rpcResultVariant } from '../transport/rpc-operation-result-reader'
+import { isMobileMethodUnavailableError } from '../transport/mobile-method-unavailable'
+import type { RpcClient } from '../transport/rpc-client'
+
+/** Where a chat's visuals are read from: the host that owns the structured session. */
+export type MobileNativeChatVisualSource = {
+  client: RpcClient
+  sessionId: string
+}
+
+export type MobileNativeChatVisualRead =
+  | { kind: 'ready'; html: string; revision: string }
+  /** The host positively refused (missing, too large, outside the folder...) or cannot serve visuals. */
+  | { kind: 'refused' }
+  /** No verdict: no answer, an error reply, an unreadable answer. Worth asking again. */
+  | { kind: 'unreachable' }
+
+const Revision = z.string().regex(/^[0-9a-f]{16,64}$/)
+
+const visualReadReplySchema = z.union([
+  z.object({
+    ok: z.literal(true),
+    revision: Revision,
+    html: z.string().max(NATIVE_CHAT_VISUAL_MAX_BYTES)
+  }),
+  z.object({ ok: z.literal(true), revision: Revision, unchanged: z.literal(true) }),
+  // A newer host's error code still reads as a refusal.
+  z.object({ ok: z.literal(false), error: z.string() })
+])
+
+/** An error reply and an unreadable reply both read as null. */
+const nativeChatVisualRead = bindDeferredRpcOperation(
+  defineRpcOperation({
+    name: 'agentSession.read-visual',
+    method: 'agentSession.readVisual',
+    acceptance: 'object-result-or-null',
+    barrier: 'after-caller-barrier',
+    read: rpcResultVariant('native-chat-visual', visualReadReplySchema)
+  })
+)
+
+const READ_TIMEOUT_MS = 15_000
+// Each entry is at most 512 KiB of UTF-8; the character bound is what caps memory.
+const MAX_CACHE_ENTRIES = 16
+const MAX_CACHE_CHARS = 4 * 1024 * 1024
+
+type CachedVisual = { html: string; revision: string }
+
+const cache = new Map<string, CachedVisual>()
+const inFlight = new Map<string, Promise<MobileNativeChatVisualRead>>()
+
+// The client stands for the host: each paired host has its own, so one host's visuals never
+// answer for another's even if two session ids collided.
+const clientKeys = new WeakMap<RpcClient, number>()
+let nextClientKey = 0
+
+function cacheKey(source: MobileNativeChatVisualSource, file: string): string {
+  let clientKey = clientKeys.get(source.client)
+  if (clientKey === undefined) {
+    nextClientKey += 1
+    clientKey = nextClientKey
+    clientKeys.set(source.client, clientKey)
+  }
+  return JSON.stringify([clientKey, source.sessionId, file])
+}
+
+function remember(key: string, entry: CachedVisual): void {
+  cache.delete(key)
+  cache.set(key, entry)
+  let chars = 0
+  for (const value of cache.values()) {
+    chars += value.html.length
+  }
+  // Oldest first: Map iteration follows insertion order, and a hit re-inserts.
+  for (const [oldKey, value] of cache) {
+    if (cache.size <= MAX_CACHE_ENTRIES && chars <= MAX_CACHE_CHARS) {
+      break
+    }
+    if (oldKey === key) {
+      continue
+    }
+    cache.delete(oldKey)
+    chars -= value.html.length
+  }
+}
+
+/** What this phone already holds for a visual, to paint before revalidating. */
+export function cachedMobileNativeChatVisual(
+  source: MobileNativeChatVisualSource,
+  file: string
+): CachedVisual | null {
+  return cache.get(cacheKey(source, file)) ?? null
+}
+
+async function readOnce(
+  source: MobileNativeChatVisualSource,
+  file: string,
+  key: string
+): Promise<MobileNativeChatVisualRead> {
+  const known = cache.get(key)
+  let response
+  try {
+    response = await nativeChatVisualRead.request(
+      source.client,
+      {
+        sessionId: source.sessionId,
+        file,
+        ...(known ? { knownRevision: known.revision } : {})
+      },
+      { timeoutMs: READ_TIMEOUT_MS, budgetSpansConnect: true }
+    )
+  } catch {
+    return { kind: 'unreachable' }
+  }
+  if (!response.ok && isMobileMethodUnavailableError(response.error.code, response.error.message)) {
+    // An older host (its mobile allowlist answers `forbidden`): asking again will not help.
+    return { kind: 'refused' }
+  }
+  const reply = nativeChatVisualRead.interpret(response)
+  if (reply === null) {
+    // An error reply, an older host or an unreadable answer is not a verdict on the file.
+    return { kind: 'unreachable' }
+  }
+  if (!reply.ok) {
+    // The host no longer serves it (deleted, now too large...): stop painting the old bytes.
+    cache.delete(key)
+    return { kind: 'refused' }
+  }
+  if ('html' in reply) {
+    remember(key, { html: reply.html, revision: reply.revision })
+    return { kind: 'ready', html: reply.html, revision: reply.revision }
+  }
+  // `unchanged` answers the revision this phone sent; anything else is a host that lost track.
+  if (known && known.revision === reply.revision) {
+    remember(key, known)
+    return { kind: 'ready', html: known.html, revision: known.revision }
+  }
+  cache.delete(key)
+  return { kind: 'unreachable' }
+}
+
+/**
+ * Reads one visual from the chat's owning host, revalidating what the phone already holds by
+ * revision. Concurrent reads of the same visual share one request.
+ */
+export function readMobileNativeChatVisual(
+  source: MobileNativeChatVisualSource,
+  file: string
+): Promise<MobileNativeChatVisualRead> {
+  const key = cacheKey(source, file)
+  const pending = inFlight.get(key)
+  if (pending) {
+    return pending
+  }
+  const read = readOnce(source, file, key).finally(() => {
+    inFlight.delete(key)
+  })
+  inFlight.set(key, read)
+  return read
+}
+
+/** Test seam: forget every cached visual. */
+export function resetMobileNativeChatVisualCacheForTest(): void {
+  cache.clear()
+  inFlight.clear()
+}
diff --git a/mobile/src/session/mobile-native-chat-visual-theme.ts b/mobile/src/session/mobile-native-chat-visual-theme.ts
new file mode 100644
index 000000000000..08f244887d52
--- /dev/null
+++ b/mobile/src/session/mobile-native-chat-visual-theme.ts
@@ -0,0 +1,40 @@
+import type { NativeChatVisualTheme } from '../../../src/shared/native-chat-visual-shell'
+import { colors, radii } from '../theme/mobile-theme'
+
+/**
+ * The phone's one (dark) theme, as the variables a visual styles against. The app has no theme
+ * switch, so a visual receives this before its content runs and never needs a live update.
+ * Chart colors are desktop's dark `--chart-1..5` (the blue 300-800 ramp), as hex.
+ */
+export const MOBILE_NATIVE_CHAT_VISUAL_THEME: NativeChatVisualTheme = {
+  colorScheme: 'dark',
+  tokens: {
+    '--background': colors.bgBase,
+    '--foreground': colors.textPrimary,
+    '--card': colors.bgPanel,
+    '--card-foreground': colors.textPrimary,
+    '--popover': colors.bgRaised,
+    '--popover-foreground': colors.textPrimary,
+    '--primary': colors.surfaceBright,
+    '--primary-foreground': colors.bgBase,
+    '--secondary': colors.bgRaised,
+    '--secondary-foreground': colors.textPrimary,
+    '--muted': colors.bgRaised,
+    '--muted-foreground': colors.textMuted,
+    '--accent': colors.bgRaised,
+    '--accent-foreground': colors.textPrimary,
+    '--destructive': colors.statusRed,
+    '--destructive-foreground': colors.onAccent,
+    '--border': colors.borderSubtle,
+    '--input': colors.borderSubtle,
+    '--ring': colors.textMuted,
+    '--radius': `${radii.row}px`,
+    '--chart-1': '#8ec5ff',
+    '--chart-2': '#2b7fff',
+    '--chart-3': '#155dfc',
+    '--chart-4': '#1447e6',
+    '--chart-5': '#193cb8',
+    '--font-sans': '-apple-system, system-ui, Roboto, sans-serif',
+    '--font-mono': 'Menlo, monospace'
+  }
+}
diff --git a/mobile/src/session/mobile-structured-agent-prompts-free-text.test.ts b/mobile/src/session/mobile-structured-agent-prompts-free-text.test.ts
new file mode 100644
index 000000000000..5cf44a60c472
--- /dev/null
+++ b/mobile/src/session/mobile-structured-agent-prompts-free-text.test.ts
@@ -0,0 +1,70 @@
+import { describe, expect, it } from 'vitest'
+import type { AgentJournalFreeTextInput } from '../../../src/shared/agent-session-journal-types'
+import { formatQuestionFreeTextAnswer } from './mobile-native-chat-question'
+import {
+  projectStructuredQuestion,
+  structuredQuestionResponseTarget,
+  type StructuredQuestionItem
+} from './mobile-structured-agent-prompts'
+
+function prompt(freeTextInput?: AgentJournalFreeTextInput): StructuredQuestionItem {
+  return {
+    itemId: 'item-1',
+    revision: 3,
+    sequence: 1,
+    observedAt: 1,
+    body: {
+      kind: 'question',
+      question: 'Edit the draft',
+      options: [],
+      freeTextQuestionId: 'q1',
+      ...(freeTextInput ? { freeTextInput } : {}),
+      resolution: { state: 'pending', selectedOptionId: null, resolvedBy: null, resolvedAt: null }
+    }
+  }
+}
+
+describe('mobile structured free-text questions', () => {
+  it('projects editor input metadata onto the existing question card', () => {
+    const freeTextInput = {
+      allowEmpty: true,
+      multiline: true,
+      initialValue: 'draft',
+      placeholder: 'Edit here'
+    }
+    expect(projectStructuredQuestion(prompt(freeTextInput))?.freeTextInput).toEqual(freeTextInput)
+    expect(projectStructuredQuestion(prompt())?.freeTextInput).toBeUndefined()
+  })
+
+  it('accepts empty and whitespace text only for the matching allowed prompt', () => {
+    const current = prompt({ allowEmpty: true })
+    const projected = projectStructuredQuestion(current)!
+    for (const answer of ['', '  \n ']) {
+      const response = formatQuestionFreeTextAnswer(projected, answer)
+      expect(structuredQuestionResponseTarget(response, current)).toEqual({
+        itemId: 'item-1',
+        expectedRevision: 3,
+        answer: { questionId: 'q1', optionIds: [], other: answer }
+      })
+      expect(structuredQuestionResponseTarget(response, prompt())).toBeNull()
+    }
+    expect(
+      structuredQuestionResponseTarget(formatQuestionFreeTextAnswer(projected, ''), {
+        ...current,
+        revision: 4
+      })
+    ).toBeNull()
+  })
+
+  it('keeps legacy trimming for ordinary free-text answers', () => {
+    const current = prompt()
+    const projected = projectStructuredQuestion(current)!
+    expect(
+      structuredQuestionResponseTarget(
+        formatQuestionFreeTextAnswer(projected, '  draft  '),
+        current
+      )
+    ).toMatchObject({ answer: { other: 'draft' } })
+    expect(structuredQuestionResponseTarget('', current)).toBeNull()
+  })
+})
diff --git a/mobile/src/session/mobile-structured-agent-prompts.ts b/mobile/src/session/mobile-structured-agent-prompts.ts
index b36ca43e8924..cd1b35d0102f 100644
--- a/mobile/src/session/mobile-structured-agent-prompts.ts
+++ b/mobile/src/session/mobile-structured-agent-prompts.ts
@@ -192,6 +192,7 @@ export function projectStructuredQuestion(
     ...(optionDescriptions.some(Boolean) ? { optionDescriptions } : {}),
     multiSelect: false,
     allowOther: Boolean(prompt.body.freeTextQuestionId),
+    ...(prompt.body.freeTextInput ? { freeTextInput: prompt.body.freeTextInput } : {}),
     optionTokens: prompt.body.options.map((option) =>
       encodePromptToken({
         kind: 'question-option',
@@ -258,8 +259,13 @@ export function structuredQuestionResponseTarget(
   }
   const freeText = decodeQuestionFreeTextAnswer(response)
   if (freeText) {
-    const answer = freeText.answer.trim()
-    return answer.length > 0
+    const allowEmpty =
+      currentPrompt?.itemId === freeText.payload.itemId &&
+      currentPrompt.revision === freeText.payload.revision &&
+      currentPrompt.body.freeTextQuestionId === freeText.payload.questionId &&
+      currentPrompt.body.freeTextInput?.allowEmpty === true
+    const answer = allowEmpty ? freeText.answer : freeText.answer.trim()
+    return answer.length > 0 || allowEmpty
       ? {
           itemId: freeText.payload.itemId,
           expectedRevision: freeText.payload.revision,
@@ -272,6 +278,7 @@ export function structuredQuestionResponseTarget(
   }
   const [question] = agentSessionPromptQuestions(currentPrompt.body)
   const trimmed = response.trim()
+  const allowEmpty = currentPrompt.body.freeTextInput?.allowEmpty === true
   const option = currentPrompt.body.options.find(
     (candidate) => candidate.id === response || candidate.label === trimmed
   )
@@ -282,11 +289,11 @@ export function structuredQuestionResponseTarget(
       answer: { questionId: question.id, optionIds: [option.id] }
     }
   }
-  return question && currentPrompt.body.freeTextQuestionId && trimmed
+  return question && currentPrompt.body.freeTextQuestionId && (trimmed || allowEmpty)
     ? {
         itemId: currentPrompt.itemId,
         expectedRevision: currentPrompt.revision,
-        answer: { questionId: question.id, optionIds: [], other: trimmed }
+        answer: { questionId: question.id, optionIds: [], other: allowEmpty ? response : trimmed }
       }
     : null
 }
diff --git a/mobile/src/session/mobile-structured-agent-session-rpc.ts b/mobile/src/session/mobile-structured-agent-session-rpc.ts
index b5d7959eb460..7b2da967d56c 100644
--- a/mobile/src/session/mobile-structured-agent-session-rpc.ts
+++ b/mobile/src/session/mobile-structured-agent-session-rpc.ts
@@ -27,10 +27,7 @@ export const STRUCTURED_SEND_TIMEOUT_MS = 15_000
 export type StructuredAgentSessionMutationCallResult<TValue> =
   | { status: 'accepted'; value: TValue }
   | { status: 'refused'; code: AgentSessionWireRefusalCode; message: string }
-  /** `hostRejectedByRequestSchema`: the host's schema turned this request away before running
-   *  it, so the same request can never be accepted there. An auth refusal does not set it:
-   *  it says nothing about an earlier delivery of the same id. */
-  | { status: 'failed'; message: string; hostRejectedByRequestSchema?: true }
+  | { status: 'failed'; message: string }
   | { status: 'unknown' }
 
 export type StructuredAgentSessionMutationResult<TValue> =
@@ -188,10 +185,7 @@ export async function requestStructuredAgentSessionMutation<TValue>(args: {
         status: 'failed',
         message: agentSessionWriteNoticeEnglish(
           agentSessionWriteNoticeParts(answered, phoneWriteKind(fingerprintMethod, fields))
-        ),
-        ...(error instanceof AgentSessionRpcResponseError && error.code === 'invalid_argument'
-          ? { hostRejectedByRequestSchema: true }
-          : {})
+        )
       }
     }
     if (
diff --git a/mobile/src/session/mobile-structured-agent-session-send-bypass.test.ts b/mobile/src/session/mobile-structured-agent-session-send-bypass.test.ts
deleted file mode 100644
index 2652c041b525..000000000000
--- a/mobile/src/session/mobile-structured-agent-session-send-bypass.test.ts
+++ /dev/null
@@ -1,215 +0,0 @@
-// A resend past a saved record storage would not clear goes out under a fresh id. A retry of that
-// text in the same app run must replay that id, never mint another: if the first resend's answer
-// was lost, a second fresh id could deliver the message twice.
-
-import { beforeEach, 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 { DISPATCH_REJECTED_CANCELLED } from '../../../src/shared/structured-agent-session-dispatch-rejection'
-import { sendMobileStructuredAgentSessionMessage } from './mobile-structured-agent-session-send'
-import { resetMobileStructuredSendOperationJournalForTests } from './mobile-structured-send-operation-journal'
-
-const asyncStorage = vi.hoisted(() => ({
-  getItem: vi.fn(),
-  setItem: vi.fn(),
-  removeItem: vi.fn()
-}))
-
-vi.mock('@react-native-async-storage/async-storage', () => ({ default: asyncStorage }))
-
-function ok(result: unknown): RpcResponse {
-  return { id: 'request-1', ok: true, result, _meta: { runtimeId: 'runtime-1' } }
-}
-
-/** Its own submission, which a Stop took back before the agent started it. */
-function stoppedAnswer(clientMessageId: string): RpcResponse {
-  return ok({
-    ok: true,
-    replayed: false,
-    fence: 3,
-    cursor: { epoch: 'epoch-1', sequence: 1 },
-    value: {
-      clientMessageId,
-      submission: {
-        clientMessageId,
-        fence: 3,
-        payloadFingerprint: 'fingerprint',
-        dispatchState: 'rejected',
-        providerItemId: null,
-        reason: DISPATCH_REJECTED_CANCELLED,
-        submittedAt: 10,
-        resolvedAt: 10
-      }
-    }
-  })
-}
-
-function queuedAnswer(clientMessageId: string, state: 'waiting' | 'withdrawn'): RpcResponse {
-  return ok({
-    ok: true,
-    replayed: false,
-    fence: 3,
-    cursor: { epoch: 'epoch-1', sequence: 1 },
-    value: { clientMessageId, queued: { messageId: clientMessageId, position: 1, state } }
-  })
-}
-
-/** Each `agentSession.send` answered in turn: a lost answer, a queued draft in that state, or its
- *  submission stopped. */
-function hostAnswering(answers: readonly ('lost' | 'waiting' | 'withdrawn' | 'stopped')[]) {
-  const ids: string[] = []
-  const deliveries: unknown[] = []
-  const sendRequest = vi.fn<RpcClient['sendRequest']>(async (_method, params) => {
-    const envelope = Object(Object(params).envelope)
-    const id = String(envelope.clientOperationId)
-    const answer = answers[ids.length]
-    ids.push(id)
-    deliveries.push(Object(params).delivery)
-    if (answer === 'lost' || answer === undefined) {
-      throw markRpcDeliveryUnknown(new Error('Connection closed'))
-    }
-    return answer === 'stopped' ? stoppedAnswer(id) : queuedAnswer(id, answer)
-  })
-  const client: RpcClient = {
-    sendRequest,
-    subscribe: vi.fn(() => vi.fn()),
-    updateTerminalSubscriptionViewport: () => {},
-    getState: () => 'connected',
-    getReconnectAttempt: () => 0,
-    getLastConnectedAt: () => null,
-    onStateChange: () => () => {},
-    notifyForeground: () => {},
-    close: () => {}
-  }
-  return { client, ids, deliveries }
-}
-
-function sendAgain(client: RpcClient, onError: (message: string) => void, queue = true) {
-  return sendMobileStructuredAgentSessionMessage({
-    client,
-    sessionId: 'session-1',
-    sessionKey: 'host-a:session-1',
-    callerIdentity: 'device-a',
-    expectedRuntimeFence: 3,
-    text: 'again',
-    attachments: [],
-    ...(queue ? { delivery: 'queue-if-active' as const } : {}),
-    onError
-  })
-}
-
-describe('a resend past a saved record storage would not clear', () => {
-  let stored: Map<string, string>
-
-  beforeEach(() => {
-    vi.clearAllMocks()
-    resetMobileStructuredSendOperationJournalForTests()
-    stored = new Map()
-    asyncStorage.getItem.mockImplementation(async (key: string) => stored.get(key) ?? null)
-    asyncStorage.setItem.mockImplementation(async (key: string, value: string) => {
-      stored.set(key, value)
-    })
-    asyncStorage.removeItem.mockImplementation(async (key: string) => {
-      stored.delete(key)
-    })
-  })
-
-  it('replays its own id once storage recovers, even without the queue capability now', async () => {
-    const { client, ids, deliveries } = hostAnswering([
-      'lost',
-      'withdrawn',
-      'lost',
-      'withdrawn',
-      'waiting'
-    ])
-    const onError = vi.fn()
-    expect(await sendAgain(client, onError)).toBe('unknown')
-    asyncStorage.setItem.mockRejectedValue(new Error('disk full'))
-    asyncStorage.removeItem.mockRejectedValue(new Error('disk full'))
-    expect(await sendAgain(client, onError)).toBe('unknown')
-    // Storage recovers: the lost send's record now clears, and the queue capability is gone.
-    asyncStorage.setItem.mockImplementation(async (key: string, value: string) => {
-      stored.set(key, value)
-    })
-    asyncStorage.removeItem.mockImplementation(async (key: string) => {
-      stored.delete(key)
-    })
-    expect(await sendAgain(client, onError, false)).toBe('queued')
-    expect(ids).toHaveLength(5)
-    // The resend's id is replayed, as first sent, never replaced by a fresh one.
-    expect(ids[4]).toBe(ids[2])
-    expect(deliveries[4]).toBe('queue-if-active')
-  })
-
-  it('replays its own id on a retry after a lost answer, and reports the record only once sent', async () => {
-    // Lost first send; its withdrawn replay; the fresh resend's answer lost; the retry's
-    // withdrawn replay; then the resend answered.
-    const { client, ids } = hostAnswering(['lost', 'withdrawn', 'lost', 'withdrawn', 'waiting'])
-    const onError = vi.fn()
-    const send = () =>
-      sendMobileStructuredAgentSessionMessage({
-        client,
-        sessionId: 'session-1',
-        sessionKey: 'host-a:session-1',
-        callerIdentity: 'device-a',
-        expectedRuntimeFence: 3,
-        text: 'again',
-        attachments: [],
-        delivery: 'queue-if-active',
-        onError
-      })
-    expect(await send()).toBe('unknown')
-    // From here the lost send's record can never be cleared.
-    asyncStorage.setItem.mockRejectedValue(new Error('disk full'))
-    asyncStorage.removeItem.mockRejectedValue(new Error('disk full'))
-
-    expect(await send()).toBe('unknown')
-    // An unconfirmed resend may not have gone out, so nothing says it was sent.
-    expect(onError).not.toHaveBeenCalled()
-
-    expect(await send()).toBe('queued')
-    expect(ids).toHaveLength(5)
-    expect(ids[1]).toBe(ids[0])
-    expect(ids[3]).toBe(ids[0])
-    expect(ids[2]).not.toBe(ids[0])
-    // The retry replays the resend's id rather than minting one that could deliver twice.
-    expect(ids[4]).toBe(ids[2])
-    expect(onError).toHaveBeenCalledWith(
-      "Sent, but this phone couldn't update its record of sent messages."
-    )
-  })
-
-  // Lost first send; its withdrawn replay; the fresh resend's answer lost; the retry's withdrawn
-  // replay; then that resend's own replay withdrawn too. A resend is sent once, never again.
-  it('sends a withdrawn replay once more at most, then hands a queued draft back', async () => {
-    const { client, ids } = hostAnswering(['lost', 'withdrawn', 'lost', 'withdrawn', 'withdrawn'])
-    const onError = vi.fn()
-    expect(await sendAgain(client, onError)).toBe('unknown')
-    asyncStorage.setItem.mockRejectedValue(new Error('disk full'))
-    asyncStorage.removeItem.mockRejectedValue(new Error('disk full'))
-    expect(await sendAgain(client, onError)).toBe('unknown')
-
-    expect(await sendAgain(client, onError)).toBe('rejected')
-    expect(ids).toHaveLength(5)
-    expect(ids[4]).toBe(ids[2])
-    expect(onError).toHaveBeenCalledWith('Message not sent')
-  })
-
-  it('reads a resend a Stop took back again as sent, since the chat draws it, not as not sent', async () => {
-    const { client, ids } = hostAnswering(['lost', 'stopped', 'lost', 'stopped', 'stopped'])
-    const onError = vi.fn()
-    expect(await sendAgain(client, onError, false)).toBe('unknown')
-    asyncStorage.setItem.mockRejectedValue(new Error('disk full'))
-    asyncStorage.removeItem.mockRejectedValue(new Error('disk full'))
-    expect(await sendAgain(client, onError, false)).toBe('unknown')
-
-    expect(await sendAgain(client, onError, false)).toBe('accepted')
-    expect(ids).toHaveLength(5)
-    expect(ids[4]).toBe(ids[2])
-    // Only the storage failure is reported; nothing says the message was not sent.
-    expect(onError.mock.calls).toEqual([
-      ["Sent, but this phone couldn't update its record of sent messages."]
-    ])
-  })
-})
diff --git a/mobile/src/session/mobile-structured-agent-session-send.ts b/mobile/src/session/mobile-structured-agent-session-send.ts
index c7a2aa356128..41c6e109a30f 100644
--- a/mobile/src/session/mobile-structured-agent-session-send.ts
+++ b/mobile/src/session/mobile-structured-agent-session-send.ts
@@ -2,249 +2,47 @@ import type { AgentSessionSendResult } from '../../../src/shared/agent-session-w
 import {
   structuredAgentSessionSendBody,
   type StructuredAgentSessionAttachment
-} from '../../../src/shared/structured-agent-session-outbox'
-import {
-  structuredAgentSessionDomainFingerprint,
-  structuredAgentSessionPayloadFingerprint
-} from '../../../src/shared/structured-agent-session-mutation'
+} from '../../../src/shared/structured-agent-session-send-mutation'
 import type { RpcClient } from '../transport/rpc-client'
 import type { MobileNativeChatSendOutcome } from './mobile-native-chat-send'
 import {
   requestStructuredAgentSessionMutation,
   timeoutForDeadline
 } from './mobile-structured-agent-session-rpc'
-import { structuredSessionOperationId } from './structured-session-operation-id'
-import {
-  mobileStructuredSendDelivery,
-  mobileStructuredSendWithdrawnBeforeStart
-} from './mobile-structured-send-delivery'
-import {
-  bypassedMobileStructuredSendOperationId,
-  clearMobileStructuredSendOperation,
-  forgetBypassedMobileStructuredSendOperation,
-  getOrCreateMobileStructuredSendOperation,
-  mobileStructuredSendOperationKey,
-  rememberBypassedMobileStructuredSendOperation
-} from './mobile-structured-send-operation-journal'
+import { mobileStructuredSendDelivery } from './mobile-structured-send-delivery'
 
 export async function sendMobileStructuredAgentSessionMessage(input: {
   client: RpcClient
   sessionId: string
-  sessionKey: string
-  callerIdentity: string
   expectedRuntimeFence: number
   text: string
-  attachments: readonly (StructuredAgentSessionAttachment & { contentFingerprint?: string })[]
+  attachments: readonly StructuredAgentSessionAttachment[]
   /** Sent only when the host advertises `agent-session.queued-messages.v1`. */
   delivery?: 'queue-if-active'
   deadline?: number
   onError: (message: string) => void
-  /** Internal: the one fresh-id resend after a withdrawn replay. */
-  resendingAfterWithdrawal?: true
-  /** Internal: that resend when the withdrawn id's record could not be cleared. It bypasses the
-   *  record, so failing storage never blocks the send; its id is kept in memory for this app run,
-   *  so a retry after a lost answer replays it rather than sending again. */
-  bypassRetainedRecord?: true
-  /** Internal: on that resend, the key the withdrawn record matched. The remembered id is keyed
-   *  by it, so a capability change since the lost answer never mints another id. */
-  resendOperationKey?: string
 }): Promise<MobileNativeChatSendOutcome> {
   const timeoutMs = timeoutForDeadline(input.deadline)
   if (timeoutMs === null) {
     input.onError('Message not sent')
     return 'rejected'
   }
-  const requestedBody = structuredAgentSessionSendBody(input.text, input.attachments)
-  const requestedPayloadFingerprint = structuredAgentSessionPayloadFingerprint({
-    method: 'agentSession.send',
-    sessionId: input.sessionId,
-    fields: { body: requestedBody }
-  })
-  const intentFields = {
-    text: input.text.trimEnd(),
-    attachments: input.attachments.map(
-      (attachment) =>
-        attachment.contentFingerprint ??
-        structuredAgentSessionDomainFingerprint({
-          domain: 'mobile.nativeChat.image.preview',
-          sessionId: '',
-          fields: { previewUri: attachment.previewUri }
-        })
-    )
-  }
-  // `delivery` is part of the intent key, never a stored journal field: the
-  // immediate key is exactly today's, so an older build still reads the journal.
-  const operationKeyFor = (delivery: 'queue-if-active' | undefined): string =>
-    mobileStructuredSendOperationKey({
-      sessionKey: input.sessionKey,
-      intentFingerprint: structuredAgentSessionDomainFingerprint({
-        domain: 'mobile.agentSession.send.intent',
-        sessionId: input.sessionKey,
-        fields: delivery ? { ...intentFields, delivery } : intentFields
-      })
-    })
-  const queuedOperationKey = operationKeyFor('queue-if-active')
-  const immediateOperationKey = operationKeyFor(undefined)
-  const requestedOperationKey = input.delivery ? queuedOperationKey : immediateOperationKey
-  const attachmentPaths = input.attachments.map((attachment) => attachment.path)
-  const resendKey = input.resendOperationKey ?? requestedOperationKey
-  let operation: Awaited<ReturnType<typeof getOrCreateMobileStructuredSendOperation>>
-  try {
-    if (input.bypassRetainedRecord) {
-      operation = bypassOperation(resendKey, requestedPayloadFingerprint, attachmentPaths)
-    } else if (
-      input.resendOperationKey !== undefined &&
-      bypassedMobileStructuredSendOperationId(resendKey) !== undefined
-    ) {
-      // Storage recovered after a bypassed resend's answer was lost: that id is replayed, never
-      // replaced by a fresh one that could deliver the message twice.
-      operation = await adoptBypassedOperation({
-        operationKey: resendKey,
-        callerIdentity: input.callerIdentity,
-        payloadFingerprint: requestedPayloadFingerprint,
-        attachmentPaths
-      })
-    } else {
-      operation = await getOrCreateMobileStructuredSendOperation({
-        operationKey: requestedOperationKey,
-        // A retained id replays exactly as first sent, whatever the capability says now;
-        // a host that refuses that request shape retires it, so the next send goes out fresh.
-        alternateOperationKey: input.delivery ? immediateOperationKey : queuedOperationKey,
-        callerIdentity: input.callerIdentity,
-        payloadFingerprint: requestedPayloadFingerprint,
-        attachmentPaths,
-        createOperationId: structuredSessionOperationId
-      })
-    }
-  } catch {
-    input.onError('Message not sent')
-    return 'rejected'
-  }
-  const operationKey = operation.operationKey
-  const delivery = operationKey === queuedOperationKey ? 'queue-if-active' : undefined
-  const body = structuredAgentSessionSendBody(
-    input.text,
-    operation.attachmentPaths.map((path) => ({ path, previewUri: '' }))
-  )
-  const payloadFingerprint = structuredAgentSessionPayloadFingerprint({
-    method: 'agentSession.send',
-    sessionId: input.sessionId,
-    fields: { body }
-  })
-  if (payloadFingerprint !== operation.payloadFingerprint) {
-    input.onError('Message not sent')
-    return 'rejected'
-  }
+  // Each Send is a new action; the shared mutation sender mints its operation id once.
   const result = await requestStructuredAgentSessionMutation<AgentSessionSendResult>({
     client: input.client,
     method: 'agentSession.send',
     fingerprintMethod: 'agentSession.send',
     sessionId: input.sessionId,
     expectedRuntimeFence: input.expectedRuntimeFence,
-    // `delivery` joins the wire fields — and so the operation fingerprint — but
-    // never the journal's body-only fingerprint the submission echo recomputes.
-    fields: { body, ...(delivery ? { delivery } : {}) },
-    clientOperationId: operation.operationId,
+    fields: {
+      body: structuredAgentSessionSendBody(input.text, input.attachments),
+      ...(input.delivery ? { delivery: input.delivery } : {})
+    },
     timeoutMs
   })
-  const outcome = mobileStructuredSendDelivery(result, operation.retained)
-  if (input.bypassRetainedRecord && outcome.operationIdSpent) {
-    forgetBypassedMobileStructuredSendOperation(operationKey, operation.operationId)
-  }
-  let released = false
-  if (outcome.operationIdSpent) {
-    try {
-      await clearMobileStructuredSendOperation({
-        operationKey,
-        operationId: operation.operationId
-      })
-      released = true
-    } catch {
-      // A retained settled id can suppress a later identical send, never
-      // duplicate this one; the next replay gets another clear chance.
-    }
-  }
-  const withdrawnReplay =
-    (result.status === 'accepted' &&
-      'queued' in result.value &&
-      result.value.queued?.state === 'withdrawn') ||
-    (operation.retained && mobileStructuredSendWithdrawnBeforeStart(result))
-  if (withdrawnReplay && operation.retained && !input.resendingAfterWithdrawal) {
-    // The retained id's draft or submission was withdrawn, so it never reached the agent:
-    // this identical message is a new one, not a replay to swallow. A record
-    // storage would not clear is bookkeeping: it is reported, never allowed to
-    // block the send.
-    const resent = await sendMobileStructuredAgentSessionMessage({
-      ...input,
-      resendingAfterWithdrawal: true,
-      resendOperationKey: operationKey,
-      ...(released ? {} : { bypassRetainedRecord: true as const })
-    })
-    // Only when the resend is known to have gone out; an unconfirmed one may not have.
-    if (!released && (resent === 'accepted' || resent === 'queued')) {
-      input.onError("Sent, but this phone couldn't update its record of sent messages.")
-    }
-    return resent
-  }
-  if (withdrawnReplay && mobileStructuredSendWithdrawnBeforeStart(result)) {
-    // Not resent, but the chat draws it with its stop row: handing it back too would show it twice.
-    return 'accepted'
-  }
-  if (withdrawnReplay) {
-    // Not resent: no card and no bubble holds the text, so it goes back to the
-    // composer rather than vanishing.
-    input.onError('Message not sent')
-    return 'rejected'
-  }
+  const outcome = mobileStructuredSendDelivery(result)
   if (outcome.error !== null) {
     input.onError(outcome.error)
   }
   return outcome.outcome
 }
-
-/** The id a resend past an uncleared record goes out under: the one this app run already used
- *  for this text, replayed, or a fresh one remembered for the next retry. */
-function bypassOperation(
-  operationKey: string,
-  payloadFingerprint: string,
-  attachmentPaths: string[]
-): Awaited<ReturnType<typeof getOrCreateMobileStructuredSendOperation>> {
-  const bypassed = bypassedMobileStructuredSendOperationId(operationKey)
-  const operationId = bypassed ?? structuredSessionOperationId()
-  if (bypassed === undefined) {
-    rememberBypassedMobileStructuredSendOperation(operationKey, operationId)
-  }
-  return {
-    operationKey,
-    operationId,
-    retained: bypassed !== undefined,
-    payloadFingerprint,
-    attachmentPaths
-  }
-}
-
-/** A remembered bypassed id handed back to the saved record once storage works again: the record
- *  replays it, and memory lets it go. Should storage fail again, memory keeps replaying it. */
-async function adoptBypassedOperation(input: {
-  operationKey: string
-  callerIdentity: string
-  payloadFingerprint: string
-  attachmentPaths: string[]
-}): Promise<Awaited<ReturnType<typeof getOrCreateMobileStructuredSendOperation>>> {
-  const operationId = bypassedMobileStructuredSendOperationId(input.operationKey)
-  if (operationId === undefined) {
-    throw new Error('No bypassed send id to adopt')
-  }
-  try {
-    const recorded = await getOrCreateMobileStructuredSendOperation({
-      ...input,
-      createOperationId: () => operationId
-    })
-    if (recorded.operationId === operationId) {
-      forgetBypassedMobileStructuredSendOperation(input.operationKey, operationId)
-    }
-    return { ...recorded, retained: true }
-  } catch {
-    return bypassOperation(input.operationKey, input.payloadFingerprint, input.attachmentPaths)
-  }
-}
diff --git a/mobile/src/session/mobile-structured-grouped-question.test.ts b/mobile/src/session/mobile-structured-grouped-question.test.ts
index 37a4dc125c27..83b1e50e9c1e 100644
--- a/mobile/src/session/mobile-structured-grouped-question.test.ts
+++ b/mobile/src/session/mobile-structured-grouped-question.test.ts
@@ -123,6 +123,43 @@ describe('mobile structured grouped questions', () => {
     ])
   })
 
+  it('projects editor metadata and preserves allowed empty and whitespace answers', () => {
+    const editor = question({
+      options: [],
+      freeTextInput: {
+        allowEmpty: true,
+        multiline: true,
+        initialValue: 'draft',
+        placeholder: 'Edit response'
+      }
+    })
+    const projected = projectGroupedQuestion([editor], null, PROMPT_KEY)!
+    expect(projected.freeTextInput).toEqual(editor.freeTextInput)
+
+    for (const answer of ['', '  \n ']) {
+      const result = advanceGroupedQuestion({
+        response: formatQuestionFreeTextAnswer(projected, answer),
+        questions: [editor],
+        draft: null,
+        promptKey: PROMPT_KEY
+      })
+      expect(result).toEqual({
+        kind: 'submit',
+        answers: [{ questionId: 'q1', optionIds: [], other: answer }]
+      })
+    }
+
+    const legacy = question({ options: [] })
+    expect(
+      advanceGroupedQuestion({
+        response: formatQuestionFreeTextAnswer(projected, ''),
+        questions: [legacy],
+        draft: null,
+        promptKey: PROMPT_KEY
+      })
+    ).toBeNull()
+  })
+
   it('keeps selected options and other text for grouped multi-select answers', () => {
     const questions = [SECOND]
     const only = projectGroupedQuestion(questions, null, PROMPT_KEY)!
diff --git a/mobile/src/session/mobile-structured-grouped-question.ts b/mobile/src/session/mobile-structured-grouped-question.ts
index d111b4de95aa..7fa5c41b95d7 100644
--- a/mobile/src/session/mobile-structured-grouped-question.ts
+++ b/mobile/src/session/mobile-structured-grouped-question.ts
@@ -122,6 +122,7 @@ export function projectGroupedQuestion(
     ...(optionDescriptions.some(Boolean) ? { optionDescriptions } : {}),
     multiSelect: question.multiSelect,
     allowOther: Boolean(question.freeTextQuestionId),
+    ...(question.freeTextInput ? { freeTextInput: question.freeTextInput } : {}),
     optionTokens: question.options.map((option) =>
       encodeGroupedToken({
         kind: 'option',
@@ -155,11 +156,12 @@ function answerFromResponse(
     const trimmed = part.trim()
     const freeText = decodeGroupedFreeTextAnswer(trimmed)
     if (freeText) {
-      const answer = freeText.answer.trim()
+      const allowEmpty = question.freeTextInput?.allowEmpty === true
+      const answer = allowEmpty ? freeText.answer : freeText.answer.trim()
       if (
         freeText.promptKey !== promptKey ||
         freeText.questionId !== question.id ||
-        answer.length === 0 ||
+        (answer.length === 0 && !allowEmpty) ||
         other !== undefined
       ) {
         return null
@@ -182,14 +184,14 @@ function answerFromResponse(
   if (optionIds.some((optionId) => !offered.has(optionId))) {
     return null
   }
-  if (other && !question.freeTextQuestionId) {
+  if (other !== undefined && !question.freeTextQuestionId) {
     return null
   }
-  const answerCount = optionIds.length + (other ? 1 : 0)
+  const answerCount = optionIds.length + (other !== undefined ? 1 : 0)
   if (answerCount === 0 || (!question.multiSelect && answerCount !== 1)) {
     return null
   }
-  return { questionId: question.id, optionIds, ...(other ? { other } : {}) }
+  return { questionId: question.id, optionIds, ...(other !== undefined ? { other } : {}) }
 }
 
 /**
diff --git a/mobile/src/session/mobile-structured-queued-message-cards.test.ts b/mobile/src/session/mobile-structured-queued-message-cards.test.ts
index 3341b7a80d9c..8ead70b20275 100644
--- a/mobile/src/session/mobile-structured-queued-message-cards.test.ts
+++ b/mobile/src/session/mobile-structured-queued-message-cards.test.ts
@@ -2,10 +2,7 @@ import { describe, expect, it } from 'vitest'
 import { agentSessionFailureFact } from '../../../src/shared/agent-session-failure'
 import { agentSessionFailureWords } from '../../../src/shared/agent-session-failure-words'
 import { DISPATCH_REJECTED_HOST_RESTARTED } from '../../../src/shared/structured-agent-session-dispatch-rejection'
-import {
-  QUEUED_MESSAGE_PAUSED_KEPT,
-  QUEUED_MESSAGE_PAUSED_SEND_FAILED
-} from '../../../src/shared/agent-session-wire'
+import { QUEUED_MESSAGE_PAUSED_SEND_FAILED } from '../../../src/shared/agent-session-wire'
 import type { AgentSessionQueuedMessage } from '../../../src/shared/agent-session-wire'
 import {
   mobileQueueHasResumableCard,
@@ -103,35 +100,12 @@ describe('mobileQueuedMessageCards', () => {
     expect(resumable([failed])).toBe(false)
     expect(resumable([failed, waiting])).toBe(true)
     expect(resumable([waiting, { ...returned, position: 3 }])).toBe(true)
-    // A kept card is held on its own, like a failed one: the drain goes past it.
-    const kept = draft({ messageId: 'k', paused: true, pausedReason: QUEUED_MESSAGE_PAUSED_KEPT })
-    expect(resumable([kept])).toBe(false)
-    expect(resumable([kept, waiting])).toBe(true)
-  })
-
-  // The host kept it unsent across a restart or a close; the cards behind it are not held by it.
-  it('captions a kept card as not sent yet, and leaves the cards behind it plainly queued', () => {
-    const cards = mobileQueuedMessageCards(
-      [
-        draft({ messageId: 'k', paused: true, pausedReason: QUEUED_MESSAGE_PAUSED_KEPT }),
-        draft({ messageId: 'b', position: 2 })
-      ],
-      [],
-      { pendingPrompt: false }
-    )
-    expect(cards.map(({ caption, needsAttention }) => ({ caption, needsAttention }))).toEqual([
-      { caption: 'Not sent yet — tap Send to send it', needsAttention: false },
-      { caption: null, needsAttention: false }
-    ])
   })
 
   it('words the paused queue by reason, and one this build does not know as a plain pause', () => {
     expect(mobileQueuePauseLabel({ reason: 'stopped' })).toBe(
       'Queue paused because you interrupted'
     )
-    expect(mobileQueuePauseLabel({ reason: 'cleared' })).toBe(
-      'Queue paused after you cleared the conversation'
-    )
     // oxlint-disable-next-line typescript/consistent-type-assertions -- SAFETY: a reason newer than this build's union, as a newer host would send it.
     const newer = { reason: 'later_reason' } as never
     expect(mobileQueuePauseLabel(newer)).toBe('Queue paused')
diff --git a/mobile/src/session/mobile-structured-queued-message-cards.ts b/mobile/src/session/mobile-structured-queued-message-cards.ts
index 6388efbf4123..d65a73388c3d 100644
--- a/mobile/src/session/mobile-structured-queued-message-cards.ts
+++ b/mobile/src/session/mobile-structured-queued-message-cards.ts
@@ -6,9 +6,8 @@ import { readWholeAgentSessionFailureFact } from '../../../src/shared/agent-sess
 import type { AgentJournalSubmission } from '../../../src/shared/agent-session-journal-types'
 import { agentSessionWriteNoticeEnglish } from '../../../src/shared/agent-session-refusal-notice'
 import { dispatchWasWithdrawn } from '../../../src/shared/structured-agent-session-dispatch-rejection'
-import { structuredAgentSessionAttemptFailureParts } from '../../../src/shared/structured-agent-session-send-disposition'
+import { structuredAgentSessionAttemptFailureParts } from '../../../src/shared/structured-agent-session-rejection-words'
 import {
-  QUEUED_MESSAGE_PAUSED_KEPT,
   QUEUED_MESSAGE_PAUSED_SEND_FAILED,
   type AgentSessionQueuedMessage,
   type AgentSessionQueuePause
@@ -53,22 +52,17 @@ function returnedCaption(
   )
 }
 
-/** One card's own hold: a failed conversion, or a send the host kept; the queue's pause is the
- *  list's first row. */
+/** One card's own hold: a failed conversion; the queue's pause is the list's first row. */
 function pausedCaption(reason: string | undefined): string {
   if (reason === QUEUED_MESSAGE_PAUSED_SEND_FAILED) {
     return "Couldn't send — tap Send to retry"
   }
-  if (reason === QUEUED_MESSAGE_PAUSED_KEPT) {
-    return 'Not sent yet — tap Send to send it'
-  }
   // Absent or unknown (newer host) marker: a plain pause, promising no release rule.
   return 'Paused'
 }
 
 const QUEUE_PAUSE_LABELS: Readonly<Record<string, string>> = {
-  stopped: 'Queue paused because you interrupted',
-  cleared: 'Queue paused after you cleared the conversation'
+  stopped: 'Queue paused because you interrupted'
 }
 
 /** Whether Resume would send anything: a waiting card with no hold of its own, ahead of any
diff --git a/mobile/src/session/mobile-structured-send-delivery.test.ts b/mobile/src/session/mobile-structured-send-delivery.test.ts
index b7e457c7569d..ef0e7a520d9a 100644
--- a/mobile/src/session/mobile-structured-send-delivery.test.ts
+++ b/mobile/src/session/mobile-structured-send-delivery.test.ts
@@ -6,8 +6,6 @@ import { mobileStructuredSendDelivery } from './mobile-structured-send-delivery'
 import type { StructuredAgentSessionMutationCallResult } from './mobile-structured-agent-session-rpc'
 import { structuredSendResultFixture } from './structured-agent-send-result.test-fixture'
 
-const WITHDRAWN_SENTENCE = 'This message was withdrawn before the agent started it.'
-
 function accepted(
   dispatchState: AgentJournalDispatchState,
   reason: string | null = null
@@ -16,291 +14,147 @@ function accepted(
 }
 
 describe('mobileStructuredSendDelivery', () => {
-  it('keeps the operation id for every unknown, host-recorded or ack-lost', () => {
-    // The one answer that may be a delivery. Spending the id here turns the next
-    // identical send into a second copy in front of the model.
+  it('reports transport and host uncertainty on this send', () => {
     expect(mobileStructuredSendDelivery({ status: 'unknown' })).toEqual({
       outcome: 'unknown',
-      operationIdSpent: false,
       error: null
     })
     expect(mobileStructuredSendDelivery(accepted('unknown'))).toEqual({
       outcome: 'unknown',
-      operationIdSpent: false,
       error: null
     })
   })
 
-  it('reports a written send as sent and spends its id', () => {
-    // `pending` is written and awaiting the provider's acknowledgement — not doubt.
-    for (const dispatchState of ['accepted', 'pending'] as const) {
-      expect(mobileStructuredSendDelivery(accepted(dispatchState))).toEqual({
-        outcome: 'accepted',
-        operationIdSpent: true,
-        error: null
-      })
-    }
+  it.each(['accepted', 'pending'] as const)('reports a written %s send as accepted', (state) => {
+    expect(mobileStructuredSendDelivery(accepted(state))).toEqual({
+      outcome: 'accepted',
+      error: null
+    })
   })
 
-  it('classifies a queued draft answer as spent, card-rendered, never a bubble', () => {
-    // The host holds the message now; a later identical send is a new message.
-    // A dispatched draft answers as `queued` only when the host lost its
-    // submission, so no echo would retire a bubble: it too shows nothing.
-    for (const state of ['waiting', 'dispatched', 'returned', 'withdrawn'] as const) {
-      const queued: StructuredAgentSessionMutationCallResult<AgentSessionSendResult> = {
+  it.each(['waiting', 'dispatched', 'returned'] as const)(
+    'lets the host own its %s queued message without an optimistic bubble',
+    (state) => {
+      expect(
+        mobileStructuredSendDelivery({
+          status: 'accepted',
+          value: {
+            clientMessageId: 'client-1',
+            queued: { messageId: 'client-1', position: 1, state }
+          }
+        })
+      ).toEqual({ outcome: 'queued', error: null })
+    }
+  )
+
+  it('hands back a withdrawn card instead of silently sending again', () => {
+    expect(
+      mobileStructuredSendDelivery({
         status: 'accepted',
         value: {
           clientMessageId: 'client-1',
-          queued: { messageId: 'client-1', position: 1, state }
+          queued: { messageId: 'client-1', position: 1, state: 'withdrawn' }
         }
-      }
-      const outcome = 'queued'
-      expect(mobileStructuredSendDelivery(queued)).toEqual({
-        outcome,
-        operationIdSpent: true,
-        error: null
       })
-      expect(mobileStructuredSendDelivery(queued, true)).toEqual({
-        outcome,
-        operationIdSpent: true,
-        error: null
-      })
-    }
+    ).toEqual({ outcome: 'rejected', error: 'Message not sent' })
   })
 
-  it("reads a replay answered by its draft's hand-off as unconfirmed, and spends the id", () => {
-    // The hand-off names the replayed id as its draft: the host's answer states the link, so the
-    // id is spent without waiting for a stream that may never carry the hand-off.
-    const handedOff = structuredSendResultFixture('accepted')
-    if (!('submission' in handedOff)) {
+  it('keeps a handed-off queued message unconfirmed until the stream identifies it', () => {
+    const value = structuredSendResultFixture('accepted')
+    if (!('submission' in value)) {
       throw new Error('expected a submission answer')
     }
-    const replay: StructuredAgentSessionMutationCallResult<AgentSessionSendResult> = {
-      status: 'accepted',
-      value: {
-        clientMessageId: 'retained-draft-id',
-        submission: {
-          ...handedOff.submission,
-          clientMessageId: 'fresh-id',
-          queuedMessageId: 'retained-draft-id'
+    expect(
+      mobileStructuredSendDelivery({
+        status: 'accepted',
+        value: {
+          clientMessageId: 'draft-id',
+          submission: {
+            ...value.submission,
+            clientMessageId: 'fresh-id',
+            queuedMessageId: 'draft-id'
+          }
         }
-      }
-    }
-    expect(mobileStructuredSendDelivery(replay, true)).toEqual({
-      outcome: 'unknown',
-      operationIdSpent: true,
-      error: null
-    })
+      })
+    ).toEqual({ outcome: 'unknown', error: null })
   })
 
-  it('never spends a retained id on a malformed answer with no submission and no id', () => {
-    const malformed: StructuredAgentSessionMutationCallResult<AgentSessionSendResult> = {
-      status: 'accepted',
-      value: JSON.parse('{}')
-    }
-    expect(mobileStructuredSendDelivery(malformed, true)).toEqual({
+  it('fails closed when a malformed answer has no submission', () => {
+    expect(mobileStructuredSendDelivery({ status: 'accepted', value: JSON.parse('{}') })).toEqual({
       outcome: 'unknown',
-      operationIdSpent: false,
       error: null
     })
   })
 
-  it('does not report a retained payload replay as a new accepted send', () => {
-    for (const dispatchState of ['accepted', 'pending'] as const) {
-      expect(mobileStructuredSendDelivery(accepted(dispatchState), true)).toEqual({
-        outcome: 'unknown',
-        operationIdSpent: false,
-        error: null
-      })
-    }
-  })
-
-  it('spends the id of a rejection and withholds its internal reason', () => {
-    // Provably undelivered and terminal, so the id can only replay it: spending the
-    // id makes the retry a first delivery. The marker itself names nothing a person
-    // can act on, so it must not reach the screen.
+  it('withholds internal provider write reasons', () => {
     expect(
       mobileStructuredSendDelivery(accepted('rejected', 'provider_write_failed: broken pipe'))
     ).toEqual({
       outcome: 'rejected',
-      operationIdSpent: true,
       error: "Orca couldn't reach the agent. Your message was not sent. Send it again."
     })
   })
 
-  it('answers a send the host kept as a card like a queued one, first send or replay', () => {
-    // The card shows the text, so neither an error nor a composer hand-back may repeat it.
-    const kept: StructuredAgentSessionMutationCallResult<AgentSessionSendResult> = {
-      status: 'accepted',
-      value: {
-        clientMessageId: 'msg-1',
-        submission: {
-          clientMessageId: 'msg-1',
-          fence: 3,
-          payloadFingerprint: 'fingerprint',
-          dispatchState: 'rejected',
-          providerItemId: null,
-          reason: 'Orca restarted before this was sent.',
-          submittedAt: 10,
-          resolvedAt: 10,
-          keptAsQueuedMessageId: 'msg-1'
-        }
-      }
-    }
-    for (const retained of [false, true]) {
-      expect(mobileStructuredSendDelivery(kept, retained)).toEqual({
-        outcome: 'queued',
-        operationIdSpent: true,
-        error: null
-      })
+  it('lets a kept queued card hold the text after a provider rejection', () => {
+    const value = structuredSendResultFixture('rejected', 'Orca restarted before this was sent.')
+    if (!('submission' in value)) {
+      throw new Error('expected a submission answer')
     }
+    value.submission.keptAsQueuedMessageId = 'card-id'
+    expect(mobileStructuredSendDelivery({ status: 'accepted', value })).toEqual({
+      outcome: 'queued',
+      error: null
+    })
   })
 
-  // The chat draws a send a Stop took back with its stop row, so it never goes back to the draft. A
-  // retained replay is resent by the caller, which needs the id spent and no words of its own.
   it.each([
-    { retained: false, reason: DISPATCH_REJECTED_CANCELLED, fact: false, outcome: 'accepted' },
-    { retained: false, reason: WITHDRAWN_SENTENCE, fact: true, outcome: 'accepted' },
-    { retained: true, reason: DISPATCH_REJECTED_CANCELLED, fact: false, outcome: 'rejected' },
-    { retained: true, reason: WITHDRAWN_SENTENCE, fact: true, outcome: 'rejected' }
-  ] as const)(
-    'reads a send a Stop took back (retained $retained, typed fact $fact) as $outcome, spent, wordless',
-    ({ retained, reason, fact, outcome }) => {
-      const value = structuredSendResultFixture('rejected', reason)
-      if (fact && 'submission' in value) {
-        value.submission.rejection = { kind: 'cancelled' }
-      }
-      expect(mobileStructuredSendDelivery({ status: 'accepted', value }, retained)).toEqual({
-        outcome,
-        operationIdSpent: true,
-        error: null
-      })
+    { reason: DISPATCH_REJECTED_CANCELLED, typed: false },
+    { reason: 'This message was withdrawn before the agent started it.', typed: true }
+  ])('leaves a stopped submission in its existing chat row (typed $typed)', ({ reason, typed }) => {
+    const value = structuredSendResultFixture('rejected', reason)
+    if (typed && 'submission' in value) {
+      value.submission.rejection = { kind: 'cancelled' }
     }
-  )
+    expect(mobileStructuredSendDelivery({ status: 'accepted', value })).toEqual({
+      outcome: 'accepted',
+      error: null
+    })
+  })
 
-  it('shows a provider content rejection verbatim', () => {
+  it('shows an actionable content rejection', () => {
     expect(
       mobileStructuredSendDelivery(accepted('rejected', 'Claude does not support .bmp'))
-    ).toEqual({
+    ).toEqual({ outcome: 'rejected', error: 'Claude does not support .bmp' })
+  })
+
+  it.each([
+    ['agent_session_operation_invalid', 'Invalid operation'],
+    ['agent_session_checkpoint_stale', 'Fence moved'],
+    ['agent_session_operation_expired', 'Operation expired'],
+    ['agent_session_operation_conflict', 'Operation conflict']
+  ] as const)('reports the current %s refusal', (code, message) => {
+    expect(mobileStructuredSendDelivery({ status: 'refused', code, message })).toEqual({
       outcome: 'rejected',
-      operationIdSpent: true,
-      error: 'Claude does not support .bmp'
+      error: message
     })
   })
 
-  it('spends only refusals that prove the operation is settled', () => {
-    expect(
-      mobileStructuredSendDelivery({
-        status: 'refused',
-        code: 'agent_session_operation_invalid',
-        message: 'Invalid operation'
-      })
-    ).toEqual({ outcome: 'rejected', operationIdSpent: true, error: 'Invalid operation' })
-    expect(
-      mobileStructuredSendDelivery({
-        status: 'refused',
-        code: 'agent_session_checkpoint_stale',
-        message: 'Fence moved'
-      })
-    ).toEqual({ outcome: 'rejected', operationIdSpent: false, error: 'Fence moved' })
+  it('preserves an unknown operation refusal as uncertainty', () => {
     expect(
       mobileStructuredSendDelivery({
         status: 'refused',
         code: 'agent_session_operation_unknown',
         message: 'Outcome unknown'
       })
-    ).toEqual({ outcome: 'unknown', operationIdSpent: false, error: null })
+    ).toEqual({ outcome: 'unknown', error: null })
+  })
+
+  it('reports a request failure without consulting earlier sends', () => {
     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('spends an ambiguous id the host has expired, and says to check the chat', () => {
-    // The host refuses an expired id on every replay; keeping it would refuse this text forever.
-    // The earlier attempt may still be in the chat, so the words never say it was not sent.
-    expect(
-      mobileStructuredSendDelivery(
-        {
-          status: 'refused',
-          code: 'agent_session_operation_expired',
-          message: 'Operation expired'
-        },
-        true
-      )
-    ).toEqual({
-      outcome: 'rejected',
-      operationIdSpent: true,
-      error:
-        "Orca couldn't confirm your message reached the agent. Check the chat, then send it again if needed."
-    })
-  })
-
-  it('never releases an ambiguous id on any other later RPC refusal or failure', () => {
-    expect(
-      mobileStructuredSendDelivery(
-        {
-          status: 'refused',
-          code: 'agent_session_operation_conflict',
-          message: 'Operation conflict'
-        },
-        true
-      )
-    ).toEqual({ outcome: 'rejected', operationIdSpent: false, error: 'Operation conflict' })
-    expect(
-      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('releases a replay only when the host refuses its request shape itself', () => {
-    // An older host's strict schema refuses `delivery` before it runs anything:
-    // that replay can never be accepted, so keeping the id refuses the text forever.
-    expect(
-      mobileStructuredSendDelivery(
-        {
-          status: 'failed',
-          message: 'Your message was not sent. Send it again.',
-          hostRejectedByRequestSchema: true
-        },
-        true
-      )
-    ).toEqual({
-      outcome: 'rejected',
-      operationIdSpent: true,
-      error: 'Your message was not sent. Send it again.'
-    })
-    // Any other refusal (an auth failure, a host without the method) proves nothing
-    // about an earlier delivery of this id.
-    expect(
-      mobileStructuredSendDelivery(
-        { status: 'failed', message: 'Your message was not sent.' },
-        true
-      )
-    ).toMatchObject({ operationIdSpent: false })
-  })
-
-  it('fails closed when an invalid host response omits the required submission', () => {
-    const result = {
-      status: 'accepted',
-      value: { clientMessageId: 'msg-1' }
-    } as unknown as StructuredAgentSessionMutationCallResult<AgentSessionSendResult>
-    expect(mobileStructuredSendDelivery(result)).toEqual({
-      outcome: 'unknown',
-      operationIdSpent: false,
-      error: null
-    })
+    ).toEqual({ outcome: 'rejected', error: 'Your message was not sent. Send it again.' })
   })
 })
diff --git a/mobile/src/session/mobile-structured-send-delivery.ts b/mobile/src/session/mobile-structured-send-delivery.ts
index 2d48d1d2a9e0..744a561cabb1 100644
--- a/mobile/src/session/mobile-structured-send-delivery.ts
+++ b/mobile/src/session/mobile-structured-send-delivery.ts
@@ -1,144 +1,53 @@
-// What one `agentSession.send` answer means to a client with no outbox.
-//
-// The desktop reads the same four dispatch states through
-// `disposeStructuredAgentSessionSendResult`; mobile has no queue to move, so it
-// needs only two facts: the outcome to report, and whether the operation id it
-// sent under is spent.
-//
-// The id is the whole safety mechanism here. Mobile keys its retained ids by
-// message body, so re-sending the same text reuses the id — and one id is one
-// delivery: `performSend` answers a second request under a recorded id from the
-// ledger and never puts it back on the wire. Releasing the id turns that replay
-// into a genuine second delivery, which is why only a settled answer releases it:
-//
-//   accepted/pending — the send happened. The id is spent; a later identical
-//     message is a new message and must carry a new id.
-//   withdrawn — a submission a Stop took back before the agent started it is
-//     drawn in the chat with its stop row, so it spends the id and goes back to no
-//     draft. Answering a first send, it is that message: sent, then stopped. As a
-//     retained replay it cannot be told from a new send of the same text, and it
-//     provably never ran, so the caller sends it again under a fresh id.
-//   rejected — a terminal refusal or rejected submission spends a fresh id. A
-//     pending-admission refusal, or any refusal after earlier transport doubt,
-//     keeps it because neither proves a retained delivery did not happen. Two
-//     exceptions spend it anyway, because the host can never accept the replay
-//     and keeping the id would only refuse every later send of the same text:
-//     a host that refuses the replay's request shape itself (an older host's
-//     strict schema turning `delivery` away), and an id the host has expired.
-//     A rejection the host kept as a card answers as `queued`: the card holds the text.
-//   unknown — the one answer that KEEPS its id, whether it came from the host or
-//     from an ack-loss on the way back. The message may be with the provider, so
-//     the retry has to stay a replay. Rotating here is what sent one message to a
-//     model five times.
-
-import type { AgentJournalSubmission } from '../../../src/shared/agent-session-journal-types'
 import type { AgentSessionSendResult } from '../../../src/shared/agent-session-wire'
 import { agentSessionRefusalOperationState } from '../../../src/shared/agent-session-refusal-retry'
-import { agentSessionWriteNoticeEnglish } from '../../../src/shared/agent-session-refusal-notice'
-import { structuredAgentSessionRejectionNotice } from '../../../src/shared/structured-agent-session-send-disposition'
+import { structuredAgentSessionRejectionNotice } from '../../../src/shared/structured-agent-session-rejection-words'
 import { dispatchWasWithdrawn } from '../../../src/shared/structured-agent-session-dispatch-rejection'
 import type { MobileNativeChatSendOutcome } from './mobile-native-chat-send'
 import type { StructuredAgentSessionMutationCallResult } from './mobile-structured-agent-session-rpc'
 
 export type MobileStructuredSendDelivery = {
   outcome: MobileNativeChatSendOutcome
-  /** True when a retry is safe under a fresh operation id. */
-  operationIdSpent: boolean
-  /** Copy for the user, or null when the outcome needs none. */
   error: string | null
 }
 
-/** Whether a send answer is its own submission, which a Stop took back before the agent started it. */
-export function mobileStructuredSendWithdrawnBeforeStart(
-  result: StructuredAgentSessionMutationCallResult<AgentSessionSendResult>
-): boolean {
-  if (result.status !== 'accepted' || !('submission' in result.value)) {
-    return false
-  }
-  const { submission } = result.value
-  return (
-    submission.queuedMessageId === undefined &&
-    submission.dispatchState === 'rejected' &&
-    dispatchWasWithdrawn(submission)
-  )
-}
-
 export function mobileStructuredSendDelivery(
-  result: StructuredAgentSessionMutationCallResult<AgentSessionSendResult>,
-  retained = false
+  result: StructuredAgentSessionMutationCallResult<AgentSessionSendResult>
 ): MobileStructuredSendDelivery {
   if (result.status === 'unknown') {
-    return { outcome: 'unknown', operationIdSpent: false, error: null }
+    return { outcome: 'unknown', error: null }
   }
   if (result.status === 'refused') {
-    const refusalState = agentSessionRefusalOperationState(result.code)
-    if (refusalState === 'unknown') {
-      return { outcome: 'unknown', operationIdSpent: false, error: null }
-    }
-    if (retained && result.code === 'agent_session_operation_expired') {
-      // The host refuses this id for good once its day is up, so keeping it would refuse this text
-      // forever. The earlier attempt may already be in the chat, so the words say to check first.
-      return {
-        outcome: 'rejected',
-        operationIdSpent: true,
-        error: agentSessionWriteNoticeEnglish(['sendOutcomeLost'])
-      }
-    }
-    return {
-      outcome: 'rejected',
-      operationIdSpent: refusalState === 'settled-rejected' && !retained,
-      error: result.message
-    }
+    return agentSessionRefusalOperationState(result.code) === 'unknown'
+      ? { outcome: 'unknown', error: null }
+      : { outcome: 'rejected', error: result.message }
   }
   if (result.status !== 'accepted') {
-    return {
-      outcome: 'rejected',
-      operationIdSpent: !retained || result.hostRejectedByRequestSchema === true,
-      error: result.message
-    }
+    return { outcome: 'rejected', error: result.message }
   }
   if ('queued' in result.value && result.value.queued) {
-    // The host holds (or already settled) the draft: the send is spent — a
-    // later identical message is a new message. A withdrawn replay is spent
-    // too, never unknown: its card was deleted or carried by a /clear, and the
-    // caller resends it or hands the text back. A dispatched draft answers here
-    // only when the host could not find the submission it became (a live one
-    // answers with that submission), so no echo would retire an optimistic
-    // bubble: it shows nothing, and the transcript or the card owns the text.
-    return { outcome: 'queued', operationIdSpent: true, error: null }
-  }
-  const submission: AgentJournalSubmission | undefined =
-    'submission' in result.value ? result.value.submission : undefined
-  if (submission !== undefined && submission.queuedMessageId === result.value.clientMessageId) {
-    // The host says this id's queued draft was handed off as that submission: the send reached
-    // it, so the id is spent now, not when a stream that may never carry the hand-off shows it.
-    // Which send the phone meant stays unconfirmed, as for any retained replay of a live send.
-    return { outcome: 'unknown', operationIdSpent: true, error: null }
+    return result.value.queued.state === 'withdrawn'
+      ? { outcome: 'rejected', error: 'Message not sent' }
+      : { outcome: 'queued', error: null }
   }
+  const submission = 'submission' in result.value ? result.value.submission : undefined
   if (!submission || submission.dispatchState === 'unknown') {
-    return { outcome: 'unknown', operationIdSpent: false, error: null }
+    return { outcome: 'unknown', error: null }
   }
-  if (submission.dispatchState === 'rejected' && submission.keptAsQueuedMessageId !== undefined) {
-    // The host kept it as a card, which holds the text: no error, and nothing handed back to the
-    // composer, so the words never show twice.
-    return { outcome: 'queued', operationIdSpent: true, error: null }
-  }
-  if (mobileStructuredSendWithdrawnBeforeStart(result)) {
-    // The chat draws it with its stop row, so it is never handed back to the composer as well. A
-    // retained replay is resent by the caller.
-    return { outcome: retained ? 'rejected' : 'accepted', operationIdSpent: true, error: null }
+  if (submission.queuedMessageId === result.value.clientMessageId) {
+    return { outcome: 'unknown', error: null }
   }
   if (submission.dispatchState === 'rejected') {
+    if (submission.keptAsQueuedMessageId !== undefined) {
+      return { outcome: 'queued', error: null }
+    }
+    if (submission.queuedMessageId === undefined && dispatchWasWithdrawn(submission)) {
+      // The host transcript already owns this send's stopped row.
+      return { outcome: 'accepted', error: null }
+    }
     return {
       outcome: 'rejected',
-      operationIdSpent: true,
       error: structuredAgentSessionRejectionNotice(submission.reason, 'composer-send')
     }
   }
-  if (retained) {
-    // A payload match cannot distinguish retrying the ambiguous action from a
-    // later identical intent. Wait for the stream to settle and release it.
-    return { outcome: 'unknown', operationIdSpent: false, error: null }
-  }
-  return { outcome: 'accepted', operationIdSpent: true, error: null }
+  return { outcome: 'accepted', error: null }
 }
diff --git a/mobile/src/session/mobile-structured-send-new-action.test.ts b/mobile/src/session/mobile-structured-send-new-action.test.ts
new file mode 100644
index 000000000000..71827af8640c
--- /dev/null
+++ b/mobile/src/session/mobile-structured-send-new-action.test.ts
@@ -0,0 +1,97 @@
+import { beforeEach, describe, expect, it, vi } from 'vitest'
+import type { RpcClient } from '../transport/rpc-client'
+import { fieldsOf } from './use-mobile-structured-agent-session-queued.test-fixture'
+import { markRpcDeliveryUnknown } from '../transport/rpc-delivery-ambiguity'
+import { sendMobileStructuredAgentSessionMessage } from './mobile-structured-agent-session-send'
+
+const storage = vi.hoisted(() => ({ getItem: vi.fn(), setItem: vi.fn(), removeItem: vi.fn() }))
+vi.mock('@react-native-async-storage/async-storage', () => ({ default: storage }))
+
+describe('a new phone send after an acknowledgement was lost', () => {
+  beforeEach(() => {
+    vi.clearAllMocks()
+
+    const saved = new Map<string, string>()
+    storage.getItem.mockImplementation(async (key: string) => saved.get(key) ?? null)
+    storage.setItem.mockImplementation(async (key: string, value: string) => saved.set(key, value))
+    storage.removeItem.mockImplementation(async (key: string) => saved.delete(key))
+  })
+
+  it.each([false, true])(
+    'delivers identical text as a new action while the old host entry stays unknown (relaunch %s)',
+    async (relaunch) => {
+      const ids: string[] = []
+      const delivered: string[] = []
+      const ledger = new Set<string>()
+      const sendRequest = vi.fn<RpcClient['sendRequest']>(async (_method, params) => {
+        const id = String(fieldsOf(fieldsOf(params).envelope).clientOperationId)
+        const replayed = ledger.has(id)
+        ids.push(id)
+        if (!replayed) {
+          ledger.add(id)
+          delivered.push(id)
+          if (delivered.length === 1) {
+            throw markRpcDeliveryUnknown(new Error('Connection closed after dispatch'))
+          }
+        }
+        return {
+          id: 'response',
+          ok: true,
+          result: {
+            ok: true,
+            replayed,
+            fence: 3,
+            cursor: { epoch: 'epoch', sequence: 1 },
+            value: {
+              clientMessageId: id,
+              submission: {
+                clientMessageId: id,
+                fence: 3,
+                payloadFingerprint: String(fieldsOf(fieldsOf(params).envelope).payloadFingerprint),
+                dispatchState: id === delivered[0] ? 'unknown' : 'accepted',
+                providerItemId: null,
+                reason: null,
+                submittedAt: Date.now(),
+                resolvedAt: null
+              }
+            }
+          }
+        }
+      })
+      const clientFor = (): RpcClient => ({
+        sendRequest,
+        subscribe: vi.fn(() => vi.fn()),
+        updateTerminalSubscriptionViewport: () => {},
+        getState: () => 'connected',
+        getReconnectAttempt: () => 0,
+        getLastConnectedAt: () => null,
+        onStateChange: () => () => {},
+        notifyForeground: () => {},
+        close: () => {}
+      })
+      let client = clientFor()
+      const onError = vi.fn()
+      const message = {
+        sessionId: 'session',
+        sessionKey: 'remote-host:folder:session',
+        callerIdentity: 'phone',
+        expectedRuntimeFence: 3,
+        text: 'please continue',
+        attachments: [],
+        onError
+      }
+      const send = () => sendMobileStructuredAgentSessionMessage({ ...message, client })
+
+      expect(await send()).toBe('unknown')
+      if (relaunch) {
+        client = clientFor()
+      }
+      expect(await send()).toBe('accepted')
+      expect(delivered).toHaveLength(2)
+      expect(new Set(ids).size).toBe(2)
+      expect(onError).not.toHaveBeenCalled()
+      expect(storage.getItem).not.toHaveBeenCalled()
+      expect(storage.setItem).not.toHaveBeenCalled()
+    }
+  )
+})
diff --git a/mobile/src/session/mobile-structured-send-operation-journal.test.ts b/mobile/src/session/mobile-structured-send-operation-journal.test.ts
deleted file mode 100644
index 3c76e1d1c3fc..000000000000
--- a/mobile/src/session/mobile-structured-send-operation-journal.test.ts
+++ /dev/null
@@ -1,450 +0,0 @@
-import { beforeEach, describe, expect, it, vi } from 'vitest'
-import { AGENT_SESSION_MAX_OPERATION_REPLAY_AGE_MS } from '../../../src/shared/agent-session-host-authority'
-import { AGENT_SESSION_DURABLE_OPERATION_GLOBAL_LIMIT } from '../../../src/shared/agent-session-operation-ledger'
-
-const asyncStorage = vi.hoisted(() => ({
-  getItem: vi.fn(),
-  setItem: vi.fn(),
-  removeItem: vi.fn()
-}))
-
-vi.mock('@react-native-async-storage/async-storage', () => ({ default: asyncStorage }))
-
-import {
-  clearMobileStructuredSendOperation,
-  clearMobileStructuredSettledSendOperations,
-  getOrCreateMobileStructuredSendOperation as getOrCreatePersistedOperation,
-  mobileStructuredSendCallerFingerprint,
-  mobileStructuredSendOperationKey,
-  resetMobileStructuredSendOperationJournalForTests
-} from './mobile-structured-send-operation-journal'
-import { readMirroredStorage } from '../storage/mirrored-storage-keys'
-
-const NOW = 1_900_000_000_000
-/** The key the journal persists under, which the hybrid shell mirrors into every `init`. */
-const JOURNAL_KEY = 'orca:mobileStructuredSendOperations:v1'
-const OPERATION_KEY = 'a'.repeat(64)
-const CALLER_IDENTITY = 'mobile-device-a'
-
-function getOrCreateMobileStructuredSendOperation(
-  input: Omit<
-    Parameters<typeof getOrCreatePersistedOperation>[0],
-    'callerIdentity' | 'payloadFingerprint' | 'attachmentPaths'
-  > & { payloadFingerprint?: string; attachmentPaths?: readonly string[] }
-) {
-  const { payloadFingerprint = 'b'.repeat(64), attachmentPaths = [], ...operation } = input
-  return getOrCreatePersistedOperation({
-    ...operation,
-    callerIdentity: CALLER_IDENTITY,
-    payloadFingerprint,
-    attachmentPaths
-  }).then(({ operationId, retained }) => ({ operationId, retained }))
-}
-
-function operationIdAt(timestamp: number, entropy: string): string {
-  return `${timestamp}-${entropy.repeat(32).slice(0, 32)}`
-}
-
-describe('mobile structured send operation journal', () => {
-  let values: Map<string, string>
-
-  beforeEach(() => {
-    vi.clearAllMocks()
-    resetMobileStructuredSendOperationJournalForTests()
-    values = new Map()
-    asyncStorage.getItem.mockImplementation(async (key: string) => values.get(key) ?? null)
-    asyncStorage.setItem.mockImplementation(async (key: string, value: string) => {
-      values.set(key, value)
-    })
-    asyncStorage.removeItem.mockImplementation(async (key: string) => {
-      values.delete(key)
-    })
-  })
-
-  it('persists an ambiguous id before dispatch and reuses it after remount', async () => {
-    const firstId = operationIdAt(NOW, '1')
-    await expect(
-      getOrCreateMobileStructuredSendOperation({
-        operationKey: OPERATION_KEY,
-        createOperationId: () => firstId,
-        now: NOW
-      })
-    ).resolves.toEqual({ operationId: firstId, retained: false })
-
-    resetMobileStructuredSendOperationJournalForTests()
-    const createAfterRemount = vi.fn(() => operationIdAt(NOW, '2'))
-    await expect(
-      getOrCreateMobileStructuredSendOperation({
-        operationKey: OPERATION_KEY,
-        createOperationId: createAfterRemount,
-        now: NOW
-      })
-    ).resolves.toEqual({ operationId: firstId, retained: true })
-    expect(createAfterRemount).not.toHaveBeenCalled()
-  })
-
-  /**
-   * A mirror the page reads is not allowed to run ahead of the store (round 4, CodeRabbit).
-   *
-   * The hybrid shell builds `init` from the mirror synchronously, so the page is handed whatever
-   * was noted here. Noting the write before it is persisted is what keeps an `init` in the same
-   * turn current; keeping the note after the persist was refused publishes a journal that does
-   * not exist, and the page resumes operations the device never wrote down.
-   */
-  it('rolls the mirror back when persisting an added entry fails', async () => {
-    await getOrCreateMobileStructuredSendOperation({
-      operationKey: OPERATION_KEY,
-      createOperationId: () => operationIdAt(NOW, '8'),
-      now: NOW
-    })
-    const held = readMirroredStorage([JOURNAL_KEY])[JOURNAL_KEY]
-    asyncStorage.setItem.mockRejectedValueOnce(new Error('the store is full'))
-    await expect(
-      getOrCreateMobileStructuredSendOperation({
-        operationKey: 'c'.repeat(64),
-        createOperationId: () => operationIdAt(NOW, '9'),
-        now: NOW
-      })
-    ).rejects.toThrow('the store is full')
-    expect(readMirroredStorage([JOURNAL_KEY])[JOURNAL_KEY]).toBe(held)
-  })
-
-  it('rolls the mirror back when persisting the last clear fails', async () => {
-    const firstId = operationIdAt(NOW, 'a')
-    await getOrCreateMobileStructuredSendOperation({
-      operationKey: OPERATION_KEY,
-      createOperationId: () => firstId,
-      now: NOW
-    })
-    const held = readMirroredStorage([JOURNAL_KEY])[JOURNAL_KEY]
-    asyncStorage.removeItem.mockRejectedValueOnce(new Error('the store is full'))
-    await expect(
-      clearMobileStructuredSendOperation({ operationKey: OPERATION_KEY, operationId: firstId })
-    ).rejects.toThrow('the store is full')
-    expect(readMirroredStorage([JOURNAL_KEY])[JOURNAL_KEY]).toBe(held)
-  })
-
-  it('clears only the exact settled operation', async () => {
-    const firstId = operationIdAt(NOW, '3')
-    await getOrCreateMobileStructuredSendOperation({
-      operationKey: OPERATION_KEY,
-      createOperationId: () => firstId,
-      now: NOW
-    })
-
-    await expect(
-      clearMobileStructuredSendOperation({
-        operationKey: OPERATION_KEY,
-        operationId: operationIdAt(NOW, '4')
-      })
-    ).rejects.toThrow('identity changed')
-    await clearMobileStructuredSendOperation({
-      operationKey: OPERATION_KEY,
-      operationId: firstId
-    })
-
-    const secondId = operationIdAt(NOW, '5')
-    await expect(
-      getOrCreateMobileStructuredSendOperation({
-        operationKey: OPERATION_KEY,
-        createOperationId: () => secondId,
-        now: NOW
-      })
-    ).resolves.toEqual({ operationId: secondId, retained: false })
-  })
-
-  it('clears an ack-lost id only when its journal submission settles', async () => {
-    const sessionKey = 'host-a:session-a'
-    const payloadFingerprint = 'c'.repeat(64)
-    const operationKey = mobileStructuredSendOperationKey({
-      sessionKey,
-      intentFingerprint: payloadFingerprint
-    })
-    const operationId = operationIdAt(NOW, 'd')
-    await getOrCreateMobileStructuredSendOperation({
-      operationKey,
-      payloadFingerprint,
-      createOperationId: () => operationId,
-      now: NOW
-    })
-    const submission = {
-      clientMessageId: operationId,
-      fence: 1,
-      payloadFingerprint,
-      dispatchState: 'unknown' as const,
-      providerItemId: null,
-      reason: 'ack lost',
-      submittedAt: NOW,
-      resolvedAt: NOW
-    }
-
-    await clearMobileStructuredSettledSendOperations({ submissions: [submission] })
-    expect(values.size).toBe(1)
-
-    await clearMobileStructuredSettledSendOperations({
-      submissions: [{ ...submission, dispatchState: 'accepted', reason: null }]
-    })
-    expect(values.size).toBe(0)
-  })
-
-  it("clears an id a draft hand-off names, whatever that hand-off's state", async () => {
-    const sessionKey = 'host-a:session-a'
-    const payloadFingerprint = '9'.repeat(64)
-    const operationKey = mobileStructuredSendOperationKey({
-      sessionKey,
-      intentFingerprint: payloadFingerprint
-    })
-    const operationId = operationIdAt(NOW, '7')
-    await getOrCreateMobileStructuredSendOperation({
-      operationKey,
-      payloadFingerprint,
-      createOperationId: () => operationId,
-      now: NOW
-    })
-    // The drain handed the draft off under a fresh id; only the link names this send.
-    await clearMobileStructuredSettledSendOperations({
-      submissions: [
-        {
-          clientMessageId: operationIdAt(NOW + 1, '8'),
-          queuedMessageId: operationId,
-          fence: 1,
-          payloadFingerprint,
-          dispatchState: 'pending',
-          providerItemId: null,
-          reason: null,
-          submittedAt: NOW + 1,
-          resolvedAt: null
-        }
-      ]
-    })
-    expect(values.size).toBe(0)
-  })
-
-  it('does not clear a newer id for an older matching-payload submission', async () => {
-    const sessionKey = 'host-a:session-a'
-    const payloadFingerprint = 'e'.repeat(64)
-    const operationKey = mobileStructuredSendOperationKey({
-      sessionKey,
-      intentFingerprint: payloadFingerprint
-    })
-    const operationId = operationIdAt(NOW, 'f')
-    await getOrCreateMobileStructuredSendOperation({
-      operationKey,
-      payloadFingerprint,
-      createOperationId: () => operationId,
-      now: NOW
-    })
-
-    await clearMobileStructuredSettledSendOperations({
-      submissions: [
-        {
-          clientMessageId: operationIdAt(NOW - 1, '1'),
-          fence: 1,
-          payloadFingerprint,
-          dispatchState: 'accepted',
-          providerItemId: null,
-          reason: null,
-          submittedAt: NOW - 1,
-          resolvedAt: NOW - 1
-        }
-      ]
-    })
-
-    await expect(
-      getOrCreateMobileStructuredSendOperation({
-        operationKey,
-        createOperationId: () => operationIdAt(NOW, '2'),
-        now: NOW
-      })
-    ).resolves.toEqual({ operationId, retained: true })
-  })
-
-  it('reuses the original attachment paths for an ambiguous repeat upload', async () => {
-    const operationId = operationIdAt(NOW, 'e')
-    const payloadFingerprint = 'd'.repeat(64)
-    await getOrCreatePersistedOperation({
-      operationKey: OPERATION_KEY,
-      callerIdentity: CALLER_IDENTITY,
-      payloadFingerprint,
-      attachmentPaths: ['/tmp/original.png'],
-      createOperationId: () => operationId,
-      now: NOW
-    })
-
-    await expect(
-      getOrCreatePersistedOperation({
-        operationKey: OPERATION_KEY,
-        callerIdentity: CALLER_IDENTITY,
-        payloadFingerprint: 'e'.repeat(64),
-        attachmentPaths: ['/tmp/reuploaded.png'],
-        createOperationId: () => operationIdAt(NOW, 'f'),
-        now: NOW
-      })
-    ).resolves.toEqual({
-      operationKey: OPERATION_KEY,
-      operationId,
-      retained: true,
-      payloadFingerprint,
-      attachmentPaths: ['/tmp/original.png']
-    })
-  })
-
-  it('replays an entry retained under the alternate key, and says which key matched', async () => {
-    const operationId = operationIdAt(NOW, 'e')
-    const alternateKey = 'b'.repeat(64)
-    await getOrCreatePersistedOperation({
-      operationKey: alternateKey,
-      callerIdentity: CALLER_IDENTITY,
-      payloadFingerprint: 'd'.repeat(64),
-      attachmentPaths: [],
-      createOperationId: () => operationId,
-      now: NOW
-    })
-    await expect(
-      getOrCreatePersistedOperation({
-        operationKey: OPERATION_KEY,
-        alternateOperationKey: alternateKey,
-        callerIdentity: CALLER_IDENTITY,
-        payloadFingerprint: 'd'.repeat(64),
-        attachmentPaths: [],
-        createOperationId: () => operationIdAt(NOW, 'f'),
-        now: NOW
-      })
-    ).resolves.toMatchObject({ operationKey: alternateKey, operationId, retained: true })
-  })
-
-  it('keeps an ambiguous id after the host replay window closes', async () => {
-    const expired = operationIdAt(NOW - AGENT_SESSION_MAX_OPERATION_REPLAY_AGE_MS - 1, '6')
-    asyncStorage.getItem.mockResolvedValueOnce(
-      JSON.stringify({
-        v: 1,
-        entries: [
-          {
-            operationKey: OPERATION_KEY,
-            operationId: expired,
-            callerFingerprint: mobileStructuredSendCallerFingerprint(CALLER_IDENTITY),
-            payloadFingerprint: 'b'.repeat(64),
-            attachmentPaths: []
-          }
-        ]
-      })
-    )
-
-    await expect(
-      getOrCreateMobileStructuredSendOperation({
-        operationKey: OPERATION_KEY,
-        createOperationId: () => operationIdAt(NOW, '7'),
-        now: NOW
-      })
-    ).resolves.toEqual({ operationId: expired, retained: true })
-  })
-
-  it('fails closed when a retained operation id is malformed', async () => {
-    asyncStorage.getItem.mockResolvedValueOnce(
-      JSON.stringify({
-        v: 1,
-        entries: [
-          {
-            operationKey: OPERATION_KEY,
-            operationId: 'not-an-operation-id',
-            callerFingerprint: mobileStructuredSendCallerFingerprint(CALLER_IDENTITY),
-            payloadFingerprint: 'b'.repeat(64),
-            attachmentPaths: []
-          }
-        ]
-      })
-    )
-
-    await expect(
-      getOrCreateMobileStructuredSendOperation({
-        operationKey: OPERATION_KEY,
-        createOperationId: () => operationIdAt(NOW, '8'),
-        now: NOW
-      })
-    ).rejects.toThrow('unreadable')
-  })
-
-  it('fails closed when durable identity cannot be read or written', async () => {
-    asyncStorage.getItem.mockRejectedValueOnce(new Error('storage unavailable'))
-    await expect(
-      getOrCreateMobileStructuredSendOperation({
-        operationKey: OPERATION_KEY,
-        createOperationId: () => operationIdAt(NOW, '9'),
-        now: NOW
-      })
-    ).rejects.toThrow('storage unavailable')
-
-    asyncStorage.setItem.mockRejectedValueOnce(new Error('disk full'))
-    await expect(
-      getOrCreateMobileStructuredSendOperation({
-        operationKey: OPERATION_KEY,
-        createOperationId: () => operationIdAt(NOW, 'a'),
-        now: NOW
-      })
-    ).rejects.toThrow('disk full')
-    expect(values.size).toBe(0)
-  })
-
-  it('refuses new sends rather than evicting an ambiguous id at capacity', async () => {
-    asyncStorage.getItem.mockResolvedValueOnce(
-      JSON.stringify({
-        v: 1,
-        entries: Array.from(
-          { length: AGENT_SESSION_DURABLE_OPERATION_GLOBAL_LIMIT },
-          (_, index) => ({
-            operationKey: index.toString(16).padStart(64, '0'),
-            operationId: operationIdAt(NOW, index.toString(16).padStart(32, '0')),
-            callerFingerprint: mobileStructuredSendCallerFingerprint(CALLER_IDENTITY),
-            payloadFingerprint: 'b'.repeat(64),
-            attachmentPaths: []
-          })
-        )
-      })
-    )
-
-    await expect(
-      getOrCreateMobileStructuredSendOperation({
-        operationKey: OPERATION_KEY,
-        createOperationId: () => operationIdAt(NOW, 'b'),
-        now: NOW
-      })
-    ).rejects.toThrow('journal is full')
-  })
-
-  it('hashes the session scope and payload instead of retaining message bodies', () => {
-    const first = mobileStructuredSendOperationKey({
-      sessionKey: 'host-a:session-a',
-      intentFingerprint: 'message-body-fingerprint'
-    })
-    const second = mobileStructuredSendOperationKey({
-      sessionKey: 'host-b:session-a',
-      intentFingerprint: 'message-body-fingerprint'
-    })
-
-    expect(first).toMatch(/^[0-9a-f]{64}$/)
-    expect(second).not.toBe(first)
-    expect(first).not.toContain('message-body')
-  })
-
-  it('fails closed when a retained id crosses authenticated caller identities', async () => {
-    await getOrCreatePersistedOperation({
-      operationKey: OPERATION_KEY,
-      callerIdentity: 'mobile-device-before-repair',
-      payloadFingerprint: 'b'.repeat(64),
-      attachmentPaths: [],
-      createOperationId: () => operationIdAt(NOW, '3'),
-      now: NOW
-    })
-
-    await expect(
-      getOrCreatePersistedOperation({
-        operationKey: OPERATION_KEY,
-        callerIdentity: 'mobile-device-after-repair',
-        payloadFingerprint: 'b'.repeat(64),
-        attachmentPaths: [],
-        createOperationId: () => operationIdAt(NOW, '4'),
-        now: NOW
-      })
-    ).rejects.toThrow('caller identity changed')
-  })
-})
diff --git a/mobile/src/session/mobile-structured-send-operation-journal.ts b/mobile/src/session/mobile-structured-send-operation-journal.ts
deleted file mode 100644
index 98937ad1bbbb..000000000000
--- a/mobile/src/session/mobile-structured-send-operation-journal.ts
+++ /dev/null
@@ -1,281 +0,0 @@
-import AsyncStorage from '@react-native-async-storage/async-storage'
-import { z } from 'zod'
-import { persistMirrored } from '../storage/mirrored-storage-keys'
-import type { AgentJournalSubmission } from '../../../src/shared/agent-session-journal-types'
-import {
-  AGENT_SESSION_MAX_NEW_OPERATION_AGE_MS,
-  AGENT_SESSION_OPERATION_FUTURE_SKEW_MS,
-  parseAgentSessionOperationTimestamp
-} from '../../../src/shared/agent-session-host-authority'
-import { AGENT_SESSION_DURABLE_OPERATION_GLOBAL_LIMIT } from '../../../src/shared/agent-session-operation-ledger'
-import { structuredAgentSessionDomainFingerprint } from '../../../src/shared/structured-agent-session-mutation'
-
-const STORAGE_KEY = 'orca:mobileStructuredSendOperations:v1'
-const OperationEntrySchema = z
-  .object({
-    operationKey: z.string().regex(/^[0-9a-f]{64}$/),
-    operationId: z.string().max(128),
-    callerFingerprint: z.string().regex(/^[0-9a-f]{64}$/),
-    payloadFingerprint: z.string().regex(/^[0-9a-f]{64}$/),
-    attachmentPaths: z.array(z.string().max(4096)).max(128)
-  })
-  .strict()
-const OperationJournalSchema = z
-  .object({
-    v: z.literal(1),
-    entries: z.array(OperationEntrySchema).max(AGENT_SESSION_DURABLE_OPERATION_GLOBAL_LIMIT)
-  })
-  .strict()
-
-type OperationEntry = z.infer<typeof OperationEntrySchema>
-type OperationJournal = z.infer<typeof OperationJournalSchema>
-
-const mutations: { tail: Promise<void> } = { tail: Promise.resolve() }
-
-export function mobileStructuredSendOperationKey(input: {
-  sessionKey: string
-  intentFingerprint: string
-}): string {
-  return structuredAgentSessionDomainFingerprint({
-    domain: 'mobile.agentSession.send.operation',
-    sessionId: input.sessionKey,
-    fields: { intentFingerprint: input.intentFingerprint }
-  })
-}
-
-export function mobileStructuredSendCallerFingerprint(callerIdentity: string): string {
-  return structuredAgentSessionDomainFingerprint({
-    domain: 'mobile.agentSession.send.caller',
-    sessionId: callerIdentity,
-    fields: {}
-  })
-}
-
-function newOperationIdIsAdmissible(operationId: string, now: number): boolean {
-  const timestamp = parseAgentSessionOperationTimestamp(operationId)
-  return (
-    timestamp !== null &&
-    timestamp <= now + AGENT_SESSION_OPERATION_FUTURE_SKEW_MS &&
-    now - timestamp <= AGENT_SESSION_MAX_NEW_OPERATION_AGE_MS
-  )
-}
-
-function parseJournal(raw: string | null): OperationJournal {
-  if (raw === null) {
-    return { v: 1, entries: [] }
-  }
-  let value: unknown
-  try {
-    value = JSON.parse(raw)
-  } catch {
-    throw new Error('Structured send operation journal is unreadable')
-  }
-  const parsed = OperationJournalSchema.safeParse(value)
-  if (!parsed.success) {
-    throw new Error('Structured send operation journal is unreadable')
-  }
-  if (
-    new Set(parsed.data.entries.map((entry) => entry.operationKey)).size !==
-      parsed.data.entries.length ||
-    parsed.data.entries.some(
-      (entry) => parseAgentSessionOperationTimestamp(entry.operationId) === null
-    )
-  ) {
-    throw new Error('Structured send operation journal is unreadable')
-  }
-  return parsed.data
-}
-
-async function writeEntries(entries: OperationEntry[]): Promise<void> {
-  // Through the one write path, which notes the mirror on an accepted write and on nothing else
-  // (ruling 35). The rejection this can raise is the point of the key: a journal the device never
-  // wrote must not reach the page, and the composer above catches it as "Message not sent".
-  await persistMirrored(
-    STORAGE_KEY,
-    entries.length === 0 ? null : JSON.stringify({ v: 1, entries })
-  )
-}
-
-async function serialize<T>(action: () => Promise<T>): Promise<T> {
-  const operation = mutations.tail.then(action, action)
-  mutations.tail = operation.then(
-    () => undefined,
-    () => undefined
-  )
-  return operation
-}
-
-export async function getOrCreateMobileStructuredSendOperation(input: {
-  operationKey: string
-  /** The same intent under its other delivery: a retained entry there is replayed
-   *  as-is, so the key that matched — never a stored field — says how it was sent. */
-  alternateOperationKey?: string
-  callerIdentity: string
-  payloadFingerprint: string
-  attachmentPaths: readonly string[]
-  createOperationId: () => string
-  now?: number
-}): Promise<{
-  operationKey: string
-  operationId: string
-  retained: boolean
-  payloadFingerprint: string
-  attachmentPaths: string[]
-}> {
-  return serialize(async () => {
-    const now = input.now ?? Date.now()
-    const callerFingerprint = mobileStructuredSendCallerFingerprint(input.callerIdentity)
-    const journal = parseJournal(await AsyncStorage.getItem(STORAGE_KEY))
-    const entries = journal.entries
-    const existing =
-      entries.find((entry) => entry.operationKey === input.operationKey) ??
-      entries.find(
-        (entry) =>
-          input.alternateOperationKey !== undefined &&
-          entry.operationKey === input.alternateOperationKey
-      )
-    if (existing) {
-      if (existing.callerFingerprint !== callerFingerprint) {
-        throw new Error('Structured send caller identity changed')
-      }
-      return {
-        operationKey: existing.operationKey,
-        operationId: existing.operationId,
-        retained: true,
-        payloadFingerprint: existing.payloadFingerprint,
-        attachmentPaths: [...existing.attachmentPaths]
-      }
-    }
-    // Ambiguity has no TTL. At the fixed capacity, refusing a new send is safer
-    // than evicting an id whose message may already be in provider context.
-    if (entries.length >= AGENT_SESSION_DURABLE_OPERATION_GLOBAL_LIMIT) {
-      throw new Error('Structured send operation journal is full')
-    }
-    const operationId = input.createOperationId()
-    if (!newOperationIdIsAdmissible(operationId, now)) {
-      throw new Error('Structured send operation id is invalid')
-    }
-    const entry = OperationEntrySchema.parse({
-      operationKey: input.operationKey,
-      operationId,
-      callerFingerprint,
-      payloadFingerprint: input.payloadFingerprint,
-      attachmentPaths: [...input.attachmentPaths]
-    })
-    await writeEntries([...entries, entry])
-    return {
-      operationKey: input.operationKey,
-      operationId,
-      retained: false,
-      payloadFingerprint: input.payloadFingerprint,
-      attachmentPaths: [...input.attachmentPaths]
-    }
-  })
-}
-
-export async function clearMobileStructuredSendOperation(input: {
-  operationKey: string
-  operationId: string
-}): Promise<void> {
-  return serialize(async () => {
-    const journal = parseJournal(await AsyncStorage.getItem(STORAGE_KEY))
-    const entries = journal.entries
-    const existing = entries.find((entry) => entry.operationKey === input.operationKey)
-    if (!existing) {
-      return
-    }
-    if (existing.operationId !== input.operationId) {
-      throw new Error('Structured send operation identity changed')
-    }
-    await writeEntries(entries.filter((entry) => entry !== existing))
-  })
-}
-
-/** Reconcile an ack-lost operation once the authoritative journal settles it, or hands it off:
- *  a submission naming the operation's id as its `queuedMessageId` is that send's queued draft
- *  going out, in whatever state, so the send reached the host and its id is spent. */
-export async function clearMobileStructuredSettledSendOperations(input: {
-  submissions: readonly AgentJournalSubmission[]
-}): Promise<void> {
-  const settled = new Set(
-    input.submissions.flatMap((submission) =>
-      submission.dispatchState === 'accepted' || submission.dispatchState === 'rejected'
-        ? [`${submission.payloadFingerprint}\u0000${submission.clientMessageId}`]
-        : []
-    )
-  )
-  const handedOff = new Set(
-    input.submissions.flatMap((submission) =>
-      submission.queuedMessageId !== undefined ? [submission.queuedMessageId] : []
-    )
-  )
-  if (settled.size === 0 && handedOff.size === 0) {
-    return
-  }
-  return serialize(async () => {
-    const journal = parseJournal(await AsyncStorage.getItem(STORAGE_KEY))
-    const entries = journal.entries.filter(
-      (entry) =>
-        !settled.has(`${entry.payloadFingerprint}\u0000${entry.operationId}`) &&
-        !handedOff.has(entry.operationId)
-    )
-    if (entries.length !== journal.entries.length) {
-      await writeEntries(entries)
-    }
-  })
-}
-
-/**
- * Spend the ids the host publishes as queued drafts. A draft is named by the
- * operation id of the send that created it, so seeing one is the host's own
- * receipt of that send — the `queued` answer a lost acknowledgement never
- * brought. Without this, a draft another device later withdraws leaves an entry
- * that no submission will ever settle.
- */
-export async function clearMobileStructuredQueuedSendOperations(input: {
-  queuedMessageIds: readonly string[]
-}): Promise<void> {
-  if (input.queuedMessageIds.length === 0) {
-    return
-  }
-  const held = new Set(input.queuedMessageIds)
-  return serialize(async () => {
-    const journal = parseJournal(await AsyncStorage.getItem(STORAGE_KEY))
-    const entries = journal.entries.filter((entry) => !held.has(entry.operationId))
-    if (entries.length !== journal.entries.length) {
-      await writeEntries(entries)
-    }
-  })
-}
-
-/** Ids sent past a saved record storage would not clear, keyed by the operation key that record
- *  matched, for this app run only: a retry of that text replays the same id instead of minting
- *  another, which could deliver it twice. An entry dies at app restart, when the host answers the
- *  id as spent, or when a saved record takes the id over; a replay the host keeps keeps it. */
-const bypassedOperationIds = new Map<string, string>()
-
-export function bypassedMobileStructuredSendOperationId(operationKey: string): string | undefined {
-  return bypassedOperationIds.get(operationKey)
-}
-
-export function rememberBypassedMobileStructuredSendOperation(
-  operationKey: string,
-  operationId: string
-): void {
-  bypassedOperationIds.set(operationKey, operationId)
-}
-
-export function forgetBypassedMobileStructuredSendOperation(
-  operationKey: string,
-  operationId: string
-): void {
-  if (bypassedOperationIds.get(operationKey) === operationId) {
-    bypassedOperationIds.delete(operationKey)
-  }
-}
-
-/** Test-only: drain in-memory serialization and bypassed ids while preserving durable storage. */
-export function resetMobileStructuredSendOperationJournalForTests(): void {
-  mutations.tail = Promise.resolve()
-  bypassedOperationIds.clear()
-}
diff --git a/mobile/src/session/mobile-structured-send-page-storage-refusal.test.ts b/mobile/src/session/mobile-structured-send-page-storage-refusal.test.ts
deleted file mode 100644
index b33d992ddb23..000000000000
--- a/mobile/src/session/mobile-structured-send-page-storage-refusal.test.ts
+++ /dev/null
@@ -1,143 +0,0 @@
-import { beforeEach, describe, expect, it, vi } from 'vitest'
-
-/**
- * The page's own AsyncStorage under the durable send journal, which is the one allowlisted value
- * that outgrows what the bridge will carry.
- *
- * Measured on this tree: a journal entry with no attachment costs 343 characters in the array —
- * 342 of its own plus the comma that joins it — and the schema admits 4,096 of them, so 47
- * unsettled sends measure 16,140 and 48 measure 16,483, past `PAGE_STORAGE_MAX_VALUE_CHARS`. Every
- * page write goes through `page-async-storage`, which the
- * bundler aliases over the real module, so this is the module the journal actually writes to
- * inside the page — and the reason the refusal must be a rejection rather than a dropped write.
- *
- * What a resolved refusal would cost, which is more than a lost preference: the journal would
- * answer with an operation id no store holds, the mutation would go out carrying it, and a retry
- * after a crash would send the same message again. Ruling 7's "nothing silently no-ops", at the
- * one key where silence is a duplicate message rather than a default.
- *
- * The other half of the chain — that the rejection reaches the composer as "Message not sent" — is
- * in `use-mobile-structured-agent-session-send.test.tsx`, which already drives the real send with
- * a client double; asserting it here would mean building a second one.
- */
-vi.mock('@react-native-async-storage/async-storage', async () => ({
-  default: (await import('../mobile-web-shell/bridge/page-async-storage')).default
-}))
-
-const { publishPageStorage } = await import('../mobile-web-shell/bridge/page-async-storage')
-const { PAGE_STORAGE_MAX_VALUE_CHARS, pageStorageEntriesForInit } =
-  await import('../mobile-web-shell/page-storage-keys')
-const {
-  getOrCreateMobileStructuredSendOperation,
-  resetMobileStructuredSendOperationJournalForTests
-} = await import('./mobile-structured-send-operation-journal')
-
-const HOST_ID = 'host-1'
-const SESSION_ROUTE = '/h/host-1/session/wt-1'
-const JOURNAL = 'orca:mobileStructuredSendOperations:v1'
-
-const hex = (fill: string) => fill.repeat(64)
-
-/**
- * A journal the module itself reads back, built past the cap out of real entries rather than
- * filler: a value the parser refuses reads as "unreadable" and never reaches the write at all.
- * `ENTRIES_OVER_THE_CAP` is the measured number — one entry costs 343 characters in the array.
- */
-const ENTRIES_OVER_THE_CAP = 48
-
-function storedJournal(count: number): string {
-  return JSON.stringify({
-    v: 1,
-    entries: Array.from({ length: count }, (_, index) => ({
-      operationKey: index.toString(16).padStart(64, '0'),
-      operationId: `17584320${String(index).padStart(5, '0')}-${'b'.repeat(32)}`,
-      callerFingerprint: hex('c'),
-      payloadFingerprint: hex('d'),
-      attachmentPaths: []
-    }))
-  })
-}
-
-const posted: { key: string; value: string | null }[] = []
-
-/**
- * The page seated the way the shell seats it, rather than from a hand-written record.
- *
- * `pageStorageEntriesForInit` is the split the shell runs before `init` is built, so driving the
- * page through it is what makes these states ones production can reach: a journal over the cap
- * never arrives as a value, it arrives as a name on the oversize list.
- */
-function publishAsTheShellWould(held: Record<string, string>): void {
-  posted.length = 0
-  const { entries, oversize } = pageStorageEntriesForInit(held)
-  publishPageStorage(
-    entries,
-    (key, value) => {
-      posted.push({ key, value })
-      return true
-    },
-    HOST_ID,
-    SESSION_ROUTE,
-    oversize
-  )
-}
-
-function publish(entries: Record<string, string>): void {
-  publishAsTheShellWould(entries)
-}
-
-function claim() {
-  return getOrCreateMobileStructuredSendOperation({
-    operationKey: hex('a'),
-    callerIdentity: 'caller-1',
-    payloadFingerprint: hex('d'),
-    attachmentPaths: [],
-    createOperationId: () => `${String(Date.now())}-${hex('b').slice(0, 32)}`
-  })
-}
-
-beforeEach(() => {
-  resetMobileStructuredSendOperationJournalForTests()
-  publish({})
-})
-
-describe('the durable send journal against the page store', () => {
-  it('rejects the send that would take the journal past what the page may write', async () => {
-    // The real precondition, seated through the shell's own split: 47 entries fit, so `init`
-    // carries them and the page holds a journal it can read. The 48th is the one that does not.
-    const held = storedJournal(ENTRIES_OVER_THE_CAP - 1)
-    expect(held.length).toBeLessThanOrEqual(PAGE_STORAGE_MAX_VALUE_CHARS)
-    expect(storedJournal(ENTRIES_OVER_THE_CAP).length).toBeGreaterThan(PAGE_STORAGE_MAX_VALUE_CHARS)
-    publishAsTheShellWould({ [JOURNAL]: held })
-    await expect(claim()).rejects.toThrow(/could not save/)
-    // Nothing posted either: the value the wire would have dropped never left the page.
-    expect(posted).toEqual([])
-  })
-
-  /**
-   * The destructive one (ruling 33.6).
-   *
-   * A native journal past the cap is dropped from `init` for size, and the key stays in
-   * `pageStorageKeysForRoute`. Without the oversize list the page reads `null`, `parseJournal`
-   * answers an empty journal, and the first send writes a one-entry value over the device's — the
-   * native entries gone and a fresh `operationId` for an operation native already holds, which is
-   * the duplicate send ruling 7 exists to prevent.
-   */
-  it('refuses a send when init could not carry the journal, instead of replacing it', async () => {
-    const held = storedJournal(ENTRIES_OVER_THE_CAP)
-    const { entries, oversize } = pageStorageEntriesForInit({ [JOURNAL]: held })
-    // The precondition itself: the shell hands no value for this key and names it instead.
-    expect(entries).toEqual({})
-    expect(oversize).toEqual([JOURNAL])
-    publishAsTheShellWould({ [JOURNAL]: held })
-    await expect(claim()).rejects.toThrow(/could not save/)
-    // The half that makes it destructive: nothing was posted, so the native journal is untouched.
-    expect(posted).toEqual([])
-  })
-
-  it('claims an id when the journal fits, so the refusal above is the size and not the path', async () => {
-    publish({})
-    await expect(claim()).resolves.toEqual(expect.objectContaining({ retained: false }))
-    expect(posted.map((write) => write.key)).toEqual([JOURNAL])
-  })
-})
diff --git a/mobile/src/session/use-mobile-native-chat-ask-auto-advance.ts b/mobile/src/session/use-mobile-native-chat-ask-auto-advance.ts
new file mode 100644
index 000000000000..ef801a965dad
--- /dev/null
+++ b/mobile/src/session/use-mobile-native-chat-ask-auto-advance.ts
@@ -0,0 +1,17 @@
+import { useEffect, useRef } from 'react'
+import { NATIVE_CHAT_QUESTION_AUTO_ADVANCE_MS } from '../../../src/shared/native-chat-question-auto-advance'
+
+/** Mirrors desktop's useNativeChatQuestionAutoAdvance; shared code cannot import this app's React. */
+export function useMobileNativeChatAskAutoAdvance(): {
+  schedule: (step: () => void) => void
+  cancel: () => void
+} {
+  const timerRef = useRef<ReturnType<typeof setTimeout>>(undefined)
+  const cancel = (): void => clearTimeout(timerRef.current)
+  const schedule = (step: () => void): void => {
+    cancel()
+    timerRef.current = setTimeout(step, NATIVE_CHAT_QUESTION_AUTO_ADVANCE_MS)
+  }
+  useEffect(() => () => clearTimeout(timerRef.current), [])
+  return { schedule, cancel }
+}
diff --git a/mobile/src/session/use-mobile-native-chat-composer-tray.test.tsx b/mobile/src/session/use-mobile-native-chat-composer-tray.test.tsx
new file mode 100644
index 000000000000..eae7cbb8bec5
--- /dev/null
+++ b/mobile/src/session/use-mobile-native-chat-composer-tray.test.tsx
@@ -0,0 +1,197 @@
+// The composer tray keeps one card list and one child-work strip per conversation, so an action
+// still in flight in one never disables the same control in another, and the strip's open list
+// outlives a roster that empties between sequential children.
+
+import { createElement } from 'react'
+import { act, create, type ReactTestRenderer } from 'react-test-renderer'
+import { afterEach, describe, expect, it, vi } from 'vitest'
+import type { AgentChildWorkView } from '../../../src/shared/agent-status-child-work-view'
+import type { AgentSessionBackgroundTaskState } from '../../../src/shared/agent-session-wire'
+import { agentChildRowContextForSessionStream } from '../../../src/shared/agent-child-row-stream-context'
+import { structuredSessionBackgroundTasksView } from '../../../src/shared/structured-session-background-tasks-view'
+import { useMobileNativeChatComposerTray } from './use-mobile-native-chat-composer-tray'
+import type { MobileStructuredBackgroundTasks } from './use-mobile-structured-background-tasks'
+
+vi.mock('react-native', () => ({
+  Dimensions: { get: () => ({ width: 430, height: 900 }) },
+  Pressable: 'Pressable',
+  ScrollView: 'ScrollView',
+  StyleSheet: { create: (styles: unknown) => styles, hairlineWidth: 1 },
+  Text: 'Text',
+  View: 'View'
+}))
+
+vi.mock('lucide-react-native', () => ({
+  Activity: 'Activity',
+  AlertCircle: 'AlertCircle',
+  Bot: 'Bot',
+  ChevronDown: 'ChevronDown',
+  CircleHelp: 'CircleHelp',
+  SquareTerminal: 'SquareTerminal',
+  Workflow: 'Workflow',
+  CornerDownRight: 'CornerDownRight',
+  ListEnd: 'ListEnd',
+  MoreHorizontal: 'MoreHorizontal',
+  Pause: 'Pause',
+  Pencil: 'Pencil',
+  Play: 'Play',
+  Send: 'Send',
+  Trash2: 'Trash2'
+}))
+
+vi.mock('../components/ActionSheetModal', () => ({ ActionSheetModal: 'ActionSheetModal' }))
+vi.mock('../components/AgentStateDot', () => ({
+  AGENT_WORKING_COLOR: '#eab308',
+  AgentStateDot: 'AgentStateDot'
+}))
+vi.mock('../hooks/use-now', () => ({ useNow: () => 100_000 }))
+
+const CARD = {
+  messageId: 'waiting-1',
+  text: 'next',
+  state: 'waiting' as const,
+  paused: false,
+  needsAttention: false,
+  caption: null,
+  attribution: null
+}
+
+const CHILD: AgentChildWorkView = {
+  id: 'a',
+  providerId: 'task-a',
+  kind: 'agent',
+  description: 'review a',
+  state: 'working',
+  membership: 'live',
+  firstObservedAt: 90_000,
+  observedAt: 99_000,
+  stoppable: true,
+  invocation: { invocationId: 'spawn-a', generation: 1 }
+}
+const RUNNING: AgentSessionBackgroundTaskState = { state: 'monitoring', children: [CHILD] }
+
+function tasks(
+  sessionKey: string,
+  state: AgentSessionBackgroundTaskState | null
+): MobileStructuredBackgroundTasks {
+  return {
+    sessionKey,
+    view: structuredSessionBackgroundTasksView(state, null),
+    rowContext: agentChildRowContextForSessionStream(true, 0),
+    stop: vi.fn(async () => undefined)
+  }
+}
+
+const NEVER_RESUMES = (): Promise<boolean> => new Promise<boolean>(() => undefined)
+
+function Slot({
+  sessionKey,
+  onResume = NEVER_RESUMES,
+  backgroundTasks = null
+}: {
+  sessionKey: string
+  onResume?: () => Promise<boolean>
+  backgroundTasks?: MobileStructuredBackgroundTasks | null
+}): React.JSX.Element {
+  const tray = useMobileNativeChatComposerTray({
+    queued: { cards: [CARD], pause: { reason: 'stopped' }, onResume, sessionKey },
+    backgroundTasks
+  })
+  return createElement('View', null, tray.content)
+}
+
+describe('useMobileNativeChatComposerTray', () => {
+  let renderer: ReactTestRenderer | null = null
+
+  afterEach(() => {
+    act(() => renderer?.unmount())
+    renderer = null
+  })
+
+  it("never lets one conversation's pending Resume disable another's", async () => {
+    const pending = vi.fn(() => new Promise<boolean>(() => undefined))
+    const mounted = create(createElement('View'))
+    renderer = mounted
+    const resume = () =>
+      mounted.root.findByProps({ accessibilityLabel: 'Resume sending the queued messages' })
+    await act(async () => {
+      mounted.update(createElement(Slot, { sessionKey: 'session-a', onResume: pending }))
+    })
+    await act(async () => resume().props.onPress())
+    expect(resume().props.disabled).toBe(true)
+    await act(async () => {
+      mounted.update(createElement(Slot, { sessionKey: 'session-b', onResume: pending }))
+    })
+    expect(resume().props.disabled).toBe(false)
+  })
+
+  function stripRows(mounted: ReactTestRenderer) {
+    return mounted.root.findAll((node) => node.props.testID === 'background-task-row')
+  }
+
+  function openStrip(mounted: ReactTestRenderer): void {
+    const header = mounted.root.find(
+      (node) =>
+        String(node.type) === 'Pressable' && node.props.accessibilityState?.expanded !== undefined
+    )
+    act(() => header.props.onPress())
+  }
+
+  it('keeps the strip open across a moment with nothing running', async () => {
+    const mounted = create(createElement('View'))
+    renderer = mounted
+    await act(async () => {
+      mounted.update(
+        createElement(Slot, { sessionKey: 's-a', backgroundTasks: tasks('s-a', RUNNING) })
+      )
+    })
+    openStrip(mounted)
+    expect(stripRows(mounted)).toHaveLength(1)
+    await act(async () => {
+      mounted.update(
+        createElement(Slot, { sessionKey: 's-a', backgroundTasks: tasks('s-a', null) })
+      )
+    })
+    expect(stripRows(mounted)).toHaveLength(0)
+    await act(async () => {
+      mounted.update(
+        createElement(Slot, { sessionKey: 's-a', backgroundTasks: tasks('s-a', RUNNING) })
+      )
+    })
+    expect(stripRows(mounted)).toHaveLength(1)
+  })
+
+  it("starts another conversation's strip closed", async () => {
+    const mounted = create(createElement('View'))
+    renderer = mounted
+    await act(async () => {
+      mounted.update(
+        createElement(Slot, { sessionKey: 's-a', backgroundTasks: tasks('s-a', RUNNING) })
+      )
+    })
+    openStrip(mounted)
+    expect(stripRows(mounted)).toHaveLength(1)
+    await act(async () => {
+      mounted.update(
+        createElement(Slot, { sessionKey: 's-b', backgroundTasks: tasks('s-b', RUNNING) })
+      )
+    })
+    expect(stripRows(mounted)).toHaveLength(0)
+  })
+
+  it('gives the strip and the cards of one conversation their own keys', async () => {
+    const consoleError = vi.spyOn(console, 'error').mockImplementation(() => undefined)
+    const mounted = create(createElement('View'))
+    renderer = mounted
+    await act(async () => {
+      mounted.update(
+        createElement(Slot, { sessionKey: 's-a', backgroundTasks: tasks('s-a', RUNNING) })
+      )
+    })
+    const duplicateKeys = consoleError.mock.calls.filter((call) =>
+      String(call[0]).includes('same key')
+    )
+    consoleError.mockRestore()
+    expect(duplicateKeys).toEqual([])
+  })
+})
diff --git a/mobile/src/session/use-mobile-native-chat-composer-tray.ts b/mobile/src/session/use-mobile-native-chat-composer-tray.ts
new file mode 100644
index 000000000000..17e0570c57a4
--- /dev/null
+++ b/mobile/src/session/use-mobile-native-chat-composer-tray.ts
@@ -0,0 +1,80 @@
+// The region between the transcript and the composer, built outside the chat view: the session's
+// running child work, then its queued-draft cards, and the composer ref a card's Edit focuses.
+
+import { createElement, Fragment, useMemo, type ReactNode, type RefObject } from 'react'
+import type { TextInput } from 'react-native'
+import { MobileNativeChatBackgroundTasks } from './MobileNativeChatBackgroundTasks'
+import {
+  MobileNativeChatQueuedMessages,
+  type MobileNativeChatQueuedMessagesProps
+} from './MobileNativeChatQueuedMessages'
+import type { MobileStructuredBackgroundTasks } from './use-mobile-structured-background-tasks'
+import { useMobileNativeChatQueuedEditFocus } from './use-mobile-native-chat-queued-edit-focus'
+
+export type MobileNativeChatComposerTray = {
+  content?: ReactNode
+  composerInputRef?: RefObject<TextInput | null>
+}
+
+export type ComposerTrayProps = {
+  /** Running child work and host-held queued drafts, drawn between transcript and composer. */
+  composerTray?: MobileNativeChatComposerTray
+}
+
+/** A view given no tray draws nothing there; one stable object, so the default never re-renders. */
+export const NO_COMPOSER_TRAY: MobileNativeChatComposerTray = {}
+
+export function useMobileNativeChatComposerTray({
+  queued,
+  backgroundTasks
+}: {
+  queued: MobileNativeChatQueuedMessagesProps & {
+    /** One card list per conversation: a pending action in one never disables another's. */
+    sessionKey: string
+  }
+  /** Null off the structured lane, which publishes no child work. */
+  backgroundTasks: MobileStructuredBackgroundTasks | null
+}): MobileNativeChatComposerTray {
+  const { composerInputRef, editQueuedMessage } = useMobileNativeChatQueuedEditFocus(queued.onEdit)
+  const { cards, onSend, onDelete, pause, onResume, sessionKey, steerHeld } = queued
+  return useMemo(
+    () => ({
+      content: createElement(
+        Fragment,
+        null,
+        backgroundTasks
+          ? // Keyed per conversation: one chat's open list or pending Stop never shows in another.
+            // Its own suffix: the two never share a key, so each stays mounted as the other comes
+            // and goes.
+            createElement(MobileNativeChatBackgroundTasks, {
+              key: `${backgroundTasks.sessionKey}:background-tasks`,
+              tasks: backgroundTasks
+            })
+          : null,
+        createElement(MobileNativeChatQueuedMessages, {
+          key: sessionKey,
+          cards,
+          onSend,
+          onDelete,
+          onEdit: editQueuedMessage,
+          pause,
+          onResume,
+          steerHeld
+        })
+      ),
+      composerInputRef
+    }),
+    [
+      backgroundTasks,
+      cards,
+      composerInputRef,
+      editQueuedMessage,
+      onDelete,
+      onResume,
+      onSend,
+      pause,
+      sessionKey,
+      steerHeld
+    ]
+  )
+}
diff --git a/mobile/src/session/use-mobile-native-chat-controller.ts b/mobile/src/session/use-mobile-native-chat-controller.ts
index c44001a45737..7e0c29ecb1ea 100644
--- a/mobile/src/session/use-mobile-native-chat-controller.ts
+++ b/mobile/src/session/use-mobile-native-chat-controller.ts
@@ -97,7 +97,6 @@ export function useMobileNativeChatController(args: {
       transcriptPath: activeChatResolution?.transcriptPath ?? null,
       sessionId: activeChatSessionId,
       sourceIdentity,
-      callerIdentity: deviceTokenRef.current ?? '',
       enabled: showNativeChat,
       connState,
       hostSupport: agentSessionHostSupport,
@@ -197,10 +196,7 @@ export function useMobileNativeChatController(args: {
     onSendError
   })
 
-  const { nativeChatFilePaths, loadNativeChatFiles } = useMobileNativeChatFileSearch({
-    client,
-    worktreeId
-  })
+  const nativeChatFiles = useMobileNativeChatFileSearch({ client, worktreeId })
 
   // Why: the send seam reports outgoing catalog commands to session-option
   // tracking, but the options hook needs the seam's dispatcher — a ref breaks
@@ -298,6 +294,7 @@ export function useMobileNativeChatController(args: {
     nativeChatSession,
     /** Structured lane: drives the per-turn status row and live tool progress. */
     nativeChatStructured: activeChatStructured,
+    nativeChatVisualSource: activeChatStructured ? structuredNativeChat.visualSource : null,
     nativeChatAgentWorking,
     nativeChatTurnIndicator: activeChatStructured ? structuredNativeChat.turnIndicator : null,
     nativeChatWorkingStartedAt: activeChatStructured ? structuredNativeChat.workingStartedAt : null,
@@ -323,8 +320,8 @@ export function useMobileNativeChatController(args: {
     handleNativeChatStop: activeChatStructured ? structuredNativeChat.cancel : handleNativeChatStop,
     // The inactive lane's session is starved of identity, so its cards stay empty.
     nativeChatQueued: structuredNativeChat.queued,
-    nativeChatFilePaths,
-    loadNativeChatFiles,
+    nativeChatBackgroundTasks: activeChatStructured ? structuredNativeChat.backgroundTasks : null,
+    ...nativeChatFiles,
     handleNativeChatSend: activeChatStructured
       ? structuredNativeChatSend.send
       : handleNativeChatSend,
diff --git a/mobile/src/session/use-mobile-native-chat-image-attachments.test.ts b/mobile/src/session/use-mobile-native-chat-image-attachments.test.ts
index d1ed7b9b77f1..8f1e59bd0cfc 100644
--- a/mobile/src/session/use-mobile-native-chat-image-attachments.test.ts
+++ b/mobile/src/session/use-mobile-native-chat-image-attachments.test.ts
@@ -126,8 +126,7 @@ describe('useMobileNativeChatImageAttachments', () => {
       {
         id: 'img-1',
         path: '/tmp/a.png',
-        previewUri: 'file:///a.jpg',
-        contentFingerprint: expect.stringMatching(/^[0-9a-f]{64}$/)
+        previewUri: 'file:///a.jpg'
       }
     ])
     expect(client.calls.some((c) => c.method === 'terminal.send')).toBe(false)
diff --git a/mobile/src/session/use-mobile-native-chat-queued-slot.test.tsx b/mobile/src/session/use-mobile-native-chat-queued-slot.test.tsx
deleted file mode 100644
index d623953c0e9b..000000000000
--- a/mobile/src/session/use-mobile-native-chat-queued-slot.test.tsx
+++ /dev/null
@@ -1,80 +0,0 @@
-// The queued-card slot keeps one card list per conversation, so an action still in flight in one
-// never disables the same control in another.
-
-import { createElement } from 'react'
-import { act, create, type ReactTestRenderer } from 'react-test-renderer'
-import { afterEach, describe, expect, it, vi } from 'vitest'
-import { useMobileNativeChatQueuedSlot } from './use-mobile-native-chat-queued-slot'
-
-vi.mock('react-native', () => ({
-  Pressable: 'Pressable',
-  StyleSheet: { create: (styles: unknown) => styles, hairlineWidth: 1 },
-  Text: 'Text',
-  View: 'View'
-}))
-
-vi.mock('lucide-react-native', () => ({
-  AlertCircle: 'AlertCircle',
-  CornerDownRight: 'CornerDownRight',
-  ListEnd: 'ListEnd',
-  MoreHorizontal: 'MoreHorizontal',
-  Pause: 'Pause',
-  Pencil: 'Pencil',
-  Play: 'Play',
-  Send: 'Send',
-  Trash2: 'Trash2'
-}))
-
-vi.mock('../components/ActionSheetModal', () => ({ ActionSheetModal: 'ActionSheetModal' }))
-
-const CARD = {
-  messageId: 'waiting-1',
-  text: 'next',
-  state: 'waiting' as const,
-  paused: false,
-  needsAttention: false,
-  caption: null,
-  attribution: null
-}
-
-function Slot({
-  sessionKey,
-  onResume
-}: {
-  sessionKey: string
-  onResume: () => Promise<boolean>
-}): React.JSX.Element {
-  const slot = useMobileNativeChatQueuedSlot({
-    cards: [CARD],
-    pause: { reason: 'stopped' },
-    onResume,
-    sessionKey
-  })
-  return createElement('View', null, slot.cards)
-}
-
-describe('useMobileNativeChatQueuedSlot', () => {
-  let renderer: ReactTestRenderer | null = null
-
-  afterEach(() => {
-    act(() => renderer?.unmount())
-    renderer = null
-  })
-
-  it("never lets one conversation's pending Resume disable another's", async () => {
-    const pending = vi.fn(() => new Promise<boolean>(() => undefined))
-    const mounted = create(createElement('View'))
-    renderer = mounted
-    const resume = () =>
-      mounted.root.findByProps({ accessibilityLabel: 'Resume sending the queued messages' })
-    await act(async () => {
-      mounted.update(createElement(Slot, { sessionKey: 'session-a', onResume: pending }))
-    })
-    await act(async () => resume().props.onPress())
-    expect(resume().props.disabled).toBe(true)
-    await act(async () => {
-      mounted.update(createElement(Slot, { sessionKey: 'session-b', onResume: pending }))
-    })
-    expect(resume().props.disabled).toBe(false)
-  })
-})
diff --git a/mobile/src/session/use-mobile-native-chat-queued-slot.ts b/mobile/src/session/use-mobile-native-chat-queued-slot.ts
deleted file mode 100644
index 41b3eb48c8cc..000000000000
--- a/mobile/src/session/use-mobile-native-chat-queued-slot.ts
+++ /dev/null
@@ -1,61 +0,0 @@
-// The queued-draft cards' place in the chat view, built outside it: the cards to show between the
-// transcript and the composer, and the composer ref their Edit focuses.
-
-import { createElement, useMemo, type ReactNode, type RefObject } from 'react'
-import type { TextInput } from 'react-native'
-import {
-  MobileNativeChatQueuedMessages,
-  type MobileNativeChatQueuedMessagesProps
-} from './MobileNativeChatQueuedMessages'
-import { useMobileNativeChatQueuedEditFocus } from './use-mobile-native-chat-queued-edit-focus'
-
-export type MobileNativeChatQueuedSlot = {
-  cards?: ReactNode
-  composerInputRef?: RefObject<TextInput | null>
-}
-
-export type MobileQueuedSlotProps = {
-  /** Host-held queued drafts, rendered as cards between transcript and composer. */
-  queuedSlot?: MobileNativeChatQueuedSlot
-}
-
-/** A view given no slot shows no cards; one stable object, so the default never re-renders. */
-export const NO_QUEUED_SLOT: MobileNativeChatQueuedSlot = {}
-
-export function useMobileNativeChatQueuedSlot(
-  queuedMessages: MobileNativeChatQueuedMessagesProps & {
-    /** One card list per conversation: a pending action in one never disables another's. */
-    sessionKey: string
-  }
-): MobileNativeChatQueuedSlot {
-  const { composerInputRef, editQueuedMessage } = useMobileNativeChatQueuedEditFocus(
-    queuedMessages.onEdit
-  )
-  const { cards, onSend, onDelete, pause, onResume, sessionKey, steerHeld } = queuedMessages
-  return useMemo(
-    () => ({
-      cards: createElement(MobileNativeChatQueuedMessages, {
-        key: sessionKey,
-        cards,
-        onSend,
-        onDelete,
-        onEdit: editQueuedMessage,
-        pause,
-        onResume,
-        steerHeld
-      }),
-      composerInputRef
-    }),
-    [
-      cards,
-      composerInputRef,
-      editQueuedMessage,
-      onDelete,
-      onResume,
-      onSend,
-      pause,
-      sessionKey,
-      steerHeld
-    ]
-  )
-}
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 c34f1995190c..15f68f0758b3 100644
--- a/mobile/src/session/use-mobile-native-chat-session-lane.ts
+++ b/mobile/src/session/use-mobile-native-chat-session-lane.ts
@@ -16,7 +16,6 @@ export function useMobileNativeChatSessionLane({
   transcriptPath,
   sessionId,
   sourceIdentity,
-  callerIdentity,
   hostSupport,
   appendComposerTextRef,
   enabled,
@@ -33,7 +32,6 @@ export function useMobileNativeChatSessionLane({
   transcriptPath: string | null
   sessionId: string | null
   sourceIdentity: Parameters<typeof useMobileNativeChatSession>[0]['sourceIdentity']
-  callerIdentity: string
   hostSupport: StructuredAgentSessionHostSupport | null
   /** The active pane's live composer; a queued card's Edit copies through it.
    *  A ref because the drafts (and their append) mount after this lane. */
@@ -62,7 +60,6 @@ export function useMobileNativeChatSessionLane({
     client,
     sessionId: structured ? sessionId : null,
     sourceIdentity,
-    callerIdentity,
     hostSupport,
     appendComposerText,
     enabled,
diff --git a/mobile/src/session/use-mobile-native-chat-turn-disclosure-growing-row.test.tsx b/mobile/src/session/use-mobile-native-chat-turn-disclosure-growing-row.test.tsx
new file mode 100644
index 000000000000..90fda385bcc0
--- /dev/null
+++ b/mobile/src/session/use-mobile-native-chat-turn-disclosure-growing-row.test.tsx
@@ -0,0 +1,49 @@
+import { createElement } from 'react'
+import { act, create, type ReactTestRenderer } from 'react-test-renderer'
+import { afterEach, describe, expect, it } from 'vitest'
+import type { NativeChatMessage } from '../../../src/shared/native-chat-types'
+import { Harness, Result, userMessage } from './use-mobile-native-chat-turn-disclosure.test-fixture'
+
+function assistantMessage(id: string): NativeChatMessage {
+  return {
+    id,
+    role: 'assistant',
+    blocks: [{ type: 'text', text: id }],
+    timestamp: null,
+    source: 'transcript'
+  }
+}
+
+describe('useMobileNativeChatTurnDisclosure growing row', () => {
+  let renderer: ReactTestRenderer | null = null
+
+  afterEach(() => {
+    act(() => renderer?.unmount())
+    renderer = null
+  })
+
+  it('marks no row while a prompt is open', () => {
+    const messages = [userMessage('u1'), assistantMessage('a1')]
+    act(() => {
+      renderer = create(createElement(Harness, { messages, enabled: true, lineYields: true }))
+    })
+    const { disclosure } = renderer!.root.findByType(Result).props
+    expect(disclosure.resolveRow(1, messages[1]).mayStillGrow).toBe(false)
+  })
+
+  it('marks only the newest assistant row, even when a user row follows it', () => {
+    const messages = [
+      userMessage('u1'),
+      assistantMessage('a1'),
+      assistantMessage('a2'),
+      userMessage('u2')
+    ]
+    act(() => {
+      renderer = create(createElement(Harness, { messages, enabled: true }))
+    })
+    const { disclosure } = renderer!.root.findByType(Result).props
+    expect(
+      messages.map((message, index) => disclosure.resolveRow(index, message).mayStillGrow)
+    ).toEqual([false, false, true, false])
+  })
+})
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 28bd7a7d4fa8..4da463207657 100644
--- a/mobile/src/session/use-mobile-native-chat-turn-disclosure.ts
+++ b/mobile/src/session/use-mobile-native-chat-turn-disclosure.ts
@@ -1,5 +1,5 @@
 import { useCallback, useMemo, useState } from 'react'
-import type { NativeChatMessage } from '../../../src/shared/native-chat-types'
+import { isSubagentGroupBlock, type NativeChatMessage } from '../../../src/shared/native-chat-types'
 import { nativeChatReasoningDisclosureKey } from '../../../src/shared/native-chat-reasoning-row'
 import {
   nativeChatLiveLine,
@@ -33,11 +33,17 @@ export type MobileNativeChatTurnRow = {
   /** Set only on a settled turn — the one row that has activity to disclose. */
   turnKey?: string
   activeTurnIsWorking: boolean
+  /** The newest assistant row of a live turn with no prompt open: its last text may still grow. */
+  mayStillGrow: boolean
   /** The live activity line discloses this open reasoning block, so its row draws nothing. */
   reasoningIsLive: boolean
   /** A reasoning row's disclosure, keyed like the live line's so an opened block stays open. */
   reasoningExpanded: boolean
   onToggleReasoning: (key: string) => void
+  /** The roster groups the reader opened, by group id; set only on a row that carries one, so a
+   *  toggle re-renders roster rows alone. */
+  subagentGroupsOpen?: ReadonlySet<string>
+  onToggleSubagentGroup: (groupId: string) => void
 }
 
 /** The live activity line, when it draws, and whether the reader opened the block it discloses. */
@@ -163,6 +169,7 @@ export function useMobileNativeChatTurnDisclosure({
   })
   const [expandedTurnIds, toggleExpandedTurn] = useScopedOpenKeys(scopeKey)
   const [expandedReasoning, toggleReasoning] = useScopedOpenKeys(scopeKey)
+  const [openSubagentGroups, toggleSubagentGroup] = useScopedOpenKeys(scopeKey)
   const bars = useMemo(() => nativeChatTurnBarRows(rows, turnKeys), [rows, turnKeys])
 
   const { active, activeTurnKey, completedByTurn } = turnStatuses
@@ -195,6 +202,16 @@ export function useMobileNativeChatTurnDisclosure({
       },
     [expandedReasoning, line]
   )
+  // Why a reverse loop: Hermes lacks the ES2023 last-match array helper (fork ES2023 ban).
+  const latestAssistantId = useMemo(() => {
+    const rows = waiting.listMessages
+    for (let i = rows.length - 1; i >= 0; i--) {
+      if (rows[i].role === 'assistant') {
+        return rows[i].id
+      }
+    }
+    return null
+  }, [waiting.listMessages])
   const resolveRow = useCallback(
     (listIndex: number, message: NativeChatMessage): MobileNativeChatTurnRow => {
       const index = waiting.indexById?.get(message.id) ?? listIndex
@@ -219,11 +236,16 @@ export function useMobileNativeChatTurnDisclosure({
         turnKey: turnKey && turnStatus?.workedSeconds != null ? turnKey : undefined,
         // With no user boundary at all, the session's working state stays authoritative.
         activeTurnIsWorking: inLiveWorkingTurn(index),
+        mayStillGrow: !lineYields && message.id === latestAssistantId,
         reasoningIsLive: message.id === liveReasoningId,
         reasoningExpanded:
           message.role === 'reasoning' &&
           expandedReasoning.has(nativeChatReasoningDisclosureKey(message.id)),
-        onToggleReasoning: toggleReasoning
+        onToggleReasoning: toggleReasoning,
+        ...(message.blocks.some(isSubagentGroupBlock)
+          ? { subagentGroupsOpen: openSubagentGroups }
+          : {}),
+        onToggleSubagentGroup: toggleSubagentGroup
       }
     },
     [
@@ -236,9 +258,13 @@ export function useMobileNativeChatTurnDisclosure({
       completedByTurn,
       expandedTurnIds,
       inLiveWorkingTurn,
+      latestAssistantId,
+      lineYields,
       liveReasoningId,
       expandedReasoning,
-      toggleReasoning
+      toggleReasoning,
+      openSubagentGroups,
+      toggleSubagentGroup
     ]
   )
 
diff --git a/mobile/src/session/use-mobile-native-chat-visual.test.tsx b/mobile/src/session/use-mobile-native-chat-visual.test.tsx
new file mode 100644
index 000000000000..21e8cde258cc
--- /dev/null
+++ b/mobile/src/session/use-mobile-native-chat-visual.test.tsx
@@ -0,0 +1,92 @@
+import { createElement } from 'react'
+import { act, create, type ReactTestRenderer } from 'react-test-renderer'
+import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest'
+import type { RpcClient } from '../transport/rpc-client'
+import type { MobileNativeChatVisualRead } from './mobile-native-chat-visual-read'
+
+const reads = vi.hoisted(() => {
+  const next: MobileNativeChatVisualRead[] = []
+  return { next, calls: 0 }
+})
+
+vi.mock('./mobile-native-chat-visual-read', () => ({
+  cachedMobileNativeChatVisual: () => null,
+  readMobileNativeChatVisual: () => {
+    reads.calls += 1
+    return Promise.resolve(reads.next.shift() ?? { kind: 'unreachable' })
+  }
+}))
+
+import {
+  useMobileNativeChatVisual,
+  type MobileNativeChatVisualState
+} from './use-mobile-native-chat-visual'
+
+// oxlint-disable-next-line typescript/consistent-type-assertions -- SAFETY: the read module is mocked; the client is only an identity here.
+const source = { client: {} as RpcClient, sessionId: 'session-1' }
+
+let latest: { state: MobileNativeChatVisualState; retry: () => void } | null = null
+function Probe() {
+  latest = useMobileNativeChatVisual(source, 'chart.html')
+  return null
+}
+
+describe('useMobileNativeChatVisual', () => {
+  let renderer: ReactTestRenderer | null = null
+
+  beforeEach(() => {
+    vi.useFakeTimers()
+    reads.next = []
+    reads.calls = 0
+  })
+
+  afterEach(() => {
+    act(() => renderer?.unmount())
+    renderer = null
+    latest = null
+    vi.useRealTimers()
+  })
+
+  async function mount(): Promise<void> {
+    await act(async () => {
+      renderer = create(createElement(Probe))
+    })
+  }
+
+  it('re-asks a bounded number of times when the host does not answer, then shows unavailable', async () => {
+    await mount()
+    expect(reads.calls).toBe(1)
+    for (const delay of [1_500, 5_000]) {
+      await act(async () => {
+        await vi.advanceTimersByTimeAsync(delay)
+      })
+    }
+    expect(reads.calls).toBe(3)
+    expect(latest?.state).toEqual({ kind: 'unavailable' })
+    await act(async () => {
+      await vi.advanceTimersByTimeAsync(60_000)
+    })
+    expect(reads.calls).toBe(3)
+  })
+
+  it('does not latch a failure: a retry asks again and can succeed', async () => {
+    reads.next = [{ kind: 'refused' }, { kind: 'ready', html: '<p>', revision: 'a'.repeat(32) }]
+    await mount()
+    expect(latest?.state).toEqual({ kind: 'unavailable' })
+    await act(async () => {
+      latest?.retry()
+    })
+    expect(reads.calls).toBe(2)
+    expect(latest?.state).toEqual({ kind: 'ready', html: '<p>', revision: 'a'.repeat(32) })
+  })
+
+  it('stops re-asking after unmount', async () => {
+    await mount()
+    act(() => renderer?.unmount())
+    renderer = null
+    await act(async () => {
+      await vi.advanceTimersByTimeAsync(60_000)
+    })
+    expect(reads.calls).toBe(1)
+  })
+})
diff --git a/mobile/src/session/use-mobile-native-chat-visual.ts b/mobile/src/session/use-mobile-native-chat-visual.ts
new file mode 100644
index 000000000000..cb06138d5d05
--- /dev/null
+++ b/mobile/src/session/use-mobile-native-chat-visual.ts
@@ -0,0 +1,87 @@
+import { useCallback, useEffect, useState } from 'react'
+import {
+  cachedMobileNativeChatVisual,
+  readMobileNativeChatVisual,
+  type MobileNativeChatVisualSource
+} from './mobile-native-chat-visual-read'
+
+export type MobileNativeChatVisualState =
+  | { kind: 'loading' }
+  | { kind: 'ready'; html: string; revision: string }
+  | { kind: 'unavailable' }
+
+/** Automatic re-asks after a read that got no answer; the reader's tap starts a fresh round. */
+const AUTO_RETRY_DELAYS_MS = [1_500, 5_000] as const
+
+function initialState(
+  source: MobileNativeChatVisualSource,
+  file: string
+): MobileNativeChatVisualState {
+  const cached = cachedMobileNativeChatVisual(source, file)
+  return cached ? { kind: 'ready', ...cached } : { kind: 'loading' }
+}
+
+/**
+ * One visual's content: painted from the phone's cache when it has one, revalidated against the
+ * owning host on every mount, and retried a bounded number of times when the host does not answer.
+ * Nothing latches: `retry` (or a new client after a reconnect) asks again.
+ */
+export function useMobileNativeChatVisual(
+  source: MobileNativeChatVisualSource,
+  file: string
+): { state: MobileNativeChatVisualState; retry: () => void } {
+  const [state, setState] = useState(() => initialState(source, file))
+  // `round` is a reader's retry; `retriesUsed` counts automatic re-asks within it.
+  const [request, setRequest] = useState({ round: 0, retriesUsed: 0 })
+  const [retryInMs, setRetryInMs] = useState<number | null>(null)
+
+  useEffect(() => {
+    let disposed = false
+    void readMobileNativeChatVisual(source, file).then((read) => {
+      if (disposed) {
+        return
+      }
+      if (read.kind === 'ready') {
+        // Same revision keeps the same state object, so the frame does not reload its document.
+        setState((current) =>
+          current.kind === 'ready' && current.revision === read.revision
+            ? current
+            : { kind: 'ready', html: read.html, revision: read.revision }
+        )
+        return
+      }
+      const delay =
+        read.kind === 'unreachable' ? AUTO_RETRY_DELAYS_MS[request.retriesUsed] : undefined
+      if (delay !== undefined) {
+        setRetryInMs(delay)
+        return
+      }
+      // A host that does not answer leaves a visual on screen; one that refuses it takes it down.
+      setState((current) =>
+        current.kind === 'ready' && read.kind === 'unreachable' ? current : { kind: 'unavailable' }
+      )
+    })
+    return () => {
+      disposed = true
+    }
+  }, [source, file, request])
+
+  useEffect(() => {
+    if (retryInMs === null) {
+      return
+    }
+    const timer = setTimeout(() => {
+      setRetryInMs(null)
+      setRequest((current) => ({ ...current, retriesUsed: current.retriesUsed + 1 }))
+    }, retryInMs)
+    return () => clearTimeout(timer)
+  }, [retryInMs])
+
+  const retry = useCallback(() => {
+    setState((current) => (current.kind === 'unavailable' ? { kind: 'loading' } : current))
+    setRetryInMs(null)
+    setRequest((current) => ({ round: current.round + 1, retriesUsed: 0 }))
+  }, [])
+
+  return { state, retry }
+}
diff --git a/mobile/src/session/use-mobile-session-close-actions.ts b/mobile/src/session/use-mobile-session-close-actions.ts
index 22fdcc58f825..442d514cc77d 100644
--- a/mobile/src/session/use-mobile-session-close-actions.ts
+++ b/mobile/src/session/use-mobile-session-close-actions.ts
@@ -16,6 +16,7 @@ export function useMobileSessionCloseActions(scope: MobileSessionContentCreateAc
     terminalsRef,
     setSessionTabs,
     setFileDocs,
+    setMarkdownDocs,
     sessionTabsRef,
     reconcileBufferedDraftsRef,
     closedTabTombstonesRef,
@@ -119,6 +120,17 @@ export function useMobileSessionCloseActions(scope: MobileSessionContentCreateAc
         })
       )
       if (response.accepted) {
+        if (tab.type === 'markdown') {
+          setMarkdownDocs((prev) => {
+            const doc = prev.get(tab.id)
+            if (!doc || (doc.status === 'ready' && doc.isDirty)) {
+              return prev
+            }
+            const next = new Map(prev)
+            next.delete(tab.id)
+            return next
+          })
+        }
         if (tab.type === 'file') {
           setFileDocs((prev) => {
             if (!prev.has(tab.id)) {
diff --git a/mobile/src/session/use-mobile-session-document-readers.ts b/mobile/src/session/use-mobile-session-document-readers.ts
index a1e7d64a3049..be9f4d74f6de 100644
--- a/mobile/src/session/use-mobile-session-document-readers.ts
+++ b/mobile/src/session/use-mobile-session-document-readers.ts
@@ -17,7 +17,8 @@ export function useMobileSessionDocumentReaders(scope: MobileSessionTabApplicati
       if (!client) {
         return
       }
-      setMarkdownDocs((prev) => new Map(prev).set(tab.id, { status: 'loading' }))
+      const loading = { status: 'loading' } as const
+      setMarkdownDocs((prev) => new Map(prev).set(tab.id, loading))
       try {
         const response = await markdownTabRead.request(client, {
           worktree: `id:${worktreeId}`,
@@ -26,19 +27,21 @@ export function useMobileSessionDocumentReaders(scope: MobileSessionTabApplicati
         if (response.ok) {
           const result = markdownTabRead.interpret(response)
           setMarkdownDocs((prev) =>
-            new Map(prev).set(tab.id, {
-              status: 'ready',
-              content: result.content,
-              localContent: result.content,
-              baseVersion: result.version,
-              isDirty: false,
-              editable: result.editable === true,
-              stale: result.isDirty,
-              readOnlyReason: result.readOnlyReason,
-              ...(result.truncated === true
-                ? { truncated: true, byteLength: result.byteLength }
-                : {})
-            })
+            prev.get(tab.id) === loading
+              ? new Map(prev).set(tab.id, {
+                  status: 'ready',
+                  content: result.content,
+                  localContent: result.content,
+                  baseVersion: result.version,
+                  isDirty: false,
+                  editable: result.editable === true,
+                  stale: result.isDirty,
+                  readOnlyReason: result.readOnlyReason,
+                  ...(result.truncated === true
+                    ? { truncated: true, byteLength: result.byteLength }
+                    : {})
+                })
+              : prev
           )
           return
         }
@@ -57,22 +60,26 @@ export function useMobileSessionDocumentReaders(scope: MobileSessionTabApplicati
         }
         const fileResult = fallback.value
         setMarkdownDocs((prev) =>
-          new Map(prev).set(
-            tab.id,
-            buildMarkdownDiskFallbackDoc({
-              content: fileResult.content,
-              truncated: fileResult.truncated,
-              byteLength: fileResult.byteLength,
-              tabIsDirty: tab.isDirty
-            })
-          )
+          prev.get(tab.id) === loading
+            ? new Map(prev).set(
+                tab.id,
+                buildMarkdownDiskFallbackDoc({
+                  content: fileResult.content,
+                  truncated: fileResult.truncated,
+                  byteLength: fileResult.byteLength,
+                  tabIsDirty: tab.isDirty
+                })
+              )
+            : prev
         )
       } catch (err) {
         setMarkdownDocs((prev) =>
-          new Map(prev).set(tab.id, {
-            status: 'error',
-            message: documentReadErrorMessage(err, "Couldn't load markdown")
-          })
+          prev.get(tab.id) === loading
+            ? new Map(prev).set(tab.id, {
+                status: 'error',
+                message: documentReadErrorMessage(err, "Couldn't load markdown")
+              })
+            : prev
         )
       }
     },
diff --git a/mobile/src/session/use-mobile-session-image-attachments.ts b/mobile/src/session/use-mobile-session-image-attachments.ts
index 92a2b52c844d..ec53d196a4c5 100644
--- a/mobile/src/session/use-mobile-session-image-attachments.ts
+++ b/mobile/src/session/use-mobile-session-image-attachments.ts
@@ -35,7 +35,6 @@ type Args = {
       id: string
       path: string
       previewUri: string
-      contentFingerprint?: string
     }[]
   ) => Promise<MobileNativeChatSendOutcome>
   /** Structured agent sessions do not have a terminal paste path. */
diff --git a/mobile/src/session/use-mobile-structured-agent-session-background-tasks.test.tsx b/mobile/src/session/use-mobile-structured-agent-session-background-tasks.test.tsx
new file mode 100644
index 000000000000..aef38e82e6e9
--- /dev/null
+++ b/mobile/src/session/use-mobile-structured-agent-session-background-tasks.test.tsx
@@ -0,0 +1,184 @@
+// The running child work a structured session publishes reaches the phone's strip: desktop's view
+// of the same roster, rows that stop claiming live work once the stream is lost, and a Stop that
+// reaches the host's background-task cancel.
+
+import { createElement } from 'react'
+import { act, create, type ReactTestRenderer } from 'react-test-renderer'
+import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest'
+import type { AgentChildWorkView } from '../../../src/shared/agent-status-child-work-view'
+import type { AgentSessionSubscribeEvent } from '../../../src/shared/agent-session-wire'
+import type { RpcClient } from '../transport/rpc-client'
+import {
+  backgroundTaskRowMeta,
+  buildBackgroundTaskGroupsFromViews
+} from '../../../src/shared/background-task-roster'
+import { useMobileStructuredAgentSession } from './use-mobile-structured-agent-session'
+import {
+  batchEvent,
+  CAPABLE,
+  fieldsOf,
+  mutationOk,
+  ok,
+  snapshotEvent
+} from './use-mobile-structured-agent-session-queued.test-fixture'
+
+vi.mock('@react-native-async-storage/async-storage', () => ({
+  default: { getItem: vi.fn(async () => null), setItem: vi.fn(), removeItem: vi.fn() }
+}))
+
+function childView(id: string): AgentChildWorkView {
+  return {
+    id,
+    providerId: `task-${id}`,
+    kind: 'agent',
+    description: `review ${id}`,
+    state: 'working',
+    membership: 'live',
+    firstObservedAt: 1_000,
+    observedAt: 2_000,
+    stoppable: true,
+    invocation: { invocationId: `spawn-${id}`, generation: 1 }
+  }
+}
+
+function withChildren(hostNow?: number): AgentSessionSubscribeEvent {
+  const snapshot = snapshotEvent()
+  return snapshot.type === 'snapshot'
+    ? {
+        ...snapshot,
+        ...(hostNow !== undefined ? { hostNow } : {}),
+        backgroundTasks: {
+          state: 'monitoring',
+          supportsTaskStop: true,
+          children: [childView('a'), childView('b')]
+        }
+      }
+    : snapshot
+}
+
+describe('mobile structured session background tasks', () => {
+  let renderer: ReactTestRenderer | null = null
+  let hook: ReturnType<typeof useMobileStructuredAgentSession> | null = null
+  let listener: ((value: unknown) => void) | null = null
+  const sendRequest = vi.fn<RpcClient['sendRequest']>()
+  const onSendError = vi.fn()
+  const client: RpcClient = {
+    sendRequest,
+    subscribe: (_method, _params, onData) => {
+      listener = onData
+      return vi.fn()
+    },
+    updateTerminalSubscriptionViewport: () => {},
+    getState: () => 'connected',
+    getReconnectAttempt: () => 0,
+    getLastConnectedAt: () => null,
+    onStateChange: () => () => {},
+    notifyForeground: () => {},
+    close: () => {}
+  }
+
+  function Harness({ connected }: { connected: boolean }): null {
+    hook = useMobileStructuredAgentSession({
+      client,
+      sessionId: 'session-1',
+      sourceIdentity: 'host-a\0workspace-a',
+      enabled: true,
+      connected,
+      agent: 'claude',
+      hostSupport: CAPABLE,
+      onSendError
+    })
+    return null
+  }
+
+  async function mount(event: AgentSessionSubscribeEvent): Promise<void> {
+    act(() => {
+      renderer = create(createElement(Harness, { connected: true }))
+    })
+    await vi.waitFor(() => expect(listener).toEqual(expect.any(Function)))
+    act(() => listener?.(event))
+  }
+
+  beforeEach(() => {
+    vi.clearAllMocks()
+
+    sendRequest.mockImplementation(async (method) =>
+      method === 'agentSession.cancel'
+        ? mutationOk({})
+        : method === 'agentSession.options'
+          ? ok({ models: [], current: {} })
+          : ok({})
+    )
+  })
+
+  afterEach(() => {
+    act(() => renderer?.unmount())
+    renderer = null
+    hook = null
+    listener = null
+  })
+
+  it('returns the running children the host publishes, with live rows while the stream is', async () => {
+    await mount(withChildren())
+    const tasks = hook?.backgroundTasks
+    expect(tasks?.view.show).toBe(true)
+    expect(tasks?.view.supportsStop).toBe(true)
+    expect(tasks?.view.children?.map((view) => view.id)).toEqual(['a', 'b'])
+    expect(tasks?.rowContext.transportObservation).toBe('live')
+  })
+
+  it('shows no strip for a host that reports nothing running', async () => {
+    await mount(snapshotEvent())
+    expect(hook?.backgroundTasks.view.show).toBe(false)
+  })
+
+  it('keeps the roster but stops claiming live work once the connection drops', async () => {
+    await mount(withChildren())
+    act(() => renderer?.update(createElement(Harness, { connected: false })))
+    expect(hook?.backgroundTasks.view.children).toHaveLength(2)
+    expect(hook?.backgroundTasks.rowContext.transportObservation).toBe('unverifiable')
+  })
+
+  function stripElapsed(): string {
+    const tasks = hook!.backgroundTasks
+    const [group] = buildBackgroundTaskGroupsFromViews(tasks.view.children ?? [], tasks.rowContext)
+    // The strip reads host-stamped clocks on the host's clock: the phone's now less the offset.
+    return backgroundTaskRowMeta(
+      group!.tasks[0]!.row,
+      Date.now() - tasks.rowContext.hostClockOffsetMs
+    )
+  }
+
+  it('keeps the rows on a jitter-only frame and re-derives a shifted host clock', async () => {
+    const clock = vi.spyOn(Date, 'now').mockReturnValue(100_000)
+    await mount(withChildren(40_000))
+    const first = hook?.backgroundTasks
+    expect(first?.rowContext.hostClockOffsetMs).toBe(60_000)
+    // Child first seen at host time 1_000; host now is 40_000.
+    expect(stripElapsed()).toBe('39s')
+
+    // A later sample whose delivery took 300 ms longer: the same offset once rounded.
+    const jitter = batchEvent()
+    act(() => listener?.(jitter.type === 'batch' ? { ...jitter, hostNow: 39_700 } : jitter))
+    expect(hook?.backgroundTasks).toBe(first)
+
+    // The host's clock jumped forward 20 s (a restart or correction): every elapsed moves with it.
+    act(() => listener?.(withChildren(60_000)))
+    expect(hook?.backgroundTasks.rowContext.hostClockOffsetMs).toBe(40_000)
+    expect(stripElapsed()).toBe('59s')
+    clock.mockRestore()
+  })
+
+  it("stops one child through the host's background-task cancel", async () => {
+    await mount(withChildren())
+    await act(async () => {
+      await hook?.backgroundTasks.stop('task-a')
+    })
+    const cancel = sendRequest.mock.calls.find(([method]) => method === 'agentSession.cancel')
+    expect(fieldsOf(cancel?.[1])).toMatchObject({
+      turnId: 'background-tasks',
+      scope: 'background-tasks',
+      taskId: 'task-a'
+    })
+  })
+})
diff --git a/mobile/src/session/use-mobile-structured-agent-session-newer-approval-send.test.tsx b/mobile/src/session/use-mobile-structured-agent-session-newer-approval-send.test.tsx
index 9ed32c49579d..2d7e8f07462c 100644
--- a/mobile/src/session/use-mobile-structured-agent-session-newer-approval-send.test.tsx
+++ b/mobile/src/session/use-mobile-structured-agent-session-newer-approval-send.test.tsx
@@ -7,7 +7,6 @@ import { act, create, type ReactTestRenderer } from 'react-test-renderer'
 import { afterEach, beforeEach, expect, it, vi } from 'vitest'
 import type { AgentJournalRenderItem } from '../../../src/shared/agent-session-journal-types'
 import type { RpcClient } from '../transport/rpc-client'
-import { resetMobileStructuredSendOperationJournalForTests } from './mobile-structured-send-operation-journal'
 import { useMobileStructuredAgentSession } from './use-mobile-structured-agent-session'
 import {
   CAPABLE,
@@ -98,7 +97,7 @@ async function sentDelivery(items: AgentJournalRenderItem[]): Promise<unknown> {
 
 beforeEach(() => {
   vi.clearAllMocks()
-  resetMobileStructuredSendOperationJournalForTests()
+
   sendRequest.mockImplementation(async (method) =>
     method === 'agentSession.send'
       ? mutationOk({ clientMessageId: 'client-1' })
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 4c419108c7c1..328a1effdd30 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
@@ -34,9 +34,6 @@ vi.mock('./use-mobile-structured-agent-options', () => ({
 vi.mock('./use-mobile-structured-prompt-responses', () => ({
   useMobileStructuredPromptResponses: mocks.promptResponses
 }))
-vi.mock('./use-mobile-structured-send-operation-reconciliation', () => ({
-  useMobileStructuredSendOperationReconciliation: vi.fn()
-}))
 
 import { useMobileStructuredAgentSession } from './use-mobile-structured-agent-session'
 
diff --git a/mobile/src/session/use-mobile-structured-agent-session-queued.test.tsx b/mobile/src/session/use-mobile-structured-agent-session-queued.test.tsx
index c14e823ab401..0268fece2c65 100644
--- a/mobile/src/session/use-mobile-structured-agent-session-queued.test.tsx
+++ b/mobile/src/session/use-mobile-structured-agent-session-queued.test.tsx
@@ -15,7 +15,6 @@ import type { AgentSessionSubscribeEvent } from '../../../src/shared/agent-sessi
 import type { RpcClient } from '../transport/rpc-client'
 import type { RpcResponse } from '../transport/types'
 import { markRpcDeliveryUnknown } from '../transport/rpc-delivery-ambiguity'
-import { resetMobileStructuredSendOperationJournalForTests } from './mobile-structured-send-operation-journal'
 import type { StructuredAgentSessionHostSupport } from './mobile-structured-agent-session-host-support'
 import { useMobileStructuredAgentSession } from './use-mobile-structured-agent-session'
 import {
@@ -124,7 +123,7 @@ describe('mobile structured queued messages', () => {
 
   beforeEach(() => {
     vi.clearAllMocks()
-    resetMobileStructuredSendOperationJournalForTests()
+
     stored = new Map()
     asyncStorage.getItem.mockImplementation(async (key: string) => stored.get(key) ?? null)
     asyncStorage.setItem.mockImplementation(async (key: string, value: string) => {
@@ -167,10 +166,7 @@ describe('mobile structured queued messages', () => {
           fields: { body: params.body, delivery: 'queue-if-active' }
         })
       )
-      // Spent at `queued`: the durable send-operation entry is released.
-      await vi.waitFor(() =>
-        expect(stored.has('orca:mobileStructuredSendOperations:v1')).toBe(false)
-      )
+      expect(asyncStorage.setItem).not.toHaveBeenCalled()
     })
 
     it('keeps today’s request exactly against an incapable host', async () => {
@@ -207,317 +203,61 @@ describe('mobile structured queued messages', () => {
       )
     })
 
-    it('replays an ack-lost delivery send under one id and the delivery it was sent with', async () => {
+    it('a new send follows the current host capability after acknowledgement loss', async () => {
       let attempts = 0
-      sendRequest.mockImplementation(async (method) => {
-        if (method === 'agentSession.send') {
-          attempts += 1
+      sendRequest.mockImplementation(async (method, params) => {
+        if (method !== 'agentSession.send') {
+          return ok({ models: [], current: {} })
+        }
+        if (++attempts === 1) {
           throw markRpcDeliveryUnknown(new Error('Connection closed'))
         }
-        return method === 'agentSession.options' ? ok({ models: [], current: {} }) : ok({})
+        const id = String(fieldsOf(fieldsOf(params).envelope).clientOperationId)
+        return mutationOk({ clientMessageId: id, submission: acceptedSubmission(id) })
       })
       await mountSession(CAPABLE)
       await act(async () => {
-        expect(await hook!.sendWithOutcome('retry me')).toBe('unknown')
+        expect(await hook!.sendWithOutcome('again')).toBe('unknown')
       })
       unmountSession()
-      // The capability probe has not answered after the reload, but the recorded
-      // operation must replay bit-for-bit — content-derived key, same id, same
-      // delivery field — or the host would refuse it as a fingerprint conflict.
       await mountSession(LEGACY)
       await act(async () => {
-        expect(await hook!.sendWithOutcome('retry me')).toBe('unknown')
+        expect(await hook!.sendWithOutcome('again')).toBe('accepted')
       })
-      expect(attempts).toBe(2)
       const first = requestOf('agentSession.send', 0)
       const second = requestOf('agentSession.send', 1)
-      expect(second.params.delivery).toBe('queue-if-active')
-      expect(second.envelope.clientOperationId).toBe(first.envelope.clientOperationId)
-      // Nothing new is persisted: an older build still reads the send journal.
-      const journal = stored.get('orca:mobileStructuredSendOperations:v1') ?? ''
-      expect(journal).not.toContain('delivery')
-    })
-
-    it('retires an ack-lost delivery send an older host refuses, so the next send goes out plain', async () => {
-      const journalKey = 'orca:mobileStructuredSendOperations:v1'
-      let attempts = 0
-      sendRequest.mockImplementation(async (method, params) => {
-        if (method === 'agentSession.send') {
-          attempts += 1
-          if (attempts <= 2) {
-            throw markRpcDeliveryUnknown(new Error('Connection closed'))
-          }
-          // The downgraded host's strict schema turns `delivery` away before running anything.
-          if ('delivery' in fieldsOf(params)) {
-            return {
-              id: 'request-1',
-              ok: false,
-              error: { code: 'invalid_argument', message: 'Unrecognized key: "delivery"' }
-            }
-          }
-          return mutationOk({
-            clientMessageId: 'client-plain',
-            submission: {
-              clientMessageId: 'client-plain',
-              fence: 3,
-              payloadFingerprint: 'fp',
-              dispatchState: 'accepted',
-              providerItemId: null,
-              reason: null,
-              submittedAt: 10,
-              resolvedAt: 10
-            }
-          })
-        }
-        return method === 'agentSession.options' ? ok({ models: [], current: {} }) : ok({})
-      })
-      await mountSession(CAPABLE)
-      await act(async () => {
-        expect(await hook!.sendWithOutcome('downgraded')).toBe('unknown')
-      })
-      unmountSession()
-      await mountSession(LEGACY)
-      // A lost answer is still doubt: the replay keeps the id and its delivery.
-      await act(async () => {
-        expect(await hook!.sendWithOutcome('downgraded')).toBe('unknown')
-      })
-      const first = requestOf('agentSession.send', 0)
-      expect(requestOf('agentSession.send', 1).envelope.clientOperationId).toBe(
-        first.envelope.clientOperationId
-      )
-      expect(stored.get(journalKey)).toContain(String(first.envelope.clientOperationId))
-      // The host answering that it cannot take the request retires the entry, once.
-      await act(async () => {
-        expect(await hook!.sendWithOutcome('downgraded')).toBe('rejected')
-      })
-      const refused = requestOf('agentSession.send', 2)
-      expect(refused.params.delivery).toBe('queue-if-active')
-      expect(refused.envelope.clientOperationId).toBe(first.envelope.clientOperationId)
-      expect(onSendError).toHaveBeenCalledTimes(1)
-      await act(async () => {
-        expect(await hook!.sendWithOutcome('downgraded')).toBe('accepted')
-      })
-      const plain = requestOf('agentSession.send', 3)
-      expect('delivery' in plain.params).toBe(false)
-      expect(plain.envelope.clientOperationId).not.toBe(first.envelope.clientOperationId)
-      expect(attempts).toBe(4)
-    })
-
-    it('keeps an ack-lost send when the host refuses its replay as unauthorized', async () => {
-      let attempts = 0
-      sendRequest.mockImplementation(async (method) => {
-        if (method === 'agentSession.send') {
-          attempts += 1
-          if (attempts === 1) {
-            throw markRpcDeliveryUnknown(new Error('Connection closed'))
-          }
-          // An auth refusal says nothing about whether the first attempt was delivered.
-          return {
-            id: 'request-1',
-            ok: false,
-            error: { code: 'unauthorized', message: 'Pairing revoked' }
-          }
-        }
-        return method === 'agentSession.options' ? ok({ models: [], current: {} }) : ok({})
-      })
-      await mountSession(CAPABLE)
-      await act(async () => {
-        expect(await hook!.sendWithOutcome('in doubt')).toBe('unknown')
-      })
-      await act(async () => {
-        expect(await hook!.sendWithOutcome('in doubt')).toBe('rejected')
-      })
-      await act(async () => {
-        await hook!.sendWithOutcome('in doubt')
-      })
-      const first = requestOf('agentSession.send', 0)
-      expect(requestOf('agentSession.send', 2).envelope.clientOperationId).toBe(
-        first.envelope.clientOperationId
-      )
+      expect(first.params.delivery).toBe('queue-if-active')
+      expect('delivery' in second.params).toBe(false)
+      expect(second.envelope.clientOperationId).not.toBe(first.envelope.clientOperationId)
     })
   })
 
-  it('an ack-lost send is spent once the host publishes it as a draft, even one later withdrawn', async () => {
-    const journalKey = 'orca:mobileStructuredSendOperations:v1'
+  it('an ack-lost queued send never absorbs the next identical message', async () => {
     let attempts = 0
-    sendRequest.mockImplementation(async (method) => {
-      if (method === 'agentSession.send') {
-        attempts += 1
-        if (attempts === 1) {
-          throw markRpcDeliveryUnknown(new Error('Connection closed'))
-        }
-        return mutationOk({
-          clientMessageId: `client-${attempts}`,
-          queued: { messageId: `client-${attempts}`, position: 1, state: 'waiting' }
-        })
+    sendRequest.mockImplementation(async (method, params) => {
+      if (method !== 'agentSession.send') {
+        return ok({ models: [], current: {} })
       }
-      return method === 'agentSession.options' ? ok({ models: [], current: {} }) : ok({})
+      if (++attempts === 1) {
+        throw markRpcDeliveryUnknown(new Error('Connection closed'))
+      }
+      const id = String(fieldsOf(fieldsOf(params).envelope).clientOperationId)
+      return mutationOk({
+        clientMessageId: id,
+        queued: { messageId: id, position: 1, state: 'waiting' }
+      })
     })
     await mountSession(CAPABLE, snapshotEvent({ runningTurn: true }))
     await act(async () => {
       expect(await hook!.sendWithOutcome('held')).toBe('unknown')
     })
-    const operationId = String(requestOf('agentSession.send').envelope.clientOperationId)
-    expect(stored.get(journalKey)).toContain(operationId)
-    // Someone else's draft proves nothing about this send.
-    act(() => listener?.(batchEvent([queuedDraft({ messageId: 'other-device' })])))
-    await act(async () => {})
-    expect(stored.get(journalKey)).toContain(operationId)
-    // The host names the draft by this send's operation id: that is its receipt.
-    act(() => listener?.(batchEvent([queuedDraft({ messageId: operationId })])))
-    await vi.waitFor(() => expect(stored.has(journalKey)).toBe(false))
-    // Deleted elsewhere: no submission will ever settle it, and nothing has to.
-    act(() => listener?.(batchEvent(null)))
+    const firstId = String(requestOf('agentSession.send').envelope.clientOperationId)
+    act(() => listener?.(batchEvent([queuedDraft({ messageId: firstId })])))
     await act(async () => {
       expect(await hook!.sendWithOutcome('held')).toBe('queued')
     })
-    expect(requestOf('agentSession.send', 1).envelope.clientOperationId).not.toBe(operationId)
-  })
-
-  it('an identical send whose retained id replays as withdrawn goes out fresh', async () => {
-    let attempts = 0
-    sendRequest.mockImplementation(async (method) => {
-      if (method === 'agentSession.send') {
-        attempts += 1
-        if (attempts === 1) {
-          throw markRpcDeliveryUnknown(new Error('Connection closed'))
-        }
-        const state = attempts === 2 ? 'withdrawn' : 'waiting'
-        // A pruned deleted card's receipt names no place in the queue: position 0.
-        return mutationOk({
-          clientMessageId: `client-${attempts}`,
-          queued: {
-            messageId: `client-${attempts}`,
-            position: state === 'withdrawn' ? 0 : 1,
-            state
-          }
-        })
-      }
-      return method === 'agentSession.options' ? ok({ models: [], current: {} }) : ok({})
-    })
-    await mountSession(CAPABLE)
-    await act(async () => {
-      expect(await hook!.sendWithOutcome('again')).toBe('unknown')
-    })
-    // A Delete spent the ack-lost draft before it reached the agent; typing the
-    // same words again is a new message, not a replay to swallow.
-    await act(async () => {
-      expect(await hook!.sendWithOutcome('again')).toBe('queued')
-    })
-    expect(attempts).toBe(3)
-    const ids = [0, 1, 2].map(
-      (index) => requestOf('agentSession.send', index).envelope.clientOperationId
-    )
-    expect(ids[1]).toBe(ids[0])
-    expect(ids[2]).not.toBe(ids[0])
-  })
-
-  it('a withdrawn replay whose record storage will not clear still goes out fresh, and says so', async () => {
-    let attempts = 0
-    sendRequest.mockImplementation(async (method) => {
-      if (method === 'agentSession.send') {
-        attempts += 1
-        if (attempts === 1) {
-          throw markRpcDeliveryUnknown(new Error('Connection closed'))
-        }
-        const state = attempts === 2 ? 'withdrawn' : 'waiting'
-        return mutationOk({
-          clientMessageId: `client-${attempts}`,
-          queued: { messageId: `client-${attempts}`, position: 1, state }
-        })
-      }
-      return method === 'agentSession.options' ? ok({ models: [], current: {} }) : ok({})
-    })
-    await mountSession(CAPABLE)
-    await act(async () => {
-      expect(await hook!.sendWithOutcome('again')).toBe('unknown')
-    })
-    // The retained record cannot be cleared; that must not keep this text from being sent.
-    asyncStorage.setItem.mockRejectedValue(new Error('disk full'))
-    asyncStorage.removeItem.mockRejectedValue(new Error('disk full'))
-    await act(async () => {
-      expect(await hook!.sendWithOutcome('again')).toBe('queued')
-    })
-    expect(attempts).toBe(3)
-    const ids = [0, 1, 2].map(
-      (index) => requestOf('agentSession.send', index).envelope.clientOperationId
-    )
-    expect(ids[1]).toBe(ids[0])
-    expect(ids[2]).not.toBe(ids[0])
-    expect(onSendError).toHaveBeenCalledWith(
-      "Sent, but this phone couldn't update its record of sent messages."
-    )
-  })
-
-  describe('a lost answer, then Stop, then the drain under a fresh id', () => {
-    const journalKey = 'orca:mobileStructuredSendOperations:v1'
-    let attempts = 0
-    let lostId = ''
-
-    beforeEach(() => {
-      attempts = 0
-      lostId = ''
-      sendRequest.mockImplementation(async (method, params) => {
-        if (method === 'agentSession.send') {
-          attempts += 1
-          const id = String(fieldsOf(fieldsOf(params).envelope).clientOperationId)
-          if (attempts === 1) {
-            lostId = id
-            throw markRpcDeliveryUnknown(new Error('Connection closed'))
-          }
-          if (id === lostId) {
-            // The replay answers with the hand-off, which names the replayed id as its draft.
-            return mutationOk({
-              clientMessageId: id,
-              submission: acceptedSubmission('fresh-hand-off', id)
-            })
-          }
-          return mutationOk({
-            clientMessageId: id,
-            queued: { messageId: id, position: 1, state: 'waiting' }
-          })
-        }
-        return method === 'agentSession.options' ? ok({ models: [], current: {} }) : ok({})
-      })
-    })
-
-    it('spends the record once the stream carries the hand-off naming it; a direct send does not', async () => {
-      await mountSession(CAPABLE)
-      await act(async () => {
-        expect(await hook!.sendWithOutcome('again')).toBe('unknown')
-      })
-      expect(stored.get(journalKey)).toContain(lostId)
-      // A direct send's submission names no draft, so it settles nothing here.
-      act(() => listener?.(batchEvent(undefined, [acceptedSubmission('someone-else')])))
-      await act(async () => {})
-      expect(stored.get(journalKey)).toContain(lostId)
-      // The drain's hand-off went out under a fresh id and names the lost send's draft.
-      act(() => listener?.(batchEvent(undefined, [acceptedSubmission('fresh-hand-off', lostId)])))
-      await vi.waitFor(() => expect(stored.has(journalKey)).toBe(false))
-      await act(async () => {
-        expect(await hook!.sendWithOutcome('again')).toBe('queued')
-      })
-      expect(attempts).toBe(2)
-      expect(requestOf('agentSession.send', 1).envelope.clientOperationId).not.toBe(lostId)
-    })
-
-    it('spends the record from a replay answered by the hand-off, which no page carries', async () => {
-      await mountSession(CAPABLE)
-      await act(async () => {
-        expect(await hook!.sendWithOutcome('again')).toBe('unknown')
-      })
-      // The host holds that message now; the phone paints no bubble for it. The stream never
-      // carries the hand-off, so the answer's link is what spends the record.
-      await act(async () => {
-        expect(await hook!.sendWithOutcome('again')).toBe('unknown')
-      })
-      expect(requestOf('agentSession.send', 1).envelope.clientOperationId).toBe(lostId)
-      await vi.waitFor(() => expect(stored.has(journalKey)).toBe(false))
-      await act(async () => {
-        expect(await hook!.sendWithOutcome('again')).toBe('queued')
-      })
-      expect(requestOf('agentSession.send', 2).envelope.clientOperationId).not.toBe(lostId)
-    })
+    expect(attempts).toBe(2)
+    expect(requestOf('agentSession.send', 1).envelope.clientOperationId).not.toBe(firstId)
   })
 
   describe('cards from the published list', () => {
@@ -577,21 +317,20 @@ describe('mobile structured queued messages', () => {
         listener?.(
           batchEvent(
             [
-              queuedDraft({ messageId: 'kept-1', paused: true, pausedReason: 'kept' }),
+              queuedDraft({ messageId: 'kept-1' }),
               queuedDraft({ messageId: 'behind', position: 2 })
             ],
             [],
-            // This host publishes no restart pause; a Stop's stands in for any queue-wide one.
-            { reason: 'stopped' }
+            null
           )
         )
       )
+      // Plain waiting cards: the host holds them until the chat's next turn, and shows no row.
       expect(hook!.queued.cards.map(({ messageId, caption }) => ({ messageId, caption }))).toEqual([
-        { messageId: 'kept-1', caption: 'Not sent yet — tap Send to send it' },
+        { messageId: 'kept-1', caption: null },
         { messageId: 'behind', caption: null }
       ])
-      // The kept card is held on its own, so Resume would send the card behind it.
-      expect(hook!.queued.pause).toEqual({ reason: 'stopped' })
+      expect(hook!.queued.pause).toBeNull()
     })
   })
 
diff --git a/mobile/src/session/use-mobile-structured-agent-session-read-failure.test.tsx b/mobile/src/session/use-mobile-structured-agent-session-read-failure.test.tsx
index 0c1c1a7f7115..a59a5f699276 100644
--- a/mobile/src/session/use-mobile-structured-agent-session-read-failure.test.tsx
+++ b/mobile/src/session/use-mobile-structured-agent-session-read-failure.test.tsx
@@ -5,7 +5,6 @@ import { createElement } from 'react'
 import { act, create, type ReactTestRenderer } from 'react-test-renderer'
 import { afterEach, beforeEach, expect, it, vi } from 'vitest'
 import type { RpcClient } from '../transport/rpc-client'
-import { resetMobileStructuredSendOperationJournalForTests } from './mobile-structured-send-operation-journal'
 import { useMobileStructuredAgentSession } from './use-mobile-structured-agent-session'
 import { CAPABLE, SESSION_ID, ok } from './use-mobile-structured-agent-session-queued.test-fixture'
 
@@ -72,7 +71,7 @@ async function readFailedWith(reason: string) {
 
 beforeEach(() => {
   vi.clearAllMocks()
-  resetMobileStructuredSendOperationJournalForTests()
+
   sendRequest.mockImplementation(async (method) =>
     method === 'agentSession.options' ? ok({ models: [], current: {} }) : ok({})
   )
diff --git a/mobile/src/session/use-mobile-structured-agent-session-send.test.tsx b/mobile/src/session/use-mobile-structured-agent-session-send.test.tsx
index 4fa1d5bd13c0..3a6c351c6302 100644
--- a/mobile/src/session/use-mobile-structured-agent-session-send.test.tsx
+++ b/mobile/src/session/use-mobile-structured-agent-session-send.test.tsx
@@ -5,8 +5,8 @@ import type { AgentJournalDispatchState } from '../../../src/shared/agent-sessio
 import { DISPATCH_REJECTED_CANCELLED } from '../../../src/shared/structured-agent-session-dispatch-rejection'
 import type { AgentSessionSubscribeEvent } from '../../../src/shared/agent-session-wire'
 import type { RpcClient } from '../transport/rpc-client'
+import { fieldsOf, ok } from './use-mobile-structured-agent-session-queued.test-fixture'
 import { markRpcDeliveryUnknown } from '../transport/rpc-delivery-ambiguity'
-import { resetMobileStructuredSendOperationJournalForTests } from './mobile-structured-send-operation-journal'
 import { structuredSendResultFixture } from './structured-agent-send-result.test-fixture'
 import { useMobileStructuredAgentSession } from './use-mobile-structured-agent-session'
 
@@ -18,10 +18,6 @@ const asyncStorage = vi.hoisted(() => ({
 
 vi.mock('@react-native-async-storage/async-storage', () => ({ default: asyncStorage }))
 
-function ok(result: unknown) {
-  return { ok: true, result, _meta: { runtimeId: 'runtime-1' } }
-}
-
 function sendResult(dispatchState: AgentJournalDispatchState, reason: string | null = null) {
   return ok({
     ok: true,
@@ -32,7 +28,7 @@ function sendResult(dispatchState: AgentJournalDispatchState, reason: string | n
   })
 }
 
-function snapshotEvent(): AgentSessionSubscribeEvent {
+function snapshotEvent(): Extract<AgentSessionSubscribeEvent, { type: 'snapshot' }> {
   return {
     type: 'snapshot',
     sessionId: 'session-1',
@@ -57,18 +53,28 @@ function snapshotEvent(): AgentSessionSubscribeEvent {
   }
 }
 
-describe('mobile structured send retries', () => {
+describe('mobile structured send actions', () => {
   let renderer: ReactTestRenderer | null = null
   let hook: ReturnType<typeof useMobileStructuredAgentSession> | null = null
   let listener: ((value: unknown) => void) | null = null
   let storedOperations: Map<string, string>
   const onSendError = vi.fn()
-  const sendRequest = vi.fn()
-  const subscribe = vi.fn((_method: string, _params: unknown, onData: (value: unknown) => void) => {
+  const sendRequest = vi.fn<RpcClient['sendRequest']>()
+  const subscribe = vi.fn<RpcClient['subscribe']>((_method, _params, onData) => {
     listener = onData
     return vi.fn()
   })
-  const client = { sendRequest, subscribe } as unknown as RpcClient
+  const client: RpcClient = {
+    sendRequest,
+    subscribe,
+    updateTerminalSubscriptionViewport: () => {},
+    getState: () => 'connected',
+    getReconnectAttempt: () => 0,
+    getLastConnectedAt: () => null,
+    onStateChange: () => () => {},
+    notifyForeground: () => {},
+    close: () => {}
+  }
 
   function Harness(): null {
     hook = useMobileStructuredAgentSession({
@@ -78,8 +84,9 @@ describe('mobile structured send retries', () => {
       enabled: true,
       connected: true,
       agent: 'codex',
+      hostSupport: null,
       onSendError
-    } as never)
+    })
     return null
   }
 
@@ -96,15 +103,14 @@ describe('mobile structured send retries', () => {
   }
 
   function sentIds(): string[] {
-    return calls().map(
-      ([, params]) =>
-        (params as { envelope: { clientOperationId: string } }).envelope.clientOperationId
+    return calls().map(([, params]) =>
+      String(fieldsOf(fieldsOf(params).envelope).clientOperationId)
     )
   }
 
   beforeEach(() => {
     vi.clearAllMocks()
-    resetMobileStructuredSendOperationJournalForTests()
+
     storedOperations = new Map()
     asyncStorage.getItem.mockImplementation(
       async (key: string) => storedOperations.get(key) ?? null
@@ -127,137 +133,59 @@ describe('mobile structured send retries', () => {
     listener = null
   })
 
-  it('keeps one id across acknowledgement loss and host unknown replays', async () => {
-    let attempts = 0
-    sendRequest.mockImplementation(async (method) => {
-      if (method !== 'agentSession.send') {
-        return method === 'agentSession.options' ? ok({ models: [], current: {} }) : ok({})
-      }
-      attempts += 1
-      if (attempts === 1) {
-        throw markRpcDeliveryUnknown(new Error('Connection closed'))
-      }
-      return sendResult('unknown')
-    })
-    await mountSession()
-
-    await act(async () => {
-      expect(await hook!.sendWithOutcome('retry me')).toBe('unknown')
-      expect(await hook!.sendWithOutcome('retry me')).toBe('unknown')
-      expect(await hook!.sendWithOutcome('retry me')).toBe('unknown')
-    })
-
-    expect(calls()).toHaveLength(3)
-    expect(new Set(sentIds()).size).toBe(1)
-    expect(calls().every(([, params]) => !('retryUnknown' in (params as object)))).toBe(true)
-  })
+  it.each(['unknown', 'pending', 'accepted'] as const)(
+    'a later Send owns a new id even when the earlier host answer was %s',
+    async (state) => {
+      sendRequest.mockImplementation(async (method) =>
+        method === 'agentSession.send' ? sendResult(state) : ok({ models: [], current: {} })
+      )
+      await mountSession()
+      await act(async () => {
+        const outcome = state === 'unknown' ? 'unknown' : 'accepted'
+        expect(await hook!.sendWithOutcome('same text')).toBe(outcome)
+        expect(await hook!.sendWithOutcome('same text')).toBe(outcome)
+      })
+      expect(new Set(sentIds()).size).toBe(2)
+    }
+  )
 
-  // A replay of a retained id cannot be told from a new send of the same text, and a Stop took the
-  // first one back before the agent started it, so this press goes out as a new message.
-  it('sends a replay a Stop took back once more, under a fresh id, saying nothing', async () => {
-    let attempts = 0
-    sendRequest.mockImplementation(async (method) => {
-      if (method !== 'agentSession.send') {
-        return method === 'agentSession.options' ? ok({ models: [], current: {} }) : ok({})
-      }
-      attempts += 1
-      if (attempts === 1) {
-        throw markRpcDeliveryUnknown(new Error('Connection closed'))
+  it('keeps the original unknown host row while allowing another Send', async () => {
+    const original = structuredSendResultFixture('unknown')
+    if (!('submission' in original)) {
+      throw new Error('expected a submission answer')
+    }
+    const event = snapshotEvent()
+    event.page.submissions = [original.submission]
+    event.page.items = [
+      {
+        itemId: 'original-message',
+        revision: 1,
+        sequence: 1,
+        observedAt: 10,
+        body: { kind: 'message', role: 'user', blocks: [{ type: 'text', text: 'same text' }] }
       }
-      return attempts === 2
-        ? sendResult('rejected', DISPATCH_REJECTED_CANCELLED)
-        : sendResult('pending')
-    })
-    await mountSession()
-
-    await act(async () => {
-      expect(await hook!.sendWithOutcome('stopped one')).toBe('unknown')
-      expect(await hook!.sendWithOutcome('stopped one')).toBe('accepted')
-    })
-
-    expect(onSendError).not.toHaveBeenCalled()
-    // The lost first send, its replay, and exactly one resend under a new id.
-    const ids = sentIds()
-    expect(ids).toHaveLength(3)
-    expect(ids[1]).toBe(ids[0])
-    expect(ids[2]).not.toBe(ids[0])
-  })
-
-  it('reads a first answer a Stop took back as sent, saying nothing, and spends its id', async () => {
+    ]
     sendRequest.mockImplementation(async (method) =>
-      method === 'agentSession.send'
-        ? sendResult('rejected', DISPATCH_REJECTED_CANCELLED)
-        : method === 'agentSession.options'
-          ? ok({ models: [], current: {} })
-          : ok({})
+      method === 'agentSession.send' ? sendResult('accepted') : ok({ models: [], current: {} })
     )
     await mountSession()
-
+    act(() => listener?.(event))
+    const messages = hook!.session.messages
+    expect(messages).toHaveLength(1)
     await act(async () => {
-      expect(await hook!.sendWithOutcome('stopped first')).toBe('accepted')
-      expect(await hook!.sendWithOutcome('stopped first')).toBe('accepted')
+      expect(await hook!.sendWithOutcome('same text')).toBe('accepted')
     })
-
-    expect(onSendError).not.toHaveBeenCalled()
-    const ids = sentIds()
-    expect(ids).toHaveLength(2)
-    expect(ids[1]).not.toBe(ids[0])
+    expect(hook!.session.messages).toEqual(messages)
+    expect(event.page.submissions[0]?.dispatchState).toBe('unknown')
+    expect(calls()).toHaveLength(1)
   })
 
-  it('releases an ack-lost id after the journal accepts it for a later identical intent', async () => {
-    let attempts = 0
+  it('does not replay an old action after remount', async () => {
     sendRequest.mockImplementation(async (method) => {
-      if (method !== 'agentSession.send') {
-        return method === 'agentSession.options' ? ok({ models: [], current: {} }) : ok({})
-      }
-      attempts += 1
-      return attempts === 1
-        ? Promise.reject(markRpcDeliveryUnknown(new Error('Connection closed')))
-        : sendResult('accepted')
-    })
-    await mountSession()
-    await act(async () => {
-      expect(await hook!.sendWithOutcome('same text, later intent')).toBe('unknown')
-    })
-    const firstRequest = calls()[0]![1] as {
-      envelope: { clientOperationId: string; payloadFingerprint: string }
-    }
-    const event = snapshotEvent()
-    act(() =>
-      listener?.({
-        ...event,
-        page: {
-          ...event.page,
-          submissions: [
-            {
-              ...structuredSendResultFixture('accepted').submission,
-              clientMessageId: firstRequest.envelope.clientOperationId,
-              payloadFingerprint: firstRequest.envelope.payloadFingerprint
-            }
-          ]
-        }
-      })
-    )
-    await vi.waitFor(() => expect(storedOperations.size).toBe(0))
-
-    await act(async () => {
-      expect(await hook!.sendWithOutcome('same text, later intent')).toBe('accepted')
-    })
-
-    expect(sentIds()).toHaveLength(2)
-    expect(new Set(sentIds()).size).toBe(2)
-  })
-
-  it('reuses an ambiguous id after the session hook remounts', async () => {
-    let attempts = 0
-    sendRequest.mockImplementation(async (method) => {
-      if (method !== 'agentSession.send') {
-        return method === 'agentSession.options' ? ok({ models: [], current: {} }) : ok({})
+      if (method === 'agentSession.send') {
+        throw markRpcDeliveryUnknown(new Error('Connection closed'))
       }
-      attempts += 1
-      return attempts === 1
-        ? Promise.reject(markRpcDeliveryUnknown(new Error('Connection closed')))
-        : sendResult('unknown')
+      return ok({ models: [], current: {} })
     })
     await mountSession()
     await act(async () => {
@@ -265,131 +193,87 @@ describe('mobile structured send retries', () => {
     })
     act(() => renderer?.unmount())
     renderer = null
-    hook = null
     listener = null
-
     await mountSession()
     await act(async () => {
       expect(await hook!.sendWithOutcome('survive remount')).toBe('unknown')
     })
-
-    expect(new Set(sentIds()).size).toBe(1)
-    expect(calls().every(([, params]) => !('retryUnknown' in (params as object)))).toBe(true)
-    expect(asyncStorage.setItem.mock.invocationCallOrder[0]).toBeLessThan(
-      sendRequest.mock.invocationCallOrder.find(
-        (_, index) => sendRequest.mock.calls[index]?.[0] === 'agentSession.send'
-      )!
-    )
+    expect(new Set(sentIds()).size).toBe(2)
   })
 
-  it('keeps the id when the host fails after provider dispatch', async () => {
-    let attempts = 0
-    sendRequest.mockImplementation(async (method) => {
-      if (method !== 'agentSession.send') {
-        return method === 'agentSession.options' ? ok({ models: [], current: {} }) : ok({})
-      }
-      attempts += 1
-      return attempts === 1
-        ? {
-            id: 'request-1',
-            ok: false as const,
-            error: { code: 'runtime_error', message: 'journal resolve failed' },
-            _meta: { runtimeId: 'runtime-1' }
-          }
-        : sendResult('unknown')
-    })
+  it('uses newly uploaded attachment paths for a new action with the same image', async () => {
+    sendRequest.mockImplementation(async (method) =>
+      method === 'agentSession.send' ? sendResult('unknown') : ok({ models: [], current: {} })
+    )
     await mountSession()
-
     await act(async () => {
-      expect(await hook!.sendWithOutcome('possibly delivered')).toBe('unknown')
-      expect(await hook!.sendWithOutcome('possibly delivered')).toBe('unknown')
-    })
-
-    expect(calls()).toHaveLength(2)
-    expect(new Set(sentIds()).size).toBe(1)
-    expect(calls().every(([, params]) => !('retryUnknown' in (params as object)))).toBe(true)
-  })
-
-  it('reuses the original uploaded attachment identity after acknowledgement loss', async () => {
-    let attempts = 0
-    sendRequest.mockImplementation(async (method) => {
-      if (method !== 'agentSession.send') {
-        return method === 'agentSession.options' ? ok({ models: [], current: {} }) : ok({})
+      for (const path of ['/tmp/original.png', '/tmp/reuploaded.png']) {
+        expect(
+          await hook!.sendWithOutcome('describe', undefined, undefined, [
+            {
+              path,
+              previewUri: 'file:///photo.jpg'
+            }
+          ])
+        ).toBe('unknown')
       }
-      attempts += 1
-      return attempts === 1
-        ? Promise.reject(markRpcDeliveryUnknown(new Error('Connection closed')))
-        : sendResult('unknown')
-    })
-    await mountSession()
-    const contentFingerprint = 'f'.repeat(64)
-
-    await act(async () => {
-      expect(
-        await hook!.sendWithOutcome('describe', undefined, undefined, [
-          {
-            path: '/tmp/original.png',
-            previewUri: 'file:///photo.jpg',
-            contentFingerprint
-          }
-        ])
-      ).toBe('unknown')
-      expect(
-        await hook!.sendWithOutcome('describe', undefined, undefined, [
-          {
-            path: '/tmp/reuploaded.png',
-            previewUri: 'file:///photo.jpg',
-            contentFingerprint
-          }
-        ])
-      ).toBe('unknown')
     })
-
-    expect(new Set(sentIds()).size).toBe(1)
+    expect(new Set(sentIds()).size).toBe(2)
     expect(calls()[1]?.[1]).toMatchObject({
       body: {
-        blocks: expect.arrayContaining([{ type: 'image-ref', path: '/tmp/original.png' }])
+        blocks: expect.arrayContaining([{ type: 'image-ref', path: '/tmp/reuploaded.png' }])
       }
     })
   })
 
+  it('reports a send stopped before the agent started it without sending it twice', async () => {
+    sendRequest.mockImplementation(async (method) =>
+      method === 'agentSession.send'
+        ? sendResult('rejected', DISPATCH_REJECTED_CANCELLED)
+        : ok({ models: [], current: {} })
+    )
+    await mountSession()
+    await act(async () => {
+      expect(await hook!.sendWithOutcome('stopped')).toBe('accepted')
+      expect(await hook!.sendWithOutcome('stopped')).toBe('accepted')
+    })
+    expect(calls()).toHaveLength(2)
+    expect(new Set(sentIds()).size).toBe(2)
+    expect(onSendError).not.toHaveBeenCalled()
+  })
+
   it.each(['invalid_argument', 'unauthorized'])(
-    'rotates after a %s pre-handler RPC refusal that proves the send did not run',
+    'a later Send is independent after a %s refusal',
     async (code) => {
       let attempts = 0
       sendRequest.mockImplementation(async (method) => {
         if (method !== 'agentSession.send') {
-          return method === 'agentSession.options' ? ok({ models: [], current: {} }) : ok({})
+          return ok({ models: [], current: {} })
         }
-        attempts += 1
-        return attempts === 1
+        return ++attempts === 1
           ? {
+              id: 'request-1',
               ok: false as const,
-              error: { code, message: 'Message is not authorized' },
-              _meta: { runtimeId: 'runtime-1' }
+              error: { code, message: 'Message is not authorized' }
             }
           : sendResult('accepted')
       })
       await mountSession()
-
       await act(async () => {
-        expect(await hook!.sendWithOutcome('never reached the handler')).toBe('rejected')
-        expect(await hook!.sendWithOutcome('never reached the handler')).toBe('accepted')
+        expect(await hook!.sendWithOutcome('again')).toBe('rejected')
+        expect(await hook!.sendWithOutcome('again')).toBe('accepted')
       })
-
-      expect(sentIds()).toHaveLength(2)
       expect(new Set(sentIds()).size).toBe(2)
     }
   )
 
-  it('keeps the send id after a pending-admission refusal', async () => {
+  it('a new Send goes through after a stale-fence refusal', async () => {
     let attempts = 0
     sendRequest.mockImplementation(async (method) => {
       if (method !== 'agentSession.send') {
-        return method === 'agentSession.options' ? ok({ models: [], current: {} }) : ok({})
+        return ok({ models: [], current: {} })
       }
-      attempts += 1
-      return attempts === 1
+      return ++attempts === 1
         ? ok({
             ok: false,
             refusal: {
@@ -401,112 +285,33 @@ describe('mobile structured send retries', () => {
         : sendResult('accepted')
     })
     await mountSession()
-
-    await act(async () => {
-      expect(await hook!.sendWithOutcome('retry at the current fence')).toBe('rejected')
-      expect(await hook!.sendWithOutcome('retry at the current fence')).toBe('unknown')
-    })
-
-    expect(sentIds()).toHaveLength(2)
-    expect(new Set(sentIds()).size).toBe(1)
-  })
-
-  it('keeps the id when an older host refuses an unknown replay', async () => {
-    let attempts = 0
-    sendRequest.mockImplementation(async (method) => {
-      if (method !== 'agentSession.send') {
-        return method === 'agentSession.options' ? ok({ models: [], current: {} }) : ok({})
-      }
-      attempts += 1
-      if (attempts === 1) {
-        throw markRpcDeliveryUnknown(new Error('Connection closed'))
-      }
-      return attempts === 2
-        ? ok({
-            ok: false,
-            refusal: {
-              code: 'agent_session_operation_unknown',
-              message: 'The outcome is unknown.'
-            }
-          })
-        : sendResult('unknown')
-    })
-    await mountSession()
-
     await act(async () => {
-      expect(await hook!.sendWithOutcome('old host replay')).toBe('unknown')
-      expect(await hook!.sendWithOutcome('old host replay')).toBe('unknown')
-      expect(await hook!.sendWithOutcome('old host replay')).toBe('unknown')
+      expect(await hook!.sendWithOutcome('again')).toBe('rejected')
+      expect(await hook!.sendWithOutcome('again')).toBe('accepted')
     })
-
-    expect(new Set(sentIds()).size).toBe(1)
-    expect(calls().every(([, params]) => !('retryUnknown' in (params as object)))).toBe(true)
+    expect(new Set(sentIds()).size).toBe(2)
   })
 
-  it('sends under a new id once the host has expired an ambiguous one', async () => {
-    let attempts = 0
-    sendRequest.mockImplementation(async (method) => {
-      if (method !== 'agentSession.send') {
-        return method === 'agentSession.options' ? ok({ models: [], current: {} }) : ok({})
-      }
-      attempts += 1
-      if (attempts === 1) {
-        throw markRpcDeliveryUnknown(new Error('Connection closed'))
-      }
-      if (attempts === 3) {
-        return sendResult('accepted')
-      }
-      return ok({
-        ok: false,
-        refusal: {
-          code: 'agent_session_operation_expired',
-          message: 'Operation expired.'
-        }
-      })
-    })
-    await mountSession()
-
-    await act(async () => {
-      expect(await hook!.sendWithOutcome('old ambiguity')).toBe('unknown')
-      expect(await hook!.sendWithOutcome('old ambiguity')).toBe('rejected')
-      expect(await hook!.sendWithOutcome('old ambiguity')).toBe('accepted')
-    })
-
-    expect(calls()).toHaveLength(3)
-    const [first, replay, fresh] = sentIds()
-    expect(replay).toBe(first)
-    expect(fresh).not.toBe(first)
-    expect(onSendError).toHaveBeenCalledWith(
-      "Orca couldn't confirm your message reached the agent. Check the chat, then send it again if needed."
+  it('never reads an old phone journal, even when storage is full or unreadable', async () => {
+    asyncStorage.getItem.mockRejectedValue(new Error('unreadable old journal'))
+    asyncStorage.setItem.mockRejectedValue(new Error('disk full'))
+    sendRequest.mockImplementation(async (method) =>
+      method === 'agentSession.send' ? sendResult('accepted') : ok({ models: [], current: {} })
     )
-  })
-
-  it('does not retain an id when the action budget expires before dispatch', async () => {
     await mountSession()
-
     await act(async () => {
-      expect(await hook!.sendWithOutcome('never attempted', undefined, 0)).toBe('rejected')
+      expect(await hook!.sendWithOutcome('new action')).toBe('accepted')
     })
-
-    expect(calls()).toHaveLength(0)
+    expect(asyncStorage.getItem).not.toHaveBeenCalled()
     expect(asyncStorage.setItem).not.toHaveBeenCalled()
+    expect(onSendError).not.toHaveBeenCalled()
   })
 
-  it('puts a store that would not take the journal on screen, and sends nothing', async () => {
-    // Inside the page the store is the app's, reached over the `storage` grant, and it rejects a
-    // journal past `PAGE_STORAGE_MAX_VALUE_CHARS` — 48 unsettled sends, measured. A refusal that
-    // resolved instead would put a mutation on the wire carrying an operation id nothing holds,
-    // and a retry after a crash would send this message twice (rulings-ota-c7.md ruling 7).
-    asyncStorage.setItem.mockImplementation(async () => {
-      throw new Error('Orca could not save orca:mobileStructuredSendOperations:v1')
-    })
+  it('sends nothing once the action budget expires', async () => {
     await mountSession()
-
     await act(async () => {
-      expect(await hook!.sendWithOutcome('the journal will not take this')).toBe('rejected')
+      expect(await hook!.sendWithOutcome('never attempted', undefined, 0)).toBe('rejected')
     })
-
-    expect(onSendError).toHaveBeenCalledWith('Message not sent')
     expect(calls()).toHaveLength(0)
   })
 })
diff --git a/mobile/src/session/use-mobile-structured-agent-session.test.tsx b/mobile/src/session/use-mobile-structured-agent-session.test.tsx
index 04b8e87304a2..db9657a4dd8b 100644
--- a/mobile/src/session/use-mobile-structured-agent-session.test.tsx
+++ b/mobile/src/session/use-mobile-structured-agent-session.test.tsx
@@ -22,8 +22,6 @@ const asyncStorage = vi.hoisted(() => ({
 
 vi.mock('@react-native-async-storage/async-storage', () => ({ default: asyncStorage }))
 
-import { resetMobileStructuredSendOperationJournalForTests } from './mobile-structured-send-operation-journal'
-
 function ok(result: unknown) {
   return { ok: true, result, _meta: { runtimeId: 'runtime-1' } }
 }
@@ -271,7 +269,7 @@ describe('useMobileStructuredAgentSession', () => {
 
   beforeEach(() => {
     vi.clearAllMocks()
-    resetMobileStructuredSendOperationJournalForTests()
+
     storedOperations = new Map()
     asyncStorage.getItem.mockImplementation(
       async (key: string) => storedOperations.get(key) ?? null
diff --git a/mobile/src/session/use-mobile-structured-agent-session.ts b/mobile/src/session/use-mobile-structured-agent-session.ts
index 6bcc502aaf2b..b5f17dbbfa49 100644
--- a/mobile/src/session/use-mobile-structured-agent-session.ts
+++ b/mobile/src/session/use-mobile-structured-agent-session.ts
@@ -18,6 +18,7 @@ import {
   projectStructuredQuestion
 } from './mobile-structured-agent-prompts'
 import type { RpcClient } from '../transport/rpc-client'
+import type { MobileNativeChatVisualSource } from './mobile-native-chat-visual-read'
 import type { MobileChatPermission } from './mobile-native-chat-permission'
 import type { MobileChatQuestion } from './mobile-native-chat-question'
 import type { MobileNativeChatSession } from './use-mobile-native-chat-session'
@@ -29,7 +30,6 @@ import { useMobileStructuredPromptResponses } from './use-mobile-structured-prom
 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 { useMobileStructuredSendOperationReconciliation } from './use-mobile-structured-send-operation-reconciliation'
 import {
   pendingStructuredPromptIdentity,
   requestMobileStructuredAgentSessionCancel
@@ -45,6 +45,10 @@ import {
   useMobileStructuredQueuedMessageControls,
   type MobileStructuredQueuedMessageControls
 } from './use-mobile-structured-queued-message-controls'
+import {
+  useMobileStructuredBackgroundTasks,
+  type MobileStructuredBackgroundTasks
+} from './use-mobile-structured-background-tasks'
 
 type StructuredMobileSession = ReturnType<typeof useMobileStructuredAgentOptions> &
   ReturnType<typeof useMobileStructuredAgentTurnTiming> & {
@@ -67,6 +71,10 @@ type StructuredMobileSession = ReturnType<typeof useMobileStructuredAgentOptions
     cancelPrompt: (prompt?: { itemId: string; expectedRevision: number }) => Promise<boolean>
     /** The queued-draft cards and their actions, from any host that publishes them. */
     queued: MobileStructuredQueuedMessageControls
+    /** Running child work for the strip above the composer, as desktop shows it. */
+    backgroundTasks: MobileStructuredBackgroundTasks
+    /** Where this chat's `::orca-visual` lines read their HTML from; null without a client. */
+    visualSource: MobileNativeChatVisualSource | null
   }
 
 export function useMobileStructuredAgentSession(args: {
@@ -74,10 +82,8 @@ export function useMobileStructuredAgentSession(args: {
   sessionId: string | null
   /** Host/workspace scope used to keep same provider ids isolated. */
   sourceIdentity?: string
-  /** Authenticated identity the host keys mutation admission under. */
-  callerIdentity?: string
   enabled: boolean
-  /** Live transport only; gates the connection-scoped hold, nothing else. */
+  /** Live transport only; gates the connection-scoped hold, and whether child rows may read live. */
   connected: boolean
   /** Capability facts from the shared runtime status probe; null follows the legacy wire. */
   hostSupport: StructuredAgentSessionHostSupport | null
@@ -91,7 +97,6 @@ export function useMobileStructuredAgentSession(args: {
   const {
     agent,
     appendComposerText,
-    callerIdentity = '',
     client,
     connected,
     sessionId,
@@ -112,7 +117,6 @@ export function useMobileStructuredAgentSession(args: {
   const stateArgs = { client, sessionId, sessionKey, enabled, connected }
   const { state, stateRef, queuedMessages, queuePause, loadingOlder, loadEarlier } =
     useMobileStructuredAgentState(stateArgs)
-  useMobileStructuredSendOperationReconciliation(state.submissions, queuedMessages)
 
   const mutate = useMobileStructuredAgentMutate({
     client,
@@ -145,10 +149,8 @@ export function useMobileStructuredAgentSession(args: {
 
   const sendWithOutcome = useMobileStructuredSendWithOutcome({
     agent,
-    callerIdentity,
     client,
     sessionId,
-    sessionKey,
     enabled,
     queueCapable,
     stateRef,
@@ -190,6 +192,13 @@ export function useMobileStructuredAgentSession(args: {
     selectStructuredAgentTurnActivity(state.items, turnId, state.activity)?.text ?? null
   const thinking = isStructuredAgentSessionThinking(state)
   const isWorking = isStructuredAgentSessionMainAgentWorking(turnId, state.submissions, state.fence)
+  const backgroundTasks = useMobileStructuredBackgroundTasks({
+    sessionKey,
+    state,
+    turnId,
+    connected,
+    mutate
+  })
   const hostStopping = useMobileStructuredSessionHostStopping({
     client,
     sessionId,
@@ -266,8 +275,14 @@ export function useMobileStructuredAgentSession(args: {
     ]
   )
 
+  const visualSource = useMemo<MobileNativeChatVisualSource | null>(
+    () => (client && sessionId ? { client, sessionId } : null),
+    [client, sessionId]
+  )
+
   return {
     ...options,
+    visualSource,
     session: {
       messages,
       status,
@@ -292,6 +307,7 @@ export function useMobileStructuredAgentSession(args: {
     question: projectStructuredQuestion(questionPrompt, groupedDraft),
     respondPermission,
     respondQuestion,
-    queued
+    queued,
+    backgroundTasks
   }
 }
diff --git a/mobile/src/session/use-mobile-structured-background-tasks.ts b/mobile/src/session/use-mobile-structured-background-tasks.ts
new file mode 100644
index 000000000000..5b32d82a7391
--- /dev/null
+++ b/mobile/src/session/use-mobile-structured-background-tasks.ts
@@ -0,0 +1,67 @@
+// The running child work a structured session's stream publishes, for the strip above the composer:
+// desktop's view of the same roster, the verdict its rows read, and the Stop that reaches them.
+
+import { useCallback, useMemo } from 'react'
+import type { AgentChildRowContext } from '../../../src/shared/agent-child-row-model'
+import { agentChildRowContextForSessionStream } from '../../../src/shared/agent-child-row-stream-context'
+import type { StructuredAgentSessionState } from '../../../src/shared/structured-agent-session-reducer'
+import {
+  structuredSessionBackgroundTasksView,
+  type StructuredSessionBackgroundTasksView
+} from '../../../src/shared/structured-session-background-tasks-view'
+import type { MobileStructuredAgentMutate } from './use-mobile-structured-agent-mutation'
+
+export type MobileStructuredBackgroundTasks = {
+  /** The conversation these tasks belong to; the strip's open and stopping state is kept per one. */
+  sessionKey: string
+  view: StructuredSessionBackgroundTasksView
+  /** The verdict every child row reads: unverifiable once this phone stops hearing the stream. Its
+   *  host clock offset also moves the rows' host-stamped clocks onto the phone's. */
+  rowContext: AgentChildRowContext
+  /** One child by its provider id, or, with none, every background task the host can stop. */
+  stop: (taskId?: string) => Promise<unknown>
+}
+
+/** Coarser than one frame's delivery latency, finer than any clock a row shows. */
+const OFFSET_GRAIN_MS = 1_000
+
+export function useMobileStructuredBackgroundTasks(args: {
+  sessionKey: string
+  state: StructuredAgentSessionState
+  turnId: string | null
+  /** Live transport; without it the kept roster is the last thing heard, not what runs now. */
+  connected: boolean
+  mutate: MobileStructuredAgentMutate
+}): MobileStructuredBackgroundTasks {
+  const { connected, mutate, sessionKey, state, turnId } = args
+  const view = useMemo(
+    () => structuredSessionBackgroundTasksView(state.backgroundTasks, turnId),
+    [state.backgroundTasks, turnId]
+  )
+  // A disconnected or failed stream keeps the last roster on screen; its live claims then stand
+  // for nothing, so they read unverifiable rather than working.
+  const streamLive = connected && state.status === 'ready'
+  // Re-derived from every frame's host sample, so a host restart or clock correction shows at once;
+  // rounded so a sample's own delivery jitter never rebuilds the rows (they memoize on the value).
+  const hostClock = state.hostClock
+  const offsetMs = hostClock
+    ? Math.round((hostClock.receivedAt - hostClock.hostNow) / OFFSET_GRAIN_MS) * OFFSET_GRAIN_MS
+    : 0
+  const rowContext = useMemo(
+    () => agentChildRowContextForSessionStream(streamLive, offsetMs),
+    [streamLive, offsetMs]
+  )
+  const stop = useCallback(
+    (taskId?: string) =>
+      mutate('agentSession.cancel', 'agentSession.cancel', {
+        turnId: 'background-tasks',
+        scope: 'background-tasks',
+        ...(taskId ? { taskId } : {})
+      }),
+    [mutate]
+  )
+  return useMemo(
+    () => ({ sessionKey, view, rowContext, stop }),
+    [sessionKey, view, rowContext, stop]
+  )
+}
diff --git a/mobile/src/session/use-mobile-structured-native-chat-send-bridge.ts b/mobile/src/session/use-mobile-structured-native-chat-send-bridge.ts
index 5abe42b39e60..274390eca6ba 100644
--- a/mobile/src/session/use-mobile-structured-native-chat-send-bridge.ts
+++ b/mobile/src/session/use-mobile-structured-native-chat-send-bridge.ts
@@ -8,7 +8,6 @@ type StructuredNativeChatAttachment = {
   id?: string
   path: string
   previewUri: string
-  contentFingerprint?: string
 }
 
 export function useMobileStructuredNativeChatSendBridge(args: {
diff --git a/mobile/src/session/use-mobile-structured-queued-message-controls.ts b/mobile/src/session/use-mobile-structured-queued-message-controls.ts
index f65ecf2d46e3..a786eeacbe09 100644
--- a/mobile/src/session/use-mobile-structured-queued-message-controls.ts
+++ b/mobile/src/session/use-mobile-structured-queued-message-controls.ts
@@ -1,8 +1,8 @@
 // The queued-draft surface the structured session exposes: cards derived from
 // the published list and the Send-now / Delete / Edit actions. Shown whatever
 // the queue capability says: a host that does not queue sends still publishes a
-// message it kept across a restart or a close, and only queueing a new send is
-// gated. A host older than the queue publishes no list, so shows no cards.
+// message it kept as a card across a restart or a close, and only queueing a new
+// send is gated. A host older than the queue publishes no list, so shows no cards.
 // Nothing here is durable: the host owns the queue, and the published list is
 // the only truth a card action ever needs.
 
diff --git a/mobile/src/session/use-mobile-structured-send-operation-reconciliation.ts b/mobile/src/session/use-mobile-structured-send-operation-reconciliation.ts
deleted file mode 100644
index 65d0f3184668..000000000000
--- a/mobile/src/session/use-mobile-structured-send-operation-reconciliation.ts
+++ /dev/null
@@ -1,24 +0,0 @@
-import { useEffect } from 'react'
-import type { AgentJournalSubmission } from '../../../src/shared/agent-session-journal-types'
-import type { MobileQueuedMessageFeed } from './mobile-structured-queued-message-feed'
-import {
-  clearMobileStructuredQueuedSendOperations,
-  clearMobileStructuredSettledSendOperations
-} from './mobile-structured-send-operation-journal'
-
-export function useMobileStructuredSendOperationReconciliation(
-  submissions: readonly AgentJournalSubmission[],
-  queuedMessages: MobileQueuedMessageFeed = null
-): void {
-  useEffect(() => {
-    void clearMobileStructuredSettledSendOperations({ submissions }).catch(() => undefined)
-  }, [submissions])
-  useEffect(() => {
-    if (!queuedMessages || queuedMessages.length === 0) {
-      return
-    }
-    void clearMobileStructuredQueuedSendOperations({
-      queuedMessageIds: queuedMessages.map((draft) => draft.messageId)
-    }).catch(() => undefined)
-  }, [queuedMessages])
-}
diff --git a/mobile/src/session/use-mobile-structured-send-with-outcome.ts b/mobile/src/session/use-mobile-structured-send-with-outcome.ts
index e1759ac4fca8..4a7b1e67470c 100644
--- a/mobile/src/session/use-mobile-structured-send-with-outcome.ts
+++ b/mobile/src/session/use-mobile-structured-send-with-outcome.ts
@@ -9,7 +9,7 @@ import { pendingPromptsAllUnanswerableHere } from '../../../src/shared/agent-ses
 import {
   structuredAgentSessionSendBody,
   type StructuredAgentSessionAttachment
-} from '../../../src/shared/structured-agent-session-outbox'
+} from '../../../src/shared/structured-agent-session-send-mutation'
 import type { StructuredAgentSessionComposerOptions } from '../../../src/shared/structured-agent-session-composer'
 import type { StructuredAgentSessionState } from '../../../src/shared/structured-agent-session-reducer'
 import type { RpcClient } from '../transport/rpc-client'
@@ -33,15 +33,12 @@ export function mobileStructuredSendQueues(
 
 export type StructuredMobileSendAttachment = StructuredAgentSessionAttachment & {
   id?: string
-  contentFingerprint?: string
 }
 
 export function useMobileStructuredSendWithOutcome(args: {
   agent: string | null
-  callerIdentity: string
   client: RpcClient | null
   sessionId: string | null
-  sessionKey: string
   enabled: boolean
   queueCapable: boolean
   stateRef: { readonly current: StructuredAgentSessionState }
@@ -59,7 +56,6 @@ export function useMobileStructuredSendWithOutcome(args: {
 ) => Promise<MobileNativeChatSendOutcome> {
   const {
     agent,
-    callerIdentity,
     client,
     commandPending,
     controller,
@@ -67,7 +63,6 @@ export function useMobileStructuredSendWithOutcome(args: {
     onSendError,
     queueCapable,
     sessionId,
-    sessionKey,
     stateRef
   } = args
   return useCallback(
@@ -121,8 +116,6 @@ export function useMobileStructuredSendWithOutcome(args: {
       return sendMobileStructuredAgentSessionMessage({
         client,
         sessionId,
-        sessionKey,
-        callerIdentity,
         expectedRuntimeFence: currentFence,
         text,
         attachments: sendAttachments,
@@ -135,7 +128,6 @@ export function useMobileStructuredSendWithOutcome(args: {
     },
     [
       agent,
-      callerIdentity,
       client,
       commandPending,
       controller,
@@ -143,7 +135,6 @@ export function useMobileStructuredSendWithOutcome(args: {
       onSendError,
       queueCapable,
       sessionId,
-      sessionKey,
       stateRef
     ]
   )
diff --git a/mobile/src/source-control/MobileSourceControlContent.test.tsx b/mobile/src/source-control/MobileSourceControlContent.test.tsx
new file mode 100644
index 000000000000..e04dc4c041af
--- /dev/null
+++ b/mobile/src/source-control/MobileSourceControlContent.test.tsx
@@ -0,0 +1,314 @@
+import { createElement, useState, type ReactElement } from 'react'
+import { act, create, type ReactTestRenderer } from 'react-test-renderer'
+import { afterEach, describe, expect, it, vi } from 'vitest'
+import { MobileSourceControlContent } from './MobileSourceControlContent'
+import * as branchFormat from './mobile-branch-entry-format'
+import type { MobileSourceControlState } from './use-mobile-source-control-state'
+
+vi.mock('react-native', () => ({
+  ActivityIndicator: 'ActivityIndicator',
+  Pressable: 'Pressable',
+  ScrollView: 'ScrollView',
+  SectionList: ({ ListFooterComponent }: { ListFooterComponent: ReactElement }) =>
+    createElement('SectionList', null, ListFooterComponent),
+  StyleSheet: { create: (styles: unknown) => styles, hairlineWidth: 1 },
+  Text: 'Text',
+  TextInput: 'TextInput',
+  View: 'View'
+}))
+vi.mock('expo-clipboard', () => ({ setStringAsync: async () => {} }))
+vi.mock('lucide-react-native', () => ({
+  ArrowDown: 'ArrowDown',
+  ArrowDownUp: 'ArrowDownUp',
+  ArrowUp: 'ArrowUp',
+  Check: 'Check',
+  ChevronRight: 'ChevronRight',
+  CloudUpload: 'CloudUpload',
+  FileText: 'FileText',
+  GitBranch: 'GitBranch',
+  GitPullRequestArrow: 'GitPullRequestArrow',
+  History: 'History',
+  Minus: 'Minus',
+  MoreHorizontal: 'MoreHorizontal',
+  Plus: 'Plus',
+  RefreshCw: 'RefreshCw',
+  Sparkles: 'Sparkles',
+  Trash2: 'Trash2'
+}))
+
+const noop = () => {}
+const unusedAsync = async (): Promise<never> => {
+  throw new Error('unused action')
+}
+
+function initialState(): MobileSourceControlState {
+  const branchEntries = Array.from({ length: 20 }, (_, index) => ({
+    path: `src/file-${index}.ts`,
+    status: 'modified' as const,
+    added: 3,
+    removed: 1,
+    canOpen: true
+  }))
+  const branchCompareResult = {
+    entries: branchEntries,
+    summary: {
+      status: 'ready' as const,
+      baseRef: 'main',
+      changedFiles: 20,
+      commitsAhead: undefined,
+      errorMessage: undefined
+    }
+  }
+  return {
+    client: null,
+    connState: 'connected',
+    forceReconnect: null,
+    insets: { top: 0, bottom: 0, left: 0, right: 0 },
+    router: {
+      back: noop,
+      push: noop,
+      replace: noop,
+      navigate: noop,
+      dismiss: noop,
+      dismissAll: noop,
+      dismissTo: noop,
+      prefetch: noop,
+      canGoBack: () => false,
+      canDismiss: () => false,
+      setParams: noop,
+      reload: noop
+    },
+    setRootRef: noop,
+    worktreeLabel: 'fixture',
+    screenState: { kind: 'loading' },
+    branchCompareState: { kind: 'ready', result: branchCompareResult },
+    branchDiffPreview: null,
+    setBranchDiffPreview: noop,
+    busyAction: null,
+    commitMessage: '',
+    setCommitMessage: noop,
+    generatingMessage: false,
+    showBranchPicker: false,
+    setShowBranchPicker: noop,
+    localBranches: null,
+    createdPrUrl: null,
+    setCreatedPrUrl: noop,
+    createdPrWarning: null,
+    setCreatedPrWarning: noop,
+    discardTarget: null,
+    setDiscardTarget: noop,
+    showActionSheet: false,
+    setShowActionSheet: noop,
+    actionError: null,
+    commitFailureRecovery: null,
+    commitFailureRecoveryAction: {
+      summary: null,
+      hasDetails: false,
+      launching: false,
+      availability: 'available',
+      launchError: null,
+      launchWarning: null,
+      launchSuccess: null,
+      undeliveredPrompt: null,
+      launch: unusedAsync
+    },
+    keyboardLift: 0,
+    openingPath: null,
+    openingBranchPath: null,
+    status: null,
+    sections: [],
+    branchCompareResult,
+    branchCompareSummaryText: '20 files vs main',
+    branchEntries,
+    shouldShowBranchCompareSection: true,
+    hasVisibleChanges: true,
+    stageablePaths: [],
+    unstageablePaths: [],
+    stagedCount: 1,
+    unstagedCount: 0,
+    branchLabel: 'fixture',
+    upstream: undefined,
+    upstreamKnown: false,
+    syncLabel: null,
+    primaryAction: {
+      kind: 'commit',
+      label: 'Commit',
+      accessibilityLabel: 'Commit',
+      accessibilityHint: '',
+      disabled: false,
+      loading: false,
+      onPress: noop
+    },
+    createPrAction: {
+      visible: false,
+      label: 'Create Pull Request',
+      disabled: true,
+      loading: false,
+      pushFirst: false,
+      onPress: noop
+    },
+    loadStatus: unusedAsync,
+    openFile: unusedAsync,
+    openBranchDiff: unusedAsync,
+    runGitAction: unusedAsync,
+    stageAll: unusedAsync,
+    unstageAll: unusedAsync,
+    commit: unusedAsync,
+    generateCommitMessage: unusedAsync,
+    cancelGenerateCommitMessage: noop,
+    createPr: unusedAsync,
+    openBranchPicker: noop,
+    openHistory: noop,
+    checkoutBranch: unusedAsync,
+    abortConflictOperation: unusedAsync,
+    runActionSheetCommit: unusedAsync,
+    runActionSheetCommitSequence: unusedAsync,
+    runActionSheetCommitSync: unusedAsync,
+    runActionSheetGitSequence: unusedAsync,
+    runActionSheetGitSync: unusedAsync,
+    runActionSheetRebase: unusedAsync
+  }
+}
+
+let renderer: ReactTestRenderer | null = null
+const controls: { patch: ((patch: Partial<MobileSourceControlState>) => void) | null } = {
+  patch: null
+}
+
+function Fixture({ initial }: { initial: MobileSourceControlState }) {
+  const [state, setState] = useState(initial)
+  controls.patch = (patch) => setState((previous) => ({ ...previous, ...patch }))
+  return createElement(MobileSourceControlContent, {
+    state: {
+      ...state,
+      setCommitMessage: (next) =>
+        setState((previous) => ({
+          ...previous,
+          commitMessage: typeof next === 'function' ? next(previous.commitMessage) : next
+        }))
+    }
+  })
+}
+
+function render(initial = initialState()) {
+  act(() => {
+    renderer = create(createElement(Fixture, { initial }))
+  })
+}
+function patch(values: Partial<MobileSourceControlState>) {
+  act(() => {
+    controls.patch?.(values)
+  })
+}
+function rows() {
+  return (
+    renderer?.root.findAll(
+      (node) =>
+        String(node.type) === 'Pressable' &&
+        typeof node.props.accessibilityLabel === 'string' &&
+        node.props.accessibilityLabel.startsWith('Open committed change')
+    ) ?? []
+  )
+}
+function text() {
+  return JSON.stringify(renderer?.toJSON())
+}
+
+afterEach(() => {
+  act(() => renderer?.unmount())
+  renderer = null
+  controls.patch = null
+  vi.restoreAllMocks()
+})
+
+describe('committed branch files during commit-message typing', () => {
+  it.each(['scroll', 'sections'])('keeps the footer without revisiting rows in %s', (layout) => {
+    const initial = initialState()
+    if (layout === 'sections') {
+      initial.sections = [{ area: 'staged', title: 'Staged Changes', data: [] }]
+    }
+    const format = vi.spyOn(branchFormat, 'formatMobileBranchEntryMeta')
+    render(initial)
+    expect(format).toHaveBeenCalledTimes(20)
+    format.mockClear()
+    for (let index = 0; index < 50; index++) {
+      act(() => {
+        const input = renderer?.root.find((node) => String(node.type) === 'TextInput')
+        if (typeof input?.props.onChangeText !== 'function') {
+          throw new Error('missing input handler')
+        }
+        input.props.onChangeText(`message ${index}`)
+      })
+    }
+    expect(renderer?.root.find((node) => String(node.type) === 'TextInput').props.value).toBe(
+      'message 49'
+    )
+    expect(rows()).toHaveLength(20)
+    expect(format).not.toHaveBeenCalled()
+  })
+
+  it('updates the footer when each of its inputs changes independently', () => {
+    const initial = initialState()
+    const format = vi.spyOn(branchFormat, 'formatMobileBranchEntryMeta')
+    render(initial)
+    patch({ branchCompareSummaryText: 'changed summary' })
+    expect(text()).toContain('changed summary')
+    const first = initial.branchEntries[0]
+    if (!first) {
+      throw new Error('missing fixture entry')
+    }
+    patch({ branchEntries: [{ ...first, path: 'changed.ts' }] })
+    expect(rows()).toHaveLength(1)
+    expect(text()).toContain('changed.ts')
+    patch({ busyAction: 'stage-all' })
+    expect(rows()[0]?.props.disabled).toBe(true)
+    patch({ busyAction: null })
+    expect(rows()[0]?.props.disabled).toBe(false)
+    patch({ openingPath: 'local.ts' })
+    expect(rows()[0]?.props.disabled).toBe(true)
+    patch({ openingPath: null })
+    patch({ openingBranchPath: 'changed.ts' })
+    expect(rows()[0]?.props.disabled).toBe(true)
+    expect(rows()[0]?.findAll((node) => String(node.type) === 'ActivityIndicator')).toHaveLength(1)
+    patch({ openingBranchPath: null })
+    const open = vi.fn(async () => {})
+    patch({ openBranchDiff: open })
+    act(() => {
+      const onPress = rows()[0]?.props.onPress
+      if (typeof onPress !== 'function') {
+        throw new Error('missing branch opener')
+      }
+      onPress()
+    })
+    expect(open).toHaveBeenCalledWith(expect.objectContaining({ path: 'changed.ts' }))
+    patch({ branchCompareState: { kind: 'error', message: 'compare failed' } })
+    expect(text()).toContain('compare failed')
+    expect(rows()).toHaveLength(0)
+    patch({ branchCompareState: initial.branchCompareState })
+    patch({
+      branchCompareResult: {
+        ...initial.branchCompareResult,
+        summary: {
+          status: 'error',
+          baseRef: 'main',
+          changedFiles: 0,
+          commitsAhead: undefined,
+          errorMessage: 'unavailable'
+        }
+      }
+    })
+    expect(text()).toContain('unavailable')
+    expect(rows()).toHaveLength(0)
+    patch({ branchCompareResult: initial.branchCompareResult })
+    expect(rows()).toHaveLength(1)
+    patch({ shouldShowBranchCompareSection: false })
+    expect(text()).not.toContain('Committed on Branch')
+    patch({ shouldShowBranchCompareSection: true })
+    expect(rows()).toHaveLength(1)
+    format.mockClear()
+    patch({ connState: 'disconnected', actionError: 'offline', keyboardLift: 100 })
+    expect(text()).toContain('Reconnecting to desktop')
+    expect(text()).toContain('offline')
+    expect(format).not.toHaveBeenCalled()
+  })
+})
diff --git a/mobile/src/source-control/MobileSourceControlContent.tsx b/mobile/src/source-control/MobileSourceControlContent.tsx
index 885d8bf0c4da..6c0a8ca3f338 100644
--- a/mobile/src/source-control/MobileSourceControlContent.tsx
+++ b/mobile/src/source-control/MobileSourceControlContent.tsx
@@ -1,3 +1,4 @@
+import { useMemo } from 'react'
 import {
   ActivityIndicator,
   Pressable,
@@ -58,20 +59,33 @@ export function MobileSourceControlContent({ state }: Props) {
   const shouldShowGenerateButton = stagedCount > 0 || generatingMessage
   const createPrHeroActive =
     createPrAction.visible && !createPrAction.disabled && !createPrAction.pushFirst
-  const branchCompareFooter = (
-    <BranchCompareFooter
-      state={{
-        shouldShowBranchCompareSection: state.shouldShowBranchCompareSection,
-        branchCompareSummaryText: state.branchCompareSummaryText,
-        branchEntries: state.branchEntries,
-        branchCompareState: state.branchCompareState,
-        branchCompareResult: state.branchCompareResult,
-        busyAction,
-        openBranchDiff,
-        openingBranchPath,
-        openingPath
-      }}
-    />
+  const branchCompareFooter = useMemo(
+    () => (
+      <BranchCompareFooter
+        state={{
+          shouldShowBranchCompareSection: state.shouldShowBranchCompareSection,
+          branchCompareSummaryText: state.branchCompareSummaryText,
+          branchEntries: state.branchEntries,
+          branchCompareState: state.branchCompareState,
+          branchCompareResult: state.branchCompareResult,
+          busyAction,
+          openBranchDiff,
+          openingBranchPath,
+          openingPath
+        }}
+      />
+    ),
+    [
+      state.shouldShowBranchCompareSection,
+      state.branchCompareSummaryText,
+      state.branchEntries,
+      state.branchCompareState,
+      state.branchCompareResult,
+      busyAction,
+      openBranchDiff,
+      openingBranchPath,
+      openingPath
+    ]
   )
 
   return (
diff --git a/mobile/src/storage/mirrored-storage-keys.ts b/mobile/src/storage/mirrored-storage-keys.ts
index 590c99a77405..c8eac0c40346 100644
--- a/mobile/src/storage/mirrored-storage-keys.ts
+++ b/mobile/src/storage/mirrored-storage-keys.ts
@@ -78,8 +78,7 @@ function note(key: string, value: string | null): void {
  * refused page write left this map holding a value no store had taken and the next `init` handed
  * the page exactly that. There is nothing to undo, because nothing is written until the answer.
  *
- * Returns the store's own promise, so a caller that has something to say about a refusal — the
- * durable send journal is the one — still hears it, and a caller that has not is unchanged.
+ * Returns the store's own promise so callers can report refusals.
  */
 export function persistMirrored(key: string, value: string | null): Promise<void> {
   const write = value === null ? AsyncStorage.removeItem(key) : AsyncStorage.setItem(key, value)
diff --git a/mobile/src/tasks/mobile-task-detail-hydration.test-fixture.tsx b/mobile/src/tasks/mobile-task-detail-hydration.test-fixture.tsx
new file mode 100644
index 000000000000..afa07de3799e
--- /dev/null
+++ b/mobile/src/tasks/mobile-task-detail-hydration.test-fixture.tsx
@@ -0,0 +1,188 @@
+import { createElement, useState } from 'react'
+import { act, create, type ReactTestRenderer } from 'react-test-renderer'
+import { createFakeRpcClient, type SentRequest } from '../mobile-web-shell/bridge-host-test-fakes'
+import type { RpcClient } from '../transport/rpc-client'
+import type { RpcResponse } from '../transport/types'
+import type { ActionableTaskItem, TaskItem } from './mobile-tasks-project-workspace-types'
+import type { DetailPayload, GitLabWorkItem } from './mobile-tasks-provider-detail-types'
+import { useMobileTasksItemDetailLoading } from './use-mobile-tasks-item-detail-loading'
+
+export const GITLAB_DETAILS = {
+  body: 'Merge request body',
+  comments: [],
+  item: { labels: ['performance'], mergeable: 'MERGEABLE' },
+  assignees: ['reviewer'],
+  pipelineJobs: [{ id: 1, name: 'test', stage: 'test', status: 'success' }],
+  reviewers: [{ username: 'reviewer' }],
+  approvalState: { approvalsRequired: 1, approvalsLeft: 0 }
+}
+
+export const SUCCESS_CHECKS = {
+  state: 'success',
+  total: 1,
+  passed: 1,
+  failed: 0,
+  pending: 0,
+  neutral: 0
+} as const
+
+export function gitlabItem(
+  source: Partial<GitLabWorkItem> = {}
+): Extract<TaskItem, { provider: 'gitlab' }> {
+  return {
+    key: 'gitlab:repo:mr:12',
+    provider: 'gitlab',
+    title: 'A merge request',
+    subtitle: 'Repository !12',
+    status: 'Open',
+    updatedAt: '2026-10-07T00:00:00Z',
+    source: {
+      id: 'mr:12',
+      type: 'mr',
+      number: 12,
+      title: 'A merge request',
+      state: 'opened',
+      url: 'https://gitlab.example/group/repo/-/merge_requests/12',
+      labels: [],
+      author: null,
+      updatedAt: '2026-10-07T00:00:00Z',
+      repoId: 'repo',
+      repoName: 'Repository',
+      projectRef: { host: 'gitlab.example', path: 'group/repo' },
+      ...source
+    }
+  }
+}
+
+export function hydratedItem(source: Partial<GitLabWorkItem> = {}) {
+  return gitlabItem({
+    checksSummary: SUCCESS_CHECKS,
+    mergeable: 'MERGEABLE',
+    reviewDecision: 'approved',
+    reviewerCount: 1,
+    ...source
+  })
+}
+
+export function success(result: unknown): RpcResponse {
+  return { id: 'detail', ok: true, result }
+}
+
+export function detailClient() {
+  const client = createFakeRpcClient({ getLastConnectedAt: () => 1 })
+  const settled = new Set<SentRequest>()
+  const pendingRequests = () => client.requests.filter((request) => !settled.has(request))
+  return {
+    client,
+    get requests() {
+      return client.requests.map((request) => ({
+        method: request.method,
+        params: request.args[1],
+        options: request.args[2]
+      }))
+    },
+    pending: pendingRequests,
+    async answer(
+      reply: RpcResponse | ((request: SentRequest) => RpcResponse) = success(
+        structuredClone(GITLAB_DETAILS)
+      ),
+      pending = pendingRequests()
+    ) {
+      await act(async () => {
+        for (const request of pending) {
+          settled.add(request)
+          request.resolve(typeof reply === 'function' ? reply(request) : reply)
+        }
+      })
+    },
+    async reject(error: Error) {
+      const pending = pendingRequests()
+      await act(async () => {
+        for (const request of pending) {
+          settled.add(request)
+          request.reject(error)
+        }
+      })
+    }
+  }
+}
+
+type DetailState = {
+  actionItem: ActionableTaskItem | null
+  items: TaskItem[]
+  payload: DetailPayload | null
+  loading: boolean
+  error: string
+}
+
+export async function mountDetail(
+  initial: ActionableTaskItem = gitlabItem(),
+  initialItems: TaskItem[] = [initial]
+) {
+  const transport = detailClient()
+  const observation: { state?: DetailState } = {}
+  let renderer: ReactTestRenderer | undefined
+  const commands = {
+    select: (_item: ActionableTaskItem | null): void => {},
+    refresh: (): void => {},
+    client: (_client: RpcClient): void => {},
+    rerender: (): void => {}
+  }
+  function Probe(): null {
+    const [actionItem, setActionItem] = useState<ActionableTaskItem | null>(initial)
+    const [items, setItems] = useState(initialItems)
+    const [payload, setDetailPayload] = useState<DetailPayload | null>(null)
+    const [loading, setDetailLoading] = useState(false)
+    const [error, setDetailError] = useState('')
+    const [detailRefreshSeq, setRefreshSeq] = useState(0)
+    const [client, setClient] = useState<RpcClient>(transport.client)
+    const [, setUnrelated] = useState(0)
+    commands.select = setActionItem
+    commands.refresh = () => setRefreshSeq((value) => value + 1)
+    commands.client = setClient
+    commands.rerender = () => setUnrelated((value) => value + 1)
+    observation.state = { actionItem, items, payload, loading, error }
+    useMobileTasksItemDetailLoading({
+      actionItem,
+      client,
+      detailRefreshSeq,
+      setActionItem,
+      setItems,
+      setDetailPayload,
+      setDetailLoading,
+      setDetailError,
+      tasksSupported: true
+    })
+    return null
+  }
+  await act(async () => {
+    renderer = create(createElement(Probe))
+  })
+  return {
+    transport,
+    state() {
+      if (!observation.state) {
+        throw new Error('Detail hook did not mount')
+      }
+      return observation.state
+    },
+    async select(item: ActionableTaskItem | null) {
+      await act(async () => commands.select(item))
+    },
+    async refresh() {
+      await act(async () => commands.refresh())
+    },
+    async replaceClient(client: RpcClient) {
+      await act(async () => commands.client(client))
+    },
+    async rerender() {
+      await act(async () => commands.rerender())
+    },
+    async dispose() {
+      await act(async () => {
+        renderer?.unmount()
+        renderer = undefined
+      })
+    }
+  }
+}
diff --git a/mobile/src/tasks/use-mobile-tasks-item-detail-lifecycle.test.tsx b/mobile/src/tasks/use-mobile-tasks-item-detail-lifecycle.test.tsx
new file mode 100644
index 000000000000..e29da4016d82
--- /dev/null
+++ b/mobile/src/tasks/use-mobile-tasks-item-detail-lifecycle.test.tsx
@@ -0,0 +1,134 @@
+import { afterEach, describe, expect, it, vi } from 'vitest'
+import type { ActionableTaskItem } from './mobile-tasks-project-workspace-types'
+import {
+  detailClient,
+  GITLAB_DETAILS,
+  gitlabItem,
+  hydratedItem,
+  mountDetail,
+  success
+} from './mobile-task-detail-hydration.test-fixture'
+
+vi.mock('./mobile-tasks-dependencies', async () => {
+  const react = await import('react')
+  const { colors } = await import('../theme/mobile-theme')
+  const { buildGitLabCheckSummary } = await import('./gitlab-check-summary')
+  return { useEffect: react.useEffect, colors, buildGitLabCheckSummary }
+})
+
+vi.mock('./mobile-tasks-legacy-foundation', async () => import('./mobile-tasks-item-mapping'))
+
+const mounts: Awaited<ReturnType<typeof mountDetail>>[] = []
+async function mount(...args: Parameters<typeof mountDetail>) {
+  const fixture = await mountDetail(...args)
+  mounts.push(fixture)
+  return fixture
+}
+afterEach(async () => {
+  for (const fixture of mounts.splice(0)) {
+    await fixture.dispose()
+  }
+})
+
+describe('task detail request lifetime', () => {
+  it('ignores results after another client becomes authoritative', async () => {
+    const fixture = await mount(hydratedItem())
+    const next = detailClient()
+    await fixture.replaceClient(next.client)
+    await fixture.transport.answer(success({ ...GITLAB_DETAILS, body: 'Old client' }))
+    expect(fixture.state().payload).toBeNull()
+    await next.answer(success({ ...GITLAB_DETAILS, body: 'Current client' }))
+    expect(fixture.state()).toMatchObject({ loading: false, payload: { body: 'Current client' } })
+    expect(next.requests).toHaveLength(1)
+  })
+
+  it('ignores an old item reply after selecting another item', async () => {
+    const fixture = await mount(hydratedItem())
+    const next = hydratedItem({ id: 'mr:99', number: 99 })
+    const old = fixture.transport.pending()
+    await fixture.select(next)
+    const current = fixture.transport.requests[1]
+    expect(current?.params).toMatchObject({ iid: 99 })
+    await fixture.transport.answer(success({ ...GITLAB_DETAILS, body: 'Retired item' }), old)
+    expect(fixture.state().payload).toBeNull()
+    await fixture.transport.answer(success({ ...GITLAB_DETAILS, body: 'Current item' }))
+    expect(fixture.state().payload).toMatchObject({ body: 'Current item' })
+    expect(fixture.state().actionItem).toBe(next)
+    expect(fixture.transport.requests).toHaveLength(2)
+  })
+
+  it('stops requests and ignores an outstanding reply on close', async () => {
+    const fixture = await mount()
+    await fixture.select(null)
+    await fixture.transport.answer()
+    expect(fixture.state()).toMatchObject({ actionItem: null, payload: null, loading: false })
+    expect(fixture.transport.requests).toHaveLength(1)
+  })
+
+  it('ignores a reply after unmount', async () => {
+    const fixture = await mount()
+    const state = fixture.state()
+    await fixture.dispose()
+    await fixture.transport.answer()
+    expect(fixture.state()).toBe(state)
+    expect(fixture.transport.requests).toHaveLength(1)
+  })
+
+  it.each([
+    success(null),
+    success('invalid'),
+    { id: 'detail', ok: false as const, error: { code: 'refused', message: 'Access refused' } }
+  ])('does not retry refused or unreadable details', async (reply) => {
+    const fixture = await mount()
+    await fixture.transport.answer(reply)
+    expect(fixture.transport.requests).toHaveLength(1)
+    expect(fixture.transport.pending()).toHaveLength(0)
+    expect(fixture.state().loading).toBe(false)
+    expect(fixture.state().error).not.toBe('')
+  })
+
+  it('does not retry a transport failure', async () => {
+    const fixture = await mount()
+    await fixture.transport.reject(new Error('Transport lost'))
+    expect(fixture.state()).toMatchObject({ loading: false, error: 'Transport lost' })
+    expect(fixture.transport.requests).toHaveLength(1)
+  })
+})
+
+describe('other detail providers', () => {
+  it('keeps GitHub and Linear reads stable after successful replies', async () => {
+    const gitlab = gitlabItem()
+    const github: ActionableTaskItem = {
+      ...gitlab,
+      provider: 'github',
+      source: { ...gitlab.source, type: 'pr', state: 'open' }
+    }
+    const fixture = await mount(github)
+    await fixture.transport.answer(success({ body: 'GitHub body' }))
+    expect(fixture.transport.requests).toHaveLength(1)
+    expect(fixture.state()).toMatchObject({ loading: false, payload: { provider: 'github' } })
+    const issue = {
+      id: 'linear-1',
+      identifier: 'ENG-1',
+      title: 'Issue',
+      url: 'https://linear.example/ENG-1',
+      updatedAt: '',
+      priority: 0,
+      labels: [],
+      state: { name: 'Todo', type: 'unstarted', color: '' },
+      team: { id: 'team', name: 'Team', key: 'ENG' }
+    }
+    const linear: ActionableTaskItem = { ...gitlab, provider: 'linear', source: issue }
+    await fixture.select(linear)
+    expect(fixture.transport.requests.slice(1).map((request) => request.method)).toEqual([
+      'linear.getIssue',
+      'linear.issueComments'
+    ])
+    await fixture.transport.answer((request) =>
+      success(request.method === 'linear.issueComments' ? [] : issue)
+    )
+    expect(fixture.transport.requests).toHaveLength(3)
+    expect(fixture.state()).toMatchObject({ loading: false, payload: { provider: 'linear' } })
+    expect(fixture.state().actionItem).toBe(linear)
+  })
+})
diff --git a/mobile/src/tasks/use-mobile-tasks-item-detail-loading.test.tsx b/mobile/src/tasks/use-mobile-tasks-item-detail-loading.test.tsx
new file mode 100644
index 000000000000..f2e526f46338
--- /dev/null
+++ b/mobile/src/tasks/use-mobile-tasks-item-detail-loading.test.tsx
@@ -0,0 +1,143 @@
+import { afterEach, describe, expect, it, vi } from 'vitest'
+import type { ProviderCheckSummary } from '../../../src/shared/github/pull-request-types'
+import type { GitLabWorkItem } from './mobile-tasks-provider-detail-types'
+import {
+  GITLAB_DETAILS,
+  gitlabItem,
+  hydratedItem,
+  mountDetail,
+  SUCCESS_CHECKS,
+  success
+} from './mobile-task-detail-hydration.test-fixture'
+
+vi.mock('./mobile-tasks-dependencies', async () => {
+  const react = await import('react')
+  const { colors } = await import('../theme/mobile-theme')
+  const { buildGitLabCheckSummary } = await import('./gitlab-check-summary')
+  return { useEffect: react.useEffect, colors, buildGitLabCheckSummary }
+})
+
+vi.mock('./mobile-tasks-legacy-foundation', async () => import('./mobile-tasks-item-mapping'))
+
+const mounts: Awaited<ReturnType<typeof mountDetail>>[] = []
+async function mount(...args: Parameters<typeof mountDetail>) {
+  const fixture = await mountDetail(...args)
+  mounts.push(fixture)
+  return fixture
+}
+afterEach(async () => {
+  for (const fixture of mounts.splice(0)) {
+    await fixture.dispose()
+  }
+})
+
+const summaryChanges: { field: keyof ProviderCheckSummary; summary: ProviderCheckSummary }[] = [
+  { field: 'state', summary: { ...SUCCESS_CHECKS, state: 'failure' } },
+  { field: 'total', summary: { ...SUCCESS_CHECKS, total: 9 } },
+  { field: 'passed', summary: { ...SUCCESS_CHECKS, passed: 9 } },
+  { field: 'failed', summary: { ...SUCCESS_CHECKS, failed: 9 } },
+  { field: 'pending', summary: { ...SUCCESS_CHECKS, pending: 9 } },
+  { field: 'neutral', summary: { ...SUCCESS_CHECKS, neutral: 9 } }
+]
+const statusChanges: { field: string; source: Partial<GitLabWorkItem> }[] = [
+  { field: 'mergeable', source: { mergeable: 'CONFLICTING' } },
+  { field: 'reviewDecision', source: { reviewDecision: 'review_required' } },
+  { field: 'reviewerCount', source: { reviewerCount: 9 } }
+]
+
+describe('GitLab task detail hydration', () => {
+  it('settles repeated identical replies and keeps the loaded sheet readable', async () => {
+    const fixture = await mount()
+    for (let round = 0; round < 6; round += 1) {
+      await fixture.transport.answer()
+    }
+    expect(fixture.transport.requests).toHaveLength(2)
+    expect(fixture.transport.pending()).toHaveLength(0)
+    expect(fixture.state()).toMatchObject({
+      loading: false,
+      error: '',
+      payload: { provider: 'gitlab', body: GITLAB_DETAILS.body }
+    })
+  })
+
+  it('retains already hydrated selected and list references after an unrelated render', async () => {
+    const initial = hydratedItem()
+    const other = gitlabItem({ id: 'mr:99', number: 99 })
+    const items = [initial, other]
+    const fixture = await mount(initial, items)
+    await fixture.rerender()
+    expect(fixture.transport.requests).toHaveLength(1)
+    await fixture.transport.answer()
+    expect(fixture.transport.requests).toHaveLength(1)
+    expect(fixture.state().actionItem).toBe(initial)
+    expect(fixture.state().items).toBe(items)
+    expect(fixture.state().items[1]).toBe(other)
+    expect(fixture.transport.requests[0]).toMatchObject({
+      method: 'gitlab.workItemDetails',
+      params: { repo: 'id:repo', iid: 12, type: 'mr', projectRef: initial.source.projectRef },
+      options: { timeoutMs: 30_000 }
+    })
+  })
+
+  it.each(summaryChanges)(
+    'hydrates a changed checks $field before settling',
+    async ({ summary }) => {
+      const initial = hydratedItem({ checksSummary: summary })
+      const other = gitlabItem({ id: 'mr:99' })
+      const fixture = await mount(initial, [initial, other])
+      await fixture.transport.answer()
+      expect(fixture.state().actionItem?.source).toMatchObject({ checksSummary: SUCCESS_CHECKS })
+      expect(fixture.state().items[0]?.source).toMatchObject({ checksSummary: SUCCESS_CHECKS })
+      expect(fixture.state().items[1]).toBe(other)
+      const selected = fixture.state().actionItem
+      const items = fixture.state().items
+      await fixture.transport.answer()
+      expect(fixture.transport.requests).toHaveLength(2)
+      expect(fixture.transport.pending()).toHaveLength(0)
+      expect(fixture.state().actionItem).toBe(selected)
+      expect(fixture.state().items).toBe(items)
+    }
+  )
+
+  it.each(statusChanges)('hydrates provided $field before settling', async ({ source }) => {
+    const fixture = await mount(hydratedItem(source))
+    await fixture.transport.answer()
+    expect(fixture.state().actionItem?.source).toMatchObject({
+      mergeable: 'MERGEABLE',
+      reviewDecision: 'approved',
+      reviewerCount: 1
+    })
+    await fixture.transport.answer()
+    expect(fixture.transport.requests).toHaveLength(2)
+    expect(fixture.transport.pending()).toHaveLength(0)
+  })
+
+  it('preserves absent optional status fields while accepting empty checks', async () => {
+    const initial = hydratedItem({
+      mergeable: 'CONFLICTING',
+      reviewDecision: 'review_required',
+      reviewerCount: 9
+    })
+    const fixture = await mount(initial)
+    const reply = success({ body: 'No status fields', comments: [], pipelineJobs: [] })
+    await fixture.transport.answer(reply)
+    expect(fixture.state().actionItem?.source).toMatchObject({
+      checksSummary: { state: 'none', total: 0, passed: 0, failed: 0, pending: 0, neutral: 0 },
+      mergeable: 'CONFLICTING',
+      reviewDecision: 'review_required',
+      reviewerCount: 9
+    })
+    await fixture.transport.answer(reply)
+    expect(fixture.transport.requests).toHaveLength(2)
+    expect(fixture.state()).toMatchObject({ loading: false, payload: { body: 'No status fields' } })
+  })
+
+  it('still reads explicit refreshes and changed details', async () => {
+    const fixture = await mount(hydratedItem())
+    await fixture.transport.answer()
+    await fixture.refresh()
+    await fixture.transport.answer(success({ ...GITLAB_DETAILS, body: 'Updated body' }))
+    expect(fixture.transport.requests).toHaveLength(2)
+    expect(fixture.state()).toMatchObject({ loading: false, payload: { body: 'Updated body' } })
+  })
+})
diff --git a/mobile/src/tasks/use-mobile-tasks-item-detail-loading.tsx b/mobile/src/tasks/use-mobile-tasks-item-detail-loading.tsx
index 4ffafce06e74..6f96124fd36e 100644
--- a/mobile/src/tasks/use-mobile-tasks-item-detail-loading.tsx
+++ b/mobile/src/tasks/use-mobile-tasks-item-detail-loading.tsx
@@ -1,3 +1,5 @@
+import type { ProviderCheckSummary } from '../../../src/shared/github/pull-request-types'
+import type { GitLabWorkItem } from './mobile-tasks-provider-detail-types'
 import type { ItemDetailMetadataEffectsModel } from './use-mobile-tasks-item-detail-metadata-effects'
 import {
   type HostedReviewDecision,
@@ -12,7 +14,43 @@ import {
   linearIssueRead
 } from './mobile-task-item-detail-operations'
 
-export function useMobileTasksItemDetailLoading(model: ItemDetailMetadataEffectsModel) {
+type GitLabHydratedStatus = Pick<GitLabWorkItem, 'mergeable' | 'reviewDecision' | 'reviewerCount'>
+
+function gitLabHydrationUnchanged(
+  source: GitLabWorkItem,
+  summary: ProviderCheckSummary,
+  status: GitLabHydratedStatus
+): boolean {
+  const current = source.checksSummary
+  return (
+    current?.state === summary.state &&
+    current.total === summary.total &&
+    current.passed === summary.passed &&
+    current.failed === summary.failed &&
+    current.pending === summary.pending &&
+    current.neutral === summary.neutral &&
+    (status.mergeable === undefined || source.mergeable === status.mergeable) &&
+    (status.reviewDecision === undefined || source.reviewDecision === status.reviewDecision) &&
+    (status.reviewerCount === undefined || source.reviewerCount === status.reviewerCount)
+  )
+}
+
+export type ItemDetailLoadingInput = Pick<
+  ItemDetailMetadataEffectsModel,
+  | 'actionItem'
+  | 'client'
+  | 'detailRefreshSeq'
+  | 'setActionItem'
+  | 'setDetailError'
+  | 'setDetailLoading'
+  | 'setDetailPayload'
+  | 'setItems'
+  | 'tasksSupported'
+>
+
+export function useMobileTasksItemDetailLoading<Model extends ItemDetailLoadingInput>(
+  model: Model
+) {
   const {
     actionItem,
     client,
@@ -109,7 +147,9 @@ export function useMobileTasksItemDetailLoading(model: ItemDetailMetadataEffects
             ...(details.reviewers !== undefined ? { reviewerCount: details.reviewers.length } : {})
           }
           setActionItem((current) =>
-            current?.provider === 'gitlab' && current.source.id === actionItem.source.id
+            current?.provider === 'gitlab' &&
+            current.source.id === actionItem.source.id &&
+            !gitLabHydrationUnchanged(current.source, checksSummary, hydratedStatus)
               ? {
                   ...current,
                   source: {
@@ -120,20 +160,24 @@ export function useMobileTasksItemDetailLoading(model: ItemDetailMetadataEffects
                 }
               : current
           )
-          setItems((current) =>
-            current.map((candidate) =>
-              candidate.provider === 'gitlab' && candidate.source.id === actionItem.source.id
-                ? {
-                    ...candidate,
-                    source: {
-                      ...candidate.source,
-                      checksSummary,
-                      ...hydratedStatus
-                    }
-                  }
-                : candidate
-            )
-          )
+          setItems((current) => {
+            let changed = false
+            const next = current.map((candidate) => {
+              if (
+                candidate.provider !== 'gitlab' ||
+                candidate.source.id !== actionItem.source.id ||
+                gitLabHydrationUnchanged(candidate.source, checksSummary, hydratedStatus)
+              ) {
+                return candidate
+              }
+              changed = true
+              return {
+                ...candidate,
+                source: { ...candidate.source, checksSummary, ...hydratedStatus }
+              }
+            })
+            return changed ? next : current
+          })
         }
         return
       }
@@ -211,4 +255,4 @@ export function useMobileTasksItemDetailLoading(model: ItemDetailMetadataEffects
   return model
 }
 
-export type ItemDetailLoadingModel = ReturnType<typeof useMobileTasksItemDetailLoading>
+export type ItemDetailLoadingModel = ItemDetailMetadataEffectsModel
diff --git a/mobile/src/transport/base64-byte-codec.test.ts b/mobile/src/transport/base64-byte-codec.test.ts
index 9dcd84bcf571..641f10433ceb 100644
--- a/mobile/src/transport/base64-byte-codec.test.ts
+++ b/mobile/src/transport/base64-byte-codec.test.ts
@@ -1,7 +1,37 @@
-import { describe, expect, it } from 'vitest'
+import { describe, expect, it, vi } from 'vitest'
 import { decodeBase64Bytes, encodeBase64Bytes } from './base64-byte-codec'
 
 describe('base64 byte codec', () => {
+  it('uses native encoding on the original byte view without building binary strings', () => {
+    class NativeBase64Bytes extends Uint8Array {
+      toBase64(): string {
+        return Buffer.from(this).toString('base64')
+      }
+    }
+    const bytes = new NativeBase64Bytes(new Uint8Array([9, 255, 254, 8]).buffer, 1, 2)
+    const nativeEncoder = vi.spyOn(bytes, 'toBase64')
+    const binaryEncoder = vi.spyOn(globalThis, 'btoa')
+    try {
+      expect(encodeBase64Bytes(bytes)).toBe('//4=')
+      expect(nativeEncoder).toHaveBeenCalledExactlyOnceWith()
+      expect(binaryEncoder).not.toHaveBeenCalled()
+    } finally {
+      binaryEncoder.mockRestore()
+    }
+  })
+
+  it('keeps the fallback when the native property is not callable', () => {
+    const bytes = new Uint8Array([255, 254])
+    Object.defineProperty(bytes, 'toBase64', { value: undefined })
+    expect(encodeBase64Bytes(bytes)).toBe('//4=')
+  })
+
+  it('preserves empty encoding for a detached byte view', () => {
+    const bytes = new Uint8Array([1, 2, 3])
+    structuredClone(bytes.buffer, { transfer: [bytes.buffer] })
+    expect(encodeBase64Bytes(bytes)).toBe('')
+  })
+
   it.each([0, 1, 2, 3, 4, 8190 - 1, 8190, 8190 + 1, 8190 + 2, 8190 * 2, 256 * 1024 + 1])(
     'preserves all bytes and padding at size %i',
     (length) => {
diff --git a/mobile/src/transport/base64-byte-codec.ts b/mobile/src/transport/base64-byte-codec.ts
index 2786bb5abbe1..9958e0cf8ea8 100644
--- a/mobile/src/transport/base64-byte-codec.ts
+++ b/mobile/src/transport/base64-byte-codec.ts
@@ -2,6 +2,12 @@
 const BASE64_BINARY_CHUNK_BYTES = 8190
 
 export function encodeBase64Bytes(bytes: Uint8Array): string {
+  if (bytes.byteLength === 0) {
+    return ''
+  }
+  if ('toBase64' in bytes && typeof bytes.toBase64 === 'function') {
+    return bytes.toBase64()
+  }
   const encoded: string[] = []
   for (let offset = 0; offset < bytes.byteLength; offset += BASE64_BINARY_CHUNK_BYTES) {
     const end = Math.min(offset + BASE64_BINARY_CHUNK_BYTES, bytes.byteLength)
diff --git a/mobile/tests-typecheck-baseline.txt b/mobile/tests-typecheck-baseline.txt
index 91b1fd6bae8c..e8fa6ca1b48d 100644
--- a/mobile/tests-typecheck-baseline.txt
+++ b/mobile/tests-typecheck-baseline.txt
@@ -84,7 +84,6 @@ src/session/use-mobile-native-chat-image-attachments.test.ts
 src/session/use-mobile-pr-branch-context.test.ts
 src/session/use-mobile-pr-sidebar-controller.test.ts
 src/session/use-mobile-session-terminal-create-actions.test.ts
-src/session/use-mobile-structured-agent-session-send.test.tsx
 src/session/use-mobile-structured-agent-session.test.tsx
 src/session/use-mobile-structured-prompt-responses.test.tsx
 src/session/use-mobile-terminal-inventory-recovery.test.ts
diff --git a/mobile/web-entry/web-overrides.json b/mobile/web-entry/web-overrides.json
index ed26d89319f8..22cc58fe0b1e 100644
--- a/mobile/web-entry/web-overrides.json
+++ b/mobile/web-entry/web-overrides.json
@@ -165,6 +165,10 @@
       "file": "src/components/AuthFailedBannerActions.web.tsx",
       "reason": "The auth-failed banner offers Retry, Re-pair and Remove, and on the page only Re-pair works. /pair-scan sits outside the page's route root of app/h (config/scripts/mobile-web-app-route-manifest.mjs:6), so route-handoff.web.ts:207 hands the push to the shell, which opens the native scan screen and returns to the same page document on Back. Retry and Remove are inert here: forceReconnect is null (client-context.web.tsx:57, read through host-client-hooks.ts:88) and removal refuses (page-host-removal-refusal.ts). The banner is reachable on the page because the shell forwards the native client's state (mobile-web-shell/bridge-host.ts:301) and auth-failed is in the wire enum (bridge/bridge-envelope.ts:44). So this one renders Re-pair as native does and one line naming the app for reconnect and removal."
     },
+    {
+      "file": "src/session/MobileNativeChatVisualFrame.web.tsx",
+      "reason": "The native frame runs a chat visual's scripts in a sandboxed child of a trusted host document inside a react-native-webview, which throws at import in a browser. The page's response-header policy (script-src 'self', frame-src 'none') is inherited by a srcdoc frame, so a visual's inline scripts cannot run here without loosening the page policy. This one renders the visual sealed, as MobileHtmlPreview.web.tsx does: an empty sandbox, no script, a fixed-height frame the visual scrolls inside."
+    },
     {
       "file": "src/components/MobileHtmlPreview.web.tsx",
       "reason": "The native preview renders an agent-produced HTML artifact inside a sandboxed WebView with navigation locked to the initial inline document, and react-native-webview throws at import in a browser for the reason above. This one renders the artifact in a sandboxed iframe with no allow-scripts and no allow-same-origin, keeping the Preview/Source toggle. srcdoc rather than a blob: URL and no CSP change at all: a srcdoc frame has no URL for frame-src to match and inherits its embedder's policy instead, so it is admitted under the shipped frame-src 'none' on Chromium and WebKit alike, while a blob: frame is refused by frame-src and refused again in WebKit by the frame-ancestors 'none' it inherits. The inherited policy is also what seals it -- script-src 'self' refuses the artifact's inline script, img-src bounds its images, font-src 'none' its fonts -- and allow-top-navigation-by-user-activation is the one capability granted, so a tapped link becomes a top-frame navigation the shell opens externally (ruling 29) while a meta refresh, a form submit, target=_blank and any script-initiated navigation produce none. That token is granted only when the shell says it can open such a navigation: without the externalNavigation grant this file renders the artifact with its links as text and seals the frame with an empty sandbox instead (C8.1, ruling 37.2)."
diff --git a/resources/native-chat-visuals/.claude-plugin/plugin.json b/resources/native-chat-visuals/.claude-plugin/plugin.json
new file mode 100644
index 000000000000..855f314a7f13
--- /dev/null
+++ b/resources/native-chat-visuals/.claude-plugin/plugin.json
@@ -0,0 +1,5 @@
+{
+  "name": "orca-native-chat",
+  "version": "1.0.0",
+  "description": "Teaches an Orca chat agent to show charts, diagrams and mockups inline in the chat."
+}
diff --git a/resources/native-chat-visuals/skills/orca-chat-visuals/SKILL.md b/resources/native-chat-visuals/skills/orca-chat-visuals/SKILL.md
new file mode 100644
index 000000000000..dc63d3c8d206
--- /dev/null
+++ b/resources/native-chat-visuals/skills/orca-chat-visuals/SKILL.md
@@ -0,0 +1,33 @@
+---
+name: orca-chat-visuals
+description: Show a chart, diagram, table, report or mockup inline in this Orca chat as an HTML
+  page. Use when a visual would help the user understand your answer. Only available when the
+  ORCA_CHAT_VISUALS_DIR environment variable is set.
+user-invocable: false
+---
+
+# Inline visuals in an Orca chat
+
+Orca can show an HTML page inside your reply. Use one whenever a visual would make the answer
+clearer.
+
+## Writing the page
+
+- Save it in the folder named by `ORCA_CHAT_VISUALS_DIR` (`printenv ORCA_CHAT_VISUALS_DIR`; in
+  PowerShell `$env:ORCA_CHAT_VISUALS_DIR`). If it's unset or you can't write there, skip the visual.
+- One complete HTML file per visual, directly in that folder, under 512 KB, with a new file name
+  each time (e.g. `latency-by-region-7c1e.html`): letters, digits, `.`, `_`, `-`, ending in `.html`.
+- Inline your styles, scripts and data. Libraries and fonts may load only from cdn.jsdelivr.net,
+  unpkg.com, cdnjs.cloudflare.com, esm.sh, fonts.googleapis.com and fonts.gstatic.com. The page
+  can't make network requests; use inline SVG or `data:` URLs for images.
+- Don't size anything to the viewport height (`100vh`); Orca fits the frame to your content.
+- Optional: Orca's theme colors are available as CSS variables (`--background`, `--foreground`,
+  `--muted-foreground`, `--border`, `--primary`, `--chart-1` to `--chart-5`).
+
+## Showing it
+
+After the file exists, put this on its own line in your reply, outside any code block:
+
+::orca-visual{file="latency-by-region-7c1e.html" title="Latency by region"}
+
+`file` is the bare file name, never a path; `title` is optional. At most 8 per reply.
diff --git a/src/cli/handlers/account-list-format.ts b/src/cli/handlers/account-list-format.ts
index 66da6d4b1b71..59df0c6b3a48 100644
--- a/src/cli/handlers/account-list-format.ts
+++ b/src/cli/handlers/account-list-format.ts
@@ -3,7 +3,7 @@ import type { ManagedDataAccountsState } from '../../shared/managed-account-type
 // Why: Claude and Codex managed-account summaries both carry id+email+active id,
 // so one formatter renders either provider's block.
 type AccountsBlock = {
-  accounts: readonly { id: string; email: string }[]
+  accounts: readonly { id: string; email: string; needsSignIn?: true }[]
   activeAccountId: string | null
   activeAccountIdsByRuntime?: {
     host: string | null
@@ -35,7 +35,10 @@ export function formatAccountsBlock(label: string, block: AccountsBlock): string
     ...Object.values(block.activeAccountIdsByRuntime?.wsl ?? {})
   ])
   const lines = block.accounts.map(
-    (account) => `  ${account.email}${activeAccountIds.has(account.id) ? ' (active)' : ''}`
+    (account) =>
+      `  ${account.email}${activeAccountIds.has(account.id) ? ' (active)' : ''}${
+        account.needsSignIn ? ' (sign in again in Orca Settings > AI Provider Accounts)' : ''
+      }`
   )
   return `Managed ${label} accounts (${block.accounts.length}):\n${lines.join('\n')}`
 }
diff --git a/src/cli/handlers/account.test.ts b/src/cli/handlers/account.test.ts
index 8b2fe9d5ae7e..e19fd4a8ad29 100644
--- a/src/cli/handlers/account.test.ts
+++ b/src/cli/handlers/account.test.ts
@@ -1,6 +1,5 @@
 import type * as NodeCliCommandResolutionModule from '../../shared/node-cli-command-resolution'
 import { EventEmitter } from 'node:events'
-import { createHash } from 'node:crypto'
 import { existsSync } from 'node:fs'
 import { delimiter } from 'node:path'
 import type * as NodeFs from 'node:fs'
@@ -63,7 +62,10 @@ import {
   WINDOWS_BATCH_UNSAFE_ARGUMENTS_ERROR,
   WINDOWS_BATCH_UNSAFE_CHARACTERS_LABEL
 } from '../../shared/windows-batch-spawn'
-import { ACCOUNT_IMPORT_RUNTIME_CAPABILITY } from '../../shared/protocol-version'
+import {
+  ACCOUNT_IMPORT_RUNTIME_CAPABILITY,
+  CLAUDE_SIGN_IN_RUNTIME_CAPABILITY
+} from '../../shared/protocol-version'
 
 function successfulChild(): EventEmitter {
   const child = new EventEmitter()
@@ -131,8 +133,14 @@ describe('account CLI handlers', () => {
         ok: true,
         result:
           method === 'status.get'
-            ? { capabilities: [ACCOUNT_IMPORT_RUNTIME_CAPABILITY] }
-            : accountState(method.includes('Claude') ? 'claude@example.com' : 'codex@example.com'),
+            ? {
+                capabilities: [ACCOUNT_IMPORT_RUNTIME_CAPABILITY, CLAUDE_SIGN_IN_RUNTIME_CAPABILITY]
+              }
+            : method === 'accounts.beginClaudeSignIn'
+              ? { accountId: 'draft', configDir: '/fake/final-profile', runtime: 'host' }
+              : accountState(
+                  method.includes('Claude') ? 'claude@example.com' : 'codex@example.com'
+                ),
         _meta: { runtimeId: 'test-runtime' }
       })
     )
@@ -306,37 +314,17 @@ describe('account CLI handlers', () => {
     expect(pathValues).toContain(`${nodeBin}${delimiter}${effectivePathBefore}`)
   })
 
-  it('removes scoped Claude credentials and restores the legacy Keychain item', async () => {
-    Object.defineProperty(process, 'platform', { configurable: true, value: 'darwin' })
-    readKeychainMock.mockResolvedValue('legacy-credentials')
-
+  it('runs login in the final profile and never reads, writes or cleans up Keychain credentials', async () => {
     await ACCOUNT_HANDLERS['account add'](context('claude'))
-
-    const configDir = spawnMock.mock.calls[0]?.[2].env.CLAUDE_CONFIG_DIR
-    expect(deleteKeychainMock).toHaveBeenCalledWith(configDir)
-    expect(writeKeychainMock).toHaveBeenCalledWith('legacy-credentials')
-    expect(callMock).toHaveBeenCalledWith('accounts.addClaudeFromConfigDir', {
-      configDir,
-      previousLegacyCredentialsSha256: createHash('sha256')
-        .update('legacy-credentials')
-        .digest('hex')
-    })
-    expect(existsSync(configDir)).toBe(false)
-  })
-
-  it('attributes a Claude account added through the WSL bridge to the cwd distro', async () => {
-    Object.defineProperty(process, 'platform', { configurable: true, value: 'win32' })
-
-    await ACCOUNT_HANDLERS['account add'](
-      context('claude', false, String.raw`\\wsl.localhost\Ubuntu-22.04\home\user\project`)
+    expect(spawnMock.mock.calls[0]?.[2].env.CLAUDE_CONFIG_DIR).toBe('/fake/final-profile')
+    expect(callMock).toHaveBeenCalledWith(
+      'accounts.finishClaudeSignIn',
+      { accountId: 'draft', runtime: 'host', wslDistro: undefined },
+      { timeoutMs: 300000 }
     )
-
-    const configDir = spawnMock.mock.calls[0]?.[2].env.CLAUDE_CONFIG_DIR
-    expect(callMock).toHaveBeenCalledWith('accounts.addClaudeFromConfigDir', {
-      configDir,
-      runtime: 'wsl',
-      wslDistro: 'Ubuntu-22.04'
-    })
+    expect(readKeychainMock).not.toHaveBeenCalled()
+    expect(writeKeychainMock).not.toHaveBeenCalled()
+    expect(deleteKeychainMock).not.toHaveBeenCalled()
   })
 
   it('attributes a Codex account added through the WSL bridge to the cwd distro', async () => {
@@ -364,8 +352,9 @@ describe('account CLI handlers', () => {
     )
 
     expect(callMock).toHaveBeenCalledWith(
-      'accounts.addClaudeFromConfigDir',
-      expect.objectContaining({ runtime: 'wsl', wslDistro: 'Debian' })
+      'accounts.beginClaudeSignIn',
+      expect.objectContaining({ runtime: 'wsl', wslDistro: 'Debian' }),
+      { timeoutMs: 300000 }
     )
   })
 
@@ -375,10 +364,14 @@ describe('account CLI handlers', () => {
       Object.defineProperty(process, 'platform', { configurable: true, value: 'win32' })
       process.env.ORCA_CLI_WSL_DISTRO = 'Ubuntu Work'
       await ACCOUNT_HANDLERS['account add'](context(agent, false, String.raw`C:\work with spaces`))
-      expect(callMock).toHaveBeenCalledWith(
-        agent === 'claude' ? 'accounts.addClaudeFromConfigDir' : 'accounts.addCodexFromHome',
-        expect.objectContaining({ runtime: 'wsl', wslDistro: 'Ubuntu Work' })
-      )
+      expect(
+        callMock.mock.calls.some(
+          ([method, params]) =>
+            method ===
+              (agent === 'claude' ? 'accounts.beginClaudeSignIn' : 'accounts.addCodexFromHome') &&
+            params.wslDistro === 'Ubuntu Work'
+        )
+      ).toBe(true)
     }
   )
 
@@ -470,62 +463,6 @@ describe('account CLI handlers', () => {
     exitSpy.mockRestore()
   })
 
-  it('waits for in-flight cleanup when a second signal arrives', async () => {
-    // Why: a boolean latch lets the second signal's process.exit fire while the
-    // first cleanup is still inside a Keychain call, stranding the credentials.
-    Object.defineProperty(process, 'platform', { configurable: true, value: 'darwin' })
-    readKeychainMock.mockResolvedValue('legacy-credentials')
-    let releaseKeychainDelete: (() => void) | undefined
-    deleteKeychainMock.mockImplementationOnce(
-      () =>
-        new Promise<void>((resolvePromise) => {
-          releaseKeychainDelete = () => resolvePromise()
-        })
-    )
-    const child = Object.assign(new EventEmitter(), { kill: vi.fn() })
-    let configDir = ''
-    spawnMock.mockImplementation((_command, _args, options: { env: Record<string, string> }) => {
-      configDir = options.env.CLAUDE_CONFIG_DIR
-      return child
-    })
-    const exitSpy = vi.spyOn(process, 'exit').mockImplementation((() => undefined) as never)
-    const sigintBefore = process.listeners('SIGINT')
-    const sigtermBefore = process.listeners('SIGTERM')
-
-    const pending = ACCOUNT_HANDLERS['account add'](context('claude')).catch(() => {})
-    await vi.waitFor(() => expect(configDir).not.toBe(''))
-
-    const onSigint = newSignalListener('SIGINT', sigintBefore)
-    const onSigterm = newSignalListener('SIGTERM', sigtermBefore)
-    // Why: `rawListeners` exposes the `once` wrapper, so this fails if the handler
-    // is registered with `once` — where a second Ctrl-C falls through to Node's
-    // default and kills the process mid-cleanup.
-    expect(process.rawListeners('SIGINT')).toContain(onSigint)
-
-    onSigint('SIGINT')
-    await vi.waitFor(() => expect(child.kill).toHaveBeenCalledWith('SIGINT'))
-    child.emit('exit', 1)
-    child.emit('close', 1)
-    await vi.waitFor(() => expect(deleteKeychainMock).toHaveBeenCalledWith(configDir))
-    onSigterm('SIGTERM')
-    await new Promise<void>((resolvePromise) => {
-      setImmediate(resolvePromise)
-    })
-
-    expect(exitSpy).not.toHaveBeenCalled()
-    expect(writeKeychainMock).not.toHaveBeenCalled()
-    expect(existsSync(configDir)).toBe(true)
-
-    releaseKeychainDelete?.()
-    await vi.waitFor(() => expect(exitSpy).toHaveBeenCalled())
-    expect(writeKeychainMock).toHaveBeenCalledWith('legacy-credentials')
-    expect(existsSync(configDir)).toBe(false)
-    expect(child.kill).toHaveBeenCalledOnce()
-
-    await pending
-    exitSpy.mockRestore()
-  })
-
   it('warns that the account may already be registered when interrupted mid-RPC', async () => {
     // Why: the runtime finishes the add independently of this process, so an
     // interrupt after sign-in cannot honestly be reported as "not added".
@@ -540,7 +477,9 @@ describe('account CLI handlers', () => {
         ? Promise.resolve({
             id: 'test',
             ok: true,
-            result: { capabilities: [ACCOUNT_IMPORT_RUNTIME_CAPABILITY] },
+            result: {
+              capabilities: [ACCOUNT_IMPORT_RUNTIME_CAPABILITY, CLAUDE_SIGN_IN_RUNTIME_CAPABILITY]
+            },
             _meta: { runtimeId: 'test-runtime' }
           })
         : method === 'accounts.list'
@@ -569,32 +508,6 @@ describe('account CLI handlers', () => {
     exitSpy.mockRestore()
   })
 
-  it('stays armed for signals until post-success cleanup finishes', async () => {
-    // Why: detaching the handlers before cleanup leaves the multi-second Keychain
-    // calls covered only by Node's default handling, which kills mid-cleanup.
-    Object.defineProperty(process, 'platform', { configurable: true, value: 'darwin' })
-    readKeychainMock.mockResolvedValue('legacy-credentials')
-    let releaseKeychainDelete: (() => void) | undefined
-    deleteKeychainMock.mockImplementationOnce(
-      () =>
-        new Promise<void>((resolvePromise) => {
-          releaseKeychainDelete = () => resolvePromise()
-        })
-    )
-
-    const listenersBefore = process.listeners('SIGINT')
-
-    const pending = ACCOUNT_HANDLERS['account add'](context('claude'))
-    await vi.waitFor(() => expect(deleteKeychainMock).toHaveBeenCalled())
-
-    // Why: cleanup is still in flight here, so this add's guard must still be installed.
-    const handler = newSignalListener('SIGINT', listenersBefore)
-
-    releaseKeychainDelete?.()
-    await pending
-    expect(process.listeners('SIGINT')).not.toContain(handler)
-  })
-
   it('fails before the login when the runtime is unreachable', async () => {
     // Why: discovering a dead runtime after sign-in wastes a full OAuth round trip.
     callMock.mockRejectedValue(new Error('runtime not running'))
@@ -606,22 +519,40 @@ describe('account CLI handlers', () => {
     expect(spawnMock).not.toHaveBeenCalled()
   })
 
-  it('fails before login when the running runtime predates account imports', async () => {
+  it('still adds Codex through an older host that advertises only the retired import capability', async () => {
     callMock.mockResolvedValue({
       id: 'test',
       ok: true,
-      result: { capabilities: [] },
+      result: { capabilities: [ACCOUNT_IMPORT_RUNTIME_CAPABILITY] },
       _meta: { runtimeId: 'test-runtime' }
     })
+    spawnMock.mockImplementation(() => {
+      throw new Error('stop after the capability gate')
+    })
 
-    await expect(ACCOUNT_HANDLERS['account add'](context('codex'))).rejects.toThrow(
-      'runtime is too old'
-    )
-    expect(callMock).toHaveBeenCalledOnce()
-    expect(callMock).toHaveBeenCalledWith('status.get')
-    expect(spawnMock).not.toHaveBeenCalled()
+    await expect(ACCOUNT_HANDLERS['account add'](context('codex'))).rejects.toThrow()
+    expect(spawnMock).toHaveBeenCalled()
   })
 
+  it.each(['claude', 'codex'] as const)(
+    'refuses %s login before spawning when its capability is absent',
+    async (agent) => {
+      callMock.mockResolvedValue({
+        id: 'test',
+        ok: true,
+        result: { capabilities: [] },
+        _meta: { runtimeId: 'test-runtime' }
+      })
+
+      await expect(ACCOUNT_HANDLERS['account add'](context(agent))).rejects.toThrow(
+        'The running Orca runtime is too old to add accounts from the CLI.'
+      )
+      expect(callMock).toHaveBeenCalledOnce()
+      expect(callMock).toHaveBeenCalledWith('status.get')
+      expect(spawnMock).not.toHaveBeenCalled()
+    }
+  )
+
   it.each(['environment', 'pairing-code'])(
     'rejects --%s instead of silently ignoring it',
     async (flag) => {
@@ -667,7 +598,9 @@ describe('account CLI handlers', () => {
         ? Promise.resolve({
             id: 'test',
             ok: true,
-            result: { capabilities: [ACCOUNT_IMPORT_RUNTIME_CAPABILITY] },
+            result: {
+              capabilities: [ACCOUNT_IMPORT_RUNTIME_CAPABILITY, CLAUDE_SIGN_IN_RUNTIME_CAPABILITY]
+            },
             _meta: { runtimeId: 'test-runtime' }
           })
         : method === 'accounts.list'
@@ -699,15 +632,14 @@ describe('account CLI handlers', () => {
     expect(logSpy).not.toHaveBeenCalled()
   })
 
-  it('fails a successful Claude add when Keychain cleanup fails', async () => {
-    Object.defineProperty(process, 'platform', { configurable: true, value: 'darwin' })
-    readKeychainMock.mockResolvedValue('legacy-credentials')
-    deleteKeychainMock.mockRejectedValueOnce(new Error('Keychain denied cleanup'))
-
-    await expect(ACCOUNT_HANDLERS['account add'](context('claude'))).rejects.toThrow(
-      'Failed to clean up Claude login artifacts'
-    )
-    expect(writeKeychainMock).toHaveBeenCalledWith('legacy-credentials')
+  it('does not touch a locked Keychain while the CLI signs in', async () => {
+    readKeychainMock.mockRejectedValue(new Error('locked'))
+    deleteKeychainMock.mockRejectedValue(new Error('locked'))
+    writeKeychainMock.mockRejectedValue(new Error('locked'))
+    await ACCOUNT_HANDLERS['account add'](context('claude'))
+    expect(readKeychainMock).not.toHaveBeenCalled()
+    expect(deleteKeychainMock).not.toHaveBeenCalled()
+    expect(writeKeychainMock).not.toHaveBeenCalled()
   })
 
   it('rejects `--agent` with no value instead of defaulting to Claude', async () => {
@@ -741,6 +673,32 @@ describe('account CLI handlers', () => {
     expect(logSpy).toHaveBeenCalledWith(expect.stringContaining('claude@example.com (active)'))
   })
 
+  it('tells the user which saved Claude accounts need a fresh sign-in', async () => {
+    callMock.mockResolvedValue({
+      id: 'test',
+      ok: true,
+      result: {
+        claude: {
+          accounts: [
+            { id: 'old', email: 'old@example.com', needsSignIn: true },
+            { id: 'ok', email: 'ok@example.com' }
+          ],
+          activeAccountId: 'old'
+        },
+        codex: { accounts: [], activeAccountId: null }
+      },
+      _meta: { runtimeId: 'test-runtime' }
+    })
+
+    await ACCOUNT_HANDLERS['account list']({ ...context('claude'), flags: new Map() })
+
+    expect(logSpy).toHaveBeenCalledWith(
+      expect.stringContaining(
+        '  old@example.com (active) (sign in again in Orca Settings > AI Provider Accounts)\n  ok@example.com\n'
+      )
+    )
+  })
+
   it('lists accounts without forcing a provider usage refresh', async () => {
     // Why: the forced lane bypasses the poll throttle and costs one serial
     // round-trip per managed account, and this output shows no usage numbers.
diff --git a/src/cli/handlers/account.ts b/src/cli/handlers/account.ts
index d4081c3c5da1..db2cd31c8b8a 100644
--- a/src/cli/handlers/account.ts
+++ b/src/cli/handlers/account.ts
@@ -1,5 +1,4 @@
 import { spawn } from 'node:child_process'
-import { createHash } from 'node:crypto'
 import { mkdtempSync, rmSync } from 'node:fs'
 import { tmpdir } from 'node:os'
 import { delimiter, join } from 'node:path'
@@ -9,10 +8,10 @@ import { RuntimeClientError } from '../runtime-client'
 import { stripElectronRunAsNode } from '../runtime/launch'
 import { rejectRemoteSelectionFlags } from '../remote-selection-flag-rejection'
 import {
-  deleteActiveClaudeKeychainCredentialsStrict,
-  readActiveClaudeKeychainCredentialsStrict,
-  writeActiveClaudeKeychainCredentials
-} from '../../main/claude-accounts/keychain'
+  buildWslExecArgs,
+  buildWslLoginShellCommand,
+  quotePosixShell
+} from '../../shared/wsl-login-shell-command'
 import {
   getVersionManagerBinPaths,
   resolveCliCommand,
@@ -24,9 +23,13 @@ import {
   WINDOWS_BATCH_UNSAFE_CHARACTERS_LABEL
 } from '../../shared/windows-batch-spawn'
 import { stdioForWindowsInteractiveChild } from '../../shared/windows-console-input'
-import { ACCOUNT_IMPORT_RUNTIME_CAPABILITY } from '../../shared/protocol-version'
+import {
+  ACCOUNT_IMPORT_RUNTIME_CAPABILITY,
+  CLAUDE_SIGN_IN_RUNTIME_CAPABILITY
+} from '../../shared/protocol-version'
 import type { RuntimeStatus } from '../../shared/runtime-types'
 import type {
+  ClaudeAccountSignIn,
   ClaudeRateLimitAccountsState,
   CodexRateLimitAccountsState,
   ManagedDataAccountsState
@@ -140,79 +143,53 @@ async function runAgentLoginInTerminal(
   })
 }
 
-async function cleanupClaudeLoginArtifacts(
-  configDir: string,
-  legacyCredentials: string | null,
-  restoreLegacyCredentials: boolean
-): Promise<void> {
-  const errors: unknown[] = []
-  if (process.platform === 'darwin') {
-    try {
-      await deleteActiveClaudeKeychainCredentialsStrict(configDir)
-    } catch (error) {
-      errors.push(error)
-    }
-    if (restoreLegacyCredentials) {
-      try {
-        await (legacyCredentials
-          ? writeActiveClaudeKeychainCredentials(legacyCredentials)
-          : deleteActiveClaudeKeychainCredentialsStrict())
-      } catch (error) {
-        errors.push(error)
-      }
-    }
-  }
-  try {
-    rmSync(configDir, { recursive: true, force: true })
-  } catch (error) {
-    errors.push(error)
-  }
-  if (errors.length > 0) {
-    throw new AggregateError(errors, 'Failed to clean up Claude login artifacts.')
-  }
-}
-
-/** Logs into a Claude account in a temp config dir, then registers it with the local runtime. */
+/** Signs in to a new account folder the host created, then registers it (superset AddAccountDialog). */
 async function addClaudeAccount({ client, cwd, json }: HandlerContext): Promise<void> {
-  const configDir = mkdtempSync(join(tmpdir(), 'orca-account-add-claude-'))
+  const { result: signIn } = await client.call<ClaudeAccountSignIn>(
+    'accounts.beginClaudeSignIn',
+    getWslAccountTarget(cwd) ?? {},
+    { timeoutMs: 300_000 }
+  )
   const session: InteractiveLoginSession = {
     child: null,
     registering: false,
     terminationPromise: null
   }
-  let legacyCredentials: string | null = null
-  let restoreLegacyCredentials = false
   const result = await withInteractiveLoginCleanup(
     session,
+    // Why always: the host keeps a folder that became an account, and deletes an abandoned one.
+    // Never thrown: an older running Orca lacks the method, and the add itself already finished.
     async () => {
-      await cleanupClaudeLoginArtifacts(configDir, legacyCredentials, restoreLegacyCredentials)
+      const { accountId, runtime, wslDistro } = signIn
+      await client
+        .call('accounts.cancelClaudeSignIn', { accountId, runtime, wslDistro })
+        .catch((error: unknown) => console.warn('[account] Could not clean up sign-in:', error))
     },
     async () => {
-      if (process.platform === 'darwin') {
-        legacyCredentials = await readActiveClaudeKeychainCredentialsStrict()
-        restoreLegacyCredentials = true
+      if (signIn.runtime === 'wsl' && signIn.wslDistro) {
+        const login = `exec env CLAUDE_CONFIG_DIR=${quotePosixShell(signIn.configDir)} claude auth login`
+        await runAgentLoginInTerminal(
+          'wsl.exe',
+          buildWslExecArgs(signIn.wslDistro, ['/bin/sh', '-c', buildWslLoginShellCommand(login)]),
+          {},
+          json,
+          session
+        )
+      } else {
+        await runAgentLoginInTerminal(
+          'claude',
+          ['auth', 'login'],
+          { CLAUDE_CONFIG_DIR: signIn.configDir },
+          json,
+          session
+        )
       }
-      await runAgentLoginInTerminal(
-        'claude',
-        ['auth', 'login', '--claudeai'],
-        {
-          CLAUDE_CONFIG_DIR: configDir
-        },
-        json,
-        session
-      )
       session.registering = true
-      return client.call<ClaudeRateLimitAccountsState>('accounts.addClaudeFromConfigDir', {
-        configDir,
-        ...getWslAccountTarget(cwd),
-        ...(process.platform === 'darwin'
-          ? {
-              previousLegacyCredentialsSha256: legacyCredentials
-                ? createHash('sha256').update(legacyCredentials).digest('hex')
-                : null
-            }
-          : {})
-      })
+      return client.call<ClaudeRateLimitAccountsState>(
+        'accounts.finishClaudeSignIn',
+        { accountId: signIn.accountId, runtime: signIn.runtime, wslDistro: signIn.wslDistro },
+        { timeoutMs: 300_000 }
+      )
     }
   )
   printResult(result, json, (state) => formatAccountsBlock('Claude', state))
@@ -265,9 +242,14 @@ function rejectAccountRemoteSelectionFlags(ctx: HandlerContext, command: string)
   )
 }
 
-async function assertAccountImportSupported({ client }: HandlerContext): Promise<void> {
+async function assertAccountImportSupported(
+  { client }: HandlerContext,
+  agent: 'claude' | 'codex'
+): Promise<void> {
   const status = await client.call<RuntimeStatus>('status.get')
-  if (!status.result.capabilities?.includes(ACCOUNT_IMPORT_RUNTIME_CAPABILITY)) {
+  const capability =
+    agent === 'claude' ? CLAUDE_SIGN_IN_RUNTIME_CAPABILITY : ACCOUNT_IMPORT_RUNTIME_CAPABILITY
+  if (!status.result.capabilities?.includes(capability)) {
     throw new RuntimeClientError(
       'incompatible_runtime',
       'The running Orca runtime is too old to add accounts from the CLI. Update or restart Orca and try again.'
@@ -300,7 +282,7 @@ export const ACCOUNT_HANDLERS: Record<string, CommandHandler> = {
       return
     }
     // Why: fail on runtime version skew before burning a full OAuth round trip.
-    await assertAccountImportSupported(ctx)
+    await assertAccountImportSupported(ctx, agent)
     await ctx.client.call('accounts.list', { refreshUsage: false })
     await (agent === 'claude' ? addClaudeAccount(ctx) : addCodexAccount(ctx))
   },
diff --git a/src/cli/handlers/terminal-originating-pane.test.ts b/src/cli/handlers/terminal-originating-pane.test.ts
index c10e40875e4a..0d61c5096f98 100644
--- a/src/cli/handlers/terminal-originating-pane.test.ts
+++ b/src/cli/handlers/terminal-originating-pane.test.ts
@@ -1,7 +1,7 @@
 import { describe, expect, it, vi } from 'vitest'
 import { terminalSwitchOriginHandler } from './terminal-originating-pane'
 import type { HandlerContext } from '../dispatch'
-import { TERMINAL_ORIGINATING_PANE_NAVIGATION_RUNTIME_CAPABILITY } from '../../shared/protocol-version'
+import { TERMINAL_ORIGINATING_PANE_NAVIGATION_RUNTIME_CAPABILITY } from '../../shared/terminal-navigation-runtime-capabilities'
 import { CORE_COMMAND_SPECS } from '../specs/core'
 import { parseArgs, validateCommandAndFlags } from '../args'
 
diff --git a/src/cli/handlers/terminal-originating-pane.ts b/src/cli/handlers/terminal-originating-pane.ts
index aab7eea7ed5f..8fd11049d327 100644
--- a/src/cli/handlers/terminal-originating-pane.ts
+++ b/src/cli/handlers/terminal-originating-pane.ts
@@ -2,7 +2,7 @@ import type { CommandHandler } from '../dispatch'
 import { getOptionalStringFlag, getRequiredStringFlag } from '../flags'
 import { printResult } from '../format'
 import { RuntimeClientError } from '../runtime-client'
-import { TERMINAL_ORIGINATING_PANE_NAVIGATION_RUNTIME_CAPABILITY } from '../../shared/protocol-version'
+import { TERMINAL_ORIGINATING_PANE_NAVIGATION_RUNTIME_CAPABILITY } from '../../shared/terminal-navigation-runtime-capabilities'
 import { TerminalSwitchOrigin } from '../../shared/rpc-contract/terminal-originating-pane-params'
 
 export const terminalSwitchOriginHandler: CommandHandler = async ({ flags, client, json }) => {
diff --git a/src/cli/handlers/terminal-question-answer.test.ts b/src/cli/handlers/terminal-question-answer.test.ts
index 19372eda76f9..6d724b17c35a 100644
--- a/src/cli/handlers/terminal-question-answer.test.ts
+++ b/src/cli/handlers/terminal-question-answer.test.ts
@@ -1,7 +1,7 @@
 import { describe, expect, it, vi } from 'vitest'
 import { terminalQuestionAnswerHandler } from './terminal-question-answer'
 import type { HandlerContext } from '../dispatch'
-import { TERMINAL_QUESTION_ANSWER_RUNTIME_CAPABILITY } from '../../shared/protocol-version'
+import { TERMINAL_QUESTION_ANSWER_RUNTIME_CAPABILITY } from '../../shared/terminal-navigation-runtime-capabilities'
 
 vi.mock('../format', () => ({ printResult: vi.fn() }))
 
diff --git a/src/cli/handlers/terminal-question-answer.ts b/src/cli/handlers/terminal-question-answer.ts
index 370222b58db6..f5143d621c7b 100644
--- a/src/cli/handlers/terminal-question-answer.ts
+++ b/src/cli/handlers/terminal-question-answer.ts
@@ -2,7 +2,7 @@ import type { CommandHandler } from '../dispatch'
 import { getOptionalStringFlag, getRequiredStringFlag } from '../flags'
 import { printResult } from '../format'
 import { RuntimeClientError } from '../runtime-client'
-import { TERMINAL_QUESTION_ANSWER_RUNTIME_CAPABILITY } from '../../shared/protocol-version'
+import { TERMINAL_QUESTION_ANSWER_RUNTIME_CAPABILITY } from '../../shared/terminal-navigation-runtime-capabilities'
 
 export const terminalQuestionAnswerHandler: CommandHandler = async ({ flags, client, json }) => {
   const provider = getRequiredStringFlag(flags, 'provider')
diff --git a/src/cli/handlers/terminal-session-navigation.ts b/src/cli/handlers/terminal-session-navigation.ts
index 0fdf79b21153..ff8741413626 100644
--- a/src/cli/handlers/terminal-session-navigation.ts
+++ b/src/cli/handlers/terminal-session-navigation.ts
@@ -2,7 +2,7 @@ import type { CommandHandler } from '../dispatch'
 import { getRequiredStringFlag } from '../flags'
 import { printResult } from '../format'
 import { RuntimeClientError } from '../runtime-client'
-import { TERMINAL_SESSION_NAVIGATION_RUNTIME_CAPABILITY } from '../../shared/protocol-version'
+import { TERMINAL_SESSION_NAVIGATION_RUNTIME_CAPABILITY } from '../../shared/terminal-navigation-runtime-capabilities'
 
 function handler(method: string): CommandHandler {
   return async ({ flags, client, json }) => {
diff --git a/src/cli/runtime/websocket-transport.test.ts b/src/cli/runtime/websocket-transport.test.ts
index 32559f305e11..5c814f91fc63 100644
--- a/src/cli/runtime/websocket-transport.test.ts
+++ b/src/cli/runtime/websocket-transport.test.ts
@@ -1,3 +1,4 @@
+import { SKILL_INSTALL_RESULT_V2_CAPABILITY } from '../../shared/skill-install-capability'
 import { createServer, type Server } from 'node:http'
 import { mkdtempSync } from 'node:fs'
 import { tmpdir } from 'node:os'
@@ -28,7 +29,6 @@ import {
   RUNTIME_PROTOCOL_VERSION,
   SESSION_TABS_AUTHORITATIVE_INVENTORY_RUNTIME_CAPABILITY,
   SESSION_TAB_CLOSE_INTENT_RUNTIME_CAPABILITY,
-  SKILL_INSTALL_RESULT_V2_CAPABILITY,
   WORKTREE_GITHUB_PR_SUPPRESSION_RUNTIME_CAPABILITY,
   WORKTREE_VISIBILITY_DEFAULTS_RUNTIME_CAPABILITY,
   WORKTREE_VISIBILITY_SOURCE_DEFAULTS_RUNTIME_CAPABILITY
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 c8de61a9fdac..eb280f1900bf 100644
--- a/src/main/__fixtures__/shell-wrapper-snapshots/daemon-bash-rcfile.txt
+++ b/src/main/__fixtures__/shell-wrapper-snapshots/daemon-bash-rcfile.txt
@@ -138,6 +138,30 @@ if [[ -n "${__orca_codex_binary:-}" && -x "${__orca_codex_binary}" ]]; then
   }
 fi
 unset __orca_codex_binary
+__orca_claude_binary="$(unalias claude 2>/dev/null || :; command -v claude 2>/dev/null || :)"
+if [[ -n "${ORCA_CLAUDE_PROFILE_POINTER:-}" && -n "${__orca_claude_binary:-}" && -x "${__orca_claude_binary}" ]]; then
+  function claude {
+    local __orca_claude_home __orca_claude_pointer="${ORCA_CLAUDE_PROFILE_POINTER:-}"
+    # Why: a WSL pane's pointer is relative to the guest home, which the host cannot know at spawn.
+    case "$__orca_claude_pointer" in '~/'*) __orca_claude_pointer="${HOME:-}/${__orca_claude_pointer#??}" ;; esac
+    __orca_claude_home="$(cat "$__orca_claude_pointer" 2>/dev/null || :)"
+    if [ -n "${CLAUDE_CONFIG_DIR:-}" ] && [ "$CLAUDE_CONFIG_DIR" != "${ORCA_CLAUDE_INJECTED_CONFIG_DIR:-}" ]; then
+      command claude "$@"; return
+    fi
+    # Why: Orca's value replaced the user's own at spawn, so System default restores theirs.
+    if [ -z "$__orca_claude_home" ] && [ -n "${CLAUDE_CONFIG_DIR:-}" ] && [ -n "${ORCA_CLAUDE_USER_CONFIG_DIR:-}" ]; then
+      ( unset ORCA_CLAUDE_INJECTED_CONFIG_DIR; export CLAUDE_CONFIG_DIR="$ORCA_CLAUDE_USER_CONFIG_DIR"; command claude "$@" ); return
+    fi
+    if [ -z "$__orca_claude_home" ]; then
+      ( unset CLAUDE_CONFIG_DIR ORCA_CLAUDE_INJECTED_CONFIG_DIR; command claude "$@" ); return
+    fi
+    case "$__orca_claude_home" in /*|[A-Za-z]:*) ;; *) return 1 ;; esac
+    # Why -m 700: matches the folder Orca's setup creates; a credentials folder stays private.
+    [ -d "$__orca_claude_home" ] || mkdir -p -m 700 -- "$__orca_claude_home" 2>/dev/null
+    ( unset ANTHROPIC_API_KEY ANTHROPIC_AUTH_TOKEN CLAUDE_CODE_OAUTH_TOKEN AWS_BEARER_TOKEN_BEDROCK; case "${ANTHROPIC_CUSTOM_HEADERS:-}" in *[aA][uU][tT][hH][oO][rR][iI][zZ][aA][tT][iI][oO][nN]*|*[xX]-[aA][pP][iI]-[kK][eE][yY]*|*[aA][pP][iI]-[kK][eE][yY]*|*[bB][eE][aA][rR][eE][rR]*) unset ANTHROPIC_CUSTOM_HEADERS ;; esac; export CLAUDE_CONFIG_DIR="$__orca_claude_home" ORCA_CLAUDE_INJECTED_CONFIG_DIR="$__orca_claude_home"; command claude "$@" )
+  }
+fi
+unset __orca_claude_binary
 
 # Why: emit OSC 133 C/D so terminal-command-lifecycle can drop stale agent
 # status when the foreground command exits — mirrors the zsh daemon wrapper.
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 ff24125e2c00..42fb21032ecc 100644
--- a/src/main/__fixtures__/shell-wrapper-snapshots/daemon-fish-init.txt
+++ b/src/main/__fixtures__/shell-wrapper-snapshots/daemon-fish-init.txt
@@ -17,4 +17,34 @@ if test "$__orca_codex_type" = file
     command codex $argv
   end
 end
-set -e __orca_codex_type
\ No newline at end of file
+set -e __orca_codex_type
+set -l __orca_claude_type (type -t claude 2>/dev/null)
+if test -n "$ORCA_CLAUDE_PROFILE_POINTER"; and test "$__orca_claude_type" = file
+  function claude
+    # Why: a WSL pane's pointer is relative to the guest home, which the host cannot know at spawn.
+    set -l pointer (string replace -r '^~/' "$HOME/" -- "$ORCA_CLAUDE_PROFILE_POINTER")
+    set -l profile (cat "$pointer" 2>/dev/null)
+    if test -n "$CLAUDE_CONFIG_DIR"; and test "$CLAUDE_CONFIG_DIR" != "$ORCA_CLAUDE_INJECTED_CONFIG_DIR"
+      command claude $argv
+      return $status
+    end
+    if test -z "$profile"; and test -n "$CLAUDE_CONFIG_DIR"; and test -n "$ORCA_CLAUDE_USER_CONFIG_DIR"
+      env -u ORCA_CLAUDE_INJECTED_CONFIG_DIR CLAUDE_CONFIG_DIR="$ORCA_CLAUDE_USER_CONFIG_DIR" claude $argv
+      return $status
+    end
+    if test -z "$profile"
+      env -u CLAUDE_CONFIG_DIR -u ORCA_CLAUDE_INJECTED_CONFIG_DIR claude $argv
+      return $status
+    end
+    if not string match -qr '^(/|[A-Za-z]:)' -- "$profile"
+      return 1
+    end
+    test -d "$profile"; or mkdir -p -m 700 -- "$profile" 2>/dev/null
+    set -l headers
+    if string match -irq 'authorization|x-api-key|api-key|bearer' -- "$ANTHROPIC_CUSTOM_HEADERS"
+      set headers -u ANTHROPIC_CUSTOM_HEADERS
+    end
+    env $headers -u ANTHROPIC_API_KEY -u ANTHROPIC_AUTH_TOKEN -u CLAUDE_CODE_OAUTH_TOKEN -u AWS_BEARER_TOKEN_BEDROCK CLAUDE_CONFIG_DIR="$profile" ORCA_CLAUDE_INJECTED_CONFIG_DIR="$profile" claude $argv
+  end
+end
+set -e __orca_claude_type
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 18850b4a0efc..22c221bb9434 100644
--- a/src/main/__fixtures__/shell-wrapper-snapshots/daemon-zsh-zshenv.txt
+++ b/src/main/__fixtures__/shell-wrapper-snapshots/daemon-zsh-zshenv.txt
@@ -220,6 +220,30 @@ __orca_deferred_init() {
     }
   fi
   unset __orca_codex_binary
+  __orca_claude_binary="$(unalias claude 2>/dev/null || :; command -v claude 2>/dev/null || :)"
+  if [[ -n "${ORCA_CLAUDE_PROFILE_POINTER:-}" && -n "${__orca_claude_binary:-}" && -x "${__orca_claude_binary}" ]]; then
+    function claude {
+      local __orca_claude_home __orca_claude_pointer="${ORCA_CLAUDE_PROFILE_POINTER:-}"
+      # Why: a WSL pane's pointer is relative to the guest home, which the host cannot know at spawn.
+      case "$__orca_claude_pointer" in '~/'*) __orca_claude_pointer="${HOME:-}/${__orca_claude_pointer#??}" ;; esac
+      __orca_claude_home="$(cat "$__orca_claude_pointer" 2>/dev/null || :)"
+      if [ -n "${CLAUDE_CONFIG_DIR:-}" ] && [ "$CLAUDE_CONFIG_DIR" != "${ORCA_CLAUDE_INJECTED_CONFIG_DIR:-}" ]; then
+        command claude "$@"; return
+      fi
+      # Why: Orca's value replaced the user's own at spawn, so System default restores theirs.
+      if [ -z "$__orca_claude_home" ] && [ -n "${CLAUDE_CONFIG_DIR:-}" ] && [ -n "${ORCA_CLAUDE_USER_CONFIG_DIR:-}" ]; then
+        ( unset ORCA_CLAUDE_INJECTED_CONFIG_DIR; export CLAUDE_CONFIG_DIR="$ORCA_CLAUDE_USER_CONFIG_DIR"; command claude "$@" ); return
+      fi
+      if [ -z "$__orca_claude_home" ]; then
+        ( unset CLAUDE_CONFIG_DIR ORCA_CLAUDE_INJECTED_CONFIG_DIR; command claude "$@" ); return
+      fi
+      case "$__orca_claude_home" in /*|[A-Za-z]:*) ;; *) return 1 ;; esac
+      # Why -m 700: matches the folder Orca's setup creates; a credentials folder stays private.
+      [ -d "$__orca_claude_home" ] || mkdir -p -m 700 -- "$__orca_claude_home" 2>/dev/null
+      ( unset ANTHROPIC_API_KEY ANTHROPIC_AUTH_TOKEN CLAUDE_CODE_OAUTH_TOKEN AWS_BEARER_TOKEN_BEDROCK; case "${ANTHROPIC_CUSTOM_HEADERS:-}" in *[aA][uU][tT][hH][oO][rR][iI][zZ][aA][tT][iI][oO][nN]*|*[xX]-[aA][pP][iI]-[kK][eE][yY]*|*[aA][pP][iI]-[kK][eE][yY]*|*[bB][eE][aA][rR][eE][rR]*) unset ANTHROPIC_CUSTOM_HEADERS ;; esac; export CLAUDE_CONFIG_DIR="$__orca_claude_home" ORCA_CLAUDE_INJECTED_CONFIG_DIR="$__orca_claude_home"; command claude "$@" )
+    }
+  fi
+  unset __orca_claude_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 05f3da594e03..a43c7bf2c396 100644
--- a/src/main/__fixtures__/shell-wrapper-snapshots/local-bash-rcfile.txt
+++ b/src/main/__fixtures__/shell-wrapper-snapshots/local-bash-rcfile.txt
@@ -148,6 +148,30 @@ if [[ -n "${__orca_codex_binary:-}" && -x "${__orca_codex_binary}" ]]; then
   }
 fi
 unset __orca_codex_binary
+__orca_claude_binary="$(unalias claude 2>/dev/null || :; command -v claude 2>/dev/null || :)"
+if [[ -n "${ORCA_CLAUDE_PROFILE_POINTER:-}" && -n "${__orca_claude_binary:-}" && -x "${__orca_claude_binary}" ]]; then
+  function claude {
+    local __orca_claude_home __orca_claude_pointer="${ORCA_CLAUDE_PROFILE_POINTER:-}"
+    # Why: a WSL pane's pointer is relative to the guest home, which the host cannot know at spawn.
+    case "$__orca_claude_pointer" in '~/'*) __orca_claude_pointer="${HOME:-}/${__orca_claude_pointer#??}" ;; esac
+    __orca_claude_home="$(cat "$__orca_claude_pointer" 2>/dev/null || :)"
+    if [ -n "${CLAUDE_CONFIG_DIR:-}" ] && [ "$CLAUDE_CONFIG_DIR" != "${ORCA_CLAUDE_INJECTED_CONFIG_DIR:-}" ]; then
+      command claude "$@"; return
+    fi
+    # Why: Orca's value replaced the user's own at spawn, so System default restores theirs.
+    if [ -z "$__orca_claude_home" ] && [ -n "${CLAUDE_CONFIG_DIR:-}" ] && [ -n "${ORCA_CLAUDE_USER_CONFIG_DIR:-}" ]; then
+      ( unset ORCA_CLAUDE_INJECTED_CONFIG_DIR; export CLAUDE_CONFIG_DIR="$ORCA_CLAUDE_USER_CONFIG_DIR"; command claude "$@" ); return
+    fi
+    if [ -z "$__orca_claude_home" ]; then
+      ( unset CLAUDE_CONFIG_DIR ORCA_CLAUDE_INJECTED_CONFIG_DIR; command claude "$@" ); return
+    fi
+    case "$__orca_claude_home" in /*|[A-Za-z]:*) ;; *) return 1 ;; esac
+    # Why -m 700: matches the folder Orca's setup creates; a credentials folder stays private.
+    [ -d "$__orca_claude_home" ] || mkdir -p -m 700 -- "$__orca_claude_home" 2>/dev/null
+    ( unset ANTHROPIC_API_KEY ANTHROPIC_AUTH_TOKEN CLAUDE_CODE_OAUTH_TOKEN AWS_BEARER_TOKEN_BEDROCK; case "${ANTHROPIC_CUSTOM_HEADERS:-}" in *[aA][uU][tT][hH][oO][rR][iI][zZ][aA][tT][iI][oO][nN]*|*[xX]-[aA][pP][iI]-[kK][eE][yY]*|*[aA][pP][iI]-[kK][eE][yY]*|*[bB][eE][aA][rR][eE][rR]*) unset ANTHROPIC_CUSTOM_HEADERS ;; esac; export CLAUDE_CONFIG_DIR="$__orca_claude_home" ORCA_CLAUDE_INJECTED_CONFIG_DIR="$__orca_claude_home"; command claude "$@" )
+  }
+fi
+unset __orca_claude_binary
 
 # Why: emit OSC 133 C/D so terminal-command-lifecycle can drop stale agent
 # status when the foreground command (e.g. an interrupted Claude/Codex CLI)
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 ff24125e2c00..42fb21032ecc 100644
--- a/src/main/__fixtures__/shell-wrapper-snapshots/local-fish-init.txt
+++ b/src/main/__fixtures__/shell-wrapper-snapshots/local-fish-init.txt
@@ -17,4 +17,34 @@ if test "$__orca_codex_type" = file
     command codex $argv
   end
 end
-set -e __orca_codex_type
\ No newline at end of file
+set -e __orca_codex_type
+set -l __orca_claude_type (type -t claude 2>/dev/null)
+if test -n "$ORCA_CLAUDE_PROFILE_POINTER"; and test "$__orca_claude_type" = file
+  function claude
+    # Why: a WSL pane's pointer is relative to the guest home, which the host cannot know at spawn.
+    set -l pointer (string replace -r '^~/' "$HOME/" -- "$ORCA_CLAUDE_PROFILE_POINTER")
+    set -l profile (cat "$pointer" 2>/dev/null)
+    if test -n "$CLAUDE_CONFIG_DIR"; and test "$CLAUDE_CONFIG_DIR" != "$ORCA_CLAUDE_INJECTED_CONFIG_DIR"
+      command claude $argv
+      return $status
+    end
+    if test -z "$profile"; and test -n "$CLAUDE_CONFIG_DIR"; and test -n "$ORCA_CLAUDE_USER_CONFIG_DIR"
+      env -u ORCA_CLAUDE_INJECTED_CONFIG_DIR CLAUDE_CONFIG_DIR="$ORCA_CLAUDE_USER_CONFIG_DIR" claude $argv
+      return $status
+    end
+    if test -z "$profile"
+      env -u CLAUDE_CONFIG_DIR -u ORCA_CLAUDE_INJECTED_CONFIG_DIR claude $argv
+      return $status
+    end
+    if not string match -qr '^(/|[A-Za-z]:)' -- "$profile"
+      return 1
+    end
+    test -d "$profile"; or mkdir -p -m 700 -- "$profile" 2>/dev/null
+    set -l headers
+    if string match -irq 'authorization|x-api-key|api-key|bearer' -- "$ANTHROPIC_CUSTOM_HEADERS"
+      set headers -u ANTHROPIC_CUSTOM_HEADERS
+    end
+    env $headers -u ANTHROPIC_API_KEY -u ANTHROPIC_AUTH_TOKEN -u CLAUDE_CODE_OAUTH_TOKEN -u AWS_BEARER_TOKEN_BEDROCK CLAUDE_CONFIG_DIR="$profile" ORCA_CLAUDE_INJECTED_CONFIG_DIR="$profile" claude $argv
+  end
+end
+set -e __orca_claude_type
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 b3c8a92869ca..e6e492c48bcf 100644
--- a/src/main/__fixtures__/shell-wrapper-snapshots/local-zsh-zshenv.txt
+++ b/src/main/__fixtures__/shell-wrapper-snapshots/local-zsh-zshenv.txt
@@ -227,6 +227,30 @@ __orca_deferred_init() {
     }
   fi
   unset __orca_codex_binary
+  __orca_claude_binary="$(unalias claude 2>/dev/null || :; command -v claude 2>/dev/null || :)"
+  if [[ -n "${ORCA_CLAUDE_PROFILE_POINTER:-}" && -n "${__orca_claude_binary:-}" && -x "${__orca_claude_binary}" ]]; then
+    function claude {
+      local __orca_claude_home __orca_claude_pointer="${ORCA_CLAUDE_PROFILE_POINTER:-}"
+      # Why: a WSL pane's pointer is relative to the guest home, which the host cannot know at spawn.
+      case "$__orca_claude_pointer" in '~/'*) __orca_claude_pointer="${HOME:-}/${__orca_claude_pointer#??}" ;; esac
+      __orca_claude_home="$(cat "$__orca_claude_pointer" 2>/dev/null || :)"
+      if [ -n "${CLAUDE_CONFIG_DIR:-}" ] && [ "$CLAUDE_CONFIG_DIR" != "${ORCA_CLAUDE_INJECTED_CONFIG_DIR:-}" ]; then
+        command claude "$@"; return
+      fi
+      # Why: Orca's value replaced the user's own at spawn, so System default restores theirs.
+      if [ -z "$__orca_claude_home" ] && [ -n "${CLAUDE_CONFIG_DIR:-}" ] && [ -n "${ORCA_CLAUDE_USER_CONFIG_DIR:-}" ]; then
+        ( unset ORCA_CLAUDE_INJECTED_CONFIG_DIR; export CLAUDE_CONFIG_DIR="$ORCA_CLAUDE_USER_CONFIG_DIR"; command claude "$@" ); return
+      fi
+      if [ -z "$__orca_claude_home" ]; then
+        ( unset CLAUDE_CONFIG_DIR ORCA_CLAUDE_INJECTED_CONFIG_DIR; command claude "$@" ); return
+      fi
+      case "$__orca_claude_home" in /*|[A-Za-z]:*) ;; *) return 1 ;; esac
+      # Why -m 700: matches the folder Orca's setup creates; a credentials folder stays private.
+      [ -d "$__orca_claude_home" ] || mkdir -p -m 700 -- "$__orca_claude_home" 2>/dev/null
+      ( unset ANTHROPIC_API_KEY ANTHROPIC_AUTH_TOKEN CLAUDE_CODE_OAUTH_TOKEN AWS_BEARER_TOKEN_BEDROCK; case "${ANTHROPIC_CUSTOM_HEADERS:-}" in *[aA][uU][tT][hH][oO][rR][iI][zZ][aA][tT][iI][oO][nN]*|*[xX]-[aA][pP][iI]-[kK][eE][yY]*|*[aA][pP][iI]-[kK][eE][yY]*|*[bB][eE][aA][rR][eE][rR]*) unset ANTHROPIC_CUSTOM_HEADERS ;; esac; export CLAUDE_CONFIG_DIR="$__orca_claude_home" ORCA_CLAUDE_INJECTED_CONFIG_DIR="$__orca_claude_home"; command claude "$@" )
+    }
+  fi
+  unset __orca_claude_binary
   if [[ -n "${_orca_histfile:-}" ]]; then
     HISTFILE="$_orca_histfile"
   fi
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 21dce8480e63..1fcf476a1a0b 100644
--- a/src/main/__fixtures__/shell-wrapper-snapshots/relay-zsh-zshenv.txt
+++ b/src/main/__fixtures__/shell-wrapper-snapshots/relay-zsh-zshenv.txt
@@ -190,6 +190,30 @@ __orca_deferred_init() {
     }
   fi
   unset __orca_codex_binary
+  __orca_claude_binary="$(unalias claude 2>/dev/null || :; command -v claude 2>/dev/null || :)"
+  if [[ -n "${ORCA_CLAUDE_PROFILE_POINTER:-}" && -n "${__orca_claude_binary:-}" && -x "${__orca_claude_binary}" ]]; then
+    function claude {
+      local __orca_claude_home __orca_claude_pointer="${ORCA_CLAUDE_PROFILE_POINTER:-}"
+      # Why: a WSL pane's pointer is relative to the guest home, which the host cannot know at spawn.
+      case "$__orca_claude_pointer" in '~/'*) __orca_claude_pointer="${HOME:-}/${__orca_claude_pointer#??}" ;; esac
+      __orca_claude_home="$(cat "$__orca_claude_pointer" 2>/dev/null || :)"
+      if [ -n "${CLAUDE_CONFIG_DIR:-}" ] && [ "$CLAUDE_CONFIG_DIR" != "${ORCA_CLAUDE_INJECTED_CONFIG_DIR:-}" ]; then
+        command claude "$@"; return
+      fi
+      # Why: Orca's value replaced the user's own at spawn, so System default restores theirs.
+      if [ -z "$__orca_claude_home" ] && [ -n "${CLAUDE_CONFIG_DIR:-}" ] && [ -n "${ORCA_CLAUDE_USER_CONFIG_DIR:-}" ]; then
+        ( unset ORCA_CLAUDE_INJECTED_CONFIG_DIR; export CLAUDE_CONFIG_DIR="$ORCA_CLAUDE_USER_CONFIG_DIR"; command claude "$@" ); return
+      fi
+      if [ -z "$__orca_claude_home" ]; then
+        ( unset CLAUDE_CONFIG_DIR ORCA_CLAUDE_INJECTED_CONFIG_DIR; command claude "$@" ); return
+      fi
+      case "$__orca_claude_home" in /*|[A-Za-z]:*) ;; *) return 1 ;; esac
+      # Why -m 700: matches the folder Orca's setup creates; a credentials folder stays private.
+      [ -d "$__orca_claude_home" ] || mkdir -p -m 700 -- "$__orca_claude_home" 2>/dev/null
+      ( unset ANTHROPIC_API_KEY ANTHROPIC_AUTH_TOKEN CLAUDE_CODE_OAUTH_TOKEN AWS_BEARER_TOKEN_BEDROCK; case "${ANTHROPIC_CUSTOM_HEADERS:-}" in *[aA][uU][tT][hH][oO][rR][iI][zZ][aA][tT][iI][oO][nN]*|*[xX]-[aA][pP][iI]-[kK][eE][yY]*|*[aA][pP][iI]-[kK][eE][yY]*|*[bB][eE][aA][rR][eE][rR]*) unset ANTHROPIC_CUSTOM_HEADERS ;; esac; export CLAUDE_CONFIG_DIR="$__orca_claude_home" ORCA_CLAUDE_INJECTED_CONFIG_DIR="$__orca_claude_home"; command claude "$@" )
+    }
+  fi
+  unset __orca_claude_binary
   if [[ -n "${_orca_histfile:-}" ]]; then
     HISTFILE="$_orca_histfile"
   fi
diff --git a/src/main/acp/acp-account-binding.ts b/src/main/acp/acp-account-binding.ts
new file mode 100644
index 000000000000..4adddaa48822
--- /dev/null
+++ b/src/main/acp/acp-account-binding.ts
@@ -0,0 +1,40 @@
+// How an ACP agent's chats pin their account: what a new chat records, and how a launch points the
+// agent at the account its record pinned. Both run on the machine that runs the agent.
+
+import {
+  isLegacyAgentSessionAccountHome,
+  type AgentSessionAccountHome
+} from '../../shared/agent-session-account-home'
+import { resolveStructuredEnvAccountHomePath } from '../runtime/structured-agent-account-home'
+
+type AccountPin = { accountHomeVariable: string } | { accountLocatorKind: 'opencode' }
+
+export type AcpAccountBinding = {
+  /** What the agent's definition says its records pin. */
+  pin: AccountPin
+  /** The account a new chat pins: the current selection, read without side effects. */
+  resolve(input: { launchEnv: NodeJS.ProcessEnv }): Promise<AgentSessionAccountHome>
+  /** `env` pointed at the pinned account; throws for an account of another kind. */
+  environment(home: AgentSessionAccountHome, env: Record<string, string>): Record<string, string>
+}
+
+/** An agent whose account is one config directory named by `variable`, with a default under the
+ *  user's home. */
+export function directoryAccountBinding(
+  variable: string,
+  defaultHome: (homePath: string) => string
+): AcpAccountBinding {
+  return {
+    pin: { accountHomeVariable: variable },
+    resolve: async ({ launchEnv }) => ({
+      variable,
+      path: resolveStructuredEnvAccountHomePath({ launchEnv, variable, defaultPath: defaultHome })
+    }),
+    environment: (home, env) => {
+      if (!isLegacyAgentSessionAccountHome(home) || home.variable !== variable) {
+        throw new Error(`sessions of this agent pin ${variable}`)
+      }
+      return { ...env, [variable]: home.path }
+    }
+  }
+}
diff --git a/src/main/acp/acp-dialects/acp-dialect.ts b/src/main/acp/acp-dialects/acp-dialect.ts
index 596ddcb4049a..1defc82f7644 100644
--- a/src/main/acp/acp-dialects/acp-dialect.ts
+++ b/src/main/acp/acp-dialects/acp-dialect.ts
@@ -41,6 +41,8 @@ export type AcpDialectNotification =
 /** Hooks interpret extensions; lifecycle and row identity stay shared. */
 export type AcpDialect = {
   injectedPromptIdentity?: true
+  /** A tool update in the shared shape (`rawOutput.stdout`, `rawOutput.exitCode`), read first. */
+  normalizeToolUpdate?(update: ToolCallUpdate): ToolCallUpdate
   toolName?(update: ToolCallUpdate): string | undefined
   toolBackgroundTasks?(
     update: ToolCallUpdate,
diff --git a/src/main/acp/acp-dialects/omp-dialect.test.ts b/src/main/acp/acp-dialects/omp-dialect.test.ts
new file mode 100644
index 000000000000..5c6b3cb059b7
--- /dev/null
+++ b/src/main/acp/acp-dialects/omp-dialect.test.ts
@@ -0,0 +1,48 @@
+import { describe, expect, it } from 'vitest'
+import type { ToolCallUpdate } from '../generated/acp-protocol.generated'
+import { OMP_ACP_DIALECT } from './omp-dialect'
+
+const text = (value: string) => ({
+  type: 'content' as const,
+  content: { type: 'text' as const, text: value }
+})
+const normalize = (update: ToolCallUpdate) => OMP_ACP_DIALECT.normalizeToolUpdate!(update)
+
+describe('OMP tool updates', () => {
+  it('leaves a tool without a command echo as it came', () => {
+    const update: ToolCallUpdate = {
+      toolCallId: 'call-1',
+      status: 'completed',
+      rawOutput: { content: [{ type: 'text', text: 'file body' }], details: {} },
+      content: [text('file body')]
+    }
+    expect(normalize(update)).toBe(update)
+  })
+
+  it('keeps a result that itself starts with "$ "', () => {
+    const update: ToolCallUpdate = {
+      toolCallId: 'call-1',
+      status: 'completed',
+      rawOutput: { content: [{ type: 'text', text: '$ 5.00' }], details: {} },
+      content: [text('$ 5.00')]
+    }
+    expect(normalize(update)).toBe(update)
+  })
+
+  it('keeps output that only looks like a notice when OMP sent no matching detail', () => {
+    const update = normalize({
+      toolCallId: 'call-1',
+      status: 'completed',
+      rawOutput: {
+        content: [{ type: 'text', text: 'done\n\nCommand exited with code 3' }],
+        details: {}
+      },
+      content: [text('$ ./run'), text('done\n\nCommand exited with code 3')]
+    })
+    expect(update).toMatchObject({
+      content: [],
+      rawOutput: { stdout: 'done\n\nCommand exited with code 3' }
+    })
+    expect(update.rawOutput).not.toHaveProperty('exitCode')
+  })
+})
diff --git a/src/main/acp/acp-dialects/omp-dialect.ts b/src/main/acp/acp-dialects/omp-dialect.ts
new file mode 100644
index 000000000000..cb7e321d8228
--- /dev/null
+++ b/src/main/acp/acp-dialects/omp-dialect.ts
@@ -0,0 +1,66 @@
+import { z } from 'zod'
+import type { ToolCallContent, ToolCallUpdate } from '../generated/acp-protocol.generated'
+import type { AcpDialect } from './acp-dialect'
+
+// OMP sends a tool's result as `rawOutput: {content: [{type: 'text', text}], details}`, with a
+// command's non-zero exit at `details.exitCode`, and repeats the text as content behind a
+// `$ <command>` echo. The shared reader takes content text first, so that echo became the output.
+const textBlockSchema = z.looseObject({ type: z.literal('text'), text: z.string() })
+const toolResultSchema = z.looseObject({
+  content: z.array(z.unknown()),
+  details: z
+    .looseObject({
+      exitCode: z.number().int().safe().optional(),
+      wallTimeMs: z.number().optional()
+    })
+    .optional()
+})
+
+function contentText(block: ToolCallContent | undefined): string | undefined {
+  return block?.type === 'content' && block.content.type === 'text' ? block.content.text : undefined
+}
+
+/** OMP appends these notice lines to a command's output; the row shows exit and timing itself. */
+function commandOutput(text: string, exitCode: number | undefined, timed: boolean): string {
+  let output = text
+  const exitNotice = `\n\nCommand exited with code ${exitCode}`
+  if (exitCode !== undefined && output.endsWith(exitNotice)) {
+    output = output.slice(0, -exitNotice.length)
+  }
+  return timed ? output.replace(/\n\nWall time: \d+(?:\.\d+)? seconds$/u, '') : output
+}
+
+function normalizeToolUpdate(update: ToolCallUpdate): ToolCallUpdate {
+  const echo = contentText(update.content?.[0])
+  if (!echo?.startsWith('$ ')) {
+    return update
+  }
+  const parsed = toolResultSchema.safeParse(update.rawOutput)
+  const texts = parsed.success
+    ? parsed.data.content.flatMap((block) => textBlockSchema.safeParse(block).data?.text ?? [])
+    : []
+  if (texts.includes(echo)) {
+    return update
+  }
+  // The result's own text moves to `stdout`; content keeps anything else it carried.
+  const content = (update.content ?? []).slice(1).filter((block) => {
+    const text = contentText(block)
+    return text === undefined || !texts.includes(text)
+  })
+  if (!parsed.success) {
+    return { ...update, content }
+  }
+  const exitCode = parsed.data.details?.exitCode
+  const stdout = commandOutput(
+    texts.join('\n'),
+    exitCode,
+    parsed.data.details?.wallTimeMs !== undefined
+  )
+  return {
+    ...update,
+    content,
+    rawOutput: { ...parsed.data, stdout, ...(exitCode === undefined ? {} : { exitCode }) }
+  }
+}
+
+export const OMP_ACP_DIALECT: AcpDialect = { normalizeToolUpdate }
diff --git a/src/main/acp/acp-dialects/opencode-dialect.ts b/src/main/acp/acp-dialects/opencode-dialect.ts
new file mode 100644
index 000000000000..98566568f160
--- /dev/null
+++ b/src/main/acp/acp-dialects/opencode-dialect.ts
@@ -0,0 +1,45 @@
+import { z } from 'zod'
+import type { ToolCallUpdate } from '../generated/acp-protocol.generated'
+import type { AcpDialect } from './acp-dialect'
+
+// OpenCode reports a command's output and exit code under `rawOutput.metadata`; the shared shape
+// is `stdout` and `exitCode`.
+const commandRawOutputSchema = z.looseObject({
+  output: z.unknown().optional(),
+  metadata: z
+    .looseObject({
+      exit: z.number().int().nullable().optional(),
+      output: z.string().optional()
+    })
+    .optional()
+})
+
+function normalizeToolUpdate(update: ToolCallUpdate): ToolCallUpdate {
+  const parsed = commandRawOutputSchema.safeParse(update.rawOutput)
+  if (!parsed.success) {
+    return update
+  }
+  const rawOutput = parsed.data
+  const output =
+    typeof rawOutput.output === 'string' ? rawOutput.output : rawOutput.metadata?.output
+  const hasSharedOutput = ['stdout', 'stderr', 'output_for_prompt'].some(
+    (key) => rawOutput[key] !== undefined
+  )
+  const hasSharedExitCode = rawOutput.exitCode !== undefined || rawOutput.exit_code !== undefined
+  const exitCode = rawOutput.metadata?.exit ?? undefined
+  if ((output === undefined || hasSharedOutput) && (exitCode === undefined || hasSharedExitCode)) {
+    return update
+  }
+  return {
+    ...update,
+    rawOutput: {
+      ...rawOutput,
+      ...(output === undefined || hasSharedOutput ? {} : { stdout: output }),
+      ...(exitCode === undefined || hasSharedExitCode ? {} : { exitCode })
+    }
+  }
+}
+
+export const OPENCODE_ACP_DIALECT: AcpDialect = {
+  normalizeToolUpdate
+}
diff --git a/src/main/acp/acp-json-rpc-peer.test.ts b/src/main/acp/acp-json-rpc-peer.test.ts
index 3d74a9c1c7cc..858bac2d6703 100644
--- a/src/main/acp/acp-json-rpc-peer.test.ts
+++ b/src/main/acp/acp-json-rpc-peer.test.ts
@@ -293,6 +293,22 @@ describe('ACP JSON-RPC peer', () => {
     output.destroy()
   })
 
+  it('closes when a request times out mid-write, so a cancel never waits behind it', async () => {
+    vi.useFakeTimers()
+    const input = new PassThrough()
+    const output = new Writable({ write() {} })
+    const peer = new AcpJsonRpcPeer(input, output, {}, { requestTimeoutMs: 20 })
+    peers.push(peer)
+    const timedOut = expect(peer.request('stuck', {})).rejects.toBeInstanceOf(
+      AcpRequestTimeoutError
+    )
+    await vi.advanceTimersByTimeAsync(20)
+    await timedOut
+    expect(peer.closed).toBe(true)
+    await expect(peer.notify('session/cancel', {})).rejects.toBeInstanceOf(AcpRequestTimeoutError)
+    input.destroy()
+  })
+
   it('fails pending requests on an output stream error', async () => {
     const { peer, agent } = fixture()
     const rejected = expect(peer.request('wait', {})).rejects.toThrow('Broken pipe')
diff --git a/src/main/acp/acp-launch-specs.ts b/src/main/acp/acp-launch-specs.ts
index 2b705aa0dd7f..0cc9feae43e0 100644
--- a/src/main/acp/acp-launch-specs.ts
+++ b/src/main/acp/acp-launch-specs.ts
@@ -9,15 +9,27 @@ import {
 import { AGENT_HOOK_RUNTIME_ENV_KEYS } from '../ipc/pty/host-env/spawn-env-keys'
 import type { AcpDialect } from './acp-dialects/acp-dialect'
 import { GROK_ACP_DIALECT } from './acp-dialects/grok-dialect'
+import { OMP_ACP_DIALECT } from './acp-dialects/omp-dialect'
+import { OPENCODE_ACP_DIALECT } from './acp-dialects/opencode-dialect'
+import { directoryAccountBinding, type AcpAccountBinding } from './acp-account-binding'
+import { openCodeAcpAccountBinding } from '../opencode/opencode-structured-account-home'
+import { scrubOpenCodeAcpEnvironment } from '../opencode/opencode-acp-environment'
+import { openCodeStoredUserMessagesReader } from '../opencode/opencode-acp-stored-messages'
+import type { AcpStoredUserMessagesReader } from './acp-recovery-history'
+import { isStableCliVersionFrom, isStableCliVersionOnLine } from '../agent-cli-version-probe'
+import type { TuiAgent } from '../../shared/tui-agent'
 
 export type AcpLaunchSpec = {
-  /** The Orca agent id (a `TuiAgent`), which names the agent's records and its catalog label. */
-  agent: string
+  /** The Orca agent id, which names the agent's records, its catalog label and its settings. */
+  agent: TuiAgent
   command: string
   /** Built per launch: `fullAccess` is the Agent Permissions setting's bypass posture. */
   args(input: { fullAccess: boolean }): string[]
-  /** Overlaid on the child's environment. */
+  /** Laid over the child's environment last, after the account and the user's own variables. */
   env: Readonly<Record<string, string>>
+  /** Rewrites what the child would inherit from Orca's own plumbing; returns the keys it must not
+   *  inherit at all. `inherited` is the environment the child process starts from. */
+  scrubEnvironment?(env: Record<string, string>, inherited: NodeJS.ProcessEnv): string[]
   dialect: AcpDialect
   /** The agent's own sign-in command, for a person to run when it reports auth required. */
   loginCommand: readonly string[]
@@ -27,12 +39,17 @@ export type AcpLaunchSpec = {
     advertised: readonly string[]
     env: Readonly<Record<string, string>>
   }): string | undefined
-  /** Variable naming the agent's config directory, pinned as each record's account home. */
-  accountHomeVariable: string
-  /** The config directory the agent uses when the variable is unset, under the user's home. */
-  defaultAccountHome(homePath: string): string
+  /** The account each chat pins, and how a launch points the agent at it. */
+  account: AcpAccountBinding
+  /** The `--version` releases a structured chat runs on, asked before a create and again at every
+   *  launch; any other release keeps the terminal chat. Absent runs whatever is installed. */
+  supportsVersion?(version: string): boolean
   /** Where the agent installs its own binary, searched after PATH. */
-  installDirectories(accountHomePath: string): string[]
+  installDirectories(input: { env: Readonly<Record<string, string>>; homePath: string }): string[]
+  /** Images go to the agent when it also advertises them; off sends text prompts only. */
+  imagePrompts?: true
+  /** The agent's own store of a session's user messages, read for restart recovery only. */
+  readStoredUserMessages?: AcpStoredUserMessagesReader
 }
 
 const GROK_LAUNCH_SPEC: AcpLaunchSpec = {
@@ -50,12 +67,63 @@ const GROK_LAUNCH_SPEC: AcpLaunchSpec = {
       : advertised.includes('cached_token')
         ? 'cached_token'
         : undefined,
-  accountHomeVariable: 'GROK_HOME',
-  defaultAccountHome: (homePath) => join(homePath, '.grok'),
-  installDirectories: (accountHomePath) => [join(accountHomePath, 'bin')]
+  account: directoryAccountBinding('GROK_HOME', (homePath) => join(homePath, '.grok')),
+  installDirectories: ({ env }) => (env.GROK_HOME ? [join(env.GROK_HOME, 'bin')] : [])
 }
 
-export const ACP_LAUNCH_SPECS: readonly AcpLaunchSpec[] = [GROK_LAUNCH_SPEC]
+// `opencode acp` on 1.x serves in-process; on 2.x it starts a private `opencode serve --stdio` child
+// with this environment and ends it with stdin, so both lines run the chat's own account.
+const OPENCODE_ACP_RELEASE_LINES = [
+  // The release the recorded sessions capture.
+  { major: 1, floor: '1.18.31' },
+  // The 2.x release verified to start that private child.
+  { major: 2, floor: '2.0.14' }
+] as const
+
+const OPENCODE_LAUNCH_SPEC: AcpLaunchSpec = {
+  agent: 'opencode',
+  command: 'opencode',
+  // OpenCode has no bypass flag: full access answers each permission request yes.
+  args: () => ['acp'],
+  // Applied last: the client name ACP sessions report, and no question tool, which ACP cannot
+  // answer (it would wait forever).
+  env: { OPENCODE_CLIENT: 'acp', OPENCODE_ENABLE_QUESTION_TOOL: 'false' },
+  scrubEnvironment: scrubOpenCodeAcpEnvironment,
+  dialect: OPENCODE_ACP_DIALECT,
+  loginCommand: ['opencode', 'auth', 'login'],
+  account: openCodeAcpAccountBinding(),
+  installDirectories: ({ homePath }) => [join(homePath, '.opencode', 'bin')],
+  supportsVersion: (version) =>
+    OPENCODE_ACP_RELEASE_LINES.some((line) => isStableCliVersionOnLine(version, line)),
+  imagePrompts: true,
+  readStoredUserMessages: openCodeStoredUserMessagesReader()
+}
+
+// OMP serves ACP through `omp acp`; its environment reaches it as the user set it.
+const OMP_LAUNCH_SPEC: AcpLaunchSpec = {
+  agent: 'omp',
+  command: 'omp',
+  // `omp acp` takes no flags: full access answers each permission request yes.
+  args: () => ['acp'],
+  env: {},
+  dialect: OMP_ACP_DIALECT,
+  // OMP signs in from its own `/login`.
+  loginCommand: ['omp'],
+  // The directory OMP's terminal chats read too; its default is OMP's own.
+  account: directoryAccountBinding('PI_CODING_AGENT_DIR', (homePath) =>
+    join(homePath, '.omp', 'agent')
+  ),
+  // OMP's installers use directories the shared resolver already searches after PATH.
+  installDirectories: () => [],
+  // Stable releases from 17.0.5, the release verified to serve `omp acp`.
+  supportsVersion: (version) => isStableCliVersionFrom(version, '17.0.5')
+}
+
+export const ACP_LAUNCH_SPECS: readonly AcpLaunchSpec[] = [
+  GROK_LAUNCH_SPEC,
+  OPENCODE_LAUNCH_SPEC,
+  OMP_LAUNCH_SPEC
+]
 
 export function acpLaunchSpecFor(agent: string): AcpLaunchSpec | null {
   return ACP_LAUNCH_SPECS.find((spec) => spec.agent === agent) ?? null
diff --git a/src/main/acp/acp-prompt-content.test.ts b/src/main/acp/acp-prompt-content.test.ts
new file mode 100644
index 000000000000..63b7363ca5f9
--- /dev/null
+++ b/src/main/acp/acp-prompt-content.test.ts
@@ -0,0 +1,109 @@
+import { mkdtempSync, writeFileSync } from 'node:fs'
+import { tmpdir } from 'node:os'
+import { join } from 'node:path'
+import { pathToFileURL } from 'node:url'
+import { describe, expect, it } from 'vitest'
+import type { AgentJournalMessageItem } from '../../shared/agent-session-journal-types'
+import type { NativeChatBlock } from '../../shared/native-chat-types'
+import {
+  ACP_PROMPT_IMAGE_MAX_BYTES,
+  AcpPromptContentError,
+  acpPromptBlocks
+} from './acp-prompt-content'
+
+const PNG = Buffer.from('89504e470d0a1a0a', 'hex')
+const dir = mkdtempSync(join(tmpdir(), 'acp-prompt-content-'))
+const pngPath = join(dir, 'shot.png')
+writeFileSync(pngPath, PNG)
+
+function message(...blocks: NativeChatBlock[]): AgentJournalMessageItem {
+  return { kind: 'message', role: 'user', blocks }
+}
+
+async function refusal(body: AgentJournalMessageItem, images = true) {
+  const error = await acpPromptBlocks(body, images).catch((caught: unknown) => caught)
+  if (!(error instanceof AcpPromptContentError)) {
+    throw new Error(`expected a refusal, got ${String(error)}`)
+  }
+  return error.failure
+}
+
+describe('ACP prompt content', () => {
+  it('sends text as text blocks', async () => {
+    await expect(acpPromptBlocks(message({ type: 'text', text: 'hi' }), false)).resolves.toEqual([
+      { type: 'text', text: 'hi' }
+    ])
+  })
+
+  it('sends a file or data image as an ACP image block, in order', async () => {
+    const data = PNG.toString('base64')
+    await expect(
+      acpPromptBlocks(
+        message(
+          { type: 'image-ref', path: pngPath },
+          { type: 'text', text: 'what is this?' },
+          { type: 'image-ref', url: pathToFileURL(pngPath).href },
+          { type: 'image-ref', url: `data:image/png;base64,${data}` }
+        ),
+        true
+      )
+    ).resolves.toEqual([
+      { type: 'image', mimeType: 'image/png', data },
+      { type: 'text', text: 'what is this?' },
+      { type: 'image', mimeType: 'image/png', data },
+      { type: 'image', mimeType: 'image/png', data }
+    ])
+  })
+
+  it('refuses an image when the agent takes none', async () => {
+    expect(await refusal(message({ type: 'image-ref', path: pngPath }), false)).toMatchObject({
+      kind: 'attachmentInvalid',
+      attachment: { reason: 'unsupportedType' }
+    })
+  })
+
+  it('refuses what it cannot read or send before anything leaves Orca', async () => {
+    expect(await refusal(message({ type: 'image-ref', path: 'relative.png' }))).toMatchObject({
+      attachment: { reason: 'noSource' }
+    })
+    expect(await refusal(message({ type: 'image-ref', path: join(dir, 'a.bmp') }))).toMatchObject({
+      attachment: { reason: 'unsupportedType' }
+    })
+    expect(await refusal(message({ type: 'image-ref', path: `${dir}.png` }))).toMatchObject({
+      kind: 'attachmentUnreadable'
+    })
+    expect(
+      await refusal(message({ type: 'image-ref', url: 'data:image/svg+xml;base64,PHN2Zz4=' }))
+    ).toMatchObject({ attachment: { reason: 'unsupportedType' } })
+  })
+
+  it('keeps a message with images within one protocol line', async () => {
+    // The images fit their raw limit, but with this much text the prompt would pass the line.
+    const text = 'x'.repeat(8 * 1024 * 1024)
+    const image = {
+      type: 'image-ref' as const,
+      url: `data:image/png;base64,${PNG.toString('base64')}`
+    }
+    expect(
+      await refusal(message({ type: 'text', text }, { type: 'text', text }, image))
+    ).toMatchObject({
+      attachment: { reason: 'totalTooLarge' }
+    })
+    expect(ACP_PROMPT_IMAGE_MAX_BYTES * (4 / 3)).toBeLessThan(16 * 1024 * 1024)
+  })
+
+  it('leaves a text-only message to the agent, however long', async () => {
+    const text = 'x'.repeat(9 * 1024 * 1024)
+    await expect(
+      acpPromptBlocks(message({ type: 'text', text }, { type: 'text', text }), true)
+    ).resolves.toHaveLength(2)
+  })
+
+  it("bounds one message's images together", async () => {
+    const big = Buffer.alloc(ACP_PROMPT_IMAGE_MAX_BYTES / 2 + 1).toString('base64')
+    const image = { type: 'image-ref' as const, url: `data:image/png;base64,${big}` }
+    expect(await refusal(message(image, image))).toMatchObject({
+      attachment: { reason: 'totalTooLarge', limit: ACP_PROMPT_IMAGE_MAX_BYTES }
+    })
+  })
+})
diff --git a/src/main/acp/acp-prompt-content.ts b/src/main/acp/acp-prompt-content.ts
new file mode 100644
index 000000000000..2d1c6e336b1d
--- /dev/null
+++ b/src/main/acp/acp-prompt-content.ts
@@ -0,0 +1,161 @@
+// A person's message as an ACP prompt. Images go as the protocol's image blocks, and only to an
+// agent that advertised them; each is checked and read before anything reaches the agent.
+
+import { extname, isAbsolute } from 'node:path'
+import { fileURLToPath } from 'node:url'
+import {
+  agentSessionFailureFact,
+  type AgentSessionAttachmentProblem,
+  type SubmissionRejectionFact
+} from '../../shared/agent-session-failure'
+import {
+  agentSessionFailureWords,
+  type AgentJournalDispatchRejection
+} from '../../shared/agent-session-failure-words'
+import type { AgentJournalMessageItem } from '../../shared/agent-session-journal-types'
+import { IMAGE_FILE_MIME_TYPES } from '../../shared/image-file-extensions'
+import type { NativeChatImageRefBlock } from '../../shared/native-chat-types'
+import {
+  NodeFileReadTooLargeError,
+  readNodeFileWithinLimit
+} from '../../shared/node-bounded-file-reader'
+import type { AcpLaunchSpec } from './acp-launch-specs'
+import { resolveAcpPeerOptions } from './acp-peer-limits'
+import { acpAgentName } from './acp-structured-acquire'
+import type { AcpStructuredConnection } from './acp-structured-connection'
+import type { ContentBlock } from './generated/acp-protocol.generated'
+
+const ACP_IMAGE_MIME_TYPES = new Set(['image/png', 'image/jpeg', 'image/gif', 'image/webp'])
+/** A prompt is one JSON-RPC line; this leaves room for the request around its blocks. */
+const ACP_PROMPT_LINE_BUDGET = resolveAcpPeerOptions().maxLineBytes - 64 * 1024
+/** One message's images together, raw: base64 makes each 4 bytes of them 3 more. */
+export const ACP_PROMPT_IMAGE_MAX_BYTES = Math.floor((ACP_PROMPT_LINE_BUDGET * 3) / 4) - 1024 * 1024
+const MAX_IMAGE_COUNT = 20
+const READ_TIMEOUT_MS = 15_000
+
+/** Why Orca did not send a message; never the agent's refusal. */
+export class AcpPromptContentError extends Error {
+  constructor(readonly failure: SubmissionRejectionFact) {
+    super(`ACP prompt refused: ${failure.kind}`)
+    this.name = 'AcpPromptContentError'
+  }
+}
+
+function attachmentProblem(attachment: AgentSessionAttachmentProblem): AcpPromptContentError {
+  return new AcpPromptContentError(agentSessionFailureFact('attachmentInvalid', { attachment }))
+}
+
+async function imageBlock(
+  block: NativeChatImageRefBlock,
+  remainingBytes: number,
+  signal: AbortSignal
+): Promise<{ block: ContentBlock; bytes: number }> {
+  const tooLarge = (): AcpPromptContentError =>
+    attachmentProblem({
+      reason: remainingBytes < ACP_PROMPT_IMAGE_MAX_BYTES ? 'totalTooLarge' : 'tooLarge',
+      limit: ACP_PROMPT_IMAGE_MAX_BYTES
+    })
+  if (block.url?.startsWith('data:')) {
+    const match = /^data:(image\/[a-z]+);base64,([A-Za-z0-9+/]*={0,2})$/.exec(block.url)
+    if (!match || !ACP_IMAGE_MIME_TYPES.has(match[1]) || match[2].length % 4 !== 0) {
+      throw attachmentProblem({ reason: 'unsupportedType' })
+    }
+    const bytes = Buffer.byteLength(match[2], 'base64')
+    if (bytes === 0) {
+      throw attachmentProblem({ reason: 'empty' })
+    }
+    if (bytes > remainingBytes) {
+      throw tooLarge()
+    }
+    return { block: { type: 'image', mimeType: match[1], data: match[2] }, bytes }
+  }
+  let path = block.path
+  if (!path && block.url?.startsWith('file:')) {
+    try {
+      path = fileURLToPath(block.url)
+    } catch {
+      throw attachmentProblem({ reason: 'noSource' })
+    }
+  }
+  if (!path || !isAbsolute(path)) {
+    throw attachmentProblem({ reason: 'noSource' })
+  }
+  const mimeType = IMAGE_FILE_MIME_TYPES[extname(path).toLowerCase()]
+  if (!mimeType || !ACP_IMAGE_MIME_TYPES.has(mimeType)) {
+    throw attachmentProblem({ reason: 'unsupportedType' })
+  }
+  let data: Buffer
+  try {
+    data = (await readNodeFileWithinLimit(path, remainingBytes, { regularFileOnly: true, signal }))
+      .buffer
+  } catch (error) {
+    if (error instanceof NodeFileReadTooLargeError) {
+      throw tooLarge()
+    }
+    if (error instanceof Error && error.message === 'Expected a regular file') {
+      throw attachmentProblem({ reason: 'notAFile' })
+    }
+    throw new AcpPromptContentError(agentSessionFailureFact('attachmentUnreadable'))
+  }
+  if (data.byteLength === 0) {
+    throw attachmentProblem({ reason: 'empty' })
+  }
+  return { block: { type: 'image', mimeType, data: data.toString('base64') }, bytes: data.length }
+}
+
+/** The prompt for `body`; throws `AcpPromptContentError` for what Orca will not send. */
+export async function acpPromptBlocks(
+  body: AgentJournalMessageItem,
+  acceptsImages: boolean
+): Promise<ContentBlock[]> {
+  const blocks: ContentBlock[] = []
+  const signal = AbortSignal.timeout(READ_TIMEOUT_MS)
+  let imageCount = 0
+  let imageBytes = 0
+  for (const block of body.blocks) {
+    if (block.type === 'text') {
+      blocks.push({ type: 'text', text: block.text })
+      continue
+    }
+    if (block.type !== 'image-ref' || !acceptsImages) {
+      throw attachmentProblem({ reason: 'unsupportedType' })
+    }
+    imageCount += 1
+    if (imageCount > MAX_IMAGE_COUNT) {
+      throw attachmentProblem({ reason: 'tooMany', limit: MAX_IMAGE_COUNT })
+    }
+    const image = await imageBlock(block, ACP_PROMPT_IMAGE_MAX_BYTES - imageBytes, signal)
+    imageBytes += image.bytes
+    blocks.push(image.block)
+  }
+  // Only images can carry a message past one line here; their words are the refusal's.
+  if (imageCount > 0 && Buffer.byteLength(JSON.stringify(blocks)) > ACP_PROMPT_LINE_BUDGET) {
+    throw attachmentProblem({ reason: 'totalTooLarge', limit: ACP_PROMPT_IMAGE_MAX_BYTES })
+  }
+  return blocks
+}
+
+/** The prompt for `body` to `session`'s agent, or Orca's refusal of it in words that name the
+ *  agent. Images go only where the agent's row offers them and its start advertised them. */
+export async function acpDispatchPrompt(
+  body: AgentJournalMessageItem,
+  session: {
+    spec: Pick<AcpLaunchSpec, 'agent' | 'imagePrompts'>
+    connection: Pick<AcpStructuredConnection, 'initialize'>
+  }
+): Promise<ContentBlock[] | AgentJournalDispatchRejection> {
+  try {
+    const advertised =
+      session.spec.imagePrompts === true &&
+      (await session.connection.initialize()).agentCapabilities?.promptCapabilities?.image === true
+    return await acpPromptBlocks(body, advertised)
+  } catch (error) {
+    if (error instanceof AcpPromptContentError) {
+      return agentSessionFailureWords(error.failure, {
+        surface: 'rejection',
+        agentName: acpAgentName(session.spec.agent)
+      })
+    }
+    throw error
+  }
+}
diff --git a/src/main/acp/acp-recovery-history.test.ts b/src/main/acp/acp-recovery-history.test.ts
new file mode 100644
index 000000000000..402b9e2f76d1
--- /dev/null
+++ b/src/main/acp/acp-recovery-history.test.ts
@@ -0,0 +1,219 @@
+import { describe, expect, it, vi } from 'vitest'
+import type { AgentJournalSubmission } from '../../shared/agent-session-journal-types'
+import { computeAgentSessionPayloadFingerprint } from '../../shared/agent-session-mutation-envelope'
+import type { JournalLoad } from '../native-chat/agent-session-journal/journal-open'
+import { createJournalReducerState } from '../native-chat/agent-session-journal/journal-reducer'
+import { reconcileSubmissions } from '../native-chat/agent-session-journal/journal-submission-reconciler'
+import { acpLaunchSpecFor } from './acp-launch-specs'
+import { readAcpRecoveryHistory, type AcpStoredUserMessage } from './acp-recovery-history'
+import type { AcpStructuredLaunch } from './acp-structured-launch-resolution'
+
+const SESSION = 'session-alpha-1'
+const identity = {
+  sessionId: SESSION,
+  workspaceId: 'workspace-1',
+  hostId: 'local',
+  agent: 'opencode',
+  providerHandle: null
+}
+
+function fingerprint(text: string): string {
+  return computeAgentSessionPayloadFingerprint({
+    method: 'agentSession.send',
+    sessionId: SESSION,
+    fields: { body: { kind: 'message', role: 'user', blocks: [{ type: 'text', text }] } }
+  })
+}
+
+function submission(
+  clientMessageId: string,
+  text: string,
+  dispatchState: AgentJournalSubmission['dispatchState'],
+  submittedAt: number,
+  resolvedAt: number | null = null
+): AgentJournalSubmission {
+  return {
+    clientMessageId,
+    fence: 1,
+    payloadFingerprint: fingerprint(text),
+    dispatchState,
+    providerItemId: null,
+    reason: null,
+    submittedAt,
+    resolvedAt
+  }
+}
+
+function journal(...submissions: AgentJournalSubmission[]): JournalLoad {
+  const state = createJournalReducerState(SESSION, 'epoch-1')
+  for (const entry of submissions) {
+    state.submissions.set(entry.clientMessageId, entry)
+  }
+  return { state, newer: null, damage: null }
+}
+
+const launch: AcpStructuredLaunch = {
+  spec: acpLaunchSpecFor('opencode')!,
+  command: '/resolved/opencode',
+  args: ['acp'],
+  cwd: '/repo',
+  env: { XDG_DATA_HOME: '/data' },
+  envToDelete: [],
+  fullAccess: false,
+  resume: {
+    sessionId: 'ses_1',
+    key: 'acp:opencode:ses_1',
+    mayBeUnsaved: () => false,
+    unannouncedLosses: () => []
+  }
+}
+
+function stored(id: string, text: string, createdAt: number): AcpStoredUserMessage {
+  return { id, blocks: [{ type: 'text', text }], createdAt }
+}
+
+async function windowFor(load: JournalLoad | null, messages: AcpStoredUserMessage[] | null) {
+  const readStoredUserMessages = vi.fn(async () => messages)
+  const window = await readAcpRecoveryHistory(
+    {
+      spec: { readStoredUserMessages },
+      resolveLaunch: async () => launch,
+      readJournal: () => load
+    },
+    identity
+  )
+  return { window, readStoredUserMessages }
+}
+
+describe('ACP restart recovery from the agent store', () => {
+  it('settles a message the agent recorded after the crash as sent, under its own row', async () => {
+    const load = journal(
+      submission('first', 'hello', 'accepted', 100, 110),
+      submission('held', 'run the tests', 'unknown', 200)
+    )
+    const { window, readStoredUserMessages } = await windowFor(load, [
+      stored('msg_1', 'hello', 105),
+      stored('msg_2', 'run the tests', 205)
+    ])
+    expect(readStoredUserMessages).toHaveBeenCalledWith(
+      expect.objectContaining({ env: launch.env, providerSessionId: 'ses_1' })
+    )
+    expect(window).toMatchObject({ boundaryConsistent: false, turnInFlight: true })
+    expect(
+      reconcileSubmissions({ submissions: [...load.state.submissions.values()], history: window! })
+    ).toEqual([
+      {
+        clientMessageId: 'held',
+        outcome: 'accepted',
+        providerItemId: 'msg_2',
+        identity: { provider: 'orca', clientMessageId: 'held' }
+      }
+    ])
+  })
+
+  it('never offers an older identical message as the one in doubt', async () => {
+    const load = journal(
+      submission('first', 'continue', 'accepted', 100, 110),
+      submission('held', 'continue', 'unknown', 200)
+    )
+    const { window } = await windowFor(load, [stored('msg_1', 'continue', 105)])
+    expect(window?.items).toEqual([])
+    expect(
+      reconcileSubmissions({ submissions: [...load.state.submissions.values()], history: window! })
+    ).toMatchObject([{ clientMessageId: 'held', outcome: 'unknown' }])
+  })
+
+  it('lets an accepted send claim its own copy even when the agent stored it after the next send', async () => {
+    // Accepted at dispatch (r=500) and stored at 505; the identical send behind it was lost.
+    const load = journal(
+      submission('first', 'continue', 'accepted', 100, 500),
+      submission('held', 'continue', 'unknown', 110)
+    )
+    const { window } = await windowFor(load, [stored('msg_1', 'continue', 505)])
+    expect(window?.items).toEqual([])
+  })
+
+  it('keeps an older unconfirmed send from widening the window over a delivered copy', async () => {
+    const load = journal(
+      submission('old', 'yes', 'unknown', 50),
+      submission('first', 'yes', 'accepted', 300, 300),
+      submission('held', 'yes', 'unknown', 400)
+    )
+    const { window } = await windowFor(load, [stored('msg_1', 'yes', 303)])
+    expect(window?.items).toEqual([])
+  })
+
+  it('confirms the doubted send when both identical copies are stored', async () => {
+    const load = journal(
+      submission('first', 'yes', 'accepted', 300, 300),
+      submission('held', 'yes', 'unknown', 400)
+    )
+    const { window } = await windowFor(load, [
+      stored('msg_1', 'yes', 303),
+      stored('msg_2', 'yes', 405)
+    ])
+    expect(
+      reconcileSubmissions({ submissions: [...load.state.submissions.values()], history: window! })
+    ).toMatchObject([{ clientMessageId: 'held', outcome: 'accepted', providerItemId: 'msg_2' }])
+  })
+
+  it('reads nothing for a queued card the agent was never handed', async () => {
+    const queued = { ...submission('queued', 'x', 'pending', 1), handoverRecorded: true as const }
+    const { window, readStoredUserMessages } = await windowFor(journal(queued), [])
+    expect(window).toBeNull()
+    expect(readStoredUserMessages).not.toHaveBeenCalled()
+  })
+
+  it('reads nothing with no message in doubt, a damaged journal, or no resumable session', async () => {
+    expect((await windowFor(journal(submission('a', 'x', 'accepted', 1, 2)), [])).window).toBeNull()
+    const damaged = journal(submission('held', 'x', 'unknown', 1))
+    expect(
+      (await windowFor({ ...damaged, damage: { sequence: 3, cause: 'sequence-gap' } }, [])).window
+    ).toBeNull()
+    const readStoredUserMessages = vi.fn(async () => [])
+    await expect(
+      readAcpRecoveryHistory(
+        {
+          spec: { readStoredUserMessages },
+          resolveLaunch: async () => ({ ...launch, resume: null }),
+          readJournal: () => journal(submission('held', 'x', 'unknown', 1))
+        },
+        identity
+      )
+    ).resolves.toBeNull()
+    expect(readStoredUserMessages).not.toHaveBeenCalled()
+  })
+
+  it('reads nothing for an agent whose store Orca does not read', async () => {
+    await expect(
+      readAcpRecoveryHistory(
+        {
+          spec: {},
+          resolveLaunch: async () => launch,
+          readJournal: () => journal(submission('held', 'x', 'unknown', 1))
+        },
+        identity
+      )
+    ).resolves.toBeNull()
+  })
+
+  it('answers null, never throws, when the store cannot be read', async () => {
+    const warn = vi.fn()
+    await expect(
+      readAcpRecoveryHistory(
+        {
+          spec: {
+            readStoredUserMessages: async () => {
+              throw new Error('database is locked')
+            }
+          },
+          resolveLaunch: async () => launch,
+          readJournal: () => journal(submission('held', 'x', 'unknown', 1)),
+          logger: { warn, error: vi.fn() }
+        },
+        identity
+      )
+    ).resolves.toBeNull()
+    expect(warn).toHaveBeenCalled()
+  })
+})
diff --git a/src/main/acp/acp-recovery-history.ts b/src/main/acp/acp-recovery-history.ts
new file mode 100644
index 000000000000..d00a21a6d863
--- /dev/null
+++ b/src/main/acp/acp-recovery-history.ts
@@ -0,0 +1,145 @@
+// Restart recovery for an ACP agent that keeps its own store: whether a message a crash left
+// unconfirmed reached the agent. Presence only: a match settles it as sent, while absence proves
+// nothing, so nothing is ever called undelivered. Bounded, and null on any failure; the user can
+// always resend or discard, so this never stands between them and the chat.
+
+import { waitForPromiseWithSignal } from '../../shared/abort-signal-reason'
+import { agentSessionSendBodyFingerprint } from '../../shared/structured-agent-session-send-mutation'
+import type {
+  AgentJournalSubmission,
+  AgentSessionJournalIdentity
+} from '../../shared/agent-session-journal-types'
+import type { NativeChatBlock } from '../../shared/native-chat-types'
+import type { JournalLoad } from '../native-chat/agent-session-journal/journal-open'
+import type {
+  ProviderHistoryItem,
+  ProviderHistoryWindow
+} from '../native-chat/agent-session-journal/journal-submission-reconciler'
+import { isQueuedAgentJournalSubmission } from '../../shared/agent-session-queued-submission'
+import type { AcpLaunchSpec } from './acp-launch-specs'
+import type { AcpStructuredSessionAdapterDeps } from './acp-structured-session-adapter-deps'
+
+const RECOVERY_READ_MS = 5_000
+
+/** A person's message as the agent's own store holds it. */
+export type AcpStoredUserMessage = {
+  /** The store's id for it, claimed at most once. */
+  id: string
+  blocks: NativeChatBlock[]
+  /** Epoch ms the agent recorded it, on this machine's clock. */
+  createdAt: number
+}
+
+/** Reads the user messages of one provider session from the agent's own store; null when it cannot. */
+export type AcpStoredUserMessagesReader = (input: {
+  env: Record<string, string>
+  providerSessionId: string
+  signal: AbortSignal
+}) => Promise<AcpStoredUserMessage[] | null>
+
+/** Sends a crash may have left unconfirmed; a queued card was never handed over, so the agent
+ *  cannot hold it. */
+function sendsInDoubt(load: JournalLoad): AgentJournalSubmission[] {
+  return [...load.state.submissions.values()].filter(
+    (submission) =>
+      (submission.dispatchState === 'pending' || submission.dispatchState === 'unknown') &&
+      !isQueuedAgentJournalSubmission(submission)
+  )
+}
+
+function fingerprintOf(sessionId: string, message: AcpStoredUserMessage): string {
+  return agentSessionSendBodyFingerprint(sessionId, {
+    kind: 'message',
+    role: 'user',
+    blocks: message.blocks
+  })
+}
+
+/**
+ * The agent's store keeps no id of Orca's, so a stored message can only match a send by content.
+ * Each send the journal already accepted first claims the earliest stored copy of its text written
+ * no earlier than it was sent, so an identical message that did reach the agent is never offered as
+ * the one in doubt; what is left, from the first send in doubt on, is the window. Claiming more than
+ * a send's own copy only leaves a send in doubt unconfirmed, never wrongly confirmed.
+ */
+function recoveryWindow(
+  load: JournalLoad,
+  inDoubt: readonly AgentJournalSubmission[],
+  messages: readonly AcpStoredUserMessage[]
+): ProviderHistoryItem[] {
+  const submissions = [...load.state.submissions.values()]
+  const from = Math.min(...inDoubt.map((submission) => submission.submittedAt))
+  const stored = messages
+    .map((message) => ({ message, fingerprint: fingerprintOf(load.state.sessionId, message) }))
+    .toSorted((left, right) => left.message.createdAt - right.message.createdAt)
+  const claimed = new Set<number>()
+  const accepted = submissions
+    .filter((submission) => submission.dispatchState === 'accepted')
+    .toSorted((left, right) => left.submittedAt - right.submittedAt)
+  for (const submission of accepted) {
+    const index = stored.findIndex(
+      ({ message, fingerprint }, at) =>
+        !claimed.has(at) &&
+        fingerprint === submission.payloadFingerprint &&
+        message.createdAt >= submission.submittedAt
+    )
+    if (index !== -1) {
+      claimed.add(index)
+    }
+  }
+  return stored.flatMap(({ message, fingerprint }, at) =>
+    claimed.has(at) || message.createdAt < from
+      ? []
+      : [{ providerItemId: message.id, clientMessageId: null, payloadFingerprint: fingerprint }]
+  )
+}
+
+/** The window for one chat; null for an agent whose store Orca does not read. */
+export async function readAcpRecoveryHistory(
+  input: Pick<AcpStructuredSessionAdapterDeps, 'resolveLaunch' | 'readJournal' | 'logger'> & {
+    spec: Pick<AcpLaunchSpec, 'readStoredUserMessages'>
+  },
+  identity: AgentSessionJournalIdentity
+): Promise<ProviderHistoryWindow | null> {
+  const { readStoredUserMessages } = input.spec
+  if (!readStoredUserMessages || !input.readJournal) {
+    return null
+  }
+  const sessionId = identity.sessionId
+  const signal = AbortSignal.timeout(RECOVERY_READ_MS)
+  try {
+    const load = input.readJournal(sessionId)
+    const inDoubt = load && !load.damage && !load.newer ? sendsInDoubt(load) : []
+    if (!load || inDoubt.length === 0) {
+      return null
+    }
+    const launch = await waitForPromiseWithSignal(input.resolveLaunch({ identity }), signal)
+    if (!launch.resume) {
+      return null
+    }
+    const messages = await waitForPromiseWithSignal(
+      readStoredUserMessages({
+        env: launch.env,
+        providerSessionId: launch.resume.sessionId,
+        signal
+      }),
+      signal
+    )
+    if (!messages) {
+      return null
+    }
+    return {
+      // Absence proves nothing: neither the start of the read nor the end of the agent's work is known.
+      boundaryConsistent: false,
+      turnInFlight: true,
+      items: recoveryWindow(load, inDoubt, messages)
+    }
+  } catch (error) {
+    input.logger?.warn('ACP recovery history could not be read', {
+      scope: 'acp-recovery-history',
+      sessionId,
+      error
+    })
+    return null
+  }
+}
diff --git a/src/main/acp/acp-stdio-error-boundary.ts b/src/main/acp/acp-stdio-error-boundary.ts
index 67854b6f95a2..6dd0fe81b55b 100644
--- a/src/main/acp/acp-stdio-error-boundary.ts
+++ b/src/main/acp/acp-stdio-error-boundary.ts
@@ -1,16 +1 @@
-import type { Readable, Writable } from 'node:stream'
-
-function ignoreLateError(): void {}
-
-export function detachAcpStreamErrorHandler(
-  stream: Readable | Writable,
-  handler: (error: Error) => void
-): void {
-  stream.removeListener('error', handler)
-  if (stream.closed) {
-    return
-  }
-  // Node may emit the write error after its callback has already closed the peer.
-  stream.on('error', ignoreLateError)
-  stream.once('close', () => stream.removeListener('error', ignoreLateError))
-}
+export { detachProviderStreamErrorHandler as detachAcpStreamErrorHandler } from '../provider-process/provider-stdio-error-boundary'
diff --git a/src/main/acp/acp-structured-acquire.ts b/src/main/acp/acp-structured-acquire.ts
index cf7466f27d8f..b9c8b41d209f 100644
--- a/src/main/acp/acp-structured-acquire.ts
+++ b/src/main/acp/acp-structured-acquire.ts
@@ -124,7 +124,7 @@ export async function acquireAcpStructuredSession(input: {
         ...structuredSessionChildIdentityEnv(sessionId, launch.env),
         [PROVIDER_SPAWN_TOKEN_ENV]: acquire.spawnToken
       },
-      envToDelete: ACP_CHILD_ENV_TO_DELETE
+      envToDelete: [...ACP_CHILD_ENV_TO_DELETE, ...launch.envToDelete]
     },
     {
       clientInfo: { name: 'orca', version: '1' },
diff --git a/src/main/acp/acp-structured-adapter.test-support.ts b/src/main/acp/acp-structured-adapter.test-support.ts
index e39ade6c7b97..a81fb2c8198e 100644
--- a/src/main/acp/acp-structured-adapter.test-support.ts
+++ b/src/main/acp/acp-structured-adapter.test-support.ts
@@ -11,7 +11,7 @@ import {
   SESSION,
   type ProviderTimelineRig
 } from '../native-chat/agent-session-timeline/provider-timeline-assembler-test-support'
-import { acpLaunchSpecFor } from './acp-launch-specs'
+import { acpLaunchSpecFor, type AcpLaunchSpec } from './acp-launch-specs'
 import { AcpScriptedAgent, tick, type FakeFrame } from './acp-scripted-agent.test-support'
 import type { AcpAgentConnectionOptions } from './acp-agent-connection'
 import { AcpConnectionClosedError } from './acp-errors'
@@ -156,6 +156,8 @@ export type AcpAdapterRig = {
 
 export async function openAcpAdapterRig(
   options: {
+    /** The agent's row; Grok's unless a test drives another agent. */
+    spec?: AcpLaunchSpec
     launch?: Partial<AcpStructuredLaunch>
     initialize?: Record<string, unknown>
     script?: (agent: AcpScriptedAgent) => void
@@ -167,14 +169,16 @@ export async function openAcpAdapterRig(
   const spawned: string[] = []
   const lifecycle: StructuredAgentSessionLifecycleEvent[] = []
   const settled: AcpAdapterRig['settled'] = []
+  const spec = options.spec ?? GROK
   const adapter = new AcpStructuredSessionAdapter({
-    spec: GROK,
+    spec,
     resolveLaunch: async () => ({
-      spec: GROK,
-      command: '/opt/grok/bin/grok',
-      args: GROK.args({ fullAccess: false }),
+      spec,
+      command: `/opt/bin/${spec.command}`,
+      args: spec.args({ fullAccess: false }),
       cwd: '/workspace/project',
       env: { PATH: '/usr/bin', ORCA_PANE_KEY: 'tab-1:pane-1', ORCA_AGENT_HOOK_PORT: '1234' },
+      envToDelete: [],
       fullAccess: false,
       resume: null,
       ...options.launch
@@ -226,7 +230,7 @@ export async function openAcpAdapterRig(
           sessionId: SESSION,
           workspaceId: 'workspace-1',
           hostId: 'local',
-          agent: 'grok',
+          agent: spec.agent,
           providerHandle: null
         },
         fence: acquireOptions.fence ?? 1,
diff --git a/src/main/acp/acp-structured-agent-definitions.ts b/src/main/acp/acp-structured-agent-definitions.ts
index d51816db450e..c82d5483ad88 100644
--- a/src/main/acp/acp-structured-agent-definitions.ts
+++ b/src/main/acp/acp-structured-agent-definitions.ts
@@ -16,15 +16,15 @@ export function acpStructuredAgentDefinition(spec: AcpLaunchSpec): StructuredAge
   return {
     agent: spec.agent,
     handleTransport: ACP_HANDLE_TRANSPORT,
-    accountHomeVariable: spec.accountHomeVariable,
+    ...spec.account.pin,
     capabilities: {
       // ACP has no stable rewind, compact or goal method; a command arrives through `/` instead.
       rewind: false,
       compact: false,
       threadGoal: false,
       contextUsage: true,
-      // Off: Orca sends text prompts only until ACP image prompts have a path.
-      imagePrompts: false,
+      // An agent that does not also advertise images at its start has a message with one refused.
+      imagePrompts: spec.imagePrompts === true,
       steering: 'queue',
       // Orca answers every permission request the agent sends; the agent decides when it asks.
       approvalEnforcement: 'orca'
diff --git a/src/main/acp/acp-structured-electron-free.test.ts b/src/main/acp/acp-structured-electron-free.test.ts
index 0a63542a1997..dfc3ceb45eb4 100644
--- a/src/main/acp/acp-structured-electron-free.test.ts
+++ b/src/main/acp/acp-structured-electron-free.test.ts
@@ -6,12 +6,13 @@ import { build } from 'esbuild'
 import { describe, expect, it } from 'vitest'
 
 describe('ACP structured lane', () => {
-  it('reaches no Electron import from the adapter or its launch resolution', async () => {
+  it('reaches no Electron import from the adapter, its launch resolution or any agent row', async () => {
     const result = await build({
       entryPoints: [
         resolve(__dirname, 'acp-structured-session-adapter.ts'),
         resolve(__dirname, 'acp-structured-launch-resolution.ts'),
-        resolve(__dirname, 'acp-agent-connection.ts')
+        resolve(__dirname, 'acp-agent-connection.ts'),
+        resolve(__dirname, 'acp-launch-specs.ts')
       ],
       bundle: true,
       write: false,
diff --git a/src/main/acp/acp-structured-fixture-replay.test-support.ts b/src/main/acp/acp-structured-fixture-replay.test-support.ts
index c4cf1605c797..51555fe9a73b 100644
--- a/src/main/acp/acp-structured-fixture-replay.test-support.ts
+++ b/src/main/acp/acp-structured-fixture-replay.test-support.ts
@@ -16,7 +16,10 @@ const messageSchema = z.object({
   id: z.union([z.string(), z.number()]).optional(),
   method: z.string().optional(),
   params: z.unknown().optional(),
-  result: z.unknown().optional()
+  result: z.unknown().optional(),
+  error: z
+    .object({ code: z.number(), message: z.string(), data: z.unknown().optional() })
+    .optional()
 })
 
 function promptIdOf(params: unknown): string | undefined {
@@ -83,13 +86,13 @@ export class GrokFixtureReplay {
         agent.send({
           jsonrpc: '2.0',
           id: this.requestIds.get(message.id ?? '') ?? message.id,
-          result: message.result
+          ...(message.error === undefined ? { result: message.result } : { error: message.error })
         })
       }
     }
   }
 
-  private rewrite(message: AcpFixtureFrame['message']): AcpFixtureFrame['message'] {
+  private rewrite(message: AcpFixtureFrame['message']): z.infer<typeof messageSchema> {
     let text = JSON.stringify(message).replaceAll(
       RECORDED_SESSION,
       JSON.stringify(PROVIDER_SESSION)
diff --git a/src/main/acp/acp-structured-host.test-support.ts b/src/main/acp/acp-structured-host.test-support.ts
index afc1c1c42401..cc6dc7244913 100644
--- a/src/main/acp/acp-structured-host.test-support.ts
+++ b/src/main/acp/acp-structured-host.test-support.ts
@@ -61,6 +61,7 @@ export function launch(resume: () => boolean): () => Promise<AcpStructuredLaunch
     args: [],
     cwd: '/workspace',
     env: {},
+    envToDelete: [],
     fullAccess: false,
     resume: resume()
       ? {
diff --git a/src/main/acp/acp-structured-image-prompts.test.ts b/src/main/acp/acp-structured-image-prompts.test.ts
new file mode 100644
index 000000000000..1abeae55a94c
--- /dev/null
+++ b/src/main/acp/acp-structured-image-prompts.test.ts
@@ -0,0 +1,59 @@
+import { afterEach, describe, expect, it } from 'vitest'
+import type { AgentJournalMessageItem } from '../../shared/agent-session-journal-types'
+import {
+  closeProviderTimelineRigs,
+  SESSION
+} from '../native-chat/agent-session-timeline/provider-timeline-assembler-test-support'
+import { acpLaunchSpecFor } from './acp-launch-specs'
+import { openAcpAdapterRig } from './acp-structured-adapter.test-support'
+
+afterEach(closeProviderTimelineRigs)
+
+const DATA = Buffer.from('89504e470d0a1a0a', 'hex').toString('base64')
+const withImage: AgentJournalMessageItem = {
+  kind: 'message',
+  role: 'user',
+  blocks: [
+    { type: 'image-ref', url: `data:image/png;base64,${DATA}` },
+    { type: 'text', text: 'what is this?' }
+  ]
+}
+
+describe('ACP image prompts', () => {
+  it('sends an image to an agent whose row offers images and whose start advertised them', async () => {
+    const rig = await openAcpAdapterRig({
+      spec: acpLaunchSpecFor('opencode')!,
+      initialize: { agentCapabilities: { loadSession: true, promptCapabilities: { image: true } } }
+    })
+    await rig.acquire()
+    await expect(
+      rig.adapter.dispatch({ sessionId: SESSION, clientMessageId: 'm1', body: withImage, fence: 1 })
+    ).resolves.toEqual({ state: 'admitted' })
+    expect((await rig.frame('session/prompt')).params).toMatchObject({
+      prompt: [
+        { type: 'image', mimeType: 'image/png', data: DATA },
+        { type: 'text', text: 'what is this?' }
+      ]
+    })
+  })
+
+  it('refuses the message, sending nothing, when the agent did not advertise images', async () => {
+    const rig = await openAcpAdapterRig({ spec: acpLaunchSpecFor('opencode')! })
+    await rig.acquire()
+    await expect(
+      rig.adapter.dispatch({ sessionId: SESSION, clientMessageId: 'm1', body: withImage, fence: 1 })
+    ).resolves.toMatchObject({ state: 'rejected', rejection: { kind: 'attachmentInvalid' } })
+    expect(rig.sent('session/prompt')).toEqual([])
+  })
+
+  it('refuses an image for an agent whose row offers none, whatever it advertises', async () => {
+    const rig = await openAcpAdapterRig({
+      initialize: { agentCapabilities: { loadSession: true, promptCapabilities: { image: true } } }
+    })
+    await rig.acquire()
+    await expect(
+      rig.adapter.dispatch({ sessionId: SESSION, clientMessageId: 'm1', body: withImage, fence: 1 })
+    ).resolves.toMatchObject({ state: 'rejected' })
+    expect(rig.sent('session/prompt')).toEqual([])
+  })
+})
diff --git a/src/main/acp/acp-structured-launch-resolution-omp.test.ts b/src/main/acp/acp-structured-launch-resolution-omp.test.ts
new file mode 100644
index 000000000000..8e34dee2e9d7
--- /dev/null
+++ b/src/main/acp/acp-structured-launch-resolution-omp.test.ts
@@ -0,0 +1,132 @@
+import { describe, expect, it } from 'vitest'
+import type { AgentSessionRecord } from '../../shared/agent-session-record'
+import { agentSessionRecordFixture } from '../../shared/agent-session-record.test-fixture'
+import { createProviderSpawnSpec } from '../provider-process/provider-process-supervisor'
+import { ACP_CHILD_ENV_TO_DELETE, acpLaunchSpecFor } from './acp-launch-specs'
+import {
+  createAcpStructuredLaunchResolver,
+  type AcpStructuredLaunchResolverDeps
+} from './acp-structured-launch-resolution'
+
+const OMP = acpLaunchSpecFor('omp')!
+const identity = {
+  sessionId: 'session-alpha-1',
+  workspaceId: 'workspace-1',
+  hostId: 'local',
+  agent: 'omp',
+  providerHandle: null
+}
+
+function ompRecord(
+  accountHome: AgentSessionRecord['accountHome'] = {
+    variable: 'PI_CODING_AGENT_DIR',
+    path: '/home/user/.omp/agent'
+  }
+): AgentSessionRecord {
+  return { ...agentSessionRecordFixture(), provider: 'omp', providerHandleChain: [], accountHome }
+}
+
+function resolver(
+  record: AgentSessionRecord,
+  options: {
+    launchEnv?: Record<string, string>
+    fullAccess?: boolean
+    probeVersion?: AcpStructuredLaunchResolverDeps['probeVersion']
+  } = {}
+) {
+  return createAcpStructuredLaunchResolver(OMP, {
+    store: { getRecord: () => record },
+    readJournal: () => null,
+    resolveWorkspacePath: async () => '/repo/worktree',
+    resolveEnvironment: async () => ({ PATH: '/usr/bin', HOME: '/home/user' }),
+    resolveLaunchEnv: () => options.launchEnv ?? {},
+    resolveFullAccess: () => options.fullAccess ?? false,
+    resolveCommand: (command) => `/resolved/${command}`,
+    inheritedEnv: {},
+    probeVersion: options.probeVersion ?? (async (_input, supports) => supports('17.0.5'))
+  })
+}
+
+describe('OMP ACP launch resolution', () => {
+  it('runs `omp acp` pointed at the agent directory the chat pinned, with or without full access', async () => {
+    for (const fullAccess of [false, true]) {
+      const launch = await resolver(ompRecord(), { fullAccess })({ identity })
+      expect(launch).toMatchObject({ command: '/resolved/omp', args: ['acp'], fullAccess })
+      expect(launch.env.PI_CODING_AGENT_DIR).toBe('/home/user/.omp/agent')
+    }
+  })
+
+  it("passes the user's own OMP environment through unchanged", async () => {
+    const userEnv = {
+      OMP_PROFILE: 'work',
+      PI_CONFIG_DIR: 'relative/config',
+      PI_SMOL_MODEL: 'fast',
+      ANTHROPIC_API_KEY: 'sk-test'
+    }
+    const launch = await resolver(ompRecord(), { launchEnv: userEnv })({ identity })
+    expect(launch.envToDelete).toEqual([])
+    const child = createProviderSpawnSpec(
+      {
+        command: launch.command,
+        args: launch.args,
+        env: launch.env,
+        envToDelete: [...ACP_CHILD_ENV_TO_DELETE, ...launch.envToDelete]
+      },
+      { ORCA_PANE_KEY: 'tab-1:pane-1' },
+      'darwin'
+    ).env
+    expect(child).toMatchObject(userEnv)
+    // A pane's identity would let OMP's Orca status extension report for this chat too.
+    expect(child.ORCA_PANE_KEY).toBeUndefined()
+  })
+
+  it('keeps a chat on the directory it pinned when the launch env names another', async () => {
+    const launch = await resolver(ompRecord(), {
+      launchEnv: { PI_CODING_AGENT_DIR: '/data/other-agent' }
+    })({ identity })
+    expect(launch.env.PI_CODING_AGENT_DIR).toBe('/home/user/.omp/agent')
+  })
+
+  it("refuses a record that pins another agent's directory", async () => {
+    await expect(
+      resolver(ompRecord({ variable: 'GROK_HOME', path: '/home/user/.grok' }))({ identity })
+    ).rejects.toThrow(/pin PI_CODING_AGENT_DIR/)
+  })
+
+  it.each(['17.0.5', '17.2.12', '18.4.5'])('admits OMP %s', async (version) => {
+    const launch = resolver(ompRecord(), {
+      probeVersion: async (_input, supports) => supports(version)
+    })
+    await expect(launch({ identity })).resolves.toMatchObject({ args: ['acp'] })
+  })
+
+  it.each(['17.0.4', '16.9.0', '18.0.0-beta.1'])(
+    'refuses OMP %s before spawning it, as a host that cannot run the chat',
+    async (version) => {
+      const launch = resolver(ompRecord(), {
+        probeVersion: async (_input, supports) => supports(version)
+      })
+      await expect(launch({ identity })).rejects.toMatchObject({
+        refusal: {
+          code: 'structured_agent_session_unsupported',
+          details: { reason: 'hostUnsupported' }
+        }
+      })
+    }
+  )
+
+  it('refuses when the version cannot be read', async () => {
+    const launch = resolver(ompRecord(), { probeVersion: async () => false })
+    await expect(launch({ identity })).rejects.toMatchObject({
+      refusal: { code: 'structured_agent_session_unsupported' }
+    })
+  })
+
+  it('asks the version of exactly the binary, folder and environment it spawns', async () => {
+    const asked: Parameters<NonNullable<AcpStructuredLaunchResolverDeps['probeVersion']>>[0][] = []
+    const launch = await resolver(ompRecord(), {
+      probeVersion: async (input, supports) => (asked.push(input), supports('17.0.5'))
+    })({ identity })
+    expect(asked).toEqual([{ program: launch.command, cwd: launch.cwd, env: launch.env }])
+  })
+})
diff --git a/src/main/acp/acp-structured-launch-resolution-opencode.test.ts b/src/main/acp/acp-structured-launch-resolution-opencode.test.ts
new file mode 100644
index 000000000000..a473dd07b397
--- /dev/null
+++ b/src/main/acp/acp-structured-launch-resolution-opencode.test.ts
@@ -0,0 +1,254 @@
+import { describe, expect, it } from 'vitest'
+import type { AgentSessionRecord } from '../../shared/agent-session-record'
+import { agentSessionRecordFixture } from '../../shared/agent-session-record.test-fixture'
+import type { ManagedDataAccountsState } from '../../shared/managed-account-types'
+import { restoreManagedDataAccountEnvironment } from '../../shared/managed-data-account-environment'
+import { createProviderSpawnSpec } from '../provider-process/provider-process-supervisor'
+import { openCodeAcpAccountBinding } from '../opencode/opencode-structured-account-home'
+import { scrubOpenCodeAcpEnvironment } from '../opencode/opencode-acp-environment'
+import { ACP_CHILD_ENV_TO_DELETE, acpLaunchSpecFor } from './acp-launch-specs'
+import {
+  createAcpStructuredLaunchResolver,
+  type AcpStructuredLaunchResolverDeps
+} from './acp-structured-launch-resolution'
+
+const PROFILE = '123e4567-e89b-42d3-a456-426614174000'
+
+const managedAccounts = {
+  list: (): ManagedDataAccountsState => ({
+    accounts: [{ id: PROFILE, label: 'work', integrations: [], createdAt: 0 }],
+    activeAccountId: PROFILE
+  }),
+  restoreOriginalEnvironment: (environment: Record<string, string | undefined>) =>
+    restoreManagedDataAccountEnvironment(environment),
+  environmentForAccount: (_provider: 'opencode' | 'devin', id: string) => ({
+    XDG_DATA_HOME: `/profiles/${id}/data`,
+    XDG_STATE_HOME: `/profiles/${id}/state`,
+    OPENCODE_DB: 'opencode.db',
+    OPENCODE_AUTH_CONTENT: ''
+  })
+}
+
+const OPENCODE = {
+  ...acpLaunchSpecFor('opencode')!,
+  account: openCodeAcpAccountBinding(() => managedAccounts)
+}
+const identity = {
+  sessionId: 'session-alpha-1',
+  workspaceId: 'workspace-1',
+  hostId: 'local',
+  agent: 'opencode',
+  providerHandle: null
+}
+
+function openCodeRecord(accountHome: AgentSessionRecord['accountHome']): AgentSessionRecord {
+  return {
+    ...agentSessionRecordFixture(),
+    provider: 'opencode',
+    providerHandleChain: [],
+    accountHome
+  }
+}
+
+const UNMANAGED: AgentSessionRecord['accountHome'] = {
+  kind: 'opencode',
+  locator: { kind: 'unmanaged' }
+}
+
+function resolver(
+  record: AgentSessionRecord,
+  options: {
+    launchEnv?: Record<string, string>
+    inheritedEnv?: NodeJS.ProcessEnv
+    base?: Record<string, string>
+    probeVersion?: AcpStructuredLaunchResolverDeps['probeVersion']
+  } = {}
+) {
+  return createAcpStructuredLaunchResolver(OPENCODE, {
+    store: { getRecord: () => record },
+    readJournal: () => null,
+    resolveWorkspacePath: async () => '/repo/worktree',
+    resolveEnvironment: async () => ({ PATH: '/usr/bin', HOME: '/home/user', ...options.base }),
+    resolveLaunchEnv: () => options.launchEnv ?? {},
+    resolveCommand: (command) => `/resolved/${command}`,
+    inheritedEnv: options.inheritedEnv ?? {},
+    probeVersion: options.probeVersion ?? (async (_input, supports) => supports('1.18.31'))
+  })
+}
+
+describe('OpenCode ACP launch resolution', () => {
+  it('runs `opencode acp` as an ACP client with no question tool, whatever the user set', async () => {
+    const launch = await resolver(openCodeRecord(UNMANAGED), {
+      launchEnv: { OPENCODE_CLIENT: 'tui', OPENCODE_ENABLE_QUESTION_TOOL: 'true' }
+    })({ identity })
+    expect(launch).toMatchObject({ command: '/resolved/opencode', args: ['acp'] })
+    expect(launch.env).toMatchObject({
+      OPENCODE_CLIENT: 'acp',
+      OPENCODE_ENABLE_QUESTION_TOOL: 'false'
+    })
+  })
+
+  it("starts OpenCode with the user's own folders, database and inline credentials", async () => {
+    const userEnv = {
+      HOME: 'relative/home',
+      XDG_DATA_HOME: 'relative/data',
+      XDG_STATE_HOME: '/data/opencode-state',
+      OPENCODE_DB: 'work.db',
+      OPENCODE_AUTH_CONTENT: '{"secret":1}'
+    }
+    const launch = await resolver(openCodeRecord(UNMANAGED), {
+      base: { XDG_DATA_HOME: '/elsewhere' },
+      launchEnv: userEnv
+    })({ identity })
+    expect(launch.env).toMatchObject(userEnv)
+    const child = createProviderSpawnSpec(
+      {
+        command: launch.command,
+        args: launch.args,
+        env: launch.env,
+        envToDelete: [...ACP_CHILD_ENV_TO_DELETE, ...launch.envToDelete]
+      },
+      {},
+      'darwin'
+    ).env
+    expect(child).toMatchObject(userEnv)
+  })
+
+  it('leaves unset what the user left unset, whatever Orca itself inherited', async () => {
+    const inheritedEnv = { OPENCODE_DB: '/elsewhere/other.db', OPENCODE_AUTH_CONTENT: '' }
+    const launch = await resolver(openCodeRecord(UNMANAGED), { inheritedEnv })({ identity })
+    expect(launch.env.XDG_DATA_HOME).toBeUndefined()
+    expect(launch.env.OPENCODE_DB).toBeUndefined()
+    const child = createProviderSpawnSpec(
+      {
+        command: launch.command,
+        args: launch.args,
+        env: launch.env,
+        envToDelete: launch.envToDelete
+      },
+      inheritedEnv,
+      'darwin'
+    ).env
+    expect(child.OPENCODE_DB).toBeUndefined()
+    expect(child.OPENCODE_AUTH_CONTENT).toBeUndefined()
+  })
+
+  it('points a managed profile at its own directories', async () => {
+    const launch = await resolver(
+      openCodeRecord({ kind: 'opencode', locator: { kind: 'managed', managedProfileId: PROFILE } })
+    )({ identity })
+    expect(launch.env).toMatchObject({
+      XDG_DATA_HOME: `/profiles/${PROFILE}/data`,
+      XDG_STATE_HOME: `/profiles/${PROFILE}/state`,
+      OPENCODE_DB: 'opencode.db',
+      OPENCODE_AUTH_CONTENT: ''
+    })
+  })
+
+  it("restores the user's own config directory over Orca's status overlay", async () => {
+    const inheritedEnv = {
+      OPENCODE_CONFIG_DIR: '/orca/overlay',
+      ORCA_OPENCODE_CONFIG_DIR: '/orca/overlay',
+      ORCA_OPENCODE_SOURCE_CONFIG_DIR: '/home/user/.config/opencode-mine',
+      ORCA_OPENCODE_AGENT: 'opencode'
+    }
+    const launch = await resolver(openCodeRecord(UNMANAGED), { inheritedEnv })({ identity })
+    expect(launch.env.OPENCODE_CONFIG_DIR).toBe('/home/user/.config/opencode-mine')
+    const child = createProviderSpawnSpec(
+      {
+        command: launch.command,
+        args: launch.args,
+        env: launch.env,
+        envToDelete: [...ACP_CHILD_ENV_TO_DELETE, ...launch.envToDelete]
+      },
+      inheritedEnv,
+      'darwin'
+    ).env
+    expect(Object.keys(child).filter((key) => key.startsWith('ORCA_OPENCODE_'))).toEqual([])
+    expect(child.OPENCODE_CONFIG_DIR).toBe('/home/user/.config/opencode-mine')
+  })
+
+  it('drops an inherited overlay with no recorded source, so the default config is read', async () => {
+    const inheritedEnv = {
+      OPENCODE_CONFIG_DIR: '/orca/overlay',
+      ORCA_OPENCODE_CONFIG_DIR: '/orca/overlay'
+    }
+    const launch = await resolver(openCodeRecord(UNMANAGED), { inheritedEnv })({ identity })
+    const child = createProviderSpawnSpec(
+      {
+        command: launch.command,
+        args: launch.args,
+        env: launch.env,
+        envToDelete: [...ACP_CHILD_ENV_TO_DELETE, ...launch.envToDelete]
+      },
+      inheritedEnv,
+      'darwin'
+    ).env
+    expect(child.OPENCODE_CONFIG_DIR).toBeUndefined()
+    expect(child.ORCA_OPENCODE_CONFIG_DIR).toBeUndefined()
+  })
+
+  it("drops Orca's retired shared plugin directory an old shell still exports", () => {
+    const env: Record<string, string> = {
+      OPENCODE_CONFIG_DIR: '/orca-data/opencode-hooks/shared',
+      ORCA_DATA_ACCOUNT_PROVIDER: 'opencode'
+    }
+    const removed = scrubOpenCodeAcpEnvironment(env, {}, '/orca-data')
+    expect(env.OPENCODE_CONFIG_DIR).toBeUndefined()
+    expect(removed).toEqual(
+      expect.arrayContaining(['OPENCODE_CONFIG_DIR', 'ORCA_DATA_ACCOUNT_PROVIDER'])
+    )
+  })
+
+  it("keeps a config directory the user set for OpenCode's launches", async () => {
+    const launch = await resolver(openCodeRecord(UNMANAGED), {
+      launchEnv: { OPENCODE_CONFIG_DIR: '/home/user/team-config' },
+      inheritedEnv: {
+        OPENCODE_CONFIG_DIR: '/orca/overlay',
+        ORCA_OPENCODE_CONFIG_DIR: '/orca/overlay'
+      }
+    })({ identity })
+    expect(launch.env.OPENCODE_CONFIG_DIR).toBe('/home/user/team-config')
+    expect(launch.envToDelete).not.toContain('OPENCODE_CONFIG_DIR')
+  })
+
+  it('refuses a record that pins a single directory instead of an OpenCode account', async () => {
+    await expect(
+      resolver(openCodeRecord({ variable: 'XDG_DATA_HOME', path: '/data' }))({ identity })
+    ).rejects.toThrow(/pinned data account/)
+  })
+
+  it('runs an `opencode` that is stable 2.x', async () => {
+    const launch = await resolver(openCodeRecord(UNMANAGED), {
+      probeVersion: async (_input, supports) => supports('2.0.21')
+    })({ identity })
+    expect(launch.args).toEqual(['acp'])
+  })
+
+  it('refuses a release outside its lines before spawning it, as a host that cannot run the chat', async () => {
+    const launch = resolver(openCodeRecord(UNMANAGED), {
+      probeVersion: async (_input, supports) => supports('3.0.0')
+    })({ identity })
+    await expect(launch).rejects.toMatchObject({
+      refusal: {
+        code: 'structured_agent_session_unsupported',
+        details: { reason: 'hostUnsupported' }
+      }
+    })
+  })
+
+  it('refuses when the version cannot be read', async () => {
+    const launch = resolver(openCodeRecord(UNMANAGED), { probeVersion: async () => false })
+    await expect(launch({ identity })).rejects.toMatchObject({
+      refusal: { code: 'structured_agent_session_unsupported' }
+    })
+  })
+
+  it('asks the version of exactly the binary, folder and environment it spawns', async () => {
+    const asked: Parameters<NonNullable<AcpStructuredLaunchResolverDeps['probeVersion']>>[0][] = []
+    const launch = await resolver(openCodeRecord(UNMANAGED), {
+      probeVersion: async (input, supports) => (asked.push(input), supports('1.18.31'))
+    })({ identity })
+    expect(asked).toEqual([{ program: launch.command, cwd: launch.cwd, env: launch.env }])
+  })
+})
diff --git a/src/main/acp/acp-structured-launch-resolution.ts b/src/main/acp/acp-structured-launch-resolution.ts
index dbe372495a0a..8c13e2f3e620 100644
--- a/src/main/acp/acp-structured-launch-resolution.ts
+++ b/src/main/acp/acp-structured-launch-resolution.ts
@@ -14,7 +14,13 @@ import {
   type AgentSessionProviderHandleChain
 } from '../../shared/agent-session-provider-handle'
 import { LOCAL_EXECUTION_HOST_ID } from '../../shared/execution-host'
-import { resolveCliCommand } from '../../shared/node-cli-command-resolution'
+import type { resolveCliCommand } from '../../shared/node-cli-command-resolution'
+import { agentSessionRefusalError } from '../../shared/agent-session-wire-refusals'
+import {
+  resolveStructuredAgentCommand,
+  type StructuredAgentCommandSettings
+} from '../native-chat/structured-agent-command-resolution'
+import { probeAgentCliVersion } from '../agent-cli-version-probe'
 import { readAgentJournalTurn } from '../../shared/agent-session-turn-record'
 import type { JournalLoad } from '../native-chat/agent-session-journal/journal-open'
 import {
@@ -32,6 +38,8 @@ export type AcpStructuredLaunch = {
   args: string[]
   cwd: string
   env: Record<string, string>
+  /** Keys the child must not inherit from this process's own environment. */
+  envToDelete: string[]
   fullAccess: boolean
   /** The provider session to load; null starts a new one. */
   resume: {
@@ -58,8 +66,52 @@ export type AcpStructuredLaunchResolverDeps = {
   resolveLaunchEnv?: (agent: string) => Record<string, string>
   /** The Agent Permissions setting's bypass posture for this agent, re-read per acquisition. */
   resolveFullAccess?: (agent: string) => boolean
+  /** The user's per-agent Command setting, re-read per acquisition; none runs the stock binary. */
+  resolveCommandSettings?: () => StructuredAgentCommandSettings
   resolveCommand?: typeof resolveCliCommand
   homePath?: string
+  /** The environment the child process inherits at spawn; this process's own by default. */
+  inheritedEnv?: NodeJS.ProcessEnv
+  probeVersion?: typeof probeAgentCliVersion
+}
+
+/** The binary a launch with `env` spawns: the user's Command setting when set, else the stock
+ *  binary from PATH, then the agent's own install directories. A create's version check resolves
+ *  through here too, so it asks about the same file. */
+export function resolveAcpLaunchCommand(
+  spec: AcpLaunchSpec,
+  env: Readonly<Record<string, string>>,
+  options: {
+    commandSettings?: StructuredAgentCommandSettings
+    resolveCommand?: typeof resolveCliCommand
+    homePath?: string
+  } = {}
+): string {
+  const homePath = env.HOME ?? env.USERPROFILE ?? options.homePath ?? homedir()
+  const pathEnv = [env.PATH ?? env.Path, ...spec.installDirectories({ env, homePath })]
+    .filter((entry): entry is string => Boolean(entry))
+    .join(delimiter)
+  return resolveStructuredAgentCommand(
+    spec.agent,
+    options.commandSettings ?? {},
+    { pathEnv, homePath },
+    {
+      command: spec.command,
+      ...(options.resolveCommand ? { resolve: options.resolveCommand } : {})
+    }
+  )
+}
+
+/** Whether `command` is a release the spec runs a structured chat on; true when it names none. */
+export async function acpLaunchVersionSupported(
+  spec: AcpLaunchSpec,
+  launch: { command: string; cwd: string; env: Record<string, string> },
+  probe: typeof probeAgentCliVersion = probeAgentCliVersion
+): Promise<boolean> {
+  return (
+    !spec.supportsVersion ||
+    probe({ program: launch.command, cwd: launch.cwd, env: launch.env }, spec.supportsVersion)
+  )
 }
 
 export function createAcpStructuredLaunchResolver(
@@ -82,33 +134,33 @@ export function createAcpStructuredLaunchResolver(
         `${spec.agent} structured sessions run on this runtime's host, not ${location.executionHostId}`
       )
     }
-    if (accountHome.variable !== spec.accountHomeVariable) {
-      throw new Error(
-        `${spec.agent} sessions pin ${spec.accountHomeVariable}, not ${accountHome.variable}`
-      )
-    }
     const base = await deps.resolveEnvironment()
-    const env: Record<string, string> = {
+    const env: Record<string, string> = spec.account.environment(accountHome, {
       ...base,
-      ...deps.resolveLaunchEnv?.(spec.agent),
-      ...spec.env,
-      [spec.accountHomeVariable]: accountHome.path
-    }
-    const pathEnv = [env.PATH ?? env.Path, ...spec.installDirectories(accountHome.path)]
-      .filter((entry): entry is string => Boolean(entry))
-      .join(delimiter)
-    const command = (deps.resolveCommand ?? resolveCliCommand)(spec.command, {
-      pathEnv,
-      homePath: env.HOME ?? env.USERPROFILE ?? deps.homePath ?? homedir()
+      ...deps.resolveLaunchEnv?.(spec.agent)
     })
+    const envToDelete = spec.scrubEnvironment?.(env, deps.inheritedEnv ?? process.env) ?? []
+    Object.assign(env, spec.env)
+    const command = resolveAcpLaunchCommand(spec, env, {
+      ...deps,
+      ...(deps.resolveCommandSettings ? { commandSettings: deps.resolveCommandSettings() } : {})
+    })
+    const cwd = await deps.resolveWorkspacePath(location.workspaceId)
+    // Again at every launch: the binary on PATH may have changed since the chat was created.
+    if (!(await acpLaunchVersionSupported(spec, { command, cwd, env }, deps.probeVersion))) {
+      throw agentSessionRefusalError('structured_agent_session_unsupported', {
+        reason: 'hostUnsupported'
+      })
+    }
     const fullAccess = deps.resolveFullAccess?.(spec.agent) ?? false
     const head = agentSessionProviderHandleChainHead(record.providerHandleChain)
     return {
       spec,
       command,
       args: spec.args({ fullAccess }),
-      cwd: await deps.resolveWorkspacePath(location.workspaceId),
+      cwd,
       env,
+      envToDelete,
       fullAccess,
       resume: head
         ? {
diff --git a/src/main/acp/acp-structured-omp-recordings.test.ts b/src/main/acp/acp-structured-omp-recordings.test.ts
new file mode 100644
index 000000000000..4c0dc40c03d6
--- /dev/null
+++ b/src/main/acp/acp-structured-omp-recordings.test.ts
@@ -0,0 +1,117 @@
+// The adapter against OMP's recorded `omp acp` traffic (17.0.5): each recording plays back as the
+// agent, and the assertions read the journal a client would see.
+
+import { afterEach, describe, expect, it } from 'vitest'
+import type { AgentJournalMessageItem } from '../../shared/agent-session-journal-types'
+import { readAgentJournalTurn } from '../../shared/agent-session-turn-record'
+import {
+  closeProviderTimelineRigs,
+  SESSION
+} from '../native-chat/agent-session-timeline/provider-timeline-assembler-test-support'
+import { acpLaunchSpecFor } from './acp-launch-specs'
+import {
+  openAcpAdapterRig,
+  waitFor,
+  type AcpAdapterRig
+} from './acp-structured-adapter.test-support'
+import { GrokFixtureReplay } from './acp-structured-fixture-replay.test-support'
+import { readAcpFixture } from './acp-timeline-fixture.test-support'
+
+afterEach(async () => {
+  await closeProviderTimelineRigs()
+})
+
+const ask: AgentJournalMessageItem = {
+  kind: 'message',
+  role: 'user',
+  blocks: [{ type: 'text', text: 'Fixture prompt' }]
+}
+
+async function replaying(name: string) {
+  const replay = new GrokFixtureReplay(await readAcpFixture(name))
+  const rig = await openAcpAdapterRig({
+    spec: acpLaunchSpecFor('omp')!,
+    script: (scripted) => replay.attach(scripted)
+  })
+  await rig.acquire()
+  await rig.adapter.dispatch({ sessionId: SESSION, clientMessageId: 'send-1', body: ask, fence: 1 })
+  return { rig, replay }
+}
+
+async function turns(rig: AcpAdapterRig) {
+  return (await rig.rig.rows()).flatMap((row) => readAgentJournalTurn(row.body) ?? [])
+}
+
+async function toolRow(rig: AcpAdapterRig) {
+  const rows = (await rig.rig.rows()).filter((row) => row.body.kind === 'tool-call')
+  expect(rows).toHaveLength(1)
+  return rows[0]!.body
+}
+
+async function allowOnce(rig: AcpAdapterRig, replay: GrokFixtureReplay) {
+  const approval = await waitFor(async () => {
+    const found = (await rig.rig.rows()).find((row) => row.body.kind === 'approval')
+    if (!found || replay.awaiting !== 'reply') {
+      throw new Error('no pending approval yet')
+    }
+    return found
+  })
+  await rig.adapter.answerPrompt({
+    sessionId: SESSION,
+    itemId: approval.itemId,
+    kind: 'approval',
+    response: { kind: 'option', optionId: 'allow_once' },
+    fence: 1,
+    commit: async () => {}
+  })
+}
+
+describe('OMP recordings through the adapter', () => {
+  it("a failed command's row shows its output and exit code, not the command again", async () => {
+    const { rig, replay } = await replaying('omp-v17-shell-exit-3')
+    await allowOnce(rig, replay)
+    await waitFor(() => expect(replay.awaiting).toBeNull())
+    await waitFor(async () =>
+      expect(await turns(rig)).toMatchObject([{ state: 'completed', outcome: 'success' }])
+    )
+    expect(await toolRow(rig)).toMatchObject({
+      state: 'failed',
+      input: { command: 'printf hi; exit 3' },
+      exitCode: 3,
+      output: { head: 'hi', truncated: false }
+    })
+  })
+
+  it("a successful command's row shows its output", async () => {
+    const { rig, replay } = await replaying('omp-v17-shell-ok')
+    await allowOnce(rig, replay)
+    await waitFor(() => expect(replay.awaiting).toBeNull())
+    await waitFor(async () =>
+      expect(await turns(rig)).toMatchObject([{ state: 'completed', outcome: 'success' }])
+    )
+    const tool = await toolRow(rig)
+    expect(tool).toMatchObject({ state: 'completed', output: { head: 'ok', truncated: false } })
+    // OMP reports an exit code only when it is not zero.
+    expect(tool).not.toHaveProperty('exitCode')
+  })
+
+  it('Stop during a running command ends the turn and leaves the row without the command as output', async () => {
+    const { rig, replay } = await replaying('omp-v17-stop-mid-tool')
+    await allowOnce(rig, replay)
+    await waitFor(() => expect(replay.awaiting).toBe('session/cancel'))
+    await expect(rig.adapter.cancelTurn({ sessionId: SESSION, fence: 1 })).resolves.toEqual({
+      cancelled: true
+    })
+    await waitFor(() => expect(replay.awaiting).toBeNull())
+    await waitFor(async () =>
+      expect(await turns(rig)).toMatchObject([{ state: 'interrupted', outcome: 'cancellation' }])
+    )
+    // OMP sends nothing more for the stopped command; Orca settles its row with the turn.
+    const tool = await toolRow(rig)
+    expect(tool).toMatchObject({
+      endedAs: 'interrupted',
+      input: { command: 'sleep 30', timeout: 60 }
+    })
+    expect(tool).not.toHaveProperty('output')
+  })
+})
diff --git a/src/main/acp/acp-structured-opencode-recordings.test.ts b/src/main/acp/acp-structured-opencode-recordings.test.ts
new file mode 100644
index 000000000000..6adf5d1d910e
--- /dev/null
+++ b/src/main/acp/acp-structured-opencode-recordings.test.ts
@@ -0,0 +1,129 @@
+// The adapter against OpenCode's recorded `opencode acp` traffic (1.18.31): each
+// recording plays back as the agent, and the assertions read the journal a client would see.
+
+import { afterEach, describe, expect, it } from 'vitest'
+import type { AgentJournalMessageItem } from '../../shared/agent-session-journal-types'
+import { readAgentJournalTurn } from '../../shared/agent-session-turn-record'
+import {
+  closeProviderTimelineRigs,
+  SESSION
+} from '../native-chat/agent-session-timeline/provider-timeline-assembler-test-support'
+import { acpLaunchSpecFor } from './acp-launch-specs'
+import {
+  openAcpAdapterRig,
+  waitFor,
+  type AcpAdapterRig
+} from './acp-structured-adapter.test-support'
+import { GrokFixtureReplay } from './acp-structured-fixture-replay.test-support'
+import { readAcpFixture } from './acp-timeline-fixture.test-support'
+
+afterEach(async () => {
+  await closeProviderTimelineRigs()
+})
+
+const ask: AgentJournalMessageItem = {
+  kind: 'message',
+  role: 'user',
+  blocks: [{ type: 'text', text: 'Fixture prompt' }]
+}
+
+async function replaying(name: string) {
+  const replay = new GrokFixtureReplay(await readAcpFixture(name))
+  const rig = await openAcpAdapterRig({
+    spec: acpLaunchSpecFor('opencode')!,
+    script: (scripted) => replay.attach(scripted)
+  })
+  await rig.acquire()
+  await rig.adapter.dispatch({ sessionId: SESSION, clientMessageId: 'send-1', body: ask, fence: 1 })
+  return { rig, replay }
+}
+
+async function turns(rig: AcpAdapterRig) {
+  return (await rig.rig.rows()).flatMap((row) => readAgentJournalTurn(row.body) ?? [])
+}
+
+async function rowsOf(rig: AcpAdapterRig, kind: string) {
+  return (await rig.rig.rows()).filter((row) => row.body.kind === kind)
+}
+
+async function answer(rig: AcpAdapterRig, replay: GrokFixtureReplay, optionId: string, index = 0) {
+  const approval = await waitFor(async () => {
+    const found = (await rowsOf(rig, 'approval'))[index]
+    if (!found || replay.awaiting !== 'reply') {
+      throw new Error('no pending approval yet')
+    }
+    return found
+  })
+  await rig.adapter.answerPrompt({
+    sessionId: SESSION,
+    itemId: approval.itemId,
+    kind: 'approval',
+    response: { kind: 'option', optionId },
+    fence: 1,
+    commit: async () => {}
+  })
+  return approval
+}
+
+describe('OpenCode recordings through the adapter', () => {
+  it('an approved shell command lands with its exit code, and "always" keeps OpenCode\'s own name', async () => {
+    const { rig, replay } = await replaying('opencode-v1-tool')
+    const approval = await answer(rig, replay, 'once')
+    expect(approval.body).toMatchObject({
+      kind: 'approval',
+      options: [
+        { id: 'once', label: 'Allow once' },
+        { id: 'always', label: 'Always allow' },
+        { id: 'reject', label: 'Reject' }
+      ]
+    })
+    await waitFor(() => expect(replay.awaiting).toBeNull())
+    await waitFor(async () =>
+      expect(await turns(rig)).toMatchObject([{ state: 'completed', outcome: 'success' }])
+    )
+    const shell = (await rowsOf(rig, 'tool-call')).find(
+      (row) => row.body.kind === 'tool-call' && row.body.exitCode !== undefined
+    )
+    expect(shell?.body).toMatchObject({ state: 'completed', exitCode: 0 })
+  })
+
+  it('a rejected permission fails its tool and the turn still ends', async () => {
+    const { rig, replay } = await replaying('opencode-v1-deny')
+    await answer(rig, replay, 'reject')
+    await waitFor(() => expect(replay.awaiting).toBeNull())
+    await waitFor(async () => expect(await turns(rig)).toMatchObject([{ state: 'completed' }]))
+    expect((await rowsOf(rig, 'tool-call')).at(-1)?.body).toMatchObject({ state: 'failed' })
+  })
+
+  it("a subagent's approval never arrives (a known OpenCode bug); Stop still ends the turn", async () => {
+    const { rig, replay } = await replaying('opencode-v1-subagent-hang')
+    await waitFor(() => expect(replay.awaiting).toBe('session/cancel'))
+    expect(await rowsOf(rig, 'approval')).toEqual([])
+    await expect(rig.adapter.cancelTurn({ sessionId: SESSION, fence: 1 })).resolves.toEqual({
+      cancelled: true
+    })
+    await waitFor(async () =>
+      expect(await turns(rig)).toMatchObject([{ state: 'interrupted', outcome: 'cancellation' }])
+    )
+  })
+
+  it("OpenCode's stray file write after an approved edit is refused without breaking the turn", async () => {
+    const { rig, replay } = await replaying('opencode-v1-stray-write')
+    await answer(rig, replay, 'once', 0)
+    await answer(rig, replay, 'reject', 1)
+    await waitFor(() => expect(replay.awaiting).toBeNull())
+    await waitFor(async () => expect(await turns(rig)).toMatchObject([{ state: 'completed' }]))
+    // The write OpenCode repeats to a client that took no file system leaves no row.
+    expect(JSON.stringify((await rig.rig.rows()).map((row) => row.body))).not.toContain(
+      'fs/write_text_file'
+    )
+  })
+
+  it("a provider error fails the turn in OpenCode's own words", async () => {
+    const { rig, replay } = await replaying('opencode-v1-provider-error')
+    await waitFor(() => expect(replay.awaiting).toBeNull())
+    await waitFor(async () => expect(await turns(rig)).toMatchObject([{ outcome: 'failure' }]))
+    const texts = JSON.stringify((await rig.rig.rows()).map((row) => row.body))
+    expect(texts).toContain('CAPTURE_PROVIDER_400')
+  })
+})
diff --git a/src/main/acp/acp-structured-session-adapter-deps.ts b/src/main/acp/acp-structured-session-adapter-deps.ts
index 3f59f4db3e4a..f8605b12daf4 100644
--- a/src/main/acp/acp-structured-session-adapter-deps.ts
+++ b/src/main/acp/acp-structured-session-adapter-deps.ts
@@ -5,6 +5,7 @@ import type {
   AgentSessionJournalIdentity
 } from '../../shared/agent-session-journal-types'
 import type { AgentJournalDispatchRejection } from '../../shared/agent-session-failure-words'
+import type { JournalLoad } from '../native-chat/agent-session-journal/journal-open'
 import type { AcpLaunchSpec } from './acp-launch-specs'
 import type { ConnectAcpAgent } from './acp-structured-connection'
 import type { AcpStructuredLaunch } from './acp-structured-launch-resolution'
@@ -17,6 +18,8 @@ export const ACP_OPTION_WRITE_TIMEOUT_MS = 30_000
 export type AcpStructuredSessionAdapterDeps = {
   spec: AcpLaunchSpec
   resolveLaunch: (input: { identity: AgentSessionJournalIdentity }) => Promise<AcpStructuredLaunch>
+  /** The chat's journal as it stands, read without opening it; null when it has none. */
+  readJournal?: (sessionId: string) => JournalLoad | null
   /** Starts the agent's process and owns its protocol: `createAcpAgentConnection` in production. */
   connect: ConnectAcpAgent
   readProcessStartTime?: (pid: number) => Promise<number | null>
diff --git a/src/main/acp/acp-structured-session-adapter-lifecycle.test.ts b/src/main/acp/acp-structured-session-adapter-lifecycle.test.ts
index bb845eb429fb..e20058bfd726 100644
--- a/src/main/acp/acp-structured-session-adapter-lifecycle.test.ts
+++ b/src/main/acp/acp-structured-session-adapter-lifecycle.test.ts
@@ -421,6 +421,7 @@ describe('ACP startup that never answers', () => {
             args: [],
             cwd: '/workspace/project',
             env: {},
+            envToDelete: [],
             fullAccess: false,
             resume: null
           }
diff --git a/src/main/acp/acp-structured-session-adapter.ts b/src/main/acp/acp-structured-session-adapter.ts
index b0dd9804b5ea..664580848706 100644
--- a/src/main/acp/acp-structured-session-adapter.ts
+++ b/src/main/acp/acp-structured-session-adapter.ts
@@ -27,25 +27,35 @@ import {
   endAcpStructuredSession,
   type AcpStructuredSession
 } from './acp-structured-session'
-import { AcpStructuredStarts, type AcpStartAttempt } from './acp-structured-starts'
+import {
+  ProviderAcquisitionStarts,
+  type ProviderStartAttempt
+} from '../provider-process/provider-acquisition-starts'
+import type { AcpStructuredConnection } from './acp-structured-connection'
 import { waitForAcpExit } from './acp-structured-connection'
 import { AcpConnectionClosedError } from './acp-errors'
-import { acpPromptBlocks } from './acp-structured-turns'
 import { awaitAcpTurnEnd, interruptAcpTurn, windDownAcpTurn } from './acp-structured-stop'
+import { acpDispatchPrompt } from './acp-prompt-content'
 import {
   ACP_OPTION_WRITE_TIMEOUT_MS,
   ACP_STOP_GRACE_MS,
   type AcpStructuredSessionAdapterDeps
 } from './acp-structured-session-adapter-deps'
 import { writeAcpSessionOption } from './acp-structured-options'
+import { readAcpRecoveryHistory } from './acp-recovery-history'
 
 export class AcpStructuredSessionAdapter implements StructuredAgentSessionAdapter {
   /** Live children, and ones whose exit is not yet proven; a proven exit removes its entry. */
   private readonly sessions = new Map<string, AcpStructuredSession>()
-  private readonly starts = new AcpStructuredStarts()
+  private readonly starts = new ProviderAcquisitionStarts<AcpStructuredConnection>()
 
   constructor(private readonly deps: AcpStructuredSessionAdapterDeps) {}
 
+  /** Restart recovery's evidence; null for an agent whose own store Orca cannot read. */
+  providerHistoryWindow: NonNullable<StructuredAgentSessionAdapter['providerHistoryWindow']> = ({
+    identity
+  }) => readAcpRecoveryHistory(this.deps, identity)
+
   // The child runs on this runtime's own machine; Windows needs process start-time proof.
   supportsLocation = (location: AgentSessionExecutionLocation): boolean =>
     supportsSupervisedProviderChildLocation(location, this.deps.isWindowsProcessStartTimeAvailable)
@@ -69,7 +79,7 @@ export class AcpStructuredSessionAdapter implements StructuredAgentSessionAdapte
 
   private async start(
     input: StructuredAgentSessionAcquireInput,
-    attempt: AcpStartAttempt
+    attempt: ProviderStartAttempt<AcpStructuredConnection>
   ): Promise<AgentSessionAcquisition> {
     const sessionId = input.identity.sessionId
     const generation = this.deps.mintGeneration?.() ?? randomUUID()
@@ -142,9 +152,13 @@ export class AcpStructuredSessionAdapter implements StructuredAgentSessionAdapte
       return this.rejected(lost, 'providerExited')
     }
     const session = this.live(input.sessionId)
-    const prompt = acpPromptBlocks(input.body)
-    if (!prompt) {
-      return this.rejected(session, 'attachmentInvalid')
+    const prompt = await acpDispatchPrompt(input.body, session)
+    if (!Array.isArray(prompt)) {
+      return { state: 'rejected', ...prompt }
+    }
+    if (this.sessions.get(input.sessionId) !== session || session.journalClosed !== null) {
+      // The child ended while its attachments were read: nothing left Orca.
+      return this.rejected(session, 'providerExited')
     }
     await input.beforeDispatch?.()
     session.turns.dispatch({
@@ -312,7 +326,7 @@ export class AcpStructuredSessionAdapter implements StructuredAgentSessionAdapte
 
   private rejected(
     session: AcpStructuredSession,
-    kind: 'providerExited' | 'attachmentInvalid'
+    kind: 'providerExited'
   ): AgentSessionDispatchOutcome {
     return {
       state: 'rejected',
diff --git a/src/main/acp/acp-structured-turns.ts b/src/main/acp/acp-structured-turns.ts
index df5495f65edc..4bbf773ea51f 100644
--- a/src/main/acp/acp-structured-turns.ts
+++ b/src/main/acp/acp-structured-turns.ts
@@ -17,10 +17,7 @@ import {
   agentSessionFailureWords,
   type AgentJournalDispatchRejection
 } from '../../shared/agent-session-failure-words'
-import type {
-  AgentJournalItemIdentity,
-  AgentJournalMessageItem
-} from '../../shared/agent-session-journal-types'
+import type { AgentJournalItemIdentity } from '../../shared/agent-session-journal-types'
 import { AcpAgentError, AcpConnectionClosedError } from './acp-errors'
 import type { AcpStructuredConnection } from './acp-structured-connection'
 import type { AcpStructuredLane } from './acp-structured-lane'
@@ -32,19 +29,6 @@ export type AcpDispatchSettlement = { clientMessageId: string } & (
   | { state: 'unknown'; reason: string }
 )
 
-/** A person's message as an ACP prompt; null when it carries what the agent cannot take. */
-export function acpPromptBlocks(body: AgentJournalMessageItem): ContentBlock[] | null {
-  const blocks: ContentBlock[] = []
-  for (const block of body.blocks) {
-    if (block.type !== 'text') {
-      // Images wait for an ACP image path; the chat offers none while `imagePrompts` is off.
-      return null
-    }
-    blocks.push({ type: 'text', text: block.text })
-  }
-  return blocks
-}
-
 type Send = { clientMessageId: string; prompt: ContentBlock[]; requestedAt: number }
 
 export type AcpStructuredTurnsDeps = {
diff --git a/src/main/acp/acp-timeline-fixture.test-support.ts b/src/main/acp/acp-timeline-fixture.test-support.ts
index ae9eac456e47..c611cfabbb99 100644
--- a/src/main/acp/acp-timeline-fixture.test-support.ts
+++ b/src/main/acp/acp-timeline-fixture.test-support.ts
@@ -20,7 +20,8 @@ const frameSchema = z.object({
     id: z.union([z.string(), z.number()]).optional(),
     method: z.string().optional(),
     params: z.unknown().optional(),
-    result: z.unknown().optional()
+    result: z.unknown().optional(),
+    error: z.unknown().optional()
   })
 })
 export type AcpFixtureFrame = z.infer<typeof frameSchema>
diff --git a/src/main/acp/acp-timeline-opencode-dialect.test.ts b/src/main/acp/acp-timeline-opencode-dialect.test.ts
new file mode 100644
index 000000000000..e82a72235fde
--- /dev/null
+++ b/src/main/acp/acp-timeline-opencode-dialect.test.ts
@@ -0,0 +1,106 @@
+import { afterEach, describe, expect, it } from 'vitest'
+import {
+  closeProviderTimelineRigs,
+  openProviderTimelineRig
+} from '../native-chat/agent-session-timeline/provider-timeline-assembler-test-support'
+import type { ProviderTimelineEvent } from '../native-chat/agent-session-timeline/provider-timeline-event'
+import { OPENCODE_ACP_DIALECT } from './acp-dialects/opencode-dialect'
+import { AcpTimelineTranslator } from './acp-timeline-translator'
+
+afterEach(closeProviderTimelineRigs)
+
+async function openCodeRig() {
+  const rig = await openProviderTimelineRig()
+  const translator = new AcpTimelineTranslator({
+    sessionId: 'provider-1',
+    dialect: OPENCODE_ACP_DIALECT
+  })
+  const apply = (events: ProviderTimelineEvent[]) => {
+    for (const event of events) {
+      expect(rig.assembler.apply(event).admission.accepted).toBe(true)
+    }
+  }
+  const update = (body: Record<string, unknown>, at: number) =>
+    apply(translator.notification('session/update', { sessionId: 'provider-1', update: body }, at))
+  apply(translator.openPrompt('send-1', 1000).events)
+  return { rig, translator, apply, update }
+}
+
+// The shapes OpenCode's ACP server writes for a shell tool: its output and exit code ride under
+// `rawOutput.metadata`, beside the text content.
+const bashStart = {
+  sessionUpdate: 'tool_call',
+  toolCallId: 'call-1',
+  title: 'List files',
+  kind: 'execute',
+  status: 'pending',
+  rawInput: { command: 'ls missing', description: 'List files' }
+}
+
+describe('OpenCode over ACP', () => {
+  it("reads a shell tool's exit code and output from OpenCode's metadata", async () => {
+    const { rig, update } = await openCodeRig()
+    update(bashStart, 1001)
+    update(
+      {
+        sessionUpdate: 'tool_call_update',
+        toolCallId: 'call-1',
+        status: 'completed',
+        rawOutput: {
+          output: 'ls: missing: No such file or directory\n',
+          metadata: { output: 'ls: missing: No such file or directory\n', exit: 1 }
+        }
+      },
+      1002
+    )
+    const tool = (await rig.rows()).find((row) => row.body.kind === 'tool-call')?.body
+    expect(tool).toMatchObject({
+      kind: 'tool-call',
+      state: 'completed',
+      exitCode: 1,
+      output: { head: 'ls: missing: No such file or directory\n' }
+    })
+  })
+
+  it('keeps a shared exit code the agent already reported', () => {
+    const normalized = OPENCODE_ACP_DIALECT.normalizeToolUpdate!({
+      toolCallId: 'call-1',
+      rawOutput: { exitCode: 0, metadata: { exit: 3 } }
+    })
+    expect(normalized.rawOutput).toEqual({ exitCode: 0, metadata: { exit: 3 } })
+  })
+
+  it('leaves a tool with no command metadata as it came', () => {
+    const plain = { toolCallId: 'call-2', rawOutput: 'done' }
+    expect(OPENCODE_ACP_DIALECT.normalizeToolUpdate!(plain)).toBe(plain)
+  })
+
+  it("shows OpenCode's own permission option names", async () => {
+    const { translator, apply, update } = await openCodeRig()
+    update(bashStart, 1001)
+    const request = translator.request(
+      'session/request_permission',
+      {
+        sessionId: 'provider-1',
+        toolCall: { toolCallId: 'call-1', title: 'ls missing', kind: 'execute' },
+        options: [
+          { optionId: 'once', kind: 'allow_once', name: 'Allow once' },
+          { optionId: 'always', kind: 'allow_always', name: 'Always allow' },
+          { optionId: 'reject', kind: 'reject_once', name: 'Reject' }
+        ]
+      },
+      0
+    )
+    apply(request.events)
+    expect(request.presentation?.body).toMatchObject({
+      options: [
+        { id: 'once', label: 'Allow once' },
+        { id: 'always', label: 'Always allow' },
+        { id: 'reject', label: 'Reject' }
+      ]
+    })
+    expect(request.presentation?.reply({ kind: 'option', optionId: 'always' })).toEqual({
+      outcome: { outcome: 'selected', optionId: 'always' }
+    })
+  })
+})
diff --git a/src/main/acp/acp-timeline-requests.ts b/src/main/acp/acp-timeline-requests.ts
index 176967409c9e..4afdf09cb386 100644
--- a/src/main/acp/acp-timeline-requests.ts
+++ b/src/main/acp/acp-timeline-requests.ts
@@ -28,7 +28,10 @@ export function acpPermissionPresentation(params: unknown): AcpRequestPresentati
       kind: 'approval',
       title: toolCall.title ?? 'Permission requested',
       detail: null,
-      options: options.map((option) => ({ id: option.optionId, label: option.name })),
+      options: options.map((option) => ({
+        id: option.optionId,
+        label: option.name
+      })),
       resolution: pendingAcpResolution
     },
     reply: (response) => {
@@ -47,6 +50,7 @@ export function acpPermissionPresentation(params: unknown): AcpRequestPresentati
 }
 
 const requestSessionSchema = z.object({ sessionId: z.string() })
+const UNADVERTISED_CLIENT_METHOD = /^(?:fs|terminal)\//
 const requestToolSchema = z.object({
   toolCallId: z.string().optional(),
   toolCall: z.object({ toolCallId: z.string() }).optional()
@@ -105,6 +109,11 @@ export function translateAcpRequest(
       ? acpPermissionPresentation(params)
       : options.dialect.request?.(method, params)
   if (!presentation) {
+    // A file system or terminal call Orca never advertised is the agent's own misstep (OpenCode 1.x
+    // repeats each approved edit as a file write it already made): refused, with no row.
+    if (UNADVERTISED_CLIENT_METHOD.test(method)) {
+      return { events: [] }
+    }
     return {
       events: [{ type: 'provider.frame', frameKind: `request:${method}`, payload: params, join }]
     }
diff --git a/src/main/acp/acp-tool-timeline.ts b/src/main/acp/acp-tool-timeline.ts
index 28762bc4646d..f6b4a22df2f7 100644
--- a/src/main/acp/acp-tool-timeline.ts
+++ b/src/main/acp/acp-tool-timeline.ts
@@ -19,6 +19,7 @@ import type { AcpDialect } from './acp-dialects/acp-dialect'
 import type { ToolCallUpdate } from './generated/acp-protocol.generated'
 
 const rawStreamsSchema = z.object({ stdout: z.string().optional(), stderr: z.string().optional() })
+const rawExitCodeSchema = z.looseObject({ exitCode: z.number().int().safe() })
 
 function outputText(update: ToolCallUpdate): string | undefined {
   const text = update.content?.flatMap((block) =>
@@ -89,12 +90,14 @@ export class AcpToolTimeline {
   })
 
   translate(
-    update: ToolCallUpdate,
+    raw: ToolCallUpdate,
     dialect: AcpDialect,
     join: ProviderTimelineJoin
   ): ProviderTimelineEvent[] {
+    const update = dialect.normalizeToolUpdate?.(raw) ?? raw
     const previous = this.tools.get(update.toolCallId)
     const output = outputText(update)
+    const exitCode = rawExitCodeSchema.safeParse(update.rawOutput).data?.exitCode
     const state =
       update.status === 'completed'
         ? 'completed'
@@ -118,6 +121,7 @@ export class AcpToolTimeline {
           ? (previous?.body.input ?? null)
           : boundToolInput(update.rawInput, DEFAULT_JOURNAL_PAYLOAD_LIMITS),
       state,
+      ...(exitCode === undefined ? {} : { exitCode }),
       ...(output === undefined
         ? previous?.body.output
           ? { output: previous.body.output }
diff --git a/src/main/acp/acp-write-queue-retention.test.ts b/src/main/acp/acp-write-queue-retention.test.ts
new file mode 100644
index 000000000000..1c9a5931737c
--- /dev/null
+++ b/src/main/acp/acp-write-queue-retention.test.ts
@@ -0,0 +1,113 @@
+import { PassThrough, Writable } from 'node:stream'
+import { expect, it } from 'vitest'
+import { AcpJsonRpcPeer } from './acp-json-rpc-peer'
+
+async function collect(): Promise<void> {
+  if (!('gc' in globalThis) || typeof globalThis.gc !== 'function') {
+    throw new Error('The test runner must enable --expose-gc')
+  }
+  for (let round = 0; round < 6; round++) {
+    await new Promise<void>((resolve) => setImmediate(resolve))
+    globalThis.gc()
+  }
+}
+
+function fixture(deferred: boolean, backpressure: boolean) {
+  const input = new PassThrough()
+  const refs: WeakRef<object>[] = []
+  const writes: string[] = []
+  let callback: ((error?: Error | null) => void) | undefined
+  const output = new Writable({
+    highWaterMark: backpressure ? 1 : 1024 * 1024,
+    write(chunk, _encoding, done) {
+      writes.push(JSON.parse(chunk.toString()).method)
+      if (deferred) {
+        callback = done
+      } else {
+        done()
+      }
+    }
+  })
+  output.on('newListener', (event, listener) => {
+    if (event === 'drain') {
+      refs.push(new WeakRef(listener))
+    }
+  })
+  const peer = new AcpJsonRpcPeer(input, output)
+  return {
+    input,
+    output,
+    refs,
+    peer,
+    writes,
+    complete() {
+      const done = callback
+      callback = undefined
+      if (!done) {
+        throw new Error('Missing pending stream callback')
+      }
+      done()
+    },
+    close() {
+      peer.close()
+      input.destroy()
+      output.destroy()
+    }
+  }
+}
+
+it.each([false, true])(
+  'releases the completed last drain closure while the peer remains usable (backpressure=%s)',
+  async (backpressure) => {
+    const state = fixture(false, backpressure)
+    try {
+      await state.peer.notify('first', { text: 'x'.repeat(256 * 1024) })
+      expect(state.output.writableLength).toBe(0)
+      expect(state.output.listenerCount('drain')).toBe(0)
+      await collect()
+      expect(state.refs.filter((ref) => ref.deref())).toHaveLength(0)
+      await state.peer.notify('next', {})
+      expect(state.writes).toEqual(['first', 'next'])
+    } finally {
+      state.close()
+    }
+  }
+)
+
+it('keeps the active write until stream completion then releases its drain closure', async () => {
+  const state = fixture(true, true)
+  try {
+    const first = state.peer.notify('first', {})
+    const second = state.peer.notify('second', {})
+    await collect()
+    expect(state.refs.filter((ref) => ref.deref())).toHaveLength(1)
+    expect(state.writes).toEqual(['first'])
+    state.complete()
+    await first
+    expect(state.writes).toEqual(['first', 'second'])
+    state.complete()
+    await second
+    await collect()
+    expect(state.refs.filter((ref) => ref.deref())).toHaveLength(0)
+    expect(state.output.listenerCount('drain')).toBe(0)
+  } finally {
+    state.close()
+  }
+})
+
+it('retires a closed peer drain closure after its late stream completion', async () => {
+  const state = fixture(true, true)
+  try {
+    const first = expect(state.peer.notify('first', {})).rejects.toThrow('closed')
+    const second = expect(state.peer.notify('second', {})).rejects.toThrow('closed')
+    state.peer.close()
+    await Promise.all([first, second])
+    state.complete()
+    await collect()
+    expect(state.refs.filter((ref) => ref.deref())).toHaveLength(0)
+    expect(state.output.listenerCount('drain')).toBe(0)
+    expect(state.writes).toEqual(['first'])
+  } finally {
+    state.close()
+  }
+})
diff --git a/src/main/acp/acp-write-queue.ts b/src/main/acp/acp-write-queue.ts
index 7538fc04aa66..9a72f21c235c 100644
--- a/src/main/acp/acp-write-queue.ts
+++ b/src/main/acp/acp-write-queue.ts
@@ -1,119 +1,12 @@
 import type { Writable } from 'node:stream'
+import { ProviderStdioWriteQueue } from '../provider-process/provider-stdio-write-queue'
 import { AcpConnectionClosedError } from './acp-errors'
 
-type Write = {
-  line: string
-  resolve: () => void
-  reject: (error: Error) => void
-  detachAbort?: () => void
-}
-
-export class AcpWriteQueue {
-  private readonly queue: Write[] = []
-  private bytes = 0
-  private active?: Write
-  private terminalError?: Error
-  private detachDrain?: () => void
-
-  constructor(
-    private readonly output: Writable,
-    private readonly maxBytes: number,
-    private readonly onFailure: (error: Error) => void
-  ) {}
-
-  write(line: string, signal?: AbortSignal): Promise<void> {
-    if (this.terminalError) {
-      return Promise.reject(this.terminalError)
-    }
-    if (signal?.aborted) {
-      return Promise.reject(signal.reason)
-    }
-    const bytes = Buffer.byteLength(line)
-    if (this.bytes + bytes > this.maxBytes) {
-      return Promise.reject(new Error('ACP write queue capacity exceeded'))
-    }
-    this.bytes += bytes
-    return new Promise((resolve, reject) => {
-      const write: Write = { line, resolve, reject }
-      const abort = (): void => {
-        const index = this.queue.indexOf(write)
-        if (index === -1) {
-          return
-        }
-        this.queue.splice(index, 1)
-        this.bytes -= bytes
-        write.detachAbort?.()
-        reject(signal?.reason)
-      }
-      signal?.addEventListener('abort', abort, { once: true })
-      write.detachAbort = () => signal?.removeEventListener('abort', abort)
-      this.queue.push(write)
-      this.flush()
+export class AcpWriteQueue extends ProviderStdioWriteQueue {
+  constructor(output: Writable, maxBytes: number, onFailure: (error: Error) => void) {
+    super(output, maxBytes, onFailure, {
+      capacity: () => new Error('ACP write queue capacity exceeded'),
+      closed: () => new AcpConnectionClosedError('ACP output is not writable')
     })
   }
-
-  close(error: Error): void {
-    if (this.terminalError) {
-      return
-    }
-    this.terminalError = error
-    this.detachDrain?.()
-    this.active?.reject(error)
-    this.active = undefined
-    for (const write of this.queue.splice(0)) {
-      write.detachAbort?.()
-      write.reject(error)
-    }
-    this.bytes = 0
-  }
-
-  private flush(): void {
-    if (this.active || this.terminalError) {
-      return
-    }
-    const write = this.queue.shift()
-    if (!write) {
-      return
-    }
-    write.detachAbort?.()
-    this.active = write
-    if (this.output.destroyed || !this.output.writable) {
-      this.onFailure(new AcpConnectionClosedError('ACP output is not writable'))
-      return
-    }
-    let completed = false
-    let drained = false
-    let returned = false
-    const finish = (): void => {
-      if (!returned || !completed || !drained || this.terminalError) {
-        return
-      }
-      this.detachDrain?.()
-      this.active = undefined
-      this.bytes -= Buffer.byteLength(write.line)
-      write.resolve()
-      this.flush()
-    }
-    const onDrain = (): void => {
-      drained = true
-      finish()
-    }
-    this.output.once('drain', onDrain)
-    this.detachDrain = () => this.output.removeListener('drain', onDrain)
-    try {
-      const accepted = this.output.write(write.line, (error) => {
-        if (error) {
-          this.onFailure(error)
-          return
-        }
-        completed = true
-        finish()
-      })
-      drained ||= accepted
-      returned = true
-      finish()
-    } catch (error) {
-      this.onFailure(error instanceof Error ? error : new Error(String(error)))
-    }
-  }
 }
diff --git a/src/main/acp/fixtures/omp-v17-shell-exit-3.jsonl b/src/main/acp/fixtures/omp-v17-shell-exit-3.jsonl
new file mode 100644
index 000000000000..7bbad57dbe8a
--- /dev/null
+++ b/src/main/acp/fixtures/omp-v17-shell-exit-3.jsonl
@@ -0,0 +1,23 @@
+{"direction":"out","process":"p1","message":{"jsonrpc":"2.0","id":3,"method":"session/prompt","params":{"sessionId":"session-1","prompt":[{"type":"text","text":"Use the bash tool exactly once to run this exact command and nothing else: printf hi; exit 3\nDo not run any other tool. Then reply in one short sentence with what it printed and its exit code."}]}}}
+{"direction":"in","process":"p1","message":{"jsonrpc":"2.0","method":"session/update","params":{"sessionId":"session-1","update":{"sessionUpdate":"available_commands_update","availableCommands":[{"name":"model","description":"Show current model selection"},{"name":"fast","description":"Toggle fast mode","input":{"hint":"[on|off|status]"}}]}}}}
+{"direction":"in","process":"p1","message":{"jsonrpc":"2.0","method":"session/update","params":{"sessionId":"session-1","update":{"sessionUpdate":"session_info_update","updatedAt":"2026-10-08T03:24:13.994Z"}}}}
+{"direction":"in","process":"p1","message":{"jsonrpc":"2.0","id":0,"method":"session/request_permission","params":{"sessionId":"session-1","toolCall":{"toolCallId":"call-1","title":"printf hi; exit 3","kind":"execute","status":"pending","rawInput":{"command":"printf hi; exit 3","timeout":10},"content":[{"type":"content","content":{"type":"text","text":"$ printf hi; exit 3"}}],"locations":[]},"options":[{"optionId":"allow_once","name":"Allow once","kind":"allow_once"},{"optionId":"allow_always","name":"Always allow","kind":"allow_always"},{"optionId":"reject_once","name":"Reject","kind":"reject_once"},{"optionId":"reject_always","name":"Always reject","kind":"reject_always"}]}}}
+{"direction":"out","process":"p1","message":{"jsonrpc":"2.0","id":0,"result":{"outcome":{"outcome":"selected","optionId":"allow_once"}}}}
+{"direction":"in","process":"p1","message":{"jsonrpc":"2.0","method":"session/update","params":{"sessionId":"session-1","update":{"sessionUpdate":"tool_call","toolCallId":"call-1","title":"$ printf hi; exit 3","kind":"execute","status":"pending","rawInput":{"command":"printf hi; exit 3","timeout":10},"content":[{"type":"content","content":{"type":"text","text":"$ printf hi; exit 3"}}]}}}}
+{"direction":"in","process":"p1","message":{"jsonrpc":"2.0","method":"session/update","params":{"sessionId":"session-1","update":{"sessionUpdate":"tool_call_update","toolCallId":"call-1","status":"in_progress","rawOutput":{"content":[{"type":"text","text":"hi"}],"details":{}},"content":[{"type":"content","content":{"type":"text","text":"$ printf hi; exit 3"}},{"type":"content","content":{"type":"text","text":"hi"}}]}}}}
+{"direction":"in","process":"p1","message":{"jsonrpc":"2.0","method":"session/update","params":{"sessionId":"session-1","update":{"sessionUpdate":"tool_call_update","toolCallId":"call-1","status":"failed","rawOutput":{"content":[{"type":"text","text":"hi\n\nWall time: 0.09 seconds\n\nCommand exited with code 3"}],"details":{"timeoutSeconds":10,"wallTimeMs":87.65562499999942,"exitCode":3},"isError":true},"content":[{"type":"content","content":{"type":"text","text":"$ printf hi; exit 3"}},{"type":"content","content":{"type":"text","text":"hi\n\nWall time: 0.09 seconds\n\nCommand exited with code 3"}}]}}}}
+{"direction":"in","process":"p1","message":{"jsonrpc":"2.0","method":"session/update","params":{"sessionId":"session-1","update":{"sessionUpdate":"agent_message_chunk","content":{"type":"text","text":"It"},"messageId":"94959649-0666-4fe3-b0f8-5f4254d56d7e"}}}}
+{"direction":"in","process":"p1","message":{"jsonrpc":"2.0","method":"session/update","params":{"sessionId":"session-1","update":{"sessionUpdate":"agent_message_chunk","content":{"type":"text","text":" printed"},"messageId":"94959649-0666-4fe3-b0f8-5f4254d56d7e"}}}}
+{"direction":"in","process":"p1","message":{"jsonrpc":"2.0","method":"session/update","params":{"sessionId":"session-1","update":{"sessionUpdate":"agent_message_chunk","content":{"type":"text","text":" `"},"messageId":"94959649-0666-4fe3-b0f8-5f4254d56d7e"}}}}
+{"direction":"in","process":"p1","message":{"jsonrpc":"2.0","method":"session/update","params":{"sessionId":"session-1","update":{"sessionUpdate":"agent_message_chunk","content":{"type":"text","text":"hi"},"messageId":"94959649-0666-4fe3-b0f8-5f4254d56d7e"}}}}
+{"direction":"in","process":"p1","message":{"jsonrpc":"2.0","method":"session/update","params":{"sessionId":"session-1","update":{"sessionUpdate":"agent_message_chunk","content":{"type":"text","text":"`"},"messageId":"94959649-0666-4fe3-b0f8-5f4254d56d7e"}}}}
+{"direction":"in","process":"p1","message":{"jsonrpc":"2.0","method":"session/update","params":{"sessionId":"session-1","update":{"sessionUpdate":"agent_message_chunk","content":{"type":"text","text":" and"},"messageId":"94959649-0666-4fe3-b0f8-5f4254d56d7e"}}}}
+{"direction":"in","process":"p1","message":{"jsonrpc":"2.0","method":"session/update","params":{"sessionId":"session-1","update":{"sessionUpdate":"agent_message_chunk","content":{"type":"text","text":" exited"},"messageId":"94959649-0666-4fe3-b0f8-5f4254d56d7e"}}}}
+{"direction":"in","process":"p1","message":{"jsonrpc":"2.0","method":"session/update","params":{"sessionId":"session-1","update":{"sessionUpdate":"agent_message_chunk","content":{"type":"text","text":" with"},"messageId":"94959649-0666-4fe3-b0f8-5f4254d56d7e"}}}}
+{"direction":"in","process":"p1","message":{"jsonrpc":"2.0","method":"session/update","params":{"sessionId":"session-1","update":{"sessionUpdate":"agent_message_chunk","content":{"type":"text","text":" code"},"messageId":"94959649-0666-4fe3-b0f8-5f4254d56d7e"}}}}
+{"direction":"in","process":"p1","message":{"jsonrpc":"2.0","method":"session/update","params":{"sessionId":"session-1","update":{"sessionUpdate":"agent_message_chunk","content":{"type":"text","text":" "},"messageId":"94959649-0666-4fe3-b0f8-5f4254d56d7e"}}}}
+{"direction":"in","process":"p1","message":{"jsonrpc":"2.0","method":"session/update","params":{"sessionId":"session-1","update":{"sessionUpdate":"agent_message_chunk","content":{"type":"text","text":"3"},"messageId":"94959649-0666-4fe3-b0f8-5f4254d56d7e"}}}}
+{"direction":"in","process":"p1","message":{"jsonrpc":"2.0","method":"session/update","params":{"sessionId":"session-1","update":{"sessionUpdate":"agent_message_chunk","content":{"type":"text","text":"."},"messageId":"94959649-0666-4fe3-b0f8-5f4254d56d7e"}}}}
+{"direction":"in","process":"p1","message":{"jsonrpc":"2.0","method":"session/update","params":{"sessionId":"session-1","update":{"sessionUpdate":"usage_update","size":272000,"used":18220,"cost":{"amount":0.10272500000000001,"currency":"USD"}}}}}
+{"direction":"in","process":"p1","message":{"jsonrpc":"2.0","method":"session/update","params":{"sessionId":"session-1","update":{"sessionUpdate":"session_info_update","updatedAt":"2026-10-08T03:24:19.387Z"}}}}
+{"direction":"in","process":"p1","message":{"jsonrpc":"2.0","id":3,"result":{"stopReason":"end_turn","usage":{"inputTokens":18459,"outputTokens":49,"totalTokens":36428,"cachedReadTokens":17920}}}}
diff --git a/src/main/acp/fixtures/omp-v17-shell-ok.jsonl b/src/main/acp/fixtures/omp-v17-shell-ok.jsonl
new file mode 100644
index 000000000000..0c96d48be96e
--- /dev/null
+++ b/src/main/acp/fixtures/omp-v17-shell-ok.jsonl
@@ -0,0 +1,23 @@
+{"direction":"out","process":"p1","message":{"jsonrpc":"2.0","id":3,"method":"session/prompt","params":{"sessionId":"session-1","prompt":[{"type":"text","text":"Use the bash tool exactly once to run this exact command and nothing else: printf ok\nDo not run any other tool. Then reply in one short sentence with what it printed and its exit code."}]}}}
+{"direction":"in","process":"p1","message":{"jsonrpc":"2.0","method":"session/update","params":{"sessionId":"session-1","update":{"sessionUpdate":"available_commands_update","availableCommands":[{"name":"model","description":"Show current model selection"},{"name":"fast","description":"Toggle fast mode","input":{"hint":"[on|off|status]"}}]}}}}
+{"direction":"in","process":"p1","message":{"jsonrpc":"2.0","method":"session/update","params":{"sessionId":"session-1","update":{"sessionUpdate":"session_info_update","updatedAt":"2026-10-08T03:24:00.014Z"}}}}
+{"direction":"in","process":"p1","message":{"jsonrpc":"2.0","id":0,"method":"session/request_permission","params":{"sessionId":"session-1","toolCall":{"toolCallId":"call-1","title":"printf ok","kind":"execute","status":"pending","rawInput":{"command":"printf ok"},"content":[{"type":"content","content":{"type":"text","text":"$ printf ok"}}],"locations":[]},"options":[{"optionId":"allow_once","name":"Allow once","kind":"allow_once"},{"optionId":"allow_always","name":"Always allow","kind":"allow_always"},{"optionId":"reject_once","name":"Reject","kind":"reject_once"},{"optionId":"reject_always","name":"Always reject","kind":"reject_always"}]}}}
+{"direction":"out","process":"p1","message":{"jsonrpc":"2.0","id":0,"result":{"outcome":{"outcome":"selected","optionId":"allow_once"}}}}
+{"direction":"in","process":"p1","message":{"jsonrpc":"2.0","method":"session/update","params":{"sessionId":"session-1","update":{"sessionUpdate":"tool_call","toolCallId":"call-1","title":"$ printf ok","kind":"execute","status":"pending","rawInput":{"command":"printf ok"},"content":[{"type":"content","content":{"type":"text","text":"$ printf ok"}}]}}}}
+{"direction":"in","process":"p1","message":{"jsonrpc":"2.0","method":"session/update","params":{"sessionId":"session-1","update":{"sessionUpdate":"tool_call_update","toolCallId":"call-1","status":"in_progress","rawOutput":{"content":[{"type":"text","text":"ok"}],"details":{}},"content":[{"type":"content","content":{"type":"text","text":"$ printf ok"}},{"type":"content","content":{"type":"text","text":"ok"}}]}}}}
+{"direction":"in","process":"p1","message":{"jsonrpc":"2.0","method":"session/update","params":{"sessionId":"session-1","update":{"sessionUpdate":"tool_call_update","toolCallId":"call-1","status":"completed","rawOutput":{"content":[{"type":"text","text":"ok\n\nWall time: 0.41 seconds"}],"details":{"timeoutSeconds":300,"wallTimeMs":406.50874999999996}},"content":[{"type":"content","content":{"type":"text","text":"$ printf ok"}},{"type":"content","content":{"type":"text","text":"ok\n\nWall time: 0.41 seconds"}}]}}}}
+{"direction":"in","process":"p1","message":{"jsonrpc":"2.0","method":"session/update","params":{"sessionId":"session-1","update":{"sessionUpdate":"agent_message_chunk","content":{"type":"text","text":"It"},"messageId":"62df7016-80a7-41a9-8467-43c45abf950b"}}}}
+{"direction":"in","process":"p1","message":{"jsonrpc":"2.0","method":"session/update","params":{"sessionId":"session-1","update":{"sessionUpdate":"agent_message_chunk","content":{"type":"text","text":" printed"},"messageId":"62df7016-80a7-41a9-8467-43c45abf950b"}}}}
+{"direction":"in","process":"p1","message":{"jsonrpc":"2.0","method":"session/update","params":{"sessionId":"session-1","update":{"sessionUpdate":"agent_message_chunk","content":{"type":"text","text":" `"},"messageId":"62df7016-80a7-41a9-8467-43c45abf950b"}}}}
+{"direction":"in","process":"p1","message":{"jsonrpc":"2.0","method":"session/update","params":{"sessionId":"session-1","update":{"sessionUpdate":"agent_message_chunk","content":{"type":"text","text":"ok"},"messageId":"62df7016-80a7-41a9-8467-43c45abf950b"}}}}
+{"direction":"in","process":"p1","message":{"jsonrpc":"2.0","method":"session/update","params":{"sessionId":"session-1","update":{"sessionUpdate":"agent_message_chunk","content":{"type":"text","text":"`"},"messageId":"62df7016-80a7-41a9-8467-43c45abf950b"}}}}
+{"direction":"in","process":"p1","message":{"jsonrpc":"2.0","method":"session/update","params":{"sessionId":"session-1","update":{"sessionUpdate":"agent_message_chunk","content":{"type":"text","text":" and"},"messageId":"62df7016-80a7-41a9-8467-43c45abf950b"}}}}
+{"direction":"in","process":"p1","message":{"jsonrpc":"2.0","method":"session/update","params":{"sessionId":"session-1","update":{"sessionUpdate":"agent_message_chunk","content":{"type":"text","text":" exited"},"messageId":"62df7016-80a7-41a9-8467-43c45abf950b"}}}}
+{"direction":"in","process":"p1","message":{"jsonrpc":"2.0","method":"session/update","params":{"sessionId":"session-1","update":{"sessionUpdate":"agent_message_chunk","content":{"type":"text","text":" with"},"messageId":"62df7016-80a7-41a9-8467-43c45abf950b"}}}}
+{"direction":"in","process":"p1","message":{"jsonrpc":"2.0","method":"session/update","params":{"sessionId":"session-1","update":{"sessionUpdate":"agent_message_chunk","content":{"type":"text","text":" code"},"messageId":"62df7016-80a7-41a9-8467-43c45abf950b"}}}}
+{"direction":"in","process":"p1","message":{"jsonrpc":"2.0","method":"session/update","params":{"sessionId":"session-1","update":{"sessionUpdate":"agent_message_chunk","content":{"type":"text","text":" "},"messageId":"62df7016-80a7-41a9-8467-43c45abf950b"}}}}
+{"direction":"in","process":"p1","message":{"jsonrpc":"2.0","method":"session/update","params":{"sessionId":"session-1","update":{"sessionUpdate":"agent_message_chunk","content":{"type":"text","text":"0"},"messageId":"62df7016-80a7-41a9-8467-43c45abf950b"}}}}
+{"direction":"in","process":"p1","message":{"jsonrpc":"2.0","method":"session/update","params":{"sessionId":"session-1","update":{"sessionUpdate":"agent_message_chunk","content":{"type":"text","text":"."},"messageId":"62df7016-80a7-41a9-8467-43c45abf950b"}}}}
+{"direction":"in","process":"p1","message":{"jsonrpc":"2.0","method":"session/update","params":{"sessionId":"session-1","update":{"sessionUpdate":"usage_update","size":272000,"used":18198,"cost":{"amount":0.10234000000000001,"currency":"USD"}}}}}
+{"direction":"in","process":"p1","message":{"jsonrpc":"2.0","method":"session/update","params":{"sessionId":"session-1","update":{"sessionUpdate":"session_info_update","updatedAt":"2026-10-08T03:24:06.553Z"}}}}
+{"direction":"in","process":"p1","message":{"jsonrpc":"2.0","id":3,"result":{"stopReason":"end_turn","usage":{"inputTokens":18430,"outputTokens":41,"totalTokens":36391,"cachedReadTokens":17920}}}}
diff --git a/src/main/acp/fixtures/omp-v17-stop-mid-tool.jsonl b/src/main/acp/fixtures/omp-v17-stop-mid-tool.jsonl
new file mode 100644
index 000000000000..660483571a23
--- /dev/null
+++ b/src/main/acp/fixtures/omp-v17-stop-mid-tool.jsonl
@@ -0,0 +1,8 @@
+{"direction":"out","process":"p1","message":{"jsonrpc":"2.0","id":3,"method":"session/prompt","params":{"sessionId":"session-1","prompt":[{"type":"text","text":"Use the bash tool exactly once to run this exact command and nothing else: sleep 30\nDo not run any other tool. Then reply in one short sentence with what it printed and its exit code."}]}}}
+{"direction":"in","process":"p1","message":{"jsonrpc":"2.0","method":"session/update","params":{"sessionId":"session-1","update":{"sessionUpdate":"available_commands_update","availableCommands":[{"name":"model","description":"Show current model selection"},{"name":"fast","description":"Toggle fast mode","input":{"hint":"[on|off|status]"}}]}}}}
+{"direction":"in","process":"p1","message":{"jsonrpc":"2.0","method":"session/update","params":{"sessionId":"session-1","update":{"sessionUpdate":"session_info_update","updatedAt":"2026-10-08T03:32:42.139Z"}}}}
+{"direction":"in","process":"p1","message":{"jsonrpc":"2.0","id":0,"method":"session/request_permission","params":{"sessionId":"session-1","toolCall":{"toolCallId":"call-1","title":"sleep 30","kind":"execute","status":"pending","rawInput":{"command":"sleep 30","timeout":60},"content":[{"type":"content","content":{"type":"text","text":"$ sleep 30"}}],"locations":[]},"options":[{"optionId":"allow_once","name":"Allow once","kind":"allow_once"},{"optionId":"allow_always","name":"Always allow","kind":"allow_always"},{"optionId":"reject_once","name":"Reject","kind":"reject_once"},{"optionId":"reject_always","name":"Always reject","kind":"reject_always"}]}}}
+{"direction":"out","process":"p1","message":{"jsonrpc":"2.0","id":0,"result":{"outcome":{"outcome":"selected","optionId":"allow_once"}}}}
+{"direction":"in","process":"p1","message":{"jsonrpc":"2.0","method":"session/update","params":{"sessionId":"session-1","update":{"sessionUpdate":"tool_call","toolCallId":"call-1","title":"$ sleep 30","kind":"execute","status":"pending","rawInput":{"command":"sleep 30","timeout":60},"content":[{"type":"content","content":{"type":"text","text":"$ sleep 30"}}]}}}}
+{"direction":"out","process":"p1","message":{"jsonrpc":"2.0","method":"session/cancel","params":{"sessionId":"session-1"}}}
+{"direction":"in","process":"p1","message":{"jsonrpc":"2.0","id":3,"result":{"stopReason":"cancelled","usage":{"inputTokens":234,"outputTokens":63,"totalTokens":18217,"cachedReadTokens":17920}}}}
diff --git a/src/main/acp/fixtures/opencode-v1-deny.jsonl b/src/main/acp/fixtures/opencode-v1-deny.jsonl
new file mode 100644
index 000000000000..11fd57bd2117
--- /dev/null
+++ b/src/main/acp/fixtures/opencode-v1-deny.jsonl
@@ -0,0 +1,21 @@
+{"direction":"out","process":"p1","message":{"jsonrpc":"2.0","id":3,"method":"session/prompt","params":{"sessionId":"session-1","prompt":[{"type":"text","text":"Use the write or edit tool to create denied.txt containing exactly DENY-ME. If permission is denied, stop and report it; do not retry via another tool."}]}}}
+{"direction":"in","process":"p1","message":{"jsonrpc":"2.0","method":"session/update","params":{"sessionId":"session-1","update":{"sessionUpdate":"available_commands_update","availableCommands":[{"name":"init","description":"create/update AGENTS.md"}]}}}}
+{"direction":"in","process":"p1","message":{"jsonrpc":"2.0","method":"session/update","params":{"sessionId":"session-1","update":{"sessionUpdate":"agent_thought_chunk","messageId":"prt_1125cda15001TZVLpZfbqbt4B8","content":{"type":"text","text":"The"}}}}}
+{"direction":"in","process":"p1","message":{"jsonrpc":"2.0","method":"session/update","params":{"sessionId":"session-1","update":{"sessionUpdate":"agent_thought_chunk","messageId":"prt_1125cda15001TZVLpZfbqbt4B8","content":{"type":"text","text":" user wants me to"}}}}}
+{"direction":"in","process":"p1","message":{"jsonrpc":"2.0","method":"session/update","params":{"sessionId":"session-1","update":{"sessionUpdate":"agent_thought_chunk","messageId":"prt_1125cda15001TZVLpZfbqbt4B8","content":{"type":"text","text":" create denied.txt"}}}}}
+{"direction":"in","process":"p1","message":{"jsonrpc":"2.0","method":"session/update","params":{"sessionId":"session-1","update":{"sessionUpdate":"agent_thought_chunk","messageId":"prt_1125cda15001TZVLpZfbqbt4B8","content":{"type":"text","text":" with content"}}}}}
+{"direction":"in","process":"p1","message":{"jsonrpc":"2.0","method":"session/update","params":{"sessionId":"session-1","update":{"sessionUpdate":"agent_thought_chunk","messageId":"prt_1125cda15001TZVLpZfbqbt4B8","content":{"type":"text","text":" DENY-ME. Let"}}}}}
+{"direction":"in","process":"p1","message":{"jsonrpc":"2.0","method":"session/update","params":{"sessionId":"session-1","update":{"sessionUpdate":"agent_thought_chunk","messageId":"prt_1125cda15001TZVLpZfbqbt4B8","content":{"type":"text","text":" me just do"}}}}}
+{"direction":"in","process":"p1","message":{"jsonrpc":"2.0","method":"session/update","params":{"sessionId":"session-1","update":{"sessionUpdate":"agent_thought_chunk","messageId":"prt_1125cda15001TZVLpZfbqbt4B8","content":{"type":"text","text":" it.\n\nBut wait -"}}}}}
+{"direction":"in","process":"p1","message":{"jsonrpc":"2.0","method":"session/update","params":{"sessionId":"session-1","update":{"sessionUpdate":"agent_thought_chunk","messageId":"prt_1125cda15001TZVLpZfbqbt4B8","content":{"type":"text","text":" there's a permission"}}}}}
+{"direction":"in","process":"p1","message":{"jsonrpc":"2.0","method":"session/update","params":{"sessionId":"session-1","update":{"sessionUpdate":"agent_thought_chunk","messageId":"prt_1125cda15001TZVLpZfbqbt4B8","content":{"type":"text","text":" system."}}}}}
+{"direction":"in","process":"p1","message":{"jsonrpc":"2.0","method":"session/update","params":{"sessionId":"session-1","update":{"sessionUpdate":"agent_thought_chunk","messageId":"prt_1125cda15001TZVLpZfbqbt4B8","content":{"type":"text","text":" Let me try the write"}}}}}
+{"direction":"in","process":"p1","message":{"jsonrpc":"2.0","method":"session/update","params":{"sessionId":"session-1","update":{"sessionUpdate":"agent_thought_chunk","messageId":"prt_1125cda15001TZVLpZfbqbt4B8","content":{"type":"text","text":" tool. If denied, stop"}}}}}
+{"direction":"in","process":"p1","message":{"jsonrpc":"2.0","method":"session/update","params":{"sessionId":"session-1","update":{"sessionUpdate":"agent_thought_chunk","messageId":"prt_1125cda15001TZVLpZfbqbt4B8","content":{"type":"text","text":" and report."}}}}}
+{"direction":"in","process":"p1","message":{"jsonrpc":"2.0","method":"session/update","params":{"sessionId":"session-1","update":{"sessionUpdate":"tool_call","toolCallId":"call_00_rmd4myxlisfqpsm7qnvhcqvm","title":"write","kind":"edit","status":"pending","locations":[],"rawInput":{}}}}}
+{"direction":"in","process":"p1","message":{"jsonrpc":"2.0","method":"session/update","params":{"sessionId":"session-1","update":{"sessionUpdate":"tool_call_update","toolCallId":"call_00_rmd4myxlisfqpsm7qnvhcqvm","status":"in_progress","kind":"edit","title":"write","locations":[{"path":"/workspace/project/denied.txt"}],"rawInput":{"filePath":"/workspace/project/denied.txt","content":"DENY-ME"}}}}}
+{"direction":"in","process":"p1","message":{"jsonrpc":"2.0","id":0,"method":"session/request_permission","params":{"sessionId":"session-1","toolCall":{"toolCallId":"call_00_rmd4myxlisfqpsm7qnvhcqvm","title":"/workspace/project/denied.txt","kind":"edit","status":"pending","locations":[{"path":"/workspace/project/denied.txt"}],"rawInput":{"filepath":"/workspace/project/denied.txt","diff":"Index: /workspace/project/denied.txt\n===================================================================\n--- /workspace/project/denied.txt\n+++ /workspace/project/denied.txt\n@@ -0,0 +1,1 @@\n+DENY-ME\n\\ No newline at end of file\n"},"content":[{"type":"diff","path":"/workspace/project/denied.txt","oldText":"","newText":"DENY-ME"}]},"options":[{"optionId":"once","kind":"allow_once","name":"Allow once"},{"optionId":"always","kind":"allow_always","name":"Always allow"},{"optionId":"reject","kind":"reject_once","name":"Reject"}]}}}
+{"direction":"out","process":"p1","message":{"jsonrpc":"2.0","id":0,"result":{"outcome":{"outcome":"selected","optionId":"reject"}}}}
+{"direction":"in","process":"p1","message":{"jsonrpc":"2.0","method":"session/update","params":{"sessionId":"session-1","update":{"sessionUpdate":"tool_call_update","toolCallId":"call_00_rmd4myxlisfqpsm7qnvhcqvm","status":"failed","kind":"edit","title":"write","locations":[{"path":"/workspace/project/denied.txt"}],"rawInput":{"filePath":"/workspace/project/denied.txt","content":"DENY-ME"},"content":[{"type":"content","content":{"type":"text","text":"The user rejected permission to use this specific tool call."}}],"rawOutput":{"error":"The user rejected permission to use this specific tool call."}}}}}
+{"direction":"in","process":"p1","message":{"jsonrpc":"2.0","method":"session/update","params":{"sessionId":"session-1","update":{"sessionUpdate":"usage_update","used":10390,"size":1000000,"cost":{"amount":0.00013182,"currency":"USD"}}}}}
+{"direction":"in","process":"p1","message":{"jsonrpc":"2.0","id":3,"result":{"stopReason":"end_turn","usage":{"inputTokens":150,"outputTokens":87,"totalTokens":10521,"thoughtTokens":44,"cachedReadTokens":10240},"_meta":{}}}}
diff --git a/src/main/acp/fixtures/opencode-v1-provider-error.jsonl b/src/main/acp/fixtures/opencode-v1-provider-error.jsonl
new file mode 100644
index 000000000000..612772542c55
--- /dev/null
+++ b/src/main/acp/fixtures/opencode-v1-provider-error.jsonl
@@ -0,0 +1,2 @@
+{"direction":"out","process":"p1","message":{"jsonrpc":"2.0","id":4,"method":"session/prompt","params":{"sessionId":"session-1","prompt":[{"type":"text","text":"Reply OK."}]}}}
+{"direction":"in","process":"p1","message":{"jsonrpc":"2.0","id":4,"error":{"code":-32603,"message":"Internal error: CAPTURE_PROVIDER_400","data":{"service":"session","errorName":"APIError"}}}}
diff --git a/src/main/acp/fixtures/opencode-v1-stray-write.jsonl b/src/main/acp/fixtures/opencode-v1-stray-write.jsonl
new file mode 100644
index 000000000000..8249b591c0ed
--- /dev/null
+++ b/src/main/acp/fixtures/opencode-v1-stray-write.jsonl
@@ -0,0 +1,30 @@
+{"direction":"out","process":"p1","message":{"jsonrpc":"2.0","id":3,"method":"session/prompt","params":{"sessionId":"session-1","prompt":[{"type":"text","text":"First use the edit tool to change edit.txt from before to approved. After that succeeds, run bash with exactly: printf \"STRAY\\n\" > stray.txt. Do not combine these actions. If the shell write permission is denied, stop and report it."}]}}}
+{"direction":"in","process":"p1","message":{"jsonrpc":"2.0","method":"session/update","params":{"sessionId":"session-1","update":{"sessionUpdate":"available_commands_update","availableCommands":[{"name":"init","description":"create/update AGENTS.md"}]}}}}
+{"direction":"in","process":"p1","message":{"jsonrpc":"2.0","method":"session/update","params":{"sessionId":"session-1","update":{"sessionUpdate":"agent_thought_chunk","messageId":"prt_112605aaa001IbEN879E3yY64j","content":{"type":"text","text":"Let"}}}}}
+{"direction":"in","process":"p1","message":{"jsonrpc":"2.0","method":"session/update","params":{"sessionId":"session-1","update":{"sessionUpdate":"agent_thought_chunk","messageId":"prt_112605aaa001IbEN879E3yY64j","content":{"type":"text","text":" me first"}}}}}
+{"direction":"in","process":"p1","message":{"jsonrpc":"2.0","method":"session/update","params":{"sessionId":"session-1","update":{"sessionUpdate":"agent_thought_chunk","messageId":"prt_112605aaa001IbEN879E3yY64j","content":{"type":"text","text":" read edit.txt. Actually"}}}}}
+{"direction":"in","process":"p1","message":{"jsonrpc":"2.0","method":"session/update","params":{"sessionId":"session-1","update":{"sessionUpdate":"agent_thought_chunk","messageId":"prt_112605aaa001IbEN879E3yY64j","content":{"type":"text","text":" the edit"}}}}}
+{"direction":"in","process":"p1","message":{"jsonrpc":"2.0","method":"session/update","params":{"sessionId":"session-1","update":{"sessionUpdate":"agent_thought_chunk","messageId":"prt_112605aaa001IbEN879E3yY64j","content":{"type":"text","text":" tool requires reading first. Let"}}}}}
+{"direction":"in","process":"p1","message":{"jsonrpc":"2.0","method":"session/update","params":{"sessionId":"session-1","update":{"sessionUpdate":"agent_thought_chunk","messageId":"prt_112605aaa001IbEN879E3yY64j","content":{"type":"text","text":" me read it."}}}}}
+{"direction":"in","process":"p1","message":{"jsonrpc":"2.0","method":"session/update","params":{"sessionId":"session-1","update":{"sessionUpdate":"tool_call","toolCallId":"call_00_436gprdnre54g9m10b8sx6qv","title":"read","kind":"read","status":"pending","locations":[],"rawInput":{}}}}}
+{"direction":"in","process":"p1","message":{"jsonrpc":"2.0","method":"session/update","params":{"sessionId":"session-1","update":{"sessionUpdate":"tool_call_update","toolCallId":"call_00_436gprdnre54g9m10b8sx6qv","status":"in_progress","kind":"read","title":"read","locations":[{"path":"/workspace/project/edit.txt"}],"rawInput":{"filePath":"/workspace/project/edit.txt"}}}}}
+{"direction":"in","process":"p1","message":{"jsonrpc":"2.0","method":"session/update","params":{"sessionId":"session-1","update":{"sessionUpdate":"tool_call_update","toolCallId":"call_00_436gprdnre54g9m10b8sx6qv","status":"completed","title":"/workspace/project/edit.txt","content":[{"type":"content","content":{"type":"text","text":"before"}}],"rawOutput":{"output":"<path>/workspace/project/edit.txt</path>\n<type>file</type>\n<content>\n1: before\n\n(End of file - total 1 lines)\n</content>","metadata":{"preview":"before","truncated":false,"loaded":[],"display":{"type":"file","path":"/workspace/project/edit.txt","text":"before","lineStart":1,"lineEnd":1,"totalLines":1,"truncated":false}}}}}}}
+{"direction":"in","process":"p1","message":{"jsonrpc":"2.0","method":"session/update","params":{"sessionId":"session-1","update":{"sessionUpdate":"agent_thought_chunk","messageId":"prt_112605fae001cQnOHi1XrRfxQ4","content":{"type":"text","text":"The"}}}}}
+{"direction":"in","process":"p1","message":{"jsonrpc":"2.0","method":"session/update","params":{"sessionId":"session-1","update":{"sessionUpdate":"agent_thought_chunk","messageId":"prt_112605fae001cQnOHi1XrRfxQ4","content":{"type":"text","text":" instructions say change"}}}}}
+{"direction":"in","process":"p1","message":{"jsonrpc":"2.0","method":"session/update","params":{"sessionId":"session-1","update":{"sessionUpdate":"agent_thought_chunk","messageId":"prt_112605fae001cQnOHi1XrRfxQ4","content":{"type":"text","text":" \"before\""}}}}}
+{"direction":"in","process":"p1","message":{"jsonrpc":"2.0","method":"session/update","params":{"sessionId":"session-1","update":{"sessionUpdate":"agent_thought_chunk","messageId":"prt_112605fae001cQnOHi1XrRfxQ4","content":{"type":"text","text":" to \"approved\"."}}}}}
+{"direction":"in","process":"p1","message":{"jsonrpc":"2.0","method":"session/update","params":{"sessionId":"session-1","update":{"sessionUpdate":"tool_call","toolCallId":"call_00_eu9lzl303a1dxo1u78uj9xkc","title":"edit","kind":"edit","status":"pending","locations":[],"rawInput":{}}}}}
+{"direction":"in","process":"p1","message":{"jsonrpc":"2.0","method":"session/update","params":{"sessionId":"session-1","update":{"sessionUpdate":"tool_call_update","toolCallId":"call_00_eu9lzl303a1dxo1u78uj9xkc","status":"in_progress","kind":"edit","title":"edit","locations":[{"path":"/workspace/project/edit.txt"}],"rawInput":{"filePath":"/workspace/project/edit.txt","oldString":"before","newString":"approved"}}}}}
+{"direction":"in","process":"p1","message":{"jsonrpc":"2.0","id":0,"method":"session/request_permission","params":{"sessionId":"session-1","toolCall":{"toolCallId":"call_00_eu9lzl303a1dxo1u78uj9xkc","title":"/workspace/project/edit.txt","kind":"edit","status":"pending","locations":[{"path":"/workspace/project/edit.txt"}],"rawInput":{"filepath":"/workspace/project/edit.txt","diff":"Index: /workspace/project/edit.txt\n===================================================================\n--- /workspace/project/edit.txt\n+++ /workspace/project/edit.txt\n@@ -1,1 +1,1 @@\n-before\n+approved\n"},"content":[{"type":"diff","path":"/workspace/project/edit.txt","oldText":"before\n","newText":"approved\n"}]},"options":[{"optionId":"once","kind":"allow_once","name":"Allow once"},{"optionId":"always","kind":"allow_always","name":"Always allow"},{"optionId":"reject","kind":"reject_once","name":"Reject"}]}}}
+{"direction":"out","process":"p1","message":{"jsonrpc":"2.0","id":0,"result":{"outcome":{"outcome":"selected","optionId":"once"}}}}
+{"direction":"in","process":"p1","message":{"jsonrpc":"2.0","id":1,"method":"fs/write_text_file","params":{"sessionId":"session-1","path":"/workspace/project/edit.txt","content":"approved\n"}}}
+{"direction":"out","process":"p1","message":{"jsonrpc":"2.0","id":1,"error":{"code":-32601,"message":"Method not found: fs/write_text_file"}}}
+{"direction":"in","process":"p1","message":{"jsonrpc":"2.0","method":"session/update","params":{"sessionId":"session-1","update":{"sessionUpdate":"tool_call_update","toolCallId":"call_00_eu9lzl303a1dxo1u78uj9xkc","status":"in_progress","kind":"edit","title":"edit","locations":[{"path":"/workspace/project/edit.txt"}],"rawInput":{"filePath":"/workspace/project/edit.txt","oldString":"before","newString":"approved"}}}}}
+{"direction":"in","process":"p1","message":{"jsonrpc":"2.0","method":"session/update","params":{"sessionId":"session-1","update":{"sessionUpdate":"tool_call_update","toolCallId":"call_00_eu9lzl303a1dxo1u78uj9xkc","status":"completed","title":"/workspace/project/edit.txt","content":[{"type":"content","content":{"type":"text","text":"Edit applied successfully."}},{"type":"diff","path":"/workspace/project/edit.txt","oldText":"before","newText":"approved"}],"rawOutput":{"output":"Edit applied successfully.","metadata":{"diagnostics":{},"diff":"Index: /workspace/project/edit.txt\n===================================================================\n--- /workspace/project/edit.txt\n+++ /workspace/project/edit.txt\n@@ -1,1 +1,1 @@\n-before\n+approved\n","filediff":{"file":"/workspace/project/edit.txt","patch":"Index: /workspace/project/edit.txt\n===================================================================\n--- /workspace/project/edit.txt\n+++ /workspace/project/edit.txt\n@@ -1,1 +1,1 @@\n-before\n+approved\n","additions":1,"deletions":1},"truncated":false}}}}}}
+{"direction":"in","process":"p1","message":{"jsonrpc":"2.0","method":"session/update","params":{"sessionId":"session-1","update":{"sessionUpdate":"tool_call","toolCallId":"call_00_d0qy5hwrmp85vvitkrmkhxm8","title":"bash","kind":"execute","status":"pending","locations":[{"path":"/workspace/project"}],"rawInput":{"cwd":"/workspace/project"}}}}}
+{"direction":"in","process":"p1","message":{"jsonrpc":"2.0","method":"session/update","params":{"sessionId":"session-1","update":{"sessionUpdate":"tool_call_update","toolCallId":"call_00_d0qy5hwrmp85vvitkrmkhxm8","status":"in_progress","kind":"execute","title":"printf \"STRAY\\n\" > stray.txt","locations":[{"path":"/workspace/project"}],"rawInput":{"command":"printf \"STRAY\\n\" > stray.txt","cwd":"/workspace/project"}}}}}
+{"direction":"in","process":"p1","message":{"jsonrpc":"2.0","id":2,"method":"session/request_permission","params":{"sessionId":"session-1","toolCall":{"toolCallId":"call_00_d0qy5hwrmp85vvitkrmkhxm8","title":"printf \"STRAY\\n\" > stray.txt","kind":"execute","status":"pending","locations":[],"rawInput":{"command":"printf \"STRAY\\n\" > stray.txt"}},"options":[{"optionId":"once","kind":"allow_once","name":"Allow once"},{"optionId":"always","kind":"allow_always","name":"Always allow"},{"optionId":"reject","kind":"reject_once","name":"Reject"}]}}}
+{"direction":"out","process":"p1","message":{"jsonrpc":"2.0","id":2,"result":{"outcome":{"outcome":"selected","optionId":"reject"}}}}
+{"direction":"in","process":"p1","message":{"jsonrpc":"2.0","method":"session/update","params":{"sessionId":"session-1","update":{"sessionUpdate":"tool_call_update","toolCallId":"call_00_d0qy5hwrmp85vvitkrmkhxm8","status":"failed","kind":"execute","title":"printf \"STRAY\\n\" > stray.txt","locations":[{"path":"/workspace/project"}],"rawInput":{"command":"printf \"STRAY\\n\" > stray.txt","cwd":"/workspace/project"},"content":[{"type":"content","content":{"type":"text","text":"The user rejected permission to use this specific tool call."}}],"rawOutput":{"error":"The user rejected permission to use this specific tool call."}}}}}
+{"direction":"in","process":"p1","message":{"jsonrpc":"2.0","method":"session/update","params":{"sessionId":"session-1","update":{"sessionUpdate":"usage_update","used":10690,"size":1000000,"cost":{"amount":0.000322062,"currency":"USD"}}}}}
+{"direction":"in","process":"p1","message":{"jsonrpc":"2.0","id":3,"result":{"stopReason":"end_turn","usage":{"inputTokens":194,"outputTokens":45,"totalTokens":10735,"cachedReadTokens":10496},"_meta":{}}}}
diff --git a/src/main/acp/fixtures/opencode-v1-subagent-hang.jsonl b/src/main/acp/fixtures/opencode-v1-subagent-hang.jsonl
new file mode 100644
index 000000000000..1c176531db2e
--- /dev/null
+++ b/src/main/acp/fixtures/opencode-v1-subagent-hang.jsonl
@@ -0,0 +1,13 @@
+{"direction":"out","process":"p1","message":{"jsonrpc":"2.0","id":3,"method":"session/prompt","params":{"sessionId":"session-1","prompt":[{"type":"text","text":"Use the Task tool to launch one general subagent. The subagent must create child.txt in this project containing CHILD-OK, using a write or edit tool. Do not perform the edit yourself. Let the subagent finish, then reply briefly. Do not launch other subagents."}]}}}
+{"direction":"in","process":"p1","message":{"jsonrpc":"2.0","method":"session/update","params":{"sessionId":"session-1","update":{"sessionUpdate":"available_commands_update","availableCommands":[{"name":"init","description":"create/update AGENTS.md"}]}}}}
+{"direction":"in","process":"p1","message":{"jsonrpc":"2.0","method":"session/update","params":{"sessionId":"session-1","update":{"sessionUpdate":"agent_message_chunk","messageId":"msg_1125d1722001x7f5Lth7HBxMQu","content":{"type":"text","text":"I'll launch"}}}}}
+{"direction":"in","process":"p1","message":{"jsonrpc":"2.0","method":"session/update","params":{"sessionId":"session-1","update":{"sessionUpdate":"agent_message_chunk","messageId":"msg_1125d1722001x7f5Lth7HBxMQu","content":{"type":"text","text":" one"}}}}}
+{"direction":"in","process":"p1","message":{"jsonrpc":"2.0","method":"session/update","params":{"sessionId":"session-1","update":{"sessionUpdate":"agent_message_chunk","messageId":"msg_1125d1722001x7f5Lth7HBxMQu","content":{"type":"text","text":" general subagent to create the"}}}}}
+{"direction":"in","process":"p1","message":{"jsonrpc":"2.0","method":"session/update","params":{"sessionId":"session-1","update":{"sessionUpdate":"agent_message_chunk","messageId":"msg_1125d1722001x7f5Lth7HBxMQu","content":{"type":"text","text":" file."}}}}}
+{"direction":"in","process":"p1","message":{"jsonrpc":"2.0","method":"session/update","params":{"sessionId":"session-1","update":{"sessionUpdate":"tool_call","toolCallId":"call_00_2d1jjspyyy65tjo00sp7d1tk","title":"task","kind":"think","status":"pending","locations":[],"rawInput":{}}}}}
+{"direction":"in","process":"p1","message":{"jsonrpc":"2.0","method":"session/update","params":{"sessionId":"session-1","update":{"sessionUpdate":"tool_call_update","toolCallId":"call_00_2d1jjspyyy65tjo00sp7d1tk","status":"in_progress","kind":"think","title":"Create child.txt","locations":[],"rawInput":{"description":"Create child.txt","prompt":"Create a file at the absolute path /workspace/project/child.txt using the write tool. The file must contain exactly the text: CHILD-OK\n\nDo not do anything else. After writing the file, read it back to verify its contents, then report back the exact contents and the file path. Do not touch any other files.","subagent_type":"general"}}}}}
+{"direction":"in","process":"p1","message":{"jsonrpc":"2.0","method":"session/update","params":{"sessionId":"session-1","update":{"sessionUpdate":"tool_call_update","toolCallId":"call_00_2d1jjspyyy65tjo00sp7d1tk","status":"in_progress","kind":"think","title":"Create child.txt","locations":[],"rawInput":{"description":"Create child.txt","prompt":"Create a file at the absolute path /workspace/project/child.txt using the write tool. The file must contain exactly the text: CHILD-OK\n\nDo not do anything else. After writing the file, read it back to verify its contents, then report back the exact contents and the file path. Do not touch any other files.","subagent_type":"general"}}}}}
+{"direction":"out","process":"p1","message":{"jsonrpc":"2.0","method":"session/cancel","params":{"sessionId":"session-1"}}}
+{"direction":"in","process":"p1","message":{"jsonrpc":"2.0","method":"session/update","params":{"sessionId":"session-1","update":{"sessionUpdate":"tool_call_update","toolCallId":"call_00_2d1jjspyyy65tjo00sp7d1tk","status":"failed","kind":"think","title":"task","locations":[],"rawInput":{"description":"Create child.txt","prompt":"Create a file at the absolute path /workspace/project/child.txt using the write tool. The file must contain exactly the text: CHILD-OK\n\nDo not do anything else. After writing the file, read it back to verify its contents, then report back the exact contents and the file path. Do not touch any other files.","subagent_type":"general"},"content":[{"type":"content","content":{"type":"text","text":"Task cancelled"}}],"rawOutput":{"error":"Task cancelled","metadata":{"parentSessionId":"session-1","sessionId":"session-2","model":{"modelID":"deepseek-v4.1-flash","providerID":"opencode-go"}}}}}}}
+{"direction":"in","process":"p1","message":{"jsonrpc":"2.0","method":"session/update","params":{"sessionId":"session-1","update":{"sessionUpdate":"usage_update","used":0,"size":1000000,"cost":{"amount":0.00016167,"currency":"USD"}}}}}
+{"direction":"in","process":"p1","message":{"jsonrpc":"2.0","id":3,"result":{"stopReason":"cancelled","usage":{"inputTokens":0,"outputTokens":0,"totalTokens":0},"_meta":{}}}}
diff --git a/src/main/acp/fixtures/opencode-v1-tool.jsonl b/src/main/acp/fixtures/opencode-v1-tool.jsonl
new file mode 100644
index 000000000000..4fec143af031
--- /dev/null
+++ b/src/main/acp/fixtures/opencode-v1-tool.jsonl
@@ -0,0 +1,40 @@
+{"direction":"out","process":"p1","message":{"jsonrpc":"2.0","id":3,"method":"session/prompt","params":{"sessionId":"session-1","prompt":[{"type":"text","text":"Read README.md using the read tool. Then run the bash tool with exactly: printf \"TOOL-OK\\n\". Reply briefly with the two markers. Do not inspect any other paths."}]}}}
+{"direction":"in","process":"p1","message":{"jsonrpc":"2.0","method":"session/update","params":{"sessionId":"session-1","update":{"sessionUpdate":"available_commands_update","availableCommands":[{"name":"init","description":"create/update AGENTS.md"}]}}}}
+{"direction":"in","process":"p1","message":{"jsonrpc":"2.0","method":"session/update","params":{"sessionId":"session-1","update":{"sessionUpdate":"agent_thought_chunk","messageId":"prt_1125cb136001S5aCvasDYu18AM","content":{"type":"text","text":"Let"}}}}}
+{"direction":"in","process":"p1","message":{"jsonrpc":"2.0","method":"session/update","params":{"sessionId":"session-1","update":{"sessionUpdate":"agent_thought_chunk","messageId":"prt_1125cb136001S5aCvasDYu18AM","content":{"type":"text","text":" me read README.md and"}}}}}
+{"direction":"in","process":"p1","message":{"jsonrpc":"2.0","method":"session/update","params":{"sessionId":"session-1","update":{"sessionUpdate":"agent_thought_chunk","messageId":"prt_1125cb136001S5aCvasDYu18AM","content":{"type":"text","text":" then"}}}}}
+{"direction":"in","process":"p1","message":{"jsonrpc":"2.0","method":"session/update","params":{"sessionId":"session-1","update":{"sessionUpdate":"agent_thought_chunk","messageId":"prt_1125cb136001S5aCvasDYu18AM","content":{"type":"text","text":" run the bash command. Per"}}}}}
+{"direction":"in","process":"p1","message":{"jsonrpc":"2.0","method":"session/update","params":{"sessionId":"session-1","update":{"sessionUpdate":"agent_thought_chunk","messageId":"prt_1125cb136001S5aCvasDYu18AM","content":{"type":"text","text":" instructions, read first"}}}}}
+{"direction":"in","process":"p1","message":{"jsonrpc":"2.0","method":"session/update","params":{"sessionId":"session-1","update":{"sessionUpdate":"agent_thought_chunk","messageId":"prt_1125cb136001S5aCvasDYu18AM","content":{"type":"text","text":", then bash."}}}}}
+{"direction":"in","process":"p1","message":{"jsonrpc":"2.0","method":"session/update","params":{"sessionId":"session-1","update":{"sessionUpdate":"agent_thought_chunk","messageId":"prt_1125cb136001S5aCvasDYu18AM","content":{"type":"text","text":" Can I batch"}}}}}
+{"direction":"in","process":"p1","message":{"jsonrpc":"2.0","method":"session/update","params":{"sessionId":"session-1","update":{"sessionUpdate":"agent_thought_chunk","messageId":"prt_1125cb136001S5aCvasDYu18AM","content":{"type":"text","text":"? The bash"}}}}}
+{"direction":"in","process":"p1","message":{"jsonrpc":"2.0","method":"session/update","params":{"sessionId":"session-1","update":{"sessionUpdate":"agent_thought_chunk","messageId":"prt_1125cb136001S5aCvasDYu18AM","content":{"type":"text","text":" says"}}}}}
+{"direction":"in","process":"p1","message":{"jsonrpc":"2.0","method":"session/update","params":{"sessionId":"session-1","update":{"sessionUpdate":"agent_thought_chunk","messageId":"prt_1125cb136001S5aCvasDYu18AM","content":{"type":"text","text":" run with exactly"}}}}}
+{"direction":"in","process":"p1","message":{"jsonrpc":"2.0","method":"session/update","params":{"sessionId":"session-1","update":{"sessionUpdate":"agent_thought_chunk","messageId":"prt_1125cb136001S5aCvasDYu18AM","content":{"type":"text","text":" printf \""}}}}}
+{"direction":"in","process":"p1","message":{"jsonrpc":"2.0","method":"session/update","params":{"sessionId":"session-1","update":{"sessionUpdate":"agent_thought_chunk","messageId":"prt_1125cb136001S5aCvasDYu18AM","content":{"type":"text","text":"TOOL-OK\\n\"."}}}}}
+{"direction":"in","process":"p1","message":{"jsonrpc":"2.0","method":"session/update","params":{"sessionId":"session-1","update":{"sessionUpdate":"agent_thought_chunk","messageId":"prt_1125cb136001S5aCvasDYu18AM","content":{"type":"text","text":" Let"}}}}}
+{"direction":"in","process":"p1","message":{"jsonrpc":"2.0","method":"session/update","params":{"sessionId":"session-1","update":{"sessionUpdate":"agent_thought_chunk","messageId":"prt_1125cb136001S5aCvasDYu18AM","content":{"type":"text","text":" me do the"}}}}}
+{"direction":"in","process":"p1","message":{"jsonrpc":"2.0","method":"session/update","params":{"sessionId":"session-1","update":{"sessionUpdate":"agent_thought_chunk","messageId":"prt_1125cb136001S5aCvasDYu18AM","content":{"type":"text","text":" read first, then bash"}}}}}
+{"direction":"in","process":"p1","message":{"jsonrpc":"2.0","method":"session/update","params":{"sessionId":"session-1","update":{"sessionUpdate":"agent_thought_chunk","messageId":"prt_1125cb136001S5aCvasDYu18AM","content":{"type":"text","text":".\n\nActually I can do both in"}}}}}
+{"direction":"in","process":"p1","message":{"jsonrpc":"2.0","method":"session/update","params":{"sessionId":"session-1","update":{"sessionUpdate":"agent_thought_chunk","messageId":"prt_1125cb136001S5aCvasDYu18AM","content":{"type":"text","text":" parallel since independent"}}}}}
+{"direction":"in","process":"p1","message":{"jsonrpc":"2.0","method":"session/update","params":{"sessionId":"session-1","update":{"sessionUpdate":"agent_thought_chunk","messageId":"prt_1125cb136001S5aCvasDYu18AM","content":{"type":"text","text":". But the instruction says \""}}}}}
+{"direction":"in","process":"p1","message":{"jsonrpc":"2.0","method":"session/update","params":{"sessionId":"session-1","update":{"sessionUpdate":"agent_thought_chunk","messageId":"prt_1125cb136001S5aCvasDYu18AM","content":{"type":"text","text":"Then run"}}}}}
+{"direction":"in","process":"p1","message":{"jsonrpc":"2.0","method":"session/update","params":{"sessionId":"session-1","update":{"sessionUpdate":"agent_thought_chunk","messageId":"prt_1125cb136001S5aCvasDYu18AM","content":{"type":"text","text":"\". Let me just"}}}}}
+{"direction":"in","process":"p1","message":{"jsonrpc":"2.0","method":"session/update","params":{"sessionId":"session-1","update":{"sessionUpdate":"agent_thought_chunk","messageId":"prt_1125cb136001S5aCvasDYu18AM","content":{"type":"text","text":" do them in"}}}}}
+{"direction":"in","process":"p1","message":{"jsonrpc":"2.0","method":"session/update","params":{"sessionId":"session-1","update":{"sessionUpdate":"agent_thought_chunk","messageId":"prt_1125cb136001S5aCvasDYu18AM","content":{"type":"text","text":" one"}}}}}
+{"direction":"in","process":"p1","message":{"jsonrpc":"2.0","method":"session/update","params":{"sessionId":"session-1","update":{"sessionUpdate":"agent_thought_chunk","messageId":"prt_1125cb136001S5aCvasDYu18AM","content":{"type":"text","text":" message"}}}}}
+{"direction":"in","process":"p1","message":{"jsonrpc":"2.0","method":"session/update","params":{"sessionId":"session-1","update":{"sessionUpdate":"agent_thought_chunk","messageId":"prt_1125cb136001S5aCvasDYu18AM","content":{"type":"text","text":"."}}}}}
+{"direction":"in","process":"p1","message":{"jsonrpc":"2.0","method":"session/update","params":{"sessionId":"session-1","update":{"sessionUpdate":"tool_call","toolCallId":"call_00_9bqxuxnngg6oum1tifcyejhj","title":"read","kind":"read","status":"pending","locations":[],"rawInput":{}}}}}
+{"direction":"in","process":"p1","message":{"jsonrpc":"2.0","method":"session/update","params":{"sessionId":"session-1","update":{"sessionUpdate":"tool_call_update","toolCallId":"call_00_9bqxuxnngg6oum1tifcyejhj","status":"in_progress","kind":"read","title":"read","locations":[{"path":"/workspace/project/README.md"}],"rawInput":{"filePath":"/workspace/project/README.md"}}}}}
+{"direction":"in","process":"p1","message":{"jsonrpc":"2.0","method":"session/update","params":{"sessionId":"session-1","update":{"sessionUpdate":"tool_call","toolCallId":"call_01_9xtun202cqouz4q8t7ss7a8v","title":"bash","kind":"execute","status":"pending","locations":[{"path":"/workspace/project"}],"rawInput":{"cwd":"/workspace/project"}}}}}
+{"direction":"in","process":"p1","message":{"jsonrpc":"2.0","method":"session/update","params":{"sessionId":"session-1","update":{"sessionUpdate":"tool_call_update","toolCallId":"call_00_9bqxuxnngg6oum1tifcyejhj","status":"completed","title":"/workspace/project/README.md","content":[{"type":"content","content":{"type":"text","text":"Protocol capture scratch project. Read marker: CAPTURE-OK."}}],"rawOutput":{"output":"<path>/workspace/project/README.md</path>\n<type>file</type>\n<content>\n1: Protocol capture scratch project. Read marker: CAPTURE-OK.\n\n(End of file - total 1 lines)\n</content>","metadata":{"preview":"Protocol capture scratch project. Read marker: CAPTURE-OK.","truncated":false,"loaded":[],"display":{"type":"file","path":"/workspace/project/README.md","text":"Protocol capture scratch project. Read marker: CAPTURE-OK.","lineStart":1,"lineEnd":1,"totalLines":1,"truncated":false}}}}}}}
+{"direction":"in","process":"p1","message":{"jsonrpc":"2.0","method":"session/update","params":{"sessionId":"session-1","update":{"sessionUpdate":"tool_call_update","toolCallId":"call_01_9xtun202cqouz4q8t7ss7a8v","status":"in_progress","kind":"execute","title":"printf \"TOOL-OK\\n\"","locations":[{"path":"/workspace/project"}],"rawInput":{"command":"printf \"TOOL-OK\\n\"","cwd":"/workspace/project"}}}}}
+{"direction":"in","process":"p1","message":{"jsonrpc":"2.0","id":0,"method":"session/request_permission","params":{"sessionId":"session-1","toolCall":{"toolCallId":"call_01_9xtun202cqouz4q8t7ss7a8v","title":"printf \"TOOL-OK\\n\"","kind":"execute","status":"pending","locations":[],"rawInput":{"command":"printf \"TOOL-OK\\n\""}},"options":[{"optionId":"once","kind":"allow_once","name":"Allow once"},{"optionId":"always","kind":"allow_always","name":"Always allow"},{"optionId":"reject","kind":"reject_once","name":"Reject"}]}}}
+{"direction":"out","process":"p1","message":{"jsonrpc":"2.0","id":0,"result":{"outcome":{"outcome":"selected","optionId":"once"}}}}
+{"direction":"in","process":"p1","message":{"jsonrpc":"2.0","method":"session/update","params":{"sessionId":"session-1","update":{"sessionUpdate":"tool_call_update","toolCallId":"call_01_9xtun202cqouz4q8t7ss7a8v","status":"in_progress","kind":"execute","title":"printf \"TOOL-OK\\n\"","locations":[{"path":"/workspace/project"}],"rawInput":{"command":"printf \"TOOL-OK\\n\"","cwd":"/workspace/project"}}}}}
+{"direction":"in","process":"p1","message":{"jsonrpc":"2.0","method":"session/update","params":{"sessionId":"session-1","update":{"sessionUpdate":"tool_call_update","toolCallId":"call_01_9xtun202cqouz4q8t7ss7a8v","status":"in_progress","kind":"execute","title":"printf \"TOOL-OK\\n\"","locations":[{"path":"/workspace/project"}],"rawInput":{"command":"printf \"TOOL-OK\\n\"","cwd":"/workspace/project"},"content":[{"type":"content","content":{"type":"text","text":"TOOL-OK\n"}}]}}}}
+{"direction":"in","process":"p1","message":{"jsonrpc":"2.0","method":"session/update","params":{"sessionId":"session-1","update":{"sessionUpdate":"tool_call_update","toolCallId":"call_01_9xtun202cqouz4q8t7ss7a8v","status":"completed","title":"printf \"TOOL-OK\\n\"","content":[{"type":"content","content":{"type":"text","text":"TOOL-OK\n"}}],"rawOutput":{"output":"TOOL-OK\n","metadata":{"output":"TOOL-OK\n","exit":0,"truncated":false}}}}}}
+{"direction":"in","process":"p1","message":{"jsonrpc":"2.0","method":"session/update","params":{"sessionId":"session-1","update":{"sessionUpdate":"agent_message_chunk","messageId":"msg_1125cb49c001tmofdzWc1JiS6i","content":{"type":"text","text":"CAPTURE-OK"}}}}}
+{"direction":"in","process":"p1","message":{"jsonrpc":"2.0","method":"session/update","params":{"sessionId":"session-1","update":{"sessionUpdate":"agent_message_chunk","messageId":"msg_1125cb49c001tmofdzWc1JiS6i","content":{"type":"text","text":"\nTOOL-OK"}}}}}
+{"direction":"in","process":"p1","message":{"jsonrpc":"2.0","method":"session/update","params":{"sessionId":"session-1","update":{"sessionUpdate":"usage_update","used":10669,"size":1000000,"cost":{"amount":0.00148533,"currency":"USD"}}}}}
+{"direction":"in","process":"p1","message":{"jsonrpc":"2.0","id":3,"result":{"stopReason":"end_turn","usage":{"inputTokens":301,"outputTokens":11,"totalTokens":10680,"cachedReadTokens":10368},"_meta":{}}}}
diff --git a/src/main/agent-auth-restart-preservation.test.ts b/src/main/agent-auth-restart-preservation.test.ts
index 0b0ff8ca6225..b5056e836066 100644
--- a/src/main/agent-auth-restart-preservation.test.ts
+++ b/src/main/agent-auth-restart-preservation.test.ts
@@ -8,7 +8,7 @@ describe('preserveAgentAuthBeforeRestart', () => {
     vi.restoreAllMocks()
   })
 
-  it('syncs Codex then Claude before flushing the store', async () => {
+  it('syncs Codex and flushes the store', async () => {
     const calls: string[] = []
 
     await preserveAgentAuthBeforeRestart({
@@ -17,11 +17,6 @@ describe('preserveAgentAuthBeforeRestart', () => {
           calls.push('codex')
         })
       },
-      claudeRuntimeAuth: {
-        syncForCurrentSelection: vi.fn(async () => {
-          calls.push('claude')
-        })
-      },
       store: {
         flushPendingOrThrowAsync: vi.fn(async () => {
           calls.push('flush')
@@ -29,7 +24,7 @@ describe('preserveAgentAuthBeforeRestart', () => {
       }
     })
 
-    expect(calls).toEqual(['codex', 'claude', 'flush'])
+    expect(calls).toEqual(['codex', 'flush'])
   })
 
   it('drains retained WSL Codex auth before flushing the store', async () => {
@@ -106,27 +101,6 @@ describe('preserveAgentAuthBeforeRestart', () => {
     expect(JSON.stringify(warn.mock.calls)).not.toContain('token-secret')
   })
 
-  it('does not start Claude after host Codex exhausts the lifecycle budget', async () => {
-    vi.useFakeTimers()
-    const startedAt = Date.now()
-    const warn = vi.spyOn(console, 'warn').mockImplementation(() => {})
-    const syncClaude = vi.fn(async () => {})
-
-    await preserveAgentAuthBeforeRestart({
-      codexRuntimeHome: {
-        syncForCurrentSelection: vi.fn(() => {
-          vi.setSystemTime(startedAt + 2_000)
-        })
-      },
-      claudeRuntimeAuth: { syncForCurrentSelection: syncClaude }
-    })
-
-    expect(syncClaude).not.toHaveBeenCalled()
-    expect(warn).toHaveBeenCalledWith(
-      '[agent-auth-restart] Claude auth preservation exceeded 0ms; continuing restart/update'
-    )
-  })
-
   it('checkpoints admitted state without waiting for ongoing edits when auth services are missing', async () => {
     const flushPendingOrThrowAsync = vi.fn()
 
@@ -148,83 +122,15 @@ describe('preserveAgentAuthBeforeRestart', () => {
             throw new Error('codex-token-secret')
           })
         },
-        claudeRuntimeAuth: {
-          syncForCurrentSelection: vi.fn(async () => {
-            throw new Error('claude-token-secret')
-          })
-        },
         store: { flushPendingOrThrowAsync }
       })
     ).resolves.toBeUndefined()
 
     expect(flushPendingOrThrowAsync).toHaveBeenCalledTimes(1)
-    expect(warn).toHaveBeenCalledTimes(2)
+    expect(warn).toHaveBeenCalledTimes(1)
     expect(JSON.stringify(warn.mock.calls)).not.toContain('token-secret')
   })
 
-  it('releases the lifecycle path on timeout without canceling in-flight sync', async () => {
-    vi.useFakeTimers()
-    const warn = vi.spyOn(console, 'warn').mockImplementation(() => {})
-    const calls: string[] = []
-    let finishClaude!: () => void
-
-    const preservation = preserveAgentAuthBeforeRestart({
-      claudeRuntimeAuth: {
-        syncForCurrentSelection: vi.fn(async () => {
-          calls.push('claude-start')
-          await new Promise<void>((resolve) => {
-            finishClaude = resolve
-          })
-          calls.push('claude-finish')
-        })
-      },
-      store: {
-        flushPendingOrThrowAsync: vi.fn(async () => {
-          calls.push('flush')
-        })
-      }
-    })
-
-    await vi.advanceTimersByTimeAsync(2_000)
-    await preservation
-
-    expect(calls).toEqual(['claude-start', 'flush'])
-    expect(warn).toHaveBeenCalledWith(
-      '[agent-auth-restart] Claude auth preservation exceeded 2000ms; continuing restart/update'
-    )
-
-    finishClaude()
-    await Promise.resolve()
-
-    expect(calls).toEqual(['claude-start', 'flush', 'claude-finish'])
-  })
-
-  it('shares the original lifecycle timeout between Claude and store preservation', async () => {
-    vi.useFakeTimers()
-    const warn = vi.spyOn(console, 'warn').mockImplementation(() => {})
-    let settled = false
-
-    const preservation = preserveAgentAuthBeforeRestart({
-      claudeRuntimeAuth: {
-        syncForCurrentSelection: vi.fn(() => new Promise<void>(() => {}))
-      },
-      store: {
-        flushPendingOrThrowAsync: vi.fn(() => new Promise<void>(() => {}))
-      }
-    }).then(() => {
-      settled = true
-    })
-
-    await vi.advanceTimersByTimeAsync(2_000)
-    await vi.runOnlyPendingTimersAsync()
-    await preservation
-
-    expect(settled).toBe(true)
-    expect(warn).toHaveBeenCalledWith(
-      '[agent-auth-restart] Store persistence exceeded 0ms; continuing restart/update'
-    )
-  })
-
   it('bounds a store flush that never settles', async () => {
     vi.useFakeTimers()
     const warn = vi.spyOn(console, 'warn').mockImplementation(() => {})
diff --git a/src/main/agent-auth-restart-preservation.ts b/src/main/agent-auth-restart-preservation.ts
index d00641088cc2..a41be9a01833 100644
--- a/src/main/agent-auth-restart-preservation.ts
+++ b/src/main/agent-auth-restart-preservation.ts
@@ -1,4 +1,3 @@
-import type { ClaudeRuntimeAuthService } from './claude-accounts/runtime-auth-service'
 import type { CodexRuntimeHomeService } from './codex-accounts/runtime-home-service'
 import type { Store } from './persistence'
 
@@ -6,23 +5,17 @@ const AUTH_PRESERVATION_TIMEOUT_MS = 2_000
 
 type CodexRuntimeAuthSync = Pick<CodexRuntimeHomeService, 'syncForCurrentSelection'> &
   Partial<Pick<CodexRuntimeHomeService, 'syncActiveWslSelectionsBeforeRestart'>>
-type ClaudeRuntimeAuthSync = Pick<ClaudeRuntimeAuthService, 'syncForCurrentSelection'>
 type ShutdownStore = Pick<Store, 'flushPendingOrThrowAsync'>
 
-type AuthPreservationStep =
-  | 'Codex auth preservation'
-  | 'Claude auth preservation'
-  | 'Store persistence'
+type AuthPreservationStep = 'Codex auth preservation' | 'Store persistence'
 
 export type AgentAuthRestartPreservationOptions = {
   codexRuntimeHome?: CodexRuntimeAuthSync | null
-  claudeRuntimeAuth?: ClaudeRuntimeAuthSync | null
   store?: ShutdownStore | null
 }
 
 export async function preserveAgentAuthBeforeRestart({
   codexRuntimeHome,
-  claudeRuntimeAuth,
   store
 }: AgentAuthRestartPreservationOptions): Promise<void> {
   const startedAt = Date.now()
@@ -30,17 +23,6 @@ export async function preserveAgentAuthBeforeRestart({
   // Why: the drain owns guest-process timeouts; a shared 2s cutoff can relaunch before promotion.
   const wslCodexPreservation = runWslCodexPreservationStep(codexRuntimeHome)
 
-  const claudeRemainingMs = remainingLifecycleTime(startedAt)
-  if (claudeRuntimeAuth && claudeRemainingMs > 0) {
-    await runWithinLifecycleTimeout(
-      'Claude auth preservation',
-      () => claudeRuntimeAuth.syncForCurrentSelection(),
-      claudeRemainingMs
-    )
-  } else if (claudeRuntimeAuth) {
-    logStepTimeout('Claude auth preservation', 0)
-  }
-
   const storePreservation = store
     ? runWithinLifecycleTimeout(
         'Store persistence',
diff --git a/src/main/agent-cli-version-probe.test.ts b/src/main/agent-cli-version-probe.test.ts
new file mode 100644
index 000000000000..d04480f71dce
--- /dev/null
+++ b/src/main/agent-cli-version-probe.test.ts
@@ -0,0 +1,118 @@
+import { beforeEach, describe, expect, it, vi } from 'vitest'
+import {
+  isStableCliVersionFrom,
+  isStableCliVersionOnLine,
+  probeAgentCliVersion
+} from './agent-cli-version-probe'
+
+const { runProcess } = vi.hoisted(() => ({ runProcess: vi.fn() }))
+vi.mock('../shared/child-process/run-process', () => ({ runProcess }))
+
+const INPUT = { program: '/opt/bin/agent', cwd: '/repo', env: { PATH: '/opt/bin' } }
+const anyVersion = (): boolean => true
+
+function prints(stdout: string, result: Record<string, unknown> = {}): void {
+  runProcess.mockResolvedValue({
+    code: 0,
+    signal: null,
+    stdout,
+    stderr: '',
+    timedOut: false,
+    ...result
+  })
+}
+
+describe('probeAgentCliVersion', () => {
+  beforeEach(() => runProcess.mockReset())
+
+  it('asks the program for its version, bounded, where and as the launch would run it', async () => {
+    prints('1.18.31\n')
+    const seen: string[] = []
+    expect(await probeAgentCliVersion(INPUT, (version) => (seen.push(version), true))).toBe(true)
+    expect(seen).toEqual(['1.18.31'])
+    expect(runProcess).toHaveBeenCalledWith({
+      ...INPUT,
+      args: ['--version'],
+      timeoutMs: 5_000,
+      maxOutputBytes: 4_096,
+      killOnOutputLimit: true
+    })
+  })
+
+  it('reads a version printed with a name or a v prefix', async () => {
+    prints('opencode v2.0.21\n')
+    const seen: string[] = []
+    await probeAgentCliVersion(INPUT, (version) => (seen.push(version), true))
+    expect(seen).toEqual(['2.0.21'])
+  })
+
+  it('reads a version printed after the program name and a slash', async () => {
+    prints('omp/17.0.5\n')
+    const seen: string[] = []
+    await probeAgentCliVersion(INPUT, (version) => (seen.push(version), true))
+    expect(seen).toEqual(['17.0.5'])
+  })
+
+  it.each([
+    ['a non-zero exit', { code: 1 }],
+    ['a timeout', { timedOut: true }],
+    ['oversized output', { outputTruncated: true }]
+  ])('cannot tell after %s', async (_label, result) => {
+    prints('1.18.31\n', result)
+    expect(await probeAgentCliVersion(INPUT, anyVersion)).toBe(false)
+  })
+
+  it('cannot tell when the output names no version, or the program does not start', async () => {
+    prints('usage: agent [options]\n')
+    expect(await probeAgentCliVersion(INPUT, anyVersion)).toBe(false)
+    runProcess.mockImplementationOnce(() => {
+      throw new Error('spawn ENOENT')
+    })
+    expect(await probeAgentCliVersion(INPUT, anyVersion)).toBe(false)
+  })
+})
+
+describe('probeAgentCliVersion refusal', () => {
+  beforeEach(() => runProcess.mockReset())
+
+  it('says why it refused, with what the binary printed', async () => {
+    const warn = vi.spyOn(console, 'warn').mockImplementation(() => {})
+    prints('', { code: 1, stderr: 'Error: EACCES mkdir /x\n' })
+    await probeAgentCliVersion(INPUT, anyVersion)
+    prints('2.0.21\n')
+    await probeAgentCliVersion(INPUT, () => false)
+    expect(warn.mock.calls.map(([line]) => line)).toEqual([
+      '[agent-cli-version] /opt/bin/agent --version: exited 1: Error: EACCES mkdir /x',
+      '[agent-cli-version] /opt/bin/agent --version: 2.0.21 is not a supported release'
+    ])
+    warn.mockRestore()
+  })
+})
+
+describe('isStableCliVersionOnLine', () => {
+  const line = { major: 1, floor: '1.18.31' }
+
+  it.each([
+    ['1.18.31', true],
+    ['1.19.2', true],
+    ['1.18.30', false],
+    ['2.0.21', false],
+    ['1.18.31-beta.1', false],
+    ['11.0.0', false]
+  ])('%s -> %s', (version, supported) => {
+    expect(isStableCliVersionOnLine(version, line)).toBe(supported)
+  })
+})
+
+describe('isStableCliVersionFrom', () => {
+  it.each([
+    ['17.0.5', true],
+    ['17.2.12', true],
+    ['18.4.5', true],
+    ['17.0.4', false],
+    ['16.9.0', false],
+    ['18.0.0-beta.1', false]
+  ])('%s -> %s', (version, supported) => {
+    expect(isStableCliVersionFrom(version, '17.0.5')).toBe(supported)
+  })
+})
diff --git a/src/main/agent-cli-version-probe.ts b/src/main/agent-cli-version-probe.ts
new file mode 100644
index 000000000000..4cf45ce0e4d2
--- /dev/null
+++ b/src/main/agent-cli-version-probe.ts
@@ -0,0 +1,67 @@
+import {
+  hasReachedAppVersion,
+  isPrereleaseAppVersion,
+  parseCliVersion
+} from '../shared/app-version'
+import { runProcess, type ProcessSpec } from '../shared/child-process/run-process'
+
+/** One line naming why a probe said no; the binary's own words, bounded. */
+function warnRefused(program: string, why: string, output = ''): void {
+  const said = output.trim().replace(/\s+/g, ' ').slice(0, 200)
+  console.warn(`[agent-cli-version] ${program} --version: ${why}${said ? `: ${said}` : ''}`)
+}
+
+/** Runs `<program> --version` on this host and asks `supports` about the version it prints. False
+ *  when it cannot tell: a failed spawn, a non-zero exit, a timeout, or output with no version. */
+export async function probeAgentCliVersion(
+  input: Pick<ProcessSpec, 'program' | 'cwd' | 'env'>,
+  supports: (version: string) => boolean
+): Promise<boolean> {
+  let result
+  try {
+    result = await runProcess({
+      ...input,
+      args: ['--version'],
+      timeoutMs: 5_000,
+      maxOutputBytes: 4_096,
+      killOnOutputLimit: true
+    })
+  } catch (error) {
+    warnRefused(input.program, `did not start (${String(error)})`)
+    return false
+  }
+  const output = `${result.stdout}\n${result.stderr}`
+  if (result.timedOut || result.outputTruncated || result.code !== 0) {
+    const why = result.timedOut
+      ? 'timed out'
+      : result.outputTruncated
+        ? 'printed too much'
+        : `exited ${result.code ?? result.signal}`
+    warnRefused(input.program, why, output)
+    return false
+  }
+  const version = parseCliVersion(result.stdout)
+  if (version === null) {
+    warnRefused(input.program, 'printed no version', output)
+    return false
+  }
+  if (!supports(version)) {
+    warnRefused(input.program, `${version} is not a supported release`)
+    return false
+  }
+  console.info(`[agent-cli-version] ${input.program} --version: ${version} is supported`)
+  return true
+}
+
+/** A stable release at or after `floor`, on any later major line too. */
+export function isStableCliVersionFrom(version: string, floor: string): boolean {
+  return !isPrereleaseAppVersion(version) && hasReachedAppVersion(version, floor)
+}
+
+/** A stable release on `major`'s line, at or after `floor`. */
+export function isStableCliVersionOnLine(
+  version: string,
+  line: { major: number; floor: string }
+): boolean {
+  return version.startsWith(`${line.major}.`) && isStableCliVersionFrom(version, line.floor)
+}
diff --git a/src/main/agent-hooks/managed-hook-runtime.test.ts b/src/main/agent-hooks/managed-hook-runtime.test.ts
index e4c23e13959e..79d0742ce6cd 100644
--- a/src/main/agent-hooks/managed-hook-runtime.test.ts
+++ b/src/main/agent-hooks/managed-hook-runtime.test.ts
@@ -155,6 +155,18 @@ describe.runIf(process.platform !== 'win32')('installManagedHooks', () => {
       errors: 0
     })
 
-    expect((await readdir(home)).sort()).toEqual(['.claude', '.orca', SHELL_NAME, SHELL_RUNS_NAME])
+    expect((await readdir(home)).sort()).toEqual(['.claude', '.orca', SHELL_NAME])
+  })
+
+  it('still probes the login shell when Grok is selected', async () => {
+    const home = await createTempHome()
+    await stubLoginShell(home)
+
+    await expect(installManagedHooks({ agents: ['grok'] })).resolves.toEqual({
+      installers: 1,
+      errors: 0
+    })
+
+    expect((await readdir(home)).sort()).toEqual(['.grok', '.orca', SHELL_NAME, SHELL_RUNS_NAME])
   })
 })
diff --git a/src/main/agent-hooks/managed-hook-runtime.ts b/src/main/agent-hooks/managed-hook-runtime.ts
index 99a2c68be89f..4d1baeef609e 100644
--- a/src/main/agent-hooks/managed-hook-runtime.ts
+++ b/src/main/agent-hooks/managed-hook-runtime.ts
@@ -86,7 +86,9 @@ export async function installManagedHooks(options?: {
     return { installers: 0, errors: 0 }
   }
   const home = homedir()
-  const grokHomeDir = await resolveRelayGrokHome(home, options?.signal)
+  const grokHomeDir = agents.includes('grok')
+    ? await resolveRelayGrokHome(home, options?.signal)
+    : undefined
   options?.signal?.throwIfAborted()
   const hostIdentity = scopeManagedHookHostIdentity(
     await readManagedHookHostIdentity(),
diff --git a/src/main/agent-hooks/server-claude-task-wakeup-lifecycle.test.ts b/src/main/agent-hooks/server-claude-task-wakeup-lifecycle.test.ts
index a270b462202c..1ef842aa0d9e 100644
--- a/src/main/agent-hooks/server-claude-task-wakeup-lifecycle.test.ts
+++ b/src/main/agent-hooks/server-claude-task-wakeup-lifecycle.test.ts
@@ -57,6 +57,8 @@ async function host(remote: boolean, launchToken?: string) {
           method: 'POST',
           headers: {
             'Content-Type': 'application/json',
+            // Advancing fake time can expire a pooled HTTP socket before the next post.
+            Connection: 'close',
             'X-Orca-Agent-Hook-Token': relay.getCoordinates().token
           },
           body: JSON.stringify(body)
diff --git a/src/main/agent-hooks/server.test-fixtures.test.ts b/src/main/agent-hooks/server.test-fixtures.test.ts
new file mode 100644
index 000000000000..9b558e91419a
--- /dev/null
+++ b/src/main/agent-hooks/server.test-fixtures.test.ts
@@ -0,0 +1,48 @@
+import type { Socket } from 'node:net'
+import { expect, it, vi } from 'vitest'
+import { AgentHookServer } from './server'
+import { buildBody, postHookEvent } from './server.test-fixtures'
+
+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') }
+}))
+
+vi.mock('../telemetry/client', () => ({ track: vi.fn() }))
+vi.mock('../telemetry/cohort-classifier', () => ({ getCohortAtEmit: vi.fn(() => ({})) }))
+
+class SocketTrackingHookServer extends AgentHookServer {
+  readonly requestSockets = new Set<Socket>()
+
+  trackRequestSockets(): void {
+    this.server?.on('request', (request) => this.requestSockets.add(request.socket))
+  }
+}
+
+it('uses a fresh connection for each hook across fake-time advances', async () => {
+  vi.useFakeTimers({
+    shouldAdvanceTime: true,
+    toFake: ['Date', 'performance', 'setTimeout', 'clearTimeout']
+  })
+  const server = new SocketTrackingHookServer()
+  try {
+    await server.start({ env: 'production' })
+    server.trackRequestSockets()
+    for (let index = 0; index < 3; index += 1) {
+      const response = await postHookEvent(
+        server,
+        buildBody({ hook_event_name: 'UserPromptSubmit', prompt: 'fresh turn' })
+      )
+      expect(response.status).toBe(204)
+      if (index === 1) {
+        vi.advanceTimersByTime(120_000)
+      }
+    }
+    expect(server.requestSockets.size).toBe(3)
+  } finally {
+    server.stop()
+    vi.useRealTimers()
+  }
+})
diff --git a/src/main/agent-hooks/server.test-fixtures.ts b/src/main/agent-hooks/server.test-fixtures.ts
index 99bb0aeee696..565515239e77 100644
--- a/src/main/agent-hooks/server.test-fixtures.ts
+++ b/src/main/agent-hooks/server.test-fixtures.ts
@@ -57,6 +57,8 @@ export async function postHookEvent(
     method: 'POST',
     headers: {
       'Content-Type': 'application/json',
+      // Fake-time advances must not expire a pooled socket before the next hook.
+      Connection: 'close',
       'X-Orca-Agent-Hook-Token': env.ORCA_AGENT_HOOK_TOKEN
     },
     body: JSON.stringify(body)
diff --git a/src/main/agent-hooks/wsl-hook-relay-recovery.test.ts b/src/main/agent-hooks/wsl-hook-relay-recovery.test.ts
index 018d91019153..a603a22282aa 100644
--- a/src/main/agent-hooks/wsl-hook-relay-recovery.test.ts
+++ b/src/main/agent-hooks/wsl-hook-relay-recovery.test.ts
@@ -1,10 +1,14 @@
 // Restart-timer policy: recovery must re-ensure a running distro, must NOT
 // boot a stopped one (wsl -d starts stopped distros), and must respect state
 // currency and disposal.
-import { describe, expect, it, vi } from 'vitest'
+import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest'
 
 import { WslRelayRecovery, type WslRelayRecoveryState } from './wsl-hook-relay-recovery'
 
+beforeEach(() => vi.useFakeTimers({ toFake: ['setTimeout', 'clearTimeout'] }))
+
+afterEach(() => vi.useRealTimers())
+
 function makeState(): WslRelayRecoveryState {
   return { distro: 'Ubuntu', cooldownUntil: Date.now() - 1_000 }
 }
@@ -26,6 +30,7 @@ describe('WslRelayRecovery', () => {
     })
     const state = makeState()
     recovery.scheduleRestart(state)
+    await vi.advanceTimersByTimeAsync(250)
     await waitFor(() => restart.mock.calls.length === 1)
     expect(restart).toHaveBeenCalledWith('Ubuntu')
   })
@@ -44,6 +49,7 @@ describe('WslRelayRecovery', () => {
     })
     const state = makeState()
     recovery.scheduleRestart(state)
+    await vi.advanceTimersByTimeAsync(250)
     await waitFor(() => dropState.mock.calls.length === 1)
     expect(restart).not.toHaveBeenCalled()
     expect(warn).toHaveBeenCalledWith(expect.stringContaining('distro not running'))
@@ -62,7 +68,7 @@ describe('WslRelayRecovery', () => {
     })
     const state = makeState()
     recovery.scheduleRestart(state)
-    await new Promise((resolve) => setTimeout(resolve, 500))
+    await vi.advanceTimersByTimeAsync(500)
     expect(probe).not.toHaveBeenCalled()
     expect(restart).not.toHaveBeenCalled()
   })
@@ -83,11 +89,12 @@ describe('WslRelayRecovery', () => {
     })
     const state = makeState()
     recovery.scheduleRestart(state)
+    await vi.advanceTimersByTimeAsync(250)
     await waitFor(() => probe.mock.calls.length === 1)
     // A fresh ensure() replaces this state while the probe is in flight.
     current = false
     resolveProbe?.(false)
-    await new Promise((resolve) => setTimeout(resolve, 100))
+    await vi.advanceTimersByTimeAsync(100)
     expect(dropState).not.toHaveBeenCalled()
     expect(restart).not.toHaveBeenCalled()
   })
@@ -107,10 +114,11 @@ describe('WslRelayRecovery', () => {
     })
     const state = makeState()
     recovery.scheduleRestart(state)
+    await vi.advanceTimersByTimeAsync(250)
     await waitFor(() => probe.mock.calls.length === 1)
     current = false
     resolveProbe?.(true)
-    await new Promise((resolve) => setTimeout(resolve, 100))
+    await vi.advanceTimersByTimeAsync(100)
     expect(restart).not.toHaveBeenCalled()
   })
 
@@ -126,7 +134,7 @@ describe('WslRelayRecovery', () => {
     })
     const state = makeState()
     recovery.scheduleOneShotReinstall(state, 10, run)
-    await new Promise((resolve) => setTimeout(resolve, 100))
+    await vi.advanceTimersByTimeAsync(100)
     expect(run).not.toHaveBeenCalled()
     expect(state.reinstallTimer).toBeUndefined()
   })
@@ -146,7 +154,7 @@ describe('WslRelayRecovery', () => {
     recovery.scheduleRestart(state)
     recovery.scheduleOneShotReinstall(state, 100, reinstall)
     recovery.clearTimers(state)
-    await new Promise((resolve) => setTimeout(resolve, 500))
+    await vi.advanceTimersByTimeAsync(500)
     expect(restart).not.toHaveBeenCalled()
     expect(reinstall).not.toHaveBeenCalled()
     expect(state.restartTimer).toBeUndefined()
diff --git a/src/main/agent-launch/agent-launch-executor.test.ts b/src/main/agent-launch/agent-launch-executor.test.ts
index 30e652a6cb4c..c27d84cf0379 100644
--- a/src/main/agent-launch/agent-launch-executor.test.ts
+++ b/src/main/agent-launch/agent-launch-executor.test.ts
@@ -159,6 +159,31 @@ describe('a structured launch that creates its own worktree', () => {
     expect(result.receipt).toMatchObject({ reason: 'structured_support_unknown' })
   })
 
+  it('keeps Pi on the terminal path when its RPC version is unsupported', async () => {
+    const h = harness({ createSupport: { supported: false, reason: 'agent' } })
+    const result = await h.run({
+      ...CREATE_INTENT,
+      agent: 'pi',
+      prompt: { text: 'continue my task', delivery: 'submit' }
+    })
+    expect(h.calls).toEqual([
+      'createWorktree(startupAgent=undefined)',
+      'createSupport',
+      'createTerminalAgent'
+    ])
+    expect(h.createStructuredSession).not.toHaveBeenCalled()
+    expect(h.createTerminalAgent).toHaveBeenCalledWith(
+      expect.objectContaining({
+        startupPrompt: 'continue my task'
+      })
+    )
+    expect(result.outcome).toEqual({ kind: 'terminal', handle: 'term_1' })
+    expect(result.receipt).toMatchObject({
+      mode: 'terminal',
+      reason: 'structured_unsupported_on_host'
+    })
+  })
+
   it('falls back only for a definitive structured refusal after the worktree exists', async () => {
     const h = harness({
       structuredCreateError: new AgentLaunchStructuredSessionRefusedError(
diff --git a/src/main/agent-launch/agent-launch-executor.ts b/src/main/agent-launch/agent-launch-executor.ts
index 3b5794a0ba74..642e59914148 100644
--- a/src/main/agent-launch/agent-launch-executor.ts
+++ b/src/main/agent-launch/agent-launch-executor.ts
@@ -55,7 +55,8 @@ import {
   resolveAgentLaunchModeOnHost,
   type AgentLaunchModeReceipt,
   type AgentLaunchModeVocabulary,
-  DEFAULT_LAUNCH_VOCABULARY
+  DEFAULT_LAUNCH_VOCABULARY,
+  warnStructuredLaunchDowngrade
 } from './agent-launch-mode'
 import {
   AgentLaunchStructuredSessionRefusedError,
@@ -212,6 +213,7 @@ function published(
   execution: AgentLaunchExecution,
   surface: AgentLaunchPublishedSurface
 ): AgentLaunchPublishedSurface {
+  warnStructuredLaunchDowngrade(execution.intent.agent, surface.receipt)
   execution.onSurfacePublished?.(surface)
   return surface
 }
diff --git a/src/main/agent-launch/agent-launch-mode.ts b/src/main/agent-launch/agent-launch-mode.ts
index 2a96c4f58088..be3837f97b6b 100644
--- a/src/main/agent-launch/agent-launch-mode.ts
+++ b/src/main/agent-launch/agent-launch-mode.ts
@@ -256,6 +256,16 @@ function downgraded(
   }
 }
 
+/** One main-log line when a launch the user's default asked to be a chat opened a terminal. */
+export function warnStructuredLaunchDowngrade(
+  agent: string,
+  receipt: AgentLaunchModeReceipt
+): void {
+  if (receipt.mode === 'terminal' && receipt.preferred === 'structured') {
+    console.warn(`[agent-launch] ${agent} opened a terminal: ${receipt.reason}`)
+  }
+}
+
 /** The store can be missing on a runtime that never opened one; that reads as no preference. */
 export function readAgentLaunchModeSettings(
   runtime: Pick<OrcaRuntimeService, 'getClientSettings'>
diff --git a/src/main/ai-vault/session-scanner-accumulator.ts b/src/main/ai-vault/session-scanner-accumulator.ts
index cb664b41581c..357816cb9b44 100644
--- a/src/main/ai-vault/session-scanner-accumulator.ts
+++ b/src/main/ai-vault/session-scanner-accumulator.ts
@@ -230,7 +230,7 @@ export function addPreviewMessage(
     () => (args.text ? normalizeFullFirstUserPromptText(args.text) : null),
     args.seedFirstUserPrompt
   )
-  const text = normalizePreviewText(args.text ?? '')
+  const text = normalizePreviewText(args.text ?? '', args.role)
   if (!text) {
     return
   }
@@ -267,7 +267,7 @@ export function addPreviewContent(
   }
   addPreviewMessage(accumulator, {
     role,
-    text: extractPreviewContentText(content),
+    text: extractPreviewContentText(content, role),
     timestamp,
     // Content path already seeded above when capture is enabled.
     seedFirstUserPrompt: false,
diff --git a/src/main/ai-vault/session-scanner-text-normalization.ts b/src/main/ai-vault/session-scanner-text-normalization.ts
index 50fc54ab7aaa..9ad459575f66 100644
--- a/src/main/ai-vault/session-scanner-text-normalization.ts
+++ b/src/main/ai-vault/session-scanner-text-normalization.ts
@@ -1,4 +1,5 @@
 import { sliceAtCodeUnitLimit } from '../../shared/surrogate-safe-text-slice'
+import { withoutNativeChatVisualDirectiveLines } from '../../shared/native-chat-visual-directive'
 
 export { sliceAtCodeUnitLimit }
 
@@ -38,17 +39,31 @@ export function normalizeTitleText(value: string): string | null {
   return finalizeNormalizedText(normalizeStringText(value, SESSION_TITLE_TEXT_LIMIT))
 }
 
-export function extractPreviewContentText(value: unknown): string | null {
-  return normalizeContentText(value, SESSION_PREVIEW_TEXT_LIMIT)
+/**
+ * `role` 'assistant': a reply's visual lines show only in a chat transcript, so a preview drops
+ * them, per text part and before lines are folded into one.
+ */
+export function extractPreviewContentText(value: unknown, role?: string): string | null {
+  return normalizeContentText(value, SESSION_PREVIEW_TEXT_LIMIT, role === 'assistant')
 }
 
-export function normalizePreviewText(value: string): string | null {
-  return finalizeNormalizedText(normalizeStringText(value, SESSION_PREVIEW_TEXT_LIMIT))
+export function normalizePreviewText(value: string, role?: string): string | null {
+  return finalizeNormalizedText(
+    normalizeStringText(previewSource(value, role === 'assistant'), SESSION_PREVIEW_TEXT_LIMIT)
+  )
+}
+
+function previewSource(text: string, dropVisualLines: boolean): string {
+  return dropVisualLines ? withoutNativeChatVisualDirectiveLines(text) : text
 }
 
-function normalizeContentText(value: unknown, limit: number): string | null {
+function normalizeContentText(
+  value: unknown,
+  limit: number,
+  dropVisualLines = false
+): string | null {
   if (typeof value === 'string') {
-    return finalizeNormalizedText(normalizeStringText(value, limit))
+    return finalizeNormalizedText(normalizeStringText(previewSource(value, dropVisualLines), limit))
   }
   if (!Array.isArray(value)) {
     return null
@@ -61,7 +76,7 @@ function normalizeContentText(value: unknown, limit: number): string | null {
       continue
     }
     appendInterPartSpace(builder)
-    appendNormalizedString(builder, text)
+    appendNormalizedString(builder, previewSource(text, dropVisualLines))
     if (builder.truncated) {
       break
     }
diff --git a/src/main/ai-vault/session-scanner-values.test.ts b/src/main/ai-vault/session-scanner-values.test.ts
index 10f6195b07c2..8fce0a6c49bf 100644
--- a/src/main/ai-vault/session-scanner-values.test.ts
+++ b/src/main/ai-vault/session-scanner-values.test.ts
@@ -24,6 +24,24 @@ describe('AI Vault session scanner text values', () => {
     expect(normalizeTitleText('<INSTRUCTIONS>Use this repo guidance')).toBeNull()
   })
 
+  it("drops a reply's visual lines from its preview, but not a user's", () => {
+    const line = '::orca-visual{file="latency.html" title="p95"}'
+    expect(normalizePreviewText(`p95 is highest.\n\n${line}\n\nDone.`, 'assistant')).toBe(
+      'p95 is highest. Done.'
+    )
+    expect(normalizePreviewText(line, 'assistant')).toBeNull()
+    expect(normalizePreviewText(line, 'user')).toBe(line)
+    // Provider content (Claude/Codex message parts) folds lines; the visual line goes first.
+    expect(
+      extractPreviewContentText(
+        [{ type: 'text', text: `Here it is.\n\n${line}\n\nDone.` }],
+        'assistant'
+      )
+    ).toBe('Here it is. Done.')
+    expect(extractPreviewContentText(`Here it is.\n${line}`, 'assistant')).toBe('Here it is.')
+    expect(extractPreviewContentText([{ type: 'text', text: line }], 'user')).toBe(line)
+  })
+
   it('folds large preview text directly without full-string replacement', () => {
     const replaceSpy = vi.spyOn(String.prototype, 'replace')
     const hiddenContext = `<codex_internal_context source="goal">${'SECRET\n'.repeat(10_000)}</codex_internal_context>`
diff --git a/src/main/automations/automation-owner-fencing.test.ts b/src/main/automations/automation-owner-fencing.test.ts
index 14852c0267d9..87c18e466674 100644
--- a/src/main/automations/automation-owner-fencing.test.ts
+++ b/src/main/automations/automation-owner-fencing.test.ts
@@ -1,4 +1,10 @@
-import { closeTestStores, createSqliteTestStore } from '../persistence-test-harness'
+import {
+  closeTestStores,
+  createSqliteTestStore,
+  createStore as createFreshStore,
+  testState
+} from '../persistence-test-harness'
+import { resetRetirementCollisionKeyCacheForTests } from '../worktree-name-retirement'
 /**
  * The desktop authority's end of the scoped-list and owner-fenced contracts:
  * a parameterless read still answers with everything it stores, a scoped read is
@@ -16,7 +22,7 @@ import { getDefaultPersistedState } from '../../shared/constants'
 import { AUTOMATION_OWNER_CONFLICT_CODES } from '../../shared/automation-owner-conflict'
 import { installFakeAppEnvironment } from '../../../config/scripts/vitest-host-ports-setup'
 
-const testState = { dir: '' }
+let hasCreatedStoreInCase = false
 
 vi.mock('electron', () => ({
   app: { getPath: () => testState.dir },
@@ -103,6 +109,10 @@ async function createStore() {
     }),
     'utf-8'
   )
+  if (!hasCreatedStoreInCase) {
+    hasCreatedStoreInCase = true
+    return createFreshStore()
+  }
   vi.resetModules()
   installFakeAppEnvironment({ getPath: () => testState.dir })
   const { Store, initDataPath } = await import('../persistence')
@@ -111,6 +121,8 @@ async function createStore() {
 }
 
 beforeEach(() => {
+  hasCreatedStoreInCase = false
+  resetRetirementCollisionKeyCacheForTests()
   testState.dir = mkdtempSync(join(tmpdir(), 'automation-fencing-'))
 })
 
diff --git a/src/main/automations/automation-update-host-retarget.test.ts b/src/main/automations/automation-update-host-retarget.test.ts
index 62c2b000d6fd..69fd40826429 100644
--- a/src/main/automations/automation-update-host-retarget.test.ts
+++ b/src/main/automations/automation-update-host-retarget.test.ts
@@ -1,4 +1,10 @@
-import { closeTestStores, createSqliteTestStore } from '../persistence-test-harness'
+import {
+  closeTestStores,
+  createSqliteTestStore,
+  createStore as createFreshStore,
+  testState
+} from '../persistence-test-harness'
+import { resetRetirementCollisionKeyCacheForTests } from '../worktree-name-retirement'
 /**
  * An update may not move a record to another host unless it was asked to.
  *
@@ -20,7 +26,7 @@ import { AUTOMATION_ORPHAN_ISSUES } from '../../shared/automation-list-scope'
 import { AUTOMATION_OWNER_CONFLICT_CODES } from '../../shared/automation-owner-conflict'
 import { installFakeAppEnvironment } from '../../../config/scripts/vitest-host-ports-setup'
 
-const testState = { dir: '' }
+let hasCreatedStoreInCase = false
 
 vi.mock('electron', () => ({
   app: { getPath: () => testState.dir },
@@ -120,6 +126,10 @@ async function createStore() {
     }),
     'utf-8'
   )
+  if (!hasCreatedStoreInCase) {
+    hasCreatedStoreInCase = true
+    return createFreshStore()
+  }
   vi.resetModules()
   installFakeAppEnvironment({ getPath: () => testState.dir })
   const { Store, initDataPath } = await import('../persistence')
@@ -144,6 +154,8 @@ function projectedSelector(store: Store, id: string) {
 const ORPHAN = { selector: { kind: 'orphan' } } as const
 
 beforeEach(() => {
+  hasCreatedStoreInCase = false
+  resetRetirementCollisionKeyCacheForTests()
   testState.dir = mkdtempSync(join(tmpdir(), 'automation-retarget-'))
 })
 
diff --git a/src/main/automations/automation-workspace-host-attribution.test.ts b/src/main/automations/automation-workspace-host-attribution.test.ts
index 326de8fad23b..6a4ab525557d 100644
--- a/src/main/automations/automation-workspace-host-attribution.test.ts
+++ b/src/main/automations/automation-workspace-host-attribution.test.ts
@@ -1,4 +1,10 @@
-import { closeTestStores, createSqliteTestStore } from '../persistence-test-harness'
+import {
+  closeTestStores,
+  createSqliteTestStore,
+  createStore as createFreshStore,
+  testState
+} from '../persistence-test-harness'
+import { resetRetirementCollisionKeyCacheForTests } from '../worktree-name-retirement'
 /**
  * A folder workspace can pin its execution host while its repo stays local.
  * The desktop authority used to project only the repo, so those records listed
@@ -19,7 +25,7 @@ import { AUTOMATION_ORPHAN_ISSUES } from '../../shared/automation-list-scope'
 import { AutomationService } from './service'
 import { installFakeAppEnvironment } from '../../../config/scripts/vitest-host-ports-setup'
 
-const testState = { dir: '' }
+let hasCreatedStoreInCase = false
 
 vi.mock('electron', () => ({
   app: { getPath: () => testState.dir },
@@ -116,6 +122,10 @@ async function createStore(
     }),
     'utf-8'
   )
+  if (!hasCreatedStoreInCase) {
+    hasCreatedStoreInCase = true
+    return createFreshStore()
+  }
   vi.resetModules()
   installFakeAppEnvironment({ getPath: () => testState.dir })
   const { Store, initDataPath } = await import('../persistence')
@@ -124,6 +134,8 @@ async function createStore(
 }
 
 beforeEach(() => {
+  hasCreatedStoreInCase = false
+  resetRetirementCollisionKeyCacheForTests()
   testState.dir = mkdtempSync(join(tmpdir(), 'automation-workspace-host-'))
 })
 
diff --git a/src/main/automations/service-precheck.test.ts b/src/main/automations/service-precheck.test.ts
index 2bd3b5dd969e..7e3ec5886ced 100644
--- a/src/main/automations/service-precheck.test.ts
+++ b/src/main/automations/service-precheck.test.ts
@@ -2,8 +2,11 @@ import {
   closeTestStores,
   createSqliteTestStore,
   readPersistedStateJson,
-  writePersistedStateJson
+  writePersistedStateJson,
+  createStore as createFreshStore,
+  testState
 } from '../persistence-test-harness'
+import { resetRetirementCollisionKeyCacheForTests } from '../worktree-name-retirement'
 import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest'
 import { mkdtempSync, rmSync } from 'node:fs'
 import { join } from 'node:path'
@@ -15,7 +18,7 @@ import { createAutomationRunWriter } from './automation-run-writer'
 import { installFakeAppEnvironment } from '../../../config/scripts/vitest-host-ports-setup'
 
 const runAutomationPrecheckMock = vi.hoisted(() => vi.fn())
-const testState = { dir: '' }
+let hasCreatedStoreInCase = false
 
 vi.mock('electron', () => ({
   app: {
@@ -33,6 +36,10 @@ vi.mock('./precheck-runner', () => ({
 }))
 
 async function createStore() {
+  if (!hasCreatedStoreInCase) {
+    hasCreatedStoreInCase = true
+    return createFreshStore()
+  }
   vi.resetModules()
   installFakeAppEnvironment({ getPath: () => testState.dir })
   const { Store, initDataPath } = await import('../persistence')
@@ -64,6 +71,8 @@ function mutateDataFile(
 
 describe('AutomationService prechecks', () => {
   beforeEach(() => {
+    hasCreatedStoreInCase = false
+    resetRetirementCollisionKeyCacheForTests()
     testState.dir = mkdtempSync(join(tmpdir(), 'orca-automations-test-'))
     runAutomationPrecheckMock.mockReset()
     vi.useFakeTimers()
diff --git a/src/main/browser/agent-browser-bridge-raw-process-retention.test.ts b/src/main/browser/agent-browser-bridge-raw-process-retention.test.ts
new file mode 100644
index 000000000000..014e0f392a2e
--- /dev/null
+++ b/src/main/browser/agent-browser-bridge-raw-process-retention.test.ts
@@ -0,0 +1,117 @@
+import * as childProcess from 'node:child_process'
+import { mkdtempSync, rmSync } from 'node:fs'
+import { tmpdir } from 'node:os'
+import { join } from 'node:path'
+import { afterEach, beforeEach, expect, it, vi } from 'vitest'
+
+const { userDataPath } = vi.hoisted(() => ({ userDataPath: { current: '' } }))
+
+vi.mock('electron', () => ({
+  app: {
+    getPath: vi.fn(() => userDataPath.current),
+    getAppPath: vi.fn(() => userDataPath.current),
+    isPackaged: false
+  }
+}))
+
+vi.mock('node:child_process', async (importOriginal) => {
+  const actual = await importOriginal<typeof childProcess>()
+  return { ...actual, execFile: vi.fn(actual.execFile) }
+})
+
+import { AgentBrowserBridge } from './agent-browser-bridge'
+import { mockBrowserManager } from './agent-browser-bridge-test-harness'
+import { AGENT_BROWSER_EXIT_DRAIN_MS } from './agent-browser-bridge-types'
+
+let bridge: AgentBrowserBridge
+
+beforeEach(() => {
+  vi.clearAllMocks()
+  userDataPath.current = mkdtempSync(join(tmpdir(), 'orca-agent-browser-retention-'))
+  bridge = new AgentBrowserBridge(mockBrowserManager())
+  Object.defineProperty(bridge, 'agentBrowserBin', { value: process.execPath, configurable: true })
+})
+
+afterEach(() => {
+  vi.restoreAllMocks()
+  rmSync(userDataPath.current, { recursive: true, force: true })
+})
+
+function run(script: string): Promise<string> {
+  return bridge['runAgentBrowserRaw']('orca-tab-retention', ['-e', script])
+}
+
+function rememberChild(script: string) {
+  const spawn = vi.mocked(childProcess.execFile)
+  const pending = run(script)
+  const result = spawn.mock.results[0]
+  if (result?.type !== 'return') {
+    throw new Error('Expected a real helper process')
+  }
+  const child = new WeakRef(result.value)
+  // Mock call records must not keep the completed helper alive.
+  spawn.mockClear()
+  return { pending, child }
+}
+
+async function collect(): Promise<void> {
+  if (!global.gc) {
+    throw new Error('This retention test requires --expose-gc')
+  }
+  for (let turn = 0; turn < 5; turn++) {
+    await new Promise<void>((resolve) => setImmediate(resolve))
+    global.gc()
+  }
+}
+
+it('releases the completed helper before the fallback deadline while its bridge stays usable', async () => {
+  const { pending, child } = rememberChild("process.stdout.write('complete')")
+  expect(await pending).toBe('complete')
+  await collect()
+  expect(child.deref()).toBeUndefined()
+  expect(await run("process.stdout.write('next')")).toBe('next')
+})
+
+it.each(['error', 'cancel'] as const)(
+  'retires the unused drain timer after %s',
+  async (outcome) => {
+    const timers = vi.spyOn(globalThis, 'setTimeout')
+    const clear = vi.spyOn(globalThis, 'clearTimeout')
+    const spawned = vi.mocked(childProcess.execFile)
+    const pending = run(
+      outcome === 'error'
+        ? "process.stderr.write('fixture-error');process.exitCode=1"
+        : 'setInterval(() => {}, 1000)'
+    )
+    if (outcome === 'cancel') {
+      const result = spawned.mock.results[0]
+      if (result?.type !== 'return') {
+        throw new Error('Expected a real helper process')
+      }
+      bridge['cancelledProcesses'].add(result.value)
+      result.value.kill()
+    }
+    await expect(pending).rejects.toThrow(outcome === 'error' ? 'fixture-error' : 'Tab was closed')
+    const completed = spawned.mock.results[0]
+    if (completed?.type !== 'return') {
+      throw new Error('Expected a real helper process')
+    }
+    expect(bridge['cancelledProcesses'].has(completed.value)).toBe(false)
+    const drainIndex = timers.mock.calls.findIndex(
+      ([, delay]) => delay === AGENT_BROWSER_EXIT_DRAIN_MS
+    )
+    expect(drainIndex).toBeGreaterThanOrEqual(0)
+    const drain = timers.mock.results[drainIndex]
+    if (drain?.type !== 'return') {
+      throw new Error('Expected a scheduled drain timer')
+    }
+    expect(clear).toHaveBeenCalledWith(drain.value)
+  }
+)
+
+it('preserves spawn failure without scheduling an exit drain', async () => {
+  Object.defineProperty(bridge, 'agentBrowserBin', { value: join(userDataPath.current, 'missing') })
+  const timers = vi.spyOn(globalThis, 'setTimeout')
+  await expect(run('')).rejects.toThrow('ENOENT')
+  expect(timers.mock.calls.some(([, delay]) => delay === AGENT_BROWSER_EXIT_DRAIN_MS)).toBe(false)
+})
diff --git a/src/main/browser/agent-browser-bridge-raw-process.ts b/src/main/browser/agent-browser-bridge-raw-process.ts
index 49663d260c27..aef9d2ce579c 100644
--- a/src/main/browser/agent-browser-bridge-raw-process.ts
+++ b/src/main/browser/agent-browser-bridge-raw-process.ts
@@ -23,6 +23,7 @@ export abstract class AgentBrowserBridgeRawProcess extends AgentBrowserBridgeExe
     return new Promise<string>((resolve, reject) => {
       const session = this.sessions.get(sessionName)
       let child: ChildProcess | null = null
+      let exitDrainTimer: ReturnType<typeof setTimeout> | undefined
       child = execFile(
         this.agentBrowserBin,
         args,
@@ -38,6 +39,7 @@ export abstract class AgentBrowserBridgeRawProcess extends AgentBrowserBridgeExe
             : this.agentBrowserEnv
         },
         (error, stdout, stderr) => {
+          clearTimeout(exitDrainTimer)
           if (session && session.activeProcess === child) {
             session.activeProcess = null
           }
@@ -99,7 +101,7 @@ export abstract class AgentBrowserBridgeRawProcess extends AgentBrowserBridgeExe
       // Why: a Windows daemon inherits the helper's stdio pipes (vercel-labs/agent-browser#1407), so
       // EOF never arrives; after exit, drain briefly then release the pipes so execFile settles.
       child.once('exit', () => {
-        setTimeout(() => {
+        exitDrainTimer = setTimeout(() => {
           child.stdout?.destroy()
           child.stderr?.destroy()
         }, AGENT_BROWSER_EXIT_DRAIN_MS)
diff --git a/src/main/browser/browser-cookie-chromium-prepare.ts b/src/main/browser/browser-cookie-chromium-prepare.ts
index 8b71b102f13d..6253e50116e7 100644
--- a/src/main/browser/browser-cookie-chromium-prepare.ts
+++ b/src/main/browser/browser-cookie-chromium-prepare.ts
@@ -142,185 +142,198 @@ export async function prepareChromiumCookieImport(
     }
   }
 
-  // Why: Chromium timestamps (µs since 1601) can exceed Number.MAX_SAFE_INTEGER; readBigInts avoids precision loss.
-  sourceDb = new DatabaseSync(sourceSnapshot.databasePath, { readOnly: true, readBigInts: true })
-  let targetColumnInfo: ChromiumCookieColumnInfo[] | null = null
-  let colList: string | null = null
-  let placeholders: string | null = null
-  if (stagingAvailable) {
-    // Why: the staged file is Orca's own partition DB, also named "Cookies", so the same
-    // transient AV handle can make opening it throw — degrade instead of killing the import.
-    try {
-      stagingDb = new DatabaseSync(stagingCookiesPath)
-      // Why (STA-4797): a new-format stage must be one self-contained file. Otherwise a lost WAL
-      // can erase its scope marker and make cold-start replay mistake it for a legacy whole-image
-      // import, restoring the unrelated-cookie data loss this format is meant to prevent.
-      stagingDb.exec('PRAGMA journal_mode = DELETE')
-      targetColumnInfo = stagingDb
-        .prepare('PRAGMA table_info(cookies)')
-        .all() as ChromiumCookieColumnInfo[]
-      const targetCols = targetColumnInfo.map((row) => row.name)
-      colList = targetCols.join(', ')
-      placeholders = targetCols.map(() => '?').join(', ')
-    } catch (err) {
-      diag(`  staging database unusable, restart fallback disabled: ${String(err)}`)
-      stagingAvailable = false
-      targetColumnInfo = null
-      colList = null
-      placeholders = null
-      closeStagingDb()
-      // Why: the copy holds real partition cookies; discard it now rather than at the exit branches.
-      discardStagingFile()
+  let ownershipTransferred = false
+  try {
+    // Why: Chromium timestamps (µs since 1601) can exceed Number.MAX_SAFE_INTEGER; readBigInts avoids precision loss.
+    sourceDb = new DatabaseSync(sourceSnapshot.databasePath, { readOnly: true, readBigInts: true })
+    let targetColumnInfo: ChromiumCookieColumnInfo[] | null = null
+    let colList: string | null = null
+    let placeholders: string | null = null
+    if (stagingAvailable) {
+      // Why: the staged file is Orca's own partition DB, also named "Cookies", so the same
+      // transient AV handle can make opening it throw — degrade instead of killing the import.
+      try {
+        stagingDb = new DatabaseSync(stagingCookiesPath)
+        // Why (STA-4797): a new-format stage must be one self-contained file. Otherwise a lost WAL
+        // can erase its scope marker and make cold-start replay mistake it for a legacy whole-image
+        // import, restoring the unrelated-cookie data loss this format is meant to prevent.
+        stagingDb.exec('PRAGMA journal_mode = DELETE')
+        targetColumnInfo = stagingDb
+          .prepare('PRAGMA table_info(cookies)')
+          .all() as ChromiumCookieColumnInfo[]
+        const targetCols = targetColumnInfo.map((row) => row.name)
+        colList = targetCols.join(', ')
+        placeholders = targetCols.map(() => '?').join(', ')
+      } catch (err) {
+        diag(`  staging database unusable, restart fallback disabled: ${String(err)}`)
+        stagingAvailable = false
+        targetColumnInfo = null
+        colList = null
+        placeholders = null
+        closeStagingDb()
+        // Why: the copy holds real partition cookies; discard it now rather than at the exit branches.
+        discardStagingFile()
+      }
     }
-  }
 
-  // Why (STA-4300): the partition columns drift across Chromium versions, so read the source
-  // schema rather than assuming a row's missing column means "unpartitioned".
-  const sourceColumns = new Set(
-    (sourceDb.prepare('PRAGMA table_info(cookies)').all() as ChromiumCookieColumnInfo[]).map(
-      (column) => column.name
+    // Why (STA-4300): the partition columns drift across Chromium versions, so read the source
+    // schema rather than assuming a row's missing column means "unpartitioned".
+    const sourceColumns = new Set(
+      (sourceDb.prepare('PRAGMA table_info(cookies)').all() as ChromiumCookieColumnInfo[]).map(
+        (column) => column.name
+      )
     )
-  )
-  const sourceRows = sourceDb.prepare('SELECT * FROM cookies ORDER BY rowid').all() as Record<
-    string,
-    unknown
-  >[]
-  sourceDb.close()
-  sourceDb = null
-  diag(`  source has ${sourceRows.length} cookies`)
-  if (sourceRows.length === 0) {
-    closeStagingDb()
-    discardStagingFile()
-    return { result: { ok: false, reason: `No cookies found in ${browser.label}.` } }
-  }
-
-  // Why (STA-4300): partition fidelity is a property of the source row, even when its value
-  // cannot be decrypted. Plan first so decryption failure cannot discard a family's skip.
-  const partitionCandidates = sourceRows.flatMap((sourceRow) => {
-    const domain = sourceRow.host_key as string
-    const name = sourceRow.name as string
-    return isGoogleSourceBoundCookie(name, domain) || isNonTransplantableCookieDomain(domain)
-      ? []
-      : [{ sourceRow, domain, partition: readChromiumRowPartition(sourceRow, sourceColumns) }]
-  })
-  const nativePlan = planImportWrites(partitionCandidates)
-  const plannedSourceRows = new Set(nativePlan.writes.map((candidate) => candidate.sourceRow))
-  const partitionBySourceRow = new Map(
-    partitionCandidates.map((candidate) => [candidate.sourceRow, candidate.partition])
-  )
-  // Why (§4.3c): a family we cannot name is one we cannot exclude from the clear, and clearing a
-  // family we cannot protect is the P0. Refuse before the jar is touched.
-  if (nativePlan.hasUnrepresentableSkip) {
-    closeStagingDb()
-    discardStagingFile()
-    return {
-      result: {
-        ok: false,
-        reason:
-          'Could not import: a cookie with an unreadable site partition has no registrable domain, so its existing session cannot be protected.'
-      }
+    const sourceRows = sourceDb.prepare('SELECT * FROM cookies ORDER BY rowid').all() as Record<
+      string,
+      unknown
+    >[]
+    sourceDb.close()
+    sourceDb = null
+    diag(`  source has ${sourceRows.length} cookies`)
+    if (sourceRows.length === 0) {
+      return { result: { ok: false, reason: `No cookies found in ${browser.label}.` } }
     }
-  }
 
-  const needsSourceKey = sourceRows.some((sourceRow) => {
-    const encrypted = sourceRow.encrypted_value
-    if (!(encrypted instanceof Uint8Array) || encrypted.length === 0) {
-      return false
-    }
-    return (
-      !isGoogleSourceBoundCookie(sourceRow.name as string, sourceRow.host_key as string) &&
-      !isNonTransplantableCookieDomain(sourceRow.host_key as string)
+    // Why (STA-4300): partition fidelity is a property of the source row, even when its value
+    // cannot be decrypted. Plan first so decryption failure cannot discard a family's skip.
+    const partitionCandidates = sourceRows.flatMap((sourceRow) => {
+      const domain = sourceRow.host_key as string
+      const name = sourceRow.name as string
+      return isGoogleSourceBoundCookie(name, domain) || isNonTransplantableCookieDomain(domain)
+        ? []
+        : [{ sourceRow, domain, partition: readChromiumRowPartition(sourceRow, sourceColumns) }]
+    })
+    const nativePlan = planImportWrites(partitionCandidates)
+    const plannedSourceRows = new Set(nativePlan.writes.map((candidate) => candidate.sourceRow))
+    const partitionBySourceRow = new Map(
+      partitionCandidates.map((candidate) => [candidate.sourceRow, candidate.partition])
     )
-  })
-  const sourceKey = needsSourceKey
-    ? getEncryptionKey(browser.keychainService!, browser.keychainAccount!, browser)
-    : null
-  if (needsSourceKey && !sourceKey) {
-    closeStagingDb()
-    // Why: key denial happens after staging, so clean up the target DB copy or retries pile up.
-    discardStagingFile()
-    return {
-      result: {
-        ok: false,
-        reason: `Could not access ${browser.label} encryption key. The OS may have denied access.`
+    // Why (§4.3c): a family we cannot name is one we cannot exclude from the clear, and clearing a
+    // family we cannot protect is the P0. Refuse before the jar is touched.
+    if (nativePlan.hasUnrepresentableSkip) {
+      return {
+        result: {
+          ok: false,
+          reason:
+            'Could not import: a cookie with an unreadable site partition has no registrable domain, so its existing session cannot be protected.'
+        }
       }
     }
-  }
 
-  // Why: staging only backs the cold-restart replay, so any failure writing it disables that
-  // fallback instead of aborting an import whose in-memory half still works.
-  let insertStmt: ChromiumImportContext['insertStmt'] = null
-  const context: ChromiumImportContext = {
-    browser,
-    targetPartition,
-    options,
-    targetSession,
-    stagingCookiesPath,
-    stagingAvailable,
-    sourceSnapshot,
-    sourceDb,
-    stagingDb,
-    targetColumnInfo,
-    colList,
-    placeholders,
-    sourceColumns,
-    sourceRows,
-    nativePlan,
-    plannedSourceRows,
-    partitionBySourceRow,
-    sourceKey,
-    imported: 0,
-    skipped: 0,
-    decryptFailed: 0,
-    appBoundFailed: 0,
-    keyringUnavailableFailed: 0,
-    integritySkipped: 0,
-    nonTransplantableSkipped: 0,
-    partitionSkipped: nativePlan.skips.length,
-    googleCookiesSkipped: 0,
-    memoryLoaded: 0,
-    memoryFailed: 0,
-    domainSet: new Set<string>(),
-    decryptedCookies: [],
-    // Why: the staging insert needs the RAW source row, so each scanned candidate carries it.
-    // A plan record holding only the derived fields compiles fine and then cannot stage.
-    scanned: [],
-    sourceDomainValidity: new Map<string, boolean>(),
-    insertStmt,
-    importScope: {
-      exact: new Set<string>(),
-      ancestors: new Set<string>(),
-      descendantRoots: new Set<string>()
-    },
-    closeStagingDb,
-    discardStagingFile,
-    disableStaging: (reason: string): void => {
-      diag(`  staging disabled, restart fallback unavailable: ${reason}`)
-      context.stagingAvailable = false
-      context.insertStmt = null
-      context.closeStagingDb()
-      context.discardStagingFile()
+    const needsSourceKey = sourceRows.some((sourceRow) => {
+      const encrypted = sourceRow.encrypted_value
+      if (!(encrypted instanceof Uint8Array) || encrypted.length === 0) {
+        return false
+      }
+      return (
+        !isGoogleSourceBoundCookie(sourceRow.name as string, sourceRow.host_key as string) &&
+        !isNonTransplantableCookieDomain(sourceRow.host_key as string)
+      )
+    })
+    const sourceKey = needsSourceKey
+      ? getEncryptionKey(browser.keychainService!, browser.keychainAccount!, browser)
+      : null
+    if (needsSourceKey && !sourceKey) {
+      return {
+        result: {
+          ok: false,
+          reason: `Could not access ${browser.label} encryption key. The OS may have denied access.`
+        }
+      }
     }
-  } satisfies ChromiumImportContext
 
-  if (context.stagingDb && context.colList && context.placeholders) {
-    try {
-      context.insertStmt = context.stagingDb.prepare(
-        `INSERT OR REPLACE INTO cookies (${context.colList}) VALUES (${context.placeholders})`
+    // Why: staging only backs the cold-restart replay, so any failure writing it disables that
+    // fallback instead of aborting an import whose in-memory half still works.
+    let insertStmt: ChromiumImportContext['insertStmt'] = null
+    const context: ChromiumImportContext = {
+      browser,
+      targetPartition,
+      options,
+      targetSession,
+      stagingCookiesPath,
+      stagingAvailable,
+      sourceSnapshot,
+      sourceDb,
+      stagingDb,
+      targetColumnInfo,
+      colList,
+      placeholders,
+      sourceColumns,
+      sourceRows,
+      nativePlan,
+      plannedSourceRows,
+      partitionBySourceRow,
+      sourceKey,
+      imported: 0,
+      skipped: 0,
+      decryptFailed: 0,
+      appBoundFailed: 0,
+      keyringUnavailableFailed: 0,
+      integritySkipped: 0,
+      nonTransplantableSkipped: 0,
+      partitionSkipped: nativePlan.skips.length,
+      googleCookiesSkipped: 0,
+      memoryLoaded: 0,
+      memoryFailed: 0,
+      domainSet: new Set<string>(),
+      decryptedCookies: [],
+      // Why: the staging insert needs the RAW source row, so each scanned candidate carries it.
+      // A plan record holding only the derived fields compiles fine and then cannot stage.
+      scanned: [],
+      sourceDomainValidity: new Map<string, boolean>(),
+      insertStmt,
+      importScope: {
+        exact: new Set<string>(),
+        ancestors: new Set<string>(),
+        descendantRoots: new Set<string>()
+      },
+      closeStagingDb,
+      discardStagingFile,
+      disableStaging: (reason: string): void => {
+        diag(`  staging disabled, restart fallback unavailable: ${reason}`)
+        context.stagingAvailable = false
+        context.insertStmt = null
+        context.closeStagingDb()
+        context.discardStagingFile()
+      }
+    } satisfies ChromiumImportContext
+
+    if (context.stagingDb && context.colList && context.placeholders) {
+      try {
+        context.insertStmt = context.stagingDb.prepare(
+          `INSERT OR REPLACE INTO cookies (${context.colList}) VALUES (${context.placeholders})`
+        )
+        context.stagingDb.exec('BEGIN TRANSACTION')
+      } catch (err) {
+        context.disableStaging(String(err))
+      }
+    } else if (context.stagingAvailable) {
+      context.disableStaging('staged database exposed no cookies columns')
+    }
+    // Why: keep the existing conservative fallback boundary for family-level omissions. Expanding
+    // partial-import restart behavior is separate from narrowing what a staged replay may replace.
+    if (context.nativePlan.skippedFamilies.size > 0) {
+      context.disableStaging(
+        `${context.nativePlan.skippedFamilies.size} preserved cookie families cannot be represented in a staged image`
       )
-      context.stagingDb.exec('BEGIN TRANSACTION')
-    } catch (err) {
-      context.disableStaging(String(err))
     }
-  } else if (context.stagingAvailable) {
-    context.disableStaging('staged database exposed no cookies columns')
-  }
-  // Why: keep the existing conservative fallback boundary for family-level omissions. Expanding
-  // partial-import restart behavior is separate from narrowing what a staged replay may replace.
-  if (context.nativePlan.skippedFamilies.size > 0) {
-    context.disableStaging(
-      `${context.nativePlan.skippedFamilies.size} preserved cookie families cannot be represented in a staged image`
-    )
+    // Why: the importer owns successful preparation, including any restart fallback.
+    ownershipTransferred = true
+    return { context }
+  } finally {
+    if (!ownershipTransferred) {
+      try {
+        sourceDb?.close()
+      } catch {
+        /* best-effort */
+      }
+      closeStagingDb()
+      discardStagingFile()
+      try {
+        sourceSnapshot.cleanup()
+      } catch (err) {
+        diag(`  Chromium snapshot cleanup failed: ${String(err)}`)
+      }
+    }
   }
-  return { context }
 }
diff --git a/src/main/browser/browser-cookie-import-snapshot-ownership.test.ts b/src/main/browser/browser-cookie-import-snapshot-ownership.test.ts
new file mode 100644
index 000000000000..c704ae8c9ad0
--- /dev/null
+++ b/src/main/browser/browser-cookie-import-snapshot-ownership.test.ts
@@ -0,0 +1,281 @@
+import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest'
+import type * as NodeSqlite from 'node:sqlite'
+import type * as ChromiumCookieSnapshotModule from './chromium-cookie-snapshot'
+import type { DetectedBrowser } from './browser-cookie-detection-types'
+import { existsSync, mkdtempSync, readdirSync, readFileSync, rmSync } from 'node:fs'
+import { basename, dirname, join } from 'node:path'
+import { tmpdir } from 'node:os'
+
+const {
+  appGetPathMock,
+  sessionFromPartitionMock,
+  runProcessSyncMock,
+  snapshotRootMock,
+  setPendingCookieImportMock,
+  clearPendingCookieImportMock,
+  writeCookieIdentityMock,
+  openedDatabases,
+  cleanupStates
+} = vi.hoisted(() => {
+  const openedDatabases: { path: string; database: NodeSqlite.DatabaseSync }[] = []
+  const cleanupStates: boolean[][] = []
+  return {
+    appGetPathMock: vi.fn(),
+    sessionFromPartitionMock: vi.fn(),
+    runProcessSyncMock: vi.fn(),
+    snapshotRootMock: vi.fn(),
+    setPendingCookieImportMock: vi.fn(),
+    clearPendingCookieImportMock: vi.fn(),
+    writeCookieIdentityMock: vi.fn(),
+    openedDatabases,
+    cleanupStates
+  }
+})
+
+vi.mock('electron', () => ({
+  app: { getPath: appGetPathMock },
+  session: { fromPartition: sessionFromPartitionMock }
+}))
+vi.mock('../../shared/child-process/run-process', () => ({
+  runProcessSync: runProcessSyncMock
+}))
+vi.mock('./browser-session-registry', () => ({
+  browserSessionRegistry: {
+    setPendingCookieImport: setPendingCookieImportMock,
+    clearPendingCookieImport: clearPendingCookieImportMock
+  }
+}))
+vi.mock('node:sqlite', async (importOriginal) => {
+  const actual = await importOriginal<typeof NodeSqlite>()
+  return {
+    ...actual,
+    DatabaseSync: class extends actual.DatabaseSync {
+      constructor(...args: ConstructorParameters<typeof actual.DatabaseSync>) {
+        super(...args)
+        openedDatabases.push({ path: String(args[0]), database: this })
+      }
+    }
+  }
+})
+vi.mock('./chromium-cookie-snapshot', async (importOriginal) => {
+  const actual = await importOriginal<typeof ChromiumCookieSnapshotModule>()
+  return {
+    ...actual,
+    createChromiumCookieSnapshot: (sourcePath: string) => {
+      const snapshot = actual.createChromiumCookieSnapshot(sourcePath, {
+        tempRoot: snapshotRootMock()
+      })
+      return {
+        ...snapshot,
+        cleanup: () => {
+          cleanupStates.push(
+            openedDatabases
+              .filter(
+                ({ path }) =>
+                  path === snapshot.databasePath || path.includes('cookie-import-staging')
+              )
+              .map(({ database }) => database.isOpen)
+          )
+          snapshot.cleanup()
+        }
+      }
+    }
+  }
+})
+vi.mock('./browser-cookie-clear-store', () => ({
+  openCookieClearStore: (targetSession: {
+    cookies: { get: () => Promise<unknown>; remove: (url: string, name: string) => Promise<void> }
+  }) => ({
+    get: () => targetSession.cookies.get(),
+    remove: (url: string, name: string) => targetSession.cookies.remove(url, name),
+    snapshotClearIdentities: async () => [],
+    restoreClearIdentities: async () => undefined,
+    writeCookieIdentity: writeCookieIdentityMock,
+    dispose: () => undefined
+  })
+}))
+
+import { importChromiumCookies } from './browser-cookie-chromium-import'
+import { createChromiumCookieTestDatabase } from './browser-cookie-import-test-database'
+import { DatabaseSync } from 'node:sqlite'
+
+const PARTITION = 'persist:test'
+
+function chromeBrowser(cookiesPath: string): DetectedBrowser {
+  return {
+    family: 'chrome',
+    label: 'Google Chrome',
+    cookiesPath,
+    keychainService: 'Chrome Safe Storage',
+    keychainAccount: 'Chrome',
+    profiles: [{ name: 'Default', directory: 'Default' }],
+    selectedProfile: 'Default'
+  }
+}
+
+describe('Chromium import snapshot ownership', () => {
+  let root: string
+  let sourcePath: string
+  let targetPath: string
+  let snapshotRoot: string
+  let stagingRoot: string
+  let sourceDatabase: NodeSqlite.DatabaseSync
+  let targetBefore: Buffer
+  let cookiesRemoveMock: ReturnType<typeof vi.fn>
+  let platformSpy: ReturnType<typeof vi.spyOn>
+
+  beforeEach(() => {
+    root = mkdtempSync(join(tmpdir(), 'orca-cookie-snapshot-owner-test-'))
+    snapshotRoot = root
+    sourcePath = join(root, 'Chrome', 'Default', 'Network', 'Cookies')
+    targetPath = join(root, 'userData', 'Partitions', 'test', 'Network', 'Cookies')
+    stagingRoot = join(root, 'userData', 'cookie-import-staging')
+    sourceDatabase = createChromiumCookieTestDatabase(sourcePath, [], { journalMode: 'wal' })
+    createChromiumCookieTestDatabase(targetPath, [
+      { domain: '.other.test', name: 'old', value: 'target' }
+    ]).close()
+    targetBefore = readFileSync(targetPath)
+    cookiesRemoveMock = vi.fn().mockResolvedValue(undefined)
+    appGetPathMock.mockReturnValue(join(root, 'userData'))
+    snapshotRootMock.mockReturnValue(snapshotRoot)
+    sessionFromPartitionMock.mockReturnValue({
+      getStoragePath: () => dirname(dirname(targetPath)),
+      cookies: {
+        flushStore: vi.fn().mockResolvedValue(undefined),
+        get: vi.fn().mockResolvedValue([]),
+        remove: cookiesRemoveMock,
+        set: vi.fn().mockRejectedValue(new Error('Unexpected target initialization'))
+      }
+    })
+    runProcessSyncMock.mockReturnValue({
+      code: 1,
+      signal: null,
+      stdout: '',
+      stderr: '',
+      timedOut: false
+    })
+    writeCookieIdentityMock.mockResolvedValue(undefined)
+    platformSpy = vi.spyOn(process, 'platform', 'get').mockReturnValue('darwin')
+    cleanupStates.length = 0
+  })
+
+  afterEach(() => {
+    for (const { database } of openedDatabases) {
+      if (database.isOpen) {
+        database.close()
+      }
+    }
+    openedDatabases.length = 0
+    platformSpy.mockRestore()
+    vi.clearAllMocks()
+    rmSync(root, { recursive: true, force: true })
+  })
+
+  function snapshotDirectories() {
+    return readdirSync(snapshotRoot).filter((name) => name.startsWith('orca-cookie-import-'))
+  }
+
+  function expectRefusalCleanup() {
+    expect(snapshotDirectories()).toEqual([])
+    expect(readdirSync(stagingRoot)).toEqual([])
+    expect(readFileSync(targetPath)).toEqual(targetBefore)
+    expect(writeCookieIdentityMock).not.toHaveBeenCalled()
+    expect(cookiesRemoveMock).not.toHaveBeenCalled()
+    expect(setPendingCookieImportMock).not.toHaveBeenCalled()
+    expect(cleanupStates.every((states) => states.every((open) => !open))).toBe(true)
+  }
+
+  function insertSourceCookie(encrypted: boolean) {
+    sourceDatabase.exec(`INSERT INTO cookies (
+      creation_utc, host_key, name, value, encrypted_value, path, expires_utc,
+      is_secure, is_httponly, samesite
+    ) VALUES (133000000000000, '.example.test', 'sid',
+      ${encrypted ? "''" : "'source-value'"},
+      ${encrypted ? "X'763130656E63727970746564'" : "X''"}, '/', 0, 0, 0, -1)`)
+  }
+
+  it('retires an empty live-WAL source snapshot before returning its existing refusal', async () => {
+    expect(existsSync(`${sourcePath}-wal`)).toBe(true)
+    expect(await importChromiumCookies(chromeBrowser(sourcePath), PARTITION)).toEqual({
+      ok: false,
+      reason: 'No cookies found in Google Chrome.'
+    })
+    expect(cleanupStates).toHaveLength(1)
+    expectRefusalCleanup()
+  })
+
+  it('retires every snapshot when denied credential access is retried', async () => {
+    insertSourceCookie(true)
+    for (let attempt = 0; attempt < 3; attempt++) {
+      expect(await importChromiumCookies(chromeBrowser(sourcePath), PARTITION)).toEqual({
+        ok: false,
+        reason: 'Could not access Google Chrome encryption key. The OS may have denied access.'
+      })
+      expectRefusalCleanup()
+    }
+    expect(runProcessSyncMock).toHaveBeenCalledTimes(3)
+    expect(cleanupStates).toHaveLength(3)
+  })
+
+  it('retires the snapshot when an unreadable partition has no preservable family', async () => {
+    insertSourceCookie(false)
+    sourceDatabase.exec(
+      "UPDATE cookies SET host_key = 'com', top_frame_site_key = 'https://top.test', has_cross_site_ancestor = 2"
+    )
+    expect(await importChromiumCookies(chromeBrowser(sourcePath), PARTITION)).toEqual({
+      ok: false,
+      reason:
+        'Could not import: a cookie with an unreadable site partition has no registrable domain, so its existing session cannot be protected.'
+    })
+    expect(cleanupStates).toHaveLength(1)
+    expectRefusalCleanup()
+  })
+
+  it('closes private databases before cleanup when source schema preparation throws', async () => {
+    sourceDatabase.exec('DROP TABLE cookies; CREATE TABLE other_data(value TEXT)')
+    expect(await importChromiumCookies(chromeBrowser(sourcePath), PARTITION)).toEqual({
+      ok: false,
+      reason: expect.stringContaining('no such table: cookies')
+    })
+    expect(cleanupStates).toHaveLength(1)
+    expect(cleanupStates[0].length).toBeGreaterThanOrEqual(2)
+    expectRefusalCleanup()
+  })
+
+  it('hands successful preparation to the importer for ordinary completion cleanup', async () => {
+    insertSourceCookie(false)
+    const result = await importChromiumCookies(chromeBrowser(sourcePath), PARTITION)
+    expect(result).toMatchObject({ ok: true, summary: { totalCookies: 1, importedCookies: 1 } })
+    expect(writeCookieIdentityMock).toHaveBeenCalledWith(
+      expect.objectContaining({ name: 'sid', value: 'source-value' })
+    )
+    expect(snapshotDirectories()).toEqual([])
+    expect(readdirSync(stagingRoot)).toEqual([])
+    expect(cleanupStates).toEqual([[false, false]])
+  })
+
+  it('removes the source snapshot while preserving a usable stage owned by restart replay', async () => {
+    insertSourceCookie(false)
+    writeCookieIdentityMock.mockRejectedValue(new Error('Cookie rejected'))
+    expect(await importChromiumCookies(chromeBrowser(sourcePath), PARTITION)).toMatchObject({
+      ok: true
+    })
+    expect(snapshotDirectories()).toEqual([])
+    expect(cleanupStates).toEqual([[false, false]])
+    expect(setPendingCookieImportMock).toHaveBeenCalledTimes(1)
+    const stagedPath: unknown = setPendingCookieImportMock.mock.calls[0][1]
+    if (typeof stagedPath !== 'string') {
+      throw new Error('No staged replay path')
+    }
+    expect(readdirSync(stagingRoot)).toEqual([basename(stagedPath)])
+    const stage = new DatabaseSync(stagedPath, { readOnly: true })
+    try {
+      const row = stage
+        .prepare("SELECT CAST(value AS TEXT) AS value FROM cookies WHERE name = 'sid'")
+        .get()
+      expect(row).toEqual({ value: 'source-value' })
+    } finally {
+      stage.close()
+    }
+  })
+})
diff --git a/src/main/browser/browser-screencast-first-frame-timeout.test.ts b/src/main/browser/browser-screencast-first-frame-timeout.test.ts
new file mode 100644
index 000000000000..63e92e0de27b
--- /dev/null
+++ b/src/main/browser/browser-screencast-first-frame-timeout.test.ts
@@ -0,0 +1,120 @@
+/**
+ * A hidden, throttled embedder stops compositing: capturePage never settles and no live frame
+ * comes. The stream says so once, 10 s after it started, and only if no frame arrived by then.
+ */
+import { Buffer } from 'node:buffer'
+import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest'
+import { startBrowserScreencast } from './browser-screencast-stream'
+import type { BrowserScreencastOptions } from './browser-screencast-stream-types'
+import { createMockScreencastWebContents } from './browser-screencast-web-contents-test-double'
+
+function never<T>(): Promise<T> {
+  return new Promise<T>(() => {})
+}
+
+function start(
+  webContents: ReturnType<typeof createMockScreencastWebContents>,
+  options: BrowserScreencastOptions
+) {
+  // oxlint-disable-next-line typescript/consistent-type-assertions -- SAFETY: the stream touches only the debugger, isDestroyed and capturePage the doubles provide.
+  return startBrowserScreencast(webContents as never, options)
+}
+
+function liveFrame(webContents: ReturnType<typeof createMockScreencastWebContents>): void {
+  webContents.debugger.emit('message', {}, 'Page.screencastFrame', {
+    data: Buffer.from('live').toString('base64'),
+    sessionId: 1,
+    metadata: { deviceWidth: 390, deviceHeight: 844, pageScaleFactor: 1 }
+  })
+}
+
+function startOptions(viewport: boolean) {
+  return {
+    format: 'jpeg' as const,
+    quality: 70,
+    maxWidth: 1440,
+    maxHeight: 1200,
+    everyNthFrame: 2,
+    minFrameIntervalMs: 0,
+    ...(viewport ? { viewportWidth: 390, viewportHeight: 844 } : {}),
+    onFrame: vi.fn(() => true),
+    onError: vi.fn()
+  }
+}
+
+describe('browser screencast first-frame deadline', () => {
+  beforeEach(() => {
+    vi.useFakeTimers()
+  })
+  afterEach(() => {
+    vi.useRealTimers()
+  })
+
+  it('reports no frame at exactly 10 s when the captures hang', async () => {
+    const webContents = Object.assign(createMockScreencastWebContents(), {
+      capturePage: vi.fn(() => never())
+    })
+    webContents.debugger.sendCommand.mockImplementation(async (method: string) =>
+      method === 'Page.captureScreenshot' ? never() : {}
+    )
+    const options = startOptions(true)
+    const session = await start(webContents, options)
+
+    await vi.advanceTimersByTimeAsync(9_999)
+    expect(options.onError).not.toHaveBeenCalled()
+    await vi.advanceTimersByTimeAsync(1)
+
+    expect(options.onError).toHaveBeenCalledExactlyOnceWith('Browser stream timed out.')
+    session.stop()
+    // The stop queues behind the capture: capturePage's 10 s bound, then the fallback's 8 s.
+    await vi.advanceTimersByTimeAsync(8_000)
+    await session.done
+  })
+
+  it.each(['live', 'snapshot'] as const)('stays quiet once a %s frame arrives', async (kind) => {
+    const webContents = Object.assign(createMockScreencastWebContents(), {
+      capturePage: vi.fn(() => never())
+    })
+    webContents.debugger.sendCommand.mockImplementation(async (method: string) =>
+      method === 'Page.captureScreenshot' ? { data: Buffer.from('frame').toString('base64') } : {}
+    )
+    const options = startOptions(kind === 'live')
+    const session = await start(webContents, options)
+    if (kind === 'live') {
+      liveFrame(webContents)
+    }
+
+    await vi.advanceTimersByTimeAsync(30_000)
+
+    expect(options.onFrame).toHaveBeenCalled()
+    expect(options.onError).not.toHaveBeenCalled()
+    session.stop()
+    await session.done
+  })
+
+  it('drops a capture that settles after the limit', async () => {
+    let settleCapture!: (image: unknown) => void
+    const webContents = Object.assign(createMockScreencastWebContents(), {
+      capturePage: vi.fn(
+        () =>
+          new Promise((resolve) => {
+            settleCapture = resolve
+          })
+      )
+    })
+    const options = startOptions(true)
+    const session = await start(webContents, options)
+    await vi.advanceTimersByTimeAsync(10_000)
+
+    settleCapture({
+      getSize: () => ({ width: 390, height: 844 }),
+      toJPEG: () => Buffer.from('late'),
+      toPNG: () => Buffer.from('late')
+    })
+    await vi.advanceTimersByTimeAsync(1_000)
+
+    expect(options.onFrame).not.toHaveBeenCalled()
+    session.stop()
+    await session.done
+  })
+})
diff --git a/src/main/browser/browser-screencast-snapshot-capture.ts b/src/main/browser/browser-screencast-snapshot-capture.ts
index b06ce8bb5cf3..70c4d4449832 100644
--- a/src/main/browser/browser-screencast-snapshot-capture.ts
+++ b/src/main/browser/browser-screencast-snapshot-capture.ts
@@ -7,6 +7,10 @@ import type {
   PendingScreencastFrame
 } from './browser-screencast-stream-types'
 import { positiveInteger, scaleSnapshotToFit } from './browser-screencast-viewport-fit'
+import { withTimeout } from '../../shared/promise-timeout-fallback'
+
+// Why: a hung capture would also wedge the viewport updates and stop queued behind it.
+const SNAPSHOT_CAPTURE_TIMEOUT_MS = 10_000
 
 type BrowserScreencastSnapshotCaptureDeps = {
   webContents: WebContents
@@ -76,19 +80,19 @@ export function createBrowserScreencastSnapshotCapture(
       }
       if (viewportWidth && viewportHeight && typeof webContents.capturePage === 'function') {
         try {
-          // Why: CDP captureScreenshot can tile BrowserView surfaces under
-          // mobile emulation; Electron captures the actual visible viewport.
-          const nativeImage = await webContents.capturePage({
-            x: 0,
-            y: 0,
-            width: viewportWidth,
-            height: viewportHeight
-          })
-          const capture = scaleSnapshotToFit(nativeImage, options)
-          const buffer =
-            options.format === 'png' ? capture.toPNG() : capture.toJPEG(options.quality)
-          if (buffer.byteLength > 0) {
-            image = new Uint8Array(buffer)
+          // Why: captures the real viewport (CDP can tile it) but never settles once compositing stops.
+          const nativeImage = await withTimeout(
+            webContents.capturePage({ x: 0, y: 0, width: viewportWidth, height: viewportHeight }),
+            SNAPSHOT_CAPTURE_TIMEOUT_MS,
+            null
+          )
+          if (nativeImage) {
+            const capture = scaleSnapshotToFit(nativeImage, options)
+            const buffer =
+              options.format === 'png' ? capture.toPNG() : capture.toJPEG(options.quality)
+            if (buffer.byteLength > 0) {
+              image = new Uint8Array(buffer)
+            }
           }
         } catch {
           image = null
diff --git a/src/main/browser/browser-screencast-stream.ts b/src/main/browser/browser-screencast-stream.ts
index 237c94852e88..6456f4e3102d 100644
--- a/src/main/browser/browser-screencast-stream.ts
+++ b/src/main/browser/browser-screencast-stream.ts
@@ -13,6 +13,9 @@ import type {
   BrowserScreencastViewport
 } from './browser-screencast-stream-types'
 
+// Why: long enough for a slow first paint, short enough that a frameless viewer is told soon.
+const NO_FRAME_TIMEOUT_MS = 10_000
+
 export async function startBrowserScreencast(
   webContents: WebContents,
   options: BrowserScreencastOptions
@@ -108,8 +111,9 @@ export async function startBrowserScreencast(
   }
 
   const handleDetach = (): void => {
-    options.onError?.('Browser debugger detached while streaming.')
+    // Why: finish first so an owner that stops the stream on this error finds it already closed.
     finish()
+    options.onError?.('Browser debugger detached while streaming.')
   }
 
   dbg.on('message', handleMessage as never)
@@ -120,6 +124,13 @@ export async function startBrowserScreencast(
     await deviceMetrics.apply()
     await startScreencast()
     pendingUpdate = snapshotCapture.emitSnapshotFrame(true)
+    // Why: a page whose embedder stopped compositing never yields a frame; the owner ends on this.
+    const noFrameTimer = setTimeout(() => {
+      if (!closed && !stopping && framePacer.getSeq() === 0) {
+        options.onError?.('Browser stream timed out.')
+      }
+    }, NO_FRAME_TIMEOUT_MS)
+    void done.then(() => clearTimeout(noFrameTimer))
   } catch (error) {
     if (deviceMetrics.isOverridden()) {
       await deviceMetrics.clear().catch(() => {})
@@ -188,7 +199,7 @@ export async function startBrowserScreencast(
       return pendingUpdate
     },
     stop: () => {
-      if (closed) {
+      if (closed || stopping) {
         return
       }
       stopping = true
diff --git a/src/main/claude-accounts/claude-account-folder.test.ts b/src/main/claude-accounts/claude-account-folder.test.ts
new file mode 100644
index 000000000000..5374afed213a
--- /dev/null
+++ b/src/main/claude-accounts/claude-account-folder.test.ts
@@ -0,0 +1,106 @@
+import { existsSync, mkdirSync, mkdtempSync, rmSync, symlinkSync, writeFileSync } from 'node:fs'
+import { tmpdir } from 'node:os'
+import { join } from 'node:path'
+import { afterEach, describe, expect, it, vi } from 'vitest'
+import type * as Os from 'node:os'
+
+const keychain = vi.hoisted(() => ({ items: new Map<string, number>(), userHome: '' }))
+vi.mock('node:os', async (original) => ({
+  ...(await original<typeof Os>()),
+  homedir: () => keychain.userHome
+}))
+vi.mock('../macos-keychain/generic-password', () => ({
+  execSecurityCommand: async (args: string[]) => {
+    const service = args[2]
+    const count = keychain.items.get(service) ?? 0
+    if (count === 0) {
+      throw new Error('The specified item could not be found in the keychain.')
+    }
+    keychain.items.set(service, count - 1)
+    return { stdout: '', stderr: '' }
+  }
+}))
+
+import { readClaudeFolderLogin, removeClaudeAccountFolder } from './claude-account-folder'
+import { claudeKeychainService } from './keychain'
+
+const roots: string[] = []
+afterEach(() => {
+  keychain.items.clear()
+  roots.splice(0).forEach((root) => rmSync(root, { recursive: true, force: true }))
+})
+
+function fixture() {
+  const root = mkdtempSync(join(tmpdir(), 'claude-account-folder-'))
+  roots.push(root)
+  keychain.userHome = root
+  const dataRoot = join(root, 'data')
+  const home = join(dataRoot, 'claude-profiles', 'a', 'home')
+  mkdirSync(home, { recursive: true })
+  return { root, dataRoot, home }
+}
+
+describe('claude account folder', () => {
+  it("reads the folder's login and treats a signed-out state file as no login", () => {
+    const { home } = fixture()
+    const stateFile = join(home, '.claude.json')
+    expect(readClaudeFolderLogin(stateFile)).toBeNull()
+    writeFileSync(stateFile, JSON.stringify({ oauthAccount: { emailAddress: ' a@example.test ' } }))
+    expect(readClaudeFolderLogin(stateFile)).toEqual({
+      email: 'a@example.test',
+      organizationUuid: null,
+      organizationName: null
+    })
+    writeFileSync(stateFile, JSON.stringify({ numStartups: 2 }))
+    expect(readClaudeFolderLogin(stateFile)).toBeNull()
+  })
+
+  it('reuses a recent answer within maxAgeMs even though the file changed', () => {
+    const { home } = fixture()
+    const stateFile = join(home, '.claude.json')
+    writeFileSync(stateFile, JSON.stringify({ oauthAccount: { emailAddress: 'a@example.test' } }))
+    expect(readClaudeFolderLogin(stateFile, 5_000)?.email).toBe('a@example.test')
+    writeFileSync(stateFile, JSON.stringify({ oauthAccount: { emailAddress: 'b@example.test!' } }))
+    expect(readClaudeFolderLogin(stateFile, 5_000)?.email).toBe('a@example.test')
+    expect(readClaudeFolderLogin(stateFile)?.email).toBe('b@example.test!')
+  })
+
+  // A real symlink needs Developer Mode on Windows (EPERM otherwise).
+  it.skipIf(process.platform === 'win32')(
+    'unlinks shared history before deleting, and leaves the older layout alone',
+    async () => {
+      const { root, dataRoot, home } = fixture()
+      const history = join(root, '.claude', 'projects')
+      mkdirSync(history, { recursive: true })
+      writeFileSync(join(history, 'chat.jsonl'), '{}')
+      symlinkSync(history, join(home, 'projects'))
+      const older = join(dataRoot, 'claude-accounts', 'a')
+      mkdirSync(older, { recursive: true })
+
+      await removeClaudeAccountFolder(dataRoot, 'a')
+      expect(existsSync(join(dataRoot, 'claude-profiles', 'a'))).toBe(false)
+      expect(existsSync(join(history, 'chat.jsonl'))).toBe(true)
+      expect(existsSync(older)).toBe(true)
+    }
+  )
+
+  it.skipIf(process.platform !== 'darwin')(
+    'deletes every Keychain item Claude may have keyed to the folder',
+    async () => {
+      const { dataRoot, home } = fixture()
+      const rest = home.slice(keychain.userHome.length)
+      const spellings = [home, `${home}/`, `~${rest}`, `$HOME${rest}/`]
+      for (const spelling of spellings) {
+        keychain.items.set(claudeKeychainService(spelling), 2)
+      }
+      const unrelated = claudeKeychainService(join(keychain.userHome, 'other'))
+      keychain.items.set(unrelated, 1)
+
+      await removeClaudeAccountFolder(dataRoot, 'a')
+      for (const spelling of spellings) {
+        expect(keychain.items.get(claudeKeychainService(spelling))).toBe(0)
+      }
+      expect(keychain.items.get(unrelated)).toBe(1)
+    }
+  )
+})
diff --git a/src/main/claude-accounts/claude-account-folder.ts b/src/main/claude-accounts/claude-account-folder.ts
new file mode 100644
index 000000000000..7e4bfe8e3efd
--- /dev/null
+++ b/src/main/claude-accounts/claude-account-folder.ts
@@ -0,0 +1,153 @@
+import {
+  existsSync,
+  lstatSync,
+  readdirSync,
+  rmdirSync,
+  rmSync,
+  statSync,
+  unlinkSync
+} from 'node:fs'
+import { homedir } from 'node:os'
+import { dirname, join } from 'node:path'
+import { z } from 'zod'
+import { resolveClaudeGlobalConfigFile } from '../claude/claude-folder-trust-file'
+import { execSecurityCommand } from '../macos-keychain/generic-password'
+import { describeClaudeProfile, readClaudeProfileObject } from './claude-profile-paths'
+import { claudeConfigDirSpellings, claudeKeychainService } from './keychain'
+
+export type ClaudeFolderLogin = {
+  email: string
+  organizationUuid: string | null
+  organizationName: string | null
+}
+
+const text = z
+  .string()
+  .transform((value) => value.trim() || null)
+  .nullish()
+  .catch(null)
+const oauthAccount = z.object({
+  emailAddress: text,
+  organizationUuid: text,
+  organizationName: text
+})
+
+/** Claude's state file for a config folder; undefined is `~/.claude`, whose file sits in home. */
+export function claudeStateFile(configDir: string | undefined, userHome = homedir()): string {
+  return resolveClaudeGlobalConfigFile({
+    env: { CLAUDE_CONFIG_DIR: configDir },
+    homeDir: userHome,
+    style: process.platform === 'win32' ? 'win32' : 'posix',
+    exists: existsSync
+  })
+}
+
+// Why memoized: a state file grows with history and the account list is read on every refresh.
+const logins = new Map<
+  string,
+  { mtimeMs: number; size: number; readAt: number; login: ClaudeFolderLogin | null }
+>()
+
+/** The login parsed Claude state names; null before Claude finishes a sign-in. */
+export function claudeStateLogin(state: Record<string, unknown>): ClaudeFolderLogin | null {
+  const parsed = oauthAccount.safeParse(state.oauthAccount)
+  const email = parsed.success ? parsed.data.emailAddress : null
+  return parsed.success && email
+    ? {
+        email,
+        organizationUuid: parsed.data.organizationUuid ?? null,
+        organizationName: parsed.data.organizationName ?? null
+      }
+    : null
+}
+
+/**
+ * The login a Claude state file names; null when signed out (superset U/profiles.ts:121-137).
+ * `maxAgeMs` reuses a recent answer without a stat, for a file Claude rewrites constantly.
+ */
+export function readClaudeFolderLogin(stateFile: string, maxAgeMs = 0): ClaudeFolderLogin | null {
+  const recent = logins.get(stateFile)
+  if (recent && Date.now() - recent.readAt < maxAgeMs) {
+    return recent.login
+  }
+  let stat: { mtimeMs: number; size: number }
+  try {
+    stat = statSync(stateFile)
+  } catch {
+    logins.delete(stateFile)
+    return null
+  }
+  if (recent?.mtimeMs === stat.mtimeMs && recent.size === stat.size) {
+    recent.readAt = Date.now()
+    return recent.login
+  }
+  const read = readClaudeProfileObject(stateFile)
+  const login = read.kind === 'present' ? claudeStateLogin(read.value) : null
+  logins.set(stateFile, { mtimeMs: stat.mtimeMs, size: stat.size, readAt: Date.now(), login })
+  return login
+}
+
+/**
+ * Deletes a host account's folder and, on macOS, the Keychain items Claude keyed to it
+ * (superset profile-remove.ts). Only `claude-profiles/<id>` is reachable from an id, so an
+ * older Orca's `claude-accounts/` folders are never touched.
+ */
+export async function removeClaudeAccountFolder(
+  dataRoot: string,
+  accountId: string
+): Promise<void> {
+  const { home } = describeClaudeProfile(dataRoot, accountId, {
+    executionHostId: 'local',
+    runtime: 'host'
+  })
+  if (process.platform === 'darwin') {
+    for (const spelling of claudeConfigDirSpellings(home, homedir())) {
+      // Why a loop: items are filed per Keychain account name, and each delete removes one.
+      for (let attempt = 0; attempt < 4; attempt += 1) {
+        const deleted = await execSecurityCommand([
+          'delete-generic-password',
+          '-s',
+          claudeKeychainService(spelling)
+        ]).then(
+          () => true,
+          () => false
+        )
+        if (!deleted) {
+          break
+        }
+      }
+    }
+  }
+  const folder = dirname(home)
+  unlinkLinks(folder)
+  rmSync(folder, { recursive: true, force: true })
+}
+
+// Why first: history is linked into ~/.claude, and a recursive delete that followed a Windows
+// junction would delete the user's own history.
+function unlinkLinks(dir: string): void {
+  let names: string[]
+  try {
+    names = readdirSync(dir)
+  } catch {
+    return
+  }
+  for (const name of names) {
+    const path = join(dir, name)
+    // Why no throw: an entry may vanish between the listing and the stat.
+    const stat = lstatSync(path, { throwIfNoEntry: false })
+    if (!stat) {
+      continue
+    }
+    if (stat.isSymbolicLink()) {
+      try {
+        unlinkSync(path)
+      } catch {
+        // A Windows directory link is removed as a directory.
+        rmdirSync(path)
+      }
+    } else if (stat.isDirectory()) {
+      unlinkLinks(path)
+    }
+  }
+}
diff --git a/src/main/claude-accounts/claude-account-registration.ts b/src/main/claude-accounts/claude-account-registration.ts
index bebc26be6804..13ec68d7dee8 100644
--- a/src/main/claude-accounts/claude-account-registration.ts
+++ b/src/main/claude-accounts/claude-account-registration.ts
@@ -1,250 +1,152 @@
 import { randomUUID } from 'node:crypto'
 import type {
-  ClaudeManagedAccount,
-  ClaudeRateLimitAccountsState
+  ClaudeAccountSignIn,
+  ClaudeRateLimitAccountsState,
+  ClaudeSignInRequest
 } from '../../shared/managed-account-types'
-import type { Store } from '../persistence'
-import type { RateLimitService } from '../rate-limits/service'
-import { findDuplicateClaudeAccount } from './claude-duplicate-account'
-import type { CapturedClaudeAuth } from './claude-auth-capture'
+import { claudeStateFile, readClaudeFolderLogin } from './claude-account-folder'
 import type {
-  ClaudeManagedAuthLocation,
-  ClaudeManagedAuthSnapshot,
-  ClaudeManagedAuthTarget
-} from './claude-managed-auth-storage'
-import type { ClaudeRuntimeAuthService } from './runtime-auth-service'
+  ClaudeAccountRuntime,
+  ClaudeAccountSelection,
+  ClaudeAccountStore,
+  ClaudeAccountUsage
+} from './claude-account-selection'
+import type { ClaudeCommandConfig } from './claude-command-process'
+import { findDuplicateClaudeAccount } from './claude-duplicate-account'
 import {
   getClaudeSelectionTargetForAccount,
-  normalizeClaudeRuntimeSelection
+  normalizeClaudeAccountSelectionTarget,
+  type ClaudeAccountSelectionTarget
 } from './runtime-selection'
-import type { ClaudeAccountSelection } from './claude-account-selection'
 
-type ClaudeAccountRegistrationDependencies = {
-  store: Store
-  rateLimits: RateLimitService
-  runtimeAuth: ClaudeRuntimeAuthService
-  selection: ClaudeAccountSelection
-  createManagedAuth: (
-    accountId: string,
-    target?: ClaudeManagedAuthTarget
-  ) => Promise<ClaudeManagedAuthLocation>
-  assertManagedAuth: (path: string, accountId: string) => Promise<string>
-  removeManagedAuth: (accountId: string, path: string) => Promise<void>
-  writeManagedAuth: (accountId: string, path: string, captured: CapturedClaudeAuth) => Promise<void>
-  writeCredentials: (accountId: string, path: string, value: string) => Promise<void>
-  writeOauth: (accountId: string, path: string, value: unknown) => Promise<void>
-  readSnapshot: (accountId: string, path: string) => Promise<ClaudeManagedAuthSnapshot>
-  restoreCredentials: (
-    accountId: string,
-    path: string,
-    snapshot: ClaudeManagedAuthSnapshot
-  ) => Promise<void>
-  restoreOauth: (
-    accountId: string,
-    path: string,
-    snapshot: ClaudeManagedAuthSnapshot
-  ) => Promise<void>
-  login: (location: ClaudeManagedAuthLocation) => Promise<CapturedClaudeAuth>
-  captureExisting: (
-    configDir: string,
-    previousLegacyCredentialsSha256?: string | null
-  ) => Promise<CapturedClaudeAuth>
-}
-
-class DuplicateClaudeAccountError extends Error {}
+export const CLAUDE_SIGN_IN_NOT_FINISHED_MESSAGE =
+  'Claude has not finished signing in to this account yet. Finish the sign-in in the terminal, then try again.'
+const CLAUDE_LOGIN_WITHOUT_ACCOUNT_MESSAGE =
+  'Claude login completed, but Orca could not resolve the account email.'
 
+/**
+ * Sign-in runs `claude auth login` against the account's own folder: hidden from Settings, in
+ * the user's terminal from the CLI. A folder becomes an account only once it holds a login
+ * (superset U/profiles.ts:132,178), so an abandoned sign-in never shows as a row.
+ */
 export class ClaudeAccountRegistration {
-  constructor(private readonly dependencies: ClaudeAccountRegistrationDependencies) {}
-
-  async add(target?: ClaudeManagedAuthTarget): Promise<ClaudeRateLimitAccountsState> {
-    const accountId = randomUUID()
-    const location = await this.dependencies.createManagedAuth(accountId, target)
-    const previousSettings = this.dependencies.store.getSettings()
-    try {
-      const captured = await this.dependencies.login(location)
-      return await this.persist(accountId, location, previousSettings, captured)
-    } catch (error) {
-      await this.cleanupFailedAdd(accountId, location.managedAuthPath, previousSettings, error)
-      throw error
+  constructor(
+    private readonly deps: {
+      store: ClaudeAccountStore
+      rateLimits: ClaudeAccountUsage
+      runtimeAuth: ClaudeAccountRuntime
+      selection: ClaudeAccountSelection
     }
+  ) {}
+
+  /** A new folder, or a saved account's own folder when `accountId` is given. */
+  async begin(request: ClaudeSignInRequest): Promise<ClaudeAccountSignIn> {
+    const { accountId, target, folder } = await this.prepare(request)
+    return { accountId, configDir: folder.configDir, ...target }
   }
 
-  async addFromConfigDir(
-    configDir: string,
-    options?: ClaudeManagedAuthTarget & { previousLegacyCredentialsSha256?: string | null }
+  /** Runs `login` into the account's folder, then saves it; a failed new folder is deleted. */
+  async signIn(
+    request: ClaudeSignInRequest,
+    login: (folder: ClaudeCommandConfig) => Promise<void>
   ): Promise<ClaudeRateLimitAccountsState> {
-    const accountId = randomUUID()
-    const location = await this.dependencies.createManagedAuth(accountId, options)
-    const previousSettings = this.dependencies.store.getSettings()
+    const { accountId, target, folder } = await this.prepare(request)
+    const signIn = { accountId, ...target }
     try {
-      const captured = await this.dependencies.captureExisting(
-        configDir,
-        options?.previousLegacyCredentialsSha256
-      )
-      return await this.persist(accountId, location, previousSettings, captured)
+      await login({
+        windowsPath: folder.readPath,
+        linuxPath: target.runtime === 'wsl' ? folder.configDir : null,
+        wslDistro: target.runtime === 'wsl' ? (target.wslDistro ?? null) : null
+      })
+      return await this.finish(signIn, CLAUDE_LOGIN_WITHOUT_ACCOUNT_MESSAGE)
     } catch (error) {
-      await this.cleanupFailedAdd(accountId, location.managedAuthPath, previousSettings, error)
+      // Why caught: the sign-in's own failure is what the user needs to see.
+      await this.cancel(signIn).catch((cleanupError: unknown) =>
+        console.warn(
+          '[claude-accounts] Could not delete an unfinished sign-in folder:',
+          cleanupError
+        )
+      )
       throw error
     }
   }
 
-  async reauthenticate(accountId: string): Promise<ClaudeRateLimitAccountsState> {
-    const account = this.dependencies.selection.requireAccount(accountId)
-    const managedAuthPath = await this.dependencies.assertManagedAuth(
-      account.managedAuthPath,
-      accountId
-    )
-    const previousSettings = this.dependencies.store.getSettings()
-    const previousAuth = await this.dependencies.readSnapshot(accountId, managedAuthPath)
-    const captured = await this.dependencies.login({
-      managedAuthPath,
-      managedAuthRuntime: account.managedAuthRuntime ?? 'host',
-      wslDistro: account.wslDistro ?? null,
-      wslLinuxAuthPath: account.wslLinuxAuthPath ?? null
-    })
-    if (!captured.identity.email) {
-      throw new Error('Claude login completed, but Orca could not resolve the account email.')
-    }
+  private async prepare(request: ClaudeSignInRequest) {
+    const saved = request.accountId ? this.deps.selection.requireAccount(request.accountId) : null
+    const target = saved ? getClaudeSelectionTargetForAccount(saved) : signInTarget(request)
+    const accountId = saved?.id ?? randomUUID()
+    const folder = await this.deps.runtimeAuth.prepareAccountFolder(accountId, target)
+    return { accountId, target, folder }
+  }
 
-    const settings = this.dependencies.store.getSettings()
-    const now = Date.now()
-    const nextAccounts = settings.claudeManagedAccounts.map((entry) =>
-      entry.id === accountId
-        ? {
-            ...entry,
-            email: captured.identity.email!,
-            organizationUuid: captured.identity.organizationUuid,
-            organizationName: captured.identity.organizationName,
-            updatedAt: now,
-            lastAuthenticatedAt: now
-          }
-        : entry
-    )
-    let wroteCredentials = false
-    try {
-      await this.dependencies.writeOauth(accountId, managedAuthPath, captured.oauthAccount)
-      await this.dependencies.writeCredentials(accountId, managedAuthPath, captured.credentialsJson)
-      wroteCredentials = true
-      this.dependencies.store.updateSettings({ claudeManagedAccounts: nextAccounts })
-      this.dependencies.runtimeAuth.clearLastWrittenCredentialsJson(accountId)
-      this.dependencies.rateLimits.evictInactiveClaudeCache(accountId)
-      const target = getClaudeSelectionTargetForAccount(account)
-      await this.dependencies.selection.syncRuntimeAuth(target)
-      await this.dependencies.rateLimits.refreshForClaudeAccountChange(undefined, target)
-      return this.dependencies.selection.snapshot()
-    } catch (error) {
-      await this.rollbackReauthentication(
-        accountId,
-        managedAuthPath,
-        previousAuth,
-        previousSettings,
-        nextAccounts,
-        wroteCredentials
-      )
-      throw error
+  async cancel(signIn: Omit<ClaudeAccountSignIn, 'configDir'>): Promise<void> {
+    if (!this.deps.selection.findAccount(signIn.accountId)) {
+      await this.deps.runtimeAuth.removeAccountFolder(signIn.accountId, signInTarget(signIn))
     }
   }
 
-  private async persist(
-    accountId: string,
-    location: ClaudeManagedAuthLocation,
-    previousSettings: ReturnType<Store['getSettings']>,
-    captured: CapturedClaudeAuth
+  async finish(
+    signIn: Omit<ClaudeAccountSignIn, 'configDir'>,
+    notSignedInMessage = CLAUDE_SIGN_IN_NOT_FINISHED_MESSAGE
   ): Promise<ClaudeRateLimitAccountsState> {
-    if (!captured.identity.email) {
-      throw new Error('Claude login completed, but Orca could not resolve the account email.')
+    const { store, rateLimits, runtimeAuth, selection } = this.deps
+    const saved = selection.findAccount(signIn.accountId)
+    const target = saved ? getClaudeSelectionTargetForAccount(saved) : signInTarget(signIn)
+    // Why set up again: onboarding is merged only into a state file the login just created.
+    const folder = await runtimeAuth.prepareAccountFolder(signIn.accountId, target)
+    const login = readClaudeFolderLogin(claudeStateFile(folder.readPath))
+    if (!login) {
+      throw new Error(notSignedInMessage)
     }
+    const accounts = store.getSettings().claudeManagedAccounts
+    const scope = {
+      managedAuthRuntime: target.runtime ?? 'host',
+      wslDistro: target.runtime === 'wsl' ? (target.wslDistro ?? null) : null
+    } as const
     if (
-      findDuplicateClaudeAccount(previousSettings.claudeManagedAccounts, {
-        email: captured.identity.email,
-        organizationUuid: captured.identity.organizationUuid,
-        managedAuthRuntime: location.managedAuthRuntime,
-        wslDistro: location.wslDistro
+      !saved &&
+      findDuplicateClaudeAccount(accounts, {
+        email: login.email,
+        organizationUuid: login.organizationUuid,
+        ...scope
       })
     ) {
-      throw new DuplicateClaudeAccountError('This Claude account is already added.')
+      await runtimeAuth.removeAccountFolder(signIn.accountId, target)
+      throw new Error('This Claude account is already added.')
     }
-    await this.dependencies.writeManagedAuth(accountId, location.managedAuthPath, captured)
     const now = Date.now()
-    const account: ClaudeManagedAccount = {
-      id: accountId,
-      email: captured.identity.email,
-      managedAuthPath: location.managedAuthPath,
-      managedAuthRuntime: location.managedAuthRuntime,
-      wslDistro: location.wslDistro,
-      wslLinuxAuthPath: location.wslLinuxAuthPath,
-      authMethod: 'subscription-oauth',
-      organizationUuid: captured.identity.organizationUuid,
-      organizationName: captured.identity.organizationName,
-      createdAt: now,
-      updatedAt: now,
-      lastAuthenticatedAt: now
-    }
-    const selection = normalizeClaudeRuntimeSelection(previousSettings)
-    this.dependencies.store.updateSettings({
-      claudeManagedAccounts: [...previousSettings.claudeManagedAccounts, account],
-      activeClaudeManagedAccountId: selection.host,
-      activeClaudeManagedAccountIdsByRuntime: selection
+    selection.saveSettings({
+      claudeManagedAccounts: [
+        ...accounts.filter((entry) => entry.id !== signIn.accountId),
+        {
+          id: signIn.accountId,
+          email: login.email,
+          organizationUuid: login.organizationUuid,
+          organizationName: login.organizationName,
+          managedAuthPath: folder.readPath,
+          ...scope,
+          wslLinuxAuthPath: target.runtime === 'wsl' ? folder.configDir : null,
+          authMethod: 'subscription-oauth',
+          createdAt: saved?.createdAt ?? now,
+          updatedAt: now,
+          lastAuthenticatedAt: now
+        }
+      ]
     })
-    this.dependencies.runtimeAuth.clearLastWrittenCredentialsJson(accountId)
-    this.dependencies.rateLimits.evictInactiveClaudeCache(accountId)
-    return this.dependencies.selection.snapshot()
-  }
-
-  private async cleanupFailedAdd(
-    accountId: string,
-    managedAuthPath: string,
-    previousSettings: ReturnType<Store['getSettings']>,
-    error: unknown
-  ): Promise<void> {
-    if (error instanceof DuplicateClaudeAccountError) {
-      await this.dependencies.removeManagedAuth(accountId, managedAuthPath)
-      return
-    }
-    this.dependencies.selection.restoreSettings(previousSettings)
-    try {
-      await this.dependencies.runtimeAuth.forceMaterializeCurrentSelectionForRollback()
-    } catch (rollbackError) {
-      console.warn('[claude-accounts] Rollback rematerialization failed:', rollbackError)
-    }
-    await this.dependencies.removeManagedAuth(accountId, managedAuthPath)
+    rateLimits.evictInactiveClaudeCache(signIn.accountId)
+    // Why publish: a selected account's terminals follow its folder only once it exists.
+    await runtimeAuth.syncForCurrentSelection(target)
+    selection.refreshUsage(undefined, target)
+    return selection.list()
   }
+}
 
-  private async rollbackReauthentication(
-    accountId: string,
-    path: string,
-    snapshot: ClaudeManagedAuthSnapshot,
-    previousSettings: ReturnType<Store['getSettings']>,
-    nextAccounts: ClaudeManagedAccount[],
-    wroteCredentials: boolean
-  ): Promise<void> {
-    let restoredCredentials = false
-    try {
-      await this.dependencies.restoreCredentials(accountId, path, snapshot)
-      restoredCredentials = true
-    } catch (rollbackError) {
-      console.warn(
-        '[claude-accounts] Failed to restore managed credentials during rollback:',
-        rollbackError
-      )
-    }
-    if (restoredCredentials || !wroteCredentials) {
-      try {
-        await this.dependencies.restoreOauth(accountId, path, snapshot)
-      } catch (rollbackError) {
-        console.warn(
-          '[claude-accounts] Failed to restore managed oauth metadata during rollback:',
-          rollbackError
-        )
-      }
-    }
-    if (restoredCredentials) {
-      this.dependencies.selection.restoreSettings(previousSettings)
-      await this.dependencies.runtimeAuth.forceMaterializeCurrentSelectionForRollback()
-    } else if (wroteCredentials) {
-      this.dependencies.store.updateSettings({ claudeManagedAccounts: nextAccounts })
-    } else {
-      this.dependencies.selection.restoreSettings(previousSettings)
-    }
+function signInTarget(request: ClaudeAccountSelectionTarget): ClaudeAccountSelectionTarget {
+  const target = normalizeClaudeAccountSelectionTarget(request)
+  if (target.runtime === 'wsl' && !target.wslDistro) {
+    throw new Error('Choose a WSL distro before signing in.')
   }
+  return target.runtime === 'wsl'
+    ? { runtime: 'wsl', wslDistro: target.wslDistro }
+    : { runtime: 'host' }
 }
diff --git a/src/main/claude-accounts/claude-account-selection.ts b/src/main/claude-accounts/claude-account-selection.ts
index d81f2346eb70..c0b089e902cf 100644
--- a/src/main/claude-accounts/claude-account-selection.ts
+++ b/src/main/claude-accounts/claude-account-selection.ts
@@ -3,9 +3,10 @@ import type {
   ClaudeManagedAccountSummary,
   ClaudeRateLimitAccountsState
 } from '../../shared/managed-account-types'
-import type { Store } from '../persistence'
+import type { GlobalSettings } from '../../shared/global-settings-types'
 import type { RateLimitService } from '../rate-limits/service'
-import { beginClaudeAuthSwitch, endClaudeAuthSwitch } from './live-pty-gate'
+import { claudeStateFile, readClaudeFolderLogin } from './claude-account-folder'
+import { savedWslClaudeAccountHome } from './claude-profile-wsl-paths'
 import type { ClaudeRuntimeAuthService } from './runtime-auth-service'
 import {
   getClaudeSelectionTargetForAccount,
@@ -18,59 +19,137 @@ import {
   type ClaudeAccountSelectionTarget
 } from './runtime-selection'
 
+export const CLAUDE_ACCOUNT_NEEDS_SIGN_IN_MESSAGE =
+  'Sign in to this Claude account again before selecting it.'
+
+export const CLAUDE_ACCOUNT_FOLDER_IN_USE_MESSAGE =
+  "Orca couldn't delete this Claude account's folder. Quit any Claude running in this account, then remove it again."
+
+export type ClaudeAccountSettings = Pick<
+  GlobalSettings,
+  | 'claudeManagedAccounts'
+  | 'activeClaudeManagedAccountId'
+  | 'activeClaudeManagedAccountIdsByRuntime'
+>
+
+export type ClaudeAccountStore = {
+  getSettings: () => ClaudeAccountSettings
+  updateSettings: (
+    patch: Partial<ClaudeAccountSettings>,
+    options?: { notifyListeners?: boolean }
+  ) => unknown
+}
+
+export type ClaudeAccountRuntime = Pick<
+  ClaudeRuntimeAuthService,
+  'syncForCurrentSelection' | 'publishAll' | 'removeAccountFolder' | 'prepareAccountFolder'
+> & {
+  router: Pick<
+    ClaudeRuntimeAuthService['router'],
+    'accountHome' | 'userConfigDir' | 'copiedLoginIntoSystemDefault'
+  >
+}
+
+export type ClaudeAccountUsage = Pick<
+  RateLimitService,
+  'evictInactiveClaudeCache' | 'refreshForClaudeAccountChange'
+>
+
 export class ClaudeAccountSelection {
   constructor(
-    private readonly store: Store,
-    private readonly rateLimits: RateLimitService,
-    private readonly runtimeAuth: ClaudeRuntimeAuthService,
-    private readonly removeManagedAuth: (accountId: string, path: string) => Promise<void>
+    private readonly store: ClaudeAccountStore,
+    private readonly rateLimits: ClaudeAccountUsage,
+    private readonly runtimeAuth: ClaudeAccountRuntime
   ) {}
 
+  /** Each row is labelled with the login its folder holds (superset U/profiles.ts:121-137). */
   list(): ClaudeRateLimitAccountsState {
-    this.normalizeActiveSelection()
-    return this.snapshot()
+    this.pruneSelection()
+    const settings = this.store.getSettings()
+    const selection = normalizeClaudeRuntimeSelection(settings)
+    const accounts = settings.claudeManagedAccounts
+      .map((account) => this.summarize(account))
+      .sort((a, b) => b.updatedAt - a.updatedAt)
+    const userConfigDir = this.runtimeAuth.router.userConfigDir()
+    // Why only with accounts, and at most every 5 s: the personal state file is large and every
+    // running Claude rewrites it, so a list would otherwise re-parse it on main each time.
+    const systemDefault =
+      accounts.length > 0 ? readClaudeFolderLogin(claudeStateFile(userConfigDir), 5_000) : null
+    return {
+      accounts,
+      activeAccountId: selection.host,
+      activeAccountIdsByRuntime: selection,
+      ...(systemDefault ? { systemDefaultEmail: systemDefault.email } : {}),
+      ...(systemDefault && this.runtimeAuth.router.copiedLoginIntoSystemDefault()
+        ? { systemDefaultMayBeCopied: true }
+        : {})
+    }
+  }
+
+  private summarize(account: ClaudeManagedAccount): ClaudeManagedAccountSummary {
+    const summary: ClaudeManagedAccountSummary = {
+      id: account.id,
+      email: account.email,
+      managedAuthRuntime: account.managedAuthRuntime ?? 'host',
+      wslDistro: account.wslDistro ?? null,
+      authMethod: account.authMethod ?? 'unknown',
+      organizationUuid: account.organizationUuid ?? null,
+      organizationName: account.organizationName ?? null,
+      createdAt: account.createdAt,
+      updatedAt: account.updatedAt,
+      lastAuthenticatedAt: account.lastAuthenticatedAt
+    }
+    if (account.managedAuthRuntime === 'wsl') {
+      // Why no read: listing must not start a stopped distro. Only an older Orca's folder layout
+      // is known to hold no login; a launch refuses a missing folder with its own reason.
+      return savedWslClaudeAccountHome(account) ? summary : { ...summary, needsSignIn: true }
+    }
+    const login = readClaudeFolderLogin(
+      claudeStateFile(this.runtimeAuth.router.accountHome(account.id))
+    )
+    return login
+      ? {
+          ...summary,
+          email: login.email,
+          organizationUuid: login.organizationUuid,
+          organizationName: login.organizationName
+        }
+      : { ...summary, needsSignIn: true }
   }
 
   async remove(accountId: string): Promise<ClaudeRateLimitAccountsState> {
     const account = this.requireAccount(accountId)
     const settings = this.store.getSettings()
-    const nextAccounts = settings.claudeManagedAccounts.filter((entry) => entry.id !== accountId)
+    const target = getClaudeSelectionTargetForAccount(account)
+    const wasSelected = getSelectedClaudeAccountIdForTarget(settings, target) === accountId
     const nextSelection = removeClaudeAccountIdFromSelection(
       normalizeClaudeRuntimeSelection(settings),
       accountId
     )
-    const nextActiveId =
-      settings.activeClaudeManagedAccountId === accountId ? null : nextSelection.host
-    const target = getClaudeSelectionTargetForAccount(account)
-    const wasSelected = getSelectedClaudeAccountIdForTarget(settings, target) === accountId
+    this.saveSettings({
+      activeClaudeManagedAccountId:
+        settings.activeClaudeManagedAccountId === accountId ? null : nextSelection.host,
+      activeClaudeManagedAccountIdsByRuntime: nextSelection
+    })
+    // Why before the delete: no new launch may pick the folder while it is being removed.
+    await this.runtimeAuth.syncForCurrentSelection(target)
     try {
-      if (wasSelected) {
-        this.store.updateSettings({
-          activeClaudeManagedAccountId: nextActiveId,
-          activeClaudeManagedAccountIdsByRuntime: nextSelection
-        })
-        await this.syncRuntimeAuth(target)
-        this.store.updateSettings({ claudeManagedAccounts: nextAccounts })
-      } else {
-        this.store.updateSettings({
-          claudeManagedAccounts: nextAccounts,
-          activeClaudeManagedAccountId: nextActiveId,
-          activeClaudeManagedAccountIdsByRuntime: nextSelection
-        })
-        await this.syncRuntimeAuth(target)
-      }
-      await this.removeManagedAuth(accountId, account.managedAuthPath)
-      this.rateLimits.evictInactiveClaudeCache(accountId)
-      await this.rateLimits.refreshForClaudeAccountChange(
-        wasSelected ? accountId : undefined,
-        target
-      )
-      return this.snapshot()
+      await this.runtimeAuth.removeAccountFolder(accountId, target)
     } catch (error) {
-      this.restoreSettings(settings)
-      await this.runtimeAuth.forceMaterializeCurrentSelectionForRollback()
-      throw error
+      // Why keep the row: the folder (on Windows, with its history) is still there to retry.
+      console.warn('[claude-accounts] Could not delete the account folder:', error)
+      throw new Error(CLAUDE_ACCOUNT_FOLDER_IN_USE_MESSAGE)
     }
+    this.saveSettings({
+      claudeManagedAccounts: this.store
+        .getSettings()
+        .claudeManagedAccounts.filter((entry) => entry.id !== accountId)
+    })
+    // Why again: the last account's removal also removes the which-account file.
+    await this.runtimeAuth.syncForCurrentSelection(target)
+    this.rateLimits.evictInactiveClaudeCache(accountId)
+    this.refreshUsage(wasSelected ? accountId : undefined, target)
+    return this.list()
   }
 
   async select(
@@ -81,111 +160,90 @@ export class ClaudeAccountSelection {
     if (accountId !== null) {
       const account = this.requireAccount(accountId)
       const accountTarget = getClaudeSelectionTargetForAccount(account)
-      const requestedTarget = normalizeClaudeAccountSelectionTarget(target ?? accountTarget)
-      const normalizedAccountTarget = normalizeClaudeAccountSelectionTarget(accountTarget)
+      const requested = normalizeClaudeAccountSelectionTarget(target ?? accountTarget)
+      const owned = normalizeClaudeAccountSelectionTarget(accountTarget)
       if (
-        requestedTarget.runtime !== normalizedAccountTarget.runtime ||
-        (requestedTarget.wslDistro !== null &&
-          requestedTarget.wslDistro !== normalizedAccountTarget.wslDistro)
+        requested.runtime !== owned.runtime ||
+        (requested.wslDistro !== null && requested.wslDistro !== owned.wslDistro)
       ) {
         throw new Error('That Claude account belongs to a different runtime.')
       }
+      // Why on the host: the CLI and paired clients select without the renderer's check.
+      if (this.summarize(account).needsSignIn) {
+        throw new Error(CLAUDE_ACCOUNT_NEEDS_SIGN_IN_MESSAGE)
+      }
       effectiveTarget = accountTarget
     }
-    const previousSettings = this.store.getSettings()
-    const outgoingAccountId = getSelectedClaudeAccountIdForTarget(previousSettings, effectiveTarget)
+    const previous = this.store.getSettings()
+    const outgoingAccountId = getSelectedClaudeAccountIdForTarget(previous, effectiveTarget)
     const nextSelection = setSelectedClaudeAccountIdForTarget(
-      normalizeClaudeRuntimeSelection(previousSettings),
+      normalizeClaudeRuntimeSelection(previous),
       accountId,
       effectiveTarget
     )
-    this.store.updateSettings({
+    this.saveSettings({
       activeClaudeManagedAccountId:
         effectiveTarget?.runtime === 'wsl' ? nextSelection.host : accountId,
       activeClaudeManagedAccountIdsByRuntime: nextSelection
     })
     try {
-      await this.syncRuntimeAuth(effectiveTarget)
-      await this.rateLimits.refreshForClaudeAccountChange(outgoingAccountId, effectiveTarget)
-      return this.snapshot()
+      await this.runtimeAuth.syncForCurrentSelection(effectiveTarget)
     } catch (error) {
-      this.restoreSettings(previousSettings)
-      await this.runtimeAuth.forceMaterializeCurrentSelectionForRollback()
+      this.saveSettings({
+        activeClaudeManagedAccountId: previous.activeClaudeManagedAccountId,
+        activeClaudeManagedAccountIdsByRuntime: previous.activeClaudeManagedAccountIdsByRuntime
+      })
+      await this.runtimeAuth.publishAll().catch((rollbackError: unknown) => {
+        console.warn('[claude-accounts] Rollback republish failed:', rollbackError)
+      })
       throw error
     }
+    this.refreshUsage(outgoingAccountId, effectiveTarget)
+    return this.list()
   }
 
-  snapshot(): ClaudeRateLimitAccountsState {
-    const settings = this.store.getSettings()
-    return {
-      accounts: settings.claudeManagedAccounts
-        .map(toClaudeAccountSummary)
-        .sort((a, b) => b.updatedAt - a.updatedAt),
-      activeAccountId: normalizeClaudeRuntimeSelection(settings).host,
-      activeAccountIdsByRuntime: normalizeClaudeRuntimeSelection(settings)
-    }
+  /** Bookkeeping: a usage failure never undoes the account change that triggered it. */
+  refreshUsage(
+    outgoingAccountId: string | null | undefined,
+    target: ClaudeAccountSelectionTarget | undefined
+  ): void {
+    void this.rateLimits
+      .refreshForClaudeAccountChange(outgoingAccountId ?? undefined, target)
+      .catch((error: unknown) =>
+        console.warn('[claude-accounts] Usage unavailable after account change:', error)
+      )
+  }
+
+  findAccount(accountId: string): ClaudeManagedAccount | undefined {
+    return this.store.getSettings().claudeManagedAccounts.find((entry) => entry.id === accountId)
   }
 
   requireAccount(accountId: string): ClaudeManagedAccount {
-    const account = this.store
-      .getSettings()
-      .claudeManagedAccounts.find((entry) => entry.id === accountId)
+    const account = this.findAccount(accountId)
     if (!account) {
       throw new Error('That Claude account no longer exists.')
     }
     return account
   }
 
-  restoreSettings(settings: ReturnType<Store['getSettings']>): void {
-    this.store.updateSettings({
-      claudeManagedAccounts: settings.claudeManagedAccounts,
-      activeClaudeManagedAccountId: settings.activeClaudeManagedAccountId,
-      activeClaudeManagedAccountIdsByRuntime: settings.activeClaudeManagedAccountIdsByRuntime
-    })
+  // Why notify: every window's switcher and Settings read the selection from settings, including
+  // selections made by the CLI, a paired client or another window.
+  saveSettings(patch: Partial<ClaudeAccountSettings>): void {
+    this.store.updateSettings(patch, { notifyListeners: true })
   }
 
-  async syncRuntimeAuth(
-    target?: ClaudeAccountSelectionTarget,
-    operation?: () => Promise<void>
-  ): Promise<void> {
-    beginClaudeAuthSwitch()
-    try {
-      await (operation ? operation() : this.runtimeAuth.syncForCurrentSelection(target))
-    } finally {
-      endClaudeAuthSwitch()
-    }
-  }
-
-  private normalizeActiveSelection(): void {
+  private pruneSelection(): void {
     const settings = this.store.getSettings()
-    const currentSelection = normalizeClaudeRuntimeSelection(settings)
-    const nextSelection = pruneInvalidClaudeRuntimeSelection(
-      currentSelection,
-      settings.claudeManagedAccounts
-    )
+    const current = normalizeClaudeRuntimeSelection(settings)
+    const next = pruneInvalidClaudeRuntimeSelection(current, settings.claudeManagedAccounts)
     if (
-      nextSelection.host !== settings.activeClaudeManagedAccountId ||
-      JSON.stringify(nextSelection) !== JSON.stringify(currentSelection)
+      next.host !== settings.activeClaudeManagedAccountId ||
+      JSON.stringify(next) !== JSON.stringify(current)
     ) {
       this.store.updateSettings({
-        activeClaudeManagedAccountId: nextSelection.host,
-        activeClaudeManagedAccountIdsByRuntime: nextSelection
+        activeClaudeManagedAccountId: next.host,
+        activeClaudeManagedAccountIdsByRuntime: next
       })
     }
   }
 }
-
-function toClaudeAccountSummary(account: ClaudeManagedAccount): ClaudeManagedAccountSummary {
-  return {
-    id: account.id,
-    email: account.email,
-    managedAuthRuntime: account.managedAuthRuntime ?? 'host',
-    wslDistro: account.wslDistro ?? null,
-    authMethod: account.authMethod ?? 'unknown',
-    organizationUuid: account.organizationUuid ?? null,
-    organizationName: account.organizationName ?? null,
-    createdAt: account.createdAt,
-    updatedAt: account.updatedAt,
-    lastAuthenticatedAt: account.lastAuthenticatedAt
-  }
-}
diff --git a/src/main/claude-accounts/claude-account-service-account-selection.test.ts b/src/main/claude-accounts/claude-account-service-account-selection.test.ts
deleted file mode 100644
index f055475506bc..000000000000
--- a/src/main/claude-accounts/claude-account-service-account-selection.test.ts
+++ /dev/null
@@ -1,488 +0,0 @@
-import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest'
-import { mkdirSync, rmSync, writeFileSync } from 'node:fs'
-import { tmpdir } from 'node:os'
-import { join } from 'node:path'
-import {
-  resetClaudeKeychainMocks,
-  restorePlatform,
-  setPlatform
-} from './claude-account-service-test-harness'
-
-const CLAUDE_SERVICE_TEST_ROOT = join(tmpdir(), 'orca-claude-service-selection-test')
-
-vi.mock('electron', () => ({
-  app: {
-    getPath: () => CLAUDE_SERVICE_TEST_ROOT
-  }
-}))
-
-const commandMocks = vi.hoisted(() => ({
-  resolveClaudeCommand: vi.fn(() => 'claude')
-}))
-
-vi.mock('../codex-cli/command', () => ({
-  resolveClaudeCommand: commandMocks.resolveClaudeCommand
-}))
-
-vi.mock('./keychain', () => ({
-  deleteActiveClaudeKeychainCredentialsStrict: vi.fn(async () => {}),
-  deleteManagedClaudeKeychainCredentials: vi.fn(async () => {}),
-  readActiveClaudeKeychainCredentials: vi.fn(),
-  readActiveClaudeKeychainCredentialsStrict: vi.fn(),
-  readManagedClaudeKeychainCredentials: vi.fn(),
-  writeActiveClaudeKeychainCredentials: vi.fn(async () => {}),
-  writeManagedClaudeKeychainCredentials: vi.fn(async () => {})
-}))
-
-describe('ClaudeAccountService credential capture', () => {
-  let tempDir: string | null = null
-
-  beforeEach(() => {
-    setPlatform('darwin')
-    tempDir = null
-    resetClaudeKeychainMocks()
-  })
-
-  afterEach(() => {
-    restorePlatform()
-    if (tempDir) {
-      rmSync(tempDir, { recursive: true, force: true })
-    }
-  })
-
-  it('refreshes rate limits without recaching a removed active account', async () => {
-    setPlatform('linux')
-    tempDir = CLAUDE_SERVICE_TEST_ROOT
-    rmSync(tempDir, { recursive: true, force: true })
-    const managedAuthPath = join(tempDir, 'claude-accounts', 'account-1', 'auth')
-    mkdirSync(managedAuthPath, { recursive: true })
-    writeFileSync(join(managedAuthPath, '.orca-managed-claude-auth'), 'account-1\n', 'utf-8')
-    writeFileSync(join(managedAuthPath, '.credentials.json'), '{"old":true}\n', 'utf-8')
-    let settings = {
-      claudeManagedAccounts: [
-        {
-          id: 'account-1',
-          email: 'old@example.com',
-          managedAuthPath,
-          authMethod: 'subscription-oauth',
-          organizationUuid: null,
-          organizationName: null,
-          createdAt: 1,
-          updatedAt: 1,
-          lastAuthenticatedAt: 1
-        }
-      ],
-      activeClaudeManagedAccountId: 'account-1'
-    }
-    const store = {
-      getSettings: vi.fn(() => settings),
-      updateSettings: vi.fn((updates: Partial<typeof settings>) => {
-        settings = { ...settings, ...updates }
-        return settings
-      })
-    }
-    const runtimeAuth = {
-      syncForCurrentSelection: vi.fn(async () => {}),
-      forceMaterializeCurrentSelectionForRollback: vi.fn(async () => {})
-    }
-    const rateLimits = {
-      evictInactiveClaudeCache: vi.fn(),
-      refreshForClaudeAccountChange: vi.fn(async () => ({ accounts: [], activeAccountId: null }))
-    }
-    const { ClaudeAccountService } = await import('./service')
-    const service = new ClaudeAccountService(
-      store as never,
-      rateLimits as never,
-      runtimeAuth as never
-    )
-
-    await service.removeAccount('account-1')
-
-    expect(rateLimits.evictInactiveClaudeCache).toHaveBeenCalledWith('account-1')
-    expect(rateLimits.refreshForClaudeAccountChange).toHaveBeenCalledWith('account-1', {
-      runtime: 'host'
-    })
-    expect(settings).toMatchObject({
-      claudeManagedAccounts: [],
-      activeClaudeManagedAccountId: null
-    })
-  })
-
-  it('switches the active Claude account while PTYs are live', async () => {
-    setPlatform('linux')
-    tempDir = CLAUDE_SERVICE_TEST_ROOT
-    rmSync(tempDir, { recursive: true, force: true })
-    const firstAuthPath = join(tempDir, 'claude-accounts', 'account-1', 'auth')
-    const secondAuthPath = join(tempDir, 'claude-accounts', 'account-2', 'auth')
-    mkdirSync(firstAuthPath, { recursive: true })
-    mkdirSync(secondAuthPath, { recursive: true })
-    let settings = {
-      claudeManagedAccounts: [
-        {
-          id: 'account-1',
-          email: 'first@example.com',
-          managedAuthPath: firstAuthPath,
-          managedAuthRuntime: 'host',
-          wslDistro: null,
-          wslLinuxAuthPath: null,
-          authMethod: 'subscription-oauth',
-          organizationUuid: null,
-          organizationName: null,
-          createdAt: 1,
-          updatedAt: 1,
-          lastAuthenticatedAt: 1
-        },
-        {
-          id: 'account-2',
-          email: 'second@example.com',
-          managedAuthPath: secondAuthPath,
-          managedAuthRuntime: 'host',
-          wslDistro: null,
-          wslLinuxAuthPath: null,
-          authMethod: 'subscription-oauth',
-          organizationUuid: null,
-          organizationName: null,
-          createdAt: 2,
-          updatedAt: 2,
-          lastAuthenticatedAt: 2
-        }
-      ],
-      activeClaudeManagedAccountId: 'account-1',
-      activeClaudeManagedAccountIdsByRuntime: { host: 'account-1', wsl: {} }
-    }
-    const store = {
-      getSettings: vi.fn(() => settings),
-      updateSettings: vi.fn((updates: Partial<typeof settings>) => {
-        settings = { ...settings, ...updates }
-        return settings
-      })
-    }
-    const runtimeAuth = {
-      syncForCurrentSelection: vi.fn(async () => {}),
-      forceMaterializeCurrentSelectionForRollback: vi.fn(async () => {})
-    }
-    const rateLimits = {
-      refreshForClaudeAccountChange: vi.fn(async () => ({ accounts: [], activeAccountId: null }))
-    }
-    const { ClaudeAccountService } = await import('./service')
-    const { markClaudePtyExited, markClaudePtySpawned } = await import('./live-pty-gate')
-    const service = new ClaudeAccountService(
-      store as never,
-      rateLimits as never,
-      runtimeAuth as never
-    )
-
-    markClaudePtySpawned('live-claude-pty')
-    try {
-      await service.selectAccount('account-2')
-    } finally {
-      markClaudePtyExited('live-claude-pty')
-    }
-
-    expect(settings.activeClaudeManagedAccountId).toBe('account-2')
-    expect(settings.activeClaudeManagedAccountIdsByRuntime).toEqual({
-      host: 'account-2',
-      wsl: {}
-    })
-    expect(runtimeAuth.syncForCurrentSelection).toHaveBeenCalledWith({ runtime: 'host' })
-    expect(rateLimits.refreshForClaudeAccountChange).toHaveBeenCalledWith('account-1', {
-      runtime: 'host'
-    })
-  })
-
-  it('restores the previous selection when a Claude account switch fails', async () => {
-    setPlatform('linux')
-    tempDir = CLAUDE_SERVICE_TEST_ROOT
-    rmSync(tempDir, { recursive: true, force: true })
-    const firstAuthPath = join(tempDir, 'claude-accounts', 'account-1', 'auth')
-    const secondAuthPath = join(tempDir, 'claude-accounts', 'account-2', 'auth')
-    mkdirSync(firstAuthPath, { recursive: true })
-    mkdirSync(secondAuthPath, { recursive: true })
-    let settings = {
-      claudeManagedAccounts: [
-        {
-          id: 'account-1',
-          email: 'first@example.com',
-          managedAuthPath: firstAuthPath,
-          managedAuthRuntime: 'host',
-          wslDistro: null,
-          wslLinuxAuthPath: null,
-          authMethod: 'subscription-oauth',
-          organizationUuid: null,
-          organizationName: null,
-          createdAt: 1,
-          updatedAt: 1,
-          lastAuthenticatedAt: 1
-        },
-        {
-          id: 'account-2',
-          email: 'second@example.com',
-          managedAuthPath: secondAuthPath,
-          managedAuthRuntime: 'host',
-          wslDistro: null,
-          wslLinuxAuthPath: null,
-          authMethod: 'subscription-oauth',
-          organizationUuid: null,
-          organizationName: null,
-          createdAt: 2,
-          updatedAt: 2,
-          lastAuthenticatedAt: 2
-        }
-      ],
-      activeClaudeManagedAccountId: 'account-1',
-      activeClaudeManagedAccountIdsByRuntime: { host: 'account-1', wsl: {} }
-    }
-    const store = {
-      getSettings: vi.fn(() => settings),
-      updateSettings: vi.fn((updates: Partial<typeof settings>) => {
-        settings = { ...settings, ...updates }
-        return settings
-      })
-    }
-    const runtimeAuth = {
-      syncForCurrentSelection: vi.fn(async () => {
-        throw new Error('runtime sync failed')
-      }),
-      forceMaterializeCurrentSelectionForRollback: vi.fn(async () => {})
-    }
-    const rateLimits = {
-      refreshForClaudeAccountChange: vi.fn(async () => ({ accounts: [], activeAccountId: null }))
-    }
-    const { ClaudeAccountService } = await import('./service')
-    const service = new ClaudeAccountService(
-      store as never,
-      rateLimits as never,
-      runtimeAuth as never
-    )
-
-    await expect(service.selectAccount('account-2')).rejects.toThrow('runtime sync failed')
-
-    expect(settings.activeClaudeManagedAccountId).toBe('account-1')
-    expect(settings.activeClaudeManagedAccountIdsByRuntime).toEqual({
-      host: 'account-1',
-      wsl: {}
-    })
-    expect(runtimeAuth.forceMaterializeCurrentSelectionForRollback).toHaveBeenCalled()
-    expect(rateLimits.refreshForClaudeAccountChange).not.toHaveBeenCalled()
-  })
-
-  it('selects a WSL account without changing the Windows active account', async () => {
-    setPlatform('linux')
-    tempDir = CLAUDE_SERVICE_TEST_ROOT
-    rmSync(tempDir, { recursive: true, force: true })
-    const hostAuthPath = join(tempDir, 'claude-accounts', 'host-account', 'auth')
-    const wslAuthPath = join(tempDir, 'claude-accounts', 'wsl-account', 'auth')
-    mkdirSync(hostAuthPath, { recursive: true })
-    mkdirSync(wslAuthPath, { recursive: true })
-    let settings = {
-      claudeManagedAccounts: [
-        {
-          id: 'host-account',
-          email: 'host@example.com',
-          managedAuthPath: hostAuthPath,
-          managedAuthRuntime: 'host',
-          wslDistro: null,
-          wslLinuxAuthPath: null,
-          authMethod: 'subscription-oauth',
-          organizationUuid: null,
-          organizationName: null,
-          createdAt: 1,
-          updatedAt: 1,
-          lastAuthenticatedAt: 1
-        },
-        {
-          id: 'wsl-account',
-          email: 'wsl@example.com',
-          managedAuthPath: wslAuthPath,
-          managedAuthRuntime: 'wsl',
-          wslDistro: 'Ubuntu',
-          wslLinuxAuthPath: '/home/jin/.local/share/orca/claude-accounts/wsl-account/auth',
-          authMethod: 'subscription-oauth',
-          organizationUuid: null,
-          organizationName: null,
-          createdAt: 1,
-          updatedAt: 1,
-          lastAuthenticatedAt: 1
-        }
-      ],
-      activeClaudeManagedAccountId: 'host-account',
-      activeClaudeManagedAccountIdsByRuntime: { host: 'host-account', wsl: { Ubuntu: null } }
-    }
-    const store = {
-      getSettings: vi.fn(() => settings),
-      updateSettings: vi.fn((updates: Partial<typeof settings>) => {
-        settings = { ...settings, ...updates }
-        return settings
-      })
-    }
-    const runtimeAuth = {
-      syncForCurrentSelection: vi.fn(async () => {}),
-      forceMaterializeCurrentSelectionForRollback: vi.fn(async () => {})
-    }
-    const rateLimits = {
-      refreshForClaudeAccountChange: vi.fn(async () => ({ accounts: [], activeAccountId: null }))
-    }
-    const { ClaudeAccountService } = await import('./service')
-    const service = new ClaudeAccountService(
-      store as never,
-      rateLimits as never,
-      runtimeAuth as never
-    )
-
-    const snapshot = await service.selectAccountForTarget('wsl-account', {
-      runtime: 'wsl',
-      wslDistro: 'Ubuntu'
-    })
-
-    expect(settings.activeClaudeManagedAccountId).toBe('host-account')
-    expect(settings.activeClaudeManagedAccountIdsByRuntime).toEqual({
-      host: 'host-account',
-      wsl: { Ubuntu: 'wsl-account' }
-    })
-    expect(snapshot.activeAccountIdsByRuntime).toEqual({
-      host: 'host-account',
-      wsl: { Ubuntu: 'wsl-account' }
-    })
-    expect(runtimeAuth.syncForCurrentSelection).toHaveBeenCalledWith({
-      runtime: 'wsl',
-      wslDistro: 'Ubuntu'
-    })
-    expect(rateLimits.refreshForClaudeAccountChange).toHaveBeenCalledWith(null, {
-      runtime: 'wsl',
-      wslDistro: 'Ubuntu'
-    })
-  })
-
-  it('rejects selecting a WSL account for the Windows target', async () => {
-    setPlatform('linux')
-    tempDir = CLAUDE_SERVICE_TEST_ROOT
-    rmSync(tempDir, { recursive: true, force: true })
-    const wslAuthPath = join(tempDir, 'claude-accounts', 'wsl-account', 'auth')
-    mkdirSync(wslAuthPath, { recursive: true })
-    const settings = {
-      claudeManagedAccounts: [
-        {
-          id: 'wsl-account',
-          email: 'wsl@example.com',
-          managedAuthPath: wslAuthPath,
-          managedAuthRuntime: 'wsl',
-          wslDistro: 'Ubuntu',
-          wslLinuxAuthPath: '/home/jin/.local/share/orca/claude-accounts/wsl-account/auth',
-          authMethod: 'subscription-oauth',
-          organizationUuid: null,
-          organizationName: null,
-          createdAt: 1,
-          updatedAt: 1,
-          lastAuthenticatedAt: 1
-        }
-      ],
-      activeClaudeManagedAccountId: null,
-      activeClaudeManagedAccountIdsByRuntime: { host: null, wsl: { Ubuntu: null } }
-    }
-    const store = {
-      getSettings: vi.fn(() => settings),
-      updateSettings: vi.fn()
-    }
-    const runtimeAuth = {
-      syncForCurrentSelection: vi.fn(async () => {}),
-      forceMaterializeCurrentSelectionForRollback: vi.fn(async () => {})
-    }
-    const rateLimits = {
-      refreshForClaudeAccountChange: vi.fn(async () => ({ accounts: [], activeAccountId: null }))
-    }
-    const { ClaudeAccountService } = await import('./service')
-    const service = new ClaudeAccountService(
-      store as never,
-      rateLimits as never,
-      runtimeAuth as never
-    )
-
-    await expect(
-      service.selectAccountForTarget('wsl-account', { runtime: 'host' })
-    ).rejects.toThrow('different runtime')
-    expect(runtimeAuth.syncForCurrentSelection).not.toHaveBeenCalled()
-    expect(rateLimits.refreshForClaudeAccountChange).not.toHaveBeenCalled()
-  })
-
-  it('removes a WSL account without clearing the Windows active account', async () => {
-    setPlatform('linux')
-    tempDir = CLAUDE_SERVICE_TEST_ROOT
-    rmSync(tempDir, { recursive: true, force: true })
-    const hostAuthPath = join(tempDir, 'claude-accounts', 'host-account', 'auth')
-    const wslAuthPath = join(tempDir, 'claude-accounts', 'wsl-account', 'auth')
-    mkdirSync(hostAuthPath, { recursive: true })
-    mkdirSync(wslAuthPath, { recursive: true })
-    writeFileSync(join(wslAuthPath, '.orca-managed-claude-auth'), 'wsl-account\n', 'utf-8')
-    let settings = {
-      claudeManagedAccounts: [
-        {
-          id: 'host-account',
-          email: 'host@example.com',
-          managedAuthPath: hostAuthPath,
-          managedAuthRuntime: 'host',
-          wslDistro: null,
-          wslLinuxAuthPath: null,
-          authMethod: 'subscription-oauth',
-          organizationUuid: null,
-          organizationName: null,
-          createdAt: 1,
-          updatedAt: 1,
-          lastAuthenticatedAt: 1
-        },
-        {
-          id: 'wsl-account',
-          email: 'wsl@example.com',
-          managedAuthPath: wslAuthPath,
-          managedAuthRuntime: 'wsl',
-          wslDistro: 'Ubuntu',
-          wslLinuxAuthPath: '/home/jin/.local/share/orca/claude-accounts/wsl-account/auth',
-          authMethod: 'subscription-oauth',
-          organizationUuid: null,
-          organizationName: null,
-          createdAt: 1,
-          updatedAt: 1,
-          lastAuthenticatedAt: 1
-        }
-      ],
-      activeClaudeManagedAccountId: 'host-account',
-      activeClaudeManagedAccountIdsByRuntime: {
-        host: 'host-account',
-        wsl: { Ubuntu: 'wsl-account' }
-      }
-    }
-    const store = {
-      getSettings: vi.fn(() => settings),
-      updateSettings: vi.fn((updates: Partial<typeof settings>) => {
-        settings = { ...settings, ...updates }
-        return settings
-      })
-    }
-    const runtimeAuth = {
-      syncForCurrentSelection: vi.fn(async () => {}),
-      forceMaterializeCurrentSelectionForRollback: vi.fn(async () => {})
-    }
-    const rateLimits = {
-      evictInactiveClaudeCache: vi.fn(),
-      refreshForClaudeAccountChange: vi.fn(async () => ({ accounts: [], activeAccountId: null }))
-    }
-    const { ClaudeAccountService } = await import('./service')
-    const service = new ClaudeAccountService(
-      store as never,
-      rateLimits as never,
-      runtimeAuth as never
-    )
-
-    await service.removeAccount('wsl-account')
-
-    expect(settings.activeClaudeManagedAccountId).toBe('host-account')
-    expect(settings.activeClaudeManagedAccountIdsByRuntime).toEqual({
-      host: 'host-account',
-      wsl: { Ubuntu: null }
-    })
-    expect(rateLimits.evictInactiveClaudeCache).toHaveBeenCalledWith('wsl-account')
-    expect(rateLimits.refreshForClaudeAccountChange).toHaveBeenCalledWith('wsl-account', {
-      runtime: 'wsl',
-      wslDistro: 'Ubuntu'
-    })
-  })
-})
diff --git a/src/main/claude-accounts/claude-account-service-add-account.test.ts b/src/main/claude-accounts/claude-account-service-add-account.test.ts
deleted file mode 100644
index 3e17f4c00ebb..000000000000
--- a/src/main/claude-accounts/claude-account-service-add-account.test.ts
+++ /dev/null
@@ -1,373 +0,0 @@
-import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest'
-import { mkdirSync, readdirSync, readFileSync, rmSync, writeFileSync } from 'node:fs'
-import { tmpdir } from 'node:os'
-import { join } from 'node:path'
-import {
-  resetClaudeKeychainMocks,
-  restorePlatform,
-  setPlatform
-} from './claude-account-service-test-harness'
-
-const CLAUDE_SERVICE_TEST_ROOT = join(tmpdir(), 'orca-claude-service-add-test')
-
-vi.mock('electron', () => ({
-  app: {
-    getPath: () => CLAUDE_SERVICE_TEST_ROOT
-  }
-}))
-
-const commandMocks = vi.hoisted(() => ({
-  resolveClaudeCommand: vi.fn(() => 'claude')
-}))
-
-vi.mock('../codex-cli/command', () => ({
-  resolveClaudeCommand: commandMocks.resolveClaudeCommand
-}))
-
-vi.mock('./keychain', () => ({
-  deleteActiveClaudeKeychainCredentialsStrict: vi.fn(async () => {}),
-  deleteManagedClaudeKeychainCredentials: vi.fn(async () => {}),
-  readActiveClaudeKeychainCredentials: vi.fn(),
-  readActiveClaudeKeychainCredentialsStrict: vi.fn(),
-  readManagedClaudeKeychainCredentials: vi.fn(),
-  writeActiveClaudeKeychainCredentials: vi.fn(async () => {}),
-  writeManagedClaudeKeychainCredentials: vi.fn(async () => {})
-}))
-
-describe('ClaudeAccountService credential capture', () => {
-  let tempDir: string | null = null
-
-  beforeEach(() => {
-    setPlatform('darwin')
-    tempDir = null
-    resetClaudeKeychainMocks()
-  })
-
-  afterEach(() => {
-    restorePlatform()
-    if (tempDir) {
-      rmSync(tempDir, { recursive: true, force: true })
-    }
-  })
-
-  it('adds an account without switching the active Claude auth while PTYs are live', async () => {
-    setPlatform('linux')
-    tempDir = CLAUDE_SERVICE_TEST_ROOT
-    rmSync(tempDir, { recursive: true, force: true })
-    const hostAuthPath = join(tempDir, 'claude-accounts', 'host-account', 'auth')
-    mkdirSync(hostAuthPath, { recursive: true })
-    let settings = {
-      claudeManagedAccounts: [
-        {
-          id: 'host-account',
-          email: 'host@example.com',
-          managedAuthPath: hostAuthPath,
-          managedAuthRuntime: 'host',
-          wslDistro: null,
-          wslLinuxAuthPath: null,
-          authMethod: 'subscription-oauth',
-          organizationUuid: null,
-          organizationName: null,
-          createdAt: 1,
-          updatedAt: 1,
-          lastAuthenticatedAt: 1
-        }
-      ],
-      activeClaudeManagedAccountId: 'host-account',
-      activeClaudeManagedAccountIdsByRuntime: { host: 'host-account', wsl: { Ubuntu: null } }
-    }
-    const store = {
-      getSettings: vi.fn(() => settings),
-      updateSettings: vi.fn((updates: Partial<typeof settings>) => {
-        settings = { ...settings, ...updates }
-        return settings
-      })
-    }
-    const runtimeAuth = {
-      clearLastWrittenCredentialsJson: vi.fn(),
-      syncForCurrentSelection: vi.fn(async () => {}),
-      forceMaterializeCurrentSelectionForRollback: vi.fn(async () => {})
-    }
-    const rateLimits = {
-      evictInactiveClaudeCache: vi.fn(),
-      refreshForClaudeAccountChange: vi.fn(async () => ({ accounts: [], activeAccountId: null }))
-    }
-    const { ClaudeAccountService } = await import('./service')
-    const { markClaudePtyExited, markClaudePtySpawned } = await import('./live-pty-gate')
-    const service = new ClaudeAccountService(
-      store as never,
-      rateLimits as never,
-      runtimeAuth as never
-    )
-    ;(
-      service as unknown as {
-        runClaudeLoginAndCapture(): Promise<{
-          credentialsJson: string
-          oauthAccount: unknown
-          identity: { email: string; organizationUuid: null; organizationName: null }
-        }>
-      }
-    ).runClaudeLoginAndCapture = vi.fn(async () => ({
-      credentialsJson: '{"new":true}\n',
-      oauthAccount: { newOauth: true },
-      identity: { email: 'new@example.com', organizationUuid: null, organizationName: null }
-    }))
-
-    markClaudePtySpawned('live-claude-pty')
-    try {
-      await service.addAccount({ runtime: 'host' })
-    } finally {
-      markClaudePtyExited('live-claude-pty')
-    }
-
-    expect(settings.claudeManagedAccounts).toHaveLength(2)
-    expect(settings.claudeManagedAccounts[1].email).toBe('new@example.com')
-    expect(settings.activeClaudeManagedAccountId).toBe('host-account')
-    expect(settings.activeClaudeManagedAccountIdsByRuntime).toEqual({
-      host: 'host-account',
-      wsl: { Ubuntu: null }
-    })
-    expect(runtimeAuth.syncForCurrentSelection).not.toHaveBeenCalled()
-    expect(rateLimits.refreshForClaudeAccountChange).not.toHaveBeenCalled()
-    expect(rateLimits.evictInactiveClaudeCache).toHaveBeenCalledWith(
-      settings.claudeManagedAccounts[1].id
-    )
-  })
-
-  it('reports the original add failure and still removes managed auth when rollback rematerialization fails', async () => {
-    // Why: this is the desktop add path. Previously the rollback's rematerialize
-    // was unguarded, so when it threw it replaced the real add error and skipped
-    // safeRemoveManagedAuth, leaking the throwaway auth dir.
-    setPlatform('linux')
-    tempDir = CLAUDE_SERVICE_TEST_ROOT
-    rmSync(tempDir, { recursive: true, force: true })
-    const hostAuthPath = join(tempDir, 'claude-accounts', 'host-account', 'auth')
-    mkdirSync(hostAuthPath, { recursive: true })
-    const warn = vi.spyOn(console, 'warn').mockImplementation(() => {})
-    let settings = {
-      claudeManagedAccounts: [
-        {
-          id: 'host-account',
-          email: 'host@example.com',
-          managedAuthPath: hostAuthPath,
-          managedAuthRuntime: 'host',
-          wslDistro: null,
-          wslLinuxAuthPath: null,
-          authMethod: 'subscription-oauth',
-          organizationUuid: null,
-          organizationName: null,
-          createdAt: 1,
-          updatedAt: 1,
-          lastAuthenticatedAt: 1
-        }
-      ],
-      activeClaudeManagedAccountId: 'host-account',
-      activeClaudeManagedAccountIdsByRuntime: { host: 'host-account', wsl: { Ubuntu: null } }
-    }
-    const store = {
-      getSettings: vi.fn(() => settings),
-      updateSettings: vi.fn((updates: Partial<typeof settings>) => {
-        settings = { ...settings, ...updates }
-        return settings
-      })
-    }
-    const runtimeAuth = {
-      clearLastWrittenCredentialsJson: vi.fn(),
-      syncForCurrentSelection: vi.fn(async () => {}),
-      forceMaterializeCurrentSelectionForRollback: vi.fn(async () => {
-        throw new Error('rematerialize failed')
-      })
-    }
-    const rateLimits = {
-      evictInactiveClaudeCache: vi.fn(),
-      refreshForClaudeAccountChange: vi.fn(async () => ({ accounts: [], activeAccountId: null }))
-    }
-    const { ClaudeAccountService } = await import('./service')
-    const service = new ClaudeAccountService(
-      store as never,
-      rateLimits as never,
-      runtimeAuth as never
-    )
-    ;(
-      service as unknown as {
-        runClaudeLoginAndCapture(): Promise<{
-          credentialsJson: string
-          oauthAccount: unknown
-          identity: { email: string; organizationUuid: null; organizationName: null }
-        }>
-      }
-    ).runClaudeLoginAndCapture = vi.fn(async () => ({
-      credentialsJson: '{"new":true}\n',
-      oauthAccount: null,
-      identity: { email: 'new@example.com', organizationUuid: null, organizationName: null }
-    }))
-    ;(service as unknown as { writeManagedAuth(): Promise<void> }).writeManagedAuth = vi.fn(
-      async () => {
-        throw new Error('managed auth write failed')
-      }
-    )
-
-    await expect(service.addAccount({ runtime: 'host' })).rejects.toThrow(
-      'managed auth write failed'
-    )
-
-    expect(runtimeAuth.forceMaterializeCurrentSelectionForRollback).toHaveBeenCalled()
-    expect(settings.claudeManagedAccounts).toHaveLength(1)
-    // Why: the throwaway account directory must be gone even though rollback threw.
-    expect(readdirSync(join(tempDir, 'claude-accounts'))).toEqual(['host-account'])
-    warn.mockRestore()
-  })
-
-  it('rejects adding a Claude account whose identity already exists', async () => {
-    setPlatform('linux')
-    tempDir = CLAUDE_SERVICE_TEST_ROOT
-    rmSync(tempDir, { recursive: true, force: true })
-    const existingAuthPath = join(tempDir, 'claude-accounts', 'existing-account', 'auth')
-    mkdirSync(existingAuthPath, { recursive: true })
-    const existingMarkerPath = join(existingAuthPath, '.orca-managed-claude-auth')
-    writeFileSync(existingMarkerPath, 'existing-account\n', 'utf-8')
-    let settings = {
-      claudeManagedAccounts: [
-        {
-          id: 'existing-account',
-          email: 'new@example.com',
-          managedAuthPath: existingAuthPath,
-          managedAuthRuntime: 'host',
-          wslDistro: null,
-          wslLinuxAuthPath: null,
-          authMethod: 'subscription-oauth',
-          organizationUuid: null,
-          organizationName: null,
-          createdAt: 1,
-          updatedAt: 1,
-          lastAuthenticatedAt: 1
-        }
-      ],
-      activeClaudeManagedAccountId: 'existing-account',
-      activeClaudeManagedAccountIdsByRuntime: { host: 'existing-account', wsl: {} }
-    }
-    const store = {
-      getSettings: vi.fn(() => settings),
-      updateSettings: vi.fn((updates: Partial<typeof settings>) => {
-        settings = { ...settings, ...updates }
-        return settings
-      })
-    }
-    const runtimeAuth = {
-      clearLastWrittenCredentialsJson: vi.fn(),
-      syncForCurrentSelection: vi.fn(async () => {}),
-      forceMaterializeCurrentSelectionForRollback: vi.fn(async () => {})
-    }
-    const rateLimits = {
-      evictInactiveClaudeCache: vi.fn(),
-      refreshForClaudeAccountChange: vi.fn(async () => ({ accounts: [], activeAccountId: null }))
-    }
-    const { ClaudeAccountService } = await import('./service')
-    const service = new ClaudeAccountService(
-      store as never,
-      rateLimits as never,
-      runtimeAuth as never
-    )
-    ;(
-      service as unknown as {
-        runClaudeLoginAndCapture(): Promise<{
-          credentialsJson: string
-          oauthAccount: unknown
-          identity: { email: string; organizationUuid: string | null; organizationName: null }
-        }>
-      }
-    ).runClaudeLoginAndCapture = vi.fn(async () => ({
-      credentialsJson: '{"new":true}\n',
-      oauthAccount: { newOauth: true },
-      identity: { email: 'new@example.com', organizationUuid: null, organizationName: null }
-    }))
-
-    await expect(service.addAccount({ runtime: 'host' })).rejects.toThrow(
-      'This Claude account is already added.'
-    )
-
-    expect(settings.claudeManagedAccounts).toHaveLength(1)
-    expect(readFileSync(existingMarkerPath, 'utf-8')).toBe('existing-account\n')
-    // The guard fires before credentials/settings change, so rollback I/O
-    // would only add latency and could mask the duplicate error.
-    expect(store.updateSettings).not.toHaveBeenCalled()
-    expect(runtimeAuth.forceMaterializeCurrentSelectionForRollback).not.toHaveBeenCalled()
-    // The rejected add's throwaway managed-auth dir must be cleaned up, leaving
-    // only the pre-existing account's dir behind.
-    expect(readdirSync(join(tempDir, 'claude-accounts')).sort()).toEqual(['existing-account'])
-  })
-
-  it('adds a Claude account with the same email under a different organization', async () => {
-    setPlatform('linux')
-    tempDir = CLAUDE_SERVICE_TEST_ROOT
-    rmSync(tempDir, { recursive: true, force: true })
-    const existingAuthPath = join(tempDir, 'claude-accounts', 'existing-account', 'auth')
-    mkdirSync(existingAuthPath, { recursive: true })
-    writeFileSync(
-      join(existingAuthPath, '.orca-managed-claude-auth'),
-      'existing-account\n',
-      'utf-8'
-    )
-    let settings = {
-      claudeManagedAccounts: [
-        {
-          id: 'existing-account',
-          email: 'new@example.com',
-          managedAuthPath: existingAuthPath,
-          managedAuthRuntime: 'host',
-          wslDistro: null,
-          wslLinuxAuthPath: null,
-          authMethod: 'subscription-oauth',
-          organizationUuid: 'org-A',
-          organizationName: null,
-          createdAt: 1,
-          updatedAt: 1,
-          lastAuthenticatedAt: 1
-        }
-      ],
-      activeClaudeManagedAccountId: 'existing-account',
-      activeClaudeManagedAccountIdsByRuntime: { host: 'existing-account', wsl: {} }
-    }
-    const store = {
-      getSettings: vi.fn(() => settings),
-      updateSettings: vi.fn((updates: Partial<typeof settings>) => {
-        settings = { ...settings, ...updates }
-        return settings
-      })
-    }
-    const runtimeAuth = {
-      clearLastWrittenCredentialsJson: vi.fn(),
-      syncForCurrentSelection: vi.fn(async () => {}),
-      forceMaterializeCurrentSelectionForRollback: vi.fn(async () => {})
-    }
-    const rateLimits = {
-      evictInactiveClaudeCache: vi.fn(),
-      refreshForClaudeAccountChange: vi.fn(async () => ({ accounts: [], activeAccountId: null }))
-    }
-    const { ClaudeAccountService } = await import('./service')
-    const service = new ClaudeAccountService(
-      store as never,
-      rateLimits as never,
-      runtimeAuth as never
-    )
-    ;(
-      service as unknown as {
-        runClaudeLoginAndCapture(): Promise<{
-          credentialsJson: string
-          oauthAccount: unknown
-          identity: { email: string; organizationUuid: string | null; organizationName: null }
-        }>
-      }
-    ).runClaudeLoginAndCapture = vi.fn(async () => ({
-      credentialsJson: '{"new":true}\n',
-      oauthAccount: { newOauth: true },
-      identity: { email: 'new@example.com', organizationUuid: 'org-B', organizationName: null }
-    }))
-
-    await service.addAccount({ runtime: 'host' })
-
-    expect(settings.claudeManagedAccounts).toHaveLength(2)
-    expect(settings.claudeManagedAccounts[1].email).toBe('new@example.com')
-    expect(settings.claudeManagedAccounts[1].organizationUuid).toBe('org-B')
-  })
-})
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
deleted file mode 100644
index 09ec7813ffe8..000000000000
--- a/src/main/claude-accounts/claude-account-service-api-parity.test.ts
+++ /dev/null
@@ -1,90 +0,0 @@
-import { describe, expect, it, vi } from 'vitest'
-import type { ClaudeRateLimitAccountsState } from '../../shared/managed-account-types'
-import { ClaudeAccountService } from './service'
-import type { ClaudeAccountAddTarget } from './service'
-
-vi.mock('electron', () => ({ app: { getPath: () => '/tmp/orca-claude-api-parity' } }))
-
-function createService(): ClaudeAccountService {
-  const settings = {
-    claudeManagedAccounts: [],
-    activeClaudeManagedAccountId: null,
-    activeClaudeManagedAccountIdsByRuntime: { host: null, wsl: {} }
-  }
-  return new ClaudeAccountService(
-    { getSettings: () => settings, updateSettings: vi.fn() } as never,
-    {} as never,
-    { getRuntimeConfigDir: () => '/tmp/claude' } as never
-  )
-}
-
-function deferred(): { promise: Promise<void>; resolve: () => void } {
-  let resolve!: () => void
-  return { promise: new Promise<void>((done) => (resolve = done)), resolve }
-}
-
-describe('ClaudeAccountService mutation serialization', () => {
-  it('serializes mutations within one service', async () => {
-    const service = createService()
-    const first = deferred()
-    const calls: string[] = []
-    const registration = (
-      service as unknown as {
-        registration: {
-          add(target?: ClaudeAccountAddTarget): Promise<ClaudeRateLimitAccountsState>
-        }
-      }
-    ).registration
-    registration.add = vi.fn(async (target) => {
-      calls.push(target?.wslDistro ?? 'host')
-      if (calls.length === 1) {
-        await first.promise
-      }
-      return {
-        accounts: [],
-        activeAccountId: null,
-        activeAccountIdsByRuntime: { host: null, wsl: {} }
-      }
-    })
-
-    const firstAdd = service.addAccount({ runtime: 'wsl', wslDistro: 'one' })
-    const secondAdd = service.addAccount({ runtime: 'wsl', wslDistro: 'two' })
-    await vi.waitFor(() => expect(calls).toEqual(['one']))
-    first.resolve()
-    await Promise.all([firstAdd, secondAdd])
-    expect(calls).toEqual(['one', 'two'])
-  })
-
-  it('isolates mutation and cancellation state between runtime hosts', async () => {
-    const firstService = createService()
-    const secondService = createService()
-    const first = deferred()
-    const firstAdd = vi.fn(async () => {
-      await first.promise
-      return {
-        accounts: [],
-        activeAccountId: null,
-        activeAccountIdsByRuntime: { host: null, wsl: {} }
-      }
-    })
-    const secondAdd = vi.fn(async () => ({
-      accounts: [],
-      activeAccountId: null,
-      activeAccountIdsByRuntime: { host: null, wsl: {} }
-    }))
-    ;(firstService as unknown as { registration: { add: typeof firstAdd } }).registration.add =
-      firstAdd
-    ;(secondService as unknown as { registration: { add: typeof secondAdd } }).registration.add =
-      secondAdd
-    ;(
-      firstService as unknown as { cancelPendingClaudeLogin: () => boolean }
-    ).cancelPendingClaudeLogin = vi.fn(() => true)
-
-    const pendingFirst = firstService.addAccount()
-    await expect(secondService.addAccount()).resolves.toMatchObject({ accounts: [] })
-    expect(firstService.cancelPendingLogin()).toBe(true)
-    expect(secondService.cancelPendingLogin()).toBe(false)
-    first.resolve()
-    await pendingFirst
-  })
-})
diff --git a/src/main/claude-accounts/claude-account-service-config-dir-capture.test.ts b/src/main/claude-accounts/claude-account-service-config-dir-capture.test.ts
deleted file mode 100644
index 8ed94bebc6eb..000000000000
--- a/src/main/claude-accounts/claude-account-service-config-dir-capture.test.ts
+++ /dev/null
@@ -1,250 +0,0 @@
-import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest'
-import { createHash } from 'node:crypto'
-import { mkdtempSync, readFileSync, rmSync, writeFileSync } from 'node:fs'
-import { tmpdir } from 'node:os'
-import { join } from 'node:path'
-import type { ClaudeManagedAccount } from '../../shared/managed-account-types'
-import {
-  readActiveClaudeKeychainCredentialsStrict,
-  writeManagedClaudeKeychainCredentials
-} from './keychain'
-import { restorePlatform, setPlatform } from './claude-account-service-test-harness'
-
-const CLAUDE_SERVICE_TEST_ROOT = join(tmpdir(), 'orca-claude-service-config-dir-test')
-
-vi.mock('electron', () => ({
-  app: {
-    getPath: () => CLAUDE_SERVICE_TEST_ROOT
-  }
-}))
-
-const commandMocks = vi.hoisted(() => ({
-  resolveClaudeCommand: vi.fn(() => 'claude')
-}))
-
-vi.mock('../codex-cli/command', () => ({
-  resolveClaudeCommand: commandMocks.resolveClaudeCommand
-}))
-
-vi.mock('./keychain', () => ({
-  deleteActiveClaudeKeychainCredentialsStrict: vi.fn(async () => {}),
-  deleteManagedClaudeKeychainCredentials: vi.fn(async () => {}),
-  readActiveClaudeKeychainCredentials: vi.fn(),
-  readActiveClaudeKeychainCredentialsStrict: vi.fn(),
-  readManagedClaudeKeychainCredentials: vi.fn(),
-  writeActiveClaudeKeychainCredentials: vi.fn(async () => {}),
-  writeManagedClaudeKeychainCredentials: vi.fn(async () => {})
-}))
-
-describe('ClaudeAccountService.addAccountFromConfigDir', () => {
-  const managedRoot = CLAUDE_SERVICE_TEST_ROOT
-  let sourceDir: string | null = null
-
-  beforeEach(() => {
-    setPlatform('linux')
-    rmSync(managedRoot, { recursive: true, force: true })
-    sourceDir = null
-    vi.mocked(readActiveClaudeKeychainCredentialsStrict).mockReset()
-    vi.mocked(writeManagedClaudeKeychainCredentials).mockReset().mockResolvedValue()
-  })
-
-  afterEach(() => {
-    restorePlatform()
-    rmSync(managedRoot, { recursive: true, force: true })
-    if (sourceDir) {
-      rmSync(sourceDir, { recursive: true, force: true })
-    }
-  })
-
-  function makeDeps() {
-    let settings = {
-      claudeManagedAccounts: [] as ClaudeManagedAccount[],
-      activeClaudeManagedAccountId: null as string | null,
-      activeClaudeManagedAccountIdsByRuntime: { host: null as string | null, wsl: {} }
-    }
-    const store = {
-      getSettings: vi.fn(() => settings),
-      updateSettings: vi.fn((updates: Partial<typeof settings>) => {
-        settings = { ...settings, ...updates }
-        return settings
-      })
-    }
-    const rateLimits = { evictInactiveClaudeCache: vi.fn() }
-    const runtimeAuth = {
-      clearLastWrittenCredentialsJson: vi.fn(),
-      forceMaterializeCurrentSelectionForRollback: vi.fn(async () => {})
-    }
-    return { store, rateLimits, runtimeAuth, getSettings: () => settings }
-  }
-
-  it('registers a managed account by capturing an authenticated config dir', async () => {
-    sourceDir = mkdtempSync(join(tmpdir(), 'orca-claude-source-'))
-    writeFileSync(
-      join(sourceDir, '.credentials.json'),
-      '{"claudeAiOauth":{"accessToken":"tok"}}\n',
-      'utf-8'
-    )
-    writeFileSync(
-      join(sourceDir, '.claude.json'),
-      JSON.stringify({ oauthAccount: { emailAddress: 'new@example.com' } }),
-      'utf-8'
-    )
-
-    const deps = makeDeps()
-    const { ClaudeAccountService } = await import('./service')
-    const service = new ClaudeAccountService(
-      deps.store as never,
-      deps.rateLimits as never,
-      deps.runtimeAuth as never
-    )
-    // Why: avoid spawning a real `claude auth status` subprocess in the test.
-    ;(service as unknown as { runClaudeCommand: () => Promise<string> }).runClaudeCommand = vi.fn(
-      async () => '{"email":"new@example.com"}'
-    )
-
-    const result = await service.addAccountFromConfigDir(sourceDir)
-
-    const accounts = deps.getSettings().claudeManagedAccounts
-    expect(accounts).toHaveLength(1)
-    expect(accounts[0].email).toBe('new@example.com')
-    expect(result.accounts[0]?.email).toBe('new@example.com')
-    expect(readFileSync(join(accounts[0].managedAuthPath, '.credentials.json'), 'utf-8')).toBe(
-      '{"claudeAiOauth":{"accessToken":"tok"}}\n'
-    )
-    expect(deps.runtimeAuth.clearLastWrittenCredentialsJson).toHaveBeenCalledWith(accounts[0].id)
-  })
-
-  it('captures only the config-scoped macOS Keychain credential', async () => {
-    setPlatform('darwin')
-    sourceDir = mkdtempSync(join(tmpdir(), 'orca-claude-source-keychain-'))
-    vi.mocked(readActiveClaudeKeychainCredentialsStrict).mockImplementation(async (configDir) =>
-      configDir ? '{"claudeAiOauth":{"accessToken":"scoped"}}' : 'legacy-credentials'
-    )
-    const deps = makeDeps()
-    const { ClaudeAccountService } = await import('./service')
-    const service = new ClaudeAccountService(
-      deps.store as never,
-      deps.rateLimits as never,
-      deps.runtimeAuth as never
-    )
-    ;(service as unknown as { runClaudeCommand: () => Promise<string> }).runClaudeCommand = vi.fn(
-      async () => '{"email":"new@example.com"}'
-    )
-
-    await service.addAccountFromConfigDir(sourceDir)
-
-    expect(readActiveClaudeKeychainCredentialsStrict).toHaveBeenCalledWith(sourceDir)
-    expect(writeManagedClaudeKeychainCredentials).toHaveBeenCalledWith(
-      expect.any(String),
-      '{"claudeAiOauth":{"accessToken":"scoped"}}'
-    )
-  })
-
-  it('does not mistake an unchanged legacy Keychain credential for the temp login', async () => {
-    setPlatform('darwin')
-    sourceDir = mkdtempSync(join(tmpdir(), 'orca-claude-source-keychain-empty-'))
-    vi.mocked(readActiveClaudeKeychainCredentialsStrict).mockImplementation(async (configDir) =>
-      configDir ? null : 'legacy-credentials'
-    )
-    const deps = makeDeps()
-    const { ClaudeAccountService } = await import('./service')
-    const service = new ClaudeAccountService(
-      deps.store as never,
-      deps.rateLimits as never,
-      deps.runtimeAuth as never
-    )
-    ;(service as unknown as { runClaudeCommand: () => Promise<string> }).runClaudeCommand = vi.fn(
-      async () => '{"email":"existing@example.com"}'
-    )
-
-    await expect(service.addAccountFromConfigDir(sourceDir)).rejects.toThrow(
-      'no OAuth credentials were captured'
-    )
-    expect(deps.getSettings().claudeManagedAccounts).toHaveLength(0)
-  })
-
-  it('captures a legacy Keychain credential that changed after login began', async () => {
-    setPlatform('darwin')
-    sourceDir = mkdtempSync(join(tmpdir(), 'orca-claude-source-keychain-legacy-'))
-    const previousCredentials = '{"claudeAiOauth":{"accessToken":"previous"}}'
-    const newCredentials = '{"claudeAiOauth":{"accessToken":"new","email":"new@example.com"}}'
-    vi.mocked(readActiveClaudeKeychainCredentialsStrict).mockImplementation(async (configDir) =>
-      configDir ? null : newCredentials
-    )
-    const deps = makeDeps()
-    const { ClaudeAccountService } = await import('./service')
-    const service = new ClaudeAccountService(
-      deps.store as never,
-      deps.rateLimits as never,
-      deps.runtimeAuth as never
-    )
-    ;(service as unknown as { runClaudeCommand: () => Promise<string> }).runClaudeCommand = vi.fn(
-      async () => '{"email":"new@example.com"}'
-    )
-
-    await service.addAccountFromConfigDir(sourceDir, {
-      previousLegacyCredentialsSha256: createHash('sha256')
-        .update(previousCredentials)
-        .digest('hex')
-    })
-
-    expect(writeManagedClaudeKeychainCredentials).toHaveBeenCalledWith(
-      expect.any(String),
-      newCredentials
-    )
-    expect(deps.getSettings().claudeManagedAccounts[0]?.email).toBe('new@example.com')
-  })
-
-  it('still registers when the daemon cannot spawn `claude auth status`', async () => {
-    // Why: `allowFailure` covers a non-zero exit but not a spawn error, so a daemon
-    // started with a minimal PATH would hard-fail an add the user already signed in for.
-    sourceDir = mkdtempSync(join(tmpdir(), 'orca-claude-source-nostatus-'))
-    writeFileSync(
-      join(sourceDir, '.credentials.json'),
-      '{"claudeAiOauth":{"accessToken":"tok"}}\n',
-      'utf-8'
-    )
-    writeFileSync(
-      join(sourceDir, '.claude.json'),
-      JSON.stringify({ oauthAccount: { emailAddress: 'new@example.com' } }),
-      'utf-8'
-    )
-
-    const warn = vi.spyOn(console, 'warn').mockImplementation(() => {})
-    const deps = makeDeps()
-    const { ClaudeAccountService } = await import('./service')
-    const service = new ClaudeAccountService(
-      deps.store as never,
-      deps.rateLimits as never,
-      deps.runtimeAuth as never
-    )
-    ;(service as unknown as { runClaudeCommand: () => Promise<string> }).runClaudeCommand = vi.fn(
-      async () => {
-        throw Object.assign(new Error('spawn claude ENOENT'), { code: 'ENOENT' })
-      }
-    )
-
-    const result = await service.addAccountFromConfigDir(sourceDir)
-
-    expect(result.accounts[0]?.email).toBe('new@example.com')
-    expect(deps.getSettings().claudeManagedAccounts).toHaveLength(1)
-    warn.mockRestore()
-  })
-
-  it('rejects and rolls back when the config dir has no credentials', async () => {
-    sourceDir = mkdtempSync(join(tmpdir(), 'orca-claude-source-empty-'))
-    const deps = makeDeps()
-    const { ClaudeAccountService } = await import('./service')
-    const service = new ClaudeAccountService(
-      deps.store as never,
-      deps.rateLimits as never,
-      deps.runtimeAuth as never
-    )
-
-    await expect(service.addAccountFromConfigDir(sourceDir)).rejects.toThrow(
-      /No Claude credentials found/
-    )
-    expect(deps.getSettings().claudeManagedAccounts).toHaveLength(0)
-    expect(deps.runtimeAuth.forceMaterializeCurrentSelectionForRollback).toHaveBeenCalled()
-  })
-})
diff --git a/src/main/claude-accounts/claude-account-service-credential-capture.test.ts b/src/main/claude-accounts/claude-account-service-credential-capture.test.ts
deleted file mode 100644
index 641ef58b5bee..000000000000
--- a/src/main/claude-accounts/claude-account-service-credential-capture.test.ts
+++ /dev/null
@@ -1,150 +0,0 @@
-import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest'
-import { mkdtempSync, rmSync, writeFileSync } from 'node:fs'
-import { tmpdir } from 'node:os'
-import { join } from 'node:path'
-import {
-  readActiveClaudeKeychainCredentials,
-  readActiveClaudeKeychainCredentialsStrict,
-  writeActiveClaudeKeychainCredentials
-} from './keychain'
-import {
-  createService,
-  resetClaudeKeychainMocks,
-  restorePlatform,
-  setPlatform
-} from './claude-account-service-test-harness'
-
-const CLAUDE_SERVICE_TEST_ROOT = join(tmpdir(), 'orca-claude-service-capture-test')
-
-vi.mock('electron', () => ({
-  app: {
-    getPath: () => CLAUDE_SERVICE_TEST_ROOT
-  }
-}))
-
-const commandMocks = vi.hoisted(() => ({
-  resolveClaudeCommand: vi.fn(() => 'claude')
-}))
-
-vi.mock('../codex-cli/command', () => ({
-  resolveClaudeCommand: commandMocks.resolveClaudeCommand
-}))
-
-vi.mock('./keychain', () => ({
-  deleteActiveClaudeKeychainCredentialsStrict: vi.fn(async () => {}),
-  deleteManagedClaudeKeychainCredentials: vi.fn(async () => {}),
-  readActiveClaudeKeychainCredentials: vi.fn(),
-  readActiveClaudeKeychainCredentialsStrict: vi.fn(),
-  readManagedClaudeKeychainCredentials: vi.fn(),
-  writeActiveClaudeKeychainCredentials: vi.fn(async () => {}),
-  writeManagedClaudeKeychainCredentials: vi.fn(async () => {})
-}))
-
-async function readCapturedCredentials(
-  configDir: string,
-  previousLegacyKeychain: string | null
-): Promise<string | null> {
-  const { ClaudeAccountService } = await import('./service')
-  const service = new ClaudeAccountService(
-    createService() as never,
-    createService() as never,
-    createService() as never
-  )
-  return (
-    service as unknown as {
-      readCapturedCredentials(
-        configDir: string,
-        previousLegacyKeychain: string | null
-      ): Promise<string | null>
-    }
-  ).readCapturedCredentials(configDir, previousLegacyKeychain)
-}
-
-describe('ClaudeAccountService credential capture', () => {
-  let tempDir: string | null = null
-
-  beforeEach(() => {
-    setPlatform('darwin')
-    tempDir = null
-    resetClaudeKeychainMocks()
-  })
-
-  afterEach(() => {
-    restorePlatform()
-    if (tempDir) {
-      rmSync(tempDir, { recursive: true, force: true })
-    }
-  })
-
-  it('accepts scoped Keychain capture even when it matches the previous legacy item', async () => {
-    vi.mocked(readActiveClaudeKeychainCredentialsStrict)
-      .mockResolvedValueOnce('same-account')
-      .mockResolvedValueOnce('same-account')
-
-    await expect(readCapturedCredentials('/tmp/claude-config', 'same-account')).resolves.toBe(
-      'same-account'
-    )
-
-    expect(readActiveClaudeKeychainCredentialsStrict).toHaveBeenCalledWith('/tmp/claude-config')
-    expect(readActiveClaudeKeychainCredentials).not.toHaveBeenCalled()
-  })
-
-  it('rejects unchanged legacy fallback when scoped capture is missing', async () => {
-    vi.mocked(readActiveClaudeKeychainCredentialsStrict)
-      .mockResolvedValueOnce(null)
-      .mockResolvedValueOnce('previous')
-
-    await expect(readCapturedCredentials('/tmp/claude-config', 'previous')).resolves.toBeNull()
-
-    expect(readActiveClaudeKeychainCredentialsStrict).toHaveBeenNthCalledWith(
-      1,
-      '/tmp/claude-config'
-    )
-    expect(readActiveClaudeKeychainCredentialsStrict).toHaveBeenNthCalledWith(2)
-  })
-
-  it('accepts changed legacy fallback for old Claude Code builds', async () => {
-    vi.mocked(readActiveClaudeKeychainCredentialsStrict)
-      .mockResolvedValueOnce(null)
-      .mockResolvedValueOnce('new-legacy')
-
-    await expect(readCapturedCredentials('/tmp/claude-config', 'previous')).resolves.toBe(
-      'new-legacy'
-    )
-
-    expect(readActiveClaudeKeychainCredentialsStrict).toHaveBeenNthCalledWith(
-      1,
-      '/tmp/claude-config'
-    )
-    expect(readActiveClaudeKeychainCredentialsStrict).toHaveBeenNthCalledWith(2)
-  })
-
-  it('falls back to captured credentials file on macOS', async () => {
-    tempDir = mkdtempSync(join(tmpdir(), 'orca-claude-capture-'))
-    writeFileSync(join(tempDir, '.credentials.json'), '{"token":"file"}\n', 'utf-8')
-    vi.mocked(readActiveClaudeKeychainCredentialsStrict)
-      .mockResolvedValueOnce(null)
-      .mockResolvedValueOnce('previous')
-
-    await expect(readCapturedCredentials(tempDir, 'previous')).resolves.toBe('{"token":"file"}\n')
-  })
-
-  it('fails login capture when legacy Keychain cleanup fails', async () => {
-    vi.mocked(readActiveClaudeKeychainCredentials).mockResolvedValue('previous-legacy')
-    vi.mocked(readActiveClaudeKeychainCredentialsStrict).mockResolvedValue('captured-scoped')
-    vi.mocked(writeActiveClaudeKeychainCredentials).mockRejectedValue(new Error('restore failed'))
-    const { ClaudeAccountService } = await import('./service')
-    const service = new ClaudeAccountService(
-      createService() as never,
-      createService() as never,
-      createService() as never
-    )
-    const testService = service as unknown as {
-      runClaudeCommand: () => Promise<string>
-      runClaudeLoginAndCapture(): Promise<{ credentialsJson: string }>
-    }
-    testService.runClaudeCommand = vi.fn(async () => '{"account":{"email":"user@example.com"}}')
-
-    await expect(testService.runClaudeLoginAndCapture()).rejects.toThrow('restore failed')
-  })
-})
diff --git a/src/main/claude-accounts/claude-account-service-login-process.test.ts b/src/main/claude-accounts/claude-account-service-login-process.test.ts
deleted file mode 100644
index 8aee047e5fa5..000000000000
--- a/src/main/claude-accounts/claude-account-service-login-process.test.ts
+++ /dev/null
@@ -1,684 +0,0 @@
-import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest'
-import { EventEmitter } from 'node:events'
-import { writeFileSync } from 'node:fs'
-import { tmpdir } from 'node:os'
-import { join } from 'node:path'
-import { PassThrough } from 'node:stream'
-import type { ClaudeManagedAccount } from '../../shared/managed-account-types'
-import { readActiveClaudeKeychainCredentials } from './keychain'
-import { getCmdExePath } from '../../shared/windows-batch-spawn'
-import {
-  createService,
-  resetClaudeKeychainMocks,
-  restorePlatform,
-  setPlatform
-} from './claude-account-service-test-harness'
-
-const CLAUDE_SERVICE_TEST_ROOT = join(tmpdir(), 'orca-claude-service-login-test')
-
-vi.mock('electron', () => ({
-  app: {
-    getPath: () => CLAUDE_SERVICE_TEST_ROOT
-  }
-}))
-
-const commandMocks = vi.hoisted(() => ({
-  resolveClaudeCommand: vi.fn(() => 'claude')
-}))
-
-vi.mock('../codex-cli/command', () => ({
-  resolveClaudeCommand: commandMocks.resolveClaudeCommand
-}))
-
-vi.mock('./keychain', () => ({
-  deleteActiveClaudeKeychainCredentialsStrict: vi.fn(async () => {}),
-  deleteManagedClaudeKeychainCredentials: vi.fn(async () => {}),
-  readActiveClaudeKeychainCredentials: vi.fn(),
-  readActiveClaudeKeychainCredentialsStrict: vi.fn(),
-  readManagedClaudeKeychainCredentials: vi.fn(),
-  writeActiveClaudeKeychainCredentials: vi.fn(async () => {}),
-  writeManagedClaudeKeychainCredentials: vi.fn(async () => {})
-}))
-
-// oxlint-disable-next-line typescript/consistent-type-assertions -- SAFETY: the doubles below implement every member the add-account login path reaches; this case drives the service only through addAccount.
-const asServiceDouble = <T>(double: unknown): T => double as T
-
-describe('ClaudeAccountService credential capture', () => {
-  beforeEach(() => {
-    setPlatform('darwin')
-    resetClaudeKeychainMocks()
-  })
-
-  afterEach(() => {
-    restorePlatform()
-  })
-
-  it('removes command listeners when Claude sign-in times out', async () => {
-    vi.resetModules()
-    vi.useFakeTimers()
-    const child = new EventEmitter() as EventEmitter & {
-      stdin: PassThrough
-      stdout: PassThrough
-      stderr: PassThrough
-      kill: () => void
-    }
-    child.stdin = new PassThrough()
-    child.stdout = new PassThrough()
-    child.stderr = new PassThrough()
-    child.kill = vi.fn()
-    const destroyStdin = vi.spyOn(child.stdin, 'destroy')
-    const spawnMock = vi.fn(() => child)
-    vi.doMock('node:child_process', () => ({ spawn: spawnMock }))
-
-    try {
-      const { ClaudeAccountService } = await import('./service')
-      const service = new ClaudeAccountService(
-        createService() as never,
-        createService() as never,
-        createService() as never
-      )
-      const commandPromise = (
-        service as unknown as {
-          runClaudeCommand(
-            args: string[],
-            configDir: { windowsPath: string; linuxPath: string | null; wslDistro: string | null },
-            timeoutMs: number,
-            options?: { keepStdinOpen?: boolean }
-          ): Promise<string>
-        }
-      ).runClaudeCommand(
-        ['login'],
-        { windowsPath: '/tmp/claude-auth', linuxPath: null, wslDistro: null },
-        1000,
-        { keepStdinOpen: true }
-      )
-      const rejection = expect(commandPromise).rejects.toThrow(
-        'Claude sign-in took too long to finish.'
-      )
-
-      await vi.advanceTimersByTimeAsync(1000)
-
-      await rejection
-      expect(child.kill).toHaveBeenCalledTimes(1)
-      expect(destroyStdin).toHaveBeenCalledTimes(1)
-      expect(child.stdout.listenerCount('data')).toBe(0)
-      expect(child.stderr.listenerCount('data')).toBe(0)
-      expect(child.listenerCount('error')).toBe(0)
-      expect(child.listenerCount('close')).toBe(0)
-    } finally {
-      vi.useRealTimers()
-      vi.doUnmock('node:child_process')
-    }
-  })
-
-  it('owns the complete cmd.exe command line for a resolved Windows Claude command', async () => {
-    setPlatform('win32')
-    vi.resetModules()
-    commandMocks.resolveClaudeCommand.mockReturnValueOnce(
-      'C:\\Users\\First Last\\AppData\\Roaming\\npm\\claude.cmd'
-    )
-    const child = new EventEmitter() as EventEmitter & {
-      stdout: PassThrough
-      stderr: PassThrough
-      kill: ReturnType<typeof vi.fn>
-    }
-    child.stdout = new PassThrough()
-    child.stderr = new PassThrough()
-    child.kill = vi.fn()
-    const spawnMock = vi.fn(() => {
-      child.stdout.write('{"email":"user@example.com"}\n')
-      queueMicrotask(() => child.emit('close', 0))
-      return child
-    })
-    vi.doMock('node:child_process', () => ({ spawn: spawnMock }))
-
-    try {
-      const { ClaudeAccountService } = await import('./service')
-      const service = new ClaudeAccountService(
-        createService() as never,
-        createService() as never,
-        createService() as never
-      )
-      await (
-        service as unknown as {
-          runClaudeCommand(
-            args: string[],
-            configDir: { windowsPath: string; linuxPath: string | null; wslDistro: string | null },
-            timeoutMs: number
-          ): Promise<string>
-        }
-      ).runClaudeCommand(
-        ['auth', 'status', '--json'],
-        { windowsPath: 'C:\\tmp\\claude-auth', linuxPath: null, wslDistro: null },
-        1000
-      )
-
-      expect(spawnMock).toHaveBeenCalledWith(
-        process.env.ComSpec ?? 'cmd.exe',
-        [
-          '/d',
-          '/v:off',
-          '/s',
-          '/c',
-          '""C:\\Users\\First Last\\AppData\\Roaming\\npm\\claude.cmd" "auth" "status" "--json""'
-        ],
-        expect.objectContaining({ shell: false, windowsVerbatimArguments: true })
-      )
-    } finally {
-      vi.doUnmock('node:child_process')
-    }
-  })
-
-  it('keeps WSL execution separate from Windows command resolution', async () => {
-    setPlatform('win32')
-    vi.resetModules()
-    commandMocks.resolveClaudeCommand.mockClear()
-    const child = new EventEmitter() as EventEmitter & {
-      stdout: PassThrough
-      stderr: PassThrough
-      kill: ReturnType<typeof vi.fn>
-    }
-    child.stdout = new PassThrough()
-    child.stderr = new PassThrough()
-    child.kill = vi.fn()
-    const spawnMock = vi.fn(() => {
-      child.stdout.write('{"email":"user@example.com"}\n')
-      queueMicrotask(() => child.emit('close', 0))
-      return child
-    })
-    vi.doMock('node:child_process', () => ({ spawn: spawnMock }))
-
-    try {
-      const { ClaudeAccountService } = await import('./service')
-      const service = new ClaudeAccountService(
-        createService() as never,
-        createService() as never,
-        createService() as never
-      )
-      await (
-        service as unknown as {
-          runClaudeCommand(
-            args: string[],
-            configDir: { windowsPath: string; linuxPath: string | null; wslDistro: string | null },
-            timeoutMs: number
-          ): Promise<string>
-        }
-      ).runClaudeCommand(
-        ['auth', 'status', '--json'],
-        {
-          windowsPath: 'C:\\tmp\\claude-auth',
-          linuxPath: '/home/user/.config/orca auth',
-          wslDistro: 'Ubuntu Test'
-        },
-        1000
-      )
-
-      expect(commandMocks.resolveClaudeCommand).not.toHaveBeenCalled()
-      expect(spawnMock).toHaveBeenCalledWith(
-        'wsl.exe',
-        [
-          '-d',
-          'Ubuntu Test',
-          '--exec',
-          'bash',
-          '-lc',
-          "export CLAUDE_CONFIG_DIR='/home/user/.config/orca auth'; export CLAUDE_SECURESTORAGE_CONFIG_DIR='/home/user/.config/orca auth'; exec claude 'auth' 'status' '--json'"
-        ],
-        expect.objectContaining({ shell: false, windowsVerbatimArguments: false })
-      )
-    } finally {
-      vi.doUnmock('node:child_process')
-    }
-  })
-
-  it('pipes stdin only for the explicit Claude account login command', async () => {
-    setPlatform('linux')
-    vi.resetModules()
-    vi.mocked(readActiveClaudeKeychainCredentials).mockResolvedValue(null)
-    const loginChild = new EventEmitter() as EventEmitter & {
-      stdin: PassThrough
-      stdout: PassThrough
-      stderr: PassThrough
-      kill: ReturnType<typeof vi.fn>
-    }
-    loginChild.stdin = new PassThrough()
-    loginChild.stdout = new PassThrough()
-    loginChild.stderr = new PassThrough()
-    loginChild.kill = vi.fn()
-    const statusChild = new EventEmitter() as EventEmitter & {
-      stdout: PassThrough
-      stderr: PassThrough
-      kill: ReturnType<typeof vi.fn>
-    }
-    statusChild.stdout = new PassThrough()
-    statusChild.stderr = new PassThrough()
-    statusChild.kill = vi.fn()
-    const spawnMock = vi.fn(
-      (_command: string, args: string[], options: { env: NodeJS.ProcessEnv }) => {
-        if (args[1] === 'login') {
-          writeFileSync(
-            join(options.env.CLAUDE_CONFIG_DIR!, '.credentials.json'),
-            '{"claudeAiOauth":{"email":"user@example.com","accessToken":"token"}}\n',
-            'utf-8'
-          )
-          queueMicrotask(() => loginChild.emit('close', 0))
-          return loginChild
-        }
-        statusChild.stdout.write('{"email":"user@example.com"}\n')
-        queueMicrotask(() => statusChild.emit('close', 0))
-        return statusChild
-      }
-    )
-    vi.doMock('node:child_process', () => ({ spawn: spawnMock }))
-
-    try {
-      const { ClaudeAccountService } = await import('./service')
-      let settings = {
-        claudeManagedAccounts: [] as ClaudeManagedAccount[],
-        activeClaudeManagedAccountId: null,
-        activeClaudeManagedAccountIdsByRuntime: { host: null, wsl: {} }
-      }
-      const store = {
-        getSettings: vi.fn(() => settings),
-        updateSettings: vi.fn((updates: Partial<typeof settings>) => {
-          settings = { ...settings, ...updates }
-          return settings
-        })
-      }
-      const runtimeAuth = {
-        clearLastWrittenCredentialsJson: vi.fn(),
-        forceMaterializeCurrentSelectionForRollback: vi.fn(async () => {})
-      }
-      const rateLimits = {
-        evictInactiveClaudeCache: vi.fn(),
-        refreshForClaudeAccountChange: vi.fn()
-      }
-      const service = new ClaudeAccountService(
-        store as never,
-        rateLimits as never,
-        runtimeAuth as never
-      )
-
-      await service.addAccount()
-
-      expect(spawnMock).toHaveBeenNthCalledWith(
-        1,
-        'claude',
-        ['auth', 'login', '--claudeai'],
-        expect.objectContaining({ stdio: ['pipe', 'pipe', 'pipe'] })
-      )
-      expect(spawnMock).toHaveBeenNthCalledWith(
-        2,
-        'claude',
-        ['auth', 'status', '--json'],
-        expect.objectContaining({ stdio: ['ignore', 'pipe', 'pipe'] })
-      )
-      expect(settings.claudeManagedAccounts[0]?.email).toBe('user@example.com')
-    } finally {
-      vi.doUnmock('node:child_process')
-    }
-  })
-
-  it('rejects immediately when Claude sign-in is denied', async () => {
-    vi.resetModules()
-    const child = new EventEmitter() as EventEmitter & {
-      stdin: PassThrough
-      stdout: PassThrough
-      stderr: PassThrough
-      kill: ReturnType<typeof vi.fn>
-      pid: number
-    }
-    child.stdin = new PassThrough()
-    child.stdout = new PassThrough()
-    child.stderr = new PassThrough()
-    child.kill = vi.fn()
-    child.pid = 4242
-    const destroyStdin = vi.spyOn(child.stdin, 'destroy')
-    const spawnMock = vi.fn(() => child)
-    vi.doMock('node:child_process', () => ({ spawn: spawnMock }))
-    // Denial must tear down the whole detached login/browser tree (process-group kill on POSIX),
-    // not just the direct child — otherwise the orphaned auth processes the `detached` spawn guards against leak.
-    const killTree = vi.spyOn(process, 'kill').mockReturnValue(true)
-
-    try {
-      const { ClaudeAccountService } = await import('./service')
-      const service = new ClaudeAccountService(
-        createService() as never,
-        createService() as never,
-        createService() as never
-      )
-      const commandPromise = (
-        service as unknown as {
-          runClaudeCommand(
-            args: string[],
-            configDir: { windowsPath: string; linuxPath: string | null; wslDistro: string | null },
-            timeoutMs: number,
-            options?: { keepStdinOpen?: boolean }
-          ): Promise<string>
-        }
-      ).runClaudeCommand(
-        ['login'],
-        { windowsPath: '/tmp/claude-auth', linuxPath: null, wslDistro: null },
-        180_000,
-        { keepStdinOpen: true }
-      )
-
-      child.stderr.write('OAuth authorization failed: access_denied\n')
-
-      await expect(commandPromise).rejects.toThrow('Claude sign-in was denied. Please try again.')
-      expect(killTree).toHaveBeenCalledWith(-child.pid)
-      expect(child.kill).not.toHaveBeenCalled()
-      expect(destroyStdin).toHaveBeenCalledTimes(1)
-      expect(child.stdout.listenerCount('data')).toBe(0)
-      expect(child.stderr.listenerCount('data')).toBe(0)
-      expect(child.listenerCount('error')).toBe(0)
-      expect(child.listenerCount('close')).toBe(0)
-    } finally {
-      killTree.mockRestore()
-      vi.doUnmock('node:child_process')
-    }
-  })
-
-  it('cancels an in-flight Claude account add', async () => {
-    vi.resetModules()
-    const child = new EventEmitter() as EventEmitter & {
-      stdin: PassThrough
-      stdout: PassThrough
-      stderr: PassThrough
-      kill: ReturnType<typeof vi.fn>
-    }
-    child.stdin = new PassThrough()
-    child.stdout = new PassThrough()
-    child.stderr = new PassThrough()
-    child.kill = vi.fn()
-    const destroyStdin = vi.spyOn(child.stdin, 'destroy')
-    const spawnMock = vi.fn(() => child)
-    vi.doMock('node:child_process', () => ({ spawn: spawnMock }))
-
-    try {
-      const { ClaudeAccountService } = await import('./service')
-      let settings = {
-        claudeManagedAccounts: [],
-        activeClaudeManagedAccountId: null,
-        activeClaudeManagedAccountIdsByRuntime: { host: null, wsl: {} }
-      }
-      const store = {
-        getSettings: vi.fn(() => settings),
-        updateSettings: vi.fn((updates: Partial<typeof settings>) => {
-          settings = { ...settings, ...updates }
-          return settings
-        })
-      }
-      const runtimeAuth = {
-        clearLastWrittenCredentialsJson: vi.fn(),
-        forceMaterializeCurrentSelectionForRollback: vi.fn(async () => {})
-      }
-      const rateLimits = {
-        evictInactiveClaudeCache: vi.fn(),
-        refreshForClaudeAccountChange: vi.fn()
-      }
-      const service = new ClaudeAccountService(
-        store as never,
-        rateLimits as never,
-        runtimeAuth as never
-      )
-
-      const addPromise = service.addAccount()
-      await vi.waitFor(() => {
-        expect(spawnMock).toHaveBeenCalledTimes(1)
-      })
-
-      expect(service.cancelPendingLogin()).toBe(true)
-      await expect(addPromise).rejects.toThrow('Claude sign-in was cancelled.')
-      expect(child.kill).toHaveBeenCalledTimes(1)
-      expect(destroyStdin).toHaveBeenCalledTimes(1)
-      expect(service.cancelPendingLogin()).toBe(false)
-      expect(settings.claudeManagedAccounts).toEqual([])
-      expect(child.stdout.listenerCount('data')).toBe(0)
-      expect(child.stderr.listenerCount('data')).toBe(0)
-      expect(child.listenerCount('error')).toBe(0)
-      expect(child.listenerCount('close')).toBe(0)
-    } finally {
-      vi.doUnmock('node:child_process')
-    }
-  })
-
-  it('honors cancel before Claude login command starts', async () => {
-    setPlatform('linux')
-    vi.resetModules()
-    let releaseKeychainRead: (value: string | null) => void = () => {}
-    vi.mocked(readActiveClaudeKeychainCredentials).mockReturnValue(
-      new Promise<string | null>((resolve) => {
-        releaseKeychainRead = resolve
-      })
-    )
-    const spawnMock = vi.fn()
-    vi.doMock('node:child_process', () => ({ spawn: spawnMock }))
-
-    try {
-      const { ClaudeAccountService } = await import('./service')
-      let settings = {
-        claudeManagedAccounts: [],
-        activeClaudeManagedAccountId: null,
-        activeClaudeManagedAccountIdsByRuntime: { host: null, wsl: {} }
-      }
-      const store = {
-        getSettings: vi.fn(() => settings),
-        updateSettings: vi.fn((updates: Partial<typeof settings>) => {
-          settings = { ...settings, ...updates }
-          return settings
-        })
-      }
-      const runtimeAuth = {
-        clearLastWrittenCredentialsJson: vi.fn(),
-        forceMaterializeCurrentSelectionForRollback: vi.fn(async () => {})
-      }
-      const rateLimits = {
-        evictInactiveClaudeCache: vi.fn(),
-        refreshForClaudeAccountChange: vi.fn()
-      }
-      const service = new ClaudeAccountService(
-        store as never,
-        rateLimits as never,
-        runtimeAuth as never
-      )
-
-      const addPromise = service.addAccount()
-      await vi.waitFor(() => {
-        expect(readActiveClaudeKeychainCredentials).toHaveBeenCalled()
-      })
-
-      expect(service.cancelPendingLogin()).toBe(true)
-      expect(service.cancelPendingLogin()).toBe(false)
-      expect(spawnMock).not.toHaveBeenCalled()
-      releaseKeychainRead(null)
-      await expect(addPromise).rejects.toThrow('Claude sign-in was cancelled.')
-      expect(spawnMock).not.toHaveBeenCalled()
-      expect(service.cancelPendingLogin()).toBe(false)
-      expect(settings.claudeManagedAccounts).toEqual([])
-    } finally {
-      vi.doUnmock('node:child_process')
-    }
-  })
-
-  it('supersedes the login a closed Settings pane abandoned instead of queueing behind it', async () => {
-    setPlatform('linux')
-    vi.resetModules()
-    vi.mocked(readActiveClaudeKeychainCredentials).mockResolvedValue(null)
-    const children: (EventEmitter & { stdin: PassThrough; kill: ReturnType<typeof vi.fn> })[] = []
-    // No pid: the POSIX teardown signals -pid as a process group, which must
-    // never reach a real group from a test double.
-    const spawnMock = vi.fn(() => {
-      const child = Object.assign(new EventEmitter(), {
-        stdin: new PassThrough(),
-        stdout: new PassThrough(),
-        stderr: new PassThrough(),
-        kill: vi.fn()
-      })
-      children.push(child)
-      return child
-    })
-    vi.doMock('node:child_process', () => ({ spawn: spawnMock }))
-
-    try {
-      const { ClaudeAccountService } = await import('./service')
-      let settings = {
-        claudeManagedAccounts: [],
-        activeClaudeManagedAccountId: null,
-        activeClaudeManagedAccountIdsByRuntime: { host: null, wsl: {} }
-      }
-      const store = {
-        getSettings: vi.fn(() => settings),
-        updateSettings: vi.fn((updates: Partial<typeof settings>) => {
-          settings = { ...settings, ...updates }
-          return settings
-        })
-      }
-      const runtimeAuth = {
-        clearLastWrittenCredentialsJson: vi.fn(),
-        syncForCurrentSelection: vi.fn(async () => {}),
-        forceMaterializeCurrentSelectionForRollback: vi.fn(async () => {})
-      }
-      const rateLimits = {
-        evictInactiveClaudeCache: vi.fn(),
-        refreshForClaudeAccountChange: vi.fn()
-      }
-      const service = new ClaudeAccountService(
-        asServiceDouble(store),
-        asServiceDouble(rateLimits),
-        asServiceDouble(runtimeAuth)
-      )
-
-      const abandoned = service.addAccount({ runtime: 'host' })
-      const abandonedRejection = expect(abandoned).rejects.toThrow('Claude sign-in was cancelled.')
-      await vi.waitFor(() => {
-        expect(children.length).toBe(1)
-      })
-
-      // The user reopens Settings and clicks Add Account again.
-      const retry = service.addAccount({ runtime: 'host' })
-      const retryRejection = expect(retry).rejects.toThrow()
-
-      await abandonedRejection
-      expect(children[0].kill).toHaveBeenCalled()
-      // Why: the point of the fix — the second login starts now, not after the
-      // abandoned one's whole sign-in deadline elapses.
-      await vi.waitFor(() => {
-        expect(children.length).toBe(2)
-      })
-
-      children[1].emit('close', 1)
-      await retryRejection
-    } finally {
-      vi.doUnmock('node:child_process')
-    }
-  })
-
-  it('uses taskkill to cancel the Windows Claude login process tree', async () => {
-    setPlatform('win32')
-    vi.resetModules()
-    vi.mocked(readActiveClaudeKeychainCredentials).mockResolvedValue(null)
-    const child = new EventEmitter() as EventEmitter & {
-      pid: number
-      stdin: PassThrough
-      stdout: PassThrough
-      stderr: PassThrough
-      kill: ReturnType<typeof vi.fn>
-    }
-    child.pid = 1234
-    child.stdin = new PassThrough()
-    child.stdout = new PassThrough()
-    child.stderr = new PassThrough()
-    child.kill = vi.fn()
-    const destroyStdin = vi.spyOn(child.stdin, 'destroy')
-    const taskkill = new EventEmitter()
-    const spawnMock = vi.fn((command: string) => (command === 'taskkill.exe' ? taskkill : child))
-    const cleanupInteractiveLogin = vi.fn()
-    let publishTerminationPid: (pid: number) => void = () => {}
-    const buildInteractiveLoginSpawn = vi.fn(() => ({
-      command: getCmdExePath(),
-      args: ['/d', '/c', 'start', '', '/wait', 'claude', 'auth', 'login', '--claudeai'],
-      stdio: 'ignore' as const,
-      windowsHide: true,
-      cleanup: cleanupInteractiveLogin,
-      getTerminationPid: () => null,
-      waitForTerminationPid: () =>
-        new Promise<number>((resolve) => {
-          publishTerminationPid = resolve
-        })
-    }))
-    vi.doMock('node:child_process', () => ({ spawn: spawnMock }))
-    vi.doMock('../../shared/windows-interactive-login-spawn', () => ({
-      buildWindowsHostInteractiveLoginSpawn: buildInteractiveLoginSpawn
-    }))
-
-    try {
-      const { ClaudeAccountService } = await import('./service')
-      let settings = {
-        claudeManagedAccounts: [],
-        activeClaudeManagedAccountId: null,
-        activeClaudeManagedAccountIdsByRuntime: { host: null, wsl: {} }
-      }
-      const store = {
-        getSettings: vi.fn(() => settings),
-        updateSettings: vi.fn((updates: Partial<typeof settings>) => {
-          settings = { ...settings, ...updates }
-          return settings
-        })
-      }
-      const runtimeAuth = {
-        clearLastWrittenCredentialsJson: vi.fn(),
-        forceMaterializeCurrentSelectionForRollback: vi.fn(async () => {})
-      }
-      const rateLimits = {
-        evictInactiveClaudeCache: vi.fn(),
-        refreshForClaudeAccountChange: vi.fn()
-      }
-      const service = new ClaudeAccountService(
-        store as never,
-        rateLimits as never,
-        runtimeAuth as never
-      )
-
-      const addPromise = service.addAccount()
-      await vi.waitFor(() => {
-        expect(buildInteractiveLoginSpawn).toHaveBeenCalledWith('claude', [
-          'auth',
-          'login',
-          '--claudeai'
-        ])
-        expect(spawnMock).toHaveBeenCalledWith(
-          getCmdExePath(),
-          ['/d', '/c', 'start', '', '/wait', 'claude', 'auth', 'login', '--claudeai'],
-          expect.objectContaining({ stdio: 'ignore', windowsHide: true })
-        )
-      })
-
-      expect(service.cancelPendingLogin()).toBe(true)
-      const rejection = expect(addPromise).rejects.toThrow('Claude sign-in was cancelled.')
-      expect(child.kill).not.toHaveBeenCalled()
-      expect(spawnMock).not.toHaveBeenCalledWith(
-        'taskkill.exe',
-        expect.anything(),
-        expect.anything()
-      )
-      publishTerminationPid(9876)
-      await vi.waitFor(() => {
-        expect(spawnMock).toHaveBeenCalledWith(
-          'taskkill.exe',
-          ['/pid', '9876', '/t', '/f'],
-          expect.objectContaining({ stdio: 'ignore', windowsHide: true })
-        )
-      })
-      expect(destroyStdin).not.toHaveBeenCalled()
-      taskkill.emit('close', 0)
-      await rejection
-      expect(destroyStdin).toHaveBeenCalledTimes(1)
-      expect(cleanupInteractiveLogin).toHaveBeenCalledTimes(1)
-      expect(service.cancelPendingLogin()).toBe(false)
-    } finally {
-      vi.doUnmock('node:child_process')
-      vi.doUnmock('../../shared/windows-interactive-login-spawn')
-    }
-  })
-})
diff --git a/src/main/claude-accounts/claude-account-service-reauth-rollback.test.ts b/src/main/claude-accounts/claude-account-service-reauth-rollback.test.ts
deleted file mode 100644
index 2ad1eb6356d1..000000000000
--- a/src/main/claude-accounts/claude-account-service-reauth-rollback.test.ts
+++ /dev/null
@@ -1,420 +0,0 @@
-import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest'
-import { mkdirSync, readFileSync, rmSync, writeFileSync } from 'node:fs'
-import { tmpdir } from 'node:os'
-import { join } from 'node:path'
-import {
-  readManagedClaudeKeychainCredentials,
-  writeManagedClaudeKeychainCredentials
-} from './keychain'
-import {
-  resetClaudeKeychainMocks,
-  restorePlatform,
-  setPlatform
-} from './claude-account-service-test-harness'
-
-const CLAUDE_SERVICE_TEST_ROOT = join(tmpdir(), 'orca-claude-service-reauth-test')
-
-vi.mock('electron', () => ({
-  app: {
-    getPath: () => CLAUDE_SERVICE_TEST_ROOT
-  }
-}))
-
-const commandMocks = vi.hoisted(() => ({
-  resolveClaudeCommand: vi.fn(() => 'claude')
-}))
-
-vi.mock('../codex-cli/command', () => ({
-  resolveClaudeCommand: commandMocks.resolveClaudeCommand
-}))
-
-vi.mock('./keychain', () => ({
-  deleteActiveClaudeKeychainCredentialsStrict: vi.fn(async () => {}),
-  deleteManagedClaudeKeychainCredentials: vi.fn(async () => {}),
-  readActiveClaudeKeychainCredentials: vi.fn(),
-  readActiveClaudeKeychainCredentialsStrict: vi.fn(),
-  readManagedClaudeKeychainCredentials: vi.fn(),
-  writeActiveClaudeKeychainCredentials: vi.fn(async () => {}),
-  writeManagedClaudeKeychainCredentials: vi.fn(async () => {})
-}))
-
-describe('ClaudeAccountService credential capture', () => {
-  let tempDir: string | null = null
-
-  beforeEach(() => {
-    setPlatform('darwin')
-    tempDir = null
-    resetClaudeKeychainMocks()
-  })
-
-  afterEach(() => {
-    restorePlatform()
-    if (tempDir) {
-      rmSync(tempDir, { recursive: true, force: true })
-    }
-  })
-
-  it('restores previous managed auth when reauth materialization fails', async () => {
-    setPlatform('linux')
-    tempDir = CLAUDE_SERVICE_TEST_ROOT
-    rmSync(tempDir, { recursive: true, force: true })
-    const managedAuthPath = join(tempDir, 'claude-accounts', 'account-1', 'auth')
-    mkdirSync(managedAuthPath, { recursive: true })
-    writeFileSync(join(managedAuthPath, '.orca-managed-claude-auth'), 'account-1\n', 'utf-8')
-    writeFileSync(join(managedAuthPath, '.credentials.json'), '{"old":true}\n', 'utf-8')
-    writeFileSync(join(managedAuthPath, 'oauth-account.json'), '{"oldOauth":true}\n', 'utf-8')
-    let settings = {
-      claudeManagedAccounts: [
-        {
-          id: 'account-1',
-          email: 'old@example.com',
-          managedAuthPath,
-          authMethod: 'subscription-oauth',
-          organizationUuid: null,
-          organizationName: null,
-          createdAt: 1,
-          updatedAt: 1,
-          lastAuthenticatedAt: 1
-        }
-      ],
-      activeClaudeManagedAccountId: 'account-1'
-    }
-    const store = {
-      getSettings: vi.fn(() => settings),
-      updateSettings: vi.fn((updates: Partial<typeof settings>) => {
-        settings = { ...settings, ...updates }
-        return settings
-      })
-    }
-    const runtimeAuth = {
-      clearLastWrittenCredentialsJson: vi.fn(),
-      forceMaterializeCurrentSelectionForRollback: vi.fn(async () => {}),
-      syncForCurrentSelection: vi.fn(async () => {
-        throw new Error('materialize failed')
-      })
-    }
-    const rateLimits = { evictInactiveClaudeCache: vi.fn(), refreshForClaudeAccountChange: vi.fn() }
-    const { ClaudeAccountService } = await import('./service')
-    const service = new ClaudeAccountService(
-      store as never,
-      rateLimits as never,
-      runtimeAuth as never
-    )
-    ;(
-      service as unknown as {
-        runClaudeLoginAndCapture(): Promise<{
-          credentialsJson: string
-          oauthAccount: unknown
-          identity: { email: string; organizationUuid: null; organizationName: null }
-        }>
-      }
-    ).runClaudeLoginAndCapture = vi.fn(async () => ({
-      credentialsJson: '{"new":true}\n',
-      oauthAccount: { newOauth: true },
-      identity: { email: 'new@example.com', organizationUuid: null, organizationName: null }
-    }))
-
-    await expect(service.reauthenticateAccount('account-1')).rejects.toThrow('materialize failed')
-
-    expect(readFileSync(join(managedAuthPath, '.credentials.json'), 'utf-8')).toBe('{"old":true}\n')
-    expect(readFileSync(join(managedAuthPath, 'oauth-account.json'), 'utf-8')).toBe(
-      '{"oldOauth":true}\n'
-    )
-    expect(store.getSettings().claudeManagedAccounts[0].email).toBe('old@example.com')
-    expect(runtimeAuth.forceMaterializeCurrentSelectionForRollback).toHaveBeenCalled()
-  })
-
-  it('restores settings without rematerializing when managed-auth rollback write fails', async () => {
-    const warn = vi.spyOn(console, 'warn').mockImplementation(() => {})
-    tempDir = CLAUDE_SERVICE_TEST_ROOT
-    rmSync(tempDir, { recursive: true, force: true })
-    const managedAuthPath = join(tempDir, 'claude-accounts', 'account-1', 'auth')
-    mkdirSync(managedAuthPath, { recursive: true })
-    writeFileSync(join(managedAuthPath, '.orca-managed-claude-auth'), 'account-1\n', 'utf-8')
-    writeFileSync(join(managedAuthPath, 'oauth-account.json'), '{"oldOauth":true}\n', 'utf-8')
-    vi.mocked(readManagedClaudeKeychainCredentials).mockResolvedValue('{"old":true}\n')
-    vi.mocked(writeManagedClaudeKeychainCredentials)
-      .mockResolvedValueOnce()
-      .mockRejectedValueOnce(new Error('managed restore failed'))
-    let settings = {
-      claudeManagedAccounts: [
-        {
-          id: 'account-1',
-          email: 'old@example.com',
-          managedAuthPath,
-          authMethod: 'subscription-oauth',
-          organizationUuid: null,
-          organizationName: null,
-          createdAt: 1,
-          updatedAt: 1,
-          lastAuthenticatedAt: 1
-        }
-      ],
-      activeClaudeManagedAccountId: 'account-1'
-    }
-    const store = {
-      getSettings: vi.fn(() => settings),
-      updateSettings: vi.fn((updates: Partial<typeof settings>) => {
-        settings = { ...settings, ...updates }
-        return settings
-      })
-    }
-    const runtimeAuth = {
-      clearLastWrittenCredentialsJson: vi.fn(),
-      forceMaterializeCurrentSelectionForRollback: vi.fn(async () => {}),
-      syncForCurrentSelection: vi.fn(async () => {
-        throw new Error('materialize failed')
-      })
-    }
-    const rateLimits = { evictInactiveClaudeCache: vi.fn(), refreshForClaudeAccountChange: vi.fn() }
-    const { ClaudeAccountService } = await import('./service')
-    const service = new ClaudeAccountService(
-      store as never,
-      rateLimits as never,
-      runtimeAuth as never
-    )
-    ;(
-      service as unknown as {
-        runClaudeLoginAndCapture(): Promise<{
-          credentialsJson: string
-          oauthAccount: unknown
-          identity: { email: string; organizationUuid: null; organizationName: null }
-        }>
-      }
-    ).runClaudeLoginAndCapture = vi.fn(async () => ({
-      credentialsJson: '{"new":true}\n',
-      oauthAccount: { newOauth: true },
-      identity: { email: 'new@example.com', organizationUuid: null, organizationName: null }
-    }))
-
-    await expect(service.reauthenticateAccount('account-1')).rejects.toThrow('materialize failed')
-
-    expect(store.getSettings().claudeManagedAccounts[0].email).toBe('new@example.com')
-    expect(runtimeAuth.forceMaterializeCurrentSelectionForRollback).not.toHaveBeenCalled()
-    expect(warn).toHaveBeenCalledWith(
-      '[claude-accounts] Failed to restore managed credentials during rollback:',
-      expect.any(Error)
-    )
-    warn.mockRestore()
-  })
-
-  it('restores oauth metadata when new credential write and credential rollback fail', async () => {
-    const warn = vi.spyOn(console, 'warn').mockImplementation(() => {})
-    tempDir = CLAUDE_SERVICE_TEST_ROOT
-    rmSync(tempDir, { recursive: true, force: true })
-    const managedAuthPath = join(tempDir, 'claude-accounts', 'account-1', 'auth')
-    mkdirSync(managedAuthPath, { recursive: true })
-    writeFileSync(join(managedAuthPath, '.orca-managed-claude-auth'), 'account-1\n', 'utf-8')
-    writeFileSync(join(managedAuthPath, 'oauth-account.json'), '{"oldOauth":true}\n', 'utf-8')
-    vi.mocked(readManagedClaudeKeychainCredentials).mockResolvedValue('{"old":true}\n')
-    vi.mocked(writeManagedClaudeKeychainCredentials)
-      .mockRejectedValueOnce(new Error('new credentials failed'))
-      .mockRejectedValueOnce(new Error('credential rollback failed'))
-    let settings = {
-      claudeManagedAccounts: [
-        {
-          id: 'account-1',
-          email: 'old@example.com',
-          managedAuthPath,
-          authMethod: 'subscription-oauth',
-          organizationUuid: null,
-          organizationName: null,
-          createdAt: 1,
-          updatedAt: 1,
-          lastAuthenticatedAt: 1
-        }
-      ],
-      activeClaudeManagedAccountId: 'account-1'
-    }
-    const store = {
-      getSettings: vi.fn(() => settings),
-      updateSettings: vi.fn((updates: Partial<typeof settings>) => {
-        settings = { ...settings, ...updates }
-        return settings
-      })
-    }
-    const runtimeAuth = {
-      clearLastWrittenCredentialsJson: vi.fn(),
-      forceMaterializeCurrentSelectionForRollback: vi.fn(async () => {}),
-      syncForCurrentSelection: vi.fn()
-    }
-    const rateLimits = { evictInactiveClaudeCache: vi.fn(), refreshForClaudeAccountChange: vi.fn() }
-    const { ClaudeAccountService } = await import('./service')
-    const service = new ClaudeAccountService(
-      store as never,
-      rateLimits as never,
-      runtimeAuth as never
-    )
-    ;(
-      service as unknown as {
-        runClaudeLoginAndCapture(): Promise<{
-          credentialsJson: string
-          oauthAccount: unknown
-          identity: { email: string; organizationUuid: null; organizationName: null }
-        }>
-      }
-    ).runClaudeLoginAndCapture = vi.fn(async () => ({
-      credentialsJson: '{"new":true}\n',
-      oauthAccount: { newOauth: true },
-      identity: { email: 'new@example.com', organizationUuid: null, organizationName: null }
-    }))
-
-    await expect(service.reauthenticateAccount('account-1')).rejects.toThrow(
-      'new credentials failed'
-    )
-
-    expect(readFileSync(join(managedAuthPath, 'oauth-account.json'), 'utf-8')).toBe(
-      '{"oldOauth":true}\n'
-    )
-    expect(store.getSettings().claudeManagedAccounts[0].email).toBe('old@example.com')
-    expect(runtimeAuth.forceMaterializeCurrentSelectionForRollback).not.toHaveBeenCalled()
-    expect(warn).toHaveBeenCalledWith(
-      '[claude-accounts] Failed to restore managed credentials during rollback:',
-      expect.any(Error)
-    )
-    warn.mockRestore()
-  })
-
-  it('restores old metadata when rollback restores credentials but oauth restore fails', async () => {
-    setPlatform('linux')
-    const warn = vi.spyOn(console, 'warn').mockImplementation(() => {})
-    tempDir = CLAUDE_SERVICE_TEST_ROOT
-    rmSync(tempDir, { recursive: true, force: true })
-    const managedAuthPath = join(tempDir, 'claude-accounts', 'account-1', 'auth')
-    const oauthPath = join(managedAuthPath, 'oauth-account.json')
-    mkdirSync(managedAuthPath, { recursive: true })
-    writeFileSync(join(managedAuthPath, '.orca-managed-claude-auth'), 'account-1\n', 'utf-8')
-    writeFileSync(join(managedAuthPath, '.credentials.json'), '{"old":true}\n', 'utf-8')
-    writeFileSync(oauthPath, '{"oldOauth":true}\n', 'utf-8')
-    let settings = {
-      claudeManagedAccounts: [
-        {
-          id: 'account-1',
-          email: 'old@example.com',
-          managedAuthPath,
-          authMethod: 'subscription-oauth',
-          organizationUuid: null,
-          organizationName: null,
-          createdAt: 1,
-          updatedAt: 1,
-          lastAuthenticatedAt: 1
-        }
-      ],
-      activeClaudeManagedAccountId: 'account-1'
-    }
-    const store = {
-      getSettings: vi.fn(() => settings),
-      updateSettings: vi.fn((updates: Partial<typeof settings>) => {
-        settings = { ...settings, ...updates }
-        return settings
-      })
-    }
-    const runtimeAuth = {
-      clearLastWrittenCredentialsJson: vi.fn(),
-      forceMaterializeCurrentSelectionForRollback: vi.fn(async () => {}),
-      syncForCurrentSelection: vi.fn(async () => {
-        rmSync(oauthPath, { force: true })
-        mkdirSync(oauthPath)
-        throw new Error('materialize failed')
-      })
-    }
-    const rateLimits = { evictInactiveClaudeCache: vi.fn(), refreshForClaudeAccountChange: vi.fn() }
-    const { ClaudeAccountService } = await import('./service')
-    const service = new ClaudeAccountService(
-      store as never,
-      rateLimits as never,
-      runtimeAuth as never
-    )
-    ;(
-      service as unknown as {
-        runClaudeLoginAndCapture(): Promise<{
-          credentialsJson: string
-          oauthAccount: unknown
-          identity: { email: string; organizationUuid: null; organizationName: null }
-        }>
-      }
-    ).runClaudeLoginAndCapture = vi.fn(async () => ({
-      credentialsJson: '{"new":true}\n',
-      oauthAccount: { newOauth: true },
-      identity: { email: 'new@example.com', organizationUuid: null, organizationName: null }
-    }))
-
-    await expect(service.reauthenticateAccount('account-1')).rejects.toThrow('materialize failed')
-
-    expect(readFileSync(join(managedAuthPath, '.credentials.json'), 'utf-8')).toBe('{"old":true}\n')
-    expect(store.getSettings().claudeManagedAccounts[0].email).toBe('old@example.com')
-    expect(runtimeAuth.forceMaterializeCurrentSelectionForRollback).toHaveBeenCalled()
-    expect(warn).toHaveBeenCalled()
-    warn.mockRestore()
-  })
-
-  it('evicts inactive rate-limit cache after successful reauth', async () => {
-    setPlatform('linux')
-    tempDir = CLAUDE_SERVICE_TEST_ROOT
-    rmSync(tempDir, { recursive: true, force: true })
-    const managedAuthPath = join(tempDir, 'claude-accounts', 'account-1', 'auth')
-    mkdirSync(managedAuthPath, { recursive: true })
-    writeFileSync(join(managedAuthPath, '.orca-managed-claude-auth'), 'account-1\n', 'utf-8')
-    writeFileSync(join(managedAuthPath, '.credentials.json'), '{"old":true}\n', 'utf-8')
-    writeFileSync(join(managedAuthPath, 'oauth-account.json'), '{"oldOauth":true}\n', 'utf-8')
-    let settings = {
-      claudeManagedAccounts: [
-        {
-          id: 'account-1',
-          email: 'old@example.com',
-          managedAuthPath,
-          authMethod: 'subscription-oauth',
-          organizationUuid: null,
-          organizationName: null,
-          createdAt: 1,
-          updatedAt: 1,
-          lastAuthenticatedAt: 1
-        }
-      ],
-      activeClaudeManagedAccountId: null
-    }
-    const store = {
-      getSettings: vi.fn(() => settings),
-      updateSettings: vi.fn((updates: Partial<typeof settings>) => {
-        settings = { ...settings, ...updates }
-        return settings
-      })
-    }
-    const runtimeAuth = {
-      clearLastWrittenCredentialsJson: vi.fn(),
-      syncForCurrentSelection: vi.fn(async () => {}),
-      forceMaterializeCurrentSelectionForRollback: vi.fn(async () => {})
-    }
-    const rateLimits = {
-      evictInactiveClaudeCache: vi.fn(),
-      refreshForClaudeAccountChange: vi.fn(async () => ({ accounts: [], activeAccountId: null }))
-    }
-    const { ClaudeAccountService } = await import('./service')
-    const service = new ClaudeAccountService(
-      store as never,
-      rateLimits as never,
-      runtimeAuth as never
-    )
-    ;(
-      service as unknown as {
-        runClaudeLoginAndCapture(): Promise<{
-          credentialsJson: string
-          oauthAccount: unknown
-          identity: { email: string; organizationUuid: null; organizationName: null }
-        }>
-      }
-    ).runClaudeLoginAndCapture = vi.fn(async () => ({
-      credentialsJson: '{"new":true}\n',
-      oauthAccount: { newOauth: true },
-      identity: { email: 'new@example.com', organizationUuid: null, organizationName: null }
-    }))
-
-    await service.reauthenticateAccount('account-1')
-
-    expect(rateLimits.evictInactiveClaudeCache).toHaveBeenCalledWith('account-1')
-    expect(rateLimits.refreshForClaudeAccountChange).toHaveBeenCalledWith(undefined, {
-      runtime: 'host'
-    })
-    expect(settings.claudeManagedAccounts[0].email).toBe('new@example.com')
-  })
-})
diff --git a/src/main/claude-accounts/claude-account-service-test-harness.ts b/src/main/claude-accounts/claude-account-service-test-harness.ts
deleted file mode 100644
index d66d1f3ea51b..000000000000
--- a/src/main/claude-accounts/claude-account-service-test-harness.ts
+++ /dev/null
@@ -1,41 +0,0 @@
-import { vi } from 'vitest'
-import {
-  deleteActiveClaudeKeychainCredentialsStrict,
-  readActiveClaudeKeychainCredentials,
-  readActiveClaudeKeychainCredentialsStrict,
-  readManagedClaudeKeychainCredentials,
-  writeActiveClaudeKeychainCredentials,
-  writeManagedClaudeKeychainCredentials
-} from './keychain'
-
-// Each suite declares its own `vi.mock('./keychain', ...)` (factories are hoisted and
-// cannot close over this module); this only re-arms the doubles between tests.
-export function resetClaudeKeychainMocks(): void {
-  vi.mocked(readActiveClaudeKeychainCredentials).mockReset()
-  vi.mocked(readActiveClaudeKeychainCredentialsStrict).mockReset()
-  vi.mocked(readManagedClaudeKeychainCredentials).mockReset()
-  vi.mocked(deleteActiveClaudeKeychainCredentialsStrict).mockClear()
-  vi.mocked(writeActiveClaudeKeychainCredentials).mockReset()
-  vi.mocked(writeActiveClaudeKeychainCredentials).mockResolvedValue()
-  vi.mocked(writeManagedClaudeKeychainCredentials).mockReset()
-  vi.mocked(writeManagedClaudeKeychainCredentials).mockResolvedValue()
-}
-
-const originalPlatform = Object.getOwnPropertyDescriptor(process, 'platform')
-
-export function setPlatform(platform: NodeJS.Platform): void {
-  Object.defineProperty(process, 'platform', {
-    configurable: true,
-    value: platform
-  })
-}
-
-export function restorePlatform(): void {
-  if (originalPlatform) {
-    Object.defineProperty(process, 'platform', originalPlatform)
-  }
-}
-
-export function createService(): unknown {
-  return {}
-}
diff --git a/src/main/claude-accounts/claude-account-service.test.ts b/src/main/claude-accounts/claude-account-service.test.ts
new file mode 100644
index 000000000000..55c4304ca626
--- /dev/null
+++ b/src/main/claude-accounts/claude-account-service.test.ts
@@ -0,0 +1,349 @@
+import { existsSync, mkdirSync, mkdtempSync, rmSync, writeFileSync } from 'node:fs'
+import { tmpdir } from 'node:os'
+import { join } from 'node:path'
+import { afterEach, describe, expect, it, vi } from 'vitest'
+import { getDefaultSettings } from '../../shared/constants'
+import type { GlobalSettings } from '../../shared/global-settings-types'
+import type { ClaudeManagedAccount } from '../../shared/managed-account-types'
+import { CLAUDE_SIGN_IN_NOT_FINISHED_MESSAGE } from './claude-account-registration'
+import {
+  CLAUDE_ACCOUNT_FOLDER_IN_USE_MESSAGE,
+  CLAUDE_ACCOUNT_NEEDS_SIGN_IN_MESSAGE
+} from './claude-account-selection'
+import type { ClaudeCommandConfig, ClaudeCommandOptions } from './claude-command-process'
+import type { ClaudeAccountSelectionTarget } from './runtime-selection'
+import { ClaudeAccountService } from './service'
+
+const roots: string[] = []
+afterEach(() => roots.splice(0).forEach((root) => rmSync(root, { recursive: true, force: true })))
+
+function account(id: string, extra: Partial<ClaudeManagedAccount> = {}): ClaudeManagedAccount {
+  return {
+    id,
+    email: `${id}@example.test`,
+    managedAuthPath: '',
+    managedAuthRuntime: 'host',
+    wslDistro: null,
+    authMethod: 'subscription-oauth',
+    createdAt: 1,
+    updatedAt: 1,
+    lastAuthenticatedAt: 1,
+    ...extra
+  }
+}
+
+function fixture(accounts: ClaudeManagedAccount[] = [account('a'), account('b')]) {
+  const root = mkdtempSync(join(tmpdir(), 'claude-accounts-'))
+  roots.push(root)
+  const home = (id: string) => join(root, id, 'home')
+  // Stands in for Claude finishing `claude auth login` in a folder.
+  const signIn = (id: string, email: string) => {
+    mkdirSync(home(id), { recursive: true })
+    writeFileSync(
+      join(home(id), '.claude.json'),
+      JSON.stringify({ oauthAccount: { emailAddress: email } })
+    )
+  }
+  let settings: GlobalSettings = {
+    ...getDefaultSettings('/tmp'),
+    claudeManagedAccounts: accounts,
+    activeClaudeManagedAccountId: 'a',
+    activeClaudeManagedAccountIdsByRuntime: { host: 'a', wsl: {} }
+  }
+  const runtimeAuth = {
+    router: {
+      accountHome: home,
+      userConfigDir: () => join(root, 'personal'),
+      copiedLoginIntoSystemDefault: () => existsSync(join(root, 'claude-runtime-auth'))
+    },
+    syncForCurrentSelection: vi.fn(async (_target?: ClaudeAccountSelectionTarget) => {}),
+    publishAll: vi.fn(async () => {}),
+    prepareAccountFolder: vi.fn(async (id: string) => {
+      mkdirSync(home(id), { recursive: true })
+      return { configDir: home(id), readPath: home(id) }
+    }),
+    removeAccountFolder: vi.fn(async (id: string) => rmSync(join(root, id), { recursive: true })),
+    getRuntimeConfigDir: () => '/unused'
+  }
+  // Stands in for the hidden `claude auth login`; each test decides how it ends.
+  const runLogin = vi.fn<
+    (
+      args: string[],
+      config: ClaudeCommandConfig,
+      timeoutMs: number,
+      options?: ClaudeCommandOptions
+    ) => Promise<string>
+  >(async () => '')
+  const service = new ClaudeAccountService(
+    {
+      getSettings: () => settings,
+      updateSettings: (patch) => {
+        settings = { ...settings, ...patch }
+      }
+    },
+    {
+      evictInactiveClaudeCache: vi.fn(),
+      refreshForClaudeAccountChange: vi.fn().mockResolvedValue(undefined)
+    },
+    runtimeAuth,
+    runLogin
+  )
+  return { root, home, service, runtimeAuth, runLogin, signIn, settings: () => settings }
+}
+
+// The id the last sign-in prepared a folder for.
+function newId(f: ReturnType<typeof fixture>): string {
+  return f.runtimeAuth.prepareAccountFolder.mock.calls.at(-1)![0]
+}
+
+describe('ClaudeAccountService', () => {
+  it("labels each row with its folder's login and asks a folder without one to sign in", () => {
+    const f = fixture([
+      account('a'),
+      account('b'),
+      account('old-wsl', {
+        managedAuthRuntime: 'wsl',
+        wslDistro: 'Ubuntu',
+        wslLinuxAuthPath: '/home/u/.local/share/orca/claude-accounts/old-wsl/auth'
+      }),
+      account('new-wsl', {
+        managedAuthRuntime: 'wsl',
+        wslDistro: 'Ubuntu',
+        wslLinuxAuthPath: '/home/u/.local/share/orca/claude-profiles/new-wsl/home'
+      })
+    ])
+    f.signIn('a', 'now-a@example.test')
+    const byId = new Map(f.service.listAccounts().accounts.map((row) => [row.id, row]))
+    expect(byId.get('a')).toMatchObject({ email: 'now-a@example.test' })
+    expect(byId.get('a')?.needsSignIn).toBeUndefined()
+    expect(byId.get('b')).toMatchObject({ email: 'b@example.test', needsSignIn: true })
+    expect(byId.get('old-wsl')).toMatchObject({ needsSignIn: true })
+    expect(byId.get('new-wsl')?.needsSignIn).toBeUndefined()
+  })
+
+  it("reports System default's login from the user's own folder", () => {
+    const f = fixture()
+    mkdirSync(join(f.root, 'personal'))
+    writeFileSync(
+      join(f.root, 'personal', '.claude.json'),
+      JSON.stringify({ oauthAccount: { emailAddress: 'me@example.test' } })
+    )
+    expect(f.service.listAccounts()).toMatchObject({
+      systemDefaultEmail: 'me@example.test'
+    })
+    expect(f.service.listAccounts()).not.toHaveProperty('userClaudeConfigDir')
+    expect(f.service.listAccounts().systemDefaultMayBeCopied).toBeUndefined()
+    mkdirSync(join(f.root, 'claude-runtime-auth'))
+    expect(f.service.listAccounts().systemDefaultMayBeCopied).toBe(true)
+  })
+
+  it('saves an account only once its folder holds a login', async () => {
+    const f = fixture()
+    const begun = await f.service.beginSignIn({ runtime: 'host' })
+    expect(begun).toMatchObject({
+      runtime: 'host',
+      configDir: join(f.root, begun.accountId, 'home')
+    })
+    await expect(f.service.finishSignIn(begun)).rejects.toThrow(CLAUDE_SIGN_IN_NOT_FINISHED_MESSAGE)
+    expect(f.settings().claudeManagedAccounts).toHaveLength(2)
+
+    f.signIn(begun.accountId, 'new@example.test')
+    await f.service.finishSignIn(begun)
+    expect(f.settings().claudeManagedAccounts.at(-1)).toMatchObject({
+      id: begun.accountId,
+      email: 'new@example.test',
+      managedAuthPath: begun.configDir
+    })
+  })
+
+  it('refuses a second account for the same login and deletes its folder', async () => {
+    const f = fixture()
+    const begun = await f.service.beginSignIn({ runtime: 'host' })
+    f.signIn(begun.accountId, 'B@example.test')
+    await expect(f.service.finishSignIn(begun)).rejects.toThrow('already added')
+    expect(f.runtimeAuth.removeAccountFolder).toHaveBeenCalledWith(begun.accountId, {
+      runtime: 'host'
+    })
+    expect(f.settings().claudeManagedAccounts).toHaveLength(2)
+  })
+
+  it('relabels a saved account signed in again under another login', async () => {
+    const f = fixture()
+    const begun = await f.service.beginSignIn({ accountId: 'b' })
+    f.signIn('b', 'other@example.test')
+    await f.service.finishSignIn(begun)
+    expect(f.settings().claudeManagedAccounts.find((entry) => entry.id === 'b')).toMatchObject({
+      email: 'other@example.test',
+      createdAt: 1
+    })
+  })
+
+  it('signs in with a hidden login straight into the new account folder', async () => {
+    const f = fixture()
+    f.runLogin.mockImplementationOnce(async (_args, config) => {
+      f.signIn(newId(f), 'new@example.test')
+      expect(config).toEqual({ windowsPath: f.home(newId(f)), linuxPath: null, wslDistro: null })
+      return ''
+    })
+    await f.service.addAccount({ runtime: 'host' })
+    expect(f.runLogin).toHaveBeenCalledWith(
+      ['auth', 'login', '--claudeai'],
+      expect.anything(),
+      expect.any(Number),
+      expect.objectContaining({ keepStdinOpen: true })
+    )
+    expect(f.settings().claudeManagedAccounts.at(-1)).toMatchObject({
+      id: newId(f),
+      email: 'new@example.test',
+      managedAuthPath: f.home(newId(f))
+    })
+    expect(f.runtimeAuth.removeAccountFolder).not.toHaveBeenCalled()
+  })
+
+  it('runs a WSL login against the guest folder', async () => {
+    const f = fixture()
+    f.runtimeAuth.prepareAccountFolder.mockImplementation(async (id: string) => {
+      mkdirSync(f.home(id), { recursive: true })
+      return { configDir: `/home/u/claude-profiles/${id}/home`, readPath: f.home(id) }
+    })
+    f.runLogin.mockImplementationOnce(async (_args, config) => {
+      f.signIn(newId(f), 'wsl@example.test')
+      expect(config).toEqual({
+        windowsPath: f.home(newId(f)),
+        linuxPath: `/home/u/claude-profiles/${newId(f)}/home`,
+        wslDistro: 'Ubuntu'
+      })
+      return ''
+    })
+    await f.service.addAccount({ runtime: 'wsl', wslDistro: 'Ubuntu' })
+    expect(f.settings().claudeManagedAccounts.at(-1)).toMatchObject({
+      email: 'wsl@example.test',
+      managedAuthRuntime: 'wsl',
+      wslDistro: 'Ubuntu',
+      wslLinuxAuthPath: `/home/u/claude-profiles/${newId(f)}/home`
+    })
+  })
+
+  it('leaves no row or folder when the hidden login is cancelled', async () => {
+    const f = fixture()
+    f.runLogin.mockImplementationOnce(
+      (_args, _config, _timeoutMs, options) =>
+        new Promise((_resolve, reject) =>
+          options?.signal?.addEventListener('abort', () =>
+            reject(new Error('Claude sign-in was cancelled.'))
+          )
+        )
+    )
+    const adding = f.service.addAccount({ runtime: 'host' })
+    await vi.waitFor(() => expect(f.runLogin).toHaveBeenCalled())
+    expect(f.service.cancelPendingLogin()).toBe(true)
+    await expect(adding).rejects.toThrow('Claude sign-in was cancelled.')
+    expect(f.service.cancelPendingLogin()).toBe(false)
+    expect(f.settings().claudeManagedAccounts).toHaveLength(2)
+    expect(f.runtimeAuth.removeAccountFolder).toHaveBeenCalledWith(newId(f), { runtime: 'host' })
+    expect(existsSync(join(f.root, newId(f)))).toBe(false)
+  })
+
+  it('leaves no row or folder when the hidden login times out or finds no login', async () => {
+    const f = fixture()
+    f.runLogin.mockRejectedValueOnce(new Error('Claude sign-in took too long to finish.'))
+    await expect(f.service.addAccount({ runtime: 'host' })).rejects.toThrow('took too long')
+    await expect(f.service.addAccount({ runtime: 'host' })).rejects.toThrow(
+      'could not resolve the account email'
+    )
+    expect(f.settings().claudeManagedAccounts).toHaveLength(2)
+    expect(f.runtimeAuth.removeAccountFolder).toHaveBeenCalledTimes(2)
+  })
+
+  it('refuses a hidden login to an already added account and deletes its folder', async () => {
+    const f = fixture()
+    f.runLogin.mockImplementationOnce(async () => {
+      f.signIn(newId(f), 'B@example.test')
+      return ''
+    })
+    await expect(f.service.addAccount({ runtime: 'host' })).rejects.toThrow(
+      'This Claude account is already added.'
+    )
+    expect(f.settings().claudeManagedAccounts).toHaveLength(2)
+    expect(existsSync(join(f.root, newId(f)))).toBe(false)
+  })
+
+  it('signs a saved account in again inside its own folder and keeps it on failure', async () => {
+    const f = fixture()
+    f.runLogin.mockImplementationOnce(async (_args, config) => {
+      expect(config.windowsPath).toBe(f.home('b'))
+      f.signIn('b', 'b@example.test')
+      return ''
+    })
+    await f.service.reauthenticateAccount('b')
+    expect(f.runtimeAuth.prepareAccountFolder).toHaveBeenCalledWith('b', { runtime: 'host' })
+    expect(f.settings().claudeManagedAccounts.find((entry) => entry.id === 'b')).toMatchObject({
+      email: 'b@example.test',
+      createdAt: 1
+    })
+    f.runLogin.mockRejectedValueOnce(new Error('Claude sign-in was cancelled.'))
+    await expect(f.service.reauthenticateAccount('b')).rejects.toThrow('cancelled')
+    expect(f.runtimeAuth.removeAccountFolder).not.toHaveBeenCalled()
+    expect(f.settings().claudeManagedAccounts.map((entry) => entry.id)).toEqual(['a', 'b'])
+  })
+
+  it('clears the selection, republishes, then deletes the folder on remove', async () => {
+    const f = fixture()
+    f.signIn('a', 'a@example.test')
+    await f.service.removeAccount('a')
+    expect(f.settings().claudeManagedAccounts.map((entry) => entry.id)).toEqual(['b'])
+    expect(f.settings().activeClaudeManagedAccountIdsByRuntime?.host).toBeNull()
+    expect(f.runtimeAuth.syncForCurrentSelection).toHaveBeenCalledWith({ runtime: 'host' })
+    expect(f.runtimeAuth.removeAccountFolder).toHaveBeenCalledWith('a', { runtime: 'host' })
+  })
+
+  it("deletes a cancelled sign-in's folder but never a saved account's", async () => {
+    const f = fixture()
+    const begun = await f.service.beginSignIn({ runtime: 'host' })
+    await f.service.cancelSignIn({ accountId: begun.accountId, runtime: 'host' })
+    expect(f.runtimeAuth.removeAccountFolder).toHaveBeenCalledWith(begun.accountId, {
+      runtime: 'host'
+    })
+    f.runtimeAuth.removeAccountFolder.mockClear()
+    await f.service.cancelSignIn({ accountId: 'a', runtime: 'host' })
+    expect(f.runtimeAuth.removeAccountFolder).not.toHaveBeenCalled()
+  })
+
+  it('keeps the row when its folder cannot be deleted, so the user can retry', async () => {
+    const f = fixture()
+    f.runtimeAuth.removeAccountFolder.mockRejectedValueOnce(
+      Object.assign(new Error('resource busy'), { code: 'EBUSY' })
+    )
+    await expect(f.service.removeAccount('a')).rejects.toThrow(CLAUDE_ACCOUNT_FOLDER_IN_USE_MESSAGE)
+    expect(f.settings().claudeManagedAccounts.map((entry) => entry.id)).toEqual(['a', 'b'])
+    expect(f.settings().activeClaudeManagedAccountIdsByRuntime?.host).toBeNull()
+  })
+
+  it('puts the previous account back when publishing a new selection fails', async () => {
+    const f = fixture()
+    f.signIn('b', 'b@example.test')
+    f.runtimeAuth.syncForCurrentSelection.mockRejectedValueOnce(new Error('publish failed'))
+    await expect(f.service.selectAccount('b')).rejects.toThrow('publish failed')
+    expect(f.settings().activeClaudeManagedAccountIdsByRuntime?.host).toBe('a')
+    expect(f.runtimeAuth.publishAll).toHaveBeenCalled()
+  })
+
+  it('refuses to select an account whose folder holds no login', async () => {
+    const f = fixture()
+    await expect(f.service.selectAccount('b')).rejects.toThrow(CLAUDE_ACCOUNT_NEEDS_SIGN_IN_MESSAGE)
+    expect(f.settings().activeClaudeManagedAccountIdsByRuntime?.host).toBe('a')
+    f.signIn('b', 'b@example.test')
+    await f.service.selectAccount('b')
+    expect(f.settings().activeClaudeManagedAccountIdsByRuntime?.host).toBe('b')
+  })
+
+  it('refuses to select a WSL account for the host', async () => {
+    const f = fixture([
+      account('a'),
+      account('w', { managedAuthRuntime: 'wsl', wslDistro: 'Ubuntu' })
+    ])
+    await expect(f.service.selectAccountForTarget('w', { runtime: 'host' })).rejects.toThrow(
+      'That Claude account belongs to a different runtime.'
+    )
+  })
+})
diff --git a/src/main/claude-accounts/claude-auth-capture.ts b/src/main/claude-accounts/claude-auth-capture.ts
deleted file mode 100644
index 2acaa4408683..000000000000
--- a/src/main/claude-accounts/claude-auth-capture.ts
+++ /dev/null
@@ -1,176 +0,0 @@
-import { createHash } from 'node:crypto'
-import { existsSync, readFileSync } from 'node:fs'
-import { join, resolve } from 'node:path'
-import { readActiveClaudeKeychainCredentialsStrict } from './keychain'
-
-export type ClaudeIdentity = {
-  email: string | null
-  organizationUuid: string | null
-  organizationName: string | null
-}
-
-export type CapturedClaudeAuth = {
-  credentialsJson: string
-  oauthAccount: unknown
-  identity: ClaudeIdentity
-}
-
-export type ClaudeCaptureCommand = (
-  args: string[],
-  configDir: { windowsPath: string; linuxPath: string | null; wslDistro: string | null },
-  timeoutMs: number,
-  options?: { allowFailure?: boolean }
-) => Promise<string>
-
-const STATUS_TIMEOUT_MS = 20_000
-
-export async function captureClaudeAuthFromExistingConfigDir(
-  configDir: string,
-  previousLegacyCredentialsSha256: string | null | undefined,
-  runCommand: ClaudeCaptureCommand
-): Promise<CapturedClaudeAuth> {
-  const trimmed = configDir.trim()
-  if (!trimmed) {
-    throw new Error('A Claude config directory path is required.')
-  }
-  const resolvedDir = resolve(trimmed)
-  if (process.platform !== 'darwin' && !existsSync(join(resolvedDir, '.credentials.json'))) {
-    throw new Error(
-      `No Claude credentials found in ${resolvedDir}. Run \`claude login\` into this directory first.`
-    )
-  }
-
-  let status = ''
-  try {
-    status = await runCommand(
-      ['auth', 'status', '--json'],
-      { windowsPath: resolvedDir, linuxPath: null, wslDistro: null },
-      STATUS_TIMEOUT_MS,
-      { allowFailure: true }
-    )
-  } catch (error) {
-    console.warn('[claude-accounts] Could not read `claude auth status`:', error)
-  }
-  const currentLegacyKeychain = await readActiveClaudeKeychainCredentialsStrict()
-  return captureClaudeAuthFromConfigDir(
-    resolvedDir,
-    status,
-    currentLegacyKeychain,
-    previousLegacyCredentialsSha256
-  )
-}
-
-export async function captureClaudeAuthFromConfigDir(
-  configDir: string,
-  statusOutput: string,
-  previousLegacyKeychain: string | null,
-  previousLegacyCredentialsSha256?: string | null,
-  readCredentials = readCapturedClaudeCredentials
-): Promise<CapturedClaudeAuth> {
-  const credentialsJson = await readCredentials(
-    configDir,
-    previousLegacyKeychain,
-    previousLegacyCredentialsSha256
-  )
-  if (!credentialsJson) {
-    throw new Error('Claude login completed, but no OAuth credentials were captured.')
-  }
-  const oauthAccount = readClaudeOauthAccount(configDir)
-  return {
-    credentialsJson,
-    oauthAccount,
-    identity: resolveClaudeIdentity(statusOutput, oauthAccount, credentialsJson)
-  }
-}
-
-export async function readCapturedClaudeCredentials(
-  configDir: string,
-  previousLegacyKeychain: string | null,
-  previousLegacyCredentialsSha256?: string | null
-): Promise<string | null> {
-  if (process.platform === 'darwin') {
-    const scopedCredentialsJson = await readActiveClaudeKeychainCredentialsStrict(configDir)
-    if (scopedCredentialsJson) {
-      return scopedCredentialsJson
-    }
-    const legacyCredentialsJson = await readActiveClaudeKeychainCredentialsStrict()
-    const legacyChanged =
-      previousLegacyCredentialsSha256 === undefined
-        ? legacyCredentialsJson !== previousLegacyKeychain
-        : legacyCredentialsJson !== null &&
-          createHash('sha256').update(legacyCredentialsJson).digest('hex') !==
-            previousLegacyCredentialsSha256
-    if (legacyCredentialsJson && legacyChanged) {
-      return legacyCredentialsJson
-    }
-  }
-  const credentialsPath = join(configDir, '.credentials.json')
-  return existsSync(credentialsPath) ? readFileSync(credentialsPath, 'utf-8') : null
-}
-
-function readClaudeOauthAccount(configDir: string): unknown {
-  for (const configPath of [join(configDir, '.claude.json'), join(configDir, '.config.json')]) {
-    if (!existsSync(configPath)) {
-      continue
-    }
-    try {
-      const parsed = JSON.parse(readFileSync(configPath, 'utf-8')) as Record<string, unknown>
-      if (parsed.oauthAccount) {
-        return parsed.oauthAccount
-      }
-    } catch {
-      continue
-    }
-  }
-  return null
-}
-
-function resolveClaudeIdentity(
-  statusOutput: string,
-  oauthAccount: unknown,
-  credentialsJson: string
-): ClaudeIdentity {
-  const status = parseJsonObject(statusOutput)
-  const oauth = asRecord(oauthAccount)
-  const credentialOauth = asRecord(parseJsonObject(credentialsJson)?.claudeAiOauth)
-  return {
-    email: normalizeField(
-      readString(status, 'email') ??
-        readString(oauth, 'emailAddress') ??
-        readString(oauth, 'email') ??
-        readString(credentialOauth, 'email')
-    ),
-    organizationUuid: normalizeField(
-      readString(status, 'organizationUuid') ??
-        readString(status, 'organizationId') ??
-        readString(oauth, 'organizationUuid') ??
-        readString(oauth, 'organizationId')
-    ),
-    organizationName: normalizeField(
-      readString(status, 'organizationName') ?? readString(oauth, 'organizationName')
-    )
-  }
-}
-
-function parseJsonObject(value: string): Record<string, unknown> | null {
-  try {
-    return asRecord(JSON.parse(value) as unknown)
-  } catch {
-    return null
-  }
-}
-
-function asRecord(value: unknown): Record<string, unknown> | null {
-  return value && typeof value === 'object' && !Array.isArray(value)
-    ? (value as Record<string, unknown>)
-    : null
-}
-
-function readString(value: Record<string, unknown> | null, key: string): string | null {
-  return typeof value?.[key] === 'string' ? value[key] : null
-}
-
-function normalizeField(value: string | null | undefined): string | null {
-  const trimmed = value?.trim()
-  return trimmed ? trimmed : null
-}
diff --git a/src/main/claude-accounts/claude-command-process.test.ts b/src/main/claude-accounts/claude-command-process.test.ts
new file mode 100644
index 000000000000..514a8ed4d487
--- /dev/null
+++ b/src/main/claude-accounts/claude-command-process.test.ts
@@ -0,0 +1,75 @@
+import { EventEmitter } from 'node:events'
+import { PassThrough } from 'node:stream'
+import { afterEach, describe, expect, it, vi } from 'vitest'
+
+type SpawnSpec = { program: string; args?: readonly string[]; env?: NodeJS.ProcessEnv }
+const spawned = vi.hoisted(() => {
+  const specs: SpawnSpec[] = []
+  return { specs }
+})
+
+vi.mock('../../shared/child-process/run-process', () => ({
+  spawnProcess: (spec: SpawnSpec) => {
+    spawned.specs.push(spec)
+    const child = Object.assign(new EventEmitter(), {
+      stdin: new PassThrough(),
+      stdout: new PassThrough(),
+      stderr: new PassThrough(),
+      pid: undefined,
+      kill: vi.fn()
+    })
+    queueMicrotask(() => child.emit('close', 0))
+    return child
+  }
+}))
+vi.mock('../codex-cli/command', () => ({ resolveClaudeCommand: () => 'claude' }))
+vi.mock('../wsl/wsl-executable-path', () => ({
+  resolveWslExecutablePath: () => 'C:\\Windows\\System32\\wsl.exe'
+}))
+
+import { buildWslLoginShellCommand } from '../../shared/wsl-login-shell-command'
+import { runClaudeCommandProcess } from './claude-command-process'
+
+const originalPlatform = process.platform
+afterEach(() => {
+  spawned.specs.length = 0
+  Object.defineProperty(process, 'platform', { value: originalPlatform })
+})
+
+describe('runClaudeCommandProcess', () => {
+  it("logs in on the host with CLAUDE_CONFIG_DIR set to the account's folder", async () => {
+    Object.defineProperty(process, 'platform', { value: 'darwin' })
+    await runClaudeCommandProcess(
+      ['auth', 'login', '--claudeai'],
+      { windowsPath: '/data/claude-profiles/a/home', linuxPath: null, wslDistro: null },
+      1000
+    )
+    expect(spawned.specs[0]).toMatchObject({
+      program: 'claude',
+      args: ['auth', 'login', '--claudeai']
+    })
+    expect(spawned.specs[0].env?.CLAUDE_CONFIG_DIR).toBe('/data/claude-profiles/a/home')
+  })
+
+  it("logs in through the distro's login shell with --exec for a WSL account", async () => {
+    Object.defineProperty(process, 'platform', { value: 'win32' })
+    await runClaudeCommandProcess(
+      ['auth', 'login', '--claudeai'],
+      {
+        windowsPath: '\\\\wsl.localhost\\Ubuntu\\home\\u\\a',
+        linuxPath: "/home/u/it's/a",
+        wslDistro: 'Ubuntu'
+      },
+      1000
+    )
+    const spec = spawned.specs[0]
+    expect(spec.program).toBe('C:\\Windows\\System32\\wsl.exe')
+    expect(spec.args?.slice(0, 5)).toEqual(['-d', 'Ubuntu', '--exec', '/bin/sh', '-c'])
+    expect(spec.args?.[5]).toBe(
+      buildWslLoginShellCommand(
+        `exec env CLAUDE_CONFIG_DIR='/home/u/it'\\''s/a' claude 'auth' 'login' '--claudeai'`
+      )
+    )
+    expect(spec.env?.CLAUDE_CONFIG_DIR).toBe(process.env.CLAUDE_CONFIG_DIR)
+  })
+})
diff --git a/src/main/claude-accounts/claude-command-process.ts b/src/main/claude-accounts/claude-command-process.ts
index 78fe109f79f8..98b867d02a78 100644
--- a/src/main/claude-accounts/claude-command-process.ts
+++ b/src/main/claude-accounts/claude-command-process.ts
@@ -4,7 +4,13 @@ import {
   buildWindowsHostInteractiveLoginSpawn,
   type WindowsHostInteractiveLoginSpawn
 } from '../../shared/windows-interactive-login-spawn'
+import {
+  buildWslExecArgs,
+  buildWslLoginShellCommand,
+  quotePosixShell
+} from '../../shared/wsl-login-shell-command'
 import { resolveClaudeCommand } from '../codex-cli/command'
+import { resolveWslExecutablePath } from '../wsl/wsl-executable-path'
 import { buildWindowsCommandInvocation } from './windows-command-invocation'
 import { terminateClaudeProcess } from './claude-login-process-termination'
 
@@ -19,15 +25,10 @@ export type ClaudeCommandConfig = {
 }
 
 export type ClaudeCommandOptions = {
-  allowFailure?: boolean
   signal?: AbortSignal
   keepStdinOpen?: boolean
 }
 
-function shellQuote(value: string): string {
-  return `'${value.replace(/'/g, "'\\''")}'`
-}
-
 export function runClaudeCommandProcess(
   args: string[],
   configDir: ClaudeCommandConfig,
@@ -149,7 +150,7 @@ export function runClaudeCommandProcess(
         return
       }
       settle(() => {
-        if (code === 0 || options?.allowFailure) {
+        if (code === 0) {
           resolvePromise(output)
           return
         }
@@ -188,12 +189,9 @@ type ClaudeSpawnConfig = {
   windowsVerbatimArguments: boolean
 }
 
+// Why only this variable: account terminals set just CLAUDE_CONFIG_DIR, so Claude keys the login the same way.
 function claudeConfigDirEnv(configDir: string): NodeJS.ProcessEnv {
-  return {
-    CLAUDE_CONFIG_DIR: configDir,
-    // Why: Claude Code 2.1.220+ hashes this for the Keychain service name.
-    CLAUDE_SECURESTORAGE_CONFIG_DIR: configDir
-  }
+  return { CLAUDE_CONFIG_DIR: configDir }
 }
 
 function resolveClaudeInvocation(
@@ -214,15 +212,15 @@ function resolveClaudeInvocation(
       }
     : configDir.linuxPath && configDir.wslDistro
       ? {
-          command: 'wsl.exe',
-          args: [
-            '-d',
-            configDir.wslDistro,
-            '--exec',
-            'bash',
-            '-lc',
-            `export CLAUDE_CONFIG_DIR=${shellQuote(configDir.linuxPath)}; export CLAUDE_SECURESTORAGE_CONFIG_DIR=${shellQuote(configDir.linuxPath)}; exec claude ${args.map(shellQuote).join(' ')}`
-          ],
+          // Same login as the CLI's WSL sign-in: the distro's login shell finds an nvm/mise claude.
+          command: resolveWslExecutablePath(),
+          args: buildWslExecArgs(configDir.wslDistro, [
+            '/bin/sh',
+            '-c',
+            buildWslLoginShellCommand(
+              `exec env CLAUDE_CONFIG_DIR=${quotePosixShell(configDir.linuxPath)} claude ${args.map(quotePosixShell).join(' ')}`
+            )
+          ]),
           env: process.env,
           windowsVerbatimArguments: false
         }
diff --git a/src/main/claude-accounts/claude-credential-persistence-ratchet.test.ts b/src/main/claude-accounts/claude-credential-persistence-ratchet.test.ts
new file mode 100644
index 000000000000..4156b58ced4b
--- /dev/null
+++ b/src/main/claude-accounts/claude-credential-persistence-ratchet.test.ts
@@ -0,0 +1,281 @@
+import { existsSync, readdirSync, readFileSync, statSync } from 'node:fs'
+import { join, relative } from 'node:path'
+import { expect, it } from 'vitest'
+import { stripComments } from '../../shared/source-scan/source-tree-scan'
+
+const src = join(__dirname, '../..')
+
+/**
+ * Every place a Claude login could be written from: accounts, usage, launch, hooks, the CLI, the
+ * relay and the generated shell scripts. Plan §9 lists these; credential checks run on all of them.
+ */
+const credentialRoots: readonly (string | { root: string; only: RegExp })[] = [
+  'main/claude-accounts',
+  // Other providers there refresh their own logins; only Claude's usage is in scope.
+  { root: 'main/rate-limits', only: /[\\/]claude[^\\/]*\.ts$/ },
+  'main/claude',
+  'main/native-chat',
+  'main/ipc/pty',
+  'main/daemon',
+  'main/providers',
+  'main/macos-keychain',
+  'cli',
+  'relay',
+  'shared'
+]
+
+/**
+ * Only noncredential profile surfaces may persist bytes, and each only with the primitives it
+ * uses today; a new primitive in one of them is a review, not a silent pass.
+ */
+const fsAllowances: Record<string, readonly string[]> = {
+  'claude-accounts/claude-profile-history.ts': [
+    'mkdirSync',
+    'renameSync',
+    'rmdirSync',
+    'symlinkSync'
+  ],
+  'claude-accounts/claude-profile-paths.ts': ['mkdirSync', 'writeFileAtomically'],
+  // The which-account file.
+  'claude-accounts/claude-profile-router.ts': ['mkdirSync', 'rmSync', 'writeFileAtomically'],
+  // Removing an account deletes its folder, links first.
+  'claude-accounts/claude-account-folder.ts': ['rmSync', 'rmdirSync', 'unlinkSync'],
+  'claude-accounts/claude-profile-prompt-history.ts': [
+    'appendFileSync',
+    'linkSync',
+    'openSync',
+    'renameSync',
+    'rmSync',
+    'symlinkSync',
+    'unlinkSync',
+    'writeFileSync',
+    'writeFileAtomically'
+  ],
+  'claude-accounts/claude-profile-provisioning.ts': ['mkdirSync', 'rmSync', 'writeFileAtomically'],
+  'claude-accounts/claude-profile-sharing.ts': [
+    'mkdirSync',
+    'rmdirSync',
+    'symlinkSync',
+    'unlinkSync',
+    'writeFileAtomically'
+  ],
+  // The guest helper answers the host on stdout.
+  'claude-accounts/claude-profile-wsl-entry.ts': ['write']
+}
+const mutation =
+  /^(?:write(?:File|Json|Sync|v|.*Credentials|.*Keychain)?$|write(?:File|Json)|appendFile|copyFile|cp(?:Sync)?$|rename(?:Sync)?$|unlink(?:Sync)?$|rm(?:dir)?(?:Sync)?$|truncate(?:Sync)?$|createWriteStream|symlink(?:Sync)?$|link(?:Sync)?$|chmod(?:Sync)?$|mkdir(?:Sync)?$|mkdtemp(?:Sync)?$|open(?:Sync)?$|delete.*Keychain|refreshClaudeOauth)/
+
+function persistencePrimitives(text: string): string[] {
+  const found = new Set<string>()
+  // Import-side names survive aliases, including destructuring and wrapped helper calls.
+  for (const match of text.matchAll(/\b([a-zA-Z_$][\w$]*)\s*(?=\(|as\s|[:,}])/g)) {
+    if (mutation.test(match[1])) {
+      found.add(match[1])
+    }
+  }
+  return [...found]
+}
+
+const WRITE_CALL =
+  /\b(?:write\w*|append\w*|copy\w*|cp(?:Sync)?|rename\w*|link\w*|symlink\w*|createWriteStream)\s*\(/g
+// The one runner that takes `security` argv from its callers; each caller must spell the verb.
+const SECURITY_RUNNER = 'main/macos-keychain/generic-password.ts'
+// Removing an account deletes the Keychain items Claude made for its folder; nothing adds one.
+const KEYCHAIN_DELETE_OWNER = 'main/claude-accounts/claude-account-folder.ts'
+
+/** Names bound, directly or through another such name, to the credentials file's path. */
+function credentialFileNames(text: string): Set<string> {
+  const declarations: { name: string; init: string }[] = []
+  const lines = text.split('\n')
+  lines.forEach((line, index) => {
+    const declared = /^(\s*)(?:export\s+)?(?:const|let|var)\s+([A-Za-z_$][\w$]*)/.exec(line)
+    if (!declared) {
+      return
+    }
+    const indent = declared[1].length
+    let end = index + 1
+    while (end < lines.length && /^\s*$|^\s+/.test(lines[end])) {
+      const lead = /^\s*/.exec(lines[end])?.[0].length ?? 0
+      if (lines[end].trim() && lead <= indent && !/^\s*[)\]}]/.test(lines[end])) {
+        break
+      }
+      end += 1
+    }
+    declarations.push({ name: declared[2], init: lines.slice(index, end).join('\n') })
+  })
+  const names = new Set<string>()
+  for (let changed = true; changed;) {
+    changed = false
+    for (const { name, init } of declarations) {
+      const tainted =
+        init.includes('.credentials.json') ||
+        [...names].some((other) => new RegExp(`\\b${other}\\b`).test(init.replace(name, '')))
+      if (tainted && !names.has(name)) {
+        names.add(name)
+        changed = true
+      }
+    }
+  }
+  return names
+}
+
+/** Credential writes refused everywhere scanned, whatever form the call takes. */
+function credentialMutations(text: string, file = ''): string[] {
+  const found: string[] = []
+  // A `security` launch whose verb is not spelled out could be a write, so only the runner may
+  // forward argv, and its callers must spell the verb.
+  if (
+    (file !== SECURITY_RUNNER &&
+      /\b(?:exec(?:File)?(?:Sync|Async)?|spawn(?:Sync)?|runProcess|spawnProcess)\s*\(\s*['"`]security['"`]\s*,\s*(?!\[\s*['"])/.test(
+        text
+      )) ||
+    /\bprogram\s*:\s*['"`]security['"`]\s*,\s*args\s*:\s*(?!\[\s*['"])/.test(text) ||
+    /(?<!function\s)\bexecSecurityCommand\s*\(\s*(?!\[\s*['"])/.test(text)
+  ) {
+    found.push('keychain command with a computed verb')
+  }
+  // A name bound to the credentials file that reaches a write, anywhere in the same file.
+  const names = credentialFileNames(text)
+  for (const call of text.matchAll(WRITE_CALL)) {
+    const args = text.slice(call.index + call[0].length, call.index + call[0].length + 300)
+    if ([...names].some((name) => new RegExp(`\\b${name}\\b`).test(args))) {
+      found.push('credentials file write through a name')
+      break
+    }
+  }
+  // Argv (`['add-generic-password', …]`) and shell (`security add-generic-password`) forms.
+  if (
+    /add-generic-password/.test(text) ||
+    (file !== KEYCHAIN_DELETE_OWNER && /delete-generic-password/.test(text))
+  ) {
+    found.push('keychain write')
+  }
+  if (/\b(?:write|delete|store|save)\w*Keychain\w*\b/.test(text)) {
+    found.push('keychain helper')
+  }
+  if (/oauth\/token|grant_type|\brefresh_token\b/.test(text)) {
+    found.push('token refresh')
+  }
+  // A statement that names the credentials file together with anything that writes, copies,
+  // moves or opens it for writing (TS calls and generated shell alike).
+  for (const statement of text.split(/;|\n\s*\n/)) {
+    if (
+      statement.includes('.credentials.json') &&
+      /\b(?:write\w*|append\w*|copy\w*|cp(?:Sync)?|rename\w*|link\w*|symlink\w*|createWriteStream|mv|tee|install)\b|\bopen(?:Sync)?\s*\([\s\S]{0,200}?,\s*['"`](?:w|a|r\+|wx|ax)|>\s*["'$]/.test(
+        statement
+      )
+    ) {
+      found.push('credentials file write')
+    }
+  }
+  return found
+}
+
+function files(dir: string): string[] {
+  if (!existsSync(dir)) {
+    return []
+  }
+  return readdirSync(dir, { withFileTypes: true }).flatMap((entry) => {
+    const file = join(dir, entry.name)
+    return entry.isDirectory()
+      ? entry.name === 'node_modules' || entry.name === '__fixtures__'
+        ? []
+        : files(file)
+      : /\.(?:ts|tsx|mts|cts|js|mjs|cjs|sh)$/.test(entry.name) &&
+          !/\.test\.|\.spec\.|test-harness|harness\.ts|test-fixtures|test-utils/.test(entry.name)
+        ? [file]
+        : []
+  })
+}
+
+it('keeps every Claude credential writer removed, in every form and on every launch path', () => {
+  const violations = credentialRoots
+    .flatMap((entry) => {
+      const { root, only } = typeof entry === 'string' ? { root: entry, only: null } : entry
+      const dir = join(src, root)
+      const found = statSync(dir, { throwIfNoEntry: false })?.isDirectory() ? files(dir) : []
+      return only ? found.filter((file) => only.test(file)) : found
+    })
+    .flatMap((file) =>
+      credentialMutations(
+        stripComments(readFileSync(file, 'utf8')),
+        relative(src, file).replaceAll('\\', '/')
+      ).map((kind) => `${relative(src, file)}: ${kind}`)
+    )
+  expect(violations).toEqual([])
+})
+
+it('confines filesystem persistence in accounts and usage to named profile surfaces', () => {
+  const main = join(src, 'main')
+  const candidates = [
+    ...files(__dirname),
+    ...files(join(main, 'rate-limits')).filter((file) => /\/claude[^/]*\.ts$/.test(file))
+  ]
+  const violations = candidates.flatMap((file) => {
+    const name = relative(main, file).replaceAll('\\', '/')
+    const allowed = new Set(fsAllowances[name] ?? [])
+    return persistencePrimitives(stripComments(readFileSync(file, 'utf8')))
+      .filter((primitive) => !allowed.has(primitive))
+      .map((primitive) => `${name}: ${primitive}`)
+  })
+  expect(violations).toEqual([])
+  const cli = readFileSync(join(main, '../cli/handlers/account.ts'), 'utf8')
+  expect(cli).not.toMatch(/Keychain|orca-account-add-claude|addClaudeFromConfigDir/)
+  const auth = readFileSync(join(__dirname, 'runtime-auth-service.ts'), 'utf8')
+  expect(auth).not.toMatch(/extends ClaudeRuntimeAuth|snapshot|credentialsJson|readBack/i)
+})
+
+it.each([
+  "import { writeFile as save } from 'node:fs/promises'; save(path, token)",
+  "import * as fs from 'node:fs'; const save = () => fs.writeFileSync(path, token)",
+  "import { writeFileAtomically as persist } from '../codex-accounts/fs-utils'; persist(path, token)",
+  'fs.copyFile(source, destination)',
+  'fs.symlink(credentialPath, destination)',
+  "const fd = openSync(join(dir, 'x'), 'w'); writeSync(fd, token)",
+  'await fs.promises.cp(a, b)',
+  'fs.cpSync(a, b, { recursive: true })'
+])('mutation control: the filesystem census rejects %s', (source) => {
+  expect(persistencePrimitives(source).length).toBeGreaterThan(0)
+})
+
+it.each([
+  'security add-generic-password -s Claude -w token',
+  "await execFileAsync('security', ['add-generic-password', '-U', '-s', service, '-w', token])",
+  "execFileSync('security', ['delete-generic-password', '-s', 'Claude Code-credentials'])",
+  "import { writeKeychainPassword as persist } from '../macos-keychain/generic-password'; persist(service, user, token)",
+  "const fd = openSync(join(dir, '.credentials.json'), 'w'); writeSync(fd, token)",
+  "await fs.promises.cp(join(a, '.credentials.json'), join(b, '.credentials.json'))",
+  "copyFileSync(join(from, '.credentials.json'), join(home, '.credentials.json'))",
+  "const script = 'cp source .credentials.json'",
+  'const script = `printf %s "$token" > "$HOME/.claude/.credentials.json"`',
+  "fetch('https://api.anthropic.com/v1/oauth/token')",
+  "body: JSON.stringify({ grant_type: 'refresh_token' })",
+  "execFile('security', [['add', 'generic', 'password'].join('-'), '-s', service])",
+  "spawn('security', verbArgs)",
+  'execSecurityCommand(args)',
+  "const CREDENTIALS_FILE = '.credentials.json'\n\ncopyFileSync(join(from, CREDENTIALS_FILE), join(to, CREDENTIALS_FILE))",
+  "const name = '.credentials.json'\nfunction save(dir) {\n  const target = join(dir, name)\n\n  writeFileSync(target, token)\n}"
+])('mutation control: the credential check rejects %s', (source) => {
+  expect(credentialMutations(source).length).toBeGreaterThan(0)
+})
+
+it.each([
+  "const file = await readFile(join(home, '.credentials.json'), 'utf8')",
+  "readKeychainPassword('Claude Code-credentials', user)",
+  "execSecurityCommand(['find-generic-password', '-s', service, '-w'])",
+  "const file = join(home, '.credentials.json')\nconst raw = await readFile(file, 'utf8')"
+])('the credential check leaves a read alone: %s', (source) => {
+  expect(credentialMutations(source)).toEqual([])
+})
+
+it('lets only account removal delete a Keychain item, and nothing add one', () => {
+  const remove = "execSecurityCommand(['delete-generic-password', '-s', service])"
+  expect(credentialMutations(remove, KEYCHAIN_DELETE_OWNER)).toEqual([])
+  expect(credentialMutations(remove, 'main/claude-accounts/service.ts')).not.toEqual([])
+  expect(
+    credentialMutations(
+      "execSecurityCommand(['add-generic-password', '-s', service])",
+      KEYCHAIN_DELETE_OWNER
+    )
+  ).not.toEqual([])
+})
diff --git a/src/main/claude-accounts/claude-login-completion.oracle.test.ts b/src/main/claude-accounts/claude-login-completion.oracle.test.ts
deleted file mode 100644
index 1f2fd963183f..000000000000
--- a/src/main/claude-accounts/claude-login-completion.oracle.test.ts
+++ /dev/null
@@ -1,192 +0,0 @@
-import { EventEmitter } from 'node:events'
-import { PassThrough } from 'node:stream'
-import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest'
-
-const processMocks = vi.hoisted(() => ({
-  spawn: vi.fn()
-}))
-
-vi.mock('node:child_process', () => ({
-  execFileSync: vi.fn(),
-  spawn: processMocks.spawn
-}))
-
-vi.mock('electron', () => ({
-  app: { getPath: () => 'C:\\orca-review-11407' }
-}))
-
-vi.mock('../codex-cli/command', () => ({
-  resolveClaudeCommand: () => 'claude.exe'
-}))
-
-vi.mock('./keychain', () => ({
-  deleteActiveClaudeKeychainCredentialsStrict: vi.fn(),
-  deleteManagedClaudeKeychainCredentials: vi.fn(),
-  readActiveClaudeKeychainCredentials: vi.fn(),
-  readActiveClaudeKeychainCredentialsStrict: vi.fn(),
-  readManagedClaudeKeychainCredentials: vi.fn(),
-  writeActiveClaudeKeychainCredentials: vi.fn(),
-  writeManagedClaudeKeychainCredentials: vi.fn()
-}))
-
-type CommandConfig = {
-  windowsPath: string
-  linuxPath: string | null
-  wslDistro: string | null
-}
-
-type FakeChild = EventEmitter & {
-  stdin: PassThrough
-  stdout: PassThrough
-  stderr: PassThrough
-  kill: ReturnType<typeof vi.fn>
-  pid: number
-}
-
-type CommandRunner = {
-  runClaudeCommand(
-    args: string[],
-    config: CommandConfig,
-    timeoutMs: number,
-    options?: { keepStdinOpen?: boolean; signal?: AbortSignal }
-  ): Promise<string>
-}
-
-const originalPlatform = Object.getOwnPropertyDescriptor(process, 'platform')
-
-function setPlatform(platform: NodeJS.Platform): void {
-  Object.defineProperty(process, 'platform', { configurable: true, value: platform })
-}
-
-function createChild(): FakeChild {
-  const child = new EventEmitter() as FakeChild
-  child.stdin = new PassThrough()
-  child.stdout = new PassThrough()
-  child.stderr = new PassThrough()
-  child.kill = vi.fn()
-  child.pid = 11407
-  return child
-}
-
-async function createRunner(): Promise<CommandRunner> {
-  const { ClaudeAccountService } = await import('./service')
-  return new ClaudeAccountService({} as never, {} as never, {} as never) as unknown as CommandRunner
-}
-
-async function flushPromiseCallbacks(): Promise<void> {
-  await Promise.resolve()
-  await Promise.resolve()
-}
-
-describe('native Windows Claude login completion oracle', () => {
-  beforeEach(() => {
-    vi.useFakeTimers()
-    processMocks.spawn.mockReset()
-  })
-
-  afterEach(() => {
-    vi.useRealTimers()
-    if (originalPlatform) {
-      Object.defineProperty(process, 'platform', originalPlatform)
-    }
-  })
-
-  it('settles exact native Windows auth login on exit exactly once and cleans resources', async () => {
-    setPlatform('win32')
-    const child = createChild()
-    const destroyStdin = vi.spyOn(child.stdin, 'destroy')
-    const destroyStdout = vi.spyOn(child.stdout, 'destroy')
-    const destroyStderr = vi.spyOn(child.stderr, 'destroy')
-    const abortController = new AbortController()
-    const removeAbortListener = vi.spyOn(abortController.signal, 'removeEventListener')
-    processMocks.spawn.mockReturnValue(child)
-    const runner = await createRunner()
-    let completions = 0
-    const command = runner
-      .runClaudeCommand(
-        ['auth', 'login', '--claudeai'],
-        { windowsPath: 'C:\\isolated-auth', linuxPath: null, wslDistro: null },
-        1000,
-        { keepStdinOpen: true, signal: abortController.signal }
-      )
-      .then(() => {
-        completions += 1
-      })
-
-    child.emit('exit', 0)
-    await flushPromiseCallbacks()
-
-    try {
-      expect(completions).toBe(1)
-      expect(child.listenerCount('error')).toBe(0)
-      expect(child.listenerCount('exit')).toBe(0)
-      expect(child.listenerCount('close')).toBe(0)
-      expect(child.stdout.listenerCount('data')).toBe(0)
-      expect(child.stderr.listenerCount('data')).toBe(0)
-      expect(destroyStdin).toHaveBeenCalledTimes(1)
-      expect(destroyStdout).toHaveBeenCalledTimes(1)
-      expect(destroyStderr).toHaveBeenCalledTimes(1)
-      expect(removeAbortListener).toHaveBeenCalledTimes(1)
-
-      child.emit('close', 0)
-      await vi.advanceTimersByTimeAsync(1001)
-
-      expect(completions).toBe(1)
-      expect(child.kill).not.toHaveBeenCalled()
-      expect(destroyStdin).toHaveBeenCalledTimes(1)
-      expect(destroyStdout).toHaveBeenCalledTimes(1)
-      expect(destroyStderr).toHaveBeenCalledTimes(1)
-      expect(removeAbortListener).toHaveBeenCalledTimes(1)
-    } finally {
-      child.emit('close', 0)
-      await command
-    }
-  })
-
-  it.each([
-    {
-      name: 'non-Windows auth login',
-      platform: 'linux' as const,
-      args: ['auth', 'login', '--claudeai'],
-      config: { windowsPath: '/isolated-auth', linuxPath: null, wslDistro: null }
-    },
-    {
-      name: 'unrelated native Windows command containing login',
-      platform: 'win32' as const,
-      args: ['config', 'login'],
-      config: { windowsPath: 'C:\\isolated-auth', linuxPath: null, wslDistro: null }
-    },
-    {
-      name: 'WSL auth login',
-      platform: 'win32' as const,
-      args: ['auth', 'login', '--claudeai'],
-      config: {
-        windowsPath: 'C:\\isolated-auth',
-        linuxPath: '/home/orca/isolated-auth',
-        wslDistro: 'Ubuntu-Oracle'
-      }
-    }
-  ])('preserves close completion for $name', async ({ platform, args, config }) => {
-    setPlatform(platform)
-    const child = createChild()
-    processMocks.spawn.mockReturnValue(child)
-    const runner = await createRunner()
-    let completions = 0
-    const command = runner.runClaudeCommand(args, config, 1000).then(() => {
-      completions += 1
-    })
-
-    child.emit('exit', 0)
-    await flushPromiseCallbacks()
-
-    expect(completions).toBe(0)
-    expect(child.listenerCount('close')).toBe(1)
-
-    child.emit('close', 0)
-    await command
-
-    expect(completions).toBe(1)
-    expect(child.listenerCount('close')).toBe(0)
-    expect(child.kill).not.toHaveBeenCalled()
-  })
-})
diff --git a/src/main/claude-accounts/claude-login-session.ts b/src/main/claude-accounts/claude-login-session.ts
index ce9a398bb865..47160b506b22 100644
--- a/src/main/claude-accounts/claude-login-session.ts
+++ b/src/main/claude-accounts/claude-login-session.ts
@@ -1,19 +1,6 @@
-import { mkdtempSync, realpathSync, rmSync } from 'node:fs'
-import { tmpdir } from 'node:os'
-import { join } from 'node:path'
-import { toWindowsWslPath } from '../wsl'
-import { runWslProcess } from '../wsl/wsl-runner'
-import type { CapturedClaudeAuth } from './claude-auth-capture'
 import type { ClaudeCommandConfig, ClaudeCommandOptions } from './claude-command-process'
-import type { ClaudeManagedAuthLocation } from './claude-managed-auth-storage'
-import {
-  deleteActiveClaudeKeychainCredentialsStrict,
-  readActiveClaudeKeychainCredentials,
-  writeActiveClaudeKeychainCredentials
-} from './keychain'
 
 const LOGIN_TIMEOUT_MS = 180_000
-const STATUS_TIMEOUT_MS = 20_000
 
 type ClaudeLoginSessionDependencies = {
   runCommand: (
@@ -22,19 +9,14 @@ type ClaudeLoginSessionDependencies = {
     timeoutMs: number,
     options?: ClaudeCommandOptions
   ) => Promise<string>
-  capture: (
-    configDir: string,
-    statusOutput: string,
-    previousLegacyKeychain: string | null
-  ) => Promise<CapturedClaudeAuth>
   setCancel: (cancel: (() => boolean) | null) => void
 }
 
+/** Runs a hidden `claude auth login` that writes its login straight into the account's folder. */
 export async function runClaudeLoginSession(
-  location: ClaudeManagedAuthLocation,
+  folder: ClaudeCommandConfig,
   dependencies: ClaudeLoginSessionDependencies
-): Promise<CapturedClaudeAuth> {
-  const tempConfig = await createTemporaryClaudeConfigDir(location)
+): Promise<void> {
   const controller = new AbortController()
   dependencies.setCancel(() => {
     if (controller.signal.aborted) {
@@ -43,107 +25,12 @@ export async function runClaudeLoginSession(
     controller.abort()
     return true
   })
-  const previousLegacyKeychain = await readActiveClaudeKeychainCredentials()
-  let captured: CapturedClaudeAuth | null = null
-  let captureError: unknown = null
-  let cleanupError: unknown = null
   try {
-    if (controller.signal.aborted) {
-      throw new Error('Claude sign-in was cancelled.')
-    }
-    await dependencies.runCommand(['auth', 'login', '--claudeai'], tempConfig, LOGIN_TIMEOUT_MS, {
+    await dependencies.runCommand(['auth', 'login', '--claudeai'], folder, LOGIN_TIMEOUT_MS, {
       signal: controller.signal,
       keepStdinOpen: true
     })
-    dependencies.setCancel(null)
-    const status = await dependencies.runCommand(
-      ['auth', 'status', '--json'],
-      tempConfig,
-      STATUS_TIMEOUT_MS,
-      { allowFailure: true }
-    )
-    captured = await dependencies.capture(tempConfig.windowsPath, status, previousLegacyKeychain)
-  } catch (error) {
-    captureError = error
   } finally {
-    if (process.platform === 'darwin') {
-      try {
-        await deleteActiveClaudeKeychainCredentialsStrict(tempConfig.windowsPath)
-      } catch (error) {
-        console.warn('[claude-accounts] Failed to clean temporary Claude Keychain item:', error)
-      }
-      try {
-        await (previousLegacyKeychain
-          ? writeActiveClaudeKeychainCredentials(previousLegacyKeychain)
-          : deleteActiveClaudeKeychainCredentialsStrict())
-      } catch (error) {
-        cleanupError = error
-      }
-    }
-    await removeTemporaryClaudeConfigDir(tempConfig)
     dependencies.setCancel(null)
   }
-  if (captureError) {
-    throw captureError
-  }
-  if (cleanupError) {
-    throw cleanupError
-  }
-  return captured!
-}
-
-async function createTemporaryClaudeConfigDir(
-  location: ClaudeManagedAuthLocation
-): Promise<ClaudeCommandConfig> {
-  if (location.managedAuthRuntime !== 'wsl') {
-    const created = mkdtempSync(join(tmpdir(), 'orca-claude-login-'))
-    let windowsPath = created
-    try {
-      windowsPath = realpathSync(created)
-    } catch {
-      // Keep the mkdtemp path if the temp root cannot be resolved.
-    }
-    return {
-      windowsPath,
-      linuxPath: null,
-      wslDistro: null
-    }
-  }
-  if (!location.wslDistro) {
-    throw new Error('Could not resolve the active WSL distribution for Claude login.')
-  }
-  const created = await runWslProcess({
-    distro: location.wslDistro,
-    loginPath: 'none',
-    shell: 'bash',
-    script: 'mktemp -d "${TMPDIR:-/tmp}/orca-claude-login.XXXXXX"',
-    timeoutMs: 5000
-  })
-  const linuxPath = created.stdout.replaceAll(String.fromCharCode(0), '').trim()
-  if (created.code !== 0 || created.timedOut || !linuxPath.startsWith('/')) {
-    throw new Error('Could not create a temporary WSL Claude login directory.')
-  }
-  return {
-    windowsPath: toWindowsWslPath(linuxPath, location.wslDistro),
-    linuxPath,
-    wslDistro: location.wslDistro
-  }
-}
-
-async function removeTemporaryClaudeConfigDir(config: ClaudeCommandConfig): Promise<void> {
-  if (config.linuxPath && config.wslDistro) {
-    try {
-      await runWslProcess({
-        distro: config.wslDistro,
-        loginPath: 'none',
-        program: 'rm',
-        args: ['-rf', '--', config.linuxPath],
-        timeoutMs: 5000
-      })
-    } catch {
-      // Cleanup cannot mask the login result.
-    }
-    return
-  }
-  rmSync(config.windowsPath, { recursive: true, force: true })
 }
diff --git a/src/main/claude-accounts/claude-managed-auth-storage.ts b/src/main/claude-accounts/claude-managed-auth-storage.ts
deleted file mode 100644
index b430979655c6..000000000000
--- a/src/main/claude-accounts/claude-managed-auth-storage.ts
+++ /dev/null
@@ -1,285 +0,0 @@
-import { existsSync, mkdirSync, rmSync, writeFileSync } from 'node:fs'
-import { join, relative, resolve, sep } from 'node:path'
-import { parseWslUncPath } from '../../shared/wsl-paths'
-import { toWindowsWslPath } from '../wsl'
-import { runWslProcess } from '../wsl/wsl-runner'
-import { stripSharedClaudeCredentialFields } from './shared-credential-fields'
-import {
-  getClaudeManagedAccountsRoot,
-  readClaudeManagedAuthFile,
-  resolveOwnedClaudeManagedAuthPath,
-  writeClaudeManagedAuthFile
-} from './managed-auth-path'
-import {
-  deleteManagedClaudeKeychainCredentials,
-  readManagedClaudeKeychainCredentials,
-  writeManagedClaudeKeychainCredentials
-} from './keychain'
-
-export type ClaudeManagedAuthLocation = {
-  managedAuthPath: string
-  managedAuthRuntime: 'host' | 'wsl'
-  wslDistro: string | null
-  wslLinuxAuthPath: string | null
-}
-
-export type ClaudeManagedAuthSnapshot = {
-  credentialsJson: string | null
-  oauthAccountJson: string | null
-}
-
-export type ClaudeManagedAuthTarget = {
-  runtime?: 'host' | 'wsl'
-  wslDistro?: string | null
-}
-
-function shellQuote(value: string): string {
-  return `'${value.replace(/'/g, "'\\''")}'`
-}
-
-export class ClaudeManagedAuthStorage {
-  async create(
-    accountId: string,
-    target?: ClaudeManagedAuthTarget
-  ): Promise<ClaudeManagedAuthLocation> {
-    const wslAuth = await this.tryCreateWsl(accountId, target)
-    if (wslAuth) {
-      return wslAuth
-    }
-    const managedAuthPath = join(this.getRoot(), accountId, 'auth')
-    mkdirSync(managedAuthPath, { recursive: true, mode: 0o700 })
-    writeFileSync(join(managedAuthPath, '.orca-managed-claude-auth'), `${accountId}\n`, {
-      encoding: 'utf-8',
-      mode: 0o600
-    })
-    return {
-      managedAuthPath: await this.assertOwned(managedAuthPath, accountId),
-      managedAuthRuntime: 'host',
-      wslDistro: null,
-      wslLinuxAuthPath: null
-    }
-  }
-
-  async writeAuth(
-    accountId: string,
-    managedAuthPath: string,
-    captured: { credentialsJson: string; oauthAccount: unknown }
-  ): Promise<void> {
-    await this.writeCredentials(accountId, managedAuthPath, captured.credentialsJson)
-    await this.writeOauthAccount(accountId, managedAuthPath, captured.oauthAccount)
-  }
-
-  async writeCredentials(
-    accountId: string,
-    managedAuthPath: string,
-    credentialsJson: string
-  ): Promise<void> {
-    const trustedPath = await this.assertOwned(managedAuthPath, accountId)
-    if (!parseWslUncPath(trustedPath)) {
-      credentialsJson = stripSharedClaudeCredentialFields(credentialsJson)
-    }
-    if (process.platform === 'darwin') {
-      await writeManagedClaudeKeychainCredentials(accountId, credentialsJson)
-    } else {
-      writeClaudeManagedAuthFile(trustedPath, '.credentials.json', credentialsJson)
-    }
-  }
-
-  async writeOauthAccount(
-    accountId: string,
-    managedAuthPath: string,
-    oauthAccount: unknown
-  ): Promise<void> {
-    const trustedPath = await this.assertOwned(managedAuthPath, accountId)
-    writeClaudeManagedAuthFile(
-      trustedPath,
-      'oauth-account.json',
-      `${JSON.stringify(oauthAccount, null, 2)}\n`
-    )
-  }
-
-  async readSnapshot(
-    accountId: string,
-    managedAuthPath: string
-  ): Promise<ClaudeManagedAuthSnapshot> {
-    const trustedPath = await this.assertOwned(managedAuthPath, accountId)
-    return {
-      credentialsJson:
-        process.platform === 'darwin'
-          ? await readManagedClaudeKeychainCredentials(accountId)
-          : readClaudeManagedAuthFile(trustedPath, '.credentials.json'),
-      oauthAccountJson: readClaudeManagedAuthFile(trustedPath, 'oauth-account.json')
-    }
-  }
-
-  async restoreCredentials(
-    accountId: string,
-    managedAuthPath: string,
-    snapshot: ClaudeManagedAuthSnapshot
-  ): Promise<void> {
-    const trustedPath = await this.assertOwned(managedAuthPath, accountId)
-    if (process.platform === 'darwin') {
-      await (snapshot.credentialsJson !== null
-        ? writeManagedClaudeKeychainCredentials(accountId, snapshot.credentialsJson)
-        : deleteManagedClaudeKeychainCredentials(accountId))
-    } else if (snapshot.credentialsJson !== null) {
-      writeClaudeManagedAuthFile(trustedPath, '.credentials.json', snapshot.credentialsJson)
-    } else {
-      rmSync(join(trustedPath, '.credentials.json'), { force: true })
-    }
-  }
-
-  async restoreOauth(
-    accountId: string,
-    managedAuthPath: string,
-    snapshot: ClaudeManagedAuthSnapshot
-  ): Promise<void> {
-    const trustedPath = await this.assertOwned(managedAuthPath, accountId)
-    if (snapshot.oauthAccountJson !== null) {
-      writeClaudeManagedAuthFile(trustedPath, 'oauth-account.json', snapshot.oauthAccountJson)
-    } else {
-      rmSync(join(trustedPath, 'oauth-account.json'), { force: true })
-    }
-  }
-
-  async remove(accountId: string, candidatePath: string): Promise<void> {
-    try {
-      const managedAuthPath = await this.assertOwned(candidatePath, accountId)
-      rmSync(resolve(managedAuthPath, '..'), { recursive: true, force: true })
-    } catch (error) {
-      console.warn('[claude-accounts] Refusing to remove untrusted managed auth:', error)
-    }
-    await deleteManagedClaudeKeychainCredentials(accountId)
-  }
-
-  async assertOwned(candidatePath: string, expectedAccountId?: string): Promise<string> {
-    const wslInfo = parseWslUncPath(candidatePath)
-    if (wslInfo) {
-      return this.assertOwnedWsl(candidatePath, wslInfo, expectedAccountId)
-    }
-    this.getRoot()
-    const accountId = expectedAccountId ?? this.readAccountId(candidatePath)
-    if (!accountId || (expectedAccountId && accountId !== expectedAccountId)) {
-      throw new Error('Managed Claude auth directory does not exist on disk.')
-    }
-    const trustedPath = resolveOwnedClaudeManagedAuthPath(accountId, candidatePath, {
-      adoptLegacyMarker: true
-    })
-    if (!trustedPath) {
-      throw new Error('Managed Claude auth storage is not owned by Orca.')
-    }
-    return trustedPath
-  }
-
-  private async tryCreateWsl(
-    accountId: string,
-    target?: ClaudeManagedAuthTarget
-  ): Promise<ClaudeManagedAuthLocation | null> {
-    if (process.platform !== 'win32' || target?.runtime !== 'wsl') {
-      return null
-    }
-    const requestedDistro = target.wslDistro?.trim() || undefined
-    const info = await runWslProcess({
-      distro: requestedDistro,
-      loginPath: 'none',
-      shell: 'bash',
-      script: 'printf "%s\\n%s\\n" "$WSL_DISTRO_NAME" "$HOME"',
-      timeoutMs: 5000
-    })
-    const [rawDistro, rawHome] =
-      info.code === 0 && !info.timedOut
-        ? info.stdout
-            .replaceAll(String.fromCharCode(0), '')
-            .split(/\r?\n/)
-            .map((line) => line.trim())
-        : []
-    const distro = requestedDistro || rawDistro
-    const home = rawHome
-    if (!distro || !home?.startsWith('/')) {
-      throw new Error('Could not resolve the active WSL home directory for Claude login.')
-    }
-    const linuxPath = `${home.replace(/\/$/, '')}/.local/share/orca/claude-accounts/${accountId}/auth`
-    const created = await runWslProcess({
-      distro,
-      loginPath: 'none',
-      shell: 'bash',
-      script: 'umask 077; mkdir -p "$1" && printf \'%s\\n\' "$2" > "$1/.orca-managed-claude-auth"',
-      args: [linuxPath, accountId],
-      timeoutMs: 5000
-    })
-    if (created.code !== 0 || created.timedOut) {
-      throw new Error('Could not create the managed WSL Claude auth directory.')
-    }
-    const managedAuthPath = toWindowsWslPath(linuxPath, distro)
-    return {
-      managedAuthPath: await this.assertOwned(managedAuthPath, accountId),
-      managedAuthRuntime: 'wsl',
-      wslDistro: distro,
-      wslLinuxAuthPath: linuxPath
-    }
-  }
-
-  private async assertOwnedWsl(
-    candidatePath: string,
-    wslInfo: NonNullable<ReturnType<typeof parseWslUncPath>>,
-    expectedAccountId?: string
-  ): Promise<string> {
-    if (
-      !wslInfo.linuxPath.includes('/.local/share/orca/claude-accounts/') ||
-      !wslInfo.linuxPath.endsWith('/auth')
-    ) {
-      throw new Error('Managed WSL Claude auth storage is outside Orca account storage.')
-    }
-    if (process.platform !== 'win32') {
-      if (
-        !existsSync(candidatePath) ||
-        !existsSync(join(candidatePath, '.orca-managed-claude-auth'))
-      ) {
-        throw new Error('Managed Claude auth storage is not owned by Orca.')
-      }
-      return candidatePath
-    }
-    try {
-      const expected = expectedAccountId
-        ? `test "$(cat "$candidate_real/.orca-managed-claude-auth")" = ${shellQuote(expectedAccountId)}`
-        : 'test -n "$(cat "$candidate_real/.orca-managed-claude-auth")"'
-      const owned = await runWslProcess({
-        distro: wslInfo.distro,
-        loginPath: 'none',
-        shell: 'bash',
-        script: [
-          'set -euo pipefail',
-          `candidate=${shellQuote(wslInfo.linuxPath)}`,
-          'managed_root="${HOME%/}/.local/share/orca/claude-accounts"',
-          'candidate_real=$(readlink -f -- "$candidate")',
-          'managed_root_real=$(readlink -f -- "$managed_root")',
-          'test -f "$candidate_real/.orca-managed-claude-auth"',
-          expected,
-          'case "$candidate_real" in "$managed_root_real"/*/auth) printf "%s\\n" "$candidate_real" ;; *) exit 35 ;; esac'
-        ].join('\n'),
-        timeoutMs: 5000
-      })
-      const canonicalPath = owned.stdout.trim()
-      if (owned.code !== 0 || owned.timedOut || !canonicalPath) {
-        throw new Error('Managed Claude auth directory does not exist on disk.')
-      }
-      return toWindowsWslPath(canonicalPath, wslInfo.distro)
-    } catch (error) {
-      throw new Error('Managed WSL Claude auth storage is outside Orca account storage.', {
-        cause: error
-      })
-    }
-  }
-
-  private getRoot(): string {
-    const root = getClaudeManagedAccountsRoot()
-    mkdirSync(root, { recursive: true, mode: 0o700 })
-    return root
-  }
-
-  private readAccountId(candidatePath: string): string | null {
-    const relativePath = relative(resolve(this.getRoot()), resolve(candidatePath))
-    const parts = relativePath.split(sep)
-    return parts.length === 2 && parts[1] === 'auth' ? parts[0] : null
-  }
-}
diff --git a/src/main/claude-accounts/claude-profile-installed-router.ts b/src/main/claude-accounts/claude-profile-installed-router.ts
index a0c04e3c9baa..c4efc9f39e42 100644
--- a/src/main/claude-accounts/claude-profile-installed-router.ts
+++ b/src/main/claude-accounts/claude-profile-installed-router.ts
@@ -26,7 +26,7 @@ export function listClaudeProfileHomes(dataRoot: string): string[] {
 
 let installed: ClaudeProfileRouter | undefined
 
-/** Installed by the host runtime only when routing is enabled; workers and child processes have none. */
+/** Installed by the desktop's account services; workers, child processes and orcad have none. */
 export function installClaudeProfileRouter(router: ClaudeProfileRouter | undefined): void {
   installed = router
 }
@@ -46,8 +46,8 @@ export function withClaudeProfileTerminalEnv<Env extends Record<string, string>
 }
 
 /**
- * Account `<surface>` folders the System default readers cannot see. Step 1 links history into the
- * System default on macOS/Linux, so only Windows (or a cross-filesystem refusal) adds any.
+ * Account `<surface>` folders the System default readers cannot see. Setup links history into the
+ * System default on every platform, so only a folder setup could not link (e.g. across drives) adds any.
  */
 export function claudeProfileHistoryDirs(surface: 'projects' | 'transcripts'): string[] {
   return (installed?.accountHomes() ?? []).map((home) => join(home, surface)).filter(isDirectory)
diff --git a/src/main/claude-accounts/claude-profile-paths.test.ts b/src/main/claude-accounts/claude-profile-paths.test.ts
index f0d04f0fd734..070b486eeb20 100644
--- a/src/main/claude-accounts/claude-profile-paths.test.ts
+++ b/src/main/claude-accounts/claude-profile-paths.test.ts
@@ -12,7 +12,6 @@ import { join, resolve } from 'node:path'
 import { afterEach, describe, expect, it, vi } from 'vitest'
 vi.mock('electron', () => ({ app: { getPath: () => '/unused-test-path' } }))
 import {
-  assertOutsideDefaultClaudeHomes,
   describeClaudeProfile,
   prepareClaudeProfileDirectory,
   readClaudeProfileObject,
@@ -57,10 +56,16 @@ describe('Claude profile namespace', () => {
         target,
         home: join(dir, 'claude-profiles/account-a/home')
       })
-      prepareClaudeProfileDirectory(dir, profile, userHome)
-      expect(
-        JSON.parse(readFileSync(join(dir, 'claude-profiles/account-a/profile.json'), 'utf8'))
-      ).toEqual({ version: 1, accountId: 'account-a', runtime: 'wsl', distro: 'Ubuntu' })
+      const markSetUp = prepareClaudeProfileDirectory(dir, profile, userHome)
+      const marker = join(dir, 'claude-profiles/account-a/profile.json')
+      expect(existsSync(marker)).toBe(false)
+      markSetUp()
+      expect(JSON.parse(readFileSync(marker, 'utf8'))).toEqual({
+        version: 1,
+        accountId: 'account-a',
+        runtime: 'wsl',
+        distro: 'Ubuntu'
+      })
       // The host id is the caller's view of the host, so another caller's spelling is the same profile.
       prepareClaudeProfileDirectory(
         dir,
@@ -121,11 +126,9 @@ describe('Claude profile namespace', () => {
   it.runIf(caseInsensitive)('refuses a case-only alias of the default home', () => {
     const userHome = root()
     mkdirSync(join(userHome, '.claude'))
-    expect(() => assertOutsideDefaultClaudeHomes(join(userHome, '.CLAUDE'), userHome)).toThrow(
-      'separate directories'
-    )
+    const dataRoot = join(userHome, '.CLAUDE', 'orca')
     expect(() =>
-      assertOutsideDefaultClaudeHomes(join(userHome, '.CLAUDE', 'nested'), userHome)
+      prepareClaudeProfileDirectory(dataRoot, describeClaudeProfile(dataRoot, 'a', local), userHome)
     ).toThrow('separate directories')
   })
   it("reads the user's own CLAUDE_CONFIG_DIR but never Orca's injected one", () => {
diff --git a/src/main/claude-accounts/claude-profile-paths.ts b/src/main/claude-accounts/claude-profile-paths.ts
index 74ee5222c8e0..ece12937405c 100644
--- a/src/main/claude-accounts/claude-profile-paths.ts
+++ b/src/main/claude-accounts/claude-profile-paths.ts
@@ -1,6 +1,10 @@
 import { lstatSync, mkdirSync, readFileSync, realpathSync } from 'node:fs'
 import * as hostPath from 'node:path'
 import { basename, dirname, isAbsolute, join, relative, resolve, sep } from 'node:path'
+import {
+  CLAUDE_INJECTED_CONFIG_DIR_ENV,
+  CLAUDE_USER_CONFIG_DIR_ENV
+} from '../../shared/claude-profile-routing'
 import { isDefinitiveAbsence } from '../../shared/definitive-filesystem-absence'
 import type { ExecutionHostId } from '../../shared/execution-host'
 import { writeFileAtomically } from '../codex-accounts/fs-utils'
@@ -93,23 +97,23 @@ function readOwnershipMarker(file: string): string | null {
   return ownershipRecord(version, accountId, runtime, distro)
 }
 
-/**
- * The only gate before writing into a profile: namespace, containment, no linked components,
- * outside Claude's default homes, and an ownership marker beside the home. Refuses before creating anything.
- */
-// Written by setup's ownership gate when setup starts, not when it completes: its absence means
-// setup never started here, and its presence does not prove setup finished.
+// Written when a first setup finishes, so its absence means no setup has finished here yet.
 export function claudeProfileMarkerPath(profile: ClaudeProfileDescriptor): string {
   const path = profile.target.runtime === 'wsl' ? hostPath.posix : hostPath
   return path.join(path.dirname(profile.home), 'profile.json')
 }
 
+/**
+ * The only gate before writing into a profile: namespace, containment, no linked components,
+ * outside Claude's default homes, and an ownership marker beside the home. Refuses before creating
+ * anything. Returns the step that writes the marker, which setup runs last.
+ */
 export function prepareClaudeProfileDirectory(
   dataRoot: string,
   profile: ClaudeProfileDescriptor,
   userHome: string,
   userConfigDir?: string
-): void {
+): () => void {
   let expected: ClaudeProfileDescriptor
   try {
     expected = describeClaudeProfile(dataRoot, profile.accountId, profile.target)
@@ -135,12 +139,14 @@ export function prepareClaudeProfileDirectory(
     )
   }
   mkdirSync(profile.home, { recursive: true, mode: 0o700 })
-  if (marker === null) {
-    writeFileAtomically(markerPath, `${record}\n`, { mode: 0o600 })
+  return () => {
+    if (marker === null) {
+      writeFileAtomically(markerPath, `${record}\n`, { mode: 0o600 })
+    }
   }
 }
 
-export function assertClaudeProfileDescendant(root: string, destination: string): void {
+function assertClaudeProfileDescendant(root: string, destination: string): void {
   const suffix = relative(resolve(root), resolve(destination))
   if (!suffix || suffix === '..' || suffix.startsWith(`..${sep}`) || isAbsolute(suffix)) {
     throw new ClaudeProfileSurfaceError(
@@ -184,7 +190,7 @@ function canonicalPath(file: string): string {
   }
 }
 
-export function assertDistinctClaudeProfile(profile: string, defaultHome: string): void {
+function assertDistinctClaudeProfile(profile: string, defaultHome: string): void {
   const left = canonicalPath(profile)
   const right = canonicalPath(defaultHome)
   for (const [root, destination] of [
@@ -202,7 +208,7 @@ export function assertDistinctClaudeProfile(profile: string, defaultHome: string
 }
 
 /** Claude's default homes: a profile may never be, contain, or sit inside one. */
-export function assertOutsideDefaultClaudeHomes(
+function assertOutsideDefaultClaudeHomes(
   profileHome: string,
   userHome: string,
   userConfigDir?: string
@@ -214,16 +220,18 @@ export function assertOutsideDefaultClaudeHomes(
   }
 }
 
-/** Set beside every CLAUDE_CONFIG_DIR Orca injects, so its own value never reads as the user's. */
-export const CLAUDE_INJECTED_CONFIG_DIR_ENV = 'ORCA_CLAUDE_INJECTED_CONFIG_DIR'
-
 /** The user's own CLAUDE_CONFIG_DIR (their System default), or undefined for `~/.claude`. */
 export function readUserClaudeConfigDir(env: NodeJS.ProcessEnv): string | undefined {
   const configDir = env.CLAUDE_CONFIG_DIR?.trim()
   const injected = env[CLAUDE_INJECTED_CONFIG_DIR_ENV]?.trim()
-  if (!configDir || (injected && resolve(injected) === resolve(configDir))) {
+  if (!configDir) {
     return undefined
   }
+  if (injected && resolve(injected) === resolve(configDir)) {
+    // Why: an outer Orca's injected value carries the user's own beside it.
+    const user = env[CLAUDE_USER_CONFIG_DIR_ENV]?.trim()
+    return user ? resolve(user) : undefined
+  }
   return resolve(configDir)
 }
 
diff --git a/src/main/claude-accounts/claude-profile-provisioning.test.ts b/src/main/claude-accounts/claude-profile-provisioning.test.ts
index 66bf0346d90d..4bc12a4738a9 100644
--- a/src/main/claude-accounts/claude-profile-provisioning.test.ts
+++ b/src/main/claude-accounts/claude-profile-provisioning.test.ts
@@ -13,13 +13,15 @@ vi.mock('../codex-accounts/fs-utils', async (original) => {
   return { ...actual, writeFileAtomically: vi.fn(actual.writeFileAtomically) }
 })
 import { writeFileAtomically } from '../codex-accounts/fs-utils'
-import { CLAUDE_PROFILE_MEMORY_IMPORT, provisionClaudeProfile } from './claude-profile-provisioning'
+import { provisionClaudeProfile } from './claude-profile-provisioning'
 
 const USER_HOOK = { matcher: '', hooks: [{ type: 'command', command: 'notify-me' }] }
 const ORCA_HOOK = {
   matcher: '',
   hooks: [{ type: 'command', command: '"$HOME/.orca/agent-hooks/claude-hook.sh"' }]
 }
+// What Claude writes on a finished sign-in.
+const LOGIN = { emailAddress: 'p@example.com' }
 const roots: string[] = []
 function fixture() {
   const root = fs.realpathSync(fs.mkdtempSync(join(tmpdir(), 'claude-profile-setup-')))
@@ -33,13 +35,8 @@ function fixture() {
   const read = (file: string): Record<string, unknown> => JSON.parse(fs.readFileSync(file, 'utf8'))
   return { root, userHome, profileHome, source, json, read }
 }
-const provision = (f: { profileHome: string; userHome: string }, trustKeys?: string[]) =>
-  provisionClaudeProfile({
-    profileHome: f.profileHome,
-    userHome: f.userHome,
-    trustKeys,
-    platform: 'linux'
-  })
+const provision = (f: { profileHome: string; userHome: string }) =>
+  provisionClaudeProfile({ profileHome: f.profileHome, userHome: f.userHome, platform: 'linux' })
 afterEach(() => {
   vi.clearAllMocks()
   for (const dir of roots.splice(0)) {
@@ -219,7 +216,7 @@ describe('dormant Claude profile provisioning', () => {
     const f = fixture()
     f.json(join(f.source, 'settings.json'), { model: 'a' })
     f.json(join(f.userHome, '.claude.json'), { mcpServers: { a: {} }, theme: 'dark' })
-    f.json(join(f.profileHome, '.claude.json'), { userID: 'p' })
+    f.json(join(f.profileHome, '.claude.json'), { userID: 'p', oauthAccount: LOGIN })
     await provision(f)
     fs.writeFileSync(join(f.source, 'settings.json'), '{bad')
     fs.writeFileSync(join(f.userHome, '.claude.json'), '{bad')
@@ -233,17 +230,18 @@ describe('dormant Claude profile provisioning', () => {
     await provision(f)
     expect(f.read(join(f.profileHome, '.claude.json'))).toEqual({
       userID: 'p',
+      oauthAccount: LOGIN,
       theme: 'dark',
       hasCompletedOnboarding: true
     })
   })
-  it('requires existing state, merges MCP/theme/onboarding/trust and never copies or writes credentials', async () => {
+  it('requires existing state, merges MCP/theme/onboarding and never copies or writes credentials', async () => {
     const f = fixture()
     fs.writeFileSync(join(f.source, '.credentials.json'), 'SOURCE_CREDENTIAL_BYTES')
     f.json(join(f.userHome, '.claude.json'), {
       mcpServers: { local: { command: 'example' } },
       theme: 'dark',
-      oauthAccount: { email: 'source' },
+      oauthAccount: { emailAddress: 'source@example.com' },
       userID: 'source-id'
     })
     await provision(f)
@@ -251,18 +249,18 @@ describe('dormant Claude profile provisioning', () => {
     expect(fs.existsSync(join(f.profileHome, '.credentials.json'))).toBe(false)
     fs.writeFileSync(join(f.profileHome, '.credentials.json'), 'PROFILE_CREDENTIAL_BYTES')
     f.json(join(f.profileHome, '.claude.json'), {
-      oauthAccount: { email: 'profile' },
+      oauthAccount: { emailAddress: 'profile@example.com' },
       userID: 'profile-id',
       projects: { '/work': { allowedTools: ['Read'] } }
     })
-    await provision(f, ['/work'])
+    await provision(f)
     expect(f.read(join(f.profileHome, '.claude.json'))).toEqual({
-      oauthAccount: { email: 'profile' },
+      oauthAccount: { emailAddress: 'profile@example.com' },
       userID: 'profile-id',
       mcpServers: { local: { command: 'example' } },
       theme: 'dark',
       hasCompletedOnboarding: true,
-      projects: { '/work': { allowedTools: ['Read'], hasTrustDialogAccepted: true } }
+      projects: { '/work': { allowedTools: ['Read'] } }
     })
     expect(fs.readFileSync(join(f.source, '.credentials.json'), 'utf8')).toBe(
       'SOURCE_CREDENTIAL_BYTES'
@@ -277,44 +275,50 @@ describe('dormant Claude profile provisioning', () => {
       }
     }
   })
-  it('still forces onboarding and trust when the personal state is unreadable', async () => {
+  it('leaves a folder Claude has not signed in yet to Claude’s own onboarding', async () => {
     const f = fixture()
-    fs.writeFileSync(join(f.userHome, '.claude.json'), '{"theme": "da')
-    f.json(join(f.profileHome, '.claude.json'), { userID: 'p' })
-    const report = await provision(f, ['/work'])
+    f.json(join(f.userHome, '.claude.json'), { theme: 'dark', mcpServers: { a: {} } })
+    // Claude writes its state file at the theme pick, before the sign-in.
+    f.json(join(f.profileHome, '.claude.json'), { theme: 'light' })
+    expect((await provision(f)).surfaces['.claude.json']).toBe('absent')
+    expect(f.read(join(f.profileHome, '.claude.json'))).toEqual({ theme: 'light' })
+    f.json(join(f.profileHome, '.claude.json'), { theme: 'light', oauthAccount: LOGIN })
+    expect((await provision(f)).surfaces['.claude.json']).toBe('merged')
     expect(f.read(join(f.profileHome, '.claude.json'))).toEqual({
-      userID: 'p',
-      hasCompletedOnboarding: true,
-      projects: { '/work': { hasTrustDialogAccepted: true } }
+      theme: 'light',
+      oauthAccount: LOGIN,
+      mcpServers: { a: {} },
+      hasCompletedOnboarding: true
     })
-    expect(report.warnings).toContainEqual(
-      expect.objectContaining({ surface: '.claude.json', code: 'unreadable' })
-    )
   })
-  it('skips only folder trust when the profile projects value is malformed', async () => {
+  it('still forces onboarding when the personal state is unreadable', async () => {
     const f = fixture()
-    f.json(join(f.userHome, '.claude.json'), { theme: 'dark' })
-    f.json(join(f.profileHome, '.claude.json'), { userID: 'p', projects: 'bad' })
-    const report = await provision(f, ['/work'])
-    expect(report.surfaces['.claude.json']).toBe('merged')
+    fs.writeFileSync(join(f.userHome, '.claude.json'), '{"theme": "da')
+    f.json(join(f.profileHome, '.claude.json'), { userID: 'p', oauthAccount: LOGIN })
+    const report = await provision(f)
     expect(f.read(join(f.profileHome, '.claude.json'))).toEqual({
       userID: 'p',
-      projects: 'bad',
-      theme: 'dark',
+      oauthAccount: LOGIN,
       hasCompletedOnboarding: true
     })
+    expect(report.warnings).toContainEqual(
+      expect.objectContaining({ surface: '.claude.json', code: 'unreadable' })
+    )
   })
   it('skips the state write while Claude holds its lock and records nothing for it', async () => {
     const f = fixture()
     f.json(join(f.userHome, '.claude.json'), { theme: 'dark' })
-    f.json(join(f.profileHome, '.claude.json'), { userID: 'p' })
+    f.json(join(f.profileHome, '.claude.json'), { userID: 'p', oauthAccount: LOGIN })
     fs.mkdirSync(join(f.profileHome, '.claude.json.lock'))
     const report = await provision(f)
     expect(report.surfaces['.claude.json']).toBe('failed')
     expect(report.warnings).toContainEqual(
       expect.objectContaining({ surface: '.claude.json', code: 'locked' })
     )
-    expect(f.read(join(f.profileHome, '.claude.json'))).toEqual({ userID: 'p' })
+    expect(f.read(join(f.profileHome, '.claude.json'))).toEqual({
+      userID: 'p',
+      oauthAccount: LOGIN
+    })
     fs.rmdirSync(join(f.profileHome, '.claude.json.lock'))
     expect((await provision(f)).surfaces['.claude.json']).toBe('merged')
     expect(f.read(join(f.profileHome, '.claude.json')).theme).toBe('dark')
@@ -372,9 +376,7 @@ describe('dormant Claude profile provisioning', () => {
     expect(fs.existsSync(join(f.profileHome, 'CLAUDE.md'))).toBe(false)
     fs.writeFileSync(join(f.source, 'CLAUDE.md'), 'personal instructions')
     expect((await provision(f)).surfaces['CLAUDE.md']).toBe('synced')
-    expect(fs.readFileSync(join(f.profileHome, 'CLAUDE.md'), 'utf8')).toBe(
-      CLAUDE_PROFILE_MEMORY_IMPORT
-    )
+    expect(fs.readFileSync(join(f.profileHome, 'CLAUDE.md'), 'utf8')).toBe('@~/.claude/CLAUDE.md\n')
     fs.writeFileSync(join(f.source, 'CLAUDE.md'), 'edited personal instructions')
     expect((await provision(f)).surfaces['CLAUDE.md']).toBe('unchanged')
   })
@@ -388,7 +390,7 @@ describe('dormant Claude profile provisioning', () => {
       f.json(join(userConfigDir, 'settings.json'), { model: 'custom' })
       f.json(join(userConfigDir, '.claude.json'), { theme: 'custom' })
       f.json(join(f.userHome, '.claude.json'), { theme: 'home' })
-      f.json(join(f.profileHome, '.claude.json'), { userID: 'p' })
+      f.json(join(f.profileHome, '.claude.json'), { userID: 'p', oauthAccount: LOGIN })
       await provisionClaudeProfile({ ...f, userConfigDir, platform: 'linux' })
       expect(fs.realpathSync(join(f.profileHome, 'skills'))).toBe(join(userConfigDir, 'skills'))
       expect(fs.readFileSync(join(f.profileHome, 'CLAUDE.md'), 'utf8')).toBe('custom instructions')
diff --git a/src/main/claude-accounts/claude-profile-provisioning.ts b/src/main/claude-accounts/claude-profile-provisioning.ts
index 752f7fee3f38..8c72cf291a14 100644
--- a/src/main/claude-accounts/claude-profile-provisioning.ts
+++ b/src/main/claude-accounts/claude-profile-provisioning.ts
@@ -2,10 +2,10 @@ import { existsSync } from 'node:fs'
 import { join, resolve } from 'node:path'
 import { writeFileAtomically } from '../codex-accounts/fs-utils'
 import {
-  applyClaudeFolderTrust,
   resolveClaudeGlobalConfigFile,
   updateClaudeGlobalConfig
 } from '../claude/claude-folder-trust-file'
+import { claudeStateLogin } from './claude-account-folder'
 import { readClaudeProfileObject, resolveClaudeDefaultHome } from './claude-profile-paths'
 import { lstatIfPresent } from './claude-profile-prompt-history'
 import {
@@ -39,7 +39,7 @@ export const CLAUDE_PROFILE_RESOURCE_DIRS = [
 ] as const
 // Copied, not linked: a rename-replace save (Claude's own, or an editor's) would cut a link.
 export const CLAUDE_PROFILE_RESOURCE_FILES = ['CLAUDE.md', 'keybindings.json'] as const
-export const CLAUDE_PROFILE_MEMORY_IMPORT = '@~/.claude/CLAUDE.md\n'
+const CLAUDE_PROFILE_MEMORY_IMPORT = '@~/.claude/CLAUDE.md\n'
 const PRIVATE_KEYS = new Set([
   'apiKeyHelper',
   'awsAuthRefresh',
@@ -103,7 +103,6 @@ async function mergeState(args: {
   source: string
   target: string
   ledger: ClaudeProfileLedger
-  trustKeys: readonly string[]
   report: ClaudeProfileReport
 }): Promise<ClaudeProfileSurfaceOutcome> {
   if (lstatIfPresent(args.target)?.isSymbolicLink()) {
@@ -111,7 +110,7 @@ async function mergeState(args: {
   }
   const input = readClaudeProfileObject(args.source)
   if (input.kind === 'unavailable') {
-    // Why: onboarding and trust don't depend on the personal state; only its shared keys wait.
+    // Why: onboarding doesn't depend on the personal state; only its shared keys wait.
     const error = new ClaudeProfileSurfaceError('unreadable', 'Personal Claude state is unreadable')
     warnClaudeProfile(args.report, '.claude.json', error)
   }
@@ -120,7 +119,15 @@ async function mergeState(args: {
     SHARED_STATE_KEYS.filter((key) => key in source).map((key) => [key, source[key]])
   )
   let written: Record<string, string> = {}
+  let signedOut = false
   const outcome = await updateClaudeGlobalConfig(args.target, (current) => {
+    // Why oauthAccount: Claude writes it only on a finished sign-in, while it writes this file
+    // earlier in onboarding (theme pick). It's read under Claude's own lock, on every platform;
+    // credentials sit in the Keychain on macOS. A flag set before then skips Claude's sign-in.
+    signedOut = !claudeStateLogin(current)
+    if (signedOut) {
+      return { kind: 'unchanged' }
+    }
     const config = { ...current }
     written = { ...args.ledger.keys['.claude.json'] }
     let changed = mergeClaudeProfileKeys(config, desired, written).length > 0
@@ -135,15 +142,10 @@ async function mergeState(args: {
       config.hasCompletedOnboarding = true
       changed = true
     }
-    // Why: a malformed `projects` refuses only trust; onboarding and shared keys still apply.
-    const trust = args.trustKeys.length > 0 ? applyClaudeFolderTrust(config, args.trustKeys) : null
-    if (trust?.kind === 'changed') {
-      return trust
-    }
     return changed ? { kind: 'changed', config } : { kind: 'unchanged' }
   })
-  if (outcome === 'missing-config') {
-    // Why: no state file means no completed login; writing one would fabricate an account.
+  if (outcome === 'missing-config' || (outcome === 'unchanged' && signedOut)) {
+    // Why: no completed login yet; writing would fabricate an account or skip Claude's sign-in.
     return 'absent'
   }
   if (outcome === 'locked' || outcome === 'unreadable') {
@@ -163,7 +165,6 @@ export async function provisionClaudeProfile(args: {
   /** The user's own CLAUDE_CONFIG_DIR; `~/.claude` when unset. */
   userConfigDir?: string
   platform?: NodeJS.Platform
-  trustKeys?: readonly string[]
 }): Promise<ClaudeProfileReport> {
   const platform = args.platform ?? process.platform
   const defaultHome = resolveClaudeDefaultHome(args.userHome, args.userConfigDir)
@@ -210,7 +211,6 @@ export async function provisionClaudeProfile(args: {
       source: statePath(args.userConfigDir),
       target: statePath(args.profileHome),
       ledger,
-      trustKeys: args.trustKeys ?? [],
       report
     })
   )
diff --git a/src/main/claude-accounts/claude-profile-router.test.ts b/src/main/claude-accounts/claude-profile-router.test.ts
index 5391072d0bbe..3db8218f016f 100644
--- a/src/main/claude-accounts/claude-profile-router.test.ts
+++ b/src/main/claude-accounts/claude-profile-router.test.ts
@@ -1,4 +1,6 @@
+import { spawnSync } from 'node:child_process'
 import {
+  chmodSync,
   existsSync,
   mkdirSync,
   mkdtempSync,
@@ -9,22 +11,44 @@ import {
 } from 'node:fs'
 import { tmpdir } from 'node:os'
 import { join, resolve } from 'node:path'
-import { afterEach, describe, expect, it } from 'vitest'
+import { afterEach, describe, expect, it, vi } from 'vitest'
 import type { ClaudeManagedAccount } from '../../shared/managed-account-types'
 import type { ClaudeProfileSetupReport } from './claude-profile-setup'
+import {
+  claudeProfileMarkerPath,
+  describeClaudeProfile,
+  prepareClaudeProfileDirectory,
+  type ClaudeProfileDescriptor
+} from './claude-profile-paths'
 import {
   CLAUDE_PROFILE_MISSING_MESSAGE,
-  CLAUDE_PROFILE_SETUP_FAILED_MESSAGE,
-  ClaudeProfileRouter,
-  type ClaudeProfileRouterSettings
-} from './claude-profile-router'
+  CLAUDE_PROFILE_SETUP_FAILED_MESSAGE
+} from '../../shared/claude-profile-routing'
+import { getPosixClaudeShellFunction } from '../../shared/claude-shell-function'
+import { ClaudeProfileRouter, type ClaudeProfileRouterSettings } from './claude-profile-router'
 import {
   claudeProfileHistoryDirs,
   installClaudeProfileRouter
 } from './claude-profile-installed-router'
 
+// Why: removal deletes macOS Keychain items; the test must never reach the real Keychain.
+// The login shell exports what a Dock launch's own env lacks.
+const shell = vi.hoisted(() => ({ hang: false }))
+vi.mock('../startup/login-shell-environment', () => ({
+  resolveLoginShellEnvironment: () =>
+    shell.hang
+      ? new Promise(() => {})
+      : Promise.resolve({ CLAUDE_CONFIG_DIR: resolve('/shell/own') })
+}))
+vi.mock('../macos-keychain/generic-password', () => ({
+  execSecurityCommand: async () => {
+    throw new Error('The specified item could not be found in the keychain.')
+  }
+}))
+
 const roots: string[] = []
 afterEach(() => {
+  shell.hang = false
   installClaudeProfileRouter(undefined)
   roots.splice(0).forEach((root) => rmSync(root, { recursive: true, force: true }))
 })
@@ -52,13 +76,19 @@ function fixture(env: NodeJS.ProcessEnv = {}) {
     agentStatusHooksEnabled: false,
     disabledTuiAgents: []
   }
-  // Stands in for the worker; each setup stays pending until the test settles it.
+  // Stands in for the worker; like it, stays pending until settled and marks the folder last.
   const setup: { calls: number; outcome: ClaudeProfileSetupReport['outcome']; settle: () => void } =
     { calls: 0, outcome: 'prepared', settle: () => {} }
-  const runSetup = () => {
+  const runSetup = ({ profile }: { profile: ClaudeProfileDescriptor }) => {
     setup.calls += 1
+    mkdirSync(profile.home, { recursive: true })
     return new Promise<ClaudeProfileSetupReport>((resolve) => {
-      setup.settle = () => resolve({ outcome: setup.outcome, warnings: [], surfaces: {} })
+      setup.settle = () => {
+        if (setup.outcome === 'prepared') {
+          writeFileSync(claudeProfileMarkerPath(profile), '{}')
+        }
+        resolve({ outcome: setup.outcome, warnings: [], surfaces: {} })
+      }
     })
   }
   const router = new ClaudeProfileRouter({
@@ -73,13 +103,36 @@ function fixture(env: NodeJS.ProcessEnv = {}) {
 }
 
 describe('ClaudeProfileRouter', () => {
-  it('publishes the selected folder, System default as empty, and no file without accounts', () => {
+  it('prepares an account folder for sign-in only when setup succeeds', async () => {
+    const f = fixture({ CLAUDE_CONFIG_DIR: resolve('/custom/claude') })
+    expect(f.router.accountHome('b')).toBe(f.home('b'))
+    expect(f.router.userConfigDir()).toBe(resolve('/custom/claude'))
+    const prepared = f.router.prepareAccount('b')
+    await vi.waitFor(() => expect(f.setup.calls).toBe(1))
+    f.setup.settle()
+    await expect(prepared).resolves.toBe(f.home('b'))
+    f.setup.outcome = 'refused'
+    const refused = f.router.prepareAccount('b')
+    await vi.waitFor(() => expect(f.setup.calls).toBe(2))
+    f.setup.settle()
+    await expect(refused).rejects.toThrow(CLAUDE_PROFILE_SETUP_FAILED_MESSAGE)
+  })
+
+  it("reads an older Orca's copy-based switching from the System default snapshot it left", () => {
+    const f = fixture()
+    expect(f.router.copiedLoginIntoSystemDefault()).toBe(false)
+    mkdirSync(join(f.dataRoot, 'claude-runtime-auth'), { recursive: true })
+    writeFileSync(join(f.dataRoot, 'claude-runtime-auth', 'system-default-auth.json'), '{}')
+    expect(f.router.copiedLoginIntoSystemDefault()).toBe(true)
+  })
+
+  it('publishes the selected folder, System default as empty, and no file without accounts', async () => {
     const f = fixture()
     mkdirSync(f.home('a'), { recursive: true })
     f.router.publish()
     expect(readFileSync(f.router.pointerPath, 'utf8')).toBe(f.home('a'))
     // publish returned while its setup is still running in the background.
-    expect(f.setup.calls).toBe(1)
+    await vi.waitFor(() => expect(f.setup.calls).toBe(1))
 
     f.settings.activeClaudeManagedAccountId = null
     f.router.publish()
@@ -90,42 +143,108 @@ describe('ClaudeProfileRouter', () => {
     expect(existsSync(f.router.pointerPath)).toBe(false)
   })
 
-  it('makes a launch wait only for a folder that was never set up, reusing the running setup', async () => {
+  it('makes a launch wait for a first setup that never ran or is still running, reusing it', async () => {
     const f = fixture()
     mkdirSync(f.home('a'), { recursive: true })
-    f.router.publish()
     let launched = false
     const launch = f.router.prepareLaunch().then((prepared) => {
       launched = true
       return prepared
     })
-    await Promise.resolve()
+    await vi.waitFor(() => expect(f.setup.calls).toBe(1))
+    await new Promise((resolve) => setTimeout(resolve, 10))
     expect(launched).toBe(false)
+    const second = f.router.prepareLaunch()
+    f.setup.outcome = 'refused'
+    f.setup.settle()
+    await expect(launch).rejects.toMatchObject({ reason: 'claudeAccountSetupFailed' })
+    await expect(second).rejects.toThrow(CLAUDE_PROFILE_SETUP_FAILED_MESSAGE)
     expect(f.setup.calls).toBe(1)
+  })
+
+  it('never makes a launch wait on, or fail with, a re-run of a set-up folder', async () => {
+    const f = fixture()
+    mkdirSync(f.home('a'), { recursive: true })
+    const first = f.router.prepareLaunch()
+    await vi.waitFor(() => expect(f.setup.calls).toBe(1))
     f.setup.settle()
-    await expect(launch).resolves.toMatchObject({ configDir: f.home('a') })
+    await expect(first).resolves.toMatchObject({ configDir: f.home('a') })
 
+    // Startup or a switch re-runs setup; it stays pending, then fails.
     f.setup.outcome = 'refused'
-    const refused = f.router.prepareLaunch()
+    f.router.publish()
+    await vi.waitFor(() => expect(f.setup.calls).toBe(2))
+    await expect(f.router.prepareLaunch()).resolves.toMatchObject({ configDir: f.home('a') })
     f.setup.settle()
-    await expect(refused).rejects.toThrow(CLAUDE_PROFILE_SETUP_FAILED_MESSAGE)
-
-    // Set up once (setup's marker exists): launches stop waiting.
-    writeFileSync(join(f.dataRoot, 'claude-profiles', 'a', 'profile.json'), '{}')
+    await new Promise((resolve) => setTimeout(resolve, 10))
     await expect(f.router.prepareLaunch()).resolves.toMatchObject({ configDir: f.home('a') })
     expect(f.setup.calls).toBe(2)
   })
 
-  it('names a never-signed-in folder without creating it, and refuses to launch it', async () => {
+  it('makes a launch redo a first setup that was cut off after its ownership gate', async () => {
+    const f = fixture()
+    mkdirSync(f.home('a'), { recursive: true })
+    const profile = describeClaudeProfile(f.dataRoot, 'a', {
+      executionHostId: 'local',
+      runtime: 'host'
+    })
+    // The worker timed out, or the app quit, after the gate ran.
+    const cutOff = new ClaudeProfileRouter({
+      getSettings: () => f.settings,
+      dataRoot: f.dataRoot,
+      userHome: f.userHome,
+      env: {},
+      runSetup: async (args) => {
+        prepareClaudeProfileDirectory(args.dataRoot, args.profile, args.userHome)
+        throw new Error('Claude account setup timed out')
+      }
+    })
+    await expect(cutOff.prepareLaunch()).rejects.toThrow(CLAUDE_PROFILE_SETUP_FAILED_MESSAGE)
+    expect(existsSync(claudeProfileMarkerPath(profile))).toBe(false)
+
+    const launch = f.router.prepareLaunch()
+    await vi.waitFor(() => expect(f.setup.calls).toBe(1))
+    f.setup.settle()
+    await expect(launch).resolves.toMatchObject({ configDir: f.home('a') })
+  })
+
+  it("launches a set-up account without waiting for the login shell's env", async () => {
+    shell.hang = true
+    const f = fixture()
+    mkdirSync(f.home('a'), { recursive: true })
+    writeFileSync(join(f.home('a'), '..', 'profile.json'), '{}')
+    const router = new ClaudeProfileRouter({
+      getSettings: () => f.settings,
+      dataRoot: f.dataRoot,
+      userHome: f.userHome
+    })
+    await expect(router.prepareLaunch()).resolves.toMatchObject({ configDir: f.home('a') })
+  })
+
+  it("sets up a pre-update account's missing folder without a login, for Claude's own first run", async () => {
     const f = fixture()
     f.settings.activeClaudeManagedAccountId = 'b'
-    f.router.publish()
-    expect(readFileSync(f.router.pointerPath, 'utf8')).toBe(f.home('b'))
-    expect(f.setup.calls).toBe(0)
-    expect(existsSync(f.home('b'))).toBe(false)
+    // Before its setup, a terminal still opens; its claude function creates the folder itself.
     expect(() => f.router.preparation()).toThrow(CLAUDE_PROFILE_MISSING_MESSAGE)
-    // A terminal still opens; its claude function refuses from the pointer instead.
     expect(f.router.terminalEnv()).toEqual({ ORCA_CLAUDE_PROFILE_POINTER: f.router.pointerPath })
+    f.router.publish()
+    expect(readFileSync(f.router.pointerPath, 'utf8')).toBe(f.home('b'))
+    await vi.waitFor(() => expect(f.setup.calls).toBe(1))
+    expect(existsSync(f.home('b'))).toBe(true)
+    // Claude's first run is clean only without an onboarding-done state file.
+    expect(existsSync(join(f.home('b'), '.claude.json'))).toBe(false)
+    const launch = f.router.prepareLaunch()
+    f.setup.settle()
+    await expect(launch).resolves.toMatchObject({ configDir: f.home('b') })
+    expect(f.setup.calls).toBe(1)
+  })
+
+  it('makes a launch set up a missing folder first', async () => {
+    const f = fixture()
+    const launch = f.router.prepareLaunch()
+    await vi.waitFor(() => expect(f.setup.calls).toBe(1))
+    f.setup.settle()
+    await expect(launch).resolves.toMatchObject({ configDir: f.home('a') })
   })
 
   it('injects the account with its twin, and nothing over the user’s own System default', () => {
@@ -149,12 +268,92 @@ describe('ClaudeProfileRouter', () => {
     expect(f.router.preparation().envPatch).not.toHaveProperty('CLAUDE_CONFIG_DIR')
   })
 
+  it('carries the user’s own value beside an account terminal’s injected one', () => {
+    const f = fixture({ CLAUDE_CONFIG_DIR: resolve('/user/own') })
+    mkdirSync(f.home('a'), { recursive: true })
+    expect(f.router.terminalEnv()).toEqual({
+      ORCA_CLAUDE_PROFILE_POINTER: f.router.pointerPath,
+      CLAUDE_CONFIG_DIR: f.home('a'),
+      ORCA_CLAUDE_INJECTED_CONFIG_DIR: f.home('a'),
+      ORCA_CLAUDE_USER_CONFIG_DIR: resolve('/user/own')
+    })
+    expect(f.router.preparation().envPatch).not.toHaveProperty('ORCA_CLAUDE_USER_CONFIG_DIR')
+    f.settings.activeClaudeManagedAccountId = null
+    expect(f.router.terminalEnv()).toEqual({ ORCA_CLAUDE_PROFILE_POINTER: f.router.pointerPath })
+    const none = fixture()
+    mkdirSync(none.home('a'), { recursive: true })
+    expect(none.router.terminalEnv()).not.toHaveProperty('ORCA_CLAUDE_USER_CONFIG_DIR')
+  })
+
+  // Why not win32: runs the POSIX claude function under bash.
+  it.skipIf(process.platform === 'win32')(
+    'gives an account terminal back the inherited CLAUDE_CONFIG_DIR, or none, on System default',
+    () => {
+      for (const inherited of [{ CLAUDE_CONFIG_DIR: resolve('/user/own') }, {}]) {
+        const f = fixture(inherited)
+        mkdirSync(f.home('a'), { recursive: true })
+        const bin = join(f.root, 'bin')
+        mkdirSync(bin)
+        writeFileSync(join(bin, 'claude'), '#!/bin/sh\nprintf "%s" "${CLAUDE_CONFIG_DIR-unset}"\n')
+        chmodSync(join(bin, 'claude'), 0o700)
+        const claude = (env: Record<string, string>): string =>
+          spawnSync(
+            '/bin/bash',
+            ['--norc', '--noprofile', '-c', `${getPosixClaudeShellFunction()}\nclaude`],
+            { env: { ...env, PATH: `${bin}:/usr/bin:/bin` }, encoding: 'utf8' }
+          ).stdout
+        // The pane opens while account A is selected, so Orca replaces the inherited value.
+        f.router.publish()
+        const pane = { ...inherited, ...f.router.terminalEnv() }
+        expect(claude(pane)).toBe(f.home('a'))
+        f.settings.activeClaudeManagedAccountId = null
+        f.router.publish()
+        expect(claude(pane)).toBe(inherited.CLAUDE_CONFIG_DIR ?? 'unset')
+      }
+    }
+  )
+
+  it('removes a folder only after its running setup, so the setup cannot bring it back', async () => {
+    const f = fixture()
+    mkdirSync(f.home('a'), { recursive: true })
+    f.router.publish()
+    await vi.waitFor(() => expect(f.setup.calls).toBe(1))
+    const removal = f.router.removeAccount('a')
+    await new Promise((resolve) => setTimeout(resolve, 10))
+    // Setup writes into the folder before it settles, as the worker does.
+    mkdirSync(f.home('a'), { recursive: true })
+    writeFileSync(join(f.home('a'), 'settings.json'), '{}')
+    f.setup.settle()
+    await removal
+    expect(existsSync(join(f.dataRoot, 'claude-profiles', 'a'))).toBe(false)
+  })
+
+  it('takes System default from the login shell, which a Dock launch does not inherit', async () => {
+    const f = fixture()
+    f.settings.activeClaudeManagedAccountId = null
+    const router = new ClaudeProfileRouter({
+      getSettings: () => f.settings,
+      dataRoot: f.dataRoot,
+      userHome: f.userHome
+    })
+    await expect(router.prepareLaunch()).resolves.toMatchObject({
+      configDir: resolve('/shell/own'),
+      provenance: 'system'
+    })
+  })
+
   it('treats a CLAUDE_CONFIG_DIR an outer Orca injected as not the user’s', () => {
     const f = fixture({
       CLAUDE_CONFIG_DIR: '/outer/profile',
       ORCA_CLAUDE_INJECTED_CONFIG_DIR: '/outer/profile'
     })
     expect(f.router.systemDefaultHome()).toBe(join(f.userHome, '.claude'))
+    const carried = fixture({
+      CLAUDE_CONFIG_DIR: '/outer/profile',
+      ORCA_CLAUDE_INJECTED_CONFIG_DIR: '/outer/profile',
+      ORCA_CLAUDE_USER_CONFIG_DIR: '/user/own'
+    })
+    expect(carried.router.systemDefaultHome()).toBe(resolve('/user/own'))
   })
 
   // Why not win32: creating the link needs privileges there.
diff --git a/src/main/claude-accounts/claude-profile-router.ts b/src/main/claude-accounts/claude-profile-router.ts
index 3b12f6f7c82d..fa44e53b5630 100644
--- a/src/main/claude-accounts/claude-profile-router.ts
+++ b/src/main/claude-accounts/claude-profile-router.ts
@@ -2,13 +2,19 @@ import { existsSync, mkdirSync, rmSync } from 'node:fs'
 import { homedir } from 'node:os'
 import { dirname, join } from 'node:path'
 import { isAgentStatusHooksEnabledForAgent } from '../../shared/agent-status-hooks-setting'
-import { CLAUDE_PROFILE_POINTER_ENV } from '../../shared/claude-profile-routing'
+import {
+  CLAUDE_INJECTED_CONFIG_DIR_ENV,
+  CLAUDE_PROFILE_MISSING_MESSAGE,
+  CLAUDE_PROFILE_POINTER_ENV,
+  CLAUDE_PROFILE_SETUP_FAILED_MESSAGE,
+  CLAUDE_USER_CONFIG_DIR_ENV
+} from '../../shared/claude-profile-routing'
 import type { GlobalSettings } from '../../shared/global-settings-types'
 import { probeClaudeCliVersion } from '../claude/claude-hook-event-versions'
 import { writeFileAtomically } from '../codex-accounts/fs-utils'
 import { resolveClaudeCommand } from '../codex-cli/command'
+import { AgentSessionPreSpawnError } from '../native-chat/agent-session-wire/structured-agent-session-adapter'
 import {
-  CLAUDE_INJECTED_CONFIG_DIR_ENV,
   claudeProfileMarkerPath,
   describeClaudeProfile,
   type ClaudeProfileDescriptor,
@@ -25,6 +31,8 @@ import {
 } from './runtime-selection'
 import { wslClaudeProfilePointer } from './claude-profile-wsl-paths'
 import { isDirectory, listClaudeProfileHomes } from './claude-profile-installed-router'
+import { removeClaudeAccountFolder } from './claude-account-folder'
+import { resolveLoginShellEnvironment } from '../startup/login-shell-environment'
 
 export type ClaudeProfileRouterSettings = Pick<
   GlobalSettings,
@@ -35,12 +43,6 @@ export type ClaudeProfileRouterSettings = Pick<
   | 'disabledTuiAgents'
 >
 
-export const CLAUDE_PROFILE_SETUP_FAILED_MESSAGE =
-  'The selected Claude account could not be set up. Try again or choose another account.'
-
-export const CLAUDE_PROFILE_MISSING_MESSAGE =
-  "The selected Claude account's folder is missing. Sign in to it again or choose another account."
-
 /**
  * Routes this host's Claude launches to the selected account's folder. Settings own the selection;
  * the pointer file mirrors it for `claude` typed in an already-open terminal.
@@ -48,17 +50,25 @@ export const CLAUDE_PROFILE_MISSING_MESSAGE =
 export class ClaudeProfileRouter {
   readonly pointerPath: string
   private readonly setups = new Map<string, Promise<ClaudeProfileSetupReport>>()
+  private env: NodeJS.ProcessEnv
+  private readonly envReady: Promise<unknown>
   constructor(
     private readonly args: {
       getSettings: () => ClaudeProfileRouterSettings
       dataRoot: string
       userHome?: string
+      /** Tests replace the login shell's env. */
       env?: NodeJS.ProcessEnv
       /** Tests replace the worker. */
       runSetup?: typeof runClaudeProfileSetupInWorker
     }
   ) {
     this.pointerPath = join(args.dataRoot, 'claude-profiles', 'selected-host')
+    this.env = args.env ?? process.env
+    // Why the login shell's: a Dock launch lacks the CLAUDE_CONFIG_DIR an rc exports. Chats share it.
+    this.envReady = args.env
+      ? Promise.resolve()
+      : resolveLoginShellEnvironment().then((env) => (this.env = env))
   }
 
   private get userHome(): string {
@@ -67,24 +77,19 @@ export class ClaudeProfileRouter {
 
   private selectedProfile(): ClaudeProfileDescriptor | null {
     const id = getSelectedClaudeAccountIdForTarget(this.args.getSettings(), { runtime: 'host' })
-    return id
-      ? describeClaudeProfile(this.args.dataRoot, id, { executionHostId: 'local', runtime: 'host' })
-      : null
+    return id ? this.describe(id) : null
   }
 
   /** The user's System default: their own CLAUDE_CONFIG_DIR, else ~/.claude. */
   systemDefaultHome(): string {
-    return resolveClaudeDefaultHome(
-      this.userHome,
-      readUserClaudeConfigDir(this.args.env ?? process.env)
-    )
+    return resolveClaudeDefaultHome(this.userHome, this.userConfigDir())
   }
 
   /** Null for System default. Throws for a missing folder: falling back would run the wrong account. */
   selectedHome(): string | null {
     const home = this.selectedProfile()?.home ?? null
     if (home !== null && !isDirectory(home)) {
-      throw new Error(CLAUDE_PROFILE_MISSING_MESSAGE)
+      throw claudeProfileMissing()
     }
     return home
   }
@@ -98,26 +103,72 @@ export class ClaudeProfileRouter {
     const profile = this.selectedProfile()
     mkdirSync(dirname(this.pointerPath), { recursive: true, mode: 0o700 })
     writeFileAtomically(this.pointerPath, profile?.home ?? '', { mode: 0o600 })
-    // Why the existence check: setup creates the folder, and only sign-in may create an account.
-    if (profile && isDirectory(profile.home)) {
+    // Why even a missing folder: setup creates it without a login, so Claude's own first run
+    // signs in there (an account saved before per-account folders has none yet).
+    if (profile) {
       this.setUp(profile).catch((error: unknown) => {
         console.warn('[claude-profile] Account setup failed:', error)
       })
     }
   }
 
-  /** Waits for setup only for a folder that was never set up; otherwise launches at once. */
+  /** Waits for a first setup that never finished, running or not; otherwise launches at once. */
   async prepareLaunch(): Promise<ClaudeRuntimeAuthPreparation> {
     const profile = this.selectedProfile()
-    if (profile && isDirectory(profile.home) && !existsSync(claudeProfileMarkerPath(profile))) {
+    if (!profile) {
+      // Only System default reads the login shell's env here; setup awaits it itself.
+      await this.envReady
+      return this.preparation()
+    }
+    // Why the marker: setup writes it last, so a missing folder is set up too. A re-run of a
+    // set-up folder never blocks.
+    if (!existsSync(claudeProfileMarkerPath(profile))) {
       const report = await this.setUp(profile).catch(() => null)
       if (report?.outcome !== 'prepared') {
-        throw new Error(CLAUDE_PROFILE_SETUP_FAILED_MESSAGE)
+        throw claudeProfileSetupFailed()
       }
     }
     return this.preparation()
   }
 
+  /** An account's folder on this host, whether or not it exists yet. */
+  accountHome(accountId: string): string {
+    return this.describe(accountId).home
+  }
+
+  /** Creates and sets up an account's folder for sign-in; the login itself is Claude's. */
+  async prepareAccount(accountId: string): Promise<string> {
+    const profile = this.describe(accountId)
+    const report = await this.setUp(profile).catch(() => null)
+    if (report?.outcome !== 'prepared') {
+      throw new Error(CLAUDE_PROFILE_SETUP_FAILED_MESSAGE)
+    }
+    return profile.home
+  }
+
+  /** Deletes an account's folder after any setup running for it, which would otherwise recreate it. */
+  async removeAccount(accountId: string): Promise<void> {
+    await this.setups.get(accountId)?.catch(() => {})
+    await removeClaudeAccountFolder(this.args.dataRoot, accountId)
+  }
+
+  /** True once an older Orca copied an account's login into System default: it left this snapshot. */
+  copiedLoginIntoSystemDefault(): boolean {
+    return existsSync(join(this.args.dataRoot, 'claude-runtime-auth', 'system-default-auth.json'))
+  }
+
+  /** The user's own CLAUDE_CONFIG_DIR, which wins over the selection in their terminals. */
+  userConfigDir(): string | undefined {
+    return readUserClaudeConfigDir(this.env)
+  }
+
+  private describe(accountId: string): ClaudeProfileDescriptor {
+    return describeClaudeProfile(this.args.dataRoot, accountId, {
+      executionHostId: 'local',
+      runtime: 'host'
+    })
+  }
+
   /** One setup per account at a time; a later request reuses the running one. */
   private setUp(profile: ClaudeProfileDescriptor): Promise<ClaudeProfileSetupReport> {
     const running = this.setups.get(profile.accountId)
@@ -130,13 +181,14 @@ export class ClaudeProfileRouter {
   }
 
   private async runSetup(profile: ClaudeProfileDescriptor): Promise<ClaudeProfileSetupReport> {
+    await this.envReady
     const hooks = isAgentStatusHooksEnabledForAgent(this.args.getSettings(), 'claude')
     const claudeVersion = hooks ? await probeClaudeCliVersion(resolveClaudeCommand()) : null
     const report = await (this.args.runSetup ?? runClaudeProfileSetupInWorker)({
       dataRoot: this.args.dataRoot,
       profile,
       userHome: this.userHome,
-      userConfigDir: readUserClaudeConfigDir(this.args.env ?? process.env),
+      userConfigDir: this.userConfigDir(),
       hooks,
       claudeVersion: claudeVersion ?? undefined
     })
@@ -163,7 +215,12 @@ export class ClaudeProfileRouter {
       return { [CLAUDE_PROFILE_POINTER_ENV]: `~/${wslClaudeProfilePointer(this.args.dataRoot)}` }
     }
     try {
-      return this.launchEnv()
+      const env = this.launchEnv()
+      const userConfigDir = this.userConfigDir()
+      // Why: the injected value replaces the user's own; the claude function restores it on System default.
+      return env.CLAUDE_CONFIG_DIR && userConfigDir
+        ? { ...env, [CLAUDE_USER_CONFIG_DIR_ENV]: userConfigDir }
+        : env
     } catch {
       return { [CLAUDE_PROFILE_POINTER_ENV]: this.pointerPath }
     }
@@ -187,3 +244,16 @@ export class ClaudeProfileRouter {
     return listClaudeProfileHomes(this.args.dataRoot)
   }
 }
+
+// Typed so a chat names the situation; a terminal reads the same message.
+export function claudeProfileMissing(): AgentSessionPreSpawnError {
+  return new AgentSessionPreSpawnError(new Error(CLAUDE_PROFILE_MISSING_MESSAGE), {
+    reason: 'claudeAccountFolderMissing'
+  })
+}
+
+export function claudeProfileSetupFailed(): AgentSessionPreSpawnError {
+  return new AgentSessionPreSpawnError(new Error(CLAUDE_PROFILE_SETUP_FAILED_MESSAGE), {
+    reason: 'claudeAccountSetupFailed'
+  })
+}
diff --git a/src/main/claude-accounts/claude-profile-setup.test.ts b/src/main/claude-accounts/claude-profile-setup.test.ts
index 0195805eff32..0ead45be168d 100644
--- a/src/main/claude-accounts/claude-profile-setup.test.ts
+++ b/src/main/claude-accounts/claude-profile-setup.test.ts
@@ -48,7 +48,7 @@ function fixture() {
       installHooks,
       platform: 'linux'
     })
-  return { root, defaultHome, dataRoot, service, setup }
+  return { root, defaultHome, dataRoot, service, installHooks, setup }
 }
 
 // Why: setup runs as 'linux', so it creates real symlinks, which Windows needs privilege for.
@@ -83,6 +83,24 @@ describe('Claude account profile setup', () => {
     expect(existsSync(join(home, '.credentials.json'))).toBe(false)
     expect((await f.setup()).warnings).toEqual([])
   })
+  itLinks('marks the folder set up only after its last step', async () => {
+    const f = fixture()
+    const marker = join(f.dataRoot, 'claude-profiles/a/profile.json')
+    let markedDuringHooks: boolean | undefined
+    const report = await provisionClaudeAccountProfile({
+      dataRoot: f.dataRoot,
+      profile: describeClaudeProfile(f.dataRoot, 'a', local),
+      userHome: state.home,
+      installHooks: (target) => {
+        markedDuringHooks = existsSync(marker)
+        return f.installHooks(target)
+      },
+      platform: 'linux'
+    })
+    expect(report.outcome).toBe('prepared')
+    expect(markedDuringHooks).toBe(false)
+    expect(existsSync(marker)).toBe(true)
+  })
   itLinks("brings the user's later hooks into an account set up while they had none", async () => {
     const f = fixture()
     const settings = join(f.defaultHome, 'settings.json')
diff --git a/src/main/claude-accounts/claude-profile-setup.ts b/src/main/claude-accounts/claude-profile-setup.ts
index 1687d9cf0e8b..7d132e1c86d4 100644
--- a/src/main/claude-accounts/claude-profile-setup.ts
+++ b/src/main/claude-accounts/claude-profile-setup.ts
@@ -51,16 +51,21 @@ export async function provisionClaudeAccountProfile(args: {
   userConfigDir?: string
   /** Null when Orca's Claude hooks are turned off. Runs after the settings merge so its entries survive it. */
   installHooks: ((target: { configDir: string }) => AgentHookInstallStatus) | null
-  trustKeys?: readonly string[]
   platform?: NodeJS.Platform
 }): Promise<ClaudeProfileSetupReport> {
   const platform = args.platform ?? process.platform
   const report = createClaudeProfileReport()
+  let markSetUp: () => void
   try {
     if (args.profile.target.runtime === 'wsl' && platform === 'win32') {
       throw new ClaudeProfileSurfaceError('invalid-profile', 'WSL profiles are set up in the guest')
     }
-    prepareClaudeProfileDirectory(args.dataRoot, args.profile, args.userHome, args.userConfigDir)
+    markSetUp = prepareClaudeProfileDirectory(
+      args.dataRoot,
+      args.profile,
+      args.userHome,
+      args.userConfigDir
+    )
   } catch (error) {
     report.surfaces.profile = 'failed'
     warnClaudeProfile(report, 'profile', error)
@@ -70,7 +75,7 @@ export async function provisionClaudeAccountProfile(args: {
   const shared = { profileHome: home, userHome: args.userHome, userConfigDir: args.userConfigDir }
   for (const step of [
     () => shareClaudeProfileHistory({ ...shared, platform }),
-    () => provisionClaudeProfile({ ...shared, platform, trustKeys: args.trustKeys })
+    () => provisionClaudeProfile({ ...shared, platform })
   ]) {
     try {
       const part = await step()
@@ -92,5 +97,7 @@ export async function provisionClaudeAccountProfile(args: {
     recordInstalledHooks(home)
     return 'merged'
   })
+  // Last: a setup cut off before here leaves no marker, so the next launch waits for a full one.
+  markSetUp()
   return { outcome: 'prepared', ...report }
 }
diff --git a/src/main/claude-accounts/claude-profile-shell-composition.test.ts b/src/main/claude-accounts/claude-profile-shell-composition.test.ts
index 4bf99fdac515..fb4ed6255e10 100644
--- a/src/main/claude-accounts/claude-profile-shell-composition.test.ts
+++ b/src/main/claude-accounts/claude-profile-shell-composition.test.ts
@@ -1,21 +1,13 @@
-import type * as ProfileRouting from '../../shared/claude-profile-routing'
 import { spawnSync } from 'node:child_process'
 import { chmodSync, existsSync, mkdirSync, mkdtempSync, rmSync, writeFileSync } from 'node:fs'
 import { tmpdir } from 'node:os'
 import { join } from 'node:path'
-import { afterEach, expect, it, vi } from 'vitest'
-const gate = vi.hoisted(() => ({ enabled: true }))
-vi.mock('../../shared/claude-profile-routing', async (original) => ({
-  ...(await original<typeof ProfileRouting>()),
-  claudeProfileRoutingEnabled: () => gate.enabled
-}))
+import { afterEach, expect, it } from 'vitest'
 const FISH =
   ['/opt/homebrew/bin/fish', '/usr/local/bin/fish', '/usr/bin/fish'].find(existsSync) ??
   '/usr/bin/fish'
 const roots: string[] = []
 afterEach(() => {
-  gate.enabled = true
-  vi.resetModules()
   roots.splice(0).forEach((root) => rmSync(root, { recursive: true, force: true }))
 })
 function fishInit({ args }: { args: string[] | null }): string {
@@ -25,9 +17,7 @@ function fishInit({ args }: { args: string[] | null }): string {
   }
   return init
 }
-async function composed(enabled: boolean) {
-  gate.enabled = enabled
-  vi.resetModules()
+async function composed() {
   const local = await import('../providers/local-pty-shell-ready')
   const daemon = await import('../daemon/shell-ready')
   const powershell = await import('../powershell-osc133-bootstrap')
@@ -53,35 +43,19 @@ async function composed(enabled: boolean) {
   }
 }
 
-it('keeps the composed bash, zsh, fish and PowerShell startup text dormant with the gate off', async () => {
-  const off = await composed(false)
-  for (const text of [...off.fish, off.powershell]) {
-    expect(text).not.toContain('claude')
-  }
-  for (const text of [...off.bash, ...off.zsh]) {
-    expect(text).not.toContain('ORCA_CLAUDE')
-  }
-  const on = await composed(true)
+it('gives every composed shell startup and the plain fish vendor snippet the claude function', async () => {
+  const on = await composed()
   for (const text of [...on.bash, ...on.zsh]) {
     expect(text).toContain('ORCA_CLAUDE_INJECTED_CONFIG_DIR')
   }
-})
-
-it('gives a plain fish tab the claude function through the vendor snippet only with the gate on', async () => {
-  gate.enabled = false
-  vi.resetModules()
-  const off = await import('../fish-xdg-data-dirs-handoff')
-  expect(off.getFishVendorConfSnippet()).not.toContain('claude')
-  gate.enabled = true
-  vi.resetModules()
-  const on = await import('../fish-xdg-data-dirs-handoff')
+  const { getFishVendorConfSnippet } = await import('../fish-xdg-data-dirs-handoff')
   const { getFishClaudeShellFunction } = await import('../../shared/claude-shell-function')
   expect(getFishClaudeShellFunction()).toContain('function claude')
-  expect(on.getFishVendorConfSnippet()).toContain(getFishClaudeShellFunction())
+  expect(getFishVendorConfSnippet()).toContain(getFishClaudeShellFunction())
 })
 
 it('starts the PowerShell claude function on its own line after the codex fragment', async () => {
-  const on = await composed(true)
+  const on = await composed()
   expect(on.powershell).toContain(
     'Remove-Variable orcaCodexCommand -ErrorAction SilentlyContinue\n$orcaClaudeCommand'
   )
@@ -95,7 +69,7 @@ it.skipIf(!existsSync(FISH))(
     mkdirSync(join(root, 'bin'))
     writeFileSync(join(root, 'bin', 'claude'), '#!/bin/sh\nexit 0\n')
     chmodSync(join(root, 'bin', 'claude'), 0o700)
-    const on = await composed(true)
+    const on = await composed()
     for (const init of on.fish) {
       const result = spawnSync(
         '/usr/bin/env',
diff --git a/src/main/claude-accounts/claude-profile-wsl-paths.ts b/src/main/claude-accounts/claude-profile-wsl-paths.ts
index a5096c040eea..39d2bf677282 100644
--- a/src/main/claude-accounts/claude-profile-wsl-paths.ts
+++ b/src/main/claude-accounts/claude-profile-wsl-paths.ts
@@ -25,3 +25,12 @@ export function wslClaudeProfilePointer(hostDataRoot: string): string {
   const build = basename(hostDataRoot).replace(/[^\w.-]/g, '_')
   return `.local/share/orca/claude-profiles/selected-wsl-${build}`
 }
+
+/** A saved WSL account's guest folder; null for an older Orca's folder, which holds no login. */
+export function savedWslClaudeAccountHome(account: {
+  id: string
+  wslLinuxAuthPath?: string | null
+}): string | null {
+  const home = account.wslLinuxAuthPath
+  return home?.endsWith(`/claude-profiles/${account.id}/home`) ? home : null
+}
diff --git a/src/main/claude-accounts/claude-profile-wsl-router.test.ts b/src/main/claude-accounts/claude-profile-wsl-router.test.ts
index decde2f9d35a..00c16d881d20 100644
--- a/src/main/claude-accounts/claude-profile-wsl-router.test.ts
+++ b/src/main/claude-accounts/claude-profile-wsl-router.test.ts
@@ -6,6 +6,7 @@ import {
   mkdtempSync,
   readFileSync,
   rmSync,
+  symlinkSync,
   writeFileSync
 } from 'node:fs'
 import { tmpdir } from 'node:os'
@@ -37,10 +38,12 @@ vi.mock('../wsl/wsl-runner', () => ({
 
 import {
   CLAUDE_PROFILE_MISSING_MESSAGE,
-  CLAUDE_PROFILE_SETUP_FAILED_MESSAGE,
-  type ClaudeProfileRouterSettings
-} from './claude-profile-router'
+  CLAUDE_PROFILE_SETUP_FAILED_MESSAGE
+} from '../../shared/claude-profile-routing'
+import type { ClaudeProfileRouterSettings } from './claude-profile-router'
+import { prepareClaudeProfileDirectory } from './claude-profile-paths'
 import { ClaudeWslProfileRouter } from './claude-profile-wsl-router'
+import { wslClaudeProfile } from './claude-profile-wsl-paths'
 
 // Why skipped on Windows: the guest is Linux; these run its scripts and Node bundle as the guest.
 const posixHost = process.platform !== 'win32'
@@ -75,12 +78,14 @@ function fixture() {
   const router = new ClaudeWslProfileRouter({
     getSettings: () => settings,
     dataRoot: join(root, 'orca-dev'),
+    // Like the guest helper, marks the folder only once it finishes.
     runSetup: async () => {
       setup.calls += 1
       await setup.gate
       if (setup.fail) {
         throw new Error('refused')
       }
+      mkdirSync(profileHome, { recursive: true })
       writeFileSync(join(profileHome, '..', 'profile.json'), '{}')
     }
   })
@@ -90,14 +95,10 @@ function fixture() {
 }
 
 describe.skipIf(!posixHost)('ClaudeWslProfileRouter', () => {
-  it('writes the guest pointer per build, sets up only a signed-in folder, and removes it with the last account', async () => {
+  it('writes the guest pointer per build, sets up even a missing folder, and removes it with the last account', async () => {
     const f = fixture()
     await f.router.publish('Ubuntu')
     expect(readFileSync(f.pointer, 'utf8')).toBe(f.profileHome)
-    expect(f.setup.calls).toBe(0)
-
-    mkdirSync(f.profileHome, { recursive: true })
-    await f.router.publish('Ubuntu')
     await vi.waitFor(() => expect(f.setup.calls).toBe(1))
 
     f.wsl.Ubuntu = null
@@ -109,15 +110,21 @@ describe.skipIf(!posixHost)('ClaudeWslProfileRouter', () => {
     expect(existsSync(f.pointer)).toBe(false)
   })
 
-  it('refuses a missing folder, waits for a never-set-up one, then launches at once', async () => {
+  it('sets up a missing folder, waits for a first setup never run or still running, then launches at once', async () => {
     const f = fixture()
-    await expect(f.router.prepareLaunch('Ubuntu')).rejects.toThrow(CLAUDE_PROFILE_MISSING_MESSAGE)
-
-    mkdirSync(f.profileHome, { recursive: true })
+    await expect(f.router.preparation('Ubuntu')).rejects.toThrow(CLAUDE_PROFILE_MISSING_MESSAGE)
     f.setup.fail = true
-    await expect(f.router.prepareLaunch('Ubuntu')).rejects.toThrow(
-      CLAUDE_PROFILE_SETUP_FAILED_MESSAGE
-    )
+    let release = () => {}
+    f.setup.gate = new Promise((resolve) => (release = resolve))
+    const launch = f.router.prepareLaunch('Ubuntu')
+    await vi.waitFor(() => expect(f.setup.calls).toBe(1))
+    const second = f.router.prepareLaunch('Ubuntu')
+    await new Promise((resolve) => setTimeout(resolve, 50))
+    release()
+    await expect(launch).rejects.toThrow(CLAUDE_PROFILE_SETUP_FAILED_MESSAGE)
+    await expect(second).rejects.toThrow(CLAUDE_PROFILE_SETUP_FAILED_MESSAGE)
+    expect(f.setup.calls).toBe(1)
+
     f.setup.fail = false
     const prepared = await f.router.prepareLaunch('Ubuntu')
     expect(prepared).toMatchObject({
@@ -131,10 +138,94 @@ describe.skipIf(!posixHost)('ClaudeWslProfileRouter', () => {
         ORCA_CLAUDE_INJECTED_CONFIG_DIR: f.profileHome
       }
     })
+    // The failed first setup left no marker, so this launch ran setup again; the next does not.
+    expect(f.setup.calls).toBe(2)
     await f.router.prepareLaunch('Ubuntu')
     expect(f.setup.calls).toBe(2)
   })
 
+  it('makes a launch redo a first setup that was cut off after its ownership gate', async () => {
+    const f = fixture()
+    mkdirSync(f.profileHome, { recursive: true })
+    // The guest helper failed, or timed out, after the gate ran.
+    const cutOff = new ClaudeWslProfileRouter({
+      getSettings: () => f.settings,
+      dataRoot: join(guest.home, '..', 'orca-dev'),
+      runSetup: async (distro, home, accountId) => {
+        const { dataRoot, profile } = wslClaudeProfile(home, distro, accountId)
+        prepareClaudeProfileDirectory(dataRoot, profile, home)
+        throw new Error('timed out')
+      }
+    })
+    await expect(cutOff.prepareLaunch('Ubuntu')).rejects.toThrow(
+      CLAUDE_PROFILE_SETUP_FAILED_MESSAGE
+    )
+    expect(existsSync(join(f.profileHome, '..', 'profile.json'))).toBe(false)
+
+    await f.router.prepareLaunch('Ubuntu')
+    expect(f.setup.calls).toBe(1)
+  })
+
+  it('never makes a launch wait on, or fail with, a re-run of a set-up folder', async () => {
+    const f = fixture()
+    mkdirSync(f.profileHome, { recursive: true })
+    writeFileSync(join(f.profileHome, '..', 'profile.json'), '{}')
+    f.setup.fail = true
+    let release = () => {}
+    f.setup.gate = new Promise((resolve) => (release = resolve))
+    await f.router.publish('Ubuntu')
+    await vi.waitFor(() => expect(f.setup.calls).toBe(1))
+    await expect(f.router.prepareLaunch('Ubuntu')).resolves.toMatchObject({
+      configDir: f.profileHome
+    })
+    release()
+    await new Promise((resolve) => setTimeout(resolve, 10))
+    await expect(f.router.prepareLaunch('Ubuntu')).resolves.toMatchObject({
+      configDir: f.profileHome
+    })
+    expect(f.setup.calls).toBe(1)
+  })
+
+  it('sets up a new account folder for sign-in and deletes it without following its links', async () => {
+    const f = fixture()
+    const sharedHistory = join(guest.home, '.claude', 'projects')
+    mkdirSync(sharedHistory)
+    writeFileSync(join(sharedHistory, 'chat.jsonl'), '{}')
+    // The stub setup marks account a's folder.
+    mkdirSync(f.profileHome, { recursive: true })
+    const home = await f.router.prepareAccount('Ubuntu', 'b')
+    expect(home).toBe(join(guest.home, '.local/share/orca/claude-profiles/b/home'))
+    expect(f.setup.calls).toBe(1)
+    mkdirSync(home, { recursive: true })
+    symlinkSync(sharedHistory, join(home, 'projects'))
+
+    await f.router.removeAccount('Ubuntu', 'b')
+    expect(existsSync(join(home, '..'))).toBe(false)
+    expect(existsSync(join(sharedHistory, 'chat.jsonl'))).toBe(true)
+
+    f.setup.fail = true
+    await expect(f.router.prepareAccount('Ubuntu', 'c')).rejects.toThrow(
+      CLAUDE_PROFILE_SETUP_FAILED_MESSAGE
+    )
+  })
+
+  it('removes a guest folder only after its running setup, so the setup cannot bring it back', async () => {
+    const f = fixture()
+    mkdirSync(f.profileHome, { recursive: true })
+    let release = () => {}
+    // Like the guest helper, setup recreates the folder it writes into.
+    f.setup.gate = new Promise<void>((resolve) => (release = resolve)).then(() => {
+      mkdirSync(f.profileHome, { recursive: true })
+    })
+    await f.router.publish('Ubuntu')
+    await vi.waitFor(() => expect(f.setup.calls).toBe(1))
+    const removal = f.router.removeAccount('Ubuntu', 'a')
+    await new Promise((resolve) => setTimeout(resolve, 50))
+    release()
+    await removal
+    expect(existsSync(join(f.profileHome, '..'))).toBe(false)
+  })
+
   it('writes a missing guest pointer before a launch returns', async () => {
     const f = fixture()
     mkdirSync(f.profileHome, { recursive: true })
diff --git a/src/main/claude-accounts/claude-profile-wsl-router.ts b/src/main/claude-accounts/claude-profile-wsl-router.ts
index 0fba0eb59a68..10c8273d9195 100644
--- a/src/main/claude-accounts/claude-profile-wsl-router.ts
+++ b/src/main/claude-accounts/claude-profile-wsl-router.ts
@@ -2,21 +2,21 @@ import { existsSync } from 'node:fs'
 import { lstat, readFile } from 'node:fs/promises'
 import { join, posix } from 'node:path'
 import { getAppEnvironment } from '../../shared/app-environment'
-import { CLAUDE_PROFILE_POINTER_ENV } from '../../shared/claude-profile-routing'
+import {
+  CLAUDE_INJECTED_CONFIG_DIR_ENV,
+  CLAUDE_PROFILE_POINTER_ENV,
+  CLAUDE_PROFILE_SETUP_FAILED_MESSAGE
+} from '../../shared/claude-profile-routing'
 import { WSL_CLAUDE_PROFILE_HELPER_FILENAME } from '../../shared/relay-artifacts'
 import { parseWslUncPath, toWindowsWslPath } from '../../shared/wsl-paths'
 import { getWslHomeAsync, listRunningWslDistrosAsync } from '../wsl'
 import { ensureWslPinnedRuntime } from '../wsl/wsl-pinned-runtime'
 import { relayBundleCandidates } from '../ssh/relay-bundle-paths'
 import { runWslProcess, type WslSpec } from '../wsl/wsl-runner'
+import { claudeProfileMarkerPath, type ClaudeProfileDescriptor } from './claude-profile-paths'
 import {
-  CLAUDE_INJECTED_CONFIG_DIR_ENV,
-  claudeProfileMarkerPath,
-  type ClaudeProfileDescriptor
-} from './claude-profile-paths'
-import {
-  CLAUDE_PROFILE_MISSING_MESSAGE,
-  CLAUDE_PROFILE_SETUP_FAILED_MESSAGE,
+  claudeProfileMissing,
+  claudeProfileSetupFailed,
   type ClaudeProfileRouterSettings
 } from './claude-profile-router'
 import { wslClaudeProfile, wslClaudeProfilePointer } from './claude-profile-wsl-paths'
@@ -90,22 +90,23 @@ export class ClaudeWslProfileRouter {
       return
     }
     await writePointer(distro, this.pointerIn(home), profile?.home ?? '')
-    // Why the existence check: setup creates the folder, and only sign-in may create an account.
-    if (profile && (await guestStat(distro, profile.home))?.isDirectory()) {
+    // Why even a missing folder: setup creates it without a login, for Claude's own first run.
+    if (profile) {
       this.setUp(distro, home, profile.accountId).catch((error: unknown) => {
         console.warn('[claude-profile] WSL account setup failed:', error)
       })
     }
   }
 
-  /** Waits for setup only for a folder that was never set up; otherwise launches at once. */
+  /** Waits for a first setup that never finished, running or not; otherwise launches at once. */
   async prepareLaunch(distro: string): Promise<ClaudeRuntimeAuthPreparation> {
     const { home, profile } = await this.resolve(distro)
-    await this.assertPresent(distro, profile)
-    if (profile && !(await guestStat(distro, claudeProfileMarkerPath(profile)))?.isFile()) {
+    // Why the marker: setup writes it last, so a missing folder is set up too. A re-run of a
+    // set-up folder never blocks.
+    if (profile && !(await hasMarker(distro, profile))) {
       await this.setUp(distro, home, profile.accountId).catch((error: unknown) => {
         console.warn('[claude-profile] WSL account setup failed:', error)
-        throw new Error(CLAUDE_PROFILE_SETUP_FAILED_MESSAGE)
+        throw claudeProfileSetupFailed()
       })
     }
     // Why: a missing or stale guest pointer would run the pane's `claude` under another account.
@@ -123,10 +124,32 @@ export class ClaudeWslProfileRouter {
     return this.preparationFor(distro, home, profile)
   }
 
+  /** Creates and sets up an account's guest folder for sign-in; the login itself is Claude's. */
+  async prepareAccount(distro: string, accountId: string): Promise<string> {
+    const { home } = await this.resolve(distro)
+    const { profile } = wslClaudeProfile(home, distro, accountId)
+    await this.setUp(distro, home, accountId).catch((error: unknown) => {
+      console.warn('[claude-profile] WSL account setup failed:', error)
+      throw new Error(CLAUDE_PROFILE_SETUP_FAILED_MESSAGE)
+    })
+    return profile.home
+  }
+
+  /**
+   * Deletes an account's guest folder after any setup running for it, which would otherwise
+   * recreate it. Linux `rm -r` never follows the history links.
+   */
+  async removeAccount(distro: string, accountId: string): Promise<void> {
+    await this.setups.get(accountId)?.catch(() => {})
+    const { home } = await this.resolve(distro)
+    const folder = posix.dirname(wslClaudeProfile(home, distro, accountId).profile.home)
+    await runGuest(distro, { script: 'rm -rf -- "$1"', args: [folder], loginPath: 'none' })
+  }
+
   /** Falling back would run the wrong account. */
   private async assertPresent(distro: string, profile: ClaudeProfileDescriptor | null) {
     if (profile && !(await guestStat(distro, profile.home))?.isDirectory()) {
-      throw new Error(CLAUDE_PROFILE_MISSING_MESSAGE)
+      throw claudeProfileMissing()
     }
   }
 
@@ -172,6 +195,10 @@ async function guestStat(distro: string, linuxPath: string) {
   return lstat(toWindowsWslPath(linuxPath, distro)).catch(() => null)
 }
 
+async function hasMarker(distro: string, profile: ClaudeProfileDescriptor): Promise<boolean> {
+  return (await guestStat(distro, claudeProfileMarkerPath(profile)))?.isFile() ?? false
+}
+
 /** Writes in the guest only when the file differs, so a launch reads it over the share instead. */
 async function writePointer(distro: string, pointer: string, home: string): Promise<void> {
   // Why the timeout: a hung share must not stall startup's serialized publish; the guest write decides.
diff --git a/src/main/claude-accounts/claude-windows-interactive-login.test.ts b/src/main/claude-accounts/claude-windows-interactive-login.test.ts
deleted file mode 100644
index 69ca24c21a8f..000000000000
--- a/src/main/claude-accounts/claude-windows-interactive-login.test.ts
+++ /dev/null
@@ -1,148 +0,0 @@
-import { afterEach, describe, expect, it, vi } from 'vitest'
-import { EventEmitter } from 'node:events'
-import { getCmdExePath } from '../../shared/windows-batch-spawn'
-import { createService, restorePlatform, setPlatform } from './claude-account-service-test-harness'
-
-vi.mock('electron', () => ({
-  app: {
-    getPath: () => '/tmp/orca-claude-windows-login-test'
-  }
-}))
-
-vi.mock('../codex-cli/command', () => ({
-  resolveClaudeCommand: vi.fn(() => 'C:\\Tools\\claude.cmd')
-}))
-
-describe('Claude Windows host interactive login', () => {
-  afterEach(() => {
-    restorePlatform()
-  })
-
-  it('resolves a Windows auth login whose child has no piped streams', async () => {
-    setPlatform('win32')
-    vi.resetModules()
-    const child = new EventEmitter() as EventEmitter & {
-      stdout: null
-      stderr: null
-      kill: ReturnType<typeof vi.fn>
-      pid: number
-    }
-    child.stdout = null
-    child.stderr = null
-    child.kill = vi.fn()
-    child.pid = 4242
-    const spawnMock = vi.fn(() => {
-      queueMicrotask(() => child.emit('exit', 0))
-      return child
-    })
-    const buildInteractiveLoginSpawn = vi.fn(() => ({
-      command: getCmdExePath(),
-      args: [
-        '/d',
-        '/c',
-        'start',
-        '',
-        '/wait',
-        'C:\\Tools\\claude.cmd',
-        'auth',
-        'login',
-        '--claudeai'
-      ],
-      stdio: 'ignore' as const,
-      windowsHide: true
-    }))
-    vi.doMock('node:child_process', () => ({ spawn: spawnMock }))
-    vi.doMock('../../shared/windows-interactive-login-spawn', () => ({
-      buildWindowsHostInteractiveLoginSpawn: buildInteractiveLoginSpawn
-    }))
-
-    try {
-      const { ClaudeAccountService } = await import('./service')
-      const service = new ClaudeAccountService(
-        createService() as never,
-        createService() as never,
-        createService() as never
-      )
-      await (
-        service as unknown as {
-          runClaudeCommand(
-            args: string[],
-            configDir: { windowsPath: string; linuxPath: string | null; wslDistro: string | null },
-            timeoutMs: number
-          ): Promise<string>
-        }
-      ).runClaudeCommand(
-        ['auth', 'login', '--claudeai'],
-        { windowsPath: 'C:\\tmp\\claude-auth', linuxPath: null, wslDistro: null },
-        1000
-      )
-
-      expect(buildInteractiveLoginSpawn).toHaveBeenCalledWith('C:\\Tools\\claude.cmd', [
-        'auth',
-        'login',
-        '--claudeai'
-      ])
-      expect(spawnMock).toHaveBeenCalledWith(
-        getCmdExePath(),
-        expect.arrayContaining(['start', '', '/wait']),
-        expect.objectContaining({
-          stdio: 'ignore',
-          windowsHide: true
-        })
-      )
-      expect(child.kill).not.toHaveBeenCalled()
-    } finally {
-      vi.doUnmock('node:child_process')
-      vi.doUnmock('../../shared/windows-interactive-login-spawn')
-    }
-  })
-
-  it('times out a denied Windows login that stays alive without piped output', async () => {
-    setPlatform('win32')
-    vi.resetModules()
-    vi.useFakeTimers()
-    const child = new EventEmitter() as EventEmitter & {
-      stdout: null
-      stderr: null
-      kill: ReturnType<typeof vi.fn>
-      pid: number
-    }
-    child.stdout = null
-    child.stderr = null
-    child.kill = vi.fn()
-    child.pid = 0
-    const spawnMock = vi.fn(() => child)
-    vi.doMock('node:child_process', () => ({ spawn: spawnMock }))
-
-    try {
-      const { ClaudeAccountService } = await import('./service')
-      const service = new ClaudeAccountService(
-        createService() as never,
-        createService() as never,
-        createService() as never
-      )
-      const login = (
-        service as unknown as {
-          runClaudeCommand(
-            args: string[],
-            configDir: { windowsPath: string; linuxPath: string | null; wslDistro: string | null },
-            timeoutMs: number
-          ): Promise<string>
-        }
-      ).runClaudeCommand(
-        ['auth', 'login', '--claudeai'],
-        { windowsPath: 'C:\\tmp\\claude-auth', linuxPath: null, wslDistro: null },
-        1000
-      )
-      const rejection = expect(login).rejects.toThrow('Claude sign-in took too long to finish.')
-
-      await vi.advanceTimersByTimeAsync(3_000)
-
-      await rejection
-      expect(child.kill).toHaveBeenCalledOnce()
-    } finally {
-      vi.useRealTimers()
-      vi.doUnmock('node:child_process')
-    }
-  })
-})
diff --git a/src/main/claude-accounts/environment.ts b/src/main/claude-accounts/environment.ts
index 3fd7871c70d7..918de5250f5e 100644
--- a/src/main/claude-accounts/environment.ts
+++ b/src/main/claude-accounts/environment.ts
@@ -1,4 +1,9 @@
 import type { ClaudeManagedAccount } from '../../shared/managed-account-types'
+import {
+  CLAUDE_INJECTED_CONFIG_DIR_ENV,
+  CLAUDE_PROFILE_POINTER_ENV,
+  CLAUDE_USER_CONFIG_DIR_ENV
+} from '../../shared/claude-profile-routing'
 
 export const CLAUDE_AUTH_ENV_VARS = [
   'ANTHROPIC_API_KEY',
@@ -8,8 +13,9 @@ export const CLAUDE_AUTH_ENV_VARS = [
 ] as const
 
 export type ClaudeEnvPatch = {
-  ORCA_CLAUDE_PROFILE_POINTER?: string
-  ORCA_CLAUDE_INJECTED_CONFIG_DIR?: string
+  [CLAUDE_PROFILE_POINTER_ENV]?: string
+  [CLAUDE_INJECTED_CONFIG_DIR_ENV]?: string
+  [CLAUDE_USER_CONFIG_DIR_ENV]?: string
   CLAUDE_CONFIG_DIR?: string
   ANTHROPIC_CUSTOM_HEADERS?: string
 }
@@ -35,11 +41,15 @@ export function applyClaudeEnvPatch(
     }
   }
 
-  if (patch.ORCA_CLAUDE_PROFILE_POINTER) {
-    baseEnv.ORCA_CLAUDE_PROFILE_POINTER = patch.ORCA_CLAUDE_PROFILE_POINTER
-  }
-  if (patch.ORCA_CLAUDE_INJECTED_CONFIG_DIR) {
-    baseEnv.ORCA_CLAUDE_INJECTED_CONFIG_DIR = patch.ORCA_CLAUDE_INJECTED_CONFIG_DIR
+  for (const key of [
+    CLAUDE_PROFILE_POINTER_ENV,
+    CLAUDE_INJECTED_CONFIG_DIR_ENV,
+    CLAUDE_USER_CONFIG_DIR_ENV
+  ] as const) {
+    const value = patch[key]
+    if (value) {
+      baseEnv[key] = value
+    }
   }
   if (patch.CLAUDE_CONFIG_DIR) {
     baseEnv.CLAUDE_CONFIG_DIR = patch.CLAUDE_CONFIG_DIR
@@ -56,9 +66,6 @@ export function applyClaudeEnvPatch(
 export const CLAUDE_AUTH_ENV_CONFLICT_MESSAGE =
   'This Claude launch defines explicit Anthropic auth environment variables. Remove those overrides before using a managed Claude account.'
 
-export const CLAUDE_AUTH_SWITCH_IN_PROGRESS_MESSAGE =
-  'A Claude account switch is in progress. Try again after it finishes.'
-
 /**
  * Whether a launch on the host runtime must drop inherited Anthropic auth.
  *
diff --git a/src/main/claude-accounts/keychain.test.ts b/src/main/claude-accounts/keychain.test.ts
index 3ee2c6b77593..3bd725ba068f 100644
--- a/src/main/claude-accounts/keychain.test.ts
+++ b/src/main/claude-accounts/keychain.test.ts
@@ -1,277 +1,21 @@
-import { createHash } from 'node:crypto'
-import { execFile } from 'node:child_process'
-import { mkdtempSync, realpathSync, rmSync } from 'node:fs'
-import { tmpdir } from 'node:os'
-import { join } from 'node:path'
-import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest'
-import {
-  deleteActiveClaudeKeychainCredentials,
-  readActiveClaudeKeychainCredentials,
-  readActiveClaudeKeychainCredentialsStrict,
-  writeActiveClaudeKeychainCredentials,
-  writeActiveClaudeKeychainCredentialsForRuntime
-} from './keychain'
+import { afterEach, expect, it, vi } from 'vitest'
 
-vi.mock('node:child_process', () => ({
-  execFile: vi.fn()
-}))
+const reads = vi.hoisted(() => vi.fn(async () => null))
+vi.mock('../macos-keychain/generic-password', () => ({ readKeychainPassword: reads }))
 
-const execFileMock = vi.mocked(execFile)
-const originalPlatform = Object.getOwnPropertyDescriptor(process, 'platform')
-const originalUser = process.env.USER
-const originalUsername = process.env.USERNAME
-const TEST_USER = 'orca-test-user'
-const SSO_USER = 'sso.user@example.com'
-let configDir: string
-
-function setPlatform(platform: NodeJS.Platform): void {
-  Object.defineProperty(process, 'platform', {
-    configurable: true,
-    value: platform
-  })
-}
-
-function serviceForConfigDir(configDir: string): string {
-  const suffix = createHash('sha256').update(configDir).digest('hex').slice(0, 8)
-  return `Claude Code-credentials-${suffix}`
-}
-
-function invokeExecFileCallback(
-  callback: unknown,
-  error: Error | null,
-  stdout: string,
-  stderr: string
-): void {
-  const execCallback = callback as (error: Error | null, stdout: string, stderr: string) => void
-  execCallback(error, stdout, stderr)
-}
-
-describe('Claude Keychain credentials', () => {
-  beforeEach(() => {
-    configDir = realpathSync(mkdtempSync(join(tmpdir(), 'orca-claude-keychain-')))
-    setPlatform('darwin')
-    execFileMock.mockReset()
-    process.env.USER = TEST_USER
-    delete process.env.USERNAME
-  })
-
-  afterEach(() => {
-    rmSync(configDir, { recursive: true, force: true })
-    vi.useRealTimers()
-    if (originalPlatform) {
-      Object.defineProperty(process, 'platform', originalPlatform)
-    }
-    if (originalUser === undefined) {
-      delete process.env.USER
-    } else {
-      process.env.USER = originalUser
-    }
-    if (originalUsername === undefined) {
-      delete process.env.USERNAME
-    } else {
-      process.env.USERNAME = originalUsername
-    }
-  })
-
-  it('reads config-scoped Claude Code 2.1 credentials before legacy credentials', async () => {
-    const scopedService = serviceForConfigDir(configDir)
-    execFileMock.mockImplementationOnce((_file, _args, _options, callback) => {
-      invokeExecFileCallback(callback, null, '{"claudeAiOauth":{"accessToken":"scoped"}}\n', '')
-      return null as never
-    })
-
-    await expect(readActiveClaudeKeychainCredentials(configDir)).resolves.toBe(
-      '{"claudeAiOauth":{"accessToken":"scoped"}}'
-    )
-
-    expect(execFileMock).toHaveBeenCalledTimes(1)
-    expect(execFileMock.mock.calls[0][1]).toEqual([
-      'find-generic-password',
-      '-s',
-      scopedService,
-      '-a',
-      TEST_USER,
-      '-w'
-    ])
-  })
-
-  it('falls back to the legacy unsuffixed Claude Code credentials service', async () => {
-    const notFound = Object.assign(new Error('not found'), { code: 44 })
-    execFileMock
-      .mockImplementationOnce((_file, _args, _options, callback) => {
-        invokeExecFileCallback(callback, notFound, '', 'could not be found')
-        return null as never
-      })
-      .mockImplementationOnce((_file, _args, _options, callback) => {
-        invokeExecFileCallback(callback, null, 'legacy\n', '')
-        return null as never
-      })
-
-    await expect(readActiveClaudeKeychainCredentials(configDir)).resolves.toBe('legacy')
-
-    expect(execFileMock.mock.calls[1][1]).toEqual([
-      'find-generic-password',
-      '-s',
-      'Claude Code-credentials',
-      '-a',
-      TEST_USER,
-      '-w'
-    ])
-  })
-
-  it('writes active credentials to the config-scoped Claude Code service', async () => {
-    const scopedService = serviceForConfigDir(configDir)
-    execFileMock.mockImplementationOnce((_file, _args, _options, callback) => {
-      invokeExecFileCallback(callback, null, '', '')
-      return null as never
-    })
-
-    await writeActiveClaudeKeychainCredentials('credentials-json', configDir)
-
-    expect(execFileMock.mock.calls[0][1]).toEqual([
-      'add-generic-password',
-      '-U',
-      '-s',
-      scopedService,
-      '-a',
-      TEST_USER,
-      '-w',
-      'credentials-json'
-    ])
-  })
-
-  it('writes runtime credentials to scoped and legacy services for old Claude Code compatibility', async () => {
-    const scopedService = serviceForConfigDir(configDir)
-    execFileMock.mockImplementation((_file, _args, _options, callback) => {
-      invokeExecFileCallback(callback, null, '', '')
-      return null as never
-    })
-
-    await writeActiveClaudeKeychainCredentialsForRuntime('credentials-json', configDir)
+import { readActiveClaudeKeychainCredentialsStrict } from './keychain'
 
-    expect(execFileMock.mock.calls.map((call) => call[1])).toEqual([
-      [
-        'add-generic-password',
-        '-U',
-        '-s',
-        scopedService,
-        '-a',
-        TEST_USER,
-        '-w',
-        'credentials-json'
-      ],
-      [
-        'add-generic-password',
-        '-U',
-        '-s',
-        'Claude Code-credentials',
-        '-a',
-        TEST_USER,
-        '-w',
-        'credentials-json'
-      ]
-    ])
-  })
-
-  it('strictly reads only the requested active credentials service', async () => {
-    const scopedService = serviceForConfigDir(configDir)
-    execFileMock.mockImplementationOnce((_file, _args, _options, callback) => {
-      invokeExecFileCallback(callback, null, 'scoped\n', '')
-      return null as never
-    })
-
-    await expect(readActiveClaudeKeychainCredentialsStrict(configDir)).resolves.toBe('scoped')
-
-    expect(execFileMock).toHaveBeenCalledTimes(1)
-    expect(execFileMock.mock.calls[0][1]).toEqual([
-      'find-generic-password',
-      '-s',
-      scopedService,
-      '-a',
-      TEST_USER,
-      '-w'
-    ])
-  })
-
-  it('rejects when a keychain read never reports completion', async () => {
-    vi.useFakeTimers()
-    const killMock = vi.fn()
-    execFileMock.mockImplementationOnce(() => ({ kill: killMock }) as never)
-
-    let settled = false
-    let rejected: unknown
-    const readPromise = readActiveClaudeKeychainCredentialsStrict(configDir).then(
-      (credentials) => {
-        settled = true
-        return credentials
-      },
-      (error: unknown) => {
-        settled = true
-        rejected = error
-        return null
-      }
-    )
-
-    await vi.advanceTimersByTimeAsync(3000)
-
-    expect(settled).toBe(true)
-    await readPromise
-    expect(rejected).toEqual(
-      expect.objectContaining({ message: 'security timed out after 3000ms' })
-    )
-    expect(killMock).toHaveBeenCalled()
-  })
-
-  it('deletes both scoped and legacy active credentials for config-dir cleanup', async () => {
-    const scopedService = serviceForConfigDir(configDir)
-    execFileMock.mockImplementation((_file, _args, _options, callback) => {
-      invokeExecFileCallback(callback, null, '', '')
-      return null as never
-    })
-
-    await deleteActiveClaudeKeychainCredentials(configDir)
-
-    expect(execFileMock.mock.calls.map((call) => call[1])).toEqual([
-      ['delete-generic-password', '-s', scopedService, '-a', TEST_USER],
-      ['delete-generic-password', '-s', 'Claude Code-credentials', '-a', TEST_USER]
-    ])
-  })
-
-  it('looks up claude-code-user when $USER contains @ (#12857)', async () => {
-    process.env.USER = SSO_USER
-    execFileMock.mockImplementationOnce((_file, _args, _options, callback) => {
-      invokeExecFileCallback(callback, null, '{"claudeAiOauth":{"accessToken":"ok"}}\n', '')
-      return null as never
-    })
-
-    await expect(readActiveClaudeKeychainCredentials()).resolves.toBe(
-      '{"claudeAiOauth":{"accessToken":"ok"}}'
-    )
-    expect(execFileMock.mock.calls[0][1]).toEqual([
-      'find-generic-password',
-      '-s',
-      'Claude Code-credentials',
-      '-a',
-      'claude-code-user',
-      '-w'
-    ])
-  })
-
-  it('cleans both Claude Code and raw $USER Keychain accounts after a failed SSO login', async () => {
-    process.env.USER = SSO_USER
-    const scopedService = serviceForConfigDir(configDir)
-    execFileMock.mockImplementation((_file, _args, _options, callback) => {
-      invokeExecFileCallback(callback, null, '', '')
-      return null as never
-    })
-
-    await deleteActiveClaudeKeychainCredentials(configDir)
+const originalUser = process.env.USER
+afterEach(() => {
+  process.env.USER = originalUser
+  reads.mockClear()
+})
 
-    expect(execFileMock.mock.calls.map((call) => call[1])).toEqual([
-      ['delete-generic-password', '-s', scopedService, '-a', 'claude-code-user'],
-      ['delete-generic-password', '-s', scopedService, '-a', SSO_USER],
-      ['delete-generic-password', '-s', 'Claude Code-credentials', '-a', 'claude-code-user'],
-      ['delete-generic-password', '-s', 'Claude Code-credentials', '-a', SSO_USER]
-    ])
-  })
+it('reads the claude-code-user item when $USER is not a valid Keychain account (#12857)', async () => {
+  process.env.USER = 'first@example.com'
+  await readActiveClaudeKeychainCredentialsStrict()
+  expect(reads).toHaveBeenCalledWith('Claude Code-credentials', 'claude-code-user')
+  process.env.USER = 'first.last'
+  await readActiveClaudeKeychainCredentialsStrict()
+  expect(reads).toHaveBeenLastCalledWith('Claude Code-credentials', 'first.last')
 })
diff --git a/src/main/claude-accounts/keychain.ts b/src/main/claude-accounts/keychain.ts
index aa4dcfa64dbc..14070e6bb631 100644
--- a/src/main/claude-accounts/keychain.ts
+++ b/src/main/claude-accounts/keychain.ts
@@ -2,36 +2,18 @@ import { createHash } from 'node:crypto'
 import { lstatSync, realpathSync } from 'node:fs'
 import { userInfo } from 'node:os'
 import { basename, dirname, join } from 'node:path'
-import {
-  deleteKeychainPassword,
-  readKeychainPassword,
-  writeKeychainPassword
-} from '../macos-keychain/generic-password'
+import { readKeychainPassword } from '../macos-keychain/generic-password'
 
 const ACTIVE_CLAUDE_SERVICE = 'Claude Code-credentials'
-const ORCA_CLAUDE_SERVICE = 'Orca Claude Code Managed Credentials'
-export async function readActiveClaudeKeychainCredentials(
-  configDir?: string
-): Promise<string | null> {
-  for (const service of getActiveClaudeServices(configDir)) {
-    const credentials = await readKeychainPassword(service, getKeychainUser())
-    if (credentials) {
-      return credentials
-    }
-  }
-  return null
-}
-
 export async function readActiveClaudeKeychainCredentialsStrict(
   configDir?: string
 ): Promise<string | null> {
   if (!configDir) {
-    return readKeychainPassword(getActiveClaudeService(), getKeychainUser())
+    return readKeychainPassword(claudeKeychainService(), getKeychainUser())
   }
-  // Why: macOS tmp is /var → /private/var. Claude hashes the realpath; a
-  // mkdtemp login dir would miss the Keychain item if we only hashed the raw path.
+  // Keep both lexical and canonical profile aliases scoped; never try System Default.
   for (const dir of claudeConfigDirKeychainAliases(configDir)) {
-    const credentials = await readKeychainPassword(getActiveClaudeService(dir), getKeychainUser())
+    const credentials = await readKeychainPassword(claudeKeychainService(dir), getKeychainUser())
     if (credentials) {
       return credentials
     }
@@ -39,63 +21,6 @@ export async function readActiveClaudeKeychainCredentialsStrict(
   return null
 }
 
-export async function writeActiveClaudeKeychainCredentials(
-  contents: string,
-  configDir?: string
-): Promise<void> {
-  await writeKeychainPassword(getActiveClaudeService(configDir), getKeychainUser(), contents)
-}
-
-export async function writeActiveClaudeKeychainCredentialsForRuntime(
-  contents: string,
-  configDir: string
-): Promise<void> {
-  const user = getKeychainUser()
-  const scopedService = getActiveClaudeService(configDir)
-  await writeKeychainPassword(scopedService, user, contents)
-  if (scopedService !== ACTIVE_CLAUDE_SERVICE) {
-    await writeKeychainPassword(ACTIVE_CLAUDE_SERVICE, user, contents)
-  }
-}
-
-export async function deleteActiveClaudeKeychainCredentials(configDir?: string): Promise<void> {
-  for (const service of getActiveClaudeServices(configDir)) {
-    for (const account of getKeychainUsersForCleanup()) {
-      await deleteKeychainPassword(service, account)
-    }
-  }
-}
-
-export async function deleteActiveClaudeKeychainCredentialsStrict(
-  configDir?: string
-): Promise<void> {
-  const dirs = configDir ? claudeConfigDirKeychainAliases(configDir) : [undefined]
-  for (const dir of dirs) {
-    for (const account of getKeychainUsersForCleanup()) {
-      await deleteKeychainPassword(getActiveClaudeService(dir), account, {
-        failOnAccessError: true
-      })
-    }
-  }
-}
-
-export async function readManagedClaudeKeychainCredentials(
-  accountId: string
-): Promise<string | null> {
-  return readKeychainPassword(ORCA_CLAUDE_SERVICE, accountId)
-}
-
-export async function writeManagedClaudeKeychainCredentials(
-  accountId: string,
-  contents: string
-): Promise<void> {
-  await writeKeychainPassword(ORCA_CLAUDE_SERVICE, accountId, contents)
-}
-
-export async function deleteManagedClaudeKeychainCredentials(accountId: string): Promise<void> {
-  await deleteKeychainPassword(ORCA_CLAUDE_SERVICE, accountId)
-}
-
 const KEYCHAIN_ACCOUNT_PATTERN = /^[a-zA-Z0-9._-]+$/
 const CLAUDE_CODE_FALLBACK_USER = 'claude-code-user'
 
@@ -111,13 +36,7 @@ function getKeychainUser(): string {
   return KEYCHAIN_ACCOUNT_PATTERN.test(user) ? user : CLAUDE_CODE_FALLBACK_USER
 }
 
-function getKeychainUsersForCleanup(): string[] {
-  const derived = getKeychainUser()
-  const raw = process.env.USER || process.env.USERNAME
-  return raw && raw !== derived ? [derived, raw] : [derived]
-}
-
-function getActiveClaudeService(configDir?: string): string {
+export function claudeKeychainService(configDir?: string): string {
   if (!configDir) {
     return ACTIVE_CLAUDE_SERVICE
   }
@@ -173,10 +92,16 @@ export function claudeConfigDirKeychainAliases(configDir: string): string[] {
   return aliases
 }
 
-function getActiveClaudeServices(configDir?: string): string[] {
-  if (!configDir) {
-    return [ACTIVE_CLAUDE_SERVICE]
+/** Every spelling of a folder Claude may have hashed into its Keychain item name (superset U/profiles.ts). */
+export function claudeConfigDirSpellings(configDir: string, userHome: string): string[] {
+  const spellings = new Set<string>()
+  for (const dir of claudeConfigDirKeychainAliases(configDir)) {
+    const trimmed = dir.replace(/[\\/]+$/, '')
+    const rest = trimmed.startsWith(`${userHome}/`) ? trimmed.slice(userHome.length) : null
+    for (const spelling of [trimmed, ...(rest ? [`~${rest}`, `$HOME${rest}`] : [])]) {
+      spellings.add(spelling)
+      spellings.add(`${spelling}/`)
+    }
   }
-  const scoped = claudeConfigDirKeychainAliases(configDir).map((dir) => getActiveClaudeService(dir))
-  return [...new Set([...scoped, ACTIVE_CLAUDE_SERVICE])]
+  return [...spellings]
 }
diff --git a/src/main/claude-accounts/live-pty-gate.test.ts b/src/main/claude-accounts/live-pty-gate.test.ts
deleted file mode 100644
index 7359bbd98055..000000000000
--- a/src/main/claude-accounts/live-pty-gate.test.ts
+++ /dev/null
@@ -1,142 +0,0 @@
-import { afterEach, describe, expect, it, vi } from 'vitest'
-import {
-  attachClaudeLivePtyPersistence,
-  beginClaudeAuthSwitch,
-  confirmSeededClaudeLivePtys,
-  endClaudeAuthSwitch,
-  hasLiveClaudePtys,
-  isClaudeAuthSwitchInProgress,
-  markClaudePtyExited,
-  markClaudePtySpawned,
-  onLiveClaudePtysDrained,
-  seedLiveClaudePtysFromPersistence
-} from './live-pty-gate'
-
-describe('Claude live PTY gate', () => {
-  afterEach(() => {
-    markClaudePtyExited('live-claude-pty')
-    markClaudePtyExited('seeded-pty-1')
-    markClaudePtyExited('seeded-pty-2')
-    confirmSeededClaudeLivePtys([])
-    attachClaudeLivePtyPersistence(null)
-    endClaudeAuthSwitch()
-  })
-
-  it('allows switching while Claude PTYs are live', () => {
-    markClaudePtySpawned('live-claude-pty')
-
-    beginClaudeAuthSwitch()
-
-    expect(isClaudeAuthSwitchInProgress()).toBe(true)
-  })
-
-  it('still rejects overlapping account switches', () => {
-    beginClaudeAuthSwitch()
-
-    expect(() => beginClaudeAuthSwitch()).toThrow('already in progress')
-  })
-
-  it('counts seeded session ids as live until confirmed dead', () => {
-    seedLiveClaudePtysFromPersistence(['seeded-pty-1', 'seeded-pty-2'])
-
-    expect(hasLiveClaudePtys()).toBe(true)
-
-    confirmSeededClaudeLivePtys(['seeded-pty-1'])
-
-    expect(hasLiveClaudePtys()).toBe(true)
-
-    confirmSeededClaudeLivePtys([])
-
-    expect(hasLiveClaudePtys()).toBe(true)
-
-    markClaudePtyExited('seeded-pty-1')
-
-    expect(hasLiveClaudePtys()).toBe(false)
-  })
-
-  it('releases seeded ids the daemon no longer knows', () => {
-    const removeClaudeLivePtySessionId = vi.fn()
-    attachClaudeLivePtyPersistence({
-      addClaudeLivePtySessionId: vi.fn(),
-      removeClaudeLivePtySessionId
-    })
-    seedLiveClaudePtysFromPersistence(['seeded-pty-1', 'seeded-pty-2'])
-
-    confirmSeededClaudeLivePtys(['seeded-pty-2'])
-
-    expect(hasLiveClaudePtys()).toBe(true)
-    expect(removeClaudeLivePtySessionId).toHaveBeenCalledWith('seeded-pty-1')
-    expect(removeClaudeLivePtySessionId).not.toHaveBeenCalledWith('seeded-pty-2')
-  })
-
-  it('keeps a seeded id confirmed by a real spawn out of later pruning', () => {
-    seedLiveClaudePtysFromPersistence(['seeded-pty-1'])
-    markClaudePtySpawned('seeded-pty-1')
-
-    confirmSeededClaudeLivePtys([])
-
-    expect(hasLiveClaudePtys()).toBe(true)
-  })
-
-  it('notifies drain listeners only when the last live Claude PTY exits', () => {
-    const onDrained = vi.fn()
-    const unsubscribe = onLiveClaudePtysDrained(onDrained)
-    try {
-      markClaudePtySpawned('live-claude-pty')
-      markClaudePtySpawned('seeded-pty-1')
-
-      markClaudePtyExited('live-claude-pty')
-      expect(onDrained).not.toHaveBeenCalled()
-
-      markClaudePtyExited('seeded-pty-1')
-      expect(onDrained).toHaveBeenCalledTimes(1)
-
-      // Why: exits with no live PTYs left must not fire again — the drain
-      // signal marks the 1 -> 0 transition, not every teardown call.
-      markClaudePtyExited('seeded-pty-1')
-      expect(onDrained).toHaveBeenCalledTimes(1)
-    } finally {
-      unsubscribe()
-    }
-  })
-
-  it('notifies drain listeners when seed reconciliation releases the last live id', () => {
-    const onDrained = vi.fn()
-    const unsubscribe = onLiveClaudePtysDrained(onDrained)
-    try {
-      seedLiveClaudePtysFromPersistence(['seeded-pty-1'])
-
-      confirmSeededClaudeLivePtys([])
-
-      expect(onDrained).toHaveBeenCalledTimes(1)
-    } finally {
-      unsubscribe()
-    }
-  })
-
-  it('stops notifying an unsubscribed drain listener', () => {
-    const onDrained = vi.fn()
-    const unsubscribe = onLiveClaudePtysDrained(onDrained)
-    unsubscribe()
-
-    markClaudePtySpawned('live-claude-pty')
-    markClaudePtyExited('live-claude-pty')
-
-    expect(onDrained).not.toHaveBeenCalled()
-  })
-
-  it('persists spawns and exits when persistence is attached', () => {
-    const addClaudeLivePtySessionId = vi.fn()
-    const removeClaudeLivePtySessionId = vi.fn()
-    attachClaudeLivePtyPersistence({
-      addClaudeLivePtySessionId,
-      removeClaudeLivePtySessionId
-    })
-
-    markClaudePtySpawned('live-claude-pty')
-    expect(addClaudeLivePtySessionId).toHaveBeenCalledWith('live-claude-pty')
-
-    markClaudePtyExited('live-claude-pty')
-    expect(removeClaudeLivePtySessionId).toHaveBeenCalledWith('live-claude-pty')
-  })
-})
diff --git a/src/main/claude-accounts/live-pty-gate.ts b/src/main/claude-accounts/live-pty-gate.ts
deleted file mode 100644
index caab66c34308..000000000000
--- a/src/main/claude-accounts/live-pty-gate.ts
+++ /dev/null
@@ -1,174 +0,0 @@
-const liveClaudePtyIds = new Set<string>()
-// Why: ids restored from persistence at startup, not yet confirmed against the
-// daemon. They keep the OAuth refresh gate closed so an early managed refresh
-// cannot rotate the single-use refresh token out from under a Claude CLI that
-// survived the app restart inside the daemon.
-const seededUnconfirmedPtyIds = new Set<string>()
-let switchInProgress = false
-// Woken by endClaudeAuthSwitch so a caller past the point of no return can wait the
-// swap out instead of refusing. See whenClaudeAuthSwitchSettles.
-const switchSettledListeners = new Set<() => void>()
-
-/** A managed account swap is a credential-file rewrite, not a network round trip;
- *  anything past this is a wedged switch, and refusing beats waiting forever. */
-export const CLAUDE_AUTH_SWITCH_SETTLE_TIMEOUT_MS = 15_000
-
-export type ClaudeLivePtyPersistence = {
-  addClaudeLivePtySessionId(sessionId: string): void
-  removeClaudeLivePtySessionId(sessionId: string): void
-}
-
-let persistence: ClaudeLivePtyPersistence | null = null
-
-export function attachClaudeLivePtyPersistence(target: ClaudeLivePtyPersistence | null): void {
-  persistence = target
-}
-
-// Why: a live claude defers the managed OAuth refresh ("Waiting for Claude
-// session"); consumers need the 1 -> 0 transition to recover promptly instead
-// of waiting out the usage-fetch failure backoff.
-type LiveClaudePtyDrainListener = () => void
-const drainListeners = new Set<LiveClaudePtyDrainListener>()
-
-export function onLiveClaudePtysDrained(listener: LiveClaudePtyDrainListener): () => void {
-  drainListeners.add(listener)
-  return () => drainListeners.delete(listener)
-}
-
-function notifyDrainedOnTransition(hadLivePtys: boolean): void {
-  if (!hadLivePtys || liveClaudePtyIds.size > 0) {
-    return
-  }
-  for (const listener of drainListeners) {
-    listener()
-  }
-}
-
-export function seedLiveClaudePtysFromPersistence(sessionIds: readonly string[]): void {
-  for (const sessionId of sessionIds) {
-    liveClaudePtyIds.add(sessionId)
-    seededUnconfirmedPtyIds.add(sessionId)
-  }
-}
-
-export function hasSeededUnconfirmedClaudePtys(): boolean {
-  return seededUnconfirmedPtyIds.size > 0
-}
-
-/**
- * Reconcile seeded ids against the daemon's live session list. Seeded ids the
- * daemon no longer knows are dead — release them so they cannot defer OAuth
- * refresh forever. Seeded ids that are still alive stay in the gate even if
- * their pane never reattaches: that daemon process still owns the credentials.
- */
-export function confirmSeededClaudeLivePtys(aliveSessionIds: readonly string[]): void {
-  const hadLivePtys = liveClaudePtyIds.size > 0
-  const alive = new Set(aliveSessionIds)
-  for (const sessionId of seededUnconfirmedPtyIds) {
-    if (!alive.has(sessionId)) {
-      liveClaudePtyIds.delete(sessionId)
-      persistence?.removeClaudeLivePtySessionId(sessionId)
-    }
-  }
-  seededUnconfirmedPtyIds.clear()
-  notifyDrainedOnTransition(hadLivePtys)
-}
-
-export function markClaudePtySpawned(ptyId: string): void {
-  liveClaudePtyIds.add(ptyId)
-  seededUnconfirmedPtyIds.delete(ptyId)
-  persistence?.addClaudeLivePtySessionId(ptyId)
-}
-
-export function markClaudePtyExited(ptyId: string): void {
-  const hadLivePtys = liveClaudePtyIds.size > 0
-  liveClaudePtyIds.delete(ptyId)
-  seededUnconfirmedPtyIds.delete(ptyId)
-  persistence?.removeClaudeLivePtySessionId(ptyId)
-  notifyDrainedOnTransition(hadLivePtys)
-}
-
-/**
- * Register a structured Claude child with the same gate the terminal path uses.
- *
- * The gate is what makes the managed OAuth refresh defer instead of rotating a
- * single-use refresh token out from under a running Claude (runtime-auth-sync.ts).
- * A structured session's child is as much a live Claude as a PTY's is, so it has to
- * hold the gate too — otherwise a refresh mid-turn breaks its next API call while an
- * identical terminal session is protected.
- *
- * Deliberately not persisted, unlike markClaudePtySpawned: these children are direct
- * children of this process and cannot survive a restart, so seeding them back on the
- * next launch would hold the gate closed for a process that is provably gone.
- */
-export function markClaudeStructuredChildSpawned(childKey: string): void {
-  liveClaudePtyIds.add(structuredChildGateId(childKey))
-}
-
-export function markClaudeStructuredChildExited(childKey: string): void {
-  const hadLivePtys = liveClaudePtyIds.size > 0
-  liveClaudePtyIds.delete(structuredChildGateId(childKey))
-  notifyDrainedOnTransition(hadLivePtys)
-}
-
-// Namespaced so a structured child can never collide with a daemon PTY session id,
-// which confirmSeededClaudeLivePtys reconciles against the daemon's own list.
-function structuredChildGateId(childKey: string): string {
-  return `claude-structured:${childKey}`
-}
-
-export function hasLiveClaudePtys(): boolean {
-  return liveClaudePtyIds.size > 0
-}
-
-export function beginClaudeAuthSwitch(): void {
-  if (switchInProgress) {
-    throw new Error('A Claude account switch is already in progress.')
-  }
-  switchInProgress = true
-}
-
-export function endClaudeAuthSwitch(): void {
-  const wasInProgress = switchInProgress
-  switchInProgress = false
-  if (!wasInProgress) {
-    return
-  }
-  // Each listener removes itself as it settles; Set iteration is defined over that.
-  for (const listener of switchSettledListeners) {
-    listener()
-  }
-}
-
-/**
- * Resolves `true` once no account switch is running, `false` if one is still running
- * at the deadline.
- *
- * Exists for callers that have already done irreversible work — a structured acquire
- * has closed the old child by the time it resolves its launch, so turning a switch
- * into a refusal there strands the user with a dead session and no replacement.
- * Waiting for the swap and then launching against it is the recoverable answer;
- * refusing is only correct when nothing has been torn down yet.
- */
-export function whenClaudeAuthSwitchSettles(
-  timeoutMs = CLAUDE_AUTH_SWITCH_SETTLE_TIMEOUT_MS
-): Promise<boolean> {
-  if (!switchInProgress) {
-    return Promise.resolve(true)
-  }
-  return new Promise<boolean>((resolve) => {
-    const settle = (settled: boolean): void => {
-      switchSettledListeners.delete(listener)
-      clearTimeout(timer)
-      resolve(settled)
-    }
-    const listener = (): void => settle(true)
-    switchSettledListeners.add(listener)
-    const timer = setTimeout(() => settle(false), timeoutMs)
-    timer.unref?.()
-  })
-}
-
-export function isClaudeAuthSwitchInProgress(): boolean {
-  return switchInProgress
-}
diff --git a/src/main/claude-accounts/managed-auth-path.ts b/src/main/claude-accounts/managed-auth-path.ts
deleted file mode 100644
index 2914b72e0334..000000000000
--- a/src/main/claude-accounts/managed-auth-path.ts
+++ /dev/null
@@ -1,112 +0,0 @@
-import { existsSync, lstatSync, readFileSync, realpathSync, writeFileSync } from 'node:fs'
-import { join, relative, resolve, sep } from 'node:path'
-import { app } from 'electron'
-import { writeFileAtomically } from '../codex-accounts/fs-utils'
-
-const MANAGED_AUTH_MARKER = '.orca-managed-claude-auth'
-
-export function getClaudeManagedAccountsRoot(): string {
-  return join(app.getPath('userData'), 'claude-accounts')
-}
-
-export function resolveOwnedClaudeManagedAuthPath(
-  accountId: string,
-  candidatePath: string,
-  options: { adoptLegacyMarker?: boolean } = {}
-): string | null {
-  const rootPath = getClaudeManagedAccountsRoot()
-  const resolvedCandidate = resolve(candidatePath)
-  if (!existsSync(resolvedCandidate) || !existsSync(rootPath)) {
-    return null
-  }
-  try {
-    if (lstatSync(resolvedCandidate).isSymbolicLink()) {
-      return null
-    }
-    const canonicalCandidate = realpathSync(resolvedCandidate)
-    const canonicalRoot = realpathSync(rootPath)
-    if (
-      canonicalCandidate === canonicalRoot ||
-      !canonicalCandidate.startsWith(canonicalRoot + sep)
-    ) {
-      return null
-    }
-    const relativePath = relative(canonicalRoot, canonicalCandidate)
-    const relativeParts = relativePath.split(sep)
-    const escaped = relativePath.startsWith('..') || relativePath.includes(`..${sep}`)
-    if (
-      escaped ||
-      relativeParts.length !== 2 ||
-      relativeParts[0] !== accountId ||
-      relativeParts[1] !== 'auth'
-    ) {
-      return null
-    }
-    const markerPath = join(canonicalCandidate, MANAGED_AUTH_MARKER)
-    const markerValid = isManagedAuthMarkerValid(markerPath, accountId)
-    if (!markerValid && options.adoptLegacyMarker) {
-      writeFileSync(markerPath, `${accountId}\n`, { encoding: 'utf-8', mode: 0o600, flag: 'wx' })
-    }
-    if (!markerValid && !isManagedAuthMarkerValid(markerPath, accountId)) {
-      return null
-    }
-    return canonicalCandidate
-  } catch {
-    return null
-  }
-}
-
-export function readClaudeManagedAuthFile(
-  managedAuthPath: string,
-  filename: '.credentials.json' | 'oauth-account.json'
-): string | null {
-  const filePath = resolve(managedAuthPath, filename)
-  try {
-    if (!isOwnedChildFile(managedAuthPath, filePath)) {
-      return null
-    }
-    return readFileSync(filePath, 'utf-8')
-  } catch {
-    return null
-  }
-}
-
-export function writeClaudeManagedAuthFile(
-  managedAuthPath: string,
-  filename: '.credentials.json' | 'oauth-account.json',
-  contents: string
-): void {
-  const filePath = resolve(managedAuthPath, filename)
-  if (existsSync(filePath) && !isOwnedChildFile(managedAuthPath, filePath)) {
-    throw new Error('Managed Claude auth child file is not owned by Orca.')
-  }
-  writeFileAtomically(filePath, contents, { mode: 0o600 })
-}
-
-function isManagedAuthMarkerValid(markerPath: string, accountId: string): boolean {
-  try {
-    if (
-      !existsSync(markerPath) ||
-      lstatSync(markerPath).isSymbolicLink() ||
-      !lstatSync(markerPath).isFile()
-    ) {
-      return false
-    }
-    return readFileSync(markerPath, 'utf-8').trim() === accountId
-  } catch {
-    return false
-  }
-}
-
-function isOwnedChildFile(managedAuthPath: string, filePath: string): boolean {
-  if (
-    !existsSync(filePath) ||
-    lstatSync(filePath).isSymbolicLink() ||
-    !lstatSync(filePath).isFile()
-  ) {
-    return false
-  }
-  const canonicalAuthPath = realpathSync(managedAuthPath)
-  const canonicalFilePath = realpathSync(filePath)
-  return canonicalFilePath.startsWith(canonicalAuthPath + sep)
-}
diff --git a/src/main/claude-accounts/oauth-refresh.test.ts b/src/main/claude-accounts/oauth-refresh.test.ts
deleted file mode 100644
index dd5e01c245a5..000000000000
--- a/src/main/claude-accounts/oauth-refresh.test.ts
+++ /dev/null
@@ -1,186 +0,0 @@
-import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest'
-import {
-  applyRefreshedToken,
-  isOauthTokenExpiring,
-  parseClaudeOauthBlob,
-  readRefreshToken,
-  refreshClaudeOauthCredentials
-} from './oauth-refresh'
-
-const { netFetchMock } = vi.hoisted(() => ({
-  netFetchMock: vi.fn()
-}))
-
-vi.mock('electron', () => ({
-  net: { fetch: netFetchMock },
-  session: { defaultSession: {} }
-}))
-
-vi.mock('../network/proxy-settings', () => ({
-  ensureElectronProxyFromEnvironment: vi.fn().mockResolvedValue({ source: 'none' })
-}))
-
-const NOW = 1_700_000_000_000
-
-function credentials(overrides: Record<string, unknown> = {}): string {
-  return JSON.stringify({
-    claudeAiOauth: {
-      accessToken: 'old-access',
-      refreshToken: 'old-refresh',
-      expiresAt: NOW + 60 * 60 * 1000,
-      scopes: ['user:inference', 'user:profile'],
-      ...overrides
-    }
-  })
-}
-
-describe('parseClaudeOauthBlob', () => {
-  it('returns the oauth block', () => {
-    expect(parseClaudeOauthBlob(credentials())?.accessToken).toBe('old-access')
-  })
-
-  it('returns null for non-JSON or missing block', () => {
-    expect(parseClaudeOauthBlob('not json')).toBeNull()
-    expect(parseClaudeOauthBlob('{}')).toBeNull()
-    expect(parseClaudeOauthBlob('{"claudeAiOauth":[]}')).toBeNull()
-  })
-})
-
-describe('readRefreshToken', () => {
-  it('reads a present token', () => {
-    expect(readRefreshToken(credentials())).toBe('old-refresh')
-  })
-
-  it('returns null for blank or missing tokens', () => {
-    expect(readRefreshToken(credentials({ refreshToken: '   ' }))).toBeNull()
-    expect(readRefreshToken(credentials({ refreshToken: undefined }))).toBeNull()
-  })
-})
-
-describe('isOauthTokenExpiring', () => {
-  it('is false when well within validity', () => {
-    expect(isOauthTokenExpiring(credentials(), NOW)).toBe(false)
-  })
-
-  it('is true within the 5-minute buffer', () => {
-    expect(isOauthTokenExpiring(credentials({ expiresAt: NOW + 60 * 1000 }), NOW)).toBe(true)
-  })
-
-  it('is true when already expired', () => {
-    expect(isOauthTokenExpiring(credentials({ expiresAt: NOW - 1000 }), NOW)).toBe(true)
-  })
-
-  it('treats missing/non-numeric expiry as expiring', () => {
-    expect(isOauthTokenExpiring(credentials({ expiresAt: undefined }), NOW)).toBe(true)
-    expect(isOauthTokenExpiring(credentials({ expiresAt: 'soon' }), NOW)).toBe(true)
-  })
-
-  it('is false for credentials without an oauth block', () => {
-    expect(isOauthTokenExpiring('{}', NOW)).toBe(false)
-  })
-})
-
-describe('applyRefreshedToken', () => {
-  it('rotates access + refresh token and recomputes expiry', () => {
-    const updated = applyRefreshedToken(
-      credentials(),
-      { access_token: 'new-access', expires_in: 3600, refresh_token: 'new-refresh' },
-      NOW
-    )
-    const oauth = parseClaudeOauthBlob(updated!)!
-    expect(oauth.accessToken).toBe('new-access')
-    expect(oauth.refreshToken).toBe('new-refresh')
-    expect(oauth.expiresAt).toBe(NOW + 3600 * 1000)
-  })
-
-  it('keeps the existing refresh token when the server does not rotate it', () => {
-    const updated = applyRefreshedToken(
-      credentials(),
-      { access_token: 'new-access', expires_in: 3600 },
-      NOW
-    )
-    expect(parseClaudeOauthBlob(updated!)!.refreshToken).toBe('old-refresh')
-  })
-
-  it('preserves unrelated top-level fields', () => {
-    const raw = JSON.stringify({
-      claudeAiOauth: { accessToken: 'a', refreshToken: 'r' },
-      somethingElse: { keep: true }
-    })
-    const updated = applyRefreshedToken(raw, { access_token: 'b' }, NOW)
-    expect(JSON.parse(updated!).somethingElse).toEqual({ keep: true })
-  })
-
-  it('splits scope string into scopes array', () => {
-    const updated = applyRefreshedToken(
-      credentials(),
-      { access_token: 'b', scope: 'user:inference user:profile' },
-      NOW
-    )
-    expect(parseClaudeOauthBlob(updated!)!.scopes).toEqual(['user:inference', 'user:profile'])
-  })
-
-  it('returns null when the response lacks an access token', () => {
-    expect(applyRefreshedToken(credentials(), {}, NOW)).toBeNull()
-    expect(applyRefreshedToken('not json', { access_token: 'b' }, NOW)).toBeNull()
-  })
-})
-
-describe('refreshClaudeOauthCredentials', () => {
-  beforeEach(() => {
-    vi.clearAllMocks()
-  })
-
-  afterEach(() => {
-    vi.clearAllMocks()
-  })
-
-  it('returns null without a refresh token (no network call)', async () => {
-    const result = await refreshClaudeOauthCredentials(
-      credentials({ refreshToken: undefined }),
-      NOW
-    )
-    expect(result).toBeNull()
-    expect(netFetchMock).not.toHaveBeenCalled()
-  })
-
-  it('posts a form-urlencoded refresh grant and persists the rotation', async () => {
-    netFetchMock.mockResolvedValue({
-      ok: true,
-      json: async () => ({
-        access_token: 'fresh-access',
-        expires_in: 3600,
-        refresh_token: 'fresh-refresh'
-      })
-    })
-
-    const result = await refreshClaudeOauthCredentials(credentials(), NOW)
-
-    expect(netFetchMock).toHaveBeenCalledTimes(1)
-    const [url, init] = netFetchMock.mock.calls[0]
-    expect(url).toBe('https://platform.claude.com/v1/oauth/token')
-    expect(init.method).toBe('POST')
-    expect(init.headers['Content-Type']).toBe('application/x-www-form-urlencoded')
-    const body = new URLSearchParams(init.body)
-    expect(body.get('grant_type')).toBe('refresh_token')
-    expect(body.get('refresh_token')).toBe('old-refresh')
-    expect(body.get('client_id')).toBe('9d1c250a-e61b-44d9-88ed-5944d1962f5e')
-
-    const oauth = parseClaudeOauthBlob(result!)!
-    expect(oauth.accessToken).toBe('fresh-access')
-    expect(oauth.refreshToken).toBe('fresh-refresh')
-  })
-
-  it('returns null on a non-ok response and logs the status for diagnosability', async () => {
-    const warn = vi.spyOn(console, 'warn').mockImplementation(() => {})
-    netFetchMock.mockResolvedValue({ ok: false, status: 429, json: async () => ({}) })
-    expect(await refreshClaudeOauthCredentials(credentials(), NOW)).toBeNull()
-    expect(warn).toHaveBeenCalledWith(expect.stringContaining('429'))
-    warn.mockRestore()
-  })
-
-  it('returns null when the request throws (never rejects)', async () => {
-    netFetchMock.mockRejectedValue(new Error('network down'))
-    await expect(refreshClaudeOauthCredentials(credentials(), NOW)).resolves.toBeNull()
-  })
-})
diff --git a/src/main/claude-accounts/oauth-refresh.ts b/src/main/claude-accounts/oauth-refresh.ts
deleted file mode 100644
index cc717ef51ee8..000000000000
--- a/src/main/claude-accounts/oauth-refresh.ts
+++ /dev/null
@@ -1,170 +0,0 @@
-import { net, session } from 'electron'
-import { ensureElectronProxyFromEnvironment } from '../network/proxy-settings'
-
-// Why: the OAuth client id and token endpoint are the public Claude Code
-// values, verified against the installed `claude` binary (2.1.177) and the
-// claude-swap reference tool. Orca owns the refresh so a single-use refresh
-// token is rotated and persisted atomically, instead of being scraped back
-// after the CLI rotates it (the lossy path that strands stale tokens).
-const OAUTH_TOKEN_URL = 'https://platform.claude.com/v1/oauth/token'
-const OAUTH_CLIENT_ID = '9d1c250a-e61b-44d9-88ed-5944d1962f5e'
-
-// Refresh slightly ahead of expiry so a token doesn't expire mid-launch. The
-// CLI uses the same 5-minute skew for its own refresh decision.
-const OAUTH_EXPIRY_BUFFER_MS = 5 * 60 * 1000
-const REFRESH_TIMEOUT_MS = 10_000
-
-type ClaudeOauthBlob = {
-  accessToken?: unknown
-  refreshToken?: unknown
-  expiresAt?: unknown
-  scopes?: unknown
-  [key: string]: unknown
-}
-
-type ClaudeCredentials = {
-  claudeAiOauth?: ClaudeOauthBlob
-  [key: string]: unknown
-}
-
-type TokenEndpointResponse = {
-  access_token?: unknown
-  expires_in?: unknown
-  refresh_token?: unknown
-  scope?: unknown
-}
-
-/**
- * Parse the `claudeAiOauth` object from a credentials JSON string.
- * Returns null when the string is not parseable or lacks the OAuth block.
- */
-export function parseClaudeOauthBlob(credentialsJson: string): ClaudeOauthBlob | null {
-  try {
-    const parsed = JSON.parse(credentialsJson) as ClaudeCredentials
-    const oauth = parsed?.claudeAiOauth
-    return oauth && typeof oauth === 'object' && !Array.isArray(oauth) ? oauth : null
-  } catch {
-    return null
-  }
-}
-
-/** Read a stored refresh token, or null when absent/blank. */
-export function readRefreshToken(credentialsJson: string): string | null {
-  const oauth = parseClaudeOauthBlob(credentialsJson)
-  const token = oauth?.refreshToken
-  return typeof token === 'string' && token.trim() !== '' ? token.trim() : null
-}
-
-/**
- * Whether the stored access token is expired or within the refresh buffer.
- *
- * A missing/non-numeric `expiresAt` is treated as "needs refresh" so a blob
- * with no usable expiry metadata still gets a proactive refresh attempt rather
- * than being trusted indefinitely. `now` is injectable for tests.
- */
-export function isOauthTokenExpiring(credentialsJson: string, now: number = Date.now()): boolean {
-  const oauth = parseClaudeOauthBlob(credentialsJson)
-  if (!oauth) {
-    return false
-  }
-  const expiresAt = oauth.expiresAt
-  if (typeof expiresAt !== 'number' || !Number.isFinite(expiresAt)) {
-    return true
-  }
-  return now + OAUTH_EXPIRY_BUFFER_MS >= expiresAt
-}
-
-/**
- * Merge a token-endpoint response into the stored credentials, returning the
- * updated credentials JSON. Preserves every field the caller already had
- * (including the refresh token when the server does not rotate it) and only
- * overwrites what the response provides. Returns null on malformed input.
- */
-export function applyRefreshedToken(
-  credentialsJson: string,
-  response: TokenEndpointResponse,
-  now: number = Date.now()
-): string | null {
-  let parsed: ClaudeCredentials
-  try {
-    parsed = JSON.parse(credentialsJson) as ClaudeCredentials
-  } catch {
-    return null
-  }
-  const accessToken = response.access_token
-  if (typeof accessToken !== 'string' || accessToken.trim() === '') {
-    return null
-  }
-  const oauth: ClaudeOauthBlob = { ...parsed.claudeAiOauth }
-  oauth.accessToken = accessToken
-  if (typeof response.expires_in === 'number' && Number.isFinite(response.expires_in)) {
-    oauth.expiresAt = now + response.expires_in * 1000
-  }
-  // Rotation: keep the existing refresh token unless the server issued a new
-  // one. Single-use refresh tokens make persisting the rotated value the whole
-  // point of owning refresh.
-  if (typeof response.refresh_token === 'string' && response.refresh_token.trim() !== '') {
-    oauth.refreshToken = response.refresh_token
-  }
-  if (typeof response.scope === 'string' && response.scope.trim() !== '') {
-    oauth.scopes = response.scope.split(' ')
-  }
-  parsed.claudeAiOauth = oauth
-  return JSON.stringify(parsed)
-}
-
-/**
- * Refresh the OAuth token for a stored credentials blob.
- *
- * Returns the updated credentials JSON (with the rotated refresh token and new
- * access token) on success, or null on any failure. Never throws — callers
- * treat null as "keep the existing credentials", so a transient network error
- * is never worse than today's behavior.
- */
-export async function refreshClaudeOauthCredentials(
-  credentialsJson: string,
-  now: number = Date.now()
-): Promise<string | null> {
-  const refreshToken = readRefreshToken(credentialsJson)
-  if (!refreshToken) {
-    return null
-  }
-
-  await ensureElectronProxyFromEnvironment({
-    proxySession: session.defaultSession,
-    probeUrl: OAUTH_TOKEN_URL
-  }).catch(() => {})
-
-  try {
-    // Why: the `claude` CLI posts grant_type=refresh_token as
-    // application/x-www-form-urlencoded with the public client id. net.fetch
-    // routes through Chromium's stack so the env proxy bridge above applies.
-    const res = await net.fetch(OAUTH_TOKEN_URL, {
-      method: 'POST',
-      headers: { 'Content-Type': 'application/x-www-form-urlencoded' },
-      body: new URLSearchParams({
-        grant_type: 'refresh_token',
-        refresh_token: refreshToken,
-        client_id: OAUTH_CLIENT_ID
-      }).toString(),
-      signal: AbortSignal.timeout(REFRESH_TIMEOUT_MS)
-    })
-    if (!res.ok) {
-      // Why: surface the status (never the token) so a throttle (429) or a
-      // dead refresh token (400/401 invalid_grant) is diagnosable in the
-      // field, instead of a silent null that looks identical to success.
-      // Callers keep the existing credentials on null — a transient 429 just
-      // means the still-valid token is reused until the next attempt.
-      console.warn(`[claude-oauth-refresh] token endpoint returned ${res.status}`)
-      return null
-    }
-    const data = (await res.json()) as TokenEndpointResponse
-    return applyRefreshedToken(credentialsJson, data, now)
-  } catch (error) {
-    console.warn(
-      '[claude-oauth-refresh] token refresh request failed:',
-      error instanceof Error ? error.message : error
-    )
-    return null
-  }
-}
diff --git a/src/main/claude-accounts/runtime-auth-path-materialization.test.ts b/src/main/claude-accounts/runtime-auth-path-materialization.test.ts
deleted file mode 100644
index dbccd87cee5e..000000000000
--- a/src/main/claude-accounts/runtime-auth-path-materialization.test.ts
+++ /dev/null
@@ -1,58 +0,0 @@
-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 { getDefaultSettings } from '../../shared/constants'
-
-const testState = {
-  fakeHomeDir: '',
-  previousConfigDir: undefined as string | undefined
-}
-
-vi.mock('electron', () => ({ app: { getPath: () => testState.fakeHomeDir } }))
-
-vi.mock('node:os', async () => {
-  // eslint-disable-next-line @typescript-eslint/consistent-type-imports -- vi.importActual requires inline import()
-  const actual = await vi.importActual<typeof import('node:os')>('node:os')
-  return { ...actual, homedir: () => testState.fakeHomeDir }
-})
-
-const { ClaudeRuntimeAuthService } = await import('./runtime-auth-service')
-
-beforeEach(() => {
-  testState.fakeHomeDir = mkdtempSync(join(tmpdir(), 'orca-claude-rate-limit-path-'))
-  testState.previousConfigDir = process.env.CLAUDE_CONFIG_DIR
-  delete process.env.CLAUDE_CONFIG_DIR
-})
-
-afterEach(() => {
-  rmSync(testState.fakeHomeDir, { recursive: true, force: true })
-  if (testState.previousConfigDir === undefined) {
-    delete process.env.CLAUDE_CONFIG_DIR
-  } else {
-    process.env.CLAUDE_CONFIG_DIR = testState.previousConfigDir
-  }
-  testState.fakeHomeDir = ''
-})
-
-describe('Claude runtime auth path materialization', () => {
-  it('does not create the config directory while preparing a background usage fetch', async () => {
-    const settings = {
-      ...getDefaultSettings(testState.fakeHomeDir),
-      disabledTuiAgents: ['claude'] as const,
-      claudeManagedAccounts: [],
-      activeClaudeManagedAccountId: null
-    }
-    const store = {
-      getSettings: vi.fn(() => settings),
-      updateSettings: vi.fn()
-    }
-    const service = new ClaudeRuntimeAuthService(store as never)
-
-    const preparation = await service.prepareForRateLimitFetch()
-
-    expect(preparation.configDir).toBe(join(testState.fakeHomeDir, '.claude'))
-    expect(preparation.provenance).toBe('system')
-    expect(existsSync(preparation.configDir)).toBe(false)
-  })
-})
diff --git a/src/main/claude-accounts/runtime-auth-service-account-switching.test.ts b/src/main/claude-accounts/runtime-auth-service-account-switching.test.ts
deleted file mode 100644
index 249e403b075b..000000000000
--- a/src/main/claude-accounts/runtime-auth-service-account-switching.test.ts
+++ /dev/null
@@ -1,509 +0,0 @@
-import {
-  cleanupRuntimeAuthTestState,
-  createClaudeAccount,
-  createClaudeCredentialsJson,
-  createClaudeCredentialsWithoutEmail,
-  createElectronMock,
-  createKeychainMock,
-  createManagedClaudeAuth,
-  createOauthRefreshMock,
-  createSettings,
-  createStore,
-  readManagedCredentialsForTest,
-  readRuntimeOauthAccountForTest,
-  resetRuntimeAuthTestState,
-  testState
-} from './runtime-auth-service-test-harness'
-import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest'
-import { readFileSync, writeFileSync } from 'node:fs'
-import { join } from 'node:path'
-
-vi.mock('electron', () => createElectronMock())
-
-vi.mock('./oauth-refresh', () => createOauthRefreshMock())
-
-vi.mock('node:os', async () => {
-  const actual = await vi.importActual<typeof import('node:os')>('node:os') // eslint-disable-line @typescript-eslint/consistent-type-imports -- vi.importActual requires inline import()
-  return {
-    ...actual,
-    homedir: () => testState.fakeHomeDir
-  }
-})
-
-vi.mock('./keychain', () => createKeychainMock())
-
-describe('ClaudeRuntimeAuthService', () => {
-  beforeEach(() => {
-    resetRuntimeAuthTestState()
-  })
-
-  afterEach(() => {
-    cleanupRuntimeAuthTestState()
-  })
-
-  it('saves a verified file refresh but refuses to overwrite unreadable keychain state', async () => {
-    const runtimeCredentialsPath = join(testState.fakeHomeDir, '.claude', '.credentials.json')
-    const originalCredentials = createClaudeCredentialsJson('user@example.com', 'original')
-    const refreshedCredentials = createClaudeCredentialsJson('user@example.com', 'refreshed')
-    const managedAuthPath = createManagedClaudeAuth(
-      testState.userDataDir,
-      'account-1',
-      originalCredentials
-    )
-    const settings = createSettings({
-      claudeManagedAccounts: [createClaudeAccount('account-1', managedAuthPath)],
-      activeClaudeManagedAccountId: 'account-1'
-    })
-    const store = createStore(settings)
-    const warn = vi.spyOn(console, 'warn').mockImplementation(() => {})
-
-    const { ClaudeRuntimeAuthService } = await import('./runtime-auth-service')
-    const service = new ClaudeRuntimeAuthService(store as never)
-    await service.syncForCurrentSelection()
-
-    writeFileSync(runtimeCredentialsPath, refreshedCredentials, 'utf-8')
-    testState.throwScopedKeychainRead = true
-    testState.throwLegacyKeychainRead = true
-    await expect(service.syncForCurrentSelection()).rejects.toThrow('scoped keychain read failed')
-
-    expect(readManagedCredentialsForTest('account-1', managedAuthPath)).toBe(refreshedCredentials)
-    expect(readFileSync(runtimeCredentialsPath, 'utf-8')).toBe(refreshedCredentials)
-    expect(testState.scopedKeychainCredentials).toBe(originalCredentials)
-    expect(testState.legacyKeychainCredentials).toBe(originalCredentials)
-    warn.mockRestore()
-  })
-
-  it('captures a fresh system-default snapshot when re-entering managed mode', async () => {
-    const runtimeCredentialsPath = join(testState.fakeHomeDir, '.claude', '.credentials.json')
-    const systemCredentials1 = createClaudeCredentialsJson('system1@example.com', 'system1')
-    const systemCredentials2 = createClaudeCredentialsJson('system2@example.com', 'system2')
-    const managedCredentials = createClaudeCredentialsJson('user@example.com', 'managed')
-    writeFileSync(runtimeCredentialsPath, systemCredentials1, 'utf-8')
-    const managedAuthPath = createManagedClaudeAuth(
-      testState.userDataDir,
-      'account-1',
-      managedCredentials
-    )
-    const settings = createSettings({
-      claudeManagedAccounts: [createClaudeAccount('account-1', managedAuthPath)],
-      activeClaudeManagedAccountId: 'account-1'
-    })
-    const store = createStore(settings)
-
-    const { ClaudeRuntimeAuthService } = await import('./runtime-auth-service')
-    const service = new ClaudeRuntimeAuthService(store as never)
-    await service.syncForCurrentSelection()
-
-    settings.activeClaudeManagedAccountId = null
-    await service.syncForCurrentSelection()
-    writeFileSync(runtimeCredentialsPath, systemCredentials2, 'utf-8')
-
-    settings.activeClaudeManagedAccountId = 'account-1'
-    await service.syncForCurrentSelection()
-    settings.activeClaudeManagedAccountId = null
-    await service.syncForCurrentSelection()
-
-    expect(readFileSync(runtimeCredentialsPath, 'utf-8')).toBe(systemCredentials2)
-  })
-
-  it('refreshes keychain and oauth snapshot surfaces when the credentials file is unchanged', async () => {
-    const runtimeCredentialsPath = join(testState.fakeHomeDir, '.claude', '.credentials.json')
-    const runtimeConfigPath = join(testState.fakeHomeDir, '.claude.json')
-    const systemCredentials1 = createClaudeCredentialsJson('system1@example.com', 'system1')
-    const systemCredentials2 = createClaudeCredentialsJson('system2@example.com', 'system2')
-    const managedCredentials = createClaudeCredentialsJson('user@example.com', 'managed')
-    const systemOauthAccount1 = { accountUuid: 'system-account-1' }
-    const systemOauthAccount2 = { accountUuid: 'system-account-2' }
-    writeFileSync(runtimeCredentialsPath, systemCredentials1, 'utf-8')
-    writeFileSync(
-      runtimeConfigPath,
-      `${JSON.stringify({ oauthAccount: systemOauthAccount1 })}\n`,
-      'utf-8'
-    )
-    testState.scopedKeychainCredentials = systemCredentials1
-    testState.legacyKeychainCredentials = systemCredentials1
-    const managedAuthPath = createManagedClaudeAuth(
-      testState.userDataDir,
-      'account-1',
-      managedCredentials
-    )
-    const settings = createSettings({
-      claudeManagedAccounts: [createClaudeAccount('account-1', managedAuthPath)]
-    })
-    const store = createStore(settings)
-
-    const { ClaudeRuntimeAuthService } = await import('./runtime-auth-service')
-    const service = new ClaudeRuntimeAuthService(store as never)
-    settings.activeClaudeManagedAccountId = 'account-1'
-    await service.syncForCurrentSelection()
-    settings.activeClaudeManagedAccountId = null
-    await service.syncForCurrentSelection()
-
-    writeFileSync(runtimeCredentialsPath, managedCredentials, 'utf-8')
-    writeFileSync(
-      runtimeConfigPath,
-      `${JSON.stringify({ oauthAccount: systemOauthAccount2 })}\n`,
-      'utf-8'
-    )
-    testState.scopedKeychainCredentials = systemCredentials2
-    testState.legacyKeychainCredentials = systemCredentials2
-    settings.activeClaudeManagedAccountId = 'account-1'
-    await service.syncForCurrentSelection()
-    settings.activeClaudeManagedAccountId = null
-    await service.syncForCurrentSelection()
-
-    expect(readFileSync(runtimeCredentialsPath, 'utf-8')).toBe(systemCredentials1)
-    expect(readRuntimeOauthAccountForTest()).toEqual(systemOauthAccount2)
-    expect(testState.scopedKeychainCredentials).toBe(systemCredentials2)
-    expect(testState.legacyKeychainCredentials).toBe(systemCredentials2)
-  })
-
-  it('reads back refreshed credentials for the outgoing Claude account before switching', async () => {
-    const runtimeCredentialsPath = join(testState.fakeHomeDir, '.claude', '.credentials.json')
-    const account1Original = createClaudeCredentialsJson('one@example.com', 'one-original')
-    const account1Refreshed = createClaudeCredentialsJson('one@example.com', 'one-refreshed')
-    const account2Credentials = createClaudeCredentialsJson('two@example.com', 'two')
-    const managedAuthPath1 = createManagedClaudeAuth(
-      testState.userDataDir,
-      'account-1',
-      account1Original
-    )
-    const managedAuthPath2 = createManagedClaudeAuth(
-      testState.userDataDir,
-      'account-2',
-      account2Credentials
-    )
-    const settings = createSettings({
-      claudeManagedAccounts: [
-        createClaudeAccount('account-1', managedAuthPath1, { email: 'one@example.com' }),
-        createClaudeAccount('account-2', managedAuthPath2, { email: 'two@example.com' })
-      ],
-      activeClaudeManagedAccountId: 'account-1'
-    })
-    const store = createStore(settings)
-
-    const { ClaudeRuntimeAuthService } = await import('./runtime-auth-service')
-    const service = new ClaudeRuntimeAuthService(store as never)
-    await service.syncForCurrentSelection()
-
-    writeFileSync(runtimeCredentialsPath, account1Refreshed, 'utf-8')
-    settings.activeClaudeManagedAccountId = 'account-2'
-    await service.syncForCurrentSelection()
-
-    expect(readManagedCredentialsForTest('account-1', managedAuthPath1)).toBe(account1Refreshed)
-    expect(readFileSync(runtimeCredentialsPath, 'utf-8')).toBe(account2Credentials)
-  })
-
-  it('switches accounts without persisting unverified live runtime credentials', async () => {
-    const runtimeCredentialsPath = join(testState.fakeHomeDir, '.claude', '.credentials.json')
-    const account1Original = createClaudeCredentialsJson('one@example.com', 'one-original', 'org-a')
-    const unverifiedLiveCredentials = createClaudeCredentialsWithoutEmail('one-live', 'org-b')
-    const account2Credentials = createClaudeCredentialsJson('two@example.com', 'two', 'org-c')
-    const managedAuthPath1 = createManagedClaudeAuth(
-      testState.userDataDir,
-      'account-1',
-      account1Original
-    )
-    const managedAuthPath2 = createManagedClaudeAuth(
-      testState.userDataDir,
-      'account-2',
-      account2Credentials
-    )
-    const settings = createSettings({
-      claudeManagedAccounts: [
-        createClaudeAccount('account-1', managedAuthPath1, {
-          email: 'one@example.com',
-          organizationUuid: 'org-a'
-        }),
-        createClaudeAccount('account-2', managedAuthPath2, {
-          email: 'two@example.com',
-          organizationUuid: 'org-c'
-        })
-      ],
-      activeClaudeManagedAccountId: 'account-1'
-    })
-    const store = createStore(settings)
-
-    const { ClaudeRuntimeAuthService } = await import('./runtime-auth-service')
-    const { markClaudePtyExited, markClaudePtySpawned } = await import('./live-pty-gate')
-    const service = new ClaudeRuntimeAuthService(store as never)
-    await service.syncForCurrentSelection()
-
-    markClaudePtySpawned('live-claude-pty')
-    try {
-      writeFileSync(runtimeCredentialsPath, unverifiedLiveCredentials, 'utf-8')
-      settings.activeClaudeManagedAccountId = 'account-2'
-
-      await service.syncForCurrentSelection()
-    } finally {
-      markClaudePtyExited('live-claude-pty')
-    }
-
-    expect(readManagedCredentialsForTest('account-1', managedAuthPath1)).toBe(account1Original)
-    expect(readFileSync(runtimeCredentialsPath, 'utf-8')).toBe(account2Credentials)
-    if (process.platform === 'darwin') {
-      expect(testState.scopedKeychainCredentials).toBe(account2Credentials)
-    }
-  })
-
-  it('routes refreshed Claude credentials to the matching managed account', async () => {
-    const runtimeCredentialsPath = join(testState.fakeHomeDir, '.claude', '.credentials.json')
-    const account1Original = createClaudeCredentialsJson('one@example.com', 'one-original')
-    const account1Refreshed = createClaudeCredentialsJson('one@example.com', 'one-refreshed')
-    const account2Credentials = createClaudeCredentialsJson('two@example.com', 'two')
-    const managedAuthPath1 = createManagedClaudeAuth(
-      testState.userDataDir,
-      'account-1',
-      account1Original
-    )
-    const managedAuthPath2 = createManagedClaudeAuth(
-      testState.userDataDir,
-      'account-2',
-      account2Credentials
-    )
-    const settings = createSettings({
-      claudeManagedAccounts: [
-        createClaudeAccount('account-1', managedAuthPath1, { email: 'one@example.com' }),
-        createClaudeAccount('account-2', managedAuthPath2, { email: 'two@example.com' })
-      ],
-      activeClaudeManagedAccountId: 'account-2'
-    })
-    const store = createStore(settings)
-
-    const { ClaudeRuntimeAuthService } = await import('./runtime-auth-service')
-    const service = new ClaudeRuntimeAuthService(store as never)
-    await service.syncForCurrentSelection()
-
-    // A stale account-1 Claude process refreshed the shared runtime file after
-    // Orca selected account-2. Persist that refresh to account-1, then restore
-    // the selected account in the shared Claude runtime credentials.
-    writeFileSync(runtimeCredentialsPath, account1Refreshed, 'utf-8')
-    testState.scopedKeychainCredentials = account1Refreshed
-    await service.syncForCurrentSelection()
-
-    expect(readManagedCredentialsForTest('account-1', managedAuthPath1)).toBe(account1Refreshed)
-    expect(readManagedCredentialsForTest('account-2', managedAuthPath2)).toBe(account2Credentials)
-    expect(readFileSync(runtimeCredentialsPath, 'utf-8')).toBe(account2Credentials)
-    if (process.platform === 'darwin') {
-      expect(testState.scopedKeychainCredentials).toBe(account2Credentials)
-      expect(testState.legacyKeychainCredentials).toBe(account2Credentials)
-    }
-  })
-
-  it('rejects stale cold-start read-back for inactive matching account', async () => {
-    const runtimeCredentialsPath = join(testState.fakeHomeDir, '.claude', '.credentials.json')
-    const account1ManagedNewer = createClaudeCredentialsJson(
-      'one@example.com',
-      'one-managed-newer',
-      null,
-      5_000
-    )
-    const account1RuntimeStale = createClaudeCredentialsJson(
-      'one@example.com',
-      'one-runtime-stale',
-      null,
-      2_000
-    )
-    const account2Credentials = createClaudeCredentialsJson('two@example.com', 'two', null, 1_000)
-    writeFileSync(runtimeCredentialsPath, account1RuntimeStale, 'utf-8')
-    const managedAuthPath1 = createManagedClaudeAuth(
-      testState.userDataDir,
-      'account-1',
-      account1ManagedNewer
-    )
-    const managedAuthPath2 = createManagedClaudeAuth(
-      testState.userDataDir,
-      'account-2',
-      account2Credentials
-    )
-    const settings = createSettings({
-      claudeManagedAccounts: [
-        createClaudeAccount('account-1', managedAuthPath1, { email: 'one@example.com' }),
-        createClaudeAccount('account-2', managedAuthPath2, { email: 'two@example.com' })
-      ],
-      activeClaudeManagedAccountId: 'account-2'
-    })
-    const store = createStore(settings)
-
-    const { ClaudeRuntimeAuthService } = await import('./runtime-auth-service')
-    const service = new ClaudeRuntimeAuthService(store as never)
-    await service.syncForCurrentSelection()
-
-    expect(readManagedCredentialsForTest('account-1', managedAuthPath1)).toBe(account1ManagedNewer)
-    expect(readManagedCredentialsForTest('account-2', managedAuthPath2)).toBe(account2Credentials)
-    expect(readFileSync(runtimeCredentialsPath, 'utf-8')).toBe(account2Credentials)
-  })
-
-  it('rejects ambiguous Claude read-back instead of choosing a managed account', async () => {
-    const runtimeCredentialsPath = join(testState.fakeHomeDir, '.claude', '.credentials.json')
-    const originalCredentials = createClaudeCredentialsJson('same@example.com', 'same-original')
-    const refreshedCredentials = createClaudeCredentialsJson('same@example.com', 'same-refreshed')
-    const activeCredentials = createClaudeCredentialsJson('active@example.com', 'active')
-    const managedAuthPath1 = createManagedClaudeAuth(
-      testState.userDataDir,
-      'account-1',
-      originalCredentials
-    )
-    const managedAuthPath2 = createManagedClaudeAuth(
-      testState.userDataDir,
-      'account-2',
-      originalCredentials
-    )
-    const managedAuthPath3 = createManagedClaudeAuth(
-      testState.userDataDir,
-      'account-3',
-      activeCredentials
-    )
-    const settings = createSettings({
-      claudeManagedAccounts: [
-        createClaudeAccount('account-1', managedAuthPath1, { email: 'same@example.com' }),
-        createClaudeAccount('account-2', managedAuthPath2, { email: 'same@example.com' }),
-        createClaudeAccount('account-3', managedAuthPath3, { email: 'active@example.com' })
-      ],
-      activeClaudeManagedAccountId: 'account-3'
-    })
-    const store = createStore(settings)
-
-    const { ClaudeRuntimeAuthService } = await import('./runtime-auth-service')
-    const service = new ClaudeRuntimeAuthService(store as never)
-    await service.syncForCurrentSelection()
-
-    writeFileSync(runtimeCredentialsPath, refreshedCredentials, 'utf-8')
-    testState.scopedKeychainCredentials = refreshedCredentials
-    await service.syncForCurrentSelection()
-
-    expect(readManagedCredentialsForTest('account-1', managedAuthPath1)).toBe(originalCredentials)
-    expect(readManagedCredentialsForTest('account-2', managedAuthPath2)).toBe(originalCredentials)
-    expect(readFileSync(runtimeCredentialsPath, 'utf-8')).toBe(activeCredentials)
-    if (process.platform === 'darwin') {
-      expect(testState.scopedKeychainCredentials).toBe(activeCredentials)
-      expect(testState.legacyKeychainCredentials).toBe(activeCredentials)
-    }
-  })
-
-  it('rejects same-email read-back when another account needs organization proof', async () => {
-    const runtimeCredentialsPath = join(testState.fakeHomeDir, '.claude', '.credentials.json')
-    const noOrgCredentials = createClaudeCredentialsJson('same@example.com', 'no-org')
-    const orgCredentials = createClaudeCredentialsJson('same@example.com', 'org', 'org-b')
-    const refreshedWithoutOrg = createClaudeCredentialsJson('same@example.com', 'refreshed')
-    const managedAuthPath1 = createManagedClaudeAuth(
-      testState.userDataDir,
-      'account-1',
-      noOrgCredentials
-    )
-    const managedAuthPath2 = createManagedClaudeAuth(
-      testState.userDataDir,
-      'account-2',
-      orgCredentials
-    )
-    const settings = createSettings({
-      claudeManagedAccounts: [
-        createClaudeAccount('account-1', managedAuthPath1, { email: 'same@example.com' }),
-        createClaudeAccount('account-2', managedAuthPath2, {
-          email: 'same@example.com',
-          organizationUuid: 'org-b'
-        })
-      ],
-      activeClaudeManagedAccountId: 'account-1'
-    })
-    const store = createStore(settings)
-
-    const { ClaudeRuntimeAuthService } = await import('./runtime-auth-service')
-    const service = new ClaudeRuntimeAuthService(store as never)
-    await service.syncForCurrentSelection()
-
-    writeFileSync(runtimeCredentialsPath, refreshedWithoutOrg, 'utf-8')
-    await service.syncForCurrentSelection()
-
-    expect(readManagedCredentialsForTest('account-1', managedAuthPath1)).toBe(noOrgCredentials)
-    expect(readManagedCredentialsForTest('account-2', managedAuthPath2)).toBe(orgCredentials)
-    expect(readFileSync(runtimeCredentialsPath, 'utf-8')).toBe(noOrgCredentials)
-  })
-
-  it('ignores unrelated org-scoped accounts when reading back no-org credentials', async () => {
-    const runtimeCredentialsPath = join(testState.fakeHomeDir, '.claude', '.credentials.json')
-    const account1Credentials = createClaudeCredentialsJson('one@example.com', 'one')
-    const account1RefreshedCredentials = createClaudeCredentialsJson(
-      'one@example.com',
-      'one-refreshed'
-    )
-    const account2Credentials = createClaudeCredentialsJson('two@example.com', 'two', 'org-b')
-    const managedAuthPath1 = createManagedClaudeAuth(
-      testState.userDataDir,
-      'account-1',
-      account1Credentials
-    )
-    const managedAuthPath2 = createManagedClaudeAuth(
-      testState.userDataDir,
-      'account-2',
-      account2Credentials
-    )
-    const settings = createSettings({
-      claudeManagedAccounts: [
-        createClaudeAccount('account-1', managedAuthPath1, { email: 'one@example.com' }),
-        createClaudeAccount('account-2', managedAuthPath2, {
-          email: 'two@example.com',
-          organizationUuid: 'org-b'
-        })
-      ],
-      activeClaudeManagedAccountId: 'account-1'
-    })
-    const store = createStore(settings)
-
-    const { ClaudeRuntimeAuthService } = await import('./runtime-auth-service')
-    const service = new ClaudeRuntimeAuthService(store as never)
-    await service.syncForCurrentSelection()
-
-    writeFileSync(runtimeCredentialsPath, account1RefreshedCredentials, 'utf-8')
-    await service.syncForCurrentSelection()
-
-    expect(readManagedCredentialsForTest('account-1', managedAuthPath1)).toBe(
-      account1RefreshedCredentials
-    )
-    expect(readManagedCredentialsForTest('account-2', managedAuthPath2)).toBe(account2Credentials)
-    expect(readFileSync(runtimeCredentialsPath, 'utf-8')).toBe(account1RefreshedCredentials)
-  })
-
-  it('rejects same-email read-back with conflicting organization for no-org accounts', async () => {
-    const runtimeCredentialsPath = join(testState.fakeHomeDir, '.claude', '.credentials.json')
-    const noOrgCredentials = createClaudeCredentialsJson('same@example.com', 'no-org')
-    const orgCredentials = createClaudeCredentialsJson('same@example.com', 'org', 'org-b')
-    const conflictingOrgCredentials = createClaudeCredentialsJson(
-      'same@example.com',
-      'conflicting-org',
-      'org-c'
-    )
-    const managedAuthPath1 = createManagedClaudeAuth(
-      testState.userDataDir,
-      'account-1',
-      noOrgCredentials
-    )
-    const managedAuthPath2 = createManagedClaudeAuth(
-      testState.userDataDir,
-      'account-2',
-      orgCredentials
-    )
-    const settings = createSettings({
-      claudeManagedAccounts: [
-        createClaudeAccount('account-1', managedAuthPath1, { email: 'same@example.com' }),
-        createClaudeAccount('account-2', managedAuthPath2, {
-          email: 'same@example.com',
-          organizationUuid: 'org-b'
-        })
-      ],
-      activeClaudeManagedAccountId: 'account-1'
-    })
-    const store = createStore(settings)
-
-    const { ClaudeRuntimeAuthService } = await import('./runtime-auth-service')
-    const service = new ClaudeRuntimeAuthService(store as never)
-    await service.syncForCurrentSelection()
-
-    writeFileSync(runtimeCredentialsPath, conflictingOrgCredentials, 'utf-8')
-    await service.syncForCurrentSelection()
-
-    expect(readManagedCredentialsForTest('account-1', managedAuthPath1)).toBe(noOrgCredentials)
-    expect(readManagedCredentialsForTest('account-2', managedAuthPath2)).toBe(orgCredentials)
-    expect(readFileSync(runtimeCredentialsPath, 'utf-8')).toBe(noOrgCredentials)
-  })
-})
diff --git a/src/main/claude-accounts/runtime-auth-service-deselect-restore.test.ts b/src/main/claude-accounts/runtime-auth-service-deselect-restore.test.ts
deleted file mode 100644
index efd650618b41..000000000000
--- a/src/main/claude-accounts/runtime-auth-service-deselect-restore.test.ts
+++ /dev/null
@@ -1,611 +0,0 @@
-import {
-  cleanupRuntimeAuthTestState,
-  createClaudeAccount,
-  createClaudeCredentialsJson,
-  createClaudeCredentialsWithoutEmail,
-  createElectronMock,
-  createKeychainMock,
-  createManagedClaudeAuth,
-  createOauthRefreshMock,
-  createSettings,
-  createStore,
-  readManagedCredentialsForTest,
-  readRuntimeOauthAccountForTest,
-  resetRuntimeAuthTestState,
-  setPlatform,
-  testState
-} from './runtime-auth-service-test-harness'
-import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest'
-import { existsSync, mkdirSync, readFileSync, rmSync, writeFileSync } from 'node:fs'
-import { join } from 'node:path'
-
-vi.mock('electron', () => createElectronMock())
-
-vi.mock('./oauth-refresh', () => createOauthRefreshMock())
-
-vi.mock('node:os', async () => {
-  const actual = await vi.importActual<typeof import('node:os')>('node:os') // eslint-disable-line @typescript-eslint/consistent-type-imports -- vi.importActual requires inline import()
-  return {
-    ...actual,
-    homedir: () => testState.fakeHomeDir
-  }
-})
-
-vi.mock('./keychain', () => createKeychainMock())
-
-describe('ClaudeRuntimeAuthService', () => {
-  beforeEach(() => {
-    resetRuntimeAuthTestState()
-  })
-
-  afterEach(() => {
-    cleanupRuntimeAuthTestState()
-  })
-
-  it('restores the system default after rejecting unverifiable managed credentials', async () => {
-    const runtimeCredentialsPath = join(testState.fakeHomeDir, '.claude', '.credentials.json')
-    const systemCredentials = createClaudeCredentialsJson('system@example.com', 'system')
-    writeFileSync(runtimeCredentialsPath, systemCredentials, 'utf-8')
-    const originalCredentials = createClaudeCredentialsWithoutEmail('original')
-    const refreshedCredentials = createClaudeCredentialsWithoutEmail('refreshed')
-    const managedAuthPath = createManagedClaudeAuth(
-      testState.userDataDir,
-      'account-1',
-      originalCredentials
-    )
-    const settings = createSettings({
-      claudeManagedAccounts: [createClaudeAccount('account-1', managedAuthPath)]
-    })
-    const store = createStore(settings)
-
-    const { ClaudeRuntimeAuthService } = await import('./runtime-auth-service')
-    const service = new ClaudeRuntimeAuthService(store as never)
-    settings.activeClaudeManagedAccountId = 'account-1'
-    await service.syncForCurrentSelection()
-
-    writeFileSync(runtimeCredentialsPath, refreshedCredentials, 'utf-8')
-    await service.syncForCurrentSelection()
-
-    settings.activeClaudeManagedAccountId = null
-    await service.syncForCurrentSelection()
-
-    expect(readFileSync(runtimeCredentialsPath, 'utf-8')).toBe(systemCredentials)
-  })
-
-  it('restores system default after same-identity managed Claude refresh on deselect', async () => {
-    const runtimeCredentialsPath = join(testState.fakeHomeDir, '.claude', '.credentials.json')
-    const systemCredentials = createClaudeCredentialsJson('system@example.com', 'system')
-    const managedCredentials = createClaudeCredentialsJson('user@example.com', 'managed', 'org-1')
-    const externalCredentials = createClaudeCredentialsJson('user@example.com', 'external', 'org-1')
-    writeFileSync(runtimeCredentialsPath, systemCredentials, 'utf-8')
-    const managedAuthPath = createManagedClaudeAuth(
-      testState.userDataDir,
-      'account-1',
-      managedCredentials
-    )
-    const settings = createSettings({
-      claudeManagedAccounts: [
-        createClaudeAccount('account-1', managedAuthPath, {
-          organizationUuid: 'org-1'
-        })
-      ]
-    })
-    const store = createStore(settings)
-
-    const { ClaudeRuntimeAuthService } = await import('./runtime-auth-service')
-    const service = new ClaudeRuntimeAuthService(store as never)
-    settings.activeClaudeManagedAccountId = 'account-1'
-    await service.syncForCurrentSelection()
-
-    writeFileSync(runtimeCredentialsPath, externalCredentials, 'utf-8')
-    settings.activeClaudeManagedAccountId = null
-    await service.syncForCurrentSelection()
-
-    expect(readManagedCredentialsForTest('account-1', managedAuthPath)).toBe(externalCredentials)
-    expect(readFileSync(runtimeCredentialsPath, 'utf-8')).toBe(systemCredentials)
-  })
-
-  it('preserves external stale Claude credentials without writing them to managed storage', async () => {
-    const runtimeCredentialsPath = join(testState.fakeHomeDir, '.claude', '.credentials.json')
-    const systemCredentials = createClaudeCredentialsJson('system@example.com', 'system')
-    const selectedCredentials = createClaudeCredentialsJson('selected@example.com', 'selected')
-    const staleCredentials = createClaudeCredentialsJson('stale@example.com', 'stale')
-    writeFileSync(runtimeCredentialsPath, systemCredentials, 'utf-8')
-    testState.scopedKeychainCredentials = systemCredentials
-    testState.legacyKeychainCredentials = systemCredentials
-    const managedAuthPath = createManagedClaudeAuth(
-      testState.userDataDir,
-      'account-1',
-      selectedCredentials
-    )
-    const settings = createSettings({
-      claudeManagedAccounts: [
-        createClaudeAccount('account-1', managedAuthPath, { email: 'selected@example.com' })
-      ]
-    })
-    const store = createStore(settings)
-
-    const { ClaudeRuntimeAuthService } = await import('./runtime-auth-service')
-    const service = new ClaudeRuntimeAuthService(store as never)
-    settings.activeClaudeManagedAccountId = 'account-1'
-    await service.syncForCurrentSelection()
-
-    writeFileSync(runtimeCredentialsPath, staleCredentials, 'utf-8')
-    settings.activeClaudeManagedAccountId = null
-    await service.syncForCurrentSelection()
-
-    expect(readManagedCredentialsForTest('account-1', managedAuthPath)).toBe(selectedCredentials)
-    expect(readFileSync(runtimeCredentialsPath, 'utf-8')).toBe(staleCredentials)
-    expect(testState.scopedKeychainCredentials).toBe(systemCredentials)
-    expect(testState.legacyKeychainCredentials).toBe(systemCredentials)
-  })
-
-  it('does not persist unverifiable stale Claude credentials into another active account', async () => {
-    const runtimeCredentialsPath = join(testState.fakeHomeDir, '.claude', '.credentials.json')
-    const account1Credentials = createClaudeCredentialsJson('one@example.com', 'one')
-    const account2Credentials = createClaudeCredentialsJson('two@example.com', 'two')
-    const staleUnverifiableCredentials = createClaudeCredentialsWithoutEmail('stale')
-    const managedAuthPath1 = createManagedClaudeAuth(
-      testState.userDataDir,
-      'account-1',
-      account1Credentials
-    )
-    const managedAuthPath2 = createManagedClaudeAuth(
-      testState.userDataDir,
-      'account-2',
-      account2Credentials
-    )
-    const settings = createSettings({
-      claudeManagedAccounts: [
-        createClaudeAccount('account-1', managedAuthPath1, { email: 'one@example.com' }),
-        createClaudeAccount('account-2', managedAuthPath2, { email: 'two@example.com' })
-      ],
-      activeClaudeManagedAccountId: 'account-1'
-    })
-    const store = createStore(settings)
-
-    const { ClaudeRuntimeAuthService } = await import('./runtime-auth-service')
-    const service = new ClaudeRuntimeAuthService(store as never)
-    await service.syncForCurrentSelection()
-
-    settings.activeClaudeManagedAccountId = 'account-2'
-    await service.syncForCurrentSelection()
-    writeFileSync(runtimeCredentialsPath, staleUnverifiableCredentials, 'utf-8')
-    await service.syncForCurrentSelection()
-
-    expect(readManagedCredentialsForTest('account-2', managedAuthPath2)).toBe(account2Credentials)
-    expect(readFileSync(runtimeCredentialsPath, 'utf-8')).toBe(account2Credentials)
-  })
-
-  it('materializes only the selected managed account into shared Claude runtime files', async () => {
-    setPlatform('linux')
-    const runtimeCredentialsPath = join(testState.fakeHomeDir, '.claude', '.credentials.json')
-    const account1Credentials = createClaudeCredentialsJson('one@example.com', 'one-token')
-    const account2Credentials = createClaudeCredentialsJson('two@example.com', 'two-token')
-    const account1Oauth = '{"accountUuid":"account-1","emailAddress":"one@example.com"}\n'
-    const account2Oauth = '{"accountUuid":"account-2","emailAddress":"two@example.com"}\n'
-    const managedAuthPath1 = createManagedClaudeAuth(
-      testState.userDataDir,
-      'account-1',
-      account1Credentials,
-      account1Oauth
-    )
-    const managedAuthPath2 = createManagedClaudeAuth(
-      testState.userDataDir,
-      'account-2',
-      account2Credentials,
-      account2Oauth
-    )
-    const settings = createSettings({
-      claudeManagedAccounts: [
-        createClaudeAccount('account-1', managedAuthPath1, { email: 'one@example.com' }),
-        createClaudeAccount('account-2', managedAuthPath2, { email: 'two@example.com' })
-      ],
-      activeClaudeManagedAccountId: 'account-1'
-    })
-    const store = createStore(settings)
-
-    const { ClaudeRuntimeAuthService } = await import('./runtime-auth-service')
-    const service = new ClaudeRuntimeAuthService(store as never)
-
-    await service.syncForCurrentSelection()
-    expect(readFileSync(runtimeCredentialsPath, 'utf-8')).toBe(account1Credentials)
-    expect(readRuntimeOauthAccountForTest()).toEqual({
-      accountUuid: 'account-1',
-      emailAddress: 'one@example.com'
-    })
-
-    settings.activeClaudeManagedAccountId = 'account-2'
-    await service.syncForCurrentSelection()
-    expect(readFileSync(runtimeCredentialsPath, 'utf-8')).toBe(account2Credentials)
-    expect(readRuntimeOauthAccountForTest()).toEqual({
-      accountUuid: 'account-2',
-      emailAddress: 'two@example.com'
-    })
-
-    settings.activeClaudeManagedAccountId = 'account-1'
-    await service.syncForCurrentSelection()
-    expect(readFileSync(runtimeCredentialsPath, 'utf-8')).toBe(account1Credentials)
-    expect(readRuntimeOauthAccountForTest()).toEqual({
-      accountUuid: 'account-1',
-      emailAddress: 'one@example.com'
-    })
-
-    // Why: switching rewrites only the shared Claude runtime surface; the
-    // managed account files remain per-account sources of truth.
-    expect(readFileSync(join(managedAuthPath1, '.credentials.json'), 'utf-8')).toBe(
-      account1Credentials
-    )
-    expect(readFileSync(join(managedAuthPath2, '.credentials.json'), 'utf-8')).toBe(
-      account2Credentials
-    )
-    expect(readFileSync(join(managedAuthPath1, 'oauth-account.json'), 'utf-8')).toBe(account1Oauth)
-    expect(readFileSync(join(managedAuthPath2, 'oauth-account.json'), 'utf-8')).toBe(account2Oauth)
-  })
-
-  it('does not carry the reauth read-back skip across Claude account switches', async () => {
-    const runtimeCredentialsPath = join(testState.fakeHomeDir, '.claude', '.credentials.json')
-    const account1Credentials = createClaudeCredentialsJson('one@example.com', 'one')
-    const account2Credentials = createClaudeCredentialsJson('two@example.com', 'two')
-    const account2RefreshedCredentials = createClaudeCredentialsJson(
-      'two@example.com',
-      'two-refreshed'
-    )
-    const managedAuthPath1 = createManagedClaudeAuth(
-      testState.userDataDir,
-      'account-1',
-      account1Credentials
-    )
-    const managedAuthPath2 = createManagedClaudeAuth(
-      testState.userDataDir,
-      'account-2',
-      account2Credentials
-    )
-    const settings = createSettings({
-      claudeManagedAccounts: [
-        createClaudeAccount('account-1', managedAuthPath1, { email: 'one@example.com' }),
-        createClaudeAccount('account-2', managedAuthPath2, { email: 'two@example.com' })
-      ],
-      activeClaudeManagedAccountId: 'account-1'
-    })
-    const store = createStore(settings)
-
-    const { ClaudeRuntimeAuthService } = await import('./runtime-auth-service')
-    const service = new ClaudeRuntimeAuthService(store as never)
-    await service.syncForCurrentSelection()
-
-    service.clearLastWrittenCredentialsJson()
-    settings.activeClaudeManagedAccountId = 'account-2'
-    await service.syncForCurrentSelection()
-
-    writeFileSync(runtimeCredentialsPath, account2RefreshedCredentials, 'utf-8')
-    await service.syncForCurrentSelection()
-
-    expect(readManagedCredentialsForTest('account-2', managedAuthPath2)).toBe(
-      account2RefreshedCredentials
-    )
-    expect(readFileSync(runtimeCredentialsPath, 'utf-8')).toBe(account2RefreshedCredentials)
-  })
-
-  it('does not apply inactive-account Claude reauth skip to the active account', async () => {
-    const runtimeCredentialsPath = join(testState.fakeHomeDir, '.claude', '.credentials.json')
-    const account1Credentials = createClaudeCredentialsJson('one@example.com', 'one')
-    const account1RefreshedCredentials = createClaudeCredentialsJson(
-      'one@example.com',
-      'one-refreshed'
-    )
-    const account2Credentials = createClaudeCredentialsJson('two@example.com', 'two')
-    const managedAuthPath1 = createManagedClaudeAuth(
-      testState.userDataDir,
-      'account-1',
-      account1Credentials
-    )
-    const managedAuthPath2 = createManagedClaudeAuth(
-      testState.userDataDir,
-      'account-2',
-      account2Credentials
-    )
-    const settings = createSettings({
-      claudeManagedAccounts: [
-        createClaudeAccount('account-1', managedAuthPath1, { email: 'one@example.com' }),
-        createClaudeAccount('account-2', managedAuthPath2, { email: 'two@example.com' })
-      ],
-      activeClaudeManagedAccountId: 'account-1'
-    })
-    const store = createStore(settings)
-
-    const { ClaudeRuntimeAuthService } = await import('./runtime-auth-service')
-    const service = new ClaudeRuntimeAuthService(store as never)
-    await service.syncForCurrentSelection()
-
-    writeFileSync(runtimeCredentialsPath, account1RefreshedCredentials, 'utf-8')
-    service.clearLastWrittenCredentialsJson('account-2')
-    await service.syncForCurrentSelection()
-
-    expect(readManagedCredentialsForTest('account-1', managedAuthPath1)).toBe(
-      account1RefreshedCredentials
-    )
-    expect(readFileSync(runtimeCredentialsPath, 'utf-8')).toBe(account1RefreshedCredentials)
-  })
-
-  it('keeps external Claude logout when deselecting managed account', async () => {
-    const runtimeCredentialsPath = join(testState.fakeHomeDir, '.claude', '.credentials.json')
-    const systemCredentials = createClaudeCredentialsJson('system@example.com', 'system')
-    const managedCredentials = createClaudeCredentialsJson('user@example.com', 'managed')
-    writeFileSync(runtimeCredentialsPath, systemCredentials, 'utf-8')
-    const managedAuthPath = createManagedClaudeAuth(
-      testState.userDataDir,
-      'account-1',
-      managedCredentials
-    )
-    const settings = createSettings({
-      claudeManagedAccounts: [createClaudeAccount('account-1', managedAuthPath)]
-    })
-    const store = createStore(settings)
-
-    const { ClaudeRuntimeAuthService } = await import('./runtime-auth-service')
-    const service = new ClaudeRuntimeAuthService(store as never)
-    settings.activeClaudeManagedAccountId = 'account-1'
-    await service.syncForCurrentSelection()
-
-    rmSync(runtimeCredentialsPath, { force: true })
-    testState.activeKeychainCredentials = null
-    testState.scopedKeychainCredentials = null
-    testState.legacyKeychainCredentials = null
-    settings.activeClaudeManagedAccountId = null
-    await service.syncForCurrentSelection()
-
-    expect(existsSync(runtimeCredentialsPath)).toBe(false)
-    expect(testState.scopedKeychainCredentials).toBeNull()
-    expect(testState.legacyKeychainCredentials).toBeNull()
-  })
-
-  it('preserves unknown runtime auth when invalid active account has no ownership proof', async () => {
-    const runtimeCredentialsPath = join(testState.fakeHomeDir, '.claude', '.credentials.json')
-    const runtimeConfigPath = join(testState.fakeHomeDir, '.claude.json')
-    const snapshotPath = join(
-      testState.userDataDir,
-      'claude-runtime-auth',
-      'system-default-auth.json'
-    )
-    const systemCredentials = createClaudeCredentialsJson('system@example.com', 'system')
-    const staleManagedCredentials = createClaudeCredentialsJson('managed@example.com', 'managed')
-    const systemOauthAccount = { accountUuid: 'system-account' }
-    mkdirSync(join(testState.userDataDir, 'claude-runtime-auth'), { recursive: true })
-    writeFileSync(
-      snapshotPath,
-      `${JSON.stringify({
-        credentialsJson: systemCredentials,
-        configOauthAccount: systemOauthAccount,
-        keychainCredentialsJson: systemCredentials,
-        scopedKeychainCredentialsJson: systemCredentials,
-        legacyKeychainCredentialsJson: systemCredentials,
-        capturedAt: Date.now()
-      })}\n`,
-      'utf-8'
-    )
-    writeFileSync(runtimeCredentialsPath, staleManagedCredentials, 'utf-8')
-    writeFileSync(
-      runtimeConfigPath,
-      `${JSON.stringify({ oauthAccount: { accountUuid: 'missing-account' } })}\n`,
-      'utf-8'
-    )
-    testState.scopedKeychainCredentials = staleManagedCredentials
-    testState.legacyKeychainCredentials = staleManagedCredentials
-    const settings = createSettings({
-      activeClaudeManagedAccountId: 'missing-account'
-    })
-    const store = createStore(settings)
-
-    const { ClaudeRuntimeAuthService } = await import('./runtime-auth-service')
-    const service = new ClaudeRuntimeAuthService(store as never)
-    const preparation = await service.prepareForClaudeLaunch()
-
-    expect(store.updateSettings).toHaveBeenCalledWith({
-      activeClaudeManagedAccountId: null,
-      activeClaudeManagedAccountIdsByRuntime: { host: null, wsl: {} }
-    })
-    expect(preparation.configDir).toBe(join(testState.fakeHomeDir, '.claude'))
-    expect(preparation.stripAuthEnv).toBe(false)
-    expect(preparation.provenance).toBe('system')
-    expect(readFileSync(runtimeCredentialsPath, 'utf-8')).toBe(staleManagedCredentials)
-    expect(readRuntimeOauthAccountForTest()).toEqual({ accountUuid: 'missing-account' })
-    expect(testState.scopedKeychainCredentials).toBe(staleManagedCredentials)
-    expect(testState.legacyKeychainCredentials).toBe(staleManagedCredentials)
-  })
-
-  it('restores system snapshot when active account credentials are missing but runtime matches account', async () => {
-    const runtimeCredentialsPath = join(testState.fakeHomeDir, '.claude', '.credentials.json')
-    const runtimeConfigPath = join(testState.fakeHomeDir, '.claude.json')
-    const snapshotPath = join(
-      testState.userDataDir,
-      'claude-runtime-auth',
-      'system-default-auth.json'
-    )
-    const systemCredentials = createClaudeCredentialsJson('system@example.com', 'system')
-    const staleManagedCredentials = createClaudeCredentialsJson('managed@example.com', 'managed')
-    const systemOauthAccount = { accountUuid: 'system-account' }
-    const managedAuthPath = join(testState.userDataDir, 'claude-accounts', 'account-1', 'auth')
-    mkdirSync(join(testState.userDataDir, 'claude-runtime-auth'), { recursive: true })
-    mkdirSync(managedAuthPath, { recursive: true })
-    writeFileSync(join(managedAuthPath, '.orca-managed-claude-auth'), 'account-1\n', 'utf-8')
-    writeFileSync(
-      snapshotPath,
-      `${JSON.stringify({
-        credentialsJson: systemCredentials,
-        configOauthAccount: systemOauthAccount,
-        keychainCredentialsJson: systemCredentials,
-        scopedKeychainCredentialsJson: systemCredentials,
-        legacyKeychainCredentialsJson: systemCredentials,
-        capturedAt: Date.now()
-      })}\n`,
-      'utf-8'
-    )
-    writeFileSync(runtimeCredentialsPath, staleManagedCredentials, 'utf-8')
-    writeFileSync(
-      runtimeConfigPath,
-      `${JSON.stringify({ oauthAccount: { accountUuid: 'account-1' } })}\n`,
-      'utf-8'
-    )
-    testState.scopedKeychainCredentials = staleManagedCredentials
-    testState.legacyKeychainCredentials = staleManagedCredentials
-    const settings = createSettings({
-      claudeManagedAccounts: [
-        createClaudeAccount('account-1', managedAuthPath, { email: 'managed@example.com' })
-      ],
-      activeClaudeManagedAccountId: 'account-1'
-    })
-    const store = createStore(settings)
-
-    const { ClaudeRuntimeAuthService } = await import('./runtime-auth-service')
-    const service = new ClaudeRuntimeAuthService(store as never)
-    const preparation = await service.prepareForClaudeLaunch()
-
-    expect(preparation.provenance).toBe('system')
-    expect(readFileSync(runtimeCredentialsPath, 'utf-8')).toBe(staleManagedCredentials)
-    expect(readRuntimeOauthAccountForTest()).toEqual({ accountUuid: 'account-1' })
-    expect(testState.scopedKeychainCredentials).toBe(staleManagedCredentials)
-    expect(testState.legacyKeychainCredentials).toBe(staleManagedCredentials)
-  })
-
-  it('keeps missing-managed selection until cleanup can retry after keychain failure', async () => {
-    const runtimeCredentialsPath = join(testState.fakeHomeDir, '.claude', '.credentials.json')
-    const runtimeConfigPath = join(testState.fakeHomeDir, '.claude.json')
-    const snapshotPath = join(
-      testState.userDataDir,
-      'claude-runtime-auth',
-      'system-default-auth.json'
-    )
-    const systemCredentials = createClaudeCredentialsJson('system@example.com', 'system')
-    const staleManagedCredentials = createClaudeCredentialsJson('managed@example.com', 'managed')
-    const systemOauthAccount = { accountUuid: 'system-account' }
-    const managedAuthPath = join(testState.userDataDir, 'claude-accounts', 'account-1', 'auth')
-    mkdirSync(join(testState.userDataDir, 'claude-runtime-auth'), { recursive: true })
-    mkdirSync(managedAuthPath, { recursive: true })
-    writeFileSync(join(managedAuthPath, '.orca-managed-claude-auth'), 'account-1\n', 'utf-8')
-    writeFileSync(
-      snapshotPath,
-      `${JSON.stringify({
-        credentialsJson: systemCredentials,
-        configOauthAccount: systemOauthAccount,
-        keychainCredentialsJson: systemCredentials,
-        scopedKeychainCredentialsJson: systemCredentials,
-        legacyKeychainCredentialsJson: systemCredentials,
-        capturedAt: Date.now()
-      })}\n`,
-      'utf-8'
-    )
-    writeFileSync(runtimeCredentialsPath, staleManagedCredentials, 'utf-8')
-    writeFileSync(
-      runtimeConfigPath,
-      `${JSON.stringify({ oauthAccount: { accountUuid: 'account-1' } })}\n`,
-      'utf-8'
-    )
-    testState.scopedKeychainCredentials = staleManagedCredentials
-    testState.legacyKeychainCredentials = staleManagedCredentials
-    const settings = createSettings({
-      claudeManagedAccounts: [
-        createClaudeAccount('account-1', managedAuthPath, { email: 'managed@example.com' })
-      ],
-      activeClaudeManagedAccountId: 'account-1'
-    })
-    const store = createStore(settings)
-
-    const { ClaudeRuntimeAuthService } = await import('./runtime-auth-service')
-    const service = new ClaudeRuntimeAuthService(store as never)
-    testState.throwScopedKeychainWrite = true
-    const failedPreparation = await service.prepareForClaudeLaunch()
-
-    expect(failedPreparation.provenance).toBe('system')
-    expect(store.getSettings().activeClaudeManagedAccountId).toBeNull()
-    expect(readFileSync(runtimeCredentialsPath, 'utf-8')).toBe(staleManagedCredentials)
-    expect(readRuntimeOauthAccountForTest()).toEqual({ accountUuid: 'account-1' })
-    expect(testState.scopedKeychainCredentials).toBe(staleManagedCredentials)
-
-    testState.throwScopedKeychainWrite = false
-    const preparation = await service.prepareForClaudeLaunch()
-
-    expect(preparation.provenance).toBe('system')
-    expect(store.getSettings().activeClaudeManagedAccountId).toBeNull()
-    expect(testState.scopedKeychainCredentials).toBe(staleManagedCredentials)
-    expect(testState.legacyKeychainCredentials).toBe(staleManagedCredentials)
-  })
-
-  it('restores missing-managed oauth metadata when only keychain proves ownership', async () => {
-    const runtimeConfigPath = join(testState.fakeHomeDir, '.claude.json')
-    const snapshotPath = join(
-      testState.userDataDir,
-      'claude-runtime-auth',
-      'system-default-auth.json'
-    )
-    const systemCredentials = createClaudeCredentialsJson('system@example.com', 'system')
-    const staleManagedCredentials = createClaudeCredentialsJson('managed@example.com', 'managed')
-    const systemOauthAccount = { accountUuid: 'system-account' }
-    const managedAuthPath = join(testState.userDataDir, 'claude-accounts', 'account-1', 'auth')
-    mkdirSync(join(testState.userDataDir, 'claude-runtime-auth'), { recursive: true })
-    mkdirSync(managedAuthPath, { recursive: true })
-    writeFileSync(join(managedAuthPath, '.orca-managed-claude-auth'), 'account-1\n', 'utf-8')
-    writeFileSync(
-      snapshotPath,
-      `${JSON.stringify({
-        credentialsJson: systemCredentials,
-        configOauthAccount: systemOauthAccount,
-        keychainCredentialsJson: systemCredentials,
-        scopedKeychainCredentialsJson: systemCredentials,
-        legacyKeychainCredentialsJson: systemCredentials,
-        capturedAt: Date.now()
-      })}\n`,
-      'utf-8'
-    )
-    writeFileSync(
-      runtimeConfigPath,
-      `${JSON.stringify({ oauthAccount: { accountUuid: 'account-1' } })}\n`,
-      'utf-8'
-    )
-    testState.scopedKeychainCredentials = staleManagedCredentials
-    testState.legacyKeychainCredentials = staleManagedCredentials
-    const settings = createSettings({
-      claudeManagedAccounts: [
-        createClaudeAccount('account-1', managedAuthPath, { email: 'managed@example.com' })
-      ],
-      activeClaudeManagedAccountId: 'account-1'
-    })
-    const store = createStore(settings)
-
-    const { ClaudeRuntimeAuthService } = await import('./runtime-auth-service')
-    const service = new ClaudeRuntimeAuthService(store as never)
-    await service.prepareForClaudeLaunch()
-
-    expect(readRuntimeOauthAccountForTest()).toEqual({ accountUuid: 'account-1' })
-    expect(testState.scopedKeychainCredentials).toBe(staleManagedCredentials)
-    expect(testState.legacyKeychainCredentials).toBe(staleManagedCredentials)
-  })
-
-  it('preserves unknown runtime auth when invalid active account has no system snapshot', async () => {
-    const runtimeCredentialsPath = join(testState.fakeHomeDir, '.claude', '.credentials.json')
-    const runtimeConfigPath = join(testState.fakeHomeDir, '.claude.json')
-    const staleManagedCredentials = createClaudeCredentialsJson('managed@example.com', 'managed')
-    writeFileSync(runtimeCredentialsPath, staleManagedCredentials, 'utf-8')
-    writeFileSync(
-      runtimeConfigPath,
-      `${JSON.stringify({ oauthAccount: { accountUuid: 'missing-account' } })}\n`,
-      'utf-8'
-    )
-    testState.scopedKeychainCredentials = staleManagedCredentials
-    testState.legacyKeychainCredentials = staleManagedCredentials
-    const settings = createSettings({
-      activeClaudeManagedAccountId: 'missing-account'
-    })
-    const store = createStore(settings)
-
-    const { ClaudeRuntimeAuthService } = await import('./runtime-auth-service')
-    const service = new ClaudeRuntimeAuthService(store as never)
-    const preparation = await service.prepareForClaudeLaunch()
-
-    expect(preparation.provenance).toBe('system')
-    expect(readFileSync(runtimeCredentialsPath, 'utf-8')).toBe(staleManagedCredentials)
-    expect(readRuntimeOauthAccountForTest()).toEqual({ accountUuid: 'missing-account' })
-    expect(testState.scopedKeychainCredentials).toBe(staleManagedCredentials)
-    expect(testState.legacyKeychainCredentials).toBe(staleManagedCredentials)
-  })
-})
diff --git a/src/main/claude-accounts/runtime-auth-service-keychain-snapshots.test.ts b/src/main/claude-accounts/runtime-auth-service-keychain-snapshots.test.ts
deleted file mode 100644
index 7a80c5be002a..000000000000
--- a/src/main/claude-accounts/runtime-auth-service-keychain-snapshots.test.ts
+++ /dev/null
@@ -1,712 +0,0 @@
-import {
-  cleanupRuntimeAuthTestState,
-  createClaudeAccount,
-  createClaudeCredentialsJson,
-  createElectronMock,
-  createKeychainMock,
-  createManagedClaudeAuth,
-  createOauthRefreshMock,
-  createSettings,
-  createStore,
-  expectedRuntimeConfigDir,
-  readManagedCredentialsForTest,
-  readRuntimeOauthAccountForTest,
-  resetRuntimeAuthTestState,
-  testState
-} from './runtime-auth-service-test-harness'
-import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest'
-import { mkdirSync, readFileSync, writeFileSync } from 'node:fs'
-import { join } from 'node:path'
-
-vi.mock('electron', () => createElectronMock())
-
-vi.mock('./oauth-refresh', () => createOauthRefreshMock())
-
-vi.mock('node:os', async () => {
-  const actual = await vi.importActual<typeof import('node:os')>('node:os') // eslint-disable-line @typescript-eslint/consistent-type-imports -- vi.importActual requires inline import()
-  return {
-    ...actual,
-    homedir: () => testState.fakeHomeDir
-  }
-})
-
-vi.mock('./keychain', () => createKeychainMock())
-
-describe('ClaudeRuntimeAuthService', () => {
-  beforeEach(() => {
-    resetRuntimeAuthTestState()
-  })
-
-  afterEach(() => {
-    cleanupRuntimeAuthTestState()
-  })
-
-  it('reads back refreshed active keychain credentials on macOS', async () => {
-    if (process.platform !== 'darwin') {
-      return
-    }
-
-    const runtimeCredentialsPath = join(testState.fakeHomeDir, '.claude', '.credentials.json')
-    const originalCredentials = createClaudeCredentialsJson('user@example.com', 'original')
-    const refreshedCredentials = createClaudeCredentialsJson('user@example.com', 'refreshed')
-    const managedAuthPath = createManagedClaudeAuth(
-      testState.userDataDir,
-      'account-1',
-      originalCredentials
-    )
-    const settings = createSettings({
-      claudeManagedAccounts: [createClaudeAccount('account-1', managedAuthPath)],
-      activeClaudeManagedAccountId: 'account-1'
-    })
-    const store = createStore(settings)
-
-    const { ClaudeRuntimeAuthService } = await import('./runtime-auth-service')
-    const service = new ClaudeRuntimeAuthService(store as never)
-    await service.syncForCurrentSelection()
-
-    testState.scopedKeychainCredentials = refreshedCredentials
-    await service.syncForCurrentSelection()
-
-    expect(readManagedCredentialsForTest('account-1', managedAuthPath)).toBe(refreshedCredentials)
-    expect(readFileSync(runtimeCredentialsPath, 'utf-8')).toBe(refreshedCredentials)
-  })
-
-  it('reads back refreshed legacy keychain credentials on old Claude Code builds', async () => {
-    if (process.platform !== 'darwin') {
-      return
-    }
-
-    const runtimeCredentialsPath = join(testState.fakeHomeDir, '.claude', '.credentials.json')
-    const originalCredentials = createClaudeCredentialsJson('user@example.com', 'original')
-    const refreshedCredentials = createClaudeCredentialsJson('user@example.com', 'refreshed')
-    const managedAuthPath = createManagedClaudeAuth(
-      testState.userDataDir,
-      'account-1',
-      originalCredentials
-    )
-    const settings = createSettings({
-      claudeManagedAccounts: [createClaudeAccount('account-1', managedAuthPath)],
-      activeClaudeManagedAccountId: 'account-1'
-    })
-    const store = createStore(settings)
-
-    const { ClaudeRuntimeAuthService } = await import('./runtime-auth-service')
-    const service = new ClaudeRuntimeAuthService(store as never)
-    await service.syncForCurrentSelection()
-
-    testState.scopedKeychainCredentials = originalCredentials
-    testState.legacyKeychainCredentials = refreshedCredentials
-    await service.syncForCurrentSelection()
-
-    expect(readManagedCredentialsForTest('account-1', managedAuthPath)).toBe(refreshedCredentials)
-    expect(readFileSync(runtimeCredentialsPath, 'utf-8')).toBe(refreshedCredentials)
-    expect(testState.scopedKeychainCredentials).toBe(refreshedCredentials)
-    expect(testState.legacyKeychainCredentials).toBe(refreshedCredentials)
-  })
-
-  it('rejects stale legacy keychain credentials after a fresher managed write', async () => {
-    const runtimeCredentialsPath = join(testState.fakeHomeDir, '.claude', '.credentials.json')
-    const staleCredentials = createClaudeCredentialsJson('user@example.com', 'stale', null, 1_000)
-    const managedCredentials = createClaudeCredentialsJson(
-      'user@example.com',
-      'managed-newer',
-      null,
-      2_000
-    )
-    const managedAuthPath = createManagedClaudeAuth(
-      testState.userDataDir,
-      'account-1',
-      managedCredentials
-    )
-    const settings = createSettings({
-      claudeManagedAccounts: [createClaudeAccount('account-1', managedAuthPath)],
-      activeClaudeManagedAccountId: 'account-1'
-    })
-    const store = createStore(settings)
-
-    const { ClaudeRuntimeAuthService } = await import('./runtime-auth-service')
-    const service = new ClaudeRuntimeAuthService(store as never)
-    await service.syncForCurrentSelection()
-
-    testState.scopedKeychainCredentials = managedCredentials
-    testState.legacyKeychainCredentials = staleCredentials
-    await service.syncForCurrentSelection()
-
-    expect(readManagedCredentialsForTest('account-1', managedAuthPath)).toBe(managedCredentials)
-    expect(readFileSync(runtimeCredentialsPath, 'utf-8')).toBe(managedCredentials)
-    expect(testState.scopedKeychainCredentials).toBe(managedCredentials)
-    expect(testState.legacyKeychainCredentials).toBe(managedCredentials)
-  })
-
-  it('uses fresher file credentials when scoped keychain is stale', async () => {
-    const runtimeCredentialsPath = join(testState.fakeHomeDir, '.claude', '.credentials.json')
-    const staleCredentials = createClaudeCredentialsJson('user@example.com', 'stale', null, 1_000)
-    const managedCredentials = createClaudeCredentialsJson(
-      'user@example.com',
-      'managed',
-      null,
-      2_000
-    )
-    const refreshedCredentials = createClaudeCredentialsJson(
-      'user@example.com',
-      'refreshed',
-      null,
-      3_000
-    )
-    const managedAuthPath = createManagedClaudeAuth(
-      testState.userDataDir,
-      'account-1',
-      managedCredentials
-    )
-    const settings = createSettings({
-      claudeManagedAccounts: [createClaudeAccount('account-1', managedAuthPath)],
-      activeClaudeManagedAccountId: 'account-1'
-    })
-    const store = createStore(settings)
-
-    const { ClaudeRuntimeAuthService } = await import('./runtime-auth-service')
-    const service = new ClaudeRuntimeAuthService(store as never)
-    await service.syncForCurrentSelection()
-
-    writeFileSync(runtimeCredentialsPath, refreshedCredentials, 'utf-8')
-    testState.scopedKeychainCredentials = staleCredentials
-    testState.legacyKeychainCredentials = managedCredentials
-    await service.syncForCurrentSelection()
-
-    expect(readManagedCredentialsForTest('account-1', managedAuthPath)).toBe(refreshedCredentials)
-    expect(readFileSync(runtimeCredentialsPath, 'utf-8')).toBe(refreshedCredentials)
-    expect(testState.scopedKeychainCredentials).toBe(refreshedCredentials)
-    expect(testState.legacyKeychainCredentials).toBe(refreshedCredentials)
-  })
-
-  it('restores system default when mismatched Claude keychain auth appears before deselect', async () => {
-    if (process.platform !== 'darwin') {
-      return
-    }
-
-    const runtimeCredentialsPath = join(testState.fakeHomeDir, '.claude', '.credentials.json')
-    const systemCredentials = createClaudeCredentialsJson('system@example.com', 'system')
-    const managedCredentials = createClaudeCredentialsJson('user@example.com', 'managed')
-    const externalKeychainCredentials = createClaudeCredentialsJson(
-      'external@example.com',
-      'external'
-    )
-    writeFileSync(runtimeCredentialsPath, systemCredentials, 'utf-8')
-    testState.scopedKeychainCredentials = systemCredentials
-    testState.legacyKeychainCredentials = systemCredentials
-    const managedAuthPath = createManagedClaudeAuth(
-      testState.userDataDir,
-      'account-1',
-      managedCredentials
-    )
-    const settings = createSettings({
-      claudeManagedAccounts: [createClaudeAccount('account-1', managedAuthPath)]
-    })
-    const store = createStore(settings)
-
-    const { ClaudeRuntimeAuthService } = await import('./runtime-auth-service')
-    const service = new ClaudeRuntimeAuthService(store as never)
-    settings.activeClaudeManagedAccountId = 'account-1'
-    await service.syncForCurrentSelection()
-
-    testState.scopedKeychainCredentials = externalKeychainCredentials
-    testState.legacyKeychainCredentials = externalKeychainCredentials
-    settings.activeClaudeManagedAccountId = null
-    await service.syncForCurrentSelection()
-
-    expect(readFileSync(runtimeCredentialsPath, 'utf-8')).toBe(systemCredentials)
-    expect(testState.scopedKeychainCredentials).toBe(externalKeychainCredentials)
-    expect(testState.legacyKeychainCredentials).toBe(externalKeychainCredentials)
-  })
-
-  it('restores unchanged scoped keychain while preserving external legacy keychain logout', async () => {
-    if (process.platform !== 'darwin') {
-      return
-    }
-
-    const runtimeCredentialsPath = join(testState.fakeHomeDir, '.claude', '.credentials.json')
-    const systemCredentials = createClaudeCredentialsJson('system@example.com', 'system')
-    const managedCredentials = createClaudeCredentialsJson('user@example.com', 'managed')
-    writeFileSync(runtimeCredentialsPath, systemCredentials, 'utf-8')
-    testState.scopedKeychainCredentials = systemCredentials
-    testState.legacyKeychainCredentials = systemCredentials
-    const managedAuthPath = createManagedClaudeAuth(
-      testState.userDataDir,
-      'account-1',
-      managedCredentials
-    )
-    const settings = createSettings({
-      claudeManagedAccounts: [createClaudeAccount('account-1', managedAuthPath)]
-    })
-    const store = createStore(settings)
-
-    const { ClaudeRuntimeAuthService } = await import('./runtime-auth-service')
-    const service = new ClaudeRuntimeAuthService(store as never)
-    settings.activeClaudeManagedAccountId = 'account-1'
-    await service.syncForCurrentSelection()
-
-    testState.legacyKeychainCredentials = null
-    settings.activeClaudeManagedAccountId = null
-    await service.syncForCurrentSelection()
-
-    expect(readFileSync(runtimeCredentialsPath, 'utf-8')).toBe(systemCredentials)
-    expect(testState.scopedKeychainCredentials).toBe(systemCredentials)
-    expect(testState.legacyKeychainCredentials).toBeNull()
-  })
-
-  it('preserves external scoped keychain login while restoring unchanged legacy keychain', async () => {
-    const runtimeCredentialsPath = join(testState.fakeHomeDir, '.claude', '.credentials.json')
-    const systemCredentials = createClaudeCredentialsJson('system@example.com', 'system')
-    const managedCredentials = createClaudeCredentialsJson('user@example.com', 'managed')
-    const externalScopedCredentials = createClaudeCredentialsJson(
-      'external@example.com',
-      'external'
-    )
-    writeFileSync(runtimeCredentialsPath, systemCredentials, 'utf-8')
-    testState.scopedKeychainCredentials = systemCredentials
-    testState.legacyKeychainCredentials = systemCredentials
-    const managedAuthPath = createManagedClaudeAuth(
-      testState.userDataDir,
-      'account-1',
-      managedCredentials
-    )
-    const settings = createSettings({
-      claudeManagedAccounts: [createClaudeAccount('account-1', managedAuthPath)]
-    })
-    const store = createStore(settings)
-
-    const { ClaudeRuntimeAuthService } = await import('./runtime-auth-service')
-    const { readActiveClaudeKeychainCredentials } = await import('./keychain')
-    const service = new ClaudeRuntimeAuthService(store as never)
-    settings.activeClaudeManagedAccountId = 'account-1'
-    await service.syncForCurrentSelection()
-    expect(readActiveClaudeKeychainCredentials).toHaveBeenCalledWith(expectedRuntimeConfigDir())
-
-    testState.scopedKeychainCredentials = externalScopedCredentials
-    settings.activeClaudeManagedAccountId = null
-    await service.syncForCurrentSelection()
-
-    expect(readFileSync(runtimeCredentialsPath, 'utf-8')).toBe(systemCredentials)
-    expect(testState.scopedKeychainCredentials).toBe(externalScopedCredentials)
-    expect(testState.legacyKeychainCredentials).toBe(systemCredentials)
-  })
-
-  it('restores oauth metadata when credentials prove managed ownership', async () => {
-    const runtimeCredentialsPath = join(testState.fakeHomeDir, '.claude', '.credentials.json')
-    const runtimeConfigPath = join(testState.fakeHomeDir, '.claude.json')
-    const systemCredentials = createClaudeCredentialsJson('system@example.com', 'system')
-    const managedCredentials = createClaudeCredentialsJson('user@example.com', 'managed')
-    const systemOauthAccount = { accountUuid: 'system-account' }
-    const externalOauthAccount = { accountUuid: 'external-account' }
-    writeFileSync(runtimeCredentialsPath, systemCredentials, 'utf-8')
-    writeFileSync(
-      runtimeConfigPath,
-      `${JSON.stringify({ oauthAccount: systemOauthAccount })}\n`,
-      'utf-8'
-    )
-    testState.scopedKeychainCredentials = systemCredentials
-    testState.legacyKeychainCredentials = systemCredentials
-    const managedAuthPath = createManagedClaudeAuth(
-      testState.userDataDir,
-      'account-1',
-      managedCredentials
-    )
-    const settings = createSettings({
-      claudeManagedAccounts: [createClaudeAccount('account-1', managedAuthPath)]
-    })
-    const store = createStore(settings)
-
-    const { ClaudeRuntimeAuthService } = await import('./runtime-auth-service')
-    const service = new ClaudeRuntimeAuthService(store as never)
-    settings.activeClaudeManagedAccountId = 'account-1'
-    await service.syncForCurrentSelection()
-
-    writeFileSync(
-      runtimeConfigPath,
-      `${JSON.stringify({ oauthAccount: externalOauthAccount })}\n`,
-      'utf-8'
-    )
-    settings.activeClaudeManagedAccountId = null
-    await service.syncForCurrentSelection()
-
-    expect(readFileSync(runtimeCredentialsPath, 'utf-8')).toBe(systemCredentials)
-    expect(readRuntimeOauthAccountForTest()).toEqual(systemOauthAccount)
-  })
-
-  it('restores owned oauth metadata when external credentials change but metadata does not', async () => {
-    const runtimeCredentialsPath = join(testState.fakeHomeDir, '.claude', '.credentials.json')
-    const runtimeConfigPath = join(testState.fakeHomeDir, '.claude.json')
-    const systemCredentials = createClaudeCredentialsJson('system@example.com', 'system')
-    const managedCredentials = createClaudeCredentialsJson('user@example.com', 'managed')
-    const externalCredentials = createClaudeCredentialsJson('external@example.com', 'external')
-    const systemOauthAccount = { accountUuid: 'system-account' }
-    writeFileSync(runtimeCredentialsPath, systemCredentials, 'utf-8')
-    writeFileSync(
-      runtimeConfigPath,
-      `${JSON.stringify({ oauthAccount: systemOauthAccount })}\n`,
-      'utf-8'
-    )
-    testState.scopedKeychainCredentials = systemCredentials
-    testState.legacyKeychainCredentials = systemCredentials
-    const managedAuthPath = createManagedClaudeAuth(
-      testState.userDataDir,
-      'account-1',
-      managedCredentials
-    )
-    const settings = createSettings({
-      claudeManagedAccounts: [createClaudeAccount('account-1', managedAuthPath)]
-    })
-    const store = createStore(settings)
-
-    const { ClaudeRuntimeAuthService } = await import('./runtime-auth-service')
-    const service = new ClaudeRuntimeAuthService(store as never)
-    settings.activeClaudeManagedAccountId = 'account-1'
-    await service.syncForCurrentSelection()
-
-    writeFileSync(runtimeCredentialsPath, externalCredentials, 'utf-8')
-    settings.activeClaudeManagedAccountId = null
-    await service.syncForCurrentSelection()
-
-    expect(readFileSync(runtimeCredentialsPath, 'utf-8')).toBe(externalCredentials)
-    expect(readRuntimeOauthAccountForTest()).toEqual(systemOauthAccount)
-  })
-
-  it('restores owned oauth metadata when only keychain proves managed ownership', async () => {
-    const runtimeCredentialsPath = join(testState.fakeHomeDir, '.claude', '.credentials.json')
-    const runtimeConfigPath = join(testState.fakeHomeDir, '.claude.json')
-    const systemCredentials = createClaudeCredentialsJson('system@example.com', 'system')
-    const managedCredentials = createClaudeCredentialsJson('user@example.com', 'managed')
-    const externalCredentials = createClaudeCredentialsJson('external@example.com', 'external')
-    const systemOauthAccount = { accountUuid: 'system-account' }
-    writeFileSync(runtimeCredentialsPath, systemCredentials, 'utf-8')
-    writeFileSync(
-      runtimeConfigPath,
-      `${JSON.stringify({ oauthAccount: systemOauthAccount })}\n`,
-      'utf-8'
-    )
-    testState.scopedKeychainCredentials = systemCredentials
-    testState.legacyKeychainCredentials = systemCredentials
-    const managedAuthPath = createManagedClaudeAuth(
-      testState.userDataDir,
-      'account-1',
-      managedCredentials,
-      'null\n'
-    )
-    const settings = createSettings({
-      claudeManagedAccounts: [createClaudeAccount('account-1', managedAuthPath)]
-    })
-    const store = createStore(settings)
-
-    const { ClaudeRuntimeAuthService } = await import('./runtime-auth-service')
-    const service = new ClaudeRuntimeAuthService(store as never)
-    settings.activeClaudeManagedAccountId = 'account-1'
-    await service.syncForCurrentSelection()
-
-    writeFileSync(runtimeCredentialsPath, externalCredentials, 'utf-8')
-    settings.activeClaudeManagedAccountId = null
-    await service.syncForCurrentSelection()
-
-    expect(readFileSync(runtimeCredentialsPath, 'utf-8')).toBe(externalCredentials)
-    expect(readRuntimeOauthAccountForTest()).toEqual(systemOauthAccount)
-    expect(testState.scopedKeychainCredentials).toBe(systemCredentials)
-    expect(testState.legacyKeychainCredentials).toBe(systemCredentials)
-  })
-
-  it('uses managed credentials as ownership baseline after restart with partial external changes', async () => {
-    const runtimeCredentialsPath = join(testState.fakeHomeDir, '.claude', '.credentials.json')
-    const systemCredentials = createClaudeCredentialsJson('system@example.com', 'system')
-    const managedCredentials = createClaudeCredentialsJson('user@example.com', 'managed')
-    const externalScopedCredentials = createClaudeCredentialsJson(
-      'external@example.com',
-      'external'
-    )
-    const snapshotPath = join(
-      testState.userDataDir,
-      'claude-runtime-auth',
-      'system-default-auth.json'
-    )
-    mkdirSync(join(testState.userDataDir, 'claude-runtime-auth'), { recursive: true })
-    writeFileSync(
-      snapshotPath,
-      `${JSON.stringify({
-        credentialsJson: systemCredentials,
-        configOauthAccount: null,
-        keychainCredentialsJson: systemCredentials,
-        scopedKeychainCredentialsJson: systemCredentials,
-        legacyKeychainCredentialsJson: systemCredentials,
-        capturedAt: Date.now()
-      })}\n`,
-      'utf-8'
-    )
-    writeFileSync(runtimeCredentialsPath, managedCredentials, 'utf-8')
-    testState.scopedKeychainCredentials = externalScopedCredentials
-    testState.legacyKeychainCredentials = managedCredentials
-    const managedAuthPath = createManagedClaudeAuth(
-      testState.userDataDir,
-      'account-1',
-      managedCredentials
-    )
-    const settings = createSettings({
-      claudeManagedAccounts: [createClaudeAccount('account-1', managedAuthPath)],
-      activeClaudeManagedAccountId: 'account-1'
-    })
-    const store = createStore(settings)
-
-    const { ClaudeRuntimeAuthService } = await import('./runtime-auth-service')
-    const service = new ClaudeRuntimeAuthService(store as never)
-    settings.activeClaudeManagedAccountId = null
-    await service.syncForCurrentSelection()
-
-    expect(readFileSync(runtimeCredentialsPath, 'utf-8')).toBe(systemCredentials)
-    expect(testState.scopedKeychainCredentials).toBe(externalScopedCredentials)
-    expect(testState.legacyKeychainCredentials).toBe(systemCredentials)
-  })
-
-  it('preserves external file and scoped login while restoring unchanged legacy keychain', async () => {
-    const runtimeCredentialsPath = join(testState.fakeHomeDir, '.claude', '.credentials.json')
-    const systemCredentials = createClaudeCredentialsJson('system@example.com', 'system')
-    const managedCredentials = createClaudeCredentialsJson('user@example.com', 'managed')
-    const externalCredentials = createClaudeCredentialsJson('external@example.com', 'external')
-    writeFileSync(runtimeCredentialsPath, systemCredentials, 'utf-8')
-    testState.scopedKeychainCredentials = systemCredentials
-    testState.legacyKeychainCredentials = systemCredentials
-    const managedAuthPath = createManagedClaudeAuth(
-      testState.userDataDir,
-      'account-1',
-      managedCredentials
-    )
-    const settings = createSettings({
-      claudeManagedAccounts: [createClaudeAccount('account-1', managedAuthPath)]
-    })
-    const store = createStore(settings)
-
-    const { ClaudeRuntimeAuthService } = await import('./runtime-auth-service')
-    const service = new ClaudeRuntimeAuthService(store as never)
-    settings.activeClaudeManagedAccountId = 'account-1'
-    await service.syncForCurrentSelection()
-
-    writeFileSync(runtimeCredentialsPath, externalCredentials, 'utf-8')
-    testState.scopedKeychainCredentials = externalCredentials
-    settings.activeClaudeManagedAccountId = null
-    await service.syncForCurrentSelection()
-
-    expect(readFileSync(runtimeCredentialsPath, 'utf-8')).toBe(externalCredentials)
-    expect(testState.scopedKeychainCredentials).toBe(externalCredentials)
-    expect(testState.legacyKeychainCredentials).toBe(systemCredentials)
-  })
-
-  it('restores legacy keychain credentials from old system-default snapshots', async () => {
-    const runtimeCredentialsPath = join(testState.fakeHomeDir, '.claude', '.credentials.json')
-    const snapshotPath = join(
-      testState.userDataDir,
-      'claude-runtime-auth',
-      'system-default-auth.json'
-    )
-    const systemCredentials = createClaudeCredentialsJson('system@example.com', 'system')
-    const managedCredentials = createClaudeCredentialsJson('user@example.com', 'managed')
-    mkdirSync(join(testState.userDataDir, 'claude-runtime-auth'), { recursive: true })
-    writeFileSync(
-      snapshotPath,
-      `${JSON.stringify({
-        credentialsJson: systemCredentials,
-        configOauthAccount: null,
-        keychainCredentialsJson: systemCredentials,
-        capturedAt: Date.now()
-      })}\n`,
-      'utf-8'
-    )
-    writeFileSync(runtimeCredentialsPath, managedCredentials, 'utf-8')
-    testState.scopedKeychainCredentials = managedCredentials
-    testState.legacyKeychainCredentials = managedCredentials
-    const managedAuthPath = createManagedClaudeAuth(
-      testState.userDataDir,
-      'account-1',
-      managedCredentials
-    )
-    const settings = createSettings({
-      claudeManagedAccounts: [createClaudeAccount('account-1', managedAuthPath)],
-      activeClaudeManagedAccountId: 'account-1'
-    })
-    const store = createStore(settings)
-
-    const { ClaudeRuntimeAuthService } = await import('./runtime-auth-service')
-    const service = new ClaudeRuntimeAuthService(store as never)
-    settings.activeClaudeManagedAccountId = null
-    await service.syncForCurrentSelection()
-
-    expect(readFileSync(runtimeCredentialsPath, 'utf-8')).toBe(systemCredentials)
-    expect(testState.scopedKeychainCredentials).toBe(systemCredentials)
-    expect(testState.legacyKeychainCredentials).toBe(systemCredentials)
-  })
-
-  it('does not recapture managed file as system default after a partial keychain write failure', async () => {
-    const runtimeCredentialsPath = join(testState.fakeHomeDir, '.claude', '.credentials.json')
-    const systemCredentials = createClaudeCredentialsJson('system@example.com', 'system')
-    const managedCredentials = createClaudeCredentialsJson('user@example.com', 'managed')
-    writeFileSync(runtimeCredentialsPath, systemCredentials, 'utf-8')
-    testState.scopedKeychainCredentials = systemCredentials
-    testState.legacyKeychainCredentials = systemCredentials
-    const managedAuthPath = createManagedClaudeAuth(
-      testState.userDataDir,
-      'account-1',
-      managedCredentials
-    )
-    const settings = createSettings({
-      claudeManagedAccounts: [createClaudeAccount('account-1', managedAuthPath)]
-    })
-    const store = createStore(settings)
-
-    const { ClaudeRuntimeAuthService } = await import('./runtime-auth-service')
-    const service = new ClaudeRuntimeAuthService(store as never)
-    settings.activeClaudeManagedAccountId = 'account-1'
-    testState.throwRuntimeKeychainWrite = true
-    await expect(service.syncForCurrentSelection()).rejects.toThrow('runtime keychain write failed')
-
-    expect(readFileSync(runtimeCredentialsPath, 'utf-8')).toBe(systemCredentials)
-    expect(testState.scopedKeychainCredentials).toBe(systemCredentials)
-    testState.throwRuntimeKeychainWrite = false
-    await service.syncForCurrentSelection()
-
-    settings.activeClaudeManagedAccountId = null
-    await service.syncForCurrentSelection()
-
-    expect(readFileSync(runtimeCredentialsPath, 'utf-8')).toBe(systemCredentials)
-    expect(testState.scopedKeychainCredentials).toBe(systemCredentials)
-    expect(testState.legacyKeychainCredentials).toBe(systemCredentials)
-  })
-
-  it('restores scoped keychain after legacy runtime keychain write fails', async () => {
-    const runtimeCredentialsPath = join(testState.fakeHomeDir, '.claude', '.credentials.json')
-    const systemCredentials = createClaudeCredentialsJson('system@example.com', 'system')
-    const managedCredentials = createClaudeCredentialsJson('user@example.com', 'managed')
-    writeFileSync(runtimeCredentialsPath, systemCredentials, 'utf-8')
-    testState.scopedKeychainCredentials = systemCredentials
-    testState.legacyKeychainCredentials = systemCredentials
-    const managedAuthPath = createManagedClaudeAuth(
-      testState.userDataDir,
-      'account-1',
-      managedCredentials
-    )
-    const settings = createSettings({
-      claudeManagedAccounts: [createClaudeAccount('account-1', managedAuthPath)]
-    })
-    const store = createStore(settings)
-
-    const { ClaudeRuntimeAuthService } = await import('./runtime-auth-service')
-    const service = new ClaudeRuntimeAuthService(store as never)
-    settings.activeClaudeManagedAccountId = 'account-1'
-    testState.throwLegacyRuntimeKeychainWrite = true
-    await expect(service.syncForCurrentSelection()).rejects.toThrow(
-      'legacy runtime keychain write failed'
-    )
-
-    expect(readFileSync(runtimeCredentialsPath, 'utf-8')).toBe(systemCredentials)
-    expect(testState.scopedKeychainCredentials).toBe(systemCredentials)
-    expect(testState.legacyKeychainCredentials).toBe(systemCredentials)
-  })
-
-  it('keeps managed ownership baseline when keychain restore fails and retries', async () => {
-    const runtimeCredentialsPath = join(testState.fakeHomeDir, '.claude', '.credentials.json')
-    const systemCredentials = createClaudeCredentialsJson('system@example.com', 'system')
-    const managedCredentials = createClaudeCredentialsJson('user@example.com', 'managed')
-    writeFileSync(runtimeCredentialsPath, systemCredentials, 'utf-8')
-    testState.scopedKeychainCredentials = systemCredentials
-    testState.legacyKeychainCredentials = systemCredentials
-    const managedAuthPath = createManagedClaudeAuth(
-      testState.userDataDir,
-      'account-1',
-      managedCredentials
-    )
-    const settings = createSettings({
-      claudeManagedAccounts: [createClaudeAccount('account-1', managedAuthPath)]
-    })
-    const store = createStore(settings)
-
-    const { ClaudeRuntimeAuthService } = await import('./runtime-auth-service')
-    const service = new ClaudeRuntimeAuthService(store as never)
-    settings.activeClaudeManagedAccountId = 'account-1'
-    await service.syncForCurrentSelection()
-
-    settings.activeClaudeManagedAccountId = null
-    testState.throwScopedKeychainWrite = true
-    await expect(service.syncForCurrentSelection()).rejects.toThrow('scoped keychain write failed')
-
-    expect(readFileSync(runtimeCredentialsPath, 'utf-8')).toBe(systemCredentials)
-    expect(testState.scopedKeychainCredentials).toBe(managedCredentials)
-    testState.throwScopedKeychainWrite = false
-    await service.syncForCurrentSelection()
-
-    expect(readFileSync(runtimeCredentialsPath, 'utf-8')).toBe(systemCredentials)
-    expect(testState.scopedKeychainCredentials).toBe(systemCredentials)
-    expect(testState.legacyKeychainCredentials).toBe(systemCredentials)
-  })
-
-  it('preserves previous keychain snapshot after restart following partial restore failure', async () => {
-    const runtimeCredentialsPath = join(testState.fakeHomeDir, '.claude', '.credentials.json')
-    const systemCredentials = createClaudeCredentialsJson('system@example.com', 'system')
-    const managedCredentials = createClaudeCredentialsJson('user@example.com', 'managed')
-    writeFileSync(runtimeCredentialsPath, systemCredentials, 'utf-8')
-    testState.scopedKeychainCredentials = systemCredentials
-    testState.legacyKeychainCredentials = systemCredentials
-    const managedAuthPath = createManagedClaudeAuth(
-      testState.userDataDir,
-      'account-1',
-      managedCredentials
-    )
-    const settings = createSettings({
-      claudeManagedAccounts: [createClaudeAccount('account-1', managedAuthPath)]
-    })
-    const store = createStore(settings)
-
-    const { ClaudeRuntimeAuthService } = await import('./runtime-auth-service')
-    let service = new ClaudeRuntimeAuthService(store as never)
-    settings.activeClaudeManagedAccountId = 'account-1'
-    await service.syncForCurrentSelection()
-    settings.activeClaudeManagedAccountId = null
-    testState.throwScopedKeychainWrite = true
-    await expect(service.syncForCurrentSelection()).rejects.toThrow('scoped keychain write failed')
-
-    testState.throwScopedKeychainWrite = false
-    service = new ClaudeRuntimeAuthService(store as never)
-    settings.activeClaudeManagedAccountId = 'account-1'
-    await service.syncForCurrentSelection()
-    settings.activeClaudeManagedAccountId = null
-    await service.syncForCurrentSelection()
-
-    expect(readFileSync(runtimeCredentialsPath, 'utf-8')).toBe(systemCredentials)
-    expect(testState.scopedKeychainCredentials).toBe(systemCredentials)
-    expect(testState.legacyKeychainCredentials).toBe(systemCredentials)
-  })
-
-  it('does not enter managed mode when keychain snapshot capture fails', async () => {
-    const runtimeCredentialsPath = join(testState.fakeHomeDir, '.claude', '.credentials.json')
-    const systemCredentials = createClaudeCredentialsJson('system@example.com', 'system')
-    const managedCredentials = createClaudeCredentialsJson('user@example.com', 'managed')
-    writeFileSync(runtimeCredentialsPath, systemCredentials, 'utf-8')
-    testState.scopedKeychainCredentials = systemCredentials
-    testState.legacyKeychainCredentials = systemCredentials
-    const managedAuthPath = createManagedClaudeAuth(
-      testState.userDataDir,
-      'account-1',
-      managedCredentials
-    )
-    const settings = createSettings({
-      claudeManagedAccounts: [createClaudeAccount('account-1', managedAuthPath)]
-    })
-    const store = createStore(settings)
-    const warn = vi.spyOn(console, 'warn').mockImplementation(() => {})
-
-    const { ClaudeRuntimeAuthService } = await import('./runtime-auth-service')
-    const service = new ClaudeRuntimeAuthService(store as never)
-    settings.activeClaudeManagedAccountId = 'account-1'
-    testState.throwScopedKeychainRead = true
-    await expect(service.syncForCurrentSelection()).rejects.toThrow(
-      'Cannot capture current Claude Keychain credentials'
-    )
-
-    expect(readFileSync(runtimeCredentialsPath, 'utf-8')).toBe(systemCredentials)
-    expect(testState.scopedKeychainCredentials).toBe(systemCredentials)
-    expect(testState.legacyKeychainCredentials).toBe(systemCredentials)
-    warn.mockRestore()
-  })
-})
diff --git a/src/main/claude-accounts/runtime-auth-service-launch-refresh.test.ts b/src/main/claude-accounts/runtime-auth-service-launch-refresh.test.ts
deleted file mode 100644
index 85d68d30e8b8..000000000000
--- a/src/main/claude-accounts/runtime-auth-service-launch-refresh.test.ts
+++ /dev/null
@@ -1,248 +0,0 @@
-import {
-  cleanupRuntimeAuthTestState,
-  createClaudeAccount,
-  createClaudeCredentialsJson,
-  createElectronMock,
-  createKeychainMock,
-  createManagedClaudeAuth,
-  createOauthRefreshMock,
-  createSettings,
-  createStore,
-  readManagedCredentialsForTest,
-  resetRuntimeAuthTestState,
-  testState
-} from './runtime-auth-service-test-harness'
-import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest'
-import { readFileSync, writeFileSync } from 'node:fs'
-import { join } from 'node:path'
-import { isOauthTokenExpiring, refreshClaudeOauthCredentials } from './oauth-refresh'
-
-vi.mock('electron', () => createElectronMock())
-
-vi.mock('./oauth-refresh', () => createOauthRefreshMock())
-
-vi.mock('node:os', async () => {
-  const actual = await vi.importActual<typeof import('node:os')>('node:os') // eslint-disable-line @typescript-eslint/consistent-type-imports -- vi.importActual requires inline import()
-  return {
-    ...actual,
-    homedir: () => testState.fakeHomeDir
-  }
-})
-
-vi.mock('./keychain', () => createKeychainMock())
-
-describe('ClaudeRuntimeAuthService', () => {
-  beforeEach(() => {
-    resetRuntimeAuthTestState()
-  })
-
-  afterEach(() => {
-    cleanupRuntimeAuthTestState()
-  })
-
-  it('does not clobber fresh Claude credentials after clearLastWrittenCredentialsJson', async () => {
-    const runtimeCredentialsPath = join(testState.fakeHomeDir, '.claude', '.credentials.json')
-    const originalCredentials = createClaudeCredentialsJson('user@example.com', 'original')
-    const reauthedCredentials = createClaudeCredentialsJson('user@example.com', 'reauthed')
-    const managedAuthPath = createManagedClaudeAuth(
-      testState.userDataDir,
-      'account-1',
-      originalCredentials
-    )
-    const settings = createSettings({
-      claudeManagedAccounts: [createClaudeAccount('account-1', managedAuthPath)],
-      activeClaudeManagedAccountId: 'account-1'
-    })
-    const store = createStore(settings)
-
-    const { ClaudeRuntimeAuthService } = await import('./runtime-auth-service')
-    const service = new ClaudeRuntimeAuthService(store as never)
-    await service.syncForCurrentSelection()
-
-    testState.managedKeychainCredentials.set('account-1', reauthedCredentials)
-    writeFileSync(join(managedAuthPath, '.credentials.json'), reauthedCredentials, 'utf-8')
-    service.clearLastWrittenCredentialsJson()
-    await service.syncForCurrentSelection()
-
-    expect(readManagedCredentialsForTest('account-1', managedAuthPath)).toBe(reauthedCredentials)
-    expect(readFileSync(runtimeCredentialsPath, 'utf-8')).toBe(reauthedCredentials)
-  })
-
-  it('leaves host system-default credentials untouched before launch', async () => {
-    const runtimeCredentialsPath = join(testState.fakeHomeDir, '.claude', '.credentials.json')
-    const expired = createClaudeCredentialsJson('system@example.com', 'system-expired', null, 1_000)
-    writeFileSync(runtimeCredentialsPath, expired, 'utf-8')
-    testState.scopedKeychainCredentials = expired
-    testState.legacyKeychainCredentials = expired
-    const settings = createSettings({
-      activeClaudeManagedAccountId: null
-    })
-    const store = createStore(settings)
-
-    vi.mocked(isOauthTokenExpiring).mockReturnValue(true)
-    vi.mocked(refreshClaudeOauthCredentials).mockResolvedValue(
-      createClaudeCredentialsJson('system@example.com', 'system-refreshed')
-    )
-
-    const { ClaudeRuntimeAuthService } = await import('./runtime-auth-service')
-    const service = new ClaudeRuntimeAuthService(store as never)
-    const preparation = await service.prepareForClaudeLaunch()
-
-    expect(isOauthTokenExpiring).not.toHaveBeenCalled()
-    expect(refreshClaudeOauthCredentials).not.toHaveBeenCalled()
-    expect(preparation.provenance).toBe('system')
-    expect(readFileSync(runtimeCredentialsPath, 'utf-8')).toBe(expired)
-    expect(testState.scopedKeychainCredentials).toBe(expired)
-    expect(testState.legacyKeychainCredentials).toBe(expired)
-
-    vi.mocked(isOauthTokenExpiring).mockReturnValue(false)
-    vi.mocked(refreshClaudeOauthCredentials).mockResolvedValue(null)
-  })
-
-  it('proactively refreshes and persists an expiring account on switch-in', async () => {
-    const runtimeCredentialsPath = join(testState.fakeHomeDir, '.claude', '.credentials.json')
-    const account1Stale = createClaudeCredentialsJson('one@example.com', 'one-stale', null, 1_000)
-    const account1Refreshed = createClaudeCredentialsJson(
-      'one@example.com',
-      'one-refreshed',
-      null,
-      9_999_999_999_999
-    )
-    const managedAuthPath1 = createManagedClaudeAuth(
-      testState.userDataDir,
-      'account-1',
-      account1Stale
-    )
-    // Start on the system default (no active managed account), then switch in.
-    const settings = createSettings({
-      claudeManagedAccounts: [
-        createClaudeAccount('account-1', managedAuthPath1, { email: 'one@example.com' })
-      ],
-      activeClaudeManagedAccountId: null
-    })
-    const store = createStore(settings)
-
-    const { ClaudeRuntimeAuthService } = await import('./runtime-auth-service')
-    const service = new ClaudeRuntimeAuthService(store as never)
-    await service.syncForCurrentSelection()
-
-    // Now switch into account-1: token is expiring, so the service must refresh
-    // and persist the rotation before materializing.
-    vi.mocked(isOauthTokenExpiring).mockReturnValueOnce(true)
-    vi.mocked(refreshClaudeOauthCredentials).mockResolvedValueOnce(account1Refreshed)
-    store.updateSettings({ activeClaudeManagedAccountId: 'account-1' })
-    await service.syncForCurrentSelection()
-
-    expect(refreshClaudeOauthCredentials).toHaveBeenCalledWith(account1Stale)
-    expect(readManagedCredentialsForTest('account-1', managedAuthPath1)).toBe(account1Refreshed)
-    expect(readFileSync(runtimeCredentialsPath, 'utf-8')).toBe(account1Refreshed)
-  })
-
-  it('refreshes the active account with an expired token when no Claude PTY is live', async () => {
-    const runtimeCredentialsPath = join(testState.fakeHomeDir, '.claude', '.credentials.json')
-    const expired = createClaudeCredentialsJson('one@example.com', 'one-expired', null, 1_000)
-    const refreshedCreds = createClaudeCredentialsJson(
-      'one@example.com',
-      'one-refreshed',
-      null,
-      9_999_999_999_999
-    )
-    const managedAuthPath1 = createManagedClaudeAuth(testState.userDataDir, 'account-1', expired)
-    // account-1 is ALREADY the active account (seeded), so this is a re-sync of
-    // the active account, not a switch-in — the path that was previously missed.
-    const settings = createSettings({
-      claudeManagedAccounts: [
-        createClaudeAccount('account-1', managedAuthPath1, { email: 'one@example.com' })
-      ],
-      activeClaudeManagedAccountId: 'account-1'
-    })
-    const store = createStore(settings)
-
-    vi.mocked(isOauthTokenExpiring).mockReturnValue(true)
-    vi.mocked(refreshClaudeOauthCredentials).mockResolvedValue(refreshedCreds)
-
-    const { ClaudeRuntimeAuthService } = await import('./runtime-auth-service')
-    const service = new ClaudeRuntimeAuthService(store as never)
-    await service.syncForCurrentSelection()
-
-    expect(refreshClaudeOauthCredentials).toHaveBeenCalled()
-    expect(readManagedCredentialsForTest('account-1', managedAuthPath1)).toBe(refreshedCreds)
-    expect(readFileSync(runtimeCredentialsPath, 'utf-8')).toBe(refreshedCreds)
-
-    vi.mocked(isOauthTokenExpiring).mockReturnValue(false)
-    vi.mocked(refreshClaudeOauthCredentials).mockResolvedValue(null)
-  })
-
-  it('does not refresh the active account while a Claude PTY is live', async () => {
-    const expired = createClaudeCredentialsJson('one@example.com', 'one-expired', null, 1_000)
-    const managedAuthPath1 = createManagedClaudeAuth(testState.userDataDir, 'account-1', expired)
-    const settings = createSettings({
-      claudeManagedAccounts: [
-        createClaudeAccount('account-1', managedAuthPath1, { email: 'one@example.com' })
-      ],
-      activeClaudeManagedAccountId: 'account-1'
-    })
-    const store = createStore(settings)
-
-    vi.mocked(isOauthTokenExpiring).mockReturnValue(true)
-    vi.mocked(refreshClaudeOauthCredentials).mockResolvedValue(
-      createClaudeCredentialsJson('one@example.com', 'should-not-be-used', null, 9_999_999_999_999)
-    )
-
-    const { markClaudePtySpawned, markClaudePtyExited } = await import('./live-pty-gate')
-    const { ClaudeRuntimeAuthService } = await import('./runtime-auth-service')
-    const service = new ClaudeRuntimeAuthService(store as never)
-
-    markClaudePtySpawned('pty-live-1')
-    try {
-      const preparation = await service.prepareForRateLimitFetch()
-      // A live Claude owns the credentials; refreshing here would race its
-      // rotation, so the proactive refresh must be skipped entirely.
-      expect(refreshClaudeOauthCredentials).not.toHaveBeenCalled()
-      expect(preparation.managedRefreshDeferredByLivePty).toBe(true)
-    } finally {
-      markClaudePtyExited('pty-live-1')
-      vi.mocked(isOauthTokenExpiring).mockReturnValue(false)
-      vi.mocked(refreshClaudeOauthCredentials).mockResolvedValue(null)
-    }
-  })
-
-  it('adopts a rotated-refresh-token runtime credential on cold-start read-back', async () => {
-    const runtimeCredentialsPath = join(testState.fakeHomeDir, '.claude', '.credentials.json')
-    // Same expiry on both sides (cold start), but the runtime refresh token has
-    // rotated — proof the CLI refreshed. Must be read back into managed storage.
-    const managedCredentials = createClaudeCredentialsJson(
-      'one@example.com',
-      'one-old',
-      null,
-      3_000
-    )
-    const runtimeRotated = `${JSON.stringify({
-      claudeAiOauth: {
-        email: 'one@example.com',
-        accessToken: 'one-rotated',
-        refreshToken: 'one-rotated-refresh',
-        expiresAt: 3_000
-      }
-    })}\n`
-    writeFileSync(runtimeCredentialsPath, runtimeRotated, 'utf-8')
-    const managedAuthPath1 = createManagedClaudeAuth(
-      testState.userDataDir,
-      'account-1',
-      managedCredentials
-    )
-    const settings = createSettings({
-      claudeManagedAccounts: [
-        createClaudeAccount('account-1', managedAuthPath1, { email: 'one@example.com' })
-      ],
-      activeClaudeManagedAccountId: 'account-1'
-    })
-    const store = createStore(settings)
-
-    const { ClaudeRuntimeAuthService } = await import('./runtime-auth-service')
-    const service = new ClaudeRuntimeAuthService(store as never)
-    await service.syncForCurrentSelection()
-
-    expect(readManagedCredentialsForTest('account-1', managedAuthPath1)).toBe(runtimeRotated)
-  })
-})
diff --git a/src/main/claude-accounts/runtime-auth-service-materialization.test.ts b/src/main/claude-accounts/runtime-auth-service-materialization.test.ts
deleted file mode 100644
index 94bdab9b4d82..000000000000
--- a/src/main/claude-accounts/runtime-auth-service-materialization.test.ts
+++ /dev/null
@@ -1,490 +0,0 @@
-import {
-  cleanupRuntimeAuthTestState,
-  createClaudeAccount,
-  createClaudeCredentialsJson,
-  createElectronMock,
-  createKeychainMock,
-  createManagedClaudeAuth,
-  createOauthRefreshMock,
-  createSettings,
-  createStore,
-  expectedRuntimeConfigDir,
-  hostPlatform,
-  readRuntimeOauthAccountForTest,
-  resetRuntimeAuthTestState,
-  setPlatform,
-  testState
-} from './runtime-auth-service-test-harness'
-import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest'
-import {
-  chmodSync,
-  existsSync,
-  lstatSync,
-  mkdirSync,
-  readFileSync,
-  rmSync,
-  statSync,
-  symlinkSync,
-  writeFileSync
-} from 'node:fs'
-import { join } from 'node:path'
-import type { GlobalSettings } from '../../shared/global-settings-types'
-
-vi.mock('electron', () => createElectronMock())
-
-vi.mock('./oauth-refresh', () => createOauthRefreshMock())
-
-vi.mock('node:os', async () => {
-  const actual = await vi.importActual<typeof import('node:os')>('node:os') // eslint-disable-line @typescript-eslint/consistent-type-imports -- vi.importActual requires inline import()
-  return {
-    ...actual,
-    homedir: () => testState.fakeHomeDir
-  }
-})
-
-vi.mock('./keychain', () => createKeychainMock())
-
-describe('ClaudeRuntimeAuthService', () => {
-  beforeEach(() => {
-    resetRuntimeAuthTestState()
-  })
-
-  afterEach(() => {
-    cleanupRuntimeAuthTestState()
-  })
-
-  it('creates and recreates the runtime directory when materializing managed credentials', async () => {
-    const runtimeCredentialsPath = join(testState.fakeHomeDir, '.claude', '.credentials.json')
-    rmSync(expectedRuntimeConfigDir(), { recursive: true, force: true })
-    const managedCredentials = createClaudeCredentialsJson('user@example.com', 'managed')
-    const managedAuthPath = createManagedClaudeAuth(
-      testState.userDataDir,
-      'account-1',
-      managedCredentials
-    )
-    const settings = createSettings({
-      claudeManagedAccounts: [createClaudeAccount('account-1', managedAuthPath)],
-      activeClaudeManagedAccountId: 'account-1'
-    })
-    const store = createStore(settings)
-
-    const { ClaudeRuntimeAuthService } = await import('./runtime-auth-service')
-    const service = new ClaudeRuntimeAuthService(store as never)
-    await service.syncForCurrentSelection()
-
-    expect(readFileSync(runtimeCredentialsPath, 'utf-8')).toBe(managedCredentials)
-
-    rmSync(expectedRuntimeConfigDir(), { recursive: true, force: true })
-    await service.prepareForClaudeLaunch()
-
-    expect(readFileSync(runtimeCredentialsPath, 'utf-8')).toBe(managedCredentials)
-    expect(testState.runtimeWriteConfigDir).toBe(expectedRuntimeConfigDir())
-  })
-
-  it('restores system default instead of materializing corrupt managed credentials', async () => {
-    const runtimeCredentialsPath = join(testState.fakeHomeDir, '.claude', '.credentials.json')
-    const systemCredentials = createClaudeCredentialsJson('system@example.com', 'system')
-    writeFileSync(runtimeCredentialsPath, systemCredentials, 'utf-8')
-    testState.scopedKeychainCredentials = systemCredentials
-    testState.legacyKeychainCredentials = systemCredentials
-    const managedAuthPath = createManagedClaudeAuth(testState.userDataDir, 'account-1', '{not-json')
-    const settings = createSettings({
-      claudeManagedAccounts: [createClaudeAccount('account-1', managedAuthPath)],
-      activeClaudeManagedAccountId: 'account-1'
-    })
-    const store = createStore(settings)
-
-    const { ClaudeRuntimeAuthService } = await import('./runtime-auth-service')
-    const service = new ClaudeRuntimeAuthService(store as never)
-    await service.syncForCurrentSelection()
-
-    expect(store.getSettings().activeClaudeManagedAccountId).toBeNull()
-    expect(readFileSync(runtimeCredentialsPath, 'utf-8')).toBe(systemCredentials)
-    expect(testState.scopedKeychainCredentials).toBe(systemCredentials)
-    expect(testState.legacyKeychainCredentials).toBe(systemCredentials)
-  })
-
-  it('restores system default instead of materializing wrong-shaped managed credentials', async () => {
-    const runtimeCredentialsPath = join(testState.fakeHomeDir, '.claude', '.credentials.json')
-    const systemCredentials = createClaudeCredentialsJson('system@example.com', 'system')
-    writeFileSync(runtimeCredentialsPath, systemCredentials, 'utf-8')
-    testState.scopedKeychainCredentials = systemCredentials
-    testState.legacyKeychainCredentials = systemCredentials
-    const managedAuthPath = createManagedClaudeAuth(testState.userDataDir, 'account-1', '{}\n')
-    const settings = createSettings({
-      claudeManagedAccounts: [createClaudeAccount('account-1', managedAuthPath)],
-      activeClaudeManagedAccountId: 'account-1'
-    })
-    const store = createStore(settings)
-
-    const { ClaudeRuntimeAuthService } = await import('./runtime-auth-service')
-    const service = new ClaudeRuntimeAuthService(store as never)
-    await service.syncForCurrentSelection()
-
-    expect(store.getSettings().activeClaudeManagedAccountId).toBeNull()
-    expect(readFileSync(runtimeCredentialsPath, 'utf-8')).toBe(systemCredentials)
-    expect(testState.scopedKeychainCredentials).toBe(systemCredentials)
-    expect(testState.legacyKeychainCredentials).toBe(systemCredentials)
-  })
-
-  it('does not materialize managed credentials from unowned auth paths', async () => {
-    const runtimeCredentialsPath = join(testState.fakeHomeDir, '.claude', '.credentials.json')
-    const systemCredentials = createClaudeCredentialsJson('system@example.com', 'system')
-    const managedCredentials = createClaudeCredentialsJson('user@example.com', 'managed')
-    writeFileSync(runtimeCredentialsPath, systemCredentials, 'utf-8')
-    const unownedAuthPath = join(testState.fakeHomeDir, 'unowned-claude-auth')
-    mkdirSync(unownedAuthPath, { recursive: true })
-    writeFileSync(join(unownedAuthPath, '.credentials.json'), managedCredentials, 'utf-8')
-    writeFileSync(
-      join(unownedAuthPath, 'oauth-account.json'),
-      `${JSON.stringify({ accountUuid: 'account-1' })}\n`,
-      'utf-8'
-    )
-    const settings = createSettings({
-      claudeManagedAccounts: [createClaudeAccount('account-1', unownedAuthPath)],
-      activeClaudeManagedAccountId: 'account-1'
-    })
-    const store = createStore(settings)
-
-    const { ClaudeRuntimeAuthService } = await import('./runtime-auth-service')
-    const service = new ClaudeRuntimeAuthService(store as never)
-    await service.syncForCurrentSelection()
-
-    expect(store.getSettings().activeClaudeManagedAccountId).toBeNull()
-    expect(readFileSync(runtimeCredentialsPath, 'utf-8')).toBe(systemCredentials)
-  })
-
-  it('adopts canonical legacy managed auth paths without existing markers', async () => {
-    setPlatform('linux')
-    const runtimeCredentialsPath = join(testState.fakeHomeDir, '.claude', '.credentials.json')
-    const managedCredentials = createClaudeCredentialsJson('user@example.com', 'managed')
-    const managedAuthPath = join(testState.userDataDir, 'claude-accounts', 'account-1', 'auth')
-    mkdirSync(managedAuthPath, { recursive: true })
-    writeFileSync(join(managedAuthPath, '.credentials.json'), managedCredentials, 'utf-8')
-    writeFileSync(
-      join(managedAuthPath, 'oauth-account.json'),
-      '{"accountUuid":"account-1"}\n',
-      'utf-8'
-    )
-    const settings = createSettings({
-      claudeManagedAccounts: [createClaudeAccount('account-1', managedAuthPath)],
-      activeClaudeManagedAccountId: 'account-1'
-    })
-    const store = createStore(settings)
-
-    const { ClaudeRuntimeAuthService } = await import('./runtime-auth-service')
-    const service = new ClaudeRuntimeAuthService(store as never)
-    await service.syncForCurrentSelection()
-
-    const markerPath = join(managedAuthPath, '.orca-managed-claude-auth')
-    expect(readFileSync(runtimeCredentialsPath, 'utf-8')).toBe(managedCredentials)
-    expect(lstatSync(markerPath).isFile()).toBe(true)
-    expect(readFileSync(markerPath, 'utf-8')).toBe('account-1\n')
-  })
-
-  it('rejects symlinked managed credential children', async () => {
-    setPlatform('linux')
-    const runtimeCredentialsPath = join(testState.fakeHomeDir, '.claude', '.credentials.json')
-    const systemCredentials = createClaudeCredentialsJson('system@example.com', 'system')
-    const escapedCredentials = createClaudeCredentialsJson('user@example.com', 'escaped')
-    const managedAuthPath = join(testState.userDataDir, 'claude-accounts', 'account-1', 'auth')
-    const escapedCredentialsPath = join(testState.fakeHomeDir, 'escaped-credentials.json')
-    mkdirSync(managedAuthPath, { recursive: true })
-    writeFileSync(join(managedAuthPath, '.orca-managed-claude-auth'), 'account-1\n', 'utf-8')
-    writeFileSync(
-      join(managedAuthPath, 'oauth-account.json'),
-      '{"accountUuid":"account-1"}\n',
-      'utf-8'
-    )
-    writeFileSync(escapedCredentialsPath, escapedCredentials, 'utf-8')
-    symlinkSync(escapedCredentialsPath, join(managedAuthPath, '.credentials.json'))
-    writeFileSync(runtimeCredentialsPath, systemCredentials, 'utf-8')
-    const settings = createSettings({
-      claudeManagedAccounts: [createClaudeAccount('account-1', managedAuthPath)],
-      activeClaudeManagedAccountId: 'account-1'
-    })
-    const store = createStore(settings)
-
-    const { ClaudeRuntimeAuthService } = await import('./runtime-auth-service')
-    const service = new ClaudeRuntimeAuthService(store as never)
-    await service.syncForCurrentSelection()
-
-    expect(store.getSettings().activeClaudeManagedAccountId).toBeNull()
-    expect(readFileSync(runtimeCredentialsPath, 'utf-8')).toBe(systemCredentials)
-  })
-
-  it('restores system auth when switching from an owned account to an unowned account', async () => {
-    setPlatform('linux')
-    const runtimeCredentialsPath = join(testState.fakeHomeDir, '.claude', '.credentials.json')
-    const runtimeConfigPath = join(testState.fakeHomeDir, '.claude.json')
-    const systemCredentials = createClaudeCredentialsJson('system@example.com', 'system')
-    const ownedCredentials = createClaudeCredentialsJson('owned@example.com', 'owned')
-    const unownedCredentials = createClaudeCredentialsJson('unowned@example.com', 'unowned')
-    const systemOauthAccount = { accountUuid: 'system-account' }
-    writeFileSync(runtimeCredentialsPath, systemCredentials, 'utf-8')
-    writeFileSync(
-      runtimeConfigPath,
-      `${JSON.stringify({ oauthAccount: systemOauthAccount })}\n`,
-      'utf-8'
-    )
-    const ownedAuthPath = createManagedClaudeAuth(
-      testState.userDataDir,
-      'account-1',
-      ownedCredentials
-    )
-    const unownedAuthPath = join(testState.fakeHomeDir, 'unowned-claude-auth')
-    mkdirSync(unownedAuthPath, { recursive: true })
-    writeFileSync(join(unownedAuthPath, '.credentials.json'), unownedCredentials, 'utf-8')
-    let settings = createSettings({
-      claudeManagedAccounts: [
-        createClaudeAccount('account-1', ownedAuthPath, { email: 'owned@example.com' }),
-        createClaudeAccount('account-2', unownedAuthPath, { email: 'unowned@example.com' })
-      ],
-      activeClaudeManagedAccountId: null
-    })
-    const store = {
-      getSettings: vi.fn(() => settings),
-      updateSettings: vi.fn((updates: Partial<GlobalSettings>) => {
-        settings = {
-          ...settings,
-          ...updates,
-          notifications: {
-            ...settings.notifications,
-            ...updates.notifications
-          }
-        }
-        return settings
-      })
-    }
-
-    const { ClaudeRuntimeAuthService } = await import('./runtime-auth-service')
-    const service = new ClaudeRuntimeAuthService(store as never)
-    store.updateSettings({ activeClaudeManagedAccountId: 'account-1' })
-    await service.syncForCurrentSelection()
-    expect(readFileSync(runtimeCredentialsPath, 'utf-8')).toBe(ownedCredentials)
-
-    store.updateSettings({ activeClaudeManagedAccountId: 'account-2' })
-    await service.syncForCurrentSelection()
-
-    expect(store.getSettings().activeClaudeManagedAccountId).toBeNull()
-    expect(readFileSync(runtimeCredentialsPath, 'utf-8')).toBe(systemCredentials)
-    expect(readRuntimeOauthAccountForTest()).toEqual(systemOauthAccount)
-  })
-
-  it('restores system auth when the previously synced account is no longer in settings', async () => {
-    setPlatform('linux')
-    const runtimeCredentialsPath = join(testState.fakeHomeDir, '.claude', '.credentials.json')
-    const runtimeConfigPath = join(testState.fakeHomeDir, '.claude.json')
-    const systemCredentials = createClaudeCredentialsJson('system@example.com', 'system')
-    const ownedCredentials = createClaudeCredentialsJson('owned@example.com', 'owned')
-    const systemOauthAccount = { accountUuid: 'system-account' }
-    writeFileSync(runtimeCredentialsPath, systemCredentials, 'utf-8')
-    writeFileSync(
-      runtimeConfigPath,
-      `${JSON.stringify({ oauthAccount: systemOauthAccount })}\n`,
-      'utf-8'
-    )
-    const ownedAuthPath = createManagedClaudeAuth(
-      testState.userDataDir,
-      'account-1',
-      ownedCredentials
-    )
-    const unownedAuthPath = join(testState.fakeHomeDir, 'unowned-claude-auth')
-    mkdirSync(unownedAuthPath, { recursive: true })
-    let settings = createSettings({
-      claudeManagedAccounts: [
-        createClaudeAccount('account-1', ownedAuthPath, { email: 'owned@example.com' })
-      ],
-      activeClaudeManagedAccountId: null
-    })
-    const store = {
-      getSettings: vi.fn(() => settings),
-      updateSettings: vi.fn((updates: Partial<GlobalSettings>) => {
-        settings = {
-          ...settings,
-          ...updates,
-          notifications: {
-            ...settings.notifications,
-            ...updates.notifications
-          }
-        }
-        return settings
-      })
-    }
-
-    const { ClaudeRuntimeAuthService } = await import('./runtime-auth-service')
-    const service = new ClaudeRuntimeAuthService(store as never)
-    store.updateSettings({ activeClaudeManagedAccountId: 'account-1' })
-    await service.syncForCurrentSelection()
-    expect(readFileSync(runtimeCredentialsPath, 'utf-8')).toBe(ownedCredentials)
-
-    store.updateSettings({
-      claudeManagedAccounts: [
-        createClaudeAccount('account-2', unownedAuthPath, { email: 'unowned@example.com' })
-      ],
-      activeClaudeManagedAccountId: 'account-2'
-    })
-    await service.syncForCurrentSelection()
-
-    expect(store.getSettings().activeClaudeManagedAccountId).toBeNull()
-    expect(readFileSync(runtimeCredentialsPath, 'utf-8')).toBe(systemCredentials)
-    expect(readRuntimeOauthAccountForTest()).toEqual(systemOauthAccount)
-  })
-
-  it('restores system auth when switching from an owned account to missing credentials', async () => {
-    setPlatform('linux')
-    const runtimeCredentialsPath = join(testState.fakeHomeDir, '.claude', '.credentials.json')
-    const runtimeConfigPath = join(testState.fakeHomeDir, '.claude.json')
-    const systemCredentials = createClaudeCredentialsJson('system@example.com', 'system')
-    const account1Credentials = createClaudeCredentialsJson('one@example.com', 'one')
-    const systemOauthAccount = { accountUuid: 'system-account' }
-    writeFileSync(runtimeCredentialsPath, systemCredentials, 'utf-8')
-    writeFileSync(
-      runtimeConfigPath,
-      `${JSON.stringify({ oauthAccount: systemOauthAccount })}\n`,
-      'utf-8'
-    )
-    const managedAuthPath1 = createManagedClaudeAuth(
-      testState.userDataDir,
-      'account-1',
-      account1Credentials
-    )
-    const managedAuthPath2 = join(testState.userDataDir, 'claude-accounts', 'account-2', 'auth')
-    mkdirSync(managedAuthPath2, { recursive: true })
-    writeFileSync(join(managedAuthPath2, '.orca-managed-claude-auth'), 'account-2\n', 'utf-8')
-    writeFileSync(
-      join(managedAuthPath2, 'oauth-account.json'),
-      '{"accountUuid":"account-2"}\n',
-      'utf-8'
-    )
-    let settings = createSettings({
-      claudeManagedAccounts: [
-        createClaudeAccount('account-1', managedAuthPath1, { email: 'one@example.com' }),
-        createClaudeAccount('account-2', managedAuthPath2, { email: 'two@example.com' })
-      ],
-      activeClaudeManagedAccountId: null
-    })
-    const store = {
-      getSettings: vi.fn(() => settings),
-      updateSettings: vi.fn((updates: Partial<GlobalSettings>) => {
-        settings = {
-          ...settings,
-          ...updates,
-          notifications: {
-            ...settings.notifications,
-            ...updates.notifications
-          }
-        }
-        return settings
-      })
-    }
-
-    const { ClaudeRuntimeAuthService } = await import('./runtime-auth-service')
-    const service = new ClaudeRuntimeAuthService(store as never)
-    store.updateSettings({ activeClaudeManagedAccountId: 'account-1' })
-    await service.syncForCurrentSelection()
-    expect(readFileSync(runtimeCredentialsPath, 'utf-8')).toBe(account1Credentials)
-
-    store.updateSettings({ activeClaudeManagedAccountId: 'account-2' })
-    await service.syncForCurrentSelection()
-
-    expect(store.getSettings().activeClaudeManagedAccountId).toBeNull()
-    expect(readFileSync(runtimeCredentialsPath, 'utf-8')).toBe(systemCredentials)
-    expect(readRuntimeOauthAccountForTest()).toEqual(systemOauthAccount)
-  })
-
-  it('removes runtime credentials when deselecting with a missing system-default snapshot', async () => {
-    const runtimeCredentialsPath = join(testState.fakeHomeDir, '.claude', '.credentials.json')
-    const managedCredentials = createClaudeCredentialsJson('user@example.com', 'managed')
-    writeFileSync(runtimeCredentialsPath, managedCredentials, 'utf-8')
-    const managedAuthPath = createManagedClaudeAuth(
-      testState.userDataDir,
-      'account-1',
-      managedCredentials
-    )
-    const settings = createSettings({
-      claudeManagedAccounts: [createClaudeAccount('account-1', managedAuthPath)],
-      activeClaudeManagedAccountId: 'account-1'
-    })
-    const store = createStore(settings)
-
-    const { ClaudeRuntimeAuthService } = await import('./runtime-auth-service')
-    const service = new ClaudeRuntimeAuthService(store as never)
-
-    settings.activeClaudeManagedAccountId = null
-    await service.syncForCurrentSelection()
-
-    expect(existsSync(runtimeCredentialsPath)).toBe(false)
-    if (process.platform === 'darwin') {
-      expect(testState.scopedKeychainCredentials).toBeNull()
-      expect(testState.legacyKeychainCredentials).toBeNull()
-    }
-  })
-
-  it('preserves unreadable runtime credentials instead of overwriting unknown connector grants', async () => {
-    if (hostPlatform === 'win32') {
-      return
-    }
-
-    const warn = vi.spyOn(console, 'warn').mockImplementation(() => {})
-    const runtimeCredentialsPath = join(testState.fakeHomeDir, '.claude', '.credentials.json')
-    const managedCredentials = createClaudeCredentialsJson('user@example.com', 'managed')
-    const rotatedCredentials = createClaudeCredentialsJson('user@example.com', 'rotated')
-    const managedAuthPath = createManagedClaudeAuth(
-      testState.userDataDir,
-      'account-1',
-      managedCredentials
-    )
-    const settings = createSettings({
-      claudeManagedAccounts: [createClaudeAccount('account-1', managedAuthPath)]
-    })
-    const store = createStore(settings)
-
-    const { ClaudeRuntimeAuthService } = await import('./runtime-auth-service')
-    const service = new ClaudeRuntimeAuthService(store as never)
-    settings.activeClaudeManagedAccountId = 'account-1'
-    await service.syncForCurrentSelection()
-
-    testState.managedKeychainCredentials.set('account-1', rotatedCredentials)
-    writeFileSync(join(managedAuthPath, '.credentials.json'), rotatedCredentials, 'utf-8')
-    chmodSync(runtimeCredentialsPath, 0o000)
-    try {
-      await expect(service.syncForCurrentSelection()).rejects.toMatchObject({ code: 'EACCES' })
-    } finally {
-      if (existsSync(runtimeCredentialsPath)) {
-        chmodSync(runtimeCredentialsPath, 0o600)
-      }
-      warn.mockRestore()
-    }
-
-    expect(readFileSync(runtimeCredentialsPath, 'utf-8')).toBe(managedCredentials)
-    expect(testState.scopedKeychainCredentials).toBe(managedCredentials)
-  })
-
-  it('tightens credential file permissions when unchanged content is already present', async () => {
-    if (hostPlatform === 'win32') {
-      return
-    }
-
-    const runtimeCredentialsPath = join(testState.fakeHomeDir, '.claude', '.credentials.json')
-    const managedCredentials = createClaudeCredentialsJson('user@example.com', 'managed')
-    const managedAuthPath = createManagedClaudeAuth(
-      testState.userDataDir,
-      'account-1',
-      managedCredentials
-    )
-    const settings = createSettings({
-      claudeManagedAccounts: [createClaudeAccount('account-1', managedAuthPath)]
-    })
-    const store = createStore(settings)
-
-    const { ClaudeRuntimeAuthService } = await import('./runtime-auth-service')
-    const service = new ClaudeRuntimeAuthService(store as never)
-    settings.activeClaudeManagedAccountId = 'account-1'
-    await service.syncForCurrentSelection()
-    chmodSync(runtimeCredentialsPath, 0o644)
-    await service.syncForCurrentSelection()
-
-    expect(statSync(runtimeCredentialsPath).mode & 0o777).toBe(0o600)
-  })
-})
diff --git a/src/main/claude-accounts/runtime-auth-service-readback-identity.test.ts b/src/main/claude-accounts/runtime-auth-service-readback-identity.test.ts
deleted file mode 100644
index 2806d44e82a5..000000000000
--- a/src/main/claude-accounts/runtime-auth-service-readback-identity.test.ts
+++ /dev/null
@@ -1,607 +0,0 @@
-import {
-  cleanupRuntimeAuthTestState,
-  createClaudeAccount,
-  createClaudeCredentialsJson,
-  createClaudeCredentialsWithoutEmail,
-  createElectronMock,
-  createKeychainMock,
-  createManagedClaudeAuth,
-  createOauthRefreshMock,
-  createSettings,
-  createStore,
-  readManagedCredentialsForTest,
-  resetRuntimeAuthTestState,
-  setPlatform,
-  testState
-} from './runtime-auth-service-test-harness'
-import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest'
-import { readFileSync, writeFileSync } from 'node:fs'
-import { join } from 'node:path'
-
-vi.mock('electron', () => createElectronMock())
-
-vi.mock('./oauth-refresh', () => createOauthRefreshMock())
-
-vi.mock('node:os', async () => {
-  const actual = await vi.importActual<typeof import('node:os')>('node:os') // eslint-disable-line @typescript-eslint/consistent-type-imports -- vi.importActual requires inline import()
-  return {
-    ...actual,
-    homedir: () => testState.fakeHomeDir
-  }
-})
-
-vi.mock('./keychain', () => createKeychainMock())
-
-describe('ClaudeRuntimeAuthService', () => {
-  beforeEach(() => {
-    resetRuntimeAuthTestState()
-  })
-
-  afterEach(() => {
-    cleanupRuntimeAuthTestState()
-  })
-
-  it('reads back refreshed credentials when the Claude identity still matches', async () => {
-    const runtimeCredentialsPath = join(testState.fakeHomeDir, '.claude', '.credentials.json')
-    const originalCredentials = createClaudeCredentialsJson('user@example.com', 'original')
-    const refreshedCredentials = createClaudeCredentialsJson('user@example.com', 'refreshed')
-    const managedAuthPath = createManagedClaudeAuth(
-      testState.userDataDir,
-      'account-1',
-      originalCredentials
-    )
-    const settings = createSettings({
-      claudeManagedAccounts: [createClaudeAccount('account-1', managedAuthPath)]
-    })
-    const store = createStore(settings)
-
-    const { ClaudeRuntimeAuthService } = await import('./runtime-auth-service')
-    const service = new ClaudeRuntimeAuthService(store as never)
-    settings.activeClaudeManagedAccountId = 'account-1'
-    await service.syncForCurrentSelection()
-
-    writeFileSync(runtimeCredentialsPath, refreshedCredentials, 'utf-8')
-    await service.syncForCurrentSelection()
-
-    expect(readManagedCredentialsForTest('account-1', managedAuthPath)).toBe(refreshedCredentials)
-    expect(readFileSync(runtimeCredentialsPath, 'utf-8')).toBe(refreshedCredentials)
-  })
-
-  it('rejects wrong-shaped refreshed credentials during read-back', async () => {
-    const runtimeCredentialsPath = join(testState.fakeHomeDir, '.claude', '.credentials.json')
-    const originalCredentials = createClaudeCredentialsJson('user@example.com', 'original')
-    const malformedRefresh = `${JSON.stringify({
-      claudeAiOauth: {
-        email: 'user@example.com',
-        expiresAt: Date.now() + 120_000
-      }
-    })}\n`
-    const managedAuthPath = createManagedClaudeAuth(
-      testState.userDataDir,
-      'account-1',
-      originalCredentials
-    )
-    const settings = createSettings({
-      claudeManagedAccounts: [createClaudeAccount('account-1', managedAuthPath)]
-    })
-    const store = createStore(settings)
-
-    const { ClaudeRuntimeAuthService } = await import('./runtime-auth-service')
-    const service = new ClaudeRuntimeAuthService(store as never)
-    settings.activeClaudeManagedAccountId = 'account-1'
-    await service.syncForCurrentSelection()
-
-    writeFileSync(runtimeCredentialsPath, malformedRefresh, 'utf-8')
-    await service.syncForCurrentSelection()
-
-    expect(readManagedCredentialsForTest('account-1', managedAuthPath)).toBe(originalCredentials)
-    expect(readFileSync(runtimeCredentialsPath, 'utf-8')).toBe(originalCredentials)
-  })
-
-  it('reads back verified same-account credentials on first sync after restart', async () => {
-    const runtimeCredentialsPath = join(testState.fakeHomeDir, '.claude', '.credentials.json')
-    const originalCredentials = createClaudeCredentialsJson(
-      'user@example.com',
-      'original',
-      null,
-      1_000
-    )
-    const refreshedCredentials = createClaudeCredentialsJson(
-      'user@example.com',
-      'refreshed',
-      null,
-      2_000
-    )
-    writeFileSync(runtimeCredentialsPath, refreshedCredentials, 'utf-8')
-    const managedAuthPath = createManagedClaudeAuth(
-      testState.userDataDir,
-      'account-1',
-      originalCredentials
-    )
-    const settings = createSettings({
-      claudeManagedAccounts: [createClaudeAccount('account-1', managedAuthPath)],
-      activeClaudeManagedAccountId: 'account-1'
-    })
-    const store = createStore(settings)
-
-    const { ClaudeRuntimeAuthService } = await import('./runtime-auth-service')
-    const service = new ClaudeRuntimeAuthService(store as never)
-    await service.syncForCurrentSelection()
-
-    expect(readManagedCredentialsForTest('account-1', managedAuthPath)).toBe(refreshedCredentials)
-    expect(readFileSync(runtimeCredentialsPath, 'utf-8')).toBe(refreshedCredentials)
-  })
-
-  it('rejects older same-account Claude credentials on first sync after restart', async () => {
-    const runtimeCredentialsPath = join(testState.fakeHomeDir, '.claude', '.credentials.json')
-    const staleRuntimeCredentials = createClaudeCredentialsJson(
-      'user@example.com',
-      'stale',
-      null,
-      1_000
-    )
-    const managedCredentials = createClaudeCredentialsJson(
-      'user@example.com',
-      'managed-newer',
-      null,
-      2_000
-    )
-    writeFileSync(runtimeCredentialsPath, staleRuntimeCredentials, 'utf-8')
-    const managedAuthPath = createManagedClaudeAuth(
-      testState.userDataDir,
-      'account-1',
-      managedCredentials
-    )
-    const settings = createSettings({
-      claudeManagedAccounts: [createClaudeAccount('account-1', managedAuthPath)],
-      activeClaudeManagedAccountId: 'account-1'
-    })
-    const store = createStore(settings)
-
-    const { ClaudeRuntimeAuthService } = await import('./runtime-auth-service')
-    const service = new ClaudeRuntimeAuthService(store as never)
-    await service.syncForCurrentSelection()
-
-    expect(readManagedCredentialsForTest('account-1', managedAuthPath)).toBe(managedCredentials)
-    expect(readFileSync(runtimeCredentialsPath, 'utf-8')).toBe(managedCredentials)
-  })
-
-  it('rejects runtime read-back from a different Claude identity', async () => {
-    const runtimeCredentialsPath = join(testState.fakeHomeDir, '.claude', '.credentials.json')
-    const selectedCredentials = createClaudeCredentialsJson('user@example.com', 'selected')
-    const staleCredentials = createClaudeCredentialsJson('other@example.com', 'stale')
-    const managedAuthPath = createManagedClaudeAuth(
-      testState.userDataDir,
-      'account-1',
-      selectedCredentials
-    )
-    const settings = createSettings({
-      claudeManagedAccounts: [createClaudeAccount('account-1', managedAuthPath)]
-    })
-    const store = createStore(settings)
-
-    const { ClaudeRuntimeAuthService } = await import('./runtime-auth-service')
-    const service = new ClaudeRuntimeAuthService(store as never)
-    settings.activeClaudeManagedAccountId = 'account-1'
-    await service.syncForCurrentSelection()
-
-    writeFileSync(runtimeCredentialsPath, staleCredentials, 'utf-8')
-    await service.syncForCurrentSelection()
-
-    expect(readManagedCredentialsForTest('account-1', managedAuthPath)).toBe(selectedCredentials)
-    expect(readFileSync(runtimeCredentialsPath, 'utf-8')).toBe(selectedCredentials)
-  })
-
-  it('rejects runtime read-back from the same Claude email in a different organization', async () => {
-    const runtimeCredentialsPath = join(testState.fakeHomeDir, '.claude', '.credentials.json')
-    const selectedCredentials = createClaudeCredentialsJson('user@example.com', 'selected', 'org-b')
-    const staleCredentials = createClaudeCredentialsJson('user@example.com', 'stale', 'org-a')
-    const managedAuthPath = createManagedClaudeAuth(
-      testState.userDataDir,
-      'account-1',
-      selectedCredentials
-    )
-    const settings = createSettings({
-      claudeManagedAccounts: [
-        createClaudeAccount('account-1', managedAuthPath, { organizationUuid: 'org-b' })
-      ],
-      activeClaudeManagedAccountId: 'account-1'
-    })
-    const store = createStore(settings)
-
-    const { ClaudeRuntimeAuthService } = await import('./runtime-auth-service')
-    const service = new ClaudeRuntimeAuthService(store as never)
-    await service.syncForCurrentSelection()
-
-    writeFileSync(runtimeCredentialsPath, staleCredentials, 'utf-8')
-    await service.syncForCurrentSelection()
-
-    expect(readManagedCredentialsForTest('account-1', managedAuthPath)).toBe(selectedCredentials)
-    expect(readFileSync(runtimeCredentialsPath, 'utf-8')).toBe(selectedCredentials)
-  })
-
-  it('rejects same-email Claude read-back using stored managed organization identity', async () => {
-    const runtimeCredentialsPath = join(testState.fakeHomeDir, '.claude', '.credentials.json')
-    const selectedCredentials = createClaudeCredentialsJson('user@example.com', 'selected', 'org-b')
-    const staleCredentials = createClaudeCredentialsJson('user@example.com', 'stale', 'org-a')
-    const managedAuthPath = createManagedClaudeAuth(
-      testState.userDataDir,
-      'account-1',
-      selectedCredentials
-    )
-    const settings = createSettings({
-      claudeManagedAccounts: [createClaudeAccount('account-1', managedAuthPath)]
-    })
-    const store = createStore(settings)
-
-    const { ClaudeRuntimeAuthService } = await import('./runtime-auth-service')
-    const service = new ClaudeRuntimeAuthService(store as never)
-    settings.activeClaudeManagedAccountId = 'account-1'
-    await service.syncForCurrentSelection()
-
-    writeFileSync(runtimeCredentialsPath, staleCredentials, 'utf-8')
-    await service.syncForCurrentSelection()
-
-    expect(readManagedCredentialsForTest('account-1', managedAuthPath)).toBe(selectedCredentials)
-    expect(readFileSync(runtimeCredentialsPath, 'utf-8')).toBe(selectedCredentials)
-  })
-
-  it('rejects same-email Claude read-back using stored oauth-account organization identity', async () => {
-    const runtimeCredentialsPath = join(testState.fakeHomeDir, '.claude', '.credentials.json')
-    const selectedCredentials = createClaudeCredentialsJson('user@example.com', 'selected')
-    const staleCredentials = createClaudeCredentialsJson('user@example.com', 'stale', 'org-a')
-    const managedAuthPath = createManagedClaudeAuth(
-      testState.userDataDir,
-      'account-1',
-      selectedCredentials,
-      '{"organizationUuid":"org-b"}\n'
-    )
-    const settings = createSettings({
-      claudeManagedAccounts: [createClaudeAccount('account-1', managedAuthPath)],
-      activeClaudeManagedAccountId: 'account-1'
-    })
-    const store = createStore(settings)
-
-    const { ClaudeRuntimeAuthService } = await import('./runtime-auth-service')
-    const service = new ClaudeRuntimeAuthService(store as never)
-    await service.syncForCurrentSelection()
-
-    writeFileSync(runtimeCredentialsPath, staleCredentials, 'utf-8')
-    await service.syncForCurrentSelection()
-
-    expect(readManagedCredentialsForTest('account-1', managedAuthPath)).toBe(selectedCredentials)
-    expect(readFileSync(runtimeCredentialsPath, 'utf-8')).toBe(selectedCredentials)
-  })
-
-  it('rejects no-email Claude read-back when organization identity conflicts', async () => {
-    const runtimeCredentialsPath = join(testState.fakeHomeDir, '.claude', '.credentials.json')
-    const selectedCredentials = createClaudeCredentialsJson('user@example.com', 'selected', 'org-b')
-    const staleCredentials = createClaudeCredentialsWithoutEmail('stale', 'org-a')
-    const managedAuthPath = createManagedClaudeAuth(
-      testState.userDataDir,
-      'account-1',
-      selectedCredentials
-    )
-    const settings = createSettings({
-      claudeManagedAccounts: [
-        createClaudeAccount('account-1', managedAuthPath, { organizationUuid: 'org-b' })
-      ],
-      activeClaudeManagedAccountId: 'account-1'
-    })
-    const store = createStore(settings)
-
-    const { ClaudeRuntimeAuthService } = await import('./runtime-auth-service')
-    const service = new ClaudeRuntimeAuthService(store as never)
-    await service.syncForCurrentSelection()
-
-    writeFileSync(runtimeCredentialsPath, staleCredentials, 'utf-8')
-    await service.syncForCurrentSelection()
-
-    expect(readManagedCredentialsForTest('account-1', managedAuthPath)).toBe(selectedCredentials)
-    expect(readFileSync(runtimeCredentialsPath, 'utf-8')).toBe(selectedCredentials)
-  })
-
-  it('rejects no-email refreshed credentials even when organization identity matches', async () => {
-    const runtimeCredentialsPath = join(testState.fakeHomeDir, '.claude', '.credentials.json')
-    const originalCredentials = createClaudeCredentialsJson('user@example.com', 'original', 'org-a')
-    const refreshedCredentials = createClaudeCredentialsWithoutEmail('refreshed', 'org-a')
-    const managedAuthPath = createManagedClaudeAuth(
-      testState.userDataDir,
-      'account-1',
-      originalCredentials
-    )
-    const settings = createSettings({
-      claudeManagedAccounts: [
-        createClaudeAccount('account-1', managedAuthPath, { organizationUuid: 'org-a' })
-      ],
-      activeClaudeManagedAccountId: 'account-1'
-    })
-    const store = createStore(settings)
-
-    const { ClaudeRuntimeAuthService } = await import('./runtime-auth-service')
-    const service = new ClaudeRuntimeAuthService(store as never)
-    await service.syncForCurrentSelection()
-
-    writeFileSync(runtimeCredentialsPath, refreshedCredentials, 'utf-8')
-    await service.syncForCurrentSelection()
-
-    expect(readManagedCredentialsForTest('account-1', managedAuthPath)).toBe(originalCredentials)
-    expect(readFileSync(runtimeCredentialsPath, 'utf-8')).toBe(originalCredentials)
-  })
-
-  it('preserves rejected runtime refreshes while a Claude terminal is live on Windows', async () => {
-    setPlatform('win32')
-    const runtimeCredentialsPath = join(testState.fakeHomeDir, '.claude', '.credentials.json')
-    const originalCredentials = createClaudeCredentialsJson('user@example.com', 'original', 'org-a')
-    const refreshedCredentials = createClaudeCredentialsWithoutEmail('refreshed', 'org-a')
-    const managedAuthPath = createManagedClaudeAuth(
-      testState.userDataDir,
-      'account-1',
-      originalCredentials
-    )
-    const settings = createSettings({
-      claudeManagedAccounts: [
-        createClaudeAccount('account-1', managedAuthPath, { organizationUuid: 'org-a' })
-      ],
-      activeClaudeManagedAccountId: 'account-1'
-    })
-    const store = createStore(settings)
-
-    const { ClaudeRuntimeAuthService } = await import('./runtime-auth-service')
-    const { markClaudePtyExited, markClaudePtySpawned } = await import('./live-pty-gate')
-    const service = new ClaudeRuntimeAuthService(store as never)
-    await service.syncForCurrentSelection()
-
-    markClaudePtySpawned('live-claude-pty')
-    try {
-      writeFileSync(runtimeCredentialsPath, refreshedCredentials, 'utf-8')
-      await service.syncForCurrentSelection()
-
-      expect(readManagedCredentialsForTest('account-1', managedAuthPath)).toBe(refreshedCredentials)
-      expect(readFileSync(runtimeCredentialsPath, 'utf-8')).toBe(refreshedCredentials)
-    } finally {
-      markClaudePtyExited('live-claude-pty')
-    }
-
-    await service.syncForCurrentSelection()
-
-    expect(readFileSync(runtimeCredentialsPath, 'utf-8')).toBe(refreshedCredentials)
-  })
-
-  it('does not persist live runtime refreshes with conflicting organization identity', async () => {
-    setPlatform('win32')
-    const runtimeCredentialsPath = join(testState.fakeHomeDir, '.claude', '.credentials.json')
-    const originalCredentials = createClaudeCredentialsJson('user@example.com', 'original', 'org-a')
-    const conflictingCredentials = createClaudeCredentialsWithoutEmail('refreshed', 'org-b')
-    const managedAuthPath = createManagedClaudeAuth(
-      testState.userDataDir,
-      'account-1',
-      originalCredentials
-    )
-    const settings = createSettings({
-      claudeManagedAccounts: [
-        createClaudeAccount('account-1', managedAuthPath, { organizationUuid: 'org-a' })
-      ],
-      activeClaudeManagedAccountId: 'account-1'
-    })
-    const store = createStore(settings)
-
-    const { ClaudeRuntimeAuthService } = await import('./runtime-auth-service')
-    const { markClaudePtyExited, markClaudePtySpawned } = await import('./live-pty-gate')
-    const service = new ClaudeRuntimeAuthService(store as never)
-    await service.syncForCurrentSelection()
-
-    markClaudePtySpawned('live-claude-pty')
-    try {
-      writeFileSync(runtimeCredentialsPath, conflictingCredentials, 'utf-8')
-      await service.syncForCurrentSelection()
-
-      expect(readManagedCredentialsForTest('account-1', managedAuthPath)).toBe(originalCredentials)
-      expect(readFileSync(runtimeCredentialsPath, 'utf-8')).toBe(conflictingCredentials)
-    } finally {
-      markClaudePtyExited('live-claude-pty')
-    }
-  })
-
-  it('rematerializes managed credentials over a wiped runtime blob while a Claude terminal is live', async () => {
-    setPlatform('win32')
-    const runtimeCredentialsPath = join(testState.fakeHomeDir, '.claude', '.credentials.json')
-    const originalCredentials = createClaudeCredentialsJson('user@example.com', 'original', 'org-a')
-    // Why: Claude CLI wipes tokens in place (keeps identity fields) after an
-    // invalid_grant refresh — the exact blob shape this regression guards.
-    const parsedOriginal = JSON.parse(originalCredentials) as {
-      claudeAiOauth: Record<string, unknown>
-    }
-    const wipedCredentials = `${JSON.stringify({
-      claudeAiOauth: {
-        ...parsedOriginal.claudeAiOauth,
-        accessToken: '',
-        refreshToken: '',
-        expiresAt: 0
-      }
-    })}\n`
-    const managedAuthPath = createManagedClaudeAuth(
-      testState.userDataDir,
-      'account-1',
-      originalCredentials
-    )
-    const settings = createSettings({
-      claudeManagedAccounts: [
-        createClaudeAccount('account-1', managedAuthPath, { organizationUuid: 'org-a' })
-      ],
-      activeClaudeManagedAccountId: 'account-1'
-    })
-    const store = createStore(settings)
-
-    const { ClaudeRuntimeAuthService } = await import('./runtime-auth-service')
-    const { markClaudePtyExited, markClaudePtySpawned } = await import('./live-pty-gate')
-    const service = new ClaudeRuntimeAuthService(store as never)
-    await service.syncForCurrentSelection()
-
-    markClaudePtySpawned('live-claude-pty')
-    try {
-      writeFileSync(runtimeCredentialsPath, wipedCredentials, 'utf-8')
-      await service.syncForCurrentSelection()
-
-      expect(readManagedCredentialsForTest('account-1', managedAuthPath)).toBe(originalCredentials)
-      expect(readFileSync(runtimeCredentialsPath, 'utf-8')).toBe(originalCredentials)
-    } finally {
-      markClaudePtyExited('live-claude-pty')
-    }
-  })
-
-  it('rejects unverifiable refreshed runtime credentials', async () => {
-    const runtimeCredentialsPath = join(testState.fakeHomeDir, '.claude', '.credentials.json')
-    const originalCredentials = createClaudeCredentialsWithoutEmail('original')
-    const refreshedCredentials = createClaudeCredentialsWithoutEmail('refreshed')
-    const managedAuthPath = createManagedClaudeAuth(
-      testState.userDataDir,
-      'account-1',
-      originalCredentials
-    )
-    const settings = createSettings({
-      claudeManagedAccounts: [createClaudeAccount('account-1', managedAuthPath)],
-      activeClaudeManagedAccountId: 'account-1'
-    })
-    const store = createStore(settings)
-
-    const { ClaudeRuntimeAuthService } = await import('./runtime-auth-service')
-    const service = new ClaudeRuntimeAuthService(store as never)
-    await service.syncForCurrentSelection()
-
-    writeFileSync(runtimeCredentialsPath, refreshedCredentials, 'utf-8')
-    await service.syncForCurrentSelection()
-    await service.syncForCurrentSelection()
-
-    expect(readManagedCredentialsForTest('account-1', managedAuthPath)).toBe(originalCredentials)
-    expect(readFileSync(runtimeCredentialsPath, 'utf-8')).toBe(originalCredentials)
-  })
-
-  it('reads back identity-less refreshed credentials when the refresh token matches', async () => {
-    const runtimeCredentialsPath = join(testState.fakeHomeDir, '.claude', '.credentials.json')
-    const refreshToken = 'same-managed-refresh-token'
-    const originalCredentials = createClaudeCredentialsWithoutEmail('original', null, {
-      expiresAt: 1_000,
-      refreshToken
-    })
-    const refreshedCredentials = createClaudeCredentialsWithoutEmail('refreshed', null, {
-      expiresAt: 2_000,
-      refreshToken
-    })
-    const managedAuthPath = createManagedClaudeAuth(
-      testState.userDataDir,
-      'account-1',
-      originalCredentials
-    )
-    const settings = createSettings({
-      claudeManagedAccounts: [
-        createClaudeAccount('account-1', managedAuthPath, { organizationUuid: 'org-from-account' })
-      ],
-      activeClaudeManagedAccountId: 'account-1'
-    })
-    const store = createStore(settings)
-
-    const { ClaudeRuntimeAuthService } = await import('./runtime-auth-service')
-    const service = new ClaudeRuntimeAuthService(store as never)
-    await service.syncForCurrentSelection()
-
-    writeFileSync(runtimeCredentialsPath, refreshedCredentials, 'utf-8')
-    await service.syncForCurrentSelection()
-
-    expect(readManagedCredentialsForTest('account-1', managedAuthPath)).toBe(refreshedCredentials)
-    expect(readFileSync(runtimeCredentialsPath, 'utf-8')).toBe(refreshedCredentials)
-  })
-
-  it('reads back identity-less refreshed credentials when runtime oauth metadata matches', async () => {
-    const runtimeCredentialsPath = join(testState.fakeHomeDir, '.claude', '.credentials.json')
-    const runtimeConfigPath = join(testState.fakeHomeDir, '.claude.json')
-    const originalCredentials = createClaudeCredentialsJson(
-      'user@example.com',
-      'original',
-      'org-a',
-      1_000
-    )
-    const refreshedCredentials = createClaudeCredentialsWithoutEmail('refreshed', null, {
-      expiresAt: 2_000,
-      refreshToken: 'rotated-refresh-token'
-    })
-    writeFileSync(runtimeConfigPath, '{}\n', 'utf-8')
-    const managedAuthPath = createManagedClaudeAuth(
-      testState.userDataDir,
-      'account-1',
-      originalCredentials,
-      '{"accountUuid":"account-uuid-1","emailAddress":"user@example.com","organizationUuid":"org-a"}\n'
-    )
-    const settings = createSettings({
-      claudeManagedAccounts: [
-        createClaudeAccount('account-1', managedAuthPath, {
-          email: 'user@example.com',
-          organizationUuid: 'org-a'
-        })
-      ],
-      activeClaudeManagedAccountId: 'account-1'
-    })
-    const store = createStore(settings)
-
-    const { ClaudeRuntimeAuthService } = await import('./runtime-auth-service')
-    const service = new ClaudeRuntimeAuthService(store as never)
-    await service.syncForCurrentSelection()
-
-    writeFileSync(runtimeCredentialsPath, refreshedCredentials, 'utf-8')
-    await service.syncForCurrentSelection()
-
-    expect(readManagedCredentialsForTest('account-1', managedAuthPath)).toBe(refreshedCredentials)
-    expect(readFileSync(runtimeCredentialsPath, 'utf-8')).toBe(refreshedCredentials)
-  })
-
-  it('rules out other identity-less accounts with different refresh tokens', async () => {
-    const runtimeCredentialsPath = join(testState.fakeHomeDir, '.claude', '.credentials.json')
-    const account1RefreshToken = 'account-1-refresh-token'
-    const account1OriginalCredentials = createClaudeCredentialsWithoutEmail('account-1', null, {
-      expiresAt: 1_000,
-      refreshToken: account1RefreshToken
-    })
-    const account1RefreshedCredentials = createClaudeCredentialsWithoutEmail(
-      'account-1-refreshed',
-      null,
-      {
-        expiresAt: 2_000,
-        refreshToken: account1RefreshToken
-      }
-    )
-    const account2Credentials = createClaudeCredentialsWithoutEmail('account-2', null, {
-      refreshToken: 'account-2-refresh-token'
-    })
-    const managedAuthPath1 = createManagedClaudeAuth(
-      testState.userDataDir,
-      'account-1',
-      account1OriginalCredentials
-    )
-    const managedAuthPath2 = createManagedClaudeAuth(
-      testState.userDataDir,
-      'account-2',
-      account2Credentials
-    )
-    const settings = createSettings({
-      claudeManagedAccounts: [
-        createClaudeAccount('account-1', managedAuthPath1),
-        createClaudeAccount('account-2', managedAuthPath2, { email: 'other@example.com' })
-      ],
-      activeClaudeManagedAccountId: 'account-1'
-    })
-    const store = createStore(settings)
-
-    const { ClaudeRuntimeAuthService } = await import('./runtime-auth-service')
-    const service = new ClaudeRuntimeAuthService(store as never)
-    await service.syncForCurrentSelection()
-
-    writeFileSync(runtimeCredentialsPath, account1RefreshedCredentials, 'utf-8')
-    await service.syncForCurrentSelection()
-
-    expect(readManagedCredentialsForTest('account-1', managedAuthPath1)).toBe(
-      account1RefreshedCredentials
-    )
-    expect(readManagedCredentialsForTest('account-2', managedAuthPath2)).toBe(account2Credentials)
-    expect(readFileSync(runtimeCredentialsPath, 'utf-8')).toBe(account1RefreshedCredentials)
-  })
-})
diff --git a/src/main/claude-accounts/runtime-auth-service-shared-credential-failures.test.ts b/src/main/claude-accounts/runtime-auth-service-shared-credential-failures.test.ts
deleted file mode 100644
index 4066063c5625..000000000000
--- a/src/main/claude-accounts/runtime-auth-service-shared-credential-failures.test.ts
+++ /dev/null
@@ -1,85 +0,0 @@
-import {
-  cleanupRuntimeAuthTestState,
-  createElectronMock,
-  createKeychainMock,
-  createOauthRefreshMock,
-  resetRuntimeAuthTestState,
-  testState
-} from './runtime-auth-service-test-harness'
-import {
-  createSharedCredentialRuntime,
-  sharedFields,
-  withSharedFields
-} from './runtime-auth-shared-credentials-fixture'
-import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest'
-import { readFileSync, writeFileSync } from 'node:fs'
-
-vi.mock('electron', () => createElectronMock())
-vi.mock('./oauth-refresh', () => createOauthRefreshMock())
-vi.mock('./keychain', () => createKeychainMock())
-vi.mock('node:os', async () => {
-  const actual = await vi.importActual<typeof import('node:os')>('node:os') // eslint-disable-line @typescript-eslint/consistent-type-imports -- vi.importActual requires inline import()
-  return { ...actual, homedir: () => testState.fakeHomeDir }
-})
-
-describe('shared connector credential write failures', () => {
-  beforeEach(resetRuntimeAuthTestState)
-  afterEach(cleanupRuntimeAuthTestState)
-
-  it('keeps the committed baseline across a partial rollback so a rotated grant can be retried', async () => {
-    const { service, settings, runtimePath, first } = await createSharedCredentialRuntime()
-    settings.activeClaudeManagedAccountId = 'first'
-    await service.syncForCurrentSelection()
-    const rotated = {
-      ...sharedFields,
-      mcpOAuth: { figma: { accessToken: 'new-access', refreshToken: 'new-refresh' } }
-    }
-    testState.scopedKeychainCredentials = withSharedFields(first, rotated)
-    settings.activeClaudeManagedAccountId = 'second'
-    testState.throwLegacyRuntimeKeychainWrite = true
-    await expect(service.syncForCurrentSelection()).rejects.toThrow(
-      'legacy runtime keychain write failed'
-    )
-    expect(JSON.parse(readFileSync(runtimePath, 'utf-8'))).toMatchObject(rotated)
-    testState.throwLegacyRuntimeKeychainWrite = false
-    settings.activeClaudeManagedAccountId = 'first'
-    await service.forceMaterializeCurrentSelectionForRollback()
-    expect(JSON.parse(readFileSync(runtimePath, 'utf-8'))).toMatchObject(rotated)
-    expect(JSON.parse(readFileSync(runtimePath, 'utf-8')).claudeAiOauth.accessToken).toBe('first')
-    expect(testState.scopedKeychainCredentials).toBe(readFileSync(runtimePath, 'utf-8'))
-    expect(testState.legacyKeychainCredentials).toBe(testState.scopedKeychainCredentials)
-  })
-
-  it('preserves disjoint live grants when the first switch fails after writing only the scoped item', async () => {
-    const { service, settings, runtimePath, system } = await createSharedCredentialRuntime()
-    const figma = sharedFields.mcpOAuth.figma
-    testState.scopedKeychainCredentials = withSharedFields(system, {
-      ...sharedFields,
-      mcpOAuth: { figma }
-    })
-    testState.legacyKeychainCredentials = withSharedFields(system, {
-      ...sharedFields,
-      mcpOAuth: { notion: { accessToken: 'notion-access', refreshToken: 'notion-refresh' } }
-    })
-    writeFileSync(runtimePath, system)
-    settings.activeClaudeManagedAccountId = 'first'
-    testState.throwLegacyRuntimeKeychainWrite = true
-    await expect(service.syncForCurrentSelection()).rejects.toThrow(
-      'legacy runtime keychain write failed'
-    )
-    expect(JSON.parse(readFileSync(runtimePath, 'utf-8')).mcpOAuth).toEqual({
-      figma,
-      notion: { accessToken: 'notion-access', refreshToken: 'notion-refresh' }
-    })
-    testState.throwLegacyRuntimeKeychainWrite = false
-    await service.syncForCurrentSelection()
-    const runtime = JSON.parse(readFileSync(runtimePath, 'utf-8'))
-    expect(runtime.mcpOAuth).toEqual({
-      figma,
-      notion: { accessToken: 'notion-access', refreshToken: 'notion-refresh' }
-    })
-    expect(runtime.claudeAiOauth.accessToken).toBe('first')
-    expect(testState.scopedKeychainCredentials).toBe(readFileSync(runtimePath, 'utf-8'))
-    expect(testState.legacyKeychainCredentials).toBe(testState.scopedKeychainCredentials)
-  })
-})
diff --git a/src/main/claude-accounts/runtime-auth-service-shared-credentials.test.ts b/src/main/claude-accounts/runtime-auth-service-shared-credentials.test.ts
deleted file mode 100644
index f3bb1f001378..000000000000
--- a/src/main/claude-accounts/runtime-auth-service-shared-credentials.test.ts
+++ /dev/null
@@ -1,292 +0,0 @@
-import {
-  cleanupRuntimeAuthTestState,
-  createClaudeCredentialsJson,
-  createElectronMock,
-  createKeychainMock,
-  createOauthRefreshMock,
-  createStore,
-  readManagedCredentialsForTest,
-  resetRuntimeAuthTestState,
-  testState
-} from './runtime-auth-service-test-harness'
-import {
-  createSharedCredentialRuntime,
-  sharedFields,
-  withSharedFields
-} from './runtime-auth-shared-credentials-fixture'
-import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest'
-import { existsSync, readFileSync, rmSync, writeFileSync } from 'node:fs'
-import { join } from 'node:path'
-
-vi.mock('electron', () => createElectronMock())
-vi.mock('./oauth-refresh', () => createOauthRefreshMock())
-vi.mock('./keychain', () => createKeychainMock())
-vi.mock('node:os', async () => {
-  const actual = await vi.importActual<typeof import('node:os')>('node:os') // eslint-disable-line @typescript-eslint/consistent-type-imports -- vi.importActual requires inline import()
-  return { ...actual, homedir: () => testState.fakeHomeDir }
-})
-
-describe('shared Claude connector credentials', () => {
-  beforeEach(resetRuntimeAuthTestState)
-  afterEach(cleanupRuntimeAuthTestState)
-
-  it.each(['scoped', 'legacy', 'file'] as const)(
-    'preserves connector grants stored only in %s when there is no previous Orca write',
-    async (surface) => {
-      const { service, settings, runtimePath, system } = await createSharedCredentialRuntime()
-      testState.scopedKeychainCredentials = system
-      testState.legacyKeychainCredentials = system
-      writeFileSync(runtimePath, system)
-      if (surface === 'scoped') {
-        testState.scopedKeychainCredentials = withSharedFields(system)
-      } else if (surface === 'legacy') {
-        testState.legacyKeychainCredentials = withSharedFields(system)
-      } else {
-        writeFileSync(runtimePath, withSharedFields(system))
-      }
-      settings.activeClaudeManagedAccountId = 'first'
-      await service.syncForCurrentSelection()
-      expect(JSON.parse(readFileSync(runtimePath, 'utf-8'))).toMatchObject(sharedFields)
-    }
-  )
-
-  it.each(['darwin', 'linux', 'win32'] as const)(
-    'excludes connector secrets when capturing a managed account on %s',
-    async (platform) => {
-      const { firstPath, first } = await createSharedCredentialRuntime(platform)
-      const { ClaudeManagedAuthStorage } = await import('./claude-managed-auth-storage')
-      await new ClaudeManagedAuthStorage().writeCredentials(
-        'first',
-        firstPath,
-        withSharedFields(first)
-      )
-      expect(JSON.parse(readManagedCredentialsForTest('first', firstPath) ?? '')).toEqual(
-        JSON.parse(first)
-      )
-    }
-  )
-
-  it.each(['scoped', 'legacy', 'file'] as const)(
-    'propagates connector revocations from the %s surface and does not resurrect frozen account grants',
-    async (surface) => {
-      const { service, settings, runtimePath, first, secondPath, second } =
-        await createSharedCredentialRuntime()
-      settings.activeClaudeManagedAccountId = 'first'
-      await service.syncForCurrentSelection()
-      if (surface === 'scoped') {
-        testState.scopedKeychainCredentials = first
-      } else if (surface === 'legacy') {
-        testState.legacyKeychainCredentials = first
-      } else {
-        writeFileSync(runtimePath, first)
-      }
-      testState.managedKeychainCredentials.set('second', withSharedFields(second))
-      writeFileSync(join(secondPath, '.credentials.json'), withSharedFields(second))
-      settings.activeClaudeManagedAccountId = 'second'
-      await service.syncForCurrentSelection()
-      expect(JSON.parse(readFileSync(runtimePath, 'utf-8'))).toEqual(JSON.parse(second))
-      expect(JSON.parse(testState.scopedKeychainCredentials ?? '')).toEqual(JSON.parse(second))
-      expect(JSON.parse(testState.legacyKeychainCredentials ?? '')).toEqual(JSON.parse(second))
-    }
-  )
-
-  it('preserves grants refreshed only in the keychain when returning to the system default', async () => {
-    const { service, settings, runtimePath, first, system } = await createSharedCredentialRuntime()
-    settings.activeClaudeManagedAccountId = 'first'
-    await service.syncForCurrentSelection()
-    const rotated = {
-      ...sharedFields,
-      mcpOAuth: { figma: { accessToken: 'rotated', refreshToken: 'rotated' } }
-    }
-    testState.legacyKeychainCredentials = withSharedFields(first, rotated)
-    settings.activeClaudeManagedAccountId = null
-    await service.syncForCurrentSelection()
-    expect(JSON.parse(readFileSync(runtimePath, 'utf-8'))).toMatchObject(rotated)
-    expect(JSON.parse(testState.scopedKeychainCredentials ?? '')).toMatchObject(rotated)
-    expect(JSON.parse(testState.legacyKeychainCredentials ?? '')).toMatchObject(rotated)
-    const nextRotation = {
-      ...sharedFields,
-      mcpOAuth: { figma: { accessToken: 'rotated-again', refreshToken: 'rotated-again' } }
-    }
-    testState.scopedKeychainCredentials = withSharedFields(system, nextRotation)
-    settings.activeClaudeManagedAccountId = 'first'
-    await service.syncForCurrentSelection()
-    expect(JSON.parse(readFileSync(runtimePath, 'utf-8'))).toMatchObject(nextRotation)
-    expect(JSON.parse(testState.legacyKeychainCredentials ?? '')).toMatchObject(nextRotation)
-  })
-
-  it.each(['darwin', 'linux', 'win32'] as const)(
-    'keeps connector grants through account switches, syncs, restart, and deselect on %s',
-    async (platform) => {
-      const state = await createSharedCredentialRuntime(platform)
-      const { service, settings, runtimePath, first, second, firstPath, secondPath } = state
-      for (const id of ['first', 'second', 'first']) {
-        settings.activeClaudeManagedAccountId = id
-        await service.syncForCurrentSelection()
-        await service.syncForCurrentSelection()
-        const runtime = JSON.parse(readFileSync(runtimePath, 'utf-8'))
-        expect(runtime).toMatchObject(sharedFields)
-        expect(runtime.claudeAiOauth.accessToken).toBe(id)
-        if (platform === 'darwin') {
-          expect(testState.scopedKeychainCredentials).toBe(readFileSync(runtimePath, 'utf-8'))
-          expect(testState.legacyKeychainCredentials).toBe(testState.scopedKeychainCredentials)
-        }
-      }
-      expect(JSON.parse(readManagedCredentialsForTest('first', firstPath) ?? '')).toEqual(
-        JSON.parse(first)
-      )
-      expect(JSON.parse(readManagedCredentialsForTest('second', secondPath) ?? '')).toEqual(
-        JSON.parse(second)
-      )
-      const rotated = {
-        ...sharedFields,
-        mcpOAuth: { figma: { accessToken: 'rotated-access', refreshToken: 'rotated-refresh' } }
-      }
-      const live = withSharedFields(first, rotated)
-      writeFileSync(runtimePath, live)
-      testState.scopedKeychainCredentials = live
-      testState.legacyKeychainCredentials = live
-      const { ClaudeRuntimeAuthService } = await import('./runtime-auth-service')
-      // oxlint-disable-next-line typescript/consistent-type-assertions -- SAFETY: Runtime auth uses only getSettings/updateSettings from this store mock.
-      const restarted = new ClaudeRuntimeAuthService(createStore(settings) as never)
-      await restarted.syncForCurrentSelection()
-      settings.activeClaudeManagedAccountId = null
-      await restarted.syncForCurrentSelection()
-      const restored = JSON.parse(readFileSync(runtimePath, 'utf-8'))
-      expect(restored).toMatchObject(rotated)
-      expect(restored.claudeAiOauth.accessToken).toBe('system')
-      if (platform === 'darwin') {
-        expect(JSON.parse(testState.scopedKeychainCredentials ?? '')).toMatchObject(rotated)
-        expect(JSON.parse(testState.legacyKeychainCredentials ?? '')).toMatchObject(rotated)
-      }
-    }
-  )
-
-  it.each(['scoped', 'legacy', 'file'] as const)(
-    'preserves MCP rotations written only to the %s surface while adopting a Claude refresh',
-    async (surface) => {
-      const { service, settings, runtimePath, firstPath } = await createSharedCredentialRuntime()
-      settings.activeClaudeManagedAccountId = 'first'
-      await service.syncForCurrentSelection()
-      const refreshed = createClaudeCredentialsJson(
-        'first@example.com',
-        'refreshed',
-        null,
-        Date.now() + 120_000
-      )
-      const rotated = {
-        ...sharedFields,
-        mcpOAuth: { figma: { accessToken: 'new-access', refreshToken: 'new-refresh' } }
-      }
-      const live = withSharedFields(refreshed, rotated)
-      if (surface === 'scoped') {
-        testState.scopedKeychainCredentials = live
-      }
-      if (surface === 'legacy') {
-        testState.legacyKeychainCredentials = live
-      }
-      if (surface === 'file') {
-        writeFileSync(runtimePath, live)
-      }
-      await service.syncForCurrentSelection()
-      expect(JSON.parse(readFileSync(runtimePath, 'utf-8'))).toMatchObject(rotated)
-      expect(JSON.parse(readManagedCredentialsForTest('first', firstPath) ?? '')).toEqual(
-        JSON.parse(refreshed)
-      )
-    }
-  )
-
-  it('preserves conflicting MCP grants after restart even when the Claude account token is newer', async () => {
-    const { service, settings, runtimePath, firstPath } = await createSharedCredentialRuntime()
-    settings.activeClaudeManagedAccountId = 'first'
-    await service.syncForCurrentSelection()
-    const refreshed = createClaudeCredentialsJson(
-      'first@example.com',
-      'refreshed',
-      null,
-      Date.now() + 120_000
-    )
-    const rotated = {
-      ...sharedFields,
-      mcpOAuth: { figma: { accessToken: 'new-access', refreshToken: 'new-refresh' } }
-    }
-    testState.legacyKeychainCredentials = withSharedFields(refreshed, rotated)
-    const { ClaudeRuntimeAuthService } = await import('./runtime-auth-service')
-    // oxlint-disable-next-line typescript/consistent-type-assertions -- SAFETY: Runtime auth uses only getSettings/updateSettings from this store mock.
-    const restarted = new ClaudeRuntimeAuthService(createStore(settings) as never)
-    await expect(restarted.syncForCurrentSelection()).rejects.toThrow(
-      'live connector credentials conflict'
-    )
-    expect(JSON.parse(readFileSync(runtimePath, 'utf-8'))).toMatchObject(sharedFields)
-    expect(JSON.parse(testState.scopedKeychainCredentials ?? '')).toMatchObject(sharedFields)
-    expect(JSON.parse(testState.legacyKeychainCredentials ?? '')).toMatchObject(rotated)
-    expect(JSON.parse(readManagedCredentialsForTest('first', firstPath) ?? '')).toEqual(
-      JSON.parse(refreshed)
-    )
-  })
-
-  it('leaves all credentials untouched when the active keychain cannot be read', async () => {
-    const { service, settings, runtimePath } = await createSharedCredentialRuntime()
-    settings.activeClaudeManagedAccountId = 'first'
-    await service.syncForCurrentSelection()
-    const before = readFileSync(runtimePath, 'utf-8')
-    settings.activeClaudeManagedAccountId = 'second'
-    testState.throwScopedKeychainRead = true
-    const warn = vi.spyOn(console, 'warn').mockImplementation(() => {})
-    await expect(service.syncForCurrentSelection()).rejects.toThrow('scoped keychain read failed')
-    expect(readFileSync(runtimePath, 'utf-8')).toBe(before)
-    expect(testState.scopedKeychainCredentials).toBe(before)
-    expect(testState.legacyKeychainCredentials).toBe(before)
-    testState.throwScopedKeychainRead = false
-    await service.syncForCurrentSelection()
-    expect(JSON.parse(readFileSync(runtimePath, 'utf-8'))).toMatchObject(sharedFields)
-    expect(JSON.parse(readFileSync(runtimePath, 'utf-8')).claudeAiOauth.accessToken).toBe('second')
-    warn.mockRestore()
-  })
-
-  it.each(['scoped', 'legacy', 'file'] as const)(
-    'refuses to overwrite malformed live credentials in the %s surface',
-    async (surface) => {
-      const { service, settings, runtimePath } = await createSharedCredentialRuntime()
-      settings.activeClaudeManagedAccountId = 'first'
-      await service.syncForCurrentSelection()
-      if (surface === 'scoped') {
-        testState.scopedKeychainCredentials = '{broken'
-      } else if (surface === 'legacy') {
-        testState.legacyKeychainCredentials = '{broken'
-      } else {
-        writeFileSync(runtimePath, '{broken')
-      }
-      const fileBefore = readFileSync(runtimePath, 'utf-8')
-      const scopedBefore = testState.scopedKeychainCredentials
-      const legacyBefore = testState.legacyKeychainCredentials
-      settings.activeClaudeManagedAccountId = 'second'
-      await expect(service.syncForCurrentSelection()).rejects.toThrow(
-        'Cannot preserve malformed Claude runtime credentials'
-      )
-      expect(readFileSync(runtimePath, 'utf-8')).toBe(fileBefore)
-      expect(testState.scopedKeychainCredentials).toBe(scopedBefore)
-      expect(testState.legacyKeychainCredentials).toBe(legacyBefore)
-    }
-  )
-
-  it('keeps newly authorized MCP grants when returning to a signed-out system default', async () => {
-    const { service, settings, runtimePath, first } = await createSharedCredentialRuntime()
-    // A missing system credential is a signed-out default, with no connector grants yet.
-    rmSync(runtimePath)
-    testState.scopedKeychainCredentials = null
-    testState.legacyKeychainCredentials = null
-    settings.activeClaudeManagedAccountId = 'first'
-    await service.syncForCurrentSelection()
-    const live = withSharedFields(first)
-    writeFileSync(runtimePath, live)
-    testState.scopedKeychainCredentials = live
-    testState.legacyKeychainCredentials = live
-    settings.activeClaudeManagedAccountId = null
-    await service.syncForCurrentSelection()
-    expect(existsSync(runtimePath)).toBe(true)
-    expect(JSON.parse(readFileSync(runtimePath, 'utf-8'))).toEqual(sharedFields)
-    expect(JSON.parse(testState.scopedKeychainCredentials ?? '')).toEqual(sharedFields)
-    expect(JSON.parse(testState.legacyKeychainCredentials ?? '')).toEqual(sharedFields)
-  })
-})
diff --git a/src/main/claude-accounts/runtime-auth-service-snapshot-validation.test.ts b/src/main/claude-accounts/runtime-auth-service-snapshot-validation.test.ts
deleted file mode 100644
index 1df2430b8f6a..000000000000
--- a/src/main/claude-accounts/runtime-auth-service-snapshot-validation.test.ts
+++ /dev/null
@@ -1,550 +0,0 @@
-import {
-  cleanupRuntimeAuthTestState,
-  createClaudeAccount,
-  createClaudeCredentialsJson,
-  createElectronMock,
-  createKeychainMock,
-  createManagedClaudeAuth,
-  createOauthRefreshMock,
-  createSettings,
-  createStore,
-  readRuntimeOauthAccountForTest,
-  resetRuntimeAuthTestState,
-  testState
-} from './runtime-auth-service-test-harness'
-import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest'
-import { existsSync, mkdirSync, readFileSync, rmSync, writeFileSync } from 'node:fs'
-import { join } from 'node:path'
-
-vi.mock('electron', () => createElectronMock())
-
-vi.mock('./oauth-refresh', () => createOauthRefreshMock())
-
-vi.mock('node:os', async () => {
-  const actual = await vi.importActual<typeof import('node:os')>('node:os') // eslint-disable-line @typescript-eslint/consistent-type-imports -- vi.importActual requires inline import()
-  return {
-    ...actual,
-    homedir: () => testState.fakeHomeDir
-  }
-})
-
-vi.mock('./keychain', () => createKeychainMock())
-
-describe('ClaudeRuntimeAuthService', () => {
-  beforeEach(() => {
-    resetRuntimeAuthTestState()
-  })
-
-  afterEach(() => {
-    cleanupRuntimeAuthTestState()
-  })
-
-  it('treats corrupt system-default snapshots as missing and clears owned runtime auth', async () => {
-    const runtimeCredentialsPath = join(testState.fakeHomeDir, '.claude', '.credentials.json')
-    const runtimeConfigPath = join(testState.fakeHomeDir, '.claude.json')
-    const snapshotPath = join(
-      testState.userDataDir,
-      'claude-runtime-auth',
-      'system-default-auth.json'
-    )
-    const managedCredentials = createClaudeCredentialsJson('user@example.com', 'managed')
-    mkdirSync(join(testState.userDataDir, 'claude-runtime-auth'), { recursive: true })
-    writeFileSync(snapshotPath, '{not-json', 'utf-8')
-    writeFileSync(runtimeCredentialsPath, managedCredentials, 'utf-8')
-    writeFileSync(
-      runtimeConfigPath,
-      `${JSON.stringify({ oauthAccount: { accountUuid: 'account-1' } })}\n`,
-      'utf-8'
-    )
-    testState.scopedKeychainCredentials = managedCredentials
-    testState.legacyKeychainCredentials = managedCredentials
-    const managedAuthPath = createManagedClaudeAuth(
-      testState.userDataDir,
-      'account-1',
-      managedCredentials
-    )
-    const settings = createSettings({
-      claudeManagedAccounts: [createClaudeAccount('account-1', managedAuthPath)],
-      activeClaudeManagedAccountId: 'account-1'
-    })
-    const store = createStore(settings)
-    const warn = vi.spyOn(console, 'warn').mockImplementation(() => {})
-
-    const { ClaudeRuntimeAuthService } = await import('./runtime-auth-service')
-    const service = new ClaudeRuntimeAuthService(store as never)
-    settings.activeClaudeManagedAccountId = null
-    await service.syncForCurrentSelection()
-
-    expect(existsSync(snapshotPath)).toBe(false)
-    expect(existsSync(runtimeCredentialsPath)).toBe(false)
-    expect(readRuntimeOauthAccountForTest()).toBeNull()
-    expect(testState.scopedKeychainCredentials).toBeNull()
-    expect(testState.legacyKeychainCredentials).toBeNull()
-    warn.mockRestore()
-  })
-
-  it('treats wrong-shaped system-default snapshots as missing and clears owned runtime auth', async () => {
-    const runtimeCredentialsPath = join(testState.fakeHomeDir, '.claude', '.credentials.json')
-    const runtimeConfigPath = join(testState.fakeHomeDir, '.claude.json')
-    const snapshotPath = join(
-      testState.userDataDir,
-      'claude-runtime-auth',
-      'system-default-auth.json'
-    )
-    const managedCredentials = createClaudeCredentialsJson('user@example.com', 'managed')
-    mkdirSync(join(testState.userDataDir, 'claude-runtime-auth'), { recursive: true })
-    writeFileSync(
-      snapshotPath,
-      `${JSON.stringify({
-        credentialsJson: { token: 'system' },
-        keychainCredentialsJson: managedCredentials,
-        scopedKeychainCredentialsJson: { token: 'scoped' },
-        legacyKeychainCredentialsJson: managedCredentials,
-        capturedAt: Date.now()
-      })}\n`,
-      'utf-8'
-    )
-    writeFileSync(runtimeCredentialsPath, managedCredentials, 'utf-8')
-    writeFileSync(
-      runtimeConfigPath,
-      `${JSON.stringify({ oauthAccount: { accountUuid: 'account-1' } })}\n`,
-      'utf-8'
-    )
-    testState.scopedKeychainCredentials = managedCredentials
-    testState.legacyKeychainCredentials = managedCredentials
-    const managedAuthPath = createManagedClaudeAuth(
-      testState.userDataDir,
-      'account-1',
-      managedCredentials
-    )
-    const settings = createSettings({
-      claudeManagedAccounts: [createClaudeAccount('account-1', managedAuthPath)],
-      activeClaudeManagedAccountId: 'account-1'
-    })
-    const store = createStore(settings)
-    const warn = vi.spyOn(console, 'warn').mockImplementation(() => {})
-
-    const { ClaudeRuntimeAuthService } = await import('./runtime-auth-service')
-    const service = new ClaudeRuntimeAuthService(store as never)
-    settings.activeClaudeManagedAccountId = null
-    await service.syncForCurrentSelection()
-
-    expect(existsSync(snapshotPath)).toBe(false)
-    expect(existsSync(runtimeCredentialsPath)).toBe(false)
-    expect(readRuntimeOauthAccountForTest()).toBeNull()
-    expect(testState.scopedKeychainCredentials).toBeNull()
-    expect(testState.legacyKeychainCredentials).toBeNull()
-    warn.mockRestore()
-  })
-
-  it('treats snapshots missing all keychain credential fields as invalid', async () => {
-    const runtimeCredentialsPath = join(testState.fakeHomeDir, '.claude', '.credentials.json')
-    const snapshotPath = join(
-      testState.userDataDir,
-      'claude-runtime-auth',
-      'system-default-auth.json'
-    )
-    const managedCredentials = createClaudeCredentialsJson('user@example.com', 'managed')
-    mkdirSync(join(testState.userDataDir, 'claude-runtime-auth'), { recursive: true })
-    writeFileSync(
-      snapshotPath,
-      `${JSON.stringify({
-        credentialsJson: null,
-        configOauthAccount: null,
-        capturedAt: Date.now()
-      })}\n`,
-      'utf-8'
-    )
-    writeFileSync(runtimeCredentialsPath, managedCredentials, 'utf-8')
-    testState.scopedKeychainCredentials = managedCredentials
-    testState.legacyKeychainCredentials = managedCredentials
-    const managedAuthPath = createManagedClaudeAuth(
-      testState.userDataDir,
-      'account-1',
-      managedCredentials
-    )
-    const settings = createSettings({
-      claudeManagedAccounts: [createClaudeAccount('account-1', managedAuthPath)],
-      activeClaudeManagedAccountId: 'account-1'
-    })
-    const store = createStore(settings)
-    const warn = vi.spyOn(console, 'warn').mockImplementation(() => {})
-
-    const { ClaudeRuntimeAuthService } = await import('./runtime-auth-service')
-    const service = new ClaudeRuntimeAuthService(store as never)
-    settings.activeClaudeManagedAccountId = null
-    await service.syncForCurrentSelection()
-
-    expect(existsSync(snapshotPath)).toBe(false)
-    expect(existsSync(runtimeCredentialsPath)).toBe(false)
-    expect(testState.scopedKeychainCredentials).toBeNull()
-    expect(testState.legacyKeychainCredentials).toBeNull()
-    warn.mockRestore()
-  })
-
-  it('treats snapshots missing credentialsJson as invalid and clears missing-managed runtime auth', async () => {
-    const runtimeCredentialsPath = join(testState.fakeHomeDir, '.claude', '.credentials.json')
-    const runtimeConfigPath = join(testState.fakeHomeDir, '.claude.json')
-    const snapshotPath = join(
-      testState.userDataDir,
-      'claude-runtime-auth',
-      'system-default-auth.json'
-    )
-    const staleManagedCredentials = createClaudeCredentialsJson('managed@example.com', 'managed')
-    const managedAuthPath = join(testState.userDataDir, 'claude-accounts', 'account-1', 'auth')
-    mkdirSync(managedAuthPath, { recursive: true })
-    writeFileSync(join(managedAuthPath, '.orca-managed-claude-auth'), 'account-1\n', 'utf-8')
-    mkdirSync(join(testState.userDataDir, 'claude-runtime-auth'), { recursive: true })
-    writeFileSync(
-      snapshotPath,
-      `${JSON.stringify({
-        configOauthAccount: null,
-        keychainCredentialsJson: null,
-        capturedAt: Date.now()
-      })}\n`,
-      'utf-8'
-    )
-    writeFileSync(runtimeCredentialsPath, staleManagedCredentials, 'utf-8')
-    writeFileSync(
-      runtimeConfigPath,
-      `${JSON.stringify({ oauthAccount: { accountUuid: 'account-1' } })}\n`,
-      'utf-8'
-    )
-    testState.scopedKeychainCredentials = staleManagedCredentials
-    testState.legacyKeychainCredentials = staleManagedCredentials
-    const settings = createSettings({
-      claudeManagedAccounts: [
-        createClaudeAccount('account-1', managedAuthPath, { email: 'managed@example.com' })
-      ],
-      activeClaudeManagedAccountId: 'account-1'
-    })
-    const store = createStore(settings)
-    const warn = vi.spyOn(console, 'warn').mockImplementation(() => {})
-
-    const { ClaudeRuntimeAuthService } = await import('./runtime-auth-service')
-    const service = new ClaudeRuntimeAuthService(store as never)
-    await service.prepareForClaudeLaunch()
-
-    expect(existsSync(snapshotPath)).toBe(true)
-    expect(readFileSync(runtimeCredentialsPath, 'utf-8')).toBe(staleManagedCredentials)
-    expect(readRuntimeOauthAccountForTest()).toEqual({ accountUuid: 'account-1' })
-    expect(testState.scopedKeychainCredentials).toBe(staleManagedCredentials)
-    expect(testState.legacyKeychainCredentials).toBe(staleManagedCredentials)
-    warn.mockRestore()
-  })
-
-  it('clears missing-managed oauth metadata when only keychain proves ownership', async () => {
-    const runtimeConfigPath = join(testState.fakeHomeDir, '.claude.json')
-    const staleManagedCredentials = createClaudeCredentialsJson('managed@example.com', 'managed')
-    const managedAuthPath = join(testState.userDataDir, 'claude-accounts', 'account-1', 'auth')
-    mkdirSync(managedAuthPath, { recursive: true })
-    writeFileSync(join(managedAuthPath, '.orca-managed-claude-auth'), 'account-1\n', 'utf-8')
-    writeFileSync(
-      runtimeConfigPath,
-      `${JSON.stringify({ oauthAccount: { accountUuid: 'account-1' } })}\n`,
-      'utf-8'
-    )
-    testState.scopedKeychainCredentials = staleManagedCredentials
-    testState.legacyKeychainCredentials = staleManagedCredentials
-    const settings = createSettings({
-      claudeManagedAccounts: [
-        createClaudeAccount('account-1', managedAuthPath, { email: 'managed@example.com' })
-      ],
-      activeClaudeManagedAccountId: 'account-1'
-    })
-    const store = createStore(settings)
-
-    const { ClaudeRuntimeAuthService } = await import('./runtime-auth-service')
-    const service = new ClaudeRuntimeAuthService(store as never)
-    await service.prepareForClaudeLaunch()
-
-    expect(readRuntimeOauthAccountForTest()).toEqual({ accountUuid: 'account-1' })
-    expect(testState.scopedKeychainCredentials).toBe(staleManagedCredentials)
-    expect(testState.legacyKeychainCredentials).toBe(staleManagedCredentials)
-  })
-
-  it('preserves missing-managed oauth metadata without credential ownership proof', async () => {
-    const runtimeConfigPath = join(testState.fakeHomeDir, '.claude.json')
-    const externalCredentials = createClaudeCredentialsJson('external@example.com', 'external')
-    const managedAuthPath = join(testState.userDataDir, 'claude-accounts', 'account-1', 'auth')
-    const managedOauthAccount = { accountUuid: 'account-1' }
-    mkdirSync(managedAuthPath, { recursive: true })
-    writeFileSync(
-      runtimeConfigPath,
-      `${JSON.stringify({ oauthAccount: managedOauthAccount })}\n`,
-      'utf-8'
-    )
-    testState.scopedKeychainCredentials = externalCredentials
-    testState.legacyKeychainCredentials = externalCredentials
-    const settings = createSettings({
-      claudeManagedAccounts: [
-        createClaudeAccount('account-1', managedAuthPath, { email: 'managed@example.com' })
-      ],
-      activeClaudeManagedAccountId: 'account-1'
-    })
-    const store = createStore(settings)
-
-    const { ClaudeRuntimeAuthService } = await import('./runtime-auth-service')
-    const service = new ClaudeRuntimeAuthService(store as never)
-    await service.prepareForClaudeLaunch()
-
-    expect(readRuntimeOauthAccountForTest()).toEqual(managedOauthAccount)
-    expect(testState.scopedKeychainCredentials).toBe(externalCredentials)
-    expect(testState.legacyKeychainCredentials).toBe(externalCredentials)
-  })
-
-  it('preserves invalid external runtime oauth metadata when deselecting', async () => {
-    const runtimeCredentialsPath = join(testState.fakeHomeDir, '.claude', '.credentials.json')
-    const runtimeConfigPath = join(testState.fakeHomeDir, '.claude.json')
-    const systemCredentials = createClaudeCredentialsJson('system@example.com', 'system')
-    const managedCredentials = createClaudeCredentialsJson('user@example.com', 'managed')
-    writeFileSync(runtimeCredentialsPath, systemCredentials, 'utf-8')
-    writeFileSync(runtimeConfigPath, `${JSON.stringify({})}\n`, 'utf-8')
-    const managedAuthPath = createManagedClaudeAuth(
-      testState.userDataDir,
-      'account-1',
-      managedCredentials,
-      'null\n'
-    )
-    const settings = createSettings({
-      claudeManagedAccounts: [createClaudeAccount('account-1', managedAuthPath)]
-    })
-    const store = createStore(settings)
-
-    const { ClaudeRuntimeAuthService } = await import('./runtime-auth-service')
-    const service = new ClaudeRuntimeAuthService(store as never)
-    settings.activeClaudeManagedAccountId = 'account-1'
-    await service.syncForCurrentSelection()
-
-    writeFileSync(runtimeConfigPath, '{not-json', 'utf-8')
-    settings.activeClaudeManagedAccountId = null
-    await service.syncForCurrentSelection()
-
-    expect(readFileSync(runtimeCredentialsPath, 'utf-8')).toBe(systemCredentials)
-    expect(readFileSync(runtimeConfigPath, 'utf-8')).toBe('{not-json')
-  })
-
-  it('preserves invalid runtime config while materializing managed credentials', async () => {
-    const runtimeCredentialsPath = join(testState.fakeHomeDir, '.claude', '.credentials.json')
-    const runtimeConfigPath = join(testState.fakeHomeDir, '.claude.json')
-    const systemCredentials = createClaudeCredentialsJson('system@example.com', 'system')
-    const managedCredentials = createClaudeCredentialsJson('user@example.com', 'managed')
-    writeFileSync(runtimeCredentialsPath, systemCredentials, 'utf-8')
-    writeFileSync(runtimeConfigPath, '{not-json', 'utf-8')
-    testState.scopedKeychainCredentials = systemCredentials
-    testState.legacyKeychainCredentials = systemCredentials
-    const managedAuthPath = createManagedClaudeAuth(
-      testState.userDataDir,
-      'account-1',
-      managedCredentials
-    )
-    const settings = createSettings({
-      claudeManagedAccounts: [createClaudeAccount('account-1', managedAuthPath)]
-    })
-    const store = createStore(settings)
-
-    const { ClaudeRuntimeAuthService } = await import('./runtime-auth-service')
-    const service = new ClaudeRuntimeAuthService(store as never)
-    settings.activeClaudeManagedAccountId = 'account-1'
-    await service.syncForCurrentSelection()
-
-    expect(readFileSync(runtimeCredentialsPath, 'utf-8')).toBe(managedCredentials)
-    expect(testState.scopedKeychainCredentials).toBe(managedCredentials)
-    expect(testState.legacyKeychainCredentials).toBe(managedCredentials)
-    expect(readFileSync(runtimeConfigPath, 'utf-8')).toBe('{not-json')
-
-    settings.activeClaudeManagedAccountId = null
-    await service.syncForCurrentSelection()
-
-    expect(readFileSync(runtimeCredentialsPath, 'utf-8')).toBe(systemCredentials)
-    expect(readFileSync(runtimeConfigPath, 'utf-8')).toBe('{not-json')
-  })
-
-  it('preserves non-object runtime config while materializing managed credentials', async () => {
-    const runtimeCredentialsPath = join(testState.fakeHomeDir, '.claude', '.credentials.json')
-    const runtimeConfigPath = join(testState.fakeHomeDir, '.claude.json')
-    const systemCredentials = createClaudeCredentialsJson('system@example.com', 'system')
-    const managedCredentials = createClaudeCredentialsJson('user@example.com', 'managed')
-    writeFileSync(runtimeCredentialsPath, systemCredentials, 'utf-8')
-    writeFileSync(runtimeConfigPath, '[]', 'utf-8')
-    const managedAuthPath = createManagedClaudeAuth(
-      testState.userDataDir,
-      'account-1',
-      managedCredentials
-    )
-    const settings = createSettings({
-      claudeManagedAccounts: [createClaudeAccount('account-1', managedAuthPath)]
-    })
-    const store = createStore(settings)
-
-    const { ClaudeRuntimeAuthService } = await import('./runtime-auth-service')
-    const service = new ClaudeRuntimeAuthService(store as never)
-    settings.activeClaudeManagedAccountId = 'account-1'
-    await service.syncForCurrentSelection()
-
-    expect(readFileSync(runtimeCredentialsPath, 'utf-8')).toBe(managedCredentials)
-    expect(readFileSync(runtimeConfigPath, 'utf-8')).toBe('[]')
-  })
-
-  it('does not use skipped oauth writes as ownership proof on deselect', async () => {
-    const runtimeCredentialsPath = join(testState.fakeHomeDir, '.claude', '.credentials.json')
-    const runtimeConfigPath = join(testState.fakeHomeDir, '.claude.json')
-    const systemCredentials = createClaudeCredentialsJson('system@example.com', 'system')
-    const managedCredentials = createClaudeCredentialsJson('user@example.com', 'managed')
-    const externalCredentials = createClaudeCredentialsJson('external@example.com', 'external')
-    const managedOauthAccount = { accountUuid: 'account-1' }
-    writeFileSync(runtimeCredentialsPath, systemCredentials, 'utf-8')
-    writeFileSync(runtimeConfigPath, '{not-json', 'utf-8')
-    testState.scopedKeychainCredentials = systemCredentials
-    testState.legacyKeychainCredentials = systemCredentials
-    const managedAuthPath = createManagedClaudeAuth(
-      testState.userDataDir,
-      'account-1',
-      managedCredentials,
-      `${JSON.stringify(managedOauthAccount)}\n`
-    )
-    const settings = createSettings({
-      claudeManagedAccounts: [createClaudeAccount('account-1', managedAuthPath)]
-    })
-    const store = createStore(settings)
-
-    const { ClaudeRuntimeAuthService } = await import('./runtime-auth-service')
-    const service = new ClaudeRuntimeAuthService(store as never)
-    settings.activeClaudeManagedAccountId = 'account-1'
-    await service.syncForCurrentSelection()
-
-    writeFileSync(runtimeCredentialsPath, externalCredentials, 'utf-8')
-    writeFileSync(
-      runtimeConfigPath,
-      `${JSON.stringify({ oauthAccount: managedOauthAccount })}\n`,
-      'utf-8'
-    )
-    testState.scopedKeychainCredentials = externalCredentials
-    testState.legacyKeychainCredentials = externalCredentials
-    settings.activeClaudeManagedAccountId = null
-    await service.syncForCurrentSelection()
-
-    expect(readFileSync(runtimeCredentialsPath, 'utf-8')).toBe(externalCredentials)
-    expect(readRuntimeOauthAccountForTest()).toEqual(managedOauthAccount)
-    expect(testState.scopedKeychainCredentials).toBe(externalCredentials)
-    expect(testState.legacyKeychainCredentials).toBe(externalCredentials)
-  })
-
-  it('preserves external oauth logout when managed oauth metadata is null', async () => {
-    const runtimeCredentialsPath = join(testState.fakeHomeDir, '.claude', '.credentials.json')
-    const runtimeConfigPath = join(testState.fakeHomeDir, '.claude.json')
-    const systemCredentials = createClaudeCredentialsJson('system@example.com', 'system')
-    const managedCredentials = createClaudeCredentialsJson('user@example.com', 'managed')
-    writeFileSync(runtimeCredentialsPath, systemCredentials, 'utf-8')
-    writeFileSync(
-      runtimeConfigPath,
-      `${JSON.stringify({ oauthAccount: { accountUuid: 'system-account' } })}\n`,
-      'utf-8'
-    )
-    testState.scopedKeychainCredentials = systemCredentials
-    testState.legacyKeychainCredentials = systemCredentials
-    const managedAuthPath = createManagedClaudeAuth(
-      testState.userDataDir,
-      'account-1',
-      managedCredentials,
-      'null\n'
-    )
-    const settings = createSettings({
-      claudeManagedAccounts: [createClaudeAccount('account-1', managedAuthPath)]
-    })
-    const store = createStore(settings)
-
-    const { ClaudeRuntimeAuthService } = await import('./runtime-auth-service')
-    const service = new ClaudeRuntimeAuthService(store as never)
-    settings.activeClaudeManagedAccountId = 'account-1'
-    await service.syncForCurrentSelection()
-
-    rmSync(runtimeCredentialsPath, { force: true })
-    testState.scopedKeychainCredentials = null
-    testState.legacyKeychainCredentials = null
-    writeFileSync(runtimeConfigPath, `${JSON.stringify({})}\n`, 'utf-8')
-    settings.activeClaudeManagedAccountId = null
-    await service.syncForCurrentSelection()
-
-    expect(existsSync(runtimeCredentialsPath)).toBe(false)
-    expect(readRuntimeOauthAccountForTest()).toBeNull()
-    expect(testState.scopedKeychainCredentials).toBeNull()
-    expect(testState.legacyKeychainCredentials).toBeNull()
-  })
-
-  it('restores reordered owned oauth metadata using stable json equality', async () => {
-    const runtimeCredentialsPath = join(testState.fakeHomeDir, '.claude', '.credentials.json')
-    const runtimeConfigPath = join(testState.fakeHomeDir, '.claude.json')
-    const systemCredentials = createClaudeCredentialsJson('system@example.com', 'system')
-    const managedCredentials = createClaudeCredentialsJson('user@example.com', 'managed')
-    const systemOauthAccount = { accountUuid: 'system-account', emailAddress: 'system@example.com' }
-    writeFileSync(runtimeCredentialsPath, systemCredentials, 'utf-8')
-    writeFileSync(
-      runtimeConfigPath,
-      `${JSON.stringify({ oauthAccount: systemOauthAccount })}\n`,
-      'utf-8'
-    )
-    const managedAuthPath = createManagedClaudeAuth(
-      testState.userDataDir,
-      'account-1',
-      managedCredentials,
-      '{"accountUuid":"account-1","emailAddress":"user@example.com"}\n'
-    )
-    const settings = createSettings({
-      claudeManagedAccounts: [createClaudeAccount('account-1', managedAuthPath)]
-    })
-    const store = createStore(settings)
-
-    const { ClaudeRuntimeAuthService } = await import('./runtime-auth-service')
-    const service = new ClaudeRuntimeAuthService(store as never)
-    settings.activeClaudeManagedAccountId = 'account-1'
-    await service.syncForCurrentSelection()
-
-    writeFileSync(
-      runtimeConfigPath,
-      '{"oauthAccount":{"emailAddress":"user@example.com","accountUuid":"account-1"}}\n',
-      'utf-8'
-    )
-    settings.activeClaudeManagedAccountId = null
-    await service.syncForCurrentSelection()
-
-    expect(readFileSync(runtimeCredentialsPath, 'utf-8')).toBe(systemCredentials)
-    expect(readRuntimeOauthAccountForTest()).toEqual(systemOauthAccount)
-  })
-
-  it('restores owned oauth metadata during rollback after removing the added account', async () => {
-    const runtimeCredentialsPath = join(testState.fakeHomeDir, '.claude', '.credentials.json')
-    const runtimeConfigPath = join(testState.fakeHomeDir, '.claude.json')
-    const systemCredentials = createClaudeCredentialsJson('system@example.com', 'system')
-    const managedCredentials = createClaudeCredentialsJson('user@example.com', 'managed')
-    const systemOauthAccount = { accountUuid: 'system-account' }
-    writeFileSync(runtimeCredentialsPath, systemCredentials, 'utf-8')
-    writeFileSync(
-      runtimeConfigPath,
-      `${JSON.stringify({ oauthAccount: systemOauthAccount })}\n`,
-      'utf-8'
-    )
-    const managedAuthPath = createManagedClaudeAuth(
-      testState.userDataDir,
-      'account-1',
-      managedCredentials,
-      '{"accountUuid":"account-1"}\n'
-    )
-    const settings = createSettings({
-      claudeManagedAccounts: [createClaudeAccount('account-1', managedAuthPath)]
-    })
-    const store = createStore(settings)
-
-    const { ClaudeRuntimeAuthService } = await import('./runtime-auth-service')
-    const service = new ClaudeRuntimeAuthService(store as never)
-    settings.activeClaudeManagedAccountId = 'account-1'
-    await service.syncForCurrentSelection()
-
-    settings.activeClaudeManagedAccountId = null
-    settings.claudeManagedAccounts = []
-    await service.forceMaterializeCurrentSelectionForRollback()
-
-    expect(readFileSync(runtimeCredentialsPath, 'utf-8')).toBe(systemCredentials)
-    expect(readRuntimeOauthAccountForTest()).toEqual(systemOauthAccount)
-  })
-})
diff --git a/src/main/claude-accounts/runtime-auth-service-test-harness.ts b/src/main/claude-accounts/runtime-auth-service-test-harness.ts
deleted file mode 100644
index 874e7534ff1a..000000000000
--- a/src/main/claude-accounts/runtime-auth-service-test-harness.ts
+++ /dev/null
@@ -1,277 +0,0 @@
-import { vi } from 'vitest'
-import { existsSync, mkdirSync, mkdtempSync, readFileSync, rmSync, writeFileSync } from 'node:fs'
-import { tmpdir } from 'node:os'
-import { join } from 'node:path'
-import { getDefaultSettings } from '../../shared/constants'
-import type { GlobalSettings } from '../../shared/global-settings-types'
-import type { ClaudeManagedAccount } from '../../shared/managed-account-types'
-
-const originalPlatform = Object.getOwnPropertyDescriptor(process, 'platform')
-export const hostPlatform = process.platform
-export const testState = {
-  userDataDir: '',
-  fakeHomeDir: '',
-  activeKeychainCredentials: null as string | null,
-  scopedKeychainCredentials: null as string | null,
-  legacyKeychainCredentials: null as string | null,
-  throwScopedKeychainRead: false,
-  throwLegacyKeychainRead: false,
-  throwRuntimeKeychainWrite: false,
-  throwLegacyRuntimeKeychainWrite: false,
-  throwScopedKeychainWrite: false,
-  runtimeWriteConfigDir: null as string | null,
-  managedKeychainCredentials: new Map<string, string>()
-}
-
-export function expectedRuntimeConfigDir(): string {
-  return join(testState.fakeHomeDir, '.claude')
-}
-
-export function createElectronMock() {
-  return {
-    app: {
-      getPath: () => testState.userDataDir
-    }
-  }
-}
-
-// Why: these tests exercise materialize/read-back/snapshot logic, not the
-// network OAuth refresh (covered by oauth-refresh.test.ts). Default the token
-// to "not expiring" so the proactive switch-in refresh never fires here and
-// existing expectations hold; individual tests can override these mocks.
-export function createOauthRefreshMock() {
-  return {
-    isOauthTokenExpiring: vi.fn(() => false),
-    refreshClaudeOauthCredentials: vi.fn(async () => null)
-  }
-}
-
-export function createKeychainMock() {
-  return {
-    readActiveClaudeKeychainCredentials: vi.fn(async (configDir?: string) => {
-      if (configDir) {
-        if (configDir !== expectedRuntimeConfigDir()) {
-          return testState.legacyKeychainCredentials
-        }
-        return testState.scopedKeychainCredentials ?? testState.legacyKeychainCredentials
-      }
-      return testState.legacyKeychainCredentials
-    }),
-    writeActiveClaudeKeychainCredentials: vi.fn(async (contents: string, configDir?: string) => {
-      if (configDir) {
-        if (configDir !== expectedRuntimeConfigDir()) {
-          throw new Error(`Unexpected Claude config dir: ${configDir}`)
-        }
-        if (testState.throwScopedKeychainWrite) {
-          throw new Error('scoped keychain write failed')
-        }
-        testState.scopedKeychainCredentials = contents
-      } else {
-        testState.legacyKeychainCredentials = contents
-      }
-      testState.activeKeychainCredentials = contents
-    }),
-    deleteActiveClaudeKeychainCredentials: vi.fn(async () => {
-      testState.scopedKeychainCredentials = null
-      testState.legacyKeychainCredentials = null
-      testState.activeKeychainCredentials = null
-    }),
-    deleteActiveClaudeKeychainCredentialsStrict: vi.fn(async (configDir?: string) => {
-      if (configDir) {
-        if (configDir !== expectedRuntimeConfigDir()) {
-          throw new Error(`Unexpected Claude config dir: ${configDir}`)
-        }
-        testState.scopedKeychainCredentials = null
-      } else {
-        testState.legacyKeychainCredentials = null
-      }
-      testState.activeKeychainCredentials = null
-    }),
-    readActiveClaudeKeychainCredentialsStrict: vi.fn(async (configDir?: string) =>
-      configDir
-        ? (() => {
-            if (testState.throwScopedKeychainRead) {
-              throw new Error('scoped keychain read failed')
-            }
-            return configDir === expectedRuntimeConfigDir()
-              ? testState.scopedKeychainCredentials
-              : null
-          })()
-        : (() => {
-            if (testState.throwLegacyKeychainRead) {
-              throw new Error('legacy keychain read failed')
-            }
-            return testState.legacyKeychainCredentials
-          })()
-    ),
-    writeActiveClaudeKeychainCredentialsForRuntime: vi.fn(
-      async (contents: string, configDir: string) => {
-        if (configDir !== expectedRuntimeConfigDir()) {
-          throw new Error(`Unexpected Claude config dir: ${configDir}`)
-        }
-        if (testState.throwRuntimeKeychainWrite) {
-          throw new Error('runtime keychain write failed')
-        }
-        testState.runtimeWriteConfigDir = configDir
-        testState.scopedKeychainCredentials = contents
-        if (testState.throwLegacyRuntimeKeychainWrite) {
-          throw new Error('legacy runtime keychain write failed')
-        }
-        testState.legacyKeychainCredentials = contents
-        testState.activeKeychainCredentials = contents
-      }
-    ),
-    readManagedClaudeKeychainCredentials: vi.fn(
-      async (accountId: string) => testState.managedKeychainCredentials.get(accountId) ?? null
-    ),
-    writeManagedClaudeKeychainCredentials: vi.fn(async (accountId: string, contents: string) => {
-      testState.managedKeychainCredentials.set(accountId, contents)
-    })
-  }
-}
-
-export function setPlatform(platform: NodeJS.Platform): void {
-  Object.defineProperty(process, 'platform', {
-    configurable: true,
-    value: platform
-  })
-}
-
-/** Shared `beforeEach` body: fresh platform, module registry, and temp homes. */
-export function resetRuntimeAuthTestState(): void {
-  setPlatform('darwin')
-  vi.resetModules()
-  vi.clearAllMocks()
-  testState.activeKeychainCredentials = null
-  testState.scopedKeychainCredentials = null
-  testState.legacyKeychainCredentials = null
-  testState.throwScopedKeychainRead = false
-  testState.throwLegacyKeychainRead = false
-  testState.throwRuntimeKeychainWrite = false
-  testState.throwLegacyRuntimeKeychainWrite = false
-  testState.throwScopedKeychainWrite = false
-  testState.runtimeWriteConfigDir = null
-  testState.managedKeychainCredentials.clear()
-  testState.userDataDir = mkdtempSync(join(tmpdir(), 'orca-claude-runtime-'))
-  testState.fakeHomeDir = mkdtempSync(join(tmpdir(), 'orca-claude-home-'))
-  mkdirSync(join(testState.fakeHomeDir, '.claude'), { recursive: true })
-}
-
-/** Shared `afterEach` body. */
-export function cleanupRuntimeAuthTestState(): void {
-  if (originalPlatform) {
-    Object.defineProperty(process, 'platform', originalPlatform)
-  }
-  rmSync(testState.userDataDir, { recursive: true, force: true })
-  rmSync(testState.fakeHomeDir, { recursive: true, force: true })
-}
-
-export function createSettings(overrides: Partial<GlobalSettings> = {}): GlobalSettings {
-  return {
-    ...getDefaultSettings(testState.fakeHomeDir),
-    ...overrides
-  }
-}
-
-export function createStore(settings: GlobalSettings) {
-  return {
-    getSettings: vi.fn(() => settings),
-    updateSettings: vi.fn((updates: Partial<GlobalSettings>) => {
-      settings = {
-        ...settings,
-        ...updates,
-        notifications: {
-          ...settings.notifications,
-          ...updates.notifications
-        }
-      }
-      return settings
-    })
-  }
-}
-
-export function createManagedClaudeAuth(
-  rootDir: string,
-  accountId: string,
-  credentialsJson: string,
-  oauthAccountJson = `{"accountUuid":"${accountId}"}\n`
-): string {
-  const managedAuthPath = join(rootDir, 'claude-accounts', accountId, 'auth')
-  mkdirSync(managedAuthPath, { recursive: true })
-  writeFileSync(join(managedAuthPath, '.orca-managed-claude-auth'), `${accountId}\n`, 'utf-8')
-  writeFileSync(join(managedAuthPath, '.credentials.json'), credentialsJson, 'utf-8')
-  writeFileSync(join(managedAuthPath, 'oauth-account.json'), oauthAccountJson, 'utf-8')
-  testState.managedKeychainCredentials.set(accountId, credentialsJson)
-  return managedAuthPath
-}
-
-export function createClaudeAccount(
-  id: string,
-  managedAuthPath: string,
-  overrides: Partial<ClaudeManagedAccount> = {}
-): ClaudeManagedAccount {
-  return {
-    id,
-    email: 'user@example.com',
-    managedAuthPath,
-    authMethod: 'subscription-oauth',
-    organizationUuid: null,
-    organizationName: null,
-    createdAt: 1,
-    updatedAt: 1,
-    lastAuthenticatedAt: 1,
-    ...overrides
-  }
-}
-
-export function createClaudeCredentialsJson(
-  email: string,
-  accessToken: string,
-  organizationUuid: string | null = null,
-  expiresAt = Date.now() + 60_000
-): string {
-  return `${JSON.stringify({
-    claudeAiOauth: {
-      email,
-      ...(organizationUuid ? { organizationUuid } : {}),
-      accessToken,
-      refreshToken: `${accessToken}-refresh`,
-      expiresAt
-    }
-  })}\n`
-}
-
-export function createClaudeCredentialsWithoutEmail(
-  accessToken: string,
-  organizationUuid: string | null = null,
-  options: { expiresAt?: number; refreshToken?: string } = {}
-): string {
-  return `${JSON.stringify({
-    claudeAiOauth: {
-      ...(organizationUuid ? { organizationUuid } : {}),
-      accessToken,
-      refreshToken: options.refreshToken ?? `${accessToken}-refresh`,
-      expiresAt: options.expiresAt ?? Date.now() + 60_000
-    }
-  })}\n`
-}
-
-export function readManagedCredentialsForTest(
-  accountId: string,
-  managedAuthPath: string
-): string | null {
-  if (process.platform === 'darwin') {
-    return testState.managedKeychainCredentials.get(accountId) ?? null
-  }
-  return readFileSync(join(managedAuthPath, '.credentials.json'), 'utf-8')
-}
-
-export function readRuntimeOauthAccountForTest(): unknown {
-  const configPath = join(testState.fakeHomeDir, '.claude.json')
-  if (!existsSync(configPath)) {
-    return null
-  }
-  return (
-    (JSON.parse(readFileSync(configPath, 'utf-8')) as Record<string, unknown>).oauthAccount ?? null
-  )
-}
diff --git a/src/main/claude-accounts/runtime-auth-service-wsl-runtime.test.ts b/src/main/claude-accounts/runtime-auth-service-wsl-runtime.test.ts
deleted file mode 100644
index 61c3323b6327..000000000000
--- a/src/main/claude-accounts/runtime-auth-service-wsl-runtime.test.ts
+++ /dev/null
@@ -1,312 +0,0 @@
-import {
-  cleanupRuntimeAuthTestState,
-  createClaudeAccount,
-  createClaudeCredentialsJson,
-  createElectronMock,
-  createKeychainMock,
-  createManagedClaudeAuth,
-  createOauthRefreshMock,
-  createSettings,
-  createStore,
-  resetRuntimeAuthTestState,
-  setPlatform,
-  testState
-} from './runtime-auth-service-test-harness'
-import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest'
-import { mkdirSync, writeFileSync } from 'node:fs'
-import { join } from 'node:path'
-import type * as ClaudeProfileRouting from '../../shared/claude-profile-routing'
-
-vi.mock('electron', () => createElectronMock())
-
-vi.mock('./oauth-refresh', () => createOauthRefreshMock())
-
-vi.mock('node:os', async () => {
-  const actual = await vi.importActual<typeof import('node:os')>('node:os') // eslint-disable-line @typescript-eslint/consistent-type-imports -- vi.importActual requires inline import()
-  return {
-    ...actual,
-    homedir: () => testState.fakeHomeDir
-  }
-})
-
-vi.mock('./keychain', () => createKeychainMock())
-
-describe('ClaudeRuntimeAuthService', () => {
-  beforeEach(() => {
-    resetRuntimeAuthTestState()
-  })
-
-  afterEach(() => {
-    cleanupRuntimeAuthTestState()
-  })
-
-  it('uses account WSL runtime for untargeted Claude preparation instead of stale terminal WSL settings', async () => {
-    setPlatform('win32')
-    vi.doMock('../wsl', () => ({
-      getDefaultWslDistro: () => 'Ubuntu',
-      getWslHome: () => null,
-      toWindowsWslPath: (value: string) => value
-    }))
-    const ubuntuAuthPath = createManagedClaudeAuth(
-      testState.userDataDir,
-      'ubuntu-account',
-      createClaudeCredentialsJson('ubuntu@example.com', 'ubuntu-token')
-    )
-    const settings = createSettings({
-      localAccountRuntime: 'wsl',
-      localAccountWslDistro: 'Ubuntu',
-      terminalWindowsShell: 'wsl.exe',
-      terminalWindowsWslDistro: 'Debian',
-      claudeManagedAccounts: [
-        createClaudeAccount('ubuntu-account', ubuntuAuthPath, {
-          managedAuthRuntime: 'wsl',
-          wslDistro: 'Ubuntu',
-          wslLinuxAuthPath: '/home/alice/.local/share/orca/claude-accounts/ubuntu/auth'
-        })
-      ],
-      activeClaudeManagedAccountId: null,
-      activeClaudeManagedAccountIdsByRuntime: {
-        host: null,
-        wsl: { Ubuntu: 'ubuntu-account' }
-      }
-    })
-    const store = createStore(settings)
-
-    const { ClaudeRuntimeAuthService } = await import('./runtime-auth-service')
-    const service = new ClaudeRuntimeAuthService(store as never)
-    expect(service.getRuntimeConfigDir({ runtime: 'wsl', wslDistro: 'Ubuntu' })).toBe(
-      ubuntuAuthPath
-    )
-    const preparation = await service.prepareForClaudeLaunch()
-
-    expect(preparation).toMatchObject({
-      runtime: 'wsl',
-      wslDistro: 'Ubuntu',
-      wslLinuxConfigDir: '/home/alice/.local/share/orca/claude-accounts/ubuntu/auth',
-      provenance: 'managed:ubuntu-account:wsl:Ubuntu',
-      stripAuthEnv: true
-    })
-  })
-
-  it('uses the global WSL runtime for untargeted Claude preparation under auto', async () => {
-    setPlatform('win32')
-    vi.doMock('../wsl', () => ({
-      getDefaultWslDistro: () => 'Ubuntu',
-      getWslHome: () => null,
-      toWindowsWslPath: (value: string) => value
-    }))
-    const ubuntuAuthPath = createManagedClaudeAuth(
-      testState.userDataDir,
-      'ubuntu-account',
-      createClaudeCredentialsJson('ubuntu@example.com', 'ubuntu-token')
-    )
-    const settings = createSettings({
-      localAccountRuntime: 'auto',
-      localWindowsRuntimeDefault: { kind: 'wsl', distro: 'Ubuntu' },
-      claudeManagedAccounts: [
-        createClaudeAccount('ubuntu-account', ubuntuAuthPath, {
-          managedAuthRuntime: 'wsl',
-          wslDistro: 'Ubuntu',
-          wslLinuxAuthPath: '/home/alice/.local/share/orca/claude-accounts/ubuntu/auth'
-        })
-      ],
-      activeClaudeManagedAccountId: null,
-      activeClaudeManagedAccountIdsByRuntime: {
-        host: null,
-        wsl: { Ubuntu: 'ubuntu-account' }
-      }
-    })
-    const store = createStore(settings)
-
-    const { ClaudeRuntimeAuthService } = await import('./runtime-auth-service')
-    const service = new ClaudeRuntimeAuthService(store as never)
-    const preparation = await service.prepareForClaudeLaunch()
-
-    expect(preparation).toMatchObject({
-      runtime: 'wsl',
-      wslDistro: 'Ubuntu',
-      provenance: 'managed:ubuntu-account:wsl:Ubuntu'
-    })
-  })
-
-  it('ignores a persisted WSL account-runtime pin on non-Windows hosts', async () => {
-    setPlatform('darwin')
-    vi.doMock('../wsl', () => ({
-      getDefaultWslDistro: () => 'Ubuntu',
-      getWslHome: () => null,
-      toWindowsWslPath: (value: string) => value
-    }))
-    const settings = createSettings({
-      localAccountRuntime: 'wsl',
-      localAccountWslDistro: 'Ubuntu'
-    })
-    const store = createStore(settings)
-
-    const { ClaudeRuntimeAuthService } = await import('./runtime-auth-service')
-    const service = new ClaudeRuntimeAuthService(store as never)
-    const preparation = await service.prepareForClaudeLaunch()
-
-    expect(preparation).toMatchObject({
-      runtime: 'host',
-      wslDistro: null,
-      provenance: 'system',
-      stripAuthEnv: false
-    })
-  })
-
-  it('keeps untargeted Claude preparation on host when account runtime is host', async () => {
-    setPlatform('win32')
-    vi.doMock('../wsl', () => ({
-      getDefaultWslDistro: () => 'Ubuntu',
-      getWslHome: () => null,
-      toWindowsWslPath: (value: string) => value
-    }))
-    const settings = createSettings({
-      localAccountRuntime: 'host',
-      terminalWindowsShell: 'wsl.exe',
-      terminalWindowsWslDistro: 'Debian'
-    })
-    const store = createStore(settings)
-
-    const { ClaudeRuntimeAuthService } = await import('./runtime-auth-service')
-    const service = new ClaudeRuntimeAuthService(store as never)
-    const preparation = await service.prepareForClaudeLaunch()
-
-    expect(preparation).toMatchObject({
-      runtime: 'host',
-      wslDistro: null,
-      provenance: 'system',
-      stripAuthEnv: false
-    })
-  })
-
-  it('clears a selected WSL managed account when its credentials are missing', async () => {
-    const managedAuthPath = join(testState.userDataDir, 'claude-accounts', 'account-1', 'auth')
-    mkdirSync(managedAuthPath, { recursive: true })
-    writeFileSync(join(managedAuthPath, '.orca-managed-claude-auth'), 'account-1\n', 'utf-8')
-    const settings = createSettings({
-      claudeManagedAccounts: [
-        createClaudeAccount('account-1', managedAuthPath, {
-          managedAuthRuntime: 'wsl',
-          wslDistro: 'Ubuntu',
-          wslLinuxAuthPath: '/home/alice/.local/share/orca/claude-accounts/account-1/auth'
-        })
-      ],
-      activeClaudeManagedAccountId: null,
-      activeClaudeManagedAccountIdsByRuntime: { host: null, wsl: { Ubuntu: 'account-1' } }
-    })
-    const store = createStore(settings)
-
-    const { ClaudeRuntimeAuthService } = await import('./runtime-auth-service')
-    const service = new ClaudeRuntimeAuthService(store as never)
-    const preparation = await service.prepareForClaudeLaunch({
-      runtime: 'wsl',
-      wslDistro: 'Ubuntu'
-    })
-
-    expect(store.updateSettings).toHaveBeenCalledWith({
-      activeClaudeManagedAccountId: null,
-      activeClaudeManagedAccountIdsByRuntime: { host: null, wsl: { Ubuntu: null } }
-    })
-    expect(preparation.runtime).toBe('wsl')
-    expect(preparation.provenance).toBe('wsl:Ubuntu:system')
-    expect(preparation.stripAuthEnv).toBe(true)
-  })
-
-  it('uses the default distro selection for WSL-default Claude preparation', async () => {
-    const originalPlatform = Object.getOwnPropertyDescriptor(process, 'platform')
-    Object.defineProperty(process, 'platform', { configurable: true, value: 'win32' })
-    vi.doMock('../wsl', () => ({
-      getDefaultWslDistro: () => 'Ubuntu',
-      getWslHome: () => join(testState.userDataDir, 'wsl-home'),
-      toWindowsWslPath: (value: string) => value
-    }))
-    const ubuntuAuthPath = createManagedClaudeAuth(
-      testState.userDataDir,
-      'ubuntu-account',
-      createClaudeCredentialsJson('ubuntu@example.com', 'ubuntu-token')
-    )
-    const debianAuthPath = createManagedClaudeAuth(
-      testState.userDataDir,
-      'debian-account',
-      createClaudeCredentialsJson('debian@example.com', 'debian-token')
-    )
-    const settings = createSettings({
-      claudeManagedAccounts: [
-        createClaudeAccount('ubuntu-account', ubuntuAuthPath, {
-          managedAuthRuntime: 'wsl',
-          wslDistro: 'Ubuntu',
-          wslLinuxAuthPath: '/home/alice/.local/share/orca/claude-accounts/ubuntu/auth'
-        }),
-        createClaudeAccount('debian-account', debianAuthPath, {
-          managedAuthRuntime: 'wsl',
-          wslDistro: 'Debian',
-          wslLinuxAuthPath: '/home/alice/.local/share/orca/claude-accounts/debian/auth'
-        })
-      ],
-      activeClaudeManagedAccountId: null,
-      activeClaudeManagedAccountIdsByRuntime: {
-        host: null,
-        wsl: { Ubuntu: 'ubuntu-account', Debian: 'debian-account' }
-      }
-    })
-    const store = createStore(settings)
-
-    try {
-      const { ClaudeRuntimeAuthService } = await import('./runtime-auth-service')
-      const service = new ClaudeRuntimeAuthService(store as never)
-      const preparation = await service.prepareForClaudeLaunch({
-        runtime: 'wsl',
-        wslDistro: null
-      })
-
-      expect(preparation).toMatchObject({
-        runtime: 'wsl',
-        wslDistro: 'Ubuntu',
-        wslLinuxConfigDir: '/home/alice/.local/share/orca/claude-accounts/ubuntu/auth',
-        provenance: 'managed:ubuntu-account:wsl:Ubuntu',
-        stripAuthEnv: true
-      })
-    } finally {
-      if (originalPlatform) {
-        Object.defineProperty(process, 'platform', originalPlatform)
-      }
-    }
-  })
-
-  it('routes a WSL distro through its guest router, and a failed guest publish never fails a select', async () => {
-    setPlatform('win32')
-    const wslRouter = {
-      prepareLaunch: vi.fn(async (distro: string) => ({ runtime: 'wsl', wslDistro: distro })),
-      publish: vi.fn(async () => {
-        throw new Error('distro is gone')
-      }),
-      runningDistros: vi.fn(async () => [])
-    }
-    vi.doMock('../../shared/claude-profile-routing', async (original) => ({
-      ...(await original<typeof ClaudeProfileRouting>()),
-      claudeProfileRoutingEnabled: () => true
-    }))
-    vi.doMock('./claude-profile-wsl-router', () => ({
-      ClaudeWslProfileRouter: function ClaudeWslProfileRouter() {
-        return wslRouter
-      }
-    }))
-    try {
-      const { ClaudeRuntimeAuthService } = await import('./runtime-auth-service')
-      const store = createStore(createSettings())
-      // oxlint-disable-next-line typescript/consistent-type-assertions -- SAFETY: the service reads only getSettings/updateSettings, which the harness store implements.
-      const service = new ClaudeRuntimeAuthService(store as never)
-      await expect(
-        service.prepareForClaudeLaunch({ runtime: 'wsl', wslDistro: 'Ubuntu' })
-      ).resolves.toMatchObject({ wslDistro: 'Ubuntu' })
-      await expect(
-        service.syncForCurrentSelection({ runtime: 'wsl', wslDistro: 'Ubuntu' })
-      ).resolves.toBeUndefined()
-      expect(wslRouter.publish).toHaveBeenCalledWith('Ubuntu')
-    } finally {
-      vi.doUnmock('../../shared/claude-profile-routing')
-      vi.doUnmock('./claude-profile-wsl-router')
-    }
-  })
-})
diff --git a/src/main/claude-accounts/runtime-auth-service.test.ts b/src/main/claude-accounts/runtime-auth-service.test.ts
new file mode 100644
index 000000000000..1cfc4c7d3857
--- /dev/null
+++ b/src/main/claude-accounts/runtime-auth-service.test.ts
@@ -0,0 +1,96 @@
+import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest'
+import { getDefaultSettings } from '../../shared/constants'
+import type { GlobalSettings } from '../../shared/global-settings-types'
+
+const fakes = vi.hoisted(() => ({
+  host: {
+    prepareLaunch: async () => ({ runtime: 'host' }),
+    publish: () => {},
+    systemDefaultHome: () => '/host/.claude'
+  },
+  wsl: {
+    prepareLaunch: async (distro: string) => ({ runtime: 'wsl', wslDistro: distro }),
+    publish: async (_distro: string): Promise<void> => {},
+    runningDistros: async (): Promise<string[]> => []
+  }
+}))
+vi.mock('../../shared/app-environment', () => ({
+  getAppEnvironment: () => ({ getPath: () => '/data/orca' })
+}))
+vi.mock('../wsl', () => ({
+  getDefaultWslDistro: () => 'Ubuntu',
+  getWslHome: (distro: string) => `/wsl/${distro}/home`
+}))
+vi.mock('./claude-profile-router', () => ({
+  ClaudeProfileRouter: function ClaudeProfileRouter() {
+    return fakes.host
+  }
+}))
+vi.mock('./claude-profile-wsl-router', () => ({
+  ClaudeWslProfileRouter: function ClaudeWslProfileRouter() {
+    return fakes.wsl
+  }
+}))
+vi.mock('./claude-profile-installed-router', () => ({ installClaudeProfileRouter: () => {} }))
+
+import { ClaudeRuntimeAuthService } from './runtime-auth-service'
+
+const platform = Object.getOwnPropertyDescriptor(process, 'platform')!
+function service(platformName: NodeJS.Platform, overrides: Partial<GlobalSettings> = {}) {
+  Object.defineProperty(process, 'platform', { configurable: true, value: platformName })
+  const settings = { ...getDefaultSettings('/home/user'), ...overrides }
+  return new ClaudeRuntimeAuthService({ getSettings: () => settings })
+}
+
+beforeEach(() => {
+  vi.spyOn(console, 'warn').mockImplementation(() => {})
+})
+afterEach(() => {
+  Object.defineProperty(process, 'platform', platform)
+  vi.restoreAllMocks()
+})
+
+describe('ClaudeRuntimeAuthService', () => {
+  it('keeps a stale WSL account setting on the host off Windows', async () => {
+    const auth = service('darwin', { localAccountRuntime: 'wsl', localAccountWslDistro: 'Ubuntu' })
+    expect(auth.getRuntimeConfigDir()).toBe('/host/.claude')
+    await expect(auth.prepareForClaudeLaunch()).resolves.toEqual({ runtime: 'host' })
+  })
+
+  it('routes a WSL target that names no distro to the default distro', async () => {
+    const auth = service('win32')
+    await expect(auth.prepareForClaudeLaunch({ runtime: 'wsl', wslDistro: null })).resolves.toEqual(
+      { runtime: 'wsl', wslDistro: 'Ubuntu' }
+    )
+    expect(auth.getRuntimeConfigDir({ runtime: 'wsl', wslDistro: null })).toBe(
+      '/wsl/Ubuntu/home/.claude'
+    )
+  })
+
+  it('never fails a select over a failed guest publish, and publishes one pass at a time', async () => {
+    const auth = service('win32')
+    vi.spyOn(fakes.wsl, 'publish').mockRejectedValue(new Error('distro is gone'))
+    await expect(
+      auth.syncForCurrentSelection({ runtime: 'wsl', wslDistro: 'Ubuntu' })
+    ).resolves.toBeUndefined()
+
+    const order: string[] = []
+    let release = () => {}
+    const gate = new Promise<void>((resolve) => (release = resolve))
+    vi.spyOn(fakes.host, 'publish').mockImplementation(() => order.push('host'))
+    vi.spyOn(fakes.wsl, 'runningDistros')
+      .mockImplementationOnce(async () => {
+        await gate
+        order.push('first guests')
+        return []
+      })
+      .mockResolvedValue([])
+    const first = auth.publishAll()
+    const second = auth.publishAll()
+    await new Promise((resolve) => setTimeout(resolve, 10))
+    expect(order).toEqual(['host'])
+    release()
+    await Promise.all([first, second])
+    expect(order).toEqual(['host', 'first guests', 'host'])
+  })
+})
diff --git a/src/main/claude-accounts/runtime-auth-service.ts b/src/main/claude-accounts/runtime-auth-service.ts
index adbbce30da01..b15bffbc4829 100644
--- a/src/main/claude-accounts/runtime-auth-service.ts
+++ b/src/main/claude-accounts/runtime-auth-service.ts
@@ -1,164 +1,156 @@
+import { join } from 'node:path'
 import { getAppEnvironment } from '../../shared/app-environment'
-import { claudeProfileRoutingEnabled } from '../../shared/claude-profile-routing'
+import { toWindowsWslPath } from '../../shared/wsl-paths'
+import { resolveLocalAccountRuntimeTarget } from '../../shared/local-account-runtime'
+import type { Store } from '../persistence'
+import { getDefaultWslDistro, getWslHome } from '../wsl'
 import { ClaudeProfileRouter } from './claude-profile-router'
 import { ClaudeWslProfileRouter } from './claude-profile-wsl-router'
-import {
-  getClaudeProfileRouter,
-  installClaudeProfileRouter
-} from './claude-profile-installed-router'
-import type { Store } from '../persistence'
-import {
-  getSelectedClaudeAccountIdForTarget,
-  type ClaudeAccountSelectionTarget
-} from './runtime-selection'
-import { ClaudeRuntimeAuthSync } from './runtime-auth/runtime-auth-sync'
+import { installClaudeProfileRouter } from './claude-profile-installed-router'
+import type { ClaudeAccountSelectionTarget } from './runtime-selection'
 import type { ClaudeRuntimeAuthPreparation } from './runtime-auth/runtime-auth-types'
 
 export type { ClaudeRuntimeAuthPreparation } from './runtime-auth/runtime-auth-types'
 
-function routerFor(target: ClaudeAccountSelectionTarget): ClaudeProfileRouter | undefined {
-  return target.runtime === 'wsl' ? undefined : getClaudeProfileRouter()
-}
+/** `configDir` is the CLAUDE_CONFIG_DIR value; `readPath` is where this host reads it (UNC for WSL). */
+export type ClaudeAccountFolder = { configDir: string; readPath: string }
 
-export class ClaudeRuntimeAuthService extends ClaudeRuntimeAuthSync {
+/** Routes Claude launches on this host and its WSL distros to the selected account folder. */
+export class ClaudeRuntimeAuthService {
+  readonly router: ClaudeProfileRouter
   private readonly wslRouter?: ClaudeWslProfileRouter
-
-  constructor(store: Store) {
-    super(store)
-    if (claudeProfileRoutingEnabled()) {
-      const args = {
-        getSettings: () => store.getSettings(),
-        dataRoot: getAppEnvironment().getPath('userData')
-      }
-      installClaudeProfileRouter(new ClaudeProfileRouter(args))
-      this.wslRouter = process.platform === 'win32' ? new ClaudeWslProfileRouter(args) : undefined
-    }
-    this.initializeLastSyncedState()
-    void this.safeSyncForCurrentSelection()
+  private readonly dataRoot = getAppEnvironment().getPath('userData')
+  private mutationQueue: Promise<unknown> = Promise.resolve()
+
+  constructor(private readonly store: Pick<Store, 'getSettings'>) {
+    const args = { getSettings: () => store.getSettings(), dataRoot: this.dataRoot }
+    this.router = new ClaudeProfileRouter(args)
+    installClaudeProfileRouter(this.router)
+    this.wslRouter = process.platform === 'win32' ? new ClaudeWslProfileRouter(args) : undefined
+    void this.publishAll().catch((error: unknown) => {
+      console.warn('[claude-runtime-auth] Failed to publish the Claude account selection:', error)
+    })
   }
 
-  async prepareForClaudeLaunch(
+  prepareForClaudeLaunch(
     target?: ClaudeAccountSelectionTarget
   ): Promise<ClaudeRuntimeAuthPreparation> {
-    const effectiveTarget = target ?? this.getDefaultAccountSelectionTarget()
-    const wsl = this.wslRouteFor(effectiveTarget)
-    if (wsl) {
-      return wsl.router.prepareLaunch(wsl.distro)
-    }
-    const router = routerFor(effectiveTarget)
-    if (router) {
-      return router.prepareLaunch()
-    }
-    await this.syncForCurrentSelection(effectiveTarget)
-    return this.getPreparation(effectiveTarget)
+    const wsl = this.wslRouteFor(target)
+    return wsl ? wsl.router.prepareLaunch(wsl.distro) : this.router.prepareLaunch()
   }
 
   async prepareForRateLimitFetch(
     target?: ClaudeAccountSelectionTarget
   ): Promise<ClaudeRuntimeAuthPreparation> {
-    const effectiveTarget = target ?? this.getDefaultAccountSelectionTarget()
-    const wsl = this.wslRouteFor(effectiveTarget)
-    if (wsl) {
-      return wsl.router.preparation(wsl.distro)
-    }
-    const router = routerFor(effectiveTarget)
-    if (router) {
-      return router.preparation()
+    const wsl = this.wslRouteFor(target)
+    try {
+      return await (wsl ? wsl.router.preparation(wsl.distro) : this.router.preparation())
+    } catch (error) {
+      // Why not thrown: one usage cycle polls every provider, so one account must not stop it.
+      return {
+        configDir: '',
+        envPatch: {},
+        stripAuthEnv: true,
+        provenance: 'profile:unavailable',
+        usageError: error instanceof Error ? error.message : String(error)
+      }
     }
-    await this.syncForCurrentSelection(effectiveTarget)
-    return this.getPreparation(effectiveTarget)
   }
 
+  /** Rewrites the which-account file for `target` after its selection changed. */
   async syncForCurrentSelection(target?: ClaudeAccountSelectionTarget): Promise<void> {
     await this.serializeMutation(async () => {
-      const effectiveTarget = target ?? this.getDefaultAccountSelectionTarget()
-      const wsl = this.wslRouteFor(effectiveTarget)
-      const router = routerFor(effectiveTarget)
+      const wsl = this.wslRouteFor(target)
       if (wsl) {
         await this.publishWsl(wsl.router, wsl.distro)
-      } else if (router) {
-        router.publish()
       } else {
-        await this.doSyncForCurrentSelection(effectiveTarget)
+        this.router.publish()
       }
     })
   }
 
-  /** Null when the target is not a WSL distro routed by account folders. */
-  private wslRouteFor(
-    target: ClaudeAccountSelectionTarget
-  ): { router: ClaudeWslProfileRouter; distro: string } | null {
-    const distro =
-      target.runtime === 'wsl' ? this.resolveWslDefaultTarget(target).wslDistro?.trim() : null
-    return this.wslRouter && distro ? { router: this.wslRouter, distro } : null
-  }
-
-  // Why never thrown: a guest Orca cannot reach also cannot run a pane, and a deleted distro must
-  // not block removing its accounts. The next select, or a start while it runs, rewrites it.
-  private async publishWsl(router: ClaudeWslProfileRouter, distro: string): Promise<void> {
-    await router.publish(distro).catch((error: unknown) => {
-      console.warn(`[claude-profile] Could not update the Claude account in WSL ${distro}:`, error)
+  /** Startup and rollback republish only running distros: neither may boot a stopped one. */
+  async publishAll(): Promise<void> {
+    await this.serializeMutation(async () => {
+      this.router.publish()
+      const router = this.wslRouter
+      if (router) {
+        const distros = await router.runningDistros()
+        await Promise.all(distros.map((distro) => this.publishWsl(router, distro)))
+      }
     })
   }
 
-  /** Startup and rollback republish only running distros: neither may boot a stopped one. */
-  private async publishRunningWslDistros(): Promise<void> {
-    const router = this.wslRouter
-    if (router) {
-      const distros = await router.runningDistros()
-      await Promise.all(distros.map((distro) => this.publishWsl(router, distro)))
+  /** Creates and sets up an account's folder so Claude can sign in to it. */
+  async prepareAccountFolder(
+    accountId: string,
+    target: ClaudeAccountSelectionTarget
+  ): Promise<ClaudeAccountFolder> {
+    const wsl = this.wslRouteFor(target)
+    if (!wsl) {
+      const home = await this.router.prepareAccount(accountId)
+      return { configDir: home, readPath: home }
     }
+    const home = await wsl.router.prepareAccount(wsl.distro, accountId)
+    return { configDir: home, readPath: toWindowsWslPath(home, wsl.distro) }
   }
 
-  async forceMaterializeCurrentSelectionForRollback(): Promise<void> {
-    await this.serializeMutation(async () => {
-      const router = getClaudeProfileRouter()
-      if (router) {
-        router.publish()
-        await this.publishRunningWslDistros()
-        return
-      }
-      const settings = this.store.getSettings()
-      if (!settings.activeClaudeManagedAccountId) {
-        const previousAccount = this.getActiveAccount(
-          settings.claudeManagedAccounts,
-          this.lastSyncedAccountId
-        )
-        await this.restoreSystemDefaultSnapshot(
-          previousAccount ? await this.readManagedCredentials(previousAccount) : null,
-          previousAccount ? await this.readManagedOauthAccount(previousAccount) : undefined
-        )
-        this.lastSyncedAccountId = null
-        return
-      }
-      await this.doSyncForCurrentSelection()
+  async removeAccountFolder(
+    accountId: string,
+    target: ClaudeAccountSelectionTarget
+  ): Promise<void> {
+    const wsl = this.wslRouteFor(target)
+    if (!wsl) {
+      await this.router.removeAccount(accountId)
+      return
+    }
+    // Why never thrown: a deleted distro must not block removing its accounts.
+    await wsl.router.removeAccount(wsl.distro, accountId).catch((error: unknown) => {
+      console.warn(
+        `[claude-profile] Could not delete the Claude account folder in WSL ${wsl.distro}:`,
+        error
+      )
     })
   }
 
+  /** System default's folder: skills and plugins install there and are linked into accounts. */
   getRuntimeConfigDir(target?: ClaudeAccountSelectionTarget): string {
-    return this.getPreparation(target).configDir
+    const effective = this.resolveTarget(target)
+    const home =
+      effective.runtime === 'wsl' && effective.wslDistro ? getWslHome(effective.wslDistro) : null
+    return home ? join(home, '.claude') : this.router.systemDefaultHome()
   }
 
-  private initializeLastSyncedState(): void {
-    const settings = this.store.getSettings()
-    this.lastSyncedAccountId = getSelectedClaudeAccountIdForTarget(settings, { runtime: 'host' })
+  // Why never thrown: a guest Orca cannot reach also cannot run a pane, and a deleted distro must
+  // not block removing its accounts. The next select, or a start while it runs, rewrites it.
+  private async publishWsl(router: ClaudeWslProfileRouter, distro: string): Promise<void> {
+    await router.publish(distro).catch((error: unknown) => {
+      console.warn(`[claude-profile] Could not update the Claude account in WSL ${distro}:`, error)
+    })
   }
 
-  private async safeSyncForCurrentSelection(): Promise<void> {
-    try {
-      const router = getClaudeProfileRouter()
-      if (!router) {
-        await this.syncForCurrentSelection()
-        return
-      }
-      // Why serialized: an account change during startup must not be overwritten by this older read.
-      await this.serializeMutation(async () => {
-        router.publish()
-        await this.publishRunningWslDistros()
-      })
-    } catch (error) {
-      console.warn('[claude-runtime-auth] Failed to sync runtime auth state:', error)
+  /** Null when the target is not a WSL distro this host can route. */
+  private wslRouteFor(
+    target?: ClaudeAccountSelectionTarget
+  ): { router: ClaudeWslProfileRouter; distro: string } | null {
+    const effective = this.resolveTarget(target)
+    const distro = effective.runtime === 'wsl' ? effective.wslDistro?.trim() : null
+    return this.wslRouter && distro ? { router: this.wslRouter, distro } : null
+  }
+
+  /** A WSL target that names no distro means the default distro, as Claude launches it there. */
+  private resolveTarget(target?: ClaudeAccountSelectionTarget): ClaudeAccountSelectionTarget {
+    const effective =
+      target ??
+      // Why: stale cross-platform WSL pins must stay on the host off Windows.
+      (process.platform === 'win32'
+        ? resolveLocalAccountRuntimeTarget(this.store.getSettings())
+        : { runtime: 'host' as const })
+    if (effective.runtime !== 'wsl' || effective.wslDistro?.trim()) {
+      return effective
     }
+    const defaultDistro = getDefaultWslDistro()
+    return defaultDistro ? { runtime: 'wsl', wslDistro: defaultDistro } : effective
   }
 
   private serializeMutation<T>(fn: () => Promise<T>): Promise<T> {
@@ -166,14 +158,4 @@ export class ClaudeRuntimeAuthService extends ClaudeRuntimeAuthSync {
     this.mutationQueue = next.catch(() => {})
     return next
   }
-
-  // Why: re-auth/add-account write fresh managed tokens; skip the next read-back so stale runtime tokens can't overwrite them.
-  clearLastWrittenCredentialsJson(
-    accountId = this.store.getSettings().activeClaudeManagedAccountId
-  ): void {
-    if (accountId === this.store.getSettings().activeClaudeManagedAccountId) {
-      this.lastWrittenCredentialsJson = null
-    }
-    this.skipNextReadBackForAccountId = accountId
-  }
 }
diff --git a/src/main/claude-accounts/runtime-auth-shared-credentials-fixture.ts b/src/main/claude-accounts/runtime-auth-shared-credentials-fixture.ts
deleted file mode 100644
index 8cb00420dc65..000000000000
--- a/src/main/claude-accounts/runtime-auth-shared-credentials-fixture.ts
+++ /dev/null
@@ -1,51 +0,0 @@
-import {
-  createClaudeAccount,
-  createClaudeCredentialsJson,
-  createManagedClaudeAuth,
-  createSettings,
-  createStore,
-  setPlatform,
-  testState
-} from './runtime-auth-service-test-harness'
-import { writeFileSync } from 'node:fs'
-import { join } from 'node:path'
-
-export const sharedFields = {
-  mcpOAuth: { figma: { accessToken: 'mcp-access', refreshToken: 'mcp-refresh' } },
-  mcpOAuthClientConfig: { figma: { clientId: 'figma-client' } },
-  mcpXaaIdp: { token: 'idp-token' },
-  mcpXaaIdpConfig: { issuer: 'idp-issuer' },
-  pluginSecrets: { plugin: 'secret' }
-}
-
-export function withSharedFields(
-  credentials: string,
-  fields: Record<string, unknown> = sharedFields
-): string {
-  return JSON.stringify({ ...JSON.parse(credentials), ...fields })
-}
-
-export async function createSharedCredentialRuntime(platform: NodeJS.Platform = 'darwin') {
-  setPlatform(platform)
-  const runtimePath = join(testState.fakeHomeDir, '.claude', '.credentials.json')
-  const system = createClaudeCredentialsJson('system@example.com', 'system')
-  const first = createClaudeCredentialsJson('first@example.com', 'first')
-  const second = createClaudeCredentialsJson('second@example.com', 'second')
-  const firstPath = createManagedClaudeAuth(testState.userDataDir, 'first', first)
-  const secondPath = createManagedClaudeAuth(testState.userDataDir, 'second', second)
-  writeFileSync(runtimePath, withSharedFields(system))
-  testState.scopedKeychainCredentials = withSharedFields(system)
-  testState.legacyKeychainCredentials = withSharedFields(system)
-  const settings = createSettings({
-    claudeManagedAccounts: [
-      createClaudeAccount('first', firstPath, { email: 'first@example.com' }),
-      createClaudeAccount('second', secondPath, { email: 'second@example.com' })
-    ]
-  })
-  const store = createStore(settings)
-  const { ClaudeRuntimeAuthService } = await import('./runtime-auth-service')
-  // oxlint-disable-next-line typescript/consistent-type-assertions -- SAFETY: Runtime auth uses only getSettings/updateSettings from this store mock.
-  const service = new ClaudeRuntimeAuthService(store as never)
-  await service.syncForCurrentSelection()
-  return { service, settings, runtimePath, first, second, system, firstPath, secondPath }
-}
diff --git a/src/main/claude-accounts/runtime-auth/runtime-auth-credential-identity.ts b/src/main/claude-accounts/runtime-auth/runtime-auth-credential-identity.ts
deleted file mode 100644
index d029ae0d6992..000000000000
--- a/src/main/claude-accounts/runtime-auth/runtime-auth-credential-identity.ts
+++ /dev/null
@@ -1,209 +0,0 @@
-import { ClaudeRuntimeAuthFileStorage } from './runtime-auth-file-storage'
-import { stripSharedClaudeCredentialFields } from '../shared-credential-fields'
-import type {
-  ClaudeAuthIdentity,
-  ClaudeReadBackMatch,
-  ClaudeRefreshTokenComparison
-} from './runtime-auth-types'
-
-export class ClaudeRuntimeAuthCredentialIdentity extends ClaudeRuntimeAuthFileStorage {
-  protected accountCredentialFieldsEqual(left: string | null, right: string | null): boolean {
-    if (left === right) {
-      return true
-    }
-    if (left === null || right === null) {
-      return false
-    }
-    try {
-      const leftAccount = this.asRecord(JSON.parse(stripSharedClaudeCredentialFields(left)))
-      const rightAccount = this.asRecord(JSON.parse(stripSharedClaudeCredentialFields(right)))
-      return (
-        leftAccount !== null &&
-        rightAccount !== null &&
-        this.jsonValuesEqual(leftAccount, rightAccount)
-      )
-    } catch {
-      return false
-    }
-  }
-
-  protected readIdentityFromCredentials(credentialsJson: string): ClaudeAuthIdentity | null {
-    let parsed: Record<string, unknown>
-    try {
-      parsed = JSON.parse(credentialsJson) as Record<string, unknown>
-    } catch {
-      return null
-    }
-    const oauth = this.asRecord(parsed.claudeAiOauth)
-    return {
-      accountUuid: this.normalizeField(
-        this.readString(oauth, 'accountUuid') ?? this.readString(oauth, 'accountId')
-      ),
-      email: this.normalizeField(this.readString(oauth, 'email')),
-      organizationUuid: this.normalizeField(
-        this.readString(oauth, 'organizationUuid') ?? this.readString(oauth, 'organizationId')
-      )
-    }
-  }
-
-  protected isValidCredentialsJsonObject(credentialsJson: string): boolean {
-    try {
-      const parsed = this.asRecord(JSON.parse(credentialsJson))
-      const oauth = this.asRecord(parsed?.claudeAiOauth)
-      return this.normalizeField(this.readString(oauth, 'accessToken')) !== null
-    } catch {
-      return false
-    }
-  }
-
-  protected runtimeCredentialsAreFresher(
-    runtimeCredentialsJson: string,
-    managedCredentialsJson: string
-  ): boolean {
-    const runtimeFreshness = this.readFreshnessFromCredentials(runtimeCredentialsJson)
-    const managedFreshness = this.readFreshnessFromCredentials(managedCredentialsJson)
-    return (
-      runtimeFreshness !== null && managedFreshness !== null && runtimeFreshness > managedFreshness
-    )
-  }
-
-  protected runtimeCredentialsAreOlder(
-    runtimeCredentialsJson: string,
-    managedCredentialsJson: string
-  ): boolean {
-    const runtimeFreshness = this.readFreshnessFromCredentials(runtimeCredentialsJson)
-    const managedFreshness = this.readFreshnessFromCredentials(managedCredentialsJson)
-    return (
-      runtimeFreshness !== null && managedFreshness !== null && runtimeFreshness < managedFreshness
-    )
-  }
-
-  protected chooseFreshestReadBackCandidate(
-    candidates: {
-      credentialsJson: string
-      match: Extract<ClaudeReadBackMatch, { kind: 'matched' }>
-    }[]
-  ): {
-    credentialsJson: string
-    match: Extract<ClaudeReadBackMatch, { kind: 'matched' }>
-  } {
-    return candidates.reduce((freshest, candidate) => {
-      const candidateFreshness = this.readFreshnessFromCredentials(candidate.credentialsJson)
-      const freshestFreshness = this.readFreshnessFromCredentials(freshest.credentialsJson)
-      if (
-        candidateFreshness !== null &&
-        (freshestFreshness === null || candidateFreshness > freshestFreshness)
-      ) {
-        return candidate
-      }
-      return freshest
-    })
-  }
-
-  protected readFreshnessFromCredentials(credentialsJson: string): number | null {
-    let parsed: Record<string, unknown>
-    try {
-      parsed = JSON.parse(credentialsJson) as Record<string, unknown>
-    } catch {
-      return null
-    }
-    const oauth = this.asRecord(parsed.claudeAiOauth)
-    return (
-      this.readNumber(oauth, 'expiresAt') ??
-      this.readNumber(oauth, 'expires_at') ??
-      this.readNumber(oauth, 'expiry') ??
-      this.readNumber(oauth, 'expires')
-    )
-  }
-
-  protected compareRefreshTokens(
-    runtimeCredentialsJson: string,
-    managedCredentialsJson: string
-  ): ClaudeRefreshTokenComparison {
-    const runtimeRefreshToken = this.readRefreshTokenFromCredentials(runtimeCredentialsJson)
-    const managedRefreshToken = this.readRefreshTokenFromCredentials(managedCredentialsJson)
-    if (!runtimeRefreshToken || !managedRefreshToken) {
-      return 'missing'
-    }
-    return runtimeRefreshToken === managedRefreshToken ? 'same' : 'different'
-  }
-
-  protected readRefreshTokenFromCredentials(credentialsJson: string): string | null {
-    try {
-      const parsed = JSON.parse(credentialsJson) as Record<string, unknown>
-      const oauth = this.asRecord(parsed.claudeAiOauth)
-      return this.normalizeField(this.readString(oauth, 'refreshToken'))
-    } catch {
-      return null
-    }
-  }
-
-  protected readIdentityFromOauthAccount(oauthAccount: unknown): ClaudeAuthIdentity {
-    const oauth = this.asRecord(oauthAccount)
-    return {
-      accountUuid: this.normalizeField(
-        this.readString(oauth, 'accountUuid') ?? this.readString(oauth, 'accountId')
-      ),
-      email: this.normalizeField(
-        this.readString(oauth, 'emailAddress') ?? this.readString(oauth, 'email')
-      ),
-      organizationUuid: this.normalizeField(
-        this.readString(oauth, 'organizationUuid') ?? this.readString(oauth, 'organizationId')
-      )
-    }
-  }
-
-  protected asRecord(value: unknown): Record<string, unknown> | null {
-    if (!value || typeof value !== 'object' || Array.isArray(value)) {
-      return null
-    }
-    return value as Record<string, unknown>
-  }
-
-  protected readString(value: Record<string, unknown> | null, key: string): string | null {
-    const candidate = value?.[key]
-    return typeof candidate === 'string' ? candidate : null
-  }
-
-  protected readNumber(value: Record<string, unknown> | null, key: string): number | null {
-    const candidate = value?.[key]
-    if (typeof candidate === 'number' && Number.isFinite(candidate)) {
-      return candidate
-    }
-    if (typeof candidate === 'string') {
-      const parsed = Number(candidate)
-      return Number.isFinite(parsed) ? parsed : null
-    }
-    return null
-  }
-
-  protected normalizeField(value: string | null | undefined): string | null {
-    if (!value) {
-      return null
-    }
-    const trimmed = value.trim()
-    return trimmed === '' ? null : trimmed
-  }
-
-  protected jsonValuesEqual(left: unknown, right: unknown): boolean {
-    return (
-      JSON.stringify(this.sortJsonValue(left ?? null)) ===
-      JSON.stringify(this.sortJsonValue(right ?? null))
-    )
-  }
-
-  protected sortJsonValue(value: unknown): unknown {
-    if (Array.isArray(value)) {
-      return value.map((item) => this.sortJsonValue(item))
-    }
-    const record = this.asRecord(value)
-    if (!record) {
-      return value
-    }
-    return Object.fromEntries(
-      Object.entries(record)
-        .sort(([leftKey], [rightKey]) => leftKey.localeCompare(rightKey))
-        .map(([key, nestedValue]) => [key, this.sortJsonValue(nestedValue)])
-    )
-  }
-}
diff --git a/src/main/claude-accounts/runtime-auth/runtime-auth-credential-matching.ts b/src/main/claude-accounts/runtime-auth/runtime-auth-credential-matching.ts
deleted file mode 100644
index 390ec57a8b2f..000000000000
--- a/src/main/claude-accounts/runtime-auth/runtime-auth-credential-matching.ts
+++ /dev/null
@@ -1,152 +0,0 @@
-import type { ClaudeManagedAccount } from '../../../shared/managed-account-types'
-import { ClaudeRuntimeAuthRuntimeState } from './runtime-auth-runtime-state'
-import type { ClaudeReadBackMatch } from './runtime-auth-types'
-
-export class ClaudeRuntimeAuthCredentialMatching extends ClaudeRuntimeAuthRuntimeState {
-  protected async findManagedAccountForRuntimeCredentials(
-    runtimeCredentialsJson: string,
-    runtimeOauthAccount: unknown
-  ): Promise<ClaudeReadBackMatch> {
-    const matches: { account: ClaudeManagedAccount; managedCredentialsJson: string }[] = []
-    let unverifiableCount = 0
-    for (const account of this.store.getSettings().claudeManagedAccounts) {
-      const managedCredentialsJson = await this.readManagedCredentials(account)
-      if (!managedCredentialsJson) {
-        continue
-      }
-      const match = this.runtimeCredentialsMatchAccount(
-        runtimeCredentialsJson,
-        runtimeOauthAccount,
-        account,
-        managedCredentialsJson,
-        await this.readManagedOauthAccount(account)
-      )
-      if (match === 'match') {
-        matches.push({ account, managedCredentialsJson })
-      } else if (match === 'unverifiable') {
-        unverifiableCount += 1
-      }
-    }
-
-    if (matches.length === 1 && unverifiableCount === 0) {
-      return { kind: 'matched', ...matches[0] }
-    }
-    return { kind: matches.length === 0 && unverifiableCount === 0 ? 'none' : 'ambiguous' }
-  }
-
-  protected runtimeCredentialsMatchAccount(
-    runtimeCredentialsJson: string,
-    runtimeOauthAccount: unknown,
-    account: ClaudeManagedAccount,
-    managedCredentialsJson: string,
-    managedOauthAccount: unknown
-  ): 'match' | 'mismatch' | 'unverifiable' {
-    const identity = this.readIdentityFromCredentials(runtimeCredentialsJson)
-    if (!identity) {
-      return 'mismatch'
-    }
-    const managedIdentity = this.readIdentityFromCredentials(managedCredentialsJson)
-    const managedOauthIdentity = this.readIdentityFromOauthAccount(managedOauthAccount)
-    const runtimeOauthIdentity = this.readIdentityFromOauthAccount(runtimeOauthAccount)
-    const credentialOauthConflict =
-      (identity.accountUuid &&
-        runtimeOauthIdentity.accountUuid &&
-        identity.accountUuid !== runtimeOauthIdentity.accountUuid) ||
-      (identity.email &&
-        runtimeOauthIdentity.email &&
-        identity.email !== runtimeOauthIdentity.email) ||
-      (identity.organizationUuid &&
-        runtimeOauthIdentity.organizationUuid &&
-        identity.organizationUuid !== runtimeOauthIdentity.organizationUuid)
-    if (credentialOauthConflict) {
-      return 'mismatch'
-    }
-
-    // Why: mirrors the Codex runtime-home guard; don't persist shared runtime creds into the managed account if another login rewrote them.
-    const selectedOrganizationUuid = this.normalizeField(
-      account.organizationUuid ??
-        managedIdentity?.organizationUuid ??
-        managedOauthIdentity.organizationUuid
-    )
-    const oauthAccountMatches =
-      Boolean(managedOauthIdentity.accountUuid) &&
-      managedOauthIdentity.accountUuid === runtimeOauthIdentity.accountUuid &&
-      Boolean(runtimeOauthIdentity.email || runtimeOauthIdentity.organizationUuid)
-    const runtimeEmail = identity.email ?? runtimeOauthIdentity.email
-    const runtimeOrganizationUuid =
-      identity.organizationUuid ?? runtimeOauthIdentity.organizationUuid
-    const refreshTokenComparison = this.compareRefreshTokens(
-      runtimeCredentialsJson,
-      managedCredentialsJson
-    )
-    if (!runtimeEmail) {
-      if (refreshTokenComparison === 'same') {
-        return 'match'
-      }
-      if (identity.organizationUuid) {
-        if (selectedOrganizationUuid && selectedOrganizationUuid !== identity.organizationUuid) {
-          return 'mismatch'
-        }
-        return 'unverifiable'
-      }
-      if (oauthAccountMatches) {
-        return 'match'
-      }
-      if (!runtimeOrganizationUuid && refreshTokenComparison === 'different') {
-        return 'mismatch'
-      }
-      return 'unverifiable'
-    }
-    if (account.email && this.normalizeField(account.email) !== runtimeEmail) {
-      return 'mismatch'
-    }
-    if (selectedOrganizationUuid && !runtimeOrganizationUuid) {
-      return refreshTokenComparison === 'same' || oauthAccountMatches ? 'match' : 'unverifiable'
-    }
-    if (
-      selectedOrganizationUuid &&
-      runtimeOrganizationUuid &&
-      selectedOrganizationUuid !== runtimeOrganizationUuid
-    ) {
-      return 'mismatch'
-    }
-    if (!selectedOrganizationUuid && runtimeOrganizationUuid) {
-      return refreshTokenComparison === 'same' ? 'match' : 'unverifiable'
-    }
-
-    return 'match'
-  }
-
-  protected liveRuntimeCredentialsCanUpdateActiveAccount(
-    runtimeCredentialsJson: string,
-    account: ClaudeManagedAccount,
-    managedCredentialsJson: string,
-    managedOauthAccount: unknown
-  ): boolean {
-    const match = this.runtimeCredentialsMatchAccount(
-      runtimeCredentialsJson,
-      this.readRuntimeOauthAccount(),
-      account,
-      managedCredentialsJson,
-      managedOauthAccount
-    )
-    if (match === 'match') {
-      return true
-    }
-    const identity = this.readIdentityFromCredentials(runtimeCredentialsJson)
-    const managedIdentity = this.readIdentityFromCredentials(managedCredentialsJson)
-    const managedOauthIdentity = this.readIdentityFromOauthAccount(managedOauthAccount)
-    const runtimeOauthIdentity = this.readIdentityFromOauthAccount(this.readRuntimeOauthAccount())
-    const selectedOrganizationUuid = this.normalizeField(
-      account.organizationUuid ??
-        managedIdentity?.organizationUuid ??
-        managedOauthIdentity.organizationUuid
-    )
-    return (
-      match === 'unverifiable' &&
-      Boolean(selectedOrganizationUuid) &&
-      (identity?.organizationUuid ?? runtimeOauthIdentity.organizationUuid) ===
-        selectedOrganizationUuid
-    )
-  }
-}
diff --git a/src/main/claude-accounts/runtime-auth/runtime-auth-file-storage.ts b/src/main/claude-accounts/runtime-auth/runtime-auth-file-storage.ts
deleted file mode 100644
index 8aa33a88c609..000000000000
--- a/src/main/claude-accounts/runtime-auth/runtime-auth-file-storage.ts
+++ /dev/null
@@ -1,82 +0,0 @@
-import { chmodSync, existsSync, mkdirSync, readFileSync } from 'node:fs'
-import { dirname, join } from 'node:path'
-import { app } from 'electron'
-import { writeFileAtomically } from '../../codex-accounts/fs-utils'
-import { ClaudeRuntimeAuthState } from './runtime-auth-state'
-
-export class ClaudeRuntimeAuthFileStorage extends ClaudeRuntimeAuthState {
-  protected writeRuntimeCredentials(contents: string): void {
-    const credentialsPath = this.pathResolver.getRuntimePaths().credentialsPath
-    mkdirSync(dirname(credentialsPath), { recursive: true })
-    // Why: skip unchanged rewrites to dodge Windows EPERM contention (#1507); re-verify the file since another Claude may have rewritten it.
-    if (
-      this.lastWrittenCredentialsJson === contents &&
-      this.fileContentsEqual(credentialsPath, contents)
-    ) {
-      this.ensureOwnerOnlyMode(credentialsPath)
-      return
-    }
-    if (this.fileContentsEqual(credentialsPath, contents)) {
-      this.ensureOwnerOnlyMode(credentialsPath)
-      this.lastWrittenCredentialsJson = contents
-      return
-    }
-    writeFileAtomically(credentialsPath, contents, { mode: 0o600 })
-    this.lastWrittenCredentialsJson = contents
-  }
-
-  protected writeJson(targetPath: string, value: unknown): void {
-    const serialized = `${JSON.stringify(value, null, 2)}\n`
-    mkdirSync(dirname(targetPath), { recursive: true })
-    // Why: same Windows contention reason as writeRuntimeCredentials.
-    if (this.fileContentsEqual(targetPath, serialized)) {
-      return
-    }
-    writeFileAtomically(targetPath, serialized, { mode: 0o600 })
-  }
-
-  protected fileContentsEqual(targetPath: string, contents: string): boolean {
-    try {
-      return existsSync(targetPath) && readFileSync(targetPath, 'utf-8') === contents
-    } catch {
-      return false
-    }
-  }
-
-  protected ensureOwnerOnlyMode(targetPath: string): void {
-    if (process.platform === 'win32') {
-      return
-    }
-    try {
-      chmodSync(targetPath, 0o600)
-    } catch {
-      /* Best effort: the next atomic write will set the restrictive mode. */
-    }
-  }
-
-  protected readJsonObject(targetPath: string): Record<string, unknown> | null {
-    if (!existsSync(targetPath)) {
-      return {}
-    }
-    try {
-      const parsed = JSON.parse(readFileSync(targetPath, 'utf-8')) as unknown
-      if (parsed && typeof parsed === 'object' && !Array.isArray(parsed)) {
-        return parsed as Record<string, unknown>
-      }
-    } catch {
-      // Why: invalid config is unknown external state; return null so we don't erase user or Claude-owned settings.
-      return null
-    }
-    return null
-  }
-
-  protected getRuntimeMetadataDir(): string {
-    const metadataDir = join(app.getPath('userData'), 'claude-runtime-auth')
-    mkdirSync(metadataDir, { recursive: true })
-    return metadataDir
-  }
-
-  protected getSystemDefaultSnapshotPath(): string {
-    return join(this.getRuntimeMetadataDir(), 'system-default-auth.json')
-  }
-}
diff --git a/src/main/claude-accounts/runtime-auth/runtime-auth-keychain-snapshots.ts b/src/main/claude-accounts/runtime-auth/runtime-auth-keychain-snapshots.ts
deleted file mode 100644
index ef4c54acab83..000000000000
--- a/src/main/claude-accounts/runtime-auth/runtime-auth-keychain-snapshots.ts
+++ /dev/null
@@ -1,135 +0,0 @@
-import {
-  readActiveClaudeKeychainCredentials,
-  readActiveClaudeKeychainCredentialsStrict
-} from '../keychain'
-import { ClaudeRuntimeAuthManagedCredentials } from './runtime-auth-managed-credentials'
-import type {
-  ClaudeKeychainReadResult,
-  ClaudeKeychainSnapshotValue,
-  ClaudeSystemDefaultSnapshot
-} from './runtime-auth-types'
-
-export class ClaudeRuntimeAuthKeychainSnapshots extends ClaudeRuntimeAuthManagedCredentials {
-  protected isSystemDefaultSnapshot(value: unknown): value is ClaudeSystemDefaultSnapshot {
-    const snapshot = this.asRecord(value)
-    return (
-      snapshot !== null &&
-      Object.hasOwn(snapshot, 'credentialsJson') &&
-      this.isOptionalNullableString(snapshot.credentialsJson) &&
-      this.isOptionalNullableString(snapshot.keychainCredentialsJson) &&
-      this.isOptionalNullableString(snapshot.scopedKeychainCredentialsJson) &&
-      this.isOptionalNullableString(snapshot.legacyKeychainCredentialsJson) &&
-      this.isOptionalBoolean(snapshot.scopedKeychainCredentialsCaptured) &&
-      this.isOptionalBoolean(snapshot.legacyKeychainCredentialsCaptured) &&
-      this.hasValidKeychainSnapshotValue(snapshot, 'scoped') &&
-      this.hasValidKeychainSnapshotValue(snapshot, 'legacy') &&
-      (snapshot.capturedAt === undefined || typeof snapshot.capturedAt === 'number')
-    )
-  }
-
-  protected isOptionalNullableString(value: unknown): boolean {
-    return value === undefined || value === null || typeof value === 'string'
-  }
-
-  protected isOptionalBoolean(value: unknown): boolean {
-    return value === undefined || typeof value === 'boolean'
-  }
-
-  protected snapshotKeychainCredentials(
-    credentialsJson: string | null,
-    previousSnapshot: ClaudeSystemDefaultSnapshot | null | undefined,
-    service: 'scoped' | 'legacy',
-    managedCredentialsJson: string | undefined
-  ): string | null {
-    if (
-      managedCredentialsJson &&
-      this.accountCredentialFieldsEqual(credentialsJson, managedCredentialsJson) &&
-      previousSnapshot
-    ) {
-      const previousValue = this.readKeychainSnapshotValue(previousSnapshot, service)
-      if (previousValue.status === 'captured') {
-        return previousValue.credentialsJson
-      }
-    }
-    return credentialsJson
-  }
-
-  protected hasValidKeychainSnapshotValue(
-    snapshot: Record<string, unknown>,
-    service: 'scoped' | 'legacy'
-  ): boolean {
-    const capturedKey =
-      service === 'scoped'
-        ? 'scopedKeychainCredentialsCaptured'
-        : 'legacyKeychainCredentialsCaptured'
-    if (snapshot[capturedKey] === false) {
-      return true
-    }
-    const credentialsKey =
-      service === 'scoped' ? 'scopedKeychainCredentialsJson' : 'legacyKeychainCredentialsJson'
-    return (
-      Object.hasOwn(snapshot, credentialsKey) || Object.hasOwn(snapshot, 'keychainCredentialsJson')
-    )
-  }
-
-  protected readKeychainSnapshotValue(
-    snapshot: ClaudeSystemDefaultSnapshot | null,
-    service: 'scoped' | 'legacy'
-  ): ClaudeKeychainSnapshotValue {
-    if (!snapshot) {
-      return { status: 'captured', credentialsJson: null }
-    }
-    const capturedKey =
-      service === 'scoped'
-        ? 'scopedKeychainCredentialsCaptured'
-        : 'legacyKeychainCredentialsCaptured'
-    if (snapshot[capturedKey] === false) {
-      return { status: 'unknown' }
-    }
-    const credentialsKey =
-      service === 'scoped' ? 'scopedKeychainCredentialsJson' : 'legacyKeychainCredentialsJson'
-    if (Object.hasOwn(snapshot, credentialsKey)) {
-      return {
-        status: 'captured',
-        credentialsJson: snapshot[credentialsKey] ?? null
-      }
-    }
-    return { status: 'captured', credentialsJson: snapshot.keychainCredentialsJson }
-  }
-
-  protected async readAggregateClaudeKeychainCredentialsBestEffort(
-    configDir: string
-  ): Promise<string | null> {
-    try {
-      return await readActiveClaudeKeychainCredentials(configDir)
-    } catch (error) {
-      console.warn('[claude-runtime-auth] Failed to read Claude Keychain credentials:', error)
-      return null
-    }
-  }
-
-  protected async readActiveClaudeKeychainCredentialsBestEffort(
-    configDir?: string
-  ): Promise<string | null> {
-    try {
-      return await readActiveClaudeKeychainCredentialsStrict(configDir)
-    } catch (error) {
-      console.warn('[claude-runtime-auth] Failed to read Claude Keychain credentials:', error)
-      return null
-    }
-  }
-
-  protected async readActiveClaudeKeychainCredentialsForSnapshot(
-    configDir?: string
-  ): Promise<ClaudeKeychainReadResult> {
-    try {
-      return {
-        status: 'captured',
-        credentialsJson: await readActiveClaudeKeychainCredentialsStrict(configDir)
-      }
-    } catch (error) {
-      console.warn('[claude-runtime-auth] Failed to read Claude Keychain credentials:', error)
-      return { status: 'failed' }
-    }
-  }
-}
diff --git a/src/main/claude-accounts/runtime-auth/runtime-auth-managed-credentials.ts b/src/main/claude-accounts/runtime-auth/runtime-auth-managed-credentials.ts
deleted file mode 100644
index 3a93f63d4dd6..000000000000
--- a/src/main/claude-accounts/runtime-auth/runtime-auth-managed-credentials.ts
+++ /dev/null
@@ -1,152 +0,0 @@
-import { existsSync } from 'node:fs'
-import type { ClaudeManagedAccount } from '../../../shared/managed-account-types'
-import { parseWslUncPath } from '../../../shared/wsl-paths'
-import { toWindowsWslPath } from '../../wsl'
-import { runWslProcess } from '../../wsl/wsl-runner'
-import {
-  readClaudeManagedAuthFile,
-  resolveOwnedClaudeManagedAuthPath,
-  writeClaudeManagedAuthFile
-} from '../managed-auth-path'
-import { isOauthTokenExpiring, refreshClaudeOauthCredentials } from '../oauth-refresh'
-import {
-  readManagedClaudeKeychainCredentials,
-  writeManagedClaudeKeychainCredentials
-} from '../keychain'
-import { ClaudeRuntimeAuthCredentialIdentity } from './runtime-auth-credential-identity'
-import { stripSharedClaudeCredentialFields } from '../shared-credential-fields'
-
-const OWNERSHIP_PROBE_TIMEOUT = 'orca-wsl-ownership-probe-timeout'
-
-function shellQuote(value: string): string {
-  return `'${value.replace(/'/g, "'\\''")}'`
-}
-
-export class ClaudeRuntimeAuthManagedCredentials extends ClaudeRuntimeAuthCredentialIdentity {
-  protected async readManagedCredentials(account: ClaudeManagedAccount): Promise<string | null> {
-    const managedAuthPath = await this.getOwnedManagedAuthPath(account)
-    if (!managedAuthPath) {
-      return null
-    }
-    if (process.platform === 'darwin') {
-      const credentials = await readManagedClaudeKeychainCredentials(account.id)
-      return credentials === null ? null : stripSharedClaudeCredentialFields(credentials)
-    }
-    const credentials = readClaudeManagedAuthFile(managedAuthPath, '.credentials.json')
-    return credentials === null || account.managedAuthRuntime === 'wsl'
-      ? credentials
-      : stripSharedClaudeCredentialFields(credentials)
-  }
-
-  protected async writeManagedCredentials(
-    account: ClaudeManagedAccount,
-    credentialsJson: string
-  ): Promise<void> {
-    const managedAuthPath = await this.getOwnedManagedAuthPath(account)
-    if (!managedAuthPath) {
-      throw new Error('Managed Claude auth storage is not owned by Orca.')
-    }
-    if (account.managedAuthRuntime !== 'wsl') {
-      credentialsJson = stripSharedClaudeCredentialFields(credentialsJson)
-    }
-    if (process.platform === 'darwin') {
-      await writeManagedClaudeKeychainCredentials(account.id, credentialsJson)
-      return
-    }
-    writeClaudeManagedAuthFile(managedAuthPath, '.credentials.json', credentialsJson)
-  }
-
-  /**
-   * Proactively refresh an account's OAuth token and persist the rotation to
-   * managed storage. Returns the refreshed credentials JSON, or null when no
-   * refresh happened (token valid, no refresh token, or network failure).
-   *
-   * Caller guarantees this account isn't the live/active one and runs inside the
-   * serialized mutation queue, so the single-use refresh token can't rotate concurrently.
-   */
-  protected async refreshManagedAccountTokenIfNeeded(
-    account: ClaudeManagedAccount,
-    credentialsJson: string
-  ): Promise<string | null> {
-    if (!isOauthTokenExpiring(credentialsJson)) {
-      return null
-    }
-    const refreshed = await refreshClaudeOauthCredentials(credentialsJson)
-    if (!refreshed || !this.isValidCredentialsJsonObject(refreshed)) {
-      return null
-    }
-    try {
-      await this.writeManagedCredentials(account, refreshed)
-    } catch (error) {
-      console.warn('[claude-runtime-auth] Failed to persist refreshed Claude token:', error)
-      return null
-    }
-    return refreshed
-  }
-
-  protected async readManagedOauthAccount(account: ClaudeManagedAccount): Promise<unknown> {
-    const managedAuthPath = await this.getOwnedManagedAuthPath(account)
-    if (!managedAuthPath) {
-      return null
-    }
-    try {
-      const contents = readClaudeManagedAuthFile(managedAuthPath, 'oauth-account.json')
-      return contents ? (JSON.parse(contents) as unknown) : null
-    } catch {
-      return null
-    }
-  }
-
-  protected async getOwnedManagedAuthPath(account: ClaudeManagedAccount): Promise<string | null> {
-    const wslInfo = parseWslUncPath(account.managedAuthPath)
-    if (wslInfo) {
-      if (
-        !wslInfo.linuxPath.includes('/.local/share/orca/claude-accounts/') ||
-        !wslInfo.linuxPath.endsWith('/auth')
-      ) {
-        return null
-      }
-      if (process.platform === 'win32') {
-        try {
-          const owned = await runWslProcess({
-            distro: wslInfo.distro,
-            loginPath: 'none',
-            shell: 'bash',
-            script: [
-              'set -euo pipefail',
-              `candidate=${shellQuote(wslInfo.linuxPath)}`,
-              'managed_root="${HOME%/}/.local/share/orca/claude-accounts"',
-              'candidate_real=$(readlink -f -- "$candidate")',
-              'managed_root_real=$(readlink -f -- "$managed_root")',
-              'test -f "$candidate_real/.orca-managed-claude-auth"',
-              `test "$(cat "$candidate_real/.orca-managed-claude-auth")" = ${shellQuote(account.id)}`,
-              'case "$candidate_real" in "$managed_root_real"/*/auth) printf "%s\\n" "$candidate_real" ;; *) exit 35 ;; esac'
-            ].join('\n'),
-            timeoutMs: 5000
-          })
-          if (owned.timedOut) {
-            throw new Error(OWNERSHIP_PROBE_TIMEOUT)
-          }
-          if (owned.code !== 0) {
-            return null
-          }
-          const canonicalLinuxPath = owned.stdout.trim()
-          return canonicalLinuxPath ? toWindowsWslPath(canonicalLinuxPath, wslInfo.distro) : null
-        } catch (error) {
-          // Why rethrow a timeout: null means "not owned by Orca", and the
-          // caller persists that -- clearing the user's account selection. A
-          // slow distro must not decide ownership. Swallowing it here is what
-          // made the previous guard dead code.
-          if (error instanceof Error && error.message === OWNERSHIP_PROBE_TIMEOUT) {
-            throw error
-          }
-          return null
-        }
-      }
-      return existsSync(account.managedAuthPath) ? account.managedAuthPath : null
-    }
-    return resolveOwnedClaudeManagedAuthPath(account.id, account.managedAuthPath, {
-      adoptLegacyMarker: true
-    })
-  }
-}
diff --git a/src/main/claude-accounts/runtime-auth/runtime-auth-preparation.ts b/src/main/claude-accounts/runtime-auth/runtime-auth-preparation.ts
deleted file mode 100644
index dabcd9d472f3..000000000000
--- a/src/main/claude-accounts/runtime-auth/runtime-auth-preparation.ts
+++ /dev/null
@@ -1,119 +0,0 @@
-import { join } from 'node:path'
-import type { ClaudeManagedAccount } from '../../../shared/managed-account-types'
-import { resolveLocalAccountRuntimeTarget } from '../../../shared/local-account-runtime'
-import { parseWslUncPath } from '../../../shared/wsl-paths'
-import { shouldStripClaudeAuthEnvForAccount } from '../environment'
-import { getDefaultWslDistro, getWslHome } from '../../wsl'
-import {
-  getSelectedClaudeAccountIdForTarget,
-  normalizeClaudeAccountSelectionTarget,
-  type ClaudeAccountSelectionTarget
-} from '../runtime-selection'
-import { ClaudeRuntimeAuthSnapshotRestore } from './runtime-auth-snapshot-restore'
-import type { ClaudeRuntimeAuthPreparation } from './runtime-auth-types'
-
-export class ClaudeRuntimeAuthPreparationService extends ClaudeRuntimeAuthSnapshotRestore {
-  protected getPreparation(target?: ClaudeAccountSelectionTarget): ClaudeRuntimeAuthPreparation {
-    const settings = this.store.getSettings()
-    const paths = this.pathResolver.getRuntimePaths()
-    const normalizedTarget = this.resolveWslDefaultTarget(
-      target ?? this.getDefaultAccountSelectionTarget(settings)
-    )
-    const activeAccountId = getSelectedClaudeAccountIdForTarget(settings, normalizedTarget)
-    const activeAccount = this.getActiveAccount(settings.claudeManagedAccounts, activeAccountId)
-    if (
-      normalizeClaudeAccountSelectionTarget(normalizedTarget).runtime === 'wsl' &&
-      activeAccount?.managedAuthRuntime === 'wsl' &&
-      activeAccount.wslLinuxAuthPath
-    ) {
-      return {
-        configDir: activeAccount.managedAuthPath,
-        runtime: 'wsl',
-        wslDistro: activeAccount.wslDistro ?? null,
-        wslLinuxConfigDir: activeAccount.wslLinuxAuthPath,
-        envPatch: { CLAUDE_CONFIG_DIR: activeAccount.wslLinuxAuthPath },
-        stripAuthEnv: true,
-        provenance: `managed:${activeAccount.id}:wsl:${activeAccount.wslDistro ?? ''}`
-      }
-    }
-    if (normalizeClaudeAccountSelectionTarget(normalizedTarget).runtime === 'wsl') {
-      const distro =
-        normalizeClaudeAccountSelectionTarget(normalizedTarget).wslDistro ?? getDefaultWslDistro()
-      const wslHome = distro ? getWslHome(distro) : null
-      const wslHomeInfo = wslHome ? parseWslUncPath(wslHome) : null
-      if (distro && wslHome && wslHomeInfo) {
-        const windowsConfigDir = join(wslHome, '.claude')
-        const linuxConfigDir = `${wslHomeInfo.linuxPath.replace(/\/$/, '')}/.claude`
-        return {
-          configDir: windowsConfigDir,
-          runtime: 'wsl',
-          wslDistro: distro,
-          wslLinuxConfigDir: linuxConfigDir,
-          envPatch: {},
-          stripAuthEnv: true,
-          provenance: `wsl:${distro}:system`
-        }
-      }
-      return {
-        configDir: paths.configDir,
-        runtime: 'wsl',
-        wslDistro: normalizeClaudeAccountSelectionTarget(normalizedTarget).wslDistro,
-        wslLinuxConfigDir: null,
-        envPatch: {},
-        stripAuthEnv: true,
-        provenance: `wsl:${normalizeClaudeAccountSelectionTarget(normalizedTarget).wslDistro ?? '__default__'}:system`
-      }
-    }
-    return {
-      configDir: paths.configDir,
-      runtime: 'host',
-      wslDistro: null,
-      wslLinuxConfigDir: null,
-      envPatch: paths.envPatch,
-      stripAuthEnv: shouldStripClaudeAuthEnvForAccount(
-        settings.claudeManagedAccounts,
-        activeAccountId
-      ),
-      managedRefreshDeferredByLivePty: Boolean(
-        activeAccountId &&
-        activeAccount?.managedAuthRuntime !== 'wsl' &&
-        this.managedRefreshDeferredByLivePtyAccountId === activeAccountId
-      ),
-      provenance:
-        activeAccountId && activeAccount?.managedAuthRuntime !== 'wsl'
-          ? `managed:${activeAccountId}`
-          : 'system'
-    }
-  }
-
-  protected getActiveAccount(
-    accounts: ClaudeManagedAccount[],
-    activeAccountId: string | null
-  ): ClaudeManagedAccount | null {
-    if (!activeAccountId) {
-      return null
-    }
-    return accounts.find((account) => account.id === activeAccountId) ?? null
-  }
-
-  protected getDefaultAccountSelectionTarget(
-    settings = this.store.getSettings()
-  ): ClaudeAccountSelectionTarget {
-    // Why: Windows auth follows the resolved account runtime; stale cross-platform WSL pins must stay local-host.
-    const resolved = resolveLocalAccountRuntimeTarget(settings)
-    if (process.platform === 'win32' && resolved.runtime === 'wsl') {
-      return { runtime: 'wsl', wslDistro: resolved.wslDistro }
-    }
-    return { runtime: 'host' }
-  }
-
-  protected resolveWslDefaultTarget(
-    target?: ClaudeAccountSelectionTarget
-  ): ClaudeAccountSelectionTarget {
-    if (target?.runtime !== 'wsl' || target.wslDistro?.trim()) {
-      return target ?? { runtime: 'host' }
-    }
-    const defaultDistro = getDefaultWslDistro()
-    return defaultDistro ? { runtime: 'wsl', wslDistro: defaultDistro } : target
-  }
-}
diff --git a/src/main/claude-accounts/runtime-auth/runtime-auth-readback.ts b/src/main/claude-accounts/runtime-auth/runtime-auth-readback.ts
deleted file mode 100644
index 848ee093dfbc..000000000000
--- a/src/main/claude-accounts/runtime-auth/runtime-auth-readback.ts
+++ /dev/null
@@ -1,163 +0,0 @@
-import { existsSync, readFileSync } from 'node:fs'
-import { writeActiveClaudeKeychainCredentialsForRuntime } from '../keychain'
-import { ClaudeRuntimeAuthCredentialMatching } from './runtime-auth-credential-matching'
-import type {
-  ClaudeReadBackMatch,
-  ClaudeReadBackResult,
-  ClaudeRuntimeCredentialCandidate
-} from './runtime-auth-types'
-
-export class ClaudeRuntimeAuthReadback extends ClaudeRuntimeAuthCredentialMatching {
-  protected async readBackRefreshedTokens(
-    baselineCredentialsJson: string,
-    options: { updateLastWrittenCredentialsJson: boolean }
-  ): Promise<ClaudeReadBackResult> {
-    try {
-      const candidates =
-        await this.readRuntimeCredentialCandidatesForReadBack(baselineCredentialsJson)
-      if (candidates.length === 0) {
-        return { status: 'unchanged' }
-      }
-      const changedCandidates =
-        this.lastWrittenCredentialsJson === null
-          ? candidates
-          : candidates.filter(
-              (candidate) =>
-                !this.accountCredentialFieldsEqual(
-                  candidate.credentialsJson,
-                  this.lastWrittenCredentialsJson
-                )
-            )
-      if (changedCandidates.length === 0) {
-        return { status: 'unchanged' }
-      }
-
-      const acceptedCandidates: {
-        credentialsJson: string
-        match: Extract<ClaudeReadBackMatch, { kind: 'matched' }>
-      }[] = []
-      const ambiguousCandidates: string[] = []
-      let sawAmbiguousCandidate = false
-      let sawValidChangedCandidate = false
-      for (const runtimeContents of changedCandidates) {
-        if (!this.isValidCredentialsJsonObject(runtimeContents.credentialsJson)) {
-          continue
-        }
-        sawValidChangedCandidate = true
-        const match = await this.findManagedAccountForRuntimeCredentials(
-          runtimeContents.credentialsJson,
-          runtimeContents.runtimeOauthAccount
-        )
-        if (match.kind === 'ambiguous') {
-          sawAmbiguousCandidate = true
-          ambiguousCandidates.push(runtimeContents.credentialsJson)
-          continue
-        }
-        if (match.kind !== 'matched') {
-          continue
-        }
-        // Why: on cold start we can't tell a fresh CLI refresh from stale runtime creds; adopt only when expiry or a rotated refresh token proves runtime is newer than managed.
-        if (this.lastWrittenCredentialsJson === null) {
-          const fresher = this.runtimeCredentialsAreFresher(
-            runtimeContents.credentialsJson,
-            match.managedCredentialsJson
-          )
-          const refreshTokenRotated =
-            this.compareRefreshTokens(
-              runtimeContents.credentialsJson,
-              match.managedCredentialsJson
-            ) === 'different'
-          const older = this.runtimeCredentialsAreOlder(
-            runtimeContents.credentialsJson,
-            match.managedCredentialsJson
-          )
-          if (!fresher && !(refreshTokenRotated && !older)) {
-            continue
-          }
-        } else if (
-          this.runtimeCredentialsAreOlder(
-            runtimeContents.credentialsJson,
-            match.managedCredentialsJson
-          )
-        ) {
-          continue
-        }
-        acceptedCandidates.push({ credentialsJson: runtimeContents.credentialsJson, match })
-      }
-      if (acceptedCandidates.length === 0) {
-        if (sawAmbiguousCandidate) {
-          console.warn('[claude-runtime-auth] Refusing ambiguous Claude auth read-back')
-        }
-        return {
-          status: 'rejected',
-          runtimeCredentialsChanged: true,
-          hasValidChangedRuntimeCredentials: sawValidChangedCandidate,
-          runtimeCredentialsJson:
-            ambiguousCandidates.length === 1 ? ambiguousCandidates[0] : undefined
-        }
-      }
-      const { credentialsJson: runtimeContents, match } =
-        this.chooseFreshestReadBackCandidate(acceptedCandidates)
-
-      await this.writeManagedCredentials(match.account, runtimeContents)
-      if (options.updateLastWrittenCredentialsJson) {
-        const merged = await this.mergeLiveRuntimeSharedCredentials(runtimeContents)
-        this.writeRuntimeCredentials(merged)
-        if (process.platform === 'darwin') {
-          const paths = this.pathResolver.getRuntimePaths()
-          await writeActiveClaudeKeychainCredentialsForRuntime(merged, paths.configDir)
-        }
-        this.lastWrittenSharedCredentialsJson = merged
-      }
-      return { status: 'persisted' }
-    } catch (error) {
-      // Why: read-back is best-effort; a transient fs error must not block forward sync (worst case: one more stale-token cycle).
-      console.warn('[claude-runtime-auth] Failed to read back refreshed tokens:', error)
-      return {
-        status: 'rejected',
-        runtimeCredentialsChanged:
-          this.runtimeCredentialsChangedSinceLastWrite(baselineCredentialsJson),
-        // Why: an fs error hides whether a live session's refresh is present, so err toward preserving runtime state.
-        hasValidChangedRuntimeCredentials: true
-      }
-    }
-  }
-
-  protected async readRuntimeCredentialCandidatesForReadBack(
-    baselineCredentialsJson: string
-  ): Promise<ClaudeRuntimeCredentialCandidate[]> {
-    const paths = this.pathResolver.getRuntimePaths()
-    const fileCredentials = existsSync(paths.credentialsPath)
-      ? readFileSync(paths.credentialsPath, 'utf-8')
-      : null
-    const runtimeOauthAccount = this.readRuntimeOauthAccount()
-    const candidates: ClaudeRuntimeCredentialCandidate[] = []
-    const pushCandidate = (credentialsJson: string | null): void => {
-      if (
-        credentialsJson &&
-        !candidates.some((candidate) => candidate.credentialsJson === credentialsJson)
-      ) {
-        candidates.push({ credentialsJson, runtimeOauthAccount })
-      }
-    }
-    if (process.platform === 'darwin') {
-      const scopedKeychainCredentials = await this.readActiveClaudeKeychainCredentialsBestEffort(
-        paths.configDir
-      )
-      const legacyKeychainCredentials = await this.readActiveClaudeKeychainCredentialsBestEffort()
-      if (this.lastWrittenCredentialsJson === null) {
-        pushCandidate(scopedKeychainCredentials)
-        pushCandidate(legacyKeychainCredentials)
-        pushCandidate(fileCredentials)
-        return candidates.filter(
-          (candidate) =>
-            !this.accountCredentialFieldsEqual(candidate.credentialsJson, baselineCredentialsJson)
-        )
-      }
-      pushCandidate(scopedKeychainCredentials)
-      pushCandidate(legacyKeychainCredentials)
-    }
-    pushCandidate(fileCredentials)
-    return candidates
-  }
-}
diff --git a/src/main/claude-accounts/runtime-auth/runtime-auth-runtime-state.ts b/src/main/claude-accounts/runtime-auth/runtime-auth-runtime-state.ts
deleted file mode 100644
index 40d4d45395a2..000000000000
--- a/src/main/claude-accounts/runtime-auth/runtime-auth-runtime-state.ts
+++ /dev/null
@@ -1,238 +0,0 @@
-import { existsSync, readFileSync, rmSync } from 'node:fs'
-import type { ClaudeManagedAccount } from '../../../shared/managed-account-types'
-import {
-  deleteActiveClaudeKeychainCredentialsStrict,
-  readActiveClaudeKeychainCredentialsStrict,
-  writeActiveClaudeKeychainCredentials
-} from '../keychain'
-import {
-  mergeSharedClaudeCredentialFields,
-  reconcileSharedClaudeCredentialFields
-} from '../shared-credential-fields'
-import { ClaudeRuntimeAuthKeychainSnapshots } from './runtime-auth-keychain-snapshots'
-import {
-  RUNTIME_OAUTH_ACCOUNT_PARSE_ERROR,
-  type ClaudeKeychainSnapshotValue
-} from './runtime-auth-types'
-
-export class ClaudeRuntimeAuthRuntimeState extends ClaudeRuntimeAuthKeychainSnapshots {
-  protected async mergeLiveRuntimeSharedCredentials(credentialsJson: string): Promise<string> {
-    const paths = this.pathResolver.getRuntimePaths()
-    const candidates: string[] = []
-    if (process.platform === 'darwin') {
-      // A failed read must stop the switch before any shared tokens are overwritten.
-      const scoped = await readActiveClaudeKeychainCredentialsStrict(paths.configDir)
-      const legacy = await readActiveClaudeKeychainCredentialsStrict()
-      if (scoped !== null) {
-        candidates.push(scoped)
-      }
-      if (legacy !== null) {
-        candidates.push(legacy)
-      }
-    }
-    const file = this.readRuntimeCredentialsFile()
-    if (file !== null) {
-      candidates.push(file)
-    }
-    const shared = reconcileSharedClaudeCredentialFields(
-      candidates,
-      this.lastWrittenSharedCredentialsJson
-    )
-    return mergeSharedClaudeCredentialFields(credentialsJson, shared)
-  }
-
-  protected readRuntimeCredentialsFile(): string | null {
-    const credentialsPath = this.pathResolver.getRuntimePaths().credentialsPath
-    return existsSync(credentialsPath) ? readFileSync(credentialsPath, 'utf-8') : null
-  }
-
-  protected runtimeCredentialsBelongToAccount(
-    credentialsJson: string | null,
-    account: ClaudeManagedAccount,
-    managedOauthAccount: unknown
-  ): boolean {
-    if (!credentialsJson) {
-      return false
-    }
-    const identity = this.readIdentityFromCredentials(credentialsJson)
-    if (
-      !identity?.email ||
-      (account.email && this.normalizeField(account.email) !== identity.email)
-    ) {
-      return false
-    }
-    const oauthIdentity = this.readIdentityFromOauthAccount(managedOauthAccount)
-    const selectedOrganizationUuid = this.normalizeField(
-      account.organizationUuid ?? oauthIdentity.organizationUuid
-    )
-    if (selectedOrganizationUuid) {
-      return identity.organizationUuid === selectedOrganizationUuid
-    }
-    return !identity.organizationUuid
-  }
-
-  protected clearLastWrittenRuntimeState(): void {
-    this.lastWrittenCredentialsJson = null
-    this.lastWrittenOauthAccount = null
-    this.hasLastWrittenOauthAccount = false
-    this.hasMaterializedRuntimeAuth = false
-  }
-
-  protected hasUnchangedRuntimeCredentials(
-    previouslyWrittenCredentialsJson: string | null
-  ): boolean {
-    if (previouslyWrittenCredentialsJson === null) {
-      return false
-    }
-    const paths = this.pathResolver.getRuntimePaths()
-    const currentCredentialsJson = existsSync(paths.credentialsPath)
-      ? readFileSync(paths.credentialsPath, 'utf-8')
-      : null
-    return this.accountCredentialFieldsEqual(
-      currentCredentialsJson,
-      previouslyWrittenCredentialsJson
-    )
-  }
-
-  protected runtimeCredentialsChangedSinceLastWrite(baselineCredentialsJson: string): boolean {
-    const paths = this.pathResolver.getRuntimePaths()
-    try {
-      const currentCredentialsJson = existsSync(paths.credentialsPath)
-        ? readFileSync(paths.credentialsPath, 'utf-8')
-        : null
-      return (
-        currentCredentialsJson !== null &&
-        currentCredentialsJson !== (this.lastWrittenCredentialsJson ?? baselineCredentialsJson)
-      )
-    } catch {
-      return false
-    }
-  }
-
-  protected restoreRuntimeCredentials(
-    credentialsJson: string | null,
-    sharedCredentialsJson?: string
-  ): void {
-    const paths = this.pathResolver.getRuntimePaths()
-    const restored = mergeSharedClaudeCredentialFields(
-      credentialsJson ?? '{}',
-      sharedCredentialsJson ?? this.readRuntimeCredentialsFile()
-    )
-    if (credentialsJson !== null || restored !== '{}') {
-      this.writeRuntimeCredentials(restored)
-    } else {
-      rmSync(paths.credentialsPath, { force: true })
-    }
-  }
-
-  protected restoreRuntimeOauthAccountIfOwned(
-    oauthAccount: unknown,
-    ownedOauthAccount: unknown,
-    options: { allowCredentialSurfaceOwnership: boolean }
-  ): void {
-    const currentOauthAccount = this.readRuntimeOauthAccount()
-    if (currentOauthAccount === RUNTIME_OAUTH_ACCOUNT_PARSE_ERROR) {
-      return
-    }
-    if (options.allowCredentialSurfaceOwnership) {
-      this.writeRuntimeOauthAccount(oauthAccount)
-      return
-    }
-    if (
-      (ownedOauthAccount === null || ownedOauthAccount === undefined) &&
-      !options.allowCredentialSurfaceOwnership
-    ) {
-      return
-    }
-    if (!this.jsonValuesEqual(currentOauthAccount, ownedOauthAccount)) {
-      return
-    }
-    this.writeRuntimeOauthAccount(oauthAccount)
-  }
-
-  protected async hasUnchangedActiveClaudeKeychainCredentials(
-    snapshotValue: ClaudeKeychainSnapshotValue,
-    previouslyWrittenCredentialsJson: string | null,
-    configDir?: string
-  ): Promise<boolean> {
-    if (snapshotValue.status === 'unknown') {
-      return false
-    }
-    const currentCredentialsJson =
-      await this.readActiveClaudeKeychainCredentialsBestEffort(configDir)
-    return (
-      previouslyWrittenCredentialsJson !== null &&
-      this.accountCredentialFieldsEqual(currentCredentialsJson, previouslyWrittenCredentialsJson)
-    )
-  }
-
-  protected async restoreActiveClaudeKeychainCredentials(
-    credentialsJson: string | null,
-    configDir?: string,
-    sharedCredentialsJson?: string
-  ): Promise<void> {
-    const live =
-      sharedCredentialsJson ?? (await readActiveClaudeKeychainCredentialsStrict(configDir))
-    const restored = mergeSharedClaudeCredentialFields(credentialsJson ?? '{}', live)
-    await (credentialsJson !== null || restored !== '{}'
-      ? writeActiveClaudeKeychainCredentials(restored, configDir)
-      : deleteActiveClaudeKeychainCredentialsStrict(configDir))
-  }
-
-  protected async hasActiveKeychainCredentialsForAccount(
-    account: ClaudeManagedAccount,
-    managedOauthAccount: unknown,
-    configDir?: string
-  ): Promise<boolean> {
-    const currentCredentialsJson =
-      await this.readActiveClaudeKeychainCredentialsBestEffort(configDir)
-    return this.runtimeCredentialsBelongToAccount(
-      currentCredentialsJson,
-      account,
-      managedOauthAccount
-    )
-  }
-
-  protected readRuntimeOauthAccount(): unknown {
-    const configPath = this.pathResolver.getRuntimePaths().configPath
-    if (!existsSync(configPath)) {
-      return null
-    }
-    try {
-      const parsed = JSON.parse(readFileSync(configPath, 'utf-8')) as unknown
-      const record = this.asRecord(parsed)
-      if (!record) {
-        return RUNTIME_OAUTH_ACCOUNT_PARSE_ERROR
-      }
-      return record.oauthAccount ?? null
-    } catch {
-      return RUNTIME_OAUTH_ACCOUNT_PARSE_ERROR
-    }
-  }
-
-  protected runtimeOauthAccountMatches(managedOauthAccount: unknown): boolean {
-    if (managedOauthAccount === null || managedOauthAccount === undefined) {
-      return false
-    }
-    const currentOauthAccount = this.readRuntimeOauthAccount()
-    if (currentOauthAccount === RUNTIME_OAUTH_ACCOUNT_PARSE_ERROR) {
-      return false
-    }
-    return this.jsonValuesEqual(currentOauthAccount, managedOauthAccount)
-  }
-
-  protected writeRuntimeOauthAccount(oauthAccount: unknown): boolean {
-    const configPath = this.pathResolver.getRuntimePaths().configPath
-    const existing = this.readJsonObject(configPath)
-    if (existing === null) {
-      return false
-    }
-    if (oauthAccount === null || oauthAccount === undefined) {
-      delete existing.oauthAccount
-    } else {
-      existing.oauthAccount = oauthAccount
-    }
-    this.writeJson(configPath, existing)
-    return true
-  }
-}
diff --git a/src/main/claude-accounts/runtime-auth/runtime-auth-snapshot-capture.ts b/src/main/claude-accounts/runtime-auth/runtime-auth-snapshot-capture.ts
deleted file mode 100644
index e184ec4e7517..000000000000
--- a/src/main/claude-accounts/runtime-auth/runtime-auth-snapshot-capture.ts
+++ /dev/null
@@ -1,119 +0,0 @@
-import { existsSync, readFileSync, rmSync } from 'node:fs'
-import { ClaudeRuntimeAuthReadback } from './runtime-auth-readback'
-import {
-  RUNTIME_OAUTH_ACCOUNT_PARSE_ERROR,
-  type ClaudeSystemDefaultSnapshot
-} from './runtime-auth-types'
-
-export class ClaudeRuntimeAuthSnapshotCapture extends ClaudeRuntimeAuthReadback {
-  protected async captureSystemDefaultSnapshotForManagedEntry(
-    runtimeCredentialsJson: string | null,
-    managedCredentialsJson: string
-  ): Promise<void> {
-    const snapshotPath = this.getSystemDefaultSnapshotPath()
-    const existingSnapshot = this.readSystemDefaultSnapshot(snapshotPath)
-    if (!this.accountCredentialFieldsEqual(runtimeCredentialsJson, managedCredentialsJson)) {
-      await this.captureSystemDefaultSnapshot({
-        force: true,
-        previousSnapshot: existingSnapshot,
-        managedCredentialsJson
-      })
-      return
-    }
-    if (existingSnapshot) {
-      await this.captureSystemDefaultSnapshot({
-        force: true,
-        credentialsJsonOverride: existingSnapshot.credentialsJson,
-        previousSnapshot: existingSnapshot,
-        managedCredentialsJson
-      })
-      return
-    }
-    await this.captureSystemDefaultSnapshot({ force: false })
-  }
-
-  protected async captureSystemDefaultSnapshot(options: {
-    force: boolean
-    credentialsJsonOverride?: string | null
-    previousSnapshot?: ClaudeSystemDefaultSnapshot | null
-    managedCredentialsJson?: string
-  }): Promise<void> {
-    const snapshotPath = this.getSystemDefaultSnapshotPath()
-    if (!options.force && existsSync(snapshotPath)) {
-      return
-    }
-
-    const paths = this.pathResolver.getRuntimePaths()
-    const credentialsJson =
-      options.credentialsJsonOverride !== undefined
-        ? options.credentialsJsonOverride
-        : existsSync(paths.credentialsPath)
-          ? readFileSync(paths.credentialsPath, 'utf-8')
-          : null
-    const keychainCredentialsJson = await this.readAggregateClaudeKeychainCredentialsBestEffort(
-      paths.configDir
-    )
-    const scopedKeychainCredentials =
-      process.platform === 'darwin'
-        ? await this.readActiveClaudeKeychainCredentialsForSnapshot(paths.configDir)
-        : ({ status: 'captured', credentialsJson: null } as const)
-    const legacyKeychainCredentialsJson =
-      process.platform === 'darwin'
-        ? await this.readActiveClaudeKeychainCredentialsForSnapshot()
-        : ({ status: 'captured', credentialsJson: null } as const)
-    if (
-      scopedKeychainCredentials.status === 'failed' ||
-      legacyKeychainCredentialsJson.status === 'failed'
-    ) {
-      throw new Error('Cannot capture current Claude Keychain credentials')
-    }
-    const scopedKeychainCredentialsJson =
-      scopedKeychainCredentials.status === 'captured'
-        ? this.snapshotKeychainCredentials(
-            scopedKeychainCredentials.credentialsJson,
-            options.previousSnapshot,
-            'scoped',
-            options.managedCredentialsJson
-          )
-        : undefined
-    const legacyKeychainSnapshotJson =
-      legacyKeychainCredentialsJson.status === 'captured'
-        ? this.snapshotKeychainCredentials(
-            legacyKeychainCredentialsJson.credentialsJson,
-            options.previousSnapshot,
-            'legacy',
-            options.managedCredentialsJson
-          )
-        : undefined
-    const configOauthAccount = this.readRuntimeOauthAccount()
-    const snapshot: ClaudeSystemDefaultSnapshot = {
-      credentialsJson,
-      configOauthAccount:
-        configOauthAccount === RUNTIME_OAUTH_ACCOUNT_PARSE_ERROR ? null : configOauthAccount,
-      keychainCredentialsJson,
-      scopedKeychainCredentialsJson,
-      legacyKeychainCredentialsJson: legacyKeychainSnapshotJson,
-      scopedKeychainCredentialsCaptured: scopedKeychainCredentials.status === 'captured',
-      legacyKeychainCredentialsCaptured: legacyKeychainCredentialsJson.status === 'captured',
-      capturedAt: Date.now()
-    }
-    this.writeJson(snapshotPath, snapshot)
-  }
-
-  protected readSystemDefaultSnapshot(snapshotPath: string): ClaudeSystemDefaultSnapshot | null {
-    if (!existsSync(snapshotPath)) {
-      return null
-    }
-    try {
-      const parsed = JSON.parse(readFileSync(snapshotPath, 'utf-8')) as unknown
-      if (this.isSystemDefaultSnapshot(parsed)) {
-        return parsed
-      }
-      throw new Error('Invalid Claude system-default auth snapshot shape')
-    } catch (error) {
-      console.warn('[claude-runtime-auth] Ignoring invalid system-default auth snapshot:', error)
-      rmSync(snapshotPath, { force: true })
-      return null
-    }
-  }
-}
diff --git a/src/main/claude-accounts/runtime-auth/runtime-auth-snapshot-restore.ts b/src/main/claude-accounts/runtime-auth/runtime-auth-snapshot-restore.ts
deleted file mode 100644
index bb2158d9464b..000000000000
--- a/src/main/claude-accounts/runtime-auth/runtime-auth-snapshot-restore.ts
+++ /dev/null
@@ -1,239 +0,0 @@
-import type { ClaudeManagedAccount } from '../../../shared/managed-account-types'
-import { ClaudeRuntimeAuthSnapshotCapture } from './runtime-auth-snapshot-capture'
-import type { ClaudeKeychainSnapshotValue } from './runtime-auth-types'
-
-export class ClaudeRuntimeAuthSnapshotRestore extends ClaudeRuntimeAuthSnapshotCapture {
-  protected async restoreSystemDefaultSnapshot(
-    ownedCredentialsJson?: string | null,
-    ownedOauthAccount?: unknown
-  ): Promise<void> {
-    const snapshotPath = this.getSystemDefaultSnapshotPath()
-    const paths = this.pathResolver.getRuntimePaths()
-    const previouslyWrittenCredentialsJson =
-      this.lastWrittenCredentialsJson ?? ownedCredentialsJson ?? null
-    const snapshot = this.readSystemDefaultSnapshot(snapshotPath)
-
-    const fileCredentialsOwned = this.hasUnchangedRuntimeCredentials(
-      previouslyWrittenCredentialsJson
-    )
-    let hasCredentialSurfaceOwnership = fileCredentialsOwned
-    // Why: prove ownership before mutating anything, and restore OAuth first so a failure leaves the credential proof intact for retry.
-    this.lastWrittenCredentialsJson = previouslyWrittenCredentialsJson
-    let scopedSnapshot: ClaudeKeychainSnapshotValue | null = null
-    let legacySnapshot: ClaudeKeychainSnapshotValue | null = null
-    let scopedKeychainOwned = false
-    let legacyKeychainOwned = false
-    if (process.platform === 'darwin') {
-      scopedSnapshot = this.readKeychainSnapshotValue(snapshot, 'scoped')
-      legacySnapshot = this.readKeychainSnapshotValue(snapshot, 'legacy')
-      scopedKeychainOwned = await this.hasUnchangedActiveClaudeKeychainCredentials(
-        scopedSnapshot,
-        previouslyWrittenCredentialsJson,
-        paths.configDir
-      )
-      legacyKeychainOwned = await this.hasUnchangedActiveClaudeKeychainCredentials(
-        legacySnapshot,
-        previouslyWrittenCredentialsJson
-      )
-      hasCredentialSurfaceOwnership =
-        fileCredentialsOwned || scopedKeychainOwned || legacyKeychainOwned
-    }
-    const sharedCredentialsJson = hasCredentialSurfaceOwnership
-      ? await this.mergeLiveRuntimeSharedCredentials('{}')
-      : undefined
-    this.restoreRuntimeOauthAccountIfOwned(
-      snapshot?.configOauthAccount ?? null,
-      this.getOwnedRuntimeOauthBaseline(ownedOauthAccount, hasCredentialSurfaceOwnership),
-      { allowCredentialSurfaceOwnership: hasCredentialSurfaceOwnership }
-    )
-    if (fileCredentialsOwned) {
-      this.restoreRuntimeCredentials(snapshot?.credentialsJson ?? null, sharedCredentialsJson)
-    }
-    if (process.platform === 'darwin') {
-      if (scopedSnapshot?.status === 'captured' && scopedKeychainOwned) {
-        await this.restoreActiveClaudeKeychainCredentials(
-          scopedSnapshot.credentialsJson,
-          paths.configDir,
-          sharedCredentialsJson
-        )
-      }
-      if (legacySnapshot?.status === 'captured' && legacyKeychainOwned) {
-        await this.restoreActiveClaudeKeychainCredentials(
-          legacySnapshot.credentialsJson,
-          undefined,
-          sharedCredentialsJson
-        )
-      }
-    }
-    this.recordRestoredSharedCredentials(
-      sharedCredentialsJson,
-      fileCredentialsOwned,
-      scopedSnapshot?.status === 'captured' && scopedKeychainOwned,
-      legacySnapshot?.status === 'captured' && legacyKeychainOwned
-    )
-    this.lastWrittenCredentialsJson = null
-    this.lastWrittenOauthAccount = null
-    this.hasLastWrittenOauthAccount = false
-    this.hasMaterializedRuntimeAuth = false
-  }
-
-  protected getOwnedRuntimeOauthBaseline(
-    ownedOauthAccount: unknown,
-    hasCredentialSurfaceOwnership: boolean
-  ): unknown {
-    if (this.hasLastWrittenOauthAccount) {
-      return this.lastWrittenOauthAccount
-    }
-    // Why: managed metadata hints identity but isn't proof Orca wrote .claude.json; use only after a credential surface proves ownership.
-    if (hasCredentialSurfaceOwnership && ownedOauthAccount !== undefined) {
-      return ownedOauthAccount
-    }
-    return null
-  }
-
-  private recordRestoredSharedCredentials(
-    credentialsJson: string | undefined,
-    fileRestored: boolean,
-    scopedRestored: boolean,
-    legacyRestored: boolean
-  ): void {
-    if (
-      credentialsJson !== undefined &&
-      fileRestored &&
-      (process.platform !== 'darwin' || (scopedRestored && legacyRestored))
-    ) {
-      this.lastWrittenSharedCredentialsJson = credentialsJson
-    }
-  }
-
-  protected async clearRuntimeAuthForAccount(
-    account: ClaudeManagedAccount,
-    managedOauthAccount: unknown
-  ): Promise<void> {
-    const paths = this.pathResolver.getRuntimePaths()
-    const fileCredentialsOwned = this.runtimeCredentialsBelongToAccount(
-      this.readRuntimeCredentialsFile(),
-      account,
-      managedOauthAccount
-    )
-    let scopedKeychainOwned = false
-    let legacyKeychainOwned = false
-    if (process.platform === 'darwin') {
-      scopedKeychainOwned = await this.hasActiveKeychainCredentialsForAccount(
-        account,
-        managedOauthAccount,
-        paths.configDir
-      )
-      legacyKeychainOwned = await this.hasActiveKeychainCredentialsForAccount(
-        account,
-        managedOauthAccount
-      )
-    }
-    const hasCredentialSurfaceOwnership =
-      fileCredentialsOwned || scopedKeychainOwned || legacyKeychainOwned
-    const sharedCredentialsJson = hasCredentialSurfaceOwnership
-      ? await this.mergeLiveRuntimeSharedCredentials('{}')
-      : undefined
-    this.restoreRuntimeOauthAccountIfOwned(
-      null,
-      this.getOwnedRuntimeOauthBaseline(managedOauthAccount, hasCredentialSurfaceOwnership),
-      {
-        allowCredentialSurfaceOwnership: hasCredentialSurfaceOwnership
-      }
-    )
-    if (fileCredentialsOwned) {
-      this.restoreRuntimeCredentials(null, sharedCredentialsJson)
-    }
-    if (process.platform === 'darwin') {
-      if (scopedKeychainOwned) {
-        await this.restoreActiveClaudeKeychainCredentials(
-          null,
-          paths.configDir,
-          sharedCredentialsJson
-        )
-      }
-      if (legacyKeychainOwned) {
-        await this.restoreActiveClaudeKeychainCredentials(null, undefined, sharedCredentialsJson)
-      }
-    }
-    this.recordRestoredSharedCredentials(
-      sharedCredentialsJson,
-      fileCredentialsOwned,
-      scopedKeychainOwned,
-      legacyKeychainOwned
-    )
-  }
-
-  protected async restoreSystemDefaultSnapshotForMissingManagedCredentials(
-    account: ClaudeManagedAccount,
-    managedOauthAccount: unknown
-  ): Promise<void> {
-    const snapshot = this.readSystemDefaultSnapshot(this.getSystemDefaultSnapshotPath())
-    if (!snapshot) {
-      await this.clearRuntimeAuthForAccount(account, managedOauthAccount)
-      this.clearLastWrittenRuntimeState()
-      return
-    }
-    const paths = this.pathResolver.getRuntimePaths()
-    const fileCredentialsOwned = this.runtimeCredentialsBelongToAccount(
-      this.readRuntimeCredentialsFile(),
-      account,
-      managedOauthAccount
-    )
-    let scopedSnapshot: ClaudeKeychainSnapshotValue | null = null
-    let legacySnapshot: ClaudeKeychainSnapshotValue | null = null
-    let scopedKeychainOwned = false
-    let legacyKeychainOwned = false
-    if (process.platform === 'darwin') {
-      scopedSnapshot = this.readKeychainSnapshotValue(snapshot, 'scoped')
-      legacySnapshot = this.readKeychainSnapshotValue(snapshot, 'legacy')
-      scopedKeychainOwned = await this.hasActiveKeychainCredentialsForAccount(
-        account,
-        managedOauthAccount,
-        paths.configDir
-      )
-      legacyKeychainOwned = await this.hasActiveKeychainCredentialsForAccount(
-        account,
-        managedOauthAccount
-      )
-    }
-    const hasCredentialSurfaceOwnership =
-      fileCredentialsOwned || scopedKeychainOwned || legacyKeychainOwned
-    const sharedCredentialsJson = hasCredentialSurfaceOwnership
-      ? await this.mergeLiveRuntimeSharedCredentials('{}')
-      : undefined
-    this.restoreRuntimeOauthAccountIfOwned(
-      snapshot.configOauthAccount,
-      this.getOwnedRuntimeOauthBaseline(managedOauthAccount, hasCredentialSurfaceOwnership),
-      {
-        allowCredentialSurfaceOwnership: hasCredentialSurfaceOwnership
-      }
-    )
-    if (fileCredentialsOwned) {
-      this.restoreRuntimeCredentials(snapshot.credentialsJson, sharedCredentialsJson)
-    }
-    if (process.platform === 'darwin') {
-      if (scopedSnapshot?.status === 'captured' && scopedKeychainOwned) {
-        await this.restoreActiveClaudeKeychainCredentials(
-          scopedSnapshot.credentialsJson,
-          paths.configDir,
-          sharedCredentialsJson
-        )
-      }
-      if (legacySnapshot?.status === 'captured' && legacyKeychainOwned) {
-        await this.restoreActiveClaudeKeychainCredentials(
-          legacySnapshot.credentialsJson,
-          undefined,
-          sharedCredentialsJson
-        )
-      }
-    }
-    this.recordRestoredSharedCredentials(
-      sharedCredentialsJson,
-      fileCredentialsOwned,
-      scopedSnapshot?.status === 'captured' && scopedKeychainOwned,
-      legacySnapshot?.status === 'captured' && legacyKeychainOwned
-    )
-    this.clearLastWrittenRuntimeState()
-  }
-}
diff --git a/src/main/claude-accounts/runtime-auth/runtime-auth-state.ts b/src/main/claude-accounts/runtime-auth/runtime-auth-state.ts
deleted file mode 100644
index 6d6e5e47a489..000000000000
--- a/src/main/claude-accounts/runtime-auth/runtime-auth-state.ts
+++ /dev/null
@@ -1,19 +0,0 @@
-import type { Store } from '../../persistence'
-import { ClaudeRuntimePathResolver } from '../runtime-paths'
-
-export class ClaudeRuntimeAuthState {
-  protected readonly pathResolver = new ClaudeRuntimePathResolver()
-  protected mutationQueue: Promise<unknown> = Promise.resolve()
-  protected lastSyncedAccountId: string | null = null
-  // Why: creds Orca last wrote to the shared file; a mismatch on managed→default transition means an external login overwrote it, so adopt it as the new default.
-  protected lastWrittenCredentialsJson: string | null = null
-  // Connector revocations require a baseline that reached every runtime store, not a partial file write.
-  protected lastWrittenSharedCredentialsJson: string | null = null
-  protected hasMaterializedRuntimeAuth = false
-  protected hasLastWrittenOauthAccount = false
-  protected lastWrittenOauthAccount: unknown = null
-  protected skipNextReadBackForAccountId: string | null = null
-  protected managedRefreshDeferredByLivePtyAccountId: string | null = null
-
-  protected constructor(protected readonly store: Store) {}
-}
diff --git a/src/main/claude-accounts/runtime-auth/runtime-auth-sync.ts b/src/main/claude-accounts/runtime-auth/runtime-auth-sync.ts
deleted file mode 100644
index 23e9112d7ed7..000000000000
--- a/src/main/claude-accounts/runtime-auth/runtime-auth-sync.ts
+++ /dev/null
@@ -1,289 +0,0 @@
-import { existsSync, readFileSync } from 'node:fs'
-import {
-  getSelectedClaudeAccountIdForTarget,
-  normalizeClaudeAccountSelectionTarget,
-  normalizeClaudeRuntimeSelection,
-  setSelectedClaudeAccountIdForTarget,
-  type ClaudeAccountSelectionTarget
-} from '../runtime-selection'
-import { hasLiveClaudePtys } from '../live-pty-gate'
-import { isOauthTokenExpiring } from '../oauth-refresh'
-import { writeActiveClaudeKeychainCredentialsForRuntime } from '../keychain'
-import { ClaudeRuntimeAuthPreparationService } from './runtime-auth-preparation'
-
-export class ClaudeRuntimeAuthSync extends ClaudeRuntimeAuthPreparationService {
-  protected async doSyncForCurrentSelection(target?: ClaudeAccountSelectionTarget): Promise<void> {
-    const settings = this.store.getSettings()
-    const effectiveTarget = this.resolveWslDefaultTarget(target)
-    const normalizedTarget = normalizeClaudeAccountSelectionTarget(effectiveTarget)
-    const activeAccountId = getSelectedClaudeAccountIdForTarget(settings, normalizedTarget)
-    const activeAccount = this.getActiveAccount(settings.claudeManagedAccounts, activeAccountId)
-    const previousAccount = this.getActiveAccount(
-      settings.claudeManagedAccounts,
-      this.lastSyncedAccountId
-    )
-    this.managedRefreshDeferredByLivePtyAccountId = null
-    const previousManagedCredentialsJson = previousAccount
-      ? await this.readManagedCredentials(previousAccount)
-      : null
-    const previousManagedOauthAccount = previousAccount
-      ? await this.readManagedOauthAccount(previousAccount)
-      : null
-    if (previousAccount && previousAccount.id !== activeAccount?.id) {
-      if (previousManagedCredentialsJson) {
-        const outgoingReadBackResult = await this.readBackRefreshedTokens(
-          previousManagedCredentialsJson,
-          {
-            updateLastWrittenCredentialsJson: true
-          }
-        )
-        if (
-          outgoingReadBackResult.status === 'rejected' &&
-          outgoingReadBackResult.runtimeCredentialsChanged &&
-          hasLiveClaudePtys()
-        ) {
-          if (
-            outgoingReadBackResult.runtimeCredentialsJson &&
-            this.liveRuntimeCredentialsCanUpdateActiveAccount(
-              outgoingReadBackResult.runtimeCredentialsJson,
-              previousAccount,
-              previousManagedCredentialsJson,
-              previousManagedOauthAccount
-            )
-          ) {
-            // Why: switching away while Claude is live must preserve verified token refreshes before replacing shared runtime credentials.
-            await this.writeManagedCredentials(
-              previousAccount,
-              outgoingReadBackResult.runtimeCredentialsJson
-            )
-          } else {
-            // Why: the runtime blob may lack identity proof for a live-session refresh; skip persisting it, but still let new terminals move to the account.
-            console.warn(
-              '[claude-runtime-auth] Skipping unverified live Claude auth read-back while switching accounts'
-            )
-          }
-        }
-      }
-    }
-    if (!activeAccount) {
-      if (activeAccountId) {
-        const nextSelection = setSelectedClaudeAccountIdForTarget(
-          normalizeClaudeRuntimeSelection(settings),
-          null,
-          normalizedTarget
-        )
-        this.store.updateSettings({
-          activeClaudeManagedAccountId:
-            normalizedTarget.runtime === 'host' ? null : settings.activeClaudeManagedAccountId,
-          activeClaudeManagedAccountIdsByRuntime: nextSelection
-        })
-      }
-      if (normalizedTarget.runtime === 'wsl') {
-        return
-      }
-      if (this.lastSyncedAccountId !== null) {
-        await (previousAccount
-          ? this.restoreSystemDefaultSnapshot(
-              previousManagedCredentialsJson,
-              previousManagedOauthAccount
-            )
-          : this.restoreSystemDefaultSnapshot(this.lastWrittenCredentialsJson, undefined))
-        this.lastSyncedAccountId = null
-      }
-      return
-    }
-
-    if (activeAccount.managedAuthRuntime === 'wsl') {
-      if (!(await this.getOwnedManagedAuthPath(activeAccount))) {
-        console.warn(
-          '[claude-runtime-auth] Active WSL managed account is not owned by Orca, restoring system default'
-        )
-        const nextSelection = setSelectedClaudeAccountIdForTarget(
-          normalizeClaudeRuntimeSelection(settings),
-          null,
-          normalizedTarget
-        )
-        this.store.updateSettings({
-          activeClaudeManagedAccountId:
-            normalizedTarget.runtime === 'host' ? null : settings.activeClaudeManagedAccountId,
-          activeClaudeManagedAccountIdsByRuntime: nextSelection
-        })
-        return
-      }
-      const credentialsJson = await this.readManagedCredentials(activeAccount)
-      if (!credentialsJson || !this.isValidCredentialsJsonObject(credentialsJson)) {
-        console.warn(
-          '[claude-runtime-auth] Active WSL managed account is missing or has invalid credentials, restoring system default'
-        )
-        const nextSelection = setSelectedClaudeAccountIdForTarget(
-          normalizeClaudeRuntimeSelection(settings),
-          null,
-          normalizedTarget
-        )
-        this.store.updateSettings({
-          activeClaudeManagedAccountId:
-            normalizedTarget.runtime === 'host' ? null : settings.activeClaudeManagedAccountId,
-          activeClaudeManagedAccountIdsByRuntime: nextSelection
-        })
-        return
-      }
-      // Why: WSL managed accounts are isolated by their Linux CLAUDE_CONFIG_DIR; materializing into Windows ~/.claude would mix two auth stores.
-      this.clearLastWrittenRuntimeState()
-      return
-    }
-
-    if (!(await this.getOwnedManagedAuthPath(activeAccount))) {
-      console.warn(
-        '[claude-runtime-auth] Active managed account is not owned by Orca, restoring system default'
-      )
-      if (this.lastSyncedAccountId !== null) {
-        if (
-          previousAccount &&
-          (previousAccount.id !== activeAccount.id ||
-            this.hasMaterializedRuntimeAuth ||
-            this.runtimeOauthAccountMatches(await this.readManagedOauthAccount(previousAccount)))
-        ) {
-          await this.restoreSystemDefaultSnapshotForMissingManagedCredentials(
-            previousAccount,
-            previousManagedOauthAccount
-          )
-        } else if (!previousAccount && this.hasMaterializedRuntimeAuth) {
-          await this.restoreSystemDefaultSnapshot(this.lastWrittenCredentialsJson, undefined)
-        }
-      }
-      this.store.updateSettings({ activeClaudeManagedAccountId: null })
-      this.lastSyncedAccountId = null
-      return
-    }
-
-    let credentialsJson = await this.readManagedCredentials(activeAccount)
-    if (!credentialsJson || !this.isValidCredentialsJsonObject(credentialsJson)) {
-      console.warn(
-        '[claude-runtime-auth] Active managed account is missing or has invalid credentials, restoring system default'
-      )
-      if (this.lastSyncedAccountId !== null) {
-        if (
-          previousAccount &&
-          (previousAccount.id !== activeAccount.id ||
-            this.hasMaterializedRuntimeAuth ||
-            this.runtimeOauthAccountMatches(previousManagedOauthAccount))
-        ) {
-          await this.restoreSystemDefaultSnapshotForMissingManagedCredentials(
-            previousAccount,
-            previousManagedOauthAccount
-          )
-        } else if (!previousAccount && this.hasMaterializedRuntimeAuth) {
-          await this.restoreSystemDefaultSnapshot(this.lastWrittenCredentialsJson, undefined)
-        }
-      }
-      this.store.updateSettings({ activeClaudeManagedAccountId: null })
-      this.lastSyncedAccountId = null
-      return
-    }
-
-    if (this.lastSyncedAccountId === null) {
-      const paths = this.pathResolver.getRuntimePaths()
-      const runtimeCredentialsJson = existsSync(paths.credentialsPath)
-        ? readFileSync(paths.credentialsPath, 'utf-8')
-        : null
-      await this.captureSystemDefaultSnapshotForManagedEntry(
-        runtimeCredentialsJson,
-        credentialsJson
-      )
-    }
-
-    // Why: the CLI writes refreshed tokens to .credentials.json; if runtime differs from our last write, preserve them to managed storage before overwriting.
-    if (this.lastSyncedAccountId === activeAccount.id) {
-      if (this.skipNextReadBackForAccountId === activeAccount.id) {
-        this.skipNextReadBackForAccountId = null
-      } else {
-        const readBackResult = await this.readBackRefreshedTokens(credentialsJson, {
-          updateLastWrittenCredentialsJson: true
-        })
-        if (readBackResult.status === 'persisted') {
-          const updatedCredentialsJson = await this.readManagedCredentials(activeAccount)
-          if (updatedCredentialsJson && this.isValidCredentialsJsonObject(updatedCredentialsJson)) {
-            credentialsJson = updatedCredentialsJson
-          }
-        } else if (
-          readBackResult.status === 'rejected' &&
-          readBackResult.runtimeCredentialsChanged &&
-          // Why: a live Claude that lost a refresh race can wipe its runtime blob (empty tokens); preserving that would log out every new session.
-          readBackResult.hasValidChangedRuntimeCredentials &&
-          hasLiveClaudePtys()
-        ) {
-          if (
-            readBackResult.runtimeCredentialsJson &&
-            this.liveRuntimeCredentialsCanUpdateActiveAccount(
-              readBackResult.runtimeCredentialsJson,
-              activeAccount,
-              credentialsJson,
-              await this.readManagedOauthAccount(activeAccount)
-            )
-          ) {
-            // Why: this Claude launched under the active managed account, but persistence still needs positive account proof.
-            await this.writeManagedCredentials(activeAccount, readBackResult.runtimeCredentialsJson)
-            credentialsJson = readBackResult.runtimeCredentialsJson
-          } else {
-            // Why: while Claude runs, an unknown refresh may belong to a live session; rewriting stale managed auth logs it out.
-            console.warn(
-              '[claude-runtime-auth] Preserving changed Claude runtime credentials while live Claude terminals are running'
-            )
-            this.lastSyncedAccountId = activeAccount.id
-            this.hasMaterializedRuntimeAuth = true
-            return
-          }
-        }
-      }
-    }
-
-    if (this.lastSyncedAccountId !== activeAccount.id) {
-      this.skipNextReadBackForAccountId = null
-    }
-
-    // Why: rotate+persist the single-use token to managed storage before materializing (else runtime gets a stale token that fails invalid_grant); skip while a live PTY owns the creds since refreshing would double-rotate it (invalidating one copy) — read-back preserves its refresh instead.
-    const liveClaudePtys = hasLiveClaudePtys()
-    if (liveClaudePtys && isOauthTokenExpiring(credentialsJson)) {
-      this.managedRefreshDeferredByLivePtyAccountId = activeAccount.id
-    }
-    if (!liveClaudePtys) {
-      const refreshed = await this.refreshManagedAccountTokenIfNeeded(
-        activeAccount,
-        credentialsJson
-      )
-      if (refreshed) {
-        credentialsJson = refreshed
-      }
-    }
-
-    const paths = this.pathResolver.getRuntimePaths()
-    const runtimeCredentialsJson = await this.mergeLiveRuntimeSharedCredentials(credentialsJson)
-    this.writeRuntimeCredentials(runtimeCredentialsJson)
-    if (process.platform === 'darwin') {
-      // Why: Claude Code 2.1+ reads the scoped service, older builds the legacy unsuffixed one; runtime switching must satisfy both.
-      try {
-        await writeActiveClaudeKeychainCredentialsForRuntime(
-          runtimeCredentialsJson,
-          paths.configDir
-        )
-      } catch (error) {
-        await this.restoreSystemDefaultSnapshot(
-          credentialsJson,
-          await this.readManagedOauthAccount(activeAccount)
-        )
-        throw error
-      }
-    }
-    this.lastWrittenSharedCredentialsJson = runtimeCredentialsJson
-    const managedOauthAccount = await this.readManagedOauthAccount(activeAccount)
-    if (this.writeRuntimeOauthAccount(managedOauthAccount)) {
-      this.lastWrittenOauthAccount = managedOauthAccount
-      this.hasLastWrittenOauthAccount = true
-    } else {
-      this.lastWrittenOauthAccount = null
-      this.hasLastWrittenOauthAccount = false
-    }
-    this.lastSyncedAccountId = activeAccount.id
-    this.hasMaterializedRuntimeAuth = true
-  }
-}
diff --git a/src/main/claude-accounts/runtime-auth/runtime-auth-types.ts b/src/main/claude-accounts/runtime-auth/runtime-auth-types.ts
index 77f0394e5719..a6a099dad194 100644
--- a/src/main/claude-accounts/runtime-auth/runtime-auth-types.ts
+++ b/src/main/claude-accounts/runtime-auth/runtime-auth-types.ts
@@ -1,4 +1,3 @@
-import type { ClaudeManagedAccount } from '../../../shared/managed-account-types'
 import type { ClaudeEnvPatch } from '../environment'
 
 export type ClaudeRuntimeAuthPreparation = {
@@ -8,48 +7,7 @@ export type ClaudeRuntimeAuthPreparation = {
   wslLinuxConfigDir?: string | null
   envPatch: ClaudeEnvPatch
   stripAuthEnv: boolean
-  managedRefreshDeferredByLivePty?: boolean
   provenance: string
+  /** Usage only: why the selected account cannot be read; usage polling must not throw for it. */
+  usageError?: string
 }
-
-export type ClaudeSystemDefaultSnapshot = {
-  credentialsJson: string | null
-  configOauthAccount: unknown
-  keychainCredentialsJson: string | null
-  scopedKeychainCredentialsJson?: string | null
-  legacyKeychainCredentialsJson?: string | null
-  scopedKeychainCredentialsCaptured?: boolean
-  legacyKeychainCredentialsCaptured?: boolean
-  capturedAt: number
-}
-
-export type ClaudeAuthIdentity = {
-  accountUuid: string | null
-  email: string | null
-  organizationUuid: string | null
-}
-
-export type ClaudeReadBackResult =
-  | { status: 'unchanged' | 'persisted' }
-  | {
-      status: 'rejected'
-      runtimeCredentialsChanged: boolean
-      hasValidChangedRuntimeCredentials: boolean
-      runtimeCredentialsJson?: string
-    }
-export type ClaudeReadBackMatch =
-  | { kind: 'matched'; account: ClaudeManagedAccount; managedCredentialsJson: string }
-  | { kind: 'none' | 'ambiguous' }
-export type ClaudeKeychainReadResult =
-  | { status: 'captured'; credentialsJson: string | null }
-  | { status: 'failed' }
-export type ClaudeKeychainSnapshotValue =
-  | { status: 'captured'; credentialsJson: string | null }
-  | { status: 'unknown' }
-export type ClaudeRefreshTokenComparison = 'same' | 'different' | 'missing'
-export type ClaudeRuntimeCredentialCandidate = {
-  credentialsJson: string
-  runtimeOauthAccount: unknown
-}
-
-export const RUNTIME_OAUTH_ACCOUNT_PARSE_ERROR = Symbol('runtime-oauth-account-parse-error')
diff --git a/src/main/claude-accounts/runtime-paths.test.ts b/src/main/claude-accounts/runtime-paths.test.ts
index cd1607e5a319..aa2f168b6eac 100644
--- a/src/main/claude-accounts/runtime-paths.test.ts
+++ b/src/main/claude-accounts/runtime-paths.test.ts
@@ -79,12 +79,6 @@ describe('ClaudeRuntimePathResolver', () => {
     expect(paths.envPatch).toEqual({ CLAUDE_CONFIG_DIR: inherited })
   })
 
-  it('resolves credentials next to the config directory', () => {
-    const paths = new ClaudeRuntimePathResolver().getRuntimePaths()
-
-    expect(paths.credentialsPath).toBe(join(testState.fakeHomeDir, '.claude', '.credentials.json'))
-  })
-
   it('falls back to the home config file when no colocated config exists', () => {
     const paths = new ClaudeRuntimePathResolver().getRuntimePaths()
 
diff --git a/src/main/claude-accounts/runtime-paths.ts b/src/main/claude-accounts/runtime-paths.ts
index d9ff5701f262..c164df91d9c6 100644
--- a/src/main/claude-accounts/runtime-paths.ts
+++ b/src/main/claude-accounts/runtime-paths.ts
@@ -5,7 +5,6 @@ import type { ClaudeEnvPatch } from './environment'
 
 export type ClaudeRuntimePaths = {
   configDir: string
-  credentialsPath: string
   configPath: string
   envPatch: ClaudeEnvPatch
 }
@@ -18,7 +17,6 @@ export class ClaudeRuntimePathResolver {
 
     return {
       configDir,
-      credentialsPath: join(configDir, '.credentials.json'),
       configPath: this.resolveConfigPath(configDir, inheritedConfigDir),
       envPatch: inheritedConfigDir ? { CLAUDE_CONFIG_DIR: configDir } : {}
     }
diff --git a/src/main/claude-accounts/service.ts b/src/main/claude-accounts/service.ts
index d1c79eaf17d5..9d64480cfd4a 100644
--- a/src/main/claude-accounts/service.ts
+++ b/src/main/claude-accounts/service.ts
@@ -1,73 +1,39 @@
-import type { ClaudeRateLimitAccountsState } from '../../shared/managed-account-types'
-import type { Store } from '../persistence'
-import type { RateLimitService } from '../rate-limits/service'
+import type {
+  ClaudeAccountSignIn,
+  ClaudeRateLimitAccountsState,
+  ClaudeSignInRequest
+} from '../../shared/managed-account-types'
 import { ClaudeAccountRegistration } from './claude-account-registration'
-import { ClaudeAccountSelection } from './claude-account-selection'
 import {
-  captureClaudeAuthFromConfigDir,
-  captureClaudeAuthFromExistingConfigDir,
-  readCapturedClaudeCredentials,
-  type CapturedClaudeAuth
-} from './claude-auth-capture'
-import {
-  runClaudeCommandProcess,
-  type ClaudeCommandConfig,
-  type ClaudeCommandOptions
-} from './claude-command-process'
+  ClaudeAccountSelection,
+  type ClaudeAccountRuntime,
+  type ClaudeAccountStore,
+  type ClaudeAccountUsage
+} from './claude-account-selection'
+import { runClaudeCommandProcess } from './claude-command-process'
 import { runClaudeLoginSession } from './claude-login-session'
-import {
-  ClaudeManagedAuthStorage,
-  type ClaudeManagedAuthLocation
-} from './claude-managed-auth-storage'
 import type { ClaudeRuntimeAuthService } from './runtime-auth-service'
 import type { ClaudeAccountSelectionTarget } from './runtime-selection'
 
-export type ClaudeAccountAddTarget = {
-  runtime?: 'host' | 'wsl'
-  wslDistro?: string | null
-}
-
-export type ClaudeAccountImportOptions = ClaudeAccountAddTarget & {
-  previousLegacyCredentialsSha256?: string | null
-}
-
 export class ClaudeAccountService {
   private mutationQueue: Promise<unknown> = Promise.resolve()
   private cancelPendingClaudeLogin: (() => boolean) | null = null
-  private readonly storage = new ClaudeManagedAuthStorage()
   private readonly selection: ClaudeAccountSelection
   private readonly registration: ClaudeAccountRegistration
 
   constructor(
-    store: Store,
-    rateLimits: RateLimitService,
-    private readonly runtimeAuth: ClaudeRuntimeAuthService
+    store: ClaudeAccountStore,
+    rateLimits: ClaudeAccountUsage,
+    private readonly runtimeAuth: ClaudeAccountRuntime &
+      Pick<ClaudeRuntimeAuthService, 'getRuntimeConfigDir'>,
+    private readonly runLoginCommand = runClaudeCommandProcess
   ) {
-    this.selection = new ClaudeAccountSelection(store, rateLimits, runtimeAuth, (accountId, path) =>
-      this.safeRemoveManagedAuth(accountId, path)
-    )
+    this.selection = new ClaudeAccountSelection(store, rateLimits, runtimeAuth)
     this.registration = new ClaudeAccountRegistration({
       store,
       rateLimits,
       runtimeAuth,
-      selection: this.selection,
-      createManagedAuth: (accountId, target) => this.storage.create(accountId, target),
-      assertManagedAuth: (path, accountId) => this.storage.assertOwned(path, accountId),
-      removeManagedAuth: (accountId, path) => this.safeRemoveManagedAuth(accountId, path),
-      writeManagedAuth: (accountId, path, captured) =>
-        this.writeManagedAuth(accountId, path, captured),
-      writeCredentials: (accountId, path, value) =>
-        this.storage.writeCredentials(accountId, path, value),
-      writeOauth: (accountId, path, value) =>
-        this.storage.writeOauthAccount(accountId, path, value),
-      readSnapshot: (accountId, path) => this.storage.readSnapshot(accountId, path),
-      restoreCredentials: (accountId, path, snapshot) =>
-        this.storage.restoreCredentials(accountId, path, snapshot),
-      restoreOauth: (accountId, path, snapshot) =>
-        this.storage.restoreOauth(accountId, path, snapshot),
-      login: (location) => this.runClaudeLoginAndCapture(location),
-      captureExisting: (configDir, previousDigest) =>
-        this.captureFromExistingConfigDir(configDir, previousDigest)
+      selection: this.selection
     })
   }
 
@@ -75,34 +41,45 @@ export class ClaudeAccountService {
     return this.selection.list()
   }
 
-  async addAccount(target?: ClaudeAccountAddTarget): Promise<ClaudeRateLimitAccountsState> {
-    this.supersedePendingLogin()
-    return this.serializeMutation(() => this.registration.add(target))
+  /** A hidden `claude auth login` opens the browser and writes into the new account's folder. */
+  addAccount(target: ClaudeAccountSelectionTarget = {}): Promise<ClaudeRateLimitAccountsState> {
+    return this.signInHidden({ runtime: target.runtime, wslDistro: target.wslDistro })
+  }
+
+  reauthenticateAccount(accountId: string): Promise<ClaudeRateLimitAccountsState> {
+    return this.signInHidden({ accountId })
   }
 
-  async addAccountFromConfigDir(
-    configDir: string,
-    options?: ClaudeAccountImportOptions
+  cancelPendingLogin(): boolean {
+    return this.cancelPendingClaudeLogin?.() ?? false
+  }
+
+  beginSignIn(request: ClaudeSignInRequest = {}): Promise<ClaudeAccountSignIn> {
+    return this.serializeMutation(() => this.registration.begin(request))
+  }
+
+  finishSignIn(
+    signIn: Omit<ClaudeAccountSignIn, 'configDir'>
   ): Promise<ClaudeRateLimitAccountsState> {
-    return this.serializeMutation(() => this.registration.addFromConfigDir(configDir, options))
+    return this.serializeMutation(() => this.registration.finish(signIn))
   }
 
-  async reauthenticateAccount(accountId: string): Promise<ClaudeRateLimitAccountsState> {
-    this.supersedePendingLogin()
-    return this.serializeMutation(() => this.registration.reauthenticate(accountId))
+  /** Deletes the folder of a sign-in that never became an account; a saved account's is kept. */
+  cancelSignIn(signIn: Omit<ClaudeAccountSignIn, 'configDir'>): Promise<void> {
+    return this.serializeMutation(() => this.registration.cancel(signIn))
   }
 
-  async removeAccount(accountId: string): Promise<ClaudeRateLimitAccountsState> {
+  removeAccount(accountId: string): Promise<ClaudeRateLimitAccountsState> {
     this.supersedePendingLogin()
     return this.serializeMutation(() => this.selection.remove(accountId))
   }
 
-  async selectAccount(accountId: string | null): Promise<ClaudeRateLimitAccountsState> {
+  selectAccount(accountId: string | null): Promise<ClaudeRateLimitAccountsState> {
     this.supersedePendingLogin()
     return this.serializeMutation(() => this.selection.select(accountId))
   }
 
-  async selectAccountForTarget(
+  selectAccountForTarget(
     accountId: string | null,
     target?: ClaudeAccountSelectionTarget
   ): Promise<ClaudeRateLimitAccountsState> {
@@ -110,13 +87,26 @@ export class ClaudeAccountService {
     return this.serializeMutation(() => this.selection.select(accountId, target))
   }
 
-  cancelPendingLogin(): boolean {
-    return this.cancelPendingClaudeLogin?.() ?? false
+  getRuntimeConfigDir(target?: ClaudeAccountSelectionTarget): string {
+    return this.runtimeAuth.getRuntimeConfigDir(target)
   }
 
-  // Why before the queue, not inside it: the abandoned login owns the queue slot
-  // every later account action waits for. Called from the four the user drives,
-  // never from serializeMutation, which background work also uses.
+  private signInHidden(request: ClaudeSignInRequest): Promise<ClaudeRateLimitAccountsState> {
+    this.supersedePendingLogin()
+    return this.serializeMutation(() =>
+      this.registration.signIn(request, (folder) =>
+        runClaudeLoginSession(folder, {
+          runCommand: this.runLoginCommand,
+          setCancel: (cancel) => {
+            this.cancelPendingClaudeLogin = cancel
+          }
+        })
+      )
+    )
+  }
+
+  // Why before the queue, not inside it: the abandoned login owns the queue slot every later
+  // account action waits for. Only user-driven actions supersede it.
   private supersedePendingLogin(): void {
     if (this.cancelPendingLogin()) {
       console.info(
@@ -125,91 +115,9 @@ export class ClaudeAccountService {
     }
   }
 
-  getRuntimeConfigDir(target?: ClaudeAccountSelectionTarget): string {
-    return this.runtimeAuth.getRuntimeConfigDir(target)
-  }
-
   private serializeMutation<T>(operation: () => Promise<T>): Promise<T> {
     const next = this.mutationQueue.then(operation, operation)
     this.mutationQueue = next.catch(() => {})
     return next
   }
-
-  private runClaudeLoginAndCapture(
-    location: ClaudeManagedAuthLocation = {
-      managedAuthPath: '',
-      managedAuthRuntime: 'host',
-      wslDistro: null,
-      wslLinuxAuthPath: null
-    }
-  ): Promise<CapturedClaudeAuth> {
-    return runClaudeLoginSession(location, {
-      runCommand: (args, config, timeoutMs, options) =>
-        this.runClaudeCommand(args, config, timeoutMs, options),
-      capture: (configDir, status, previousLegacy) =>
-        this.captureAuthFromConfigDir(configDir, status, previousLegacy),
-      setCancel: (cancel) => {
-        this.cancelPendingClaudeLogin = cancel
-      }
-    })
-  }
-
-  private runClaudeCommand(
-    args: string[],
-    configDir: ClaudeCommandConfig,
-    timeoutMs: number,
-    options?: ClaudeCommandOptions
-  ): Promise<string> {
-    return runClaudeCommandProcess(args, configDir, timeoutMs, options)
-  }
-
-  private captureFromExistingConfigDir(
-    configDir: string,
-    previousLegacyCredentialsSha256?: string | null
-  ): Promise<CapturedClaudeAuth> {
-    return captureClaudeAuthFromExistingConfigDir(
-      configDir,
-      previousLegacyCredentialsSha256,
-      (args, config, timeoutMs, options) => this.runClaudeCommand(args, config, timeoutMs, options)
-    )
-  }
-
-  private captureAuthFromConfigDir(
-    configDir: string,
-    statusOutput: string,
-    previousLegacyKeychain: string | null,
-    previousLegacyCredentialsSha256?: string | null
-  ): Promise<CapturedClaudeAuth> {
-    return captureClaudeAuthFromConfigDir(
-      configDir,
-      statusOutput,
-      previousLegacyKeychain,
-      previousLegacyCredentialsSha256,
-      (path, previous, digest) => this.readCapturedCredentials(path, previous, digest)
-    )
-  }
-
-  private readCapturedCredentials(
-    configDir: string,
-    previousLegacyKeychain: string | null,
-    previousLegacyCredentialsSha256?: string | null
-  ): Promise<string | null> {
-    return readCapturedClaudeCredentials(
-      configDir,
-      previousLegacyKeychain,
-      previousLegacyCredentialsSha256
-    )
-  }
-
-  private writeManagedAuth(
-    accountId: string,
-    managedAuthPath: string,
-    captured: CapturedClaudeAuth
-  ): Promise<void> {
-    return this.storage.writeAuth(accountId, managedAuthPath, captured)
-  }
-
-  private safeRemoveManagedAuth(accountId: string, path: string): Promise<void> {
-    return this.storage.remove(accountId, path)
-  }
 }
diff --git a/src/main/claude-accounts/shared-credential-fields.test.ts b/src/main/claude-accounts/shared-credential-fields.test.ts
deleted file mode 100644
index 097e1725d128..000000000000
--- a/src/main/claude-accounts/shared-credential-fields.test.ts
+++ /dev/null
@@ -1,137 +0,0 @@
-import { describe, expect, it } from 'vitest'
-import {
-  mergeSharedClaudeCredentialFields,
-  SHARED_CLAUDE_CREDENTIAL_KEYS
-} from './shared-credential-fields'
-
-describe('mergeSharedClaudeCredentialFields', () => {
-  it('merges the live credential shared fields into the target credential', () => {
-    const target = JSON.stringify({ claudeAiOauth: { accessToken: 'target-token' } })
-    const live = JSON.stringify({
-      claudeAiOauth: { accessToken: 'live-token' },
-      mcpOAuth: { conn1: 'v1' },
-      pluginSecrets: { s: 1 }
-    })
-    const result = JSON.parse(mergeSharedClaudeCredentialFields(target, live))
-    expect(result.claudeAiOauth).toEqual({ accessToken: 'target-token' })
-    expect(result.mcpOAuth).toEqual({ conn1: 'v1' })
-    expect(result.pluginSecrets).toEqual({ s: 1 })
-  })
-
-  it('is absence-authoritative: a shared key missing on live is not carried from the target', () => {
-    const target = JSON.stringify({
-      claudeAiOauth: { accessToken: 'target-token' },
-      mcpOAuth: { stale: 'rotated-out' }
-    })
-    const live = JSON.stringify({ claudeAiOauth: { accessToken: 'live-token' } })
-    const result = JSON.parse(mergeSharedClaudeCredentialFields(target, live))
-    expect(result.mcpOAuth).toBeUndefined()
-  })
-
-  it('leaves account-scoped sibling keys on the target untouched', () => {
-    const target = JSON.stringify({
-      claudeAiOauth: { accessToken: 'target-token' },
-      trustedDeviceToken: 'target-device-token'
-    })
-    const live = JSON.stringify({
-      claudeAiOauth: { accessToken: 'live-token' },
-      mcpOAuth: { conn1: 'v1' }
-    })
-    const result = JSON.parse(mergeSharedClaudeCredentialFields(target, live))
-    expect(result.trustedDeviceToken).toBe('target-device-token')
-    expect(result.mcpOAuth).toEqual({ conn1: 'v1' })
-  })
-
-  it('returns the target unchanged when there is no live credential to merge from', () => {
-    const target = JSON.stringify({ claudeAiOauth: { accessToken: 'target-token' } })
-    expect(mergeSharedClaudeCredentialFields(target, null)).toBe(target)
-  })
-
-  it('returns the target unchanged when the live value is not a JSON object (e.g. a raw managed API key)', () => {
-    const target = JSON.stringify({ claudeAiOauth: { accessToken: 'target-token' } })
-    expect(mergeSharedClaudeCredentialFields(target, 'sk-ant-api-not-json')).toBe(target)
-  })
-
-  it('returns the target unchanged when the target itself is not a Claude OAuth credential object (managed API key)', () => {
-    const target = 'sk-ant-api-a-raw-managed-key'
-    const live = JSON.stringify({ claudeAiOauth: {}, mcpOAuth: { conn1: 'v1' } })
-    expect(mergeSharedClaudeCredentialFields(target, live)).toBe(target)
-  })
-
-  it('returns the target unchanged when the target JSON is malformed', () => {
-    const target = '{not valid json'
-    const live = JSON.stringify({ claudeAiOauth: {}, mcpOAuth: { conn1: 'v1' } })
-    expect(mergeSharedClaudeCredentialFields(target, live)).toBe(target)
-  })
-
-  it('returns the target unchanged when claudeAiOauth is null rather than an object', () => {
-    const target = JSON.stringify({ claudeAiOauth: null })
-    const live = JSON.stringify({ claudeAiOauth: {}, mcpOAuth: { conn1: 'v1' } })
-    expect(mergeSharedClaudeCredentialFields(target, live)).toBe(target)
-  })
-
-  it('returns the target unchanged when claudeAiOauth is a primitive rather than an object', () => {
-    const target = JSON.stringify({ claudeAiOauth: 'not-an-object' })
-    const live = JSON.stringify({ claudeAiOauth: {}, mcpOAuth: { conn1: 'v1' } })
-    expect(mergeSharedClaudeCredentialFields(target, live)).toBe(target)
-  })
-
-  it('returns the target byte-for-byte unchanged when neither side has any shared key (no-op merge)', () => {
-    // Why: a no-op reformat (e.g. dropped trailing newline) reads as an external refresh downstream.
-    const target = `${JSON.stringify({
-      claudeAiOauth: { accessToken: 'target-token', refreshToken: 'target-refresh' }
-    })}\n`
-    const live = JSON.stringify({ claudeAiOauth: { accessToken: 'live-token' } })
-    expect(mergeSharedClaudeCredentialFields(target, live)).toBe(target)
-  })
-
-  it('covers every documented shared key, not just mcpOAuth', () => {
-    // Why: pins the actual key names, so removing one from the constant fails this test.
-    expect(SHARED_CLAUDE_CREDENTIAL_KEYS).toEqual([
-      'mcpOAuth',
-      'mcpOAuthClientConfig',
-      'mcpXaaIdp',
-      'mcpXaaIdpConfig',
-      'pluginSecrets'
-    ])
-    const target = JSON.stringify({ claudeAiOauth: {} })
-    const liveObj: Record<string, unknown> = { claudeAiOauth: {} }
-    for (const key of SHARED_CLAUDE_CREDENTIAL_KEYS) {
-      liveObj[key] = { present: true }
-    }
-    const result = JSON.parse(mergeSharedClaudeCredentialFields(target, JSON.stringify(liveObj)))
-    for (const key of SHARED_CLAUDE_CREDENTIAL_KEYS) {
-      expect(result[key]).toEqual({ present: true })
-    }
-  })
-
-  it('returns the target byte-for-byte unchanged when an existing shared key keeps its value (interleaved order)', () => {
-    // Why: rebuilding via key-order iteration used to move an existing shared key to the
-    // end even when its value did not change, causing a spurious formatting-only rewrite.
-    const target = `${JSON.stringify({
-      claudeAiOauth: { accessToken: 'target-token' },
-      mcpOAuth: { conn1: 'v1' },
-      trustedDeviceToken: 'target-device-token'
-    })}\n`
-    const live = JSON.stringify({
-      claudeAiOauth: { accessToken: 'live-token' },
-      mcpOAuth: { conn1: 'v1' }
-    })
-    expect(mergeSharedClaudeCredentialFields(target, live)).toBe(target)
-  })
-
-  it('still updates an interleaved shared key in place when its live value actually differs', () => {
-    const target = JSON.stringify({
-      claudeAiOauth: { accessToken: 'target-token' },
-      mcpOAuth: { conn1: 'stale' },
-      trustedDeviceToken: 'target-device-token'
-    })
-    const live = JSON.stringify({
-      claudeAiOauth: { accessToken: 'live-token' },
-      mcpOAuth: { conn1: 'fresh' }
-    })
-    const result = JSON.parse(mergeSharedClaudeCredentialFields(target, live))
-    expect(result.mcpOAuth).toEqual({ conn1: 'fresh' })
-    expect(result.trustedDeviceToken).toBe('target-device-token')
-  })
-})
diff --git a/src/main/claude-accounts/shared-credential-fields.ts b/src/main/claude-accounts/shared-credential-fields.ts
deleted file mode 100644
index e0014f25c4b8..000000000000
--- a/src/main/claude-accounts/shared-credential-fields.ts
+++ /dev/null
@@ -1,166 +0,0 @@
-import { isDeepStrictEqual } from 'node:util'
-
-export const SHARED_CLAUDE_CREDENTIAL_KEYS = [
-  'mcpOAuth',
-  'mcpOAuthClientConfig',
-  'mcpXaaIdp',
-  'mcpXaaIdpConfig',
-  'pluginSecrets'
-] as const
-
-function parseCredentialObject(credentialsJson: string | null): Record<string, unknown> | null {
-  if (!credentialsJson) {
-    return null
-  }
-  let parsed: unknown
-  try {
-    parsed = JSON.parse(credentialsJson)
-  } catch {
-    return null
-  }
-  return isCredentialObject(parsed) ? parsed : null
-}
-
-function isCredentialObject(value: unknown): value is Record<string, unknown> {
-  return typeof value === 'object' && value !== null && !Array.isArray(value)
-}
-
-export function stripSharedClaudeCredentialFields(credentialsJson: string): string {
-  const credential = parseCredentialObject(credentialsJson)
-  if (!credential) {
-    return credentialsJson
-  }
-  let changed = false
-  for (const key of SHARED_CLAUDE_CREDENTIAL_KEYS) {
-    if (Object.hasOwn(credential, key)) {
-      delete credential[key]
-      changed = true
-    }
-  }
-  return changed ? JSON.stringify(credential) : credentialsJson
-}
-
-// Shared connector state follows the live runtime, including revocations, rather than frozen account snapshots.
-export function mergeSharedClaudeCredentialFields(
-  targetCredentialsJson: string,
-  liveCredentialsJson: string | null
-): string {
-  const target = parseCredentialObject(targetCredentialsJson)
-  const live = parseCredentialObject(liveCredentialsJson)
-  if (
-    !target ||
-    !live ||
-    (Object.hasOwn(target, 'claudeAiOauth') && !isCredentialObject(target.claudeAiOauth))
-  ) {
-    return targetCredentialsJson
-  }
-
-  let changed = false
-  const merged: Record<string, unknown> = { ...target }
-  for (const key of SHARED_CLAUDE_CREDENTIAL_KEYS) {
-    const targetHasKey = Object.hasOwn(target, key)
-    if (Object.hasOwn(live, key)) {
-      if (!targetHasKey || JSON.stringify(live[key]) !== JSON.stringify(target[key])) {
-        merged[key] = live[key]
-        changed = true
-      }
-    } else if (targetHasKey) {
-      delete merged[key]
-      changed = true
-    }
-  }
-  return changed ? JSON.stringify(merged) : targetCredentialsJson
-}
-
-type CredentialField = { present: boolean; value: unknown }
-
-function credentialField(record: Record<string, unknown>, key: string): CredentialField {
-  const present = Object.hasOwn(record, key)
-  return { present, value: present ? record[key] : undefined }
-}
-
-function resolveCredentialField(
-  candidates: CredentialField[],
-  baseline: CredentialField | null
-): CredentialField {
-  const changes = candidates.filter((candidate) =>
-    baseline === null ? candidate.present : !isDeepStrictEqual(candidate, baseline)
-  )
-  const first = changes[0]
-  if (first && changes.some((candidate) => !isDeepStrictEqual(candidate, first))) {
-    throw new Error(
-      'Cannot switch Claude accounts: live connector credentials conflict; existing authorizations were preserved'
-    )
-  }
-  return first ?? baseline ?? { present: false, value: undefined }
-}
-
-function resolveServerGrants(
-  sources: Record<string, unknown>[],
-  baseline: Record<string, unknown> | null,
-  key: string
-): CredentialField | null {
-  const fields = sources.map((source) => credentialField(source, key))
-  const previous = baseline === null ? null : credentialField(baseline, key)
-  if (
-    fields.some((field) => field.present && !isCredentialObject(field.value)) ||
-    (previous?.present && !isCredentialObject(previous.value))
-  ) {
-    return null
-  }
-  const maps = fields.map((field) => (isCredentialObject(field.value) ? field.value : {}))
-  const previousMap =
-    previous === null ? null : isCredentialObject(previous.value) ? previous.value : {}
-  const names = new Set([
-    ...maps.flatMap((map) => Object.keys(map)),
-    ...Object.keys(previousMap ?? {})
-  ])
-  const entries: [string, unknown][] = []
-  for (const name of names) {
-    // Keep a server's access/refresh token pair atomic while combining independent server updates.
-    const grant = resolveCredentialField(
-      maps.map((map) => credentialField(map, name)),
-      previousMap === null ? null : credentialField(previousMap, name)
-    )
-    if (grant.present) {
-      entries.push([name, grant.value])
-    }
-  }
-  const present =
-    entries.length > 0 ||
-    (fields.some((field) => field.present) &&
-      !(baseline !== null && fields.some((field) => !field.present)))
-  return { present, value: present ? Object.fromEntries(entries) : undefined }
-}
-
-export function reconcileSharedClaudeCredentialFields(
-  liveCredentials: string[],
-  lastWrittenCredentials: string | null
-): string {
-  const sources = liveCredentials.map((credentials) => {
-    const parsed = parseCredentialObject(credentials)
-    if (!parsed) {
-      throw new Error('Cannot preserve malformed Claude runtime credentials')
-    }
-    return parsed
-  })
-  if (sources.length === 0) {
-    return '{}'
-  }
-  const baseline = parseCredentialObject(lastWrittenCredentials)
-  const entries: [string, unknown][] = []
-  for (const key of SHARED_CLAUDE_CREDENTIAL_KEYS) {
-    const field =
-      (key === 'mcpOAuth' || key === 'mcpOAuthClientConfig'
-        ? resolveServerGrants(sources, baseline, key)
-        : null) ??
-      resolveCredentialField(
-        sources.map((source) => credentialField(source, key)),
-        baseline === null ? null : credentialField(baseline, key)
-      )
-    if (field.present) {
-      entries.push([key, field.value])
-    }
-  }
-  return JSON.stringify(Object.fromEntries(entries))
-}
diff --git a/src/main/claude-accounts/shared-credential-reconciliation.test.ts b/src/main/claude-accounts/shared-credential-reconciliation.test.ts
deleted file mode 100644
index f772b5634c99..000000000000
--- a/src/main/claude-accounts/shared-credential-reconciliation.test.ts
+++ /dev/null
@@ -1,129 +0,0 @@
-import { describe, expect, it } from 'vitest'
-import { reconcileSharedClaudeCredentialFields } from './shared-credential-fields'
-
-const original = { accessToken: 'access', refreshToken: 'refresh' }
-const rotated = { accessToken: 'rotated-access', refreshToken: 'rotated-refresh' }
-const baseline = JSON.stringify({
-  mcpOAuth: { figma: original },
-  pluginSecrets: { plugin: 'secret' }
-})
-
-describe('live Claude connector reconciliation', () => {
-  it('combines independent server grants on startup without importing account identity', () => {
-    const sources = [
-      JSON.stringify({ claudeAiOauth: { accessToken: 'account' }, mcpOAuth: { figma: original } }),
-      JSON.stringify({
-        mcpOAuth: { notion: rotated },
-        mcpOAuthClientConfig: { notion: { clientId: 'client' } }
-      }),
-      '{}'
-    ]
-    const expected = {
-      mcpOAuth: { figma: original, notion: rotated },
-      mcpOAuthClientConfig: { notion: { clientId: 'client' } }
-    }
-    expect(JSON.parse(reconcileSharedClaudeCredentialFields(sources, null))).toEqual(expected)
-    expect(JSON.parse(reconcileSharedClaudeCredentialFields(sources.toReversed(), null))).toEqual(
-      expected
-    )
-  })
-
-  it('combines independent rotations and additions against the previous write', () => {
-    const sources = [
-      JSON.stringify({ mcpOAuth: { figma: rotated }, pluginSecrets: { plugin: 'secret' } }),
-      JSON.stringify({
-        mcpOAuth: { figma: original, notion: original },
-        pluginSecrets: { plugin: 'new-secret' }
-      }),
-      baseline
-    ]
-    const expected = {
-      mcpOAuth: { figma: rotated, notion: original },
-      pluginSecrets: { plugin: 'new-secret' }
-    }
-    expect(JSON.parse(reconcileSharedClaudeCredentialFields(sources, baseline))).toEqual(expected)
-    expect(
-      JSON.parse(reconcileSharedClaudeCredentialFields(sources.toReversed(), baseline))
-    ).toEqual(expected)
-  })
-
-  it('keeps a revocation while another store adds an unrelated server', () => {
-    const sources = [
-      JSON.stringify({ mcpOAuth: {}, pluginSecrets: { plugin: 'secret' } }),
-      JSON.stringify({
-        mcpOAuth: { figma: original, notion: rotated },
-        pluginSecrets: { plugin: 'secret' }
-      }),
-      baseline
-    ]
-    expect(JSON.parse(reconcileSharedClaudeCredentialFields(sources, baseline))).toEqual({
-      mcpOAuth: { notion: rotated },
-      pluginSecrets: { plugin: 'secret' }
-    })
-  })
-
-  it.each([null, baseline])(
-    'rejects conflicting server token pairs with baseline %s',
-    (previous) => {
-      const sources = [
-        JSON.stringify({ mcpOAuth: { figma: rotated } }),
-        JSON.stringify({
-          mcpOAuth: { figma: { accessToken: 'other-access', refreshToken: 'other-refresh' } }
-        })
-      ]
-      expect(() => reconcileSharedClaudeCredentialFields(sources, previous)).toThrow(
-        'live connector credentials conflict'
-      )
-      expect(() => reconcileSharedClaudeCredentialFields(sources.toReversed(), previous)).toThrow(
-        'live connector credentials conflict'
-      )
-    }
-  )
-
-  it('does not recombine access and refresh tokens from different writes', () => {
-    const sources = [
-      JSON.stringify({ mcpOAuth: { figma: { ...original, accessToken: 'new-access' } } }),
-      JSON.stringify({ mcpOAuth: { figma: { ...original, refreshToken: 'new-refresh' } } })
-    ]
-    expect(() => reconcileSharedClaudeCredentialFields(sources, baseline)).toThrow(
-      'live connector credentials conflict'
-    )
-  })
-
-  it('does not infer MCP freshness from Claude account-token expiry', () => {
-    const sources = [
-      JSON.stringify({ claudeAiOauth: { expiresAt: 1 }, mcpOAuth: { figma: original } }),
-      JSON.stringify({ claudeAiOauth: { expiresAt: 9999999999999 }, mcpOAuth: { figma: rotated } })
-    ]
-    expect(() => reconcileSharedClaudeCredentialFields(sources, null)).toThrow(
-      'live connector credentials conflict'
-    )
-  })
-
-  it('rejects conflicting non-server fields instead of combining their secrets', () => {
-    expect(() =>
-      reconcileSharedClaudeCredentialFields(
-        [
-          JSON.stringify({ pluginSecrets: { plugin: 'one' } }),
-          JSON.stringify({ pluginSecrets: { plugin: 'two' } })
-        ],
-        null
-      )
-    ).toThrow('live connector credentials conflict')
-  })
-
-  it('does not resurrect the last-written grants when every live store is missing', () => {
-    expect(reconcileSharedClaudeCredentialFields([], baseline)).toBe('{}')
-  })
-
-  it('treats an explicit null as an authoritative field removal after a known write', () => {
-    expect(
-      JSON.parse(
-        reconcileSharedClaudeCredentialFields(
-          [JSON.stringify({ mcpOAuth: null, pluginSecrets: { plugin: 'secret' } }), baseline],
-          baseline
-        )
-      )
-    ).toEqual({ mcpOAuth: null, pluginSecrets: { plugin: 'secret' } })
-  })
-})
diff --git a/src/main/claude/claude-at-rest-commands.ts b/src/main/claude/claude-at-rest-commands.ts
index 02bf2fc17a05..47d4198a4fac 100644
--- a/src/main/claude/claude-at-rest-commands.ts
+++ b/src/main/claude/claude-at-rest-commands.ts
@@ -1,5 +1,9 @@
 import { join } from 'node:path'
 import type { AgentSessionRecord } from '../../shared/agent-session-record'
+import {
+  isLegacyAgentSessionAccountHome,
+  requireLegacyAgentSessionAccountHome
+} from '../../shared/agent-session-account-home'
 import type { AgentSessionSlashCommand } from '../../shared/agent-session-wire'
 import { structuredSlashCommands } from '../../shared/structured-agent-session-composer'
 import { discoverSkills } from '../skills/discovery'
@@ -45,7 +49,11 @@ export class ClaudeAtRestCommandCatalog {
 
   read = (record: AgentSessionRecord): AgentSessionSlashCommand[] | undefined => {
     // Another host's folders are only readable there, so this host never answers for them.
-    if (record.provider !== 'claude' || !supportsClaudeStructuredLocation(record.location)) {
+    if (
+      record.provider !== 'claude' ||
+      !supportsClaudeStructuredLocation(record.location) ||
+      !isLegacyAgentSessionAccountHome(record.accountHome)
+    ) {
       return undefined
     }
     const key = JSON.stringify([record.location.workspaceId, record.accountHome.path])
@@ -115,7 +123,7 @@ export class ClaudeAtRestCommandCatalog {
     const cwd =
       agentSessionPinnedLaunchDirectory(record) ??
       (await this.deps.resolveWorkspacePath(record.location.workspaceId))
-    const account = record.accountHome.path
+    const account = requireLegacyAgentSessionAccountHome(record.accountHome).path
     const [custom, discovered] = await Promise.all([
       scanClaudeCommandFolders([join(cwd, '.claude', 'commands'), join(account, 'commands')]),
       (this.deps.discover ?? discoverSkills)({
diff --git a/src/main/claude/claude-child-process-environment.ts b/src/main/claude/claude-child-process-environment.ts
index 58f00c5c1b8a..a75d4f01921e 100644
--- a/src/main/claude/claude-child-process-environment.ts
+++ b/src/main/claude/claude-child-process-environment.ts
@@ -1,4 +1,5 @@
 import { CLAUDE_AUTH_ENV_VARS, applyClaudeEnvPatch } from '../claude-accounts/environment'
+import { NATIVE_CHAT_VISUALS_DIR_ENV } from '../native-chat/native-chat-visuals-delivery'
 
 const CLAUDE_CHILD_SESSION_STAMP_ENV_KEYS = [
   'CLAUDE_CODE_CHILD_SESSION',
@@ -16,11 +17,12 @@ function cloneProcessEnv(source: NodeJS.ProcessEnv): Record<string, string> {
   return env
 }
 
-function stripClaudeChildSessionStamps(
+function stripEnvKeys(
   env: Record<string, string>,
+  keys: readonly string[],
   platform: NodeJS.Platform
 ): Record<string, string> {
-  for (const key of CLAUDE_CHILD_SESSION_STAMP_ENV_KEYS) {
+  for (const key of keys) {
     for (const envKey of Object.keys(env)) {
       if (envKey === key || (platform === 'win32' && envKey.toUpperCase() === key)) {
         delete env[envKey]
@@ -30,6 +32,13 @@ function stripClaudeChildSessionStamps(
   return env
 }
 
+function stripClaudeChildSessionStamps(
+  env: Record<string, string>,
+  platform: NodeJS.Platform
+): Record<string, string> {
+  return stripEnvKeys(env, CLAUDE_CHILD_SESSION_STAMP_ENV_KEYS, platform)
+}
+
 export function buildClaudeChildProcessEnv(
   configuredEnv: Record<string, string> = {},
   options: {
@@ -61,6 +70,8 @@ export function buildClaudeChildProcessEnv(
       }
     }
   }
+  // Only the launch names a chat's visuals folder: an inherited one belongs to another chat.
+  stripEnvKeys(env, [NATIVE_CHAT_VISUALS_DIR_ENV], platform)
   if (options.scrubConfiguredChildSessionStamps) {
     return stripClaudeChildSessionStamps({ ...env, ...configuredEnv }, platform)
   }
diff --git a/src/main/claude/claude-cli-flag-prewarm.test.ts b/src/main/claude/claude-cli-flag-prewarm.test.ts
new file mode 100644
index 000000000000..cfc03250f44e
--- /dev/null
+++ b/src/main/claude/claude-cli-flag-prewarm.test.ts
@@ -0,0 +1,71 @@
+import { homedir } from 'node:os'
+import { describe, expect, it, vi } from 'vitest'
+import type { AgentSessionRecord } from '../../shared/agent-session-record'
+import { LOCAL_EXECUTION_HOST_ID, type ExecutionHostId } from '../../shared/execution-host'
+import { agentSessionRecordFixture } from '../native-chat/agent-session-record-test-fixture'
+import { prewarmClaudeCliFlags } from './claude-cli-flag-prewarm'
+
+const record = (
+  sessionId: string,
+  overrides: {
+    provider?: string
+    host?: ExecutionHostId
+    wslDistro?: string | null
+    dir?: string
+  } = {}
+): AgentSessionRecord =>
+  agentSessionRecordFixture({
+    sessionId,
+    provider: overrides.provider ?? 'claude',
+    location: {
+      executionHostId: overrides.host ?? LOCAL_EXECUTION_HOST_ID,
+      wslDistro: overrides.wslDistro ?? null
+    },
+    ...(overrides.dir ? { launchDirectory: overrides.dir } : {})
+  })
+
+function prewarmWith(records: AgentSessionRecord[], resolveCommand = () => '/bin/claude') {
+  const prewarm = vi.fn()
+  const done = prewarmClaudeCliFlags({
+    cliFlags: { prewarm },
+    store: {
+      listVisibleSessionIds: () => records.map((r) => r.sessionId),
+      getRecord: (id) => records.find((r) => r.sessionId === id) ?? null
+    },
+    resolveCommand,
+    resolveEnv: () => ({ PATH: '/shims' }),
+    resolveInheritedEnv: async () => ({ PATH: '/usr/bin' })
+  })
+  return { prewarm, done }
+}
+
+describe('prewarming the Claude version check at startup', () => {
+  it("probes the home folder and each open local Claude chat's own folder, a few at most", async () => {
+    const { prewarm, done } = prewarmWith([
+      record('a', { dir: '/scratch/a' }),
+      record('codex', { provider: 'codex', dir: '/scratch/codex' }),
+      record('remote', { host: 'ssh:box', dir: '/scratch/remote' }),
+      record('wsl', { wslDistro: 'Ubuntu', dir: '/scratch/wsl' }),
+      record('b', { dir: '/scratch/b' }),
+      record('unpinned'),
+      record('c', { dir: '/scratch/c' }),
+      record('d', { dir: '/scratch/d' })
+    ])
+    await done
+    expect(prewarm.mock.calls.map(([launch]) => launch.cwd)).toEqual([
+      homedir(),
+      '/scratch/a',
+      '/scratch/b',
+      '/scratch/c'
+    ])
+    expect(prewarm.mock.calls[0]?.[0]).toMatchObject({ command: '/bin/claude' })
+  })
+
+  it('never throws when the CLI cannot be resolved', async () => {
+    const { prewarm, done } = prewarmWith([], () => {
+      throw new Error('the claude Command setting is not a runnable program')
+    })
+    await expect(done).resolves.toBeUndefined()
+    expect(prewarm).not.toHaveBeenCalled()
+  })
+})
diff --git a/src/main/claude/claude-cli-flag-prewarm.ts b/src/main/claude/claude-cli-flag-prewarm.ts
new file mode 100644
index 000000000000..7278f5ad430a
--- /dev/null
+++ b/src/main/claude/claude-cli-flag-prewarm.ts
@@ -0,0 +1,52 @@
+// Asks the Claude CLI for its version when native chat starts, so a chat's launch usually finds the
+// answer already known instead of waiting on a probe of a cold binary.
+
+import { homedir } from 'node:os'
+import { LOCAL_EXECUTION_HOST_ID } from '../../shared/execution-host'
+import type { AgentSessionRecordStore } from '../runtime/agent-session-record-store'
+import type { ClaudeCliFlagSupport } from './claude-cli-flag-support'
+import {
+  claudeProbeEnv,
+  resolveClaudeChildEnvSources,
+  type ClaudeEnvDeps
+} from './claude-structured-child-env'
+
+// Why a few: each is one short `--version` at startup; enough for the chats the user has open.
+const MAX_PREWARMED_FOLDERS = 4
+
+/**
+ * Probes in the home folder, which loads the binary from a cold disk, and in the folder of each open
+ * Claude chat pinned to one (the probe answer is per folder: a version manager's shim can pick a
+ * different CLI per project). Never resolves a workspace or lists worktrees, and never throws.
+ */
+export async function prewarmClaudeCliFlags(
+  deps: ClaudeEnvDeps & {
+    cliFlags: Pick<ClaudeCliFlagSupport, 'prewarm'>
+    store: Pick<AgentSessionRecordStore, 'listVisibleSessionIds' | 'getRecord'>
+  }
+): Promise<void> {
+  try {
+    const sources = await resolveClaudeChildEnvSources(deps)
+    const folders = new Set([homedir()])
+    for (const sessionId of deps.store.listVisibleSessionIds()) {
+      if (folders.size >= MAX_PREWARMED_FOLDERS) {
+        break
+      }
+      const record = deps.store.getRecord(sessionId)
+      if (
+        record?.provider === 'claude' &&
+        record.location.executionHostId === LOCAL_EXECUTION_HOST_ID &&
+        record.location.wslDistro === null &&
+        record.launchDirectory
+      ) {
+        folders.add(record.launchDirectory)
+      }
+    }
+    const env = claudeProbeEnv(sources)
+    for (const cwd of folders) {
+      deps.cliFlags.prewarm({ command: sources.command, cwd, env })
+    }
+  } catch {
+    // A launch probes for itself; this only saves it the wait.
+  }
+}
diff --git a/src/main/claude/claude-cli-flag-support.test.ts b/src/main/claude/claude-cli-flag-support.test.ts
new file mode 100644
index 000000000000..f61dda478f38
--- /dev/null
+++ b/src/main/claude/claude-cli-flag-support.test.ts
@@ -0,0 +1,275 @@
+import { describe, expect, it, vi } from 'vitest'
+import {
+  CLAUDE_PLUGIN_DIR_FLAG,
+  CLAUDE_THINKING_DISPLAY_FLAG,
+  createClaudeCliFlagSupport
+} from './claude-cli-flag-support'
+
+const LAUNCH = { command: '/bin/claude', cwd: '/repo', env: { PATH: '/shims' } }
+const UNKNOWN_FLAG = new Error(
+  "claude stream-json exited (code 1): error: unknown option '--thinking-display'"
+)
+
+type Support = ReturnType<typeof createClaudeCliFlagSupport>
+
+const thinking = (support: Support, launch: typeof LAUNCH): Promise<boolean> =>
+  support.supports(CLAUDE_THINKING_DISPLAY_FLAG, launch)
+
+type Probe = (
+  command: string,
+  launch: { cwd: string; env: Record<string, string>; timeoutMs: number }
+) => Promise<string | null>
+
+function supportWith(
+  probe: Probe,
+  budgetMs = 20,
+  keyOf = async (command: string, cwd: string): Promise<string | null> => `${command}\n${cwd}`
+) {
+  const calls = vi.fn(probe)
+  // Real time plus whatever a test skips ahead.
+  let skippedMs = 0
+  const support = createClaudeCliFlagSupport({
+    probe: calls,
+    keyOf,
+    budgetMs,
+    now: () => performance.now() + skippedMs
+  })
+  return { support, calls, skip: (ms: number) => (skippedMs += ms) }
+}
+
+/** A probe the test answers by hand. */
+function heldProbe() {
+  let answer: (version: string | null) => void = () => {}
+  const probe: Probe = () =>
+    new Promise((resolve) => {
+      answer = resolve
+    })
+  return { probe, answer: (version: string | null) => answer(version) }
+}
+
+describe('whether a launch passes a Claude CLI flag', () => {
+  it("probes with the launch's own cwd and env and its own kill timeout, then remembers", async () => {
+    const { support, calls } = supportWith(async () => '2.1.280')
+    await expect(thinking(support, LAUNCH)).resolves.toBe(true)
+    await expect(thinking(support, LAUNCH)).resolves.toBe(true)
+    expect(calls).toHaveBeenCalledTimes(1)
+    expect(calls).toHaveBeenCalledWith('/bin/claude', {
+      cwd: '/repo',
+      env: { PATH: '/shims' },
+      timeoutMs: 10_000
+    })
+  })
+
+  it('asks again per workspace: a shim can pick a different CLI there', async () => {
+    const { support, calls } = supportWith(async () => '2.1.280')
+    await thinking(support, LAUNCH)
+    await thinking(support, { ...LAUNCH, cwd: '/other' })
+    expect(calls).toHaveBeenCalledTimes(2)
+  })
+
+  it('passes nothing to a CLI older than the flag, and keeps that answer for good', async () => {
+    const { support, calls, skip } = supportWith(async () => '2.1.92')
+    await expect(thinking(support, LAUNCH)).resolves.toBe(false)
+    skip(60 * 60_000)
+    await expect(thinking(support, LAUNCH)).resolves.toBe(false)
+    expect(calls).toHaveBeenCalledTimes(1)
+  })
+
+  it('never remembers a probe that printed no version, failed or was killed: the next launch asks', async () => {
+    for (const failure of [async () => null, () => Promise.reject(new Error('EMFILE'))]) {
+      let answer: () => Promise<string | null> = failure
+      const { support, calls } = supportWith(() => answer())
+      await expect(thinking(support, LAUNCH)).resolves.toBe(false)
+      // A loaded boot is exactly when probes fail; the next launch must not inherit that.
+      answer = async () => '2.1.280'
+      await expect(thinking(support, LAUNCH)).resolves.toBe(true)
+      expect(calls).toHaveBeenCalledTimes(2)
+    }
+  })
+
+  it('waits as long as the caller allows for a probe slower than the default budget', async () => {
+    const { support, calls } = supportWith(
+      () => new Promise((resolve) => setTimeout(() => resolve('2.1.280'), 60)),
+      20
+    )
+    const [plugins, thinkingDisplay] = await Promise.all([
+      support.supports(CLAUDE_PLUGIN_DIR_FLAG, LAUNCH, 1_000),
+      thinking(support, LAUNCH)
+    ])
+    // One probe answers both; only the caller that allowed for it waited.
+    expect(plugins).toBe(true)
+    expect(thinkingDisplay).toBe(false)
+    expect(calls).toHaveBeenCalledTimes(1)
+    await expect(thinking(support, LAUNCH)).resolves.toBe(true)
+  })
+
+  it('bounds even a long budget: a probe that never answers costs at most that budget', async () => {
+    const held = heldProbe()
+    const { support } = supportWith(held.probe, 20)
+    const started = performance.now()
+    await expect(support.supports(CLAUDE_PLUGIN_DIR_FLAG, LAUNCH, 80)).resolves.toBe(false)
+    expect(performance.now() - started).toBeLessThan(500)
+  })
+
+  it('waits for a probe that answers within the budget', async () => {
+    const { support } = supportWith(
+      () => new Promise((resolve) => setTimeout(() => resolve('2.1.280'), 5)),
+      1_000
+    )
+    await expect(thinking(support, LAUNCH)).resolves.toBe(true)
+  })
+
+  it('does not wait again on a probe already past its budget, and keeps its late answer', async () => {
+    const held = heldProbe()
+    const { support, calls } = supportWith(held.probe, 30)
+    await expect(thinking(support, LAUNCH)).resolves.toBe(false)
+    const started = performance.now()
+    await expect(thinking(support, LAUNCH)).resolves.toBe(false)
+    expect(performance.now() - started).toBeLessThan(25)
+    held.answer('2.1.280')
+    await vi.waitFor(async () => expect(await thinking(support, LAUNCH)).toBe(true))
+    expect(calls).toHaveBeenCalledTimes(1)
+  })
+
+  it('stops passing the flag to a binary that exited refusing it', async () => {
+    const { support, calls } = supportWith(async () => '2.1.280')
+    await thinking(support, LAUNCH)
+    support.observeExit(LAUNCH, UNKNOWN_FLAG)
+    await vi.waitFor(async () => expect(await thinking(support, LAUNCH)).toBe(false))
+    expect(calls).toHaveBeenCalledTimes(1)
+  })
+
+  it('keeps a refusal seen while a probe was still running', async () => {
+    const held = heldProbe()
+    const { support } = supportWith(held.probe, 10)
+    await thinking(support, LAUNCH)
+    support.observeExit(LAUNCH, UNKNOWN_FLAG)
+    await new Promise((resolve) => setTimeout(resolve, 0))
+    held.answer('2.1.280')
+    await new Promise((resolve) => setTimeout(resolve, 0))
+    await expect(thinking(support, LAUNCH)).resolves.toBe(false)
+  })
+
+  it("keeps the flag through another failure or another option's refusal", async () => {
+    const { support } = supportWith(async () => '2.1.280')
+    await thinking(support, LAUNCH)
+    support.observeExit(LAUNCH, new Error('claude stream-json exited (code 1): not signed in'))
+    support.observeExit(LAUNCH, new Error("error: unknown option '--thinking'"))
+    await new Promise((resolve) => setTimeout(resolve, 0))
+    await expect(thinking(support, LAUNCH)).resolves.toBe(true)
+  })
+
+  it('spends the budget finding the binary too, and caches nothing when that runs out', async () => {
+    let slow = true
+    const { support, calls } = supportWith(
+      async () => '2.1.280',
+      30,
+      async (command, cwd) => {
+        if (slow) {
+          await new Promise((resolve) => setTimeout(resolve, 1_000))
+        }
+        return `${command}\n${cwd}`
+      }
+    )
+    const started = performance.now()
+    await expect(thinking(support, LAUNCH)).resolves.toBe(false)
+    expect(performance.now() - started).toBeLessThan(500)
+    expect(calls).not.toHaveBeenCalled()
+    slow = false
+    await expect(thinking(support, LAUNCH)).resolves.toBe(true)
+  })
+
+  it('forgets the binaries launched least recently, not the ones in use', async () => {
+    const { support, calls } = supportWith(async () => '2.1.280')
+    const at = (index: number) => ({ ...LAUNCH, cwd: `/repo-${index}` })
+    for (let index = 1; index <= 32; index += 1) {
+      await thinking(support, at(index))
+    }
+    await thinking(support, at(1))
+    await thinking(support, at(33))
+    expect(calls).toHaveBeenCalledTimes(33)
+    await thinking(support, at(1))
+    expect(calls).toHaveBeenCalledTimes(33)
+    await thinking(support, at(2))
+    expect(calls).toHaveBeenCalledTimes(34)
+  })
+
+  it('answers every flag from one probe, each against its own first version', async () => {
+    const { support, calls } = supportWith(async () => '2.1.0')
+    await expect(support.supports(CLAUDE_PLUGIN_DIR_FLAG, LAUNCH)).resolves.toBe(true)
+    await expect(thinking(support, LAUNCH)).resolves.toBe(false)
+    expect(calls).toHaveBeenCalledTimes(1)
+  })
+
+  it('shares a probe still running between flags', async () => {
+    const held = heldProbe()
+    const { support, calls } = supportWith(held.probe, 1_000)
+    const both = Promise.all([
+      thinking(support, LAUNCH),
+      support.supports(CLAUDE_PLUGIN_DIR_FLAG, LAUNCH)
+    ])
+    await vi.waitFor(() => expect(calls).toHaveBeenCalled())
+    held.answer('2.1.280')
+    await expect(both).resolves.toEqual([true, true])
+    expect(calls).toHaveBeenCalledTimes(1)
+  })
+
+  it('withdraws only the flag a binary refused', async () => {
+    const { support } = supportWith(async () => '2.1.280')
+    await thinking(support, LAUNCH)
+    support.observeExit(LAUNCH, new Error("error: unknown option '--plugin-dir'"))
+    await vi.waitFor(async () =>
+      expect(await support.supports(CLAUDE_PLUGIN_DIR_FLAG, LAUNCH)).toBe(false)
+    )
+    await expect(thinking(support, LAUNCH)).resolves.toBe(true)
+  })
+
+  it('keeps a refusal through a failed probe and a later one that answers', async () => {
+    let version: string | null = null
+    const { support } = supportWith(async () => version)
+    await thinking(support, LAUNCH)
+    support.observeExit(LAUNCH, UNKNOWN_FLAG)
+    await new Promise((resolve) => setTimeout(resolve, 0))
+    version = '2.1.280'
+    await expect(support.supports(CLAUDE_PLUGIN_DIR_FLAG, LAUNCH)).resolves.toBe(true)
+    await expect(thinking(support, LAUNCH)).resolves.toBe(false)
+  })
+
+  it('prewarms without waiting, so a later launch finds the answer and spawns nothing', async () => {
+    const held = heldProbe()
+    const { support, calls } = supportWith(held.probe, 20)
+    support.prewarm(LAUNCH)
+    await vi.waitFor(() => expect(calls).toHaveBeenCalledOnce())
+    held.answer('2.1.280')
+    await expect(support.supports(CLAUDE_PLUGIN_DIR_FLAG, LAUNCH)).resolves.toBe(true)
+    support.prewarm(LAUNCH)
+    await new Promise((resolve) => setTimeout(resolve, 0))
+    expect(calls).toHaveBeenCalledOnce()
+  })
+
+  it('a prewarm that finds no binary probes nothing and throws nothing', async () => {
+    const { support, calls } = supportWith(
+      async () => '2.1.280',
+      20,
+      async () => {
+        throw new Error('EACCES')
+      }
+    )
+    support.prewarm(LAUNCH)
+    await new Promise((resolve) => setTimeout(resolve, 0))
+    expect(calls).not.toHaveBeenCalled()
+  })
+
+  it('answers from what is known without starting a probe when asked not to', async () => {
+    const { support, calls } = supportWith(async () => '2.1.280')
+    await expect(support.supports(CLAUDE_THINKING_DISPLAY_FLAG, LAUNCH, 250, false)).resolves.toBe(
+      false
+    )
+    expect(calls).not.toHaveBeenCalled()
+    await support.supports(CLAUDE_PLUGIN_DIR_FLAG, LAUNCH)
+    await expect(support.supports(CLAUDE_THINKING_DISPLAY_FLAG, LAUNCH, 250, false)).resolves.toBe(
+      true
+    )
+    expect(calls).toHaveBeenCalledOnce()
+  })
+})
diff --git a/src/main/claude/claude-cli-flag-support.ts b/src/main/claude/claude-cli-flag-support.ts
new file mode 100644
index 000000000000..2b68c66fcb1e
--- /dev/null
+++ b/src/main/claude/claude-cli-flag-support.ts
@@ -0,0 +1,201 @@
+import { realpath, stat } from 'node:fs/promises'
+import { claudeVersionReaches, probeClaudeCliVersion } from './claude-hook-event-versions'
+
+/** A launch flag an older Claude CLI exits on, and the first published CLI whose parser defines it.
+ *  Versions were found by reading published packages, not by running them. */
+export type ClaudeCliFlag = { readonly option: string; readonly firstVersion: string }
+
+// Why 2.1.94: 2.1.93 was never published.
+export const CLAUDE_THINKING_DISPLAY_FLAG: ClaudeCliFlag = {
+  option: '--thinking-display',
+  firstVersion: '2.1.94'
+}
+
+// Why 2.0.25: 2.0.24's parser has no such option.
+export const CLAUDE_PLUGIN_DIR_FLAG: ClaudeCliFlag = {
+  option: '--plugin-dir',
+  firstVersion: '2.0.25'
+}
+
+/** How long a launch waits on a binary nothing is known about yet. A warm probe answers in tens of
+ *  milliseconds; this covers a cold disk, a node install and an antivirus scan, paid once per key
+ *  during a start that already takes seconds. */
+export const CLAUDE_CLI_FLAG_PROBE_BUDGET_MS = 1_500
+
+/** A probe still running by now is killed, and its binary gets no flag. */
+export const CLAUDE_CLI_FLAG_PROBE_KILL_AFTER_MS = 10_000
+
+/** Commander's refusal, exactly: any other startup failure says nothing about a flag. */
+const UNKNOWN_OPTION_DIAGNOSTIC = /unknown option '(--[a-z][a-z0-9-]*)'/
+
+// One small entry per binary per workspace it launched in; enough for every worktree in active use.
+const MAX_REMEMBERED = 32
+
+export type ClaudeCliLaunch = {
+  command: string
+  cwd: string
+  env: Record<string, string>
+}
+
+type ClaudeVersionProbe = (
+  command: string,
+  launch: { cwd: string; env: Record<string, string>; timeoutMs: number }
+) => Promise<string | null>
+
+export type ClaudeCliFlagSupport = {
+  /**
+   * Whether this launch's CLI takes `flag`. A binary not yet known is probed once for its version
+   * with the launch's own cwd and env, waited on for at most the budget (the caller's, or the
+   * default) from when its probe began; past it the answer is no for this launch only. Every flag
+   * shares that one probe.
+   */
+  supports: (
+    flag: ClaudeCliFlag,
+    launch: ClaudeCliLaunch,
+    budgetMs?: number,
+    /** False answers from what is known or already being asked, never starting a new probe. */
+    startProbe?: boolean
+  ) => Promise<boolean>
+  /** Starts the version probe for a binary nothing is known about yet, without waiting on it, so a
+   *  later launch finds the answer. Never throws. */
+  prewarm: (launch: ClaudeCliLaunch) => void
+  /** A child that exited refusing a flag: that binary, in that workspace, never gets it again. */
+  observeExit: (launch: Pick<ClaudeCliLaunch, 'command' | 'cwd'>, error: Error) => void
+}
+
+/** Which binary a command is in a workspace right now: a shim answers per project, and a
+ *  self-update swaps the link's target or the file. */
+async function claudeBinaryKey(command: string, cwd: string): Promise<string | null> {
+  try {
+    const target = await realpath(command)
+    return `${target}\n${(await stat(target)).mtimeMs}\n${cwd}`
+  } catch {
+    return null
+  }
+}
+
+/** The promise's value if it settles within `ms`, else undefined. */
+async function within<T>(pending: Promise<T>, ms: number): Promise<T | undefined> {
+  let timer: ReturnType<typeof setTimeout> | undefined
+  const expired = new Promise<undefined>((resolve) => {
+    timer = setTimeout(() => resolve(undefined), Math.max(0, ms))
+    timer.unref?.()
+  })
+  try {
+    return await Promise.race([pending, expired])
+  } finally {
+    clearTimeout(timer)
+  }
+}
+
+/** `version` undefined: not known yet. */
+type BinaryFacts = { version?: string; refused: Set<string> }
+
+export function createClaudeCliFlagSupport(
+  deps: {
+    probe: ClaudeVersionProbe
+    keyOf: (command: string, cwd: string) => Promise<string | null>
+    budgetMs: number
+    now: () => number
+  } = {
+    probe: probeClaudeCliVersion,
+    keyOf: claudeBinaryKey,
+    budgetMs: CLAUDE_CLI_FLAG_PROBE_BUDGET_MS,
+    now: () => performance.now()
+  }
+): ClaudeCliFlagSupport {
+  const known = new Map<string, BinaryFacts>()
+  const probing = new Map<string, { settled: Promise<void>; startedAt: number }>()
+  /** The key's facts, marked most recently used; the bound drops the binaries launched least recently. */
+  const touch = (key: string): BinaryFacts => {
+    const facts = known.get(key) ?? { refused: new Set<string>() }
+    known.delete(key)
+    known.set(key, facts)
+    for (const stale of known.keys()) {
+      if (known.size <= MAX_REMEMBERED) {
+        break
+      }
+      known.delete(stale)
+    }
+    return facts
+  }
+  // Only a version is remembered, for the binary's life. A probe that gave none (killed, failed to
+  // spawn, unparseable) is forgotten, so the next launch asks again: a latched failure would cost
+  // the flag exactly when probes are slowest, at boot. A refusal is remembered on its own.
+  const settle = (key: string, version: string | null): void => {
+    if (version !== null) {
+      touch(key).version = version
+    }
+  }
+  const versionOf = (key: string): string | undefined =>
+    known.has(key) ? touch(key).version : undefined
+  const answer = (key: string, flag: ClaudeCliFlag): boolean => {
+    const facts = known.get(key)
+    return (
+      facts?.version !== undefined &&
+      !facts.refused.has(flag.option) &&
+      claudeVersionReaches(facts.version, flag.firstVersion)
+    )
+  }
+  const probe = (key: string, launch: ClaudeCliLaunch) => {
+    const settled = deps
+      .probe(launch.command, {
+        cwd: launch.cwd,
+        env: launch.env,
+        timeoutMs: CLAUDE_CLI_FLAG_PROBE_KILL_AFTER_MS
+      })
+      .then(
+        (version) => settle(key, version),
+        () => settle(key, null)
+      )
+      .finally(() => probing.delete(key))
+    const started = { settled, startedAt: deps.now() }
+    probing.set(key, started)
+    return started
+  }
+
+  return {
+    supports: async (flag, launch, budgetMs = deps.budgetMs, startProbe = true) => {
+      // The launch never waits longer than the budget, finding the binary included.
+      const deadline = deps.now() + budgetMs
+      const key = await within(deps.keyOf(launch.command, launch.cwd), budgetMs)
+      if (key === undefined || key === null) {
+        return false
+      }
+      if (versionOf(key) !== undefined) {
+        return answer(key, flag)
+      }
+      const running = probing.get(key) ?? (startProbe ? probe(key, launch) : undefined)
+      if (!running) {
+        return false
+      }
+      // The probe's own budget, too: one already past it is not waited on again.
+      await within(running.settled, Math.min(running.startedAt + budgetMs, deadline) - deps.now())
+      return answer(key, flag)
+    },
+    prewarm: (launch) => {
+      void deps.keyOf(launch.command, launch.cwd).then(
+        (key) => {
+          if (key !== null && versionOf(key) === undefined && !probing.has(key)) {
+            probe(key, launch)
+          }
+        },
+        () => {}
+      )
+    },
+    observeExit: (launch, error) => {
+      const option = UNKNOWN_OPTION_DIAGNOSTIC.exec(error.message)?.[1]
+      if (!option) {
+        return
+      }
+      void deps.keyOf(launch.command, launch.cwd).then((key) => {
+        if (key !== null) {
+          touch(key).refused.add(option)
+        }
+      })
+    }
+  }
+}
+
+/** One per process: every structured launch on this host shares what it learned. */
+export const claudeCliFlagSupport = createClaudeCliFlagSupport()
diff --git a/src/main/claude/claude-model-catalog-probe.ts b/src/main/claude/claude-model-catalog-probe.ts
index f3a2646107cf..26dd3c601b03 100644
--- a/src/main/claude/claude-model-catalog-probe.ts
+++ b/src/main/claude/claude-model-catalog-probe.ts
@@ -15,7 +15,6 @@ export type ClaudeModelCatalogProbeDeps = Pick<
   ClaudeStructuredLaunchResolverDeps,
   'resolveCommand' | 'resolveEnv' | 'resolveInheritedEnv' | 'resolveAuthPolicy'
 > & {
-  authSwitchSettleTimeoutMs?: number
   /** Test seams; production runs the one-shot listing child. */
   discover?: typeof discoverModelsLocal
   spawnAgent?: typeof spawnSourceControlAgent
diff --git a/src/main/claude/claude-stream-json-connection.test.ts b/src/main/claude/claude-stream-json-connection.test.ts
index f9c61b9b8e4b..e23154524815 100644
--- a/src/main/claude/claude-stream-json-connection.test.ts
+++ b/src/main/claude/claude-stream-json-connection.test.ts
@@ -5,7 +5,6 @@ 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'
 import type { ProcessSpec } from '../../shared/child-process/process-spec'
 import { query, type CanUseTool, type Options } from '@anthropic-ai/claude-agent-sdk'
 import {
@@ -757,85 +756,3 @@ describe('Claude stream-json connection', () => {
     await expect(connection.close()).resolves.toBe(true)
   }, 20_000)
 })
-
-// A structured Claude child owns the account's credentials while it runs, exactly as
-// a Claude PTY does. The gate is what makes runtime-auth-sync defer the managed OAuth
-// refresh instead of rotating the single-use token out from under a live session, and
-// structured sessions used to be invisible to it.
-describe('the managed-auth live gate', () => {
-  it('holds while a structured child runs and releases when it ends', async () => {
-    // The gate is a process-wide singleton and a sibling test's release lands on its
-    // child's 'close' event, which can settle after that test's close() resolved.
-    await until(() => (hasLiveClaudePtys() ? null : true), 'a drained auth gate')
-    const scenario = scriptScenario([
-      { emit: { type: 'system', subtype: 'init', session_id: SESSION_ID, uuid: 'init-1' } },
-      { wait: HOLD_OPEN }
-    ])
-    const connection = await open(launchFor(scenario))
-
-    expect(hasLiveClaudePtys()).toBe(true)
-
-    await connection.close()
-
-    await until(() => (hasLiveClaudePtys() ? null : true), 'the auth gate to drain')
-    expect(hasLiveClaudePtys()).toBe(false)
-  }, 30_000)
-
-  it('releases when the child dies on its own rather than through close()', async () => {
-    await until(() => (hasLiveClaudePtys() ? null : true), 'a drained auth gate')
-    const scenario = scriptScenario([
-      { emit: { type: 'system', subtype: 'init', session_id: SESSION_ID, uuid: 'init-1' } },
-      { wait: HOLD_OPEN }
-    ])
-    await open(launchFor(scenario))
-    expect(hasLiveClaudePtys()).toBe(true)
-
-    spawnedChildren.at(-1)?.kill('SIGKILL')
-
-    await until(() => (hasLiveClaudePtys() ? null : true), 'the auth gate to drain')
-    expect(hasLiveClaudePtys()).toBe(false)
-  }, 30_000)
-
-  // The gate entry is deliberately unpersisted, so confirmSeededClaudeLivePtys can never
-  // reconcile a stray one: a leak here defers the managed OAuth refresh for the life of
-  // the process. Entering the gate only after the release handlers are attached makes
-  // that unreachable regardless of what the setup in between does.
-  it('leaks no gate entry when setup throws between spawn and handler attachment', async () => {
-    await until(() => (hasLiveClaudePtys() ? null : true), 'a drained auth gate')
-    const scenario = scriptScenario([
-      { emit: { type: 'system', subtype: 'init', session_id: SESSION_ID, uuid: 'init-1' } },
-      { wait: HOLD_OPEN }
-    ])
-    let started: SpawnedProcess | null = null
-
-    try {
-      await expect(
-        openClaudeStreamJsonConnection(launchFor(scenario), {}, (spec) => {
-          const child = spawnProcess(spec)
-          started = child
-          const attach = child.stderr.on.bind(child.stderr)
-          // Measured attach order: the SDK binds stderr 'data' from inside query(),
-          // before the child is even assigned. The SECOND bind is this connection's own
-          // armTreeOnOutput — the first statement that runs after the child exists and
-          // before its 'exit'/'close' release handlers. Throwing on the first is
-          // vacuous: it escapes before any gate entry could have happened.
-          let dataAttaches = 0
-          child.stderr.on = ((event: string, listener: (...args: unknown[]) => void) => {
-            if (event === 'data') {
-              dataAttaches += 1
-              if (dataAttaches === 2) {
-                throw new Error('stderr listener attach failed')
-              }
-            }
-            return attach(event, listener)
-          }) as typeof child.stderr.on
-          return child
-        })
-      ).rejects.toThrow('stderr listener attach failed')
-
-      expect(hasLiveClaudePtys()).toBe(false)
-    } finally {
-      ;(started as SpawnedProcess | null)?.kill('SIGKILL')
-    }
-  }, 30_000)
-})
diff --git a/src/main/claude/claude-stream-json-connection.ts b/src/main/claude/claude-stream-json-connection.ts
index e8ada34f0b91..bbf0db1c115d 100644
--- a/src/main/claude/claude-stream-json-connection.ts
+++ b/src/main/claude/claude-stream-json-connection.ts
@@ -1,12 +1,7 @@
-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'
-import {
-  markClaudeStructuredChildExited,
-  markClaudeStructuredChildSpawned
-} from '../claude-accounts/live-pty-gate'
 import { buildClaudeChildProcessEnv } from './claude-child-process-environment'
 import { withoutInheritedClaudeConfigDir } from './claude-config-dir-pin'
 import {
@@ -155,12 +150,6 @@ export async function openClaudeStreamJsonConnection(
   if (!child || !managed) {
     throw new Error('the claude agent SDK returned without spawning a child')
   }
-  // This child owns the account's credentials for as long as it runs, exactly as a
-  // Claude PTY does — hold the OAuth-refresh gate so a managed refresh cannot rotate
-  // the single-use token out from under it mid-turn. Entered below, once a release
-  // path exists.
-  const authGateKey = randomUUID()
-  const releaseAuthGate = (): void => markClaudeStructuredChildExited(authGateKey)
   let exitStatus: ExitStatus | null = null
   let closing = false
   let terminalError: Error | null = null
@@ -256,7 +245,6 @@ export async function openClaudeStreamJsonConnection(
 
   managed.onExit((exit) => {
     exitStatus = exit
-    releaseAuthGate()
     handleUnexpectedEnd()
   })
   child.on('error', (error) => {
@@ -266,7 +254,6 @@ export async function openClaudeStreamJsonConnection(
     handleUnexpectedEnd(error)
   })
   child.on('close', () => {
-    releaseAuthGate()
     handleUnexpectedEnd()
   })
   child.stdin.on('error', (error) => {
@@ -275,13 +262,6 @@ export async function openClaudeStreamJsonConnection(
       handleUnexpectedEnd(error)
     }
   })
-  // Why here and not at spawn: a structured gate entry is deliberately unpersisted, so
-  // confirmSeededClaudeLivePtys can never reconcile a stray one and a leak defers the
-  // managed OAuth refresh for the life of the process. Entering only after 'exit' and
-  // 'close' are attached makes that unreachable — any later throw still leaves a
-  // listener that releases. Nothing between spawn and here can yield, so the child
-  // cannot end before the gate is entered.
-  markClaudeStructuredChildSpawned(authGateKey)
 
   const send: ClaudeStreamJsonConnection['send'] = (message, beforeDispatch) => {
     if (
diff --git a/src/main/claude/claude-structured-agent-definition.ts b/src/main/claude/claude-structured-agent-definition.ts
index 991d681c988c..447ecb79a3be 100644
--- a/src/main/claude/claude-structured-agent-definition.ts
+++ b/src/main/claude/claude-structured-agent-definition.ts
@@ -1,9 +1,9 @@
-import type { StructuredAgentDefinition } from '../native-chat/agent-session-wire/structured-agent-definition'
+import type { DirectoryAccountAgentDefinition } from '../native-chat/agent-session-wire/structured-agent-definition'
 import { CLAUDE_STRUCTURED_HANDLE_NAMESPACE } from '../../shared/agent-session-provider-handle-encoding'
 import { isClaudeStructuredOptionKey } from './claude-structured-options'
 import { claudeFallbackModelOptions } from './claude-structured-session-options'
 
-export const CLAUDE_STRUCTURED_AGENT: StructuredAgentDefinition = {
+export const CLAUDE_STRUCTURED_AGENT: DirectoryAccountAgentDefinition = {
   agent: 'claude',
   handleTransport: CLAUDE_STRUCTURED_HANDLE_NAMESPACE.transport,
   accountHomeVariable: 'CLAUDE_CONFIG_DIR',
diff --git a/src/main/claude/claude-structured-auth-parity.test.ts b/src/main/claude/claude-structured-auth-parity.test.ts
index 227fb117914c..2a22fae853ae 100644
--- a/src/main/claude/claude-structured-auth-parity.test.ts
+++ b/src/main/claude/claude-structured-auth-parity.test.ts
@@ -1,20 +1,8 @@
-import { afterEach, describe, expect, it, vi } from 'vitest'
+import { describe, expect, it, vi } from 'vitest'
 import type { AgentSessionRecord } from '../../shared/agent-session-record'
 import { LOCAL_EXECUTION_HOST_ID } from '../../shared/execution-host'
-import { beginClaudeAuthSwitch, endClaudeAuthSwitch } from '../claude-accounts/live-pty-gate'
-import {
-  CLAUDE_AUTH_ENV_CONFLICT_MESSAGE,
-  CLAUDE_AUTH_SWITCH_IN_PROGRESS_MESSAGE
-} from '../claude-accounts/environment'
+import { CLAUDE_AUTH_ENV_CONFLICT_MESSAGE } from '../claude-accounts/environment'
 import { createClaudeStructuredLaunchResolver } from './claude-structured-launch-resolution'
-import { ClaudeStructuredSessionAdapter } from './claude-structured-session-adapter'
-import {
-  PROVIDER_SESSION_ID,
-  adapterFor,
-  fakeClaude,
-  identityFor
-} from './claude-structured-session-test-support'
-import { claudeProviderHandle } from '../../shared/agent-session-provider-handle-encoding'
 
 const SESSION_ID = 'orca-session-auth'
 const IDENTITY = { sessionId: SESSION_ID } as Parameters<
@@ -39,7 +27,6 @@ function record(): AgentSessionRecord {
 function resolverFor(options: {
   stripAuthEnv: boolean
   overlay?: Record<string, string>
-  authSwitchSettleTimeoutMs?: number
 }): ReturnType<typeof createClaudeStructuredLaunchResolver> {
   return createClaudeStructuredLaunchResolver({
     resolveLaunchArgs: () => [],
@@ -47,41 +34,10 @@ function resolverFor(options: {
     resolveWorkspacePath: async (id) => `/repos/${id}`,
     resolveCommand: () => '/usr/local/bin/claude',
     resolveAuthPolicy: () => ({ stripAuthEnv: options.stripAuthEnv }),
-    authSwitchSettleTimeoutMs: options.authSwitchSettleTimeoutMs ?? 20,
     ...(options.overlay ? { resolveEnv: () => options.overlay as Record<string, string> } : {})
   })
 }
 
-/**
- * An adapter driven by the REAL launch resolver, not the stub in the shared test
- * support — the stub has no auth guard at all, so a teardown-window test built on it
- * would pass whatever the guard did.
- */
-function realResolverAdapter(
-  claude: ReturnType<typeof fakeClaude>,
-  authSwitchSettleTimeoutMs: number
-): ClaudeStructuredSessionAdapter {
-  // oxlint-disable-next-line typescript/consistent-type-assertions -- SAFETY: the resolver reads only the chain head's handle from this partial record.
-  const resumable = {
-    ...record(),
-    providerHandleChain: [{ handle: claudeProviderHandle(PROVIDER_SESSION_ID, null) }]
-  } as unknown as AgentSessionRecord
-  return new ClaudeStructuredSessionAdapter({
-    resolveLaunch: createClaudeStructuredLaunchResolver({
-      resolveLaunchArgs: () => [],
-      store: { getRecord: () => resumable, pinLaunchDirectory: vi.fn() },
-      resolveWorkspacePath: async (id) => `/repos/${id}`,
-      resolveCommand: () => '/usr/local/bin/claude',
-      resolveAuthPolicy: () => ({ stripAuthEnv: false }),
-      authSwitchSettleTimeoutMs
-    }),
-    openConnection: claude.openConnection,
-    readProcessStartTime: async () => 1_700_000_000_000,
-    now: () => 1_700_000_000_500,
-    persistHandle: async () => {}
-  })
-}
-
 function withAmbientAuth<T>(value: string, run: () => Promise<T>): Promise<T> {
   const restore = process.env.ANTHROPIC_API_KEY
   process.env.ANTHROPIC_API_KEY = value
@@ -95,10 +51,6 @@ function withAmbientAuth<T>(value: string, run: () => Promise<T>): Promise<T> {
 }
 
 describe('claude structured auth parity with the terminal preflight', () => {
-  afterEach(() => {
-    endClaudeAuthSwitch()
-  })
-
   // Task 1 — the terminal preflight refuses this at spawn-env.ts:25 and
   // runtime/spawn-preflight.ts:139; the structured path used to let the override win.
   it('refuses an explicit Anthropic auth override while a managed account is pinned', async () => {
@@ -161,91 +113,4 @@ describe('claude structured auth parity with the terminal preflight', () => {
       expect(launch.env?.ANTHROPIC_API_KEY).toBeUndefined()
     })
   })
-
-  // Task 3 — the terminal preflight guards this at four sites; the structured path had none.
-  it('refuses launch resolution when an account switch never settles', async () => {
-    beginClaudeAuthSwitch()
-
-    await expect(
-      resolverFor({ stripAuthEnv: true, authSwitchSettleTimeoutMs: 20 })({ identity: IDENTITY })
-    ).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 () => {
-    beginClaudeAuthSwitch()
-    setTimeout(() => endClaudeAuthSwitch(), 20)
-
-    const launch = await resolverFor({
-      stripAuthEnv: true,
-      authSwitchSettleTimeoutMs: 5_000
-    })({ identity: IDENTITY })
-
-    expect(launch.claudeConfigDir).toBe('/home/work/.claude')
-  })
-
-  it('refuses an acquire before it tears the previous session down', async () => {
-    const claude = fakeClaude()
-    const adapter = adapterFor(claude)
-    beginClaudeAuthSwitch()
-
-    await expect(
-      adapter.acquire({ identity: identityFor(), fence: 7, spawnToken: 'spawn-9' })
-    ).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)
-  })
-
-  // The teardown between the entry guard and launch resolution closes the live child
-  // and proves its tree — seconds, not milliseconds. A switch that begins inside it
-  // has already cost the user their session, so refusing there produces exactly the
-  // outcome the entry guard advertises against: a dead chat and no replacement.
-  it('replaces the session when a switch begins inside the acquire teardown', async () => {
-    const claude = fakeClaude()
-    const adapter = realResolverAdapter(claude, 5_000)
-    await adapter.acquire({ identity: identityFor(), fence: 7, spawnToken: 'spawn-9' })
-    const live = claude.connections[0]!
-    const closeWithSwitch = live.close
-    live.close = async () => {
-      beginClaudeAuthSwitch()
-      setTimeout(() => endClaudeAuthSwitch(), 20)
-      return closeWithSwitch()
-    }
-
-    await expect(
-      adapter.acquire({ identity: identityFor(), fence: 8, spawnToken: 'spawn-10' })
-    ).resolves.toMatchObject({ process: { spawnToken: 'spawn-10' } })
-    expect(live.closed).toBe(true)
-    // The replacement child exists: the user's chat came back.
-    expect(claude.connections).toHaveLength(2)
-    expect(claude.connections[1]!.closed).toBe(false)
-    await adapter.closeAll()
-  })
-
-  it('still refuses a mid-teardown switch that never settles, leaving nothing half-open', async () => {
-    const claude = fakeClaude()
-    const adapter = realResolverAdapter(claude, 20)
-    await adapter.acquire({ identity: identityFor(), fence: 7, spawnToken: 'spawn-9' })
-    const live = claude.connections[0]!
-    const closeWithSwitch = live.close
-    live.close = async () => {
-      beginClaudeAuthSwitch()
-      return closeWithSwitch()
-    }
-
-    await expect(
-      adapter.acquire({ identity: identityFor(), fence: 8, spawnToken: 'spawn-10' })
-    ).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-effort-default-at-rest.test.ts b/src/main/claude/claude-structured-effort-default-at-rest.test.ts
index dcdad5b868bf..2d14a9e0c047 100644
--- a/src/main/claude/claude-structured-effort-default-at-rest.test.ts
+++ b/src/main/claude/claude-structured-effort-default-at-rest.test.ts
@@ -131,6 +131,8 @@ function restingRecord(options: Record<string, string>): AgentSessionRecord {
     provider: 'claude',
     accountHome: { variable: 'CLAUDE_CONFIG_DIR', path: ACCOUNT_HOME },
     location: { wslDistro: null },
+    // Why released: a chat at rest has no live claim, so its next start reads the current account.
+    lease: { claimStatus: 'released' },
     options
   } as unknown as AgentSessionRecord
 }
diff --git a/src/main/claude/claude-structured-history-window.test.ts b/src/main/claude/claude-structured-history-window.test.ts
index e5ed29561cbc..f0a2e78841c7 100644
--- a/src/main/claude/claude-structured-history-window.test.ts
+++ b/src/main/claude/claude-structured-history-window.test.ts
@@ -5,7 +5,7 @@ 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 } from 'vitest'
-import { structuredAgentSessionSendBody } from '../../shared/structured-agent-session-outbox'
+import { structuredAgentSessionSendBody } from '../../shared/structured-agent-session-send-mutation'
 import { structuredAgentSessionPayloadFingerprint } from '../../shared/structured-agent-session-mutation'
 import { computeAgentSessionPayloadFingerprint } from '../../shared/agent-session-mutation-envelope'
 import { reconcileSubmissions } from '../native-chat/agent-session-journal/journal-submission-reconciler'
diff --git a/src/main/claude/claude-structured-launch-account-routing.test.ts b/src/main/claude/claude-structured-launch-account-routing.test.ts
index 031559a44387..0d7babfb8f5d 100644
--- a/src/main/claude/claude-structured-launch-account-routing.test.ts
+++ b/src/main/claude/claude-structured-launch-account-routing.test.ts
@@ -4,8 +4,8 @@ import { join, resolve as resolvePath } from 'node:path'
 import { afterEach, expect, it, vi } from 'vitest'
 import { agentSessionRecordFixture } from '../../shared/agent-session-record.test-fixture'
 import { claudeProviderHandle } from '../../shared/agent-session-provider-handle-encoding'
+import { CLAUDE_PROFILE_SETUP_FAILED_MESSAGE } from '../../shared/claude-profile-routing'
 import {
-  CLAUDE_PROFILE_MISSING_MESSAGE,
   ClaudeProfileRouter,
   type ClaudeProfileRouterSettings
 } from '../claude-accounts/claude-profile-router'
@@ -32,7 +32,10 @@ it('launches each acquisition under the current selection, not the account it wa
     getSettings: () => settings,
     dataRoot: root,
     userHome: join(root, 'personal'),
-    env: { CLAUDE_CONFIG_DIR: resolvePath('/user/own') }
+    env: { CLAUDE_CONFIG_DIR: resolvePath('/user/own') },
+    runSetup: async () => {
+      throw new Error('setup refused')
+    }
   })
   installClaudeProfileRouter(router)
   const record = {
@@ -56,7 +59,12 @@ it('launches each acquisition under the current selection, not the account it wa
     providerHandle: claudeProviderHandle('unused', null)
   }
 
-  await expect(resolve({ identity })).rejects.toThrow(CLAUDE_PROFILE_MISSING_MESSAGE)
+  // A missing folder is set up first; typed when that fails, so the chat names the situation.
+  await expect(resolve({ identity })).rejects.toMatchObject({
+    name: 'AgentSessionPreSpawnError',
+    reason: 'claudeAccountSetupFailed',
+    message: CLAUDE_PROFILE_SETUP_FAILED_MESSAGE
+  })
 
   const home = join(root, 'claude-profiles', 'a', 'home')
   mkdirSync(home, { recursive: true })
diff --git a/src/main/claude/claude-structured-launch-flags.ts b/src/main/claude/claude-structured-launch-flags.ts
new file mode 100644
index 000000000000..32ccef04dff3
--- /dev/null
+++ b/src/main/claude/claude-structured-launch-flags.ts
@@ -0,0 +1,64 @@
+// The version-gated parts of a structured Claude launch: readable thinking, and the chat's visuals
+// folder with its skill plugin. Both ask one shared version probe of the launch's own CLI.
+
+import type {
+  NativeChatVisualsLaunch,
+  PrepareNativeChatVisuals
+} from '../native-chat/native-chat-visuals-delivery'
+import {
+  CLAUDE_CLI_FLAG_PROBE_KILL_AFTER_MS,
+  CLAUDE_PLUGIN_DIR_FLAG,
+  CLAUDE_THINKING_DISPLAY_FLAG,
+  type ClaudeCliFlagSupport,
+  type ClaudeCliLaunch
+} from './claude-cli-flag-support'
+
+const THINKING_DISPLAY_ARGS: Readonly<Record<string, string>> = { 'thinking-display': 'summarized' }
+
+/** How long the thinking flag is asked again once the visuals check has waited for the version:
+ *  enough to find the binary and read the now-known answer. */
+const THINKING_RECHECK_BUDGET_MS = 250
+
+export type ClaudeLaunchFlags = {
+  /** Readable thinking: the CLI otherwise streams thinking blocks with no text under Orca's
+   *  launch. Only the display is set, never `--thinking`, so a user who turned thinking off keeps
+   *  it off. */
+  thinkingDisplayArgs: Readonly<Record<string, string>>
+  visuals: { visuals: NativeChatVisualsLaunch; pluginDir: string | null } | null
+}
+
+export async function resolveClaudeLaunchFlags(
+  deps: {
+    cliFlags?: Pick<ClaudeCliFlagSupport, 'supports'>
+    prepareVisuals?: PrepareNativeChatVisuals
+  },
+  sessionId: string,
+  launch: ClaudeCliLaunch
+): Promise<ClaudeLaunchFlags> {
+  const thinking = (budgetMs?: number, startProbe?: boolean) =>
+    deps.cliFlags?.supports(CLAUDE_THINKING_DISPLAY_FLAG, launch, budgetMs, startProbe) ?? false
+  // Unlike the thinking display, a missed answer costs the chat its skill for its whole life, so
+  // the plugin check waits for the probe up to its own kill time: bounded, and instant once known.
+  const preparedVisuals = deps.prepareVisuals?.(sessionId) ?? Promise.resolve(null)
+  const [thinksFirst, visuals, loadsPlugins] = await Promise.all([
+    thinking(),
+    preparedVisuals,
+    preparedVisuals.then((visuals) =>
+      visuals
+        ? (deps.cliFlags?.supports(
+            CLAUDE_PLUGIN_DIR_FLAG,
+            launch,
+            CLAUDE_CLI_FLAG_PROBE_KILL_AFTER_MS
+          ) ?? false)
+        : false
+    )
+  ])
+  // The plugin check may have outwaited the thinking budget and learned the version meanwhile; a
+  // probe that gave none is not asked again here.
+  const thinks =
+    thinksFirst || (visuals ? await thinking(THINKING_RECHECK_BUDGET_MS, false) : false)
+  return {
+    thinkingDisplayArgs: thinks ? THINKING_DISPLAY_ARGS : {},
+    visuals: visuals ? { visuals, pluginDir: loadsPlugins ? visuals.skill.pluginDir : null } : null
+  }
+}
diff --git a/src/main/claude/claude-structured-launch-home.ts b/src/main/claude/claude-structured-launch-home.ts
index 0df1b2f599c1..14afad9b5c43 100644
--- a/src/main/claude/claude-structured-launch-home.ts
+++ b/src/main/claude/claude-structured-launch-home.ts
@@ -32,7 +32,7 @@ export async function resolveClaudeStructuredLaunchHome(
 }
 
 /** Whether Claude wrote a transcript for this id under the given config folder. */
-export async function claudeTranscriptExists(input: {
+async function claudeTranscriptExists(input: {
   providerSessionId: string
   claudeConfigDir: string
 }): Promise<boolean> {
diff --git a/src/main/claude/claude-structured-launch-resolution.test.ts b/src/main/claude/claude-structured-launch-resolution.test.ts
index 5427756baf2c..19067d65a4c5 100644
--- a/src/main/claude/claude-structured-launch-resolution.test.ts
+++ b/src/main/claude/claude-structured-launch-resolution.test.ts
@@ -5,9 +5,6 @@ import { describe, expect, it, vi } from 'vitest'
 import type { AgentSessionRecord } from '../../shared/agent-session-record'
 import { LOCAL_EXECUTION_HOST_ID } from '../../shared/execution-host'
 import { FLOATING_TERMINAL_WORKTREE_ID } from '../../shared/constants'
-import { AgentSessionPreSpawnError } from '../native-chat/agent-session-wire/structured-agent-session-adapter'
-import { claudeStructuredAuthPolicyForSettings } from '../claude-accounts/claude-structured-auth-policy'
-import type { ClaudeManagedAccountGateSettings } from '../native-chat/claude-structured-managed-account-support'
 import {
   CLAUDE_DEFAULT_SETTING_SOURCES,
   CLAUDE_SESSION_STATE_EVENTS_ENV,
@@ -17,7 +14,7 @@ import {
   type ClaudeStructuredLaunchResolverDeps
 } from './claude-structured-launch-resolution'
 import { claudeStructuredPermissionModeForSettings } from './claude-structured-permission-mode'
-import { beginClaudeAuthSwitch, endClaudeAuthSwitch } from '../claude-accounts/live-pty-gate'
+import { CLAUDE_THINKING_DISPLAY_FLAG, type ClaudeCliFlag } from './claude-cli-flag-support'
 import { claudeProviderHandle } from '../../shared/agent-session-provider-handle-encoding'
 
 const SESSION_ID = 'orca-session-1'
@@ -63,7 +60,8 @@ function resolverFor(
   // Manual by default so a test that is not about permissions is not silently about them.
   agentDefaultArgs: Record<string, string> = { claude: '' },
   hasTranscript: () => Promise<boolean> = async () => true,
-  resolveLaunchArgs?: () => string[]
+  resolveLaunchArgs?: () => string[],
+  attachmentDirectory?: string
 ) {
   return createClaudeStructuredLaunchResolver({
     store: { getRecord: () => value, pinLaunchDirectory: vi.fn() },
@@ -73,37 +71,11 @@ function resolverFor(
     resolvePermissionMode: () => claudeStructuredPermissionModeForSettings({ agentDefaultArgs }),
     hasTranscript,
     resolveLaunchArgs: resolveLaunchArgs ?? (() => value?.launchArgs ?? []),
-    ...(resolveEnv ? { resolveEnv } : {})
+    ...(resolveEnv ? { resolveEnv } : {}),
+    ...(attachmentDirectory ? { attachmentDirectory } : {})
   })
 }
 
-function managedAccount(id: string, managedAuthRuntime: 'host' | 'wsl') {
-  return {
-    id,
-    email: `${id}@example.com`,
-    managedAuthPath: `/managed/${id}`,
-    managedAuthRuntime,
-    authMethod: 'subscription-oauth' as const,
-    createdAt: 0,
-    updatedAt: 0,
-    lastAuthenticatedAt: 0
-  }
-}
-
-const HOST_SELECTED: ClaudeManagedAccountGateSettings = {
-  claudeManagedAccounts: [managedAccount('host-1', 'host')],
-  activeClaudeManagedAccountId: 'host-1',
-  activeClaudeManagedAccountIdsByRuntime: { host: 'host-1', wsl: {} }
-}
-
-/** The normalized steady state of a Windows user whose only Claude account is WSL-managed: the
- *  prune drops the WSL account out of the host slot and persists that. */
-const WSL_ONLY_NORMALIZED: ClaudeManagedAccountGateSettings = {
-  claudeManagedAccounts: [managedAccount('wsl-1', 'wsl')],
-  activeClaudeManagedAccountId: null,
-  activeClaudeManagedAccountIdsByRuntime: { host: null, wsl: { Ubuntu: 'wsl-1' } }
-}
-
 const RESUMABLE = record({
   // oxlint-disable-next-line typescript/consistent-type-assertions -- SAFETY: the resolver reads only each link's handle, so the link's other fields stay unset.
   providerHandleChain: [
@@ -424,6 +396,38 @@ describe('claude structured launch resolution', () => {
     }
   })
 
+  it("lets the agent read the host's chat attachment store, outside the workspace", async () => {
+    const launch = await resolverFor(
+      record(),
+      undefined,
+      false,
+      { claude: '' },
+      async () => true,
+      undefined,
+      '/state/agent-session-attachments'
+    )({ identity: IDENTITY })
+
+    expect(launch.options.additionalDirectories).toEqual(['/state/agent-session-attachments'])
+    expect(launch.cwd).toBe('/repos/workspace-1')
+  })
+
+  it('grants the attachment store beside folders the saved Arguments add', async () => {
+    const launch = await resolverFor(
+      record(),
+      undefined,
+      false,
+      { claude: '' },
+      async () => true,
+      () => ['--add-dir', '/extra'],
+      '/state/agent-session-attachments'
+    )({ identity: IDENTITY })
+
+    expect(launch.options.additionalDirectories).toEqual([
+      '/extra',
+      '/state/agent-session-attachments'
+    ])
+  })
+
   it('builds on the supplied inherited env instead of Orca process env', async () => {
     const launch = await createClaudeStructuredLaunchResolver({
       resolveLaunchArgs: () => [],
@@ -546,66 +550,11 @@ describe('claude structured launch resolution', () => {
       })
     ).rejects.toThrow(/CLAUDE_CONFIG_DIR/)
   })
-
-  /** The account state can change while a session lives, and a reacquire after an unexpected child
-   *  exit re-resolves the launch. Without the gate here, that reacquire spawns under whatever the
-   *  account state has become. */
-  describe('managed-account gate on every acquisition', () => {
-    function resolverWithGate(read: () => ClaudeManagedAccountGateSettings | null) {
-      return createClaudeStructuredLaunchResolver({
-        resolveLaunchArgs: () => [],
-        store: { getRecord: () => RESUMABLE, pinLaunchDirectory: vi.fn() },
-        resolveWorkspacePath: async (id) => `/repos/${id}`,
-        resolveCommand: () => '/usr/local/bin/claude',
-        // Derived, not a literal: the gate and the policy must read the SAME account state, so a
-        // hardcoded value could assert a pairing production cannot produce.
-        resolveAuthPolicy: () => {
-          const settings = read()
-          if (!settings) {
-            throw new Error('the gate refuses before the auth policy is computed')
-          }
-          return claudeStructuredAuthPolicyForSettings(settings)
-        },
-        readManagedAccountGate: read
-      })
-    }
-
-    it('refuses a reacquire once the account state becomes the refused shape', async () => {
-      let gate: ClaudeManagedAccountGateSettings | null = HOST_SELECTED
-      const resolve = resolverWithGate(() => gate)
-
-      // Created while supported: the launch resolves and would spawn.
-      await expect(resolve({ identity: identityAt('leaf-current') })).resolves.toMatchObject({
-        providerSessionId: 'provider-current'
-      })
-
-      gate = WSL_ONLY_NORMALIZED
-
-      // 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, 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 () => {
-      await expect(
-        resolverFor(RESUMABLE)({ identity: identityAt('leaf-current') })
-      ).resolves.toMatchObject({ providerSessionId: 'provider-current' })
-    })
-  })
 })
 
 describe('readable Claude thinking', () => {
   const launchWith = (
-    thinkingDisplay?: ClaudeStructuredLaunchResolverDeps['thinkingDisplay'],
-    authSwitchSettleTimeoutMs?: number,
+    cliFlags?: ClaudeStructuredLaunchResolverDeps['cliFlags'],
     command = '/usr/local/bin/claude',
     launchArgs: string[] = []
   ) =>
@@ -617,8 +566,7 @@ describe('readable Claude thinking', () => {
       resolveAuthPolicy: () => ({ stripAuthEnv: false }),
       resolveEnv: () => ({ PROJECT_SHIM: '1', ANTHROPIC_API_KEY: 'sk-user' }),
       hasTranscript: async () => false,
-      ...(thinkingDisplay ? { thinkingDisplay } : {}),
-      ...(authSwitchSettleTimeoutMs === undefined ? {} : { authSwitchSettleTimeoutMs })
+      ...(cliFlags ? { cliFlags } : {})
     })({ identity: IDENTITY })
 
   // Whether the CLI's directory holds a `node` decides if the runtime pairing puts that directory
@@ -629,10 +577,11 @@ describe('readable Claude thinking', () => {
   ])(
     'probes the CLI the launch runs, on its PATH and shims, without its credentials (%s)',
     async (_, sibling) => {
-      const argsFor = vi.fn(
-        async (_launch: { command: string; cwd: string; env: Record<string, string> }) => ({
-          'thinking-display': 'summarized'
-        })
+      const supports = vi.fn(
+        async (
+          _flag: ClaudeCliFlag,
+          _launch: { command: string; cwd: string; env: Record<string, string> }
+        ) => true
       )
       const binDir = join(mkdtempSync(join(tmpdir(), 'orca-claude-probe-')), 'bin')
       const command = join(binDir, process.platform === 'win32' ? 'claude.cmd' : 'claude')
@@ -640,8 +589,8 @@ describe('readable Claude thinking', () => {
       if (sibling) {
         makeExecutable(join(binDir, process.platform === 'win32' ? 'node.cmd' : 'node'))
       }
-      const launch = await launchWith({ argsFor }, undefined, command)
-      const asked = argsFor.mock.calls[0]?.[0]
+      const launch = await launchWith({ supports }, command)
+      const asked = supports.mock.calls[0]?.[1]
       expect(asked).toMatchObject({ command, cwd: '/repos/workspace-1' })
       const segments = (env: Record<string, string> | undefined) =>
         (env?.PATH ?? env?.Path ?? '').split(delimiter)
@@ -663,15 +612,14 @@ describe('readable Claude thinking', () => {
   )
 
   it('passes nothing when the CLI is not known to take the flag, or nothing can say', async () => {
-    const launch = await launchWith({ argsFor: async () => ({}) })
+    const launch = await launchWith({ supports: async () => false })
     expect(launch.options.extraArgs).toEqual({ 'replay-user-messages': null })
     expect((await launchWith()).options.extraArgs).toEqual({ 'replay-user-messages': null })
   })
 
   it('keeps saved Arguments beside readable thinking, with the display left to Orca', async () => {
     const launch = await launchWith(
-      { argsFor: async () => ({ 'thinking-display': 'summarized' }) },
-      undefined,
+      { supports: async (flag) => flag === CLAUDE_THINKING_DISPLAY_FLAG },
       undefined,
       ['--effort', 'high', '--thinking-display', 'omitted']
     )
@@ -681,21 +629,4 @@ describe('readable Claude thinking', () => {
       'thinking-display': 'summarized'
     })
   })
-
-  it('still rechecks an account switch that began while the probe ran', async () => {
-    try {
-      const launch = launchWith(
-        {
-          argsFor: async () => {
-            beginClaudeAuthSwitch()
-            return {}
-          }
-        },
-        10
-      )
-      await expect(launch).rejects.toMatchObject({ reason: 'accountSwitchInProgress' })
-    } finally {
-      endClaudeAuthSwitch()
-    }
-  })
 })
diff --git a/src/main/claude/claude-structured-launch-resolution.ts b/src/main/claude/claude-structured-launch-resolution.ts
index de64c7e648d1..98ec3d971add 100644
--- a/src/main/claude/claude-structured-launch-resolution.ts
+++ b/src/main/claude/claude-structured-launch-resolution.ts
@@ -1,5 +1,5 @@
 import { getClaudeProfileRouter } from '../claude-accounts/claude-profile-installed-router'
-import { createHash } from 'node:crypto'
+import { requireLegacyAgentSessionAccountHome } from '../../shared/agent-session-account-home'
 import type {
   Options as ClaudeAgentSdkOptions,
   PermissionMode
@@ -14,20 +14,10 @@ import { LOCAL_EXECUTION_HOST_ID } from '../../shared/execution-host'
 import { structuredSessionChildIdentityEnv } from '../runtime/structured-session-child-identity-env'
 import {
   CLAUDE_AUTH_ENV_CONFLICT_MESSAGE,
-  CLAUDE_AUTH_SWITCH_IN_PROGRESS_MESSAGE,
   hasClaudeAuthEnvConflict
 } from '../claude-accounts/environment'
 import type { ClaudeStructuredAuthPolicy } from '../claude-accounts/claude-structured-auth-policy'
-import {
-  CLAUDE_AUTH_SWITCH_SETTLE_TIMEOUT_MS,
-  whenClaudeAuthSwitchSettles
-} 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'
 import {
   claudeChildEnv,
   claudeProbeEnv,
@@ -36,14 +26,22 @@ import {
   type ClaudeEnvDeps
 } from './claude-structured-child-env'
 import { claudeStructuredLaunchArgs } from './claude-structured-launch-args'
+import type { ClaudeCliFlagSupport } from './claude-cli-flag-support'
+import { resolveClaudeLaunchFlags } from './claude-structured-launch-flags'
+import {
+  withNativeChatVisualsEnv,
+  type PrepareNativeChatVisuals
+} from '../native-chat/native-chat-visuals-delivery'
 import {
   claudeLaunchResumesTranscript,
   resolveClaudeStructuredLaunchHome
 } from './claude-structured-launch-home'
-import type { ClaudeThinkingDisplaySupport } from './claude-thinking-display-support'
 import type { AgentSessionRecordStore } from '../runtime/agent-session-record-store'
 import { resolveAgentSessionLaunchDirectory } from '../runtime/agent-session-launch-directory'
 import { CLAUDE_STRUCTURED_AGENT } from './claude-structured-agent-definition'
+import { claudeSessionIdForOrcaSession } from './claude-structured-session-id'
+
+export { claudeSessionIdForOrcaSession }
 
 export const CLAUDE_DEFAULT_SETTING_SOURCES = ['user', 'project', 'local'] as const
 export const CLAUDE_SESSION_STATE_EVENTS_ENV = 'CLAUDE_CODE_EMIT_SESSION_STATE_EVENTS'
@@ -56,6 +54,7 @@ export type ClaudeStructuredSdkOptions = Pick<
   | 'supportedDialogKinds'
   | 'extraArgs'
   | 'additionalDirectories'
+  | 'plugins'
   | 'model'
   | 'effort'
   | 'permissionMode'
@@ -131,12 +130,13 @@ export type ClaudeStructuredLaunchResolverDeps = {
   resolveAuthPolicy: () => Promise<ClaudeStructuredAuthPolicy> | ClaudeStructuredAuthPolicy
   /** The user's Agent Permissions setting, re-read per acquisition. Absent means prompting. */
   resolvePermissionMode?: () => Promise<PermissionMode> | PermissionMode
-  /** How long an in-flight account switch may hold a launch before it is refused. */
-  authSwitchSettleTimeoutMs?: number
-  /** Account state for the managed-account gate; null when it cannot be read, which refuses. */
-  readManagedAccountGate?: () => ClaudeManagedAccountGateSettings | null
-  /** Whether this CLI takes the thinking-display flag. Absent ⇒ the flag is never passed. */
-  thinkingDisplay?: Pick<ClaudeThinkingDisplaySupport, 'argsFor'>
+  /** The host's chat attachment store: files a client attached live there, outside the workspace,
+   *  and the agent reads them without asking. */
+  attachmentDirectory?: string
+  /** Which version-gated flags this CLI takes. Absent ⇒ none is ever passed. */
+  cliFlags?: Pick<ClaudeCliFlagSupport, 'supports'>
+  /** This chat's visuals folder and skill; absent or null ⇒ the chat gets neither. */
+  prepareVisuals?: PrepareNativeChatVisuals
   /** Whether Claude wrote a transcript for this id; defaults to the transcript resolver. */
   hasTranscript?: (input: {
     providerSessionId: string
@@ -154,19 +154,13 @@ export type ClaudeStructuredInvocation = { command: string; env: Record<string,
  * drift there heals on the next refresh.
  */
 export async function resolveClaudeStructuredInvocation(
-  deps: ClaudeEnvDeps &
-    Pick<ClaudeStructuredLaunchResolverDeps, 'resolveAuthPolicy'> & {
-      authSwitchSettleTimeoutMs?: number
-    },
+  deps: ClaudeEnvDeps & Pick<ClaudeStructuredLaunchResolverDeps, 'resolveAuthPolicy'>,
   decorateEnv: (env: Record<string, string>) => Record<string, string> = (env) => env,
   /** Already resolved by a caller that needed them earlier; read again otherwise. */
   resolvedSources?: ClaudeChildEnvSources
 ): Promise<ClaudeStructuredInvocation> {
   const sources = resolvedSources ?? (await resolveClaudeChildEnvSources(deps))
   const auth = await deps.resolveAuthPolicy()
-  // A switch can begin while the policy and overlay resolve, exactly as it can
-  // during the terminal preflight's prepareClaudeAuth — recheck after the awaits.
-  await assertClaudeAuthSwitchSettled(deps.authSwitchSettleTimeoutMs)
   // 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(sources.overlay)) {
@@ -180,37 +174,10 @@ export async function resolveClaudeStructuredInvocation(
   }
 }
 
-/**
- * Wait a running account switch out, and refuse only if it never settles.
- *
- * Launch resolution is reached from `acquireClaudeSession` *after* the old child has
- * been closed and proved, so a plain refusal here would leave the user with a dead
- * chat and no replacement — the very harm the acquire-entry guard exists to prevent.
- * The entry guard still refuses outright, because nothing has been torn down yet.
- */
-export async function assertClaudeAuthSwitchSettled(
-  timeoutMs = CLAUDE_AUTH_SWITCH_SETTLE_TIMEOUT_MS
-): Promise<void> {
-  if (!(await whenClaudeAuthSwitchSettles(timeoutMs))) {
-    throw new AgentSessionPreSpawnError(new Error(CLAUDE_AUTH_SWITCH_IN_PROGRESS_MESSAGE), {
-      reason: 'accountSwitchInProgress'
-    })
-  }
-}
-
-export function claudeSessionIdForOrcaSession(sessionId: string): string {
-  const bytes = createHash('sha256').update(`orca-claude:${sessionId}`).digest().subarray(0, 16)
-  bytes[6] = ((bytes[6] ?? 0) & 0x0f) | 0x40
-  bytes[8] = ((bytes[8] ?? 0) & 0x3f) | 0x80
-  const hex = bytes.toString('hex')
-  return `${hex.slice(0, 8)}-${hex.slice(8, 12)}-${hex.slice(12, 16)}-${hex.slice(16, 20)}-${hex.slice(20)}`
-}
-
 export function createClaudeStructuredLaunchResolver(
   deps: ClaudeStructuredLaunchResolverDeps
 ): (input: { identity: AgentSessionJournalIdentity }) => Promise<ClaudeStructuredLaunch> {
   return async ({ identity }) => {
-    await assertClaudeAuthSwitchSettled(deps.authSwitchSettleTimeoutMs)
     const record = deps.store.getRecord(identity.sessionId)
     if (!record) {
       throw new Error(`no durable agent-session record for ${identity.sessionId}`)
@@ -226,22 +193,12 @@ export function createClaudeStructuredLaunchResolver(
         `claude structured sessions run on the local host, not ${record.location.executionHostId}`
       )
     }
+    const accountHome = requireLegacyAgentSessionAccountHome(record.accountHome)
     const pinned = CLAUDE_STRUCTURED_AGENT.accountHomeVariable
-    if (record.accountHome.variable !== pinned) {
-      throw new Error(`claude sessions pin ${pinned}, not ${record.accountHome.variable}`)
+    if (accountHome.variable !== pinned) {
+      throw new Error(`claude sessions pin ${pinned}, not ${accountHome.variable}`)
     }
-    // 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.
     const router = getClaudeProfileRouter()
-    const gate = router ? undefined : 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',
-        gate && hasWslBoundClaudeAccount(gate) ? { reason: 'managedAccountUnsupported' } : {}
-      )
-    }
     // A Claude record's chain holds only Claude handles; the attach admission refuses anything else.
     const head = agentSessionProviderHandleChainHead(record.providerHandleChain)?.handle ?? null
     if (
@@ -259,51 +216,55 @@ export function createClaudeStructuredLaunchResolver(
     const cwd = await resolveAgentSessionLaunchDirectory(deps, record)
     const sources = await resolveClaudeChildEnvSources(deps)
     // Asked as soon as the spawn's cwd and PATH are known, so it overlaps what is left to resolve.
-    const thinkingDisplay = deps.thinkingDisplay?.argsFor({
-      command: sources.command,
-      cwd,
-      env: claudeProbeEnv(sources)
-    })
+    const probeLaunch = { command: sources.command, cwd, env: claudeProbeEnv(sources) }
+    const launchFlags = resolveClaudeLaunchFlags(deps, record.sessionId, probeLaunch)
     const configured = claudeStructuredLaunchArgs(await deps.resolveLaunchArgs())
-    const { additionalDirectories } = configured
+    const { thinkingDisplayArgs, visuals } = await launchFlags
+    const additionalDirectories = [
+      ...configured.additionalDirectories,
+      ...(deps.attachmentDirectory ? [deps.attachmentDirectory] : []),
+      ...(visuals ? [visuals.visuals.folder] : [])
+    ]
     const permission = claudeStructuredPermissionOptions(
       (await deps.resolvePermissionMode?.()) ?? 'default'
     )
-    const thinkingDisplayArgs = (await thinkingDisplay) ?? {}
+    const { command, env } = await resolveClaudeStructuredInvocation(
+      deps,
+      (base) =>
+        // Every structured session speaks orchestration as itself: its injected id and the Orca CLI.
+        structuredSessionChildIdentityEnv(
+          record.sessionId,
+          withNativeChatVisualsEnv(
+            {
+              ...base,
+              // The turn translator relies on Claude's authoritative idle frame when no result arrives.
+              [CLAUDE_SESSION_STATE_EVENTS_ENV]: '1'
+            },
+            visuals?.visuals ?? null
+          )
+        ),
+      sources
+    )
+    const launchHome = await resolveClaudeStructuredLaunchHome(router, env, accountHome.path)
     // A start that failed before its first turn wrote no transcript, and `--resume` of an absent
     // one exits; launch that id fresh instead. With a transcript, `--session-id` would collide.
     const leafUuid = head ? claudeProviderHandleLeafUuid(head) : null
-    const resumes = async (claudeConfigDir: string): Promise<boolean> =>
+    const resumesTranscript =
       head !== null &&
       (await claudeLaunchResumesTranscript({
         router,
         leafUuid,
         providerSessionId,
-        claudeConfigDir,
+        claudeConfigDir: launchHome,
         hasTranscript: deps.hasTranscript
       }))
-    // Why: without a router the home is fixed, so check it before the recheck that must stay last.
-    const resumedWithoutRouter = router ? undefined : await resumes(record.accountHome.path)
-    // Last: it rechecks the account switch, which may have begun during any await above.
-    const { command, env } = await resolveClaudeStructuredInvocation(
-      deps,
-      (base) =>
-        // 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'
-        }),
-      sources
-    )
-    const launchHome = await resolveClaudeStructuredLaunchHome(router, env, record.accountHome.path)
-    const resumesTranscript = resumedWithoutRouter ?? (await resumes(launchHome))
     return {
       pathToClaudeCodeExecutable: command,
       options: {
         ...CLAUDE_STRUCTURED_BASE_OPTIONS,
         ...permission,
         ...(additionalDirectories.length ? { additionalDirectories } : {}),
+        ...(visuals?.pluginDir ? { plugins: [{ type: 'local', path: visuals.pluginDir }] } : {}),
         extraArgs: {
           ...configured.extraArgs,
           ...CLAUDE_STRUCTURED_BASE_OPTIONS.extraArgs,
diff --git a/src/main/claude/claude-structured-launch-visuals.test.ts b/src/main/claude/claude-structured-launch-visuals.test.ts
new file mode 100644
index 000000000000..0411523b191c
--- /dev/null
+++ b/src/main/claude/claude-structured-launch-visuals.test.ts
@@ -0,0 +1,149 @@
+import { describe, expect, it, vi } from 'vitest'
+import type { AgentSessionJournalIdentity } from '../../shared/agent-session-journal-types'
+import { agentSessionRecordFixture } from '../native-chat/agent-session-record-test-fixture'
+import { LOCAL_EXECUTION_HOST_ID } from '../../shared/execution-host'
+import {
+  NATIVE_CHAT_VISUALS_DIR_ENV,
+  type NativeChatVisualsLaunch
+} from '../native-chat/native-chat-visuals-delivery'
+import {
+  CLAUDE_CLI_FLAG_PROBE_KILL_AFTER_MS,
+  CLAUDE_PLUGIN_DIR_FLAG,
+  type ClaudeCliFlag
+} from './claude-cli-flag-support'
+import { createClaudeStructuredLaunchResolver } from './claude-structured-launch-resolution'
+
+const SESSION_ID = 'orca-session-visuals'
+const VISUALS: NativeChatVisualsLaunch = {
+  folder: '/state/native-chat-visuals/abc',
+  skill: { pluginDir: '/app/native-chat-visuals', skillsRoot: '/app/native-chat-visuals/skills' }
+}
+
+const record = agentSessionRecordFixture({ sessionId: SESSION_ID })
+const IDENTITY: AgentSessionJournalIdentity = {
+  sessionId: SESSION_ID,
+  workspaceId: 'workspace-1',
+  hostId: LOCAL_EXECUTION_HOST_ID,
+  agent: 'claude',
+  providerHandle: null
+}
+
+function launch(options: {
+  prepareVisuals?: (sessionId: string) => Promise<NativeChatVisualsLaunch | null>
+  supports?: (flag: ClaudeCliFlag, launch: unknown, budgetMs?: number) => Promise<boolean>
+  launchArgs?: string[]
+  env?: Record<string, string>
+  attachmentDirectory?: string
+}) {
+  return createClaudeStructuredLaunchResolver({
+    store: { getRecord: () => record, pinLaunchDirectory: vi.fn() },
+    resolveWorkspacePath: async (id) => `/repos/${id}`,
+    resolveCommand: () => '/usr/local/bin/claude',
+    resolveAuthPolicy: () => ({ stripAuthEnv: false }),
+    resolveLaunchArgs: () => options.launchArgs ?? [],
+    resolveEnv: () => options.env ?? {},
+    hasTranscript: async () => false,
+    ...(options.attachmentDirectory ? { attachmentDirectory: options.attachmentDirectory } : {}),
+    ...(options.supports ? { cliFlags: { supports: options.supports } } : {}),
+    ...(options.prepareVisuals ? { prepareVisuals: options.prepareVisuals } : {})
+  })({ identity: IDENTITY })
+}
+
+describe('a Claude chat launch with inline visuals', () => {
+  it('loads the skill plugin, grants the chat folder beside the user directories, and names it', async () => {
+    const prepareVisuals = vi.fn(async () => VISUALS)
+    const resolved = await launch({
+      prepareVisuals,
+      supports: async (flag) => flag === CLAUDE_PLUGIN_DIR_FLAG,
+      launchArgs: ['--add-dir', '/shared/notes']
+    })
+    expect(prepareVisuals).toHaveBeenCalledWith(SESSION_ID)
+    expect(resolved.options.plugins).toEqual([{ type: 'local', path: VISUALS.skill.pluginDir }])
+    expect(resolved.options.additionalDirectories).toEqual(['/shared/notes', VISUALS.folder])
+    expect(resolved.env?.[NATIVE_CHAT_VISUALS_DIR_ENV]).toBe(VISUALS.folder)
+  })
+
+  it.each([
+    {
+      name: 'prepared visuals',
+      visuals: VISUALS,
+      directories: ['/shared/notes', '/state/agent-session-attachments', VISUALS.folder]
+    },
+    {
+      name: 'unavailable visuals',
+      visuals: null,
+      directories: ['/shared/notes', '/state/agent-session-attachments']
+    }
+  ])('keeps user folders and attachment access with $name', async ({ visuals, directories }) => {
+    const resolved = await launch({
+      prepareVisuals: async () => visuals,
+      supports: async (flag) => flag === CLAUDE_PLUGIN_DIR_FLAG,
+      launchArgs: ['--add-dir', '/shared/notes'],
+      attachmentDirectory: '/state/agent-session-attachments'
+    })
+    expect(resolved.options.additionalDirectories).toEqual(directories)
+  })
+
+  it('still grants and names the folder when the CLI cannot load a plugin by path', async () => {
+    const resolved = await launch({
+      prepareVisuals: async () => VISUALS,
+      supports: async () => false
+    })
+    expect(resolved.options).not.toHaveProperty('plugins')
+    expect(resolved.options.additionalDirectories).toEqual([VISUALS.folder])
+    expect(resolved.env?.[NATIVE_CHAT_VISUALS_DIR_ENV]).toBe(VISUALS.folder)
+  })
+
+  it('without a prepared folder, grants nothing and drops a folder inherited from another chat', async () => {
+    const resolved = await launch({
+      prepareVisuals: async () => null,
+      supports: async () => true,
+      env: { [NATIVE_CHAT_VISUALS_DIR_ENV]: '/state/native-chat-visuals/other-chat' }
+    })
+    expect(resolved.options).not.toHaveProperty('plugins')
+    expect(resolved.options).not.toHaveProperty('additionalDirectories')
+    expect(resolved.env).not.toHaveProperty(NATIVE_CHAT_VISUALS_DIR_ENV)
+  })
+
+  it('never asks about the plugin flag on a host that delivers no visuals', async () => {
+    const supports = vi.fn(async (_flag: ClaudeCliFlag) => true)
+    const resolved = await launch({ supports })
+    expect(supports.mock.calls.map(([flag]) => flag)).not.toContain(CLAUDE_PLUGIN_DIR_FLAG)
+    expect(resolved.options).not.toHaveProperty('plugins')
+  })
+
+  it('waits for the version up to the probe kill time for the plugin, never the short budget', async () => {
+    const supports = vi.fn(
+      async (_flag: ClaudeCliFlag, _launch: unknown, _budgetMs?: number) => true
+    )
+    await launch({ prepareVisuals: async () => VISUALS, supports })
+    expect(supports).toHaveBeenCalledWith(
+      CLAUDE_PLUGIN_DIR_FLAG,
+      expect.objectContaining({ command: '/usr/local/bin/claude' }),
+      CLAUDE_CLI_FLAG_PROBE_KILL_AFTER_MS
+    )
+  })
+
+  it('asks for readable thinking again once the plugin check has learned the version', async () => {
+    let versionKnown = false
+    const supports = vi.fn(async (flag: ClaudeCliFlag, _launch: unknown, budgetMs?: number) => {
+      if (flag === CLAUDE_PLUGIN_DIR_FLAG) {
+        versionKnown = true
+        return true
+      }
+      // The first thinking check gave up at its short budget; the re-check reads the cached answer.
+      return versionKnown && budgetMs !== undefined
+    })
+    const resolved = await launch({ prepareVisuals: async () => VISUALS, supports })
+    expect(resolved.options.plugins).toHaveLength(1)
+    expect(resolved.options.extraArgs).toMatchObject({ 'thinking-display': 'summarized' })
+  })
+
+  it('never re-asks for thinking on a host without visuals', async () => {
+    const supports = vi.fn(
+      async (_flag: ClaudeCliFlag, _launch: unknown, _budgetMs?: number) => false
+    )
+    await launch({ supports })
+    expect(supports).toHaveBeenCalledTimes(1)
+  })
+})
diff --git a/src/main/claude/claude-structured-real-cli-visuals.test.ts b/src/main/claude/claude-structured-real-cli-visuals.test.ts
new file mode 100644
index 000000000000..a74677ddacf6
--- /dev/null
+++ b/src/main/claude/claude-structured-real-cli-visuals.test.ts
@@ -0,0 +1,133 @@
+// The real Claude CLI, launched through Orca's own launch resolution with a chat's visuals: the
+// CLI must report the bundled skill and its plugin in its own init frame. Opt-in, like every
+// real-CLI suite: it spends one short turn on the signed-in account.
+import { mkdir, mkdtemp, rm } from 'node:fs/promises'
+import { homedir, tmpdir } from 'node:os'
+import { join } from 'node:path'
+import { describe, expect, it, vi } from 'vitest'
+import type { AgentSessionJournalIdentity } from '../../shared/agent-session-journal-types'
+import { agentSessionRecordFixture } from '../native-chat/agent-session-record-test-fixture'
+import { claudeProviderHandle } from '../../shared/agent-session-provider-handle-encoding'
+import { createNativeChatVisualsDelivery } from '../native-chat/native-chat-visuals-delivery'
+import { nativeChatVisualsFolderFor } from '../native-chat/native-chat-visuals-folder'
+import { NATIVE_CHAT_VISUALS_SKILL_NAME } from '../native-chat/native-chat-visuals-skill-location'
+import { createClaudeCliFlagSupport } from './claude-cli-flag-support'
+import { readClaudeInit } from './claude-structured-init-proof'
+import { createClaudeStructuredLaunchResolver } from './claude-structured-launch-resolution'
+import {
+  realClaudeAuthenticated,
+  realClaudeAvailable,
+  realClaudeCliGate,
+  realClaudeCommand,
+  realClaudeLaunchHome
+} from './claude-real-cli-availability-test-support'
+import {
+  ClaudeStructuredSessionAdapter,
+  type ClaudeStructuredSessionEvent
+} from './claude-structured-session-adapter'
+
+const SESSION_ID = 'real-cli-visuals'
+const listed = (value: unknown): unknown[] => (Array.isArray(value) ? value : [])
+const suiteTitle = `Claude real CLI chat visuals${realClaudeCliGate.skipReason ? ` (skipped: ${realClaudeCliGate.skipReason})` : ''}`
+
+describe.skipIf(!realClaudeAvailable)(suiteTitle, () => {
+  it.skipIf(!realClaudeAuthenticated)(
+    "loads the visuals skill through Orca's launch and grants the chat folder",
+    async () => {
+      const claudeConfigDir = process.env.CLAUDE_CONFIG_DIR?.trim() || join(homedir(), '.claude')
+      const scratch = await mkdtemp(join(tmpdir(), 'orca-real-cli-visuals-'))
+      const cwd = join(scratch, 'workspace')
+      const stateDirectory = join(scratch, 'state')
+      const record = agentSessionRecordFixture({
+        sessionId: SESSION_ID,
+        location: { workspaceId: 'real-cli-visuals-workspace' },
+        accountHome: { variable: 'CLAUDE_CONFIG_DIR', path: claudeConfigDir },
+        launchDirectory: cwd
+      })
+      const logger = { warn: vi.fn(), error: vi.fn() }
+      const resolveLaunch = createClaudeStructuredLaunchResolver({
+        store: { getRecord: () => record, pinLaunchDirectory: vi.fn() },
+        resolveWorkspacePath: async () => cwd,
+        resolveCommand: () => realClaudeCommand,
+        resolveLaunchArgs: () => [],
+        resolveEnv: () => realClaudeLaunchHome().env,
+        resolveAuthPolicy: () => ({ stripAuthEnv: false }),
+        hasTranscript: async () => false,
+        cliFlags: createClaudeCliFlagSupport(),
+        prepareVisuals: createNativeChatVisualsDelivery({ stateDirectory, logger })
+      })
+      const identity: AgentSessionJournalIdentity = {
+        sessionId: SESSION_ID,
+        workspaceId: 'real-cli-visuals-workspace',
+        hostId: 'local',
+        agent: 'claude',
+        providerHandle: null
+      }
+      const events: ClaudeStructuredSessionEvent[] = []
+      const adapter = new ClaudeStructuredSessionAdapter({
+        resolveLaunch,
+        onEvent: (event) => events.push(event),
+        readProcessStartTime: async () => 1,
+        now: () => 2
+      })
+      const frames = (): Record<string, unknown>[] =>
+        events.flatMap((event) => (event.type === 'message' ? [event.message] : []))
+      try {
+        await mkdir(cwd, { recursive: true })
+        const launch = await resolveLaunch({ identity })
+        const folder = nativeChatVisualsFolderFor(stateDirectory, SESSION_ID)
+        expect(launch.options.additionalDirectories).toEqual([folder])
+        expect(launch.options.plugins).toHaveLength(1)
+        await adapter.acquire({
+          identity: {
+            ...identity,
+            providerHandle: claudeProviderHandle(launch.providerSessionId, null)
+          },
+          fence: 1,
+          spawnToken: 'real-cli-visuals'
+        })
+        await adapter.dispatch({
+          sessionId: SESSION_ID,
+          clientMessageId: 'real-cli-visuals-1',
+          body: {
+            kind: 'message',
+            role: 'user',
+            blocks: [
+              {
+                type: 'text',
+                text: 'Without using any tool, reply with only the exact names of the skills available to you whose name contains "visuals", comma separated, or NONE.'
+              }
+            ]
+          },
+          fence: 1
+        })
+        await vi.waitFor(
+          () => expect(frames()).toContainEqual(expect.objectContaining({ type: 'result' })),
+          { timeout: 120_000, interval: 200 }
+        )
+        const init = frames().find(
+          (frame) => readClaudeInit(frame) !== null && frame.subtype === 'init'
+        )
+        // The model's own skill catalog lists it, though it is kept out of the `/` menu (and
+        // so out of the init frame's skill and command lists).
+        const answer = frames().find((frame) => frame.type === 'result')?.result
+        expect(String(answer)).toContain(NATIVE_CHAT_VISUALS_SKILL_NAME)
+        expect(
+          [...listed(init?.skills), ...listed(init?.slash_commands)].some(
+            (name) => typeof name === 'string' && name.endsWith(NATIVE_CHAT_VISUALS_SKILL_NAME)
+          )
+        ).toBe(false)
+        expect(init?.plugins).toEqual(
+          expect.arrayContaining([
+            expect.objectContaining({ path: launch.options.plugins?.[0]?.path })
+          ])
+        )
+        expect(logger.warn).not.toHaveBeenCalled()
+      } finally {
+        await adapter.closeAll()
+        await rm(scratch, { recursive: true, force: true })
+      }
+    },
+    150_000
+  )
+})
diff --git a/src/main/claude/claude-structured-session-acquisition.ts b/src/main/claude/claude-structured-session-acquisition.ts
index 0e10d929fa05..b10af618808b 100644
--- a/src/main/claude/claude-structured-session-acquisition.ts
+++ b/src/main/claude/claude-structured-session-acquisition.ts
@@ -1,10 +1,7 @@
-import {
-  AgentSessionPreSpawnError,
-  type AgentSessionAcquisition,
-  type StructuredAgentSessionAcquireInput
+import type {
+  AgentSessionAcquisition,
+  StructuredAgentSessionAcquireInput
 } from '../native-chat/agent-session-wire/structured-agent-session-adapter'
-import { CLAUDE_AUTH_SWITCH_IN_PROGRESS_MESSAGE } from '../claude-accounts/environment'
-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-replay-turn-resolution'
@@ -62,13 +59,6 @@ export async function acquireClaudeSession({
   exits: Map<string, ClaudeSessionExit>
   callbacks: ClaudeAcquireCallbacks
 }): Promise<AgentSessionAcquisition> {
-  // 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), {
-      reason: 'accountSwitchInProgress'
-    })
-  }
   const sessionId = input.identity.sessionId
   const prompts = new ClaudePromptRegistry()
   const { previous, attempt } = acquisitions.start(sessionId, prompts)
diff --git a/src/main/claude/claude-structured-session-adapter.ts b/src/main/claude/claude-structured-session-adapter.ts
index e79f3cab5d25..6f8bc901989e 100644
--- a/src/main/claude/claude-structured-session-adapter.ts
+++ b/src/main/claude/claude-structured-session-adapter.ts
@@ -1,3 +1,4 @@
+import { requireLegacyAgentSessionAccountHome } from '../../shared/agent-session-account-home'
 import { dispatchClaudeCommand } from './claude-structured-command-dispatch'
 import type {
   AgentSessionAcquisition,
@@ -131,7 +132,7 @@ export class ClaudeStructuredSessionAdapter implements StructuredAgentSessionAda
   ) =>
     resolveClaudeProviderHistoryWindow({
       identity: input.identity,
-      accountHomePath: input.accountHome.path,
+      accountHomePath: requireLegacyAgentSessionAccountHome(input.accountHome).path,
       hasLiveSession:
         this.sessions.has(input.identity.sessionId) || this.exits.has(input.identity.sessionId)
     })
diff --git a/src/main/claude/claude-structured-session-id.ts b/src/main/claude/claude-structured-session-id.ts
new file mode 100644
index 000000000000..abdda0721f8e
--- /dev/null
+++ b/src/main/claude/claude-structured-session-id.ts
@@ -0,0 +1,10 @@
+import { createHash } from 'node:crypto'
+
+/** A stable UUID (v4 layout) for the Claude conversation behind an Orca chat. */
+export function claudeSessionIdForOrcaSession(sessionId: string): string {
+  const bytes = createHash('sha256').update(`orca-claude:${sessionId}`).digest().subarray(0, 16)
+  bytes[6] = ((bytes[6] ?? 0) & 0x0f) | 0x40
+  bytes[8] = ((bytes[8] ?? 0) & 0x3f) | 0x80
+  const hex = bytes.toString('hex')
+  return `${hex.slice(0, 8)}-${hex.slice(8, 12)}-${hex.slice(12, 16)}-${hex.slice(16, 20)}-${hex.slice(20)}`
+}
diff --git a/src/main/claude/claude-thinking-display-support.test.ts b/src/main/claude/claude-thinking-display-support.test.ts
deleted file mode 100644
index a586a65d70a6..000000000000
--- a/src/main/claude/claude-thinking-display-support.test.ts
+++ /dev/null
@@ -1,168 +0,0 @@
-import { describe, expect, it, vi } from 'vitest'
-import { createClaudeThinkingDisplaySupport } from './claude-thinking-display-support'
-
-const LAUNCH = { command: '/bin/claude', cwd: '/repo', env: { PATH: '/shims' } }
-const UNKNOWN_FLAG = new Error(
-  "claude stream-json exited (code 1): error: unknown option '--thinking-display'"
-)
-
-type Probe = (
-  command: string,
-  launch: { cwd: string; env: Record<string, string>; timeoutMs: number }
-) => Promise<string | null>
-
-function supportWith(
-  probe: Probe,
-  budgetMs = 20,
-  keyOf = async (command: string, cwd: string): Promise<string | null> => `${command}\n${cwd}`
-) {
-  const calls = vi.fn(probe)
-  // Real time plus whatever a test skips ahead.
-  let skippedMs = 0
-  const support = createClaudeThinkingDisplaySupport({
-    probe: calls,
-    keyOf,
-    budgetMs,
-    now: () => performance.now() + skippedMs
-  })
-  return { support, calls, skip: (ms: number) => (skippedMs += ms) }
-}
-
-/** A probe the test answers by hand. */
-function heldProbe() {
-  let answer: (version: string | null) => void = () => {}
-  const probe: Probe = () =>
-    new Promise((resolve) => {
-      answer = resolve
-    })
-  return { probe, answer: (version: string | null) => answer(version) }
-}
-
-describe('the thinking-display flag a launch passes', () => {
-  it("probes with the launch's own cwd and env and its own kill timeout, then remembers", async () => {
-    const { support, calls } = supportWith(async () => '2.1.280')
-    await expect(support.argsFor(LAUNCH)).resolves.toEqual({ 'thinking-display': 'summarized' })
-    await expect(support.argsFor(LAUNCH)).resolves.toEqual({ 'thinking-display': 'summarized' })
-    expect(calls).toHaveBeenCalledTimes(1)
-    expect(calls).toHaveBeenCalledWith('/bin/claude', {
-      cwd: '/repo',
-      env: { PATH: '/shims' },
-      timeoutMs: 10_000
-    })
-  })
-
-  it('asks again per workspace: a shim can pick a different CLI there', async () => {
-    const { support, calls } = supportWith(async () => '2.1.280')
-    await support.argsFor(LAUNCH)
-    await support.argsFor({ ...LAUNCH, cwd: '/other' })
-    expect(calls).toHaveBeenCalledTimes(2)
-  })
-
-  it('passes nothing to a CLI older than the flag, and keeps that answer for good', async () => {
-    const { support, calls, skip } = supportWith(async () => '2.1.92')
-    await expect(support.argsFor(LAUNCH)).resolves.toEqual({})
-    skip(60 * 60_000)
-    await expect(support.argsFor(LAUNCH)).resolves.toEqual({})
-    expect(calls).toHaveBeenCalledTimes(1)
-  })
-
-  it('asks again after a while when a probe printed no version, failed or was killed', async () => {
-    for (const probe of [async () => null, () => Promise.reject(new Error('EMFILE'))]) {
-      const { support, calls, skip } = supportWith(probe)
-      await expect(support.argsFor(LAUNCH)).resolves.toEqual({})
-      // Within the window a hung or broken probe costs no further spawn or wait.
-      skip(9 * 60_000)
-      await expect(support.argsFor(LAUNCH)).resolves.toEqual({})
-      expect(calls).toHaveBeenCalledTimes(1)
-      // A failure from a loaded boot heals.
-      skip(2 * 60_000)
-      await support.argsFor(LAUNCH)
-      expect(calls).toHaveBeenCalledTimes(2)
-    }
-  })
-
-  it('waits for a probe that answers within the budget', async () => {
-    const { support } = supportWith(
-      () => new Promise((resolve) => setTimeout(() => resolve('2.1.280'), 5)),
-      1_000
-    )
-    await expect(support.argsFor(LAUNCH)).resolves.toEqual({ 'thinking-display': 'summarized' })
-  })
-
-  it('does not wait again on a probe already past its budget, and keeps its late answer', async () => {
-    const held = heldProbe()
-    const { support, calls } = supportWith(held.probe, 30)
-    await expect(support.argsFor(LAUNCH)).resolves.toEqual({})
-    const started = performance.now()
-    await expect(support.argsFor(LAUNCH)).resolves.toEqual({})
-    expect(performance.now() - started).toBeLessThan(25)
-    held.answer('2.1.280')
-    await vi.waitFor(async () =>
-      expect(await support.argsFor(LAUNCH)).toEqual({ 'thinking-display': 'summarized' })
-    )
-    expect(calls).toHaveBeenCalledTimes(1)
-  })
-
-  it('stops passing the flag to a binary that exited refusing it', async () => {
-    const { support, calls } = supportWith(async () => '2.1.280')
-    await support.argsFor(LAUNCH)
-    support.observeExit(LAUNCH, UNKNOWN_FLAG)
-    await vi.waitFor(async () => expect(await support.argsFor(LAUNCH)).toEqual({}))
-    expect(calls).toHaveBeenCalledTimes(1)
-  })
-
-  it('keeps a refusal seen while a probe was still running', async () => {
-    const held = heldProbe()
-    const { support } = supportWith(held.probe, 10)
-    await support.argsFor(LAUNCH)
-    support.observeExit(LAUNCH, UNKNOWN_FLAG)
-    await new Promise((resolve) => setTimeout(resolve, 0))
-    held.answer('2.1.280')
-    await new Promise((resolve) => setTimeout(resolve, 0))
-    await expect(support.argsFor(LAUNCH)).resolves.toEqual({})
-  })
-
-  it('records nothing for any other startup failure', async () => {
-    const { support } = supportWith(async () => '2.1.280')
-    await support.argsFor(LAUNCH)
-    support.observeExit(LAUNCH, new Error('claude stream-json exited (code 1): not signed in'))
-    support.observeExit(LAUNCH, new Error("error: unknown option '--thinking'"))
-    await new Promise((resolve) => setTimeout(resolve, 0))
-    await expect(support.argsFor(LAUNCH)).resolves.toEqual({ 'thinking-display': 'summarized' })
-  })
-
-  it('spends the budget finding the binary too, and caches nothing when that runs out', async () => {
-    let slow = true
-    const { support, calls } = supportWith(
-      async () => '2.1.280',
-      30,
-      async (command, cwd) => {
-        if (slow) {
-          await new Promise((resolve) => setTimeout(resolve, 1_000))
-        }
-        return `${command}\n${cwd}`
-      }
-    )
-    const started = performance.now()
-    await expect(support.argsFor(LAUNCH)).resolves.toEqual({})
-    expect(performance.now() - started).toBeLessThan(500)
-    expect(calls).not.toHaveBeenCalled()
-    slow = false
-    await expect(support.argsFor(LAUNCH)).resolves.toEqual({ 'thinking-display': 'summarized' })
-  })
-
-  it('forgets the binaries launched least recently, not the ones in use', async () => {
-    const { support, calls } = supportWith(async () => '2.1.280')
-    const at = (index: number) => ({ ...LAUNCH, cwd: `/repo-${index}` })
-    for (let index = 1; index <= 32; index += 1) {
-      await support.argsFor(at(index))
-    }
-    await support.argsFor(at(1))
-    await support.argsFor(at(33))
-    expect(calls).toHaveBeenCalledTimes(33)
-    await support.argsFor(at(1))
-    expect(calls).toHaveBeenCalledTimes(33)
-    await support.argsFor(at(2))
-    expect(calls).toHaveBeenCalledTimes(34)
-  })
-})
diff --git a/src/main/claude/claude-thinking-display-support.ts b/src/main/claude/claude-thinking-display-support.ts
deleted file mode 100644
index f7ad53d44339..000000000000
--- a/src/main/claude/claude-thinking-display-support.ts
+++ /dev/null
@@ -1,175 +0,0 @@
-import { realpath, stat } from 'node:fs/promises'
-import { claudeVersionReaches, probeClaudeCliVersion } from './claude-hook-event-versions'
-
-// Why: the first CLI whose parser defines the flag (2.1.93 was never published); an older one exits
-// on it before the session starts. Found by reading published packages, not by running them.
-const CLAUDE_THINKING_DISPLAY_FIRST_VERSION = '2.1.94'
-
-/** How long a launch waits on a binary nothing is known about yet. A warm probe answers in tens of
- *  milliseconds; this covers a cold disk, a node install and an antivirus scan, paid once per key
- *  during a start that already takes seconds. */
-export const CLAUDE_THINKING_DISPLAY_PROBE_BUDGET_MS = 1_500
-
-/** A probe still running by now is killed, and its binary gets no flag. */
-const PROBE_KILL_AFTER_MS = 10_000
-
-/** How long a probe that gave no version (killed, failed to spawn, unparseable) means "no flag":
- *  long enough that a hung `--version` costs one wait per stretch, short enough that a failure
- *  from a loaded boot heals. */
-const FAILED_PROBE_RETRY_AFTER_MS = 10 * 60_000
-
-/** Commander's refusal, exactly: any other startup failure says nothing about the flag. */
-const UNKNOWN_FLAG_DIAGNOSTIC = "unknown option '--thinking-display'"
-
-// One small entry per binary per workspace it launched in; enough for every worktree in active use.
-const MAX_REMEMBERED = 32
-
-const SUMMARIZED: Readonly<Record<string, string>> = { 'thinking-display': 'summarized' }
-
-export type ClaudeThinkingDisplayLaunch = {
-  command: string
-  cwd: string
-  env: Record<string, string>
-}
-
-type ClaudeVersionProbe = (
-  command: string,
-  launch: { cwd: string; env: Record<string, string>; timeoutMs: number }
-) => Promise<string | null>
-
-export type ClaudeThinkingDisplaySupport = {
-  /**
-   * Asks for readable thinking: under Orca's launch the CLI otherwise streams thinking blocks with
-   * no text. Only the display is set, never `--thinking`, so a user who turned thinking off keeps
-   * it off. A binary not yet known is probed with the launch's own cwd and env, waited on for at
-   * most the budget from when its probe began; past it the launch goes without the flag.
-   */
-  argsFor: (launch: ClaudeThinkingDisplayLaunch) => Promise<Readonly<Record<string, string>>>
-  /** A child that exited refusing the flag: that binary, in that workspace, never gets it again. */
-  observeExit: (launch: Pick<ClaudeThinkingDisplayLaunch, 'command' | 'cwd'>, error: Error) => void
-}
-
-/** Which binary a command is in a workspace right now: a shim answers per project, and a
- *  self-update swaps the link's target or the file. */
-async function claudeBinaryKey(command: string, cwd: string): Promise<string | null> {
-  try {
-    const target = await realpath(command)
-    return `${target}\n${(await stat(target)).mtimeMs}\n${cwd}`
-  } catch {
-    return null
-  }
-}
-
-/** The promise's value if it settles within `ms`, else undefined. */
-async function within<T>(pending: Promise<T>, ms: number): Promise<T | undefined> {
-  let timer: ReturnType<typeof setTimeout> | undefined
-  const expired = new Promise<undefined>((resolve) => {
-    timer = setTimeout(() => resolve(undefined), Math.max(0, ms))
-    timer.unref?.()
-  })
-  try {
-    return await Promise.race([pending, expired])
-  } finally {
-    clearTimeout(timer)
-  }
-}
-
-export function createClaudeThinkingDisplaySupport(
-  deps: {
-    probe: ClaudeVersionProbe
-    keyOf: (command: string, cwd: string) => Promise<string | null>
-    budgetMs: number
-    now: () => number
-  } = {
-    probe: probeClaudeCliVersion,
-    keyOf: claudeBinaryKey,
-    budgetMs: CLAUDE_THINKING_DISPLAY_PROBE_BUDGET_MS,
-    now: () => performance.now()
-  }
-): ClaudeThinkingDisplaySupport {
-  /** `expiresAt` only on an answer that was no answer: a version or a refusal is final. */
-  const known = new Map<string, { supported: boolean; expiresAt?: number }>()
-  const probing = new Map<string, { settled: Promise<void>; startedAt: number }>()
-  const remember = (key: string, supported: boolean, expiresAt?: number): void => {
-    known.delete(key)
-    known.set(key, { supported, ...(expiresAt === undefined ? {} : { expiresAt }) })
-    for (const stale of known.keys()) {
-      if (known.size <= MAX_REMEMBERED) {
-        break
-      }
-      known.delete(stale)
-    }
-  }
-  // A version is kept for the binary's life. A probe that gave none is kept only for a while, so
-  // a hung CLI costs one wait per stretch and a boot-time failure heals. A refusal seen meanwhile
-  // wins over either.
-  const settle = (key: string, supported: boolean, expiresAt?: number): void => {
-    if (!known.has(key)) {
-      remember(key, supported, expiresAt)
-    }
-  }
-  const settleWithoutVersion = (key: string): void =>
-    settle(key, false, deps.now() + FAILED_PROBE_RETRY_AFTER_MS)
-  const lookup = (key: string): boolean | undefined => {
-    const entry = known.get(key)
-    if (entry?.expiresAt !== undefined && entry.expiresAt <= deps.now()) {
-      known.delete(key)
-      return undefined
-    }
-    if (entry) {
-      // Read as used: the bound drops the binaries launched least recently.
-      remember(key, entry.supported, entry.expiresAt)
-    }
-    return entry?.supported
-  }
-  const probe = (key: string, launch: ClaudeThinkingDisplayLaunch) => {
-    const settled = deps
-      .probe(launch.command, { cwd: launch.cwd, env: launch.env, timeoutMs: PROBE_KILL_AFTER_MS })
-      .then(
-        (version) =>
-          version === null
-            ? settleWithoutVersion(key)
-            : settle(key, claudeVersionReaches(version, CLAUDE_THINKING_DISPLAY_FIRST_VERSION)),
-        () => settleWithoutVersion(key)
-      )
-      .finally(() => probing.delete(key))
-    const started = { settled, startedAt: deps.now() }
-    probing.set(key, started)
-    return started
-  }
-
-  return {
-    argsFor: async (launch) => {
-      // The launch never waits longer than the budget, finding the binary included.
-      const deadline = deps.now() + deps.budgetMs
-      const key = await within(deps.keyOf(launch.command, launch.cwd), deps.budgetMs)
-      if (key === undefined || key === null) {
-        return {}
-      }
-      const supported = lookup(key)
-      if (supported !== undefined) {
-        return supported ? SUMMARIZED : {}
-      }
-      const running = probing.get(key) ?? probe(key, launch)
-      // The probe's own budget, too: one already past it is not waited on again.
-      await within(
-        running.settled,
-        Math.min(running.startedAt + deps.budgetMs, deadline) - deps.now()
-      )
-      return known.get(key)?.supported === true ? SUMMARIZED : {}
-    },
-    observeExit: (launch, error) => {
-      if (!error.message.includes(UNKNOWN_FLAG_DIAGNOSTIC)) {
-        return
-      }
-      void deps.keyOf(launch.command, launch.cwd).then((key) => {
-        if (key !== null) {
-          remember(key, false)
-        }
-      })
-    }
-  }
-}
-
-/** One per process: every structured launch on this host shares what it learned. */
-export const claudeThinkingDisplaySupport = createClaudeThinkingDisplaySupport()
diff --git a/src/main/codex/codex-structured-agent-definition.ts b/src/main/codex/codex-structured-agent-definition.ts
index 317acdbd3a35..1f06c603000b 100644
--- a/src/main/codex/codex-structured-agent-definition.ts
+++ b/src/main/codex/codex-structured-agent-definition.ts
@@ -1,8 +1,8 @@
-import type { StructuredAgentDefinition } from '../native-chat/agent-session-wire/structured-agent-definition'
+import type { DirectoryAccountAgentDefinition } from '../native-chat/agent-session-wire/structured-agent-definition'
 import { CODEX_STRUCTURED_HANDLE_NAMESPACE } from '../../shared/agent-session-provider-handle-encoding'
 import { isCodexTurnOptionKey } from './codex-structured-turn-start'
 
-export const CODEX_STRUCTURED_AGENT: StructuredAgentDefinition = {
+export const CODEX_STRUCTURED_AGENT: DirectoryAccountAgentDefinition = {
   agent: 'codex',
   handleTransport: CODEX_STRUCTURED_HANDLE_NAMESPACE.transport,
   accountHomeVariable: 'CODEX_HOME',
diff --git a/src/main/codex/codex-structured-child-environment.ts b/src/main/codex/codex-structured-child-environment.ts
index 38ea91abe268..c34e0b3a3c87 100644
--- a/src/main/codex/codex-structured-child-environment.ts
+++ b/src/main/codex/codex-structured-child-environment.ts
@@ -1,6 +1,10 @@
 import type { CodexStructuredLaunch } from './codex-structured-session-state'
 import { CODEX_SPAWN_TOKEN_ENV } from './codex-structured-owner-identity'
 import { structuredSessionChildIdentityEnv } from '../runtime/structured-session-child-identity-env'
+import {
+  NATIVE_CHAT_VISUALS_DIR_ENV,
+  withNativeChatVisualsEnv
+} from '../native-chat/native-chat-visuals-delivery'
 
 export function buildCodexStructuredChildEnvironment(
   launch: CodexStructuredLaunch,
@@ -9,10 +13,29 @@ export function buildCodexStructuredChildEnvironment(
 ): Record<string, string> {
   return {
     // Every structured session speaks orchestration as itself: its injected id and the Orca CLI.
-    ...structuredSessionChildIdentityEnv(sessionId, {
-      ...launch.env,
-      ...(launch.codexHome ? { CODEX_HOME: launch.codexHome } : {})
-    }),
+    ...structuredSessionChildIdentityEnv(
+      sessionId,
+      withNativeChatVisualsEnv(
+        {
+          ...launch.env,
+          ...(launch.codexHome ? { CODEX_HOME: launch.codexHome } : {})
+        },
+        launch.visuals ?? null
+      )
+    ),
     [CODEX_SPAWN_TOKEN_ENV]: spawnToken
   }
 }
+
+/** The child's env overlay, and the keys removed from what it inherits: without visuals, a folder
+ *  Orca itself inherited (started from a chat) names another chat's folder. */
+export function codexStructuredChildEnvironment(
+  launch: CodexStructuredLaunch,
+  spawnToken: string,
+  sessionId: string
+): { env: Record<string, string>; envToDelete?: readonly string[] } {
+  return {
+    env: buildCodexStructuredChildEnvironment(launch, spawnToken, sessionId),
+    ...(launch.visuals ? {} : { envToDelete: [NATIVE_CHAT_VISUALS_DIR_ENV] })
+  }
+}
diff --git a/src/main/codex/codex-structured-item-streams.ts b/src/main/codex/codex-structured-item-streams.ts
index 291ff544c528..c783458ca298 100644
--- a/src/main/codex/codex-structured-item-streams.ts
+++ b/src/main/codex/codex-structured-item-streams.ts
@@ -122,10 +122,14 @@ export function createCodexStructuredItemStreams(
     }).accepted
   }
 
-  const persist = (key: string, text: string, force: boolean): boolean => {
+  const shouldPersist = (key: string, textLength: number): boolean => {
     const checkpointLength = checkpointLengths.get(key) ?? 0
     const nextLength = Math.max(checkpointLength + 32, Math.ceil(checkpointLength * 1.125))
-    if (!force && checkpointLength > 0 && text.length < nextLength) {
+    return !(checkpointLength > 0 && textLength < nextLength)
+  }
+
+  const persist = (key: string, text: string, force: boolean): boolean => {
+    if (!force && !shouldPersist(key, text.length)) {
       return true
     }
     const state = states.get(key)
@@ -143,6 +147,7 @@ export function createCodexStructuredItemStreams(
     maxTotalRetainedBytes: deps.maxTotalRetainedBytes,
     isProtected: (key) => states.isPersistent(key),
     schedule: deps.schedule,
+    shouldEmit: shouldPersist,
     emit: (key, text) => {
       return persist(key, text, false)
     }
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
index c5dccffdcd73..fd3453fed655 100644
--- a/src/main/codex/codex-structured-journal-restore-turn-grouping.test.ts
+++ b/src/main/codex/codex-structured-journal-restore-turn-grouping.test.ts
@@ -98,7 +98,7 @@ describe('grouping a Codex thread restored from full history', () => {
           draws: true,
           outlivesTurn: false,
           reportsFailure: false,
-          reportsCompaction: false
+          explainsTurn: false
         })),
         settledTurnKeys: new Set(bars.settledTurns.keys()),
         expandedTurnKeys: new Set()
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 5cb1110a5f8e..d98ccba5f35e 100644
--- a/src/main/codex/codex-structured-journal-translation-streams.test.ts
+++ b/src/main/codex/codex-structured-journal-translation-streams.test.ts
@@ -750,3 +750,77 @@ describe('notice journal pipeline', () => {
     translator.dispose()
   })
 })
+
+describe('Codex streamed checkpoint admission', () => {
+  it('skips joining a below-threshold prefix and still writes its final text', () => {
+    const { translator, tap, window } = translatorWith()
+    const prefix = 'checkpoint '.repeat(12)
+    translator.handle(notification('item/agentMessage/delta', { itemId: 'reply', delta: prefix }))
+    window.fire()
+    const rows = tap.rows.length
+    const publications = tap.publishes()
+    const join = vi.spyOn(Array.prototype, 'join')
+    const prefixJoins = () =>
+      join.mock.contexts.filter(
+        (chunks) =>
+          Array.isArray(chunks) && chunks.length === 2 && chunks[0] === prefix && chunks[1] === 'x'
+      )
+    try {
+      translator.handle(notification('item/agentMessage/delta', { itemId: 'reply', delta: 'x' }))
+      window.fire()
+      expect(prefixJoins()).toHaveLength(0)
+      expect(tap.rows).toHaveLength(rows)
+      expect(tap.publishes()).toBe(publications)
+      expect(window.idle()).toBe(true)
+
+      translator.flush()
+      expect(prefixJoins()).toHaveLength(1)
+      expect(tap.rows.at(-1)?.body).toMatchObject({
+        kind: 'message',
+        blocks: [{ type: 'text', text: `${prefix}x` }]
+      })
+      expect(tap.publishes()).toBe(publications + 1)
+    } finally {
+      join.mockRestore()
+      translator.dispose()
+    }
+  })
+
+  it('retries a refused checkpoint before forcing a smaller final increment', () => {
+    const { translator, tap, window } = translatorWith()
+    let reject = false
+    tap.sink.tryAppendItem = (identity, body, options) => {
+      if (reject) {
+        return { accepted: false, reason: 'backpressure' }
+      }
+      tap.sink.appendItem(identity, body, options)
+      return { accepted: true }
+    }
+    const delta = (text: string) =>
+      translator.handle(notification('item/agentMessage/delta', { itemId: 'reply', delta: text }))
+    delta('a'.repeat(128))
+    window.fire()
+    const rows = tap.rows.length
+    reject = true
+    delta('b'.repeat(32))
+    window.fire()
+    window.fire()
+    expect(tap.rows).toHaveLength(rows)
+    expect(window.idle()).toBe(false)
+
+    reject = false
+    window.fire()
+    expect(window.idle()).toBe(true)
+    expect(tap.rows.at(-1)?.body).toMatchObject({
+      blocks: [{ type: 'text', text: `${'a'.repeat(128)}${'b'.repeat(32)}` }]
+    })
+    delta('x')
+    window.fire()
+    expect(tap.rows).toHaveLength(rows + 1)
+    translator.flush()
+    expect(tap.rows.at(-1)?.body).toMatchObject({
+      blocks: [{ type: 'text', text: `${'a'.repeat(128)}${'b'.repeat(32)}x` }]
+    })
+    translator.dispose()
+  })
+})
diff --git a/src/main/codex/codex-structured-launch-resolution.ts b/src/main/codex/codex-structured-launch-resolution.ts
index 183f765f5c86..8016c938ae83 100644
--- a/src/main/codex/codex-structured-launch-resolution.ts
+++ b/src/main/codex/codex-structured-launch-resolution.ts
@@ -7,6 +7,7 @@
 // for, which is how a resume becomes a fork wearing a resume's name.
 
 import type { AgentSessionJournalIdentity } from '../../shared/agent-session-journal-types'
+import { requireLegacyAgentSessionAccountHome } from '../../shared/agent-session-account-home'
 import { agentSessionProviderHandleChainHead } from '../../shared/agent-session-provider-handle'
 import { LOCAL_EXECUTION_HOST_ID } from '../../shared/execution-host'
 import { resolveCodexCommand } from '../codex-cli/command'
@@ -17,6 +18,7 @@ import type { CodexStructuredPermissionPolicy } from './codex-structured-permiss
 import { resolvePinnedCodexRolloutProof } from './codex-pinned-rollout-proof'
 import { codexStructuredLaunchArgs } from './codex-structured-launch-args'
 import { CODEX_STRUCTURED_AGENT } from './codex-structured-agent-definition'
+import type { PrepareNativeChatVisuals } from '../native-chat/native-chat-visuals-delivery'
 
 export type CodexStructuredLaunchResolverDeps = {
   store: Pick<AgentSessionRecordStore, 'getRecord' | 'pinLaunchDirectory'>
@@ -32,6 +34,8 @@ export type CodexStructuredLaunchResolverDeps = {
   /** The user's Agent Permissions setting as thread policy, re-read per acquisition.
    *  States both postures outright — a resume inherits the last one for any field left absent. */
   resolvePermissionPolicy?: () => CodexStructuredPermissionPolicy
+  /** This chat's visuals folder and skill; absent or null ⇒ the chat gets neither. */
+  prepareVisuals?: PrepareNativeChatVisuals
 }
 
 export type CodexStructuredInvocation = {
@@ -67,7 +71,8 @@ export function createCodexStructuredLaunchResolver(
     if (!record) {
       throw new Error(`no durable agent-session record for ${identity.sessionId}`)
     }
-    const { location, accountHome } = record
+    const { location } = record
+    const accountHome = requireLegacyAgentSessionAccountHome(record.accountHome)
     if (record.provider !== 'codex') {
       throw new Error(`session ${identity.sessionId} is a ${record.provider} session`)
     }
@@ -91,6 +96,7 @@ export function createCodexStructuredLaunchResolver(
     const resumeThreadId = head?.handle.nativeId ?? null
     // The same saved options every turn sends, so the thread and its turns name one model.
     const model = record.options?.model
+    const visuals = (await deps.prepareVisuals?.(record.sessionId)) ?? null
     return {
       command,
       args: [...args, 'app-server'],
@@ -105,6 +111,7 @@ export function createCodexStructuredLaunchResolver(
       ...(resumeThreadId && head?.origin === 'created' ? { supersedeIfUnsaved: true } : {}),
       ...(permissionPolicy ? { permissionPolicy } : {}),
       ...(model ? { model } : {}),
+      ...(visuals ? { visuals } : {}),
       ...(resumeThreadId
         ? {
             resumePath: await (deps.resolveRollout ?? resolvePinnedCodexRolloutProof)(
diff --git a/src/main/codex/codex-structured-real-cli-visuals.test.ts b/src/main/codex/codex-structured-real-cli-visuals.test.ts
new file mode 100644
index 000000000000..c9b2e9869b7b
--- /dev/null
+++ b/src/main/codex/codex-structured-real-cli-visuals.test.ts
@@ -0,0 +1,69 @@
+// The installed Codex, driven through Orca's own visuals setup in an isolated CODEX_HOME: Codex must
+// list the bundled skill and open the thread with the chat folder beside the user's own writable
+// root. Opt-in (ORCA_REAL_CODEX_CLI_TEST=1); no account is used, nothing reaches a model.
+import { mkdirSync, mkdtempSync, rmSync, writeFileSync } from 'node:fs'
+import { tmpdir } from 'node:os'
+import { join } from 'node:path'
+import { describe, expect, it } from 'vitest'
+import { resolveCodexCommand } from '../codex-cli/command'
+import { NATIVE_CHAT_VISUALS_SKILL_NAME } from '../native-chat/native-chat-visuals-skill-location'
+import { openCodexAppServerConnection } from './codex-app-server-connection'
+import { withCodexVisualsThreadConfig } from './codex-structured-visuals'
+
+const enabled = process.env.ORCA_REAL_CODEX_CLI_TEST === '1'
+const MANUAL = { approvalPolicy: 'on-request', sandbox: 'workspace-write' } as const
+
+describe.skipIf(!enabled)('Codex real app-server chat visuals', () => {
+  it('lists the visuals skill and grants the chat folder beside the user writable roots', async () => {
+    const base = mkdtempSync(join(tmpdir(), 'orca-real-codex-visuals-'))
+    try {
+      const codexHome = join(base, 'codex-home')
+      const cwd = join(base, 'workspace')
+      const userRoot = join(base, 'user-root')
+      const folder = join(base, 'state', 'native-chat-visuals', 'chat')
+      for (const dir of [codexHome, cwd, folder]) {
+        mkdirSync(dir, { recursive: true })
+      }
+      writeFileSync(
+        join(codexHome, 'config.toml'),
+        `[sandbox_workspace_write]\nwritable_roots = [${JSON.stringify(userRoot)}]\n`
+      )
+      const pluginDir = join(__dirname, '..', '..', '..', 'resources', 'native-chat-visuals')
+      const connection = await openCodexAppServerConnection({
+        command: resolveCodexCommand(),
+        args: ['app-server'],
+        cwd,
+        env: { HOME: base, CODEX_HOME: codexHome }
+      })
+      try {
+        const launch = await withCodexVisualsThreadConfig(
+          connection,
+          {
+            cwd,
+            permissionPolicy: MANUAL,
+            visuals: { folder, skill: { pluginDir, skillsRoot: join(pluginDir, 'skills') } }
+          },
+          { sessionId: 'real-codex-visuals' }
+        )
+        const skills = JSON.stringify(
+          await connection.request('skills/list', { cwds: [cwd] }, { timeoutMs: 10_000 })
+        )
+        expect(skills).toMatch(
+          new RegExp(`"name":"(?:[a-z0-9-]+:)?${NATIVE_CHAT_VISUALS_SKILL_NAME}"`)
+        )
+        const opened = await connection.request(
+          'thread/start',
+          { cwd, ...MANUAL, ...(launch.threadConfig ? { config: launch.threadConfig } : {}) },
+          { timeoutMs: 20_000 }
+        )
+        expect(opened).toMatchObject({
+          sandbox: { type: 'workspaceWrite', writableRoots: [userRoot, folder] }
+        })
+      } finally {
+        await connection.close()
+      }
+    } finally {
+      rmSync(base, { recursive: true, force: true })
+    }
+  }, 60_000)
+})
diff --git a/src/main/codex/codex-structured-session-acquire.ts b/src/main/codex/codex-structured-session-acquire.ts
index b34aa335cfc8..1dbdde663b41 100644
--- a/src/main/codex/codex-structured-session-acquire.ts
+++ b/src/main/codex/codex-structured-session-acquire.ts
@@ -21,8 +21,9 @@ import {
   codexProviderHandleLink,
   codexSpawnedProcessIdentity
 } from './codex-structured-owner-identity'
-import { buildCodexStructuredChildEnvironment } from './codex-structured-child-environment'
+import { codexStructuredChildEnvironment } from './codex-structured-child-environment'
 import { openCodexThread } from './codex-structured-thread-open'
+import { withCodexVisualsThreadConfig } from './codex-structured-visuals'
 import {
   closeCodexPublishedSession,
   handleCodexSessionExit
@@ -139,7 +140,7 @@ export async function acquireCodexStructuredSession(input: {
         command: launch.command,
         args: launch.args,
         cwd: launch.cwd,
-        env: buildCodexStructuredChildEnvironment(launch, acquireInput.spawnToken, sessionId)
+        ...codexStructuredChildEnvironment(launch, acquireInput.spawnToken, sessionId)
       },
       {
         onNotification: codexAcquisitionNotificationHandler({
@@ -195,7 +196,12 @@ export async function acquireCodexStructuredSession(input: {
       })
     }
     acquisitions.assertCurrent(sessionId, attempt)
-    const opened = await openCodexThread(connection, launch, deps.requestTimeoutMs)
+    const threadLaunch = await withCodexVisualsThreadConfig(connection, launch, {
+      sessionId,
+      ...(deps.logger ? { logger: deps.logger } : {})
+    })
+    acquisitions.assertCurrent(sessionId, attempt)
+    const opened = await openCodexThread(connection, threadLaunch, deps.requestTimeoutMs)
     acquisitions.assertCurrent(sessionId, attempt)
     primaryThreadId = opened.threadId
     const restoreAdmission = translator?.restoreThread(opened.threadId, opened.thread ?? {})
diff --git a/src/main/codex/codex-structured-session-state.ts b/src/main/codex/codex-structured-session-state.ts
index 83cd87a3b420..fc2c505e9fb5 100644
--- a/src/main/codex/codex-structured-session-state.ts
+++ b/src/main/codex/codex-structured-session-state.ts
@@ -26,6 +26,7 @@ import type {
   AgentModelCatalogSessionAccess,
   AgentModelCatalogStore
 } from '../native-chat/agent-model-catalog/agent-model-catalog-store'
+import type { NativeChatVisualsLaunch } from '../native-chat/native-chat-visuals-delivery'
 
 export type CodexSessionCatalogAccess = AgentModelCatalogSessionAccess
 
@@ -43,6 +44,8 @@ export type CodexStructuredLaunch = {
   /** The model the session chose; the thread opens on it so its first turn is not a switch. */
   model?: string
   env?: Record<string, string>
+  /** This chat's visuals folder and skill; absent when the chat has no visuals. */
+  visuals?: NativeChatVisualsLaunch
 }
 
 /** Turn and item boundaries, timed by when the host received them, never by when a buffered or
diff --git a/src/main/codex/codex-structured-thread-open.ts b/src/main/codex/codex-structured-thread-open.ts
index 19a3980cb208..6fd58ba17ecd 100644
--- a/src/main/codex/codex-structured-thread-open.ts
+++ b/src/main/codex/codex-structured-thread-open.ts
@@ -91,11 +91,17 @@ export async function openCodexThread(
     /** 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
+    /** Config overrides for this thread, on start and resume alike. */
+    threadConfig?: Record<string, unknown>
   },
   timeoutMs: number | undefined
 ): Promise<CodexOpenedThread> {
   const resumeThreadId = launch.resumeThreadId
-  const threadSettings = { cwd: launch.cwd, ...launch.permissionPolicy }
+  const threadSettings = {
+    cwd: launch.cwd,
+    ...launch.permissionPolicy,
+    ...(launch.threadConfig ? { config: launch.threadConfig } : {})
+  }
   const startThread = (): Promise<unknown> =>
     connection.request(
       'thread/start',
diff --git a/src/main/codex/codex-structured-visuals.test.ts b/src/main/codex/codex-structured-visuals.test.ts
new file mode 100644
index 000000000000..93430c3d6af7
--- /dev/null
+++ b/src/main/codex/codex-structured-visuals.test.ts
@@ -0,0 +1,181 @@
+import { describe, expect, it, vi } from 'vitest'
+import {
+  NATIVE_CHAT_VISUALS_DIR_ENV,
+  type NativeChatVisualsLaunch
+} from '../native-chat/native-chat-visuals-delivery'
+import { CodexAppServerRequestError } from './codex-app-server-request-error'
+import { CodexAppServerTimeoutError } from './codex-app-server-session'
+import { acquired, fakeCodex, THREAD_ID } from './codex-structured-session-adapter-fixture'
+import {
+  CODEX_VISUALS_SETUP_BUDGET_MS,
+  prepareCodexThreadForVisuals
+} from './codex-structured-visuals'
+
+const VISUALS: NativeChatVisualsLaunch = {
+  folder: '/state/native-chat-visuals/abc',
+  skill: { pluginDir: '/app/native-chat-visuals', skillsRoot: '/app/native-chat-visuals/skills' }
+}
+const MANUAL = { approvalPolicy: 'on-request', sandbox: 'workspace-write' } as const
+const YOLO = { approvalPolicy: 'never', sandbox: 'danger-full-access' } as const
+
+type Call = { method: string; params?: Record<string, unknown>; timeoutMs?: number }
+
+function connectionAnswering(routes: Record<string, () => unknown>) {
+  const calls: Call[] = []
+  const request = vi.fn(
+    async (method: string, params?: Record<string, unknown>, options?: { timeoutMs?: number }) => {
+      calls.push({ method, params, timeoutMs: options?.timeoutMs })
+      const route = routes[method]
+      return route ? route() : {}
+    }
+  )
+  return { calls, connection: { request } }
+}
+
+const configWithRoots = (roots: unknown) => () => ({
+  config: { sandbox_workspace_write: { writable_roots: roots, network_access: true } }
+})
+
+describe('setting up a Codex app-server for a chat with visuals', () => {
+  it("names the skill root and adds the chat folder to the user's writable roots", async () => {
+    const { calls, connection } = connectionAnswering({
+      'config/read': configWithRoots(['/home/me/scratch'])
+    })
+    const config = await prepareCodexThreadForVisuals(connection, {
+      cwd: '/work/repo',
+      visuals: VISUALS,
+      permissionPolicy: MANUAL
+    })
+    expect(config).toEqual({
+      'sandbox_workspace_write.writable_roots': ['/home/me/scratch', VISUALS.folder]
+    })
+    expect(calls).toEqual(
+      expect.arrayContaining([
+        {
+          method: 'skills/extraRoots/set',
+          params: { extraRoots: [VISUALS.skill.skillsRoot] },
+          timeoutMs: CODEX_VISUALS_SETUP_BUDGET_MS
+        },
+        {
+          method: 'config/read',
+          params: { cwd: '/work/repo' },
+          timeoutMs: CODEX_VISUALS_SETUP_BUDGET_MS
+        }
+      ])
+    )
+  })
+
+  it('grants just the folder when the user has no writable roots of their own', async () => {
+    for (const answer of [() => ({ config: {} }), configWithRoots([])]) {
+      const { connection } = connectionAnswering({ 'config/read': answer })
+      await expect(
+        prepareCodexThreadForVisuals(connection, { cwd: '/w', visuals: VISUALS })
+      ).resolves.toEqual({ 'sandbox_workspace_write.writable_roots': [VISUALS.folder] })
+    }
+  })
+
+  it('overrides nothing when the user roots cannot be read, so none are dropped', async () => {
+    const logger = { warn: vi.fn(), error: vi.fn() }
+    for (const route of [
+      () => Promise.reject(new CodexAppServerTimeoutError('config/read exceeded 2000ms')),
+      configWithRoots([42]),
+      () => ({ nothing: true })
+    ]) {
+      const { connection } = connectionAnswering({ 'config/read': route })
+      await expect(
+        prepareCodexThreadForVisuals(
+          connection,
+          { cwd: '/w', visuals: VISUALS, permissionPolicy: MANUAL },
+          { logger, sessionId: 's-1' }
+        )
+      ).resolves.toBeNull()
+    }
+    expect(logger.warn).toHaveBeenCalledTimes(3)
+  })
+
+  it('asks for no writable root under full access, and still names the skill root', async () => {
+    const { calls, connection } = connectionAnswering({})
+    await expect(
+      prepareCodexThreadForVisuals(connection, {
+        cwd: '/w',
+        visuals: VISUALS,
+        permissionPolicy: YOLO
+      })
+    ).resolves.toBeNull()
+    expect(calls.map((call) => call.method)).toEqual(['skills/extraRoots/set'])
+  })
+
+  it('opens without the skill on a Codex that predates skill roots, or one that fails or hangs', async () => {
+    const failures = [
+      new CodexAppServerRequestError(
+        'skills/extraRoots/set',
+        -32600,
+        'Invalid request: unknown variant `skills/extraRoots/set`, expected one of `initialize`'
+      ),
+      new CodexAppServerRequestError('skills/extraRoots/set', -32601, 'method not found'),
+      new CodexAppServerTimeoutError('codex app-server skills/extraRoots/set exceeded 2000ms'),
+      new Error('broken pipe')
+    ]
+    for (const failure of failures) {
+      const logger = { warn: vi.fn(), error: vi.fn() }
+      const { connection } = connectionAnswering({
+        'skills/extraRoots/set': () => Promise.reject(failure),
+        'config/read': configWithRoots([])
+      })
+      await expect(
+        prepareCodexThreadForVisuals(
+          connection,
+          { cwd: '/w', visuals: VISUALS },
+          { logger, sessionId: 's-1' }
+        )
+      ).resolves.toEqual({ 'sandbox_workspace_write.writable_roots': [VISUALS.folder] })
+      expect(logger.warn).toHaveBeenCalledWith(
+        expect.stringMatching(
+          failure.message.includes('variant') || failure.message.includes('not found')
+            ? /cannot load skills/
+            : /did not take/
+        ),
+        expect.objectContaining({ scope: 'nativeChatVisuals.codex', error: failure })
+      )
+    }
+  })
+
+  it('sends nothing for a chat without visuals', async () => {
+    const { calls, connection } = connectionAnswering({})
+    await expect(prepareCodexThreadForVisuals(connection, { cwd: '/w' })).resolves.toBeNull()
+    expect(calls).toEqual([])
+  })
+})
+
+describe('a Codex chat acquisition with visuals', () => {
+  it('sets up skills and the folder after initialize and before the thread opens, on start and resume', async () => {
+    for (const resumeThreadId of [null, THREAD_ID]) {
+      const codex = fakeCodex({ 'config/read': configWithRoots(['/home/me/scratch']) })
+      await acquired(codex, { visuals: VISUALS, permissionPolicy: MANUAL, resumeThreadId })
+      const connection = codex.connections[0]!
+      const methods = connection.calls.map((call) => call.method)
+      const open = resumeThreadId ? 'thread/resume' : 'thread/start'
+      expect(methods.indexOf('skills/extraRoots/set')).toBeLessThan(methods.indexOf(open))
+      expect(methods.indexOf('config/read')).toBeLessThan(methods.indexOf(open))
+      expect(connection.calls.find((call) => call.method === open)?.params).toMatchObject({
+        ...MANUAL,
+        config: { 'sandbox_workspace_write.writable_roots': ['/home/me/scratch', VISUALS.folder] }
+      })
+      expect(connection.launch.env?.[NATIVE_CHAT_VISUALS_DIR_ENV]).toBe(VISUALS.folder)
+    }
+  })
+
+  it('opens the thread exactly as before for a chat without visuals', async () => {
+    const codex = fakeCodex()
+    await acquired(codex, {
+      permissionPolicy: MANUAL,
+      env: { [NATIVE_CHAT_VISUALS_DIR_ENV]: '/other' }
+    })
+    const connection = codex.connections[0]!
+    const methods = connection.calls.map((call) => call.method)
+    expect(methods[0]).toBe('thread/start')
+    expect(methods).not.toContain('skills/extraRoots/set')
+    expect(connection.calls[0]?.params).not.toHaveProperty('config')
+    expect(connection.launch.env).not.toHaveProperty(NATIVE_CHAT_VISUALS_DIR_ENV)
+  })
+})
diff --git a/src/main/codex/codex-structured-visuals.ts b/src/main/codex/codex-structured-visuals.ts
new file mode 100644
index 000000000000..20962b349ccd
--- /dev/null
+++ b/src/main/codex/codex-structured-visuals.ts
@@ -0,0 +1,153 @@
+// Inline visuals for a Codex chat, set up on its app-server between initialize and the thread
+// open: the skill root Codex scans, and the chat's folder as a writable root. Both are best effort
+// under one short budget; a chat whose setup fails, hangs or is unsupported opens without visuals.
+
+import type { NativeChatVisualsLaunch } from '../native-chat/native-chat-visuals-delivery'
+import type { StructuredAgentSessionLogger } from '../native-chat/agent-session-wire/structured-agent-session-logger'
+import type { CodexAppServerConnection } from './codex-app-server-connection'
+import { isCodexAppServerRequestError } from './codex-app-server-request-error'
+import { isCodexMethodNotFoundError } from './codex-app-server-session'
+import type { CodexStructuredPermissionPolicy } from './codex-structured-permission-policy'
+
+/** Why short: both requests answer from local state in milliseconds, and the user's first prompt
+ *  waits behind them; past this the thread opens without whatever has not answered. */
+export const CODEX_VISUALS_SETUP_BUDGET_MS = 2_000
+
+const SKILL_ROOTS_METHOD = 'skills/extraRoots/set'
+const WRITABLE_ROOTS_KEY = 'sandbox_workspace_write.writable_roots'
+
+type CodexVisualsConnection = Pick<CodexAppServerConnection, 'request'>
+
+/** A Codex that predates the method: older builds refuse it as an unknown request variant. */
+function isSkillRootsUnsupported(error: unknown): boolean {
+  return (
+    isCodexMethodNotFoundError(error) ||
+    (isCodexAppServerRequestError(error) &&
+      error.code === -32600 &&
+      error.message.includes(`unknown variant \`${SKILL_ROOTS_METHOD}\``))
+  )
+}
+
+/**
+ * The skill roots Orca hands this app-server. The request replaces the process's whole list, so
+ * every root Orca supplies is named here; each chat has its own app-server, and this runs on every
+ * acquisition, so a respawned or resumed chat gets the list again.
+ */
+function orcaSkillRoots(visuals: NativeChatVisualsLaunch): string[] {
+  return [visuals.skill.skillsRoot]
+}
+
+async function setSkillRoots(
+  connection: CodexVisualsConnection,
+  visuals: NativeChatVisualsLaunch,
+  report: (message: string, error: unknown) => void
+): Promise<void> {
+  try {
+    await connection.request(
+      SKILL_ROOTS_METHOD,
+      { extraRoots: orcaSkillRoots(visuals) },
+      { timeoutMs: CODEX_VISUALS_SETUP_BUDGET_MS }
+    )
+  } catch (error) {
+    report(
+      isSkillRootsUnsupported(error)
+        ? 'codex app-server cannot load skills by path; the chat has no visuals skill'
+        : 'codex app-server did not take the visuals skill root',
+      error
+    )
+  }
+}
+
+function writableRootsOf(response: unknown): string[] | null {
+  if (typeof response !== 'object' || response === null || !('config' in response)) {
+    return null
+  }
+  const { config } = response
+  if (typeof config !== 'object' || config === null) {
+    return null
+  }
+  const section = 'sandbox_workspace_write' in config ? config.sandbox_workspace_write : null
+  if (section === null || section === undefined) {
+    return []
+  }
+  if (typeof section !== 'object' || !('writable_roots' in section)) {
+    return []
+  }
+  const roots = section.writable_roots
+  return Array.isArray(roots) && roots.every((root) => typeof root === 'string') ? roots : null
+}
+
+/**
+ * The thread config adding the chat's folder to the writable roots the user already has. The
+ * override replaces Codex's list rather than appending to it, so the user's own roots are read
+ * first (with the project layers this cwd sees) and kept; when they can't be read, nothing is
+ * overridden and a write there asks for approval like any other path outside the workspace.
+ */
+async function writableRootsConfig(
+  connection: CodexVisualsConnection,
+  input: { cwd: string; folder: string },
+  report: (message: string, error: unknown) => void
+): Promise<Record<string, unknown> | null> {
+  try {
+    const roots = writableRootsOf(
+      await connection.request(
+        'config/read',
+        { cwd: input.cwd },
+        { timeoutMs: CODEX_VISUALS_SETUP_BUDGET_MS }
+      )
+    )
+    if (!roots) {
+      report('codex config/read gave no readable writable roots', null)
+      return null
+    }
+    return { [WRITABLE_ROOTS_KEY]: [...new Set([...roots, input.folder])] }
+  } catch (error) {
+    report('codex config/read failed; the chat folder is not a writable root', error)
+    return null
+  }
+}
+
+/**
+ * Sets this app-server up for the chat's visuals and returns the thread config the thread open
+ * carries, or null. Never throws. Full access needs no writable root: everything is writable.
+ */
+export async function prepareCodexThreadForVisuals(
+  connection: CodexVisualsConnection,
+  launch: {
+    cwd: string
+    visuals?: NativeChatVisualsLaunch | null
+    permissionPolicy?: CodexStructuredPermissionPolicy
+  },
+  log?: { logger?: StructuredAgentSessionLogger; sessionId: string }
+): Promise<Record<string, unknown> | null> {
+  const { visuals } = launch
+  if (!visuals) {
+    return null
+  }
+  const report = (message: string, error: unknown): void =>
+    log?.logger?.warn(message, {
+      scope: 'nativeChatVisuals.codex',
+      sessionId: log.sessionId,
+      ...(error === null ? {} : { error })
+    })
+  const [, threadConfig] = await Promise.all([
+    setSkillRoots(connection, visuals, report),
+    launch.permissionPolicy?.sandbox === 'danger-full-access'
+      ? null
+      : writableRootsConfig(connection, { cwd: launch.cwd, folder: visuals.folder }, report)
+  ])
+  return threadConfig
+}
+
+/** `launch` carrying its visuals thread config, set up on this app-server first. Codex reads skill
+ *  roots and writable roots when a thread opens, so this runs between initialize and the open. */
+export async function withCodexVisualsThreadConfig<
+  T extends Parameters<typeof prepareCodexThreadForVisuals>[1]
+>(
+  connection: CodexVisualsConnection,
+  launch: T,
+  log: { logger?: StructuredAgentSessionLogger; sessionId: string }
+): Promise<T & { threadConfig?: Record<string, unknown> }> {
+  const threadConfig = await prepareCodexThreadForVisuals(connection, launch, log)
+  return threadConfig ? { ...launch, threadConfig } : launch
+}
diff --git a/src/main/daemon/daemon-foreground-confirmation-protocol.test.ts b/src/main/daemon/daemon-foreground-confirmation-protocol.test.ts
index c712d0e8c9dd..53e3d13744f7 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(41)
+    expect(PROTOCOL_VERSION).toBe(42)
     expect(PREVIOUS_DAEMON_PROTOCOL_VERSIONS).toContain(19)
     expect(PREVIOUS_DAEMON_PROTOCOL_VERSIONS).toContain(22)
     expect(PREVIOUS_DAEMON_PROTOCOL_VERSIONS).toContain(23)
diff --git a/src/main/daemon/daemon-init-provider-installation.test.ts b/src/main/daemon/daemon-init-provider-installation.test.ts
index 423ee9ee34f2..2de5fd5be84e 100644
--- a/src/main/daemon/daemon-init-provider-installation.test.ts
+++ b/src/main/daemon/daemon-init-provider-installation.test.ts
@@ -125,26 +125,6 @@ describe('daemon-init: runRestartDaemon (7-step sequence)', () => {
     expect(setLocalPtyProviderMock).not.toHaveBeenCalled()
   })
 
-  it('prunes seeded Claude live-PTY ids against daemon sessions after init', async () => {
-    const mod = await importFresh()
-    // Why: live-pty-gate is intentionally unmocked — import from the same fresh registry so gate state matches daemon-init's.
-    const gate = await import('../claude-accounts/live-pty-gate')
-    defaultListSessionsSessions.push({ sessionId: 'claude-alive' })
-    gate.seedLiveClaudePtysFromPersistence(['claude-alive', 'claude-dead'])
-    try {
-      await mod.initDaemonPtyProvider()
-
-      expect(gate.hasLiveClaudePtys()).toBe(true)
-
-      gate.markClaudePtyExited('claude-alive')
-      // Why: proves 'claude-dead' was released by the daemon reconcile — the surviving session held the gate alone.
-      expect(gate.hasLiveClaudePtys()).toBe(false)
-    } finally {
-      gate.markClaudePtyExited('claude-alive')
-      gate.markClaudePtyExited('claude-dead')
-    }
-  })
-
   it('does not install a late daemon provider after startup fallback aborts the init attempt', async () => {
     const mod = await importFresh()
     let resolveEnsureRunning!: (value: { socketPath: string; tokenPath: string }) => void
diff --git a/src/main/daemon/daemon-protocol-version.ts b/src/main/daemon/daemon-protocol-version.ts
index 68eae86f58b2..8967d0cae513 100644
--- a/src/main/daemon/daemon-protocol-version.ts
+++ b/src/main/daemon/daemon-protocol-version.ts
@@ -1,7 +1,9 @@
 // Why: daemons survive app updates, so wire behavior must be version-gated.
-// v41 stages long startup commands as sourced scripts; v40 rolled the #25130/#24636 shell-wrapper
-// changes and the wider agent list into a fresh daemon; older owners stay attachable.
-export const PROTOCOL_VERSION = 41
+// v42 gives every pane the `claude` function that follows the selected Claude account; v41 stages
+// long startup commands as sourced scripts; v40 rolled the #25130/#24636 shell-wrapper changes and
+// the wider agent list into a fresh daemon; older owners stay attachable.
+export const PROTOCOL_VERSION = 42
+export const CLAUDE_ACCOUNT_FUNCTION_DAEMON_PROTOCOL_VERSION = 42
 // v39 gives plain fish panes Orca's codex function through XDG_DATA_DIRS.
 export const CODEX_FISH_SHELL_FUNCTION_DAEMON_PROTOCOL_VERSION = 39
 // Why: older daemons reject `setColorQueryReplyColors` as an unknown request type.
@@ -36,7 +38,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, 36, 37, 38, 39, 40
+  28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41
 ] as const
 
 export function supportsColorQueryReplyColors(protocolVersion: number): boolean {
diff --git a/src/main/daemon/daemon-provider-init.ts b/src/main/daemon/daemon-provider-init.ts
index 9d9a1b5c3e11..dd2d2f951368 100644
--- a/src/main/daemon/daemon-provider-init.ts
+++ b/src/main/daemon/daemon-provider-init.ts
@@ -1,8 +1,4 @@
 import { getLocalPtyProvider, rebindLocalProviderListeners } from '../ipc/pty'
-import {
-  confirmSeededClaudeLivePtys,
-  hasSeededUnconfirmedClaudePtys
-} from '../claude-accounts/live-pty-gate'
 import { isStartupDiagnosticsEnabled, logStartupDiagnostic } from '../startup/startup-diagnostics'
 import { checkDaemonHealth } from './daemon-health'
 import { collectPinnedDaemonVersions, pruneOldDaemonHosts } from './daemon-host-relocation'
@@ -163,7 +159,6 @@ export async function initDaemonPtyProvider(
   if (process.platform === 'darwin' && newSpawner.getHandle()?.adopted) {
     void reportDaemonAdoption(runtimeDir, info.socketPath, info.tokenPath, newAdapter)
   }
-  await reconcileSeededClaudeLivePtys(routedAdapter)
 }
 
 // Why off the init path: this is measurement of an adopted daemon (#17696), and neither its probes nor their failure may delay or fail startup.
@@ -190,29 +185,3 @@ async function reportDaemonAdoption(
     // Best-effort measurement only.
   }
 }
-
-// Why: release gate ids only for daemon-confirmed-dead sessions; keep seeds on listing failure since releasing early can rotate a live CLI's refresh token.
-async function reconcileSeededClaudeLivePtys(provider: DaemonProvider): Promise<void> {
-  if (!hasSeededUnconfirmedClaudePtys()) {
-    return
-  }
-  try {
-    const adapters =
-      provider instanceof DaemonPtyRouter || provider instanceof DegradedDaemonPtyProvider
-        ? provider.getAllAdapters()
-        : [provider]
-    const results = await Promise.allSettled(adapters.map((entry) => entry.listSessions()))
-    if (results.some((result) => result.status === 'rejected')) {
-      console.warn('[daemon] Keeping seeded Claude live-PTY gate — session listing failed')
-      return
-    }
-    confirmSeededClaudeLivePtys(
-      results.flatMap((result) =>
-        result.status === 'fulfilled' ? result.value.map((session) => session.sessionId) : []
-      )
-    )
-  } catch (error) {
-    // Why: gate bookkeeping must never fail daemon init; stale seeds only defer a usage refresh until next restart.
-    console.warn('[daemon] Failed to reconcile seeded Claude live-PTY gate:', error)
-  }
-}
diff --git a/src/main/daemon/daemon-provider-state.ts b/src/main/daemon/daemon-provider-state.ts
index 30eff6691f99..7599ee9cd03c 100644
--- a/src/main/daemon/daemon-provider-state.ts
+++ b/src/main/daemon/daemon-provider-state.ts
@@ -3,7 +3,7 @@ import { setLocalPtyProvider } from '../ipc/pty'
 import { DegradedDaemonPtyProvider } from './degraded-daemon-pty-provider'
 import { getDaemonRuntimeDir as getRuntimeDir } from './daemon-launch-paths'
 import { parseDaemonPidFile, type ParsedDaemonPid } from './daemon-pid-file-parse'
-import type { DaemonProvider } from './daemon-provider-routing'
+import { getLegacyDaemonAdapters, type DaemonProvider } from './daemon-provider-routing'
 import { DaemonPtyRouter } from './daemon-pty-router'
 import { getDaemonPidPath, getDaemonSocketPath, getDaemonTokenPath } from './daemon-spawner'
 import type { DaemonSpawner } from './daemon-spawner'
@@ -88,6 +88,18 @@ export function getDaemonProvider(): DaemonProvider | null {
   return adapter
 }
 
+/** True for a terminal on a daemon kept alive from before `protocolVersion`; never for an SSH pane. */
+export function isTerminalFromBeforeDaemonProtocol(
+  ptyId: string,
+  protocolVersion: number
+): boolean {
+  return adapter
+    ? getLegacyDaemonAdapters(adapter).some(
+        (legacy) => legacy.protocolVersion < protocolVersion && legacy.hasPty(ptyId)
+      )
+    : false
+}
+
 // Why: computed from the pid record on demand (not cached at adoption) so the Settings
 // remedy surface always reflects the daemon actually serving terminals right now.
 export async function getCurrentDaemonMacTccAttributionHealth(): Promise<MacDaemonTccAttributionHealth> {
diff --git a/src/main/daemon/pty-subprocess-io-failure-cleanup.test.ts b/src/main/daemon/pty-subprocess-io-failure-cleanup.test.ts
index b7ce586668b5..a4faede7cae5 100644
--- a/src/main/daemon/pty-subprocess-io-failure-cleanup.test.ts
+++ b/src/main/daemon/pty-subprocess-io-failure-cleanup.test.ts
@@ -192,7 +192,9 @@ describe.each(['darwin', 'linux', 'win32'] as const)('%s native-handle contract'
             expect(host.listSessions()).toHaveLength(1)
             expect(fixture.proc.destroy).not.toHaveBeenCalled()
             expect(onExit).not.toHaveBeenCalled()
-            await vi.waitFor(() => expect(signal).toHaveBeenCalledWith(4242, 'SIGKILL'))
+            await vi.waitFor(() => expect(signal).toHaveBeenCalledWith(4242, 'SIGKILL'), {
+              interval: 1
+            })
           } finally {
             fixture.proc._simulateExit(137)
             killFailure = await settled
diff --git a/src/main/daemon/pty-subprocess/shell-launch-plan.ts b/src/main/daemon/pty-subprocess/shell-launch-plan.ts
index e29fff5330ab..e3c1638ff1fe 100644
--- a/src/main/daemon/pty-subprocess/shell-launch-plan.ts
+++ b/src/main/daemon/pty-subprocess/shell-launch-plan.ts
@@ -34,6 +34,10 @@ import {
   type RecognizedAgentProcess
 } from '../../../shared/agent-process-recognition'
 import { ORCA_HERMES_STARTUP_QUERY_ENV } from '../../../shared/hermes-startup-query'
+import {
+  CLAUDE_INJECTED_CONFIG_DIR_ENV,
+  CLAUDE_PROFILE_POINTER_ENV
+} from '../../../shared/claude-profile-routing'
 import { WINDOWS_GIT_BASH_SHELL } from '../../../shared/windows-terminal-shell'
 import { getShellLaunchConfig, resolvePtyShellPath } from '../shell-ready'
 import { resolveWslSessionContext } from '../wsl-session-context'
@@ -169,8 +173,8 @@ export function createPtyShellLaunchPlan(
       if (env.CLAUDE_CONFIG_DIR) {
         addWslEnvKeys(env, ['CLAUDE_CONFIG_DIR'])
       }
-      if (env.ORCA_CLAUDE_PROFILE_POINTER) {
-        addWslEnvKeys(env, ['ORCA_CLAUDE_PROFILE_POINTER', 'ORCA_CLAUDE_INJECTED_CONFIG_DIR'])
+      if (env[CLAUDE_PROFILE_POINTER_ENV]) {
+        addWslEnvKeys(env, [CLAUDE_PROFILE_POINTER_ENV, CLAUDE_INJECTED_CONFIG_DIR_ENV])
       }
       if (env[ORCA_HERMES_STARTUP_QUERY_ENV] !== undefined) {
         addWslEnvKeys(env, [ORCA_HERMES_STARTUP_QUERY_ENV])
diff --git a/src/main/daemon/serialize-grid-cell-descriptors.ts b/src/main/daemon/serialize-grid-cell-descriptors.ts
index 9adbbc6c694c..9efc74221f72 100644
--- a/src/main/daemon/serialize-grid-cell-descriptors.ts
+++ b/src/main/daemon/serialize-grid-cell-descriptors.ts
@@ -132,6 +132,29 @@ function sameCellFields(expected: Cell, actual: Cell): boolean {
   )
 }
 
+// Match the frozen default-blank descriptor without formatting every trailing cell.
+function isDefaultBlank(line: BufferLine | undefined, x: number, scratch: Cell): boolean {
+  if (!line || x >= line.length) {
+    return true
+  }
+  const cell = line.getCell(x, scratch)
+  if (!cell) {
+    return true
+  }
+  const chars = cell.getChars()
+  return (
+    cell.getWidth() === 1 &&
+    cell.getBgColorMode() === 0 &&
+    cell.getBgColor() === -1 &&
+    cell.isInverse() === 0 &&
+    (chars === '' ||
+      (chars === ' ' &&
+        cell.isUnderline() === 0 &&
+        cell.isStrikethrough() === 0 &&
+        cell.isOverline() === 0))
+  )
+}
+
 function trimmedEnd(
   buffer: Buffer,
   start: number,
@@ -143,7 +166,7 @@ function trimmedEnd(
     const line = buffer.getLine(end - 1)
     let blank = true
     for (let x = 0; x < cols; x++) {
-      if (cellDescriptor(line, x, cols, scratch) !== DEFAULT_BLANK) {
+      if (!isDefaultBlank(line, x, scratch)) {
         blank = false
         break
       }
diff --git a/src/main/daemon/terminal-checkpoint-serializer.test.ts b/src/main/daemon/terminal-checkpoint-serializer.test.ts
index ca12dd1d9893..1308402ae4d3 100644
--- a/src/main/daemon/terminal-checkpoint-serializer.test.ts
+++ b/src/main/daemon/terminal-checkpoint-serializer.test.ts
@@ -92,29 +92,36 @@ describe('terminal checkpoint serializer', () => {
     expect(Buffer.byteLength(serialized, 'utf8')).toBeLessThanOrEqual(maxBytes)
   })
 
-  it('does not materialize and rescan a passing candidate', async () => {
+  it('keeps native conversion bounded without materializing the whole candidate', async () => {
     let reads = 0
     const input = snapshot()
     Object.defineProperty(input, 'snapshotAnsi', {
       enumerable: true,
       get: () => {
         reads += 1
-        return 'visible'
+        return 'visible'.repeat(20_000)
       }
     })
     const stringify = vi.spyOn(JSON, 'stringify')
     const byteLength = vi.spyOn(Buffer, 'byteLength')
 
     try {
-      await serializeTerminalCheckpointWithinLimit(input, metadata, 20 * 1024)
-
-      expect({
-        fullCandidateStringifies: stringify.mock.calls.filter(
-          ([value]) => typeof value === 'object' && value !== null
-        ).length,
-        byteLengthCalls: byteLength.mock.calls.length,
-        snapshotReads: reads
-      }).toEqual({ fullCandidateStringifies: 0, byteLengthCalls: 0, snapshotReads: 1 })
+      await serializeTerminalCheckpointWithinLimit(input, metadata, 200 * 1024)
+
+      expect(
+        stringify.mock.calls.some(([value]) => typeof value === 'object' && value !== null)
+      ).toBe(false)
+      for (const [value] of stringify.mock.calls) {
+        if (typeof value === 'string') {
+          expect(value.length).toBeLessThanOrEqual(64 * 1024)
+        }
+      }
+      for (const [value] of byteLength.mock.calls) {
+        if (typeof value === 'string') {
+          expect(value.length).toBeLessThanOrEqual(128 * 1024)
+        }
+      }
+      expect(reads).toBe(1)
     } finally {
       stringify.mockRestore()
       byteLength.mockRestore()
@@ -171,4 +178,53 @@ describe('terminal checkpoint serializer', () => {
       stringify.mockRestore()
     }
   })
+  it.each([16 * 1024 - 1, 16 * 1024])(
+    'preserves hardcoded control and surrogate JSON after %i code units',
+    async (prefixLength) => {
+      const prefix = 'x'.repeat(prefixLength)
+      const input = snapshot({
+        snapshotAnsi: `${prefix}😀\ud800x\udc00"\b\t\n\f\r\\\0`
+      })
+      const expectedPrefix =
+        `{"snapshotAnsi":"${prefix}😀\\ud800x\\udc00\\"\\b\\t\\n\\f\\r\\\\\\u0000",` +
+        '"scrollbackAnsi":""'
+      const serialized = await serializeTerminalCheckpointWithinLimit(input, metadata, 40 * 1024)
+      expect(serialized.startsWith(expectedPrefix)).toBe(true)
+      expect(JSON.parse(serialized).snapshotAnsi).toBe(input.snapshotAnsi)
+      const exactBytes = Buffer.byteLength(serialized, 'utf8')
+      await expect(
+        serializeTerminalCheckpointWithinLimit(input, metadata, exactBytes)
+      ).resolves.toBe(serialized)
+      const trimmed = await serializeTerminalCheckpointWithinLimit(input, metadata, exactBytes - 1)
+      expect(Buffer.byteLength(trimmed, 'utf8')).toBeLessThan(exactBytes)
+    }
+  )
+
+  it('rejects huge escaped metadata using bounded native conversions near the byte cap', async () => {
+    const stringify = vi.spyOn(JSON, 'stringify')
+    const byteLength = vi.spyOn(Buffer, 'byteLength')
+    try {
+      await expect(
+        serializeTerminalCheckpointWithinLimit(
+          snapshot(),
+          { ...metadata, cwd: String.fromCharCode(0).repeat(1_000_000) },
+          512
+        )
+      ).rejects.toThrow('Terminal checkpoint metadata exceeds byte limit')
+      for (const [value] of stringify.mock.calls) {
+        expect(typeof value === 'object' && value !== null).toBe(false)
+        if (typeof value === 'string') {
+          expect(value.length).toBeLessThanOrEqual(512)
+        }
+      }
+      for (const [value] of byteLength.mock.calls) {
+        if (typeof value === 'string') {
+          expect(value.length).toBeLessThanOrEqual(512 * 6)
+        }
+      }
+    } finally {
+      stringify.mockRestore()
+      byteLength.mockRestore()
+    }
+  })
 })
diff --git a/src/main/daemon/terminal-checkpoint-serializer.ts b/src/main/daemon/terminal-checkpoint-serializer.ts
index 8a686cf29f87..60ba778ef3ec 100644
--- a/src/main/daemon/terminal-checkpoint-serializer.ts
+++ b/src/main/daemon/terminal-checkpoint-serializer.ts
@@ -1,3 +1,4 @@
+import { clampToSafeSplitIndex } from './daemon-stream-data-split'
 import type { TerminalCheckpointFile, TerminalSnapshot } from './types'
 import { ColdRestoreReplayWriter } from './cold-restore-replay-writer'
 import { HeadlessEmulator } from './headless-emulator'
@@ -60,29 +61,12 @@ class BoundedJsonWriter {
     return true
   }
 
-  result(): string | null {
-    return this.exceeded ? null : this.output + this.chunk
+  remainingBytes(): number {
+    return this.maxBytes - this.bytes
   }
-}
 
-function escapedCodeUnit(codeUnit: number): string | null {
-  switch (codeUnit) {
-    case 0x08:
-      return '\\b'
-    case 0x09:
-      return '\\t'
-    case 0x0a:
-      return '\\n'
-    case 0x0c:
-      return '\\f'
-    case 0x0d:
-      return '\\r'
-    case 0x22:
-      return '\\"'
-    case 0x5c:
-      return '\\\\'
-    default:
-      return codeUnit < 0x20 ? `\\u${codeUnit.toString(16).padStart(4, '0')}` : null
+  result(): string | null {
+    return this.exceeded ? null : this.output + this.chunk
   }
 }
 
@@ -90,44 +74,17 @@ function appendJsonString(writer: BoundedJsonWriter, value: string): boolean {
   if (!writer.append('"', 1)) {
     return false
   }
-  let spanStart = 0
-  let spanBytes = 0
-  for (let index = 0; index < value.length; index += 1) {
-    const codeUnit = value.charCodeAt(index)
-    let escaped = escapedCodeUnit(codeUnit)
-    if (codeUnit >= 0xd800 && codeUnit <= 0xdbff) {
-      const next = value.charCodeAt(index + 1)
-      if (next >= 0xdc00 && next <= 0xdfff) {
-        spanBytes += 4
-        index += 1
-      } else {
-        escaped = `\\u${codeUnit.toString(16)}`
-      }
-    } else if (codeUnit >= 0xdc00 && codeUnit <= 0xdfff) {
-      escaped = `\\u${codeUnit.toString(16)}`
-    } else if (escaped === null) {
-      spanBytes += codeUnit < 0x80 ? 1 : codeUnit < 0x800 ? 2 : 3
-    }
-
-    if (escaped !== null) {
-      if (
-        (index > spanStart && !writer.append(value.slice(spanStart, index), spanBytes)) ||
-        !writer.append(escaped, escaped.length)
-      ) {
-        return false
-      }
-      spanStart = index + 1
-      spanBytes = 0
-    } else if (index + 1 - spanStart >= 16 * 1024) {
-      if (!writer.append(value.slice(spanStart, index + 1), spanBytes)) {
-        return false
-      }
-      spanStart = index + 1
-      spanBytes = 0
+  let start = 0
+  while (start < value.length) {
+    // Keep a surrogate pair together even when only one byte remains.
+    const remainingBytes = writer.remainingBytes()
+    const chunkLength = remainingBytes < 16 * 1024 ? Math.max(2, remainingBytes) : 16 * 1024
+    const end = clampToSafeSplitIndex(value, start, Math.min(value.length, start + chunkLength))
+    const json = JSON.stringify(value.slice(start, end)).slice(1, -1)
+    if (!writer.append(json, Buffer.byteLength(json, 'utf8'))) {
+      return false
     }
-  }
-  if (spanStart < value.length && !writer.append(value.slice(spanStart), spanBytes)) {
-    return false
+    start = end
   }
   return writer.append('"', 1)
 }
diff --git a/src/main/foreign-sqlite-readers/foreign-sqlite-reader-spawn.test.ts b/src/main/foreign-sqlite-readers/foreign-sqlite-reader-spawn.test.ts
new file mode 100644
index 000000000000..9b1c6fd63b4e
--- /dev/null
+++ b/src/main/foreign-sqlite-readers/foreign-sqlite-reader-spawn.test.ts
@@ -0,0 +1,90 @@
+import { mkdtempSync, mkdirSync, rmSync, writeFileSync } from 'node:fs'
+import * as fsPromises from 'node:fs/promises'
+import { tmpdir } from 'node:os'
+import { join } from 'node:path'
+import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest'
+
+vi.mock('node:fs/promises', { spy: true })
+
+const reads = vi.hoisted(() => ({
+  binder: vi.fn<() => Promise<unknown[]>>(),
+  client: vi.fn()
+}))
+
+vi.mock('./foreign-sqlite-reader-client', () => ({
+  ForeignSqliteReaderClient: class {
+    constructor() {
+      reads.client()
+    }
+
+    readOpenCodeBinderSessions = reads.binder
+  }
+}))
+
+import { readOpenCodeBinderSessions } from './foreign-sqlite-reader-spawn'
+
+const CURSOR = { ms: 0, id: '' }
+let root = ''
+
+beforeEach(() => {
+  root = mkdtempSync(join(tmpdir(), 'orca-binder-preflight-'))
+  reads.binder.mockReset().mockResolvedValue([])
+  reads.client.mockClear()
+})
+
+afterEach(() => {
+  vi.restoreAllMocks()
+  rmSync(root, { recursive: true, force: true })
+})
+
+describe('OpenCode binder worker admission', () => {
+  it.each(['ENOENT', 'ENOTDIR'])('does not dispatch a worker read for %s', async (code) => {
+    const parent = join(root, 'parent')
+    if (code === 'ENOTDIR') {
+      writeFileSync(parent, '')
+    }
+    const path = join(parent, 'opencode.db')
+
+    expect(await readOpenCodeBinderSessions(path, CURSOR)).toEqual([])
+    expect(await readOpenCodeBinderSessions(path, CURSOR)).toEqual([])
+    expect(reads.binder).not.toHaveBeenCalled()
+    expect(reads.client).not.toHaveBeenCalled()
+  })
+
+  it('dispatches once the previously absent database appears', async () => {
+    const path = join(root, 'later', 'opencode.db')
+    expect(await readOpenCodeBinderSessions(path, CURSOR)).toEqual([])
+    expect(reads.binder).not.toHaveBeenCalled()
+
+    mkdirSync(join(root, 'later'))
+    writeFileSync(path, '')
+    const rows = [{ id: 'session', directory: root, createdAtMs: 1, parentId: null }]
+    reads.binder.mockResolvedValue(rows)
+
+    expect(await readOpenCodeBinderSessions(path, CURSOR)).toEqual(rows)
+    expect(reads.binder).toHaveBeenCalledExactlyOnceWith(path, CURSOR)
+  })
+
+  it.each(['EACCES', 'EIO'])(
+    'leaves %s failures to the existing worker error handling',
+    async (code) => {
+      const path = join(root, 'opencode.db')
+      vi.mocked(fsPromises.stat).mockRejectedValueOnce(Object.assign(new Error(code), { code }))
+
+      expect(await readOpenCodeBinderSessions(path, CURSOR)).toEqual([])
+      expect(reads.binder).toHaveBeenCalledExactlyOnceWith(path, CURSOR)
+    }
+  )
+
+  it('keeps the worker result authoritative when the database changes after the preflight', async () => {
+    const path = join(root, 'opencode.db')
+    writeFileSync(path, '')
+    reads.binder.mockImplementation(async () => {
+      rmSync(path)
+      return []
+    })
+
+    expect(await readOpenCodeBinderSessions(path, CURSOR)).toEqual([])
+    expect(reads.binder).toHaveBeenCalledExactlyOnceWith(path, CURSOR)
+  })
+})
diff --git a/src/main/foreign-sqlite-readers/foreign-sqlite-reader-spawn.ts b/src/main/foreign-sqlite-readers/foreign-sqlite-reader-spawn.ts
index de4654d1160c..043a317130d8 100644
--- a/src/main/foreign-sqlite-readers/foreign-sqlite-reader-spawn.ts
+++ b/src/main/foreign-sqlite-readers/foreign-sqlite-reader-spawn.ts
@@ -1,4 +1,5 @@
 import { existsSync } from 'node:fs'
+import { stat } from 'node:fs/promises'
 import { Worker } from 'node:worker_threads'
 import { currentWorkerEntryLayout } from '../worker-thread-entry-path'
 import type { CursorDesktopProfileReadResult } from './cursor-profile-result'
@@ -40,9 +41,22 @@ export function readCursorDesktopProfile(dbPath: string): Promise<CursorDesktopP
  * @param cursor - Store position the binder has handled up to.
  * @returns Rows oldest first; `[]` when the store or the worker cannot answer.
  */
-export function readOpenCodeBinderSessions(
+export async function readOpenCodeBinderSessions(
   dbPath: string,
   cursor: OpenCodeSessionCursor
 ): Promise<BinderSessionRow[]> {
+  try {
+    // Missing stores must not keep an otherwise unused reader worker alive on every binder poll.
+    await stat(dbPath)
+  } catch (error) {
+    if (
+      error instanceof Error &&
+      'code' in error &&
+      (error.code === 'ENOENT' || error.code === 'ENOTDIR')
+    ) {
+      return []
+    }
+    // The worker still owns reporting other failures and checking for changes after this probe.
+  }
   return getSharedClient().readOpenCodeBinderSessions(dbPath, cursor)
 }
diff --git a/src/main/github/client-create-pr.test.ts b/src/main/github/client-create-pr.test.ts
index 82a02b295754..f2b9dc39ad16 100644
--- a/src/main/github/client-create-pr.test.ts
+++ b/src/main/github/client-create-pr.test.ts
@@ -61,7 +61,7 @@ vi.mock('./github-enterprise-repository', () => ({
   isGitHubHostAuthenticated: vi.fn().mockResolvedValue(true)
 }))
 
-import { createGitHubPullRequest } from './client'
+import { createGitHubPullRequest } from './client/create/create-github-pull-request'
 
 import { _resetOriginGitHubApiRepositoryCache } from './github-api-repository'
 
diff --git a/src/main/github/client-file-viewed.test.ts b/src/main/github/client-file-viewed.test.ts
index a52a479e9f59..ba0a7fb291cf 100644
--- a/src/main/github/client-file-viewed.test.ts
+++ b/src/main/github/client-file-viewed.test.ts
@@ -53,7 +53,7 @@ vi.mock('./github-enterprise-repository', () => ({
   isGitHubHostAuthenticated: vi.fn().mockResolvedValue(true)
 }))
 
-import { setPRFileViewed } from './client'
+import { setPRFileViewed } from './client/update/pr-file-viewed'
 
 import { _resetOriginGitHubApiRepositoryCache } from './github-api-repository'
 
diff --git a/src/main/github/client-issue-origin-preference.test.ts b/src/main/github/client-issue-origin-preference.test.ts
index 951962a3c255..d2e7317abe6c 100644
--- a/src/main/github/client-issue-origin-preference.test.ts
+++ b/src/main/github/client-issue-origin-preference.test.ts
@@ -85,7 +85,8 @@ vi.mock('./github-api-repository', async (importOriginal) => {
   }
 })
 
-import { getWorkItem, _resetOwnerRepoCache } from './client'
+import { getWorkItem } from './client/fetch/get-work-item'
+import { _resetOwnerRepoCache } from './gh-utils'
 
 describe('GitHub issue open-by-number origin preference', () => {
   beforeEach(() => {
diff --git a/src/main/github/client-issue-source.test.ts b/src/main/github/client-issue-source.test.ts
index a4f8b6468314..57ad87387e2a 100644
--- a/src/main/github/client-issue-source.test.ts
+++ b/src/main/github/client-issue-source.test.ts
@@ -92,7 +92,10 @@ vi.mock('./github-api-repository', async (importOriginal) => {
   }
 })
 
-import { countWorkItems, getWorkItem, listWorkItems, _resetOwnerRepoCache } from './client'
+import { countWorkItems } from './client/list/count-work-items'
+import { getWorkItem } from './client/fetch/get-work-item'
+import { listWorkItems } from './client/list/list-work-items'
+import { _resetOwnerRepoCache } from './gh-utils'
 
 const PR_LIST_FIELDS =
   'number,title,state,url,labels,updatedAt,author,isDraft,headRefName,baseRefName,headRefOid,headRepositoryOwner,reviewRequests'
diff --git a/src/main/github/client-merge-queue-auto-merge.test.ts b/src/main/github/client-merge-queue-auto-merge.test.ts
index d099408d022f..b6fe0d535d50 100644
--- a/src/main/github/client-merge-queue-auto-merge.test.ts
+++ b/src/main/github/client-merge-queue-auto-merge.test.ts
@@ -26,15 +26,13 @@ vi.mock('./github-api-repository', async (importOriginal) =>
   )
 )
 
-import {
-  getPRForBranch,
-  getWorkItemByOwnerRepo,
-  mergePR,
-  resolveReviewThread,
-  setPRAutoMerge,
-  updatePRTitle,
-  _getMergeQueueCacheSizeForTests
-} from './client'
+import { getPRForBranch } from './client/lookup/get-pr-for-branch'
+import { getWorkItemByOwnerRepo } from './client/fetch/get-work-item'
+import { mergePR } from './client/merge/merge-pr'
+import { resolveReviewThread } from './client/update/resolve-review-thread'
+import { setPRAutoMerge } from './client/merge/pr-auto-merge'
+import { updatePRTitle } from './client/update/pr-details'
+import { _getMergeQueueCacheSizeForTests } from './client/detect/repository-merge-metadata-cache'
 import { resetGraphQLRateLimitGuardMocks } from './client-test-harness'
 
 const {
diff --git a/src/main/github/client-merged-pr-visibility.test.ts b/src/main/github/client-merged-pr-visibility.test.ts
index 22501ec97350..e24c903b8914 100644
--- a/src/main/github/client-merged-pr-visibility.test.ts
+++ b/src/main/github/client-merged-pr-visibility.test.ts
@@ -26,7 +26,8 @@ vi.mock('./github-api-repository', async (importOriginal) =>
   )
 )
 
-import { getPRForBranchOutcome, getPRForBranch } from './client'
+import { getPRForBranchOutcome } from './client/lookup/pr-for-branch-outcome'
+import { getPRForBranch } from './client/lookup/get-pr-for-branch'
 import { resetPRForBranchMocks } from './client-test-harness'
 
 const {
diff --git a/src/main/github/client-pr-branch-discovery.test.ts b/src/main/github/client-pr-branch-discovery.test.ts
index 2e89ecfa45e0..82167d8bdda0 100644
--- a/src/main/github/client-pr-branch-discovery.test.ts
+++ b/src/main/github/client-pr-branch-discovery.test.ts
@@ -26,7 +26,7 @@ vi.mock('./github-api-repository', async (importOriginal) =>
   )
 )
 
-import { getPRForBranch } from './client'
+import { getPRForBranch } from './client/lookup/get-pr-for-branch'
 import { resetPRForBranchMocks } from './client-test-harness'
 
 const {
diff --git a/src/main/github/client-pr-check-details.test.ts b/src/main/github/client-pr-check-details.test.ts
index 4bb2fcbae762..e411e960e949 100644
--- a/src/main/github/client-pr-check-details.test.ts
+++ b/src/main/github/client-pr-check-details.test.ts
@@ -50,7 +50,8 @@ vi.mock('./rate-limit', () => ({
   spendsSharedGitHubComQuota: vi.fn(() => true)
 }))
 
-import { getPRCheckDetails, _resetOwnerRepoCache } from './client'
+import { getPRCheckDetails } from './client/check/get-pr-check-details'
+import { _resetOwnerRepoCache } from './gh-utils'
 
 describe('getPRCheckDetails', () => {
   beforeEach(() => {
diff --git a/src/main/github/client-pr-checks.test.ts b/src/main/github/client-pr-checks.test.ts
index a9732cacf214..aa8b31a476cd 100644
--- a/src/main/github/client-pr-checks.test.ts
+++ b/src/main/github/client-pr-checks.test.ts
@@ -84,7 +84,9 @@ vi.mock('./rate-limit', () => ({
   spendsSharedGitHubComQuota: spendsSharedGitHubComQuotaMock
 }))
 
-import { getPRChecks, rerunPRChecks, _resetOwnerRepoCache } from './client'
+import { getPRChecks } from './client/check/get-pr-checks'
+import { rerunPRChecks } from './client/check/rerun-pr-checks'
+import { _resetOwnerRepoCache } from './gh-utils'
 
 import { _resetOriginGitHubApiRepositoryCache } from './github-api-repository'
 
diff --git a/src/main/github/client-pr-comment-reactions.test.ts b/src/main/github/client-pr-comment-reactions.test.ts
index f2792c7922a6..4123dbc94a86 100644
--- a/src/main/github/client-pr-comment-reactions.test.ts
+++ b/src/main/github/client-pr-comment-reactions.test.ts
@@ -26,7 +26,8 @@ vi.mock('./github-api-repository', async (importOriginal) =>
   )
 )
 
-import { getPRComments, setPRCommentReaction } from './client'
+import { getPRComments } from './client/fetch/get-pr-comments'
+import { setPRCommentReaction } from './client/update/pr-comment-reaction'
 import { resetGraphQLRateLimitGuardMocks } from './client-test-harness'
 import type { RateLimitGuardResult } from './client-test-mocks'
 
diff --git a/src/main/github/client-pr-conflict-summary.test.ts b/src/main/github/client-pr-conflict-summary.test.ts
index a71939112743..2df6b81b6099 100644
--- a/src/main/github/client-pr-conflict-summary.test.ts
+++ b/src/main/github/client-pr-conflict-summary.test.ts
@@ -26,7 +26,7 @@ vi.mock('./github-api-repository', async (importOriginal) =>
   )
 )
 
-import { getPRForBranch } from './client'
+import { getPRForBranch } from './client/lookup/get-pr-for-branch'
 import { resetPRForBranchMocks } from './client-test-harness'
 
 const {
diff --git a/src/main/github/client-pr-fallback-number.test.ts b/src/main/github/client-pr-fallback-number.test.ts
index 59245e377562..2c63f4ddc016 100644
--- a/src/main/github/client-pr-fallback-number.test.ts
+++ b/src/main/github/client-pr-fallback-number.test.ts
@@ -26,7 +26,8 @@ vi.mock('./github-api-repository', async (importOriginal) =>
   )
 )
 
-import { getPRForBranchOutcome, getPRForBranch } from './client'
+import { getPRForBranchOutcome } from './client/lookup/pr-for-branch-outcome'
+import { getPRForBranch } from './client/lookup/get-pr-for-branch'
 import { resetPRForBranchMocks } from './client-test-harness'
 
 const {
diff --git a/src/main/github/client-pr-linked-lookup.test.ts b/src/main/github/client-pr-linked-lookup.test.ts
index e4965ee0cb98..36b2d0df0ca1 100644
--- a/src/main/github/client-pr-linked-lookup.test.ts
+++ b/src/main/github/client-pr-linked-lookup.test.ts
@@ -26,7 +26,7 @@ vi.mock('./github-api-repository', async (importOriginal) =>
   )
 )
 
-import { getPRForBranch } from './client'
+import { getPRForBranch } from './client/lookup/get-pr-for-branch'
 import { resetPRForBranchMocks } from './client-test-harness'
 
 const {
diff --git a/src/main/github/client-pr-push-target.test.ts b/src/main/github/client-pr-push-target.test.ts
index 36fd97823f3b..210cfbf6d518 100644
--- a/src/main/github/client-pr-push-target.test.ts
+++ b/src/main/github/client-pr-push-target.test.ts
@@ -26,7 +26,9 @@ vi.mock('./github-api-repository', async (importOriginal) =>
   )
 )
 
-import { getRepoSlug, getRepoUpstream, getWorkItem, getPullRequestPushTarget } from './client'
+import { getRepoSlug, getRepoUpstream } from './client/fetch/repo-slug-upstream'
+import { getWorkItem } from './client/fetch/get-work-item'
+import { getPullRequestPushTarget } from './client/lookup/pull-request-push-target'
 import { resetPRForBranchMocks } from './client-test-harness'
 
 const {
diff --git a/src/main/github/client-pr-state.test.ts b/src/main/github/client-pr-state.test.ts
index 8ca2cd85b754..3522d3022067 100644
--- a/src/main/github/client-pr-state.test.ts
+++ b/src/main/github/client-pr-state.test.ts
@@ -26,7 +26,9 @@ vi.mock('./github-api-repository', async (importOriginal) =>
   )
 )
 
-import { markPRReadyForReview, updatePRState, _resetOwnerRepoCache } from './client'
+import { markPRReadyForReview } from './client/update/pr-ready'
+import { updatePRState } from './client/update/pr-state'
+import { _resetOwnerRepoCache } from './gh-utils'
 import { resetOriginRepositoryCache } from './client-test-harness'
 
 const {
diff --git a/src/main/github/client-rate-limit-block.test.ts b/src/main/github/client-rate-limit-block.test.ts
index 969cc16af952..a5070fbb4ba5 100644
--- a/src/main/github/client-rate-limit-block.test.ts
+++ b/src/main/github/client-rate-limit-block.test.ts
@@ -26,7 +26,8 @@ vi.mock('./github-api-repository', async (importOriginal) =>
   )
 )
 
-import { getGitHubPRLookupRateLimitBlock, _resetOwnerRepoCache } from './client'
+import { getGitHubPRLookupRateLimitBlock } from './client/lookup/pr-lookup-rate-limit'
+import { _resetOwnerRepoCache } from './gh-utils'
 import { resetOriginRepositoryCache } from './client-test-harness'
 import type { RateLimitGuardResult } from './client-test-mocks'
 
diff --git a/src/main/github/client-ssh-provider-execution-boundary.test.ts b/src/main/github/client-ssh-provider-execution-boundary.test.ts
index 1f9bb1b17046..c42e3dc3f5cb 100644
--- a/src/main/github/client-ssh-provider-execution-boundary.test.ts
+++ b/src/main/github/client-ssh-provider-execution-boundary.test.ts
@@ -26,7 +26,8 @@ vi.mock('./github-api-repository', async (importOriginal) =>
   )
 )
 
-import { getPRForBranch, getPRForBranchOutcome } from './client'
+import { getPRForBranch } from './client/lookup/get-pr-for-branch'
+import { getPRForBranchOutcome } from './client/lookup/pr-for-branch-outcome'
 import { resetPRForBranchMocks } from './client-test-harness'
 
 const {
diff --git a/src/main/github/client-stack-merge-guard.test.ts b/src/main/github/client-stack-merge-guard.test.ts
index c47f786d2edb..ce2cdc540f37 100644
--- a/src/main/github/client-stack-merge-guard.test.ts
+++ b/src/main/github/client-stack-merge-guard.test.ts
@@ -26,7 +26,8 @@ vi.mock('./github-api-repository', async (importOriginal) =>
   )
 )
 
-import { getPRForBranch, mergePR } from './client'
+import { getPRForBranch } from './client/lookup/get-pr-for-branch'
+import { mergePR } from './client/merge/merge-pr'
 import { resetGraphQLRateLimitGuardMocks } from './client-test-harness'
 
 const { ghExecFileAsyncMock, getOwnerRepoMock, acquireMock, releaseMock } = clientMocks
diff --git a/src/main/github/client-starred.test.ts b/src/main/github/client-starred.test.ts
index 2997aef883a2..48a7f2d284ef 100644
--- a/src/main/github/client-starred.test.ts
+++ b/src/main/github/client-starred.test.ts
@@ -26,7 +26,7 @@ vi.mock('./github-api-repository', async (importOriginal) =>
   )
 )
 
-import { __resetOrcaStarCheckForTests, checkOrcaStarred, starOrca } from './client'
+import { __resetOrcaStarCheckForTests, checkOrcaStarred, starOrca } from './client/fetch/orca-star'
 import { resetOriginRepositoryCache } from './client-test-harness'
 
 const { execFileAsyncMock, ghExecFileAsyncMock, acquireMock, releaseMock } = clientMocks
diff --git a/src/main/github/client-test-harness.ts b/src/main/github/client-test-harness.ts
index 1f16338a5ab5..645c4f8a0c55 100644
--- a/src/main/github/client-test-harness.ts
+++ b/src/main/github/client-test-harness.ts
@@ -1,10 +1,8 @@
 import type { GitHubClientMocks } from './client-test-mocks'
-import {
-  _resetOwnerRepoCache,
-  _resetMergeQueueCacheForTests,
-  _resetPRStackSummaryCacheForTests,
-  __resetTrackedUpstreamBranchCacheForTests
-} from './client'
+import { _resetOwnerRepoCache } from './gh-utils'
+import { _resetMergeQueueCacheForTests } from './client/detect/repository-merge-metadata-cache'
+import { _resetPRStackSummaryCacheForTests } from './client/lookup/pr-stack-summary-cache'
+import { __resetTrackedUpstreamBranchCacheForTests } from './client/lookup/tracked-upstream-cache'
 import { __resetPRConflictSummaryCachesForTests } from './conflict-summary'
 import { resetMergedPRCommitMembershipCacheForTest } from './merged-pr-commit-membership'
 import { __resetRepoDefaultBranchCacheForTests } from '../source-control/repo-default-branch'
@@ -88,5 +86,6 @@ export function resetGraphQLRateLimitGuardMocks(mocks: GitHubClientMocks): void
   mocks.acquireMock.mockResolvedValue(undefined)
   _resetOwnerRepoCache()
   _resetMergeQueueCacheForTests()
+  _resetPRStackSummaryCacheForTests()
   __resetPRConflictSummaryCachesForTests()
 }
diff --git a/src/main/github/client-tracked-upstream-fork-owner.test.ts b/src/main/github/client-tracked-upstream-fork-owner.test.ts
index eb1237394358..ee967202c7da 100644
--- a/src/main/github/client-tracked-upstream-fork-owner.test.ts
+++ b/src/main/github/client-tracked-upstream-fork-owner.test.ts
@@ -26,7 +26,7 @@ vi.mock('./github-api-repository', async (importOriginal) =>
   )
 )
 
-import { getPRForBranch } from './client'
+import { getPRForBranch } from './client/lookup/get-pr-for-branch'
 import { resetPRForBranchMocks } from './client-test-harness'
 
 const {
diff --git a/src/main/github/client-tracked-upstream-snapshot.test.ts b/src/main/github/client-tracked-upstream-snapshot.test.ts
index 6bcf5dd93830..1eb2200415d2 100644
--- a/src/main/github/client-tracked-upstream-snapshot.test.ts
+++ b/src/main/github/client-tracked-upstream-snapshot.test.ts
@@ -26,11 +26,11 @@ vi.mock('./github-api-repository', async (importOriginal) =>
   )
 )
 
+import { getPRForBranch } from './client/lookup/get-pr-for-branch'
 import {
-  getPRForBranch,
   _getTrackedUpstreamBranchCacheSizesForTests,
   __resetTrackedUpstreamBranchCacheForTests
-} from './client'
+} from './client/lookup/tracked-upstream-cache'
 import { resetPRForBranchMocks } from './client-test-harness'
 
 const {
diff --git a/src/main/github/client-work-item-check-summary.test.ts b/src/main/github/client-work-item-check-summary.test.ts
index 2543fa3a2881..bdcb1cd5866d 100644
--- a/src/main/github/client-work-item-check-summary.test.ts
+++ b/src/main/github/client-work-item-check-summary.test.ts
@@ -47,7 +47,9 @@ vi.mock('./rate-limit', () => ({
   spendsSharedGitHubComQuota: vi.fn(() => true)
 }))
 
-import { getWorkItem, _resetMergeQueueCacheForTests, _resetOwnerRepoCache } from './client'
+import { getWorkItem } from './client/fetch/get-work-item'
+import { _resetMergeQueueCacheForTests } from './client/detect/repository-merge-metadata-cache'
+import { _resetOwnerRepoCache } from './gh-utils'
 import { _resetOriginGitHubApiRepositoryCache } from './github-api-repository'
 
 // Why: only `pr view` is fixtured; the merge-metadata fan-out is best-effort and must not mask the summary.
diff --git a/src/main/github/client-work-items-query-paging.test.ts b/src/main/github/client-work-items-query-paging.test.ts
index 6ff7ace0cc96..eb8237586efb 100644
--- a/src/main/github/client-work-items-query-paging.test.ts
+++ b/src/main/github/client-work-items-query-paging.test.ts
@@ -115,12 +115,10 @@ vi.mock('./github-api-repository', async (importOriginal) => {
   }
 })
 
-import {
-  countWorkItems,
-  listWorkItems,
-  _resetMergeQueueCacheForTests,
-  _resetOwnerRepoCache
-} from './client'
+import { countWorkItems } from './client/list/count-work-items'
+import { listWorkItems } from './client/list/list-work-items'
+import { _resetMergeQueueCacheForTests } from './client/detect/repository-merge-metadata-cache'
+import { _resetOwnerRepoCache } from './gh-utils'
 import { GITHUB_WORK_ITEMS_QUERY_MAX_BYTES } from '../../shared/github/work-items-query-bounds'
 
 import { _resetOriginGitHubApiRepositoryCache } from './github-api-repository'
diff --git a/src/main/github/client-work-items.test.ts b/src/main/github/client-work-items.test.ts
index 318784097684..f49738d6a562 100644
--- a/src/main/github/client-work-items.test.ts
+++ b/src/main/github/client-work-items.test.ts
@@ -109,12 +109,10 @@ vi.mock('./github-api-repository', async (importOriginal) => {
   }
 })
 
-import {
-  countWorkItems,
-  listWorkItems,
-  _resetMergeQueueCacheForTests,
-  _resetOwnerRepoCache
-} from './client'
+import { countWorkItems } from './client/list/count-work-items'
+import { listWorkItems } from './client/list/list-work-items'
+import { _resetMergeQueueCacheForTests } from './client/detect/repository-merge-metadata-cache'
+import { _resetOwnerRepoCache } from './gh-utils'
 import { GITHUB_WORK_ITEMS_QUERY_MAX_BYTES } from '../../shared/github/work-items-query-bounds'
 import { _resetRemoteNameListingCache } from '../git/remote-name-listing'
 
diff --git a/src/main/github/default-branch-stale-pr.test.ts b/src/main/github/default-branch-stale-pr.test.ts
index 8facc4867f03..c4faa88a5289 100644
--- a/src/main/github/default-branch-stale-pr.test.ts
+++ b/src/main/github/default-branch-stale-pr.test.ts
@@ -122,13 +122,11 @@ vi.mock('./rate-limit', () => ({
   noteRepositoryRateLimitSpend: noteRepositoryRateLimitSpendMock
 }))
 
-import {
-  getPRForBranch,
-  getPRForBranchOutcome,
-  _resetOwnerRepoCache,
-  _resetMergeQueueCacheForTests,
-  __resetTrackedUpstreamBranchCacheForTests
-} from './client'
+import { getPRForBranch } from './client/lookup/get-pr-for-branch'
+import { getPRForBranchOutcome } from './client/lookup/pr-for-branch-outcome'
+import { _resetOwnerRepoCache } from './gh-utils'
+import { _resetMergeQueueCacheForTests } from './client/detect/repository-merge-metadata-cache'
+import { __resetTrackedUpstreamBranchCacheForTests } from './client/lookup/tracked-upstream-cache'
 import { __resetPRConflictSummaryCachesForTests } from './conflict-summary'
 import { resetMergedPRCommitMembershipCacheForTest } from './merged-pr-commit-membership'
 import { __resetRepoDefaultBranchCacheForTests } from '../source-control/repo-default-branch'
diff --git a/src/main/github/github-repository-identity.fork-owner-repo.test.ts b/src/main/github/github-repository-identity.fork-owner-repo.test.ts
index 9c6f2a21159a..4eef43a27af1 100644
--- a/src/main/github/github-repository-identity.fork-owner-repo.test.ts
+++ b/src/main/github/github-repository-identity.fork-owner-repo.test.ts
@@ -31,7 +31,7 @@ vi.mock('./local-git-config-signature', () => ({
 import { _resetRemoteNameListingCache } from '../git/remote-name-listing'
 import { getOwnerRepoForRemote, _resetOwnerRepoCache } from './github-repository-identity'
 import { getOwnerRepo } from './github-owner-repo-selection'
-import { getRepoUpstream } from './client'
+import { getRepoUpstream } from './client/fetch/repo-slug-upstream'
 
 const FORK_PATH = '/tmp/fork-checkout'
 const NON_FORK_PATH = '/tmp/plain-checkout'
diff --git a/src/main/ipc/agent-session-attachment-upload-ipc.ts b/src/main/ipc/agent-session-attachment-upload-ipc.ts
new file mode 100644
index 000000000000..9fcf1ba357d5
--- /dev/null
+++ b/src/main/ipc/agent-session-attachment-upload-ipc.ts
@@ -0,0 +1,36 @@
+import { app, ipcMain } from 'electron'
+import type {
+  AgentSessionAttachmentPathUploadResult,
+  AgentSessionAttachmentUploadTarget
+} from '../../shared/agent-session-attachments'
+import { resolveEnvironment } from '../../shared/runtime-environment-store'
+import { uploadExternalPathsToAgentSessionAttachments } from './agent-session-attachment-upload'
+import { abortWhenRendererGone } from './renderer-lifetime-abort'
+
+export function registerAgentSessionAttachmentUploadHandlers(): void {
+  ipcMain.handle(
+    'fs:uploadPathsToAgentSessionAttachments',
+    async (
+      event,
+      args: AgentSessionAttachmentUploadTarget & { paths: string[] }
+    ): Promise<AgentSessionAttachmentPathUploadResult> => {
+      const userDataPath = app.getPath('userData')
+      // Why: a reload or close must stop the transfer; the server sweeps the part file it leaves.
+      const lifetime = abortWhenRendererGone(event.sender)
+      try {
+        return await uploadExternalPathsToAgentSessionAttachments(
+          {
+            ...args,
+            // The manual-disconnect check keys on the resolved id, not whatever selector came in.
+            environmentId: resolveEnvironment(userDataPath, args.environmentId).id,
+            userDataPath,
+            signal: lifetime.signal
+          },
+          args.paths
+        )
+      } finally {
+        lifetime.dispose()
+      }
+    }
+  )
+}
diff --git a/src/main/ipc/agent-session-attachment-upload.test.ts b/src/main/ipc/agent-session-attachment-upload.test.ts
new file mode 100644
index 000000000000..80300d92674e
--- /dev/null
+++ b/src/main/ipc/agent-session-attachment-upload.test.ts
@@ -0,0 +1,166 @@
+import { mkdir, mkdtemp, readFile, rm, symlink, 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 { AgentSessionAttachmentStore } from '../native-chat/agent-session-attachments/agent-session-attachment-store'
+
+type CallOptions = { expectedEnvironmentRuntimeId?: string; signal?: AbortSignal }
+type Call = {
+  method: string
+  params: Record<string, unknown>
+  revision?: number
+  options?: CallOptions
+}
+
+const calls: Call[] = []
+let serverStore: AgentSessionAttachmentStore
+let failMethod: string | null = null
+
+// The paired server, played by a real store: every call answers as the RPC handler would.
+vi.mock('./runtime-environment-transport-routing', () => ({
+  callRuntimeEnvironment: async (
+    _userDataPath: string,
+    _environmentId: string,
+    method: string,
+    params: Record<string, unknown>,
+    _timeoutMs?: number,
+    revision?: number,
+    _envelope?: unknown,
+    options?: CallOptions
+  ) => {
+    calls.push({ method, params, revision, options })
+    if (method === failMethod) {
+      return { ok: false, error: { code: 'internal', message: `${method} failed` } }
+    }
+    const callerKey = 'client-a'
+    const uploadId = String(params.uploadId)
+    try {
+      const result =
+        method === 'agentSessionAttachment.uploadStart'
+          ? await serverStore.startUpload({
+              callerKey,
+              sessionId: String(params.sessionId),
+              name: String(params.name),
+              byteLength: Number(params.byteLength)
+            })
+          : method === 'agentSessionAttachment.uploadAppend'
+            ? await serverStore.appendChunk({
+                callerKey,
+                uploadId,
+                offset: Number(params.offset),
+                contentBase64: String(params.contentBase64)
+              })
+            : method === 'agentSessionAttachment.uploadCommit'
+              ? await serverStore.commitUpload({ callerKey, uploadId })
+              : await serverStore.abortUpload({ callerKey, uploadId })
+      return { ok: true, result }
+    } catch (error) {
+      const message = error instanceof Error ? error.message : String(error)
+      return { ok: false, error: { code: 'internal', message } }
+    }
+  }
+}))
+
+const { uploadBufferToAgentSessionAttachments, uploadExternalPathsToAgentSessionAttachments } =
+  await import('./agent-session-attachment-upload')
+
+let workDir: string
+const context = () => ({
+  environmentId: 'env-1',
+  sessionId: 'session-1',
+  expectedEnvironmentPairingRevision: 7,
+  expectedEnvironmentRuntimeId: 'runtime-a',
+  userDataPath: join(workDir, 'client-user-data')
+})
+
+beforeEach(async () => {
+  workDir = await mkdtemp(join(tmpdir(), 'orca-attachment-upload-'))
+  serverStore = new AgentSessionAttachmentStore(
+    join(workDir, 'server', 'agent-session-attachments'),
+    { hasSession: () => true }
+  )
+  calls.length = 0
+  failMethod = null
+})
+
+afterEach(async () => {
+  serverStore.clearInFlightForTests()
+  await rm(workDir, { recursive: true, force: true })
+})
+
+describe('uploadExternalPathsToAgentSessionAttachments', () => {
+  it('uploads dropped files in order and returns only server paths', async () => {
+    const big = Buffer.alloc(1024 * 1024, 7)
+    await writeFile(join(workDir, 'big.bin'), big)
+    await writeFile(join(workDir, 'notes.md'), '# hi')
+
+    const result = await uploadExternalPathsToAgentSessionAttachments(context(), [
+      join(workDir, 'big.bin'),
+      join(workDir, 'notes.md')
+    ])
+
+    expect(result.skipped).toEqual([])
+    expect(result.failed).toEqual([])
+    expect(result.uploaded.map(({ sourcePath }) => sourcePath)).toEqual([
+      join(workDir, 'big.bin'),
+      join(workDir, 'notes.md')
+    ])
+    for (const { path } of result.uploaded) {
+      expect(path.startsWith(serverStore.rootDir)).toBe(true)
+    }
+    expect(await readFile(result.uploaded[0].path)).toEqual(big)
+    expect(await readFile(result.uploaded[1].path, 'utf8')).toBe('# hi')
+  })
+
+  it('pins every call to the pairing and every call to the server process', async () => {
+    await writeFile(join(workDir, 'a.txt'), 'a')
+    await uploadExternalPathsToAgentSessionAttachments(context(), [join(workDir, 'a.txt')])
+    expect(calls.map((call) => call.method)).toEqual([
+      'agentSessionAttachment.uploadStart',
+      'agentSessionAttachment.uploadAppend',
+      'agentSessionAttachment.uploadCommit'
+    ])
+    for (const call of calls) {
+      expect(call.revision).toBe(7)
+      expect(call.options?.expectedEnvironmentRuntimeId).toBe('runtime-a')
+    }
+  })
+
+  it('skips a folder as unsupported without walking into it', async () => {
+    await mkdir(join(workDir, 'folder', 'nested'), { recursive: true })
+    await writeFile(join(workDir, 'folder', 'inside.txt'), 'x')
+    // A link inside would make the stager skip the folder as a symlink: never reached.
+    await symlink(join(workDir, 'folder', 'inside.txt'), join(workDir, 'folder', 'nested', 'link'))
+    const result = await uploadExternalPathsToAgentSessionAttachments(context(), [
+      join(workDir, 'folder')
+    ])
+    expect(result.skipped).toEqual([{ sourcePath: join(workDir, 'folder'), reason: 'unsupported' }])
+    expect(calls).toEqual([])
+  })
+
+  it('aborts a failed upload on the server and reports the file as failed', async () => {
+    await writeFile(join(workDir, 'a.txt'), 'a')
+    failMethod = 'agentSessionAttachment.uploadCommit'
+    const result = await uploadExternalPathsToAgentSessionAttachments(context(), [
+      join(workDir, 'a.txt')
+    ])
+    expect(result.uploaded).toEqual([])
+    expect(result.failed).toEqual([
+      { sourcePath: join(workDir, 'a.txt'), reason: 'agentSessionAttachment.uploadCommit failed' }
+    ])
+    expect(calls.at(-1)?.method).toBe('agentSessionAttachment.uploadAbort')
+  })
+})
+
+describe('uploadBufferToAgentSessionAttachments', () => {
+  it('stores a pasted image under the chat', async () => {
+    const png = Buffer.alloc(900 * 1024, 3)
+    const stored = await uploadBufferToAgentSessionAttachments(context(), 'orca-paste-1.png', png)
+    expect(stored.name).toBe('orca-paste-1.png')
+    expect(await readFile(stored.path)).toEqual(png)
+    // 900 KiB in 384 KiB slices.
+    expect(
+      calls.filter((call) => call.method === 'agentSessionAttachment.uploadAppend')
+    ).toHaveLength(3)
+  })
+})
diff --git a/src/main/ipc/agent-session-attachment-upload.ts b/src/main/ipc/agent-session-attachment-upload.ts
new file mode 100644
index 000000000000..258c5d355d9a
--- /dev/null
+++ b/src/main/ipc/agent-session-attachment-upload.ts
@@ -0,0 +1,216 @@
+// Client side of chat attachments on a paired server: main owns the file handles, the clipboard and
+// the runtime socket, so it pumps the bytes into the server's attachment store and hands the
+// renderer only the server path.
+
+import { randomUUID } from 'node:crypto'
+import { lstat } from 'node:fs/promises'
+import { basename } from 'node:path'
+import {
+  AGENT_SESSION_ATTACHMENT_CHUNK_BYTES,
+  AGENT_SESSION_ATTACHMENT_MAX_BYTES,
+  agentSessionPastedImageName,
+  type AgentSessionAttachmentClipboardTarget,
+  type AgentSessionAttachmentPathUploadResult,
+  type AgentSessionAttachmentUploadCommitResult,
+  type AgentSessionAttachmentUploadStartResult,
+  type AgentSessionAttachmentUploadTarget
+} from '../../shared/agent-session-attachments'
+import { resolveEnvironment } from '../../shared/runtime-environment-store'
+import { callRuntimeEnvironment } from './runtime-environment-transport-routing'
+import {
+  isRuntimeEnvironmentManuallyDisconnected,
+  RUNTIME_MANUALLY_DISCONNECTED_MESSAGE
+} from './runtime-environment-manual-disconnect'
+import { stageOneSourceForRuntimeUpload } from './filesystem-runtime-upload-staging'
+import { streamExternalFileSlices } from './runtime-upload-file-stream'
+import { formatByteCeiling } from './runtime-import-limits'
+
+const ATTACHMENT_CALL_TIMEOUT_MS = 30_000
+
+async function isDirectory(path: string): Promise<boolean> {
+  try {
+    return (await lstat(path)).isDirectory()
+  } catch {
+    // The stager reports a path it cannot read with its own reason.
+    return false
+  }
+}
+
+type UploadContext = AgentSessionAttachmentUploadTarget & {
+  userDataPath: string
+  signal?: AbortSignal
+}
+
+async function callAttachmentMethod<TResult>(
+  context: UploadContext,
+  method: string,
+  params: unknown
+): Promise<TResult> {
+  if (isRuntimeEnvironmentManuallyDisconnected(context.environmentId)) {
+    throw new Error(RUNTIME_MANUALLY_DISCONNECTED_MESSAGE)
+  }
+  const response = await callRuntimeEnvironment(
+    context.userDataPath,
+    context.environmentId,
+    method,
+    params,
+    ATTACHMENT_CALL_TIMEOUT_MS,
+    context.expectedEnvironmentPairingRevision,
+    undefined,
+    {
+      expectedEnvironmentRuntimeId: context.expectedEnvironmentRuntimeId,
+      signal: context.signal
+    }
+  )
+  if (response.ok !== true) {
+    throw new Error(response.error.message || response.error.code)
+  }
+  // oxlint-disable-next-line typescript/consistent-type-assertions -- SAFETY: each caller names the result type of the agentSessionAttachment.* method it calls, whose server handler returns exactly that shape.
+  return response.result as TResult
+}
+
+/** start → body → commit; any failure aborts, so the server frees the slot and its part file. */
+async function uploadAttachment(
+  context: UploadContext,
+  file: { name: string; byteLength: number },
+  writeBody: (
+    appendSlice: (contentBase64: string, offset: number) => Promise<void>
+  ) => Promise<void>
+): Promise<AgentSessionAttachmentUploadCommitResult> {
+  const { uploadId } = await callAttachmentMethod<AgentSessionAttachmentUploadStartResult>(
+    context,
+    'agentSessionAttachment.uploadStart',
+    { sessionId: context.sessionId, name: file.name, byteLength: file.byteLength }
+  )
+  try {
+    await writeBody((contentBase64, offset) =>
+      callAttachmentMethod(context, 'agentSessionAttachment.uploadAppend', {
+        uploadId,
+        offset,
+        contentBase64
+      })
+    )
+    return await callAttachmentMethod<AgentSessionAttachmentUploadCommitResult>(
+      context,
+      'agentSessionAttachment.uploadCommit',
+      { uploadId }
+    )
+  } catch (error) {
+    await callAttachmentMethod(
+      { ...context, signal: undefined },
+      'agentSessionAttachment.uploadAbort',
+      { uploadId }
+    ).catch(() => {})
+    throw error
+  }
+}
+
+export function uploadBufferToAgentSessionAttachments(
+  context: UploadContext,
+  name: string,
+  buffer: Buffer
+): Promise<AgentSessionAttachmentUploadCommitResult> {
+  return uploadAttachment(context, { name, byteLength: buffer.byteLength }, async (appendSlice) => {
+    if (buffer.byteLength === 0) {
+      await appendSlice('', 0)
+      return
+    }
+    for (
+      let offset = 0;
+      offset < buffer.byteLength;
+      offset += AGENT_SESSION_ATTACHMENT_CHUNK_BYTES
+    ) {
+      context.signal?.throwIfAborted()
+      const slice = buffer.subarray(offset, offset + AGENT_SESSION_ATTACHMENT_CHUNK_BYTES)
+      await appendSlice(slice.toString('base64'), offset)
+    }
+  })
+}
+
+/** A pasted image for a structured chat on a paired server, stored in that server's store. */
+export async function uploadPastedImageToAgentSessionAttachments(
+  target: AgentSessionAttachmentClipboardTarget,
+  runtimeEnvironmentId: string,
+  userDataPath: string,
+  buffer: Buffer
+): Promise<string> {
+  const stored = await uploadBufferToAgentSessionAttachments(
+    {
+      ...target,
+      environmentId: resolveEnvironment(userDataPath, runtimeEnvironmentId).id,
+      userDataPath
+    },
+    agentSessionPastedImageName(Date.now(), randomUUID()),
+    buffer
+  )
+  return stored.path
+}
+
+/**
+ * Upload dropped or picked client-local files, in input order. A folder is skipped as
+ * unsupported: a chat attachment is a file.
+ */
+export async function uploadExternalPathsToAgentSessionAttachments(
+  context: UploadContext,
+  paths: readonly string[]
+): Promise<AgentSessionAttachmentPathUploadResult> {
+  const result: AgentSessionAttachmentPathUploadResult = { uploaded: [], skipped: [], failed: [] }
+  for (const sourcePath of paths) {
+    context.signal?.throwIfAborted()
+    // Before staging, which would walk and open everything inside a folder only to skip it.
+    if (await isDirectory(sourcePath)) {
+      result.skipped.push({ sourcePath, reason: 'unsupported' })
+      continue
+    }
+    const staged = await stageOneSourceForRuntimeUpload(sourcePath)
+    if (staged.status === 'skipped') {
+      result.skipped.push({ sourcePath, reason: staged.reason })
+      continue
+    }
+    if (staged.status === 'failed') {
+      result.failed.push({ sourcePath, reason: staged.reason })
+      continue
+    }
+    const entry = staged.entries[0]
+    if (staged.kind !== 'file' || !entry || entry.kind !== 'file') {
+      result.skipped.push({ sourcePath, reason: 'unsupported' })
+      continue
+    }
+    if (entry.byteLength > AGENT_SESSION_ATTACHMENT_MAX_BYTES) {
+      result.failed.push({
+        sourcePath,
+        reason:
+          `'${basename(sourcePath)}' is ${formatByteCeiling(entry.byteLength)}, over the ` +
+          `${formatByteCeiling(AGENT_SESSION_ATTACHMENT_MAX_BYTES)} chat attachment limit`
+      })
+      continue
+    }
+    try {
+      const stored = await uploadAttachment(
+        context,
+        { name: basename(sourcePath), byteLength: entry.byteLength },
+        async (appendSlice) => {
+          await streamExternalFileSlices({
+            sourceRootPath: sourcePath,
+            entryRelativePath: '',
+            expected: entry,
+            signal: context.signal,
+            maxFileBytes: AGENT_SESSION_ATTACHMENT_MAX_BYTES,
+            limitLabel: 'chat attachment limit',
+            writeSlice: appendSlice
+          })
+        }
+      )
+      result.uploaded.push({ sourcePath, path: stored.path })
+    } catch (error) {
+      if (context.signal?.aborted) {
+        throw error
+      }
+      result.failed.push({
+        sourcePath,
+        reason: error instanceof Error ? error.message : String(error)
+      })
+    }
+  }
+  return result
+}
diff --git a/src/main/ipc/claude-accounts.ts b/src/main/ipc/claude-accounts.ts
index f88f094e46b3..181164a46468 100644
--- a/src/main/ipc/claude-accounts.ts
+++ b/src/main/ipc/claude-accounts.ts
@@ -1,10 +1,10 @@
 import { ipcMain } from 'electron'
-import type { ClaudeAccountAddTarget, ClaudeAccountService } from '../claude-accounts/service'
+import type { ClaudeAccountService } from '../claude-accounts/service'
 import type { ClaudeAccountSelectionTarget } from '../claude-accounts/runtime-selection'
 
 export function registerClaudeAccountHandlers(claudeAccounts: ClaudeAccountService): void {
   ipcMain.handle('claudeAccounts:list', () => claudeAccounts.listAccounts())
-  ipcMain.handle('claudeAccounts:add', (_event, args?: ClaudeAccountAddTarget) =>
+  ipcMain.handle('claudeAccounts:add', (_event, args?: ClaudeAccountSelectionTarget) =>
     claudeAccounts.addAccount(args)
   )
   ipcMain.handle('claudeAccounts:cancelPendingLogin', () => claudeAccounts.cancelPendingLogin())
@@ -16,11 +16,9 @@ export function registerClaudeAccountHandlers(claudeAccounts: ClaudeAccountServi
   )
   ipcMain.handle(
     'claudeAccounts:select',
-    (_event, args: { accountId: string | null } & ClaudeAccountSelectionTarget) => {
-      if (!args.runtime) {
-        return claudeAccounts.selectAccount(args.accountId)
-      }
-      return claudeAccounts.selectAccountForTarget(args.accountId, args)
-    }
+    (_event, args: { accountId: string | null } & ClaudeAccountSelectionTarget) =>
+      args.runtime
+        ? claudeAccounts.selectAccountForTarget(args.accountId, args)
+        : claudeAccounts.selectAccount(args.accountId)
   )
 }
diff --git a/src/main/ipc/desktop-renderer-runtime-capabilities.test.ts b/src/main/ipc/desktop-renderer-runtime-capabilities.test.ts
index 4fbbc7516ce9..1a628c301cf8 100644
--- a/src/main/ipc/desktop-renderer-runtime-capabilities.test.ts
+++ b/src/main/ipc/desktop-renderer-runtime-capabilities.test.ts
@@ -1,3 +1,4 @@
+import { SKILL_INSTALL_RESULT_V2_CAPABILITY } from '../../shared/skill-install-capability'
 /**
  * The desktop renderer talks to two hosts — its own main process and a paired remote — and used to
  * advertise a different capability set to each, hand-maintained on both sides. `agent.launch` is
@@ -15,7 +16,6 @@ import {
   SESSION_TAB_CLOSE_INTENT_RUNTIME_CAPABILITY,
   SESSION_TABS_AUTHORITATIVE_INVENTORY_RUNTIME_CAPABILITY,
   SESSION_TABS_RETIREMENT_PROOF_DELTA_RUNTIME_CAPABILITY,
-  SKILL_INSTALL_RESULT_V2_CAPABILITY,
   WORKTREE_BACKGROUND_REMOVAL_RUNTIME_CAPABILITY,
   WORKTREE_GITHUB_PR_SUPPRESSION_RUNTIME_CAPABILITY,
   WORKTREE_VISIBILITY_DEFAULTS_RUNTIME_CAPABILITY,
diff --git a/src/main/ipc/desktop-renderer-runtime-capabilities.ts b/src/main/ipc/desktop-renderer-runtime-capabilities.ts
index ab205b559758..61566cd084bf 100644
--- a/src/main/ipc/desktop-renderer-runtime-capabilities.ts
+++ b/src/main/ipc/desktop-renderer-runtime-capabilities.ts
@@ -5,6 +5,7 @@ import {
   AGENT_SESSION_PENDING_SEND_RESULT_RUNTIME_CAPABILITY,
   AGENT_SESSION_TURN_ITEM_CAPABILITY,
   CLAUDE_STRUCTURED_AGENT_SESSION_RUNTIME_CAPABILITY,
+  PI_STRUCTURED_DIALOGS_RUNTIME_CAPABILITY,
   REPO_SEARCH_QUALIFIED_REFS_RUNTIME_CAPABILITY,
   STRUCTURED_AGENT_SESSION_CLIENT_LAUNCH_MODE_CAPABILITY,
   STRUCTURED_AGENT_SESSION_REGISTERED_AGENTS_RUNTIME_CAPABILITY,
@@ -42,6 +43,7 @@ export const DESKTOP_RENDERER_RUNTIME_CLIENT_CAPABILITIES: readonly RuntimeCapab
   CLAUDE_STRUCTURED_AGENT_SESSION_RUNTIME_CAPABILITY,
   // The renderer reads `agentSession.agents` and renders a chat tab of any agent its host lists.
   STRUCTURED_AGENT_SESSION_REGISTERED_AGENTS_RUNTIME_CAPABILITY,
+  PI_STRUCTURED_DIALOGS_RUNTIME_CAPABILITY,
   STRUCTURED_AGENT_SESSION_CLIENT_LAUNCH_MODE_CAPABILITY,
   REPO_SEARCH_QUALIFIED_REFS_RUNTIME_CAPABILITY,
   // Without this `supportsAgentLaunch` refuses the renderer outright, while the same renderer
diff --git a/src/main/ipc/feedback-request-ownership.test.ts b/src/main/ipc/feedback-request-ownership.test.ts
new file mode 100644
index 000000000000..728bebdfa67a
--- /dev/null
+++ b/src/main/ipc/feedback-request-ownership.test.ts
@@ -0,0 +1,167 @@
+import { beforeEach, describe, expect, it, vi } from 'vitest'
+
+const { fetchMock } = vi.hoisted(() => ({ fetchMock: vi.fn<typeof fetch>() }))
+
+vi.mock('electron', () => ({
+  app: { getVersion: () => '1.2.3-test' },
+  net: { fetch: fetchMock }
+}))
+
+import { submitFeedback } from './feedback'
+import { FEEDBACK_API_URL, postFeedback, type FeedbackSubmitBody } from './feedback-request'
+
+const plainSubmission: Parameters<typeof submitFeedback>[0] = {
+  feedback: 'request ownership regression',
+  submitAnonymously: true,
+  githubLogin: null,
+  githubEmail: null
+}
+
+const imageSubmission: Parameters<typeof submitFeedback>[0] = {
+  ...plainSubmission,
+  images: [{ contentType: 'image/png', data: new Uint8Array([1, 2, 3]) }]
+}
+
+function requestSignal(index = 0): AbortSignal {
+  const signal = fetchMock.mock.calls[index]?.[1]?.signal
+  if (!signal) {
+    throw new Error('Expected an owned feedback request signal')
+  }
+  return signal
+}
+
+describe('feedback request ownership', () => {
+  beforeEach(() => fetchMock.mockReset())
+
+  it('retires an unread response after successful text submission', async () => {
+    fetchMock.mockResolvedValue(new Response('unused response'))
+
+    await expect(submitFeedback(plainSubmission)).resolves.toEqual({ ok: true })
+
+    expect(fetchMock).toHaveBeenCalledTimes(1)
+    expect(requestSignal().aborted).toBe(true)
+  })
+
+  it('retires both failed text attempts while preserving the retry result', async () => {
+    fetchMock.mockResolvedValue(new Response('unused error', { status: 503 }))
+
+    await expect(submitFeedback(plainSubmission)).resolves.toEqual({
+      ok: false,
+      status: 503,
+      error: 'status 503; retry: status 503'
+    })
+
+    expect(fetchMock).toHaveBeenCalledTimes(2)
+    expect(requestSignal(0).aborted).toBe(true)
+    expect(requestSignal(1).aborted).toBe(true)
+  })
+
+  it('retires a rejected image response without replaying the attachments', async () => {
+    fetchMock.mockResolvedValue(new Response('unused error', { status: 503 }))
+
+    await expect(submitFeedback(imageSubmission)).resolves.toEqual({
+      ok: false,
+      status: 503,
+      error: 'status 503'
+    })
+
+    expect(fetchMock).toHaveBeenCalledTimes(1)
+    expect(requestSignal().aborted).toBe(true)
+  })
+
+  it('keeps the request live until the image response reader finishes', async () => {
+    const reading = Promise.withResolvers<void>()
+    let finishResponse = (): void => {
+      throw new Error('Response stream has not started')
+    }
+    const response = new Response(
+      new ReadableStream<Uint8Array>({
+        start(controller) {
+          controller.enqueue(new TextEncoder().encode('{"imagesDelivered":'))
+          finishResponse = () => {
+            controller.enqueue(new TextEncoder().encode('true}'))
+            controller.close()
+          }
+        },
+        pull() {
+          reading.resolve()
+        }
+      })
+    )
+    fetchMock.mockResolvedValue(response)
+
+    const submission = submitFeedback(imageSubmission)
+    await reading.promise
+    expect(requestSignal().aborted).toBe(false)
+    finishResponse()
+
+    await expect(submission).resolves.toEqual({ ok: true, imagesDelivered: true })
+    expect(requestSignal().aborted).toBe(true)
+  })
+
+  it('retires diagnostic and report-only requests after an attachment fallback', async () => {
+    fetchMock
+      .mockResolvedValueOnce(new Response('unused error', { status: 413 }))
+      .mockResolvedValueOnce(new Response('unused response'))
+
+    await expect(
+      submitFeedback({
+        ...plainSubmission,
+        submissionType: 'crash',
+        feedbackWithoutDiagnosticBundle: 'report without diagnostics',
+        diagnosticBundle: {
+          bundleSubmissionId: 'ownership-regression',
+          content: '{"type":"bundle-header"}\n',
+          bytes: 25,
+          spanCount: 1
+        }
+      })
+    ).resolves.toEqual({
+      ok: true,
+      diagnosticBundleFailure: { status: 413, error: 'status 413' }
+    })
+
+    expect(fetchMock).toHaveBeenCalledTimes(2)
+    expect(requestSignal(0).aborted).toBe(true)
+    expect(requestSignal(1).aborted).toBe(true)
+  })
+
+  it('retires failed network attempts without turning them into deadline errors', async () => {
+    fetchMock
+      .mockRejectedValueOnce(new Error('first network failure'))
+      .mockRejectedValueOnce(new Error('retry network failure'))
+
+    await expect(submitFeedback(plainSubmission)).resolves.toEqual({
+      ok: false,
+      status: null,
+      error: 'first network failure; retry: retry network failure'
+    })
+
+    expect(fetchMock).toHaveBeenCalledTimes(2)
+    expect(requestSignal(0).aborted).toBe(true)
+    expect(requestSignal(1).aborted).toBe(true)
+  })
+
+  it('preserves the response reader error when retiring its request', async () => {
+    fetchMock.mockResolvedValue(new Response('unused response'))
+    const body: FeedbackSubmitBody = {
+      feedback: plainSubmission.feedback,
+      submissionType: 'feedback',
+      githubLogin: null,
+      githubEmail: null,
+      appVersion: 'test',
+      platform: process.platform,
+      osRelease: 'test',
+      arch: process.arch
+    }
+    const failure = new Error('response reader failure')
+
+    await expect(
+      postFeedback(FEEDBACK_API_URL, body, undefined, async () => {
+        throw failure
+      })
+    ).rejects.toBe(failure)
+
+    expect(requestSignal().aborted).toBe(true)
+  })
+})
diff --git a/src/main/ipc/feedback-request.ts b/src/main/ipc/feedback-request.ts
index 4d92a77f6b80..9d95b2360f07 100644
--- a/src/main/ipc/feedback-request.ts
+++ b/src/main/ipc/feedback-request.ts
@@ -71,6 +71,7 @@ export async function postFeedback(
     throw error
   } finally {
     clearTimeout(timeout)
+    controller.abort()
   }
 }
 
diff --git a/src/main/ipc/filesystem/filesystem-write-handlers.ts b/src/main/ipc/filesystem/filesystem-write-handlers.ts
index de02a93e7ac2..6aa3502adb78 100644
--- a/src/main/ipc/filesystem/filesystem-write-handlers.ts
+++ b/src/main/ipc/filesystem/filesystem-write-handlers.ts
@@ -11,6 +11,7 @@ import {
 } from '../local-file-access-resolution'
 import { isENOENT } from '../filesystem-path-containment'
 import { registerFilesystemMutationHandlers } from '../filesystem-mutations'
+import { registerAgentSessionAttachmentUploadHandlers } from '../agent-session-attachment-upload-ipc'
 import type { FilesystemHandlerContext } from './filesystem-handler-context'
 import { assertLocalWriteTargetIsRegularFile } from './local-regular-file-read'
 
@@ -99,4 +100,5 @@ export function registerFilesystemWriteHandlers(context: FilesystemHandlerContex
   )
 
   registerFilesystemMutationHandlers(store)
+  registerAgentSessionAttachmentUploadHandlers()
 }
diff --git a/src/main/ipc/native-chat.ts b/src/main/ipc/native-chat.ts
index 02e2928f3c69..3b8e95d85697 100644
--- a/src/main/ipc/native-chat.ts
+++ b/src/main/ipc/native-chat.ts
@@ -14,6 +14,8 @@ import {
   type SubscribeNativeChatTranscriptArgs
 } from '../native-chat/transcript-watch'
 import { abortWhenRendererGone } from './renderer-lifetime-abort'
+import { agentHookServer } from '../agent-hooks/server'
+import { nativeChatTranscriptPathOnExecutionHost } from '../native-chat/ssh-transcript-path'
 
 // Re-export so existing test imports of `clearNativeChatTranscriptCache` from
 // this module keep working after the cache moved to transcript-read-cache.ts.
@@ -40,7 +42,11 @@ async function readSession(args: NativeChatReadSessionArgs): Promise<ReadTranscr
   return readNativeChatTranscriptTail({
     agent,
     sessionId,
-    transcriptPath: args.transcriptPath,
+    transcriptPath: nativeChatTranscriptPathOnExecutionHost(
+      agentHookServer.getStatusSnapshot(),
+      sessionId,
+      args.transcriptPath
+    ),
     limit
   })
 }
@@ -193,7 +199,11 @@ async function handleSubscribe(event: IpcMainEvent, args: NativeChatSubscribeArg
   const subscribeArgs: SubscribeNativeChatTranscriptArgs = {
     agent,
     sessionId,
-    transcriptPath,
+    transcriptPath: nativeChatTranscriptPathOnExecutionHost(
+      agentHookServer.getStatusSnapshot(),
+      sessionId,
+      transcriptPath
+    ),
     initialLimit: limit,
     onTranscriptPending: () => {
       if (!canPublish()) {
diff --git a/src/main/ipc/pty-listener-teardown-and-orphans.test.ts b/src/main/ipc/pty-listener-teardown-and-orphans.test.ts
index 7e4178f35d3e..470582f35615 100644
--- a/src/main/ipc/pty-listener-teardown-and-orphans.test.ts
+++ b/src/main/ipc/pty-listener-teardown-and-orphans.test.ts
@@ -8,7 +8,6 @@ import {
 } from './pty-ipc-mock-registry'
 import { posixOnlyIt, makeDisposable } from './pty-ipc-test-constants'
 import { setupPtyIpcSuite } from './pty-ipc-test-harness'
-import * as livePtyGate from '../claude-accounts/live-pty-gate'
 import { registerPtyHandlers, setLocalPtyProvider, getLocalPtyProvider } from './pty'
 import { join } from 'node:path'
 // Why resolved rather than hardcoded: the wrapper tree is content-addressed.
@@ -367,7 +366,6 @@ describe('registerPtyHandlers', () => {
     }
     spawnMock.mockReturnValue(proc)
     const isRecoveryReloadInFlight = vi.fn(() => true)
-    const markClaudePtyExitedSpy = vi.spyOn(livePtyGate, 'markClaudePtyExited')
 
     registerPtyHandlers(
       mainWindow as never,
@@ -396,11 +394,8 @@ describe('registerPtyHandlers', () => {
 
     expect(killSpy).not.toHaveBeenCalled()
     expect(runtime.onPtyExit).not.toHaveBeenCalled()
-    expect(markClaudePtyExitedSpy).not.toHaveBeenCalled()
     const listed = await getLocalPtyProvider().listProcesses()
     expect(listed.some((info) => info.id === spawnResult.id)).toBe(true)
-
-    markClaudePtyExitedSpy.mockRestore()
   })
   // Why: guard against over-suppression — with no recovery reload in flight the sweep MUST still reclaim genuinely orphaned local PTYs.
   it('still sweeps orphaned local PTYs when no recovery reload is in flight', async () => {
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 d530a9cd1947..36c02a0f2346 100644
--- a/src/main/ipc/pty-spawn-env-terminal-basics.test.ts
+++ b/src/main/ipc/pty-spawn-env-terminal-basics.test.ts
@@ -1,14 +1,13 @@
 import { withFreshOmpLaunch } from '../../shared/omp-fresh-launch'
 import { describe, expect, it, vi } from 'vitest'
 import { piBuildPtyEnvMock, spawnMock } from './pty-ipc-mock-registry'
-import { TEST_CODEX_HOME, makeDisposable } from './pty-ipc-test-constants'
+import { TEST_CODEX_HOME } from './pty-ipc-test-constants'
 import { setupPtyIpcSuite } from './pty-ipc-test-harness'
 import { LocalPtyProvider } from '../providers/local-pty-provider'
 import { __resetPersistedWindowsPathCacheForTests } from '../pty/windows-environment-path'
 import { __setWindowsPathRegistryLoaderForTests } from '../pty/windows-path-registry-reader'
-import { hasLiveClaudePtys, markClaudePtySpawned } from '../claude-accounts/live-pty-gate'
 import { wslHookRelayManager } from '../agent-hooks/wsl-hook-relay-manager'
-import { registerPtyHandlers, buildPtyHostEnv, clearProviderPtyState } from './pty'
+import { registerPtyHandlers, buildPtyHostEnv } from './pty'
 import { buildJcodeRuntimeDir, shouldInjectJcodeRuntimeDir } from '../../shared/jcode-runtime-dir'
 import { makePaneKey } from '../../shared/stable-pane-id'
 import { selectShellStartupFeatures } from '../shell-startup-features'
@@ -320,49 +319,6 @@ describe('registerPtyHandlers', () => {
         id: expect.any(String)
       })
     })
-    it('marks local Claude launches live until the PTY is killed', async () => {
-      let exitCb: ((info: { exitCode: number }) => void) | undefined
-      spawnMock.mockReturnValue({
-        onData: vi.fn(() => makeDisposable()),
-        onExit: vi.fn((cb: (info: { exitCode: number }) => void) => {
-          exitCb = cb
-          return makeDisposable()
-        }),
-        write: vi.fn(),
-        resize: vi.fn(),
-        kill: vi.fn(() => exitCb?.({ exitCode: -1 })),
-        process: 'zsh',
-        pid: 12345
-      })
-      const prepareClaudeAuth = vi.fn(async () => ({
-        configDir: '/tmp/claude',
-        envPatch: {},
-        stripAuthEnv: false,
-        provenance: 'managed:account-1'
-      }))
-      registerPtyHandlers(mainWindow as never, undefined, undefined, undefined, prepareClaudeAuth)
-
-      const spawnResult = (await handlers.get('pty:spawn')!(null, {
-        cols: 80,
-        rows: 24,
-        command: 'claude'
-      })) as { id: string }
-
-      expect(prepareClaudeAuth).toHaveBeenCalledTimes(1)
-      expect(hasLiveClaudePtys()).toBe(true)
-
-      await handlers.get('pty:kill')!(null, { id: spawnResult.id })
-
-      expect(hasLiveClaudePtys()).toBe(false)
-    })
-    it('clears Claude live-PTY tracking from shared provider teardown', () => {
-      markClaudePtySpawned('ssh-claude-pty')
-      expect(hasLiveClaudePtys()).toBe(true)
-
-      clearProviderPtyState('ssh-claude-pty')
-
-      expect(hasLiveClaudePtys()).toBe(false)
-    })
     it('defaults LANG to en_US.UTF-8 when not inherited from process.env', async () => {
       const env = await spawnAndGetEnv(undefined, { LANG: undefined })
       expect(env.LANG).toBe('en_US.UTF-8')
diff --git a/src/main/ipc/pty/ipc/claude-old-terminal.test.ts b/src/main/ipc/pty/ipc/claude-old-terminal.test.ts
new file mode 100644
index 000000000000..6d8a3e16e00a
--- /dev/null
+++ b/src/main/ipc/pty/ipc/claude-old-terminal.test.ts
@@ -0,0 +1,36 @@
+import { beforeEach, expect, it, vi } from 'vitest'
+
+type Handler = (event: unknown, args: { id: unknown }) => Promise<boolean>
+
+const mocks = vi.hoisted(() => ({
+  handlers: new Map<string, Handler>(),
+  olderPtyIds: new Set<string>(),
+  startup: vi.fn<() => Promise<void> | undefined>()
+}))
+vi.mock('../../pty-host-bindings', () => ({
+  getPtyIpc: () => ({
+    handle: (channel: string, handler: Handler) => mocks.handlers.set(channel, handler)
+  })
+}))
+vi.mock('../../../daemon/daemon-provider-state', () => ({
+  isTerminalFromBeforeDaemonProtocol: (id: string, protocolVersion: number) =>
+    protocolVersion === 42 && mocks.olderPtyIds.has(id)
+}))
+
+import { installPtyClaudeOldTerminalIpcHandler } from './claude-old-terminal'
+
+beforeEach(() => {
+  mocks.handlers.clear()
+  mocks.olderPtyIds = new Set(['old-1'])
+  installPtyClaudeOldTerminalIpcHandler({ getLocalPtyProviderStartupPromise: mocks.startup })
+})
+
+it('answers true only for a pane owned by a daemon from before per-account Claude folders', async () => {
+  const ask = mocks.handlers.get('pty:openedBeforeClaudeAccounts')!
+  expect(await ask({}, { id: 'old-1' })).toBe(true)
+  // A pane on this build's daemon, or an SSH pane, which no local daemon owns.
+  expect(await ask({}, { id: 'new-1' })).toBe(false)
+  expect(await ask({}, { id: 'ssh:conn-1:pty-1' })).toBe(false)
+  expect(await ask({}, { id: 42 })).toBe(false)
+  expect(mocks.startup).toHaveBeenCalled()
+})
diff --git a/src/main/ipc/pty/ipc/claude-old-terminal.ts b/src/main/ipc/pty/ipc/claude-old-terminal.ts
new file mode 100644
index 000000000000..385800241cbd
--- /dev/null
+++ b/src/main/ipc/pty/ipc/claude-old-terminal.ts
@@ -0,0 +1,23 @@
+import { getPtyIpc } from '../../pty-host-bindings'
+import { CLAUDE_ACCOUNT_FUNCTION_DAEMON_PROTOCOL_VERSION } from '../../../daemon/daemon-protocol-version'
+import { isTerminalFromBeforeDaemonProtocol } from '../../../daemon/daemon-provider-state'
+
+type Deps = { getLocalPtyProviderStartupPromise: () => Promise<void> | undefined }
+
+/** Whether a pane's daemon predates the claude function that follows the selected account. */
+export function installPtyClaudeOldTerminalIpcHandler(deps: Deps): void {
+  getPtyIpc().handle(
+    'pty:openedBeforeClaudeAccounts',
+    async (_event, args: { id: string }): Promise<boolean> => {
+      if (typeof args?.id !== 'string') {
+        return false
+      }
+      // Why: the pre-swap provider does not own restored daemon ids.
+      await deps.getLocalPtyProviderStartupPromise()
+      return isTerminalFromBeforeDaemonProtocol(
+        args.id,
+        CLAUDE_ACCOUNT_FUNCTION_DAEMON_PROTOCOL_VERSION
+      )
+    }
+  )
+}
diff --git a/src/main/ipc/pty/ipc/spawn-commit.ts b/src/main/ipc/pty/ipc/spawn-commit.ts
index 24df59c1201c..ffcc5d158bb3 100644
--- a/src/main/ipc/pty/ipc/spawn-commit.ts
+++ b/src/main/ipc/pty/ipc/spawn-commit.ts
@@ -1,6 +1,5 @@
 import { isValidTerminalTabId } from '../../../../shared/terminal-tab-id'
 import { agentHookServer } from '../../../agent-hooks/server'
-import { markClaudePtySpawned } from '../../../claude-accounts/live-pty-gate'
 import { registerPty } from '../../../memory/pty-registry'
 import type { PtySpawnResult } from '../../../providers/types'
 import { clearMigrationUnsupportedPtysForPaneKey } from '../../../agent-hooks/migration-unsupported-pty-state'
@@ -125,9 +124,6 @@ async function commitReservedPtyIpcSpawn(ctx: PtyIpcSpawnState): Promise<PtySpaw
       typeof ctx.launchCommand === 'string' ? ctx.launchCommand : null
     )
   }
-  if (ctx.isClaudeLaunch && !ctx.stablePaneOwner) {
-    markClaudePtySpawned(ctx.result.id)
-  }
   // Why: record the paneKey mapping so clearProviderPtyState can clear the agent-hooks server's per-paneKey caches on exit.
   // Why: args.env is untrusted IPC JSON (type unenforced); bound the paneKey so malformed/oversized values can't pollute ptyPaneKey or clearPaneState.
   const rememberedPaneKey = ctx.validatedPaneKey
diff --git a/src/main/ipc/pty/ipc/spawn-env.ts b/src/main/ipc/pty/ipc/spawn-env.ts
index df947520e7f4..95296659b652 100644
--- a/src/main/ipc/pty/ipc/spawn-env.ts
+++ b/src/main/ipc/pty/ipc/spawn-env.ts
@@ -11,10 +11,8 @@ import {
 } from '../../../../shared/jcode-runtime-dir'
 import { isOpaqueRemintedPaneKey } from '../../../../shared/pane-key-alias'
 import { isValidTerminalTabId } from '../../../../shared/terminal-tab-id'
-import { isClaudeAuthSwitchInProgress } from '../../../claude-accounts/live-pty-gate'
 import {
   CLAUDE_AUTH_ENV_CONFLICT_MESSAGE,
-  CLAUDE_AUTH_SWITCH_IN_PROGRESS_MESSAGE,
   hasClaudeAuthEnvConflict
 } from '../../../claude-accounts/environment'
 import { prewarmJcodeDaemon } from '../../../jcode/daemon-prewarm'
@@ -30,9 +28,6 @@ import { prepareAntigravityAccountForLaunch } from '../../../antigravity/native-
 
 export async function assemblePtyIpcSpawnEnv(ctx: PtyIpcSpawnState): Promise<void> {
   const args = ctx.args
-  if (ctx.isClaudeLaunch && isClaudeAuthSwitchInProgress()) {
-    throw new Error(CLAUDE_AUTH_SWITCH_IN_PROGRESS_MESSAGE)
-  }
   if (ctx.claudeAuth?.stripAuthEnv && hasClaudeAuthEnvConflict(args.env)) {
     throw new Error(CLAUDE_AUTH_ENV_CONFLICT_MESSAGE)
   }
diff --git a/src/main/ipc/pty/ipc/spawn-preflight.ts b/src/main/ipc/pty/ipc/spawn-preflight.ts
index b6a50c43bbbf..4b8d71c04417 100644
--- a/src/main/ipc/pty/ipc/spawn-preflight.ts
+++ b/src/main/ipc/pty/ipc/spawn-preflight.ts
@@ -4,8 +4,6 @@ import {
   resolveLocalWindowsTerminalRuntimeOptions
 } from '../../../../shared/local-windows-terminal-runtime'
 import { isWslUncPath, toWindowsWslPath } from '../../../../shared/wsl-paths'
-import { isClaudeAuthSwitchInProgress } from '../../../claude-accounts/live-pty-gate'
-import { CLAUDE_AUTH_SWITCH_IN_PROGRESS_MESSAGE } from '../../../claude-accounts/environment'
 import { mintPtySessionId } from '../../../daemon/pty-session-id'
 import { resolveWslSessionContext } from '../../../daemon/wsl-session-context'
 import { LocalPtyProvider } from '../../../providers/local-pty-provider'
@@ -194,9 +192,6 @@ export async function preparePtyIpcSpawnPreflight(ctx: PtyIpcSpawnState): Promis
   }
   ctx.isClaudeLaunch =
     !ctx.preAdoptedStablePane && !args.connectionId && isClaudeLaunchCommand(args.command)
-  if (ctx.isClaudeLaunch && isClaudeAuthSwitchInProgress()) {
-    throw new Error(CLAUDE_AUTH_SWITCH_IN_PROGRESS_MESSAGE)
-  }
   ctx.terminalRuntimeOptions =
     process.platform === 'win32' && !args.connectionId
       ? resolveLocalWindowsTerminalRuntimeOptions({
diff --git a/src/main/ipc/pty/provider/bind-listeners.ts b/src/main/ipc/pty/provider/bind-listeners.ts
index 31bacec82f7f..ec13ad0d36e2 100644
--- a/src/main/ipc/pty/provider/bind-listeners.ts
+++ b/src/main/ipc/pty/provider/bind-listeners.ts
@@ -1,4 +1,3 @@
-import { markClaudePtyExited } from '../../../claude-accounts/live-pty-gate'
 import { LocalPtyProvider } from '../../../providers/local-pty-provider'
 import { isCurrentPtyExit, ptyOwnership } from './ownership-state'
 import {
@@ -92,7 +91,6 @@ export function bindProviderListeners(session: PtyIpcSession): void {
       if (!isLocalProvider) {
         clearProviderPtyState(payload.id)
         ptyOwnership.delete(payload.id)
-        markClaudePtyExited(payload.id)
         if (syntheticExit) {
           session.runtime?.markPtyStopRequested(payload.id)
         }
diff --git a/src/main/ipc/pty/provider/liveness.ts b/src/main/ipc/pty/provider/liveness.ts
index 8a362b74aaf2..5c4265bdc6ea 100644
--- a/src/main/ipc/pty/provider/liveness.ts
+++ b/src/main/ipc/pty/provider/liveness.ts
@@ -10,7 +10,6 @@ import {
   isSshPtyProvenExitedOnRelayError
 } from '../../../providers/ssh-pty-errors'
 import type { IPtyProvider } from '../../../providers/types'
-import { markClaudePtyExited } from '../../../claude-accounts/live-pty-gate'
 import { ptyIncarnationById, ptyOwnership } from './ownership-state'
 import { getRelayPtyId } from './registry'
 import {
@@ -179,6 +178,5 @@ export function finishPtyShutdown(
     store?.markSshRemotePtyLease(connectionId, getRelayPtyId(connectionId, id), 'terminated')
   }
   ptyOwnership.delete(id)
-  markClaudePtyExited(id)
   return incarnationId
 }
diff --git a/src/main/ipc/pty/provider/local-configure.ts b/src/main/ipc/pty/provider/local-configure.ts
index 7a494522ec01..eeb5fef028c5 100644
--- a/src/main/ipc/pty/provider/local-configure.ts
+++ b/src/main/ipc/pty/provider/local-configure.ts
@@ -10,7 +10,6 @@ import {
   stampWslOrchestrationCompatibilityHost
 } from '../../../pty/wsl-orca-env'
 import type { CodexAccountSelectionTarget } from '../../../codex-accounts/runtime-selection'
-import { markClaudePtyExited } from '../../../claude-accounts/live-pty-gate'
 import { buildPtyHostEnv } from '../host-env/assembly'
 import {
   getCompatibleSelectedCodexHomePath,
@@ -126,7 +125,6 @@ export function configureLocalPtyProvider(args: {
       }
       clearProviderPtyState(id)
       ptyOwnership.delete(id)
-      markClaudePtyExited(id)
       runtime?.onPtyExit(id, code, incarnationId, {
         providerExitObserved: true,
         ...(cause ? { cause } : {})
diff --git a/src/main/ipc/pty/provider/state-cleanup.ts b/src/main/ipc/pty/provider/state-cleanup.ts
index f70b07dbff85..aa99d191abc0 100644
--- a/src/main/ipc/pty/provider/state-cleanup.ts
+++ b/src/main/ipc/pty/provider/state-cleanup.ts
@@ -1,6 +1,5 @@
 import { advertisedUrlWatcher } from '../../../ports/advertised-url-watcher'
 import { unregisterPty } from '../../../memory/pty-registry'
-import { markClaudePtyExited } from '../../../claude-accounts/live-pty-gate'
 import { forgetCodexPaneAccount } from '../../../codex/codex-pane-account-registry'
 import { openCodeHookService } from '../../../opencode/hook-service'
 import { piTitlebarExtensionService } from '../../../pi/titlebar-extension-service'
@@ -49,8 +48,6 @@ export function clearProviderPtyState(
   // new teardown path forgets to remove one provider's overlay/hook state.
   openCodeHookService.clearPty(id)
   piTitlebarExtensionService.clearPty(id)
-  // Why: SSH exit/teardown paths bypass pty.ts's local onExit but still must release Claude account-switch guards.
-  markClaudePtyExited(id)
   ptySizes.delete(id)
   ptyIncarnationById.delete(id)
   lastInputAtByPty.delete(id)
diff --git a/src/main/ipc/pty/register-handlers.ts b/src/main/ipc/pty/register-handlers.ts
index 7f29e895e0bc..5e823ac535ca 100644
--- a/src/main/ipc/pty/register-handlers.ts
+++ b/src/main/ipc/pty/register-handlers.ts
@@ -13,6 +13,7 @@ import { finishPtyShutdown } from './provider/liveness'
 import type { GetSelectedCodexHomePath, PrepareClaudeAuth } from './host-env/types'
 import { installPtyInspectIpcHandlers } from './ipc/inspect'
 import { installPtyCodexSharedServerIpcHandler } from './ipc/codex-shared-server'
+import { installPtyClaudeOldTerminalIpcHandler } from './ipc/claude-old-terminal'
 import {
   installPtyKillIpcHandler,
   stopReplacedPanePty,
@@ -124,6 +125,7 @@ export function registerPtyHandlers(
   ipcMain.removeHandler('pty:isCodexOnSharedServer')
   ipcMain.removeHandler('pty:disableCodexSharedServerAutoStart')
   ipcMain.removeHandler('pty:stopCodexSharedServer')
+  ipcMain.removeHandler('pty:openedBeforeClaudeAccounts')
   ipcMain.removeHandler('pty:getCwd')
   ipcMain.removeHandler('pty:getSize')
   ipcMain.removeHandler('pty:getAuthoritativeBufferSnapshotCapabilities')
@@ -286,5 +288,6 @@ export function registerPtyHandlers(
   installPtyResizeVisibilityIpc(session)
   installPtyInspectIpcHandlers({ getLocalPtyProviderStartupPromise })
   installPtyCodexSharedServerIpcHandler({ getLocalPtyProviderStartupPromise })
+  installPtyClaudeOldTerminalIpcHandler({ getLocalPtyProviderStartupPromise })
   installPtyKillIpcHandler(killDeps)
 }
diff --git a/src/main/ipc/pty/runtime/spawn-commit.ts b/src/main/ipc/pty/runtime/spawn-commit.ts
index c38637371c36..e6e301aa8afa 100644
--- a/src/main/ipc/pty/runtime/spawn-commit.ts
+++ b/src/main/ipc/pty/runtime/spawn-commit.ts
@@ -7,7 +7,6 @@ import {
   recordCodexPaneAccountForSpawn,
   codexReattachedHomeRouteField
 } from '../host-env/codex-home'
-import { markClaudePtySpawned } from '../../../claude-accounts/live-pty-gate'
 import { registerPty } from '../../../memory/pty-registry'
 import { rememberPaneKeyForPty } from '../pane/key-state'
 import {
@@ -240,9 +239,6 @@ async function commitReservedRuntimePtySpawn(ctx: RuntimePtySpawnState) {
   if (!ctx.stablePaneOwner) {
     ctx.deps.runtime?.noteTerminalSpawnCommand?.(ctx.result.id, ctx.launchCommand ?? null)
   }
-  if (ctx.isClaudeLaunch && !ctx.stablePaneOwner) {
-    markClaudePtySpawned(ctx.result.id)
-  }
   if (args.telemetry && !ctx.stablePaneOwner) {
     recordPtySpawnTelemetry(args.telemetry)
   }
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 cfbace932ab8..88db8879630e 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
@@ -96,6 +96,7 @@ describe('runtime pty spawn preflight: Claude account routing in a WSL pane', ()
       new ClaudeProfileRouter({
         getSettings: () => getDefaultSettings('/tmp'),
         dataRoot: '/data/orca',
+        env: {},
         runSetup
       })
     )
diff --git a/src/main/ipc/pty/runtime/spawn-preflight.ts b/src/main/ipc/pty/runtime/spawn-preflight.ts
index c82b0656a377..729cf74af786 100644
--- a/src/main/ipc/pty/runtime/spawn-preflight.ts
+++ b/src/main/ipc/pty/runtime/spawn-preflight.ts
@@ -23,10 +23,8 @@ import {
 } from '../host-env/fresh-spawn-routing'
 import { stripRemotePaneEnvWhenHooksDisabled } from '../provider/liveness'
 import { isTuiAgent } from '../../../../shared/tui-agent-config'
-import { isClaudeAuthSwitchInProgress } from '../../../claude-accounts/live-pty-gate'
 import {
   CLAUDE_AUTH_ENV_CONFLICT_MESSAGE,
-  CLAUDE_AUTH_SWITCH_IN_PROGRESS_MESSAGE,
   hasClaudeAuthEnvConflict
 } from '../../../claude-accounts/environment'
 import {
@@ -70,9 +68,6 @@ export async function prepareRuntimePtySpawn(
   }
   ctx.isClaudeLaunch =
     !ctx.preAdoptedStablePane && !args.connectionId && isClaudeLaunchCommand(args.command)
-  if (ctx.isClaudeLaunch && isClaudeAuthSwitchInProgress()) {
-    throw new Error(CLAUDE_AUTH_SWITCH_IN_PROGRESS_MESSAGE)
-  }
   // Why: runtime-created terminals carry no renderer-computed projectRuntime; resolve from worktreeId to honor the project's Windows runtime.
   // `args.shellOverride` is the per-request pick (`terminal create --shell`), read here the way
   // the renderer twin (ipc/spawn-preflight.ts) reads a tab's override. Without it a runtime create
@@ -151,9 +146,6 @@ export async function prepareRuntimePtySpawn(
     ctx.isClaudeLaunch && ctx.deps.prepareClaudeAuth
       ? await ctx.deps.prepareClaudeAuth(ctx.codexSelectionTarget)
       : null
-  if (ctx.isClaudeLaunch && isClaudeAuthSwitchInProgress()) {
-    throw new Error(CLAUDE_AUTH_SWITCH_IN_PROGRESS_MESSAGE)
-  }
   if (ctx.claudeAuth?.stripAuthEnv && hasClaudeAuthEnvConflict(args.env)) {
     throw new Error(CLAUDE_AUTH_ENV_CONFLICT_MESSAGE)
   }
diff --git a/src/main/ipc/remote-workspace-target-session-export.test.ts b/src/main/ipc/remote-workspace-target-session-export.test.ts
new file mode 100644
index 000000000000..aa60c2d2929e
--- /dev/null
+++ b/src/main/ipc/remote-workspace-target-session-export.test.ts
@@ -0,0 +1,54 @@
+import { describe, expect, it } from 'vitest'
+import type { Store } from '../persistence'
+import type { Repo } from '../../shared/repo-types'
+import { getDefaultWorkspaceSession } from '../../shared/constants'
+import type { TerminalTab } from '../../shared/terminal-tab-types'
+import type { WorkspaceSessionState } from '../../shared/workspace-session-state-types'
+import { createRepoRowExecutionHostLookup } from '../../shared/worktree-execution-host-resolution'
+import {
+  createWorktreeOwnerResolver,
+  persistedSessionForTarget
+} from './remote-workspace-target-session-export'
+
+const TARGET_ID = 'target-1'
+const WORKTREE_ID = 'repo-1::/remote/repo'
+
+function tab(id: string): TerminalTab {
+  return {
+    id,
+    ptyId: null,
+    worktreeId: WORKTREE_ID,
+    title: id,
+    customTitle: null,
+    color: null,
+    sortOrder: 0,
+    createdAt: 1
+  }
+}
+
+function session(tabs: TerminalTab[]): WorkspaceSessionState {
+  return { ...getDefaultWorkspaceSession(), tabsByWorktree: { [WORKTREE_ID]: tabs } }
+}
+
+describe('persistedSessionForTarget', () => {
+  it("publishes the ssh partition's tabs, not a stray local copy of an SSH-owned workspace", () => {
+    const partitions: Record<string, WorkspaceSessionState> = {
+      local: session([tab('tab-stale')]),
+      [`ssh:${TARGET_ID}`]: session([tab('tab-live')])
+    }
+    // oxlint-disable-next-line typescript/consistent-type-assertions -- SAFETY: the publish fallback reads only getWorkspaceSession.
+    const store = {
+      getWorkspaceSession: (hostId?: string) => partitions[hostId ?? 'local']
+    } as unknown as Store
+    // oxlint-disable-next-line typescript/consistent-type-assertions -- SAFETY: ownership resolution reads only id, connectionId and executionHostId.
+    const repos = [{ id: 'repo-1', connectionId: TARGET_ID, executionHostId: null }] as Repo[]
+
+    const published = persistedSessionForTarget(
+      store,
+      TARGET_ID,
+      createWorktreeOwnerResolver(createRepoRowExecutionHostLookup(repos))
+    )
+
+    expect(published.tabsByWorktree[WORKTREE_ID]?.map((entry) => entry.id)).toEqual(['tab-live'])
+  })
+})
diff --git a/src/main/ipc/remote-workspace-target-session-export.ts b/src/main/ipc/remote-workspace-target-session-export.ts
index c88f8cb620bd..9adef9312e93 100644
--- a/src/main/ipc/remote-workspace-target-session-export.ts
+++ b/src/main/ipc/remote-workspace-target-session-export.ts
@@ -113,9 +113,14 @@ function catalogAttributionForPartition(
   resolveWorktreeOwner: WorktreeOwnerResolver,
   host: WorkspaceSessionState,
   hostId: ExecutionHostId
-): { contestedSessionKeys: Set<string>; foreignSessionKeys: Set<string> } {
+): {
+  contestedSessionKeys: Set<string>
+  foreignSessionKeys: Set<string>
+  ownedSessionKeys: Set<string>
+} {
   const contestedSessionKeys = new Set<string>()
   const foreignSessionKeys = new Set<string>()
+  const ownedSessionKeys = new Set<string>()
   for (const workspaceId of workspaceIdsNamedByPartition(host)) {
     // A folder key names no repo, and `getRepoIdFromWorktreeId` hands back the whole key rather
     // than nothing, so the catalog would be asked about `folder:<uuid>` and answer `unknown`.
@@ -130,7 +135,9 @@ function catalogAttributionForPartition(
       }
     } else if (resolution.hostId !== hostId) {
       foreignSessionKeys.add(workspaceId)
+    } else {
+      ownedSessionKeys.add(workspaceId)
     }
   }
-  return { contestedSessionKeys, foreignSessionKeys }
+  return { contestedSessionKeys, foreignSessionKeys, ownedSessionKeys }
 }
diff --git a/src/main/ipc/repos/folder-workspace-attachment-handlers.test.ts b/src/main/ipc/repos/folder-workspace-attachment-handlers.test.ts
new file mode 100644
index 000000000000..06c2461b9c2d
--- /dev/null
+++ b/src/main/ipc/repos/folder-workspace-attachment-handlers.test.ts
@@ -0,0 +1,124 @@
+import { beforeEach, afterEach, describe, expect, it, vi } from 'vitest'
+import { BrowserWindow } from 'electron'
+import { mkdtempSync, rmSync } from 'node:fs'
+import { join } from 'node:path'
+import { tmpdir } from 'node:os'
+import { closeTestStores, createStore, testState } from '../../persistence-test-harness'
+import type { WorkspaceAttachment } from '../../../shared/worktree/types'
+import { registerFolderWorkspaceHandlers } from './folder-workspace-handlers'
+
+const { handlers } = vi.hoisted(() => ({
+  handlers: new Map<string, (event: unknown, args: unknown) => unknown>()
+}))
+vi.mock('electron', () => ({
+  BrowserWindow: class {},
+  app: { getPath: () => testState.dir },
+  safeStorage: { isEncryptionAvailable: () => false },
+  ipcMain: {
+    handle: (channel: string, handler: (event: unknown, args: unknown) => unknown) => {
+      handlers.set(channel, handler)
+    }
+  }
+}))
+vi.mock('../../telemetry/client', () => ({ track: vi.fn() }))
+vi.mock('../../telemetry/cohort-classifier', () => ({ getCohortAtEmit: vi.fn() }))
+vi.mock('./repos-changed-notification', () => ({ notifyReposChanged: vi.fn() }))
+
+const linkedItems: WorkspaceAttachment[] = [
+  { provider: 'github', type: 'pr', number: 7 },
+  { provider: 'gitlab', type: 'mr', number: 8 },
+  { provider: 'linear', type: 'issue', number: 0, identifier: 'APP-42' }
+]
+
+async function invoke(channel: string, args: unknown): Promise<unknown> {
+  const handler = handlers.get(channel)
+  if (!handler) {
+    throw new Error(`Handler not registered: ${channel}`)
+  }
+  return handler(undefined, args)
+}
+
+describe('folder workspace attachment desktop IPC', () => {
+  beforeEach(() => {
+    handlers.clear()
+    testState.dir = mkdtempSync(join(tmpdir(), 'orca-folder-ipc-'))
+  })
+  afterEach(async () => {
+    await closeTestStores()
+    rmSync(testState.dir, { recursive: true, force: true })
+  })
+
+  it('preserves all attachments through the registered update handler, durable reload, and list handler', async () => {
+    const store = createStore()
+    const group = store.createProjectGroup({
+      name: 'Docs',
+      parentPath: testState.dir,
+      createdFrom: 'folder-scan'
+    })
+    const workspace = store.createFolderWorkspace({ projectGroupId: group.id })
+    registerFolderWorkspaceHandlers(new BrowserWindow(), store, {
+      deleteFolderWorkspace: vi.fn(async () => ({ deleted: true }))
+    })
+    expect(
+      await invoke('folderWorkspaces:update', {
+        folderWorkspaceId: workspace.id,
+        updates: { linkedItems }
+      })
+    ).toMatchObject({ linkedItems })
+    store.flush()
+    const restored = createStore()
+    expect(restored.getFolderWorkspace(workspace.id)?.linkedItems).toEqual(linkedItems)
+    expect(await invoke('folderWorkspaces:list', undefined)).toContainEqual(
+      expect.objectContaining({ linkedItems })
+    )
+    expect(
+      await invoke('folderWorkspaces:update', {
+        folderWorkspaceId: workspace.id,
+        updates: { linkedItems: [] }
+      })
+    ).toMatchObject({ linkedItems: [], linkedTask: null })
+  })
+
+  it('preserves collections on creation and rejects malformed attachment writes', async () => {
+    const store = createStore()
+    const group = store.createProjectGroup({
+      name: 'Docs',
+      parentPath: testState.dir,
+      createdFrom: 'folder-scan'
+    })
+    registerFolderWorkspaceHandlers(new BrowserWindow(), store, {
+      deleteFolderWorkspace: vi.fn(async () => ({ deleted: true }))
+    })
+    expect(
+      await invoke('folderWorkspaces:create', { projectGroupId: group.id, linkedItems })
+    ).toMatchObject({ linkedItems })
+    await expect(
+      invoke('folderWorkspaces:create', { projectGroupId: group.id, linkedItems: [{}] })
+    ).rejects.toThrow('invalid_folder_workspace_create_args')
+  })
+  it('preserves concurrent collection additions through desktop IPC', async () => {
+    const store = createStore()
+    const group = store.createProjectGroup({
+      name: 'Docs',
+      parentPath: testState.dir,
+      createdFrom: 'folder-scan'
+    })
+    const base = [linkedItems[0]]
+    const workspace = store.createFolderWorkspace({ projectGroupId: group.id, linkedItems: base })
+    registerFolderWorkspaceHandlers(new BrowserWindow(), store, {
+      deleteFolderWorkspace: vi.fn(async () => ({ deleted: true }))
+    })
+    await invoke('folderWorkspaces:update', {
+      folderWorkspaceId: workspace.id,
+      updates: { linkedItemsBase: base, linkedItems: [linkedItems[0], linkedItems[1]] }
+    })
+    await invoke('folderWorkspaces:update', {
+      folderWorkspaceId: workspace.id,
+      updates: { linkedItemsBase: base, linkedItems: [linkedItems[2]] }
+    })
+    expect(store.getFolderWorkspace(workspace.id)?.linkedItems).toEqual([
+      linkedItems[1],
+      linkedItems[2]
+    ])
+  })
+})
diff --git a/src/main/ipc/repos/folder-workspace-handlers.ts b/src/main/ipc/repos/folder-workspace-handlers.ts
index 634c6aae0108..744d919d2823 100644
--- a/src/main/ipc/repos/folder-workspace-handlers.ts
+++ b/src/main/ipc/repos/folder-workspace-handlers.ts
@@ -23,7 +23,7 @@ import { visibleFolderWorkspaces } from '../../ssh/orcad-retained-source'
 export function registerFolderWorkspaceHandlers(
   mainWindow: BrowserWindow,
   store: Store,
-  runtime: OrcaRuntimeService
+  runtime: Pick<OrcaRuntimeService, 'deleteFolderWorkspace'>
 ): void {
   ipcMain.handle('folderWorkspaces:list', (): FolderWorkspace[] => visibleFolderWorkspaces(store))
 
diff --git a/src/main/ipc/repos/repo-ipc-arg-schemas.ts b/src/main/ipc/repos/repo-ipc-arg-schemas.ts
index 967601ecb4da..3093ed0024bc 100644
--- a/src/main/ipc/repos/repo-ipc-arg-schemas.ts
+++ b/src/main/ipc/repos/repo-ipc-arg-schemas.ts
@@ -2,6 +2,7 @@ import { z } from 'zod'
 import { isTuiAgent } from '../../../shared/tui-agent-config'
 import { TaskSourceContextSchema } from '../../../shared/task-source-context-schema'
 import { WorkspaceLinkedItemSchema } from '../../../shared/workspace-linked-item-schema'
+import { WorkspaceAttachmentsSchema } from '../../../shared/workspace-attachment-schema'
 import { isWorkspaceLinkedItemSourceContextMatch } from '../../../shared/workspace-linked-item-source-context'
 import { DiffCommentSchema } from '../../../shared/diff-comment-schema'
 import { normalizeExecutionHostId } from '../../../shared/execution-host'
@@ -134,6 +135,8 @@ export const FolderWorkspaceCreateArgs = z
     folderPath: z.string().nullable().optional(),
     connectionId: z.string().nullable().optional(),
     linkedTask: FolderWorkspaceLinkedTaskArgs.optional(),
+    linkedItems: WorkspaceAttachmentsSchema.optional(),
+
     linkedTaskSourceContext: TaskSourceContextSchema.nullable().optional(),
     createdWithAgent: z.string().refine(isTuiAgent).optional(),
     pendingFirstAgentMessageRename: z.boolean().optional()
@@ -147,6 +150,9 @@ export const FolderWorkspaceUpdateArgs = z.object({
       name: z.string().optional(),
       folderPath: z.string().optional(),
       linkedTask: FolderWorkspaceLinkedTaskArgs.optional(),
+      linkedItems: WorkspaceAttachmentsSchema.optional(),
+      linkedItemsBase: WorkspaceAttachmentsSchema.optional(),
+      linkedItemsSelectionChanged: z.boolean().optional(),
       linkedTaskSourceContext: TaskSourceContextSchema.nullable().optional(),
       comment: z.string().optional(),
       isArchived: z.boolean().optional(),
diff --git a/src/main/ipc/runtime-upload-file-stream.ts b/src/main/ipc/runtime-upload-file-stream.ts
index 079549e47111..00a5788537e5 100644
--- a/src/main/ipc/runtime-upload-file-stream.ts
+++ b/src/main/ipc/runtime-upload-file-stream.ts
@@ -35,6 +35,38 @@ export type RuntimeUploadFileStreamArgs = RuntimeUploadFileStreamRequest & {
  */
 export async function streamExternalFileToRuntime(
   args: RuntimeUploadFileStreamArgs
+): Promise<{ byteLength: number }> {
+  return streamExternalFileSlices({
+    sourceRootPath: args.sourceRootPath,
+    entryRelativePath: args.entryRelativePath,
+    expected: args.expected,
+    signal: args.signal,
+    maxFileBytes: REMOTE_IMPORT_MAX_FILE_BYTES,
+    limitLabel: 'per-file remote import limit',
+    writeSlice: (contentBase64, offset) => sendChunk(args, contentBase64, offset > 0)
+  })
+}
+
+export type ExternalFileSliceStreamArgs = {
+  /** Client-local path of the dropped source (file, or root of a dropped directory). */
+  sourceRootPath: string
+  /** Path of this file within the dropped directory; empty when the source is a file. */
+  entryRelativePath: string
+  expected: StagedRuntimeUploadFileIdentity
+  signal?: AbortSignal
+  maxFileBytes: number
+  /** Names the ceiling in the refusal, e.g. "per-file remote import limit". */
+  limitLabel: string
+  /** Sends one base64 slice; `offset` is in source bytes. An empty file sends one empty slice. */
+  writeSlice: (contentBase64: string, offset: number) => Promise<void>
+}
+
+/**
+ * Read a staged client-local file in slices and hand each to `writeSlice`, refusing a source that
+ * was swapped or changed since staging. The destination decides what a slice becomes.
+ */
+export async function streamExternalFileSlices(
+  args: ExternalFileSliceStreamArgs
 ): Promise<{ byteLength: number }> {
   const sourcePath = resolveEntrySourcePath(args.sourceRootPath, args.entryRelativePath)
 
@@ -72,16 +104,16 @@ export async function streamExternalFileToRuntime(
     const totalBytes = openedStat.size
     // Why: enforced again where the bytes actually move. Staging is a separate
     // call, so the ceiling only holds here if this boundary checks it too.
-    if (totalBytes > REMOTE_IMPORT_MAX_FILE_BYTES) {
+    if (totalBytes > args.maxFileBytes) {
       throw new Error(
         `'${displayPath}' is ${formatByteCeiling(totalBytes)}, over the ` +
-          `${formatByteCeiling(REMOTE_IMPORT_MAX_FILE_BYTES)} per-file remote import limit`
+          `${formatByteCeiling(args.maxFileBytes)} ${args.limitLabel}`
       )
     }
     if (totalBytes === 0) {
       // Why: a zero-byte source produces no slices, but the destination still
       // has to exist before commitUpload renames it into place.
-      await sendChunk(args, '', false)
+      await args.writeSlice('', 0)
     } else {
       const buffer = Buffer.allocUnsafe(Math.min(RUNTIME_UPLOAD_SLICE_BYTES, totalBytes))
       let offset = 0
@@ -93,7 +125,7 @@ export async function streamExternalFileToRuntime(
         if (bytesRead === 0) {
           throw new Error(`File truncated during upload: '${displayPath}'`)
         }
-        await sendChunk(args, buffer.subarray(0, bytesRead).toString('base64'), offset > 0)
+        await args.writeSlice(buffer.subarray(0, bytesRead).toString('base64'), offset)
         offset += bytesRead
       }
     }
diff --git a/src/main/ipc/settings.test.ts b/src/main/ipc/settings.test.ts
index 3089af28e74a..b1b4a8cdea47 100644
--- a/src/main/ipc/settings.test.ts
+++ b/src/main/ipc/settings.test.ts
@@ -99,6 +99,7 @@ type SettingsChangedListener = (
 const store = {
   getSettings: vi.fn(),
   updateSettings: vi.fn(),
+  updateSettingsAndFlush: vi.fn(),
   getGitHubCache: vi.fn(),
   setGitHubCache: vi.fn(),
   onSettingsChanged: vi.fn(() => () => {})
@@ -107,6 +108,7 @@ const store = {
 describe('registerSettingsHandlers', () => {
   beforeEach(() => {
     handleMock.mockClear()
+    store.updateSettingsAndFlush.mockReset()
     onMock.mockClear()
     applyAppIconMock.mockClear()
     applyAgentStatusHooksEnabledMock.mockReset().mockResolvedValue([])
@@ -239,6 +241,23 @@ describe('registerSettingsHandlers', () => {
     )
   })
 
+  it('propagates a failed durable force-delete preference write through settings:set', async () => {
+    store.getSettings.mockReturnValue({ alwaysForceDeleteWorktrees: false })
+    store.updateSettingsAndFlush.mockRejectedValue(new Error('Disk full'))
+    registerSettingsHandlers(store as never)
+    const handler = handleMock.mock.calls.find((call) => call[0] === 'settings:set')?.[1]
+    if (typeof handler !== 'function') {
+      throw new Error('Missing settings:set handler')
+    }
+    await expect(
+      handler(settingsInvokeEvent, { alwaysForceDeleteWorktrees: true, editorWordWrap: false })
+    ).rejects.toThrow('Disk full')
+    expect(store.updateSettingsAndFlush).toHaveBeenCalledWith(
+      { alwaysForceDeleteWorktrees: true, editorWordWrap: false },
+      { notifyListeners: true, originWebContentsId: 1 }
+    )
+  })
+
   it('persists Active Server only through the dedicated preference channel', () => {
     store.updateSettings.mockReturnValue({ activeRuntimeEnvironmentId: 'windows-2' })
     registerSettingsHandlers(store as never)
diff --git a/src/main/ipc/settings.ts b/src/main/ipc/settings.ts
index e2a173e21b16..8442bfd86829 100644
--- a/src/main/ipc/settings.ts
+++ b/src/main/ipc/settings.ts
@@ -199,10 +199,14 @@ export function registerSettingsHandlers(
     // (e.g. blur after a no-op edit), and a `settings_changed` event for a
     // no-op flip would inflate the experimental-feature-adoption signal.
     const before = store.getSettings()
-    const result = store.updateSettings(sanitizedArgs, {
+    const updateOptions = {
       notifyListeners: true,
       originWebContentsId: event.sender.id
-    })
+    }
+    const result =
+      'alwaysForceDeleteWorktrees' in sanitizedArgs
+        ? await store.updateSettingsAndFlush(sanitizedArgs, updateOptions)
+        : store.updateSettings(sanitizedArgs, updateOptions)
     const proxySettingsChanged =
       ('httpProxyUrl' in sanitizedArgs && before.httpProxyUrl !== result.httpProxyUrl) ||
       ('httpProxyBypassRules' in sanitizedArgs &&
diff --git a/src/main/ipc/sparse-preset-attribution.test.ts b/src/main/ipc/sparse-preset-attribution.test.ts
new file mode 100644
index 000000000000..34861c818d9f
--- /dev/null
+++ b/src/main/ipc/sparse-preset-attribution.test.ts
@@ -0,0 +1,68 @@
+import { describe, expect, it, vi } from 'vitest'
+import type { SparsePreset } from '../../shared/worktree/create-types'
+import { attributedSparsePresetId } from './sparse-preset-attribution'
+
+const PRESET: SparsePreset = {
+  id: 'preset-1',
+  repoId: 'repo-1',
+  name: 'web',
+  directories: ['apps/web', 'packages/ui'],
+  createdAt: 0,
+  updatedAt: 0
+}
+
+describe('the sparse preset a create is recorded under', () => {
+  it('keeps a preset whose directories are exactly the ones checked out, in any order', () => {
+    expect(
+      attributedSparsePresetId(() => [PRESET], 'repo-1', 'preset-1', ['packages/ui', 'apps/web'])
+    ).toBe('preset-1')
+  })
+
+  it('keeps a preset saved with trailing slashes', () => {
+    const preset = { ...PRESET, directories: ['apps/web/', 'packages/ui/'] }
+    expect(
+      attributedSparsePresetId(() => [preset], 'repo-1', 'preset-1', ['apps/web', 'packages/ui'])
+    ).toBe('preset-1')
+  })
+
+  it.each([
+    ['an edited selection', 'repo-1', 'preset-1', ['apps/web']],
+    [
+      'a selection that repeats one of its directories',
+      'repo-1',
+      'preset-1',
+      ['apps/web', 'apps/web']
+    ],
+    ['another repo’s preset', 'repo-2', 'preset-1', ['apps/web', 'packages/ui']],
+    ['a preset that no longer exists', 'repo-1', 'preset-gone', ['apps/web', 'packages/ui']]
+  ])('records none for %s', (_case, repoId, presetId, directories) => {
+    expect(attributedSparsePresetId(() => [PRESET], repoId, presetId, directories)).toBeUndefined()
+  })
+
+  it.each([undefined, ''])('does not read presets when no preset was chosen (%j)', (presetId) => {
+    const readPresets = vi.fn(() => [PRESET])
+    expect(
+      attributedSparsePresetId(readPresets, 'repo-1', presetId, ['apps/web', 'packages/ui'])
+    ).toBeUndefined()
+    expect(readPresets).not.toHaveBeenCalled()
+  })
+
+  it('records none, without throwing, when presets cannot be read', () => {
+    const readPresets = (): SparsePreset[] => {
+      throw new Error('corrupt presets')
+    }
+    expect(
+      attributedSparsePresetId(readPresets, 'repo-1', 'preset-1', ['apps/web', 'packages/ui'])
+    ).toBeUndefined()
+  })
+
+  it('records none for a preset whose saved directories are not repo-relative', () => {
+    const preset = { ...PRESET, directories: ['/abs/apps/web', 'packages/ui'] }
+    expect(
+      attributedSparsePresetId(() => [preset], 'repo-1', 'preset-1', [
+        'abs/apps/web',
+        'packages/ui'
+      ])
+    ).toBeUndefined()
+  })
+})
diff --git a/src/main/ipc/sparse-preset-attribution.ts b/src/main/ipc/sparse-preset-attribution.ts
new file mode 100644
index 000000000000..4c186c401acd
--- /dev/null
+++ b/src/main/ipc/sparse-preset-attribution.ts
@@ -0,0 +1,33 @@
+import type { SparsePreset } from '../../shared/worktree/create-types'
+import { normalizeSparseDirectories } from './sparse-checkout-directories'
+
+/**
+ * The preset a sparse create is recorded under: only one of this repo's presets whose directories
+ * are exactly the ones checked out, so an edited selection is never shown as the preset it began as.
+ */
+export function attributedSparsePresetId(
+  readPresets: () => readonly SparsePreset[],
+  repoId: string,
+  presetId: string | undefined,
+  sparseDirectories: readonly string[]
+): string | undefined {
+  if (!presetId) {
+    return undefined
+  }
+  try {
+    const preset = readPresets().find((entry) => entry.id === presetId)
+    if (preset?.repoId !== repoId) {
+      return undefined
+    }
+    // Set-based so directory order doesn't matter, as the renderer's `sparseDirectoriesMatch` does.
+    const presetSet = new Set(normalizeSparseDirectories(preset.directories))
+    const checkedOutSet = new Set(sparseDirectories)
+    const directoriesMatch =
+      presetSet.size === checkedOutSet.size &&
+      [...checkedOutSet].every((entry) => presetSet.has(entry))
+    return directoriesMatch ? preset.id : undefined
+  } catch {
+    // Unreadable or corrupt preset data must not block the create or falsely label the new worktree.
+    return undefined
+  }
+}
diff --git a/src/main/ipc/worktree-linked-work-item-metadata.ts b/src/main/ipc/worktree-linked-work-item-metadata.ts
index e07e78ddfcbb..143cc35ca7a0 100644
--- a/src/main/ipc/worktree-linked-work-item-metadata.ts
+++ b/src/main/ipc/worktree-linked-work-item-metadata.ts
@@ -9,6 +9,7 @@ type LinkedWorkItemMetadata = Pick<
   | 'linkedAzureDevOpsPR'
   | 'linkedGiteaPR'
   | 'linkedWorkItem'
+  | 'linkedItems'
   | 'linkedTaskSourceContext'
 >
 
@@ -20,6 +21,7 @@ export function getLinkedWorkItemMetadata(meta: WorktreeMeta | undefined): Linke
     linkedAzureDevOpsPR: meta?.linkedAzureDevOpsPR ?? null,
     linkedGiteaPR: meta?.linkedGiteaPR ?? null,
     linkedWorkItem: meta?.linkedWorkItem ?? null,
+    ...(meta?.linkedItems !== undefined ? { linkedItems: meta.linkedItems } : {}),
     linkedTaskSourceContext: meta?.linkedTaskSourceContext ?? null
   }
 }
diff --git a/src/main/ipc/worktree-remote.ts b/src/main/ipc/worktree-remote.ts
index 4e4f1d51f4aa..7b7285d1a084 100644
--- a/src/main/ipc/worktree-remote.ts
+++ b/src/main/ipc/worktree-remote.ts
@@ -140,6 +140,7 @@ import { formatWorktreeIncludeCopyWarning } from './worktree-include-copy-budget
 import { resolveWorktreeIncludePaths } from '../git/worktree-include-file'
 import { resolveWorktreeSharedDirectories } from '../git/worktree-shared-directories'
 import { normalizeSparseDirectories } from './sparse-checkout-directories'
+import { attributedSparsePresetId } from './sparse-preset-attribution'
 import { joinWorktreeRelativePath } from '../runtime/runtime-relative-paths'
 import type { IFilesystemProvider } from '../providers/types'
 import {
@@ -1890,24 +1891,12 @@ export async function createRemoteWorktree(
   if (args.sparseCheckout && sparseDirectories.length === 0) {
     throw new Error('Sparse checkout requires at least one repo-relative directory.')
   }
-  let sparsePresetId: string | undefined
-  if (args.sparseCheckout?.presetId) {
-    const preset = store
-      .getSparsePresets(repo.id)
-      .find((entry) => entry.id === args.sparseCheckout?.presetId)
-    if (preset?.repoId === repo.id) {
-      try {
-        const presetDirectories = normalizeSparseDirectories(preset.directories)
-        const presetSet = new Set(presetDirectories)
-        const directoriesMatch =
-          presetDirectories.length === sparseDirectories.length &&
-          sparseDirectories.every((entry) => presetSet.has(entry))
-        sparsePresetId = directoriesMatch ? preset.id : undefined
-      } catch {
-        // Why: corrupt preset data should not block creation or falsely label the new worktree.
-      }
-    }
-  }
+  const sparsePresetId = attributedSparsePresetId(
+    () => store.getSparsePresets(repo.id),
+    repo.id,
+    args.sparseCheckout?.presetId,
+    sparseDirectories
+  )
 
   // Why: addWorktree/setup probes run inside the new path; older relays need that root registered before accepting git/fs ops there.
   await registerRequiredSshWorktreeCreateRoots(repo.connectionId!, [remotePath])
@@ -2119,6 +2108,7 @@ export async function createRemoteWorktree(
       : {}),
     ...(args.linkedGiteaPR !== undefined ? { linkedGiteaPR: args.linkedGiteaPR } : {}),
     ...(args.linkedWorkItem !== undefined ? { linkedWorkItem: args.linkedWorkItem } : {}),
+    ...(args.linkedItems !== undefined ? { linkedItems: args.linkedItems } : {}),
     ...(args.linkedTaskSourceContext !== undefined
       ? { linkedTaskSourceContext: args.linkedTaskSourceContext }
       : {}),
@@ -2379,25 +2369,12 @@ async function performLocalWorktreeCreate(
   if (args.sparseCheckout && sparseDirectories.length === 0) {
     throw new Error('Sparse checkout requires at least one repo-relative directory.')
   }
-  let sparsePresetId: string | undefined
-  if (args.sparseCheckout?.presetId) {
-    const preset = store
-      .getSparsePresets(repo.id)
-      .find((entry) => entry.id === args.sparseCheckout?.presetId)
-    if (preset?.repoId === repo.id) {
-      try {
-        const presetDirectories = normalizeSparseDirectories(preset.directories)
-        // Why: Set-based compare so directory order doesn't affect attribution — matches renderer's sparseDirectoriesMatch.
-        const presetSet = new Set(presetDirectories)
-        const directoriesMatch =
-          presetDirectories.length === sparseDirectories.length &&
-          sparseDirectories.every((entry) => presetSet.has(entry))
-        sparsePresetId = directoriesMatch ? preset.id : undefined
-      } catch {
-        // Why: corrupt preset data should not block creation or falsely label the new worktree.
-      }
-    }
-  }
+  const sparsePresetId = attributedSparsePresetId(
+    () => store.getSparsePresets(repo.id),
+    repo.id,
+    args.sparseCheckout?.presetId,
+    sparseDirectories
+  )
 
   let effectiveRequestedName = requestedName
   let effectiveSanitizedName = sanitizedName
@@ -2825,6 +2802,7 @@ async function performLocalWorktreeCreate(
       : {}),
     ...(args.linkedGiteaPR !== undefined ? { linkedGiteaPR: args.linkedGiteaPR } : {}),
     ...(args.linkedWorkItem !== undefined ? { linkedWorkItem: args.linkedWorkItem } : {}),
+    ...(args.linkedItems !== undefined ? { linkedItems: args.linkedItems } : {}),
     ...(args.linkedTaskSourceContext !== undefined
       ? { linkedTaskSourceContext: args.linkedTaskSourceContext }
       : {}),
diff --git a/src/main/ipc/worktrees-removal-recovery.test.ts b/src/main/ipc/worktrees-removal-recovery.test.ts
index 5827eb653913..c58cdc42d391 100644
--- a/src/main/ipc/worktrees-removal-recovery.test.ts
+++ b/src/main/ipc/worktrees-removal-recovery.test.ts
@@ -1,10 +1,13 @@
 import { beforeEach, describe, expect, it, vi } from 'vitest'
+import * as filesystemAuth from './filesystem-auth'
+import * as authorizedRootsCache from './registered-worktree-roots-cache'
 import * as localWorktreeFilesystem from '../local-worktree-filesystem'
 import { lstat, mkdir, mkdtemp, rm, writeFile } from 'node:fs/promises'
 import { tmpdir } from 'node:os'
 import { join } from 'node:path'
 import type { GitWorktreeInfo } from '../../shared/worktree/types'
 import type { RedactableSpan } from '../observability/redactor'
+import type { Store } from '../persistence'
 import { _resetTracerForTests, setActiveSink } from '../observability/tracer'
 import { agentHookServer } from '../agent-hooks/server'
 import { makePaneKey } from '../../shared/stable-pane-id'
@@ -26,7 +29,13 @@ import {
   getLocalPtyProviderMock,
   getSshPtyProviderMock
 } from './worktrees-test-module-mocks'
-import { handlers, mainWindow, setupWorktreeHandlers, store } from './worktrees-test-harness'
+import {
+  handlers,
+  harnessRepo,
+  mainWindow,
+  setupWorktreeHandlers,
+  store
+} from './worktrees-test-harness'
 import { makeWorktreeMeta, mockKnownFeatureWorktree } from './worktrees-test-fixtures'
 import type { WorktreeRuntimeStub } from './worktrees-test-runtime-stub'
 
@@ -120,15 +129,47 @@ describe('registerWorktreeHandlers', () => {
 
   beforeEach(() => {
     runtimeStub = setupWorktreeHandlers()
+    vi.spyOn(filesystemAuth, 'invalidateAuthorizedRootsCacheForRepo').mockClear()
+    vi.spyOn(authorizedRootsCache, 'invalidateAuthorizedRootsCache').mockClear()
   })
 
   it('prunes the persisted cleanup and space snapshots on removal', async () => {
     mockKnownFeatureWorktree()
     getEffectiveHooksMock.mockReturnValue(null)
     removeWorktreeMock.mockResolvedValue({})
+    const unrelatedRepo = { ...harnessRepo, id: 'repo-2', path: '/unrelated/repo' }
+    store.getRepos.mockReturnValue([harnessRepo, unrelatedRepo])
+    // oxlint-disable-next-line typescript/consistent-type-assertions -- SAFETY: this existing IPC store fixture supplies the repository, project, folder, and settings methods the root registry reads.
+    const cacheStore = store as unknown as Store
+    authorizedRootsCache.registerWorktreeRootsForRepo(cacheStore, 'repo-1', [
+      '/workspace/feature-wt'
+    ])
+    authorizedRootsCache.registerWorktreeRootsForRepo(cacheStore, 'repo-2', ['/unrelated/worktree'])
+    const removedRevision = authorizedRootsCache.getRegisteredWorktreeRootsRevision('repo-1')
+    const unrelatedRevision = authorizedRootsCache.getRegisteredWorktreeRootsRevision('repo-2')
 
     await handlers['worktrees:remove'](null, { worktreeId: 'repo-1::/workspace/feature-wt' })
 
+    expect(authorizedRootsCache.getRegisteredWorktreeRootsRevision('repo-1')).toBeGreaterThan(
+      removedRevision
+    )
+    expect(authorizedRootsCache.getRegisteredWorktreeRootsRevision('repo-2')).toBe(
+      unrelatedRevision
+    )
+    expect(authorizedRootsCache.isRegisteredWorktreePath('/workspace/feature-wt', cacheStore)).toBe(
+      false
+    )
+    expect(authorizedRootsCache.isRegisteredWorktreePath('/unrelated/worktree', cacheStore)).toBe(
+      true
+    )
+
+    expect(filesystemAuth.invalidateAuthorizedRootsCacheForRepo).toHaveBeenCalledOnce()
+    expect(filesystemAuth.invalidateAuthorizedRootsCacheForRepo).toHaveBeenCalledWith(
+      store,
+      'repo-1'
+    )
+    expect(authorizedRootsCache.invalidateAuthorizedRootsCache).not.toHaveBeenCalled()
+
     // A removed workspace must never resurrect from the cached scan snapshots.
     expect(pruneCleanupScanSnapshotMock).toHaveBeenCalledWith(
       '/profile-a',
@@ -142,6 +183,22 @@ describe('registerWorktreeHandlers', () => {
     )
   })
 
+  it('globally invalidates when the removed repo has no registered authorization owner', async () => {
+    mockKnownFeatureWorktree()
+    store.getRepos.mockReturnValue([])
+    getEffectiveHooksMock.mockReturnValue(null)
+    removeWorktreeMock.mockResolvedValue({})
+
+    await handlers['worktrees:remove'](null, { worktreeId: 'repo-1::/workspace/feature-wt' })
+
+    expect(filesystemAuth.invalidateAuthorizedRootsCacheForRepo).toHaveBeenCalledOnce()
+    expect(filesystemAuth.invalidateAuthorizedRootsCacheForRepo).toHaveBeenCalledWith(
+      store,
+      'repo-1'
+    )
+    expect(authorizedRootsCache.invalidateAuthorizedRootsCache).toHaveBeenCalledOnce()
+  })
+
   it('purges only the selected host when a normal worktree id is owned locally and over SSH', async () => {
     const worktreeId = 'repo-1::/workspace/feature-wt'
     const localRepo = {
@@ -290,6 +347,13 @@ describe('registerWorktreeHandlers', () => {
       worktreeId: 'repo-1::/workspace/feature-wt'
     })
 
+    expect(filesystemAuth.invalidateAuthorizedRootsCacheForRepo).toHaveBeenCalledOnce()
+    expect(filesystemAuth.invalidateAuthorizedRootsCacheForRepo).toHaveBeenCalledWith(
+      store,
+      'repo-1'
+    )
+    expect(authorizedRootsCache.invalidateAuthorizedRootsCache).not.toHaveBeenCalled()
+
     // Should have called git worktree prune to clean up stale tracking
     expect(gitExecFileAsyncMock).toHaveBeenCalledWith(['worktree', 'prune'], {
       cwd: '/workspace/repo'
diff --git a/src/main/ipc/worktrees-remove-preflight.test.ts b/src/main/ipc/worktrees-remove-preflight.test.ts
index 335eeda6e909..39d6758291f2 100644
--- a/src/main/ipc/worktrees-remove-preflight.test.ts
+++ b/src/main/ipc/worktrees-remove-preflight.test.ts
@@ -1,4 +1,6 @@
 import { beforeEach, describe, expect, it, vi } from 'vitest'
+import * as filesystemAuth from './filesystem-auth'
+import * as authorizedRootsCache from './registered-worktree-roots-cache'
 import {
   removeWorktreeLinkedPathsMock,
   findExistingWorktreeSymlinkPathsMock,
@@ -104,6 +106,8 @@ describe('registerWorktreeHandlers', () => {
 
   beforeEach(() => {
     runtimeStub = setupWorktreeHandlers()
+    vi.spyOn(filesystemAuth, 'invalidateAuthorizedRootsCacheForRepo').mockClear()
+    vi.spyOn(authorizedRootsCache, 'invalidateAuthorizedRootsCache').mockClear()
   })
 
   it('fails dirty non-force deletes before PTY teardown', async () => {
@@ -139,6 +143,8 @@ describe('registerWorktreeHandlers', () => {
     expect(removeWorktreeLinkedPathsMock).not.toHaveBeenCalled()
     expect(killAllProcessesForWorktreeMock).not.toHaveBeenCalled()
     expect(removeWorktreeMock).not.toHaveBeenCalled()
+    expect(filesystemAuth.invalidateAuthorizedRootsCacheForRepo).not.toHaveBeenCalled()
+    expect(authorizedRootsCache.invalidateAuthorizedRootsCache).not.toHaveBeenCalled()
   })
 
   it('propagates a timed-out removal preflight before watcher teardown', async () => {
@@ -200,6 +206,8 @@ describe('registerWorktreeHandlers', () => {
     expect(removeWorktreeLinkedPathsMock).not.toHaveBeenCalled()
     expect(killAllProcessesForWorktreeMock).not.toHaveBeenCalled()
     expect(removeWorktreeMock).not.toHaveBeenCalled()
+    expect(filesystemAuth.invalidateAuthorizedRootsCacheForRepo).not.toHaveBeenCalled()
+    expect(authorizedRootsCache.invalidateAuthorizedRootsCache).not.toHaveBeenCalled()
   })
 
   it('rechecks a local Git lock after the archive hook before teardown', async () => {
diff --git a/src/main/ipc/worktrees/create/folder-workspace-creation.ts b/src/main/ipc/worktrees/create/folder-workspace-creation.ts
index c870ef734ebe..6581a9ffd5ff 100644
--- a/src/main/ipc/worktrees/create/folder-workspace-creation.ts
+++ b/src/main/ipc/worktrees/create/folder-workspace-creation.ts
@@ -58,6 +58,7 @@ export function createFolderWorkspace(
       : {}),
     ...(args.linkedGiteaPR !== undefined ? { linkedGiteaPR: args.linkedGiteaPR } : {}),
     ...(args.linkedWorkItem !== undefined ? { linkedWorkItem: args.linkedWorkItem } : {}),
+    ...(args.linkedItems !== undefined ? { linkedItems: args.linkedItems } : {}),
     ...(args.linkedTaskSourceContext !== undefined
       ? { linkedTaskSourceContext: args.linkedTaskSourceContext }
       : {})
diff --git a/src/main/ipc/worktrees/folder-workspace-model.ts b/src/main/ipc/worktrees/folder-workspace-model.ts
index 8f42175fce47..83738697bba7 100644
--- a/src/main/ipc/worktrees/folder-workspace-model.ts
+++ b/src/main/ipc/worktrees/folder-workspace-model.ts
@@ -54,6 +54,7 @@ export function mergeFolderWorkspace(repo: Repo, worktreeId: string, meta: Workt
     linkedAzureDevOpsPR: meta.linkedAzureDevOpsPR ?? null,
     linkedGiteaPR: meta.linkedGiteaPR ?? null,
     linkedWorkItem: meta.linkedWorkItem ?? null,
+    ...(meta.linkedItems !== undefined ? { linkedItems: meta.linkedItems } : {}),
     linkedTaskSourceContext: meta.linkedTaskSourceContext ?? null,
     isArchived: meta.isArchived ?? false,
     isUnread: meta.isUnread ?? false,
diff --git a/src/main/ipc/worktrees/ipc-context-schemas.ts b/src/main/ipc/worktrees/ipc-context-schemas.ts
index e25a2e96d4be..f4f957201249 100644
--- a/src/main/ipc/worktrees/ipc-context-schemas.ts
+++ b/src/main/ipc/worktrees/ipc-context-schemas.ts
@@ -7,6 +7,7 @@ import type { ExecutionHostId } from '../../../shared/execution-host'
 import type { NestedWorktreeRemovalApproval } from '../../../shared/worktree/nested-removal'
 import type { ListDetectedWorktreesArgs } from '../../../shared/detected-worktree-provider-contract'
 import { WorkspaceLinkedItemSchema } from '../../../shared/workspace-linked-item-schema'
+import { WorkspaceAttachmentsSchema } from '../../../shared/workspace-attachment-schema'
 import { TaskSourceContextSchema } from '../../../shared/task-source-context-schema'
 import { isWorkspaceLinkedItemSourceContextMatch } from '../../../shared/workspace-linked-item-source-context'
 
@@ -38,9 +39,18 @@ export const NullableTaskSourceContextSchema = TaskSourceContextSchema.nullable(
 export function normalizeLinkedWorkItemFields<
   T extends {
     linkedWorkItem?: unknown
+    linkedItems?: unknown
+    linkedItemsBase?: unknown
+    linkedItemsSelectionChanged?: boolean
     linkedTaskSourceContext?: unknown
   }
 >(input: T): T {
+  if (
+    input.linkedItemsSelectionChanged !== undefined &&
+    typeof input.linkedItemsSelectionChanged !== 'boolean'
+  ) {
+    throw new Error('Invalid attachment selection mutation')
+  }
   const linkedWorkItem =
     input.linkedWorkItem === undefined
       ? undefined
@@ -58,6 +68,12 @@ export function normalizeLinkedWorkItemFields<
   }
   return {
     ...input,
+    ...(input.linkedItems !== undefined
+      ? { linkedItems: WorkspaceAttachmentsSchema.parse(input.linkedItems) }
+      : {}),
+    ...(input.linkedItemsBase !== undefined
+      ? { linkedItemsBase: WorkspaceAttachmentsSchema.parse(input.linkedItemsBase) }
+      : {}),
     ...(linkedWorkItem !== undefined ? { linkedWorkItem } : {}),
     ...(linkedTaskSourceContext !== undefined ? { linkedTaskSourceContext } : {})
   }
diff --git a/src/main/ipc/worktrees/removal/remove-registered-local-worktree.ts b/src/main/ipc/worktrees/removal/remove-registered-local-worktree.ts
index 5a27d987a788..52d8f26ee24d 100644
--- a/src/main/ipc/worktrees/removal/remove-registered-local-worktree.ts
+++ b/src/main/ipc/worktrees/removal/remove-registered-local-worktree.ts
@@ -22,7 +22,7 @@ import {
   findExistingWorktreeSymlinkPaths,
   removeWorktreeLinkedPaths
 } from '../../worktree-symlinks'
-import { invalidateAuthorizedRootsCache } from '../../registered-worktree-roots-cache'
+import { invalidateAuthorizedRootsCacheForRepo } from '../../filesystem-auth'
 import { runWorktreeChangeInvalidators } from '../../worktree-change-invalidators'
 import {
   formatWorktreeRemovalError,
@@ -276,7 +276,7 @@ async function finishLocalWorktreeRemoval({
             hostId: removalHostId
           })
         )
-        invalidateAuthorizedRootsCache()
+        invalidateAuthorizedRootsCacheForRepo(store, repoId)
         removalCompleted = true
         return {}
       } else {
@@ -315,7 +315,7 @@ async function finishLocalWorktreeRemoval({
     )
   })
   await withWorktreeRemoveStageSpan('cache_invalidation', 'local', async () => {
-    invalidateAuthorizedRootsCache()
+    invalidateAuthorizedRootsCacheForRepo(store, repoId)
   })
   return removalResult ?? {}
 }
diff --git a/src/main/jsonl-rpc/agent-connection.test.ts b/src/main/jsonl-rpc/agent-connection.test.ts
new file mode 100644
index 000000000000..d8cd3e009ea4
--- /dev/null
+++ b/src/main/jsonl-rpc/agent-connection.test.ts
@@ -0,0 +1,224 @@
+import { EventEmitter } from 'node:events'
+import { PassThrough } from 'node:stream'
+import { afterEach, describe, expect, it, vi } from 'vitest'
+import type { spawnProcess } from '../../shared/child-process/run-process'
+import { ROOT_ONLY_GRACEFUL_EXIT_MS } from '../provider-process/provider-process-close'
+import { PROVIDER_SUPERVISOR_MAX_STOP_MS } from '../provider-process/provider-process-supervisor'
+import type { terminateProviderProcessTree } from '../provider-process/provider-process-teardown'
+import { JsonlRpcAgentConnection, type JsonlRpcAgentConnectionOptions } from './agent-connection'
+
+const teardown = vi.hoisted(() =>
+  vi.fn<typeof terminateProviderProcessTree>(async () => 'unverifiable')
+)
+vi.mock('../provider-process/provider-process-teardown', () => ({
+  terminateProviderProcessTree: teardown
+}))
+const opened: { connection: JsonlRpcAgentConnection; exit: () => void }[] = []
+const grace =
+  process.platform === 'win32' ? ROOT_ONLY_GRACEFUL_EXIT_MS : PROVIDER_SUPERVISOR_MAX_STOP_MS
+
+function fixture(
+  options: JsonlRpcAgentConnectionOptions = {},
+  behavior: { exitOnEnd?: boolean; processless?: boolean } = {}
+) {
+  const child = Object.assign(new EventEmitter(), {
+    pid: behavior.processless ? undefined : 9_999_999,
+    stdin: new PassThrough(),
+    stdout: new PassThrough(),
+    stderr: new PassThrough(),
+    kill: vi.fn(() => true)
+  })
+  const spawn = vi.fn<typeof spawnProcess>(() => {
+    // oxlint-disable-next-line typescript/consistent-type-assertions -- SAFETY: Fixture supplies piped stdio, pid, kill and process lifecycle events read by the shared supervisor.
+    return child as unknown as ReturnType<typeof spawnProcess>
+  })
+  if (behavior.exitOnEnd !== false) {
+    child.stdin.once('finish', () => child.emit('exit', 0, null))
+  }
+  const connection = new JsonlRpcAgentConnection(
+    {
+      command: 'fixture-rpc-agent',
+      args: ['--mode', 'rpc'],
+      cwd: '/execution-host/folder',
+      env: { PI_CODING_AGENT_DIR: '/host/account', STRIPPED: 'overlay' },
+      envToDelete: ['STRIPPED']
+    },
+    options,
+    spawn
+  )
+  opened.push({ connection, exit: () => child.emit('exit', 0, null) })
+  return { child, spawn, connection }
+}
+afterEach(async () => {
+  for (const { connection, exit } of opened.splice(0)) {
+    exit()
+    await connection.close()
+  }
+  teardown.mockReset().mockResolvedValue('unverifiable')
+  vi.useRealTimers()
+})
+
+describe('JSON-lines RPC process ownership', () => {
+  it('uses host-resolved launch data and exposes ordinary RPC replies', async () => {
+    const { connection, child, spawn } = fixture()
+    expect(spawn).toHaveBeenCalledExactlyOnceWith(
+      expect.objectContaining({
+        cwd: '/execution-host/folder',
+        env: expect.objectContaining({ PI_CODING_AGENT_DIR: '/host/account' }),
+        stdio: ['pipe', 'pipe', 'pipe']
+      })
+    )
+    expect(spawn.mock.calls[0][0].env).not.toHaveProperty('STRIPPED')
+    const pending = connection.request('get_state')
+    child.stdout.write(
+      '{"type":"response","id":"orca-1","command":"get_state","success":true,"data":{"sessionFile":"/host/session.jsonl"}}\n'
+    )
+    expect(await pending).toEqual({ sessionFile: '/host/session.jsonl' })
+    expect(await connection.close()).toEqual({ root: 'exited', tree: null })
+  })
+
+  it('settles requests on proven exit with stdout open, and excludes stderr from public errors', async () => {
+    vi.useFakeTimers()
+    const onExit = vi.fn()
+    const { connection, child } = fixture({ onExit })
+    const pending = expect(connection.request('prompt')).rejects.toThrow('code 7')
+    child.stderr.write('sensitive stderr text')
+    child.emit('exit', 7, null)
+    child.emit('close', 7, null)
+    await vi.advanceTimersByTimeAsync(1_000)
+    await pending
+    expect(child.stdout.readableEnded).toBe(false)
+    expect(connection.rootVerdict).toBe('exited')
+    expect(onExit).toHaveBeenCalledExactlyOnceWith(expect.any(Error), {
+      expected: false,
+      exit: { code: 7, signal: null, processless: false }
+    })
+    expect(onExit.mock.calls[0][0].message).not.toContain('sensitive')
+  })
+
+  it('drains final response and event bytes written before the root exit', async () => {
+    const onRecord = vi.fn()
+    const onExit = vi.fn()
+    const { connection, child } = fixture({ onRecord, onExit })
+    const request = connection.request('get_state')
+    child.emit('exit', 0, null)
+    expect(connection.rootVerdict).toBe('exited')
+    expect(onExit).not.toHaveBeenCalled()
+    child.stdout.end(
+      '{"type":"response","command":"get_state","id":"orca-1","success":true,"data":{}}\n{"type":"agent_settled"}\n'
+    )
+    await expect(request).resolves.toEqual({})
+    await new Promise<void>((resolve) => setImmediate(resolve))
+    expect(onRecord).toHaveBeenCalledExactlyOnceWith({ type: 'agent_settled' })
+    expect(onExit).toHaveBeenCalledOnce()
+  })
+
+  it('closes a broken stdout transport and cleans up, while keeping host exit evidence separate', async () => {
+    vi.useFakeTimers()
+    const onExit = vi.fn()
+    const onClose = vi.fn()
+    const { connection, child } = fixture({ onExit, onClose }, { exitOnEnd: false })
+    const pending = expect(connection.request('prompt')).rejects.toThrow('stream closed')
+    child.stdout.emit('end')
+    await pending
+    expect(connection.closed).toBe(true)
+    expect(connection.rootVerdict).toBe('live')
+    expect(onClose).not.toHaveBeenCalled()
+    await vi.advanceTimersByTimeAsync(250)
+    expect(onClose).toHaveBeenCalledOnce()
+    expect(onExit).not.toHaveBeenCalled()
+    child.emit('exit', 0, null)
+    expect(connection.rootVerdict).toBe('exited')
+    await connection.close()
+  })
+
+  it('preserves the numeric exit when stdout closes first', async () => {
+    const onClose = vi.fn(),
+      onExit = vi.fn()
+    const { connection, child } = fixture({ onClose, onExit }, { exitOnEnd: false })
+    child.stdout.emit('end')
+    child.emit('exit', 7, null)
+    expect(onClose).not.toHaveBeenCalled()
+    expect(onExit).toHaveBeenCalledWith(
+      expect.objectContaining({ message: expect.stringContaining('code 7') }),
+      expect.anything()
+    )
+    await connection.close()
+  })
+
+  it('joins close attempts and retries unproven exit without starting another process', async () => {
+    vi.useFakeTimers()
+    const { connection, child, spawn } = fixture({}, { exitOnEnd: false })
+    const first = connection.close()
+    const joined = connection.close()
+    await vi.advanceTimersByTimeAsync(grace + 1_000)
+    expect(await first).toEqual({ root: 'live', tree: 'unverifiable' })
+    expect(await joined).toEqual({ root: 'live', tree: 'unverifiable' })
+    expect(teardown).toHaveBeenCalledOnce()
+    teardown.mockImplementationOnce(async () => {
+      child.emit('exit', null, 'SIGKILL')
+      return 'unverifiable'
+    })
+    const retry = connection.close()
+    await vi.advanceTimersByTimeAsync(grace + 1_000)
+    expect(await retry).toEqual({ root: 'exited', tree: 'unverifiable' })
+    expect(spawn).toHaveBeenCalledOnce()
+    expect(vi.getTimerCount()).toBe(0)
+  })
+
+  it('keeps retained descendant uncertainty when the root exits between attempts', async () => {
+    vi.useFakeTimers()
+    const { connection, child } = fixture({}, { exitOnEnd: false })
+    const close = connection.close()
+    await vi.advanceTimersByTimeAsync(grace + 1_000)
+    await close
+    child.emit('exit', null, 'SIGKILL')
+    await connection.close()
+    expect(connection.lastCloseResult).toEqual({ root: 'live', tree: 'unverifiable' })
+    expect(connection.rootVerdict).toBe('exited')
+  })
+
+  it('requires processless close evidence after a failed spawn', async () => {
+    const onExit = vi.fn()
+    const { connection, child } = fixture({ onExit }, { processless: true, exitOnEnd: false })
+    const pending = expect(connection.request('prompt')).rejects.toThrow('ENOENT')
+    child.emit('error', new Error('ENOENT'))
+    await pending
+    expect(connection.rootVerdict).toBe('unverifiable')
+    expect(onExit).not.toHaveBeenCalled()
+    child.emit('close', null, null)
+    expect(connection.rootVerdict).toBe('exited')
+    expect(onExit.mock.calls[0][1].exit.processless).toBe(true)
+  })
+
+  it('handles stderr failure, and isolates failing close and exit observers', async () => {
+    const { connection, child } = fixture({
+      onClose: () => {
+        throw new Error('close observer')
+      },
+      onExit: () => {
+        throw new Error('exit observer')
+      },
+      onDiagnostic: () => {
+        throw new Error('diagnostic observer')
+      }
+    })
+    const pending = expect(connection.request('prompt')).rejects.toThrow('stderr failed')
+    child.stderr.emit('error', new Error('stderr failed'))
+    await pending
+    expect(() => child.emit('exit', 1, null)).not.toThrow()
+  })
+
+  it('validates peer limits before spawning', () => {
+    const spawn = vi.fn<typeof spawnProcess>()
+    expect(
+      () =>
+        new JsonlRpcAgentConnection(
+          { command: 'fixture', args: [] },
+          { peer: { requestTimeoutMs: 0 } },
+          spawn
+        )
+    ).toThrow('timer duration')
+    expect(spawn).not.toHaveBeenCalled()
+  })
+})
diff --git a/src/main/jsonl-rpc/agent-connection.ts b/src/main/jsonl-rpc/agent-connection.ts
new file mode 100644
index 000000000000..65bd6cfc9ad3
--- /dev/null
+++ b/src/main/jsonl-rpc/agent-connection.ts
@@ -0,0 +1,182 @@
+import { spawnProcess } from '../../shared/child-process/run-process'
+import {
+  spawnManagedProviderProcess,
+  type ManagedProviderProcess,
+  type ProviderProcessExit
+} from '../provider-process/managed-provider-process'
+import type { ProviderProcessLaunch } from '../provider-process/provider-process-launch'
+import type { ProviderProcessCloseResult } from '../provider-process/provider-process-close'
+import {
+  JsonlRpcPeer,
+  JsonlRpcStreamClosedError,
+  type JsonlRpcPeerHandlers,
+  type JsonlRpcRecord
+} from './peer'
+import { resolveJsonlRpcPeerOptions, type JsonlRpcPeerOptions } from './peer-limits'
+
+export type JsonlRpcAgentConnectionOptions = JsonlRpcPeerHandlers & {
+  peer?: JsonlRpcPeerOptions
+  onExit?: (error: Error, context: { expected: boolean; exit: ProviderProcessExit }) => void
+}
+
+/** The owning runtime keeps process exit evidence separate from transport closure. */
+export class JsonlRpcAgentConnection {
+  private readonly managed: ManagedProviderProcess
+  private readonly peer: JsonlRpcPeer
+  private closing = false
+  private finishObservedExit?: () => void
+  private streamExitTimer?: ReturnType<typeof setTimeout>
+
+  constructor(
+    launch: ProviderProcessLaunch,
+    private readonly options: JsonlRpcAgentConnectionOptions = {},
+    spawnImpl: typeof spawnProcess = spawnProcess
+  ) {
+    const peerOptions = resolveJsonlRpcPeerOptions(options.peer)
+    this.managed = spawnManagedProviderProcess(launch, {
+      spawnImpl,
+      site: 'jsonl-rpc-agent-teardown'
+    })
+    const managed = this.managed
+    this.peer = new JsonlRpcPeer(
+      managed.child.stdout,
+      managed.child.stdin,
+      {
+        ...options,
+        onClose: (error) => {
+          const fail = (): void => {
+            if (this.closing || managed.rootVerdict === 'exited') {
+              return
+            }
+            void managed.close().then(
+              (result) => {
+                if (result.root !== 'exited') {
+                  this.diagnose('Agent exit was not proven after RPC failure')
+                }
+              },
+              () => this.diagnose('Agent cleanup failed after RPC failure')
+            )
+            options.onClose?.(error)
+          }
+          if (
+            error instanceof JsonlRpcStreamClosedError &&
+            !this.closing &&
+            managed.rootVerdict !== 'exited'
+          ) {
+            // EOF often precedes the exit carrying an import/startup failure's code.
+            this.streamExitTimer = setTimeout(fail, 250)
+            this.streamExitTimer.unref()
+          } else {
+            fail()
+          }
+        }
+      },
+      peerOptions
+    )
+    managed.child.on('error', this.onError)
+    managed.child.stderr.on('error', this.onError)
+    managed.onExit((exit) => {
+      clearTimeout(this.streamExitTimer)
+      const error = new Error(
+        exit.processless
+          ? 'Agent process could not start'
+          : `Agent process exited (code ${exit.code ?? 'none'}, signal ${exit.signal ?? 'none'})`
+      )
+      this.peer.finishOnInputEnd(error)
+      const stdout = managed.child.stdout
+      let finished = false
+      let timer: ReturnType<typeof setTimeout> | undefined
+      const finish = (): void => {
+        if (finished) {
+          return
+        }
+        finished = true
+        clearTimeout(timer)
+        stdout.removeListener('end', finish)
+        stdout.removeListener('close', finish)
+        this.finishObservedExit = undefined
+        this.peer.close(error)
+        managed.child.removeListener('error', this.onError)
+        try {
+          options.onExit?.(error, { expected: this.closing, exit })
+        } catch {
+          this.diagnose('Agent exit observer failed')
+        }
+      }
+      this.finishObservedExit = finish
+      if (
+        this.closing ||
+        exit.processless ||
+        this.peer.closed ||
+        stdout.destroyed ||
+        stdout.readableEnded
+      ) {
+        finish()
+      } else {
+        stdout.once('end', finish)
+        stdout.once('close', finish)
+        // A descendant can inherit stdout after the provider root exits.
+        timer = setTimeout(finish, 1_000)
+        timer.unref()
+      }
+    })
+  }
+
+  get pid(): number | undefined {
+    return this.managed.child.pid
+  }
+  get closed(): boolean {
+    return this.peer.closed
+  }
+  get rootVerdict(): ManagedProviderProcess['rootVerdict'] {
+    return this.managed.rootVerdict
+  }
+  get processless(): boolean {
+    return this.managed.processless
+  }
+  get lastCloseResult(): ManagedProviderProcess['lastCloseResult'] {
+    return this.managed.lastCloseResult
+  }
+
+  onExit(listener: () => void): void {
+    this.managed.onExit(listener)
+  }
+
+  request(
+    command: string,
+    params: Record<string, unknown> = {},
+    options: { timeoutMs?: number | null } = {}
+  ): Promise<unknown> {
+    return this.peer.request(command, params, options)
+  }
+
+  send(record: JsonlRpcRecord): Promise<void> {
+    return this.peer.send(record)
+  }
+
+  pauseReading(): void {
+    this.peer.pauseReading()
+  }
+
+  resumeReading(): void {
+    this.peer.resumeReading()
+  }
+
+  /** Stop sends the dialect's abort first, then closes this connection through the supervisor. */
+  close(error?: Error): Promise<ProviderProcessCloseResult> {
+    this.closing = true
+    clearTimeout(this.streamExitTimer)
+    this.finishObservedExit?.()
+    this.peer.close(error)
+    return this.managed.close()
+  }
+
+  private readonly onError = (error: Error): void => this.peer.close(error)
+  private diagnose(message: string): void {
+    try {
+      this.options.onDiagnostic?.(message)
+    } catch {
+      /* Diagnostics cannot break cleanup. */
+    }
+  }
+}
diff --git a/src/main/jsonl-rpc/peer-limits.ts b/src/main/jsonl-rpc/peer-limits.ts
new file mode 100644
index 000000000000..851adec01f4c
--- /dev/null
+++ b/src/main/jsonl-rpc/peer-limits.ts
@@ -0,0 +1,36 @@
+import { isSafeTimerDelayMs } from '../../shared/timer-delay'
+
+export type JsonlRpcPeerOptions = {
+  maxLineBytes?: number
+  maxQueuedWriteBytes?: number
+  maxPendingRequests?: number
+  requestTimeoutMs?: number
+}
+
+export function resolveJsonlRpcPeerOptions(
+  options: JsonlRpcPeerOptions = {}
+): Required<JsonlRpcPeerOptions> {
+  return {
+    maxLineBytes: positiveInteger(options.maxLineBytes, 8 * 1024 * 1024),
+    maxQueuedWriteBytes: positiveInteger(options.maxQueuedWriteBytes, 32 * 1024 * 1024),
+    maxPendingRequests: positiveInteger(options.maxPendingRequests, 128),
+    requestTimeoutMs: jsonlRpcRequestTimeout(options.requestTimeoutMs ?? 30_000)
+  }
+}
+
+function positiveInteger(value: number | undefined, fallback: number): number {
+  if (value === undefined) {
+    return fallback
+  }
+  if (!Number.isSafeInteger(value) || value <= 0) {
+    throw new RangeError('JSON-lines RPC limits must be positive finite integers')
+  }
+  return value
+}
+
+export function jsonlRpcRequestTimeout(value: number): number {
+  if (!isSafeTimerDelayMs(value) || value <= 0) {
+    throw new RangeError('JSON-lines RPC timeout must be a positive finite timer duration')
+  }
+  return value
+}
diff --git a/src/main/jsonl-rpc/peer.test.ts b/src/main/jsonl-rpc/peer.test.ts
new file mode 100644
index 000000000000..dc4b8e816b5a
--- /dev/null
+++ b/src/main/jsonl-rpc/peer.test.ts
@@ -0,0 +1,224 @@
+import { PassThrough, Writable } from 'node:stream'
+import { afterEach, describe, expect, it, vi } from 'vitest'
+import { JsonlRpcPeer, type JsonlRpcPeerHandlers } from './peer'
+import type { JsonlRpcPeerOptions } from './peer-limits'
+
+const peers: JsonlRpcPeer[] = []
+function fixture(
+  handlers: JsonlRpcPeerHandlers = {},
+  options: JsonlRpcPeerOptions = {},
+  output = new PassThrough()
+) {
+  const input = new PassThrough()
+  const peer = new JsonlRpcPeer(input, output, handlers, options)
+  peers.push(peer)
+  const reply = (record: unknown): void => {
+    input.write(`${JSON.stringify(record)}\n`)
+  }
+  return { input, output, peer, reply }
+}
+afterEach(() => {
+  for (const peer of peers.splice(0)) {
+    peer.close()
+  }
+  vi.useRealTimers()
+})
+
+describe('JSON-lines RPC peer', () => {
+  it('correlates control replies and preserves unknown event fields', async () => {
+    const onRecord = vi.fn()
+    const { peer, output, reply } = fixture({ onRecord })
+    const pending = peer.request('get_state')
+    expect(JSON.parse(output.read().toString())).toEqual({ type: 'get_state', id: 'orca-1' })
+    reply({ type: 'agent_start', future: { enabled: true } })
+    reply({
+      type: 'response',
+      id: 'orca-1',
+      command: 'get_state',
+      success: true,
+      data: { isStreaming: false }
+    })
+    expect(await pending).toEqual({ isStreaming: false })
+    expect(onRecord).toHaveBeenCalledExactlyOnceWith({
+      type: 'agent_start',
+      future: { enabled: true }
+    })
+  })
+
+  it('frames only on LF, preserving Unicode separators and split UTF-8 code points', () => {
+    const onRecord = vi.fn()
+    const { input } = fixture({ onRecord })
+    const bytes = Buffer.from('{"type":"message_update","text":"a\u2028b\u2029c😀"}\r\n')
+    const split = bytes.indexOf(Buffer.from('😀')) + 2
+    input.write(bytes.subarray(0, split))
+    expect(onRecord).not.toHaveBeenCalled()
+    input.write(bytes.subarray(split))
+    expect(onRecord).toHaveBeenCalledExactlyOnceWith({
+      type: 'message_update',
+      text: 'a\u2028b\u2029c😀'
+    })
+  })
+
+  it('pauses within a burst and preserves queued records and a partial suffix across repeated pauses', async () => {
+    const records: unknown[] = []
+    const { peer, input } = fixture({
+      onRecord: (record) => {
+        records.push(record)
+        peer.pauseReading()
+      }
+    })
+    input.write('{"type":"first"}\n{"type":"second"}\n{"type":"thi')
+    expect(records).toEqual([{ type: 'first' }])
+    input.write('rd"}\n{"type":"fourth"}\n')
+    peer.resumeReading()
+    expect(records).toEqual([{ type: 'first' }, { type: 'second' }])
+    peer.resumeReading()
+    await new Promise<void>((resolve) => setImmediate(resolve))
+    expect(records).toEqual([{ type: 'first' }, { type: 'second' }, { type: 'third' }])
+    peer.resumeReading()
+    expect(records).toEqual([
+      { type: 'first' },
+      { type: 'second' },
+      { type: 'third' },
+      { type: 'fourth' }
+    ])
+  })
+
+  it('ignores non-JSON output and routes id-less acknowledgements and dialogs', async () => {
+    const onRecord = vi.fn()
+    const onDiagnostic = vi.fn()
+    const { peer, input, output, reply } = fixture({ onRecord, onDiagnostic })
+    const writes: string[] = []
+    output.on('data', (chunk: Buffer) => writes.push(chunk.toString()))
+    input.write('extension banner\n\n')
+    await peer.send({ type: 'prompt', message: '/ask' })
+    reply({ type: 'extension_ui_request', id: 'dialog-1', method: 'input', title: 'Answer' })
+    await peer.send({ type: 'extension_ui_response', id: 'dialog-1', value: '' })
+    reply({ type: 'response', command: 'prompt', success: true })
+    expect(onRecord.mock.calls.map(([record]) => record.type)).toEqual([
+      'extension_ui_request',
+      'response'
+    ])
+    expect(writes.join('')).toContain('"value":""')
+    expect(onDiagnostic).toHaveBeenCalledExactlyOnceWith('Ignored non-JSON agent output')
+  })
+
+  it('does not time out prompts waiting for slash expansion, but bounds control requests', async () => {
+    vi.useFakeTimers()
+    const { peer, reply } = fixture({}, { requestTimeoutMs: 100 })
+    const prompt = peer.request('prompt', { message: '/ask' }, { timeoutMs: null })
+    const control = expect(peer.request('get_state')).rejects.toThrow('get_state in time')
+    await vi.advanceTimersByTimeAsync(1_000)
+    await control
+    reply({ type: 'response', id: 'orca-1', command: 'prompt', success: true })
+    await expect(prompt).resolves.toBeUndefined()
+    const bounded = expect(peer.request('prompt', {}, { timeoutMs: 10 })).rejects.toThrow('in time')
+    await vi.advanceTimersByTimeAsync(10)
+    await bounded
+    expect(vi.getTimerCount()).toBe(0)
+  })
+
+  it.each([
+    { type: 'response', command: 'wrong', success: true },
+    { type: 'response', command: 'prompt', success: 'yes' },
+    { type: 'reponse', command: 'prompt', success: true },
+    { type: 4 }
+  ])('rejects malformed identified replies without stranding a prompt: %j', async (record) => {
+    const { peer, reply } = fixture()
+    const pending = expect(peer.request('prompt')).rejects.toThrow('Invalid agent RPC response')
+    reply({ ...record, id: 'orca-1' })
+    await pending
+  })
+
+  it('ignores unsolicited replies and preserves structured command errors', async () => {
+    const onRecord = vi.fn()
+    const { peer, reply } = fixture({ onRecord })
+    const pending = expect(peer.request('get_state')).rejects.toThrow(
+      'No API key found for provider'
+    )
+    reply({ type: 'response', id: 'other', command: 'get_state', success: true })
+    reply({
+      type: 'response',
+      id: 'orca-1',
+      command: 'get_state',
+      success: false,
+      error: 'No API key found for provider'
+    })
+    await pending
+    expect(onRecord).not.toHaveBeenCalled()
+  })
+
+  it('closes on oversized records, with bounded diagnostics and no later dispatch', async () => {
+    const onRecord = vi.fn()
+    const { peer, input, reply } = fixture({ onRecord }, { maxLineBytes: 64 })
+    const pending = expect(peer.request('get_state')).rejects.toThrow('size limit')
+    input.write(`{"type":"secret","text":"${'x'.repeat(100)}`)
+    reply({ type: 'agent_settled' })
+    await pending
+    expect(peer.closed).toBe(true)
+    expect(onRecord).not.toHaveBeenCalled()
+  })
+
+  it('enforces pending capacity, and releases it after timeout and invalid response', async () => {
+    vi.useFakeTimers()
+    const { peer, reply } = fixture({}, { maxPendingRequests: 1, requestTimeoutMs: 10 })
+    const first = expect(peer.request('get_state')).rejects.toThrow('in time')
+    await expect(peer.request('get_state')).rejects.toThrow('capacity')
+    await vi.advanceTimersByTimeAsync(10)
+    await first
+    const second = peer.request('get_state')
+    reply({ type: 'response', id: 'orca-2', command: 'get_state', success: true })
+    await second
+    expect(vi.getTimerCount()).toBe(0)
+  })
+
+  it('settles all requests and detaches listeners on EOF, and isolates close observers', async () => {
+    const { peer, input, output } = fixture({
+      onClose: () => {
+        throw new Error('observer')
+      }
+    })
+    const pending = expect(peer.request('prompt')).rejects.toThrow('stream closed')
+    input.emit('end')
+    input.emit('close')
+    await pending
+    expect(input.listenerCount('data')).toBe(0)
+    expect(output.listenerCount('drain')).toBe(0)
+    await expect(peer.send({ type: 'abort' })).rejects.toThrow('stream closed')
+  })
+
+  it('rejects future writes after a broken pipe and consumes delayed stream errors', async () => {
+    const output = new Writable({
+      autoDestroy: false,
+      write(_data, _encoding, callback) {
+        callback(new Error('broken pipe'))
+      }
+    })
+    const input = new PassThrough()
+    const peer = new JsonlRpcPeer(input, output)
+    peers.push(peer)
+    await expect(peer.send({ type: 'abort' })).rejects.toThrow('broken pipe')
+    await expect(peer.request('prompt')).rejects.toThrow('broken pipe')
+    expect(() => output.emit('error', new Error('late error'))).not.toThrow()
+  })
+
+  it('closes a stalled active control write on timeout so later aborts cannot wait on it', async () => {
+    vi.useFakeTimers()
+    const output = new Writable({ write() {} })
+    const peer = new JsonlRpcPeer(new PassThrough(), output, {}, { requestTimeoutMs: 10 })
+    peers.push(peer)
+    const pending = expect(peer.request('get_state')).rejects.toThrow('in time')
+    await vi.advanceTimersByTimeAsync(10)
+    await pending
+    expect(peer.closed).toBe(true)
+    await expect(peer.send({ type: 'abort' })).rejects.toThrow('in time')
+  })
+
+  it('rejects invalid limits before installing stream listeners', () => {
+    const input = new PassThrough()
+    expect(() => new JsonlRpcPeer(input, new PassThrough(), {}, { maxLineBytes: 0 })).toThrow(
+      'positive finite integers'
+    )
+    expect(input.listenerCount('data')).toBe(0)
+  })
+})
diff --git a/src/main/jsonl-rpc/peer.ts b/src/main/jsonl-rpc/peer.ts
new file mode 100644
index 000000000000..992d7f987e2c
--- /dev/null
+++ b/src/main/jsonl-rpc/peer.ts
@@ -0,0 +1,295 @@
+import type { Readable, Writable } from 'node:stream'
+import { z } from 'zod'
+import {
+  createIncrementalNdjsonFramer,
+  encodeNdjson
+} from '../../shared/main-process-ndjson-framer'
+import { detachProviderStreamErrorHandler } from '../provider-process/provider-stdio-error-boundary'
+import { ProviderStdioWriteQueue } from '../provider-process/provider-stdio-write-queue'
+import {
+  jsonlRpcRequestTimeout,
+  resolveJsonlRpcPeerOptions,
+  type JsonlRpcPeerOptions
+} from './peer-limits'
+
+const recordSchema = z.looseObject({ type: z.string() })
+const responseSchema = z.looseObject({
+  type: z.literal('response'),
+  id: z.string().optional(),
+  command: z.string(),
+  success: z.boolean(),
+  data: z.unknown().optional(),
+  error: z.string().optional()
+})
+
+export type JsonlRpcRecord = z.infer<typeof recordSchema>
+export class JsonlRpcStreamClosedError extends Error {
+  constructor() {
+    super('Agent JSON-lines RPC stream closed')
+    this.name = 'JsonlRpcStreamClosedError'
+  }
+}
+export class JsonlRpcResponseError extends Error {
+  constructor(
+    readonly command: string,
+    message: string
+  ) {
+    super(message)
+    this.name = 'JsonlRpcResponseError'
+  }
+}
+export type JsonlRpcPeerHandlers = {
+  /** Includes deferred prompt acknowledgements without an id. */
+  /** A dialect failure is fatal: continuing would discard session or tool lifecycle evidence. */
+  onRecord?: (record: JsonlRpcRecord) => void
+  onClose?: (error: Error) => void
+  onDiagnostic?: (message: string) => void
+}
+type PendingRequest = {
+  command: string
+  resolve: (value: unknown) => void
+  reject: (error: Error) => void
+  timer?: ReturnType<typeof setTimeout>
+}
+
+/** Transport only: a dialect owns turns, dialogs, and session handles. */
+export class JsonlRpcPeer {
+  private readonly limits: Required<JsonlRpcPeerOptions>
+  private readonly pending = new Map<string, PendingRequest>()
+  private readonly writer: ProviderStdioWriteQueue
+  private readonly framer: ReturnType<typeof createIncrementalNdjsonFramer>
+  private nextId = 0
+  private terminalError?: Error
+  private inputEndError?: Error
+  private readingPaused = false
+
+  constructor(
+    private readonly input: Readable,
+    private readonly output: Writable,
+    private readonly handlers: JsonlRpcPeerHandlers = {},
+    options: JsonlRpcPeerOptions = {}
+  ) {
+    this.limits = resolveJsonlRpcPeerOptions(options)
+    this.writer = new ProviderStdioWriteQueue(
+      output,
+      this.limits.maxQueuedWriteBytes,
+      (error) => this.close(error),
+      {
+        capacity: () => new Error('JSON-lines RPC write queue capacity exceeded'),
+        closed: () => new Error('JSON-lines RPC output is not writable')
+      }
+    )
+    this.framer = createIncrementalNdjsonFramer(
+      (record) => this.dispatch(record),
+      (rejected) => {
+        if (rejected.kind === 'line-too-long') {
+          this.close(new Error('JSON-lines RPC record exceeded the size limit'))
+        } else {
+          this.diagnose('Ignored non-JSON agent output')
+        }
+      },
+      {
+        maxLineBytes: this.limits.maxLineBytes,
+        shouldPause: () => this.readingPaused || this.closed
+      }
+    )
+    input.setEncoding('utf8')
+    input.on('data', this.onData)
+    input.on('end', this.onEnd)
+    input.on('close', this.onEnd)
+    input.on('error', this.onError)
+    output.on('finish', this.onEnd)
+    output.on('close', this.onEnd)
+    output.on('error', this.onError)
+    if (input.destroyed || input.readableEnded || output.destroyed || !output.writable) {
+      this.onEnd()
+    }
+  }
+
+  get closed(): boolean {
+    return this.terminalError !== undefined
+  }
+
+  /** A process exit can precede the last bytes already written to stdout. */
+  finishOnInputEnd(error: Error): void {
+    this.inputEndError = error
+  }
+
+  pauseReading(): void {
+    this.readingPaused = true
+    this.input.pause()
+  }
+
+  resumeReading(): void {
+    if (this.closed) {
+      return
+    }
+    this.readingPaused = false
+    try {
+      this.framer.resume()
+      if (!this.readingPaused && !this.closed) {
+        this.input.resume()
+      }
+    } catch (error) {
+      this.close(error instanceof Error ? error : new Error(String(error)))
+    }
+  }
+
+  request(
+    command: string,
+    params: Record<string, unknown> = {},
+    options: { timeoutMs?: number | null } = {}
+  ): Promise<unknown> {
+    if (this.terminalError) {
+      return Promise.reject(this.terminalError)
+    }
+    if (this.pending.size >= this.limits.maxPendingRequests) {
+      return Promise.reject(new Error('JSON-lines RPC pending request capacity exceeded'))
+    }
+    let timeoutMs: number | null
+    try {
+      timeoutMs =
+        options.timeoutMs === null
+          ? null
+          : jsonlRpcRequestTimeout(options.timeoutMs ?? this.limits.requestTimeoutMs)
+    } catch (error) {
+      return Promise.reject(error)
+    }
+    const id = `orca-${++this.nextId}`
+    const controller = new AbortController()
+    return new Promise((resolve, reject) => {
+      const timer =
+        timeoutMs === null
+          ? undefined
+          : setTimeout(() => {
+              this.pending.delete(id)
+              const error = new Error(`Agent did not answer ${command} in time`)
+              controller.abort(error)
+              reject(error)
+            }, timeoutMs)
+      timer?.unref()
+      this.pending.set(id, { command, resolve, reject, timer })
+      void this.send({ ...params, type: command, id }, controller.signal).catch(
+        (error: unknown) => {
+          this.rejectPending(id, error instanceof Error ? error : new Error(String(error)))
+        }
+      )
+    })
+  }
+
+  /** The dialect may track acknowledgements independently of transport correlation. */
+  send(record: JsonlRpcRecord, signal?: AbortSignal): Promise<void> {
+    if (this.terminalError) {
+      return Promise.reject(this.terminalError)
+    }
+    try {
+      return this.writer.write(encodeNdjson(record, this.limits.maxLineBytes), signal)
+    } catch (error) {
+      return Promise.reject(error)
+    }
+  }
+
+  close(error: Error = new Error('Agent JSON-lines RPC stream closed')): void {
+    if (this.terminalError) {
+      return
+    }
+    this.terminalError = error
+    this.input.removeListener('data', this.onData)
+    this.input.removeListener('end', this.onEnd)
+    this.input.removeListener('close', this.onEnd)
+    detachProviderStreamErrorHandler(this.input, this.onError)
+    this.output.removeListener('finish', this.onEnd)
+    this.output.removeListener('close', this.onEnd)
+    detachProviderStreamErrorHandler(this.output, this.onError)
+    this.framer.reset()
+    this.writer.close(error)
+    for (const id of this.pending.keys()) {
+      this.rejectPending(id, error)
+    }
+    try {
+      this.handlers.onClose?.(error)
+    } catch {
+      this.diagnose('Agent RPC close observer failed')
+    }
+  }
+
+  private readonly onData = (chunk: string): void => {
+    try {
+      this.framer.feed(chunk)
+    } catch (error) {
+      this.close(error instanceof Error ? error : new Error(String(error)))
+    }
+  }
+  private readonly onEnd = (): void =>
+    this.close(this.inputEndError ?? new JsonlRpcStreamClosedError())
+  private readonly onError = (error: Error): void => this.close(error)
+
+  private diagnose(message: string): void {
+    try {
+      this.handlers.onDiagnostic?.(message)
+    } catch {
+      /* Diagnostics cannot break cleanup. */
+    }
+  }
+
+  private rejectPending(id: string, error: Error): void {
+    const pending = this.pending.get(id)
+    if (!pending) {
+      return
+    }
+    this.pending.delete(id)
+    clearTimeout(pending.timer)
+    pending.reject(error)
+  }
+
+  private dispatch(value: unknown): void {
+    if (this.closed) {
+      return
+    }
+    const parsed = recordSchema.safeParse(value)
+    if (!parsed.success) {
+      const identified = z.object({ id: z.string() }).safeParse(value)
+      if (identified.success) {
+        this.rejectPending(identified.data.id, new Error('Invalid agent RPC response'))
+      }
+      this.diagnose('Ignored invalid agent RPC record')
+      return
+    }
+    const record = parsed.data
+    if (
+      record.type !== 'response' &&
+      record.type !== 'extension_ui_request' &&
+      typeof record.id === 'string' &&
+      this.pending.has(record.id) &&
+      (Object.hasOwn(record, 'command') || Object.hasOwn(record, 'success'))
+    ) {
+      this.rejectPending(record.id, new Error('Invalid agent RPC response'))
+      return
+    }
+    if (record.type === 'response' && typeof record.id === 'string') {
+      const pending = this.pending.get(record.id)
+      if (!pending) {
+        return
+      }
+      const response = responseSchema.safeParse(record)
+      if (!response.success || response.data.command !== pending.command) {
+        this.rejectPending(record.id, new Error('Invalid agent RPC response'))
+        return
+      }
+      this.pending.delete(record.id)
+      clearTimeout(pending.timer)
+      if (response.data.success) {
+        pending.resolve(response.data.data)
+      } else {
+        pending.reject(
+          new JsonlRpcResponseError(
+            pending.command,
+            response.data.error ?? `Agent rejected ${pending.command}`
+          )
+        )
+      }
+      return
+    }
+    this.handlers.onRecord?.(record)
+  }
+}
diff --git a/src/main/jsonl-rpc/timeline-final-tail.test.ts b/src/main/jsonl-rpc/timeline-final-tail.test.ts
new file mode 100644
index 000000000000..f39f9e789918
--- /dev/null
+++ b/src/main/jsonl-rpc/timeline-final-tail.test.ts
@@ -0,0 +1,161 @@
+import { afterEach, describe, expect, it, vi } from 'vitest'
+import { AGENT_JOURNAL_THREAD_SCOPE } from '../../shared/agent-session-journal-types'
+import {
+  closeProviderTimelineRigs,
+  openProviderTimelineRig,
+  pendingApproval,
+  SESSION,
+  GENERATION,
+  NAMESPACE
+} from '../native-chat/agent-session-timeline/provider-timeline-assembler-test-support'
+import { providerTimelineSink } from '../native-chat/agent-session-timeline/provider-timeline-plan'
+import { createDeferredStructuredAgentSessionEventSink } from '../native-chat/agent-session-wire/structured-agent-session-event-sink'
+import { evictStructuredAgentSession } from '../native-chat/agent-session-wire/structured-agent-session-eviction'
+import { testEventSinkLogging } from '../native-chat/agent-session-wire/structured-agent-session-logger-test-support'
+import { JsonlRpcTimelineLane } from './timeline-lane'
+
+const cleanups: (() => void)[] = []
+afterEach(async () => {
+  cleanups.splice(0).forEach((cleanup) => cleanup())
+  vi.useRealTimers()
+  await closeProviderTimelineRigs()
+})
+
+describe('Pi final tail before host eviction', () => {
+  it('admits text and settlements before the exit barrier while ordinary and lifecycle queues are full', async () => {
+    const { journal } = await openProviderTimelineRig({ agent: 'pi' })
+    const logging = testEventSinkLogging(SESSION)
+    const deferred = createDeferredStructuredAgentSessionEventSink({
+      ...logging,
+      watermarks: { maxQueuedOperations: 1, maxLifecycleQueuedOperations: 1 }
+    })
+    deferred.bind({ journal, fence: 1, publish: () => {} })
+    const sink = providerTimelineSink(deferred.sink)
+    if (!sink) {
+      throw new Error('the sink must provide transitions')
+    }
+    const onFailed = vi.fn()
+    const lane = new JsonlRpcTimelineLane({
+      sink,
+      sessionId: SESSION,
+      agent: 'pi',
+      generation: GENERATION,
+      namespace: NAMESPACE,
+      pauseReading: vi.fn(),
+      resumeReading: vi.fn(),
+      onInputAccepted: vi.fn(),
+      onFailed
+    })
+    cleanups.push(
+      () => lane.dispose(),
+      () => deferred.close()
+    )
+    for (const event of [
+      { type: 'turn.open', turn: 'run:1', at: 1 },
+      { type: 'request.open', request: 'confirm:1', body: pendingApproval },
+      {
+        type: 'item.open',
+        item: 'tool:1',
+        body: { kind: 'tool-call', name: 'bash', input: {}, state: 'running' }
+      }
+    ] as const) {
+      lane.apply([event])
+      await deferred.drained()
+      lane.retry()
+    }
+    const gate = Promise.withResolvers<void>()
+    cleanups.push(() => gate.resolve())
+    const append = (recordId: string, lifecycle = false) =>
+      deferred.sink.tryAppendItem?.(
+        { provider: 'legacy', agent: 'pi', sessionId: SESSION, recordId },
+        { kind: 'status', tone: 'info', text: recordId },
+        { lifecycle, turnScope: AGENT_JOURNAL_THREAD_SCOPE }
+      )
+    // The nested write joins behind this held read; later writes stay in the real journal queue.
+    const blocked = journal.readInOrder(() => {
+      expect(append('ordinary-full')).toEqual({ accepted: true })
+      return gate.promise
+    })
+    expect(append('lifecycle-full', true)).toEqual({ accepted: true })
+    expect(append('ordinary-refused')).toEqual({ accepted: false, reason: 'backpressure' })
+    expect(append('lifecycle-refused', true)).toEqual({ accepted: false, reason: 'backpressure' })
+    const before = journal.snapshot().items.length
+    vi.useFakeTimers()
+    lane.apply([
+      { type: 'text.delta', item: { id: 'reply' }, channel: 'assistant', text: 'Final reply' },
+      {
+        type: 'item.update',
+        item: 'tail',
+        body: { kind: 'status', tone: 'info', text: 'Final status' }
+      }
+    ])
+    lane.finalize()
+    lane.apply([{ type: 'session.ended', verdict: { state: 'interrupted', completedAt: 2 } }])
+    let landed = false
+    const barrier = deferred.drained().then((result) => {
+      landed = true
+      return result
+    })
+    await vi.advanceTimersByTimeAsync(2_501)
+    expect(journal.snapshot().items).toHaveLength(before)
+    expect(landed).toBe(false)
+    expect(onFailed).not.toHaveBeenCalled()
+    gate.resolve()
+    await blocked
+    await expect(barrier).resolves.toEqual({ ok: true })
+    const acknowledgeRelease = vi.fn(() => lane.dispose())
+    await evictStructuredAgentSession({
+      sessionId: SESSION,
+      eventSink: deferred,
+      logger: logging.logger,
+      acknowledgeRelease,
+      discardSink: vi.fn()
+    })
+    expect(acknowledgeRelease).toHaveBeenCalledOnce()
+    expect(journal.snapshot().items.map((item) => item.body)).toEqual(
+      expect.arrayContaining([
+        expect.objectContaining({
+          kind: 'message',
+          role: 'assistant',
+          blocks: [{ type: 'text', text: 'Final reply' }]
+        }),
+        expect.objectContaining({ kind: 'status', text: 'Final status' }),
+        expect.objectContaining({
+          kind: 'approval',
+          resolution: expect.objectContaining({ state: 'cancelled' })
+        }),
+        expect.objectContaining({ kind: 'tool-call', state: 'failed' })
+      ])
+    )
+  })
+
+  it('fails excessive final output explicitly instead of leaving a refused tail waiting for eviction', async () => {
+    const failures: unknown[] = []
+    const deferred = createDeferredStructuredAgentSessionEventSink({
+      ...testEventSinkLogging(SESSION),
+      onFailed: (error) => failures.push(error)
+    })
+    cleanups.push(() => deferred.close())
+    expect(
+      deferred.sink.tryAppendTransition?.({
+        finalTail: true,
+        lifecycle: true,
+        publish: false,
+        steps: [
+          {
+            kind: 'settlement',
+            settlementId: 'oversize',
+            reservedBytes: 16 * 1024 * 1024 + 1,
+            resolve: () => []
+          }
+        ]
+      })
+    ).toEqual({ accepted: false, reason: 'failed' })
+    expect(failures).toEqual([
+      expect.objectContaining({
+        message: 'structured agent-session final tail exceeded its reserved capacity'
+      })
+    ])
+    await expect(deferred.drained()).resolves.toMatchObject({ ok: false })
+  })
+})
diff --git a/src/main/jsonl-rpc/timeline-lane.test.ts b/src/main/jsonl-rpc/timeline-lane.test.ts
new file mode 100644
index 000000000000..8ef584d1ac35
--- /dev/null
+++ b/src/main/jsonl-rpc/timeline-lane.test.ts
@@ -0,0 +1,146 @@
+import { afterEach, describe, expect, it, vi } from 'vitest'
+import {
+  closeProviderTimelineRigs,
+  openProviderTimelineRig,
+  refusingSink,
+  SESSION,
+  GENERATION,
+  NAMESPACE
+} from '../native-chat/agent-session-timeline/provider-timeline-assembler-test-support'
+import { JsonlRpcTimelineLane } from './timeline-lane'
+
+const lanes: JsonlRpcTimelineLane[] = []
+afterEach(async () => {
+  for (const lane of lanes.splice(0)) {
+    lane.dispose()
+  }
+  vi.useRealTimers()
+  await closeProviderTimelineRigs()
+})
+
+async function rig() {
+  const journal = await openProviderTimelineRig({ agent: 'pi' })
+  let blocked = true
+  const pauseReading = vi.fn(),
+    resumeReading = vi.fn(),
+    onInputAccepted = vi.fn(),
+    onFailed = vi.fn()
+  const lane = new JsonlRpcTimelineLane({
+    sink: refusingSink(journal.sink, () => blocked),
+    sessionId: SESSION,
+    agent: 'pi',
+    generation: GENERATION,
+    namespace: NAMESPACE,
+    pauseReading,
+    resumeReading,
+    onInputAccepted,
+    onFailed
+  })
+  lanes.push(lane)
+  return {
+    journal,
+    lane,
+    pauseReading,
+    resumeReading,
+    onInputAccepted,
+    onFailed,
+    unblock: () => {
+      blocked = false
+    }
+  }
+}
+
+describe('JSON-lines timeline admission', () => {
+  it('admits the final tail with the host settlement budget when ordinary writes are full', async () => {
+    const journal = await openProviderTimelineRig({ agent: 'pi' })
+    const lane = new JsonlRpcTimelineLane({
+      sink: {
+        ...journal.sink,
+        tryAppendTransition: (transition) =>
+          transition.lifecycle
+            ? journal.sink.tryAppendTransition(transition)
+            : { accepted: false, reason: 'backpressure' }
+      },
+      sessionId: SESSION,
+      agent: 'pi',
+      generation: GENERATION,
+      namespace: NAMESPACE,
+      pauseReading: vi.fn(),
+      resumeReading: vi.fn(),
+      onInputAccepted: vi.fn(),
+      onFailed: vi.fn()
+    })
+    lanes.push(lane)
+    lane.apply([
+      {
+        type: 'item.update',
+        item: 'final',
+        body: { kind: 'status', tone: 'info', text: 'Final tail' }
+      }
+    ])
+    expect(await journal.rows()).toEqual([])
+    lane.finalize()
+    await lane.drained()
+    expect(await journal.rows()).toEqual([
+      expect.objectContaining({ body: { kind: 'status', tone: 'info', text: 'Final tail' } })
+    ])
+  })
+
+  it('holds an entire parsed batch and accepts input only after journal admission', async () => {
+    const test = await rig()
+    test.lane.apply([
+      { type: 'turn.open', turn: 'run:1', at: 1 },
+      { type: 'input.accepted', clientMessageId: 'message:1', requestedAt: 1 },
+      { type: 'turn.end', at: 2, state: 'completed', outcome: 'success' }
+    ])
+    expect(test.pauseReading).toHaveBeenCalled()
+    expect(test.onInputAccepted).not.toHaveBeenCalled()
+    expect(await test.journal.turns()).toEqual([])
+    test.unblock()
+    test.lane.retry()
+    await test.lane.drained()
+    expect(test.onInputAccepted).toHaveBeenCalledExactlyOnceWith('message:1')
+    expect(test.resumeReading).toHaveBeenCalled()
+    expect(await test.journal.turns()).toHaveLength(1)
+    expect((await test.journal.turns())[0]).toMatchObject({
+      state: 'completed',
+      outcome: 'success'
+    })
+  })
+
+  it('retries paused input and clears its timer after draining', async () => {
+    const test = await rig()
+    vi.useFakeTimers()
+    test.lane.apply([{ type: 'turn.open', turn: 'run:1', at: 1 }])
+    test.unblock()
+    await vi.advanceTimersByTimeAsync(250)
+    await test.lane.drained()
+    expect(test.lane.openTurnId).not.toBeNull()
+    expect(vi.getTimerCount()).toBe(0)
+  })
+
+  it('bounds data already parsed in a batch after the reader pauses', async () => {
+    const test = await rig()
+    test.lane.apply(
+      Array.from({ length: 257 }, (_, index) => ({
+        type: 'item.close',
+        item: `item:${index}`,
+        body: { kind: 'status', tone: 'info', text: 'held' }
+      }))
+    )
+    expect(test.onFailed).toHaveBeenCalledExactlyOnceWith('Agent timeline queue capacity exceeded')
+    await expect(test.lane.drained()).resolves.toBeUndefined()
+    expect(test.onInputAccepted).not.toHaveBeenCalled()
+  })
+
+  it('releases drain and turn waiters when a failed lane is disposed', async () => {
+    const test = await rig()
+    test.unblock()
+    test.lane.apply([{ type: 'turn.open', turn: 'run:1', at: 1 }])
+    const turn = test.lane.openTurnId
+    expect(turn).not.toBeNull()
+    const waiting = test.lane.whenTurnLeaves(turn!)
+    test.lane.dispose()
+    await expect(waiting).resolves.toBeUndefined()
+  })
+})
diff --git a/src/main/jsonl-rpc/timeline-lane.ts b/src/main/jsonl-rpc/timeline-lane.ts
new file mode 100644
index 000000000000..36c759e42ded
--- /dev/null
+++ b/src/main/jsonl-rpc/timeline-lane.ts
@@ -0,0 +1,190 @@
+import { parseAgentJournalItemKey } from '../../shared/agent-session-journal-item-key'
+import {
+  createProviderTimelineAssembler,
+  type ProviderTimelineAssembler
+} from '../native-chat/agent-session-timeline/provider-timeline-assembler'
+import type { ProviderTimelineEvent } from '../native-chat/agent-session-timeline/provider-timeline-event'
+import { createLegacyProviderTimelineIdentityScheme } from '../native-chat/agent-session-timeline/provider-timeline-identity'
+import type { ProviderTimelineSink } from '../native-chat/agent-session-timeline/provider-timeline-plan'
+import type { StructuredAgentSessionCommandRun } from '../native-chat/agent-session-wire/structured-agent-session-adapter'
+
+const MAX_HELD_EVENTS = 256
+const MAX_HELD_BYTES = 4 * 1024 * 1024
+
+export type JsonlRpcTimelineLaneDeps = {
+  sink: ProviderTimelineSink
+  sessionId: string
+  agent: string
+  generation: string
+  namespace: string
+  pauseReading: () => void
+  resumeReading: () => void
+  onInputAccepted: (clientMessageId: string) => void
+  onFailed: (reason: string) => void
+}
+
+/** A dialect supplies semantic events; the shared assembler owns every journal write. */
+export class JsonlRpcTimelineLane {
+  private readonly assembler: ProviderTimelineAssembler
+  private readonly identity: ReturnType<typeof createLegacyProviderTimelineIdentityScheme>
+  private readonly held: { event: ProviderTimelineEvent; bytes: number }[] = []
+  private heldBytes = 0
+  private draining = false
+  private ended = false
+  private finalizing = false
+  private retryTimer?: ReturnType<typeof setTimeout>
+  private readonly watchers = new Set<() => void>()
+
+  constructor(private readonly deps: JsonlRpcTimelineLaneDeps) {
+    this.assembler = createProviderTimelineAssembler({
+      ...deps,
+      sink: {
+        ...deps.sink,
+        tryAppendTransition: (transition) =>
+          deps.sink.tryAppendTransition(
+            this.finalizing ? { ...transition, lifecycle: true, finalTail: true } : transition
+          )
+      }
+    })
+    this.identity = createLegacyProviderTimelineIdentityScheme(deps)
+  }
+
+  get openTurnId(): string | null {
+    return this.assembler.openTurnId
+  }
+
+  beginCommand(command: StructuredAgentSessionCommandRun): void {
+    this.retry()
+    if (this.ended || this.held.length > 0) {
+      throw new Error('Provider timeline has not drained for this command')
+    }
+    this.assembler.beginCommand(command)
+  }
+
+  forgetCommand(turnId: string): void {
+    this.assembler.forgetCommand(turnId)
+  }
+
+  apply(events: readonly ProviderTimelineEvent[]): void {
+    if (this.ended) {
+      return
+    }
+    for (const event of events) {
+      const bytes = Buffer.byteLength(JSON.stringify(event))
+      if (this.held.length >= MAX_HELD_EVENTS || this.heldBytes + bytes > MAX_HELD_BYTES) {
+        this.fail('Agent timeline queue capacity exceeded')
+        return
+      }
+      this.held.push({ event, bytes })
+      this.heldBytes += bytes
+      this.retry()
+    }
+  }
+
+  retry(): void {
+    if (this.draining || this.ended) {
+      return
+    }
+    clearTimeout(this.retryTimer)
+    this.retryTimer = undefined
+    this.draining = true
+    try {
+      while (this.held.length > 0 && !this.ended) {
+        const entry = this.held[0]
+        const result = this.assembler.apply(entry.event)
+        if (!result.admission.accepted) {
+          if (result.admission.reason !== 'backpressure') {
+            this.fail(result.admission.reason)
+          } else {
+            this.deps.pauseReading()
+            this.retryTimer = setTimeout(() => this.retry(), 250)
+            this.retryTimer.unref()
+          }
+          return
+        }
+        this.held.shift()
+        this.heldBytes -= entry.bytes
+        if (entry.event.type === 'input.accepted' && !result.dropped) {
+          this.deps.onInputAccepted(entry.event.clientMessageId)
+        }
+      }
+    } finally {
+      this.draining = false
+      this.notify()
+    }
+    this.deps.resumeReading()
+  }
+
+  whenTurnLeaves(turnId: string): Promise<void> {
+    return new Promise((resolve) => {
+      const check = (): void => {
+        if (this.ended || this.openTurnId !== turnId) {
+          this.watchers.delete(check)
+          resolve()
+        }
+      }
+      this.watchers.add(check)
+      check()
+    })
+  }
+
+  drained(): Promise<void> {
+    return new Promise((resolve) => {
+      const check = (): void => {
+        if (this.ended || this.held.length === 0) {
+          this.watchers.delete(check)
+          resolve()
+        }
+      }
+      this.watchers.add(check)
+      check()
+    })
+  }
+
+  isRequestRow(itemId: string, key: string): boolean {
+    const row = parseAgentJournalItemKey(itemId)
+    const expected = this.identity.request({
+      generation: this.deps.generation,
+      key,
+      incarnation: 1
+    })
+    return (
+      row?.provider === 'legacy' &&
+      expected.provider === 'legacy' &&
+      row.agent === this.deps.agent &&
+      row.sessionId === this.deps.sessionId &&
+      (row.recordId === expected.recordId || row.recordId.startsWith(`${expected.recordId}#`))
+    )
+  }
+
+  flush(): void {
+    this.assembler.flush()
+  }
+
+  finalize(): void {
+    // Admission must precede the host's exit barrier even when lifecycle writes are full.
+    this.finalizing = true
+    this.retry()
+    this.flush()
+  }
+
+  dispose(): void {
+    this.ended = true
+    clearTimeout(this.retryTimer)
+    this.held.length = 0
+    this.heldBytes = 0
+    this.assembler.dispose()
+    this.notify()
+  }
+
+  private fail(reason: string): void {
+    this.dispose()
+    this.deps.onFailed(reason)
+  }
+
+  private notify(): void {
+    for (const check of this.watchers) {
+      check()
+    }
+  }
+}
diff --git a/src/main/macos-keychain/generic-password.test.ts b/src/main/macos-keychain/generic-password.test.ts
index 38ec1b05a723..604fd8b00bd5 100644
--- a/src/main/macos-keychain/generic-password.test.ts
+++ b/src/main/macos-keychain/generic-password.test.ts
@@ -4,12 +4,7 @@ const execFileMock = vi.hoisted(() => vi.fn())
 
 vi.mock('node:child_process', () => ({ execFile: execFileMock }))
 
-import {
-  deleteKeychainPassword,
-  isKeychainNotFoundError,
-  readKeychainPassword,
-  writeKeychainPassword
-} from './generic-password'
+import { isKeychainNotFoundError, readKeychainPassword } from './generic-password'
 
 const originalPlatform = process.platform
 
@@ -71,27 +66,10 @@ describe('readKeychainPassword', () => {
   it('never shells out off macOS', async () => {
     setPlatform('win32')
     await expect(readKeychainPassword('svc', 'acct')).resolves.toBeNull()
-    await writeKeychainPassword('svc', 'acct', 'value')
-    await deleteKeychainPassword('svc', 'acct')
     expect(execFileMock).not.toHaveBeenCalled()
   })
 })
 
-describe('deleteKeychainPassword', () => {
-  it('swallows a missing item', async () => {
-    fail(Object.assign(new Error('could not be found'), { code: 44 }))
-    await expect(deleteKeychainPassword('svc', 'acct')).resolves.toBeUndefined()
-  })
-
-  it('surfaces an access failure only when the caller asks for it', async () => {
-    fail(new Error('User interaction is not allowed'))
-    await expect(deleteKeychainPassword('svc', 'acct')).resolves.toBeUndefined()
-    await expect(
-      deleteKeychainPassword('svc', 'acct', { failOnAccessError: true })
-    ).rejects.toThrow('User interaction is not allowed')
-  })
-})
-
 describe('isKeychainNotFoundError', () => {
   it('recognizes the security(1) not-found signals', () => {
     expect(isKeychainNotFoundError({ code: 44 })).toBe(true)
diff --git a/src/main/macos-keychain/generic-password.ts b/src/main/macos-keychain/generic-password.ts
index 8a805edd809b..1616008f303b 100644
--- a/src/main/macos-keychain/generic-password.ts
+++ b/src/main/macos-keychain/generic-password.ts
@@ -79,20 +79,6 @@ export function execSecurityCommand(args: string[]): Promise<SecurityCommandResu
   })
 }
 
-export function execSecurity(
-  args: string[],
-  options?: { ignoreFailure?: boolean; ignoreNotFound?: boolean }
-): Promise<void> {
-  return execSecurityCommand(args).then(undefined, (error: unknown) => {
-    if (options?.ignoreNotFound && isKeychainNotFoundError(error)) {
-      return
-    }
-    if (!options?.ignoreFailure) {
-      throw error
-    }
-  })
-}
-
 export async function readKeychainPassword(
   service: string,
   account: string
@@ -120,28 +106,3 @@ export async function readKeychainPassword(
     throw error
   }
 }
-
-export async function writeKeychainPassword(
-  service: string,
-  account: string,
-  contents: string
-): Promise<void> {
-  if (process.platform !== 'darwin') {
-    return
-  }
-  await execSecurity(['add-generic-password', '-U', '-s', service, '-a', account, '-w', contents])
-}
-
-export async function deleteKeychainPassword(
-  service: string,
-  account: string,
-  options?: { failOnAccessError?: boolean }
-): Promise<void> {
-  if (process.platform !== 'darwin') {
-    return
-  }
-  await execSecurity(['delete-generic-password', '-s', service, '-a', account], {
-    ignoreNotFound: true,
-    ignoreFailure: !options?.failOnAccessError
-  })
-}
diff --git a/src/main/managed-data-accounts/service.test.ts b/src/main/managed-data-accounts/service.test.ts
index bc96800a5aa6..dc8394e4e014 100644
--- a/src/main/managed-data-accounts/service.test.ts
+++ b/src/main/managed-data-accounts/service.test.ts
@@ -52,6 +52,27 @@ function openCodeSource(sessionTable = 'session'): void {
 }
 
 describe('managed data accounts', () => {
+  it('resolves a pinned OpenCode profile by ID after selection changes', async () => {
+    openCodeSource()
+    const first = (await service.add('opencode', source, 'First')).activeAccountId
+    if (!first) {
+      throw new Error('Expected selected first profile')
+    }
+    const original = service.environmentForAccount('opencode', first)
+    const second = (await service.add('opencode', source, 'Second')).activeAccountId
+    if (!second) {
+      throw new Error('Expected selected second profile')
+    }
+    expect(service.launchEnvironment('opencode')).toEqual(
+      service.environmentForAccount('opencode', second)
+    )
+    expect(service.environmentForAccount('opencode', first)).toEqual(original)
+    await service.remove('opencode', first)
+    expect(() => service.environmentForAccount('opencode', first)).toThrow(
+      'Managed account not found.'
+    )
+  })
+
   it.each(['before write', 'after write', 'unrestricted'])(
     'preserves credentials and original metadata when removal persistence fails %s',
     async (failure) => {
diff --git a/src/main/managed-data-accounts/service.ts b/src/main/managed-data-accounts/service.ts
index 749fb023876e..7335a72f2696 100644
--- a/src/main/managed-data-accounts/service.ts
+++ b/src/main/managed-data-accounts/service.ts
@@ -152,14 +152,16 @@ export class ManagedDataAccountService {
     if (!state.activeAccountId) {
       return {}
     }
-    return this.profileEnvironment(provider, state.activeAccountId)
+    return this.environmentForAccount(provider, state.activeAccountId)
   }
 
   transcriptEnvironments(provider: ManagedDataAccountProvider): Record<string, string>[] {
     const state = this.list(provider)
     const selected = state.accounts.filter((account) => account.id === state.activeAccountId)
     const others = state.accounts.filter((account) => account.id !== state.activeAccountId)
-    return [...selected, ...others].map((account) => this.profileEnvironment(provider, account.id))
+    return [...selected, ...others].map((account) =>
+      this.environmentForAccount(provider, account.id)
+    )
   }
 
   captureOriginalEnvironment(
@@ -217,7 +219,7 @@ export class ManagedDataAccountService {
     this.inlineAuthBaselines.clear()
   }
 
-  private profileEnvironment(
+  environmentForAccount(
     provider: ManagedDataAccountProvider,
     accountId: string
   ): Record<string, string> {
diff --git a/src/main/native-chat/agent-model-catalog/agent-model-catalog-fingerprint.ts b/src/main/native-chat/agent-model-catalog/agent-model-catalog-fingerprint.ts
index d59f0d124c33..fcd20b489312 100644
--- a/src/main/native-chat/agent-model-catalog/agent-model-catalog-fingerprint.ts
+++ b/src/main/native-chat/agent-model-catalog/agent-model-catalog-fingerprint.ts
@@ -4,7 +4,10 @@ import type {
   AgentModelCatalogSessionAccess,
   AgentModelCatalogStore
 } from './agent-model-catalog-store'
-import type { AgentSessionStoredAgent } from '../../../shared/agent-session-stored-agent'
+import {
+  isLegacyAgentSessionAccountHome,
+  type AgentSessionAccountHome
+} from '../../../shared/agent-session-account-home'
 
 /**
  * Everything that changes which models a listing can answer with: the agent,
@@ -14,22 +17,22 @@ import type { AgentSessionStoredAgent } from '../../../shared/agent-session-stor
  */
 export type AgentModelCatalogIdentity = {
   agent: string
-  accountHomeVariable: string
-  accountHomePath: string
   /** Null on the native host; WSL distros each carry their own CLI. */
   wslDistro: string | null
-}
+} & (
+  | { accountHomeVariable: string; accountHomePath: string; accountHome?: never }
+  | { accountHome: AgentSessionAccountHome; accountHomeVariable?: never; accountHomePath?: never }
+)
 
 export function agentModelCatalogFingerprint(identity: AgentModelCatalogIdentity): string {
+  const account = identity.accountHome
+  const parts = account
+    ? isLegacyAgentSessionAccountHome(account)
+      ? [account.variable, account.path]
+      : [account.kind, account.locator]
+    : [identity.accountHomeVariable, identity.accountHomePath]
   return createHash('sha256')
-    .update(
-      JSON.stringify([
-        identity.agent,
-        identity.accountHomeVariable,
-        identity.accountHomePath,
-        identity.wslDistro ?? ''
-      ])
-    )
+    .update(JSON.stringify([identity.agent, ...parts, identity.wslDistro ?? '']))
     .digest('hex')
 }
 
@@ -40,8 +43,7 @@ export function agentModelCatalogIdentityForRecord(
 ): AgentModelCatalogIdentity {
   return {
     agent: record.provider,
-    accountHomeVariable: record.accountHome.variable,
-    accountHomePath: record.accountHome.path,
+    accountHome: record.accountHome,
     wslDistro: record.location.wslDistro
   }
 }
@@ -56,7 +58,7 @@ export function agentModelCatalogFingerprintForRecord(
  *  Native only: both structured adapters refuse non-native locations at launch. */
 export function agentModelCatalogSessionAccess(
   store: AgentModelCatalogStore | undefined,
-  agent: Pick<AgentSessionStoredAgent, 'agent' | 'accountHomeVariable'>,
+  agent: { agent: string; accountHomeVariable: string },
   accountHomePath: string | null
 ): AgentModelCatalogSessionAccess | undefined {
   if (!store || !accountHomePath) {
diff --git a/src/main/native-chat/agent-model-catalog/agent-model-catalog-service.ts b/src/main/native-chat/agent-model-catalog/agent-model-catalog-service.ts
index 3cba2c9e6a64..b56dc291d442 100644
--- a/src/main/native-chat/agent-model-catalog/agent-model-catalog-service.ts
+++ b/src/main/native-chat/agent-model-catalog/agent-model-catalog-service.ts
@@ -3,6 +3,7 @@ import type {
   AgentSessionAccountHome,
   AgentSessionRecord
 } from '../../../shared/agent-session-record'
+import { isLegacyAgentSessionAccountHome } from '../../../shared/agent-session-account-home'
 import {
   agentModelCatalogFingerprint,
   agentModelCatalogFingerprintForRecord
@@ -102,7 +103,10 @@ export function createAgentModelCatalogService(
       if (scoped) {
         fingerprint = agentModelCatalogFingerprintForRecord(scoped)
         // Probes spawn natively; a WSL-pinned record has no host-side lister.
-        accountHomePath = scoped.location.wslDistro === null ? scoped.accountHome.path : null
+        accountHomePath =
+          scoped.location.wslDistro === null && isLegacyAgentSessionAccountHome(scoped.accountHome)
+            ? scoped.accountHome.path
+            : null
       } else {
         let resolved: AgentSessionAccountHome
         try {
@@ -112,11 +116,10 @@ export function createAgentModelCatalogService(
         }
         fingerprint = agentModelCatalogFingerprint({
           agent: params.agent,
-          accountHomeVariable: resolved.variable,
-          accountHomePath: resolved.path,
+          accountHome: resolved,
           wslDistro: null
         })
-        accountHomePath = resolved.path
+        accountHomePath = isLegacyAgentSessionAccountHome(resolved) ? resolved.path : null
       }
       let entry = deps.store.get(fingerprint)
       const probe = deps.probes?.[params.agent]
diff --git a/src/main/native-chat/agent-session-attachments/agent-session-attachment-claims.test.ts b/src/main/native-chat/agent-session-attachments/agent-session-attachment-claims.test.ts
new file mode 100644
index 000000000000..9401bf7e9a4a
--- /dev/null
+++ b/src/main/native-chat/agent-session-attachments/agent-session-attachment-claims.test.ts
@@ -0,0 +1,280 @@
+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 } from 'vitest'
+import type {
+  AgentJournalMessageItem,
+  AgentSessionJournalIdentity
+} from '../../../shared/agent-session-journal-types'
+import { formatNativeChatFileReference } from '../../../shared/agent-image-paste'
+import {
+  createTrackedJournalOpener,
+  openTestJournalHostDatabase
+} from '../agent-session-journal/journal-host-database-test-support'
+import type { AgentSessionJournal } from '../agent-session-journal/journal-store'
+import {
+  isAgentSessionAttachmentExpiredError,
+  markUnclaimedUploadForSweep
+} from './agent-session-attachment-claims'
+import {
+  agentSessionAttachmentReferences,
+  agentSessionAttachmentStoreRoot
+} from './agent-session-attachment-references'
+import { claudeProviderHandle } from '../../../shared/agent-session-provider-handle-encoding'
+
+const UPLOAD_A = '0b6f8a52-4a3e-4c4e-9a59-1d5d1f2b8c01'
+const UPLOAD_B = '7c2d9e10-3f4a-4b5c-8d6e-2f1a0b9c8d02'
+
+function message(...blocks: AgentJournalMessageItem['blocks']): AgentJournalMessageItem {
+  return { kind: 'message', role: 'user', blocks }
+}
+
+describe('agentSessionAttachmentReferences', () => {
+  const root = '/srv/orca/agent-session-attachments'
+
+  it('finds image paths and file references in text, however the reference is quoted', () => {
+    const quoted = formatNativeChatFileReference(`${root}/${UPLOAD_B}/my "notes" and 'more'.txt`)
+    const references = agentSessionAttachmentReferences(
+      root,
+      message(
+        { type: 'image-ref', path: `${root}/${UPLOAD_A}/shot.png` },
+        { type: 'text', text: `read ${quoted} please` }
+      ),
+      'linux'
+    )
+    expect([...references].sort()).toEqual([UPLOAD_A, UPLOAD_B].sort())
+  })
+
+  it("leaves a mention of any other store path as text: another server's, a ~ form, a bare name", () => {
+    const mentions = [
+      `@/home/other/agent-session-attachments/${UPLOAD_A}/a.txt`,
+      `~/Library/Application Support/Orca/agent-session-attachments/${UPLOAD_A}/x.png`,
+      `see agent-session-attachments/${UPLOAD_A}`,
+      // This host's root as the tail of a longer path is still another path.
+      `/mnt${root}/${UPLOAD_A}/a.txt`
+    ]
+    for (const text of mentions) {
+      expect(
+        agentSessionAttachmentReferences(root, message({ type: 'text', text }), 'linux')
+      ).toEqual(new Set())
+    }
+  })
+
+  it('matches a Windows store with either separator and in any case', () => {
+    const windowsRoot = 'C:\\Users\\me\\AppData\\Roaming\\orca\\agent-session-attachments'
+    const references = agentSessionAttachmentReferences(
+      windowsRoot,
+      message(
+        {
+          type: 'image-ref',
+          path: `c:/users/ME/appdata/roaming/orca/agent-session-attachments/${UPLOAD_A}/s.png`
+        },
+        { type: 'text', text: `@"${windowsRoot}\\${UPLOAD_B.toUpperCase()}\\a b.txt"` }
+      ),
+      'win32'
+    )
+    expect([...references].sort()).toEqual([UPLOAD_A, UPLOAD_B].sort())
+  })
+})
+
+describe('claims written with the message', () => {
+  const IDENTITY: AgentSessionJournalIdentity = {
+    sessionId: 'session-c',
+    workspaceId: 'ws-1',
+    hostId: 'host-1',
+    agent: 'claude',
+    providerHandle: claudeProviderHandle('native-1', null)
+  }
+  let stateDirectory: string
+  let storeRoot: string
+  let clock = 1_000
+  const journals = createTrackedJournalOpener()
+
+  function open(sessionId = IDENTITY.sessionId): Promise<AgentSessionJournal> {
+    return journals.open({
+      identity: { ...IDENTITY, sessionId },
+      stateDirectory,
+      now: () => ++clock,
+      mintEpoch: () => `epoch-${clock}`
+    })
+  }
+
+  async function storeUpload(uploadId: string, name = 'shot.png'): Promise<string> {
+    await mkdir(join(storeRoot, uploadId), { recursive: true })
+    await writeFile(join(storeRoot, uploadId, name), 'bytes')
+    return join(storeRoot, uploadId, name)
+  }
+
+  function claims(): { upload_id: string; session_id: string }[] {
+    return openTestJournalHostDatabase(stateDirectory)
+      .db.prepare(
+        'SELECT upload_id, session_id FROM agent_session_attachment_claims ORDER BY session_id'
+      )
+      .all()
+      .flatMap((row) =>
+        typeof row === 'object' &&
+        row !== null &&
+        'upload_id' in row &&
+        'session_id' in row &&
+        typeof row.upload_id === 'string' &&
+        typeof row.session_id === 'string'
+          ? [{ upload_id: row.upload_id, session_id: row.session_id }]
+          : []
+      )
+  }
+
+  function clientSend(journal: AgentSessionJournal, id: string, body: AgentJournalMessageItem) {
+    return journal.appendSubmission({
+      clientMessageId: id,
+      payloadFingerprint: `fp-${id}`,
+      body,
+      fence: 0,
+      origin: 'client'
+    })
+  }
+
+  beforeEach(async () => {
+    stateDirectory = await mkdtemp(join(tmpdir(), 'orca-attachment-claims-'))
+    storeRoot = agentSessionAttachmentStoreRoot(stateDirectory)
+    clock = 1_000
+  })
+
+  afterEach(async () => {
+    await journals.closeAll()
+    await rm(stateDirectory, { recursive: true, force: true })
+  })
+
+  it("claims a client message's stored uploads in the same write", async () => {
+    const journal = await open()
+    const path = await storeUpload(UPLOAD_A)
+    await clientSend(journal, 'send-1', message({ type: 'image-ref', path }))
+    expect(journal.submission('send-1')).toBeTruthy()
+    expect(claims()).toEqual([{ upload_id: UPLOAD_A, session_id: IDENTITY.sessionId }])
+  })
+
+  it('refuses the whole client message, writing nothing, when an upload is gone', async () => {
+    const journal = await open()
+    const error = await clientSend(
+      journal,
+      'send-1',
+      message(
+        { type: 'text', text: 'see the image' },
+        { type: 'image-ref', path: join(storeRoot, UPLOAD_A, 'shot.png') }
+      )
+    ).catch((caught: unknown) => caught)
+    expect(isAgentSessionAttachmentExpiredError(error)).toBe(true)
+    expect(journal.submission('send-1')).toBeUndefined()
+    expect(claims()).toEqual([])
+  })
+
+  it('refuses an upload the sweep already marked, even while its file is still on disk', async () => {
+    const journal = await open()
+    const path = await storeUpload(UPLOAD_A)
+    expect(
+      markUnclaimedUploadForSweep(openTestJournalHostDatabase(stateDirectory).db, UPLOAD_A, 1)
+    ).toBe(true)
+    const error = await clientSend(journal, 'send-1', message({ type: 'image-ref', path })).catch(
+      (caught: unknown) => caught
+    )
+    expect(isAgentSessionAttachmentExpiredError(error)).toBe(true)
+  })
+
+  it('a claim landing first keeps the sweep from marking the upload', async () => {
+    const journal = await open()
+    const path = await storeUpload(UPLOAD_A)
+    await clientSend(journal, 'send-1', message({ type: 'image-ref', path }))
+    expect(
+      markUnclaimedUploadForSweep(openTestJournalHostDatabase(stateDirectory).db, UPLOAD_A, 1)
+    ).toBe(false)
+  })
+
+  it("never refuses the host's own message, and claims what it names", async () => {
+    const journal = await open()
+    const path = await storeUpload(UPLOAD_A)
+    await journal.appendSubmission({
+      clientMessageId: 'host-1',
+      payloadFingerprint: 'fp',
+      body: message(
+        { type: 'image-ref', path },
+        { type: 'image-ref', path: join(storeRoot, UPLOAD_B, 'gone.png') }
+      ),
+      fence: 0,
+      origin: 'host'
+    })
+    expect(journal.submission('host-1')).toBeTruthy()
+    expect(
+      claims()
+        .map((claim) => claim.upload_id)
+        .sort()
+    ).toEqual([UPLOAD_A, UPLOAD_B].sort())
+  })
+
+  it("refuses a client's draft naming a gone upload, and the /clear carry claims for its new chat", async () => {
+    const journal = await open()
+    const missing = message({ type: 'text', text: `@${join(storeRoot, UPLOAD_B, 'a.txt')}` })
+    const refused = await journal.queuedMessages
+      .insert({
+        messageId: 'draft-0',
+        body: missing,
+        fingerprint: 'fp',
+        hostInstance: 'p',
+        requireAttachments: true
+      })
+      .catch((caught: unknown) => caught)
+    expect(isAgentSessionAttachmentExpiredError(refused)).toBe(true)
+    expect(journal.queuedMessages.list()).toHaveLength(0)
+
+    const path = await storeUpload(UPLOAD_A, 'notes.txt')
+    const body = message({ type: 'text', text: `read @${path}` })
+    await journal.queuedMessages.insert({
+      messageId: 'draft-1',
+      body,
+      fingerprint: 'fp',
+      hostInstance: 'p',
+      requireAttachments: true
+    })
+    const replacement = await open('session-d')
+    await replacement.queuedMessages.insert({
+      messageId: 'draft-1',
+      body,
+      fingerprint: 'fp-d',
+      hostInstance: 'p',
+      carriedFrom: IDENTITY.sessionId
+    })
+    expect(claims()).toEqual([
+      { upload_id: UPLOAD_A, session_id: IDENTITY.sessionId },
+      { upload_id: UPLOAD_A, session_id: 'session-d' }
+    ])
+  })
+
+  it("does not refuse a draft's conversion: the draft claimed its uploads when it was written", async () => {
+    const journal = await open()
+    const path = await storeUpload(UPLOAD_A, 'notes.txt')
+    const body = message({ type: 'text', text: `read @${path}` })
+    await journal.queuedMessages.insert({
+      messageId: 'draft-1',
+      body,
+      fingerprint: 'fp',
+      hostInstance: 'p',
+      requireAttachments: true
+    })
+    await rm(join(storeRoot, UPLOAD_A), { recursive: true })
+    await journal.appendSubmission(
+      { clientMessageId: 'handoff-1', payloadFingerprint: 'fp', body, fence: 0, origin: 'client' },
+      { messageId: 'draft-1', expect: 'waiting', settledByOp: null }
+    )
+    expect(journal.submission('handoff-1')).toBeTruthy()
+  })
+
+  it('keeps its claims across a host restart', async () => {
+    let journal = await open()
+    const path = await storeUpload(UPLOAD_A)
+    await clientSend(journal, 'send-1', message({ type: 'image-ref', path }))
+    await journals.closeAll()
+    journal = await open()
+    expect(claims()).toEqual([{ upload_id: UPLOAD_A, session_id: IDENTITY.sessionId }])
+    expect(
+      markUnclaimedUploadForSweep(openTestJournalHostDatabase(stateDirectory).db, UPLOAD_A, 1)
+    ).toBe(false)
+  })
+})
diff --git a/src/main/native-chat/agent-session-attachments/agent-session-attachment-claims.ts b/src/main/native-chat/agent-session-attachments/agent-session-attachment-claims.ts
new file mode 100644
index 000000000000..ac41b427e58b
--- /dev/null
+++ b/src/main/native-chat/agent-session-attachments/agent-session-attachment-claims.ts
@@ -0,0 +1,201 @@
+// Which chats hold each stored attachment. A message claims the uploads it references in the same
+// host transaction that makes it durable, and the sweep may delete only an upload nobody claims:
+// both are synchronous statements on the host's one journal connection, so exactly one wins.
+
+import { existsSync, readdirSync } from 'node:fs'
+import { join } from 'node:path'
+import type Database from '../../sqlite/sync-database'
+import type { AgentJournalMessageItem } from '../../../shared/agent-session-journal-types'
+import {
+  AGENT_SESSION_ATTACHMENT_PART_FILE,
+  agentSessionAttachmentReferences,
+  agentSessionAttachmentStoreRoot
+} from './agent-session-attachment-references'
+
+const CLAIM_SAVEPOINT = 'agent_session_attachment_claims'
+
+/**
+ * Created at every writable open with no `user_version` bump, like the draft table
+ * (`ensureQueuedMessagesTable`): an older build ignores them and stays writable.
+ * Claims are keyed by upload and chat, so a /clear carry adds the replacement as a second holder
+ * and a chat's deletion frees an upload only when its last holder goes.
+ */
+export function ensureAgentSessionAttachmentClaimTables(db: Database.Database): void {
+  db.exec(`
+CREATE TABLE IF NOT EXISTS agent_session_attachment_claims (
+  upload_id  TEXT    NOT NULL,
+  session_id TEXT    NOT NULL,
+  claimed_at INTEGER NOT NULL,
+  PRIMARY KEY (upload_id, session_id)
+);
+CREATE TABLE IF NOT EXISTS agent_session_attachment_sweeps (
+  upload_id  TEXT    NOT NULL PRIMARY KEY,
+  started_at INTEGER NOT NULL
+);
+`)
+}
+
+export class AgentSessionAttachmentExpiredError extends Error {
+  constructor() {
+    super('A referenced chat attachment is no longer stored on this host.')
+    this.name = 'AgentSessionAttachmentExpiredError'
+  }
+}
+
+export function isAgentSessionAttachmentExpiredError(
+  error: unknown
+): error is AgentSessionAttachmentExpiredError {
+  return error instanceof AgentSessionAttachmentExpiredError
+}
+
+function uploadIsStored(root: string, uploadId: string): boolean {
+  try {
+    return readdirSync(join(root, uploadId)).some(
+      (entry) => entry !== AGENT_SESSION_ATTACHMENT_PART_FILE
+    )
+  } catch {
+    return false
+  }
+}
+
+function isBeingSwept(db: Database.Database, uploadId: string): boolean {
+  return (
+    db
+      .prepare('SELECT 1 FROM agent_session_attachment_sweeps WHERE upload_id = ?')
+      .get(uploadId) !== undefined
+  )
+}
+
+function insertClaims(
+  db: Database.Database,
+  uploadIds: Iterable<string>,
+  sessionId: string,
+  now: number
+): void {
+  const insert = db.prepare(
+    'INSERT OR IGNORE INTO agent_session_attachment_claims (upload_id, session_id, claimed_at) VALUES (?, ?, ?)'
+  )
+  for (const uploadId of uploadIds) {
+    insert.run(uploadId, sessionId, now)
+  }
+}
+
+export type AgentSessionAttachmentClaim = {
+  stateDirectory: string
+  sessionId: string
+  body: AgentJournalMessageItem
+  /** A client's own new message: every upload of this host's store it names must still be stored,
+   *  or the whole message is refused. The host's own writes (a /clear carry, a draft it sends) never refuse. */
+  required: boolean
+  now: number
+}
+
+/**
+ * Runs inside the transaction that writes the message. Required: throws
+ * `AgentSessionAttachmentExpiredError`, rolling the write back, when a reference names an upload
+ * this host does not hold or is deleting. Best effort: claims what it can and reports, never
+ * failing the write it rides on.
+ */
+export function claimAgentSessionAttachmentsInTransaction(
+  db: Database.Database,
+  claim: AgentSessionAttachmentClaim
+): void {
+  const root = agentSessionAttachmentStoreRoot(claim.stateDirectory)
+  const uploadIds = agentSessionAttachmentReferences(root, claim.body)
+  if (uploadIds.size === 0) {
+    return
+  }
+  if (claim.required) {
+    if (
+      [...uploadIds].some(
+        (uploadId) => isBeingSwept(db, uploadId) || !uploadIsStored(root, uploadId)
+      )
+    ) {
+      throw new AgentSessionAttachmentExpiredError()
+    }
+    insertClaims(db, uploadIds, claim.sessionId, claim.now)
+    return
+  }
+  db.exec(`SAVEPOINT ${CLAIM_SAVEPOINT}`)
+  try {
+    insertClaims(db, uploadIds, claim.sessionId, claim.now)
+    db.exec(`RELEASE ${CLAIM_SAVEPOINT}`)
+  } catch (error) {
+    db.exec(`ROLLBACK TO ${CLAIM_SAVEPOINT}`)
+    db.exec(`RELEASE ${CLAIM_SAVEPOINT}`)
+    console.warn('[agent-session-attachments] claim skipped:', {
+      sessionId: claim.sessionId,
+      error: error instanceof Error ? error.message : String(error)
+    })
+  }
+}
+
+/** The sweep's side of the race: marks an upload as being deleted only while nobody claims it.
+ *  True means this sweep won and may delete it; every later claim refuses it. */
+export function markUnclaimedUploadForSweep(
+  db: Database.Database,
+  uploadId: string,
+  now: number
+): boolean {
+  const result = db
+    .prepare(
+      `INSERT OR IGNORE INTO agent_session_attachment_sweeps (upload_id, started_at)
+       SELECT ?, ? WHERE NOT EXISTS
+         (SELECT 1 FROM agent_session_attachment_claims WHERE upload_id = ?)`
+    )
+    .run(uploadId, now, uploadId)
+  return Number(result.changes) > 0
+}
+
+export function listUploadsBeingSwept(db: Database.Database): string[] {
+  return db
+    .prepare('SELECT upload_id FROM agent_session_attachment_sweeps')
+    .all()
+    .flatMap((row) =>
+      typeof row === 'object' &&
+      row !== null &&
+      'upload_id' in row &&
+      typeof row.upload_id === 'string'
+        ? [row.upload_id]
+        : []
+    )
+}
+
+export function finishUploadSweep(db: Database.Database, uploadId: string): void {
+  db.prepare('DELETE FROM agent_session_attachment_sweeps WHERE upload_id = ?').run(uploadId)
+}
+
+/**
+ * Claims nothing can use any more: their chat has no record, or their upload is gone from disk
+ * (removed outside Orca). Re-derived on every sweep, so a claim cannot outlive what it protects.
+ * Synchronous with the facts it reads, so a claim written meanwhile is judged on today's facts.
+ */
+export function pruneAgentSessionAttachmentClaims(
+  db: Database.Database,
+  facts: { root: string; recordedSessionIds: Pick<ReadonlySet<string>, 'has'> | null }
+): number {
+  const rows = db
+    .prepare('SELECT upload_id, session_id FROM agent_session_attachment_claims')
+    .all()
+    .flatMap((row) =>
+      typeof row === 'object' &&
+      row !== null &&
+      'upload_id' in row &&
+      'session_id' in row &&
+      typeof row.upload_id === 'string' &&
+      typeof row.session_id === 'string'
+        ? [{ uploadId: row.upload_id, sessionId: row.session_id }]
+        : []
+    )
+  const remove = db.prepare(
+    'DELETE FROM agent_session_attachment_claims WHERE upload_id = ? AND session_id = ?'
+  )
+  let removed = 0
+  for (const { uploadId, sessionId } of rows) {
+    const chatGone = facts.recordedSessionIds !== null && !facts.recordedSessionIds.has(sessionId)
+    if (chatGone || !existsSync(join(facts.root, uploadId))) {
+      removed += Number(remove.run(uploadId, sessionId).changes)
+    }
+  }
+  return removed
+}
diff --git a/src/main/native-chat/agent-session-attachments/agent-session-attachment-references.ts b/src/main/native-chat/agent-session-attachments/agent-session-attachment-references.ts
new file mode 100644
index 000000000000..f08896ad4a5d
--- /dev/null
+++ b/src/main/native-chat/agent-session-attachments/agent-session-attachment-references.ts
@@ -0,0 +1,94 @@
+// How the host recognizes its own attachment store in what a client sends: a stored file is
+// `<store root>/<upload id>/<name>`, and only the upload id is needed to know which upload it is.
+
+import { isAbsolute, join, relative, sep } from 'node:path'
+import { AGENT_SESSION_ATTACHMENTS_DIR_NAME } from '../../../shared/agent-session-attachments'
+import type { AgentJournalMessageItem } from '../../../shared/agent-session-journal-types'
+
+export const AGENT_SESSION_ATTACHMENT_PART_FILE = '.upload.part'
+
+const UPLOAD_ID_SOURCE = '[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}'
+const UPLOAD_ID = new RegExp(`^${UPLOAD_ID_SOURCE}$`)
+
+export function agentSessionAttachmentStoreRoot(stateDirectory: string): string {
+  return join(stateDirectory, AGENT_SESSION_ATTACHMENTS_DIR_NAME)
+}
+
+export function isAgentSessionAttachmentUploadId(value: string): boolean {
+  return UPLOAD_ID.test(value)
+}
+
+/** The upload a stored file belongs to, or null for anything that is not exactly a committed file
+ *  directly in an upload directory of this store. */
+export function parseAgentSessionAttachmentStorePath(
+  root: string,
+  filePath: string
+): { uploadId: string; name: string } | null {
+  if (!isAbsolute(filePath)) {
+    return null
+  }
+  const inside = relative(root, filePath)
+  const segments = inside.split(sep)
+  const [uploadId, name] = segments
+  if (
+    inside === '' ||
+    isAbsolute(inside) ||
+    segments.length !== 2 ||
+    !uploadId ||
+    !name ||
+    !isAgentSessionAttachmentUploadId(uploadId) ||
+    name === AGENT_SESSION_ATTACHMENT_PART_FILE
+  ) {
+    return null
+  }
+  return { uploadId, name }
+}
+
+// A root preceded by one of these is the tail of some other, longer path.
+const PATH_CHARACTER = /[\w.~\\/-]/
+
+function normalizedRoot(root: string, platform: NodeJS.Platform): string {
+  const forward = root.replace(/\\/g, '/')
+  return platform === 'win32' ? forward.toLowerCase() : forward
+}
+
+/**
+ * The uploads of this host's store a message body names, in image paths and file references in its
+ * text alike. Only a path that starts with this host's exact store root counts: matched on the
+ * decoded body by `<store root>/<upload id>`, so quoting or a file name with spaces cannot hide one,
+ * and Windows paths match with either separator and in any case. Any other mention of a store
+ * path (another server's, a `~` form, a bare name) is only text.
+ */
+export function agentSessionAttachmentReferences(
+  root: string,
+  body: AgentJournalMessageItem,
+  platform: NodeJS.Platform = process.platform
+): Set<string> {
+  const uploadIds = new Set<string>()
+  const ownRoot = normalizedRoot(root, platform)
+  const pattern = new RegExp(
+    `${AGENT_SESSION_ATTACHMENTS_DIR_NAME}[\\\\/](${UPLOAD_ID_SOURCE})(?![0-9a-z-])`,
+    platform === 'win32' ? 'gi' : 'g'
+  )
+  for (const block of body.blocks) {
+    const text =
+      block.type === 'text' ? block.text : block.type === 'image-ref' ? block.path : undefined
+    if (!text) {
+      continue
+    }
+    for (const match of text.matchAll(pattern)) {
+      const rootEnd = match.index + AGENT_SESSION_ATTACHMENTS_DIR_NAME.length
+      const rootStart = rootEnd - root.length
+      const uploadId = match[1]?.toLowerCase()
+      if (
+        uploadId &&
+        rootStart >= 0 &&
+        !PATH_CHARACTER.test(text.charAt(rootStart - 1)) &&
+        normalizedRoot(text.slice(rootStart, rootEnd), platform) === ownRoot
+      ) {
+        uploadIds.add(uploadId)
+      }
+    }
+  }
+  return uploadIds
+}
diff --git a/src/main/native-chat/agent-session-attachments/agent-session-attachment-store-registry.ts b/src/main/native-chat/agent-session-attachments/agent-session-attachment-store-registry.ts
new file mode 100644
index 000000000000..e0f4201618a3
--- /dev/null
+++ b/src/main/native-chat/agent-session-attachments/agent-session-attachment-store-registry.ts
@@ -0,0 +1,15 @@
+// The installed attachment store, apart from the store itself: the RPC methods are imported
+// wherever the method table is, and must not load the store's file-reading dependencies with it.
+
+import type { AgentSessionAttachmentStore } from './agent-session-attachment-store'
+
+let installedStore: AgentSessionAttachmentStore | null = null
+
+/** Installed with the structured host, which owns the state directory the store lives in. */
+export function setAgentSessionAttachmentStore(store: AgentSessionAttachmentStore | null): void {
+  installedStore = store
+}
+
+export function getAgentSessionAttachmentStore(): AgentSessionAttachmentStore | null {
+  return installedStore
+}
diff --git a/src/main/native-chat/agent-session-attachments/agent-session-attachment-store.test.ts b/src/main/native-chat/agent-session-attachments/agent-session-attachment-store.test.ts
new file mode 100644
index 000000000000..fc0c57d30b24
--- /dev/null
+++ b/src/main/native-chat/agent-session-attachments/agent-session-attachment-store.test.ts
@@ -0,0 +1,231 @@
+import { mkdtemp, readdir, readFile, rm, stat, symlink, writeFile, mkdir } from 'node:fs/promises'
+import { tmpdir } from 'node:os'
+import { join } from 'node:path'
+import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest'
+import { AgentSessionAttachmentStore } from './agent-session-attachment-store'
+import { REMOTE_RPC_MAX_CONTENT_BYTES } from '../../../shared/remote-rpc-content-budget'
+import { isMobileE2EETextPayloadWithinLimit } from '../../runtime/rpc/mobile-e2ee-outbound-admission'
+
+let root: string
+let store: AgentSessionAttachmentStore
+const caller = 'client-a'
+
+beforeEach(async () => {
+  root = await mkdtemp(join(tmpdir(), 'orca-attachments-'))
+  store = new AgentSessionAttachmentStore(join(root, 'agent-session-attachments'), {
+    hasSession: (sessionId) => sessionId.startsWith('session-')
+  })
+})
+
+afterEach(async () => {
+  store.clearInFlightForTests()
+  vi.useRealTimers()
+  await rm(root, { recursive: true, force: true })
+})
+
+async function upload(name: string, bytes: Buffer, sessionId = 'session-1') {
+  const { uploadId } = await store.startUpload({
+    callerKey: caller,
+    sessionId,
+    name,
+    byteLength: bytes.byteLength
+  })
+  await store.appendChunk({
+    callerKey: caller,
+    uploadId,
+    offset: 0,
+    contentBase64: bytes.toString('base64')
+  })
+  return store.commitUpload({ callerKey: caller, uploadId })
+}
+
+describe('AgentSessionAttachmentStore', () => {
+  it('stores the bytes in an upload directory of its own, keeping the file name', async () => {
+    const stored = await upload('screen shot.png', Buffer.from('png-bytes'))
+    expect(stored.name).toBe('screen shot.png')
+    expect(stored.byteLength).toBe(9)
+    expect(await readdir(store.rootDir)).toHaveLength(1)
+    expect(stored.path.startsWith(store.rootDir)).toBe(true)
+    expect(stored.path.endsWith('screen shot.png')).toBe(true)
+    expect(await readFile(stored.path, 'utf8')).toBe('png-bytes')
+    // The part file is gone once the name holds the whole file.
+    expect(await readdir(join(stored.path, '..'))).toEqual(['screen shot.png'])
+  })
+
+  it('keeps only the last path segment of a name, never a path out of the store', async () => {
+    const stored = await upload('../../../etc/passwd', Buffer.from('x'))
+    expect(stored.name).toBe('passwd')
+    expect(stored.path.startsWith(store.rootDir)).toBe(true)
+  })
+
+  it('refuses an upload for a chat this host does not hold', async () => {
+    await expect(
+      store.startUpload({ callerKey: caller, sessionId: 'unknown', name: 'a.txt', byteLength: 1 })
+    ).rejects.toThrow('not on this host')
+    await expect(readdir(store.rootDir)).rejects.toThrow()
+  })
+
+  it('appends chunks in order and refuses one out of order or past the declared size', async () => {
+    const { uploadId } = await store.startUpload({
+      callerKey: caller,
+      sessionId: 'session-1',
+      name: 'a.txt',
+      byteLength: 4
+    })
+    const chunk = (text: string) => Buffer.from(text).toString('base64')
+    await store.appendChunk({ callerKey: caller, uploadId, offset: 0, contentBase64: chunk('ab') })
+    await expect(
+      store.appendChunk({ callerKey: caller, uploadId, offset: 0, contentBase64: chunk('cd') })
+    ).rejects.toThrow('out of order')
+    await expect(
+      store.appendChunk({ callerKey: caller, uploadId, offset: 2, contentBase64: chunk('cde') })
+    ).rejects.toThrow('exceeded its declared size')
+    await store.appendChunk({ callerKey: caller, uploadId, offset: 2, contentBase64: chunk('cd') })
+    const stored = await store.commitUpload({ callerKey: caller, uploadId })
+    expect(await readFile(stored.path, 'utf8')).toBe('abcd')
+  })
+
+  it('refuses an incomplete commit and removes what it had', async () => {
+    const { uploadId } = await store.startUpload({
+      callerKey: caller,
+      sessionId: 'session-1',
+      name: 'a.txt',
+      byteLength: 10
+    })
+    await expect(store.commitUpload({ callerKey: caller, uploadId })).rejects.toThrow('incomplete')
+    expect(await readdir(store.rootDir)).toEqual([])
+  })
+
+  it('keeps an upload in flight until its file is renamed into place, so no sweep takes it', async () => {
+    const { uploadId } = await store.startUpload({
+      callerKey: caller,
+      sessionId: 'session-1',
+      name: 'a.txt',
+      byteLength: 1
+    })
+    await store.appendChunk({ callerKey: caller, uploadId, offset: 0, contentBase64: 'eA==' })
+    const committing = store.commitUpload({ callerKey: caller, uploadId })
+    expect(store.isUploadInFlight(uploadId)).toBe(true)
+    await committing
+    expect(store.isUploadInFlight(uploadId)).toBe(false)
+  })
+
+  it('stores an empty file', async () => {
+    const stored = await upload('empty.txt', Buffer.alloc(0))
+    expect((await stat(stored.path)).size).toBe(0)
+  })
+
+  it('does not let another client touch an upload it did not start', async () => {
+    const { uploadId } = await store.startUpload({
+      callerKey: caller,
+      sessionId: 'session-1',
+      name: 'a.txt',
+      byteLength: 1
+    })
+    await expect(
+      store.appendChunk({ callerKey: 'client-b', uploadId, offset: 0, contentBase64: 'eA==' })
+    ).rejects.toThrow('not found')
+    await expect(store.commitUpload({ callerKey: 'client-b', uploadId })).rejects.toThrow(
+      'not found'
+    )
+    await expect(store.abortUpload({ callerKey: 'client-b', uploadId })).rejects.toThrow(
+      'not found'
+    )
+    expect(store.isUploadInFlight(uploadId)).toBe(true)
+  })
+
+  it('removes an aborted upload', async () => {
+    const { uploadId } = await store.startUpload({
+      callerKey: caller,
+      sessionId: 'session-1',
+      name: 'a.txt',
+      byteLength: 1
+    })
+    await store.abortUpload({ callerKey: caller, uploadId })
+    expect(store.isUploadInFlight(uploadId)).toBe(false)
+    expect(await readdir(store.rootDir)).toEqual([])
+  })
+
+  it('forgets and removes an upload its client abandoned', async () => {
+    vi.useFakeTimers({ toFake: ['setTimeout', 'clearTimeout', 'Date'] })
+    const { uploadId } = await store.startUpload({
+      callerKey: caller,
+      sessionId: 'session-1',
+      name: 'a.txt',
+      byteLength: 1
+    })
+    vi.advanceTimersByTime(5 * 60 * 1000 + 1)
+    vi.useRealTimers()
+    await vi.waitFor(async () => expect(await readdir(store.rootDir)).toEqual([]))
+    expect(store.isUploadInFlight(uploadId)).toBe(false)
+    await expect(store.commitUpload({ callerKey: caller, uploadId })).rejects.toThrow('not found')
+  })
+
+  it('reads back a stored image and nothing outside the store', async () => {
+    const stored = await upload('shot.png', Buffer.from('png-bytes'))
+    await expect(store.readPreview(stored.path)).resolves.toEqual({
+      content: Buffer.from('png-bytes').toString('base64'),
+      isBinary: true,
+      isImage: true,
+      mimeType: 'image/png'
+    })
+    const outside = join(root, 'outside.png')
+    await writeFile(outside, 'secret')
+    await expect(store.readPreview(outside)).rejects.toThrow('Not an attachment image')
+    const notImage = await upload('notes.txt', Buffer.from('text'))
+    await expect(store.readPreview(notImage.path)).rejects.toThrow('Not an attachment image')
+  })
+
+  it('reads only a file exactly at <upload>/<name>', async () => {
+    const { uploadId } = await store.startUpload({
+      callerKey: caller,
+      sessionId: 'session-1',
+      name: 'shot.png',
+      byteLength: 3
+    })
+    const uploadDir = join(store.rootDir, uploadId)
+    // Deeper than a stored file: nothing the store wrote lives there.
+    await mkdir(join(uploadDir, 'nested'), { recursive: true })
+    await writeFile(join(uploadDir, 'nested', 'x.png'), 'x')
+    await expect(store.readPreview(join(uploadDir, 'nested', 'x.png'))).rejects.toThrow(
+      'Not an attachment image'
+    )
+  })
+
+  it('never follows a link out of the store', async () => {
+    const stored = await upload('shot.png', Buffer.from('png-bytes'))
+    const outside = join(root, 'secret.png')
+    await writeFile(outside, 'secret')
+    await rm(stored.path)
+    await symlink(outside, stored.path)
+    await expect(store.readPreview(stored.path)).rejects.toThrow('Not an attachment image')
+  })
+
+  it('refuses an image over the reply budget instead of overflowing the connection', async () => {
+    const big = Buffer.alloc(3.5 * 1024 * 1024, 1)
+    const { uploadId } = await store.startUpload({
+      callerKey: caller,
+      sessionId: 'session-1',
+      name: 'big.png',
+      byteLength: big.byteLength
+    })
+    await store.appendChunk({
+      callerKey: caller,
+      uploadId,
+      offset: 0,
+      contentBase64: big.toString('base64')
+    })
+    const stored = await store.commitUpload({ callerKey: caller, uploadId })
+    // The budget a remote reply gets: what the server's outbound limit leaves after the envelope.
+    await expect(store.readPreview(stored.path, REMOTE_RPC_MAX_CONTENT_BYTES)).rejects.toThrow(
+      'file_too_large'
+    )
+    // A local read keeps the larger preview limit.
+    await expect(store.readPreview(stored.path)).resolves.toMatchObject({ mimeType: 'image/png' })
+    // An image that fits the budget also fits the server's outbound limit once enveloped.
+    const fits = await upload('fits.png', Buffer.alloc(2.5 * 1024 * 1024, 1))
+    const preview = await store.readPreview(fits.path, REMOTE_RPC_MAX_CONTENT_BYTES)
+    const reply = JSON.stringify({ id: 'request-1', ok: true, result: preview })
+    expect(isMobileE2EETextPayloadWithinLimit(reply)).toBe(true)
+  })
+})
diff --git a/src/main/native-chat/agent-session-attachments/agent-session-attachment-store.ts b/src/main/native-chat/agent-session-attachments/agent-session-attachment-store.ts
new file mode 100644
index 000000000000..a9626e86afaf
--- /dev/null
+++ b/src/main/native-chat/agent-session-attachments/agent-session-attachment-store.ts
@@ -0,0 +1,225 @@
+// The server-owned store for files a client attaches to a structured chat.
+//
+// `<root>/<upload id>/<original file name>`: one directory per upload keeps the user's file name
+// intact (agents read meaning into it) without two uploads colliding. Bytes land in a hidden part
+// file and are renamed into place on commit, so a stored name is always complete. Which chats hold
+// an upload is recorded by the message that names it (`agent-session-attachment-claims.ts`).
+
+import { appendFile, mkdir, rm, writeFile } from 'node:fs/promises'
+import { extname, join } from 'node:path'
+import {
+  sanitizeAgentSessionAttachmentName,
+  type AgentSessionAttachmentUploadCommitResult
+} from '../../../shared/agent-session-attachments'
+import type { RuntimeFilePreviewResult } from '../../../shared/runtime-types'
+import { readAuthorizedDocPreviewFile } from '../../../shared/doc-preview-file-access'
+import { renameFileWithWindowsRetryAsync } from '../../../shared/windows-retry-file-operations'
+import { IMAGE_FILE_MIME_TYPES } from '../../../shared/image-file-extensions'
+import {
+  LOCAL_PREVIEWABLE_BINARY_MAX_BYTES,
+  assertPreviewWithinTransportBudget,
+  previewableBinaryByteLimit
+} from '../../runtime/runtime-file-commands-mobile-file-list-limit'
+import { ChunkedUploadRegistry, nextChunkedUploadLength } from './chunked-upload-registry'
+import {
+  AGENT_SESSION_ATTACHMENT_PART_FILE,
+  parseAgentSessionAttachmentStorePath
+} from './agent-session-attachment-references'
+
+const UPLOAD_MAX_CONCURRENT = 8
+const UPLOAD_IDLE_TTL_MS = 5 * 60 * 1000
+const NOT_FOUND = 'Attachment upload was not found'
+const NOT_AN_IMAGE = 'Not an attachment image'
+const PREVIEW_TOO_LARGE = 'file_too_large'
+
+function isTooLarge(error: unknown): boolean {
+  return error instanceof Error && error.message === PREVIEW_TOO_LARGE
+}
+
+type InFlightUpload = {
+  callerKey: string
+  uploadDir: string
+  name: string
+  expectedLength: number
+  receivedLength: number
+  writing: boolean
+}
+
+export type AgentSessionAttachmentStoreOptions = {
+  /** Whether this host holds the chat: an upload for any other chat is refused at its start. */
+  hasSession: (sessionId: string) => boolean
+}
+
+export class AgentSessionAttachmentStore {
+  private readonly uploads = new ChunkedUploadRegistry<InFlightUpload>({
+    maxConcurrent: UPLOAD_MAX_CONCURRENT,
+    ttlMs: UPLOAD_IDLE_TTL_MS,
+    tooManyMessage: 'Too many attachment uploads are in progress',
+    notFoundMessage: NOT_FOUND,
+    onExpire: (upload) => void removeQuietly(upload.uploadDir)
+  })
+
+  constructor(
+    readonly rootDir: string,
+    private readonly options: AgentSessionAttachmentStoreOptions
+  ) {}
+
+  /** Upload ids whose bytes are still arriving; the sweep leaves their directories alone. */
+  isUploadInFlight(uploadId: string): boolean {
+    return this.uploads.has(uploadId)
+  }
+
+  async startUpload(args: {
+    callerKey: string
+    sessionId: string
+    name: string
+    byteLength: number
+  }): Promise<{ uploadId: string }> {
+    if (!this.options.hasSession(args.sessionId)) {
+      throw new Error('This chat is not on this host')
+    }
+    const name = sanitizeAgentSessionAttachmentName(args.name)
+    const uploadId = this.uploads.create((id) => ({
+      callerKey: args.callerKey,
+      uploadDir: join(this.rootDir, id),
+      name,
+      expectedLength: args.byteLength,
+      receivedLength: 0,
+      writing: false
+    }))
+    const uploadDir = join(this.rootDir, uploadId)
+    try {
+      await mkdir(uploadDir, { recursive: true })
+      await writeFile(join(uploadDir, AGENT_SESSION_ATTACHMENT_PART_FILE), '', { flag: 'wx' })
+    } catch (error) {
+      this.uploads.delete(uploadId)
+      await removeQuietly(uploadDir)
+      throw error
+    }
+    return { uploadId }
+  }
+
+  async appendChunk(args: {
+    callerKey: string
+    uploadId: string
+    offset: number
+    contentBase64: string
+  }): Promise<{ receivedBytes: number }> {
+    const upload = this.requireOwned(args.uploadId, args.callerKey)
+    if (upload.writing) {
+      throw new Error('Attachment chunk is already being written')
+    }
+    const bytes = Buffer.from(args.contentBase64, 'base64')
+    const nextLength = nextChunkedUploadLength(upload, args.offset, bytes.byteLength, {
+      outOfOrder: 'Attachment chunk offset is out of order',
+      exceeded: 'Attachment upload exceeded its declared size'
+    })
+    upload.writing = true
+    try {
+      await appendFile(join(upload.uploadDir, AGENT_SESSION_ATTACHMENT_PART_FILE), bytes)
+      upload.receivedLength = nextLength
+    } finally {
+      upload.writing = false
+    }
+    this.uploads.touch(args.uploadId)
+    return { receivedBytes: upload.receivedLength }
+  }
+
+  async commitUpload(args: {
+    callerKey: string
+    uploadId: string
+  }): Promise<AgentSessionAttachmentUploadCommitResult> {
+    const upload = this.requireOwned(args.uploadId, args.callerKey)
+    if (upload.writing) {
+      throw new Error('Attachment chunk is still being written')
+    }
+    // In flight until the rename lands, so the sweep never takes a slow upload's part file.
+    upload.writing = true
+    try {
+      if (upload.receivedLength !== upload.expectedLength) {
+        throw new Error('Attachment upload is incomplete')
+      }
+      const finalPath = join(upload.uploadDir, upload.name)
+      // An antivirus or indexer briefly holding the part file on Windows must not lose the upload.
+      await renameFileWithWindowsRetryAsync(
+        join(upload.uploadDir, AGENT_SESSION_ATTACHMENT_PART_FILE),
+        finalPath
+      )
+      return { path: finalPath, name: upload.name, byteLength: upload.receivedLength }
+    } catch (error) {
+      await removeQuietly(upload.uploadDir)
+      throw error
+    } finally {
+      this.uploads.delete(args.uploadId)
+    }
+  }
+
+  async abortUpload(args: { callerKey: string; uploadId: string }): Promise<{ aborted: true }> {
+    const upload = this.uploads.peek(args.uploadId)
+    if (upload) {
+      if (upload.callerKey !== args.callerKey) {
+        throw new Error(NOT_FOUND)
+      }
+      this.uploads.delete(args.uploadId)
+      await removeQuietly(upload.uploadDir)
+    }
+    return { aborted: true }
+  }
+
+  /**
+   * A stored image's bytes, for a client that shows it. Anything outside the store is refused, and
+   * the read is protected and bounded: `maxContentBytes` is the reply's budget on a remote
+   * connection, and an image over it is refused as too large rather than sent.
+   */
+  async readPreview(filePath: string, maxContentBytes?: number): Promise<RuntimeFilePreviewResult> {
+    if (
+      !IMAGE_FILE_MIME_TYPES[extname(filePath).toLowerCase()] ||
+      !parseAgentSessionAttachmentStorePath(this.rootDir, filePath)
+    ) {
+      throw new Error(NOT_AN_IMAGE)
+    }
+    let read: Awaited<ReturnType<typeof readAuthorizedDocPreviewFile>>
+    try {
+      read = await readAuthorizedDocPreviewFile({
+        boundaryPath: this.rootDir,
+        entryPath: filePath,
+        implicitRootPath: null,
+        authorizedRootPaths: [],
+        targetPath: filePath,
+        maxTextBytes: 0,
+        maxBinaryBytes:
+          maxContentBytes === undefined
+            ? LOCAL_PREVIEWABLE_BINARY_MAX_BYTES
+            : previewableBinaryByteLimit(maxContentBytes)
+      })
+    } catch (error) {
+      // One answer for everything else, so a read says nothing about the server's other files.
+      throw new Error(isTooLarge(error) ? PREVIEW_TOO_LARGE : NOT_AN_IMAGE)
+    }
+    if (!read.isBinary || !read.mimeType?.startsWith('image/')) {
+      throw new Error(NOT_AN_IMAGE)
+    }
+    return assertPreviewWithinTransportBudget(
+      { content: read.content, isBinary: true, isImage: true, mimeType: read.mimeType },
+      maxContentBytes
+    )
+  }
+
+  clearInFlightForTests(): void {
+    this.uploads.clear()
+  }
+
+  private requireOwned(uploadId: string, callerKey: string): InFlightUpload {
+    const upload = this.uploads.require(uploadId)
+    // Another client's upload reads as absent, not as forbidden.
+    if (upload.callerKey !== callerKey) {
+      throw new Error(NOT_FOUND)
+    }
+    return upload
+  }
+}
+
+export async function removeQuietly(path: string): Promise<void> {
+  // Cleanup is best effort: a file that will not go is retried by the next sweep.
+  await rm(path, { recursive: true, force: true }).catch(() => {})
+}
diff --git a/src/main/native-chat/agent-session-attachments/agent-session-attachment-sweep.test.ts b/src/main/native-chat/agent-session-attachments/agent-session-attachment-sweep.test.ts
new file mode 100644
index 000000000000..e414633a66bc
--- /dev/null
+++ b/src/main/native-chat/agent-session-attachments/agent-session-attachment-sweep.test.ts
@@ -0,0 +1,199 @@
+import { mkdir, mkdtemp, readdir, rm, utimes, writeFile } from 'node:fs/promises'
+import { tmpdir } from 'node:os'
+import { join } from 'node:path'
+import { afterEach, beforeEach, describe, expect, it } from 'vitest'
+import type Database from '../../sqlite/sync-database'
+import type { AgentJournalMessageItem } from '../../../shared/agent-session-journal-types'
+import {
+  closeTestJournalHostDatabases,
+  openTestJournalHostDatabase
+} from '../agent-session-journal/journal-host-database-test-support'
+import {
+  claimAgentSessionAttachmentsInTransaction,
+  isAgentSessionAttachmentExpiredError,
+  markUnclaimedUploadForSweep
+} from './agent-session-attachment-claims'
+import {
+  AGENT_SESSION_ATTACHMENT_PART_FILE,
+  agentSessionAttachmentStoreRoot
+} from './agent-session-attachment-references'
+import { AgentSessionAttachmentStore } from './agent-session-attachment-store'
+import {
+  sweepAgentSessionAttachments,
+  type AgentSessionAttachmentSweepFacts
+} from './agent-session-attachment-sweep'
+
+const HOUR = 60 * 60 * 1000
+const NOW = Date.now()
+const OLD = 24 * HOUR + 1
+const SENT = '0b6f8a52-4a3e-4c4e-9a59-1d5d1f2b8c01'
+const UNSENT = '7c2d9e10-3f4a-4b5c-8d6e-2f1a0b9c8d02'
+const CARRIED = '3e1f0a9b-8c7d-4e6f-a5b4-c3d2e1f0a903'
+
+let stateDirectory: string
+let store: AgentSessionAttachmentStore
+let db: Database.Database
+let recorded: Set<string> | null
+
+beforeEach(async () => {
+  stateDirectory = await mkdtemp(join(tmpdir(), 'orca-attachment-sweep-'))
+  store = new AgentSessionAttachmentStore(agentSessionAttachmentStoreRoot(stateDirectory), {
+    hasSession: () => true
+  })
+  db = openTestJournalHostDatabase(stateDirectory).db
+  recorded = new Set(['session-1', 'session-2'])
+})
+
+afterEach(async () => {
+  store.clearInFlightForTests()
+  closeTestJournalHostDatabases()
+  await rm(stateDirectory, { recursive: true, force: true })
+})
+
+function facts(overrides: Partial<AgentSessionAttachmentSweepFacts> = {}) {
+  return { database: () => db, recordedSessionIds: () => recorded, ...overrides }
+}
+
+/** A stored upload (or a bare part file) last touched `ageMs` ago. */
+async function seedUpload(
+  uploadId: string,
+  ageMs: number,
+  file: string = 'shot.png'
+): Promise<string> {
+  const uploadDir = join(store.rootDir, uploadId)
+  await mkdir(uploadDir, { recursive: true })
+  await writeFile(join(uploadDir, file), 'bytes')
+  const at = new Date(NOW - ageMs)
+  await utimes(uploadDir, at, at)
+  return join(uploadDir, file)
+}
+
+function claim(sessionId: string, path: string, required = true): void {
+  const body: AgentJournalMessageItem = {
+    kind: 'message',
+    role: 'user',
+    blocks: [{ type: 'image-ref', path }]
+  }
+  db.exec('BEGIN')
+  try {
+    claimAgentSessionAttachmentsInTransaction(db, {
+      stateDirectory,
+      sessionId,
+      body,
+      required,
+      now: NOW
+    })
+    db.exec('COMMIT')
+  } catch (error) {
+    db.exec('ROLLBACK')
+    throw error
+  }
+}
+
+function claimedSessions(): string[] {
+  return db
+    .prepare('SELECT session_id FROM agent_session_attachment_claims ORDER BY session_id')
+    .all()
+    .flatMap((row) =>
+      typeof row === 'object' && row !== null && 'session_id' in row ? [String(row.session_id)] : []
+    )
+}
+
+async function remaining(): Promise<string[]> {
+  return (await readdir(store.rootDir).catch(() => [])).sort()
+}
+
+describe('sweepAgentSessionAttachments', () => {
+  it('removes a part file nobody finished after an hour, and keeps a fresh one', async () => {
+    await seedUpload(SENT, HOUR + 1, AGENT_SESSION_ATTACHMENT_PART_FILE)
+    await seedUpload(UNSENT, HOUR - 1000, AGENT_SESSION_ATTACHMENT_PART_FILE)
+    await sweepAgentSessionAttachments(store, facts(), NOW)
+    expect(await remaining()).toEqual([UNSENT])
+  })
+
+  it('removes an upload nobody claimed after a day, and keeps a claimed one and a fresh one', async () => {
+    claim('session-1', await seedUpload(SENT, OLD))
+    await seedUpload(UNSENT, OLD)
+    await seedUpload(CARRIED, HOUR)
+    const { removed } = await sweepAgentSessionAttachments(store, facts(), NOW)
+    expect(removed).toEqual([join(store.rootDir, UNSENT)])
+    expect(await remaining()).toEqual([SENT, CARRIED].sort())
+  })
+
+  it('keeps an upload any chat still claims: a /clear carry is a second holder', async () => {
+    const path = await seedUpload(CARRIED, OLD)
+    claim('session-1', path)
+    claim('session-2', path, false)
+    // The source chat goes; the replacement still holds the upload.
+    recorded = new Set(['session-2'])
+    await sweepAgentSessionAttachments(store, facts(), NOW)
+    expect(await remaining()).toEqual([CARRIED])
+    expect(claimedSessions()).toEqual(['session-2'])
+    // Once no chat holds it, it is unclaimed and goes.
+    recorded = new Set()
+    await sweepAgentSessionAttachments(store, facts(), NOW)
+    expect(claimedSessions()).toEqual([])
+    await sweepAgentSessionAttachments(store, facts(), NOW)
+    expect(await remaining()).toEqual([])
+  })
+
+  it('a send after the sweep marked an upload is refused, never sent without its file', async () => {
+    const path = await seedUpload(UNSENT, OLD)
+    // The sweep wins the race: its mark lands before the claim.
+    expect(markUnclaimedUploadForSweep(db, UNSENT, NOW)).toBe(true)
+    let refused: unknown
+    try {
+      claim('session-1', path)
+    } catch (error) {
+      refused = error
+    }
+    expect(isAgentSessionAttachmentExpiredError(refused)).toBe(true)
+    expect(claimedSessions()).toEqual([])
+  })
+
+  it('finishes a delete a crashed sweep left marked, then forgets the mark', async () => {
+    await seedUpload(UNSENT, HOUR)
+    // Marked, then the process died before the files went.
+    expect(markUnclaimedUploadForSweep(db, UNSENT, NOW)).toBe(true)
+    await sweepAgentSessionAttachments(store, facts(), NOW)
+    expect(await remaining()).toEqual([])
+    expect(db.prepare('SELECT COUNT(*) AS n FROM agent_session_attachment_sweeps').get()).toEqual({
+      n: 0
+    })
+  })
+
+  it('judges no claim orphaned while the record list is incomplete', async () => {
+    claim('session-1', await seedUpload(SENT, OLD))
+    recorded = null
+    await sweepAgentSessionAttachments(store, facts(), NOW)
+    expect(claimedSessions()).toEqual(['session-1'])
+    expect(await remaining()).toEqual([SENT])
+  })
+
+  it('drops a claim whose upload was removed outside Orca', async () => {
+    claim('session-1', await seedUpload(SENT, OLD))
+    await rm(join(store.rootDir, SENT), { recursive: true })
+    await sweepAgentSessionAttachments(store, facts(), NOW)
+    expect(claimedSessions()).toEqual([])
+  })
+
+  it('removes only part files when it cannot write claims (a newer Orca wrote the journal)', async () => {
+    await seedUpload(UNSENT, OLD)
+    await seedUpload(SENT, HOUR + 1, AGENT_SESSION_ATTACHMENT_PART_FILE)
+    await sweepAgentSessionAttachments(store, facts({ database: () => null }), NOW)
+    expect(await remaining()).toEqual([UNSENT])
+  })
+
+  it('leaves an upload in flight alone however old its directory is', async () => {
+    const { uploadId } = await store.startUpload({
+      callerKey: 'client-a',
+      sessionId: 'session-1',
+      name: 'a.png',
+      byteLength: 1
+    })
+    const at = new Date(NOW - OLD)
+    await utimes(join(store.rootDir, uploadId), at, at)
+    await sweepAgentSessionAttachments(store, facts(), NOW)
+    expect(await remaining()).toEqual([uploadId])
+  })
+})
diff --git a/src/main/native-chat/agent-session-attachments/agent-session-attachment-sweep.ts b/src/main/native-chat/agent-session-attachments/agent-session-attachment-sweep.ts
new file mode 100644
index 000000000000..cb685a018939
--- /dev/null
+++ b/src/main/native-chat/agent-session-attachments/agent-session-attachment-sweep.ts
@@ -0,0 +1,157 @@
+// When a stored attachment may go, re-derived on every sweep from the disk and the claim table.
+//
+// - A part file nobody is writing (the uploader crashed or vanished) goes after an hour.
+// - An upload no message ever claimed goes after a day: its chip was removed or its draft
+//   abandoned. The sweep first marks it in the same database the claims live in, and only if no
+//   claim exists; a send that names it afterwards is refused instead of losing its file.
+// - A claimed upload stays while any chat holding it has a record. The host never deletes a chat
+//   today, so that is as long as its transcript.
+// - A mark left by a sweep that died mid-delete is finished by the next one.
+
+import { readdir, stat } from 'node:fs/promises'
+import { join } from 'node:path'
+import type Database from '../../sqlite/sync-database'
+import {
+  finishUploadSweep,
+  listUploadsBeingSwept,
+  markUnclaimedUploadForSweep,
+  pruneAgentSessionAttachmentClaims
+} from './agent-session-attachment-claims'
+import { AGENT_SESSION_ATTACHMENT_PART_FILE } from './agent-session-attachment-references'
+import { removeQuietly, type AgentSessionAttachmentStore } from './agent-session-attachment-store'
+
+export const ABANDONED_PART_MAX_AGE_MS = 60 * 60 * 1000
+export const UNCLAIMED_ATTACHMENT_MAX_AGE_MS = 24 * 60 * 60 * 1000
+
+export type AgentSessionAttachmentSweepFacts = {
+  /** The host's journal connection, or null when it cannot take writes (closed, or written by a
+   *  newer Orca): without it nothing claimed can be told apart, so only part files go. */
+  database: () => Database.Database | null
+  /** Every chat this host holds a record for; null while that list is incomplete (records still
+   *  owed their import), when no chat's claims can be judged orphaned. */
+  recordedSessionIds: () => Pick<ReadonlySet<string>, 'has'> | null
+}
+
+export type AgentSessionAttachmentSweepResult = { removed: string[] }
+
+export async function sweepAgentSessionAttachments(
+  store: AgentSessionAttachmentStore,
+  facts: AgentSessionAttachmentSweepFacts,
+  now = Date.now()
+): Promise<AgentSessionAttachmentSweepResult> {
+  const removed: string[] = []
+  // Read again at every statement: the host may close the connection while the sweep awaits disk.
+  const { database } = facts
+  for (const uploadId of withDatabase(database, listUploadsBeingSwept) ?? []) {
+    await removeQuietly(join(store.rootDir, uploadId))
+    withDatabase(database, (db) => finishUploadSweep(db, uploadId))
+  }
+  for (const uploadId of await listDirectories(store.rootDir)) {
+    if (store.isUploadInFlight(uploadId)) {
+      continue
+    }
+    const uploadDir = join(store.rootDir, uploadId)
+    const stored = (await listEntries(uploadDir)).some(
+      (entry) => entry !== AGENT_SESSION_ATTACHMENT_PART_FILE
+    )
+    const ageMs = now - (await modifiedAt(uploadDir))
+    if (!stored) {
+      if (ageMs > ABANDONED_PART_MAX_AGE_MS) {
+        await removeQuietly(uploadDir)
+        removed.push(uploadDir)
+      }
+      continue
+    }
+    // A claim landing first keeps the upload; this mark landing first refuses that claim.
+    if (
+      ageMs <= UNCLAIMED_ATTACHMENT_MAX_AGE_MS ||
+      withDatabase(database, (db) => markUnclaimedUploadForSweep(db, uploadId, now)) !== true
+    ) {
+      continue
+    }
+    await removeQuietly(uploadDir)
+    withDatabase(database, (db) => finishUploadSweep(db, uploadId))
+    removed.push(uploadDir)
+  }
+  withDatabase(database, (db) =>
+    pruneAgentSessionAttachmentClaims(db, {
+      root: store.rootDir,
+      recordedSessionIds: facts.recordedSessionIds()
+    })
+  )
+  return { removed }
+}
+
+function withDatabase<T>(
+  database: AgentSessionAttachmentSweepFacts['database'],
+  run: (db: Database.Database) => T
+): T | undefined {
+  const db = database()
+  return db ? run(db) : undefined
+}
+
+async function listEntries(dir: string): Promise<string[]> {
+  try {
+    return await readdir(dir)
+  } catch {
+    return []
+  }
+}
+
+async function listDirectories(dir: string): Promise<string[]> {
+  try {
+    const entries = await readdir(dir, { withFileTypes: true })
+    return entries.filter((entry) => entry.isDirectory()).map((entry) => entry.name)
+  } catch {
+    return []
+  }
+}
+
+async function modifiedAt(path: string): Promise<number> {
+  try {
+    return (await stat(path)).mtimeMs
+  } catch {
+    return Number.POSITIVE_INFINITY
+  }
+}
+
+export type AgentSessionAttachmentSweeper = { stop: () => void }
+
+/**
+ * Sweeps shortly after the host comes up and then periodically. Best effort: a failed sweep is
+ * logged and the next one tries again; nothing waits on it.
+ */
+export function startAgentSessionAttachmentSweeps(
+  store: AgentSessionAttachmentStore,
+  facts: AgentSessionAttachmentSweepFacts,
+  options: {
+    initialDelayMs: number
+    intervalMs: number
+    onError: (error: unknown) => void
+  }
+): AgentSessionAttachmentSweeper {
+  let running = false
+  let stopped = false
+  const run = (): void => {
+    if (running || stopped) {
+      return
+    }
+    running = true
+    void sweepAgentSessionAttachments(store, facts)
+      .catch(options.onError)
+      .finally(() => {
+        running = false
+      })
+  }
+  const initial = setTimeout(run, options.initialDelayMs)
+  const interval = setInterval(run, options.intervalMs)
+  initial.unref?.()
+  interval.unref?.()
+  return {
+    stop: () => {
+      stopped = true
+      clearTimeout(initial)
+      clearInterval(interval)
+    }
+  }
+}
diff --git a/src/main/native-chat/agent-session-attachments/chunked-upload-registry.ts b/src/main/native-chat/agent-session-attachments/chunked-upload-registry.ts
new file mode 100644
index 000000000000..729fc089c639
--- /dev/null
+++ b/src/main/native-chat/agent-session-attachments/chunked-upload-registry.ts
@@ -0,0 +1,130 @@
+import { randomUUID } from 'node:crypto'
+
+type RegistryEntry<T> = {
+  value: T
+  expiresAt: number
+  ttlTimer: ReturnType<typeof setTimeout>
+}
+
+export type ChunkedUploadRegistryOptions<T> = {
+  maxConcurrent: number
+  /** Idle lifetime: every touch restarts it. */
+  ttlMs: number
+  tooManyMessage: string
+  notFoundMessage: string
+  /** Runs when an upload expires unfinished; never for an explicit delete. */
+  onExpire?: (value: T) => void
+}
+
+/**
+ * In-flight chunked uploads held between start and commit: bounded in number, each forgotten after
+ * an idle TTL so a client that disappears mid-upload cannot pin the slot.
+ */
+export class ChunkedUploadRegistry<T> {
+  private readonly entries = new Map<string, RegistryEntry<T>>()
+
+  constructor(private readonly options: ChunkedUploadRegistryOptions<T>) {}
+
+  get size(): number {
+    return this.entries.size
+  }
+
+  /** `build` receives the new id, for state that is named after it. */
+  create(build: (uploadId: string) => T): string {
+    this.pruneExpired()
+    if (this.entries.size >= this.options.maxConcurrent) {
+      throw new Error(this.options.tooManyMessage)
+    }
+    const uploadId = randomUUID()
+    this.entries.set(uploadId, {
+      value: build(uploadId),
+      expiresAt: Date.now() + this.options.ttlMs,
+      ttlTimer: this.scheduleExpiry(uploadId)
+    })
+    return uploadId
+  }
+
+  require(uploadId: string): T {
+    this.pruneExpired()
+    const entry = this.entries.get(uploadId)
+    if (!entry) {
+      throw new Error(this.options.notFoundMessage)
+    }
+    return entry.value
+  }
+
+  peek(uploadId: string): T | undefined {
+    this.pruneExpired()
+    return this.entries.get(uploadId)?.value
+  }
+
+  has(uploadId: string): boolean {
+    return this.entries.has(uploadId)
+  }
+
+  touch(uploadId: string): void {
+    const entry = this.entries.get(uploadId)
+    if (!entry) {
+      return
+    }
+    clearTimeout(entry.ttlTimer)
+    entry.expiresAt = Date.now() + this.options.ttlMs
+    entry.ttlTimer = this.scheduleExpiry(uploadId)
+  }
+
+  delete(uploadId: string): T | undefined {
+    const entry = this.entries.get(uploadId)
+    if (!entry) {
+      return undefined
+    }
+    clearTimeout(entry.ttlTimer)
+    this.entries.delete(uploadId)
+    return entry.value
+  }
+
+  clear(): void {
+    for (const uploadId of this.entries.keys()) {
+      this.delete(uploadId)
+    }
+  }
+
+  private expire(uploadId: string): void {
+    const value = this.delete(uploadId)
+    if (value !== undefined) {
+      this.options.onExpire?.(value)
+    }
+  }
+
+  private pruneExpired(now = Date.now()): void {
+    for (const [uploadId, entry] of this.entries) {
+      if (entry.expiresAt <= now) {
+        this.expire(uploadId)
+      }
+    }
+  }
+
+  private scheduleExpiry(uploadId: string): ReturnType<typeof setTimeout> {
+    const timer = setTimeout(() => this.expire(uploadId), this.options.ttlMs)
+    if (typeof timer === 'object' && 'unref' in timer) {
+      timer.unref()
+    }
+    return timer
+  }
+}
+
+/** The next chunk must start where the last one ended and stay within the declared size. */
+export function nextChunkedUploadLength(
+  upload: { expectedLength: number; receivedLength: number },
+  offset: number,
+  chunkLength: number,
+  messages: { outOfOrder: string; exceeded: string }
+): number {
+  if (offset !== upload.receivedLength) {
+    throw new Error(messages.outOfOrder)
+  }
+  const nextLength = upload.receivedLength + chunkLength
+  if (nextLength > upload.expectedLength) {
+    throw new Error(messages.exceeded)
+  }
+  return nextLength
+}
diff --git a/src/main/native-chat/agent-session-journal/journal-database.ts b/src/main/native-chat/agent-session-journal/journal-database.ts
index 04483d099583..ba961541a7e9 100644
--- a/src/main/native-chat/agent-session-journal/journal-database.ts
+++ b/src/main/native-chat/agent-session-journal/journal-database.ts
@@ -14,6 +14,7 @@ import {
 } from './journal-database-schema'
 import { JournalUnreleasedSchemaError } from './journal-open-failure'
 import { ensureQueuedMessagesTable } from './queued-message-schema'
+import { ensureAgentSessionAttachmentClaimTables } from '../agent-session-attachments/agent-session-attachment-claims'
 
 export const JOURNAL_BUSY_TIMEOUT_MS = 5000
 /** Bounds the WAL a checkpoint leaves behind; SQLite truncates it back to this after a reset. */
@@ -80,6 +81,7 @@ export function openJournalDatabase(dbPath: string): OpenJournalDatabase {
     // already at the current version, and this table must exist at EVERY
     // writable open with no `user_version` bump (see `ensureQueuedMessagesTable`).
     ensureQueuedMessagesTable(probe)
+    ensureAgentSessionAttachmentClaimTables(probe)
     hardenSqliteDatabaseFiles(dbPath)
     transferred = true
     return { db: probe, readOnly: false }
diff --git a/src/main/native-chat/agent-session-journal/journal-dispatch-doubt-reasons.ts b/src/main/native-chat/agent-session-journal/journal-dispatch-doubt-reasons.ts
index 1aaa0b76df95..15bbcf53aa0f 100644
--- a/src/main/native-chat/agent-session-journal/journal-dispatch-doubt-reasons.ts
+++ b/src/main/native-chat/agent-session-journal/journal-dispatch-doubt-reasons.ts
@@ -11,6 +11,8 @@
 // exists to remove, and a user who wants the message sent anyway rotates the id
 // — one re-typed message, and a first delivery by construction.
 
+import { STRUCTURED_AGENT_SESSION_SUBMISSION_MISSING } from '../../../shared/structured-agent-session-send-evidence'
+
 /** A previous process wrote the message and died before learning its outcome. */
 export const DISPATCH_DOUBT_HOST_RESTARTED = 'host_restarted_before_acknowledgement'
 
@@ -21,7 +23,7 @@ export const DISPATCH_DOUBT_PROVIDER_EXITED = 'provider_exited_before_acknowledg
 export const DISPATCH_DOUBT_PERSISTENCE_FAILED = 'dispatch_result_persistence_failed'
 
 /** The operation tombstone survived recovery but its journal submission did not. */
-export const DISPATCH_DOUBT_SUBMISSION_MISSING = 'durable_send_submission_missing'
+export const DISPATCH_DOUBT_SUBMISSION_MISSING = STRUCTURED_AGENT_SESSION_SUBMISSION_MISSING
 
 /** The provider reported its thread not running with no turn open, so nothing is
  *  left that could still acknowledge the message. */
diff --git a/src/main/native-chat/agent-session-journal/journal-dispatch-settlement.test.ts b/src/main/native-chat/agent-session-journal/journal-dispatch-settlement.test.ts
index 7c6deabef407..b952f7672c5a 100644
--- a/src/main/native-chat/agent-session-journal/journal-dispatch-settlement.test.ts
+++ b/src/main/native-chat/agent-session-journal/journal-dispatch-settlement.test.ts
@@ -10,34 +10,29 @@ import {
 } from '../../../shared/structured-agent-session-dispatch-rejection'
 import { rejectedDraftSettlement } from './journal-dispatch-settlement'
 
-function settle(kind: SubmissionRejectionKind, origin?: 'client' | 'host') {
-  return rejectedDraftSettlement({
-    ...agentSessionFailureWords(agentSessionFailureFact(kind), { surface: 'rejection' }),
-    origin
-  })
+function settle(kind: SubmissionRejectionKind) {
+  return rejectedDraftSettlement(
+    agentSessionFailureWords(agentSessionFailureFact(kind), { surface: 'rejection' })
+  )
 }
 
 describe('what a rejection does to the draft it was consumed from', () => {
   it("a Stop's withdrawal sends it back to waiting, under the queue's pause rather than a hold of its own", () => {
-    expect(settle('cancelled')).toEqual({ state: 'waiting', kept: false })
+    expect(settle('cancelled')).toEqual({ state: 'waiting' })
     expect(rejectedDraftSettlement({ reason: DISPATCH_REJECTED_CANCELLED })).toEqual({
-      state: 'waiting',
-      kept: false
+      state: 'waiting'
     })
-    expect(settle('notDelivered')).toEqual({ state: 'waiting', kept: false })
+    expect(settle('notDelivered')).toEqual({ state: 'waiting' })
   })
 
-  // A Send the person asked for and the host never handed over waits for them; the queue's own
-  // hand-off, or one from a build that recorded no origin, waits under the queue's pause.
-  it('a restart or close before hand-over sends it back to waiting, kept only when the person sent it', () => {
+  // Whoever sent it, it waits under the reopen's pause like every card the chat closed with.
+  it('a restart or close before hand-over sends it back to waiting, with no hold of its own', () => {
     for (const kind of ['hostRestarted', 'chatClosed'] as const) {
-      expect(settle(kind, 'client')).toEqual({ state: 'waiting', kept: true })
-      expect(settle(kind, 'host')).toEqual({ state: 'waiting', kept: false })
-      expect(settle(kind)).toEqual({ state: 'waiting', kept: false })
+      expect(settle(kind)).toEqual({ state: 'waiting' })
     }
-    expect(
-      rejectedDraftSettlement({ reason: DISPATCH_REJECTED_HOST_RESTARTED, origin: 'client' })
-    ).toEqual({ state: 'waiting', kept: true })
+    expect(rejectedDraftSettlement({ reason: DISPATCH_REJECTED_HOST_RESTARTED })).toEqual({
+      state: 'waiting'
+    })
   })
 
   it('a failure returns the card for the user to act on', () => {
diff --git a/src/main/native-chat/agent-session-journal/journal-dispatch-settlement.ts b/src/main/native-chat/agent-session-journal/journal-dispatch-settlement.ts
index 6b3e53f36b37..c56e4f47d45d 100644
--- a/src/main/native-chat/agent-session-journal/journal-dispatch-settlement.ts
+++ b/src/main/native-chat/agent-session-journal/journal-dispatch-settlement.ts
@@ -30,27 +30,18 @@ export function consumedSubmissionWasRejected(
 }
 
 /** What a consumed draft becomes when its submission is rejected. */
-export type RejectedDraftSettlement = { state: 'returned' } | { state: 'waiting'; kept: boolean }
+export type RejectedDraftSettlement = { state: 'returned' | 'waiting' }
 
 /**
- * Where no one failed the user, the draft goes back to waiting at its own position, under whatever
- * pauses the queue: a Stop's, or the restart's, derived from the host instance. A Send the person
- * asked for (`origin` client) that a restart or a close cut short is kept (`kept`) until they send
- * it again, as the host keeps every message a person sent and it never handed over; the queue's
- * own hand-off is not theirs, so it waits as any queued card does: under the restart's pause after
- * a restart, and plainly queued after a close in the same process. A returned card would block the drafts
- * behind it on a failure that never happened. A failure returns the card with its refusal for the
- * user to act on.
+ * Where no one failed the user, the draft goes back to waiting, under whatever pauses the queue: a
+ * Stop's, or, when a restart or a close cut it short, the reopen's, so it follows the chat's next
+ * turn like every card the chat closed with. A returned card would block the drafts behind it on a
+ * failure that never happened. A failure returns the card with its refusal for the user to act on.
  */
 export function rejectedDraftSettlement(
-  rejected: Pick<AgentJournalSubmission, 'reason' | 'origin'> & { rejection?: unknown }
+  rejected: Pick<AgentJournalSubmission, 'reason'> & { rejection?: unknown }
 ): RejectedDraftSettlement {
-  const { verdict, kind } = classifyDispatchRejection(rejected)
-  if (verdict !== null) {
-    return { state: 'returned' }
-  }
-  const cutShort = kind === 'hostRestarted' || kind === 'chatClosed'
-  return { state: 'waiting', kept: cutShort && rejected.origin === 'client' }
+  return { state: classifyDispatchRejection(rejected).verdict !== null ? 'returned' : 'waiting' }
 }
 
 /** True when committing this row NEWLY settles the submission to `rejected` —
diff --git a/src/main/native-chat/agent-session-journal/journal-epoch-replacement.test.ts b/src/main/native-chat/agent-session-journal/journal-epoch-replacement.test.ts
index 6337b00417bf..36247e2571ff 100644
--- a/src/main/native-chat/agent-session-journal/journal-epoch-replacement.test.ts
+++ b/src/main/native-chat/agent-session-journal/journal-epoch-replacement.test.ts
@@ -68,7 +68,7 @@ function replace(input: {
     reason: 'legacy_import',
     fence: 1,
     items: input.items,
-    queuePause: { lifted: false, liveStop: null },
+    queuePause: { lifted: false, liveStop: null, reopened: false },
     now,
     mintEpoch: () => `epoch-${clock}`,
     onPublished: input.onPublished ?? (() => undefined)
diff --git a/src/main/native-chat/agent-session-journal/journal-epoch-replacement.ts b/src/main/native-chat/agent-session-journal/journal-epoch-replacement.ts
index da53b2e9a11d..dd56f2ac0f75 100644
--- a/src/main/native-chat/agent-session-journal/journal-epoch-replacement.ts
+++ b/src/main/native-chat/agent-session-journal/journal-epoch-replacement.ts
@@ -16,6 +16,7 @@ import type { JournalLoad } from './journal-open'
 import { applyJournalRow, createJournalReducerState } from './journal-reducer'
 import { buildJournalItemRow, journalRowBase } from './journal-row-builders'
 import {
+  buildJournalQueueReopenRow,
   buildJournalQueueResumeRow,
   buildJournalStopEventRow
 } from './journal-stop-and-resume-rows'
@@ -77,7 +78,7 @@ export function replaceJournalEpoch(input: {
     applyJournalRow(state, row)
     rows.push(row)
   }
-  const { lifted, liveStop } = input.queuePause
+  const { lifted, liveStop, reopened } = input.queuePause
   const place = () => ({ state, seq: state.lastSequence + 1, fence: input.fence, ts: input.now() })
   if (lifted) {
     const row = buildJournalQueueResumeRow(place())
@@ -89,6 +90,11 @@ export function replaceJournalEpoch(input: {
     applyJournalRow(state, row)
     rows.push(row)
   }
+  if (reopened) {
+    const row = buildJournalQueueReopenRow(place())
+    applyJournalRow(state, row)
+    rows.push(row)
+  }
 
   const { sessionId } = input.identity
   input.database.transaction((db) => {
diff --git a/src/main/native-chat/agent-session-journal/journal-host-database.ts b/src/main/native-chat/agent-session-journal/journal-host-database.ts
index e87de366fff2..aaea0228b6e9 100644
--- a/src/main/native-chat/agent-session-journal/journal-host-database.ts
+++ b/src/main/native-chat/agent-session-journal/journal-host-database.ts
@@ -28,14 +28,21 @@ export class JournalHostDatabase {
   /** A failed transaction's ROLLBACK failed too, so the transaction may still be open. */
   private stranded = false
 
-  private constructor(opened: OpenJournalDatabase) {
+  private constructor(
+    opened: OpenJournalDatabase,
+    /** Where the database lives; per-runtime end records sit beside it. */
+    readonly stateDirectory: string
+  ) {
     this.connection = opened.db
     this.readOnly = opened.readOnly
   }
 
   static open(stateDirectory: string): JournalHostDatabase {
     mkdirSync(stateDirectory, { recursive: true })
-    return new JournalHostDatabase(openJournalDatabase(journalDatabasePath(stateDirectory)))
+    return new JournalHostDatabase(
+      openJournalDatabase(journalDatabasePath(stateDirectory)),
+      stateDirectory
+    )
   }
 
   get isClosed(): boolean {
diff --git a/src/main/native-chat/agent-session-journal/journal-lifecycle-batch-partition.test.ts b/src/main/native-chat/agent-session-journal/journal-lifecycle-batch-partition.test.ts
new file mode 100644
index 000000000000..b26fabac98d0
--- /dev/null
+++ b/src/main/native-chat/agent-session-journal/journal-lifecycle-batch-partition.test.ts
@@ -0,0 +1,214 @@
+import { afterEach, describe, expect, it, vi } from 'vitest'
+import { agentJournalItemKey } from '../../../shared/agent-session-journal-item-key'
+import {
+  AGENT_JOURNAL_THREAD_SCOPE,
+  journalRowSchemaVersion
+} from '../../../shared/agent-session-journal-types'
+import { partitionJournalLifecycleMutations } from './journal-lifecycle-batch-partition'
+import { createJournalReducerState } from './journal-reducer'
+import {
+  journalLifecycleBatchRowBuilder,
+  journalLifecycleMutationRow,
+  type JournalLifecycleMutationInput
+} from './journal-row-builders'
+import {
+  MAX_JOURNAL_LIFECYCLE_BATCH_BYTES,
+  MAX_JOURNAL_LIFECYCLE_BATCH_MUTATIONS,
+  parseJournalRow,
+  serializeJournalRow,
+  type JournalLifecycleBatchRow
+} from './journal-row-schema'
+
+const EPOCH = '00000000-0000-4000-8000-000000000000'
+
+function item(
+  index: number,
+  text: string
+): Extract<JournalLifecycleMutationInput, { kind: 'item' }> {
+  return {
+    kind: 'item',
+    identity: { provider: 'orca', clientMessageId: `item:${index}` },
+    body: { kind: 'tool-call', name: 'shell', input: { command: text }, state: 'failed' },
+    turnScope: AGENT_JOURNAL_THREAD_SCOPE
+  }
+}
+
+// Frozen size probe from the previous partitioner, including Stop's larger turn outcome.
+function previousProbe(settlementId: string, mutations: readonly JournalLifecycleMutationInput[]) {
+  const row: JournalLifecycleBatchRow = {
+    v: journalRowSchemaVersion(
+      mutations.flatMap((mutation) => (mutation.kind === 'item' ? [mutation.body] : []))
+    ),
+    kind: 'lifecycle-batch',
+    epoch: EPOCH,
+    seq: Number.MAX_SAFE_INTEGER,
+    fence: Number.MAX_SAFE_INTEGER,
+    ts: Number.MAX_SAFE_INTEGER,
+    settlementId,
+    mutations: mutations.map((mutation) =>
+      journalLifecycleMutationRow(
+        mutation.kind === 'item' &&
+          mutation.body.kind === 'turn' &&
+          mutation.body.state === 'interrupted' &&
+          mutation.body.outcome === undefined
+          ? { ...mutation, body: { ...mutation.body, outcome: 'cancellation' } }
+          : mutation,
+        agentJournalItemKey(mutation.identity),
+        Number.MAX_SAFE_INTEGER
+      )
+    )
+  }
+  return Buffer.byteLength(JSON.stringify(row), 'utf8') + 1
+}
+
+function previousPartition(
+  settlementId: string,
+  mutations: readonly JournalLifecycleMutationInput[]
+) {
+  const chunks: JournalLifecycleMutationInput[][] = []
+  const probeId = `${settlementId}:${mutations.length}/${mutations.length}`
+  let pending: JournalLifecycleMutationInput[] = []
+  for (const mutation of mutations) {
+    const candidate = [...pending, mutation]
+    if (
+      pending.length > 0 &&
+      previousProbe(probeId, candidate) > MAX_JOURNAL_LIFECYCLE_BATCH_BYTES
+    ) {
+      chunks.push(pending)
+      pending = [mutation]
+    } else {
+      pending = candidate
+    }
+    if (pending.length === MAX_JOURNAL_LIFECYCLE_BATCH_MUTATIONS) {
+      chunks.push(pending)
+      pending = []
+    }
+  }
+  if (pending.length > 0) {
+    chunks.push(pending)
+  }
+  return chunks.map((mutations, index) => ({
+    settlementId:
+      chunks.length === 1 ? settlementId : `${settlementId}:${index + 1}/${chunks.length}`,
+    mutations
+  }))
+}
+
+afterEach(() => vi.restoreAllMocks())
+
+describe('journal lifecycle batch partitioning', () => {
+  it('leaves empty and singleton batches uninspected, including an oversized singleton', () => {
+    const oversized = item(0, 'x'.repeat(MAX_JOURNAL_LIFECYCLE_BATCH_BYTES))
+    const stringify = vi.spyOn(JSON, 'stringify')
+    expect(partitionJournalLifecycleMutations('one', [])).toEqual([])
+    expect(partitionJournalLifecycleMutations('one', [oversized])).toEqual([
+      { settlementId: 'one', mutations: [oversized] }
+    ])
+    expect(stringify).not.toHaveBeenCalled()
+  })
+
+  it('preserves the mutation cap and the oversized leading mutation rule', () => {
+    const small = Array.from({ length: 401 }, (_, index) => item(index, 'small'))
+    expect(
+      partitionJournalLifecycleMutations('count', small).map((chunk) => chunk.mutations.length)
+    ).toEqual([200, 200, 1])
+    const oversized = [item(0, 'x'.repeat(MAX_JOURNAL_LIFECYCLE_BATCH_BYTES)), item(1, 'small')]
+    expect(partitionJournalLifecycleMutations('large', oversized)).toEqual(
+      previousPartition('large', oversized)
+    )
+  })
+
+  it('keeps exact UTF-8 byte-boundary admission through the production row builder', () => {
+    const settlementId = 'boundary:"\\😀'
+    const mutations = [item(0, ''), item(1, '')]
+    const available =
+      MAX_JOURNAL_LIFECYCLE_BATCH_BYTES - previousProbe(`${settlementId}:2/2`, mutations)
+    const atLimit = [item(0, 'x'.repeat(available)), item(1, '')]
+    const overLimit = [item(0, 'x'.repeat(available + 1)), item(1, '')]
+    expect(partitionJournalLifecycleMutations(settlementId, atLimit)).toHaveLength(1)
+    expect(partitionJournalLifecycleMutations(settlementId, overLimit)).toHaveLength(2)
+    const state = createJournalReducerState('session', EPOCH)
+    for (const mutations of [atLimit, overLimit]) {
+      for (const chunk of partitionJournalLifecycleMutations(settlementId, mutations)) {
+        const row = journalLifecycleBatchRowBuilder(
+          () => state,
+          chunk.settlementId,
+          chunk.mutations,
+          {
+            fence: 1,
+            recovered: true
+          }
+        )(1, 1)
+        const serialized = serializeJournalRow(row)
+        expect(Buffer.byteLength(serialized)).toBeLessThanOrEqual(MAX_JOURNAL_LIFECYCLE_BATCH_BYTES)
+        expect(parseJournalRow(serialized).ok).toBe(true)
+      }
+    }
+  })
+
+  it('matches the previous chunks for seeded mixed mutations, linkage and JSON escaping', () => {
+    let seed = 82413
+    const random = (limit: number): number => {
+      seed = (Math.imul(seed, 1664525) + 1013904223) >>> 0
+      return seed % limit
+    }
+    const symbols = ['x', '"\\\n\t', '界😀', '\uD800', '\0\r\u001f']
+    for (let fixture = 0; fixture < 48; fixture++) {
+      const text = symbols[random(symbols.length)].repeat(random(8_000))
+      const mutations = Array.from(
+        { length: random(230) },
+        (_, index): JournalLifecycleMutationInput => {
+          const identity = { provider: 'orca' as const, clientMessageId: `item:"\\界😀:${index}` }
+          if (index % 23 === 0) {
+            return { kind: 'tombstone', identity }
+          }
+          if (index % 19 === 0) {
+            return {
+              kind: 'item',
+              identity,
+              body: { kind: 'turn', turnId: `turn:${index}`, state: 'interrupted', startedAt: 1 },
+              turnScope: AGENT_JOURNAL_THREAD_SCOPE
+            }
+          }
+          return {
+            ...item(index, text),
+            identity,
+            linkage: {
+              agentId: 'child',
+              parentAgentId: 'parent',
+              providerParentRef: 'call:"\\界😀',
+              producerKind: 'background',
+              attempt: 2
+            }
+          }
+        }
+      )
+      const settlementId = `settle:"\\\n😀:${'q'.repeat(random(2_000))}`
+      const actual = partitionJournalLifecycleMutations(settlementId, mutations)
+      expect(actual).toEqual(previousPartition(settlementId, mutations))
+      const flattened = actual.flatMap((chunk) => chunk.mutations)
+      expect(flattened).toHaveLength(mutations.length)
+      for (let index = 0; index < flattened.length; index++) {
+        expect(flattened[index]).toBe(mutations[index])
+      }
+    }
+  })
+
+  it('keeps serialization work proportional to the settled payload', () => {
+    const mutations = Array.from({ length: 128 }, (_, index) => item(index, 'x'.repeat(16 * 1024)))
+    const payloadBytes = Buffer.byteLength(JSON.stringify(mutations))
+    const stringify = JSON.stringify
+    let serializedBytes = 0
+    vi.spyOn(JSON, 'stringify').mockImplementation((value) => {
+      const encoded = stringify(value)
+      if (encoded !== undefined) {
+        serializedBytes += Buffer.byteLength(encoded)
+      }
+      return encoded
+    })
+    const chunks = partitionJournalLifecycleMutations('linear', mutations)
+    vi.restoreAllMocks()
+    expect(chunks.flatMap((chunk) => chunk.mutations)).toEqual(mutations)
+    expect(serializedBytes).toBeLessThan(payloadBytes * 3)
+  })
+})
diff --git a/src/main/native-chat/agent-session-journal/journal-lifecycle-batch-partition.ts b/src/main/native-chat/agent-session-journal/journal-lifecycle-batch-partition.ts
index 2074e4d77c13..f4403e9ed27f 100644
--- a/src/main/native-chat/agent-session-journal/journal-lifecycle-batch-partition.ts
+++ b/src/main/native-chat/agent-session-journal/journal-lifecycle-batch-partition.ts
@@ -22,20 +22,45 @@ export function partitionJournalLifecycleMutations(
   if (mutations.length === 0) {
     return []
   }
+  if (mutations.length === 1) {
+    return [{ settlementId, mutations: [mutations[0]] }]
+  }
   const chunks: JournalLifecycleMutationInput[][] = []
   const probeId = chunkSettlementId(settlementId, mutations.length - 1, mutations.length)
   let pending: JournalLifecycleMutationInput[] = []
+  let pendingBytes = 0
+  let pendingVersion = journalRowSchemaVersion([])
+  const overheadByVersion = new Map<number, number>()
+  const overhead = (version: number): number => {
+    let bytes = overheadByVersion.get(version)
+    if (bytes === undefined) {
+      bytes = serializedLifecycleBatchOverhead(probeId, version)
+      overheadByVersion.set(version, bytes)
+    }
+    return bytes
+  }
   for (const mutation of mutations) {
-    const candidate = [...pending, mutation]
-    if (pending.length > 0 && !serializedLifecycleBatchFits(probeId, candidate)) {
+    const bytes = Buffer.byteLength(JSON.stringify(toLifecycleMutationRow(mutation)), 'utf8')
+    const version = journalRowSchemaVersion(mutation.kind === 'item' ? [mutation.body] : [])
+    const candidateVersion = Math.max(pendingVersion, version)
+    const candidateBytes = pendingBytes + bytes + (pending.length > 0 ? 1 : 0)
+    if (
+      pending.length > 0 &&
+      candidateBytes + overhead(candidateVersion) > MAX_JOURNAL_LIFECYCLE_BATCH_BYTES
+    ) {
       chunks.push(pending)
-      pending = [mutation]
-    } else {
-      pending = candidate
+      pending = []
+      pendingBytes = 0
+      pendingVersion = journalRowSchemaVersion([])
     }
+    pendingBytes += bytes + (pending.length > 0 ? 1 : 0)
+    pendingVersion = Math.max(pendingVersion, version)
+    pending.push(mutation)
     if (pending.length === MAX_JOURNAL_LIFECYCLE_BATCH_MUTATIONS) {
       chunks.push(pending)
       pending = []
+      pendingBytes = 0
+      pendingVersion = journalRowSchemaVersion([])
     }
   }
   if (pending.length > 0) {
@@ -52,23 +77,18 @@ function chunkSettlementId(settlementId: string, index: number, total: number):
   return `${settlementId}:${index + 1}/${total}`
 }
 
-function serializedLifecycleBatchFits(
-  settlementId: string,
-  mutations: readonly JournalLifecycleMutationInput[]
-): boolean {
+function serializedLifecycleBatchOverhead(settlementId: string, version: number): number {
   const row: JournalLifecycleBatchRow = {
-    v: journalRowSchemaVersion(
-      mutations.flatMap((mutation) => (mutation.kind === 'item' ? [mutation.body] : []))
-    ),
+    v: version,
     kind: 'lifecycle-batch',
     epoch: '00000000-0000-4000-8000-000000000000',
     seq: Number.MAX_SAFE_INTEGER,
     fence: Number.MAX_SAFE_INTEGER,
     ts: Number.MAX_SAFE_INTEGER,
     settlementId,
-    mutations: mutations.map(toLifecycleMutationRow)
+    mutations: []
   }
-  return Buffer.byteLength(JSON.stringify(row), 'utf8') + 1 <= MAX_JOURNAL_LIFECYCLE_BATCH_BYTES
+  return Buffer.byteLength(JSON.stringify(row), 'utf8') + 1
 }
 
 /** Sized as a Stop may write it (`turnEndAfterStop`), so the chunk built from it still fits. */
diff --git a/src/main/native-chat/agent-session-journal/journal-prompt-body-bounds.ts b/src/main/native-chat/agent-session-journal/journal-prompt-body-bounds.ts
index d8c5c1737b74..6e226a4c6cff 100644
--- a/src/main/native-chat/agent-session-journal/journal-prompt-body-bounds.ts
+++ b/src/main/native-chat/agent-session-journal/journal-prompt-body-bounds.ts
@@ -3,7 +3,8 @@ import type {
   AgentJournalItemBody,
   AgentJournalPromptOption,
   AgentJournalQuestion,
-  AgentJournalQuestionItem
+  AgentJournalQuestionItem,
+  AgentJournalFreeTextInput
 } from '../../../shared/agent-session-journal-types'
 import { isPlanApprovalSubject } from '../../../shared/agent-session-approval-subject'
 import {
@@ -97,7 +98,8 @@ export function boundJournalPromptBody(
       : {}),
     ...(body.freeTextQuestionId
       ? { freeTextQuestionId: boundPromptIdentifier(body.freeTextQuestionId) }
-      : {})
+      : {}),
+    ...(body.freeTextInput ? { freeTextInput: boundFreeTextInput(body.freeTextInput) } : {})
   }
 }
 
@@ -110,7 +112,19 @@ function boundPromptQuestion(question: AgentJournalQuestion): AgentJournalQuesti
     options: boundPromptOptions(question.options),
     ...(question.freeTextQuestionId
       ? { freeTextQuestionId: boundPromptIdentifier(question.freeTextQuestionId) }
-      : {})
+      : {}),
+    ...(question.freeTextInput ? { freeTextInput: boundFreeTextInput(question.freeTextInput) } : {})
+  }
+}
+
+function boundFreeTextInput(input: AgentJournalFreeTextInput): AgentJournalFreeTextInput {
+  return {
+    ...(input.allowEmpty === undefined ? {} : { allowEmpty: input.allowEmpty }),
+    ...(input.multiline === undefined ? {} : { multiline: input.multiline }),
+    ...(input.initialValue === undefined
+      ? {}
+      : { initialValue: boundPromptText(input.initialValue) }),
+    ...(input.placeholder === undefined ? {} : { placeholder: boundPromptText(input.placeholder) })
   }
 }
 
diff --git a/src/main/native-chat/agent-session-journal/journal-queued-messages.ts b/src/main/native-chat/agent-session-journal/journal-queued-messages.ts
index bb6eb2ef4d78..5b0e2580c45e 100644
--- a/src/main/native-chat/agent-session-journal/journal-queued-messages.ts
+++ b/src/main/native-chat/agent-session-journal/journal-queued-messages.ts
@@ -5,7 +5,10 @@
 // working status, teardown, or the idle sweep.
 
 import type Database from '../../sqlite/sync-database'
-import type { AgentJournalMessageItem } from '../../../shared/agent-session-journal-types'
+import type {
+  AgentJournalCursor,
+  AgentJournalMessageItem
+} from '../../../shared/agent-session-journal-types'
 import {
   AGENT_SESSION_MAX_NEW_OPERATION_AGE_MS,
   AGENT_SESSION_OPERATION_FUTURE_SKEW_MS
@@ -13,9 +16,9 @@ import {
 import type { JournalHostDatabase } from './journal-host-database'
 import type { JournalReducerState } from './journal-reducer'
 import type { JournalRow } from './journal-row-schema'
-import type { JournalOperationReceipt, JournalRowTransactionHook } from './journal-row-writer'
+import type { JournalOperationReceipt } from './journal-row-writer'
 import type { JournalSubmissionConsume } from './journal-store-contracts'
-import { adoptQueuedMessages, holdQueuedMessages } from './queued-message-holds'
+import { holdQueuedMessages } from './queued-message-holds'
 import {
   deriveQueuePauses,
   journalUserStopInForce,
@@ -42,6 +45,7 @@ import {
   settleQueuedMessagesForRow
 } from './queued-message-settlement'
 import { AgentSessionJournalError, assertJournalWritable } from './journal-write-guards'
+import type { JournalAttachmentClaim } from './journal-submission-hook'
 import type { JournalWriteBody, JournalWriteResult } from './journal-write-queue'
 
 /** Tombstones must outlive the window in which their operation id could still be admitted as new. */
@@ -55,14 +59,15 @@ export type JournalQueuedMessagesDeps = {
   database: () => JournalHostDatabase
   readOnly: () => boolean
   state: () => JournalReducerState
-  /** Whether this handle found the row at `sequence` on disk when it opened. */
-  wroteBeforeOpen: (sequence: number) => boolean
+  /** Where the reopen's pause begins when this handle could not mark it (`reopenFloor`). */
+  reopenFloor: () => AgentJournalCursor | null
   /** The journal's own commit notification. Every standalone draft-table
    *  transaction that changed rows fires it after COMMIT, so a draft or hold
    *  change publishes and wakes the drain through the same path a journal row
    *  does — no call site can forget. In-transaction consume and the returned
    *  transition already ride their row's own commit. */
   committed: () => void
+  claimAttachments: JournalAttachmentClaim
 }
 
 export class JournalQueuedMessages {
@@ -107,8 +112,10 @@ export class JournalQueuedMessages {
   }
 
   /** `carriedFrom`: a /clear's carry. The card is its own 'cleared' pause, so it lands paused;
-   *  `holdReason` carries a hold of its own over with it. `receipt`: the send's ledger answer,
-   *  committed with the draft only when this inserts it. */
+   *  `holdReason` carries a hold of its own over with it.
+   *  `requireAttachments`: a client's own draft, refused whole when an attachment it names is no
+   *  longer stored; the host's own writes (the carry) claim best effort.
+   *  `receipt`: the send's ledger answer, committed with the draft only when this inserts it. */
   insert(
     input: {
       messageId: string
@@ -116,11 +123,13 @@ export class JournalQueuedMessages {
       fingerprint: string
       hostInstance: string
       carriedFrom?: string
+      requireAttachments?: true
       holdReason?: QueuedMessageHoldReason
     },
     receipt?: JournalOperationReceipt
   ): Promise<QueuedMessageRow> {
     const { sessionId } = this.deps
+    const { requireAttachments, ...draft } = input
     let inserted = false
     return this.transact(
       (db) => {
@@ -130,10 +139,11 @@ export class JournalQueuedMessages {
           // gets here, so an existing row is the same accept landing twice.
           return existing
         }
+        this.deps.claimAttachments(db, input.body, requireAttachments === true)
         inserted = true
         const { epoch, lastSequence } = this.deps.state()
         const row = insertQueuedMessage(db, {
-          ...input,
+          ...draft,
           sessionId,
           queuedAt: { epoch, sequence: lastSequence },
           now: this.deps.now()
@@ -157,8 +167,21 @@ export class JournalQueuedMessages {
   }
 
   /** The queue's pauses in force, derived from the fold and the cards (`queued-message-pause.ts`). */
-  pauses(hostInstance: string): DerivedQueuePause[] {
-    return this.derivePauses(this.list(), hostInstance)
+  pauses(): DerivedQueuePause[] {
+    return this.derivePauses(this.list())
+  }
+
+  /** A card waits, or is mid-hand-off and may come back to waiting: a chat that stops running
+   *  marks it (`AgentSessionJournal.markQueueReopen`). */
+  awaitReopenMark(): boolean {
+    const { submissions } = this.deps.state()
+    return this.list().some((row) => {
+      if (row.state === 'waiting') {
+        return true
+      }
+      const handOff = row.consumedAs ? submissions.get(row.consumedAs)?.dispatchState : undefined
+      return row.state === 'dispatched' && (handOff === 'pending' || handOff === 'unknown')
+    })
   }
 
   /** The person's Stop still pausing the queue, if any (`journalUserStopInForce`). */
@@ -167,37 +190,17 @@ export class JournalQueuedMessages {
     return journalUserStopInForce(state.queuePauseMarks, state.latestAcceptedTurnSequence)
   }
 
-  private derivePauses(
-    cards: readonly QueuedMessageRow[],
-    hostInstance: string
-  ): DerivedQueuePause[] {
+  private derivePauses(cards: readonly QueuedMessageRow[]): DerivedQueuePause[] {
     const state = this.deps.state()
     return deriveQueuePauses({
       epoch: state.epoch,
       marks: state.queuePauseMarks,
       latestAcceptedTurnSequence: state.latestAcceptedTurnSequence,
       cards,
-      hostInstance,
-      restartEnded: this.restartEnded()
+      reopenFloor: this.deps.reopenFloor()
     })
   }
 
-  /** A turn started since this handle opened, which ends a restart's pause. */
-  restartEnded(): boolean {
-    const latest = this.deps.state().latestAcceptedTurnSequence
-    return latest > 0 && !this.deps.wroteBeforeOpen(latest)
-  }
-
-  /** Adopts waiting rows another host instance wrote into this one, ending a restart's pause.
-   *  Returns whether anything changed. */
-  adopt(hostInstance: string): Promise<boolean> {
-    const { sessionId } = this.deps
-    return this.transact(
-      (db) => adoptQueuedMessages(db, { sessionId, hostInstance }),
-      (changed) => changed > 0
-    ).then((changed) => changed > 0)
-  }
-
   /** Inside the caller's journal-row transaction (`journal-unsent-send-hold.ts`): one kept send
    *  becomes a card, and the cards ahead of the queue take the positions given. False when a card
    *  by that id already exists, which then stands. */
@@ -286,7 +289,7 @@ export class JournalQueuedMessages {
       // pick and this claim (both run on the session's serialized lane, held across the send), so
       // this guards any pause-relevant row written off that lane from overtaking a held card.
       const cards = listQueuedMessages(db, this.deps.sessionId)
-      const pauses = this.derivePauses(cards, input.yieldsToPause.hostInstance)
+      const pauses = this.derivePauses(cards)
       if (nextSendableQueuedCard(pauses, cards)?.messageId !== input.messageId) {
         throw new QueuedMessageNotConsumableError(input.messageId, input.expect)
       }
@@ -367,15 +370,6 @@ export class JournalQueuedMessages {
   }
 }
 
-/** The per-append hook converting one draft inside the append's own transaction. */
-export function queuedMessageConsumeHook(
-  queuedMessages: JournalQueuedMessages,
-  consumedAs: string,
-  consume: JournalSubmissionConsume
-): JournalRowTransactionHook {
-  return (db) => queuedMessages.consumeInTransaction(db, { ...consume, consumedAs })
-}
-
 export class QueuedMessageNotConsumableError extends Error {
   constructor(
     readonly messageId: string,
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 f1484bf5da8a..d4f7e543df53 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
@@ -77,7 +77,11 @@ function unseenHistory(
   }
   return {
     ...history,
-    items: history.items.filter((item) => !committed.has(agentJournalItemKey(item.identity)))
+    // An item with no identity of its own cannot be one the journal committed under it; the
+    // adapter bounds its window to after the journal's last accepted send instead.
+    items: history.items.filter(
+      (item) => item.identity === undefined || !committed.has(agentJournalItemKey(item.identity))
+    )
   }
 }
 
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 d2a95a6db724..1d226761ae25 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
@@ -95,6 +95,12 @@ export type JournalTombstoneRow = JournalRowBase & {
   stopEvent?: JournalStopEvent
   /** Present: not a removal but a person's Resume of the queue, on an id no item ever takes. */
   queueResume?: true
+  /** Present: not a removal but a reopen that found waiting cards (`queued-message-pause.ts`), on
+   *  an id no item ever takes. */
+  queueReopen?: true
+  /** On a reopen mark written after the chat stopped: where it stopped, so a send accepted since
+   *  lifts it. Absent: the mark's own row. */
+  queueReopenSince?: number
 }
 
 /** One Stop that took effect. Temporary carrier: a tombstone's extra key, which every host ignores,
@@ -112,16 +118,21 @@ export type JournalStopEvent = {
   caller?: string
 }
 
-/** A tombstone that carries a Stop event or a Resume mark instead of removing an item. */
+/** A tombstone that carries a Stop event, a Resume or a reopen mark instead of removing an item. */
 export type JournalStopOrResumeRow = JournalTombstoneRow &
   (
     | { stopEvent: NonNullable<JournalTombstoneRow['stopEvent']> }
     | { queueResume: NonNullable<JournalTombstoneRow['queueResume']> }
+    | { queueReopen: NonNullable<JournalTombstoneRow['queueReopen']> }
   )
 
-/** A Stop's event or a Resume. Any value counts, so a newer build's mark never removes an item. */
+/** A Stop's event, a Resume or a reopen mark. Any value counts, so a newer build's mark never
+ *  removes an item. */
 export function isJournalStopOrResumeRow(row: JournalRow): row is JournalStopOrResumeRow {
-  return row.kind === 'tombstone' && (row.stopEvent !== undefined || row.queueResume !== undefined)
+  return (
+    row.kind === 'tombstone' &&
+    (row.stopEvent !== undefined || row.queueResume !== undefined || row.queueReopen !== undefined)
+  )
 }
 
 /** The write-ahead row. Durable BEFORE the adapter dispatches anything; it
diff --git a/src/main/native-chat/agent-session-journal/journal-stop-and-resume-rows.ts b/src/main/native-chat/agent-session-journal/journal-stop-and-resume-rows.ts
index e763af8b2e6c..c4ddb98bc398 100644
--- a/src/main/native-chat/agent-session-journal/journal-stop-and-resume-rows.ts
+++ b/src/main/native-chat/agent-session-journal/journal-stop-and-resume-rows.ts
@@ -1,12 +1,13 @@
-// The rows a Stop's event and a person's Resume append: tombstones of ids no item ever takes,
-// each carrying its record as an extra key (`journal-row-schema.ts` says why not a row kind).
+// The rows a Stop's event, a person's Resume and a reopen that found waiting cards append:
+// tombstones of ids no item ever takes, each carrying its record as an extra key
+// (`journal-row-schema.ts` says why not a row kind).
 
 import { agentJournalItemKey } from '../../../shared/agent-session-journal-item-key'
 import type { JournalReducerState } from './journal-reducer'
 import { journalRowBase } from './journal-row-builders'
 import type { JournalStopEvent, JournalTombstoneRow } from './journal-row-schema'
 
-/** One id per mark kind; no item ever takes either. */
+/** One id per mark kind; no item ever takes any of them. */
 const JOURNAL_STOP_EVENT_ITEM_ID = agentJournalItemKey({
   provider: 'orca',
   clientMessageId: 'stop-event'
@@ -15,6 +16,10 @@ const JOURNAL_QUEUE_RESUME_ITEM_ID = agentJournalItemKey({
   provider: 'orca',
   clientMessageId: 'queue-resume'
 })
+const JOURNAL_QUEUE_REOPEN_ITEM_ID = agentJournalItemKey({
+  provider: 'orca',
+  clientMessageId: 'queue-reopen'
+})
 
 type RowPlace = { state: JournalReducerState; seq: number; fence: number; ts: number }
 
@@ -40,6 +45,19 @@ export function buildJournalQueueResumeRow(input: RowPlace): JournalTombstoneRow
   }
 }
 
+export function buildJournalQueueReopenRow(
+  input: RowPlace & { since?: number }
+): JournalTombstoneRow {
+  return {
+    kind: 'tombstone',
+    itemId: JOURNAL_QUEUE_REOPEN_ITEM_ID,
+    revision: 1,
+    queueReopen: true,
+    ...(input.since !== undefined ? { queueReopenSince: input.since } : {}),
+    ...journalRowBase(input.state.epoch, input.seq, input.fence, input.ts)
+  }
+}
+
 /** A Stop taking effect now: its event's time is its row's. */
 export function journalStopEventRowBuilder(
   state: () => JournalReducerState,
@@ -56,3 +74,12 @@ export function journalQueueResumeRowBuilder(
 ): (seq: number, ts: number) => JournalTombstoneRow {
   return (seq, ts) => buildJournalQueueResumeRow({ state: state(), seq, fence, ts })
 }
+
+export function journalQueueReopenRowBuilder(
+  state: () => JournalReducerState,
+  fence: number,
+  since?: number
+): (seq: number, ts: number) => JournalTombstoneRow {
+  return (seq, ts) =>
+    buildJournalQueueReopenRow({ state: state(), seq, fence, ts, ...(since ? { since } : {}) })
+}
diff --git a/src/main/native-chat/agent-session-journal/journal-store-collaborators.ts b/src/main/native-chat/agent-session-journal/journal-store-collaborators.ts
index 600d673b6d81..5acba78506a4 100644
--- a/src/main/native-chat/agent-session-journal/journal-store-collaborators.ts
+++ b/src/main/native-chat/agent-session-journal/journal-store-collaborators.ts
@@ -23,6 +23,8 @@ import { JournalSubmissionWriter } from './journal-submission-writer'
 import type { JournalRow } from './journal-row-schema'
 import type { AgentSessionJournal } from './journal-store'
 import type { JournalWriteBody } from './journal-write-queue'
+import type { JournalAttachmentClaim } from './journal-submission-hook'
+import { claimAgentSessionAttachmentsInTransaction } from '../agent-session-attachments/agent-session-attachment-claims'
 
 export type JournalStoreHost = {
   /** Fires the journal's commit listener for a durable change that appended no
@@ -69,11 +71,21 @@ export function createJournalStoreCollaborators(host: JournalStoreHost): Journal
     queuePauseRestatement: () =>
       journalQueuePauseRestatement(
         host.state().queuePauseMarks,
-        host.state().latestAcceptedTurnSequence
+        host.state().latestAcceptedTurnSequence,
+        host.journal().queuedMessages.pauses()
       ),
     cursor: host.cursor,
     adopt: host.adopt
   })
+  const claimAttachments: JournalAttachmentClaim = (db, body, required) =>
+    claimAgentSessionAttachmentsInTransaction(db, {
+      // Uploaded attachments are stored beside the journal database.
+      stateDirectory: host.database().stateDirectory,
+      sessionId: host.identity.sessionId,
+      body,
+      required,
+      now: host.now()
+    })
   const queuedMessages = new JournalQueuedMessages({
     sessionId: host.identity.sessionId,
     now: host.now,
@@ -81,8 +93,9 @@ export function createJournalStoreCollaborators(host: JournalStoreHost): Journal
     database: host.database,
     readOnly: host.readOnly,
     state: host.state,
-    wroteBeforeOpen: (sequence) => host.journal().wroteBeforeOpen(sequence),
-    committed: host.notifyCommitted
+    reopenFloor: () => host.journal().reopenFloor(),
+    committed: host.notifyCommitted,
+    claimAttachments
   })
   const rowWriter = new JournalRowWriter({
     sessionId: host.identity.sessionId,
@@ -119,7 +132,8 @@ export function createJournalStoreCollaborators(host: JournalStoreHost): Journal
       state: host.state,
       identity: host.identity,
       rowWriter,
-      queuedMessages
+      queuedMessages,
+      claimAttachments
     }),
     itemAppender: new JournalItemAppender({
       state: host.state,
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 7492ea7e461c..41b892adf348 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
@@ -112,9 +112,9 @@ export type JournalSubmissionConsume = {
   /** The host process handing it off, stamped on the draft so a hand-off withdrawn back to
    *  waiting belongs to the process that sent it, not the one that first wrote the card. */
   hostInstance?: string
-  /** The queue's own send: refused in the consume's transaction while the queue's pause, as
-   *  this host instance derives it, holds the card. Send-now omits it. */
-  yieldsToPause?: { hostInstance: string }
+  /** The queue's own send: refused in the consume's transaction while the queue's pause holds
+   *  the card. Send-now omits it. */
+  yieldsToPause?: true
 }
 
 export type JournalItemAppendInput = {
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 7548f6e5502e..06bdfba25fea 100644
--- a/src/main/native-chat/agent-session-journal/journal-store.ts
+++ b/src/main/native-chat/agent-session-journal/journal-store.ts
@@ -57,6 +57,7 @@ import type {
 import type { JournalQueuedMessages } from './journal-queued-messages'
 import {
   journalQueueResumeRowBuilder,
+  journalQueueReopenRowBuilder,
   journalStopEventRowBuilder
 } from './journal-stop-and-resume-rows'
 import type { AgentJournalEpochReason, JournalStopEvent } from './journal-row-schema'
@@ -84,6 +85,7 @@ export class AgentSessionJournal {
 
   private state: JournalReducerState
   private openedThrough: AgentJournalCursor = { epoch: '', sequence: 0 }
+  private reopenUnmarked: AgentJournalCursor | null = null
   private onCommitted: (() => void) | null = null
   private readonly queue: JournalWriteQueue
   private readonly rowWriter: JournalRowWriter
@@ -156,6 +158,12 @@ export class AgentSessionJournal {
     )
   }
 
+  /** Where the reopen's pause begins when this handle could not write its mark: where the mark
+   *  would have gone. Null once a mark is written. Per handle, so the next open marks again. */
+  reopenFloor(): AgentJournalCursor | null {
+    return this.reopenUnmarked
+  }
+
   async open(): Promise<void> {
     await this.restore()
     this.openedThrough = this.cursor()
@@ -292,6 +300,23 @@ export class AgentSessionJournal {
     return this.rowWriter.append(journalQueueResumeRowBuilder(() => this.state, fence))
   }
 
+  /** This open found waiting cards an earlier handle wrote (`queued-message-pause.ts`). */
+  appendQueueReopen(fence: number, since?: number): Promise<AgentJournalCursor> {
+    return this.rowWriter.append(journalQueueReopenRowBuilder(() => this.state, fence, since))
+  }
+
+  /** Marks the reopen when a card waits or is mid-hand-off (it may come back to waiting), from
+   *  `since` when the chat stopped before now; a failed write leaves where the mark would have gone
+   *  as the pause's start (`reopenFloor`), and throws. */
+  async markQueueReopen(fence: number, since?: number): Promise<void> {
+    if (this.queuedMessages.awaitReopenMark()) {
+      const sequence = since ?? this.state.lastSequence + 1
+      this.reopenUnmarked = { epoch: this.state.epoch, sequence }
+      await this.appendQueueReopen(fence, since)
+      this.reopenUnmarked = null
+    }
+  }
+
   appendLifecycleBatch(input: JournalLifecycleBatchInput): Promise<AgentJournalCursor> {
     return this.lifecycleBatchAppender.append(input)
   }
diff --git a/src/main/native-chat/agent-session-journal/journal-submission-hook.ts b/src/main/native-chat/agent-session-journal/journal-submission-hook.ts
new file mode 100644
index 000000000000..84be3ab91c98
--- /dev/null
+++ b/src/main/native-chat/agent-session-journal/journal-submission-hook.ts
@@ -0,0 +1,30 @@
+import type Database from '../../sqlite/sync-database'
+import type { AgentJournalMessageItem } from '../../../shared/agent-session-journal-types'
+import type { JournalQueuedMessages } from './journal-queued-messages'
+import type { JournalRowTransactionHook } from './journal-row-writer'
+import type { JournalSubmissionConsume, JournalSubmissionInput } from './journal-store-contracts'
+
+/** Claims the stored chat attachments a message written to this journal names, in the write's own
+ *  transaction; `required` refuses the whole write when one is no longer stored. */
+export type JournalAttachmentClaim = (
+  db: Database.Database,
+  body: AgentJournalMessageItem,
+  required: boolean
+) => void
+
+/** The submission append's hook, inside its transaction: converts the draft it hands off, if any,
+ *  and claims the stored attachments it names. A client's new message must name only attachments
+ *  still stored; a draft's conversion was claimed when the draft was written. */
+export function journalSubmissionHook(
+  queuedMessages: JournalQueuedMessages,
+  claimAttachments: JournalAttachmentClaim,
+  input: Pick<JournalSubmissionInput, 'clientMessageId' | 'body' | 'origin'>,
+  consume: JournalSubmissionConsume | undefined
+): JournalRowTransactionHook {
+  return (db) => {
+    if (consume) {
+      queuedMessages.consumeInTransaction(db, { ...consume, consumedAs: input.clientMessageId })
+    }
+    claimAttachments(db, input.body, input.origin === 'client' && !consume)
+  }
+}
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 4647ba1e0e37..91522f76efef 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
@@ -30,7 +30,9 @@ export type ProviderHistoryItem = {
   /** Fingerprint of the submitted payload, when the caller can compute one from
    *  provider content. Used only to break an otherwise unique tie. */
   payloadFingerprint: string | null
-  identity: AgentJournalItemIdentity
+  /** Absent when the provider keeps no identity of its own for the item: a submission it matches
+   *  keeps Orca's (`orca:<clientMessageId>`), which is the identity its row already has. */
+  identity?: AgentJournalItemIdentity
 }
 
 export type ProviderHistoryWindow = {
@@ -90,6 +92,7 @@ export function reconcileSubmissions(input: {
       // A submission that already adopted a key re-matches on that key, not on the
       // provider's raw id — the raw id renumbers, the identity-derived key does not.
       Boolean(submission.providerItemId) &&
+      item.identity !== undefined &&
       submission.providerItemId === agentJournalItemKey(item.identity)
   )
   claimBy(
@@ -169,7 +172,7 @@ function resolveOne(
       clientMessageId: submission.clientMessageId,
       outcome: 'accepted',
       providerItemId: item.providerItemId,
-      identity: item.identity
+      identity: item.identity ?? { provider: 'orca', clientMessageId: submission.clientMessageId }
     }
   }
   if (ambiguous.has(submission.clientMessageId)) {
diff --git a/src/main/native-chat/agent-session-journal/journal-submission-writer.ts b/src/main/native-chat/agent-session-journal/journal-submission-writer.ts
index c79fa6030315..1fc0ac21d0da 100644
--- a/src/main/native-chat/agent-session-journal/journal-submission-writer.ts
+++ b/src/main/native-chat/agent-session-journal/journal-submission-writer.ts
@@ -5,7 +5,8 @@ import type {
   AgentJournalCursor,
   AgentSessionJournalIdentity
 } from '../../../shared/agent-session-journal-types'
-import { queuedMessageConsumeHook, type JournalQueuedMessages } from './journal-queued-messages'
+import type { JournalQueuedMessages } from './journal-queued-messages'
+import { journalSubmissionHook, type JournalAttachmentClaim } from './journal-submission-hook'
 import type { JournalReducerState } from './journal-reducer'
 import { journalDispatchRowBuilder, journalSubmissionRowBuilder } from './journal-row-builders'
 import type {
@@ -24,6 +25,7 @@ export type JournalSubmissionWriterDeps = {
   identity: AgentSessionJournalIdentity
   rowWriter: JournalRowWriter
   queuedMessages: JournalQueuedMessages
+  claimAttachments: JournalAttachmentClaim
 }
 
 export class JournalSubmissionWriter {
@@ -42,10 +44,10 @@ export class JournalSubmissionWriter {
     /** The send's ledger answer, committed with this row. */
     receipt?: JournalOperationReceipt
   ): Promise<AgentJournalCursor> {
-    const { identity, queuedMessages, rowWriter, state } = this.deps
+    const { claimAttachments, identity, queuedMessages, rowWriter, state } = this.deps
     return rowWriter.append(
       journalSubmissionRowBuilder(state, identity, input, consume),
-      consume && queuedMessageConsumeHook(queuedMessages, input.clientMessageId, consume),
+      journalSubmissionHook(queuedMessages, claimAttachments, input, consume),
       receipt
     )
   }
diff --git a/src/main/native-chat/agent-session-journal/journal-unsent-send-hold.test.ts b/src/main/native-chat/agent-session-journal/journal-unsent-send-hold.test.ts
index 293519d3680f..29fb7eb35fa2 100644
--- a/src/main/native-chat/agent-session-journal/journal-unsent-send-hold.test.ts
+++ b/src/main/native-chat/agent-session-journal/journal-unsent-send-hold.test.ts
@@ -17,7 +17,6 @@ import {
 } from '../../../shared/agent-session-message-source'
 import { agentSessionFailureFact } from '../../../shared/agent-session-failure'
 import { agentSessionFailureWords } from '../../../shared/agent-session-failure-words'
-import { QUEUED_MESSAGE_PAUSED_KEPT } from '../../../shared/agent-session-queued-message-wire'
 import { claudeProviderHandle } from '../../../shared/agent-session-provider-handle-encoding'
 import { structuredAgentSessionPayloadFingerprint } from '../../../shared/structured-agent-session-mutation'
 import { structuredAgentSessionCompactBody } from '../agent-session-wire/structured-agent-session-command-turn'
@@ -180,7 +179,7 @@ describe('which sends an earlier host process left unsent are kept', () => {
       })
       expect(reopened.queuedMessages.get(id)).toMatchObject({
         state: 'waiting',
-        holdReason: QUEUED_MESSAGE_PAUSED_KEPT,
+        holdReason: null,
         hostInstance: HOST,
         body: message(`text of ${id}`),
         fingerprint: fingerprint(message(`text of ${id}`)),
@@ -229,14 +228,13 @@ describe('which sends an earlier host process left unsent are kept', () => {
     }
   })
 
-  // Only a Send the person asked for comes back kept; the queue's own hand-off waits under the
-  // restart's pause, where it stood.
+  // Whoever sent it, the card comes back with no hold of its own, to wait under the reopen's pause.
   it.each([
-    { by: 'Send now', origin: 'client' as const, holdReason: QUEUED_MESSAGE_PAUSED_KEPT },
-    { by: 'the queue', origin: 'host' as const, holdReason: null }
+    { by: 'Send now', origin: 'client' as const },
+    { by: 'the queue', origin: 'host' as const }
   ])(
     'a card’s own hand-off by $by returns its card, and makes no second one',
-    async ({ origin, holdReason }) => {
+    async ({ origin }) => {
       const journal = await afterRestart(async (earlier) => {
         await earlier.queuedMessages.insert({
           messageId: 'card',
@@ -262,7 +260,7 @@ describe('which sends an earlier host process left unsent are kept', () => {
       expect(journal.queuedMessages.get('card')).toMatchObject({
         state: 'waiting',
         consumedAs: null,
-        holdReason
+        holdReason: null
       })
       expect(journal.queuedMessages.get('handoff')).toBeNull()
     }
@@ -383,7 +381,14 @@ describe('where kept sends go in the queue', () => {
     })
     // That run kept A, at a stale place behind C, then died before B.
     await interrupted.resolveDispatch(
-      { clientMessageId: 'A', state: 'rejected', ...HOST_RESTARTED, fence: 0, recovered: true },
+      {
+        clientMessageId: 'A',
+        state: 'rejected',
+        ...HOST_RESTARTED,
+        fence: 0,
+        recovered: true,
+        keptAsQueuedMessageId: 'A'
+      },
       (db) => {
         interrupted.queuedMessages.holdInTransaction(db, {
           card: {
@@ -391,7 +396,6 @@ describe('where kept sends go in the queue', () => {
             body: message('text of A'),
             fingerprint: fingerprint(message('text of A')),
             hostInstance: HOST,
-            holdReason: QUEUED_MESSAGE_PAUSED_KEPT,
             queuedAt: {
               epoch: 'epoch-1',
               sequence: interrupted.submission('A')!.acceptedSequence!
@@ -419,7 +423,7 @@ describe('a close of the chat', () => {
 
     expect(cardOrder(journal)).toEqual(['person'])
     expect(journal.queuedMessages.get('person')).toMatchObject({
-      holdReason: QUEUED_MESSAGE_PAUSED_KEPT,
+      holdReason: null,
       hostInstance: HOST
     })
     for (const id of ['person', 'mail']) {
diff --git a/src/main/native-chat/agent-session-journal/journal-unsent-send-hold.ts b/src/main/native-chat/agent-session-journal/journal-unsent-send-hold.ts
index 9341fbce6e11..fd5a774c7bf2 100644
--- a/src/main/native-chat/agent-session-journal/journal-unsent-send-hold.ts
+++ b/src/main/native-chat/agent-session-journal/journal-unsent-send-hold.ts
@@ -1,9 +1,10 @@
 // What becomes of a send the host accepted and can no longer hand over: an earlier host process
 // quit or crashed first (settled at the next open), or the chat is closing. Either way the agent
 // provably never got it. A person's message (typed, or a launch's first prompt) is kept as a card
-// at the head of the queue, held until the person sends, edits or deletes it (`kept`). Everything
-// else is rejected as before, because something else re-derives it or the person re-runs it. The
-// submission itself is always rejected, so it is never handed over twice.
+// at the head of the queue, an ordinary one: like every card the chat closed with, it waits for the
+// chat's next turn (`queued-message-pause.ts`). Everything else is rejected as before, because
+// something else re-derives it or the person re-runs it. The submission itself is always rejected,
+// so it is never handed over twice.
 
 import type {
   AgentJournalItemBody,
@@ -12,7 +13,6 @@ import type {
 } from '../../../shared/agent-session-journal-types'
 import { agentJournalSubmissionKey } from '../../../shared/agent-session-journal-item-key'
 import { isQueuedAgentJournalSubmission } from '../../../shared/agent-session-queued-submission'
-import { QUEUED_MESSAGE_PAUSED_KEPT } from '../../../shared/agent-session-queued-message-wire'
 import { USER_MESSAGE_SOURCE } from '../../../shared/agent-session-message-source'
 import { agentSessionFailureFact } from '../../../shared/agent-session-failure'
 import { agentSessionFailureWords } from '../../../shared/agent-session-failure-words'
@@ -75,7 +75,8 @@ export function isUnansweredHandedOverSubmission(
  * both. This batch's cards, and the card of a Send the person asked for, go to the head of the
  * queue in the order they were accepted, behind the cards an earlier settlement kept; the queue's
  * own hand-off returns its card where it stood. Throws once every row was
- * tried when one of them could not be written at all: that row stays queued.
+ * tried when one of them could not be written at all: that row stays queued. Resolves where the
+ * newest send it settled was accepted, or null when it settled none.
  */
 export async function holdUnsentSends(
   journal: AgentSessionJournal,
@@ -87,7 +88,7 @@ export async function holdUnsentSends(
      *  handed and never echoed. It ran none, so each is unsent as surely as a queued one. */
     unrun?: true
   }
-): Promise<void> {
+): Promise<number | null> {
   const { hold } = input
   const unsent = journal
     .submissions()
@@ -101,7 +102,7 @@ export async function holdUnsentSends(
     )
     .sort((a, b) => (a.acceptedSequence ?? 0) - (b.acceptedSequence ?? 0))
   if (unsent.length === 0) {
-    return
+    return null
   }
   const { epoch } = journal.cursor()
   const kept = unsent.map((submission) => ({
@@ -144,7 +145,6 @@ export async function holdUnsentSends(
                       card.body
                     ),
                     hostInstance: input.hostInstance,
-                    holdReason: QUEUED_MESSAGE_PAUSED_KEPT,
                     queuedAt: { epoch, sequence: submission.acceptedSequence ?? 0 },
                     position: card.position
                   }
@@ -185,6 +185,7 @@ export async function holdUnsentSends(
   if (failures.length > 0) {
     throw new AggregateError(failures, 'settling unsent sends failed')
   }
+  return unsent.at(-1)?.acceptedSequence ?? 0
 }
 
 /** Where each card of the batch goes: right before every other card, the cards an earlier
@@ -196,8 +197,18 @@ function headOfQueuePositions(
   batch: readonly { submission: AgentJournalSubmission; body: AgentJournalMessageItem | null }[]
 ): { placed: QueuedMessagePositionMove[]; earlier: QueuedMessagePositionMove[] } {
   const cards = journal.queuedMessages.list()
+  const keptIds = new Set(
+    journal.submissions().flatMap((entry) => entry.keptAsQueuedMessageId ?? [])
+  )
+  const { epoch } = journal.cursor()
+  // Kept by an earlier settlement: its rejection names it, or, past an epoch that dropped that
+  // row, it was queued in an earlier epoch, before anything this one accepted.
   const earlier = cards
-    .filter((card) => card.state === 'waiting' && card.holdReason === QUEUED_MESSAGE_PAUSED_KEPT)
+    .filter(
+      (card) =>
+        card.state === 'waiting' &&
+        (keptIds.has(card.messageId) || (card.queuedAt !== null && card.queuedAt.epoch !== epoch))
+    )
     .map((card) => card.messageId)
   const placed: QueuedMessagePositionMove[] = []
   for (const { submission, body } of batch) {
diff --git a/src/main/native-chat/agent-session-journal/queued-message-holds.ts b/src/main/native-chat/agent-session-journal/queued-message-holds.ts
index 05867436e12e..c3f90590c117 100644
--- a/src/main/native-chat/agent-session-journal/queued-message-holds.ts
+++ b/src/main/native-chat/agent-session-journal/queued-message-holds.ts
@@ -1,7 +1,7 @@
 // Per-draft holds: what keeps one card from auto-sending, stored on its row. A
-// Stop or a restart pauses the queue instead (`queued-message-pause.ts`, derived);
-// a per-draft hold is a conversion that failed, or a send the host kept
-// (`QueuedMessageHoldReason`), which an explicit Send releases.
+// Stop, a /clear or a reopen pauses the queue instead (`queued-message-pause.ts`,
+// derived); a per-draft hold is a conversion that failed (`QueuedMessageHoldReason`),
+// which an explicit Send releases.
 
 import type Database from '../../sqlite/sync-database'
 import type { QueuedMessageHoldReason } from './queued-message-table'
@@ -27,23 +27,3 @@ export function holdQueuedMessages(
   }
   return held
 }
-
-/** Ends a restart's pause: waiting rows another host instance wrote are adopted
- *  into this one, the same fact the pause is derived from, so no second copy
- *  exists. Also clears a per-row 'stopped' hold an earlier build of the queue
- *  wrote, which this build only ever lifts. Returns how many rows it changed. */
-export function adoptQueuedMessages(
-  db: Database.Database,
-  input: { sessionId: string; hostInstance: string }
-): number {
-  return Number(
-    db
-      .prepare(
-        `UPDATE queued_messages
-         SET host_instance = ?, hold_reason = CASE WHEN hold_reason = 'stopped' THEN NULL ELSE hold_reason END
-         WHERE session_id = ? AND state = 'waiting'
-           AND (host_instance <> ? OR hold_reason = 'stopped')`
-      )
-      .run(input.hostInstance, input.sessionId, input.hostInstance).changes ?? 0
-  )
-}
diff --git a/src/main/native-chat/agent-session-journal/queued-message-pause.test.ts b/src/main/native-chat/agent-session-journal/queued-message-pause.test.ts
index 83570726945d..dabc1d64335d 100644
--- a/src/main/native-chat/agent-session-journal/queued-message-pause.test.ts
+++ b/src/main/native-chat/agent-session-journal/queued-message-pause.test.ts
@@ -5,7 +5,7 @@
 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 { afterEach, beforeEach, describe, expect, it, vi } from 'vitest'
 import type {
   AgentJournalMessageItem,
   AgentSessionJournalIdentity
@@ -29,7 +29,6 @@ import {
 } from './queued-message-pause'
 import { agentSessionFailureFact } from '../../../shared/agent-session-failure'
 import { agentSessionFailureWords } from '../../../shared/agent-session-failure-words'
-import { QUEUED_MESSAGE_PAUSED_KEPT } from '../../../shared/agent-session-queued-message-wire'
 import { claudeProviderHandle } from '../../../shared/agent-session-provider-handle-encoding'
 
 const IDENTITY: AgentSessionJournalIdentity = {
@@ -97,12 +96,12 @@ function userStop(journal: AgentSessionJournal) {
 }
 
 function reason(journal: AgentSessionJournal): string | null {
-  return journal.queuedMessages.pauses(HOST)[0]?.reason ?? null
+  return journal.queuedMessages.pauses()[0]?.reason ?? null
 }
 
 /** Each card, and whether a pause in force holds it. */
 function held(journal: AgentSessionJournal): [string, boolean][] {
-  const pauses = journal.queuedMessages.pauses(HOST)
+  const pauses = journal.queuedMessages.pauses()
   return journal.queuedMessages
     .list()
     .filter((card) => card.state === 'waiting')
@@ -308,7 +307,7 @@ describe("the queue's pause, derived from the journal", () => {
           expect: 'waiting',
           settledByOp: null,
           hostInstance: HOST,
-          ...(automatic ? { yieldsToPause: { hostInstance: HOST } } : {})
+          ...(automatic ? { yieldsToPause: true as const } : {})
         }
       )
     await expect(consume('drain-1', true)).rejects.toBeInstanceOf(QueuedMessageNotConsumableError)
@@ -390,7 +389,7 @@ describe("the queue's pause, derived from the journal", () => {
     await turn(journal, 'typed')
     await userStop(journal)
     await journal.replaceEpochItems('handle_forked', 0, [])
-    expect(journal.queuedMessages.pauses(HOST).map((pause) => pause.reason)).toEqual(['stopped'])
+    expect(journal.queuedMessages.pauses().map((pause) => pause.reason)).toEqual(['stopped'])
     await journal.appendQueueResume(0)
     expect(reason(journal)).toBeNull()
   })
@@ -460,7 +459,7 @@ describe('which cards a pause holds', () => {
           expect: 'waiting',
           settledByOp: null,
           hostInstance: HOST,
-          yieldsToPause: { hostInstance: HOST }
+          yieldsToPause: true
         }
       )
     ).rejects.toBeInstanceOf(QueuedMessageNotConsumableError)
@@ -480,89 +479,191 @@ describe('which cards a pause holds', () => {
   })
 })
 
-describe("a restart's pause", () => {
-  it("adopting a restart's rows moves them into this instance and clears an older build's stored 'stopped' hold; send_failed stays", async () => {
-    const journal = await open()
-    await journal.queuedMessages.insert({
-      messageId: 'draft-restart',
-      body: message('written before the restart'),
-      fingerprint: 'fp-draft-restart',
-      hostInstance: 'proc-0'
-    })
-    expect(reason(journal)).toBe('restarted')
-    await queueDraft(journal, 'draft-legacy')
-    await queueDraft(journal, 'draft-failed')
-    await journal.queuedMessages.hold({ messageIds: ['draft-failed'], reason: 'send_failed' })
-    const db = new Database(journalDatabasePath(root))
-    db.prepare("UPDATE queued_messages SET hold_reason = 'stopped' WHERE message_id = ?").run(
-      'draft-legacy'
-    )
-    db.close()
-    journal.queuedMessages.invalidate()
-    expect(await journal.queuedMessages.adopt(HOST)).toBe(true)
+describe("a reopen's pause", () => {
+  /** This handle closes and the next one opens and marks it, as a quit, a crash or a chat close
+   *  leaves it; `failMark` makes the mark's write fail. */
+  async function reopen(
+    journal: AgentSessionJournal,
+    failMark = false
+  ): Promise<AgentSessionJournal> {
+    await journal.close()
+    const reopened = await open()
+    if (failMark) {
+      vi.spyOn(reopened, 'appendQueueReopen').mockRejectedValueOnce(new Error('disk full'))
+      await expect(reopened.markQueueReopen(0)).rejects.toThrow('disk full')
+    } else {
+      await reopened.markQueueReopen(0)
+    }
+    return reopened
+  }
+
+  it('holds the cards queued before the reopen, never one queued after its mark', async () => {
+    let journal = await open()
+    await queueDraft(journal, 'before')
     expect(reason(journal)).toBeNull()
-    expect(
-      journal.queuedMessages.list().map((row) => [row.messageId, row.hostInstance, row.holdReason])
-    ).toEqual([
-      ['draft-restart', HOST, null],
-      ['draft-legacy', HOST, null],
-      ['draft-failed', HOST, 'send_failed']
+    journal = await reopen(journal)
+    await queueDraft(journal, 'after')
+    expect(held(journal)).toEqual([
+      ['before', true],
+      ['after', false]
     ])
+    expect(reason(journal)).toBe('restarted')
   })
 
-  it('adoption and Resume keep a kept card held: only its own Send, Edit or Delete releases it', async () => {
-    const journal = await open()
-    const kept = await journal.queuedMessages.insert({
-      messageId: 'kept',
-      body: message('kept across a restart'),
-      fingerprint: 'fp-kept',
-      hostInstance: 'proc-0',
-      holdReason: QUEUED_MESSAGE_PAUSED_KEPT
-    })
-    expect(kept.holdReason).toBe(QUEUED_MESSAGE_PAUSED_KEPT)
-    expect(await journal.queuedMessages.adopt(HOST)).toBe(true)
-    expect(journal.queuedMessages.get('kept')).toMatchObject({
-      hostInstance: HOST,
-      holdReason: QUEUED_MESSAGE_PAUSED_KEPT
+  it.each([
+    ['an accepted turn', (journal: AgentSessionJournal) => turn(journal, 'carry-on')],
+    ['a Resume', (journal: AgentSessionJournal) => journal.appendQueueResume(0)]
+  ])('%s after the reopen lifts it', async (_name, lift) => {
+    let journal = await open()
+    await queueDraft(journal, 'before')
+    journal = await reopen(journal)
+    await lift(journal)
+    expect(reason(journal)).toBeNull()
+  })
+
+  it('a turn the agent has not accepted yet lifts nothing', async () => {
+    let journal = await open()
+    await queueDraft(journal, 'before')
+    journal = await reopen(journal)
+    await turn(journal, 'carry-on', false)
+    expect(reason(journal)).toBe('restarted')
+  })
+
+  // A hand-off in flight may come back to waiting after the open: the open marks for it too.
+  it('marks a reopen whose only card is mid-hand-off, and holds it once it comes back', async () => {
+    let journal = await open()
+    await queueDraft(journal, 'in-flight')
+    await journal.appendSubmission(
+      {
+        clientMessageId: 'drain-1',
+        payloadFingerprint: 'fp-in-flight',
+        body: message('in-flight'),
+        fence: 0,
+        handoverRecorded: true
+      },
+      { messageId: 'in-flight', expect: 'waiting', settledByOp: null, hostInstance: HOST }
+    )
+    journal = await reopen(journal)
+    await journal.resolveDispatch({
+      clientMessageId: 'drain-1',
+      state: 'rejected',
+      ...agentSessionFailureWords(agentSessionFailureFact('notDelivered'), {
+        surface: 'rejection'
+      }),
+      fence: 0
     })
+    expect(held(journal)).toEqual([['in-flight', true]])
   })
 
-  it('an adoption with nothing to adopt changes nothing and fires no commit notification', async () => {
+  // Written after a later send was accepted, the mark starts where the chat stopped, so that
+  // send still lifts it; it never narrows a wider mark before it.
+  it('a mark written late starts where the chat stopped, and narrows no earlier mark', async () => {
     const journal = await open()
-    await queueDraft(journal, 'draft-1')
-    const revision = journal.queuedMessages.revision()
-    expect(await journal.queuedMessages.adopt(HOST)).toBe(false)
-    expect(journal.queuedMessages.revision()).toBe(revision)
+    await queueDraft(journal, 'kept')
+    const stopped = journal.cursor().sequence + 1
+    await turn(journal, 'later')
+    await journal.markQueueReopen(0, stopped)
+    expect(reason(journal)).toBeNull()
+
+    const reopened = await reopen(journal)
+    expect(reason(reopened)).toBe('restarted')
+    await reopened.markQueueReopen(0, stopped)
+    expect(reason(reopened)).toBe('restarted')
+  })
+
+  it('a reopen with no waiting card writes nothing', async () => {
+    let journal = await open()
+    await turn(journal, 'earlier')
+    const before = journal.cursor()
+    journal = await reopen(journal)
+    expect(journal.cursor()).toEqual(before)
+    await queueDraft(journal, 'after')
+    expect(held(journal)).toEqual([['after', false]])
+  })
+
+  it('a second reopen before any turn still holds them; one after a turn holds them again', async () => {
+    let journal = await open()
+    await queueDraft(journal, 'before')
+    journal = await reopen(journal)
+    journal = await reopen(journal)
+    expect(reason(journal)).toBe('restarted')
+    await turn(journal, 'carry-on')
+    expect(reason(journal)).toBeNull()
+    // Still waiting (here, nothing drained it): the chat closed with it again, so it waits again.
+    journal = await reopen(journal)
+    expect(reason(journal)).toBe('restarted')
+  })
+
+  // The open could not write its mark: the open itself is the boundary, so nothing sends by
+  // itself; the next turn or Resume lifts it, and the next open marks again.
+  it('without a mark the open itself is where the pause begins', async () => {
+    let journal = await open()
+    await queueDraft(journal, 'before')
+    journal = await reopen(journal, true)
+    expect(held(journal)).toEqual([['before', true]])
+    await turn(journal, 'carry-on')
+    expect(reason(journal)).toBeNull()
+  })
+
+  it("reads an earlier build's stored 'kept' and 'stopped' holds as none; send_failed stays", async () => {
+    let journal = await open()
+    for (const id of ['was-kept', 'was-stopped', 'failed']) {
+      await queueDraft(journal, id)
+    }
+    await journal.queuedMessages.hold({ messageIds: ['failed'], reason: 'send_failed' })
+    const db = new Database(journalDatabasePath(root))
+    for (const [id, stored] of [
+      ['was-kept', 'kept'],
+      ['was-stopped', 'stopped']
+    ]) {
+      db.prepare('UPDATE queued_messages SET hold_reason = ? WHERE message_id = ?').run(stored, id)
+    }
+    db.close()
+    journal = await reopen(journal)
+    expect(journal.queuedMessages.list().map((row) => [row.messageId, row.holdReason])).toEqual([
+      ['was-kept', null],
+      ['was-stopped', null],
+      ['failed', 'send_failed']
+    ])
+    expect(held(journal)).toEqual([
+      ['was-kept', true],
+      ['was-stopped', true],
+      ['failed', false]
+    ])
   })
 })
 
 describe('which cards the pauses in force hold', () => {
   type Card = Parameters<typeof queuePauseHolding>[1] & { messageId: string }
-  const DEAD = 'proc-0'
 
   function card(messageId: string, queuedAfter: number, fields: Partial<Card> = {}): Card {
     const queuedAt = { epoch: 'epoch-1', sequence: queuedAfter + 1 }
-    const base = { state: 'waiting', holdReason: null, hostInstance: HOST, carriedFrom: null }
+    const base = { state: 'waiting', holdReason: null, carriedFrom: null }
     return { messageId, ...base, queuedAt, ...fields }
   }
 
-  /** A Stop at sequence 5 unless `stopped` is 0; no turn or Resume since. */
-  function pausesOver(cards: readonly Card[], stopped = 5) {
+  /** A Stop at sequence 5 unless `stopped` is 0; this handle opened at `opened` and could not mark
+   *  it (0: nothing to mark); no turn, Resume or reopen mark since. */
+  function pausesOver(cards: readonly Card[], stopped = 5, opened = 0) {
     return deriveQueuePauses({
       epoch: 'epoch-1',
       marks: {
         latestStop: stopped ? { sequence: stopped, event: { reason: 'user-stop', at: 0 } } : null,
-        resumedSequence: 0
+        resumedSequence: 0,
+        reopenedSequence: 0
       },
       latestAcceptedTurnSequence: 0,
       cards,
-      hostInstance: HOST,
-      restartEnded: false
+      reopenFloor: opened ? { epoch: 'epoch-1', sequence: opened + 1 } : null
     })
   }
 
-  function holding(cards: readonly Card[], stopped?: number): [string, string | null][] {
-    const pauses = pausesOver(cards, stopped)
+  function holding(
+    cards: readonly Card[],
+    stopped?: number,
+    opened?: number
+  ): [string, string | null][] {
+    const pauses = pausesOver(cards, stopped, opened)
     return cards.map((each) => [each.messageId, queuePauseHolding(pauses, each)?.reason ?? null])
   }
 
@@ -580,64 +681,51 @@ describe('which cards the pauses in force hold', () => {
     ])
   })
 
-  it("a Stop that holds nothing never hides a restart's: a dead process's card queued after it waits", () => {
-    const after = card('after', 5, { hostInstance: DEAD })
-    expect(pausesOver([after]).map((pause) => pause.reason)).toEqual(['stopped', 'restarted'])
-    expect(holding([after])).toEqual([['after', 'restarted']])
-    expect(nextSendableQueuedCard(pausesOver([after]), [after])).toBeNull()
-    expect(resumableQueuePause(pausesOver([after]), [after])?.reason).toBe('restarted')
-    // Written by this process, nothing holds it: a card queued after a Stop sends normally.
-    const live = card('after', 5)
-    expect(nextSendableQueuedCard(pausesOver([live]), [live])).toBe(live)
+  it("a Stop that holds nothing never hides a reopen's: a card from before the open waits", () => {
+    const after = card('after', 5)
+    expect(pausesOver([after], 5, 6).map((pause) => pause.reason)).toEqual(['stopped', 'restarted'])
+    expect(holding([after], 5, 6)).toEqual([['after', 'restarted']])
+    expect(nextSendableQueuedCard(pausesOver([after], 5, 6), [after])).toBeNull()
+    // Queued since the open, nothing holds it: a card queued after a Stop sends normally.
+    expect(nextSendableQueuedCard(pausesOver([after]), [after])).toBe(after)
   })
 
   it("a card names the first pause holding it, and the header names the first held card's", () => {
-    const cards = [
-      card('before', 3, { hostInstance: DEAD }),
-      card('after', 5, { hostInstance: DEAD })
-    ]
-    expect(holding(cards)).toEqual([
+    const cards = [card('before', 3), card('after', 5)]
+    expect(holding(cards, 5, 6)).toEqual([
       ['before', 'stopped'],
       ['after', 'restarted']
     ])
-    expect(resumableQueuePause(pausesOver(cards), cards)?.reason).toBe('stopped')
+    expect(resumableQueuePause(pausesOver(cards, 5, 6), cards)?.reason).toBe('stopped')
   })
 
-  // Held on its own, as a card whose send failed: the queue goes past it, and Resume is offered
-  // over the cards a pause holds behind it.
-  it('a kept card is skipped like a send_failed one; the cards behind it still send', () => {
-    const behind = card('behind', 2)
-    const kept = [card('kept', 1, { holdReason: QUEUED_MESSAGE_PAUSED_KEPT }), behind]
-    expect(holding(kept, 0)).toEqual([
-      ['kept', null],
-      ['behind', null]
+  // R13-1: a message Orca kept after a quit is an ordinary card, in order, under the reopen's pause.
+  it('a card from before the open waits in order, and so do the cards behind it', () => {
+    const cards = [card('kept', 1), card('behind', 2)]
+    expect(holding(cards, 0, 4)).toEqual([
+      ['kept', 'restarted'],
+      ['behind', 'restarted']
     ])
-    expect(nextSendableQueuedCard(pausesOver(kept, 0), kept)).toBe(behind)
-    expect(resumableQueuePause(pausesOver(kept, 0), kept)).toBeNull()
-    const restarted = [kept[0]!, card('dead', 2, { hostInstance: DEAD })]
-    expect(nextSendableQueuedCard(pausesOver(restarted, 0), restarted)).toBeNull()
-    expect(resumableQueuePause(pausesOver(restarted, 0), restarted)?.reason).toBe('restarted')
-  })
-
-  // A dead process's card held on its own waits for its own Send, so it pauses no other card.
-  it('a card held on its own from a dead process starts no restart pause', () => {
-    for (const holdReason of [QUEUED_MESSAGE_PAUSED_KEPT, 'send_failed']) {
-      const cards = [card('held', 1, { hostInstance: DEAD, holdReason }), card('live', 2)]
-      expect(pausesOver(cards, 0)).toEqual([])
-      expect(nextSendableQueuedCard(pausesOver(cards, 0), cards)?.messageId).toBe('live')
-    }
+    expect(nextSendableQueuedCard(pausesOver(cards, 0, 4), cards)).toBeNull()
+  })
+
+  // A card held on its own waits for its own Send, so it starts no reopen pause for the others.
+  it('a card held on its own from before the open starts no reopen pause', () => {
+    const cards = [card('held', 1, { holdReason: 'send_failed' }), card('live', 5)]
+    expect(pausesOver(cards, 0, 4)).toEqual([])
+    expect(nextSendableQueuedCard(pausesOver(cards, 0, 4), cards)?.messageId).toBe('live')
   })
 
-  it("a /clear's pause that holds nothing never hides a restart's", () => {
+  it("a /clear's pause that holds nothing never hides a reopen's", () => {
     const cards = [
       card('carried', 1, { carriedFrom: 'source-session', holdReason: 'send_failed' }),
-      card('typed', 2, { hostInstance: DEAD })
+      card('typed', 2)
     ]
-    expect(pausesOver(cards, 0).map((pause) => pause.reason)).toEqual(['cleared', 'restarted'])
-    expect(holding(cards, 0)).toEqual([
+    expect(pausesOver(cards, 0, 4).map((pause) => pause.reason)).toEqual(['cleared', 'restarted'])
+    expect(holding(cards, 0, 4)).toEqual([
       ['carried', null],
       ['typed', 'restarted']
     ])
-    expect(nextSendableQueuedCard(pausesOver(cards, 0), cards)).toBeNull()
+    expect(nextSendableQueuedCard(pausesOver(cards, 0, 4), cards)).toBeNull()
   })
 })
diff --git a/src/main/native-chat/agent-session-journal/queued-message-pause.ts b/src/main/native-chat/agent-session-journal/queued-message-pause.ts
index 5b13856b8f0a..a7a652d81b7c 100644
--- a/src/main/native-chat/agent-session-journal/queued-message-pause.ts
+++ b/src/main/native-chat/agent-session-journal/queued-message-pause.ts
@@ -5,12 +5,14 @@
 //     person's pauses.
 //   - 'cleared': a card /clear carried into this conversation waits, and no turn or Resume has
 //     happened here since.
-//   - 'restarted': a waiting card with no hold of its own was written by another host process,
-//     and no turn has started since this conversation opened. Never published: after a restart
-//     nothing sends by itself, and the next turn (the carry-on or the person's own message) runs
-//     first.
+//   - 'restarted': a card queued before this conversation last opened waits — Orca quit or
+//     crashed, or the chat closed, while it waited — and no turn or Resume has happened since the
+//     open. The open marks itself with a row when it finds waiting cards (`queueReopen`), so a card
+//     queued after it is never mistaken for one from before. Never published: nothing sends by
+//     itself, and the next turn (the carry-on or the person's own message) runs first.
 // Any accepted turn lifts them, whoever sent it: a person, Orca's own messages, or the queue.
-// A card held on its own (`hold_reason`) is outside every pause: only an action on it releases it.
+// A card held on its own (`hold_reason`, a failed conversion) is outside every pause: only an
+// action on it releases it.
 
 import type {
   AgentJournalCursor,
@@ -33,29 +35,32 @@ export type JournalStopSettle = {
 
 export type JournalStopFailedOn = { turnId: string } | { openedAfter: number }
 
-/** The latest Stop event, whatever its reason, and the latest Resume row, folded by the reducer. */
+/** The latest Stop event, whatever its reason, the latest Resume row and the latest reopen mark,
+ *  folded by the reducer. */
 export type JournalQueuePauseMarks = {
   latestStop: { sequence: number; event: JournalStopEvent; settle?: JournalStopSettle } | null
   /** 0 when none. */
   resumedSequence: number
+  /** 0 when none. */
+  reopenedSequence: number
 }
 
 export type DerivedQueuePause = {
   reason: QueuePauseReason
-  /** Where a Stop's pause began: a card queued at or after it is newer. Null for the others. */
+  /** Where a Stop's or a reopen's pause began: a card queued at or after it is newer. Null for
+   *  /clear's, which holds the cards it carried. */
   since: AgentJournalCursor | null
 }
 
 type QueueCard = {
   state: string
   holdReason: string | null
-  hostInstance: string
   carriedFrom: string | null
   queuedAt: AgentJournalCursor | null
 }
 
 export function createJournalQueuePauseMarks(): JournalQueuePauseMarks {
-  return { latestStop: null, resumedSequence: 0 }
+  return { latestStop: null, resumedSequence: 0, reopenedSequence: 0 }
 }
 
 /** The keys are read from disk unchecked: a value no build writes (a corrupt row) is ignored. */
@@ -79,6 +84,11 @@ export function foldJournalQueuePauseMark(
     marks.latestStop = { sequence: row.seq, event: row.stopEvent }
   } else if (row.queueResume === true) {
     marks.resumedSequence = row.seq
+  } else if (row.queueReopen === true) {
+    // Never earlier than a mark before it: a late mark of one send narrows no wider one.
+    const since = row.queueReopenSince
+    const start = typeof since === 'number' && since > 0 && since <= row.seq ? since : row.seq
+    marks.reopenedSequence = Math.max(marks.reopenedSequence, start)
   }
 }
 
@@ -103,20 +113,23 @@ export function journalUserStopInForce(
 }
 
 /** What a rewind's new epoch restates so its pauses read as they did: a lift of /clear's pause (a
- *  turn or a Resume happened), then the Stop still in force, in that order so the lift
- *  never ends the Stop. */
+ *  turn or a Resume happened), then the Stop still in force, then the reopen's pause still holding
+ *  a card, in that order so the lift never ends either. */
 export type JournalQueuePauseRestatement = {
   lifted: boolean
   liveStop: JournalStopEvent | null
+  reopened: boolean
 }
 
 export function journalQueuePauseRestatement(
   marks: JournalQueuePauseMarks,
-  latestAcceptedTurnSequence: number
+  latestAcceptedTurnSequence: number,
+  pauses: readonly DerivedQueuePause[]
 ): JournalQueuePauseRestatement {
   return {
     lifted: latestAcceptedTurnSequence > 0 || marks.resumedSequence > 0,
-    liveStop: journalUserStopInForce(marks, latestAcceptedTurnSequence)?.event ?? null
+    liveStop: journalUserStopInForce(marks, latestAcceptedTurnSequence)?.event ?? null,
+    reopened: pauses.some((pause) => pause.reason === 'restarted')
   }
 }
 
@@ -127,9 +140,8 @@ export function deriveQueuePauses(input: {
   marks: JournalQueuePauseMarks
   latestAcceptedTurnSequence: number
   cards: readonly QueueCard[]
-  hostInstance: string
-  /** A turn started since this conversation opened. */
-  restartEnded: boolean
+  /** Where the reopen's pause begins when this handle could not mark it; null otherwise. */
+  reopenFloor: AgentJournalCursor | null
 }): DerivedQueuePause[] {
   const { epoch, marks, latestAcceptedTurnSequence } = input
   const pauses: DerivedQueuePause[] = []
@@ -142,21 +154,42 @@ export function deriveQueuePauses(input: {
   if (carried.length > 0 && latestAcceptedTurnSequence === 0 && marks.resumedSequence === 0) {
     pauses.push({ reason: 'cleared', since: null })
   }
-  // A card held on its own waits for its own Send whoever wrote it, so it pauses nothing else.
-  const foreign = waiting.some(
-    (card) => card.holdReason === null && card.hostInstance !== input.hostInstance
-  )
-  if (!input.restartEnded && foreign) {
-    // The process that wrote a card is gone: every card waits, whenever it was written.
-    pauses.push({ reason: 'restarted', since: null })
+  const reopened = reopenPause(input)
+  if (
+    reopened &&
+    waiting.some((card) => card.holdReason === null && queuedBefore(reopened, card))
+  ) {
+    pauses.push(reopened)
   }
   return pauses
 }
 
-/** Queued before the pause began: for /clear, a card it carried; for a restart, every card. For a
- *  Stop, a card queued before its row; one from another epoch (before a rewind) or from a build
- *  that recorded no position counts as before. A withdrawn steer keeps its position, so is held. */
-function queuedBeforePause(pause: DerivedQueuePause, card: QueueCard): boolean {
+/** Where the latest reopen began: its mark, or, when this handle could not write one, the open
+ *  itself, so a failed write holds a little more and never sends anything by itself. A floor from
+ *  another epoch is not this one's (a rewind restates the mark). Null once a turn or a Resume came
+ *  after it. */
+function reopenPause(input: {
+  epoch: string
+  marks: JournalQueuePauseMarks
+  latestAcceptedTurnSequence: number
+  reopenFloor: AgentJournalCursor | null
+}): DerivedQueuePause | null {
+  const { epoch, marks, reopenFloor } = input
+  const floor = reopenFloor?.epoch === epoch ? reopenFloor.sequence : 0
+  const sequence = Math.max(marks.reopenedSequence, floor)
+  if (sequence === 0) {
+    return null
+  }
+  if (Math.max(input.latestAcceptedTurnSequence, marks.resumedSequence) >= sequence) {
+    return null
+  }
+  return { reason: 'restarted', since: { epoch, sequence } }
+}
+
+/** Queued before the pause began: for /clear, a card it carried. For a Stop or a reopen, a card
+ *  queued before its row; one from another epoch (before a rewind) or from a build that recorded
+ *  no position counts as before. A withdrawn steer keeps its position, so is held. */
+function queuedBefore(pause: DerivedQueuePause, card: QueueCard): boolean {
   if (pause.reason === 'cleared') {
     return card.carriedFrom !== null
   }
@@ -180,7 +213,7 @@ export function queuePauseHolding(
     return undefined
   }
   // A card queued AFTER a Stop is a new instruction and is not held; it still waits behind a held one.
-  return pauses.find((pause) => queuedBeforePause(pause, card))
+  return pauses.find((pause) => queuedBefore(pause, card))
 }
 
 /** The card the queue sends next: the oldest waiting one with no hold of its own, unless a
diff --git a/src/main/native-chat/agent-session-journal/queued-message-settlement.ts b/src/main/native-chat/agent-session-journal/queued-message-settlement.ts
index 029bdb74e6f3..9c30bf4311dd 100644
--- a/src/main/native-chat/agent-session-journal/queued-message-settlement.ts
+++ b/src/main/native-chat/agent-session-journal/queued-message-settlement.ts
@@ -58,7 +58,6 @@ export function settleOwedQueuedMessages(
       consumedRef,
       reason: submission?.reason ?? null,
       rejection: submission?.rejection,
-      origin: submission?.origin,
       now: input.now
     })
     settled += changed ? 1 : 0
@@ -124,7 +123,6 @@ export function settleQueuedMessagesForRow(
     consumedRef: row.clientMessageId,
     reason: row.reason,
     rejection: row.rejection,
-    origin: submission?.origin,
     now: input.now
   })
   return changed + (settled ? 1 : 0)
diff --git a/src/main/native-chat/agent-session-journal/queued-message-store.test.ts b/src/main/native-chat/agent-session-journal/queued-message-store.test.ts
index 7160718124bc..02e07bc53ee6 100644
--- a/src/main/native-chat/agent-session-journal/queued-message-store.test.ts
+++ b/src/main/native-chat/agent-session-journal/queued-message-store.test.ts
@@ -13,7 +13,6 @@ import type {
 } from '../../../shared/agent-session-journal-types'
 import { agentSessionFailureFact } from '../../../shared/agent-session-failure'
 import { agentSessionFailureWords } from '../../../shared/agent-session-failure-words'
-import { QUEUED_MESSAGE_PAUSED_KEPT } from '../../../shared/agent-session-queued-message-wire'
 import Database from '../../sqlite/sync-database'
 import { JOURNAL_DB_SCHEMA_VERSION } from './journal-database-schema'
 import { journalDatabasePath } from './journal-host-database'
@@ -420,11 +419,11 @@ describe('returned transition (D1/N4)', () => {
   })
 
   it.each([
-    { by: 'the queue', origin: 'host' as const, holdReason: null },
-    { by: 'the person', origin: 'client' as const, holdReason: QUEUED_MESSAGE_PAUSED_KEPT }
+    { by: 'the queue', origin: 'host' as const },
+    { by: 'the person', origin: 'client' as const }
   ])(
     'a restart between $by’s consume and handover sends the draft back to waiting',
-    async ({ origin, holdReason }) => {
+    async ({ origin }) => {
       let journal = await open()
       await queueDraft(journal, 'draft-1')
       await consumeDraft(journal, 'draft-1', { origin })
@@ -434,11 +433,10 @@ describe('returned transition (D1/N4)', () => {
       await journal.rejectQueuedSubmissions(0, HOST_RESTARTED, (submission) =>
         journal.wroteBeforeOpen(submission.acceptedSequence)
       )
-      // The queue's own hand-off waits under the restart's pause, derived from the row's host
-      // instance; a Send the person asked for waits for them, kept.
+      // Whoever sent it, it waits with no hold of its own, under the reopen's pause.
       expect(journal.queuedMessages.get('draft-1')).toMatchObject({
         state: 'waiting',
-        holdReason,
+        holdReason: null,
         hostInstance: 'proc-1',
         consumedAs: null,
         returnedReason: null
@@ -595,23 +593,15 @@ describe('open-time repair and retention', () => {
     }
   })
 
-  // The repair reaches the live hook's answer from the stored rejection and who asked for it.
+  // The repair reaches the live hook's answer from the stored rejection.
   it.each([
-    {
-      origin: 'client' as const,
-      cause: 'hostRestarted' as const,
-      holdReason: QUEUED_MESSAGE_PAUSED_KEPT
-    },
-    { origin: 'host' as const, cause: 'hostRestarted' as const, holdReason: null },
-    {
-      origin: 'client' as const,
-      cause: 'chatClosed' as const,
-      holdReason: QUEUED_MESSAGE_PAUSED_KEPT
-    },
-    { origin: 'host' as const, cause: 'chatClosed' as const, holdReason: null }
+    { origin: 'client' as const, cause: 'hostRestarted' as const },
+    { origin: 'host' as const, cause: 'hostRestarted' as const },
+    { origin: 'client' as const, cause: 'chatClosed' as const },
+    { origin: 'host' as const, cause: 'chatClosed' as const }
   ])(
-    'a skipped hook for a $origin hand-off cut short ($cause) is repaired at open, holdReason $holdReason',
-    async ({ origin, cause, holdReason }) => {
+    'a skipped hook for a $origin hand-off cut short ($cause) is repaired at open, back to waiting',
+    async ({ origin, cause }) => {
       let journal = await open()
       await queueDraft(journal, 'draft-1')
       await consumeDraft(journal, 'draft-1', { origin })
@@ -629,7 +619,7 @@ describe('open-time repair and retention', () => {
       journal = await open()
       expect(journal.queuedMessages.get('draft-1')).toMatchObject({
         state: 'waiting',
-        holdReason,
+        holdReason: null,
         consumedAs: null
       })
     }
diff --git a/src/main/native-chat/agent-session-journal/queued-message-stored-row.ts b/src/main/native-chat/agent-session-journal/queued-message-stored-row.ts
index 1e5fdb2ac03b..51233b66abb0 100644
--- a/src/main/native-chat/agent-session-journal/queued-message-stored-row.ts
+++ b/src/main/native-chat/agent-session-journal/queued-message-stored-row.ts
@@ -55,7 +55,7 @@ export function readStoredQueuedMessageRow(row: unknown): QueuedMessageRow | nul
     createdAt: record.created_at,
     hostInstance: record.host_instance,
     state,
-    holdReason: record.hold_reason,
+    holdReason: storedHoldReason(record.hold_reason),
     returnedReason: record.returned_reason,
     returnedRejection: storedRejection(record.returned_rejection),
     settledAt: record.settled_at,
@@ -69,6 +69,14 @@ export function readStoredQueuedMessageRow(row: unknown): QueuedMessageRow | nul
   }
 }
 
+/** Holds an earlier build stored that this one derives instead: a kept send (`kept`) waits under
+ *  the reopen's pause, a Stop's (`stopped`) under the Stop's. */
+const QUEUED_MESSAGE_RETIRED_HOLD_REASONS: ReadonlySet<string> = new Set(['kept', 'stopped'])
+
+function storedHoldReason(stored: string | null): string | null {
+  return stored !== null && QUEUED_MESSAGE_RETIRED_HOLD_REASONS.has(stored) ? null : stored
+}
+
 function storedRejection(json: string | null): UnreadAgentSessionFailureFact | null {
   if (json === null) {
     return null
diff --git a/src/main/native-chat/agent-session-journal/queued-message-table.ts b/src/main/native-chat/agent-session-journal/queued-message-table.ts
index f3e82613b1f3..c9b380a25352 100644
--- a/src/main/native-chat/agent-session-journal/queued-message-table.ts
+++ b/src/main/native-chat/agent-session-journal/queued-message-table.ts
@@ -13,23 +13,18 @@ import type {
   AgentJournalCursor,
   AgentJournalMessageItem
 } from '../../../shared/agent-session-journal-types'
-import {
-  QUEUED_MESSAGE_PAUSED_KEPT,
-  type QUEUED_MESSAGE_PAUSED_SEND_FAILED
-} from '../../../shared/agent-session-queued-message-wire'
+import type { QUEUED_MESSAGE_PAUSED_SEND_FAILED } from '../../../shared/agent-session-queued-message-wire'
 import { rejectedDraftSettlement } from './journal-dispatch-settlement'
 import { readStoredQueuedMessageRow } from './queued-message-stored-row'
 
 export type QueuedMessageState = 'waiting' | 'dispatched' | 'returned' | 'withdrawn'
 
-/** Why ONE waiting draft is held from auto-sending: its conversion failed (`send_failed`), or it
- *  is a send the host accepted and kept across a restart or a close (`kept`). Stored on the row, so
- *  it survives handle eviction and restart; a wire marker (it publishes as `pausedReason`). A Stop
- *  or a restart pauses the whole queue instead. A reader treats an unknown stored value as a plain
- *  hold. */
-export type QueuedMessageHoldReason =
-  | typeof QUEUED_MESSAGE_PAUSED_SEND_FAILED
-  | typeof QUEUED_MESSAGE_PAUSED_KEPT
+/** Why ONE waiting draft is held from auto-sending: its conversion failed (`send_failed`). Stored
+ *  on the row, so it survives handle eviction and restart; a wire marker (it publishes as
+ *  `pausedReason`). A Stop, a /clear or a reopen pauses the queue instead. A reader treats an
+ *  unknown stored value as a plain hold, and the holds earlier builds wrote that this one derives
+ *  (`QUEUED_MESSAGE_RETIRED_HOLD_REASONS`) as none. */
+export type QueuedMessageHoldReason = typeof QUEUED_MESSAGE_PAUSED_SEND_FAILED
 
 /** Definitively unsettled: what Stop, /clear, Edit and the budget count, and
  *  what the published list shows. Pending/unknown/accepted deliveries and
@@ -231,8 +226,8 @@ export function withdrawQueuedMessages(
  * dispatched → returned, or back to waiting (`rejectedDraftSettlement`),
  * matched on the draft's CURRENT hand-off (`consumed_as`), so a re-send refused
  * again still settles while a late duplicate of an earlier refusal matches
- * nothing. A draft back to waiting keeps its position and carries no refusal, held as `kept`
- * when the settlement says so; its spent submissions stay findable by their `queuedMessageId` link.
+ * nothing. A draft back to waiting keeps its position and carries no refusal; its spent
+ * submissions stay findable by their `queuedMessageId` link.
  */
 export function settleRejectedQueuedMessage(
   db: Database.Database,
@@ -241,8 +236,6 @@ export function settleRejectedQueuedMessage(
     consumedRef: string
     reason: string | null
     rejection: UnreadAgentSessionFailureFact | undefined
-    /** Who asked for the rejected hand-off (`AgentJournalSubmission.origin`). */
-    origin: 'client' | 'host' | undefined
     now: number
   }
 ): boolean {
@@ -252,15 +245,11 @@ export function settleRejectedQueuedMessage(
       ? db
           .prepare(
             `UPDATE queued_messages
-             SET state = 'waiting', hold_reason = ?, consumed_as = NULL,
+             SET state = 'waiting', hold_reason = NULL, consumed_as = NULL,
                  returned_reason = NULL, returned_rejection = NULL, settled_at = NULL, settled_by_op = NULL
              WHERE session_id = ? AND state = 'dispatched' AND consumed_as = ?`
           )
-          .run(
-            settlement.kept ? QUEUED_MESSAGE_PAUSED_KEPT : null,
-            input.sessionId,
-            input.consumedRef
-          )
+          .run(input.sessionId, input.consumedRef)
       : db
           .prepare(
             `UPDATE queued_messages
diff --git a/src/main/native-chat/agent-session-record-test-fixture.ts b/src/main/native-chat/agent-session-record-test-fixture.ts
new file mode 100644
index 000000000000..21e7f1d5191e
--- /dev/null
+++ b/src/main/native-chat/agent-session-record-test-fixture.ts
@@ -0,0 +1,50 @@
+// A complete, typed agent-session record for tests that care about a few of its fields.
+
+import {
+  AGENT_SESSION_RECORD_SCHEMA_VERSION,
+  type AgentSessionExecutionLocation,
+  type AgentSessionRecord
+} from '../../shared/agent-session-record'
+import { LOCAL_EXECUTION_HOST_ID } from '../../shared/execution-host'
+
+export function agentSessionRecordFixture(
+  overrides: Partial<Omit<AgentSessionRecord, 'location'>> & {
+    sessionId: string
+    location?: Partial<AgentSessionExecutionLocation>
+  }
+): AgentSessionRecord {
+  const { location, ...rest } = overrides
+  return {
+    schemaVersion: AGENT_SESSION_RECORD_SCHEMA_VERSION,
+    provider: 'claude',
+    providerHandleChain: [],
+    accountHome: { variable: 'CLAUDE_CONFIG_DIR', path: '/home/work/.claude' },
+    createdAt: 0,
+    updatedAt: 0,
+    lease: {
+      sessionId: overrides.sessionId,
+      runtimeKind: 'native',
+      runtimeFence: 1,
+      handoffStage: null,
+      provenHandleLinkId: null,
+      ownerProcess: null,
+      reservedSpawnToken: null,
+      leaseDeadlineAt: 0,
+      lastRenewedAt: 0,
+      handoffOperationId: null,
+      journalCheckpoint: null,
+      claimKeyId: 'test-key',
+      claimStatus: 'released',
+      unreconciled: false,
+      deathEvidence: null
+    },
+    ...rest,
+    location: {
+      executionHostId: LOCAL_EXECUTION_HOST_ID,
+      wslDistro: null,
+      workspaceId: 'workspace-1',
+      workspaceKind: 'folder',
+      ...location
+    }
+  }
+}
diff --git a/src/main/native-chat/agent-session-timeline/provider-timeline-assembler.ts b/src/main/native-chat/agent-session-timeline/provider-timeline-assembler.ts
index fdd10ab61041..cee9087f240a 100644
--- a/src/main/native-chat/agent-session-timeline/provider-timeline-assembler.ts
+++ b/src/main/native-chat/agent-session-timeline/provider-timeline-assembler.ts
@@ -14,6 +14,9 @@
 //   recovered: a new child is a new assembler, in a new acquisition generation.
 
 import type { AgentType } from '../../../shared/agent-session-journal-types'
+import { agentJournalItemKey } from '../../../shared/agent-session-journal-item-key'
+import { readAgentJournalTurn } from '../../../shared/agent-session-turn-record'
+import type { StructuredAgentSessionCommandRun } from '../agent-session-wire/structured-agent-session-adapter'
 import type { AgentSessionDeltaCoalescerDeps } from '../agent-session-wire/agent-session-delta-coalescer'
 import type { StructuredAgentSessionSinkAdmission } from '../agent-session-wire/structured-agent-session-event-sink'
 import {
@@ -47,6 +50,9 @@ export type { ProviderTimelineDropRule } from './provider-timeline-decision'
 export type { ProviderTimelineApplyResult } from './provider-timeline-text-events'
 
 export type ProviderTimelineAssembler = {
+  /** The host already wrote this command's running turn; the provider ends that same row. */
+  beginCommand(command: StructuredAgentSessionCommandRun): void
+  forgetCommand(turnId: string): void
   apply(event: ProviderTimelineEvent): ProviderTimelineApplyResult
   /** The turn id of the open turn, as its row and a client's Stop name it. */
   readonly openTurnId: string | null
@@ -191,6 +197,27 @@ export function createProviderTimelineAssembler(
   }
 
   return {
+    forgetCommand: (turnId) => {
+      if (state.open?.turnId === turnId) {
+        state.endTurn(state.open)
+      }
+    },
+    beginCommand: (command) => {
+      if (state.ended || state.open || state.stopped) {
+        throw new Error('Provider timeline cannot adopt a command while work is open')
+      }
+      const running = readAgentJournalTurn(command.running)
+      if (!running || running.state !== 'running' || running.turnId !== command.turnId) {
+        throw new Error('Provider timeline command is not a running host turn')
+      }
+      state.open = {
+        identity: command.identity,
+        itemId: agentJournalItemKey(command.identity),
+        turnId: command.turnId,
+        key: { source: 'provider', value: command.turnId },
+        running
+      }
+    },
     apply,
     get openTurnId() {
       return state.open?.turnId ?? null
diff --git a/src/main/native-chat/agent-session-wire/agent-session-conversation-outline.test.ts b/src/main/native-chat/agent-session-wire/agent-session-conversation-outline.test.ts
index 35737dd84ccf..9dd2b5c48f23 100644
--- a/src/main/native-chat/agent-session-wire/agent-session-conversation-outline.test.ts
+++ b/src/main/native-chat/agent-session-wire/agent-session-conversation-outline.test.ts
@@ -77,6 +77,28 @@ describe('conversation outline read', () => {
     expect(replyBytes(trimmed.entries)).toBeLessThanOrEqual(budget)
   })
 
+  it('carries the reply to each prompt, and drops replies before it shortens a preview', () => {
+    const items = Array.from({ length: 10 }, (_, index): AgentJournalRenderItem[] => [
+      prompt(index * 2 + 1, 'x'.repeat(100)),
+      {
+        itemId: `reply-${index}`,
+        revision: 1,
+        sequence: index * 2 + 2,
+        observedAt: index * 2 + 2,
+        body: { kind: 'message', role: 'assistant', blocks: [{ type: 'text', text: 'Answer' }] }
+      }
+    ]).flat()
+    const full = readAgentSessionConversationOutline(snapshot(items), Number.MAX_SAFE_INTEGER)
+    expect(full.entries.map((entry) => entry.reply)).toEqual(Array(10).fill('Answer'))
+
+    // One byte short: the budget counts a separator per entry, the array two brackets.
+    const tight = readAgentSessionConversationOutline(snapshot(items), replyBytes(full.entries) - 2)
+    expect(tight.entries.every((entry) => entry.reply === undefined)).toBe(true)
+    expect(tight.entries.map((entry) => entry.preview)).toEqual(
+      full.entries.map((entry) => entry.preview)
+    )
+  })
+
   it('stays inside the history page budget for a journal far past it', () => {
     // ~10k prompts of 1 KB each: an order of magnitude past the budget at full preview.
     const items = Array.from({ length: 10_000 }, (_, index) =>
diff --git a/src/main/native-chat/agent-session-wire/agent-session-conversation-outline.ts b/src/main/native-chat/agent-session-wire/agent-session-conversation-outline.ts
index 198a813b2171..ecdcb30062d4 100644
--- a/src/main/native-chat/agent-session-wire/agent-session-conversation-outline.ts
+++ b/src/main/native-chat/agent-session-wire/agent-session-conversation-outline.ts
@@ -2,8 +2,9 @@
 // request rather than stored, so it can never disagree with the journal it lists.
 //
 // One reply must fit the same budget a history page does. Past it the reply
-// degrades in order of what the rail can best spare: shorter previews, then no
-// previews (a tick still marks the message), and only then the oldest entries.
+// degrades in order of what the rail can best spare: the agent's replies, then
+// shorter previews, then no previews (a tick still marks the message), and only
+// then the oldest entries.
 
 import {
   AGENT_SESSION_OUTLINE_PREVIEW_MAX_CHARS,
@@ -32,6 +33,12 @@ function withPreviewCap(
   })
 }
 
+function withoutReplies(
+  entries: readonly AgentSessionConversationOutlineEntry[]
+): AgentSessionConversationOutlineEntry[] {
+  return entries.map(({ reply: _reply, ...entry }) => entry)
+}
+
 function totalBytes(entries: readonly AgentSessionConversationOutlineEntry[]): number {
   return entries.reduce((total, entry) => total + entryBytes(entry), 0)
 }
@@ -42,6 +49,9 @@ export function readAgentSessionConversationOutline(
 ): AgentSessionConversationOutline {
   const projected = projectAgentSessionConversationOutline(snapshot.items, snapshot.submissions)
   let entries = withPreviewCap(projected, AGENT_SESSION_OUTLINE_PREVIEW_MAX_CHARS)
+  if (totalBytes(entries) > budgetBytes) {
+    entries = withoutReplies(entries)
+  }
   for (const maxChars of [DEGRADED_PREVIEW_MAX_CHARS, 0]) {
     if (totalBytes(entries) <= budgetBytes) {
       break
diff --git a/src/main/native-chat/agent-session-wire/agent-session-delta-coalescer.test.ts b/src/main/native-chat/agent-session-wire/agent-session-delta-coalescer.test.ts
index fcfafac9ae96..c8790eb06b2a 100644
--- a/src/main/native-chat/agent-session-wire/agent-session-delta-coalescer.test.ts
+++ b/src/main/native-chat/agent-session-wire/agent-session-delta-coalescer.test.ts
@@ -1,4 +1,4 @@
-import { describe, expect, it } from 'vitest'
+import { describe, expect, it, vi } from 'vitest'
 import {
   AGENT_SESSION_DELTA_COALESCE_MS,
   createAgentSessionDeltaCoalescer
@@ -244,3 +244,40 @@ describe('agent-session delta coalescer', () => {
     expect(emitted.get('item-3')).toEqual({ text: '', observedBytes: 80, truncated: true })
   })
 })
+
+describe('snapshot admission before assembly', () => {
+  it('reports retained UTF-16 length after Unicode appends and byte truncation', () => {
+    const clock = manualClock()
+    const shouldEmit = vi.fn(() => true)
+    const emitted: [string, string][] = []
+    const instance = createAgentSessionDeltaCoalescer({
+      schedule: clock.schedule,
+      maxRetainedBytes: 40,
+      shouldEmit,
+      emit: (key, text) => emitted.push([key, text])
+    })
+    instance.append('unicode', 'éé')
+    instance.append('surrogate', '\ud83d')
+    instance.append('surrogate', '\ude00')
+    clock.fire()
+    expect(shouldEmit.mock.calls).toEqual([
+      ['unicode', 2],
+      ['surrogate', 2]
+    ])
+    expect(emitted).toEqual([
+      ['unicode', 'éé'],
+      ['surrogate', '😀']
+    ])
+
+    instance.append('unicode', `${'é'.repeat(20)}more`)
+    clock.fire()
+    const truncated = 'ééé\n[Orca: streamed output truncated]'
+    expect(shouldEmit).toHaveBeenLastCalledWith('unicode', truncated.length)
+    expect(emitted.at(-1)).toEqual(['unicode', truncated])
+    const calls = shouldEmit.mock.calls.length
+    instance.append('unicode', 'ignored')
+    clock.fire()
+    expect(shouldEmit).toHaveBeenCalledTimes(calls)
+    instance.dispose()
+  })
+})
diff --git a/src/main/native-chat/agent-session-wire/agent-session-delta-coalescer.ts b/src/main/native-chat/agent-session-wire/agent-session-delta-coalescer.ts
index eff850ae8e05..7c04312f5842 100644
--- a/src/main/native-chat/agent-session-wire/agent-session-delta-coalescer.ts
+++ b/src/main/native-chat/agent-session-wire/agent-session-delta-coalescer.ts
@@ -32,6 +32,8 @@ export type AgentSessionDeltaSnapshot = {
 export type AgentSessionDeltaCoalescerDeps = {
   /** Called with the FULL text accumulated for the key, not the increment. */
   emit: (key: string, text: string, snapshot: AgentSessionDeltaSnapshot) => unknown
+  /** False accepts a skipped snapshot; sink refusal is reported by emit. */
+  shouldEmit?: (key: string, textLength: number) => boolean
   windowMs?: number
   maxRetainedBytes?: number
   maxTotalRetainedBytes?: number
@@ -82,6 +84,7 @@ export function createAgentSessionDeltaCoalescer(
     {
       chunks: string[]
       retainedBytes: number
+      textLength: number
       observedBytes: number
       truncated: boolean
       dirty: boolean
@@ -96,6 +99,10 @@ export function createAgentSessionDeltaCoalescer(
     if (!stream?.dirty) {
       return true
     }
+    if (deps.shouldEmit?.(key, stream.textLength) === false) {
+      stream.dirty = false
+      return true
+    }
     const text = stream.chunks.join('')
     const emitted = deps.emit(key, text, {
       text,
@@ -159,6 +166,7 @@ export function createAgentSessionDeltaCoalescer(
         stream = {
           chunks: [],
           retainedBytes: 0,
+          textLength: 0,
           observedBytes: 0,
           truncated: false,
           dirty: false
@@ -182,6 +190,9 @@ export function createAgentSessionDeltaCoalescer(
           streamLimit
         )
         totalRetainedBytes += next.retainedBytes - stream.retainedBytes
+        stream.textLength = next.truncated
+          ? (next.chunks[0]?.length ?? 0)
+          : stream.textLength + delta.length
         stream.chunks = next.chunks
         stream.retainedBytes = next.retainedBytes
         stream.truncated = next.truncated
diff --git a/src/main/native-chat/agent-session-wire/structured-agent-definition.ts b/src/main/native-chat/agent-session-wire/structured-agent-definition.ts
index da783ac0749e..5a1e43ce2223 100644
--- a/src/main/native-chat/agent-session-wire/structured-agent-definition.ts
+++ b/src/main/native-chat/agent-session-wire/structured-agent-definition.ts
@@ -21,3 +21,8 @@ export type StructuredAgentDefinition = AgentSessionStoredAgent & {
     effortDefaultsToModel: boolean
   }
 }
+
+/** An agent whose account is one config directory, as Claude's and Codex's are. */
+export type DirectoryAccountAgentDefinition = StructuredAgentDefinition & {
+  accountHomeVariable: string
+}
diff --git a/src/main/native-chat/agent-session-wire/structured-agent-session-acquisition-runtime-stamp.test.ts b/src/main/native-chat/agent-session-wire/structured-agent-session-acquisition-runtime-stamp.test.ts
new file mode 100644
index 000000000000..90c94306db1d
--- /dev/null
+++ b/src/main/native-chat/agent-session-wire/structured-agent-session-acquisition-runtime-stamp.test.ts
@@ -0,0 +1,127 @@
+// A chat starts whatever the store stamped on its owner: the Orca runtime holding the process is
+// recorded beside its identity, and the start compares the process, not the stamp.
+
+import { mkdtemp, rm } from 'node:fs/promises'
+import { tmpdir } from 'node:os'
+import { join } from 'node:path'
+import { afterEach, expect, it, vi } from 'vitest'
+import { computeAgentSessionPayloadFingerprint } from '../../../shared/agent-session-mutation-envelope'
+import { codexProviderHandle } from '../../../shared/agent-session-provider-handle-encoding'
+import { openTestAgentSessionRecordStore } from '../../runtime/agent-session-record-store-test-harness'
+import { agentSessionRuntimeIncarnation } from '../../runtime/agent-session-runtime-attribution'
+import { openTestJournalHostDatabase } from '../agent-session-journal/journal-host-database-test-support'
+import type { StructuredAgentSessionAdapter } from './structured-agent-session-adapter'
+import {
+  attachFingerprintFields,
+  type AgentSessionAttachParams
+} from './structured-agent-session-attach'
+import { performAttach } from './structured-agent-session-attach-flow'
+import { openTestAttachConversation } from './structured-agent-session-attach-test-conversation'
+import { createStructuredAgentSessionLogger } from './structured-agent-session-logger'
+import { NO_STRUCTURED_AGENTS } from './structured-agent-session-adapter-router-test-support'
+
+const NOW = 1_800_000_000_000
+const SESSION = 'stamped-owner-session'
+const OPERATION = `${NOW}-${'1'.padStart(32, '0')}`
+let root: string | null = null
+
+afterEach(async () => {
+  if (root) {
+    await rm(root, { recursive: true, force: true })
+  }
+  root = null
+})
+
+function attachParams(): AgentSessionAttachParams {
+  const params: AgentSessionAttachParams = {
+    envelope: {
+      sessionId: SESSION,
+      clientOperationId: OPERATION,
+      expectedRuntimeFence: null,
+      payloadFingerprint: ''
+    },
+    location: {
+      executionHostId: 'local',
+      wslDistro: null,
+      workspaceId: 'workspace-1',
+      workspaceKind: 'folder'
+    },
+    provider: 'codex',
+    agent: 'codex',
+    accountHome: { variable: 'CODEX_HOME', path: '/home/dev/.codex' },
+    runtimeKind: 'native',
+    providerHandle: { kind: 'codex', threadId: 'thread-1' }
+  }
+  return {
+    ...params,
+    envelope: {
+      ...params.envelope,
+      payloadFingerprint: computeAgentSessionPayloadFingerprint({
+        method: 'agentSession.attach',
+        sessionId: SESSION,
+        fields: attachFingerprintFields(params)
+      })
+    }
+  }
+}
+
+it('starts a chat whose recorded owner carries the runtime stamp', async () => {
+  root = await mkdtemp(join(tmpdir(), 'orca-stamped-owner-'))
+  const store = await openTestAgentSessionRecordStore(root)
+  // The record as the store published it, stamp included, rather than the transition's own copy.
+  const commit = store.commitProcessIdentity.bind(store)
+  vi.spyOn(store, 'commitProcessIdentity').mockImplementation(async (input) => {
+    await commit(input)
+    const published = store.getRecord(input.sessionId)
+    if (!published) {
+      throw new Error('the committed record is missing')
+    }
+    return published
+  })
+  const adapter: StructuredAgentSessionAdapter = {
+    acquire: vi.fn<StructuredAgentSessionAdapter['acquire']>(
+      async ({ fence, spawnToken, onSpawned }) => {
+        const process = { hostId: 'local', pid: 4242, processStartTimeMs: NOW, spawnToken }
+        await onSpawned?.(process)
+        return {
+          process,
+          link: {
+            linkId: 'created-link',
+            handle: codexProviderHandle('thread-1'),
+            origin: 'created',
+            mintedAtFence: fence,
+            observedAt: NOW
+          }
+        }
+      }
+    ),
+    dispatch: vi.fn(),
+    cancelTurn: vi.fn(),
+    answerPrompt: vi.fn(),
+    setOption: vi.fn()
+  }
+
+  const attached = await performAttach({
+    agents: NO_STRUCTURED_AGENTS,
+    logger: createStructuredAgentSessionLogger(),
+    store,
+    adapter,
+    openConversation: openTestAttachConversation(openTestJournalHostDatabase(root)),
+    authority: {
+      spawnToken: 'spawn-a',
+      claimKeyId: 'key-1',
+      handoffOperationId: OPERATION,
+      probe: { outcome: 'reservation-unused' }
+    },
+    callerKey: 'client-1',
+    params: attachParams(),
+    now: () => NOW,
+    onAttached: () => {}
+  })
+
+  expect(attached).toMatchObject({ ok: true })
+  expect(store.getRecord(SESSION)?.lease.ownerProcess).toMatchObject({
+    pid: 4242,
+    runtime: agentSessionRuntimeIncarnation()
+  })
+})
diff --git a/src/main/native-chat/agent-session-wire/structured-agent-session-acquisition.ts b/src/main/native-chat/agent-session-wire/structured-agent-session-acquisition.ts
index 3389bc615e58..70019d6da3e5 100644
--- a/src/main/native-chat/agent-session-wire/structured-agent-session-acquisition.ts
+++ b/src/main/native-chat/agent-session-wire/structured-agent-session-acquisition.ts
@@ -1,5 +1,8 @@
 import { isDeepStrictEqual } from 'node:util'
-import type { AgentSessionRecord } from '../../../shared/agent-session-record'
+import type {
+  AgentSessionProcessIdentity,
+  AgentSessionRecord
+} from '../../../shared/agent-session-record'
 import {
   AgentSessionPreSpawnError,
   isAgentSessionPreSpawnError,
@@ -11,6 +14,17 @@ import type { AttachFlowInput } from './structured-agent-session-attach-flow'
 import { readNativeSessionOptions } from './structured-agent-session-option-restoration'
 import { withAgentSessionCreatePhase } from '../../observability/agent-session-instrumentation'
 
+/** The same process, whatever Orca runtime the store stamped on its record (`runtime`): that stamp
+ *  is about who holds the process, not which process it is. */
+function sameOwnerProcess(
+  stored: AgentSessionProcessIdentity,
+  acquired: AgentSessionProcessIdentity
+): boolean {
+  const { runtime: _storedRuntime, ...storedProcess } = stored
+  const { runtime: _acquiredRuntime, ...acquiredProcess } = acquired
+  return isDeepStrictEqual(storedProcess, acquiredProcess)
+}
+
 /** A reservation with no process behind it is only a promise to spawn; the
  * adapter makes it real and the store then grants the writer. */
 export async function acquireOwner(
@@ -79,7 +93,7 @@ export async function acquireOwner(
         process: acquired.process,
         now: input.now()
       })
-    } else if (!isDeepStrictEqual(record.lease.ownerProcess, acquired.process)) {
+    } else if (!sameOwnerProcess(record.lease.ownerProcess, acquired.process)) {
       throw new Error('agent_session_ownership_unknown')
     }
     const proved = await input.store.proveOwner({
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 cb2dc19465a5..fb26aeeb7562 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
@@ -134,6 +134,8 @@ export type AgentSessionPreSpawnReason = Extract<
   | 'managedAccountUnsupported'
   | 'launchFolderMissing'
   | 'historyInOtherAccount'
+  | 'claudeAccountFolderMissing'
+  | 'claudeAccountSetupFailed'
   | 'agentCommandNotRunnable'
 >
 
diff --git a/src/main/native-chat/agent-session-wire/structured-agent-session-attachment-admission.test.ts b/src/main/native-chat/agent-session-wire/structured-agent-session-attachment-admission.test.ts
new file mode 100644
index 000000000000..9228f6f0743f
--- /dev/null
+++ b/src/main/native-chat/agent-session-wire/structured-agent-session-attachment-admission.test.ts
@@ -0,0 +1,145 @@
+// A message naming a chat attachment the host no longer stores is refused whole at admission,
+// with a reason the client's existing rejected-send row puts into words, on the direct path and
+// the queued one alike; a stored one is claimed, and a /clear carries the claim to its new chat.
+
+import { mkdir, rm, writeFile } from 'node:fs/promises'
+import { join } from 'node:path'
+import { afterEach, beforeEach, describe, expect, it } from 'vitest'
+import type { AgentJournalMessageItem } from '../../../shared/agent-session-journal-types'
+import { agentSessionAttachmentStoreRoot } from '../agent-session-attachments/agent-session-attachment-references'
+import { openTestJournalHostDatabase } from '../agent-session-journal/journal-host-database-test-support'
+import {
+  createQueuedMessageTestRig,
+  QUEUED_RIG_CALLER as CALLER,
+  type QueuedMessageTestRig
+} from './structured-agent-session-queued-message-rig.test-fixture'
+import {
+  HOST_TEST_SESSION as SESSION,
+  hostTestOperationId
+} from './structured-agent-session-host-test-data'
+
+const UPLOAD = '0b6f8a52-4a3e-4c4e-9a59-1d5d1f2b8c01'
+const EXPIRED = {
+  ok: false,
+  refusal: { code: 'agent_session_operation_invalid', details: { reason: 'attachmentExpired' } }
+}
+
+let rig: QueuedMessageTestRig
+
+beforeEach(async () => {
+  rig = await createQueuedMessageTestRig()
+})
+
+afterEach(() => rig.dispose())
+
+function storedPath(name: string): string {
+  return join(agentSessionAttachmentStoreRoot(rig.root), UPLOAD, name)
+}
+
+async function storeUpload(name: string): Promise<string> {
+  await mkdir(join(agentSessionAttachmentStoreRoot(rig.root), UPLOAD), { recursive: true })
+  await writeFile(storedPath(name), 'bytes')
+  return storedPath(name)
+}
+
+function clientSend(body: AgentJournalMessageItem, delivery?: 'queue-if-active') {
+  const clientOperationId = hostTestOperationId()
+  const fields = { body, ...(delivery ? { delivery } : {}) }
+  return rig.host.send(CALLER, {
+    envelope: rig.envelope(fields, 'agentSession.send', clientOperationId),
+    body,
+    ...(delivery ? { delivery } : {}),
+    userSend: true
+  })
+}
+
+function claimedSessions(): string[] {
+  return openTestJournalHostDatabase(rig.root)
+    .db.prepare('SELECT session_id FROM agent_session_attachment_claims ORDER BY session_id')
+    .all()
+    .flatMap((row) =>
+      typeof row === 'object' && row !== null && 'session_id' in row ? [String(row.session_id)] : []
+    )
+}
+
+function textWith(path: string): AgentJournalMessageItem {
+  return { kind: 'message', role: 'user', blocks: [{ type: 'text', text: `read @${path}` }] }
+}
+
+describe('attachments at send admission', () => {
+  it('refuses a send naming an expired image before anything is recorded', async () => {
+    const result = await clientSend({
+      kind: 'message',
+      role: 'user',
+      blocks: [{ type: 'image-ref', path: storedPath('shot.png') }]
+    })
+    expect(result).toMatchObject(EXPIRED)
+    expect((await rig.host.journalSnapshot(SESSION)).submissions).toHaveLength(0)
+    expect(rig.dispatch).not.toHaveBeenCalled()
+  })
+
+  it('refuses a queued send naming an expired file, and queues nothing', async () => {
+    await rig.workingSend()
+    expect(await clientSend(textWith(storedPath('notes.txt')), 'queue-if-active')).toMatchObject(
+      EXPIRED
+    )
+    expect(await rig.drafts()).toHaveLength(0)
+  })
+
+  it('claims a stored upload, and the /clear carry claims it for the replacement chat', async () => {
+    const working = await rig.workingSend()
+    const path = await storeUpload('notes.txt')
+    expect(await clientSend(textWith(path), 'queue-if-active')).toMatchObject({
+      ok: true,
+      value: { queued: { state: 'waiting' } }
+    })
+    expect(claimedSessions()).toEqual([SESSION])
+    await rig.stop()
+    await rig.settleAccepted(working, 'a')
+    const fields = { command: 'clear' as const }
+    const cleared = await rig.host.conversationCommand(CALLER, {
+      envelope: rig.envelope(fields, 'agentSession.conversationCommand', hostTestOperationId()),
+      ...fields
+    })
+    const replacementId = cleared.ok ? cleared.value.replacementSessionId : undefined
+    expect(replacementId).toBeTruthy()
+    expect(claimedSessions()).toEqual([SESSION, replacementId].sort())
+  })
+
+  it('sends text that only mentions another store path, claiming nothing', async () => {
+    const result = await clientSend(
+      textWith(`/home/someone/.config/Orca/agent-session-attachments/${UPLOAD}/notes.txt`)
+    )
+    expect(result).toMatchObject({ ok: true, value: { submission: expect.anything() } })
+    expect(claimedSessions()).toEqual([])
+  })
+
+  it('replays an admitted send under the same id without judging its attachments again', async () => {
+    const path = await storeUpload('shot.png')
+    const body: AgentJournalMessageItem = {
+      kind: 'message',
+      role: 'user',
+      blocks: [{ type: 'image-ref', path }]
+    }
+    const clientOperationId = hostTestOperationId()
+    const params = {
+      envelope: rig.envelope({ body }, 'agentSession.send', clientOperationId),
+      body,
+      userSend: true as const
+    }
+    expect(await rig.host.send(CALLER, params)).toMatchObject({ ok: true, replayed: false })
+    // The upload goes; the outbox's resend of the same operation still answers as sent.
+    await rm(join(agentSessionAttachmentStoreRoot(rig.root), UPLOAD), { recursive: true })
+    expect(await rig.host.send(CALLER, params)).toMatchObject({ ok: true, replayed: true })
+  })
+
+  it("never refuses a host-side send (orchestration mail, a restart's continuation)", async () => {
+    const body = textWith(storedPath('notes.txt'))
+    const clientOperationId = hostTestOperationId()
+    const result = await rig.host.send(CALLER, {
+      envelope: rig.envelope({ body }, 'agentSession.send', clientOperationId),
+      body
+    })
+    expect(result).toMatchObject({ ok: true, value: { submission: expect.anything() } })
+  })
+})
diff --git a/src/main/native-chat/agent-session-wire/structured-agent-session-continuation-verdict.ts b/src/main/native-chat/agent-session-wire/structured-agent-session-continuation-verdict.ts
new file mode 100644
index 000000000000..9a75c6b0ed5a
--- /dev/null
+++ b/src/main/native-chat/agent-session-wire/structured-agent-session-continuation-verdict.ts
@@ -0,0 +1,47 @@
+// What a continuation's send came to, read from its submission: the four dispatch states, never
+// collapsed into transport success (`StructuredAgentSessionContinuationOutcome`).
+
+import {
+  readAgentSessionFailureFact,
+  type UnreadAgentSessionFailureFact
+} from '../../../shared/agent-session-failure'
+import type { StructuredAgentSessionContinuationOutcome } from './structured-agent-session-restart-continuation'
+
+export type ContinuationSubmission = {
+  dispatchState?: string
+  reason?: string | null
+  rejection?: UnreadAgentSessionFailureFact
+}
+
+export 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 } : {})
+  }
+}
+
+export function verdictOf(
+  sessionId: string,
+  submission: ContinuationSubmission | undefined
+): StructuredAgentSessionContinuationOutcome {
+  const dispatch = submission?.dispatchState
+  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' }
+  }
+  // `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-conversation-lifetime.ts b/src/main/native-chat/agent-session-wire/structured-agent-session-conversation-lifetime.ts
index f60b2f295834..1100c0abf81b 100644
--- 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
@@ -52,7 +52,7 @@ export function createStructuredAgentSessionConversationLifetime(host: {
   const stopAgent = (sessionId: string, ending: StructuredAgentSessionStopEnding) =>
     stopStructuredAgentSessionAgentUnderSerialize(host.context(), sessionId, ending)
 
-  const closeConversation = async (sessionId: string): Promise<boolean> => {
+  const closeConversation = async (sessionId: string, atRest = false): Promise<boolean> => {
     // The handle carries the proof that releases a lease its child's wind-down could not.
     if (await releaseLeaseOfEndedStructuredAgentSessionChild(host.context(), sessionId)) {
       return false
@@ -66,7 +66,8 @@ export function createStructuredAgentSessionConversationLifetime(host: {
           host.closeStatus(id, { listed: !tabs.present || tabs.sessionIds.includes(id) })
         }
       },
-      sessionId
+      sessionId,
+      atRest
     )
   }
 
@@ -91,7 +92,7 @@ export function createStructuredAgentSessionConversationLifetime(host: {
       stopStructuredAgentSessionAgentUnderSerialize(host.context(), sessionId, {
         cause: 'host-stop'
       }),
-    closeConversation,
+    closeConversation: (sessionId) => closeConversation(sessionId, true),
     logger: deps().logger,
     ...deps().idleSweep
   })
@@ -140,7 +141,7 @@ export function createStructuredAgentSessionConversationLifetime(host: {
       })
     },
     /** Ends a chat's resources, not the chat: its record and journal stay on disk, and what is
-     *  still queued will not be sent; a person's message stays as a held card. */
+     *  still queued waits for the chat's next turn; a person's unsent message stays as a card. */
     close: (sessionId: string, cause: StructuredAgentSessionCloseCause): Promise<void> => {
       // Outside the queue: a start the provider never answers must not hold the close behind it.
       host.context().runtimeState.acquireAborts.abort(sessionId, 'closed while starting')
@@ -148,8 +149,11 @@ export function createStructuredAgentSessionConversationLifetime(host: {
         readRefusals.forget(sessionId)
         const session = sessions.get(sessionId)
         if (session) {
-          // Settled before the stop, so no start delivers it.
-          await holdClosedStructuredAgentSessionSends(deps(), sessionId, session.journal)
+          // Settled and marked before the stop, so no start delivers it, and nothing it closed with
+          // sends by itself, even if the handle stays open.
+          await holdClosedStructuredAgentSessionSends(deps(), sessionId, session.journal, {
+            mark: 'always'
+          })
         }
         await stopStructuredAgentSessionAgentUnderSerialize(host.context(), sessionId, { cause })
         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
index aa1a5c3d6191..ec7f478501f7 100644
--- 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
@@ -6,8 +6,9 @@
 // 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 (it quit or crashed first) is settled here
-// too, before any reader, command or child sees it: a person's message is kept as a held card, the
-// rest rejected (`journal-unsent-send-hold.ts`). Nothing here starts a provider child.
+// too, before any reader, command or child sees it: a person's message is kept as a card, the rest
+// rejected (`journal-unsent-send-hold.ts`). The cards then wait for the chat's next turn
+// (`queued-message-pause.ts`). Nothing here starts a provider child.
 
 import type { JournalHostDatabase } from '../agent-session-journal/journal-host-database'
 import type { AgentSessionJournal } from '../agent-session-journal/journal-store'
@@ -23,7 +24,10 @@ import {
 import type { AgentSessionRecordStore } from '../../runtime/agent-session-record-store'
 import { settleStaleStructuredAgentSessionState } from './structured-agent-session-dead-generation-settlement'
 import { structuredAgentSessionFailureWordsContext } from './structured-agent-session-send-preparation'
-import { structuredAgentSessionHostInstance } from './structured-agent-session-queued-pause'
+import {
+  markStructuredQueueReopen,
+  structuredAgentSessionHostInstance
+} from './structured-agent-session-queued-pause'
 import type {
   StructuredAgentSessionHostDeps,
   StructuredAgentSessionHostSession
@@ -115,6 +119,9 @@ export async function openStructuredAgentSessionConversationJournal(
       error
     })
   }
+  // After the leftovers became cards, so the mark follows every card this open found. Every open
+  // comes after the chat stopped running: the idle sweep never closes one with cards waiting.
+  await markStructuredQueueReopen(sessionId, journal, fence, deps.logger)
   // 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.
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
index ac3e264ee0cb..a36518c5e614 100644
--- 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
@@ -39,6 +39,8 @@ import {
 import { resettleOpenStructuredAgentSessionConversation } from './structured-agent-session-conversation-open'
 import { StructuredAgentSessionHost } from './structured-agent-session-host'
 import { withNativeChatCutTurnNotices } from '../../../shared/native-chat-cut-turn-notice'
+import { latestNativeChatOrcaStopCut } from '../../../shared/native-chat-orca-stop-cut'
+import { beginAgentSessionRuntimeRecord } from '../../runtime/agent-session-runtime-end-record'
 import { STRUCTURED_AGENT_SESSION_IDLE_MS } from './structured-agent-session-idle-sweep'
 import type { StructuredAgentSessionHostDeps } from './structured-agent-session-host-types'
 import {
@@ -360,6 +362,41 @@ describe('a turn a read reached before the reconcile proved its owner dead', ()
     ).toEqual({ key: 'workedFor', duration: '27s' })
   })
 
+  it('explains the turn its proof revised, so the cut reads once and offers Continue', async () => {
+    // The Orca that crashed recorded that it started, and never that it ended.
+    const crashed = crashedClaudeRecord()
+    const ownerProcess = crashed.lease.ownerProcess
+    if (!ownerProcess) {
+      throw new Error('the crashed record has no owner')
+    }
+    await seedTestAgentSessionRecordStore(root, {
+      records: [
+        {
+          ...crashed,
+          lease: { ...crashed.lease, ownerProcess: { ...ownerProcess, runtime: 'runtime-crashed' } }
+        }
+      ]
+    })
+    beginAgentSessionRuntimeRecord(root, 'runtime-crashed', TOOL_STARTED_AT - 60_000)
+    store = await openTestAgentSessionRecordStore(root)
+    openHost({ probeOwner: async () => ({ outcome: 'pid-absent' }) })
+    expect(await settledTurn()).toEqual(UNVERIFIABLE_TURN)
+
+    await host.reconcileRestartLeases()
+    await drainSession()
+
+    const { items } = await host.journalSnapshot(SESSION)
+    const turnItemId = items.find((item) => item.body.kind === 'turn')?.itemId
+    expect(items.flatMap((item) => (item.body.kind === 'status' ? [item.turnScope] : []))).toEqual([
+      { kind: 'turn', turnItemId }
+    ])
+    expect(latestNativeChatOrcaStopCut(items, [])).toEqual({ turnItemId, cause: 'crash' })
+    const readerRows = withNativeChatCutTurnNotices(items, { agentName: 'Claude' }).filter(
+      (item) => item.body.kind === 'status'
+    )
+    expect(readerRows).toHaveLength(1)
+  })
+
   it('revises nothing twice, whoever re-runs the settle', async () => {
     openHost({ probeOwner: async () => ({ outcome: 'pid-absent' }) })
     await host.history({ sessionId: SESSION, direction: 'tail' })
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 ce11c2dc34c9..f3c8c5df9fea 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
@@ -45,8 +45,9 @@ import {
 } from './structured-agent-session-stale-turn-verdict'
 import {
   exitedRootTurnScope,
-  runningRootTurnScope
+  settledRootTurnScope
 } from './structured-agent-session-exit-turn-scope'
+import { orcaStopRowBody } from './structured-agent-session-orca-stop-row'
 import {
   hasUnfinishedStructuredAgentSessionWork,
   isInProgressStructuredAgentSessionItem,
@@ -242,16 +243,9 @@ export async function settleStaleStructuredAgentSessionState(input: {
         clientMessageId: `${STALE_SESSION_ROW_PREFIX}${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',
-        ...agentSessionFailureWords(agentSessionFailureFact('providerExited'), {
-          ...input.failureTextContext,
-          surface: 'row'
-        }),
-        tone: 'error'
-      },
-      turnScope: runningRootTurnScope(items)
+      // that the provider stopped, and how Orca ended when the provider died with it.
+      body: orcaStopRowBody(input.failureTextContext, evidence.runtimeEnd),
+      turnScope: settledRootTurnScope(items, turnEnds)
     })
   }
   for (const chunk of partitionJournalLifecycleMutations(settlementId, mutations)) {
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
index a7989f940ef2..380742f0e235 100644
--- 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
@@ -17,8 +17,6 @@ import type { AgentSessionRecord } from '../../../shared/agent-session-record'
 import type { AgentChildWorkView } from '../../../shared/agent-status-child-work-view'
 import { agentSessionFailureFact } from '../../../shared/agent-session-failure'
 import type { AgentSessionFailureWordsContext } from '../../../shared/agent-session-failure-words'
-import { holdUnsentSends } from '../agent-session-journal/journal-unsent-send-hold'
-import { structuredAgentSessionHostInstance } from './structured-agent-session-queued-pause'
 import type { StructuredAgentSessionAdapter } from './structured-agent-session-adapter'
 import type { StructuredAgentRegistry } from './structured-agent-registry'
 import {
@@ -41,6 +39,7 @@ import { handOverSubmission } from './structured-agent-session-turns'
 import { structuredAgentSessionNextHandover } from './structured-agent-session-opening-send'
 import { structuredAgentSessionCommandRunning } from './structured-agent-session-command-turn'
 import type { StructuredAgentSessionLogger } from './structured-agent-session-logger'
+import { holdRestartedStructuredAgentSessionSends } from './structured-agent-session-host-lifetime'
 
 export type StructuredAgentSessionDeliveryLoopDeps = {
   sessions: ReadonlyMap<string, StructuredAgentSessionHostSession>
@@ -167,11 +166,12 @@ export class StructuredAgentSessionDeliveryLoop {
     // The open already did, unless its write failed: a row an earlier handle wrote is never handed
     // over, whether it outlived a quit or a crash. A failure here throws, so none is: this run then
     // fails, which rejects every queued send, this process's own too.
-    await holdUnsentSends(session.journal, {
-      fence: this.deps.conversationFence(sessionId),
-      hostInstance: structuredAgentSessionHostInstance(),
-      hold: { cause: 'hostRestarted' }
-    })
+    await holdRestartedStructuredAgentSessionSends(
+      this.deps.logger,
+      sessionId,
+      session.journal,
+      this.deps.conversationFence(sessionId)
+    )
     if (!(await this.closeWhatTheUserClosed(sessionId, session))) {
       // Never start an agent for a message the user closed; the next wake re-derives and retries.
       return this.stop(sessionId)
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 9a0637c99bc7..3d5d9847400b 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
@@ -9,6 +9,7 @@ import type {
   StructuredAgentSessionSinkWatermarks
 } from './structured-agent-session-event-sink'
 import type { StructuredAgentSessionTransitionJournal } from './structured-agent-session-transition'
+import { StructuredAgentSessionFinalTailReservation } from './structured-agent-session-final-tail-reservation'
 
 export type StructuredAgentSessionSinkOperation = {
   sequence: number
@@ -16,6 +17,7 @@ export type StructuredAgentSessionSinkOperation = {
   /** Lifecycle rows use their own bounded reservation budget. */
   lifecycleBytes?: number
   lifecycle?: boolean
+  finalTail?: true
   /** Marks a publication, which writes no row: it runs at handover, or at its place in the
    *  journal's queue while writes wait there, and one still waiting with the same key is replaced
    *  by the next. Journal writes never coalesce:
@@ -26,7 +28,10 @@ export type StructuredAgentSessionSinkOperation = {
   run: (target: StructuredAgentSessionEventTarget) => Promise<unknown> | void
 }
 
-type Admitted = StructuredAgentSessionSinkOperation & { superseded?: boolean }
+type Admitted = StructuredAgentSessionSinkOperation & {
+  superseded?: boolean
+  releaseFinalTail?: () => void
+}
 
 export type StructuredAgentSessionDrainWaiter = {
   through: number
@@ -59,6 +64,7 @@ export class StructuredAgentSessionSinkQueue {
   private readonly buffered: Admitted[] = []
   private readonly waitingPublications = new Map<string, Admitted>()
   private readonly waiters: StructuredAgentSessionDrainWaiter[] = []
+  private readonly finalTail = new StructuredAgentSessionFinalTailReservation()
 
   constructor(
     private readonly deps: {
@@ -121,6 +127,7 @@ export class StructuredAgentSessionSinkQueue {
   close(): void {
     this.closed = true
     this.dropBuffered()
+    this.finalTail.close()
     this.updateBackpressure()
   }
 
@@ -160,7 +167,8 @@ export class StructuredAgentSessionSinkQueue {
         : key === undefined
           ? undefined
           : this.waitingPublications.get(key)
-    const lifecycle = operation.lifecycle ?? options.lifecycle === true
+    const finalTail = operation.finalTail === true
+    const lifecycle = !finalTail && (operation.lifecycle ?? options.lifecycle === true)
     const lifecycleBytes = lifecycle ? (operation.lifecycleBytes ?? operation.bytes) : 0
     const nextBytes = this.queuedBytes - (replaced?.bytes ?? 0) + operation.bytes
     const nextOperations = this.queuedOperations + (replaced ? 0 : 1)
@@ -169,6 +177,7 @@ export class StructuredAgentSessionSinkQueue {
     const nextLifecycleOperations =
       this.lifecycleQueuedOperations - (replaced?.lifecycle ? 1 : 0) + (lifecycle ? 1 : 0)
     const exceedsOrdinary =
+      !finalTail &&
       !lifecycle &&
       (nextBytes > this.deps.watermarks.maxQueuedBytes ||
         nextOperations > this.deps.watermarks.maxQueuedOperations)
@@ -180,11 +189,18 @@ export class StructuredAgentSessionSinkQueue {
       this.setBackpressure(true)
       return { accepted: false, reason: 'backpressure' }
     }
+    const releaseFinalTail =
+      finalTail && key === undefined ? this.finalTail.reserve(operation.bytes) : undefined
+    if (finalTail && !releaseFinalTail) {
+      this.fail(new Error('structured agent-session final tail exceeded its reserved capacity'))
+      return { accepted: false, reason: 'failed' }
+    }
     const accepted: Admitted = {
       ...operation,
       sequence: ++this.acceptedSequence,
       lifecycle,
-      lifecycleBytes
+      lifecycleBytes,
+      releaseFinalTail: releaseFinalTail ?? undefined
     }
     if (replaceAt >= 0) {
       this.buffered.splice(replaceAt, 1)
@@ -243,6 +259,7 @@ export class StructuredAgentSessionSinkQueue {
   }
 
   private release(operation: Admitted): void {
+    operation.releaseFinalTail?.()
     this.queuedBytes = Math.max(0, this.queuedBytes - operation.bytes)
     this.queuedOperations = Math.max(0, this.queuedOperations - 1)
     if (operation.lifecycle) {
@@ -313,6 +330,7 @@ export class StructuredAgentSessionSinkQueue {
       this.deps.onFailed?.(error)
     }
     this.dropBuffered()
+    this.finalTail.close()
     this.updateBackpressure()
   }
 }
diff --git a/src/main/native-chat/agent-session-wire/structured-agent-session-exit-turn-scope.ts b/src/main/native-chat/agent-session-wire/structured-agent-session-exit-turn-scope.ts
index c336a1d3eca2..ff53b6492a1c 100644
--- a/src/main/native-chat/agent-session-wire/structured-agent-session-exit-turn-scope.ts
+++ b/src/main/native-chat/agent-session-wire/structured-agent-session-exit-turn-scope.ts
@@ -7,6 +7,8 @@ import {
   type AgentJournalTurnScope
 } from '../../../shared/agent-session-journal-types'
 import { readAgentJournalTurn } from '../../../shared/agent-session-turn-record'
+import { agentJournalItemKey } from '../../../shared/agent-session-journal-item-key'
+import type { JournalLifecycleMutationInput } from '../agent-session-journal/journal-row-builders'
 import type { StructuredAgentSessionTurnVerdict } from './structured-agent-session-stale-turn-verdict'
 
 /** The turn the exit ended: still running, or already ended at the exit's instant by the child's
@@ -26,11 +28,13 @@ export function exitedRootTurnScope(
   return ended ? { kind: 'turn', turnItemId: ended.itemId } : AGENT_JOURNAL_THREAD_SCOPE
 }
 
-export function runningRootTurnScope(
-  items: readonly AgentJournalRenderItem[]
+/** The newest root turn a settle ends: one still running, or one an earlier settle left
+ *  `unverifiable` that a proof now revises, whose row no longer reads running. */
+export function settledRootTurnScope(
+  items: readonly AgentJournalRenderItem[],
+  turnEnds: readonly JournalLifecycleMutationInput[]
 ): AgentJournalTurnScope {
-  const running = items.findLast(
-    (item) => isRootAgentJournalItem(item) && readAgentJournalTurn(item.body)?.state === 'running'
-  )
-  return running ? { kind: 'turn', turnItemId: running.itemId } : AGENT_JOURNAL_THREAD_SCOPE
+  const ended = new Set(turnEnds.map((mutation) => agentJournalItemKey(mutation.identity)))
+  const settled = items.findLast((item) => isRootAgentJournalItem(item) && ended.has(item.itemId))
+  return settled ? { kind: 'turn', turnItemId: settled.itemId } : AGENT_JOURNAL_THREAD_SCOPE
 }
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
index 979044625181..79bf84fb6d43 100644
--- 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
@@ -31,6 +31,8 @@ const TYPED_START_REFUSALS = [
   'managedAccountUnsupported',
   'launchFolderMissing',
   'historyInOtherAccount',
+  'claudeAccountFolderMissing',
+  'claudeAccountSetupFailed',
   'agentCommandNotRunnable'
 ] as const satisfies readonly (AgentSessionFailureKind &
   AgentSessionRefusalReason<'agent_session_operation_invalid'>)[]
diff --git a/src/main/native-chat/agent-session-wire/structured-agent-session-final-tail-reservation.test.ts b/src/main/native-chat/agent-session-wire/structured-agent-session-final-tail-reservation.test.ts
new file mode 100644
index 000000000000..1c33de1ce122
--- /dev/null
+++ b/src/main/native-chat/agent-session-wire/structured-agent-session-final-tail-reservation.test.ts
@@ -0,0 +1,42 @@
+import { describe, expect, it } from 'vitest'
+import { StructuredAgentSessionFinalTailReservation } from './structured-agent-session-final-tail-reservation'
+
+describe('finalized provider tail reservations', () => {
+  it('bounds outstanding bytes and releases each admission once', () => {
+    const reservation = new StructuredAgentSessionFinalTailReservation()
+    const release = reservation.reserve(16 * 1024 * 1024)
+    expect(release).not.toBeNull()
+    expect(reservation.reserve(1)).toBeNull()
+    release?.()
+    release?.()
+    expect(reservation.reserve(16 * 1024 * 1024)).not.toBeNull()
+    expect(reservation.reserve(1)).toBeNull()
+  })
+
+  it('bounds operations even when they write no bytes', () => {
+    const reservation = new StructuredAgentSessionFinalTailReservation()
+    const releases = Array.from({ length: 512 }, () => reservation.reserve(0))
+    expect(releases.every(Boolean)).toBe(true)
+    expect(reservation.reserve(0)).toBeNull()
+    releases[0]?.()
+    expect(reservation.reserve(0)).not.toBeNull()
+    expect(reservation.reserve(0)).toBeNull()
+  })
+
+  it('abandons outstanding reservations on close and refuses later admission', () => {
+    const reservation = new StructuredAgentSessionFinalTailReservation()
+    const release = reservation.reserve(100)
+    reservation.close()
+    release?.()
+    reservation.close()
+    expect(reservation.reserve(0)).toBeNull()
+  })
+
+  it('refuses invalid sizes', () => {
+    const reservation = new StructuredAgentSessionFinalTailReservation()
+    for (const bytes of [-1, 0.5, Number.NaN, Number.POSITIVE_INFINITY]) {
+      expect(reservation.reserve(bytes)).toBeNull()
+    }
+    expect(reservation.reserve(0)).not.toBeNull()
+  })
+})
diff --git a/src/main/native-chat/agent-session-wire/structured-agent-session-final-tail-reservation.ts b/src/main/native-chat/agent-session-wire/structured-agent-session-final-tail-reservation.ts
new file mode 100644
index 000000000000..92b8e0f897f4
--- /dev/null
+++ b/src/main/native-chat/agent-session-wire/structured-agent-session-final-tail-reservation.ts
@@ -0,0 +1,38 @@
+const MAX_FINAL_TAIL_BYTES = 16 * 1024 * 1024
+const MAX_FINAL_TAIL_OPERATIONS = 512
+
+/** Finalized providers can admit their bounded tail before the host takes its exit barrier. */
+export class StructuredAgentSessionFinalTailReservation {
+  private bytes = 0
+  private operations = 0
+  private closed = false
+
+  reserve(bytes: number): (() => void) | null {
+    if (
+      this.closed ||
+      !Number.isSafeInteger(bytes) ||
+      bytes < 0 ||
+      this.bytes + bytes > MAX_FINAL_TAIL_BYTES ||
+      this.operations >= MAX_FINAL_TAIL_OPERATIONS
+    ) {
+      return null
+    }
+    this.bytes += bytes
+    this.operations += 1
+    let released = false
+    return () => {
+      if (released || this.closed) {
+        return
+      }
+      released = true
+      this.bytes -= bytes
+      this.operations -= 1
+    }
+  }
+
+  close(): void {
+    this.closed = true
+    this.bytes = 0
+    this.operations = 0
+  }
+}
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
index 4e4247c316fa..9abd58aa0218 100644
--- 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
@@ -74,7 +74,10 @@ export function createStructuredAgentSessionConversationDelivery(input: {
     holdClosed: async (sessionId, which) => {
       const session = sessions.get(sessionId)
       return session
-        ? holdClosedStructuredAgentSessionSends(deps, sessionId, session.journal, which)
+        ? holdClosedStructuredAgentSessionSends(deps, sessionId, session.journal, {
+            mark: 'settled',
+            which
+          })
         : true
     },
     failureTextContext: (sessionId) =>
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 84dec78d0717..8e072e714b6d 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
@@ -24,8 +24,17 @@ import type {
 } from './structured-agent-session-host-types'
 import type { StructuredAgentSessionChildExit } from './structured-agent-session-child-exit'
 import { structuredAgentSessionConversationFence } from './structured-agent-session-provider-child'
-import { structuredAgentSessionHostInstance } from './structured-agent-session-queued-pause'
+import {
+  markStructuredQueueReopen,
+  structuredAgentSessionHostInstance
+} from './structured-agent-session-queued-pause'
 import type { StructuredAgentSessionStopCause } from './structured-agent-session-adapter'
+import type { AgentSessionResumeTrigger } from '../../../shared/agent-session-resume-marker'
+import {
+  recordStructuredAgentSessionShutdownCut,
+  runningRootTurnItemId
+} from './structured-agent-session-orca-stop-row'
+import { structuredAgentSessionFailureWordsContext } from './structured-agent-session-send-preparation'
 export type { StructuredAgentSessionStopEnding } from './structured-agent-session-host-stop-event'
 import {
   recordStopEvent,
@@ -61,31 +70,62 @@ type ConversationCloseDeps = Pick<StructuredAgentSessionHostDeps, 'logger'> & {
 }
 
 /** What is still queued when the chat closes will not be handed over: a person's message is kept
- *  as a held card, the rest rejected (`journal-unsent-send-hold.ts`). A quit is not a close: the
- *  next open settles what it left. `which` narrows it to the messages a close that did not complete
+ *  as a card that waits for the chat's next turn, the rest rejected (`journal-unsent-send-hold.ts`).
+ *  A quit is not a close: the next open settles what it left. The chat stops running, so the
+ *  reopen mark follows (`markStructuredQueueReopen`): on every `close`, or only once it settled a
+ *  send, for a later re-check of the same close, which must never mark past a new send. `which` narrows it to the messages a close that did not complete
  *  closed. Best effort, so a close never waits on it: resolves false when it failed, reported and
  *  never thrown. */
 export async function holdClosedStructuredAgentSessionSends(
   deps: ConversationCloseDeps,
   sessionId: string,
   journal: StructuredAgentSessionHostSession['journal'],
-  which?: (submission: AgentJournalSubmission) => boolean
+  close: { mark: 'always' | 'settled'; which?: (submission: AgentJournalSubmission) => boolean }
 ): Promise<boolean> {
-  return holdUnsentSends(journal, {
-    fence: structuredAgentSessionConversationFence(deps.store, sessionId),
+  const fence = structuredAgentSessionConversationFence(deps.store, sessionId)
+  const { which } = close
+  const settled = await holdUnsentSends(journal, {
+    fence,
     hostInstance: structuredAgentSessionHostInstance(),
     hold: { cause: 'chatClosed', ...(which ? { which } : {}) }
   }).then(
-    () => true,
+    (newest) => ({ ok: true, newest }),
     (error: unknown) => {
       deps.logger.warn('settling queued messages of a closed chat failed', {
         scope: 'queued-abandon',
         sessionId,
         error
       })
-      return false
+      return { ok: false, newest: null }
     }
   )
+  if (close.mark === 'always') {
+    await markStructuredQueueReopen(sessionId, journal, fence, deps.logger)
+  } else if (settled.newest !== null) {
+    // A send that woke this re-check came after the ones it settled: the mark starts at them.
+    await markStructuredQueueReopen(sessionId, journal, fence, deps.logger, settled.newest + 1)
+  }
+  return settled.ok
+}
+
+/** What an earlier host process left queued and the open could not settle (its write failed):
+ *  kept or rejected now, never handed over. A failure throws. A send that woke this came after the
+ *  ones it settled, so the reopen mark starts where they did. */
+export async function holdRestartedStructuredAgentSessionSends(
+  logger: StructuredAgentSessionHostDeps['logger'],
+  sessionId: string,
+  journal: StructuredAgentSessionHostSession['journal'],
+  fence: number
+): Promise<void> {
+  const hostInstance = structuredAgentSessionHostInstance()
+  const settled = await holdUnsentSends(journal, {
+    fence,
+    hostInstance,
+    hold: { cause: 'hostRestarted' }
+  })
+  if (settled !== null) {
+    await markStructuredQueueReopen(sessionId, journal, fence, logger, settled + 1)
+  }
 }
 
 /**
@@ -128,6 +168,8 @@ export async function stopStructuredAgentSessionAgentUnderSerialize(
     )
   }
   const { close } = child
+  // Read before the kill: the turn a quit's stop may cut.
+  const quitCuts = 'quit' in ending && ending.quit ? runningRootTurnItemId(session.journal) : null
   try {
     if (context.restartWitness) {
       await snapshotBeforeStructuredAgentSessionStop(
@@ -146,6 +188,22 @@ export async function stopStructuredAgentSessionAgentUnderSerialize(
         new Error('provider child exit was not proven')
       )
     }
+    // The exit handler has settled the turn by now, so the row reads its verdict.
+    if ('quit' in ending && ending.quit) {
+      const record = context.deps.store.getRecord(sessionId)
+      await recordStructuredAgentSessionShutdownCut({
+        journal: session.journal,
+        sessionId,
+        fence: child.fence,
+        generation: child.generation ?? 'unknown',
+        turnItemId: quitCuts,
+        trigger: ending.quit,
+        ...(record
+          ? { failureTextContext: structuredAgentSessionFailureWordsContext(record) }
+          : {}),
+        logger: context.deps.logger
+      })
+    }
   } finally {
     // A person's close binds what its child's end cut; done, proven or not, it binds no more.
     void close?.recorded.then((settle) => session.journal.stopMarks.settled(settle))
@@ -159,14 +217,18 @@ export type StructuredAgentSessionCloseCause = Extract<
 >
 
 /** Whether the conversation's handle is only a cache now: no child, and nothing queued or waiting
- *  on the provider. */
+ *  on the provider. `atRest`: the idle sweep's own close, which also keeps a chat with a card
+ *  waiting, since a reopen marks it to wait for a turn (`markStructuredQueueReopen`), and an
+ *  eviction the person never saw must not; a person's close has marked them already. */
 export function structuredAgentSessionConversationClosable(
-  session: StructuredAgentSessionHostSession
+  session: StructuredAgentSessionHostSession,
+  atRest = false
 ): boolean {
   return (
     session.child === null &&
     !session.journal.submissions().some(isQueuedAgentJournalSubmission) &&
-    session.journal.pendingSubmissions().length === 0
+    session.journal.pendingSubmissions().length === 0 &&
+    !(atRest && session.journal.queuedMessages.awaitReopenMark())
   )
 }
 
@@ -181,10 +243,11 @@ export async function closeStructuredAgentSessionConversationUnderSerialize(
     /** The status row outlives the handle; see `StructuredAgentSessionClientDelivery`. */
     closeStatus: (sessionId: string) => void
   },
-  sessionId: string
+  sessionId: string,
+  atRest = false
 ): Promise<boolean> {
   const session = context.sessions.get(sessionId)
-  if (!session || !structuredAgentSessionConversationClosable(session)) {
+  if (!session || !structuredAgentSessionConversationClosable(session, atRest)) {
     return false
   }
   context.sessions.delete(sessionId)
@@ -198,7 +261,8 @@ export async function evictOwnedStructuredAgentSessions(
   context: StructuredAgentSessionLifetimeContext & {
     serialize: (sessionId: string, task: () => Promise<void>) => Promise<void>
   },
-  retainOnFailure: Set<string>
+  retainOnFailure: Set<string>,
+  trigger: AgentSessionResumeTrigger = 'quit'
 ): Promise<void> {
   const ownedSessionIds = [...context.sessions]
     .filter(([, session]) => session.child !== null)
@@ -216,7 +280,7 @@ export async function evictOwnedStructuredAgentSessions(
         await context.serialize(sessionId, () =>
           stopStructuredAgentSessionAgentUnderSerialize(context, sessionId, {
             cause: 'evict',
-            quit: true
+            quit: trigger
           })
         )
         retainOnFailure.delete(sessionId)
diff --git a/src/main/native-chat/agent-session-wire/structured-agent-session-host-stop-event.ts b/src/main/native-chat/agent-session-wire/structured-agent-session-host-stop-event.ts
index 1c9e2720aca9..85629500a0b4 100644
--- a/src/main/native-chat/agent-session-wire/structured-agent-session-host-stop-event.ts
+++ b/src/main/native-chat/agent-session-wire/structured-agent-session-host-stop-event.ts
@@ -9,16 +9,18 @@ import type { StructuredAgentSessionHostSession } from './structured-agent-sessi
 import { structuredAgentSessionConversationFence } from './structured-agent-session-provider-child'
 import type { JournalStopSettle } from '../agent-session-journal/queued-message-pause'
 import { sentSinceStop } from './structured-agent-session-queued-stop'
+import type { AgentSessionResumeTrigger } from '../../../shared/agent-session-resume-marker'
 
 /** How a stop ends the child, and why (`lastEndedChild`). A person's Stop wrote its event in its
  *  own step (`recorded` names its reason); any other stop names the reason its event records, with
- *  the host's text for it. Quit writes none: its resume marker's trigger records why. */
+ *  the host's text for it. Quit writes none: its row about a turn it cut says why. */
 export type StructuredAgentSessionStopEnding =
   | { recorded: 'user-stop' }
   | {
       cause: Exclude<StructuredAgentSessionStopCause, 'user-stop'>
       reason?: string
-      quit?: true
+      /** The app is quitting, and why: a turn this stop cuts gets a row naming it. */
+      quit?: AgentSessionResumeTrigger
       /** The idle sweep judged the agent resting (`owesWork`): a send it retires unanswered is
        *  no work its event records. */
       resting?: true
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 0c9e59fba766..759075639593 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
@@ -174,7 +174,8 @@ export async function flushStructuredAgentSessionHost(
               stopped: context.restartResume.confirmStopped
             }
           },
-          retainSessionIds
+          retainSessionIds,
+          context.trigger
         ),
       beginResumeMarkers: () => context.restartResume.beginTeardown(context.trigger),
       recordResumeMarkers: context.restartResume.recordMarkers,
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 a96388ac4ca3..c7e2e0390783 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
@@ -6,7 +6,7 @@ import { computeAgentSessionPayloadFingerprint } from '../../../shared/agent-ses
 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 { structuredAgentSessionSendBody } from '../../../shared/structured-agent-session-send-mutation'
 import { attachFingerprintFields } from './structured-agent-session-attach'
 import type { AgentSessionAttachParams } from './structured-agent-session-attach'
 
@@ -74,17 +74,13 @@ 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
+  const optimistic = sent.map((message) => ({
+    clientMessageId: message.clientMessageId,
+    body: structuredAgentSessionSendBody(message.text, []),
+    queuedAt: HOST_TEST_NOW
   }))
   return projectNativeChatTranscriptMessages(
-    projectStructuredAgentSessionMessages(snapshot.items, outbox, snapshot.submissions, {
+    projectStructuredAgentSessionMessages(snapshot.items, optimistic, snapshot.submissions, {
       rejectedInPlace: true
     })
   ).map(({ id }) => id)
diff --git a/src/main/native-chat/agent-session-wire/structured-agent-session-interrupted-continuation.test.ts b/src/main/native-chat/agent-session-wire/structured-agent-session-interrupted-continuation.test.ts
new file mode 100644
index 000000000000..ee3f3901ea2c
--- /dev/null
+++ b/src/main/native-chat/agent-session-wire/structured-agent-session-interrupted-continuation.test.ts
@@ -0,0 +1,227 @@
+// Continue on a reply an Orca stop cut off: the restart continuation, bound to the cut turn and
+// re-checked under the session lock, so it works with or without a restart offer and never sends
+// twice.
+
+import { expect, it, vi } from 'vitest'
+import {
+  AGENT_SESSION_RESTART_CONTINUATION_MESSAGE,
+  AGENT_SESSION_RESTART_CONTINUATION_NOTE,
+  AGENT_SESSION_RESTART_CONTINUATION_REFUSED_NOTE,
+  restartContinuationMessage
+} from '../../../shared/agent-session-restart-continuation'
+import { latestNativeChatOrcaStopCut } from '../../../shared/native-chat-orca-stop-cut'
+import { CALLER, envelope } from './structured-agent-session-host-test-harness'
+import {
+  HOST_TEST_SESSION as SESSION,
+  hostTestMessage
+} from './structured-agent-session-host-test-data'
+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 type { StructuredAgentSessionHost } from './structured-agent-session-host'
+import { previousExitUnverifiableRefusal } from './structured-agent-session-child-close'
+
+type Restarted = Awaited<ReturnType<typeof interruptedRestart>>
+
+async function cutTurn(host: StructuredAgentSessionHost): Promise<string> {
+  const { items } = await host.journalSnapshot(SESSION)
+  const cut = latestNativeChatOrcaStopCut(items, [])
+  if (!cut) {
+    throw new Error('the restart left no Orca-stop cut')
+  }
+  return cut.turnItemId
+}
+
+function sentTexts(dispatch: Restarted['dispatch']): string[] {
+  return dispatch.mock.calls.map(([input]) =>
+    input.body.blocks.flatMap((block) => (block.type === 'text' ? [block.text] : [])).join('')
+  )
+}
+
+it('continues with no restart offer, as Orca itself, and the chat says so', async () => {
+  const { host, dispatch } = await interruptedRestart()
+  // What a crash, a paired server's restart or a dismissed offer leaves: no offer at all.
+  await host.restartResume.dismiss()
+  expect(await host.restartResume.list()).toEqual([])
+  const send = vi.spyOn(host, 'send')
+
+  const answer = await host.restartResume.continueInterrupted(SESSION, await cutTurn(host))
+
+  expect(answer).toMatchObject({
+    sessionId: SESSION,
+    outcome: expect.stringMatching(/pending|continued/)
+  })
+  await vi.waitFor(() => expect(dispatch).toHaveBeenCalledOnce())
+  expect(sentTexts(dispatch)).toEqual([AGENT_SESSION_RESTART_CONTINUATION_MESSAGE])
+  // Sent under Orca's own caller, so it reads as Orca's and leaves a queue pause alone.
+  expect(send.mock.calls[0]?.[0]).toEqual({
+    callerKey: STRUCTURED_AGENT_SESSION_RESTART_CONTINUATION_CALLER
+  })
+  await vi.waitFor(async () =>
+    expect(JSON.stringify(await statusNotes(host))).toContain(
+      AGENT_SESSION_RESTART_CONTINUATION_NOTE
+    )
+  )
+})
+
+it('continues a chat that still has its restart offer, in its words, and the offer is spent', async () => {
+  const { host, dispatch, marker } = await interruptedRestart()
+  expect(await host.restartResume.list()).toHaveLength(1)
+
+  await host.restartResume.continueInterrupted(SESSION, await cutTurn(host))
+
+  await vi.waitFor(() => expect(dispatch).toHaveBeenCalledOnce())
+  expect(sentTexts(dispatch)).toEqual([restartContinuationMessage(marker!)])
+  expect(await host.restartResume.list()).toEqual([])
+})
+
+it('sends once for two clicks at the same moment', async () => {
+  const { host, dispatch } = await interruptedRestart()
+  const turnItemId = await cutTurn(host)
+
+  const answers = await Promise.all([
+    host.restartResume.continueInterrupted(SESSION, turnItemId),
+    host.restartResume.continueInterrupted(SESSION, turnItemId)
+  ])
+
+  expect(answers.filter((answer) => answer.outcome === 'superseded')).toHaveLength(1)
+  await vi.waitFor(() => expect(dispatch).toHaveBeenCalledOnce())
+})
+
+it('sends nothing for a retry after an answer that was lost', async () => {
+  const { host, dispatch } = await interruptedRestart()
+  const turnItemId = await cutTurn(host)
+  await host.restartResume.continueInterrupted(SESSION, turnItemId)
+  await vi.waitFor(() => expect(dispatch).toHaveBeenCalledOnce())
+
+  // The client never heard back, so it asks again for the same cut.
+  const retry = await host.restartResume.continueInterrupted(SESSION, turnItemId)
+
+  expect(retry).toEqual({ sessionId: SESSION, outcome: 'superseded' })
+  expect(dispatch).toHaveBeenCalledOnce()
+})
+
+it("sends nothing once the user's own message came first", async () => {
+  const { host, dispatch } = await interruptedRestart()
+  const turnItemId = await cutTurn(host)
+  const body = hostTestMessage('A new request')
+  await host.send(CALLER, { envelope: envelope('agentSession.send', { body }), body })
+
+  const answer = await host.restartResume.continueInterrupted(SESSION, turnItemId)
+
+  expect(answer).toEqual({ sessionId: SESSION, outcome: 'superseded' })
+  await vi.waitFor(() => expect(dispatch).toHaveBeenCalledOnce())
+  expect(sentTexts(dispatch)).toEqual(['A new request'])
+})
+
+it('sends nothing for a turn that is not the cut the chat sits on', async () => {
+  const { host, dispatch } = await interruptedRestart()
+
+  const answer = await host.restartResume.continueInterrupted(SESSION, 'some-other-turn')
+
+  expect(answer).toEqual({ sessionId: SESSION, outcome: 'superseded' })
+  expect(dispatch).not.toHaveBeenCalled()
+})
+
+it('continues when reading the restart offer hangs', async () => {
+  const { host, dispatch } = await interruptedRestart()
+  const turnItemId = await cutTurn(host)
+  vi.spyOn(host.deps.recoveryCapsule!, 'list').mockReturnValue(new Promise(() => {}))
+
+  await host.restartResume.continueInterrupted(SESSION, turnItemId)
+
+  await vi.waitFor(() => expect(dispatch).toHaveBeenCalledOnce())
+}, 10_000)
+
+it('continues when the restart offer cannot be read', async () => {
+  const { host, dispatch } = await interruptedRestart()
+  const turnItemId = await cutTurn(host)
+  vi.spyOn(host.deps.recoveryCapsule!, 'list').mockRejectedValue(new Error('unreadable'))
+
+  await host.restartResume.continueInterrupted(SESSION, turnItemId)
+
+  await vi.waitFor(() => expect(dispatch).toHaveBeenCalledOnce())
+})
+
+it('answers once Orca accepted it, while the agent is still starting', async () => {
+  const { host, acquire, dispatch } = await interruptedRestart()
+  const turnItemId = await cutTurn(host)
+  const start = acquire.getMockImplementation()
+  if (!start) {
+    throw new Error('the harness acquire has no implementation')
+  }
+  let finishStarting!: () => void
+  const starting = new Promise<void>((resolve) => {
+    finishStarting = resolve
+  })
+  // An agent start slower than a paired client's wait for the answer.
+  acquire.mockImplementationOnce(async (input) => {
+    await starting
+    return start(input)
+  })
+
+  const answer = await host.restartResume.continueInterrupted(SESSION, turnItemId)
+
+  expect(answer).toEqual({ sessionId: SESSION, outcome: 'pending' })
+  expect(dispatch).not.toHaveBeenCalled()
+  finishStarting()
+  await vi.waitFor(() => expect(dispatch).toHaveBeenCalledOnce())
+})
+
+it('says in the chat when the agent cannot start after the click was answered', async () => {
+  const { host, acquire } = await interruptedRestart()
+  const turnItemId = await cutTurn(host)
+  acquire.mockRejectedValueOnce(new Error('the agent could not start'))
+
+  const answer = await host.restartResume.continueInterrupted(SESSION, turnItemId)
+
+  expect(answer).toEqual({ sessionId: SESSION, outcome: 'pending' })
+  await vi.waitFor(async () =>
+    expect(await statusNotes(host)).toContainEqual({
+      text: AGENT_SESSION_RESTART_CONTINUATION_REFUSED_NOTE,
+      tone: 'error'
+    })
+  )
+})
+
+it('continues a reply the user had steered before Orca stopped', async () => {
+  const { host, dispatch, store, marker } = await interruptedRestart()
+  const turnItemId = await cutTurn(host)
+  const fence = store.getRecord(SESSION)?.lease.runtimeFence
+  const journal = host.collaboratorsForTests().sessions.get(SESSION)?.journal
+  if (fence === undefined || fence === null || !journal) {
+    throw new Error('the restarted chat has no open journal')
+  }
+  // A steer the cut turn took: the client still offers Continue, so the host must agree.
+  await journal.appendItem(
+    { provider: 'orca', clientMessageId: 'steer' },
+    hostTestMessage('also update the tests'),
+    { fence, turnScope: { kind: 'turn', turnItemId } }
+  )
+
+  const answer = await host.restartResume.continueInterrupted(SESSION, turnItemId)
+
+  expect(answer).toEqual({ sessionId: SESSION, outcome: 'pending' })
+  await vi.waitFor(() => expect(dispatch).toHaveBeenCalledOnce())
+  expect(sentTexts(dispatch)).toEqual([restartContinuationMessage(marker!)])
+})
+
+it('answers a refusal before anything was accepted, and a retry adds no note to the chat', async () => {
+  const { host, dispatch } = await interruptedRestart()
+  const turnItemId = await cutTurn(host)
+  const notesBefore = await statusNotes(host)
+  vi.spyOn(host, 'send').mockResolvedValue({
+    ok: false,
+    refusal: previousExitUnverifiableRefusal()
+  })
+
+  const first = await host.restartResume.continueInterrupted(SESSION, turnItemId)
+  const retry = await host.restartResume.continueInterrupted(SESSION, turnItemId)
+
+  expect([first.outcome, retry.outcome]).toEqual(['refused', 'refused'])
+  // The click's answer is the one report; the chat stays as it was.
+  expect(await statusNotes(host)).toEqual(notesBefore)
+  expect(dispatch).not.toHaveBeenCalled()
+})
diff --git a/src/main/native-chat/agent-session-wire/structured-agent-session-interrupted-continuation.ts b/src/main/native-chat/agent-session-wire/structured-agent-session-interrupted-continuation.ts
new file mode 100644
index 000000000000..49420832226e
--- /dev/null
+++ b/src/main/native-chat/agent-session-wire/structured-agent-session-interrupted-continuation.ts
@@ -0,0 +1,119 @@
+// Continue, pressed in a chat whose reply an Orca stop cut off: the restart continuation, bound to
+// that cut turn rather than to a restart offer. An offer, when one survives, only picks the words;
+// none is needed, so a crash or a paired server's restart continues the same way.
+
+import { createHash, randomUUID } from 'node:crypto'
+import { withTimeout } from '../../../shared/promise-timeout-fallback'
+import type { AgentSessionResumeMarker } from '../../../shared/agent-session-resume-marker'
+import { latestNativeChatOrcaStopCut } from '../../../shared/native-chat-orca-stop-cut'
+import {
+  continuationDeps,
+  RestartContinuationSupersededError,
+  startStructuredAgentSessionContinuation,
+  type StructuredAgentSessionContinuationHost,
+  type StructuredAgentSessionContinuationOutcome
+} from './structured-agent-session-restart-continuation'
+
+export type StructuredAgentSessionInterruptedContinuationOutcome = {
+  sessionId: string
+  /** `superseded`: the chat is no longer sitting on that cut (a message, or another Continue, came
+   *  first), so nothing was sent. */
+  outcome: StructuredAgentSessionContinuationOutcome['outcome'] | 'superseded'
+  reason?: string
+}
+
+const hex16 = (parts: readonly unknown[]): string =>
+  createHash('sha256').update(JSON.stringify(parts)).digest('hex').slice(0, 16)
+
+/** Dated by the click, as the ledger requires of a new id; tagged with the cut it continues. */
+function interruptedContinuationId(
+  sessionId: string,
+  turnItemId: string,
+  actionAt: number,
+  nonce: string
+): string {
+  return `${Math.trunc(actionAt).toString().padStart(13, '0')}-${hex16([sessionId, turnItemId])}${hex16([sessionId, turnItemId, nonce])}`
+}
+
+/**
+ * Sends the continuation when, at acceptance inside the session lock, the chat's latest turn is
+ * still `turnItemId`, cut by an Orca stop with nothing sent since. A second Continue (another
+ * client, a retry after a lost answer) finds the first one's message there and sends nothing.
+ */
+export async function continueInterruptedStructuredAgentSessionTurn(
+  host: Omit<StructuredAgentSessionContinuationHost, 'stillResumable'>,
+  input: {
+    sessionId: string
+    turnItemId: string
+    /** The chat's restart offer, when one could be read: its words cover lost background work. */
+    offer: Pick<AgentSessionResumeMarker, 'activity'> | null
+    nonce: string
+  }
+): Promise<StructuredAgentSessionInterruptedContinuationOutcome> {
+  const { sessionId, turnItemId } = input
+  const stillCut = (): boolean => {
+    const journal = host.sessions.get(sessionId)?.journal
+    return (
+      journal !== undefined &&
+      latestNativeChatOrcaStopCut(journal.snapshot().items, journal.submissions())?.turnItemId ===
+        turnItemId
+    )
+  }
+  const continuationId = interruptedContinuationId(sessionId, turnItemId, host.now(), input.nonce)
+  try {
+    const started = await startStructuredAgentSessionContinuation(
+      // As a send answers: a paired client's wait is shorter than an agent's start can be.
+      { ...continuationDeps(host, stillCut), answerAtAcceptance: true },
+      sessionId,
+      input.offer ?? {},
+      continuationId
+    )
+    if ('verdict' in started) {
+      // Accepted: the agent's start and answer can take a whole turn, and the chat's own note
+      // reports a failure, so the click is answered now.
+      void started.verdict().catch(() => {
+        host.logger.warn('settling an interrupted-turn continuation failed', {
+          scope: 'interrupted-continuation',
+          sessionId
+        })
+      })
+      return { sessionId, outcome: 'pending' }
+    }
+    return {
+      sessionId,
+      outcome: started.done.outcome,
+      ...(started.done.reason ? { reason: started.done.reason } : {})
+    }
+  } catch (error) {
+    if (error instanceof RestartContinuationSupersededError) {
+      return { sessionId, outcome: 'superseded' }
+    }
+    throw error
+  }
+}
+
+/** Reading the offer only picks the words, so a slow recovery file never holds Continue. */
+const OFFER_READ_TIMEOUT_MS = 2_000
+
+/** Continue for one host: its offer, when one can be read in time, picks the words. */
+export function createInterruptedContinuation(
+  host: Omit<StructuredAgentSessionContinuationHost, 'stillResumable'>,
+  readOffers: () => Promise<readonly AgentSessionResumeMarker[]>
+): (
+  sessionId: string,
+  turnItemId: string
+) => Promise<StructuredAgentSessionInterruptedContinuationOutcome> {
+  return async (sessionId, turnItemId) => {
+    const offers = await withTimeout(
+      readOffers().catch(() => []),
+      OFFER_READ_TIMEOUT_MS,
+      []
+    )
+    return continueInterruptedStructuredAgentSessionTurn(host, {
+      sessionId,
+      turnItemId,
+      offer: offers.find((offer) => offer.sessionId === sessionId) ?? null,
+      nonce: randomUUID()
+    })
+  }
+}
diff --git a/src/main/native-chat/agent-session-wire/structured-agent-session-journal-corruption.test.ts b/src/main/native-chat/agent-session-wire/structured-agent-session-journal-corruption.test.ts
index 9a8b5b62a8d0..736e18c80b13 100644
--- a/src/main/native-chat/agent-session-wire/structured-agent-session-journal-corruption.test.ts
+++ b/src/main/native-chat/agent-session-wire/structured-agent-session-journal-corruption.test.ts
@@ -53,7 +53,8 @@ it('refuses a send as corrupt when SQLite reports damage, and still stops the ag
   await attach()
   // The attach's restart-offer withdrawal holds a lock file until it ends; snapshot after it.
   await hostTestRecoveryCapsuleSettled()
-  const files = await readdir(root, { recursive: true })
+  // Order-free: recursive listing order is the runtime's, and only what exists matters.
+  const files = (await readdir(root, { recursive: true })).toSorted()
   const damaged = sqliteError('database disk image is malformed', 11)
   vi.spyOn(openTestJournalHostDatabase(root), 'transaction').mockImplementation(() => {
     throw damaged
@@ -81,7 +82,7 @@ it('refuses a send as corrupt when SQLite reports damage, and still stops the ag
     error: expect.objectContaining({ message: 'database disk image is malformed' })
   })
   await hostTestRecoveryCapsuleSettled()
-  expect(await readdir(root, { recursive: true })).toEqual(files)
+  expect((await readdir(root, { recursive: true })).toSorted()).toEqual(files)
 })
 
 it.each([
diff --git a/src/main/native-chat/agent-session-wire/structured-agent-session-launch-env.ts b/src/main/native-chat/agent-session-wire/structured-agent-session-launch-env.ts
index 15f4e6523f0b..58510a7231b0 100644
--- a/src/main/native-chat/agent-session-wire/structured-agent-session-launch-env.ts
+++ b/src/main/native-chat/agent-session-wire/structured-agent-session-launch-env.ts
@@ -1,5 +1,6 @@
 import type { AgentSessionRecord } from '../../../shared/agent-session-record'
 import type { AgentSessionAttachParams } from './structured-agent-session-attach'
+import { isLegacyAgentSessionAccountHome } from '../../../shared/agent-session-account-home'
 
 type LaunchEnvResolver = (
   provider: AgentSessionRecord['provider']
@@ -19,7 +20,9 @@ export async function pinnedAgentSessionLaunchEnv(
   return {
     launchEnv: {
       ...(await resolver(params.provider)),
-      [params.accountHome.variable]: params.accountHome.path
+      ...(isLegacyAgentSessionAccountHome(params.accountHome)
+        ? { [params.accountHome.variable]: params.accountHome.path }
+        : {})
     }
   }
 }
diff --git a/src/main/native-chat/agent-session-wire/structured-agent-session-orca-stop-row-readers.test.ts b/src/main/native-chat/agent-session-wire/structured-agent-session-orca-stop-row-readers.test.ts
new file mode 100644
index 000000000000..74b5abe1bc31
--- /dev/null
+++ b/src/main/native-chat/agent-session-wire/structured-agent-session-orca-stop-row-readers.test.ts
@@ -0,0 +1,104 @@
+// The row about Orca's own stop, as each kind of client reads it. A client that predates the cause
+// prints today's row, red and on screen; this build names the cause, muted, and never folds it.
+
+import { describe, expect, it } from 'vitest'
+import { agentJournalItemKey } from '../../../shared/agent-session-journal-item-key'
+import type { AgentJournalRenderItem } from '../../../shared/agent-session-journal-types'
+import { withNativeChatCutTurnNotices } from '../../../shared/native-chat-cut-turn-notice'
+import { latestNativeChatOrcaStopCut } from '../../../shared/native-chat-orca-stop-cut'
+import { nativeChatTurnFold } from '../../../shared/native-chat-turn-fold'
+import { orcaStopRowBody } from './structured-agent-session-orca-stop-row'
+
+const LEGACY_TEXT =
+  'Codex stopped while this response was in progress. You can continue in this conversation.'
+const TURN = agentJournalItemKey({ provider: 'codex', threadId: 't', turnId: 'cut', ordinal: 1 })
+
+function cutChat(row: AgentJournalRenderItem['body']): AgentJournalRenderItem[] {
+  const scope = { kind: 'turn' as const, turnItemId: TURN }
+  return [
+    {
+      itemId: agentJournalItemKey({ provider: 'orca', clientMessageId: 'user-1' }),
+      revision: 1,
+      sequence: 1,
+      observedAt: 1,
+      body: { kind: 'message', role: 'user', blocks: [{ type: 'text', text: 'go' }] }
+    },
+    {
+      itemId: TURN,
+      revision: 2,
+      sequence: 2,
+      observedAt: 2,
+      body: { kind: 'turn', turnId: 'cut', state: 'interrupted', startedAt: 1, completedAt: 5 }
+    },
+    {
+      itemId: agentJournalItemKey({ provider: 'codex', threadId: 't', turnId: 'cut', ordinal: 2 }),
+      revision: 1,
+      sequence: 3,
+      observedAt: 3,
+      turnScope: scope,
+      body: { kind: 'message', role: 'assistant', blocks: [{ type: 'text', text: 'Looking.' }] }
+    },
+    {
+      itemId: agentJournalItemKey({
+        provider: 'orca',
+        clientMessageId: 'stale-session:session-1:shutdown-3-gen-1'
+      }),
+      revision: 1,
+      sequence: 4,
+      observedAt: 6,
+      turnScope: scope,
+      body: row
+    }
+  ]
+}
+
+describe('the row a host writes for a cut it knows the cause of', () => {
+  const row = orcaStopRowBody({ agentName: 'Codex' }, 'update')
+
+  it("keeps today's words and tone, and names its presentation and cause beside them", () => {
+    expect(row).toMatchObject({
+      kind: 'status',
+      text: LEGACY_TEXT,
+      tone: 'error',
+      failure: { kind: 'providerExited' },
+      presentation: 'orca-stop',
+      orcaStop: { cause: 'update' }
+    })
+  })
+
+  it('reads, on a client that predates the cause, as the one row it prints today, on screen', () => {
+    const items = cutChat(row)
+    const read = withNativeChatCutTurnNotices(items, { agentName: 'Codex' })
+    expect(read).toBe(items)
+    expect(read.flatMap((item) => (item.body.kind === 'status' ? [item.body.text] : []))).toEqual([
+      LEGACY_TEXT
+    ])
+    // That client's fold reads only the stored tone: a red row is the turn's end, never folded.
+    const rows = read.map((item) => ({
+      turnKey: item.itemId === read[0]!.itemId ? undefined : TURN,
+      role: item.body.kind === 'message' ? item.body.role : ('system' as const),
+      rendersProse: item.body.kind !== 'turn',
+      draws: true,
+      outlivesTurn: false,
+      reportsFailure: item.body.kind === 'status' && item.body.tone === 'error',
+      explainsTurn: false
+    }))
+    const { foldedRows } = nativeChatTurnFold({
+      rows,
+      settledTurnKeys: new Set([TURN]),
+      expandedTurnKeys: new Set()
+    })
+    expect(foldedRows.has(3)).toBe(false)
+  })
+
+  it('offers Continue on this build', () => {
+    expect(latestNativeChatOrcaStopCut(cutChat(row), [])).toEqual({
+      turnItemId: TURN,
+      cause: 'update'
+    })
+  })
+
+  it('names no presentation when the cause is unknown, so it reads as any owner death', () => {
+    expect(orcaStopRowBody({ agentName: 'Codex' }, undefined)).not.toHaveProperty('presentation')
+  })
+})
diff --git a/src/main/native-chat/agent-session-wire/structured-agent-session-orca-stop-row.ts b/src/main/native-chat/agent-session-wire/structured-agent-session-orca-stop-row.ts
new file mode 100644
index 000000000000..1778f7e43977
--- /dev/null
+++ b/src/main/native-chat/agent-session-wire/structured-agent-session-orca-stop-row.ts
@@ -0,0 +1,120 @@
+// The row that says why a quit or update cut a reply: the cut turn's own explanation, in the words
+// every client already prints for a stopped agent, with the cause beside them for clients that
+// name it (`AgentSessionOrcaStop`).
+
+import { agentSessionFailureFact } from '../../../shared/agent-session-failure'
+import {
+  AGENT_SESSION_ORCA_STOP_PRESENTATION,
+  isAgentSessionOrcaStopCause
+} from '../../../shared/agent-session-orca-stop'
+import type { AgentSessionResumeTrigger } from '../../../shared/agent-session-resume-marker'
+import {
+  agentSessionFailureWords,
+  type AgentSessionFailureWordsContext
+} from '../../../shared/agent-session-failure-words'
+import { parseAgentJournalItemKey } from '../../../shared/agent-session-journal-item-key'
+import { isRootAgentJournalItem } from '../../../shared/agent-session-journal-producer'
+import type {
+  AgentJournalRenderItem,
+  AgentJournalStatusItem
+} from '../../../shared/agent-session-journal-types'
+import {
+  readAgentJournalTurn,
+  readAgentJournalTurnOutcome
+} from '../../../shared/agent-session-turn-record'
+import { agentTurnVerdict } from '../../../shared/agent-turn-outcome'
+import { orcaShutdownRowClientMessageId } from '../../../shared/native-chat-orca-stop-cut'
+import type { AgentSessionJournal } from '../agent-session-journal/journal-store'
+import type { StructuredAgentSessionLogger } from './structured-agent-session-logger'
+
+type OrcaStopRowJournal = Pick<AgentSessionJournal, 'snapshot' | 'appendItem'>
+
+/** The row about an owner gone from under a turn: today's words and tone, which every client prints
+ *  as it always has, and why Orca stopped when it was Orca, which a client that knows the cause names
+ *  instead, muted. */
+export function orcaStopRowBody(
+  context: AgentSessionFailureWordsContext | undefined,
+  orcaEnd: unknown
+): AgentJournalStatusItem {
+  return {
+    kind: 'status',
+    ...agentSessionFailureWords(agentSessionFailureFact('providerExited'), {
+      ...context,
+      surface: 'row'
+    }),
+    tone: 'error',
+    ...(isAgentSessionOrcaStopCause(orcaEnd)
+      ? { presentation: AGENT_SESSION_ORCA_STOP_PRESENTATION, orcaStop: { cause: orcaEnd } }
+      : {})
+  }
+}
+
+/** The root turn running as the quit stops the child: the one its stop may cut. */
+export function runningRootTurnItemId(
+  journal: Pick<AgentSessionJournal, 'snapshot'>
+): string | null {
+  return (
+    journal
+      .snapshot()
+      .items.findLast(
+        (item) =>
+          isRootAgentJournalItem(item) && readAgentJournalTurn(item.body)?.state === 'running'
+      )?.itemId ?? null
+  )
+}
+
+function cutByNobody(item: AgentJournalRenderItem | undefined): boolean {
+  const turn = item ? readAgentJournalTurn(item.body) : null
+  return (
+    turn !== null &&
+    agentTurnVerdict({ state: turn.state, outcome: readAgentJournalTurnOutcome(turn) }) ===
+      'interruption'
+  )
+}
+
+/**
+ * Once the quit's stop has settled: when the turn running at the stop now reads cut with nobody
+ * asking (not finished, not a person's Stop), say why. Never throws: a row that cannot be written
+ * must not keep the quit from releasing the chat.
+ */
+export async function recordStructuredAgentSessionShutdownCut(input: {
+  journal: OrcaStopRowJournal
+  sessionId: string
+  fence: number
+  generation: string
+  turnItemId: string | null
+  trigger: AgentSessionResumeTrigger
+  failureTextContext?: AgentSessionFailureWordsContext
+  logger: StructuredAgentSessionLogger
+}): Promise<void> {
+  try {
+    const { turnItemId } = input
+    if (turnItemId === null) {
+      return
+    }
+    const clientMessageId = orcaShutdownRowClientMessageId(
+      input.sessionId,
+      input.fence,
+      input.generation
+    )
+    const items = input.journal.snapshot().items
+    const written = items.some((item) => {
+      const identity = parseAgentJournalItemKey(item.itemId)
+      return identity?.provider === 'orca' && identity.clientMessageId === clientMessageId
+    })
+    if (written || !cutByNobody(items.find((item) => item.itemId === turnItemId))) {
+      return
+    }
+    await input.journal.appendItem(
+      { provider: 'orca', clientMessageId },
+      orcaStopRowBody(input.failureTextContext, input.trigger),
+      { fence: input.fence, turnScope: { kind: 'turn', turnItemId } }
+    )
+  } catch (error) {
+    input.logger.warn('recording why a quit cut a reply failed', {
+      scope: 'shutdown-cut-row',
+      sessionId: input.sessionId,
+      error
+    })
+  }
+}
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
index a0f996c80b12..0a04d6cddfa5 100644
--- 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
@@ -2,6 +2,10 @@ 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 {
+  CLAUDE_PROFILE_MISSING_MESSAGE,
+  CLAUDE_PROFILE_SETUP_FAILED_MESSAGE
+} from '../../../shared/claude-profile-routing'
 import { computeAgentSessionPayloadFingerprint } from '../../../shared/agent-session-mutation-envelope'
 import { openTestAgentSessionRecordStore } from '../../runtime/agent-session-record-store-test-harness'
 import { mapRuntimeError } from '../../runtime/rpc/errors'
@@ -169,6 +173,18 @@ describe('a create that fails before any process spawns', () => {
       'historyInOtherAccount',
       "This chat's history is in another Claude account. Switch back to that account to continue it."
     ],
+    [
+      'a selected Claude account whose folder is gone',
+      CLAUDE_PROFILE_MISSING_MESSAGE,
+      'claudeAccountFolderMissing',
+      CLAUDE_PROFILE_MISSING_MESSAGE
+    ],
+    [
+      'a selected Claude account that could not be set up',
+      CLAUDE_PROFILE_SETUP_FAILED_MESSAGE,
+      'claudeAccountSetupFailed',
+      CLAUDE_PROFILE_SETUP_FAILED_MESSAGE
+    ],
     [
       'a Command setting that names no runnable program',
       'the claude Command setting is not a runnable program',
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
index 13edb107a4b4..8c98a685c7d2 100644
--- 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
@@ -29,6 +29,7 @@ import { ensureStructuredAgentSessionAgent } from './structured-agent-session-ag
 import { StructuredAgentSessionHost } from './structured-agent-session-host'
 import { stopStructuredAgentSessionAgentUnderSerialize } from './structured-agent-session-host-lifetime'
 import { structuredAgentSessionConversationFence } from './structured-agent-session-provider-child'
+import { structuredQueuePauses } from './structured-agent-session-queued-pause'
 import {
   HOST_TEST_LOCATION,
   HOST_TEST_NOW as NOW,
@@ -773,7 +774,7 @@ describe('how a stopped child ends the start its loop was waiting on', () => {
     expect(await statusRows()).toEqual([])
   })
 
-  it('keeps a person’s message the user closed as a held card, and starts no child for it', async () => {
+  it('keeps a person’s message the user closed as a waiting card, and starts no child for it', async () => {
     const start = deferred<void>()
     adapterExtras = { closeSession: vi.fn(async () => true) }
     await restartHost()
@@ -797,6 +798,15 @@ describe('how a stopped child ends the start its loop was waiting on', () => {
     expect(page.ok && page.page.queuedMessages?.map((card) => card.messageId)).toEqual([first])
     expect(acquire).toHaveBeenCalledTimes(starts)
     expect(dispatch).not.toHaveBeenCalled()
+    // The close stopped the chat running: the card waits for its next turn, by a mark the
+    // re-check wrote once, when it kept the card.
+    const journal = conversation()!.journal
+    expect(structuredQueuePauses(journal).map((pause) => pause.reason)).toEqual(['restarted'])
+    const marks = vi.spyOn(journal, 'appendQueueReopen')
+    await accept('second', { person: true })
+    await settleLoop()
+    // A later send's re-check settles nothing, so it marks nothing past that send.
+    expect(marks).not.toHaveBeenCalled()
   })
 
   it('starts no child when closing what was queued fails, and closes it on the next wake', async () => {
diff --git a/src/main/native-chat/agent-session-wire/structured-agent-session-provider-support.ts b/src/main/native-chat/agent-session-wire/structured-agent-session-provider-support.ts
index a726affd84dc..9215c4908445 100644
--- a/src/main/native-chat/agent-session-wire/structured-agent-session-provider-support.ts
+++ b/src/main/native-chat/agent-session-wire/structured-agent-session-provider-support.ts
@@ -4,6 +4,7 @@ import type {
 } from '../../../shared/agent-session-record'
 import type { StructuredAgentSessionAdapter } from './structured-agent-session-adapter'
 import type { StructuredAgentRegistry } from './structured-agent-registry'
+import { agentPinsAccountHome } from '../../../shared/agent-session-account-home'
 
 export function adapterSupportsCreate(
   adapter: StructuredAgentSessionAdapter,
@@ -31,7 +32,7 @@ export function adapterSupportsCreateIfDeclared(
 }
 
 /** Whether this build can start the agent of `session`: the agent is registered here, its account
- *  variable is that agent's own (it becomes the child's environment), and every handle it holds is
+ *  is the kind that agent pins (it becomes the child's environment), and every handle it holds is
  *  in the transport the agent's adapter speaks. A record failing this stays readable (tab, history);
  *  only starting its agent is refused, by the one launch admission every agent passes through. */
 export function agentDrivesSession(
@@ -41,7 +42,7 @@ export function agentDrivesSession(
   const definition = agents.definition(session.provider)
   return (
     definition !== null &&
-    session.accountHome.variable === definition.accountHomeVariable &&
+    agentPinsAccountHome(definition, session.accountHome) &&
     session.providerHandleChain.every(
       ({ handle }) =>
         handle.transport === definition.handleTransport && handle.agent === definition.agent
diff --git a/src/main/native-chat/agent-session-wire/structured-agent-session-queued-card-holds.test.ts b/src/main/native-chat/agent-session-wire/structured-agent-session-queued-card-holds.test.ts
index 10b48321bc9a..d4050e8e39ad 100644
--- a/src/main/native-chat/agent-session-wire/structured-agent-session-queued-card-holds.test.ts
+++ b/src/main/native-chat/agent-session-wire/structured-agent-session-queued-card-holds.test.ts
@@ -21,7 +21,7 @@ import {
   nativeChatComposerPrimaryAction,
   type NativeChatComposerPrimaryAction
 } from '../../../renderer/src/components/native-chat/native-chat-composer-primary-action'
-import { JournalQueuedMessages } from '../agent-session-journal/journal-queued-messages'
+import { AgentSessionJournal } from '../agent-session-journal/journal-store'
 import {
   readQueuePublication,
   structuredQueueSendGate
@@ -512,11 +512,17 @@ describe("the queue's next card on a history page", () => {
     const card = await queuedDraft('held, then released')
     await rig.stop()
     await rig.settleAccepted(working, 'stopped')
-    // The Resume row is written; its adoption, and so the drain behind it, waits.
+    // The Resume row is written; the Resume itself, and so the drain behind it, waits.
     let release: () => void = () => undefined
-    const adopt = vi
-      .spyOn(JournalQueuedMessages.prototype, 'adopt')
-      .mockImplementationOnce(() => new Promise((resolve) => (release = () => resolve(false))))
+    const held = new Promise<void>((resolve) => (release = resolve))
+    const write = AgentSessionJournal.prototype.appendQueueResume
+    const resume = vi
+      .spyOn(AgentSessionJournal.prototype, 'appendQueueResume')
+      .mockImplementationOnce(async function (this: AgentSessionJournal, fence: number) {
+        const cursor = await write.call(this, fence)
+        await held
+        return cursor
+      })
     const resumed = rig.resume()
     try {
       await eventually(async () => {
@@ -525,7 +531,7 @@ describe("the queue's next card on a history page", () => {
       })
     } finally {
       release()
-      adopt.mockRestore()
+      resume.mockRestore()
     }
     expect(await resumed).toMatchObject({ ok: true, value: { resumed: true } })
   })
diff --git a/src/main/native-chat/agent-session-wire/structured-agent-session-queued-command.test.ts b/src/main/native-chat/agent-session-wire/structured-agent-session-queued-command.test.ts
index dda3d2112cd3..7ab0fcfc1f9f 100644
--- a/src/main/native-chat/agent-session-wire/structured-agent-session-queued-command.test.ts
+++ b/src/main/native-chat/agent-session-wire/structured-agent-session-queued-command.test.ts
@@ -152,7 +152,8 @@ describe('/clear', () => {
       { messageId: firstId, state: 'waiting' },
       { messageId: secondId, state: 'waiting' }
     ])
-    expect(await rig.queuePause(replacementId)).toEqual({ reason: 'cleared' })
+    // Held, unshown: nothing runs in the fresh conversation.
+    expect(await rig.queuePause(replacementId)).toBeNull()
 
     const body = hostTestMessage('first in the new chat')
     const fields = { body, delivery: 'queue-if-active' as const }
diff --git a/src/main/native-chat/agent-session-wire/structured-agent-session-queued-message-rig.test-fixture.ts b/src/main/native-chat/agent-session-wire/structured-agent-session-queued-message-rig.test-fixture.ts
index a0e3af88c49b..fd3294ddc7d6 100644
--- a/src/main/native-chat/agent-session-wire/structured-agent-session-queued-message-rig.test-fixture.ts
+++ b/src/main/native-chat/agent-session-wire/structured-agent-session-queued-message-rig.test-fixture.ts
@@ -203,13 +203,10 @@ export async function createQueuedMessageTestRig(
     })
   }
 
-  /** A host-process restart, as the queue sees it: the conversation closes, and
-   *  opens afresh under a new instance id while its rows survive. The close is an eviction, whose
-   *  Stop event ends a person's Stop pause if work runs; a quit writes none, so a test of that
-   *  pause across a restart uses `crashRestartHostProcess`. */
+  /** A host-process restart: the app quits (its own teardown runs) and a new host opens the same
+   *  state. A quit writes no close's Stop event, so a person's Stop pause survives it. */
   async function restartHostProcess(): Promise<void> {
-    await host.close(SESSION, 'evict')
-    rotateStructuredAgentSessionHostInstanceForTests()
+    await quitRestartHostProcess()
   }
 
   /** A host process that dies with no close: a new host opens the same state directory. */
diff --git a/src/main/native-chat/agent-session-wire/structured-agent-session-queued-messages.test.ts b/src/main/native-chat/agent-session-wire/structured-agent-session-queued-messages.test.ts
index 686940c4fa77..8e9344352358 100644
--- a/src/main/native-chat/agent-session-wire/structured-agent-session-queued-messages.test.ts
+++ b/src/main/native-chat/agent-session-wire/structured-agent-session-queued-messages.test.ts
@@ -298,7 +298,7 @@ describe('held drafts', () => {
     await new Promise((resolve) => setTimeout(resolve, 250))
     expect(await rig.handoff(draftId)).toBeUndefined()
     expect(await rig.queuePause()).toBeNull()
-    // The user's send starting its turn lifts it, and adopts the row into this instance.
+    // The user's send starting its turn lifts it.
     const next = send('user starts a new turn')
     await next.result
     expect(await rig.handoff(draftId)).toBeUndefined()
@@ -420,10 +420,12 @@ describe('Stop and Delete', () => {
     await stop()
     expect(await rig.queuePause()).toEqual({ reason: 'stopped' })
     await settleAccepted(working, 'a')
-    // Evict the handle and reopen (the history read opens the conversation at
-    // rest): the pause is derived from what the journal holds, so nothing drains.
+    // Close and reopen it (the history read opens it at rest): the derived pause still holds, so
+    // nothing drains; a close hides the row, as nothing runs there until its next turn.
     await host.close(SESSION, 'evict')
-    expect(await rig.queuePause()).toEqual({ reason: 'stopped' })
+    expect(await rig.queuePause()).toBeNull()
+    const reopened = host.collaboratorsForTests().sessions.get(SESSION)!.journal
+    expect(structuredQueuePauses(reopened).map((pause) => pause.reason)).toContain('stopped')
     await new Promise((resolve) => setTimeout(resolve, 250))
     expect(await rig.handoff(draftId)).toBeUndefined()
     // Send-now overrides the pause — the user acting is a release.
@@ -614,15 +616,15 @@ describe('/clear', () => {
     if (!replacementId) {
       throw new Error('expected a replacement session')
     }
-    // The source's cards are spent tombstones; the replacement shows them on a
-    // queue paused by the clear — not "because you interrupted" — until the user
-    // acts: Resume, or their next send starting its turn.
+    // The source's cards are spent tombstones; the replacement shows them as plain waiting cards,
+    // held by the clear with no row (nothing runs there), until the user acts: Resume, or their
+    // next send starting its turn.
     expect(await drafts()).toHaveLength(0)
     expect(await drafts(replacementId)).toEqual([
       { messageId: firstId, state: 'waiting' },
       { messageId: secondId, state: 'waiting' }
     ])
-    expect(await rig.queuePause(replacementId)).toEqual({ reason: 'cleared' })
+    expect(await rig.queuePause(replacementId)).toBeNull()
     // Paused from before the first carried card lands: the idle replacement auto-sends nothing.
     await new Promise((resolve) => setTimeout(resolve, 250))
     expect((await host.journalSnapshot(replacementId)).submissions).toHaveLength(0)
@@ -663,14 +665,14 @@ describe('/clear', () => {
     )
   })
 
-  it("the replacement's 'cleared' pause lifts through Resume exactly like a Stop's", async () => {
+  it("the replacement's unshown 'cleared' pause lifts through Resume exactly like a Stop's", async () => {
     const [firstId] = await pausedDrafts()
     const cleared = await clear(hostTestOperationId())
     const replacementId = cleared.ok ? cleared.value.replacementSessionId : undefined
     if (!replacementId) {
       throw new Error('expected a replacement session')
     }
-    expect(await rig.queuePause(replacementId)).toEqual({ reason: 'cleared' })
+    expect(await rig.queuePause(replacementId)).toBeNull()
     const resumed = await host.queuedMessagesResume(CALLER, {
       envelope: envelope(
         {},
@@ -733,7 +735,7 @@ describe('/clear', () => {
     // The refusal belonged to the source's submissions; on the replacement the
     // text is simply a waiting draft again, behind the replacement's pause.
     expect(await drafts(replacementId)).toEqual([{ messageId: draftId, state: 'waiting' }])
-    expect(await rig.queuePause(replacementId)).toEqual({ reason: 'cleared' })
+    expect(await rig.queuePause(replacementId)).toBeNull()
     expect(await drafts()).toHaveLength(0)
   })
 
diff --git a/src/main/native-chat/agent-session-wire/structured-agent-session-queued-messages.ts b/src/main/native-chat/agent-session-wire/structured-agent-session-queued-messages.ts
index 3acc45552aa6..bceef9cb308e 100644
--- a/src/main/native-chat/agent-session-wire/structured-agent-session-queued-messages.ts
+++ b/src/main/native-chat/agent-session-wire/structured-agent-session-queued-messages.ts
@@ -31,6 +31,8 @@ import {
 } from './structured-agent-session-queued-pause'
 import { nextSendableQueuedCard } from '../agent-session-journal/queued-message-pause'
 import type { StructuredAgentSessionLogger } from './structured-agent-session-logger'
+import { agentSessionAttachmentExpiredRefusal } from './structured-agent-session-turns'
+import { isAgentSessionAttachmentExpiredError } from '../agent-session-attachments/agent-session-attachment-claims'
 
 /** Budget at accept, in the send schema's own unit (`Buffer.byteLength` of the
  *  serialized blocks); refused readably rather than trimmed. */
@@ -200,6 +202,8 @@ export async function maybeQueueStructuredAgentSessionSend(
     envelope: { clientOperationId: string }
     body: AgentJournalMessageItem
     delivery?: 'queue-if-active'
+    /** A person's send at a chat surface: every attachment it names must still be stored. */
+    userSend?: true
   }
 ): Promise<
   | { ok: true; value: AgentSessionSendResult }
@@ -235,16 +239,25 @@ export async function maybeQueueStructuredAgentSessionSend(
   }
   // The insert notifies through the journal's commit listener: publication and
   // the drain re-derive with no call here to forget.
-  const row = await ctx.journal.queuedMessages.insert(
-    {
-      messageId: clientMessageId,
-      body: params.body,
-      // In the session that will send it: the reducer aliases the provider's echo by exactly this.
-      fingerprint: agentSessionSendBodyFingerprint(ctx.sessionId, params.body),
-      hostInstance: structuredAgentSessionHostInstance()
-    },
-    ctx.operationReceipt
-  )
+  let row: QueuedMessageRow
+  try {
+    row = await ctx.journal.queuedMessages.insert(
+      {
+        messageId: clientMessageId,
+        body: params.body,
+        // In the session that will send it: the reducer aliases the provider's echo by exactly this.
+        fingerprint: agentSessionSendBodyFingerprint(ctx.sessionId, params.body),
+        hostInstance: structuredAgentSessionHostInstance(),
+        ...(params.userSend ? { requireAttachments: true } : {})
+      },
+      ctx.operationReceipt
+    )
+  } catch (error) {
+    if (isAgentSessionAttachmentExpiredError(error)) {
+      return agentSessionAttachmentExpiredRefusal()
+    }
+    throw error
+  }
   return {
     ok: true,
     value: {
@@ -367,7 +380,7 @@ export class StructuredAgentSessionQueuedMessageDrain {
           expect: 'waiting',
           settledByOp: null,
           hostInstance: structuredAgentSessionHostInstance(),
-          yieldsToPause: { hostInstance: structuredAgentSessionHostInstance() }
+          yieldsToPause: true
         }
       )
     } catch (error) {
diff --git a/src/main/native-chat/agent-session-wire/structured-agent-session-queued-mutations.ts b/src/main/native-chat/agent-session-wire/structured-agent-session-queued-mutations.ts
index b637e1fc89e4..3ba5bbb612e9 100644
--- a/src/main/native-chat/agent-session-wire/structured-agent-session-queued-mutations.ts
+++ b/src/main/native-chat/agent-session-wire/structured-agent-session-queued-mutations.ts
@@ -7,13 +7,12 @@
 
 import type { AgentJournalSubmission } from '../../../shared/agent-session-journal-types'
 import { agentSessionOperationKey } from '../../../shared/agent-session-operation-ledger'
-import {
-  QUEUED_MESSAGE_PAUSED_KEPT,
-  type AgentSessionMutationEnvelope,
-  type AgentSessionMutationResult,
-  type AgentSessionQueuedMessageDeleteResult,
-  type AgentSessionQueuedMessagesResumeResult,
-  type AgentSessionSendResult
+import type {
+  AgentSessionMutationEnvelope,
+  AgentSessionMutationResult,
+  AgentSessionQueuedMessageDeleteResult,
+  AgentSessionQueuedMessagesResumeResult,
+  AgentSessionSendResult
 } from '../../../shared/agent-session-wire'
 import type { AgentSessionJournal } from '../agent-session-journal/journal-store'
 import { QueuedMessageNotConsumableError } from '../agent-session-journal/journal-queued-messages'
@@ -117,10 +116,6 @@ export async function carryQueuedMessagesToClearReplacement(
         fingerprint: agentSessionSendBodyFingerprint(input.replacementSessionId, row.body),
         hostInstance: structuredAgentSessionHostInstance(),
         carriedFrom: ctx.sessionId,
-        // A kept send stays held there too: no later message may release it.
-        ...(row.holdReason === QUEUED_MESSAGE_PAUSED_KEPT
-          ? { holdReason: QUEUED_MESSAGE_PAUSED_KEPT }
-          : {})
       })
     }
     await withdrawQueuedMessagesForOperation(ctx.journal, {
diff --git a/src/main/native-chat/agent-session-wire/structured-agent-session-queued-pause-lift.test.ts b/src/main/native-chat/agent-session-wire/structured-agent-session-queued-pause-lift.test.ts
index d55f7cea3fb0..418c51f5cc74 100644
--- a/src/main/native-chat/agent-session-wire/structured-agent-session-queued-pause-lift.test.ts
+++ b/src/main/native-chat/agent-session-wire/structured-agent-session-queued-pause-lift.test.ts
@@ -20,11 +20,7 @@ import {
 } from './structured-agent-session-queued-message-rig.test-fixture'
 import { openRigTurnFor } from './structured-agent-session-queued-rig-turn.test-fixture'
 import { sameQueuePause } from './structured-agent-session-queued-publication'
-import { structuredAgentSessionConversationFence } from './structured-agent-session-provider-child'
-import {
-  structuredAgentSessionHostInstance,
-  structuredQueuePauses
-} from './structured-agent-session-queued-pause'
+import { structuredQueuePauses } from './structured-agent-session-queued-pause'
 
 let rig: QueuedMessageTestRig
 
@@ -365,7 +361,7 @@ describe('a pause only over cards Resume could send', () => {
 })
 
 describe("a restart's pause", () => {
-  it('once a turn ends it, stays ended when the conversation reopens', async () => {
+  it('a turn ends it; closing again with a card still waiting holds that card again', async () => {
     const working = await rig.workingSend()
     const first = await queuedDraft('first')
     const second = await queuedDraft('second')
@@ -377,16 +373,17 @@ describe("a restart's pause", () => {
     await next.result
     await rig.settleAccepted(next.id, 'b')
     await eventually(async () => expect(await rig.handoff(first)).toBeDefined())
-    // Reopened, that turn is "before this open", yet the pause it ended stays ended:
-    // the lift adopted the rows into this process.
+    // Closed again with a card still waiting, it waits again for the next turn, unshown.
     await rig.host.close(HOST_TEST_SESSION, 'evict')
     expect(await rig.queuePause()).toBeNull()
     expect(await rig.drafts()).toContainEqual({ messageId: second, state: 'waiting' })
+    expect(derivedPauses()).toEqual(['restarted'])
   })
 })
 
 describe('a card handed off after a restart', () => {
-  it('belongs to the process that sent it: withdrawn back to waiting, it raises no restart pause', async () => {
+  // Returned, not waiting, when Orca restarted: the reopen holds nothing; only the Stop does.
+  it('sent again and withdrawn by a Stop, it waits under that Stop alone, shown; Resume lifts it', async () => {
     const working = await rig.workingSend()
     const draftId = await queuedDraft('refused, then re-sent after a restart')
     await rig.settleAccepted(working, 'a')
@@ -396,7 +393,7 @@ describe('a card handed off after a restart', () => {
       expect(await rig.drafts()).toEqual([{ messageId: draftId, state: 'returned' }])
     )
     await rig.restartHostProcess()
-    // Sent again in this process, then withdrawn by a Stop before the agent had it.
+    // Sent again after the restart, then withdrawn by a Stop before the agent had it.
     // Its delivery is held, so the Stop runs ahead of the handover.
     const { held, release } = holdDelivery()
     const handedOver = rig.dispatch.mock.calls.length
@@ -410,18 +407,10 @@ describe('a card handed off after a restart', () => {
     await eventually(async () =>
       expect(await rig.drafts()).toEqual([{ messageId: draftId, state: 'waiting' }])
     )
-    const journal = rig.host.collaboratorsForTests().sessions.get(HOST_TEST_SESSION)?.journal
-    if (!journal) {
-      throw new Error('expected the conversation open')
-    }
-    expect(journal.queuedMessages.get(draftId)?.hostInstance).toBe(
-      structuredAgentSessionHostInstance()
-    )
-    // With the Stop's pause gone, nothing else holds it: no restart happened since it was sent.
-    await journal.appendQueueResume(
-      structuredAgentSessionConversationFence(rig.store, HOST_TEST_SESSION)
-    )
-    expect(structuredQueuePauses(journal)).toEqual([])
+    expect(derivedPauses()).toEqual(['stopped'])
+    expect(await rig.queuePause()).toEqual({ reason: 'stopped' })
+    expect(await rig.resume()).toMatchObject({ ok: true, value: { resumed: true } })
+    expect(derivedPauses()).toEqual([])
   })
 })
 
diff --git a/src/main/native-chat/agent-session-wire/structured-agent-session-queued-pause.ts b/src/main/native-chat/agent-session-wire/structured-agent-session-queued-pause.ts
index 6722313d0394..e59a56a7c795 100644
--- a/src/main/native-chat/agent-session-wire/structured-agent-session-queued-pause.ts
+++ b/src/main/native-chat/agent-session-wire/structured-agent-session-queued-pause.ts
@@ -1,6 +1,6 @@
 // Whether the queue is paused, and why — derived from the journal and the cards
-// (`queued-message-pause.ts`), never stored. A Stop's event and a Resume are journal
-// rows; an explicit Resume lifts any pause.
+// (`queued-message-pause.ts`), never stored. A Stop's event, a Resume and a reopen that found
+// waiting cards are journal rows; an explicit Resume lifts any pause.
 
 import { randomUUID } from 'node:crypto'
 import type { AgentSessionJournal } from '../agent-session-journal/journal-store'
@@ -8,15 +8,15 @@ import type { DerivedQueuePause } from '../agent-session-journal/queued-message-
 import type { StructuredAgentSessionLogger } from './structured-agent-session-logger'
 
 /** A per-process id, minted once per host process like the runtime's own
- *  `runtimeId` (`orca-runtime-runtime-id.ts`); a draft written by another
- *  instance pauses the queue rather than auto-sending after a restart. */
+ *  `runtimeId` (`orca-runtime-runtime-id.ts`), stamped on the cards this process writes or hands
+ *  off. No pause reads it: an older build holds every card another instance wrote. */
 let hostInstance = randomUUID()
 
 export function structuredAgentSessionHostInstance(): string {
   return hostInstance
 }
 
-/** Simulates a host-process restart. Tests only. */
+/** A new stamp, as a new host process mints. Tests only; no pause reads it. */
 export function rotateStructuredAgentSessionHostInstanceForTests(): string {
   hostInstance = randomUUID()
   return hostInstance
@@ -26,38 +26,34 @@ type PauseJournal = Pick<AgentSessionJournal, 'queuedMessages'>
 
 /** The queue's pauses in force, derived; none when the queue sends on its own. */
 export function structuredQueuePauses(journal: PauseJournal): DerivedQueuePause[] {
-  return journal.queuedMessages.pauses(hostInstance)
+  return journal.queuedMessages.pauses()
 }
 
-/**
- * Every journal publish: a restart's rows are adopted into this instance once a turn started.
- * The derivation already reads them as lifted; the write keeps that answer when the handle
- * reopens (its "since this conversation opened" moves). Bookkeeping: a failure is reported.
- */
-export async function adoptEndedRestartPause(
+/** The mark of a chat that stopped running with cards waiting — Orca quit or crashed, or the chat
+ *  was closed — so they wait for its next turn (`queued-message-pause.ts`). Every open marks, and
+ *  so does a person's close: the idle sweep never closes a chat with cards waiting, so its
+ *  eviction never reopens one. `since`: where the chat stopped, for a mark written after a send
+ *  that came later, which must still lift it. Bookkeeping, so a failure is reported and never
+ *  thrown; the pause then starts where the mark would have gone, holding no less. */
+export async function markStructuredQueueReopen(
   sessionId: string,
-  journal: PauseJournal,
-  logger: StructuredAgentSessionLogger
+  journal: Pick<AgentSessionJournal, 'markQueueReopen'>,
+  fence: number,
+  logger: StructuredAgentSessionLogger,
+  since?: number
 ): Promise<void> {
   try {
-    const { queuedMessages } = journal
-    const restarted = queuedMessages
-      .list()
-      .some((row) => row.state === 'waiting' && row.hostInstance !== hostInstance)
-    if (restarted && queuedMessages.restartEnded()) {
-      await queuedMessages.adopt(hostInstance)
-    }
+    await journal.markQueueReopen(fence, since)
   } catch (error) {
-    logger.warn("adopting a restart's queued cards after a started turn failed", {
-      scope: 'queue-pause-adoption',
+    logger.warn('marking a reopened queue failed', {
+      scope: 'queue-reopen-mark',
       sessionId,
       error
     })
   }
 }
 
-/** Resume: a journal row that ends a Stop's or a /clear's pause, and adoption of a restart's
- *  rows. Returns whether the queue was paused. */
+/** Resume: a journal row that ends every pause. Returns whether the queue was paused. */
 export async function resumeStructuredQueue(
   journal: Pick<AgentSessionJournal, 'queuedMessages' | 'appendQueueResume'>,
   fence: number
@@ -66,6 +62,5 @@ export async function resumeStructuredQueue(
     return false
   }
   await journal.appendQueueResume(fence)
-  await journal.queuedMessages.adopt(hostInstance)
   return true
 }
diff --git a/src/main/native-chat/agent-session-wire/structured-agent-session-queued-publication.ts b/src/main/native-chat/agent-session-wire/structured-agent-session-queued-publication.ts
index af1b7e567b3f..d48d9bf27c39 100644
--- a/src/main/native-chat/agent-session-wire/structured-agent-session-queued-publication.ts
+++ b/src/main/native-chat/agent-session-wire/structured-agent-session-queued-publication.ts
@@ -4,7 +4,6 @@
 // streams from re-sending it. They ride together: a client never sees one without the others.
 
 import {
-  QUEUED_MESSAGE_PAUSED_KEPT,
   QUEUED_MESSAGE_PAUSED_SEND_FAILED,
   type AgentSessionQueuedMessage,
   type AgentSessionQueuedMessagePausedReason,
@@ -42,9 +41,8 @@ export function structuredQueueSendGate(
   })
 }
 
-/** Waiting and returned rows only. `paused` is a per-card hold (a failed
- *  conversion, or a send the host kept); a Stop or a /clear pauses the queue, published once
- *  beside it. */
+/** Waiting and returned rows only. `paused` is a per-card hold (a failed conversion); a person's
+ *  Stop pauses the queue, published once beside it. */
 function computePublishedQueuedMessages(journal: AgentSessionJournal): AgentSessionQueuedMessage[] {
   const published: AgentSessionQueuedMessage[] = []
   for (const row of journal.queuedMessages.list()) {
@@ -72,7 +70,7 @@ function computePublishedQueuedMessages(journal: AgentSessionJournal): AgentSess
 function isPublishedPausedReason(
   reason: string | null
 ): reason is AgentSessionQueuedMessagePausedReason {
-  return reason === QUEUED_MESSAGE_PAUSED_SEND_FAILED || reason === QUEUED_MESSAGE_PAUSED_KEPT
+  return reason === QUEUED_MESSAGE_PAUSED_SEND_FAILED
 }
 
 type ListMemo = { key: string; serialized: string; list: AgentSessionQueuedMessage[] }
@@ -114,18 +112,29 @@ export function readQueuePublication(
   gate: QueueSendGate
 ): QueuePublication {
   const queuedMessages = readPublishedQueuedMessages(journal)
-  // Read per emit: the pause also turns on submissions (a turn starting). Shown only over a card
-  // Resume would send, so its header never offers to send nothing; deleting a blocking returned
-  // card shows it again. After a restart nothing is shown, a Stop's or /clear's included: the
-  // chat's next turn lifts every pause, and the cards read as plain waiting cards until then.
+  // Read per emit: the pause also turns on submissions (a turn starting). Only a person's Stop is
+  // shown, and only over a card Resume would send, so its header never offers to send nothing;
+  // deleting a blocking returned card shows it again. After a /clear, a restart or a close nothing
+  // is shown, a Stop's from before it included: nothing runs in the chat, its next turn lifts every
+  // pause, and the cards read as plain waiting cards until then. A Stop the person makes after the
+  // reopen shows.
   const pauses = structuredQueuePauses(journal)
-  const restarted = pauses.some((pause) => pause.reason === 'restarted')
-  const resumable = restarted ? null : resumableQueuePause(pauses, journal.queuedMessages.list())
+  const stop = pauses.find((pause) => pause.reason === 'stopped')?.since
+  const silent = pauses.some(
+    (pause) =>
+      pause.reason === 'cleared' ||
+      (pause.reason === 'restarted' &&
+        (!stop ||
+          !pause.since ||
+          stop.epoch !== pause.since.epoch ||
+          stop.sequence < pause.since.sequence))
+  )
+  const resumable = silent ? null : resumableQueuePause(pauses, journal.queuedMessages.list())
   // The submissions are read only while a pause would show, never while the queue runs freely.
   const pause =
     resumable && !queuePauseLiftOnItsWay(resumable, journal.submissions()) ? resumable : null
-  // `restarted` is already excluded above; the test narrows the type.
-  const queuePause = pause && pause.reason !== 'restarted' ? { reason: pause.reason } : null
+  // The test narrows the type.
+  const queuePause = pause?.reason === 'stopped' ? { reason: pause.reason } : null
   const nextQueuedMessageId = nextStructuredQueuedMessage({ journal, ...gate() })?.messageId ?? null
   const previous = publications.get(journal)
   if (
diff --git a/src/main/native-chat/agent-session-wire/structured-agent-session-queued-send.ts b/src/main/native-chat/agent-session-wire/structured-agent-session-queued-send.ts
index 0fa49460d5e9..7ce3d43b4798 100644
--- a/src/main/native-chat/agent-session-wire/structured-agent-session-queued-send.ts
+++ b/src/main/native-chat/agent-session-wire/structured-agent-session-queued-send.ts
@@ -14,6 +14,7 @@ export async function runQueueableStructuredAgentSessionSend(
     envelope: { clientOperationId: string }
     body: AgentJournalMessageItem
     delivery?: 'queue-if-active'
+    userSend?: true
   },
   immediate: () => Promise<TurnOutcome<AgentSessionSendResult>>
 ): Promise<TurnOutcome<AgentSessionSendResult>> {
diff --git a/src/main/native-chat/agent-session-wire/structured-agent-session-queued-stop-row.test.ts b/src/main/native-chat/agent-session-wire/structured-agent-session-queued-stop-row.test.ts
index 001e0b10786b..2b0aae62f487 100644
--- a/src/main/native-chat/agent-session-wire/structured-agent-session-queued-stop-row.test.ts
+++ b/src/main/native-chat/agent-session-wire/structured-agent-session-queued-stop-row.test.ts
@@ -246,7 +246,11 @@ describe("a /clear's carried cards", () => {
     if (!replacementId) {
       throw new Error(`expected a replacement session: ${JSON.stringify(cleared)}`)
     }
-    expect(await rig.queuePause(replacementId)).toEqual({ reason: 'cleared' })
+    // Held there, unshown: nothing runs in the fresh conversation.
+    expect(await rig.queuePause(replacementId)).toBeNull()
+    expect(structuredQueuePauses(journal(replacementId)).map((pause) => pause.reason)).toEqual([
+      'cleared'
+    ])
     // Idle there, so the person's send goes straight out rather than queueing.
     const text = hostTestMessage('hi')
     const person = rig.host.send(QUEUED_RIG_CALLER, {
@@ -299,7 +303,9 @@ describe('no stored pause', () => {
       ...fields
     })
     const replacementId = cleared.ok ? cleared.value.replacementSessionId : undefined
-    expect(replacementId && (await rig.queuePause(replacementId))).toEqual({ reason: 'cleared' })
+    expect(
+      replacementId && structuredQueuePauses(journal(replacementId)).map((pause) => pause.reason)
+    ).toEqual(['cleared'])
     expect(pauseTables()).toBe(0)
   })
 })
diff --git a/src/main/native-chat/agent-session-wire/structured-agent-session-queued-wiring.ts b/src/main/native-chat/agent-session-wire/structured-agent-session-queued-wiring.ts
index af7aee44bc98..a5ddfeb64748 100644
--- a/src/main/native-chat/agent-session-wire/structured-agent-session-queued-wiring.ts
+++ b/src/main/native-chat/agent-session-wire/structured-agent-session-queued-wiring.ts
@@ -9,7 +9,6 @@ import type {
 } from './structured-agent-session-host-types'
 import { structuredAgentSessionConversationFence } from './structured-agent-session-provider-child'
 import { StructuredAgentSessionQueuedMessageDrain } from './structured-agent-session-queued-messages'
-import { adoptEndedRestartPause } from './structured-agent-session-queued-pause'
 import {
   deleteQueuedStructuredAgentMessage,
   resumeStructuredAgentQueue,
@@ -39,14 +38,9 @@ export function wireStructuredAgentSessionQueuedMessages(
   return {
     drain,
     /** Every journal publish: turn, submission, prompt, command and Stop
-     *  settlements are all commits, and each re-derives the drain's gates —
-     *  and adopts a restart's cards once a turn started. */
+     *  settlements are all commits, and each re-derives the drain's gates. */
     onJournalActivity: (sessionId: string) => {
       sessions.touch(sessionId)
-      const journal = sessions.get(sessionId)?.journal
-      if (journal) {
-        void adoptEndedRestartPause(sessionId, journal, context().deps.logger)
-      }
       drain.schedule(sessionId)
     },
     queuedMessageSend: (
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
index cfa2c7b502ee..b9c2072e874f 100644
--- 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
@@ -9,7 +9,9 @@ import type { AgentSessionResumeMarker } from '../../../shared/agent-session-res
 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 {
+export function restartContinuationBody(
+  marker: Pick<AgentSessionResumeMarker, 'activity'>
+): AgentJournalMessageItem {
   return {
     kind: 'message',
     role: 'user',
@@ -57,7 +59,7 @@ export function isRestartContinuationOf(
 export function restartContinuationEnvelope(
   sessionId: string,
   fence: number,
-  marker: AgentSessionResumeMarker,
+  marker: Pick<AgentSessionResumeMarker, 'activity'>,
   continuationId: string
 ): { envelope: AgentSessionMutationEnvelope; body: AgentJournalMessageItem } {
   const body = restartContinuationBody(marker)
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 67006fd51d03..92d7dea95c48 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
@@ -10,14 +10,15 @@ import {
   AGENT_JOURNAL_THREAD_SCOPE,
   type AgentJournalMessageItem
 } from '../../../shared/agent-session-journal-types'
-import {
-  readAgentSessionFailureFact,
-  type UnreadAgentSessionFailureFact
-} from '../../../shared/agent-session-failure'
 import {
   agentSessionRefusalReference,
   type AgentSessionRefusalReference
 } from '../../../shared/agent-session-wire-refusals'
+import {
+  refusedBy,
+  verdictOf,
+  type ContinuationSubmission
+} from './structured-agent-session-continuation-verdict'
 import {
   agentSessionSendSubmission,
   type AgentSessionMutationEnvelope,
@@ -85,10 +86,11 @@ export type StructuredAgentSessionContinuationHost = {
 }
 
 /** Binds one continuation to the host: the superseded check before dispatch, the settlement
- *  waiter for the verdict, and the journal note that attributes the send to Orca. */
-export function restartContinuationDeps(
-  host: StructuredAgentSessionContinuationHost,
-  marker: AgentSessionResumeMarker
+ *  waiter for the verdict, and the journal note that attributes the send to Orca. `stillWanted` is
+ *  asked at acceptance, inside the session lock, so the first message accepted since decides. */
+export function continuationDeps(
+  host: Omit<StructuredAgentSessionContinuationHost, 'stillResumable'>,
+  stillWanted: () => boolean
 ): StructuredAgentSessionContinuationDeps {
   return {
     currentFence: host.conversationFence,
@@ -96,7 +98,7 @@ export function restartContinuationDeps(
       host.send({
         ...input,
         beforeRun: () => {
-          if (!host.stillResumable(marker)) {
+          if (!stillWanted()) {
             throw new RestartContinuationSupersededError()
           }
         }
@@ -154,12 +156,6 @@ export class RestartContinuationSupersededError extends AgentSessionPreDispatchE
   }
 }
 
-type ContinuationSubmission = {
-  dispatchState?: string
-  reason?: string | null
-  rejection?: UnreadAgentSessionFailureFact
-}
-
 export type StructuredAgentSessionContinuationDeps = {
   /** Runtime fence as it stands now; null when this host has no record of the session. */
   currentFence: (sessionId: string) => number | null
@@ -197,6 +193,9 @@ export type StructuredAgentSessionContinuationDeps = {
   /** Where a note that could not be written is reported. The note is best effort, but its failure
    *  is not allowed to be silent — a swallowed append is how this regressed unnoticed once already. */
   logger: StructuredAgentSessionLogger
+  /** Answer once Orca accepted the message, as a send does, not once the agent took it. A refusal
+   *  before acceptance is then the caller's to report, not a note: a retry adds none. */
+  answerAtAcceptance?: true
 }
 
 /** A continuation handed to its agent, or already decided. */
@@ -206,13 +205,15 @@ export type StartedStructuredAgentSessionContinuation =
 
 /**
  * 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.
+ * failed — the point a restart batch counts a start as done — or, with `answerAtAcceptance`, once
+ * Orca accepted it. What the provider then answered is the `verdict`, awaited separately so a slow
+ * answer does not hold the batch.
  */
 export async function startStructuredAgentSessionContinuation(
   deps: StructuredAgentSessionContinuationDeps,
   sessionId: string,
-  marker: AgentSessionResumeMarker,
+  /** Only what picks the message's words; a continuation with no offer passes none. */
+  marker: Pick<AgentSessionResumeMarker, 'activity'>,
   /** This action's continuation, as its offer recorded it. */
   continuationId: string
 ): Promise<StartedStructuredAgentSessionContinuation> {
@@ -221,13 +222,15 @@ export async function startStructuredAgentSessionContinuation(
     started = await sendContinuation(deps, sessionId, marker, continuationId)
   } catch (error) {
     // The user's own message came first: nothing failed, so the chat says nothing.
-    if (!(error instanceof RestartContinuationSupersededError)) {
+    if (!(error instanceof RestartContinuationSupersededError) && !deps.answerAtAcceptance) {
       await noteNotContinued(deps, sessionId, 'refused')
     }
     throw error
   }
   if ('done' in started) {
-    await noteOutcome(deps, sessionId, started.done)
+    if (!(deps.answerAtAcceptance && started.done.outcome === 'refused')) {
+      await noteOutcome(deps, sessionId, started.done)
+    }
     return started
   }
   const { verdict } = started
@@ -291,7 +294,7 @@ async function noteNotContinued(
 async function sendContinuation(
   deps: StructuredAgentSessionContinuationDeps,
   sessionId: string,
-  marker: AgentSessionResumeMarker,
+  marker: Pick<AgentSessionResumeMarker, 'activity'>,
   continuationId: string
 ): Promise<StartedStructuredAgentSessionContinuation> {
   const fence = deps.currentFence(sessionId)
@@ -325,54 +328,25 @@ async function sendContinuation(
     }
   }
   const clientMessageId = envelope.clientOperationId
-  const handedOver = await deps.awaitHandedOver(sessionId, clientMessageId).catch(() => undefined)
+  const handOver = () => deps.awaitHandedOver(sessionId, clientMessageId).catch(() => undefined)
+  const settle = async (handedOver: ContinuationSubmission | undefined) =>
+    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
+    )
+  if (deps.answerAtAcceptance) {
+    // The agent's start can outlast the caller's wait; a start refused is the verdict's note.
+    return { verdict: async () => settle(await handOver()) }
+  }
+  const handedOver = await handOver()
   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 (submission && dispatch === 'rejected') {
-    return refusedBy(sessionId, submission)
-  }
-  if (dispatch === 'pending') {
-    // Still pending after settlement gave up: handed off, never confirmed.
-    return { sessionId, outcome: 'pending' }
-  }
-  // `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' }
+  return { verdict: () => settle(handedOver) }
 }
 
 /** Without the error: a failed append can carry the chat's private recovery payload. */
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 4602630960a9..c99cc945d31c 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
@@ -45,8 +45,8 @@ it('files nothing for a chat the user moved on in before its attempt, and spends
   const capsule = new AgentSessionRecoveryCapsule(root)
   expect(await capsule.listFailed(NOW)).toEqual([])
   expect(await capsule.list(NOW)).toEqual([])
-  expect(await statusNotes(host)).toEqual([])
-  // No note took over, so the cut turn keeps its one notice.
+  // Only the quit's own row about the cut: no note took over, so it stays the turn's one notice.
+  expect(await statusNotes(host)).toEqual([QUIT_CUT_NOTICE])
   expect(await readerNotes(host)).toEqual([QUIT_CUT_NOTICE])
 })
 
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
index b155674babf0..89e039689a5f 100644
--- 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
@@ -17,6 +17,7 @@ import { AgentSessionJournal } from '../agent-session-journal/journal-store'
 import type { AgentSessionSubscribeEvent } from '../../../shared/agent-session-wire'
 import {
   interruptedRestart,
+  QUIT_CUT_NOTICE,
   statusNotes
 } from './structured-agent-session-restart-interruption-test-harness'
 import { CALLER, envelope } from './structured-agent-session-host-test-harness'
@@ -385,8 +386,8 @@ it("refuses an automatic continuation when the user's message was accepted first
   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([])
+  // Nothing the user did failed: no row but the quit's own about the cut, and nothing is kept.
+  expect(await statusNotes(host)).toEqual([QUIT_CUT_NOTICE])
   expect(
     events.some(
       (event) =>
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 23d2e5897761..0d73656b3477 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
@@ -16,6 +16,7 @@ import {
 import { STRUCTURED_AGENT_SESSION_RESTART_CONTINUATION_CALLER } from './structured-agent-session-restart-resume-wiring'
 import {
   interruptedRestart,
+  QUIT_CUT_NOTICE,
   startAgent,
   statusNotes,
   supersededRefusal,
@@ -357,7 +358,8 @@ it("refuses a continuation quietly when the user's own message was accepted firs
     failed: []
   })
   await vi.waitFor(() => expect(dispatch).toHaveBeenCalledOnce())
-  expect(await statusNotes(host)).toEqual([])
+  // The quit's own row about the cut, and nothing about the refused continuation.
+  expect(await statusNotes(host)).toEqual([QUIT_CUT_NOTICE])
   expect(await new AgentSessionRecoveryCapsule(root).list(NOW)).toEqual([])
   expect(await new AgentSessionRecoveryCapsule(root).listFailed(NOW)).toEqual([])
 })
diff --git a/src/main/native-chat/agent-session-wire/structured-agent-session-restart-resume-contract.ts b/src/main/native-chat/agent-session-wire/structured-agent-session-restart-resume-contract.ts
new file mode 100644
index 000000000000..1cbbd8236ad0
--- /dev/null
+++ b/src/main/native-chat/agent-session-wire/structured-agent-session-restart-resume-contract.ts
@@ -0,0 +1,49 @@
+// What a host's restart-resume surface offers: teardown's offer recording, the offer list and its
+// actions, and Continue on a cut reply.
+
+import type { AgentSessionResumeTrigger } from '../../../shared/agent-session-resume-marker'
+import type { createInterruptedContinuation } from './structured-agent-session-interrupted-continuation'
+import type { StructuredAgentSessionContinuationOutcome } from './structured-agent-session-restart-continuation'
+import type { StructuredAgentSessionResumeOutcome } from './structured-agent-session-restart-resume-runner'
+import type {
+  StructuredAgentSessionRestartAudience,
+  StructuredAgentSessionResumeCandidate,
+  StructuredAgentSessionResumeFailure
+} from './structured-agent-session-restart-resume-set'
+
+export type StructuredAgentSessionRestartResume = {
+  /** Teardown: begin, then per session a snapshot right before its child stops and a confirmation
+   *  once the stop is proven, then one write of the confirmed offers. */
+  beginTeardown: (trigger: AgentSessionResumeTrigger) => void
+  captureBeforeStop: (sessionId: string) => void
+  confirmStopped: (sessionId: string) => void
+  recordMarkers: () => Promise<void>
+  list: (
+    audience?: StructuredAgentSessionRestartAudience
+  ) => Promise<StructuredAgentSessionResumeCandidate[]>
+  /** Offers already acted on whose agent did not carry on. Read-only; nothing here is spent. */
+  listFailures: (
+    audience?: StructuredAgentSessionRestartAudience
+  ) => Promise<StructuredAgentSessionResumeFailure[]>
+  /** Unnamed, continues every offer the audience sees; named, only those of them. */
+  continueAfterRestart: (
+    sessionIds: readonly string[] | undefined,
+    owner: string,
+    audience?: StructuredAgentSessionRestartAudience
+  ) => Promise<{
+    resumed: StructuredAgentSessionResumeOutcome[]
+    continued: StructuredAgentSessionContinuationOutcome[]
+    sessions?: StructuredAgentSessionResumeCandidate[]
+    failed?: StructuredAgentSessionResumeFailure[]
+  }>
+  /** Named sessions forget their offer or failure; unnamed, every record this host lists goes (a
+   *  newer Orca's stay). An audience limits either to the agents it sees. */
+  dismiss: (
+    sessionIds?: readonly string[],
+    audience?: StructuredAgentSessionRestartAudience
+  ) => Promise<number>
+  /** The chat's agent proved a start: its offer ends unless the start is a resume's own. */
+  onAgentStarted: (sessionId: string) => void
+  /** Continue on a reply an Orca stop cut off, offer or not; the send itself retires any offer. */
+  continueInterrupted: ReturnType<typeof createInterruptedContinuation>
+}
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 6a868201baa1..120aefb6f205 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
@@ -7,10 +7,7 @@ import {
   AgentSessionRefusalError,
   agentSessionRefusalFromReference
 } from '../../../shared/agent-session-wire-refusals'
-import type {
-  AgentSessionResumeMarker,
-  AgentSessionResumeTrigger
-} from '../../../shared/agent-session-resume-marker'
+import type { AgentSessionResumeMarker } from '../../../shared/agent-session-resume-marker'
 import {
   createNewerOrcaChats,
   createStructuredAgentSessionRestartCandidateReaders
@@ -24,21 +21,21 @@ import { createStructuredAgentSessionRestartOfferRecords } from './structured-ag
 import {
   restartRowsFor,
   type StructuredAgentSessionRestartAudience,
-  type StructuredAgentSessionResumeCandidate,
-  type StructuredAgentSessionResumeFailure
+  type StructuredAgentSessionResumeCandidate
 } from './structured-agent-session-restart-resume-set'
 import {
   resumeStructuredAgentSessionsFromRestart,
-  StructuredAgentSessionResumeAdmission,
-  type StructuredAgentSessionResumeOutcome
+  StructuredAgentSessionResumeAdmission
 } from './structured-agent-session-restart-resume-runner'
+import type { StructuredAgentSessionRestartResume } from './structured-agent-session-restart-resume-contract'
 import {
-  restartContinuationDeps,
+  continuationDeps,
   startStructuredAgentSessionContinuation,
   type StructuredAgentSessionContinuationHost,
   type StructuredAgentSessionContinuationOutcome
 } from './structured-agent-session-restart-continuation'
 import { restartContinuationId } from './structured-agent-session-restart-continuation-envelope'
+import { createInterruptedContinuation } from './structured-agent-session-interrupted-continuation'
 import {
   createStructuredAgentSessionRestartOfferWithdrawal,
   type StructuredAgentSessionRestartOfferSession
@@ -54,40 +51,7 @@ import type { StructuredAgentSessionHostDeps } from './structured-agent-session-
 
 type LiveSession = StructuredAgentSessionRestartOfferSession
 
-export type StructuredAgentSessionRestartResume = {
-  /** Teardown: begin, then per session a snapshot right before its child stops and a confirmation
-   *  once the stop is proven, then one write of the confirmed offers. */
-  beginTeardown: (trigger: AgentSessionResumeTrigger) => void
-  captureBeforeStop: (sessionId: string) => void
-  confirmStopped: (sessionId: string) => void
-  recordMarkers: () => Promise<void>
-  list: (
-    audience?: StructuredAgentSessionRestartAudience
-  ) => Promise<StructuredAgentSessionResumeCandidate[]>
-  /** Offers already acted on whose agent did not carry on. Read-only; nothing here is spent. */
-  listFailures: (
-    audience?: StructuredAgentSessionRestartAudience
-  ) => Promise<StructuredAgentSessionResumeFailure[]>
-  /** Unnamed, continues every offer the audience sees; named, only those of them. */
-  continueAfterRestart: (
-    sessionIds: readonly string[] | undefined,
-    owner: string,
-    audience?: StructuredAgentSessionRestartAudience
-  ) => Promise<{
-    resumed: StructuredAgentSessionResumeOutcome[]
-    continued: StructuredAgentSessionContinuationOutcome[]
-    sessions?: StructuredAgentSessionResumeCandidate[]
-    failed?: StructuredAgentSessionResumeFailure[]
-  }>
-  /** Named sessions forget their offer or failure; unnamed, every record this host lists goes (a
-   *  newer Orca's stay). An audience limits either to the agents it sees. */
-  dismiss: (
-    sessionIds?: readonly string[],
-    audience?: StructuredAgentSessionRestartAudience
-  ) => 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 type { StructuredAgentSessionRestartResume }
 
 export function createStructuredAgentSessionRestartResume(
   deps: Pick<
@@ -261,7 +225,7 @@ export function createStructuredAgentSessionRestartResume(
     // never starts more agents at once than the runner allows; the provider's answer comes after.
     const action = await run(sessionIds, owner, audience, async (marker, continuationId) => {
       const started = await startStructuredAgentSessionContinuation(
-        restartContinuationDeps(continuationHost, marker),
+        continuationDeps(continuationHost, () => continuationHost.stillResumable(marker)),
         marker.sessionId,
         marker,
         continuationId
@@ -327,6 +291,7 @@ export function createStructuredAgentSessionRestartResume(
         audience
       ),
     continueAfterRestart,
-    onAgentStarted: withdrawal.onAgentStarted
+    onAgentStarted: withdrawal.onAgentStarted,
+    continueInterrupted: createInterruptedContinuation(continuationHost, readMarkers)
   }
 }
diff --git a/src/main/native-chat/agent-session-wire/structured-agent-session-shutdown-cut-row.test.ts b/src/main/native-chat/agent-session-wire/structured-agent-session-shutdown-cut-row.test.ts
new file mode 100644
index 000000000000..5c82a2185a51
--- /dev/null
+++ b/src/main/native-chat/agent-session-wire/structured-agent-session-shutdown-cut-row.test.ts
@@ -0,0 +1,267 @@
+// A quit or update that cuts a reply writes one row saying so, in the words every client already
+// prints, with the cause beside them. A turn that finished, a person's Stop and an idle eviction
+// write none.
+
+import { rm } from 'node:fs/promises'
+import { join } from 'node:path'
+import { beforeEach, describe, expect, it, vi } from 'vitest'
+import {
+  AGENT_JOURNAL_THREAD_SCOPE,
+  type AgentJournalTurnLifecycle
+} from '../../../shared/agent-session-journal-types'
+import { readAgentSessionOrcaStop } from '../../../shared/agent-session-orca-stop'
+import { withNativeChatCutTurnNotices } from '../../../shared/native-chat-cut-turn-notice'
+import { latestNativeChatOrcaStopCut } from '../../../shared/native-chat-orca-stop-cut'
+import { AgentSessionRecoveryCapsule } from '../../runtime/agent-session-recovery-capsule'
+import { openTestAgentSessionRecordStore } from '../../runtime/agent-session-record-store-test-harness'
+import {
+  agentSessionRuntimeIncarnation,
+  beginAgentSessionRuntimeIncarnationForTest
+} from '../../runtime/agent-session-runtime-attribution'
+import { recordAgentSessionRuntimeEnd } from '../../runtime/agent-session-runtime-end-record'
+import { openTestJournalHostDatabase } from '../agent-session-journal/journal-host-database-test-support'
+import { StructuredAgentSessionHost } from './structured-agent-session-host'
+import {
+  adapter,
+  attach,
+  hostTestState,
+  replaceHostTestState
+} from './structured-agent-session-host-test-harness'
+import {
+  HOST_TEST_NOW,
+  HOST_TEST_SESSION as SESSION,
+  HOST_TEST_THREAD as THREAD
+} from './structured-agent-session-host-test-data'
+import { createStructuredAgentSessionLogger } from './structured-agent-session-logger'
+import { claudeAndCodexDeclared } from './structured-agent-session-adapter-router-test-support'
+
+const CUT_TURN = { provider: 'codex' as const, threadId: THREAD, turnId: 'cut-turn', ordinal: 1 }
+const LEGACY_TEXT =
+  'Codex stopped while this response was in progress. You can continue in this conversation.'
+
+let host: StructuredAgentSessionHost
+/** How the provider ends its open turn as it is stopped. */
+let providerEnd: Pick<AgentJournalTurnLifecycle, 'state' | 'outcome' | 'completedAt'>
+
+beforeEach(() => {
+  const state = hostTestState()
+  providerEnd = { state: 'interrupted', completedAt: HOST_TEST_NOW }
+  host = new StructuredAgentSessionHost({
+    agents: claudeAndCodexDeclared(),
+    logger: createStructuredAgentSessionLogger(),
+    store: state.store,
+    adapter: {
+      ...adapter(),
+      closeSession: async () => {
+        const events = state.acquire.mock.calls.at(-1)?.[0]?.events
+        if (!events) {
+          throw new Error('missing provider event sink')
+        }
+        events.appendItem(
+          CUT_TURN,
+          {
+            kind: 'turn',
+            turnId: 'cut-turn',
+            startedAt: 1_000,
+            requestedAt: 1_000,
+            ...providerEnd
+          },
+          { turnScope: AGENT_JOURNAL_THREAD_SCOPE }
+        )
+        return true
+      }
+    },
+    journalDatabase: openTestJournalHostDatabase(state.root),
+    recoveryCapsule: new AgentSessionRecoveryCapsule(state.root),
+    claimKeyId: 'key-1',
+    mintSpawnToken: () => 'spawn-a',
+    now: () => HOST_TEST_NOW
+  })
+  replaceHostTestState({ store: state.store, host })
+})
+
+async function runningTurn(): Promise<void> {
+  await attach()
+  const events = hostTestState().acquire.mock.calls[0]?.[0].events
+  if (!events) {
+    throw new Error('missing provider event sink')
+  }
+  events.appendItem(
+    { provider: 'codex', threadId: THREAD, turnId: 'cut-turn', ordinal: 0 },
+    { kind: 'message', role: 'user', blocks: [{ type: 'text', text: 'long job' }] },
+    { turnScope: AGENT_JOURNAL_THREAD_SCOPE }
+  )
+  events.appendItem(
+    CUT_TURN,
+    { kind: 'turn', turnId: 'cut-turn', state: 'running', startedAt: 1_000, requestedAt: 1_000 },
+    { turnScope: AGENT_JOURNAL_THREAD_SCOPE }
+  )
+  await host.flushStreamedEvents(SESSION)
+}
+
+/** The Orca that ran the turn dies with no teardown; the next one starts over the same files and
+ *  finds the turn's owner gone. */
+async function restartAfterDeath(): Promise<void> {
+  const { root } = hostTestState()
+  beginAgentSessionRuntimeIncarnationForTest()
+  const store = await openTestAgentSessionRecordStore(root)
+  host = new StructuredAgentSessionHost({
+    agents: claudeAndCodexDeclared(),
+    logger: createStructuredAgentSessionLogger(),
+    store,
+    adapter: adapter(),
+    journalDatabase: openTestJournalHostDatabase(root),
+    recoveryCapsule: new AgentSessionRecoveryCapsule(root),
+    claimKeyId: 'key-1',
+    mintSpawnToken: () => 'spawn-next',
+    probeOwner: async () => ({ outcome: 'pid-absent' }),
+    now: () => HOST_TEST_NOW + 60_000
+  })
+  replaceHostTestState({ store, host })
+  await host.reconcileRestartLeases()
+}
+
+async function reread() {
+  await host.restoreReadableSessions([SESSION])
+  const { items } = await host.journalSnapshot(SESSION)
+  const turnItemId = items.find((item) => item.body.kind === 'turn')?.itemId
+  const stopRows = items.filter(
+    (item) =>
+      item.body.kind === 'status' && readAgentSessionOrcaStop(item.body.orcaStop) !== undefined
+  )
+  const readerErrors = withNativeChatCutTurnNotices(items, { agentName: 'Codex' }).flatMap(
+    (item) => (item.body.kind === 'status' && item.body.tone === 'error' ? [item.body.text] : [])
+  )
+  return { items, turnItemId, stopRows, readerErrors }
+}
+
+describe('the row a quit writes for the reply it cut', () => {
+  it.each(['update', 'quit'] as const)('names a %s on the cut turn, once', async (trigger) => {
+    await runningTurn()
+
+    await host.flushAllStreamedEvents({ trigger })
+
+    const { items, turnItemId, stopRows, readerErrors } = await reread()
+    expect(stopRows).toHaveLength(1)
+    const [row] = stopRows
+    expect(row?.body).toMatchObject({
+      kind: 'status',
+      text: LEGACY_TEXT,
+      tone: 'error',
+      failure: { kind: 'providerExited' },
+      presentation: 'orca-stop',
+      orcaStop: { cause: trigger }
+    })
+    expect(row?.turnScope).toEqual({ kind: 'turn', turnItemId })
+    // A client that reads no cause still prints exactly one row for the cut, in today's words.
+    expect(readerErrors).toEqual([LEGACY_TEXT])
+    expect(latestNativeChatOrcaStopCut(items, [])).toEqual({ turnItemId, cause: trigger })
+  })
+
+  it('writes nothing for a turn the provider finished during the stop', async () => {
+    providerEnd = { state: 'completed', outcome: 'success', completedAt: 1_500 }
+    await runningTurn()
+
+    await host.flushAllStreamedEvents({ trigger: 'update' })
+
+    const { stopRows, readerErrors } = await reread()
+    expect(stopRows).toEqual([])
+    expect(readerErrors).toEqual([])
+  })
+
+  it("writes nothing for a turn a person's Stop already ended", async () => {
+    providerEnd = { state: 'interrupted', outcome: 'cancellation', completedAt: 1_500 }
+    await runningTurn()
+
+    await host.flushAllStreamedEvents({ trigger: 'update' })
+
+    const { stopRows } = await reread()
+    expect(stopRows).toEqual([])
+  })
+
+  it('never calls an idle eviction a restart', async () => {
+    await runningTurn()
+
+    await host.close(SESSION, 'evict')
+
+    const { items, stopRows, readerErrors } = await reread()
+    expect(stopRows).toEqual([])
+    // The cut keeps today's derived notice, and offers no Continue.
+    expect(readerErrors).toEqual([LEGACY_TEXT])
+    expect(latestNativeChatOrcaStopCut(items, [])).toBeNull()
+  })
+})
+
+describe('the row a restart writes for a reply its Orca died in', () => {
+  it('says Orca stopped unexpectedly when the Orca before began no quit', async () => {
+    await runningTurn()
+
+    await restartAfterDeath()
+
+    const { items, turnItemId, stopRows, readerErrors } = await reread()
+    expect(stopRows).toHaveLength(1)
+    expect(stopRows[0]?.body).toMatchObject({
+      text: LEGACY_TEXT,
+      orcaStop: { cause: 'crash' }
+    })
+    expect(readerErrors).toEqual([LEGACY_TEXT])
+    expect(latestNativeChatOrcaStopCut(items, [])).toEqual({ turnItemId, cause: 'crash' })
+  })
+
+  it('names the update an unfinished quit began, never a crash', async () => {
+    await runningTurn()
+    // The quit recorded its end, then died before it stopped the agent.
+    recordAgentSessionRuntimeEnd('update', HOST_TEST_NOW)
+
+    await restartAfterDeath()
+
+    const { stopRows } = await reread()
+    expect(stopRows.map((row) => row.body)).toMatchObject([{ orcaStop: { cause: 'update' } }])
+  })
+
+  it('names no cause when the Orca before left no record of itself', async () => {
+    await runningTurn()
+    await rm(join(hostTestState().root, 'agent-session-runtimes'), { recursive: true, force: true })
+
+    await restartAfterDeath()
+
+    const { stopRows, readerErrors } = await reread()
+    expect(stopRows).toEqual([])
+    // The cut keeps today's words.
+    expect(readerErrors).toEqual([LEGACY_TEXT])
+  })
+})
+
+describe('an agent this Orca runs', () => {
+  it('is recorded as held by this runtime', async () => {
+    await runningTurn()
+    expect(hostTestState().store.getRecord(SESSION)?.lease.ownerProcess?.runtime).toBe(
+      agentSessionRuntimeIncarnation()
+    )
+  })
+
+  it('names no Orca cause when the agent dies while Orca runs', async () => {
+    await runningTurn()
+    const child = host.collaboratorsForTests().sessions.get(SESSION)!.child!
+
+    await host.handleAdapterEvent({
+      type: 'ended',
+      sessionId: SESSION,
+      reason: 'killed',
+      cause: 'unexpected-exit',
+      fence: child.fence,
+      acquisitionGeneration: child.generation!
+    })
+
+    await vi.waitFor(() =>
+      expect(hostTestState().store.getRecord(SESSION)?.lease.deathEvidence).toMatchObject({
+        kind: 'exit-observed'
+      })
+    )
+    expect(hostTestState().store.getRecord(SESSION)?.lease.deathEvidence).not.toHaveProperty(
+      'runtimeEnd'
+    )
+    const { stopRows } = await reread()
+    expect(stopRows).toEqual([])
+  })
+})
diff --git a/src/main/native-chat/agent-session-wire/structured-agent-session-stop-event-binding.test.ts b/src/main/native-chat/agent-session-wire/structured-agent-session-stop-event-binding.test.ts
index b5d33be6827d..9c9722de00bb 100644
--- a/src/main/native-chat/agent-session-wire/structured-agent-session-stop-event-binding.test.ts
+++ b/src/main/native-chat/agent-session-wire/structured-agent-session-stop-event-binding.test.ts
@@ -3,6 +3,7 @@
 // does a Stop of a start that never landed; a card it held, which Resume releases, and anything
 // sent after it end as their own. Turn rows name the send that opened them, as Codex writes them.
 
+import { structuredQueuePauses } from './structured-agent-session-queued-pause'
 import { afterEach, describe, expect, it, vi } from 'vitest'
 import { agentJournalSubmissionKey } from '../../../shared/agent-session-journal-item-key'
 import {
@@ -128,6 +129,13 @@ async function mailTurn(): Promise<void> {
 }
 
 /** The host evicts the chat; the Stop events as its provider close finds them. */
+/** The person's Stop still pauses the reopened chat. The close hides its row, as every close of a
+ *  chat does: nothing runs there until its next turn. */
+async function stillStopped(): Promise<boolean> {
+  expect(await rig.queuePause()).toBeNull()
+  return structuredQueuePauses(journal()).some((pause) => pause.reason === 'stopped')
+}
+
 async function evictedAt(): Promise<string[]> {
   let atClose: JournalStopEvent[] = []
   rig.closeSession.mockImplementationOnce(async () => {
@@ -371,7 +379,7 @@ describe('a host stop with no turn running after a Stop that named none', () =>
       expect(journal().stopMarks.latest()?.event).not.toHaveProperty('turnId')
 
       expect(await evictedAt()).toEqual(['user-stop'])
-      expect(await rig.queuePause()).toMatchObject({ reason: 'stopped' })
+      expect(await stillStopped()).toBe(true)
       expect(await rig.handoff(card)).toBeUndefined()
     }
   )
@@ -386,7 +394,7 @@ describe('a host stop with no turn running after a Stop that named none', () =>
     expect(await rig.stop()).toMatchObject({ ok: true, value: { cancelled: false } })
 
     expect(await evictedAt()).toEqual(['user-stop'])
-    expect(await rig.queuePause()).toMatchObject({ reason: 'stopped' })
+    expect(await stillStopped()).toBe(true)
     expect(await rig.handoff(card)).toBeUndefined()
   })
 
diff --git a/src/main/native-chat/agent-session-wire/structured-agent-session-stop-event-entries.test.ts b/src/main/native-chat/agent-session-wire/structured-agent-session-stop-event-entries.test.ts
index 3f1afc89d6bc..17a274d6f5fc 100644
--- a/src/main/native-chat/agent-session-wire/structured-agent-session-stop-event-entries.test.ts
+++ b/src/main/native-chat/agent-session-wire/structured-agent-session-stop-event-entries.test.ts
@@ -251,7 +251,9 @@ describe('every Stop entry writes its event, with its reason, before it ends the
       await rig.host.close(HOST_TEST_SESSION, 'evict')
 
       expect(atClose.events?.map((event) => event.reason)).toEqual(['user-stop'])
-      expect(await rig.queuePause()).toEqual({ reason: 'stopped' })
+      // The close hides the row, as every close of a chat does; the Stop still pauses.
+      expect(await rig.queuePause()).toBeNull()
+      expect(structuredQueuePauses(journal()).map((pause) => pause.reason)).toContain('stopped')
     },
     20_000
   )
diff --git a/src/main/native-chat/agent-session-wire/structured-agent-session-transition.ts b/src/main/native-chat/agent-session-wire/structured-agent-session-transition.ts
index f13b897f12bd..4c73941ee5dc 100644
--- a/src/main/native-chat/agent-session-wire/structured-agent-session-transition.ts
+++ b/src/main/native-chat/agent-session-wire/structured-agent-session-transition.ts
@@ -57,6 +57,8 @@ export type StructuredAgentSessionTransition = {
   steps: readonly StructuredAgentSessionTransitionStep[]
   /** Rides the sink's lifecycle budget: it ends or settles something. */
   lifecycle: boolean
+  /** Internal admission only, for a provider's bounded tail after finalization. */
+  finalTail?: true
   /** Announce the writes once they land, when any step wrote. */
   publish: boolean
 }
@@ -88,6 +90,7 @@ function transitionAppend(
         transition.steps.reduce((total, step) => total + step.reservedBytes, 0) +
         (transition.publish ? 1 : 0),
       lifecycle: transition.lifecycle,
+      finalTail: transition.finalTail,
       run: async (bound) => {
         const { journal, fence } = bound
         const wrote = await journal.appendSteps(
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 4f575c1473be..200ce5a338ab 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
@@ -44,6 +44,7 @@ import {
   journalOpenRefusal
 } from '../agent-session-journal/journal-open-failure'
 import type { StructuredAgentSessionLogger } from './structured-agent-session-logger'
+import { isAgentSessionAttachmentExpiredError } from '../agent-session-attachments/agent-session-attachment-claims'
 import type { StructuredAgentRegistry } from './structured-agent-registry'
 export { performSetOption } from './structured-agent-session-turns-options'
 export { performPrompt } from './structured-agent-session-turns-prompt'
@@ -86,6 +87,17 @@ function invalid(
   return { ok: false, refusal: refuse('agent_session_operation_invalid', { reason }, message) }
 }
 
+/** A message naming an attachment this host no longer stores is refused whole, before delivery. */
+export function agentSessionAttachmentExpiredRefusal(): {
+  ok: false
+  refusal: AgentSessionWireRefusal
+} {
+  return invalid(
+    'attachmentExpired',
+    'A chat attachment in this message is no longer stored on the host, so it was not sent.'
+  )
+}
+
 /** A thrown adapter error is indistinguishable from a lost reply, so it settles as `unknown`
  *  rather than as a rejection — unless the child had not proven its start. A dispatch to such a
  *  child throws only when the start failed before the write (a write's own failure is an outcome,
@@ -159,6 +171,9 @@ export async function performSend(
       ctx.operationReceipt
     )
   } catch (error) {
+    if (isAgentSessionAttachmentExpiredError(error)) {
+      return agentSessionAttachmentExpiredRefusal()
+    }
     // Damage SQLite proves is the chat's, and no retry writes past it: say so, as an open does. So
     // does a chat holding a newer Orca's rows, which only an update writes past, and a refusal the
     // journal already classified (a failed transaction that will not roll back).
diff --git a/src/main/native-chat/agent-session-wire/structured-agent-session-unrun-send-hold.test.ts b/src/main/native-chat/agent-session-wire/structured-agent-session-unrun-send-hold.test.ts
index 5112b6ff74de..fe6a29cdcae6 100644
--- a/src/main/native-chat/agent-session-wire/structured-agent-session-unrun-send-hold.test.ts
+++ b/src/main/native-chat/agent-session-wire/structured-agent-session-unrun-send-hold.test.ts
@@ -1,13 +1,14 @@
 // A message handed to an agent whose start never answers provably never ran: its CLI takes no
 // message before it answers initialize. So when the chat ends then, the message is settled as a
 // queued one is for the same end (`journal-unsent-send-hold.ts`): a quit or a close keeps a
-// person's words as a held card, a person's Stop withdraws it. Against the real host, store and
+// person's words as an ordinary card that waits for the chat's next turn, a person's Stop
+// withdraws it. Against the real host, store and
 // journal, with an agent that stays starting.
 
 import { afterEach, beforeEach, describe, expect, it } from 'vitest'
 import { agentSessionFailureFact } from '../../../shared/agent-session-failure'
 import { agentSessionFailureWords } from '../../../shared/agent-session-failure-words'
-import { QUEUED_MESSAGE_PAUSED_KEPT } from '../../../shared/agent-session-queued-message-wire'
+import { structuredQueuePauses } from './structured-agent-session-queued-pause'
 import {
   createQueuedMessageTestRig,
   eventually,
@@ -17,7 +18,17 @@ import { HOST_TEST_SESSION as SESSION } from './structured-agent-session-host-te
 
 const words = (kind: 'hostRestarted' | 'chatClosed' | 'cancelled') =>
   agentSessionFailureWords(agentSessionFailureFact(kind), { surface: 'rejection' })
-const KEPT = { state: 'waiting', paused: true }
+/** A kept send: an ordinary waiting card, with no hold of its own. */
+const KEPT = { state: 'waiting' }
+
+/** What holds the queue, derived from the open journal. */
+function derivedPauses(): string[] {
+  const journal = rig.host.collaboratorsForTests().sessions.get(SESSION)?.journal
+  if (!journal) {
+    throw new Error('expected the conversation open')
+  }
+  return structuredQueuePauses(journal).map((pause) => pause.reason)
+}
 
 let rig: QueuedMessageTestRig
 
@@ -47,7 +58,7 @@ async function handedToHungStart(text: string): Promise<string> {
 }
 
 describe('a message handed to a start that never answered, then the chat ends', () => {
-  it('is a held card after a quit, rejected as a restart, as a queued one is', async () => {
+  it('is a card after a quit, rejected as a restart, held by the reopen until a turn', async () => {
     const id = await handedToHungStart('kept through quit')
     await rig.quitRestartHostProcess()
 
@@ -59,7 +70,8 @@ describe('a message handed to a start that never answered, then the chat ends',
     expect(await rig.drafts()).toEqual([{ messageId: id, ...KEPT }])
     const [card] =
       rig.host.collaboratorsForTests().sessions.get(SESSION)?.journal.queuedMessages.list() ?? []
-    expect(card).toMatchObject({ holdReason: QUEUED_MESSAGE_PAUSED_KEPT })
+    expect(card).toMatchObject({ holdReason: null })
+    expect(derivedPauses()).toEqual(['restarted'])
     // Nothing ran, so there is nothing to resume: the card alone holds the words.
     expect(await rig.restartOffers()).toEqual([])
   })
@@ -81,7 +93,7 @@ describe('a message handed to a start that never answered, then the chat ends',
   })
 
   it.each(['user-close', 'evict'] as const)(
-    'is a held card after a %s, rejected as closed, as a queued one is',
+    'is a card after a %s, rejected as closed, held by the reopen until a turn',
     async (cause) => {
       const id = await handedToHungStart('kept at close')
       await rig.host.close(SESSION, cause)
@@ -93,6 +105,7 @@ describe('a message handed to a start that never answered, then the chat ends',
         keptAsQueuedMessageId: id
       })
       expect(await rig.drafts()).toEqual([{ messageId: id, ...KEPT }])
+      expect(derivedPauses()).toEqual(['restarted'])
     }
   )
 
diff --git a/src/main/native-chat/agent-session-wire/structured-agent-session-unsent-send-hold.test.ts b/src/main/native-chat/agent-session-wire/structured-agent-session-unsent-send-hold.test.ts
index d3a658d42657..3f33335fcf78 100644
--- a/src/main/native-chat/agent-session-wire/structured-agent-session-unsent-send-hold.test.ts
+++ b/src/main/native-chat/agent-session-wire/structured-agent-session-unsent-send-hold.test.ts
@@ -1,23 +1,25 @@
 // A message the host accepted while the agent was starting, then Orca quit or crashed, or the chat
-// closed, before handing it over: it is kept as a held card at the head of the queue, never sent on
-// its own, and released only by the person's own Send, Edit or Delete on it. Against the real host,
-// store and journal.
+// closed, before handing it over: it is kept as an ordinary card at the head of the queue, never
+// sent on its own; like every card the chat closed with, it follows the chat's next accepted turn
+// (or a Resume, Send now, Edit or Delete). Against the real host, store and journal.
 
 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 { computeAgentSessionPayloadFingerprint } from '../../../shared/agent-session-mutation-envelope'
-import { QUEUED_MESSAGE_PAUSED_KEPT } from '../../../shared/agent-session-queued-message-wire'
 import type { AgentMessageSource } from '../../../shared/agent-session-message-source'
 import { projectStructuredAgentSessionMessages } from '../../../shared/structured-agent-session-message-projection'
-import { createStructuredAgentSessionOutboxEntry } from '../../../shared/structured-agent-session-outbox'
+import { structuredAgentSessionSendBody } from '../../../shared/structured-agent-session-send-mutation'
 import { AgentSessionJournal } from '../agent-session-journal/journal-store'
 import { JournalQueuedMessages } from '../agent-session-journal/journal-queued-messages'
 import { openAgentSessionJournal } from '../agent-session-journal/journal-store-factory'
 import { openTestJournalHostDatabase } from '../agent-session-journal/journal-host-database-test-support'
 import { journalIdentityFor } from './structured-agent-session-attach'
 import { attachParamsForRecord } from './structured-agent-session-conversation-open'
-import { structuredAgentSessionHostInstance } from './structured-agent-session-queued-pause'
+import {
+  structuredAgentSessionHostInstance,
+  structuredQueuePauses
+} from './structured-agent-session-queued-pause'
 import {
   createQueuedMessageTestRig,
   eventually,
@@ -48,7 +50,8 @@ const HOST_RESTARTED = agentSessionFailureWords(agentSessionFailureFact('hostRes
 const CHAT_CLOSED = agentSessionFailureWords(agentSessionFailureFact('chatClosed'), {
   surface: 'rejection'
 })
-const KEPT = { state: 'waiting', paused: true }
+/** A kept send: an ordinary waiting card, with no hold of its own. */
+const KEPT = { state: 'waiting' }
 
 let rig: QueuedMessageTestRig
 
@@ -133,33 +136,36 @@ describe('a message accepted while the agent starts, then Orca stops', () => {
   it.each([
     { how: 'quit', restart: () => quitRestart() },
     { how: 'crash', restart: async () => rig.crashRestartHostProcess() }
-  ])('is a held card after a $how, and its submission is rejected unseen', async ({ restart }) => {
-    const id = await acceptWhileStarting(sendRequest('hello after restart'))
-    await restart()
+  ])(
+    'is a waiting card after a $how, and its submission is rejected unseen',
+    async ({ restart }) => {
+      const id = await acceptWhileStarting(sendRequest('hello after restart'))
+      await restart()
 
-    expect(await rig.drafts()).toEqual([{ messageId: id, ...KEPT }])
-    // Held on its own: no queue-wide pause, so no Resume to press.
-    expect(await rig.queuePause()).toBeNull()
-    expect(await rig.submission(id)).toMatchObject({
-      dispatchState: 'rejected',
-      ...HOST_RESTARTED,
-      origin: 'client',
-      source: { kind: 'user' }
-    })
-    const [card] = journal().queuedMessages.list()
-    expect(card).toMatchObject({
-      messageId: id,
-      holdReason: QUEUED_MESSAGE_PAUSED_KEPT,
-      hostInstance: structuredAgentSessionHostInstance(),
-      body: hostTestMessage('hello after restart'),
-      queuedAt: { epoch: journal().epoch, sequence: expect.any(Number) }
-    })
-    // Nothing is sent on its own, however many times the chat reopens.
-    await rig.host.close(SESSION, 'evict')
-    rig.crashRestartHostProcess()
-    expect(await rig.drafts()).toEqual([{ messageId: id, ...KEPT }])
-    expect(rig.dispatch).not.toHaveBeenCalled()
-  })
+      expect(await rig.drafts()).toEqual([{ messageId: id, ...KEPT }])
+      // Nothing runs in the chat, so no paused row: it waits for the chat's next turn.
+      expect(await rig.queuePause()).toBeNull()
+      expect(await rig.submission(id)).toMatchObject({
+        dispatchState: 'rejected',
+        ...HOST_RESTARTED,
+        origin: 'client',
+        source: { kind: 'user' }
+      })
+      const [card] = journal().queuedMessages.list()
+      expect(card).toMatchObject({
+        messageId: id,
+        holdReason: null,
+        hostInstance: structuredAgentSessionHostInstance(),
+        body: hostTestMessage('hello after restart'),
+        queuedAt: { epoch: journal().epoch, sequence: expect.any(Number) }
+      })
+      // Nothing is sent on its own, however many times the chat reopens.
+      await rig.host.close(SESSION, 'evict')
+      rig.crashRestartHostProcess()
+      expect(await rig.drafts()).toEqual([{ messageId: id, ...KEPT }])
+      expect(rig.dispatch).not.toHaveBeenCalled()
+    }
+  )
 
   it('quit writes nothing for it: no closed-chat rejection, still queued until the next open', async () => {
     const id = await acceptWhileStarting(sendRequest('kept through quit'))
@@ -182,33 +188,32 @@ describe('a message accepted while the agent starts, then Orca stops', () => {
   })
 })
 
-describe('only an action on the card releases a kept card', () => {
-  it('a later message is delivered alone; Resume sends nothing; its own Send sends it once', async () => {
+// R13-1: a kept send waits in order, like every card the chat closed with, and follows the
+// chat's next accepted turn; no "press Send" step.
+describe('the next accepted turn releases a kept card', () => {
+  it('a later message runs first, then the card follows it in order', async () => {
     const id = await acceptWhileStarting(sendRequest('the kept words'))
     await quitRestart()
 
-    // The person types the same words again, as one who cannot see cards would.
-    const retyped = rig.send('the kept words')
-    await retyped.result
+    const next = rig.send('a new request')
+    await next.result
     await eventually(async () =>
-      expect((await rig.submission(retyped.id))?.handedOverAt).toBeDefined()
+      expect((await rig.submission(next.id))?.handedOverAt).toBeDefined()
     )
-    await rig.settleAccepted(retyped.id, 'retyped')
-    await new Promise((resolve) => setTimeout(resolve, 100))
-    expect(dispatchedTexts()).toEqual(['the kept words'])
-    expect(await rig.drafts()).toEqual([{ messageId: id, ...KEPT }])
-
-    await rig.resume()
-    await new Promise((resolve) => setTimeout(resolve, 100))
     expect(await rig.handoff(id)).toBeUndefined()
-    expect(await rig.drafts()).toEqual([{ messageId: id, ...KEPT }])
+    await rig.settleAccepted(next.id, 'next')
+    await eventually(() => expect(dispatchedTexts()).toEqual(['a new request', 'the kept words']))
+    expect(await rig.handoff(id)).toMatchObject({ origin: 'host' })
+  })
 
-    expect(await rig.sendNow(id)).toMatchObject({ ok: true })
-    const handoff = await rig.handoff(id)
-    expect(handoff?.clientMessageId).not.toBe(id)
-    expect(handoff).toMatchObject({ origin: 'client' })
-    await eventually(() => expect(dispatchedTexts()).toEqual(['the kept words', 'the kept words']))
-    expect(await rig.drafts()).toEqual([])
+  it('a Resume sends it, and nothing sends it before', async () => {
+    const id = await acceptWhileStarting(sendRequest('resume me'))
+    await quitRestart()
+    await new Promise((resolve) => setTimeout(resolve, 100))
+    expect(rig.dispatch).not.toHaveBeenCalled()
+    expect(await rig.resume()).toMatchObject({ ok: true, value: { resumed: true } })
+    await eventually(() => expect(dispatchedTexts()).toEqual(['resume me']))
+    expect(await rig.handoff(id)).toBeDefined()
   })
 
   it('Send now sends it at once, and Delete removes it', async () => {
@@ -249,15 +254,11 @@ describe('only an action on the card releases a kept card', () => {
     if (!page.ok) {
       throw new Error('history refused')
     }
+    // The sending desktop's own bubble, had it not settled yet.
     const lingering = {
-      ...createStructuredAgentSessionOutboxEntry({
-        clientMessageId: id,
-        sessionId: SESSION,
-        text: 'the kept words',
-        attachments: [],
-        queuedAt: 1
-      }),
-      state: 'rejected' as const
+      clientMessageId: id,
+      body: structuredAgentSessionSendBody('the kept words', []),
+      queuedAt: 1
     }
     const shown = projectStructuredAgentSessionMessages(
       page.page.items,
@@ -273,7 +274,7 @@ describe('only an action on the card releases a kept card', () => {
     expect(await rig.drafts()).toEqual([])
   })
 
-  it('a Stop on the reopened chat leaves it kept: the open settles it before the Stop runs', async () => {
+  it('a Stop on the reopened chat leaves its card waiting: the open settles it before the Stop runs', async () => {
     const id = await acceptWhileStarting(sendRequest('survives a stop'))
     await rig.crashRestartHostProcess()
 
@@ -283,26 +284,33 @@ describe('only an action on the card releases a kept card', () => {
     expect(await rig.submission(id)).toMatchObject({ dispatchState: 'rejected', ...HOST_RESTARTED })
   })
 
-  // A Send now cut short by a quit hands the card back kept, so a retyped copy still goes alone.
-  // After a second restart the kept card is another process's, yet it pauses nothing else.
-  it('a later restart leaves the cards queued after it unpaused', async () => {
+  // Another restart before any turn: the card still waits, and the first turn there releases it
+  // ahead of the cards queued behind that turn.
+  it('a second restart still holds it; the next turn sends it before the cards queued after', async () => {
     const id = await acceptWhileStarting(sendRequest('kept twice over'))
     await quitRestart()
     expect(await rig.drafts()).toEqual([{ messageId: id, ...KEPT }])
     rig.crashRestartHostProcess()
+    await new Promise((resolve) => setTimeout(resolve, 100))
+    expect(rig.dispatch).not.toHaveBeenCalled()
     const working = await rig.workingSend()
     const later = rig.send('queued after the restart', 'queue-if-active')
     expect(await later.result).toMatchObject({ ok: true, value: { queued: { state: 'waiting' } } })
 
     expect(await rig.queuePause()).toBeNull()
     await rig.settleAccepted(working, 'working')
+    await eventually(() => expect(dispatchedTexts()).toEqual(['work on this', 'kept twice over']))
+    await rig.settleAccepted(await rig.handoffId(id), 'kept')
     await eventually(() =>
-      expect(dispatchedTexts()).toEqual(['work on this', 'queued after the restart'])
+      expect(dispatchedTexts()).toEqual([
+        'work on this',
+        'kept twice over',
+        'queued after the restart'
+      ])
     )
-    expect(await rig.drafts()).toEqual([{ messageId: id, ...KEPT }])
   })
 
-  it('stays kept when its own Send is cut short by another quit', async () => {
+  it('its own Send cut short by another quit brings it back at the head, waiting', async () => {
     const id = await acceptWhileStarting(sendRequest('the kept words'))
     await quitRestart()
     expect(await rig.drafts()).toEqual([{ messageId: id, ...KEPT }])
@@ -321,16 +329,9 @@ describe('only an action on the card releases a kept card', () => {
     await quitRestart()
 
     expect(await rig.drafts()).toEqual([{ messageId: id, ...KEPT }])
-    expect(journal().queuedMessages.get(id)?.holdReason).toBe(QUEUED_MESSAGE_PAUSED_KEPT)
-    const retyped = rig.send('the kept words')
-    await retyped.result
-    await eventually(async () =>
-      expect((await rig.submission(retyped.id))?.handedOverAt).toBeDefined()
-    )
-    await rig.settleAccepted(retyped.id, 'retyped')
+    expect(journal().queuedMessages.get(id)?.holdReason).toBeNull()
     await new Promise((resolve) => setTimeout(resolve, 100))
-    expect(dispatchedTexts()).toEqual(['the kept words'])
-    expect(await rig.drafts()).toEqual([{ messageId: id, ...KEPT }])
+    expect(rig.dispatch).not.toHaveBeenCalled()
   })
 })
 
@@ -437,8 +438,8 @@ describe('the queue at a quit', () => {
     }
   )
 
-  // The card the person pushed ahead waits for their own Send; Resume sends the rest.
-  it('Send now on an ordinary card, cut short by a quit, returns it kept while Resume sends the rest', async () => {
+  // The card the person pushed ahead comes back at the head; Resume sends it, then the rest.
+  it('Send now on an ordinary card, cut short by a quit, returns it to the head; Resume sends both in order', async () => {
     await compactRunning()
     const first = rig.send('first queued', 'queue-if-active')
     await first.result
@@ -455,9 +456,9 @@ describe('the queue at a quit', () => {
     ])
     expect(await rig.queuePause()).toBeNull()
     await rig.resume()
-    await eventually(() => expect(dispatchedTexts()).toEqual(['first queued']))
-    await new Promise((resolve) => setTimeout(resolve, 100))
-    expect(await rig.drafts()).toEqual([{ messageId: pushed.id, ...KEPT }])
+    await eventually(() => expect(dispatchedTexts()).toEqual(['pushed ahead']))
+    await rig.settleAccepted(await rig.handoffId(pushed.id), 'pushed')
+    await eventually(() => expect(dispatchedTexts()).toEqual(['pushed ahead', 'first queued']))
   })
 })
 
@@ -465,7 +466,7 @@ describe('the queue at a quit', () => {
 // chat, and the chat can be reopened from its history.
 describe('a message accepted while the agent starts, then the chat closes', () => {
   it.each(['user-close', 'evict'] as const)(
-    'after a %s it is a held card the reopened chat shows, rejected as closed',
+    'after a %s it is a waiting card the reopened chat shows, rejected as closed',
     async (cause) => {
       const id = await acceptWhileStarting(sendRequest('kept at close'))
       await closeWhileStarting(cause)
@@ -488,9 +489,9 @@ describe('a message accepted while the agent starts, then the chat closes', () =
         .join('|')
       expect(texts).not.toContain('kept at close')
       expect(page.page.queuedMessages?.[0]).toMatchObject({
-        body: hostTestMessage('kept at close'),
-        pausedReason: QUEUED_MESSAGE_PAUSED_KEPT
+        body: hostTestMessage('kept at close')
       })
+      expect(page.page.queuedMessages?.[0]).not.toHaveProperty('paused')
       expect(rig.dispatch).not.toHaveBeenCalled()
     }
   )
@@ -499,7 +500,7 @@ describe('a message accepted while the agent starts, then the chat closes', () =
 // The desktop's outbox keeps an unconfirmed send and sends it again, under the same id, once the
 // app is back. That replay meets the card the open made from the same send.
 describe('the same send arriving again after the restart', () => {
-  it('a client that never asked to queue is answered from its own record: one card, still held, nothing sent', async () => {
+  it('a client that never asked to queue is answered from its own record: one card, still waiting, nothing sent', async () => {
     const request = sendRequest('sent again by the outbox')
     const id = await acceptWhileStarting(request)
     await quitRestart()
@@ -521,16 +522,17 @@ describe('the same send arriving again after the restart', () => {
     await new Promise((resolve) => setTimeout(resolve, 100))
     expect(rig.dispatch).not.toHaveBeenCalled()
 
-    // Retry on such a client sends the words under a new id: delivered once, the card still held.
+    // Retry on such a client sends the words under a new id, and the card follows that turn, as
+    // every card the chat closed with does: the same words twice, by the one rule.
     const retried = rig.send('sent again by the outbox')
     await retried.result
     await eventually(async () =>
       expect((await rig.submission(retried.id))?.handedOverAt).toBeDefined()
     )
     await rig.settleAccepted(retried.id, 'retried')
-    await new Promise((resolve) => setTimeout(resolve, 100))
-    expect(dispatchedTexts()).toEqual(['sent again by the outbox'])
-    expect(await rig.drafts()).toEqual([{ messageId: id, ...KEPT }])
+    await eventually(() =>
+      expect(dispatchedTexts()).toEqual(['sent again by the outbox', 'sent again by the outbox'])
+    )
   })
 
   it('a client that asked to queue is told the host holds it', async () => {
@@ -624,8 +626,8 @@ describe('what is not kept', () => {
   })
 })
 
-describe('/clear carries a kept card still held', () => {
-  it('a turn in the new conversation never releases it', async () => {
+describe('/clear carries a kept card', () => {
+  it('the first turn in the new conversation releases it, after that turn', async () => {
     const id = await acceptWhileStarting(sendRequest('carried through clear'))
     await quitRestart()
     expect(await rig.drafts()).toHaveLength(1)
@@ -639,8 +641,8 @@ describe('/clear carries a kept card still held', () => {
       throw new Error('expected a replacement session')
     }
     expect(await rig.drafts(replacementId)).toEqual([{ messageId: id, ...KEPT }])
-    const carried = rig.host.collaboratorsForTests().sessions.get(replacementId)?.journal
-    expect(carried?.queuedMessages.list()[0]?.holdReason).toBe(QUEUED_MESSAGE_PAUSED_KEPT)
+    // Nothing runs in the fresh conversation, so no paused row.
+    expect(await rig.queuePause(replacementId)).toBeNull()
 
     const body = hostTestMessage('first turn after the clear')
     const turn = await rig.host.send(QUEUED_RIG_CALLER, {
@@ -670,9 +672,131 @@ describe('/clear carries a kept card still held', () => {
       clientMessageId: turnId,
       providerIdentity: { provider: 'codex', threadId: 'thread-1', turnId: 'turn-x', ordinal: 0 }
     })
+    await eventually(() =>
+      expect(dispatchedTexts()).toEqual(['first turn after the clear', 'carried through clear'])
+    )
+  })
+})
+
+// One rule for a chat that was not running: a card queued while it ran drains as its turn ends,
+// and a card it closed with waits for its next accepted turn, written down by the reopen's mark.
+describe("the reopen's mark", () => {
+  it('a card queued mid-turn drains when that turn ends, with no reopen and no mark', async () => {
+    const marks = vi.spyOn(AgentSessionJournal.prototype, 'appendQueueReopen')
+    const working = await rig.workingSend()
+    const queued = rig.send('queued mid-turn', 'queue-if-active')
+    expect(await queued.result).toMatchObject({ ok: true, value: { queued: { state: 'waiting' } } })
+    await rig.settleAccepted(working, 'working')
+    await eventually(() => expect(dispatchedTexts()).toEqual(['work on this', 'queued mid-turn']))
+    expect(marks).not.toHaveBeenCalled()
+  })
+
+  it.each(['user-close', 'evict'] as const)(
+    'a %s and a reopen in the same process: the card waits for the next turn',
+    async (cause) => {
+      const working = await rig.workingSend()
+      const queued = rig.send('queued before the close', 'queue-if-active')
+      await queued.result
+      await rig.host.close(SESSION, cause)
+      expect(await rig.drafts()).toEqual([{ messageId: queued.id, state: 'waiting' }])
+      await new Promise((resolve) => setTimeout(resolve, 100))
+      expect(await rig.handoff(queued.id)).toBeUndefined()
+      expect(dispatchedTexts()).toEqual(['work on this'])
+      void working
+
+      const next = rig.send('after the reopen')
+      await next.result
+      await eventually(async () =>
+        expect((await rig.submission(next.id))?.handedOverAt).toBeDefined()
+      )
+      await rig.settleAccepted(next.id, 'next')
+      await eventually(() =>
+        expect(dispatchedTexts()).toEqual([
+          'work on this',
+          'after the reopen',
+          'queued before the close'
+        ])
+      )
+    }
+  )
+
+  // An idle eviction is Orca's own act: the person sees the same rows, and nothing new is held.
+  it('an idle-sweep eviction of a stopped chat writes nothing, and its Stop row stays', async () => {
+    await rig.dispose()
+    rig = await createQueuedMessageTestRig({ idleSweep: { idleMs: 0, intervalMs: 60 * 60 * 1000 } })
+    const marks = vi.spyOn(AgentSessionJournal.prototype, 'appendQueueReopen')
+    const working = await rig.workingSend()
+    const held = rig.send('held by the Stop', 'queue-if-active')
+    await held.result
+    expect(await rig.stop()).toMatchObject({ ok: true })
+    await rig.settleAccepted(working, 'stopped')
+    expect(await rig.queuePause()).toEqual({ reason: 'stopped' })
+
+    await rig.host.collaboratorsForTests().lifetime.idleSweep.tick()
+
+    expect(rig.closeSession).toHaveBeenCalledTimes(1)
+    // A chat with cards waiting keeps its handle, so no reopen can mark them.
+    expect(rig.host.collaboratorsForTests().sessions.has(SESSION)).toBe(true)
+    expect(await rig.queuePause()).toEqual({ reason: 'stopped' })
+    expect(await rig.handoff(held.id)).toBeUndefined()
+    expect(marks).not.toHaveBeenCalled()
+    // Kept only while a card waits: once the last one leaves, the next sweep drops it as usual.
+    expect(await rig.deleteQueued(held.id)).toMatchObject({ ok: true, value: { deleted: true } })
+    await rig.host.collaboratorsForTests().lifetime.idleSweep.tick()
+    expect(rig.host.collaboratorsForTests().sessions.has(SESSION)).toBe(false)
+  })
+
+  // The startup restore opens a visible chat through the same open as any reader.
+  it('a chat the startup restore reopens after a crash holds its cards', async () => {
+    const working = await rig.workingSend()
+    const queued = rig.send('queued behind work', 'queue-if-active')
+    await queued.result
+    void working
+    const sent = rig.dispatch.mock.calls.length
+    rig.crashRestartHostProcess()
+    await rig.host.restoreReadableSessions([SESSION])
+    expect(rig.host.collaboratorsForTests().sessions.has(SESSION)).toBe(true)
     await new Promise((resolve) => setTimeout(resolve, 100))
-    expect(await rig.drafts(replacementId)).toEqual([{ messageId: id, ...KEPT }])
-    expect(dispatchedTexts()).toEqual(['first turn after the clear'])
+    expect(await rig.handoff(queued.id)).toBeUndefined()
+    expect(rig.dispatch).toHaveBeenCalledTimes(sent)
+    expect(structuredQueuePauses(journal()).map((pause) => pause.reason)).toEqual(['restarted'])
+  })
+
+  it('an idle chat with no waiting card is closed and reopened without writing anything', async () => {
+    const marks = vi.spyOn(AgentSessionJournal.prototype, 'appendQueueReopen')
+    const working = await rig.workingSend()
+    await rig.settleAccepted(working, 'working')
+    const rows = (await rig.host.journalSnapshot(SESSION)).cursor
+    await rig.host.close(SESSION, 'evict')
+    expect(await rig.drafts()).toEqual([])
+    expect((await rig.host.journalSnapshot(SESSION)).cursor).toEqual(rows)
+    expect(marks).not.toHaveBeenCalled()
+  })
+
+  // Bookkeeping never gates the person: the open goes on, and the open itself is where the pause
+  // begins, so nothing sends by itself; the next turn releases the card, and the next open marks.
+  it('an open whose mark cannot be written still opens, and still holds the card', async () => {
+    const id = await acceptWhileStarting(sendRequest('kept, mark failed'))
+    vi.spyOn(console, 'warn').mockImplementation(() => undefined)
+    const marks = vi
+      .spyOn(AgentSessionJournal.prototype, 'appendQueueReopen')
+      .mockRejectedValueOnce(new Error('disk full'))
+    await quitRestart()
+
+    expect(await rig.drafts()).toEqual([{ messageId: id, ...KEPT }])
+    expect(marks).toHaveBeenCalledOnce()
+    await new Promise((resolve) => setTimeout(resolve, 100))
+    expect(rig.dispatch).not.toHaveBeenCalled()
+
+    const next = rig.send('a new request')
+    await next.result
+    await eventually(async () =>
+      expect((await rig.submission(next.id))?.handedOverAt).toBeDefined()
+    )
+    await rig.settleAccepted(next.id, 'next')
+    await eventually(() =>
+      expect(dispatchedTexts()).toEqual(['a new request', 'kept, mark failed'])
+    )
   })
 })
 
diff --git a/src/main/native-chat/agent-session-wire/structured-conversation-compaction.test.ts b/src/main/native-chat/agent-session-wire/structured-conversation-compaction.test.ts
index 9664aaf65573..a5db53e5555c 100644
--- a/src/main/native-chat/agent-session-wire/structured-conversation-compaction.test.ts
+++ b/src/main/native-chat/agent-session-wire/structured-conversation-compaction.test.ts
@@ -161,7 +161,7 @@ it('answers at handover, then journals its own entry, turn and result (B1, B16)'
     ok: true,
     value: { command: 'compact', state: 'completed' }
   })
-  await vi.waitFor(() => expect(compact).toHaveBeenCalledOnce())
+  await vi.waitFor(() => expect(compact).toHaveBeenCalledOnce(), { interval: 1 })
   finish({ outcome: 'success' })
 
   await vi.waitFor(async () =>
@@ -201,7 +201,7 @@ it('replays the reply for the same operation without running it again (B16)', as
   await attach()
   const params = compactParams()
   await state.host.conversationCommand(CALLER, params)
-  await vi.waitFor(() => expect(compact).toHaveBeenCalledOnce())
+  await vi.waitFor(() => expect(compact).toHaveBeenCalledOnce(), { interval: 1 })
   finish({ outcome: 'success' })
   await expect(state.host.conversationCommand(CALLER, params)).resolves.toMatchObject({
     ok: true,
@@ -214,7 +214,7 @@ it('holds messages sent during the command and delivers them after it, in order
   await attach()
   const params = compactParams()
   await state.host.conversationCommand(CALLER, params)
-  await vi.waitFor(() => expect(compact).toHaveBeenCalledOnce())
+  await vi.waitFor(() => expect(compact).toHaveBeenCalledOnce(), { interval: 1 })
   await expect(state.host.send(CALLER, sendParams('first'))).resolves.toMatchObject({ ok: true })
   await expect(state.host.send(CALLER, sendParams('second'))).resolves.toMatchObject({ ok: true })
   // Nothing is handed over while the command's turn runs.
@@ -227,7 +227,7 @@ it('holds messages sent during the command and delivers them after it, in order
   })
 
   // Delivered even though the command failed.
-  await vi.waitFor(() => expect(state.dispatch).toHaveBeenCalledTimes(2))
+  await vi.waitFor(() => expect(state.dispatch).toHaveBeenCalledTimes(2), { interval: 1 })
   expect(state.dispatch.mock.calls.map(([input]) => input.body.blocks)).toEqual([
     [{ type: 'text', text: 'first' }],
     [{ type: 'text', text: 'second' }]
@@ -246,7 +246,7 @@ it('holds messages sent during the command and delivers them after it, in order
 it('hands over a message held behind the command when the command ends just as the loop stops for it', async () => {
   await attach()
   await state.host.conversationCommand(CALLER, compactParams())
-  await vi.waitFor(() => expect(compact).toHaveBeenCalledOnce())
+  await vi.waitFor(() => expect(compact).toHaveBeenCalledOnce(), { interval: 1 })
   const { journal: live } = state.host['sessions'].get(SESSION)!
   const activeTurnId = live.activeTurnId
   let ended = false
@@ -269,7 +269,7 @@ it('hands over a message held behind the command when the command ends just as t
 
   await expect(state.host.send(CALLER, sendParams('held'))).resolves.toMatchObject({ ok: true })
 
-  await vi.waitFor(() => expect(state.dispatch).toHaveBeenCalledOnce())
+  await vi.waitFor(() => expect(state.dispatch).toHaveBeenCalledOnce(), { interval: 1 })
   expect(ended).toBe(true)
 })
 
@@ -289,7 +289,7 @@ it('settles a command the provider refused as a failure with its reason, and mov
   await state.host.conversationCommand(CALLER, params)
   await state.host.send(CALLER, sendParams('after the refusal'))
 
-  await vi.waitFor(() => expect(state.dispatch).toHaveBeenCalledOnce())
+  await vi.waitFor(() => expect(state.dispatch).toHaveBeenCalledOnce(), { interval: 1 })
   expect(readAgentJournalTurn((await commandTurn(cmid))?.body)).toMatchObject({
     state: 'completed',
     outcome: 'failure'
@@ -460,7 +460,7 @@ it('leaves the command to the provider when it takes the Stop, and ends it as ca
   const params = compactParams()
   const cmid = params.envelope.clientOperationId
   await state.host.conversationCommand(CALLER, params)
-  await vi.waitFor(() => expect(compact).toHaveBeenCalledOnce())
+  await vi.waitFor(() => expect(compact).toHaveBeenCalledOnce(), { interval: 1 })
   const { turnId } = structuredAgentSessionCommandTurn(cmid)
 
   await expect(stop(turnId)).resolves.toMatchObject({ ok: true, value: { cancelled: true } })
@@ -487,7 +487,7 @@ it('ends the command by stopping the child at a second Stop the provider never a
   const params = compactParams()
   const cmid = params.envelope.clientOperationId
   await state.host.conversationCommand(CALLER, params)
-  await vi.waitFor(() => expect(compact).toHaveBeenCalledOnce())
+  await vi.waitFor(() => expect(compact).toHaveBeenCalledOnce(), { interval: 1 })
   const { turnId } = structuredAgentSessionCommandTurn(cmid)
 
   // The provider takes the interrupt and then never answers it.
@@ -519,7 +519,7 @@ it('ends the command by stopping the child when the provider cannot take the Sto
   const params = compactParams()
   const cmid = params.envelope.clientOperationId
   await state.host.conversationCommand(CALLER, params)
-  await vi.waitFor(() => expect(compact).toHaveBeenCalledOnce())
+  await vi.waitFor(() => expect(compact).toHaveBeenCalledOnce(), { interval: 1 })
 
   await expect(stop(structuredAgentSessionCommandTurn(cmid).turnId)).resolves.toMatchObject({
     ok: true,
@@ -534,7 +534,7 @@ it('ends the command by stopping the child when the provider cannot take the Sto
   ])
   // The next message starts a child of its own.
   await state.host.send(CALLER, sendParams('after the stop'))
-  await vi.waitFor(() => expect(state.dispatch).toHaveBeenCalledOnce())
+  await vi.waitFor(() => expect(state.dispatch).toHaveBeenCalledOnce(), { interval: 1 })
   expect(state.acquire).toHaveBeenCalledTimes(2)
 })
 
@@ -543,7 +543,7 @@ it('does not stop the child for a Stop naming a command that already ended (B4)'
   state.cancelTurn.mockResolvedValue({ cancelled: false })
   const params = compactParams()
   await state.host.conversationCommand(CALLER, params)
-  await vi.waitFor(() => expect(compact).toHaveBeenCalledOnce())
+  await vi.waitFor(() => expect(compact).toHaveBeenCalledOnce(), { interval: 1 })
   finish({ outcome: 'success' })
   const { itemId, turnId } = structuredAgentSessionCommandTurn(params.envelope.clientOperationId)
   await vi.waitFor(async () =>
@@ -582,7 +582,7 @@ it("answers a refused command's message before ending its turn, so a crash betwe
   const params = compactParams()
   const cmid = params.envelope.clientOperationId
   await state.host.conversationCommand(CALLER, params)
-  await vi.waitFor(() => expect(crash).toHaveBeenCalled())
+  await vi.waitFor(() => expect(crash).toHaveBeenCalled(), { interval: 1 })
   crash.mockRestore()
 
   // Never an ended turn whose message still reads as in flight.
@@ -603,13 +603,13 @@ it("answers a refused command's message before ending its turn, so a crash betwe
 it('counts a message held behind the command from its handover, not its send', async () => {
   await attach()
   await state.host.conversationCommand(CALLER, compactParams())
-  await vi.waitFor(() => expect(compact).toHaveBeenCalledOnce())
+  await vi.waitFor(() => expect(compact).toHaveBeenCalledOnce(), { interval: 1 })
   const sent = await state.host.send(CALLER, sendParams('held'))
   expect(sent.ok).toBe(true)
   await new Promise((resolve) => setTimeout(resolve, 20))
   finish({ outcome: 'success' })
 
-  await vi.waitFor(() => expect(state.dispatch).toHaveBeenCalledOnce())
+  await vi.waitFor(() => expect(state.dispatch).toHaveBeenCalledOnce(), { interval: 1 })
   const [dispatched] = state.dispatch.mock.calls[0]!
   const submission = (await journal()).submissions.find(
     (entry) => entry.clientMessageId === dispatched.clientMessageId
@@ -653,7 +653,7 @@ it('writes one exit row when the child dies mid-command, and the loop writes not
   const params = compactParams()
   const cmid = params.envelope.clientOperationId
   await state.host.conversationCommand(CALLER, params)
-  await vi.waitFor(() => expect(compact).toHaveBeenCalledOnce())
+  await vi.waitFor(() => expect(compact).toHaveBeenCalledOnce(), { interval: 1 })
   await expect(state.host.send(CALLER, sendParams('queued behind it'))).resolves.toMatchObject({
     ok: true
   })
@@ -673,7 +673,7 @@ it('writes one exit row when the child dies mid-command, and the loop writes not
     expect(readAgentJournalTurn((await commandTurn(cmid))?.body)?.state).toBe('interrupted')
   )
   // Released from the command, the loop starts a child and delivers what waited behind it.
-  await vi.waitFor(() => expect(state.dispatch).toHaveBeenCalledOnce())
+  await vi.waitFor(() => expect(state.dispatch).toHaveBeenCalledOnce(), { interval: 1 })
   expect(state.acquire).toHaveBeenCalledTimes(2)
   const snapshot = await journal()
   expect(
@@ -702,7 +702,7 @@ it('delivers the next message after a command whose child died and whose settlem
   const params = compactParams()
   const cmid = params.envelope.clientOperationId
   await state.host.conversationCommand(CALLER, params)
-  await vi.waitFor(() => expect(compact).toHaveBeenCalledOnce())
+  await vi.waitFor(() => expect(compact).toHaveBeenCalledOnce(), { interval: 1 })
   const { journal: live } = state.host['sessions'].get(SESSION)!
   const appendLifecycleBatch = live.appendLifecycleBatch.bind(live)
   vi.spyOn(live, 'appendLifecycleBatch').mockImplementation((input) =>
@@ -729,7 +729,7 @@ it('delivers the next message after a command whose child died and whose settlem
   await expect(state.host.send(CALLER, sendParams('after it'))).resolves.toMatchObject({
     ok: true
   })
-  await vi.waitFor(() => expect(state.dispatch).toHaveBeenCalledOnce())
+  await vi.waitFor(() => expect(state.dispatch).toHaveBeenCalledOnce(), { interval: 1 })
   expect(state.acquire).toHaveBeenCalledTimes(2)
   expect(readAgentJournalTurn((await commandTurn(cmid))?.body)?.state).not.toBe('running')
 })
@@ -760,12 +760,12 @@ it("ignores an older build's unconfirmed compaction record, and answers its oper
   await expect(state.host.send(CALLER, sendParams('still works'))).resolves.toMatchObject({
     ok: true
   })
-  await vi.waitFor(() => expect(state.dispatch).toHaveBeenCalledOnce())
+  await vi.waitFor(() => expect(state.dispatch).toHaveBeenCalledOnce(), { interval: 1 })
   await expect(state.host.conversationCommand(CALLER, compactParams())).resolves.toMatchObject({
     ok: true,
     value: { state: 'completed' }
   })
-  await vi.waitFor(() => expect(compact).toHaveBeenCalledOnce())
+  await vi.waitFor(() => expect(compact).toHaveBeenCalledOnce(), { interval: 1 })
   finish({ outcome: 'success' })
   await vi.waitFor(async () =>
     expect((await journal()).submissions.every((entry) => entry.dispatchState === 'accepted')).toBe(
@@ -788,7 +788,7 @@ it('never lets a provider echo alias the command entry', async () => {
   await attach()
   const params = compactParams()
   await state.host.conversationCommand(CALLER, params)
-  await vi.waitFor(() => expect(compact).toHaveBeenCalledOnce())
+  await vi.waitFor(() => expect(compact).toHaveBeenCalledOnce(), { interval: 1 })
   finish({ outcome: 'success' })
   const events = state.acquire.mock.calls.at(-1)?.[0].events
   const echo = { provider: 'codex' as const, threadId: THREAD, turnId: 'later', ordinal: 0 }
@@ -806,7 +806,7 @@ it('never lets a provider echo alias the command entry', async () => {
 it('refuses a /compact pressed again under a new id while one runs, and runs one pressed after it ended', async () => {
   await attach()
   await state.host.conversationCommand(CALLER, compactParams())
-  await vi.waitFor(() => expect(compact).toHaveBeenCalledOnce())
+  await vi.waitFor(() => expect(compact).toHaveBeenCalledOnce(), { interval: 1 })
 
   expect(await state.host.conversationCommand(CALLER, compactParams())).toMatchObject({
     ok: false,
@@ -820,5 +820,5 @@ it('refuses a /compact pressed again under a new id while one runs, and runs one
       ok: true
     })
   )
-  await vi.waitFor(() => expect(compact).toHaveBeenCalledTimes(2))
+  await vi.waitFor(() => expect(compact).toHaveBeenCalledTimes(2), { interval: 1 })
 })
diff --git a/src/main/native-chat/claude-structured-managed-account-support.test.ts b/src/main/native-chat/claude-structured-managed-account-support.test.ts
deleted file mode 100644
index 8d6aa55783f4..000000000000
--- a/src/main/native-chat/claude-structured-managed-account-support.test.ts
+++ /dev/null
@@ -1,136 +0,0 @@
-import { describe, expect, it } from 'vitest'
-import { getSelectedClaudeAccountIdForTarget } from '../claude-accounts/runtime-selection'
-import {
-  structuredClaudeMatchesActiveManagedAccount,
-  type ClaudeManagedAccountGateSettings
-} from './claude-structured-managed-account-support'
-
-function account(id: string, managedAuthRuntime: 'host' | 'wsl') {
-  return {
-    id,
-    email: `${id}@example.com`,
-    managedAuthPath: `/managed/${id}`,
-    managedAuthRuntime,
-    authMethod: 'subscription-oauth' as const,
-    createdAt: 0,
-    updatedAt: 0,
-    lastAuthenticatedAt: 0
-  }
-}
-
-function settings(
-  overrides: Partial<ClaudeManagedAccountGateSettings>
-): ClaudeManagedAccountGateSettings {
-  return { claudeManagedAccounts: [], activeClaudeManagedAccountId: null, ...overrides }
-}
-
-describe('structuredClaudeMatchesActiveManagedAccount', () => {
-  it('allows an unmanaged install, where nothing claims an identity', () => {
-    expect(structuredClaudeMatchesActiveManagedAccount(settings({}))).toBe(true)
-  })
-
-  it('allows a selected host account, which the runtime syncs into the ambient config', () => {
-    expect(
-      structuredClaudeMatchesActiveManagedAccount(
-        settings({
-          claudeManagedAccounts: [account('host-1', 'host')],
-          activeClaudeManagedAccountIdsByRuntime: { host: 'host-1', wsl: {} }
-        })
-      )
-    ).toBe(true)
-  })
-
-  it('refuses a WSL-only managed account, which never reaches the ambient config', () => {
-    expect(
-      structuredClaudeMatchesActiveManagedAccount(
-        settings({
-          claudeManagedAccounts: [account('wsl-1', 'wsl')],
-          activeClaudeManagedAccountIdsByRuntime: { host: null, wsl: { Ubuntu: 'wsl-1' } }
-        })
-      )
-    ).toBe(false)
-  })
-
-  it('refuses when a host selection names an account that is WSL-bound or missing', () => {
-    expect(
-      structuredClaudeMatchesActiveManagedAccount(
-        settings({
-          claudeManagedAccounts: [account('wsl-1', 'wsl')],
-          activeClaudeManagedAccountIdsByRuntime: { host: 'wsl-1', wsl: {} }
-        })
-      )
-    ).toBe(false)
-    expect(
-      structuredClaudeMatchesActiveManagedAccount(
-        settings({
-          claudeManagedAccounts: [account('host-1', 'host')],
-          activeClaudeManagedAccountIdsByRuntime: { host: 'gone', wsl: {} }
-        })
-      )
-    ).toBe(false)
-  })
-
-  /** Absent and empty are the same answer: this user has no managed Claude accounts, so nothing
-   *  claims an identity and the ambient path is legitimate. Only settings that cannot be READ are
-   *  unknown. Treating a missing key as unknown strands profiles that simply never wrote it — the
-   *  auth policy's own predicate takes `(accounts ?? [])` for exactly this reason. */
-  it('treats an absent account list the same as an empty one', () => {
-    expect(
-      structuredClaudeMatchesActiveManagedAccount(settings({ claudeManagedAccounts: [] }))
-    ).toBe(true)
-    expect(
-      structuredClaudeMatchesActiveManagedAccount({
-        activeClaudeManagedAccountId: null
-      } as unknown as ClaudeManagedAccountGateSettings)
-    ).toBe(true)
-  })
-
-  it('fails closed when the settings cannot be read at all', () => {
-    expect(structuredClaudeMatchesActiveManagedAccount(null)).toBe(false)
-    expect(structuredClaudeMatchesActiveManagedAccount(undefined)).toBe(false)
-  })
-
-  /** THE discriminator, and the whole of this rule. With nothing selected for the host runtime the
-   *  settings alone cannot distinguish honest deselection from the WSL-only steady state, because
-   *  `pruneInvalidClaudeRuntimeSelection` empties the host slot in the second case and persists it.
-   *  So the presence of ANY WSL-bound account decides. Simplifying this to "none active ->
-   *  supported" re-opens the auth-identity misrepresentation this gate exists to prevent. */
-  it('splits none-active on whether a WSL-bound account exists at all', () => {
-    const noneActive = (accounts: ReturnType<typeof account>[]) =>
-      structuredClaudeMatchesActiveManagedAccount(
-        settings({
-          claudeManagedAccounts: accounts,
-          activeClaudeManagedAccountIdsByRuntime: { host: null, wsl: {} }
-        })
-      )
-
-    expect(noneActive([account('host-1', 'host')])).toBe(true)
-    expect(noneActive([account('host-1', 'host'), account('host-2', 'host')])).toBe(true)
-    expect(noneActive([account('wsl-1', 'wsl')])).toBe(false)
-    // Mixed list still refuses: the WSL account is present and nothing is selected.
-    expect(noneActive([account('host-1', 'host'), account('wsl-1', 'wsl')])).toBe(false)
-  })
-
-  /** The gate and the auth policy must resolve the SAME account. A legacy settings blob carries the
-   *  selection only in the flat `activeClaudeManagedAccountId`, which is where the accessor's
-   *  fall-through lives — reading the runtime map directly silently disagrees with the policy. */
-  it('resolves the same account as the auth policy on a legacy flat selection', () => {
-    const legacy = settings({
-      claudeManagedAccounts: [account('host-1', 'host')],
-      activeClaudeManagedAccountId: 'host-1'
-    })
-
-    expect(getSelectedClaudeAccountIdForTarget(legacy, { runtime: 'host' })).toBe('host-1')
-    expect(structuredClaudeMatchesActiveManagedAccount(legacy)).toBe(true)
-  })
-
-  it('agrees with the auth policy that a legacy flat WSL selection is refused', () => {
-    const legacy = settings({
-      claudeManagedAccounts: [account('wsl-1', 'wsl')],
-      activeClaudeManagedAccountId: 'wsl-1'
-    })
-
-    expect(getSelectedClaudeAccountIdForTarget(legacy, { runtime: 'host' })).toBe('wsl-1')
-    expect(structuredClaudeMatchesActiveManagedAccount(legacy)).toBe(false)
-  })
-})
diff --git a/src/main/native-chat/claude-structured-managed-account-support.ts b/src/main/native-chat/claude-structured-managed-account-support.ts
deleted file mode 100644
index 3b42c44c443f..000000000000
--- a/src/main/native-chat/claude-structured-managed-account-support.ts
+++ /dev/null
@@ -1,68 +0,0 @@
-import type { GlobalSettings } from '../../shared/global-settings-types'
-import { getSelectedClaudeAccountIdForTarget } from '../claude-accounts/runtime-selection'
-
-export type ClaudeManagedAccountGateSettings = Pick<
-  GlobalSettings,
-  | 'claudeManagedAccounts'
-  | 'activeClaudeManagedAccountId'
-  | 'activeClaudeManagedAccountIdsByRuntime'
->
-
-/**
- * A structured Claude session launches against the ambient Claude config, which the account service
- * keeps in sync with the selected HOST account. A WSL-bound managed account lives inside the distro
- * and is never synced there, so such a session would authenticate as whatever the ambient identity
- * happens to be while the UI names the WSL account — the user is told one identity and given
- * another. Refuse the structured path there and let the terminal-backed one, which resolves the
- * account per runtime, handle that account shape.
- *
- * Reads the selection through the same accessor the auth policy uses. Resolving it any other way
- * lets the two disagree, and a session admitted by this gate would then run under a policy computed
- * from a different account than the one approved here.
- *
- * Unknown answers refuse, and only genuinely unknown ones: settings that cannot be read at all, or
- * an active selection this cannot resolve. An install with no managed accounts — the list empty or
- * never written — claims no identity and is fine.
- */
-export function structuredClaudeMatchesActiveManagedAccount(
-  settings: ClaudeManagedAccountGateSettings | null | undefined
-): boolean {
-  if (!settings) {
-    return false
-  }
-  // Absent is the same answer as empty — this user has no managed Claude accounts, so nothing
-  // claims an identity and ambient auth is the truth. Only settings that cannot be READ are
-  // unknown, and those refuse above. The auth policy reads the list the same way.
-  const accounts = settings.claudeManagedAccounts ?? []
-  if (accounts.length === 0) {
-    return true
-  }
-  const activeHostId = getSelectedClaudeAccountIdForTarget(settings, { runtime: 'host' })
-  if (!activeHostId) {
-    // Nothing selected for the host runtime is two different states that the settings cannot tell
-    // 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 !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
-): ClaudeManagedAccountGateSettings | null {
-  try {
-    return getSettings()
-  } catch {
-    return null
-  }
-}
diff --git a/src/main/native-chat/native-chat-inline-visuals-setting.test.ts b/src/main/native-chat/native-chat-inline-visuals-setting.test.ts
new file mode 100644
index 000000000000..d778f98c247b
--- /dev/null
+++ b/src/main/native-chat/native-chat-inline-visuals-setting.test.ts
@@ -0,0 +1,154 @@
+import { existsSync, mkdtempSync, rmSync } from 'node:fs'
+import { tmpdir } from 'node:os'
+import { join } from 'node:path'
+import { afterEach, describe, expect, it, vi } from 'vitest'
+import { LOCAL_EXECUTION_HOST_ID } from '../../shared/execution-host'
+import { createClaudeStructuredLaunchResolver } from '../claude/claude-structured-launch-resolution'
+import { CLAUDE_PLUGIN_DIR_FLAG, type ClaudeCliFlag } from '../claude/claude-cli-flag-support'
+import { createCodexStructuredLaunchResolver } from '../codex/codex-structured-launch-resolution'
+import {
+  adapterFor,
+  fakeCodex,
+  identityFor
+} from '../codex/codex-structured-session-adapter-fixture'
+import { agentSessionRecordFixture } from './agent-session-record-test-fixture'
+import {
+  createNativeChatVisualsDelivery,
+  NATIVE_CHAT_VISUALS_DIR_ENV
+} from './native-chat-visuals-delivery'
+import { nativeChatVisualsFolderFor } from './native-chat-visuals-folder'
+
+const SKILL = { pluginDir: '/app/plugin', skillsRoot: '/app/plugin/skills' }
+const MANUAL = { approvalPolicy: 'on-request', sandbox: 'workspace-write' } as const
+const scratch: string[] = []
+afterEach(() => {
+  for (const dir of scratch.splice(0)) {
+    rmSync(dir, { recursive: true, force: true })
+  }
+})
+
+function delivery(isEnabled: () => boolean) {
+  const stateDirectory = mkdtempSync(join(tmpdir(), 'orca-visuals-setting-'))
+  scratch.push(stateDirectory)
+  const prepareVisuals = createNativeChatVisualsDelivery({
+    stateDirectory,
+    logger: { warn: vi.fn(), error: vi.fn() },
+    isEnabled,
+    resolveSkill: async () => SKILL
+  })
+  return { stateDirectory, prepareVisuals }
+}
+
+describe('inline visuals launch preference', () => {
+  it('starts Claude without visuals while preserving configured plugins, user folders and attachment access', async () => {
+    const sessionId = 'claude-disabled'
+    const { stateDirectory, prepareVisuals } = delivery(() => false)
+    const supports = vi.fn(async (_flag: ClaudeCliFlag) => true)
+    const record = agentSessionRecordFixture({ sessionId })
+    const launch = await createClaudeStructuredLaunchResolver({
+      store: { getRecord: () => record, pinLaunchDirectory: vi.fn() },
+      resolveWorkspacePath: async () => '/repo',
+      resolveCommand: () => '/bin/claude',
+      resolveAuthPolicy: () => ({ stripAuthEnv: false }),
+      resolveLaunchArgs: () => ['--add-dir', '/user/notes', '--plugin-dir', '/user/plugin'],
+      resolveEnv: () => ({ [NATIVE_CHAT_VISUALS_DIR_ENV]: '/inherited', KEEP: 'yes' }),
+      resolveInheritedEnv: async () => ({ PATH: '/bin' }),
+      attachmentDirectory: '/state/agent-session-attachments',
+      hasTranscript: async () => false,
+      cliFlags: { supports },
+      prepareVisuals
+    })({ identity: { ...identityFor(sessionId), agent: 'claude', providerHandle: null } })
+    expect(launch.options).not.toHaveProperty('plugins')
+    expect(launch.options.extraArgs).toHaveProperty('plugin-dir', '/user/plugin')
+    expect(launch.options.additionalDirectories).toEqual([
+      '/user/notes',
+      '/state/agent-session-attachments'
+    ])
+    expect(launch.env).not.toHaveProperty(NATIVE_CHAT_VISUALS_DIR_ENV)
+    expect(launch.env?.KEEP).toBe('yes')
+    expect(supports.mock.calls.map(([flag]) => flag)).not.toContain(CLAUDE_PLUGIN_DIR_FLAG)
+    expect(existsSync(nativeChatVisualsFolderFor(stateDirectory, sessionId))).toBe(false)
+  })
+
+  it('gives new Codex chats the current preference without changing another live chat', async () => {
+    let enabled = true
+    const { stateDirectory, prepareVisuals } = delivery(() => enabled)
+    const codex = fakeCodex({
+      'config/read': () => ({
+        config: { sandbox_workspace_write: { writable_roots: ['/user/notes'] } }
+      })
+    })
+    const resolveLaunch = createCodexStructuredLaunchResolver({
+      store: {
+        getRecord: (sessionId) =>
+          agentSessionRecordFixture({
+            sessionId,
+            provider: 'codex',
+            accountHome: { variable: 'CODEX_HOME', path: '/home/codex' }
+          }),
+        pinLaunchDirectory: vi.fn()
+      },
+      resolveWorkspacePath: async () => '/repo',
+      resolveCommand: () => '/bin/codex',
+      resolveLaunchArgs: () => [],
+      resolvePermissionPolicy: () => MANUAL,
+      resolveEnvironment: async () => ({
+        [NATIVE_CHAT_VISUALS_DIR_ENV]: '/inherited',
+        KEEP: 'yes'
+      }),
+      prepareVisuals
+    })
+    const adapter = adapterFor(codex, {}, [], { resolveLaunch })
+    const start = (sessionId: string) =>
+      adapter.acquire({
+        identity: {
+          ...identityFor(sessionId),
+          hostId: LOCAL_EXECUTION_HOST_ID,
+          providerHandle: null
+        },
+        fence: 1,
+        spawnToken: sessionId
+      })
+    try {
+      await start('first')
+      const first = codex.connections[0]!
+      const firstCalls = [...first.calls]
+      const firstFolder = nativeChatVisualsFolderFor(stateDirectory, 'first')
+      expect(first.launch.env?.[NATIVE_CHAT_VISUALS_DIR_ENV]).toBe(firstFolder)
+      expect(first.calls.find(({ method }) => method === 'thread/start')?.params).toMatchObject({
+        config: { 'sandbox_workspace_write.writable_roots': ['/user/notes', firstFolder] }
+      })
+
+      enabled = false
+      await start('disabled')
+      const disabled = codex.connections[1]!
+      expect(disabled.launch.env).not.toHaveProperty(NATIVE_CHAT_VISUALS_DIR_ENV)
+      expect(disabled.launch.env?.KEEP).toBe('yes')
+      expect(disabled.calls.map(({ method }) => method)).not.toContain('skills/extraRoots/set')
+      const openIndex = disabled.calls.findIndex(({ method }) => method === 'thread/start')
+      expect(disabled.calls.slice(0, openIndex).map(({ method }) => method)).not.toContain(
+        'config/read'
+      )
+      expect(
+        disabled.calls.find(({ method }) => method === 'thread/start')?.params
+      ).not.toHaveProperty('config')
+      expect(existsSync(nativeChatVisualsFolderFor(stateDirectory, 'disabled'))).toBe(false)
+      expect(first.closed).toBe(false)
+      expect(first.calls).toEqual(firstCalls)
+
+      enabled = true
+      await start('reenabled')
+      const reenabled = codex.connections[2]!
+      expect(
+        reenabled.calls.find(({ method }) => method === 'skills/extraRoots/set')?.params
+      ).toEqual({ extraRoots: [SKILL.skillsRoot] })
+      expect(reenabled.launch.env?.[NATIVE_CHAT_VISUALS_DIR_ENV]).toBe(
+        nativeChatVisualsFolderFor(stateDirectory, 'reenabled')
+      )
+      expect(first.closed).toBe(false)
+      expect(first.calls).toEqual(firstCalls)
+    } finally {
+      await adapter.closeAll()
+    }
+  })
+})
diff --git a/src/main/native-chat/native-chat-visual-file-read.test.ts b/src/main/native-chat/native-chat-visual-file-read.test.ts
new file mode 100644
index 000000000000..c28798e88b5f
--- /dev/null
+++ b/src/main/native-chat/native-chat-visual-file-read.test.ts
@@ -0,0 +1,204 @@
+import { execFileSync } from 'node:child_process'
+import { chmod, mkdir, mkdtemp, rm, symlink, writeFile, link } from 'node:fs/promises'
+import { tmpdir } from 'node:os'
+import { join } from 'node:path'
+import { afterEach, beforeEach, describe, expect, it } from 'vitest'
+import { NATIVE_CHAT_VISUAL_MAX_BYTES } from '../../shared/native-chat-visual-directive'
+import { nativeChatVisualsFolderFor } from './native-chat-visuals-folder'
+import { nativeChatVisualRevision, readNativeChatVisualFile } from './native-chat-visual-file-read'
+
+const posixIt = process.platform === 'win32' ? it.skip : it
+
+let stateDirectory: string
+let folder: string
+
+beforeEach(async () => {
+  stateDirectory = await mkdtemp(join(tmpdir(), 'orca-visual-read-'))
+  folder = nativeChatVisualsFolderFor(stateDirectory, 'session-alpha')
+  await mkdir(folder, { recursive: true })
+})
+
+afterEach(async () => {
+  await rm(stateDirectory, { recursive: true, force: true })
+})
+
+describe('nativeChatVisualsFolderFor', () => {
+  it('places each chat in its own hashed folder under the state directory', () => {
+    const alpha = nativeChatVisualsFolderFor('/state', 'session-alpha')
+    const beta = nativeChatVisualsFolderFor('/state', 'session-beta')
+    expect(alpha).toMatch(/native-chat-visuals[\\/][0-9a-f]{32}$/)
+    expect(alpha.startsWith(join('/state', 'native-chat-visuals'))).toBe(true)
+    expect(alpha).not.toBe(beta)
+  })
+})
+
+describe('readNativeChatVisualFile', () => {
+  it('reads a UTF-8 visual with its revision and size', async () => {
+    const html = '<!doctype html><p>Grüße</p>'
+    await writeFile(join(folder, 'chart.html'), html)
+    const result = await readNativeChatVisualFile(folder, 'chart.html')
+    expect(result).toEqual({
+      ok: true,
+      html,
+      revision: nativeChatVisualRevision(Buffer.from(html)),
+      sizeBytes: Buffer.byteLength(html)
+    })
+  })
+
+  it('answers unchanged without the bytes when the client already holds the revision', async () => {
+    await writeFile(join(folder, 'chart.html'), '<p>a</p>')
+    const first = await readNativeChatVisualFile(folder, 'chart.html')
+    if (!first.ok) {
+      throw new Error('expected a read')
+    }
+    const again = await readNativeChatVisualFile(folder, 'chart.html', first.revision)
+    expect(again).toEqual({ ok: true, revision: first.revision, sizeBytes: 8, unchanged: true })
+
+    await writeFile(join(folder, 'chart.html'), '<p>b</p>')
+    const changed = await readNativeChatVisualFile(folder, 'chart.html', first.revision)
+    expect(changed).toMatchObject({ ok: true, html: '<p>b</p>' })
+  })
+
+  it('reports a missing file or a missing folder as not_found', async () => {
+    expect(await readNativeChatVisualFile(folder, 'nope.html')).toEqual({
+      ok: false,
+      error: 'not_found'
+    })
+    const absent = nativeChatVisualsFolderFor(stateDirectory, 'session-never')
+    expect(await readNativeChatVisualFile(absent, 'chart.html')).toEqual({
+      ok: false,
+      error: 'not_found'
+    })
+  })
+
+  it('refuses names that are not a bare visual file name', async () => {
+    await mkdir(join(stateDirectory, 'other'), { recursive: true })
+    await writeFile(join(stateDirectory, 'other', 'secret.html'), 'secret')
+    for (const name of ['../other/secret.html', '/etc/hosts', 'chart.txt', 'sub/chart.html']) {
+      expect(await readNativeChatVisualFile(folder, name)).toEqual({
+        ok: false,
+        error: 'outside_folder'
+      })
+    }
+  })
+
+  posixIt('refuses a symlink to a sibling chat folder or another workspace', async () => {
+    const sibling = nativeChatVisualsFolderFor(stateDirectory, 'session-beta')
+    await mkdir(sibling, { recursive: true })
+    await writeFile(join(sibling, 'theirs.html'), '<p>other chat</p>')
+    const worktree = join(stateDirectory, 'worktree')
+    await mkdir(worktree)
+    await writeFile(join(worktree, 'index.html'), '<p>repo</p>')
+
+    await symlink(join(sibling, 'theirs.html'), join(folder, 'theirs.html'))
+    await symlink(join(worktree, 'index.html'), join(folder, 'repo.html'))
+    await symlink(join(folder, 'missing-target.html'), join(folder, 'dangling.html'))
+
+    for (const name of ['theirs.html', 'repo.html', 'dangling.html']) {
+      expect(await readNativeChatVisualFile(folder, name)).toEqual({
+        ok: false,
+        error: 'outside_folder'
+      })
+    }
+  })
+
+  posixIt('refuses a visuals folder replaced by a symlink', async () => {
+    const elsewhere = join(stateDirectory, 'elsewhere')
+    await mkdir(elsewhere)
+    await writeFile(join(elsewhere, 'chart.html'), '<p>elsewhere</p>')
+    await rm(folder, { recursive: true })
+    await symlink(elsewhere, folder)
+    expect(await readNativeChatVisualFile(folder, 'chart.html')).toEqual({
+      ok: false,
+      error: 'outside_folder'
+    })
+  })
+
+  posixIt('refuses when the shared visuals root is a symlink', async () => {
+    const root = join(stateDirectory, 'native-chat-visuals')
+    const moved = join(stateDirectory, 'moved-root')
+    await rm(root, { recursive: true })
+    await mkdir(join(moved, 'x'), { recursive: true })
+    await symlink(moved, root)
+    await mkdir(folder, { recursive: true })
+    await writeFile(join(folder, 'chart.html'), '<p>a</p>')
+    expect(await readNativeChatVisualFile(folder, 'chart.html')).toEqual({
+      ok: false,
+      error: 'outside_folder'
+    })
+  })
+
+  it('refuses a directory named like a visual', async () => {
+    await mkdir(join(folder, 'dir.html'))
+    expect(await readNativeChatVisualFile(folder, 'dir.html')).toEqual({
+      ok: false,
+      error: 'not_a_file'
+    })
+  })
+
+  posixIt('refuses a FIFO without waiting for a writer', async () => {
+    execFileSync('mkfifo', [join(folder, 'pipe.html')])
+    expect(await readNativeChatVisualFile(folder, 'pipe.html')).toEqual({
+      ok: false,
+      error: 'not_a_file'
+    })
+  })
+
+  it('refuses a file over the byte cap and accepts one exactly at it', async () => {
+    await writeFile(join(folder, 'max.html'), 'a'.repeat(NATIVE_CHAT_VISUAL_MAX_BYTES))
+    expect(await readNativeChatVisualFile(folder, 'max.html')).toMatchObject({ ok: true })
+    await writeFile(join(folder, 'big.html'), 'a'.repeat(NATIVE_CHAT_VISUAL_MAX_BYTES + 1))
+    expect(await readNativeChatVisualFile(folder, 'big.html')).toEqual({
+      ok: false,
+      error: 'too_large'
+    })
+  })
+
+  it('refuses binary and invalid UTF-8 content', async () => {
+    await writeFile(join(folder, 'zero-byte.html'), Buffer.from([0x3c, 0x00, 0x3e]))
+    await writeFile(join(folder, 'latin1.html'), Buffer.from([0x3c, 0xe9, 0x3e]))
+    expect(await readNativeChatVisualFile(folder, 'zero-byte.html')).toEqual({
+      ok: false,
+      error: 'not_text'
+    })
+    expect(await readNativeChatVisualFile(folder, 'latin1.html')).toEqual({
+      ok: false,
+      error: 'not_text'
+    })
+  })
+
+  it('reads a hard link the agent made inside its own folder', async () => {
+    // A hard link grants nothing a copy would not: the agent could write the same bytes itself.
+    await writeFile(join(folder, 'a.html'), '<p>a</p>')
+    await link(join(folder, 'a.html'), join(folder, 'b.html'))
+    expect(await readNativeChatVisualFile(folder, 'b.html')).toMatchObject({ ok: true })
+  })
+
+  it('reads the replacement after a file is swapped for new content', async () => {
+    await writeFile(join(folder, 'chart.html'), '<p>old</p>')
+    await rm(join(folder, 'chart.html'))
+    await writeFile(join(folder, 'chart.html'), '<p>new</p>')
+    expect(await readNativeChatVisualFile(folder, 'chart.html')).toMatchObject({
+      ok: true,
+      html: '<p>new</p>'
+    })
+  })
+
+  posixIt('reports an unexpected filesystem fault without the host path', async () => {
+    await writeFile(join(folder, 'chart.html'), '<p>a</p>')
+    await chmod(join(folder, 'chart.html'), 0o000)
+    try {
+      const failure = await readNativeChatVisualFile(folder, 'chart.html').then(
+        () => null,
+        (error: unknown) => error
+      )
+      // Root reads through the mode bits; everyone else gets the coded fault.
+      if (failure !== null) {
+        expect(String(failure)).toContain('visual_read_failed:EACCES')
+        expect(String(failure)).not.toContain(stateDirectory)
+      }
+    } finally {
+      await chmod(join(folder, 'chart.html'), 0o644)
+    }
+  })
+})
diff --git a/src/main/native-chat/native-chat-visual-file-read.ts b/src/main/native-chat/native-chat-visual-file-read.ts
new file mode 100644
index 000000000000..36faa39f1ae0
--- /dev/null
+++ b/src/main/native-chat/native-chat-visual-file-read.ts
@@ -0,0 +1,223 @@
+// Reading one visual out of a chat's visuals folder. This is the boundary, not the renderer: the
+// file must sit directly in the folder both lexically and canonically, be a regular file reached
+// without a symlink, and be UTF-8 text within the byte cap.
+
+import { createHash } from 'node:crypto'
+import { constants, type Stats } from 'node:fs'
+import { lstat, open, realpath, type FileHandle } from 'node:fs/promises'
+import { basename, dirname, join } from 'node:path'
+import {
+  NATIVE_CHAT_VISUAL_MAX_BYTES,
+  isNativeChatVisualFileName
+} from '../../shared/native-chat-visual-directive'
+import type {
+  AgentSessionReadVisualResult,
+  AgentSessionVisualReadError
+} from '../../shared/rpc-contract/agent-session-visual-params'
+import { isENOENT } from '../ipc/filesystem-path-containment'
+import { readLocalFileBounded } from '../ipc/filesystem/local-regular-file-read'
+
+// Why O_NOFOLLOW: refuses a final-component symlink at open, so no swap after a check can redirect
+// the read. Windows has no such flag; there the lstat and post-open identity checks hold the line.
+const VISUAL_OPEN_FLAGS =
+  constants.O_RDONLY | (constants.O_NONBLOCK ?? 0) | (constants.O_NOFOLLOW ?? 0)
+
+const REVISION_HEX_LENGTH = 32
+
+class VisualReadRefusal extends Error {
+  constructor(readonly refusal: AgentSessionVisualReadError) {
+    super(refusal)
+  }
+}
+
+function refuse(refusal: AgentSessionVisualReadError): never {
+  throw new VisualReadRefusal(refusal)
+}
+
+function errorCode(error: unknown): string | undefined {
+  return error instanceof Error && 'code' in error && typeof error.code === 'string'
+    ? error.code
+    : undefined
+}
+
+function sameFile(left: Stats, right: Stats): boolean {
+  return left.dev === right.dev && left.ino === right.ino
+}
+
+/**
+ * The folder and its parent are Orca's own directories below the trusted state directory. Either
+ * one replaced by a symlink would aim every read somewhere else, so a link there is refused.
+ */
+async function canonicalFolder(folder: string): Promise<string> {
+  try {
+    // Parent first, so the answer for a broken path does not depend on which check settles first.
+    const parentStats = await lstat(dirname(folder))
+    const owned = [parentStats, await lstat(folder)]
+    if (owned.some((stats) => stats.isSymbolicLink())) {
+      refuse('outside_folder')
+    }
+    if (owned.some((stats) => !stats.isDirectory())) {
+      refuse('not_found')
+    }
+    return await realpath(folder)
+  } catch (error) {
+    if (error instanceof VisualReadRefusal) {
+      throw error
+    }
+    if (isENOENT(error) || errorCode(error) === 'ENOTDIR') {
+      refuse('not_found')
+    }
+    throw error
+  }
+}
+
+async function openVisual(candidate: string): Promise<FileHandle> {
+  try {
+    if ((await lstat(candidate)).isSymbolicLink()) {
+      refuse('outside_folder')
+    }
+    return await open(candidate, VISUAL_OPEN_FLAGS)
+  } catch (error) {
+    if (error instanceof VisualReadRefusal) {
+      throw error
+    }
+    if (isENOENT(error) || errorCode(error) === 'ENOTDIR') {
+      refuse('not_found')
+    }
+    // ELOOP: the path became a symlink between the lstat and the open.
+    if (errorCode(error) === 'ELOOP' || errorCode(error) === 'EMLINK') {
+      refuse('outside_folder')
+    }
+    if (errorCode(error) === 'EISDIR') {
+      refuse('not_a_file')
+    }
+    throw error
+  }
+}
+
+/**
+ * After the open: the handle must still be the file directly inside the canonical folder, and the
+ * folder that canonical path names must still be the real directory at Orca's own path (a symlink
+ * swapped in and out around the first check would otherwise aim `folderReal` elsewhere).
+ */
+async function assertStillContained(
+  folder: string,
+  candidate: string,
+  folderReal: string,
+  file: string,
+  opened: Stats
+): Promise<void> {
+  let resolved: string
+  let current: Stats
+  try {
+    const [parentNow, folderNow, canonicalFolderNow] = await Promise.all([
+      lstat(dirname(folder)),
+      lstat(folder),
+      lstat(folderReal)
+    ])
+    if (
+      parentNow.isSymbolicLink() ||
+      folderNow.isSymbolicLink() ||
+      !sameFile(folderNow, canonicalFolderNow)
+    ) {
+      refuse('outside_folder')
+    }
+    resolved = await realpath(candidate)
+    current = await lstat(candidate)
+  } catch (error) {
+    if (error instanceof VisualReadRefusal) {
+      throw error
+    }
+    if (isENOENT(error)) {
+      refuse('not_found')
+    }
+    throw error
+  }
+  // Why compare names case-insensitively: a case-insensitive volume may report the stored case.
+  if (
+    dirname(resolved) !== folderReal ||
+    basename(resolved).toLowerCase() !== file.toLowerCase() ||
+    current.isSymbolicLink() ||
+    !sameFile(current, opened)
+  ) {
+    refuse('outside_folder')
+  }
+}
+
+function decodeVisualText(buffer: Buffer): string {
+  if (buffer.includes(0)) {
+    refuse('not_text')
+  }
+  try {
+    return new TextDecoder('utf-8', { fatal: true }).decode(buffer)
+  } catch {
+    return refuse('not_text')
+  }
+}
+
+export function nativeChatVisualRevision(buffer: Buffer): string {
+  return createHash('sha256').update(buffer).digest('hex').slice(0, REVISION_HEX_LENGTH)
+}
+
+async function readContained(
+  folder: string,
+  file: string,
+  knownRevision: string | undefined
+): Promise<AgentSessionReadVisualResult> {
+  if (!isNativeChatVisualFileName(file)) {
+    refuse('outside_folder')
+  }
+  const folderReal = await canonicalFolder(folder)
+  const candidate = join(folderReal, file)
+  if (dirname(candidate) !== folderReal) {
+    refuse('outside_folder')
+  }
+  const handle = await openVisual(candidate)
+  try {
+    const stats = await handle.stat()
+    if (!stats.isFile()) {
+      refuse('not_a_file')
+    }
+    if (stats.size > NATIVE_CHAT_VISUAL_MAX_BYTES) {
+      refuse('too_large')
+    }
+    await assertStillContained(folder, candidate, folderReal, file, stats)
+    let buffer: Buffer
+    try {
+      buffer = await readLocalFileBounded(handle, NATIVE_CHAT_VISUAL_MAX_BYTES, stats.size)
+    } catch (error) {
+      if (error instanceof Error && error.message.startsWith('File too large')) {
+        refuse('too_large')
+      }
+      throw error
+    }
+    const html = decodeVisualText(buffer)
+    const revision = nativeChatVisualRevision(buffer)
+    const sizeBytes = buffer.length
+    return knownRevision === revision
+      ? { ok: true, revision, sizeBytes, unchanged: true }
+      : { ok: true, revision, sizeBytes, html }
+  } finally {
+    await handle.close()
+  }
+}
+
+/**
+ * The visual `file` from `folder`, or the refusal the host observed. Unexpected filesystem faults
+ * still throw, so the client reads them as unavailable rather than as a verdict about the file; the
+ * thrown error names only the error code, never a host path.
+ */
+export async function readNativeChatVisualFile(
+  folder: string,
+  file: string,
+  knownRevision?: string
+): Promise<AgentSessionReadVisualResult> {
+  try {
+    return await readContained(folder, file, knownRevision)
+  } catch (error) {
+    if (error instanceof VisualReadRefusal) {
+      return { ok: false, error: error.refusal }
+    }
+    throw new Error(`visual_read_failed:${errorCode(error) ?? 'unknown'}`, { cause: error })
+  }
+}
diff --git a/src/main/native-chat/native-chat-visuals-delivery.test.ts b/src/main/native-chat/native-chat-visuals-delivery.test.ts
new file mode 100644
index 000000000000..72faec6dfdbf
--- /dev/null
+++ b/src/main/native-chat/native-chat-visuals-delivery.test.ts
@@ -0,0 +1,201 @@
+import { existsSync, mkdtempSync, readFileSync, rmSync, statSync, writeFileSync } from 'node:fs'
+import { tmpdir } from 'node:os'
+import { join } from 'node:path'
+import { afterEach, describe, expect, it, vi } from 'vitest'
+import {
+  NATIVE_CHAT_VISUAL_MAX_BYTES,
+  NATIVE_CHAT_VISUAL_MAX_PER_MESSAGE,
+  parseNativeChatVisualDirectiveLine
+} from '../../shared/native-chat-visual-directive'
+import { NATIVE_CHAT_VISUAL_THEME_TOKENS } from '../../shared/native-chat-visual-shell'
+import { ORCAD_NATIVE_CHAT_VISUALS_ARTIFACTS } from '../../shared/orcad-artifacts'
+import {
+  createNativeChatVisualsDelivery,
+  NATIVE_CHAT_VISUALS_DIR_ENV,
+  withNativeChatVisualsEnv
+} from './native-chat-visuals-delivery'
+import { nativeChatVisualsFolderFor, nativeChatVisualsRootFor } from './native-chat-visuals-folder'
+import { buildClaudeChildProcessEnv } from '../claude/claude-child-process-environment'
+import { codexStructuredChildEnvironment } from '../codex/codex-structured-child-environment'
+import { resolveProviderChildEnv } from '../provider-process/provider-process-launch'
+import {
+  NATIVE_CHAT_VISUALS_SKILL_NAME,
+  resetNativeChatVisualsSkillLocationForTests,
+  resolveNativeChatVisualsSkillLocation
+} from './native-chat-visuals-skill-location'
+
+const RESOURCE_DIR = join(__dirname, '..', '..', '..', 'resources', 'native-chat-visuals')
+const SKILL_TEXT = readFileSync(
+  join(RESOURCE_DIR, 'skills', NATIVE_CHAT_VISUALS_SKILL_NAME, 'SKILL.md'),
+  'utf8'
+)
+const SKILL = { pluginDir: '/app/plugin', skillsRoot: '/app/plugin/skills' }
+
+const scratch: string[] = []
+afterEach(() => {
+  resetNativeChatVisualsSkillLocationForTests()
+  for (const dir of scratch.splice(0)) {
+    rmSync(dir, { recursive: true, force: true })
+  }
+})
+
+function tempDir(): string {
+  const dir = mkdtempSync(join(tmpdir(), 'orca-visuals-delivery-'))
+  scratch.push(dir)
+  return dir
+}
+
+const logger = () => ({ warn: vi.fn(), error: vi.fn() })
+
+describe('preparing a chat for visuals', () => {
+  it('reads the preference for each launch and prepares nothing while it is off', async () => {
+    const state = tempDir()
+    let enabled = false
+    const resolveSkill = vi.fn(async () => SKILL)
+    const prepare = createNativeChatVisualsDelivery({
+      stateDirectory: state,
+      logger: logger(),
+      isEnabled: () => enabled,
+      resolveSkill
+    })
+    await expect(prepare('disabled-chat')).resolves.toBeNull()
+    expect(resolveSkill).not.toHaveBeenCalled()
+    expect(existsSync(nativeChatVisualsRootFor(state))).toBe(false)
+    enabled = true
+    const launched = await prepare('enabled-chat')
+    expect(launched).toEqual({
+      folder: nativeChatVisualsFolderFor(state, 'enabled-chat'),
+      skill: SKILL
+    })
+    enabled = false
+    await expect(prepare('next-chat')).resolves.toBeNull()
+    expect(resolveSkill).toHaveBeenCalledOnce()
+    expect(existsSync(nativeChatVisualsFolderFor(state, 'next-chat'))).toBe(false)
+    expect(existsSync(launched!.folder)).toBe(true)
+  })
+
+  it("creates the chat's own private folder and hands back the skill", async () => {
+    const state = tempDir()
+    const prepare = createNativeChatVisualsDelivery({
+      stateDirectory: state,
+      logger: logger(),
+      resolveSkill: async () => SKILL
+    })
+    const prepared = await prepare('chat-1')
+    expect(prepared).toEqual({ folder: nativeChatVisualsFolderFor(state, 'chat-1'), skill: SKILL })
+    const mode = statSync(prepared!.folder).mode & 0o777
+    expect(process.platform === 'win32' || mode === 0o700).toBe(true)
+    // A second launch of the same chat reuses it.
+    await expect(prepare('chat-1')).resolves.toEqual(prepared)
+  })
+
+  it('leaves the chat without visuals when the skill is missing or the folder fails', async () => {
+    const missingSkill = logger()
+    await expect(
+      createNativeChatVisualsDelivery({
+        stateDirectory: tempDir(),
+        logger: missingSkill,
+        resolveSkill: async () => null
+      })('chat-1')
+    ).resolves.toBeNull()
+    expect(missingSkill.warn).toHaveBeenCalledOnce()
+    // A file where the visuals root should be makes every mkdir fail.
+    const state = tempDir()
+    writeFileSync(join(state, 'native-chat-visuals'), 'not a folder')
+    const failedFolder = logger()
+    await expect(
+      createNativeChatVisualsDelivery({
+        stateDirectory: state,
+        logger: failedFolder,
+        resolveSkill: async () => SKILL
+      })('chat-1')
+    ).resolves.toBeNull()
+    expect(failedFolder.warn).toHaveBeenCalledWith(
+      'native-chat visuals folder could not be prepared',
+      expect.objectContaining({ scope: 'nativeChatVisuals.folder', sessionId: 'chat-1' })
+    )
+  })
+
+  it("never hands a chat another chat's folder that Orca itself inherited", () => {
+    const inherited = { PATH: '/bin', [NATIVE_CHAT_VISUALS_DIR_ENV]: '/parent-chat' }
+    const visuals = { folder: '/mine', skill: SKILL }
+    for (const platform of ['darwin', 'win32'] as const) {
+      const claude = (configured: Record<string, string>) =>
+        buildClaudeChildProcessEnv(configured, { inheritedEnv: inherited, platform })
+      expect(claude({})).not.toHaveProperty(NATIVE_CHAT_VISUALS_DIR_ENV)
+      expect(claude(withNativeChatVisualsEnv({}, visuals))[NATIVE_CHAT_VISUALS_DIR_ENV]).toBe(
+        '/mine'
+      )
+    }
+    const codex = (withVisuals: boolean) =>
+      resolveProviderChildEnv(
+        codexStructuredChildEnvironment(
+          {
+            command: 'codex',
+            args: ['app-server'],
+            cwd: '/w',
+            codexHome: null,
+            resumeThreadId: null,
+            ...(withVisuals ? { visuals } : {})
+          },
+          'spawn-token',
+          'chat-1'
+        ),
+        inherited
+      )
+    expect(codex(false)).not.toHaveProperty(NATIVE_CHAT_VISUALS_DIR_ENV)
+    expect(codex(true)[NATIVE_CHAT_VISUALS_DIR_ENV]).toBe('/mine')
+  })
+
+  it('names only this chat folder to the agent', () => {
+    const inherited = { PATH: '/bin', [NATIVE_CHAT_VISUALS_DIR_ENV]: '/other-chat' }
+    expect(withNativeChatVisualsEnv(inherited, { folder: '/mine', skill: SKILL })).toEqual({
+      PATH: '/bin',
+      [NATIVE_CHAT_VISUALS_DIR_ENV]: '/mine'
+    })
+    expect(withNativeChatVisualsEnv(inherited, null)).toEqual({ PATH: '/bin' })
+  })
+})
+
+describe('the bundled skill', () => {
+  it('is found in a checkout, and a missing install is not remembered', async () => {
+    await expect(resolveNativeChatVisualsSkillLocation([tempDir()])).resolves.toBeNull()
+    await expect(resolveNativeChatVisualsSkillLocation([tempDir(), RESOURCE_DIR])).resolves.toEqual(
+      { pluginDir: RESOURCE_DIR, skillsRoot: join(RESOURCE_DIR, 'skills') }
+    )
+  })
+
+  it('ships every file in the headless server build too', () => {
+    const shipped = ORCAD_NATIVE_CHAT_VISUALS_ARTIFACTS.map((file) =>
+      file.slice('native-chat-visuals/'.length)
+    )
+    expect(shipped).toEqual([
+      '.claude-plugin/plugin.json',
+      `skills/${NATIVE_CHAT_VISUALS_SKILL_NAME}/SKILL.md`
+    ])
+    const manifest = JSON.parse(readFileSync(join(RESOURCE_DIR, shipped[0]!), 'utf8'))
+    expect(manifest.name).toMatch(/^[a-z0-9-]+$/)
+  })
+
+  it('teaches the reply line the renderer parses, with its limits', () => {
+    const example = SKILL_TEXT.split('\n').find((line) => line.startsWith('::orca-visual{'))
+    expect(example && parseNativeChatVisualDirectiveLine(example)).toEqual({
+      file: 'latency-by-region-7c1e.html',
+      title: 'Latency by region'
+    })
+    expect(SKILL_TEXT).toContain(`At most ${NATIVE_CHAT_VISUAL_MAX_PER_MESSAGE} per reply`)
+    expect(SKILL_TEXT).toContain(`under ${NATIVE_CHAT_VISUAL_MAX_BYTES / 1024} KB`)
+    expect(SKILL_TEXT).toContain(NATIVE_CHAT_VISUALS_DIR_ENV)
+    expect(SKILL_TEXT).toMatch(new RegExp(`^name: ${NATIVE_CHAT_VISUALS_SKILL_NAME}$`, 'm'))
+  })
+
+  it('names only theme variables the visual frame sets', () => {
+    const named = [...SKILL_TEXT.matchAll(/`(--[a-z0-9-]+)`/g)].map(([, name]) => name)
+    const ranges = [...SKILL_TEXT.matchAll(/`--chart-1` to `--chart-(\d)`/g)].flatMap(([, last]) =>
+      Array.from({ length: Number(last) }, (_, index) => `--chart-${index + 1}`)
+    )
+    expect(named.length).toBeGreaterThan(0)
+    const frameTokens: readonly string[] = NATIVE_CHAT_VISUAL_THEME_TOKENS
+    expect([...named, ...ranges].filter((name) => !frameTokens.includes(name))).toEqual([])
+  })
+})
diff --git a/src/main/native-chat/native-chat-visuals-delivery.ts b/src/main/native-chat/native-chat-visuals-delivery.ts
new file mode 100644
index 000000000000..662dce2b567c
--- /dev/null
+++ b/src/main/native-chat/native-chat-visuals-delivery.ts
@@ -0,0 +1,70 @@
+// What a structured chat launch gets for inline visuals: its own writable folder, named to the agent
+// in an environment variable, and where this host keeps the skill that teaches the reply line.
+// Every step is best effort: a chat without visuals still starts.
+
+import { mkdir } from 'node:fs/promises'
+import type { StructuredAgentSessionLogger } from './agent-session-wire/structured-agent-session-logger'
+import { nativeChatVisualsFolderFor } from './native-chat-visuals-folder'
+import {
+  resolveNativeChatVisualsSkillLocation,
+  type NativeChatVisualsSkillLocation
+} from './native-chat-visuals-skill-location'
+
+/** The agent child's variable holding its chat's visuals folder. The skill reads it; the path is
+ *  never written into the skill text. */
+export const NATIVE_CHAT_VISUALS_DIR_ENV = 'ORCA_CHAT_VISUALS_DIR'
+
+export type NativeChatVisualsLaunch = {
+  /** This chat's folder, created and private to this user. */
+  folder: string
+  skill: NativeChatVisualsSkillLocation
+}
+
+/** Prepares one chat's launch; null leaves the chat without visuals. Never throws. */
+export type PrepareNativeChatVisuals = (
+  sessionId: string
+) => Promise<NativeChatVisualsLaunch | null>
+
+export function createNativeChatVisualsDelivery(deps: {
+  stateDirectory: string
+  logger: StructuredAgentSessionLogger
+  isEnabled?: () => boolean
+  resolveSkill?: () => Promise<NativeChatVisualsSkillLocation | null>
+}): PrepareNativeChatVisuals {
+  const resolveSkill = deps.resolveSkill ?? (() => resolveNativeChatVisualsSkillLocation())
+  return async (sessionId) => {
+    try {
+      if (deps.isEnabled?.() === false) {
+        return null
+      }
+      const skill = await resolveSkill()
+      if (!skill) {
+        deps.logger.warn('native-chat visuals skill is missing from this install', {
+          scope: 'nativeChatVisuals.skill',
+          sessionId
+        })
+        return null
+      }
+      const folder = nativeChatVisualsFolderFor(deps.stateDirectory, sessionId)
+      await mkdir(folder, { recursive: true, mode: 0o700 })
+      return { folder, skill }
+    } catch (error) {
+      deps.logger.warn('native-chat visuals folder could not be prepared', {
+        scope: 'nativeChatVisuals.folder',
+        sessionId,
+        error
+      })
+      return null
+    }
+  }
+}
+
+/** `env` naming this chat's folder; without visuals, an inherited value (Orca itself started from
+ *  a chat) is removed so the agent never writes into another chat's folder. */
+export function withNativeChatVisualsEnv(
+  env: Record<string, string>,
+  visuals: NativeChatVisualsLaunch | null
+): Record<string, string> {
+  const { [NATIVE_CHAT_VISUALS_DIR_ENV]: _inherited, ...rest } = env
+  return visuals ? { ...rest, [NATIVE_CHAT_VISUALS_DIR_ENV]: visuals.folder } : rest
+}
diff --git a/src/main/native-chat/native-chat-visuals-folder.ts b/src/main/native-chat/native-chat-visuals-folder.ts
new file mode 100644
index 000000000000..9e4ad9a810e7
--- /dev/null
+++ b/src/main/native-chat/native-chat-visuals-folder.ts
@@ -0,0 +1,26 @@
+// Where a structured chat's visuals live on the host that owns the chat: Orca-owned state beside the
+// chat journal, never inside the user's workspace.
+
+import { createHash } from 'node:crypto'
+import { join } from 'node:path'
+
+const NATIVE_CHAT_VISUALS_DIR_NAME = 'native-chat-visuals'
+
+/** Where every chat's visuals folder on this host lives. */
+export function nativeChatVisualsRootFor(stateDirectory: string): string {
+  return join(stateDirectory, NATIVE_CHAT_VISUALS_DIR_NAME)
+}
+
+/** The one path segment a chat's folder is named by: hashed so any id is a safe segment. */
+export function nativeChatVisualsFolderName(sessionId: string): string {
+  return createHash('sha256').update(sessionId, 'utf8').digest('hex').slice(0, 32)
+}
+
+/**
+ * `<stateDirectory>/native-chat-visuals/<sha256(session id), first 32 hex>`. Keyed by the session id
+ * alone, the chat record's primary key, so the folder needs no workspace lookup to find or remove;
+ * hashed so any id is one safe path segment.
+ */
+export function nativeChatVisualsFolderFor(stateDirectory: string, sessionId: string): string {
+  return join(nativeChatVisualsRootFor(stateDirectory), nativeChatVisualsFolderName(sessionId))
+}
diff --git a/src/main/native-chat/native-chat-visuals-skill-location.ts b/src/main/native-chat/native-chat-visuals-skill-location.ts
new file mode 100644
index 000000000000..629b5f5a48a7
--- /dev/null
+++ b/src/main/native-chat/native-chat-visuals-skill-location.ts
@@ -0,0 +1,74 @@
+// Where this host's copy of the chat-visuals skill plugin lives. Resolved on the host that spawns
+// the agent: a client's install path means nothing to another machine.
+
+import { access } from 'node:fs/promises'
+import { join } from 'node:path'
+import { getAppEnvironment, hasAppEnvironment } from '../../shared/app-environment'
+
+const PLUGIN_DIR_NAME = 'native-chat-visuals'
+export const NATIVE_CHAT_VISUALS_SKILL_NAME = 'orca-chat-visuals'
+
+export type NativeChatVisualsSkillLocation = {
+  /** A Claude plugin folder: `.claude-plugin/plugin.json` plus `skills/<name>/SKILL.md`. */
+  pluginDir: string
+  /** The plugin's `skills` folder, the shape a Codex skill root takes. */
+  skillsRoot: string
+}
+
+function candidatePluginDirs(): string[] {
+  const candidates: string[] = []
+  if (process.resourcesPath) {
+    candidates.push(join(process.resourcesPath, PLUGIN_DIR_NAME))
+  }
+  const packaged = hasAppEnvironment() && getAppEnvironment().isPackaged()
+  if (packaged) {
+    // Why: plain-Node orcad has no resourcesPath; its build copies the folder into its own root.
+    // Nothing else: an install must never load a skill from whatever checkout it was started in.
+    candidates.push(join(getAppEnvironment().getAppPath(), PLUGIN_DIR_NAME))
+    return candidates
+  }
+  // Development and test hosts run from a checkout.
+  for (const root of [
+    hasAppEnvironment() ? getAppEnvironment().getAppPath() : null,
+    process.cwd()
+  ]) {
+    if (root) {
+      candidates.push(join(root, 'resources', PLUGIN_DIR_NAME))
+    }
+  }
+  return candidates
+}
+
+async function isComplete(pluginDir: string): Promise<boolean> {
+  try {
+    await Promise.all([
+      access(join(pluginDir, '.claude-plugin', 'plugin.json')),
+      access(join(pluginDir, 'skills', NATIVE_CHAT_VISUALS_SKILL_NAME, 'SKILL.md'))
+    ])
+    return true
+  } catch {
+    return false
+  }
+}
+
+let found: NativeChatVisualsSkillLocation | null = null
+
+/** This install's skill plugin, or null when it is missing; only a found location is remembered. */
+export async function resolveNativeChatVisualsSkillLocation(
+  candidates: readonly string[] = candidatePluginDirs()
+): Promise<NativeChatVisualsSkillLocation | null> {
+  if (found) {
+    return found
+  }
+  for (const pluginDir of candidates) {
+    if (await isComplete(pluginDir)) {
+      found = { pluginDir, skillsRoot: join(pluginDir, 'skills') }
+      return found
+    }
+  }
+  return null
+}
+
+export function resetNativeChatVisualsSkillLocationForTests(): void {
+  found = null
+}
diff --git a/src/main/native-chat/native-chat-visuals-sweep.test.ts b/src/main/native-chat/native-chat-visuals-sweep.test.ts
new file mode 100644
index 000000000000..93c6bec5da11
--- /dev/null
+++ b/src/main/native-chat/native-chat-visuals-sweep.test.ts
@@ -0,0 +1,189 @@
+import { existsSync, mkdirSync, mkdtempSync, rmSync, symlinkSync, writeFileSync } from 'node:fs'
+import { tmpdir } from 'node:os'
+import { join } from 'node:path'
+import { afterEach, describe, expect, it, vi } from 'vitest'
+import type { AgentSessionExecutionLocation } from '../../shared/agent-session-record'
+import { LOCAL_EXECUTION_HOST_ID } from '../../shared/execution-host'
+import type { StructuredAgentSessionLogger } from './agent-session-wire/structured-agent-session-logger'
+import { nativeChatVisualsFolderFor, nativeChatVisualsRootFor } from './native-chat-visuals-folder'
+import {
+  scheduleNativeChatVisualsSweep,
+  sweepNativeChatVisualsFolders,
+  type NativeChatVisualsSweepDeps,
+  type NativeChatVisualsWorkspaceVerdict
+} from './native-chat-visuals-sweep'
+
+const scratch: string[] = []
+afterEach(() => {
+  vi.useRealTimers()
+  for (const dir of scratch.splice(0)) {
+    rmSync(dir, { recursive: true, force: true })
+  }
+})
+
+function stateDirectory(): string {
+  const dir = mkdtempSync(join(tmpdir(), 'orca-visuals-sweep-'))
+  scratch.push(dir)
+  return dir
+}
+
+function visualsFor(state: string, sessionId: string): string {
+  const folder = nativeChatVisualsFolderFor(state, sessionId)
+  mkdirSync(folder, { recursive: true })
+  writeFileSync(join(folder, 'chart.html'), '<p>chart</p>')
+  return folder
+}
+
+const location = (workspaceId: string): AgentSessionExecutionLocation => ({
+  executionHostId: LOCAL_EXECUTION_HOST_ID,
+  wslDistro: null,
+  workspaceId,
+  workspaceKind: 'git-worktree'
+})
+
+function deps(
+  state: string,
+  held: readonly string[] | null,
+  verdicts: Record<string, NativeChatVisualsWorkspaceVerdict> = {}
+): NativeChatVisualsSweepDeps & {
+  logger: { warn: ReturnType<typeof vi.fn<StructuredAgentSessionLogger['warn']>> }
+} {
+  return {
+    stateDirectory: state,
+    listHeldSessionIds: () => held,
+    locationOf: (sessionId) => (held?.includes(sessionId) ? location(`ws-${sessionId}`) : null),
+    workspaceVerdicts: () => async (where) => verdicts[where.workspaceId] ?? 'present',
+    logger: { warn: vi.fn<StructuredAgentSessionLogger['warn']>(), error: vi.fn() }
+  }
+}
+
+describe('the visuals folder sweep', () => {
+  it('removes a folder no chat record maps to and keeps every held chat', async () => {
+    const state = stateDirectory()
+    const live = visualsFor(state, 'chat-live')
+    const unreadable = visualsFor(state, 'chat-unreadable-row')
+    const orphan = visualsFor(state, 'chat-deleted')
+    const result = await sweepNativeChatVisualsFolders(
+      deps(state, ['chat-live', 'chat-unreadable-row'])
+    )
+    expect(result).toEqual({ removed: 1, failed: 0 })
+    expect(existsSync(live)).toBe(true)
+    expect(existsSync(unreadable)).toBe(true)
+    expect(existsSync(orphan)).toBe(false)
+  })
+
+  it('removes a chat folder only when its local workspace is proven removed', async () => {
+    const state = stateDirectory()
+    const removed = visualsFor(state, 'chat-a')
+    const unverifiable = visualsFor(state, 'chat-b')
+    const present = visualsFor(state, 'chat-c')
+    await sweepNativeChatVisualsFolders(
+      deps(state, ['chat-a', 'chat-b', 'chat-c'], {
+        'ws-chat-a': 'removed',
+        'ws-chat-b': 'unverifiable'
+      })
+    )
+    expect(existsSync(removed)).toBe(false)
+    expect(existsSync(unverifiable)).toBe(true)
+    expect(existsSync(present)).toBe(true)
+  })
+
+  it('keeps a held chat whose workspace verdict throws', async () => {
+    const state = stateDirectory()
+    const folder = visualsFor(state, 'chat-a')
+    await sweepNativeChatVisualsFolders({
+      ...deps(state, ['chat-a']),
+      workspaceVerdicts: () => async () => {
+        throw new Error('catalog unavailable')
+      }
+    })
+    expect(existsSync(folder)).toBe(true)
+  })
+
+  it('removes nothing when the held chats cannot be read', async () => {
+    const state = stateDirectory()
+    const folder = visualsFor(state, 'chat-a')
+    await expect(sweepNativeChatVisualsFolders(deps(state, null))).resolves.toEqual({
+      removed: 0,
+      failed: 0
+    })
+    expect(existsSync(folder)).toBe(true)
+  })
+
+  it('never touches entries it did not mint, symlinks included', async () => {
+    const state = stateDirectory()
+    const root = nativeChatVisualsRootFor(state)
+    mkdirSync(join(root, 'notes'), { recursive: true })
+    writeFileSync(join(root, 'f'.repeat(32)), 'a file, not a folder')
+    const target = mkdtempSync(join(tmpdir(), 'orca-visuals-target-'))
+    scratch.push(target)
+    writeFileSync(join(target, 'keep.txt'), 'keep')
+    symlinkSync(target, join(root, 'e'.repeat(32)))
+    await sweepNativeChatVisualsFolders(deps(state, []))
+    expect(existsSync(join(root, 'notes'))).toBe(true)
+    expect(existsSync(join(root, 'f'.repeat(32)))).toBe(true)
+    expect(existsSync(join(root, 'e'.repeat(32)))).toBe(true)
+    expect(existsSync(join(target, 'keep.txt'))).toBe(true)
+  })
+
+  it('reports a removal that fails and carries on', async () => {
+    const state = stateDirectory()
+    visualsFor(state, 'chat-x')
+    visualsFor(state, 'chat-y')
+    const sweep = deps(state, [])
+    const result = await sweepNativeChatVisualsFolders({
+      ...sweep,
+      remove: vi
+        .fn()
+        .mockRejectedValueOnce(Object.assign(new Error('busy'), { code: 'EBUSY' }))
+        .mockResolvedValueOnce(undefined)
+    })
+    expect(result).toEqual({ removed: 1, failed: 1 })
+    expect(sweep.logger.warn).toHaveBeenCalledWith(
+      'native-chat visuals folder could not be removed',
+      expect.objectContaining({ scope: 'nativeChatVisuals.sweep', reason: 'no-record' })
+    )
+  })
+
+  it('does nothing on a host with no visuals yet', async () => {
+    await expect(
+      sweepNativeChatVisualsFolders(deps(stateDirectory(), ['chat-a']))
+    ).resolves.toEqual({ removed: 0, failed: 0 })
+  })
+
+  it('runs after startup and again later, and stops for good', async () => {
+    const state = stateDirectory()
+    const orphan = visualsFor(state, 'chat-z')
+    vi.useFakeTimers()
+    const listHeldSessionIds = vi.fn((): string[] => [])
+    const stop = scheduleNativeChatVisualsSweep({ ...deps(state, []), listHeldSessionIds })
+    await vi.advanceTimersByTimeAsync(60_000)
+    expect(listHeldSessionIds).not.toHaveBeenCalled()
+    await vi.advanceTimersByTimeAsync(60_000)
+    await vi.waitFor(() => expect(existsSync(orphan)).toBe(false))
+    expect(listHeldSessionIds).toHaveBeenCalledTimes(1)
+    await vi.advanceTimersByTimeAsync(6 * 60 * 60_000)
+    await vi.waitFor(() => expect(listHeldSessionIds).toHaveBeenCalledTimes(2))
+    stop()
+    expect(vi.getTimerCount()).toBe(0)
+  })
+
+  it('touches nothing under a visuals root that is a symlink', async () => {
+    const state = stateDirectory()
+    const elsewhere = mkdtempSync(join(tmpdir(), 'orca-visuals-elsewhere-'))
+    scratch.push(elsewhere)
+    mkdirSync(join(elsewhere, 'a'.repeat(32)))
+    symlinkSync(elsewhere, nativeChatVisualsRootFor(state))
+    await sweepNativeChatVisualsFolders(deps(state, []))
+    expect(existsSync(join(elsewhere, 'a'.repeat(32)))).toBe(true)
+  })
+
+  it('takes one verdict snapshot per run', async () => {
+    const state = stateDirectory()
+    visualsFor(state, 'chat-a')
+    visualsFor(state, 'chat-b')
+    const workspaceVerdicts = vi.fn(() => async () => 'present' as const)
+    await sweepNativeChatVisualsFolders({ ...deps(state, ['chat-a', 'chat-b']), workspaceVerdicts })
+    expect(workspaceVerdicts).toHaveBeenCalledOnce()
+  })
+})
diff --git a/src/main/native-chat/native-chat-visuals-sweep.ts b/src/main/native-chat/native-chat-visuals-sweep.ts
new file mode 100644
index 000000000000..11ffab0a57dc
--- /dev/null
+++ b/src/main/native-chat/native-chat-visuals-sweep.ts
@@ -0,0 +1,163 @@
+// How a chat's visuals folder dies. The host never deletes a chat record, so no deletion event
+// exists to hang cleanup on; instead each folder's life is derived from the records every run:
+//   1. a folder no chat record (readable or not) maps to is removed, so any future record
+//      deletion cleans up for free;
+//   2. a folder whose chat ran in a local workspace this host can prove was removed is removed.
+// Anything unproven is kept. A failure is logged and never blocks anything else.
+
+import type { Dirent } from 'node:fs'
+import { lstat, readdir, rm } from 'node:fs/promises'
+import { join } from 'node:path'
+import type { AgentSessionExecutionLocation } from '../../shared/agent-session-record'
+import { isDefinitiveAbsence } from '../../shared/definitive-filesystem-absence'
+import { yieldToEventLoop } from '../../shared/event-loop-yield'
+import type { StructuredAgentSessionLogger } from './agent-session-wire/structured-agent-session-logger'
+import { nativeChatVisualsFolderName, nativeChatVisualsRootFor } from './native-chat-visuals-folder'
+
+/** `removed` only on positive proof from the host that owns the workspace. */
+export type NativeChatVisualsWorkspaceVerdict = 'present' | 'removed' | 'unverifiable'
+
+export type NativeChatVisualsSweepDeps = {
+  stateDirectory: string
+  /** Every chat this host holds a row for, readable or not; null when that can't be trusted. */
+  listHeldSessionIds: () => readonly string[] | null
+  locationOf: (sessionId: string) => AgentSessionExecutionLocation | null
+  /** Called at most once per run, so one run judges every chat against one catalog snapshot.
+   *  Absent: only rule 1 runs. */
+  workspaceVerdicts?: () => (
+    location: AgentSessionExecutionLocation
+  ) => Promise<NativeChatVisualsWorkspaceVerdict>
+  logger: StructuredAgentSessionLogger
+  remove?: (path: string) => Promise<void>
+}
+
+export type NativeChatVisualsSweepResult = { removed: number; failed: number }
+
+// Only names this host minted: anything else in the folder is never touched.
+const FOLDER_NAME = /^[0-9a-f]{32}$/
+// Bounds one run's disk work; whatever is left goes in a later run.
+const MAX_REMOVALS_PER_RUN = 200
+const YIELD_EVERY = 32
+
+async function listFolders(root: string): Promise<Dirent[]> {
+  try {
+    // A root that is not a real directory is not one this host made; nothing under it is touched.
+    if (!(await lstat(root)).isDirectory()) {
+      return []
+    }
+    return await readdir(root, { withFileTypes: true })
+  } catch (error) {
+    if (isDefinitiveAbsence(error)) {
+      return []
+    }
+    throw error
+  }
+}
+
+export async function sweepNativeChatVisualsFolders(
+  deps: NativeChatVisualsSweepDeps,
+  isStopped: () => boolean = () => false
+): Promise<NativeChatVisualsSweepResult> {
+  const result = { removed: 0, failed: 0 }
+  const root = nativeChatVisualsRootFor(deps.stateDirectory)
+  // Listed before the records are read: a folder is created only after its chat's record, so
+  // every folder seen here already has its record in the snapshot below.
+  const entries = await listFolders(root)
+  const held = deps.listHeldSessionIds()
+  if (!held || entries.length === 0) {
+    return result
+  }
+  const sessionByFolder = new Map(
+    held.map((sessionId) => [nativeChatVisualsFolderName(sessionId), sessionId])
+  )
+  const remove = deps.remove ?? ((path: string) => rm(path, { recursive: true, force: true }))
+  let verdict: ReturnType<NonNullable<NativeChatVisualsSweepDeps['workspaceVerdicts']>> | undefined
+  const verdictFor = (location: AgentSessionExecutionLocation) =>
+    (verdict ??= deps.workspaceVerdicts?.())?.(location)
+  let visited = 0
+  for (const entry of entries) {
+    if (isStopped() || result.removed + result.failed >= MAX_REMOVALS_PER_RUN) {
+      break
+    }
+    if (++visited % YIELD_EVERY === 0) {
+      await yieldToEventLoop()
+    }
+    // A Dirent describes the entry itself, so a symlink is never followed or removed here.
+    if (!entry.isDirectory() || !FOLDER_NAME.test(entry.name)) {
+      continue
+    }
+    const sessionId = sessionByFolder.get(entry.name)
+    const reason =
+      sessionId === undefined ? 'no-record' : await removedWorkspace(deps, sessionId, verdictFor)
+    if (!reason) {
+      continue
+    }
+    try {
+      await remove(join(root, entry.name))
+      result.removed += 1
+    } catch (error) {
+      result.failed += 1
+      deps.logger.warn('native-chat visuals folder could not be removed', {
+        scope: 'nativeChatVisuals.sweep',
+        reason,
+        ...(sessionId ? { sessionId } : {}),
+        error
+      })
+    }
+  }
+  return result
+}
+
+async function removedWorkspace(
+  deps: Pick<NativeChatVisualsSweepDeps, 'locationOf'>,
+  sessionId: string,
+  verdictFor: (
+    location: AgentSessionExecutionLocation
+  ) => Promise<NativeChatVisualsWorkspaceVerdict> | undefined
+): Promise<'workspace-removed' | null> {
+  const location = deps.locationOf(sessionId)
+  if (!location) {
+    return null
+  }
+  try {
+    return (await verdictFor(location)) === 'removed' ? 'workspace-removed' : null
+  } catch {
+    return null
+  }
+}
+
+// Why minutes, not at boot: the first sweep must not compete with session restore and the
+// workspace catalog loading; after that, a few runs a day is enough for files nothing reads.
+const FIRST_SWEEP_DELAY_MS = 2 * 60_000
+const SWEEP_INTERVAL_MS = 6 * 60 * 60_000
+
+/** Runs the sweep after startup and then periodically; the returned stop ends both. */
+export function scheduleNativeChatVisualsSweep(deps: NativeChatVisualsSweepDeps): () => void {
+  let stopped = false
+  let timer: ReturnType<typeof setTimeout> | null = null
+  const run = async (): Promise<void> => {
+    try {
+      await sweepNativeChatVisualsFolders(deps, () => stopped)
+    } catch (error) {
+      deps.logger.warn('native-chat visuals sweep failed', {
+        scope: 'nativeChatVisuals.sweep',
+        error
+      })
+    }
+    arm(SWEEP_INTERVAL_MS)
+  }
+  const arm = (delayMs: number): void => {
+    if (stopped) {
+      return
+    }
+    timer = setTimeout(() => void run(), delayMs)
+    timer.unref?.()
+  }
+  arm(FIRST_SWEEP_DELAY_MS)
+  return () => {
+    stopped = true
+    if (timer) {
+      clearTimeout(timer)
+    }
+  }
+}
diff --git a/src/main/native-chat/session-file-resolver.ts b/src/main/native-chat/session-file-resolver.ts
index 802cc22baffc..5ea4b4faff81 100644
--- a/src/main/native-chat/session-file-resolver.ts
+++ b/src/main/native-chat/session-file-resolver.ts
@@ -21,6 +21,7 @@ import {
   wslCodexSessionsDirs
 } from './host-readable-transcript-path'
 import { findWslCodexSessionPath } from './wsl-codex-session-path-scan'
+import { parseSshTranscriptPath } from './ssh-transcript-path'
 import { wslTranscriptFsRefusal, type WslTranscriptFsError } from './wsl-transcript-fs-gate'
 
 // Why: these mirror the path constants in ai-vault/session-scanner.ts. Reads
@@ -112,6 +113,10 @@ export async function resolveSessionFilePath(
   // stale/missing paths fall through to the id-based search.
   let unavailable: WslTranscriptFsError | undefined
   const hookPath = options.transcriptPath?.trim()
+  // An SSH host's transcript is read only where its hook said; never search this machine for it.
+  if (hookPath && parseSshTranscriptPath(hookPath)) {
+    return extname(hookPath) === '.jsonl' ? hookPath : null
+  }
   if (hookPath && extname(hookPath) === '.jsonl') {
     try {
       const hostReadable = await toHostReadableTranscriptPath(hookPath, {
diff --git a/src/main/native-chat/ssh-transcript-fs-access.ts b/src/main/native-chat/ssh-transcript-fs-access.ts
new file mode 100644
index 000000000000..2b0c4424ae52
--- /dev/null
+++ b/src/main/native-chat/ssh-transcript-fs-access.ts
@@ -0,0 +1,31 @@
+import { requireSshFilesystemProvider } from '../providers/ssh-filesystem-dispatch'
+import { readRemoteTranscriptRange } from '../runtime/orchestration/worker-transcript-remote-range-read'
+import type { SshTranscriptLocation } from './ssh-transcript-path'
+
+export type SshTranscriptHandle = { sshTranscript: SshTranscriptLocation }
+
+// Why: the provider is looked up per call, so a reconnect is picked up and a disconnect throws
+// instead of reading anything on this machine.
+export async function statSshTranscript(location: SshTranscriptLocation) {
+  const stat = await requireSshFilesystemProvider(location.connectionId).stat(location.remotePath)
+  const mtimeMs = stat.mtimeMs ?? stat.mtime
+  return { size: stat.size, mtimeMs, ctimeMs: mtimeMs, dev: stat.dev ?? 0, ino: stat.ino ?? 0 }
+}
+
+export async function readSshTranscript(
+  handle: SshTranscriptHandle,
+  buffer: Buffer,
+  offset: number,
+  length: number,
+  position: number
+): Promise<{ bytesRead: number; buffer: Buffer }> {
+  const { connectionId, remotePath } = handle.sshTranscript
+  const bytes = await readRemoteTranscriptRange(
+    requireSshFilesystemProvider(connectionId),
+    remotePath,
+    position,
+    length
+  )
+  buffer.set(bytes, offset)
+  return { bytesRead: bytes.length, buffer }
+}
diff --git a/src/main/native-chat/ssh-transcript-path.test.ts b/src/main/native-chat/ssh-transcript-path.test.ts
new file mode 100644
index 000000000000..1f2f9457feed
--- /dev/null
+++ b/src/main/native-chat/ssh-transcript-path.test.ts
@@ -0,0 +1,76 @@
+import { describe, expect, it } from 'vitest'
+import { wslHookRelayConnectionId } from '../../shared/wsl-hook-relay-contract'
+import {
+  nativeChatTranscriptPathOnExecutionHost,
+  parseSshTranscriptPath,
+  toSshTranscriptPath
+} from './ssh-transcript-path'
+
+const REMOTE_PATH = '/home/ada/.claude/projects/p/session-1.jsonl'
+// A colon, so the encoding is shown to keep the id separate from the path.
+const CONNECTION_ID = 'target:1'
+
+function row(connectionId: string | null, transcriptPath = REMOTE_PATH) {
+  return {
+    connectionId,
+    providerSession: { key: 'session_id' as const, id: 'session-1', transcriptPath }
+  }
+}
+
+function readsFrom(path: string | undefined) {
+  return path ? (parseSshTranscriptPath(path) ?? path) : path
+}
+
+describe('nativeChatTranscriptPathOnExecutionHost', () => {
+  it('names the SSH host the hook store attests the session to', () => {
+    expect(
+      readsFrom(
+        nativeChatTranscriptPathOnExecutionHost([row(CONNECTION_ID)], 'session-1', REMOTE_PATH)
+      )
+    ).toEqual({ connectionId: CONNECTION_ID, remotePath: REMOTE_PATH })
+  })
+
+  it('leaves local and WSL sessions on this machine', () => {
+    const wsl = wslHookRelayConnectionId('Ubuntu')
+
+    expect(nativeChatTranscriptPathOnExecutionHost([row(null)], 'session-1', REMOTE_PATH)).toBe(
+      REMOTE_PATH
+    )
+    expect(nativeChatTranscriptPathOnExecutionHost([row(wsl)], 'session-1', REMOTE_PATH)).toBe(
+      REMOTE_PATH
+    )
+  })
+
+  it('reads an SSH session on its host even when the client asks for another path', () => {
+    expect(
+      readsFrom(
+        nativeChatTranscriptPathOnExecutionHost(
+          [row(CONNECTION_ID)],
+          'session-1',
+          '/tmp/stale.jsonl'
+        )
+      )
+    ).toEqual({ connectionId: CONNECTION_ID, remotePath: REMOTE_PATH })
+  })
+
+  it('prefers the SSH row whose transcript the client asked for', () => {
+    const rows = [row(CONNECTION_ID), row('target:2', '/home/ada/other.jsonl')]
+
+    expect(
+      readsFrom(nativeChatTranscriptPathOnExecutionHost(rows, 'session-1', '/home/ada/other.jsonl'))
+    ).toEqual({ connectionId: 'target:2', remotePath: '/home/ada/other.jsonl' })
+  })
+
+  it('keeps a session on this machine when a local row attests the requested path', () => {
+    const localPath = '/home/bob/.claude/projects/p/session-1.jsonl'
+    const rows = [row(CONNECTION_ID), row(null, localPath)]
+
+    expect(nativeChatTranscriptPathOnExecutionHost(rows, 'session-1', localPath)).toBe(localPath)
+  })
+
+  it('ignores an SSH-qualified path a client sends itself', () => {
+    const forged = toSshTranscriptPath(CONNECTION_ID, '/etc/secret.jsonl')
+
+    expect(nativeChatTranscriptPathOnExecutionHost([], 'session-1', forged)).toBeUndefined()
+  })
+})
diff --git a/src/main/native-chat/ssh-transcript-path.ts b/src/main/native-chat/ssh-transcript-path.ts
new file mode 100644
index 000000000000..638ef7ed40ec
--- /dev/null
+++ b/src/main/native-chat/ssh-transcript-path.ts
@@ -0,0 +1,55 @@
+import type { AgentStatusIpcPayload } from '../../shared/agent-status-types'
+import { isWslHookRelayConnectionId } from '../../shared/wsl-hook-relay-contract'
+
+// Why: the transcript engine addresses a file by one path string. A transcript on an SSH host is
+// named by its connection as well, so both travel in that string and no local file can answer.
+const SSH_TRANSCRIPT_PATH_PREFIX = 'orca-ssh-transcript:'
+
+export type SshTranscriptLocation = { connectionId: string; remotePath: string }
+
+export function toSshTranscriptPath(connectionId: string, remotePath: string): string {
+  return `${SSH_TRANSCRIPT_PATH_PREFIX}${encodeURIComponent(connectionId)}:${remotePath}`
+}
+
+export function parseSshTranscriptPath(path: string): SshTranscriptLocation | null {
+  if (!path.startsWith(SSH_TRANSCRIPT_PATH_PREFIX)) {
+    return null
+  }
+  const rest = path.slice(SSH_TRANSCRIPT_PATH_PREFIX.length)
+  const separator = rest.indexOf(':')
+  if (separator <= 0) {
+    return null
+  }
+  return {
+    connectionId: decodeURIComponent(rest.slice(0, separator)),
+    remotePath: rest.slice(separator + 1)
+  }
+}
+
+type HookRow = Pick<AgentStatusIpcPayload, 'connectionId' | 'providerSession'>
+
+/** The path native chat reads: a session the hook store puts on an SSH host is read there, never here. */
+export function nativeChatTranscriptPathOnExecutionHost(
+  statusRows: readonly HookRow[],
+  sessionId: string,
+  transcriptPath: string | undefined
+): string | undefined {
+  // Only the host mints this form; a client-supplied one would name a file the hook never attested.
+  const requested =
+    transcriptPath && !parseSshTranscriptPath(transcriptPath) ? transcriptPath : undefined
+  const rows = statusRows.filter(
+    (row) => row.providerSession?.id === sessionId && row.providerSession.transcriptPath
+  )
+  // Why: the row attesting the requested path decides the host; a stale path falls back to SSH.
+  const row =
+    rows.find((candidate) => candidate.providerSession?.transcriptPath === requested) ??
+    rows.find(isSshRow)
+  const remotePath = row?.providerSession?.transcriptPath
+  return row && isSshRow(row) && remotePath
+    ? toSshTranscriptPath(row.connectionId, remotePath)
+    : requested
+}
+
+function isSshRow(row: HookRow): row is HookRow & { connectionId: string } {
+  return row.connectionId ? !isWslHookRelayConnectionId(row.connectionId) : false
+}
diff --git a/src/main/native-chat/structured-agent-command-resolution.test.ts b/src/main/native-chat/structured-agent-command-resolution.test.ts
index a2fc166a1a33..c8be0c644fca 100644
--- a/src/main/native-chat/structured-agent-command-resolution.test.ts
+++ b/src/main/native-chat/structured-agent-command-resolution.test.ts
@@ -36,6 +36,21 @@ describe('structured agent executable resolution', () => {
     }
   )
 
+  it('reads the Command setting of any agent, and its stock binary by the name it is given', () => {
+    const { command } = executable()
+    expect(
+      resolveStructuredAgentCommand('opencode', { agentCmdOverrides: { opencode: `"${command}"` } })
+    ).toBe(command)
+    expect(
+      resolveStructuredAgentCommand(
+        'opencode',
+        { agentCmdOverrides: { claude: `"${command}"` } },
+        { pathEnv: '/nowhere' },
+        { command: 'opencode', resolve: (name) => `/stock/${name}` }
+      )
+    ).toBe('/stock/opencode')
+  })
+
   it('resolves a basename through the configured PATH and a home-relative path through the host home', () => {
     const { directory, command } = executable()
     const basenameCommand = join(directory, 'agent-custom')
diff --git a/src/main/native-chat/structured-agent-command-resolution.ts b/src/main/native-chat/structured-agent-command-resolution.ts
index 9cc1f28bd010..828fd031760c 100644
--- a/src/main/native-chat/structured-agent-command-resolution.ts
+++ b/src/main/native-chat/structured-agent-command-resolution.ts
@@ -10,7 +10,10 @@ import {
 } from '../../shared/tui-agent-launch-command-override'
 import { AgentSessionPreSpawnError } from './agent-session-wire/structured-agent-session-adapter'
 
-type CommandSettings = Partial<Pick<GlobalSettings, 'agentCmdOverrides' | 'agentDefaultEnv'>>
+export type StructuredAgentCommandSettings = Partial<
+  Pick<GlobalSettings, 'agentCmdOverrides' | 'agentDefaultEnv'>
+>
+type CommandSettings = StructuredAgentCommandSettings
 type CommandOptions = NonNullable<Parameters<typeof resolveExecutableCommand>[1]>
 
 function resolveOverride(
@@ -35,14 +38,16 @@ function spawnableOn(platform: NodeJS.Platform, command: string): boolean {
 }
 
 /** Re-read the existing setting for every session acquisition and catalog probe. A set Command
- *  that names no runnable program refuses the start rather than quietly running the stock CLI. */
+ *  that names no runnable program refuses the start rather than quietly running the stock CLI.
+ *  Without one, `stock` names the agent's own binary (the agent id by default). */
 export function resolveStructuredAgentCommand(
-  agent: 'claude' | 'codex',
+  agent: TuiAgent,
   settings: CommandSettings,
-  options: CommandOptions = {}
+  options: CommandOptions = {},
+  stock: { command?: string; resolve?: typeof resolveCliCommand } = {}
 ): string {
   if (!hasExplicitTuiLaunchCommand(settings, agent)) {
-    return resolveCliCommand(agent, options)
+    return (stock.resolve ?? resolveCliCommand)(stock.command ?? agent, options)
   }
   const command = resolveOverride(agent, settings, options)
   if (!command || !spawnableOn(options.platform ?? process.platform, command)) {
diff --git a/src/main/native-chat/structured-agent-session-create-support.test.ts b/src/main/native-chat/structured-agent-session-create-support.test.ts
index 61dfd787920b..a0b61c5ceadc 100644
--- a/src/main/native-chat/structured-agent-session-create-support.test.ts
+++ b/src/main/native-chat/structured-agent-session-create-support.test.ts
@@ -1,6 +1,5 @@
 import { describe, expect, it } from 'vitest'
 import type { AgentSessionExecutionLocation } from '../../shared/agent-session-record'
-import type { ClaudeManagedAccountGateSettings } from './claude-structured-managed-account-support'
 import { resolveStructuredAgentSessionCreateSupport } from './structured-agent-session-create-support'
 
 const LOCAL: AgentSessionExecutionLocation = {
@@ -10,64 +9,11 @@ const LOCAL: AgentSessionExecutionLocation = {
   workspaceKind: 'git-worktree'
 }
 
-function managedAccount(id: string, managedAuthRuntime: 'host' | 'wsl') {
-  return {
-    id,
-    email: `${id}@example.com`,
-    managedAuthPath: `/managed/${id}`,
-    managedAuthRuntime,
-    authMethod: 'subscription-oauth' as const,
-    createdAt: 0,
-    updatedAt: 0,
-    lastAuthenticatedAt: 0
-  }
-}
-
-const HOST_SELECTED: ClaudeManagedAccountGateSettings = {
-  claudeManagedAccounts: [managedAccount('host-1', 'host')],
-  activeClaudeManagedAccountId: 'host-1',
-  activeClaudeManagedAccountIdsByRuntime: { host: 'host-1', wsl: {} }
-}
-
-const WSL_ONLY: ClaudeManagedAccountGateSettings = {
-  claudeManagedAccounts: [managedAccount('wsl-1', 'wsl')],
-  activeClaudeManagedAccountId: null,
-  activeClaudeManagedAccountIdsByRuntime: { host: null, wsl: { Ubuntu: 'wsl-1' } }
-}
-
-function support(
-  overrides: Partial<Parameters<typeof resolveStructuredAgentSessionCreateSupport>[0]> = {}
-) {
-  return resolveStructuredAgentSessionCreateSupport({
-    agent: 'claude',
-    location: LOCAL,
-    adapterSupportsCreate: true,
-    getSettings: () => HOST_SELECTED,
-    ...overrides
-  })
-}
-
 describe('resolveStructuredAgentSessionCreateSupport', () => {
-  it('supports Claude under a selected host account', () => {
-    expect(support()).toEqual({ supported: true })
-  })
-
-  it('refuses Claude under a WSL-only managed account', () => {
-    expect(support({ getSettings: () => WSL_ONLY })).toEqual({ supported: false, reason: 'wsl' })
-  })
-
-  it('fails closed for Claude when the settings throw', () => {
+  it('supports what the adapter supports', () => {
     expect(
-      support({
-        getSettings: () => {
-          throw new Error('no store')
-        }
-      })
-    ).toEqual({ supported: false, reason: 'wsl' })
-  })
-
-  it('leaves Codex to the adapter answer under the same WSL-only account', () => {
-    expect(support({ agent: 'codex', getSettings: () => WSL_ONLY })).toEqual({ supported: true })
+      resolveStructuredAgentSessionCreateSupport({ location: LOCAL, adapterSupportsCreate: true })
+    ).toEqual({ supported: true })
   })
 
   it.each([
@@ -75,22 +21,8 @@ describe('resolveStructuredAgentSessionCreateSupport', () => {
     ['wsl workspace', { ...LOCAL, wslDistro: 'Ubuntu' }, 'wsl'],
     ['unsupported agent', LOCAL, 'agent']
   ] as const)('keeps the adapter refusal reason for %s', (_name, location, reason) => {
-    expect(support({ adapterSupportsCreate: false, location })).toEqual({
-      supported: false,
-      reason
-    })
-  })
-
-  // Command values never change the selected chat surface.
-  it.each([
-    ['claude', 'claude-wrapper'],
-    ['codex', 'codex-nightly'],
-    ['claude', 'npx claude'],
-    ['codex', 'wrapper --arg'],
-    ['claude', '/missing/claude'],
-    ['codex', './codex']
-  ] as const)('supports %s when this host sets launch command %s', (agent, command) => {
-    const settings = { ...HOST_SELECTED, agentCmdOverrides: { [agent]: command } }
-    expect(support({ agent, getSettings: () => settings })).toEqual({ supported: true })
+    expect(
+      resolveStructuredAgentSessionCreateSupport({ location, adapterSupportsCreate: false })
+    ).toEqual({ supported: false, reason })
   })
 })
diff --git a/src/main/native-chat/structured-agent-session-create-support.ts b/src/main/native-chat/structured-agent-session-create-support.ts
index e15e03a1135f..37a1fc033866 100644
--- a/src/main/native-chat/structured-agent-session-create-support.ts
+++ b/src/main/native-chat/structured-agent-session-create-support.ts
@@ -1,27 +1,16 @@
 import type { AgentSessionExecutionLocation } from '../../shared/agent-session-record'
 import type { StructuredAgentId } from '../../shared/agent-session-provider-handle'
 import { LOCAL_EXECUTION_HOST_ID } from '../../shared/execution-host'
-import {
-  readClaudeManagedAccountGateSettings,
-  structuredClaudeMatchesActiveManagedAccount,
-  type ClaudeManagedAccountGateSettings
-} from './claude-structured-managed-account-support'
 
 export type StructuredAgentSessionCreateSupport = {
   supported: boolean
   reason?: 'agent' | 'remote' | 'wsl'
 }
 
-/**
- * The create-support verdict, kept out of the runtime class file because that file is `@ts-nocheck`
- * — a call site there is not typechecked, so an auth-identity decision written inline would compile
- * however wrong it was. The runtime hands over the two facts it owns and this decides.
- */
+/** The create-support verdict: the adapter's location answer, with the reason a refusal names. */
 export function resolveStructuredAgentSessionCreateSupport(input: {
-  agent: StructuredAgentId
   location: AgentSessionExecutionLocation
   adapterSupportsCreate: boolean
-  getSettings: () => ClaudeManagedAccountGateSettings
 }): StructuredAgentSessionCreateSupport {
   if (!input.adapterSupportsCreate) {
     return {
@@ -34,16 +23,23 @@ export function resolveStructuredAgentSessionCreateSupport(input: {
             : 'agent'
     }
   }
-  // Claude only: Codex resolves its account on a different path, so its answer is untouched here.
-  // `wsl` is the closest existing reason — the cause is a WSL-bound account rather than a WSL
-  // workspace — and no client reads the field, so it stays as-is.
-  if (
-    input.agent === 'claude' &&
-    !structuredClaudeMatchesActiveManagedAccount(
-      readClaudeManagedAccountGateSettings(input.getSettings)
+  return { supported: true }
+}
+
+/** Which create-support check said no: where the chat would run, or the installed agent (its
+ *  binary and version on this host). */
+export type StructuredAgentSessionCreateSupportCheck = 'location' | 'installed-agent'
+
+/** One main-log line per create-support verdict that sends a launch to the terminal; names the
+ *  check and never a path or environment value. */
+export function warnStructuredAgentSessionCreateUnsupported(
+  agent: StructuredAgentId,
+  support: StructuredAgentSessionCreateSupport,
+  check: StructuredAgentSessionCreateSupportCheck
+): void {
+  if (!support.supported) {
+    console.warn(
+      `[structured-create-support] ${agent} unsupported: ${check} check refused (reason ${support.reason ?? 'none'})`
     )
-  ) {
-    return { supported: false, reason: 'wsl' }
   }
-  return { supported: true }
 }
diff --git a/src/main/native-chat/transcript-file-version.ts b/src/main/native-chat/transcript-file-version.ts
index d0dfed29b5f8..07ccaf9aace1 100644
--- a/src/main/native-chat/transcript-file-version.ts
+++ b/src/main/native-chat/transcript-file-version.ts
@@ -1,4 +1,4 @@
-import { readTranscriptSlice, wslGatedStat } from './wsl-transcript-fs-access'
+import { readTranscriptSlice, transcriptFileStat } from './wsl-transcript-fs-access'
 
 const BOUNDARY_FINGERPRINT_BYTES = 64
 
@@ -22,7 +22,7 @@ export async function readTranscriptFileVersion(
   filePath: string,
   signal?: AbortSignal
 ): Promise<TranscriptFileVersion> {
-  const value = await wslGatedStat(filePath, 'exact', signal)
+  const value = await transcriptFileStat(filePath, 'exact', signal)
   return {
     identity: `${value.dev}:${value.ino}`,
     size: value.size,
diff --git a/src/main/native-chat/transcript-incremental-reader.ts b/src/main/native-chat/transcript-incremental-reader.ts
index 558c552139d0..67bd3dce1e44 100644
--- a/src/main/native-chat/transcript-incremental-reader.ts
+++ b/src/main/native-chat/transcript-incremental-reader.ts
@@ -5,7 +5,7 @@ import {
   MAX_NATIVE_CHAT_TRANSCRIPT_RECORD_BYTES,
   type NativeChatLineDecoder
 } from './transcript-tail-reader'
-import { openTranscriptReadStream, wslGatedStat } from './wsl-transcript-fs-access'
+import { openTranscriptReadStream, transcriptFileStat } from './wsl-transcript-fs-access'
 
 const APPEND_BATCH_MESSAGE_LIMIT = 40
 
@@ -47,7 +47,7 @@ export async function readIncrementalTranscriptMessages(
   onLifecycle?: (lifecycle: NativeChatTurnLifecycle) => void,
   signal?: AbortSignal
 ): Promise<NativeChatMessage[]> {
-  const end = (await wslGatedStat(filePath, 'exact', signal)).size
+  const end = (await transcriptFileStat(filePath, 'exact', signal)).size
   if (end <= state.offset) {
     return []
   }
diff --git a/src/main/native-chat/transcript-reader.ts b/src/main/native-chat/transcript-reader.ts
index 97ab76802d00..6cad15a7757f 100644
--- a/src/main/native-chat/transcript-reader.ts
+++ b/src/main/native-chat/transcript-reader.ts
@@ -1,4 +1,5 @@
 import { readOpenCodeNativeChatTranscriptFull } from './transcript-opencode'
+import { isENOENT } from '../ipc/filesystem-path-containment'
 import type {
   AgentType,
   NativeChatMessage,
@@ -75,7 +76,7 @@ export async function readNativeChatTranscript(
   } catch (err) {
     // Why: ENOENT after a successful resolve is the same first-flush/rotation
     // race as an unresolved path — keep it retry-worthy (#8401).
-    if ((err as NodeJS.ErrnoException | null)?.code === 'ENOENT') {
+    if (isENOENT(err)) {
       return { error: errorMessage(err), notFound: true }
     }
     return { error: errorMessage(err) }
diff --git a/src/main/native-chat/transcript-tail-boundary.ts b/src/main/native-chat/transcript-tail-boundary.ts
index b4479ac2bd03..518c256fb56f 100644
--- a/src/main/native-chat/transcript-tail-boundary.ts
+++ b/src/main/native-chat/transcript-tail-boundary.ts
@@ -1,4 +1,4 @@
-import { wslGatedRead } from './wsl-transcript-fs-access'
+import { readTranscriptFile } from './wsl-transcript-fs-access'
 import type { TranscriptFileHandle } from './wsl-transcript-fs-access'
 
 export const TAIL_CHUNK_BYTES = 64 * 1024
@@ -14,7 +14,16 @@ export async function readTranscriptByteAt(
   signal?: AbortSignal
 ): Promise<number | null> {
   const byte = Buffer.allocUnsafe(1)
-  const { bytesRead } = await wslGatedRead(handle, filePath, byte, 0, 1, position, 'exact', signal)
+  const { bytesRead } = await readTranscriptFile(
+    handle,
+    filePath,
+    byte,
+    0,
+    1,
+    position,
+    'exact',
+    signal
+  )
   signal?.throwIfAborted()
   return bytesRead === 1 ? byte[0] : null
 }
@@ -40,7 +49,7 @@ export async function findLastCompleteLineEnd(
     signal?.throwIfAborted()
     const start = Math.max(0, cursor - TAIL_CHUNK_BYTES)
     const buffer = Buffer.allocUnsafe(cursor - start)
-    const { bytesRead } = await wslGatedRead(
+    const { bytesRead } = await readTranscriptFile(
       handle,
       filePath,
       buffer,
diff --git a/src/main/native-chat/transcript-tail-reader.ts b/src/main/native-chat/transcript-tail-reader.ts
index 8f486ecbe261..fb44470047bf 100644
--- a/src/main/native-chat/transcript-tail-reader.ts
+++ b/src/main/native-chat/transcript-tail-reader.ts
@@ -1,4 +1,5 @@
 import { readOpenCodeNativeChatTranscriptTail } from './transcript-opencode'
+import { isENOENT } from '../ipc/filesystem-path-containment'
 import type {
   AgentType,
   NativeChatMessage,
@@ -25,9 +26,9 @@ import {
 } from './transcript-tail-boundary'
 import {
   closeTranscriptHandle,
-  wslGatedOpen,
-  wslGatedRead,
-  wslGatedStat
+  openTranscriptFile,
+  readTranscriptFile,
+  transcriptFileStat
 } from './wsl-transcript-fs-access'
 import { wslTranscriptFsRefusal } from './wsl-transcript-fs-gate'
 
@@ -72,14 +73,14 @@ export async function readNativeChatTranscriptTailFile(
 }> {
   signal?.throwIfAborted()
   const end = Math.min(
-    (await wslGatedStat(filePath, 'exact', signal)).size,
+    (await transcriptFileStat(filePath, 'exact', signal)).size,
     endOffset ?? Number.MAX_SAFE_INTEGER
   )
   signal?.throwIfAborted()
   if (end === 0) {
     return { messages: [], consumedTo: 0, hasMore: false, beforeOffset: 0 }
   }
-  const handle = await wslGatedOpen(filePath, 'exact', signal)
+  const handle = await openTranscriptFile(filePath, 'exact', signal)
   const lineParts: Buffer[] = []
   let lineBytes = 0
   let lineOversized = false
@@ -112,7 +113,7 @@ export async function readNativeChatTranscriptTailFile(
       signal?.throwIfAborted()
       const start = Math.max(0, cursor - TAIL_CHUNK_BYTES)
       const buffer = Buffer.allocUnsafe(cursor - start)
-      const { bytesRead } = await wslGatedRead(
+      const { bytesRead } = await readTranscriptFile(
         handle,
         filePath,
         buffer,
@@ -292,8 +293,6 @@ export async function readNativeChatTranscriptTail(
   } catch (error) {
     signal?.throwIfAborted()
     const message = error instanceof Error ? error.message : String(error)
-    return (error as NodeJS.ErrnoException | null)?.code === 'ENOENT'
-      ? { error: message, notFound: true }
-      : { error: message }
+    return isENOENT(error) ? { error: message, notFound: true } : { error: message }
   }
 }
diff --git a/src/main/native-chat/transcript-watcher-install-probe.ts b/src/main/native-chat/transcript-watcher-install-probe.ts
index 2d3cf4858c6a..8fe3488829da 100644
--- a/src/main/native-chat/transcript-watcher-install-probe.ts
+++ b/src/main/native-chat/transcript-watcher-install-probe.ts
@@ -1,4 +1,4 @@
-import { wslGatedStat } from './wsl-transcript-fs-access'
+import { transcriptFileStat } from './wsl-transcript-fs-access'
 import { WslTranscriptFsError } from './wsl-transcript-fs-gate'
 import { transcriptWatcherPathIsRunning } from './wsl-transcript-watcher-running-guard'
 
@@ -10,7 +10,7 @@ export async function transcriptWatcherPathIsInstallable(
     return false
   }
   try {
-    await wslGatedStat(filePath, 'exact', signal)
+    await transcriptFileStat(filePath, 'exact', signal)
     return true
   } catch (error) {
     if (error instanceof WslTranscriptFsError) {
diff --git a/src/main/native-chat/wsl-transcript-fs-access.test.ts b/src/main/native-chat/wsl-transcript-fs-access.test.ts
index aaaf18f26983..e836328ca34c 100644
--- a/src/main/native-chat/wsl-transcript-fs-access.test.ts
+++ b/src/main/native-chat/wsl-transcript-fs-access.test.ts
@@ -43,8 +43,8 @@ import {
   openTranscriptReadStream,
   readTranscriptSlice,
   wslGatedLstat,
-  wslGatedOpen,
-  wslGatedRead,
+  openTranscriptFile,
+  readTranscriptFile,
   wslGatedReaddir,
   wslGatedReadFile,
   wslGatedStat,
@@ -93,8 +93,8 @@ describe('transcript filesystem accessor off WSL UNC', () => {
     await wslGatedLstat(path, 'scan')
     await wslGatedReaddir(path, 'scan')
     await wslGatedReadFile(path, 'utf-8', 'scan')
-    const opened = await wslGatedOpen(path, 'exact')
-    await wslGatedRead(opened, path, Buffer.alloc(1), 0, 1, 0, 'exact')
+    const opened = await openTranscriptFile(path, 'exact')
+    await readTranscriptFile(opened, path, Buffer.alloc(1), 0, 1, 0, 'exact')
     const stream = openTranscriptReadStream(path, { encoding: 'utf-8' }, 'scan')
 
     expect(mocks.runTask).not.toHaveBeenCalled()
@@ -151,8 +151,8 @@ describe('transcript filesystem accessor on WSL UNC', () => {
     handle.read.mockResolvedValue({ bytesRead: 1, buffer: Buffer.alloc(1) })
     mocks.open.mockResolvedValue(handle)
 
-    const opened = await wslGatedOpen(UNC_PATH, 'exact')
-    await wslGatedRead(opened, UNC_PATH, Buffer.alloc(1), 0, 1, 0, 'exact')
+    const opened = await openTranscriptFile(UNC_PATH, 'exact')
+    await readTranscriptFile(opened, UNC_PATH, Buffer.alloc(1), 0, 1, 0, 'exact')
 
     for (const call of mocks.runTask.mock.calls) {
       expect(call[0]).toMatchObject({ dedupe: false })
@@ -268,7 +268,7 @@ describe('transcript filesystem accessor on WSL UNC', () => {
     )
     try {
       const handle = fakeHandle()
-      const refused = wslGatedOpen(UNC_PATH, 'exact').catch((error: unknown) => error)
+      const refused = openTranscriptFile(UNC_PATH, 'exact').catch((error: unknown) => error)
       await vi.advanceTimersByTimeAsync(WSL_TRANSCRIPT_FS_EXACT_TIMEOUT_MS + 1)
       await expect(refused).resolves.toBeInstanceOf(WslTranscriptFsError)
 
diff --git a/src/main/native-chat/wsl-transcript-fs-access.ts b/src/main/native-chat/wsl-transcript-fs-access.ts
index c048fed0605b..7fcac1d89508 100644
--- a/src/main/native-chat/wsl-transcript-fs-access.ts
+++ b/src/main/native-chat/wsl-transcript-fs-access.ts
@@ -14,6 +14,12 @@ import {
 } from './wsl-transcript-fs-process-dispatch'
 import type { WslTranscriptFsReusableProcessCall } from './wsl-transcript-fs-process-protocol'
 import { wslTranscriptFsLaneKey } from './wsl-transcript-fs-route'
+import {
+  readSshTranscript,
+  statSshTranscript,
+  type SshTranscriptHandle
+} from './ssh-transcript-fs-access'
+import { parseSshTranscriptPath } from './ssh-transcript-path'
 
 /** Never nest a gated call inside another — that deadlocks the scan slot. */
 
@@ -21,7 +27,13 @@ import { wslTranscriptFsLaneKey } from './wsl-transcript-fs-route'
 // healthy-but-slow transcript is not false-failed by a whole-file timeout.
 export const WSL_TRANSCRIPT_READ_CHUNK_BYTES = 1024 * 1024
 
-export type TranscriptFileHandle = FileHandle | WslTranscriptFsProcessHandle
+export type TranscriptFileHandle = FileHandle | WslTranscriptFsProcessHandle | SshTranscriptHandle
+/** The stat fields the transcript readers use; an SSH host answers only these. */
+export type TranscriptFileStats = Pick<Stats, 'size' | 'mtimeMs' | 'ctimeMs' | 'dev' | 'ino'>
+
+function isSshTranscriptHandle(handle: TranscriptFileHandle): handle is SshTranscriptHandle {
+  return 'sshTranscript' in handle
+}
 
 // One request object drives both the gate's dedupe/route key and the child
 // call, so the two can never disagree on the operation or path.
@@ -63,6 +75,16 @@ export function wslGatedStat(
   return runReusableFsOperation({ operation: 'stat', path }, priority, signal, () => stat(path))
 }
 
+/** Stat for the transcript readers, which may also name a file on an SSH host. */
+export function transcriptFileStat(
+  path: string,
+  priority: WslTranscriptFsTaskPriority,
+  signal?: AbortSignal
+): Promise<TranscriptFileStats> {
+  const ssh = parseSshTranscriptPath(path)
+  return ssh ? statSshTranscript(ssh) : wslGatedStat(path, priority, signal)
+}
+
 export function wslGatedLstat(
   path: string,
   priority: WslTranscriptFsTaskPriority,
@@ -93,11 +115,15 @@ export function wslGatedReadFile(
 }
 
 // dedupe:false — two joiners would share one FileHandle and both close it.
-export function wslGatedOpen(
+export function openTranscriptFile(
   path: string,
   priority: WslTranscriptFsTaskPriority,
   signal?: AbortSignal
 ): Promise<TranscriptFileHandle> {
+  const ssh = parseSshTranscriptPath(path)
+  if (ssh) {
+    return Promise.resolve({ sshTranscript: ssh })
+  }
   if (!isWslUncPath(path)) {
     return open(path, 'r')
   }
@@ -121,7 +147,7 @@ export function wslGatedOpen(
  * buffer: a joiner would receive the first caller's buffer while its own
  * (often `Buffer.allocUnsafe`) stays uninitialized.
  */
-export function wslGatedRead(
+export function readTranscriptFile(
   handle: TranscriptFileHandle,
   path: string,
   buffer: Buffer,
@@ -131,6 +157,9 @@ export function wslGatedRead(
   priority: WslTranscriptFsTaskPriority,
   signal?: AbortSignal
 ): Promise<{ bytesRead: number; buffer: Buffer }> {
+  if (isSshTranscriptHandle(handle)) {
+    return readSshTranscript(handle, buffer, offset, length, position)
+  }
   // Handle kind decides before path spelling: a process-owned handle must never
   // hit the FileHandle branch even if a caller re-derives the path off-UNC.
   if (!isWslUncPath(path) && !isWslTranscriptFsProcessHandle(handle)) {
@@ -152,6 +181,9 @@ export function wslGatedRead(
 
 /** Never gated; process-owned handles retire on the client's bounded deadline. */
 export function closeTranscriptHandle(handle: TranscriptFileHandle, path: string): Promise<void> {
+  if (isSshTranscriptHandle(handle)) {
+    return Promise.resolve()
+  }
   if (isWslTranscriptFsProcessHandle(handle)) {
     void closeWslTranscriptFsProcess(handle).catch(() => {})
     return Promise.resolve()
@@ -177,10 +209,10 @@ export async function readTranscriptSlice(
   priority: WslTranscriptFsTaskPriority,
   signal?: AbortSignal
 ): Promise<Buffer> {
-  const handle = await wslGatedOpen(path, priority, signal)
+  const handle = await openTranscriptFile(path, priority, signal)
   try {
     const buffer = Buffer.allocUnsafe(length)
-    const { bytesRead } = await wslGatedRead(
+    const { bytesRead } = await readTranscriptFile(
       handle,
       path,
       buffer,
@@ -212,7 +244,7 @@ async function* gatedChunks(
   priority: WslTranscriptFsTaskPriority,
   signal?: AbortSignal
 ): AsyncGenerator<Buffer | string> {
-  const handle = await wslGatedOpen(path, priority, signal)
+  const handle = await openTranscriptFile(path, priority, signal)
   // Why: chunk boundaries fall mid-codepoint, so decoding each slice
   // independently would emit U+FFFD on both sides of any straddling character.
   const decoder = options.encoding ? new StringDecoder(options.encoding) : null
@@ -227,7 +259,7 @@ async function* gatedChunks(
         break
       }
       const buffer = Buffer.allocUnsafe(length)
-      const { bytesRead } = await wslGatedRead(
+      const { bytesRead } = await readTranscriptFile(
         handle,
         path,
         buffer,
@@ -275,7 +307,7 @@ export function openTranscriptReadStream(
   priority: WslTranscriptFsTaskPriority,
   signal?: AbortSignal
 ): Readable {
-  if (!isWslUncPath(path)) {
+  if (!isWslUncPath(path) && !parseSshTranscriptPath(path)) {
     // Node destroys the stream with an AbortError on abort, matching how the
     // gated branch surfaces cancellation to the same consumers.
     return createReadStream(path, { ...options, signal })
diff --git a/src/main/native-chat/wsl-transcript-watcher-running-guard.ts b/src/main/native-chat/wsl-transcript-watcher-running-guard.ts
index 50d98689744b..5c83a9d90905 100644
--- a/src/main/native-chat/wsl-transcript-watcher-running-guard.ts
+++ b/src/main/native-chat/wsl-transcript-watcher-running-guard.ts
@@ -4,6 +4,7 @@ import {
   createTranscriptNativeWatcher,
   type TranscriptNativeWatcher
 } from './transcript-native-watcher'
+import { parseSshTranscriptPath } from './ssh-transcript-path'
 
 export function isWslTranscriptWatcherPath(filePath: string): boolean {
   return isWslUncPath(filePath)
@@ -21,8 +22,8 @@ export function createRunningGuardedTranscriptNativeWatcher(
   onEvent: () => void,
   onRetry: () => void
 ): TranscriptNativeWatcher {
-  const isWslPath = isWslTranscriptWatcherPath(filePath)
-  if (isWslPath) {
+  // fs.watch cannot see an SSH host's file; the reconciliation poll stats it there instead.
+  if (isWslTranscriptWatcherPath(filePath) || parseSshTranscriptPath(filePath)) {
     return {
       bind: () => false,
       dispose: () => {},
diff --git a/src/main/opencode-usage/opencode-database-discovery.ts b/src/main/opencode-usage/opencode-database-discovery.ts
index 5f7ca25415db..25fadd541e67 100644
--- a/src/main/opencode-usage/opencode-database-discovery.ts
+++ b/src/main/opencode-usage/opencode-database-discovery.ts
@@ -1,8 +1,11 @@
 import { stat } from 'node:fs/promises'
-import { basename, isAbsolute, join } from 'node:path'
+import { basename, join } from 'node:path'
 import { wslGatedReaddir, wslGatedStat } from '../native-chat/wsl-transcript-fs-access'
 import { WslTranscriptFsError } from '../native-chat/wsl-transcript-fs-gate'
-import { resolveOpenCodeDataDirectory } from '../opencode/opencode-data-directory'
+import {
+  resolveOpenCodeDataDirectory,
+  resolveOpenCodeDatabasePath
+} from '../opencode/opencode-data-directory'
 import type { OpenCodeUsageProcessedDatabase } from './types'
 
 type OpenCodeDatabaseOverride = {
@@ -10,20 +13,14 @@ type OpenCodeDatabaseOverride = {
   path: string | null
 }
 
-function getOpenCodeDatabaseOverride(
-  dataDirectory: string,
-  environment: NodeJS.ProcessEnv
-): OpenCodeDatabaseOverride {
+function getOpenCodeDatabaseOverride(environment: NodeJS.ProcessEnv): OpenCodeDatabaseOverride {
   const raw = environment.OPENCODE_DB?.trim()
   if (!raw) {
     return { isConfigured: false, path: null }
   }
-  if (raw === ':memory:') {
-    return { isConfigured: true, path: null }
-  }
   return {
     isConfigured: true,
-    path: isAbsolute(raw) ? raw : join(dataDirectory, raw)
+    path: resolveOpenCodeDatabasePath(environment)
   }
 }
 
@@ -40,7 +37,7 @@ export async function listOpenCodeDatabases(
   environment: NodeJS.ProcessEnv = process.env
 ): Promise<string[]> {
   const dataDirectory = resolveOpenCodeDataDirectory(environment)
-  const databaseOverride = getOpenCodeDatabaseOverride(dataDirectory, environment)
+  const databaseOverride = getOpenCodeDatabaseOverride(environment)
   if (databaseOverride.isConfigured) {
     if (!databaseOverride.path) {
       return []
diff --git a/src/main/opencode-usage/scanner-wsl-gate.test.ts b/src/main/opencode-usage/scanner-wsl-gate.test.ts
index c8bb123c4763..b280a8638b2b 100644
--- a/src/main/opencode-usage/scanner-wsl-gate.test.ts
+++ b/src/main/opencode-usage/scanner-wsl-gate.test.ts
@@ -12,7 +12,8 @@ const mocks = vi.hoisted(() => ({
 }))
 
 vi.mock('../opencode/opencode-data-directory', () => ({
-  resolveOpenCodeDataDirectory: mocks.resolveDataDirectory
+  resolveOpenCodeDataDirectory: mocks.resolveDataDirectory,
+  resolveOpenCodeDatabasePath: () => UNC_DATABASE
 }))
 vi.mock('node:fs/promises', async (importOriginal) => ({
   ...(await importOriginal<typeof NodeFsPromisesModule>()),
diff --git a/src/main/opencode/opencode-acp-environment.ts b/src/main/opencode/opencode-acp-environment.ts
new file mode 100644
index 000000000000..2970ce317aee
--- /dev/null
+++ b/src/main/opencode/opencode-acp-environment.ts
@@ -0,0 +1,69 @@
+import { restoreOrStripOverlayEnv } from '../../shared/agent-overlay-env'
+import { getAppEnvironment } from '../../shared/app-environment'
+import { isOpenCodeLegacySharedConfigDir } from './legacy-shared-config-dir'
+
+const ORCA_ENV_PREFIXES = ['ORCA_OPENCODE_', 'ORCA_DATA_ACCOUNT_']
+const ACCOUNT_ENV_KEYS = ['XDG_DATA_HOME', 'XDG_STATE_HOME', 'OPENCODE_DB', 'OPENCODE_AUTH_CONTENT']
+
+/**
+ * A structured chat's OpenCode reports through the chat, never through Orca's terminal status
+ * plugin. Restores the user's own `OPENCODE_CONFIG_DIR` over the overlay a terminal pane would have
+ * (dropping it when none was recorded, or when it is the retired shared plugin directory), and drops
+ * every Orca OpenCode and data-account variable. Runs after the account is applied. Returns
+ * the keys the child must not inherit.
+ */
+export function scrubOpenCodeAcpEnvironment(
+  env: Record<string, string>,
+  inherited: NodeJS.ProcessEnv,
+  userDataPath: string | null = orcaUserDataPath()
+): string[] {
+  const view: Record<string, string> = {}
+  for (const [key, value] of Object.entries(inherited)) {
+    if (value !== undefined) {
+      view[key] = value
+    }
+  }
+  Object.assign(view, env)
+  restoreOrStripOverlayEnv(
+    view,
+    {
+      primary: 'OPENCODE_CONFIG_DIR',
+      overlay: 'ORCA_OPENCODE_CONFIG_DIR',
+      source: 'ORCA_OPENCODE_SOURCE_CONFIG_DIR',
+      preserveExplicitPrimary: true
+    },
+    {}
+  )
+  const removed: string[] = []
+  if (
+    view.OPENCODE_CONFIG_DIR === undefined ||
+    (userDataPath !== null &&
+      isOpenCodeLegacySharedConfigDir(view.OPENCODE_CONFIG_DIR, userDataPath))
+  ) {
+    delete env.OPENCODE_CONFIG_DIR
+    removed.push('OPENCODE_CONFIG_DIR')
+  } else {
+    env.OPENCODE_CONFIG_DIR = view.OPENCODE_CONFIG_DIR
+  }
+  // The launch environment decides these; one it leaves unset must not come from Orca's overlay.
+  for (const key of ACCOUNT_ENV_KEYS) {
+    if (env[key] === undefined) {
+      removed.push(key)
+    }
+  }
+  for (const key of new Set([...Object.keys(env), ...Object.keys(inherited)])) {
+    if (ORCA_ENV_PREFIXES.some((prefix) => key.startsWith(prefix))) {
+      delete env[key]
+      removed.push(key)
+    }
+  }
+  return removed
+}
+
+function orcaUserDataPath(): string | null {
+  try {
+    return getAppEnvironment().getPath('userData')
+  } catch {
+    return null
+  }
+}
diff --git a/src/main/opencode/opencode-acp-stored-messages.test.ts b/src/main/opencode/opencode-acp-stored-messages.test.ts
new file mode 100644
index 000000000000..43ca17f8a5d6
--- /dev/null
+++ b/src/main/opencode/opencode-acp-stored-messages.test.ts
@@ -0,0 +1,111 @@
+import { mkdirSync, mkdtempSync, rmSync } from 'node:fs'
+import { tmpdir } from 'node:os'
+import { join } from 'node:path'
+import { afterEach, describe, expect, it, vi } from 'vitest'
+import Database from '../sqlite/sync-database'
+import { readOpenCodeTranscriptPage } from '../native-chat/transcript-opencode-sqlite-query'
+import {
+  openCodeStoredUserMessagesReader,
+  type OpenCodeTranscriptPageReader
+} from './opencode-acp-stored-messages'
+
+const roots: string[] = []
+afterEach(() => {
+  for (const root of roots.splice(0)) {
+    rmSync(root, { recursive: true, force: true })
+  }
+})
+
+/** An `opencode.db` under a fresh XDG data home, built by `schema`; returns that data home. */
+function dataHomeWith(schema: string): string {
+  const root = mkdtempSync(join(tmpdir(), 'orca-opencode-stored-'))
+  roots.push(root)
+  mkdirSync(join(root, 'opencode'))
+  const db = new Database(join(root, 'opencode', 'opencode.db'))
+  db.exec(schema)
+  db.close()
+  return root
+}
+
+/** The bounded reader in-process, standing in for its worker. */
+const readInProcess: OpenCodeTranscriptPageReader = async (args) => readOpenCodeTranscriptPage(args)
+
+function readFrom(dataHome: string) {
+  return openCodeStoredUserMessagesReader(readInProcess)({
+    env: { HOME: dataHome, USERPROFILE: dataHome, XDG_DATA_HOME: dataHome },
+    providerSessionId: 'ses_1',
+    signal: new AbortController().signal
+  })
+}
+
+const OPENCODE_2_TABLES = `CREATE TABLE session_v2 (id TEXT PRIMARY KEY);
+  CREATE TABLE session_message (id TEXT PRIMARY KEY, session_id TEXT, type TEXT, seq INTEGER,
+    data TEXT, time_created INTEGER, time_updated INTEGER);`
+
+describe('OpenCode stored user messages', () => {
+  it("reads the database under the chat's own home, and only its user messages", async () => {
+    const readPage = vi.fn<OpenCodeTranscriptPageReader>(async () => ({
+      items: [
+        {
+          rowid: 1,
+          fingerprint: 'a',
+          message: { id: 'msg_1', role: 'user', blocks: [], timestamp: 5, source: 'transcript' }
+        },
+        {
+          rowid: 2,
+          fingerprint: 'b',
+          message: {
+            id: 'msg_2',
+            role: 'assistant',
+            blocks: [],
+            timestamp: 6,
+            source: 'transcript'
+          }
+        }
+      ],
+      hasMore: false,
+      beforeMessageRowId: 1
+    }))
+    const home = join('/', 'child-home')
+    const read = openCodeStoredUserMessagesReader(readPage)
+    await expect(
+      read({
+        env: { HOME: home, USERPROFILE: home },
+        providerSessionId: 'ses_1',
+        signal: new AbortController().signal
+      })
+    ).resolves.toEqual([{ id: 'msg_1', blocks: [], createdAt: 5 }])
+    expect(readPage).toHaveBeenCalledWith(
+      expect.objectContaining({
+        dbPath: join(home, '.local', 'share', 'opencode', 'opencode.db'),
+        sessionId: 'ses_1'
+      }),
+      expect.anything()
+    )
+  })
+
+  it('reads a 2.x session from its live tables, not the frozen 1.x copy an upgrade left', async () => {
+    const dataHome = dataHomeWith(`${OPENCODE_2_TABLES}
+      CREATE TABLE session (id TEXT PRIMARY KEY);
+      CREATE TABLE message (id TEXT, session_id TEXT, time_created INTEGER, time_updated INTEGER,
+        data TEXT);
+      CREATE TABLE part (id TEXT, message_id TEXT, session_id TEXT, time_updated INTEGER, data TEXT);
+      INSERT INTO session VALUES ('ses_1');
+      INSERT INTO message VALUES ('old', 'ses_1', 1, 1, '{"role":"user"}');
+      INSERT INTO part VALUES ('p', 'old', 'ses_1', 1, '{"type":"text","text":"frozen"}');
+      INSERT INTO session_v2 VALUES ('ses_1');
+      INSERT INTO session_message VALUES
+        ('u1', 'ses_1', 'user', 1, '{"text":"live prompt"}', 50, 50),
+        ('a1', 'ses_1', 'assistant', 2, '{"content":[{"type":"text","text":"reply"}]}', 60, 60);`)
+    await expect(readFrom(dataHome)).resolves.toEqual([
+      { id: 'opencode:u1', blocks: [{ type: 'text', text: 'live prompt' }], createdAt: 50 }
+    ])
+  })
+
+  it('finds nothing in a 2.x database whose message table it does not know', async () => {
+    const dataHome = dataHomeWith(`CREATE TABLE session_v2 (id TEXT PRIMARY KEY);
+      CREATE TABLE session_message (id TEXT PRIMARY KEY, session_id TEXT, body TEXT);
+      INSERT INTO session_v2 VALUES ('ses_1');`)
+    await expect(readFrom(dataHome)).resolves.toBeNull()
+  })
+})
diff --git a/src/main/opencode/opencode-acp-stored-messages.ts b/src/main/opencode/opencode-acp-stored-messages.ts
new file mode 100644
index 000000000000..8a2beff56418
--- /dev/null
+++ b/src/main/opencode/opencode-acp-stored-messages.ts
@@ -0,0 +1,38 @@
+import { homedir } from 'node:os'
+import { OPENCODE_TRANSCRIPT_MAX_WINDOW } from '../../shared/opencode-transcript-page-limit'
+import type { AcpStoredUserMessagesReader } from '../acp/acp-recovery-history'
+import { resolveOpenCodeDatabasePath } from './opencode-data-directory'
+import type { readOpenCodeTranscriptPageViaWorker } from '../ai-vault/session-scanner-opencode-sqlite-worker-spawn'
+
+export type OpenCodeTranscriptPageReader = typeof readOpenCodeTranscriptPageViaWorker
+
+/** The latest user messages of an OpenCode session, read from the database its pinned account
+ *  selects, through the existing bounded reader: 2.x's `session_v2` rows first, else 1.x's. */
+export function openCodeStoredUserMessagesReader(
+  readPage?: OpenCodeTranscriptPageReader
+): AcpStoredUserMessagesReader {
+  return async ({ env, providerSessionId, signal }) => {
+    // The child's own home, which its account may name, not this process's.
+    const home = (process.platform === 'win32' ? env.USERPROFILE : env.HOME) || homedir()
+    const dbPath = resolveOpenCodeDatabasePath(env, home)
+    if (!dbPath) {
+      return null
+    }
+    const read =
+      readPage ??
+      (await import('../ai-vault/session-scanner-opencode-sqlite-worker-spawn'))
+        .readOpenCodeTranscriptPageViaWorker
+    const page = await read(
+      { dbPath, sessionId: providerSessionId, limit: OPENCODE_TRANSCRIPT_MAX_WINDOW },
+      signal
+    )
+    if (!page) {
+      return null
+    }
+    return page.items.flatMap(({ message }) =>
+      message.role === 'user' && message.timestamp !== null
+        ? [{ id: message.id, blocks: message.blocks, createdAt: message.timestamp }]
+        : []
+    )
+  }
+}
diff --git a/src/main/opencode/opencode-data-directory.test.ts b/src/main/opencode/opencode-data-directory.test.ts
index e3b9073aa17d..df95f0b8ae91 100644
--- a/src/main/opencode/opencode-data-directory.test.ts
+++ b/src/main/opencode/opencode-data-directory.test.ts
@@ -2,6 +2,7 @@ import { join } from 'node:path'
 import { afterEach, describe, expect, it } from 'vitest'
 import {
   resolveOpenCodeDataDirectory,
+  resolveOpenCodeDatabasePath,
   resolveOpenCodeStorageDirectory
 } from './opencode-data-directory'
 
@@ -43,4 +44,17 @@ describe('resolveOpenCodeDataDirectory', () => {
       join('/users/test', '.local', 'share', 'opencode', 'storage')
     )
   })
+
+  it('resolves default, relative, absolute and in-memory database selections', () => {
+    const environment = { XDG_DATA_HOME: '/pinned' }
+    expect(resolveOpenCodeDatabasePath(environment)).toBe(
+      join('/pinned', 'opencode', 'opencode.db')
+    )
+    expect(resolveOpenCodeDatabasePath({ ...environment, OPENCODE_DB: 'custom.db' })).toBe(
+      join('/pinned', 'opencode', 'custom.db')
+    )
+    const absolute = join(process.cwd(), 'selected.db')
+    expect(resolveOpenCodeDatabasePath({ ...environment, OPENCODE_DB: absolute })).toBe(absolute)
+    expect(resolveOpenCodeDatabasePath({ ...environment, OPENCODE_DB: ':memory:' })).toBeNull()
+  })
 })
diff --git a/src/main/opencode/opencode-data-directory.ts b/src/main/opencode/opencode-data-directory.ts
index b3db5598cee5..5010311f7884 100644
--- a/src/main/opencode/opencode-data-directory.ts
+++ b/src/main/opencode/opencode-data-directory.ts
@@ -1,5 +1,5 @@
 import { homedir } from 'node:os'
-import { join } from 'node:path'
+import { isAbsolute, join } from 'node:path'
 
 export function resolveOpenCodeDataDirectory(
   environment: NodeJS.ProcessEnv = process.env,
@@ -15,3 +15,17 @@ export function resolveOpenCodeStorageDirectory(
 ): string {
   return join(resolveOpenCodeDataDirectory(environment, homeDirectory), 'storage')
 }
+
+export function resolveOpenCodeDatabasePath(
+  environment: NodeJS.ProcessEnv = process.env,
+  homeDirectory = homedir()
+): string | null {
+  const selection = environment.OPENCODE_DB?.trim()
+  if (selection === ':memory:') {
+    return null
+  }
+  const dataDirectory = resolveOpenCodeDataDirectory(environment, homeDirectory)
+  return selection && isAbsolute(selection)
+    ? selection
+    : join(dataDirectory, selection || 'opencode.db')
+}
diff --git a/src/main/opencode/opencode-structured-account-home.test.ts b/src/main/opencode/opencode-structured-account-home.test.ts
new file mode 100644
index 000000000000..34300a3fed43
--- /dev/null
+++ b/src/main/opencode/opencode-structured-account-home.test.ts
@@ -0,0 +1,126 @@
+import { describe, expect, it } from 'vitest'
+import type { ManagedDataAccountsState } from '../../shared/managed-account-types'
+import { restoreManagedDataAccountEnvironment } from '../../shared/managed-data-account-environment'
+import {
+  environmentForStructuredOpenCodeAccountHome,
+  resolveStructuredOpenCodeAccountHome
+} from './opencode-structured-account-home'
+
+const first = '123e4567-e89b-42d3-a456-426614174000'
+const second = '123e4567-e89b-42d3-a456-426614174001'
+
+function managedAccounts() {
+  let activeAccountId: string | null = first
+  let available = new Set([first, second])
+  return {
+    list: (): ManagedDataAccountsState => ({
+      accounts: [...available].map((id) => ({ id, label: id, integrations: [], createdAt: 0 })),
+      activeAccountId
+    }),
+    restoreOriginalEnvironment: (environment: Record<string, string | undefined>) =>
+      restoreManagedDataAccountEnvironment(environment),
+    environmentForAccount: (_provider: 'opencode' | 'devin', id: string) => {
+      if (!available.has(id)) {
+        throw new Error('Managed account not found.')
+      }
+      return {
+        XDG_DATA_HOME: `/profiles/${id}/data`,
+        XDG_STATE_HOME: `/profiles/${id}/state`,
+        OPENCODE_DB: 'opencode.db',
+        OPENCODE_AUTH_CONTENT: ''
+      }
+    },
+    select: (id: string | null) => {
+      activeAccountId = id
+    },
+    remove: (id: string) => {
+      available = new Set([...available].filter((entry) => entry !== id))
+    }
+  }
+}
+
+describe('structured OpenCode account binding', () => {
+  it('records only that the chat has no managed profile', () => {
+    const accounts = managedAccounts()
+    accounts.select(null)
+    expect(resolveStructuredOpenCodeAccountHome({ managedAccounts: accounts })).toEqual({
+      kind: 'opencode',
+      locator: { kind: 'unmanaged' }
+    })
+  })
+
+  it('uses the pinned managed profile after selection changes and refuses removal', () => {
+    const accounts = managedAccounts()
+    const binding = resolveStructuredOpenCodeAccountHome({ managedAccounts: accounts })
+    accounts.select(second)
+    const environment = environmentForStructuredOpenCodeAccountHome(binding, {
+      managedAccounts: accounts,
+      baseEnvironment: { PATH: '/bin' }
+    })
+    expect(environment.XDG_DATA_HOME).toBe(`/profiles/${first}/data`)
+    expect(environment.OPENCODE_DB).toBe('opencode.db')
+    expect(resolveStructuredOpenCodeAccountHome({ managedAccounts: accounts }).locator).toEqual({
+      kind: 'managed',
+      managedProfileId: second
+    })
+    accounts.remove(first)
+    expect(() =>
+      environmentForStructuredOpenCodeAccountHome(binding, {
+        managedAccounts: accounts,
+        baseEnvironment: {}
+      })
+    ).toThrow('Managed account not found.')
+  })
+
+  it("passes the user's inline credentials, relative paths and database through unchanged", () => {
+    const accounts = managedAccounts()
+    accounts.select(null)
+    const baseEnvironment = {
+      PATH: '/bin',
+      HOME: 'relative/home',
+      XDG_DATA_HOME: 'relative/data',
+      XDG_STATE_HOME: 'relative/state',
+      OPENCODE_DB: 'custom.db',
+      OPENCODE_AUTH_CONTENT: '{"provider":{"type":"api","key":"inline"}}'
+    }
+    const binding = resolveStructuredOpenCodeAccountHome({ managedAccounts: accounts })
+    expect(
+      environmentForStructuredOpenCodeAccountHome(binding, {
+        managedAccounts: accounts,
+        baseEnvironment
+      })
+    ).toEqual(baseEnvironment)
+  })
+
+  it("undoes Orca's inherited managed overlay before passing the environment through", () => {
+    const accounts = managedAccounts()
+    accounts.select(null)
+    const environment = environmentForStructuredOpenCodeAccountHome(
+      { kind: 'opencode', locator: { kind: 'unmanaged' } },
+      {
+        managedAccounts: accounts,
+        baseEnvironment: {
+          ORCA_DATA_ACCOUNT_PROVIDER: 'opencode',
+          ORCA_DATA_ACCOUNT_DATA_HOME: '/old/data',
+          ORCA_DATA_ACCOUNT_STATE_HOME: '/old/state',
+          ORCA_DATA_ACCOUNT_ORIGINAL_ENV: JSON.stringify({
+            XDG_DATA_HOME: '/original/data',
+            XDG_STATE_HOME: null,
+            OPENCODE_DB: 'original.db',
+            OPENCODE_AUTH_CONTENT: null
+          }),
+          XDG_DATA_HOME: '/old/data',
+          XDG_STATE_HOME: '/old/state',
+          OPENCODE_DB: 'opencode.db',
+          OPENCODE_AUTH_CONTENT: '',
+          PATH: '/bin'
+        }
+      }
+    )
+    expect(environment).toEqual({
+      XDG_DATA_HOME: '/original/data',
+      OPENCODE_DB: 'original.db',
+      PATH: '/bin'
+    })
+  })
+})
diff --git a/src/main/opencode/opencode-structured-account-home.ts b/src/main/opencode/opencode-structured-account-home.ts
new file mode 100644
index 000000000000..57279a8aa05b
--- /dev/null
+++ b/src/main/opencode/opencode-structured-account-home.ts
@@ -0,0 +1,95 @@
+import {
+  isLegacyAgentSessionAccountHome,
+  type OpenCodeAgentSessionAccountHome
+} from '../../shared/agent-session-account-home'
+import {
+  getManagedDataAccountService,
+  type ManagedDataAccountService
+} from '../managed-data-accounts/service'
+import type { AcpAccountBinding } from '../acp/acp-account-binding'
+
+type AccountReader = Pick<
+  ManagedDataAccountService,
+  'list' | 'restoreOriginalEnvironment' | 'environmentForAccount'
+>
+
+function restoredEnvironment(
+  environment: NodeJS.ProcessEnv,
+  managedAccounts: Pick<AccountReader, 'restoreOriginalEnvironment'>
+): Record<string, string | undefined> {
+  const copy = { ...environment }
+  managedAccounts.restoreOriginalEnvironment(copy)
+  delete copy.ORCA_DATA_ACCOUNT_PROVIDER
+  delete copy.ORCA_DATA_ACCOUNT_DATA_HOME
+  delete copy.ORCA_DATA_ACCOUNT_STATE_HOME
+  delete copy.ORCA_DATA_ACCOUNT_ORIGINAL_ENV
+  return copy
+}
+
+function definedEnvironment(
+  environment: Record<string, string | undefined>
+): Record<string, string> {
+  const defined: Record<string, string> = {}
+  for (const [key, value] of Object.entries(environment)) {
+    if (value !== undefined) {
+      defined[key] = value
+    }
+  }
+  return defined
+}
+
+/** Resolve the current selection on the execution host when creating a chat. */
+export function resolveStructuredOpenCodeAccountHome(input: {
+  managedAccounts: AccountReader
+}): OpenCodeAgentSessionAccountHome {
+  const selected = input.managedAccounts.list('opencode').activeAccountId
+  if (selected) {
+    input.managedAccounts.environmentForAccount('opencode', selected)
+    return { kind: 'opencode', locator: { kind: 'managed', managedProfileId: selected } }
+  }
+  return { kind: 'opencode', locator: { kind: 'unmanaged' } }
+}
+
+/** Resolve a saved binding against the current host, then apply it after inherited overlays. */
+export function environmentForStructuredOpenCodeAccountHome(
+  binding: OpenCodeAgentSessionAccountHome,
+  input: {
+    managedAccounts: Pick<AccountReader, 'environmentForAccount' | 'restoreOriginalEnvironment'>
+    baseEnvironment: Record<string, string>
+  }
+): Record<string, string> {
+  const environment = restoredEnvironment(input.baseEnvironment, input.managedAccounts)
+  const locator = binding.locator
+  // Unmanaged: the user's own environment reaches OpenCode as-is.
+  if (locator.kind === 'unmanaged') {
+    return definedEnvironment(environment)
+  }
+  delete environment.XDG_DATA_HOME
+  delete environment.XDG_STATE_HOME
+  delete environment.OPENCODE_DB
+  delete environment.OPENCODE_AUTH_CONTENT
+  return {
+    ...definedEnvironment(environment),
+    ...input.managedAccounts.environmentForAccount('opencode', locator.managedProfileId)
+  }
+}
+
+/** OpenCode's account over ACP: a managed profile, or the user's own environment. */
+export function openCodeAcpAccountBinding(
+  managedAccounts: () => AccountReader = getManagedDataAccountService
+): AcpAccountBinding {
+  return {
+    pin: { accountLocatorKind: 'opencode' },
+    resolve: async () =>
+      resolveStructuredOpenCodeAccountHome({ managedAccounts: managedAccounts() }),
+    environment: (home, env) => {
+      if (isLegacyAgentSessionAccountHome(home)) {
+        throw new Error('OpenCode chat requires a pinned data account')
+      }
+      return environmentForStructuredOpenCodeAccountHome(home, {
+        managedAccounts: managedAccounts(),
+        baseEnvironment: env
+      })
+    }
+  }
+}
diff --git a/src/main/window/history-gc-profile-worktree-ids.test.ts b/src/main/orca-profiles/other-profile-workspace-catalog.test.ts
similarity index 79%
rename from src/main/window/history-gc-profile-worktree-ids.test.ts
rename to src/main/orca-profiles/other-profile-workspace-catalog.test.ts
index 3c01d0f2ea23..43fd24d919b4 100644
--- a/src/main/window/history-gc-profile-worktree-ids.test.ts
+++ b/src/main/orca-profiles/other-profile-workspace-catalog.test.ts
@@ -10,8 +10,11 @@ import { afterEach, describe, expect, it } from 'vitest'
 import { folderWorkspaceKey } from '../../shared/workspace-scope'
 import { importProfileStateJson } from '../persistence/profile-state/profile-state-documents'
 import { openProfileStateDatabase } from '../persistence/profile-state/profile-state-database'
-import { getOrcaProfileStateDatabaseFile } from '../orca-profiles/profile-storage-paths'
-import { getOtherProfileWorktreeIdsForHistoryGc } from './history-gc-profile-worktree-ids'
+import { getOrcaProfileStateDatabaseFile } from './profile-storage-paths'
+import {
+  getOtherProfileWorktreeIdsForHistoryGc,
+  readOtherProfileWorkspaceCatalog
+} from './other-profile-workspace-catalog'
 
 const roots: string[] = []
 
@@ -265,3 +268,48 @@ describe('getOtherProfileWorktreeIdsForHistoryGc', () => {
     })
   })
 })
+
+describe('readOtherProfileWorkspaceCatalog', () => {
+  it("also names every other profile's projects", () => {
+    const root = userDataWithProfiles('active', [
+      { id: 'active', state: { repos: [{ id: 'repo-active' }] } },
+      { id: 'other', state: { repos: [{ id: 'repo-other' }, { id: '' }, null] } }
+    ])
+    const catalog = readOtherProfileWorkspaceCatalog(root)
+    expect(catalog.repoIds).toEqual(new Set(['repo-other']))
+    expect(catalog.unreadableProfiles).toBe(0)
+  })
+
+  it('counts a profile whose projects are not a list as unreadable', () => {
+    const root = userDataWithProfiles('active', [
+      { id: 'active', state: {} },
+      { id: 'other', state: { repos: { 'repo-other': {} } } }
+    ])
+    expect(readOtherProfileWorkspaceCatalog(root).unreadableProfiles).toBe(1)
+  })
+
+  it('skips the running profile even when the index already names another as active', () => {
+    const root = userDataWithProfiles('next', [
+      { id: 'running', state: { repos: [{ id: 'repo-running' }] } },
+      { id: 'next', state: { repos: [{ id: 'repo-next' }] } }
+    ])
+    const catalog = readOtherProfileWorkspaceCatalog(root, { runningProfileId: 'running' })
+    expect(catalog.repoIds).toEqual(new Set(['repo-next']))
+  })
+
+  it('counts a never-written profile as empty only when asked', () => {
+    const root = userDataWithProfiles('active', [{ id: 'active', state: {} }, { id: 'fresh' }])
+    expect(readOtherProfileWorkspaceCatalog(root).unreadableProfiles).toBe(1)
+    const lenient = readOtherProfileWorkspaceCatalog(root, { neverWrittenIsEmpty: true })
+    expect(lenient.unreadableProfiles).toBe(0)
+    expect(lenient.repoIds.size).toBe(0)
+  })
+
+  it('never counts a profile with only backups of its data file as empty', () => {
+    const root = userDataWithProfiles('active', [{ id: 'active', state: {} }, { id: 'lost' }])
+    writeFileSync(join(root, 'profiles', 'lost', 'orca-data.json.bak.0'), '{}')
+    expect(
+      readOtherProfileWorkspaceCatalog(root, { neverWrittenIsEmpty: true }).unreadableProfiles
+    ).toBe(1)
+  })
+})
diff --git a/src/main/window/history-gc-profile-worktree-ids.ts b/src/main/orca-profiles/other-profile-workspace-catalog.ts
similarity index 60%
rename from src/main/window/history-gc-profile-worktree-ids.ts
rename to src/main/orca-profiles/other-profile-workspace-catalog.ts
index 07a115b0ad86..1ba2e91a114e 100644
--- a/src/main/window/history-gc-profile-worktree-ids.ts
+++ b/src/main/orca-profiles/other-profile-workspace-catalog.ts
@@ -1,13 +1,18 @@
 import { lstatSync, readFileSync } from 'node:fs'
+import { isDefinitiveAbsence } from '../../shared/definitive-filesystem-absence'
 import { folderWorkspaceKey } from '../../shared/workspace-scope'
 import {
   getOrcaProfileDataFile,
   getOrcaProfileStateDatabaseFile,
   getProfileUserDataPath
-} from '../orca-profiles/profile-storage-paths'
-import { getOrcaProfileIndexPath, readProfileIndex } from '../orca-profiles/profile-index-store'
+} from './profile-storage-paths'
+import { getOrcaProfileIndexPath, readProfileIndex } from './profile-index-store'
 import { readProfileStateDomains } from '../persistence/profile-state/profile-state-domain-reader'
 import { assertNoRetainedProfileStateExports } from '../persistence/profile-state/profile-state-recovery-required'
+import {
+  PROFILE_STATE_LEGACY_BACKUP_COUNT,
+  profileStateLegacyBackupPath
+} from '../persistence/profile-state/legacy-json/profile-state-legacy-backup-path'
 
 /**
  * Worktree ids owned by Orca profiles OTHER than the running one.
@@ -21,7 +26,7 @@ import { assertNoRetainedProfileStateExports } from '../persistence/profile-stat
  *
  * Reading their persisted state directly is deliberate: a Store per profile would
  * run migrations and normalization against state another profile owns. Only the
- * two id-bearing collections are read, and any unreadable profile is skipped —
+ * id-bearing collections are read, and any unreadable profile is skipped —
  * a profile whose ids cannot be established must widen the live set's
  * uncertainty, never narrow it, so failure here is handled by the caller
  * refusing to prune rather than by pruning more.
@@ -30,29 +35,59 @@ export function getOtherProfileWorktreeIdsForHistoryGc(userDataPath = getProfile
   ids: Set<string>
   unreadableProfiles: number
 } {
+  const { ids, unreadableProfiles } = readOtherProfileWorkspaceCatalog(userDataPath)
+  return { ids, unreadableProfiles }
+}
+
+type ProfileWorkspaceIds = {
+  /** Worktree ids with metadata, and folder workspace keys. */
+  ids: Set<string>
+  repoIds: Set<string>
+}
+
+export type OtherProfileCatalogOptions = {
+  /** The profile this process runs, whose catalog the caller reads live. Defaults to the index's
+   *  active profile, which a profile switch rewrites before the running one exits. */
+  runningProfileId?: string
+  /** A profile with no state database, sidecar or data file at all has never been written and
+   *  holds nothing; by default it counts as unreadable like a missing file anywhere else. */
+  neverWrittenIsEmpty?: boolean
+}
+
+/** The workspaces and projects every profile other than the running one holds. Any profile whose
+ *  state can't be read is counted, never skipped silently: its ids are unknown. */
+export function readOtherProfileWorkspaceCatalog(
+  userDataPath = getProfileUserDataPath(),
+  options: OtherProfileCatalogOptions = {}
+): ProfileWorkspaceIds & { unreadableProfiles: number } {
   const ids = new Set<string>()
+  const repoIds = new Set<string>()
   const index = readProfileIndex(getOrcaProfileIndexPath(userDataPath))
   if (!index) {
-    return { ids, unreadableProfiles: 0 }
+    return { ids, repoIds, unreadableProfiles: 0 }
   }
   let unreadableProfiles = 0
+  const running = options.runningProfileId ?? index.activeProfileId
   for (const profile of index.profiles) {
-    if (profile.id === index.activeProfileId) {
+    if (profile.id === running) {
       continue
     }
-    const collected = readProfileWorktreeIds(profile.id, userDataPath)
+    const collected = readProfileWorktreeIds(profile.id, userDataPath, options)
     if (!collected) {
       unreadableProfiles += 1
       continue
     }
-    for (const id of collected) {
-      ids.add(id)
-    }
+    collected.ids.forEach((id) => ids.add(id))
+    collected.repoIds.forEach((id) => repoIds.add(id))
   }
-  return { ids, unreadableProfiles }
+  return { ids, repoIds, unreadableProfiles }
 }
 
-function readProfileWorktreeIds(profileId: string, userDataPath: string): Set<string> | null {
+function readProfileWorktreeIds(
+  profileId: string,
+  userDataPath: string,
+  options: OtherProfileCatalogOptions = {}
+): ProfileWorkspaceIds | null {
   const databaseFile = getOrcaProfileStateDatabaseFile(profileId, userDataPath)
   // A present database is authoritative. In particular, do not fall back to a
   // stale JSON export after corruption or a future schema, because that could
@@ -70,9 +105,31 @@ function readProfileWorktreeIds(profileId: string, userDataPath: string): Set<st
   } catch {
     return null
   }
+  if (options.neverWrittenIsEmpty && neverWritten(dataFile)) {
+    return { ids: new Set(), repoIds: new Set() }
+  }
   return readProfileWorktreeIdsFromJson(dataFile)
 }
 
+/** No data file and none of Orca's own backups of it: a lost primary file is not a fresh profile. */
+function neverWritten(dataFile: string): boolean {
+  for (let index = 0; index < PROFILE_STATE_LEGACY_BACKUP_COUNT; index += 1) {
+    if (!definitivelyAbsent(profileStateLegacyBackupPath(dataFile, index))) {
+      return false
+    }
+  }
+  return definitivelyAbsent(dataFile)
+}
+
+function definitivelyAbsent(path: string): boolean {
+  try {
+    lstatSync(path)
+    return false
+  } catch (error) {
+    return isDefinitiveAbsence(error)
+  }
+}
+
 function profileStateDatabasePresence(path: string): 'absent' | 'present' | 'unreadable' {
   let mainDatabasePresent = false
   try {
@@ -104,10 +161,11 @@ function profileStateDatabasePresence(path: string): 'absent' | 'present' | 'unr
 function readProfileWorktreeIdsFromDatabase(
   databaseFile: string,
   profileId: string
-): Set<string> | null {
+): ProfileWorkspaceIds | null {
   const domains = readProfileStateDomains(databaseFile, profileId, [
     'worktreeMeta',
-    'folderWorkspaces'
+    'folderWorkspaces',
+    'repos'
   ])
   if (domains.kind === 'unreadable') {
     return null
@@ -141,10 +199,29 @@ function readProfileWorktreeIdsFromDatabase(
       }
     }
   }
+  const repoIds = repoIdsOf(domains.values.get('repos'))
+  return repoIds ? { ids, repoIds } : null
+}
+
+/** Null when the collection is present but not a list: its ids are unknown. */
+function repoIdsOf(repos: unknown): Set<string> | null {
+  const ids = new Set<string>()
+  if (repos === undefined || repos === null) {
+    return ids
+  }
+  if (!Array.isArray(repos)) {
+    return null
+  }
+  for (const repo of repos) {
+    const id = isRecord(repo) ? repo.id : undefined
+    if (typeof id === 'string' && id) {
+      ids.add(id)
+    }
+  }
   return ids
 }
 
-function readProfileWorktreeIdsFromJson(dataFile: string): Set<string> | null {
+function readProfileWorktreeIdsFromJson(dataFile: string): ProfileWorkspaceIds | null {
   let parsed: unknown
   try {
     parsed = JSON.parse(readFileSync(dataFile, 'utf8'))
@@ -153,10 +230,10 @@ function readProfileWorktreeIdsFromJson(dataFile: string): Set<string> | null {
     // thing to the caller: this profile's ids are unknown.
     return null
   }
-  if (!parsed || typeof parsed !== 'object') {
+  if (!isRecord(parsed)) {
     return null
   }
-  const state = parsed as { worktreeMeta?: unknown; folderWorkspaces?: unknown }
+  const state = parsed
   const ids = new Set<string>()
   if (state.worktreeMeta && typeof state.worktreeMeta === 'object') {
     for (const id of Object.keys(state.worktreeMeta)) {
@@ -165,13 +242,14 @@ function readProfileWorktreeIdsFromJson(dataFile: string): Set<string> | null {
   }
   if (Array.isArray(state.folderWorkspaces)) {
     for (const workspace of state.folderWorkspaces) {
-      const id = (workspace as { id?: unknown } | null)?.id
+      const id = isRecord(workspace) ? workspace.id : undefined
       if (typeof id === 'string' && id) {
         ids.add(folderWorkspaceKey(id))
       }
     }
   }
-  return ids
+  const repoIds = repoIdsOf(state.repos)
+  return repoIds ? { ids, repoIds } : null
 }
 
 function isRecord(value: unknown): value is Record<string, unknown> {
diff --git a/src/main/orcad/launcher.ts b/src/main/orcad/launcher.ts
new file mode 100644
index 000000000000..4e43729084a6
--- /dev/null
+++ b/src/main/orcad/launcher.ts
@@ -0,0 +1,27 @@
+import { createHash } from 'node:crypto'
+import { readFileSync, realpathSync } from 'node:fs'
+import { createRequire } from 'node:module'
+import { dirname, join } from 'node:path'
+import { ORCAD_SERVER_ENTRY_FILENAME } from '../../shared/orcad-artifacts'
+import { assertOrcadServerRuntime, handoffToBundledOrcad } from './orcad-bundled-runtime'
+
+declare const ORCAD_SERVER_SHA256: string
+
+let loadServer: (() => void) | undefined
+
+try {
+  if (!handoffToBundledOrcad()) {
+    assertOrcadServerRuntime()
+    const entry = realpathSync(process.argv[1] ?? __filename)
+    const server = join(dirname(entry), ORCAD_SERVER_ENTRY_FILENAME)
+    if (createHash('sha256').update(readFileSync(server)).digest('hex') !== ORCAD_SERVER_SHA256) {
+      throw new Error('The Orca server does not match its launcher')
+    }
+    loadServer = () => createRequire(entry)(server)
+  }
+} catch (error) {
+  console.error('orcad: failed to launch:', error)
+  process.exit(78)
+}
+
+loadServer?.()
diff --git a/src/main/orcad/main-preflight-order.test.ts b/src/main/orcad/main-preflight-order.test.ts
index d6744cdcb10b..5a77d2c5cca3 100644
--- a/src/main/orcad/main-preflight-order.test.ts
+++ b/src/main/orcad/main-preflight-order.test.ts
@@ -18,7 +18,7 @@ const { order, profileProbe } = vi.hoisted(() => {
   return { order, profileProbe: vi.fn(async () => {}) }
 })
 
-vi.mock('./orcad-bundled-runtime', () => ({ handoffToBundledOrcad: () => false }))
+vi.mock('./orcad-bundled-runtime', () => ({ assertOrcadServerRuntime: () => {} }))
 vi.mock('./orcad-profile-preflight', () => ({
   preflightBundledOrcadStartup: async () => {
     order.push('profile-admission')
diff --git a/src/main/orcad/main.ts b/src/main/orcad/main.ts
index 325ada702d68..49490ffedf37 100644
--- a/src/main/orcad/main.ts
+++ b/src/main/orcad/main.ts
@@ -8,7 +8,7 @@ import {
   ORCAD_STARTUP_PREFLIGHT_FLAG
 } from '../../shared/orcad-profile-preflight'
 import { preflightBundledOrcadStartup, runOrcadProfilePreflight } from './orcad-profile-preflight'
-import { handoffToBundledOrcad } from './orcad-bundled-runtime'
+import { assertOrcadServerRuntime } from './orcad-bundled-runtime'
 import {
   formatOrcadNativePreflightReport,
   ORCAD_NATIVE_PREFLIGHT_FLAG
@@ -44,7 +44,7 @@ function failStartup(error: unknown): void {
   process.exit(resolveOrcadExitCode(error))
 }
 
-// Why before the bundled handoff and preflights: launching or completing a stop must not start a runtime.
+// One-shot launch and stop commands must skip server startup and preflights.
 if (process.argv[2] === WINDOWS_BREAKAWAY_LAUNCH_FLAG) {
   runWindowsBreakawayLaunchIfRequested(ORCAD_WINDOWS_BREAKAWAY_CONTRACT, process.argv)
 } else if (
@@ -60,34 +60,33 @@ if (process.argv[2] === WINDOWS_BREAKAWAY_LAUNCH_FLAG) {
 
 function startOrcadProcess(): void {
   try {
-    if (!handoffToBundledOrcad()) {
-      const flag = process.argv[2]
-      if (flag === ORCAD_NATIVE_PREFLIGHT_FLAG && process.argv.length === 3) {
-        void import('./node-pty-precondition').then(({ checkNodePtyPrecondition }) => {
-          const verdict = checkNodePtyPrecondition()
-          const report = formatOrcadNativePreflightReport(verdict.status, verdict.reason ?? null)
-          process.stdout.write(`${report}\n`, () => process.exit(0))
-        }, failStartup)
-      } else if (
-        (flag === ORCAD_PROFILE_PREFLIGHT_FLAG || flag === ORCAD_STARTUP_PREFLIGHT_FLAG) &&
-        process.argv.length === 4
-      ) {
-        void runOrcadProfilePreflight(process.argv[3], {
-          nativeFeatures: flag === ORCAD_PROFILE_PREFLIGHT_FLAG
+    assertOrcadServerRuntime()
+    const flag = process.argv[2]
+    if (flag === ORCAD_NATIVE_PREFLIGHT_FLAG && process.argv.length === 3) {
+      void import('./node-pty-precondition').then(({ checkNodePtyPrecondition }) => {
+        const verdict = checkNodePtyPrecondition()
+        const report = formatOrcadNativePreflightReport(verdict.status, verdict.reason ?? null)
+        process.stdout.write(`${report}\n`, () => process.exit(0))
+      }, failStartup)
+    } else if (
+      (flag === ORCAD_PROFILE_PREFLIGHT_FLAG || flag === ORCAD_STARTUP_PREFLIGHT_FLAG) &&
+      process.argv.length === 4
+    ) {
+      void runOrcadProfilePreflight(process.argv[3], {
+        nativeFeatures: flag === ORCAD_PROFILE_PREFLIGHT_FLAG
+      })
+        // Why exit: the owner reads to EOF, so a lingering native handle must not hold the probe open.
+        .then(() => process.stdout.write('', () => process.exit(0)))
+        .catch(failStartup)
+    } else {
+      // Why: stdout is the serve readiness API; incidental diagnostics go to stderr.
+      reserveServeStdoutForReadiness()
+      void preflightBundledOrcadStartup()
+        .then(() => {
+          runOrcadNativePreflight()
+          return main()
         })
-          // Why exit: the owner reads to EOF, so a lingering native handle must not hold the probe open.
-          .then(() => process.stdout.write('', () => process.exit(0)))
-          .catch(failStartup)
-      } else {
-        // Why: stdout is the serve readiness API; incidental diagnostics go to stderr.
-        reserveServeStdoutForReadiness()
-        void preflightBundledOrcadStartup()
-          .then(() => {
-            runOrcadNativePreflight()
-            return main()
-          })
-          .catch(failStartup)
-      }
+        .catch(failStartup)
     }
   } catch (error) {
     failStartup(error)
diff --git a/src/main/orcad/orcad-bundled-runtime.test.ts b/src/main/orcad/orcad-bundled-runtime.test.ts
index 9fe9b96afb78..3cbfa8546c3e 100644
--- a/src/main/orcad/orcad-bundled-runtime.test.ts
+++ b/src/main/orcad/orcad-bundled-runtime.test.ts
@@ -1,7 +1,11 @@
 import { EventEmitter } from 'node:events'
 import { join, resolve } from 'node:path'
 import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest'
-import { handoffToBundledOrcad, resolveBundledOrcadSlot } from './orcad-bundled-runtime'
+import {
+  assertOrcadServerRuntime,
+  handoffToBundledOrcad,
+  resolveBundledOrcadSlot
+} from './orcad-bundled-runtime'
 import {
   NODE_RUNTIME_ASSETS,
   NODE_RUNTIME_COMPAT_ASSETS,
@@ -238,3 +242,36 @@ describe('bundled Orca runtime handoff', () => {
     expect(process.kill).not.toHaveBeenCalled()
   })
 })
+
+describe('server runtime admission', () => {
+  it.each(['14.21.3', '16.20.2'])('refuses host Node %s before loading profile state', (node) => {
+    fixture.exists.mockReturnValue(false)
+    vi.spyOn(process, 'versions', 'get').mockReturnValue({ ...process.versions, node })
+    expect(() => assertOrcadServerRuntime()).toThrow('requires Node.js 18')
+  })
+
+  it.each(['18.20.8', '20.19.0', '22.14.0', '23.0.0', '24.0.0', '26.0.0'])(
+    'accepts unpackaged host Node %s',
+    (node) => {
+      fixture.exists.mockReturnValue(false)
+      vi.spyOn(process, 'versions', 'get').mockReturnValue({ ...process.versions, node })
+      expect(() => assertOrcadServerRuntime()).not.toThrow()
+    }
+  )
+
+  it('refuses host Node 24 for a packaged slot that owns a bundled runtime', () => {
+    vi.spyOn(process, 'versions', 'get').mockReturnValue({ ...process.versions, node: '24.0.0' })
+    expect(() => assertOrcadServerRuntime()).toThrow('Start the Orca server with its bundled')
+  })
+
+  it('accepts the packaged runtime only at its pinned version', () => {
+    fixture.realpath.mockImplementation((path) =>
+      path === '/slot/orcad.js' ? path : '/real/runtime'
+    )
+    const versions = vi.spyOn(process, 'versions', 'get')
+    versions.mockReturnValue({ ...process.versions, node: '24.0.0' })
+    expect(() => assertOrcadServerRuntime()).toThrow(`must be Node ${NODE_RUNTIME_PIN.version}`)
+    versions.mockReturnValue({ ...process.versions, node: NODE_RUNTIME_PIN.version })
+    expect(() => assertOrcadServerRuntime()).not.toThrow()
+  })
+})
diff --git a/src/main/orcad/orcad-bundled-runtime.ts b/src/main/orcad/orcad-bundled-runtime.ts
index 497e8a1120f9..927018ac37b3 100644
--- a/src/main/orcad/orcad-bundled-runtime.ts
+++ b/src/main/orcad/orcad-bundled-runtime.ts
@@ -64,6 +64,23 @@ export function isRunningAsBundledOrcadRuntime(directory: string): boolean {
   return runtime !== null && realpathSync(process.execPath) === realpathSync(runtime)
 }
 
+/** Refuse an old or substituted runtime before the server opens any profile state. */
+export function assertOrcadServerRuntime(): void {
+  if (Number(process.versions.node.split('.')[0]) < 18) {
+    throw new OrcadBundledRuntimeError('The Orca server requires Node.js 18 or newer')
+  }
+  const directory = resolveBundledOrcadSlot()
+  const runtime = resolveBundledOrcadRuntime(directory)
+  if (runtime && !isRunningAsBundledOrcadRuntime(directory)) {
+    throw new OrcadBundledRuntimeError('Start the Orca server with its bundled Node.js runtime')
+  }
+  if (runtime && process.versions.node !== NODE_RUNTIME_PIN.version) {
+    throw new OrcadBundledRuntimeError(
+      `The bundled Orca runtime must be Node ${NODE_RUNTIME_PIN.version}`
+    )
+  }
+}
+
 /** Keep old Node service commands usable without letting a host Node open the profile. */
 export function handoffToBundledOrcad(): boolean {
   const script = process.argv[1]
diff --git a/src/main/orcad/orcad-health.ts b/src/main/orcad/orcad-health.ts
index c5ab26d28c3e..d8cf2f705a28 100644
--- a/src/main/orcad/orcad-health.ts
+++ b/src/main/orcad/orcad-health.ts
@@ -8,8 +8,7 @@
  * to cross the process boundary: orcad drives it, the daemon performs it, and the verdict
  * travels back over the daemon's socket.
  */
-import { createHash } from 'node:crypto'
-import { readFileSync } from 'node:fs'
+import { hashOrcadLauncher } from '../../shared/orcad-build-identity'
 import process from 'node:process'
 import { checkDaemonHealthWithCoverage, type DaemonHealth } from '../daemon/daemon-health'
 import { ptySpawnHealthPlatformCoverage } from '../daemon/daemon-health-identity'
@@ -58,7 +57,7 @@ export type TerminalDaemonHealth = {
 }
 
 export type OrcadHealth = {
-  /** Content hash of the running orcad bundle — the deployed build's identity. */
+  /** Launcher hash understood by older clients; split launchers embed the server digest. */
   buildHash: string
   buildVersion: string
   nodeVersion: string
@@ -83,7 +82,7 @@ export type OrcadHealth = {
 }
 
 /**
- * Identity of the exact bytes running.
+ * Launcher identity shared with clients that predate split server bundles.
  *
  * Why hash the entry and not read a version string: `ORCA_VERSION` is whatever the deploy
  * exported, so two different builds can carry one version. A rollback that did not actually
@@ -94,7 +93,7 @@ export function computeOrcadBuildHash(entryPath = process.argv[1]): string {
     return 'unknown'
   }
   try {
-    return createHash('sha256').update(readFileSync(entryPath)).digest('hex').slice(0, 16)
+    return hashOrcadLauncher(entryPath)
   } catch {
     return 'unknown'
   }
diff --git a/src/main/orcad/orcad-launch-contract.test.ts b/src/main/orcad/orcad-launch-contract.test.ts
index f8f7b2c85fa6..f1523476b47e 100644
--- a/src/main/orcad/orcad-launch-contract.test.ts
+++ b/src/main/orcad/orcad-launch-contract.test.ts
@@ -2,6 +2,9 @@
  * The two things a supervisor reads off a launch: what the arguments mean, and what an exit
  * code means. Both are part of the ops contract in docs/reference/orcad-operations.md.
  */
+import { mkdtemp, rm } from 'node:fs/promises'
+import { tmpdir } from 'node:os'
+import { join } from 'node:path'
 import { describe, expect, it, vi } from 'vitest'
 import {
   ORCAD_EXIT_CONFIGURATION,
@@ -10,6 +13,10 @@ import {
   resolveOrcadExitCode
 } from './orcad-entry'
 import { startOrcadWithLifecycle } from './orcad-lifecycle'
+import {
+  beginAgentSessionRuntimeRecord,
+  readAgentSessionRuntimeEnds
+} from '../runtime/agent-session-runtime-end-record'
 import { OrcadBindAddressError } from './orcad-bind-address'
 import { OrcadInstanceLockError } from './orcad-instance-lock'
 import { ProfileStateAccessError } from '../persistence/profile-state/profile-state-access'
@@ -124,6 +131,30 @@ describe('orcad lifecycle cleanup', () => {
     expect(cleanupHost).toHaveBeenCalledOnce()
   })
 
+  it("records the runtime's end before its stop waits on anything", async () => {
+    const directory = await mkdtemp(join(tmpdir(), 'orcad-runtime-end-'))
+    try {
+      beginAgentSessionRuntimeRecord(directory, 'orcad-runtime', 1)
+      let endSeenByCleanup: string | undefined
+      const handle = await startOrcadWithLifecycle(
+        async (registerCleanup) => {
+          registerCleanup(async () => {
+            endSeenByCleanup = readAgentSessionRuntimeEnds(directory)?.get('orcad-runtime')
+          })
+          return {}
+        },
+        vi.fn(async () => {})
+      )
+
+      await handle.stop()
+
+      // A chat whose agent dies with this stop reads as a restart, not a crash.
+      expect(endSeenByCleanup).toBe('quit')
+    } finally {
+      await rm(directory, { recursive: true, force: true })
+    }
+  })
+
   it('keeps the host aware of failed runtime teardown so it cannot release profile admission', async () => {
     const failure = new Error('profile writer still running')
     const cleanupHost = vi.fn(async () => {})
diff --git a/src/main/orcad/orcad-launcher-isolation.integration.test.ts b/src/main/orcad/orcad-launcher-isolation.integration.test.ts
new file mode 100644
index 000000000000..f52fe00b36a8
--- /dev/null
+++ b/src/main/orcad/orcad-launcher-isolation.integration.test.ts
@@ -0,0 +1,178 @@
+import { mkdir, mkdtemp, readFile, rm, writeFile } from 'node:fs/promises'
+import { tmpdir } from 'node:os'
+import { join } from 'node:path'
+import { pathToFileURL } from 'node:url'
+import { afterAll, beforeAll, describe, expect, it } from 'vitest'
+import { runProcess } from '../../shared/child-process/run-process'
+import { ORCAD_LAUNCHER_FILENAME, ORCAD_SERVER_ENTRY_FILENAME } from '../../shared/orcad-artifacts'
+import { NODE_RUNTIME_PIN } from '../../shared/node-runtime-pin'
+import { hashOrcadLauncher } from '../../shared/orcad-build-identity'
+import {
+  locatePinnedNodeForTests,
+  skipForMissingInputs,
+  writeNodeSlotFixture
+} from './orcad-node-slot-fixture'
+
+const pinnedNode = locatePinnedNodeForTests()
+const launcherNode =
+  process.env.ORCA_TEST_LAUNCHER_NODE_EXECUTABLE ??
+  process.env.ORCA_TEST_NODE_EXECUTABLE ??
+  process.execPath
+let root = ''
+let launcher = ''
+let inputs: string[] = []
+const SERVER_FIXTURE = [
+  'using resource = { [Symbol.dispose]() {} };',
+  'console.log(JSON.stringify({ node: process.versions.node, args: process.argv.slice(2) }));'
+].join('\n')
+
+async function buildLauncher(entry: string): Promise<string[]> {
+  const builder = pathToFileURL(join(process.cwd(), 'config/scripts/orcad-entry-build.mjs')).href
+  const result = await runProcess({
+    program: process.execPath,
+    args: [
+      '--input-type=module',
+      '-e',
+      `import {buildOrcadLauncher} from ${JSON.stringify(builder)};` +
+        `const result=await buildOrcadLauncher(${JSON.stringify(entry)});` +
+        'console.log(JSON.stringify(Object.keys(result.metafile.inputs)))'
+    ],
+    env: { ...process.env, ORCA_BACKGROUND_LAUNCH: '1' }
+  })
+  expect(result.code, result.stderr).toBe(0)
+  return JSON.parse(result.stdout)
+}
+
+beforeAll(async () => {
+  root = await mkdtemp(join(tmpdir(), 'orca-launcher-isolation-'))
+  launcher = join(root, ORCAD_LAUNCHER_FILENAME)
+  await writeFile(join(root, ORCAD_SERVER_ENTRY_FILENAME), SERVER_FIXTURE)
+  inputs = await buildLauncher(launcher)
+})
+
+it('changes the launcher identity when the server is rebuilt', async () => {
+  const directory = join(root, 'rebuilt')
+  await mkdir(directory)
+  const entry = join(directory, ORCAD_LAUNCHER_FILENAME)
+  const server = join(directory, ORCAD_SERVER_ENTRY_FILENAME)
+  await writeFile(server, SERVER_FIXTURE)
+  await buildLauncher(entry)
+  const first = hashOrcadLauncher(entry)
+  await writeFile(server, 'console.log("rebuilt server")')
+  await buildLauncher(entry)
+  expect(hashOrcadLauncher(entry)).not.toBe(first)
+})
+
+afterAll(async () => {
+  await rm(root, { recursive: true, force: true })
+})
+
+it('keeps the server and profile-state graph outside the compatibility launcher', async () => {
+  expect(inputs.filter((path) => path.startsWith('src/main/'))).toEqual([
+    'src/main/orcad/orcad-app-paths.ts',
+    'src/main/orcad/orcad-bundled-runtime.ts',
+    'src/main/orcad/launcher.ts'
+  ])
+  expect(inputs.some((path) => path.startsWith('node_modules/'))).toBe(false)
+  expect((await readFile(launcher)).length).toBeLessThan(32 * 1024)
+})
+
+it('runs an unpackaged server on the supported host runtime and preserves arguments', async () => {
+  const directory = join(root, 'unpackaged')
+  await mkdir(directory)
+  const entry = join(directory, ORCAD_LAUNCHER_FILENAME)
+  await writeFile(
+    join(directory, ORCAD_SERVER_ENTRY_FILENAME),
+    'console.log(JSON.stringify({ node: process.versions.node, args: process.argv.slice(2) }))'
+  )
+  await buildLauncher(entry)
+  const version = await runProcess({ program: launcherNode, args: ['-p', 'process.versions.node'] })
+  const args = ['a path with spaces', '--port', '0']
+  const result = await runProcess({
+    program: launcherNode,
+    args: [entry, ...args],
+    env: { ...process.env, ORCA_BACKGROUND_LAUNCH: '1' }
+  })
+  expect(result.code, result.stderr).toBe(0)
+  expect(JSON.parse(result.stdout)).toEqual({ node: version.stdout.trim(), args })
+})
+
+it('preserves the crash exit code when the server fails while loading', async () => {
+  const directory = join(root, 'server-crash')
+  await mkdir(directory)
+  const entry = join(directory, ORCAD_LAUNCHER_FILENAME)
+  await writeFile(
+    join(directory, ORCAD_SERVER_ENTRY_FILENAME),
+    'throw new Error("server evaluation failed")'
+  )
+  await buildLauncher(entry)
+  const result = await runProcess({
+    program: process.execPath,
+    args: [entry],
+    env: { ...process.env, ORCA_BACKGROUND_LAUNCH: '1' }
+  })
+  expect(result.code).toBe(1)
+  expect(result.stderr).toContain('server evaluation failed')
+  expect(result.stderr).not.toContain('orcad: failed to launch:')
+})
+
+const skip = skipForMissingInputs('artifact', pinnedNode ? [] : ['the pinned Node runtime'])
+
+describe.skipIf(skip)('split launcher with the real bundled runtime', () => {
+  it('hands off before parsing Node 24 server syntax and preserves arguments', async () => {
+    if (!pinnedNode) {
+      throw new Error('Missing pinned runtime')
+    }
+    const { slotDir } = await writeNodeSlotFixture(join(root, 'handoff'), pinnedNode)
+    await writeFile(join(slotDir, ORCAD_LAUNCHER_FILENAME), await readFile(launcher))
+    const server = join(slotDir, ORCAD_SERVER_ENTRY_FILENAME)
+    await writeFile(server, SERVER_FIXTURE)
+    const args = ['a path with spaces', 'line one\nline two', '--port', '0']
+    const result = await runProcess({
+      program: launcherNode,
+      args: [join(slotDir, ORCAD_LAUNCHER_FILENAME), ...args],
+      env: { ...process.env, ORCA_BACKGROUND_LAUNCH: '1' }
+    })
+    expect(result.code, result.stderr.slice(0, 2000)).toBe(0)
+    expect(JSON.parse(result.stdout)).toEqual({ node: NODE_RUNTIME_PIN.version, args })
+  })
+
+  it('refuses changed server bytes before loading them', async () => {
+    if (!pinnedNode) {
+      throw new Error('Missing pinned runtime')
+    }
+    const { slotDir, runtime } = await writeNodeSlotFixture(join(root, 'tampered'), pinnedNode)
+    await writeFile(join(slotDir, ORCAD_LAUNCHER_FILENAME), await readFile(launcher))
+    await writeFile(
+      join(slotDir, ORCAD_SERVER_ENTRY_FILENAME),
+      'throw new Error("server was loaded")'
+    )
+    const result = await runProcess({
+      program: runtime,
+      args: [join(slotDir, ORCAD_LAUNCHER_FILENAME)],
+      env: { ...process.env, ORCA_BACKGROUND_LAUNCH: '1' }
+    })
+    expect(result.code).toBe(78)
+    expect(result.stderr).toContain('server does not match its launcher')
+    expect(result.stderr).not.toContain('server was loaded')
+  })
+
+  it('refuses an old host runtime without a bundle before loading the server', async ({ skip }) => {
+    const version = await runProcess({
+      program: launcherNode,
+      args: ['-p', 'process.versions.node']
+    })
+    if (Number(version.stdout.trim().split('.')[0]) >= 18) {
+      skip()
+    }
+    await writeFile(join(root, ORCAD_SERVER_ENTRY_FILENAME), 'throw new Error("server was loaded")')
+    const result = await runProcess({
+      program: launcherNode,
+      args: [launcher],
+      env: { ...process.env, ORCA_BACKGROUND_LAUNCH: '1' }
+    })
+    expect(result.code).toBe(78)
+    expect(result.stderr).toContain('requires Node.js 18')
+    expect(result.stderr).not.toContain('server was loaded')
+  })
+})
diff --git a/src/main/orcad/orcad-lifecycle.ts b/src/main/orcad/orcad-lifecycle.ts
index 3bd3ad96889f..8af240e4f918 100644
--- a/src/main/orcad/orcad-lifecycle.ts
+++ b/src/main/orcad/orcad-lifecycle.ts
@@ -5,6 +5,7 @@ import type { OrcadManagedStopInstance } from '../../shared/orcad-stop-request'
 import { acquireOrcadInstanceLock } from './orcad-instance-lock'
 import { ORCAD_BUNDLED_LAUNCHER_ENV } from './orcad-bundled-runtime'
 import { resolveOrcadExitCode } from './orcad-exit-code'
+import { recordAgentSessionRuntimeEnd } from '../runtime/agent-session-runtime-end-record'
 import { ORCAD_SHUTDOWN_DEADLINE_MS } from './orcad-stop-deadlines'
 import {
   acquireProfileStateRuntimeAdmission,
@@ -78,6 +79,8 @@ export async function startOrcadWithLifecycle<T extends object>(
   // Runtime resources stop in reverse registration order before any host resource.
   const runtime = new OrcadRuntimeLifetime()
   const cleanup = createIdempotentOrcadCleanup(async () => {
+    // First, before any wait: chats whose agent dies with this stop read as a restart, not a crash.
+    recordAgentSessionRuntimeEnd('quit')
     let runtimeCleanupSucceeded = false
     try {
       await runtime.stop()
diff --git a/src/main/orcad/orcad-local-serve-selection.test.ts b/src/main/orcad/orcad-local-serve-selection.test.ts
index 708c74540500..9da11cfccf48 100644
--- a/src/main/orcad/orcad-local-serve-selection.test.ts
+++ b/src/main/orcad/orcad-local-serve-selection.test.ts
@@ -33,6 +33,7 @@ function slotFixture(): string {
   writeFileSync(join(slot, ORCAD_NODE_RUNTIME_MARKER_FILENAME), `${SHA}\n`)
   writeFileSync(join(slot, ORCAD_VERSION_FILENAME), '0.1.0+abc\n')
   writeFileSync(join(slot, 'orcad.js'), '')
+  writeFileSync(join(slot, 'orcad-server.js'), '')
   return slot
 }
 
@@ -77,7 +78,7 @@ describe('orca serve runtime selection', () => {
     expect(selection).toEqual({
       kind: 'orcad',
       runtime,
-      entry: join(slot, 'orcad.js'),
+      entry: join(slot, 'orcad-server.js'),
       version: '0.1.0+abc'
     })
     expect(existsSync(runtime)).toBe(true)
diff --git a/src/main/orcad/orcad-local-serve-selection.ts b/src/main/orcad/orcad-local-serve-selection.ts
index e9fa6230984f..2d8f51769fe6 100644
--- a/src/main/orcad/orcad-local-serve-selection.ts
+++ b/src/main/orcad/orcad-local-serve-selection.ts
@@ -13,7 +13,11 @@ import { chmodSync, copyFileSync, existsSync, linkSync, mkdirSync, readFileSync
 import { dirname, join } from 'node:path'
 import { runProcess } from '../../shared/child-process/run-process'
 import { NODE_RUNTIME_ASSETS, type ServerTarget } from '../../shared/node-runtime-pin'
-import { ORCAD_VERSION_FILENAME, orcadNodeRuntimeRelativePath } from '../../shared/orcad-artifacts'
+import {
+  ORCAD_SERVER_ENTRY_FILENAME,
+  ORCAD_VERSION_FILENAME,
+  orcadNodeRuntimeRelativePath
+} from '../../shared/orcad-artifacts'
 import {
   ORCAD_NATIVE_PREFLIGHT_FLAG,
   parseOrcadNativePreflightReport
@@ -87,7 +91,7 @@ export async function selectServeRuntime(
   if (!runtime) {
     return electron('the orcad slot names no pinned runtime')
   }
-  const entry = join(slotDir, 'orcad.js')
+  const entry = join(slotDir, ORCAD_SERVER_ENTRY_FILENAME)
   const report = parseOrcadNativePreflightReport(
     await (input.nativePreflight ?? runNativePreflight)(runtime, entry).catch(() => '')
   )
diff --git a/src/main/orcad/orcad-managed-stop.test.ts b/src/main/orcad/orcad-managed-stop.test.ts
index 0683a3e48b7a..5334bec5f94e 100644
--- a/src/main/orcad/orcad-managed-stop.test.ts
+++ b/src/main/orcad/orcad-managed-stop.test.ts
@@ -2,6 +2,7 @@ import { existsSync, mkdtempSync, readFileSync, rmSync, writeFileSync } from 'no
 import { tmpdir } from 'node:os'
 import { basename, dirname, join, sep } from 'node:path'
 import { afterEach, describe, expect, it, vi } from 'vitest'
+import type * as WindowsAcl from '../../shared/secure-path-windows-acl'
 import {
   OrcadManagedStopCompletionSchema,
   type OrcadManagedStopRequest
@@ -28,8 +29,38 @@ import {
   ORCAD_STOP_COMPLETION_POLL_MS
 } from './orcad-stop-deadlines'
 
+const hardening = vi.hoisted(() => ({ pending: new Set<Promise<void>>() }))
+
+vi.mock('../../shared/secure-path-windows-acl', async (importOriginal) => {
+  const acl = await importOriginal<typeof WindowsAcl>()
+  return {
+    ...acl,
+    bestEffortRestrictWindowsPath: (
+      targetPath: string,
+      isDirectory: boolean,
+      onSettled?: (restricted: boolean) => void
+    ): void => {
+      let finish!: () => void
+      const pending = new Promise<void>((resolve) => {
+        finish = resolve
+      })
+      hardening.pending.add(pending)
+      acl.bestEffortRestrictWindowsPath(targetPath, isDirectory, (restricted) => {
+        try {
+          onSettled?.(restricted)
+        } finally {
+          hardening.pending.delete(pending)
+          finish()
+        }
+      })
+    }
+  }
+})
+
 const roots: string[] = []
-afterEach(() => {
+afterEach(async () => {
+  // ACL updates must finish before their temporary directories disappear.
+  await Promise.all(hardening.pending)
   vi.restoreAllMocks()
   for (const root of roots.splice(0)) {
     rmSync(root, { recursive: true, force: true })
diff --git a/src/main/orcad/orcad-profile-preflight.test.ts b/src/main/orcad/orcad-profile-preflight.test.ts
index 809f7d839802..6d6d1187ed50 100644
--- a/src/main/orcad/orcad-profile-preflight.test.ts
+++ b/src/main/orcad/orcad-profile-preflight.test.ts
@@ -80,7 +80,7 @@ describe('bundled Orca startup readiness', () => {
       expect(fixture.run).toHaveBeenCalledOnce()
       expect(fixture.run).toHaveBeenCalledWith({
         program: process.execPath,
-        args: [join('/slot', 'orcad.js'), ORCAD_STARTUP_PREFLIGHT_FLAG, expect.any(String)],
+        args: [join('/slot', 'orcad-server.js'), ORCAD_STARTUP_PREFLIGHT_FLAG, expect.any(String)],
         env: expect.objectContaining({ ORCA_BACKGROUND_LAUNCH: '1' }),
         timeoutMs: 90_000,
         maxOutputBytes: 64 * 1024,
diff --git a/src/main/orcad/orcad-profile-preflight.ts b/src/main/orcad/orcad-profile-preflight.ts
index c299e0ca0229..cd66fda5a00e 100644
--- a/src/main/orcad/orcad-profile-preflight.ts
+++ b/src/main/orcad/orcad-profile-preflight.ts
@@ -11,7 +11,7 @@ import {
   type OrcadProfilePreflightResponse
 } from '../../shared/orcad-profile-preflight'
 import { readOrcadArtifactIdentity } from './orcad-artifact-identity'
-import { ORCAD_VERSION_FILENAME } from '../../shared/orcad-artifacts'
+import { ORCAD_SERVER_ENTRY_FILENAME, ORCAD_VERSION_FILENAME } from '../../shared/orcad-artifacts'
 import { ORCAD_NODE_RUNTIME_IDENTITY } from '../../shared/orcad-node-runtime-identity'
 import { runProcess } from '../../shared/child-process/run-process'
 import { preflightOrcadNativeRuntime } from './orcad-runtime-native-preflight'
@@ -32,7 +32,7 @@ export async function preflightBundledOrcadStartup(): Promise<void> {
   // Keep disposable SQLite ownership and native state out of the serving process.
   const result = await runProcess({
     program: process.execPath,
-    args: [join(directory, 'orcad.js'), ORCAD_STARTUP_PREFLIGHT_FLAG, nonce],
+    args: [join(directory, ORCAD_SERVER_ENTRY_FILENAME), ORCAD_STARTUP_PREFLIGHT_FLAG, nonce],
     env: { ...process.env, ORCA_BACKGROUND_LAUNCH: '1' },
     timeoutMs: ORCAD_PROFILE_PREFLIGHT_TIMEOUT_MS,
     maxOutputBytes: 64 * 1024,
diff --git a/src/main/persistence-duplicate-repo-id-host-scope.test.ts b/src/main/persistence-duplicate-repo-id-host-scope.test.ts
index 48cb826f909d..efc5abc14766 100644
--- a/src/main/persistence-duplicate-repo-id-host-scope.test.ts
+++ b/src/main/persistence-duplicate-repo-id-host-scope.test.ts
@@ -1,4 +1,9 @@
-import { closeTestStores, createSqliteTestStore } from './persistence-test-harness'
+import {
+  closeTestStores,
+  createSqliteTestStore,
+  createStore as createFreshStore,
+  testState
+} from './persistence-test-harness'
 /**
  * The same repo id may be registered on two execution hosts (see `removeProjectForHost`).
  * Every deletion that resolves a *row* must therefore delete only that row: `removeProject`
@@ -14,8 +19,9 @@ import type { Repo } from '../shared/repo-types'
 import { getDefaultPersistedState } from '../shared/constants'
 import { toRuntimeExecutionHostId } from '../shared/execution-host'
 import { installFakeAppEnvironment } from '../../config/scripts/vitest-host-ports-setup'
+import { resetRetirementCollisionKeyCacheForTests } from './worktree-name-retirement'
 
-const testState = { dir: '' }
+let hasCreatedStoreInCase = false
 
 vi.mock('electron', () => ({
   app: { getPath: () => testState.dir },
@@ -52,6 +58,10 @@ async function createStoreFromState(state: Record<string, unknown>) {
     JSON.stringify({ ...getDefaultPersistedState(testState.dir), ...state }),
     'utf-8'
   )
+  if (!hasCreatedStoreInCase) {
+    hasCreatedStoreInCase = true
+    return createFreshStore()
+  }
   vi.resetModules()
   const { Store, initDataPath } = await import('./persistence')
   // Why here: userData resolves through AppEnvironment, and this must point at this
@@ -96,6 +106,8 @@ function staleLocalSetupState() {
 }
 
 beforeEach(() => {
+  hasCreatedStoreInCase = false
+  resetRetirementCollisionKeyCacheForTests()
   testState.dir = mkdtempSync(join(tmpdir(), 'orca-dup-repo-id-'))
 })
 
diff --git a/src/main/persistence-ssh-readoption-automation-migration.test.ts b/src/main/persistence-ssh-readoption-automation-migration.test.ts
index 886b5475983c..e7820b41b80c 100644
--- a/src/main/persistence-ssh-readoption-automation-migration.test.ts
+++ b/src/main/persistence-ssh-readoption-automation-migration.test.ts
@@ -1,4 +1,9 @@
-import { closeTestStores, createSqliteTestStore } from './persistence-test-harness'
+import {
+  closeTestStores,
+  createSqliteTestStore,
+  createStore as createFreshStore,
+  testState
+} from './persistence-test-harness'
 /**
  * SSH re-adoption has to repair the automation with the workspace.
  *
@@ -22,8 +27,9 @@ import { toSshExecutionHostId } from '../shared/execution-host'
 import { hostStableKey } from '../shared/automation-owner-key'
 import { folderWorkspaceKey } from '../shared/workspace-scope'
 import { installFakeAppEnvironment } from '../../config/scripts/vitest-host-ports-setup'
+import { resetRetirementCollisionKeyCacheForTests } from './worktree-name-retirement'
 
-const testState = { dir: '' }
+let hasCreatedStoreInCase = false
 
 vi.mock('electron', () => ({
   app: { getPath: () => testState.dir },
@@ -142,6 +148,10 @@ async function createStoreFromState(state: Record<string, unknown>) {
     JSON.stringify({ ...getDefaultPersistedState(testState.dir), ...state }),
     'utf-8'
   )
+  if (!hasCreatedStoreInCase) {
+    hasCreatedStoreInCase = true
+    return createFreshStore()
+  }
   vi.resetModules()
   installFakeAppEnvironment({ getPath: () => testState.dir })
   const { Store, initDataPath } = await import('./persistence')
@@ -170,6 +180,8 @@ function readdDevBox(ssh: SshConnectionStore) {
 }
 
 beforeEach(() => {
+  hasCreatedStoreInCase = false
+  resetRetirementCollisionKeyCacheForTests()
   testState.dir = mkdtempSync(join(tmpdir(), 'orca-readopt-'))
 })
 
diff --git a/src/main/persistence-workspace-attachments.test.ts b/src/main/persistence-workspace-attachments.test.ts
new file mode 100644
index 000000000000..99976cf9023b
--- /dev/null
+++ b/src/main/persistence-workspace-attachments.test.ts
@@ -0,0 +1,151 @@
+import { describe, it, expect, vi, beforeEach, afterEach } from 'vitest'
+import { mkdtempSync, rmSync } from 'node:fs'
+import { join } from 'node:path'
+import { tmpdir } from 'node:os'
+import {
+  closeTestStores,
+  createStore,
+  makeRepo,
+  testState,
+  writeDataFile
+} from './persistence-test-harness'
+import { getWorkspaceAttachments } from '../shared/workspace-attachments'
+import type { WorkspaceAttachment } from '../shared/worktree/types'
+import { mergeWorktree } from './ipc/worktree-metadata-merge'
+
+vi.mock('electron', () => ({
+  app: { getPath: () => testState.dir },
+  safeStorage: {
+    isEncryptionAvailable: () => false
+  }
+}))
+vi.mock('./telemetry/client', () => ({ track: vi.fn() }))
+vi.mock('./telemetry/cohort-classifier', () => ({ getCohortAtEmit: vi.fn() }))
+const pr = (number: number): WorkspaceAttachment => ({ provider: 'github', type: 'pr', number })
+
+describe('workspace attachment persistence', () => {
+  beforeEach(() => {
+    testState.dir = mkdtempSync(join(tmpdir(), 'orca-attachments-'))
+  })
+  afterEach(async () => {
+    await closeTestStores()
+    rmSync(testState.dir, { recursive: true, force: true })
+  })
+
+  it('round-trips collections and active selection through host-qualified metadata and git projections', async () => {
+    writeDataFile({ repos: [makeRepo({ id: 'repo', path: '/work', connectionId: 'test' })] })
+    const store = await createStore()
+    store.setWorktreeMetaForHost('repo::/work', 'ssh:test', { linkedPR: 7 })
+    store.setWorktreeMetaForHost('repo::/work', 'ssh:test', { linkedPR: 8 })
+    store.flush()
+    const restored = await createStore()
+    const meta = restored.getWorktreeMetaForHost('repo::/work', 'ssh:test')
+    expect(meta?.linkedItems).toEqual([pr(7), pr(8)])
+    expect(meta?.linkedPR).toBe(8)
+    const projected = mergeWorktree(
+      'repo',
+      { path: '/work', head: 'abc', branch: 'feature', isBare: false, isMainWorktree: false },
+      meta
+    )
+    expect(projected.linkedItems).toEqual([pr(7), pr(8)])
+    expect(
+      restored.setWorktreeMetaForHost('repo::/work', 'ssh:test', { linkedItems: [pr(7)] }).linkedPR
+    ).toBe(7)
+    restored.flush()
+    expect(
+      (await createStore()).getWorktreeMetaForHost('repo::/work', 'ssh:test')?.linkedItems
+    ).toEqual([pr(7)])
+  })
+
+  it('loads scalar-only metadata and repairs malformed duplicate collection entries', async () => {
+    writeDataFile({
+      worktreeMeta: {
+        legacy: { linkedPR: 7 },
+        repaired: { linkedPR: 7, linkedItems: [pr(7), null, {}, pr(7), pr(8)] }
+      }
+    })
+    const store = await createStore()
+    expect(getWorkspaceAttachments(store.getWorktreeMeta('legacy'))).toEqual([pr(7)])
+    expect(store.getWorktreeMeta('repaired')?.linkedItems).toEqual([pr(7), pr(8)])
+    store.setWorktreeMeta('legacy', { linkedPR: 8 })
+    expect(store.getWorktreeMeta('legacy')?.linkedItems).toEqual([pr(7), pr(8)])
+  })
+
+  it('retains multiple repo-less folder tasks and clears the active task when its collection is emptied', async () => {
+    const store = await createStore()
+    const group = store.createProjectGroup({
+      name: 'Docs',
+      parentPath: '/docs',
+      createdFrom: 'folder-scan'
+    })
+    const task = (number: number) => ({
+      provider: 'github' as const,
+      type: 'issue' as const,
+      number,
+      title: `Issue ${number}`,
+      url: `https://github.com/a/docs/issues/${number}`
+    })
+    const workspace = store.createFolderWorkspace({ projectGroupId: group.id, linkedTask: task(7) })
+    store.updateFolderWorkspace(workspace.id, { linkedTask: task(8) })
+    expect(workspace.linkedItems).toHaveLength(2)
+    store.flush()
+    const restored = await createStore()
+    expect(restored.getFolderWorkspace(workspace.id)?.linkedItems).toHaveLength(2)
+    expect(restored.updateFolderWorkspace(workspace.id, { linkedItems: [] })?.linkedTask).toBeNull()
+    restored.flush()
+    expect((await createStore()).getFolderWorkspace(workspace.id)?.linkedItems).toEqual([])
+  })
+  it('applies stale client add/remove deltas atomically for worktrees and folders', async () => {
+    const store = await createStore()
+    store.setWorktreeMeta('wt', { linkedItems: [pr(1)] })
+    const firstClient = { linkedItemsBase: [pr(1)], linkedItems: [pr(1), pr(2)] }
+    const secondClient = { linkedItemsBase: [pr(1)], linkedItems: [pr(3)] }
+    store.setWorktreeMeta('wt', firstClient)
+    store.setWorktreeMeta('wt', secondClient)
+    expect(store.getWorktreeMeta('wt')?.linkedItems).toEqual([pr(2), pr(3)])
+    expect(store.getWorktreeMeta('wt')).not.toHaveProperty('linkedItemsBase')
+    const group = store.createProjectGroup({
+      name: 'Folder',
+      parentPath: '/docs',
+      createdFrom: 'folder-scan'
+    })
+    const folder = store.createFolderWorkspace({ projectGroupId: group.id, linkedItems: [pr(1)] })
+    store.updateFolderWorkspace(folder.id, firstClient)
+    store.updateFolderWorkspace(folder.id, secondClient)
+    expect(folder.linkedItems).toEqual([pr(2), pr(3)])
+    expect(folder).not.toHaveProperty('linkedItemsBase')
+    store.flush()
+    const restored = await createStore()
+    expect(restored.getWorktreeMeta('wt')?.linkedItems).toEqual([pr(2), pr(3)])
+    expect(restored.getFolderWorkspace(folder.id)?.linkedItems).toEqual([pr(2), pr(3)])
+  })
+
+  it('keeps the current review target when a stale collection edit resolved another review', async () => {
+    const store = await createStore()
+    const currentTarget = { remoteName: 'origin', branchName: 'pr-2' }
+    store.setWorktreeMeta('wt', { linkedItems: [pr(2)], linkedPR: 2, pushTarget: currentTarget })
+    store.setWorktreeMeta('wt', {
+      linkedItemsBase: [],
+      linkedItems: [pr(1)],
+      linkedPR: 1,
+      linkedItemsSelectionChanged: false,
+      pushTarget: { remoteName: 'origin', branchName: 'pr-1' }
+    })
+    expect(store.getWorktreeMeta('wt')).toMatchObject({
+      linkedPR: 2,
+      linkedItems: [pr(2), pr(1)],
+      pushTarget: currentTarget
+    })
+    store.setWorktreeMeta('wt', {
+      linkedItemsBase: [pr(2), pr(1)],
+      linkedItems: [pr(2), pr(1)],
+      linkedPR: 1,
+      linkedItemsSelectionChanged: true,
+      pushTarget: { remoteName: 'origin', branchName: 'pr-1' }
+    })
+    expect(store.getWorktreeMeta('wt')).toMatchObject({
+      linkedPR: 1,
+      pushTarget: { remoteName: 'origin', branchName: 'pr-1' }
+    })
+  })
+})
diff --git a/src/main/persistence-workspace-pinned-automation-fence.test.ts b/src/main/persistence-workspace-pinned-automation-fence.test.ts
index 1eaf04739a9c..e0ea55afd4d0 100644
--- a/src/main/persistence-workspace-pinned-automation-fence.test.ts
+++ b/src/main/persistence-workspace-pinned-automation-fence.test.ts
@@ -1,6 +1,8 @@
 import {
   closeTestStores,
   createSqliteTestStore,
+  createStore as createFreshStore,
+  testState,
   readPersistedStateJson,
   writePersistedStateJson
 } from './persistence-test-harness'
@@ -27,8 +29,9 @@ import { AUTOMATION_OWNER_CONFLICT_CODES } from '../shared/automation-owner-conf
 import { getDefaultPersistedState } from '../shared/constants'
 import { folderWorkspaceKey } from '../shared/workspace-scope'
 import { installFakeAppEnvironment } from '../../config/scripts/vitest-host-ports-setup'
+import { resetRetirementCollisionKeyCacheForTests } from './worktree-name-retirement'
 
-const testState = { dir: '' }
+let hasCreatedStoreInCase = false
 
 vi.mock('electron', () => ({
   app: { getPath: () => testState.dir },
@@ -118,6 +121,10 @@ async function createStoreFromState(state: Record<string, unknown>) {
     JSON.stringify({ ...getDefaultPersistedState(testState.dir), ...state }),
     'utf-8'
   )
+  if (!hasCreatedStoreInCase) {
+    hasCreatedStoreInCase = true
+    return createFreshStore()
+  }
   vi.resetModules()
   installFakeAppEnvironment({ getPath: () => testState.dir })
   const { Store, initDataPath } = await import('./persistence')
@@ -161,6 +168,8 @@ function createPinnedAutomation(store: {
 }
 
 beforeEach(() => {
+  hasCreatedStoreInCase = false
+  resetRetirementCollisionKeyCacheForTests()
   testState.dir = mkdtempSync(join(tmpdir(), 'orca-pinned-fence-'))
 })
 
diff --git a/src/main/persistence-workspace-repin-automation-owner.test.ts b/src/main/persistence-workspace-repin-automation-owner.test.ts
index 4f17c14ec47b..5eb0bcef44bd 100644
--- a/src/main/persistence-workspace-repin-automation-owner.test.ts
+++ b/src/main/persistence-workspace-repin-automation-owner.test.ts
@@ -1,6 +1,8 @@
 import {
   closeTestStores,
   createSqliteTestStore,
+  createStore as createFreshStore,
+  testState,
   readPersistedStateJson,
   writePersistedStateJson
 } from './persistence-test-harness'
@@ -27,8 +29,9 @@ import { AUTOMATION_ORPHAN_ISSUES } from '../shared/automation-list-scope'
 import { getDefaultPersistedState } from '../shared/constants'
 import { folderWorkspaceKey } from '../shared/workspace-scope'
 import { installFakeAppEnvironment } from '../../config/scripts/vitest-host-ports-setup'
+import { resetRetirementCollisionKeyCacheForTests } from './worktree-name-retirement'
 
-const testState = { dir: '' }
+let hasCreatedStoreInCase = false
 
 vi.mock('electron', () => ({
   app: { getPath: () => testState.dir },
@@ -142,6 +145,10 @@ async function loadStore(state: Record<string, unknown>) {
     JSON.stringify({ ...getDefaultPersistedState(testState.dir), ...state }),
     'utf-8'
   )
+  if (!hasCreatedStoreInCase) {
+    hasCreatedStoreInCase = true
+    return createFreshStore()
+  }
   vi.resetModules()
   installFakeAppEnvironment({ getPath: () => testState.dir })
   const { Store, initDataPath } = await import('./persistence')
@@ -161,6 +168,8 @@ function repinWorkspace(connectionId: string, sshTargets?: SshTarget[]): void {
 }
 
 beforeEach(() => {
+  hasCreatedStoreInCase = false
+  resetRetirementCollisionKeyCacheForTests()
   testState.dir = mkdtempSync(join(tmpdir(), 'orca-workspace-repin-'))
 })
 
diff --git a/src/main/persistence-worktree-lineage-and-backups.test.ts b/src/main/persistence-worktree-lineage-and-backups.test.ts
index 0c38ca2f32f9..ef5ba9c2f898 100644
--- a/src/main/persistence-worktree-lineage-and-backups.test.ts
+++ b/src/main/persistence-worktree-lineage-and-backups.test.ts
@@ -277,67 +277,6 @@ describe('Store', () => {
     })
   })
 
-  describe('claudeLivePtySessionIds', () => {
-    it('persists added ids across reloads and removes them durably', async () => {
-      const store = await createStore()
-
-      store.addClaudeLivePtySessionId('claude-session-1')
-      store.addClaudeLivePtySessionId('claude-session-2')
-      store.addClaudeLivePtySessionId('claude-session-1')
-
-      expect(store.getClaudeLivePtySessionIds()).toEqual(['claude-session-1', 'claude-session-2'])
-
-      const reloaded = await createStore()
-      expect(reloaded.getClaudeLivePtySessionIds()).toEqual([
-        'claude-session-1',
-        'claude-session-2'
-      ])
-
-      reloaded.removeClaudeLivePtySessionId('claude-session-1')
-      reloaded.flush()
-
-      const reloadedAgain = await createStore()
-      expect(reloadedAgain.getClaudeLivePtySessionIds()).toEqual(['claude-session-2'])
-    })
-
-    it('drops malformed persisted entries on load', async () => {
-      writeDataFile({
-        schemaVersion: 1,
-        claudeLivePtySessionIds: ['valid-id', '', 42, null, 'valid-id', 'x'.repeat(513)]
-      })
-
-      const store = await createStore()
-
-      expect(store.getClaudeLivePtySessionIds()).toEqual(['valid-id'])
-    })
-
-    it('keeps the newest ids when an oversized persisted list is loaded', async () => {
-      writeDataFile({
-        schemaVersion: 1,
-        claudeLivePtySessionIds: Array.from({ length: 205 }, (_, index) => `claude-${index}`)
-      })
-
-      const store = await createStore()
-
-      const ids = store.getClaudeLivePtySessionIds()
-      expect(ids).toHaveLength(200)
-      expect(ids[0]).toBe('claude-5')
-      expect(ids[199]).toBe('claude-204')
-    })
-
-    it('caps the persisted id list', async () => {
-      const store = await createStore()
-      for (let index = 0; index < 205; index += 1) {
-        store.addClaudeLivePtySessionId(`claude-session-${index}`)
-      }
-
-      const ids = store.getClaudeLivePtySessionIds()
-      expect(ids).toHaveLength(200)
-      expect(ids[0]).toBe('claude-session-5')
-      expect(ids[199]).toBe('claude-session-204')
-    })
-  })
-
   describe('retired JSON backups', () => {
     it.each(['sync', 'async'] as const)(
       'leaves legacy JSON and backups unchanged during %s SQL writes',
diff --git a/src/main/persistence-worktree-name-retirement.test.ts b/src/main/persistence-worktree-name-retirement.test.ts
index ebe4db5feec8..3bb572e9a345 100644
--- a/src/main/persistence-worktree-name-retirement.test.ts
+++ b/src/main/persistence-worktree-name-retirement.test.ts
@@ -1,4 +1,9 @@
-import { closeTestStores, createSqliteTestStore } from './persistence-test-harness'
+import {
+  closeTestStores,
+  createSqliteTestStore,
+  createStore as createFreshStore,
+  testState
+} from './persistence-test-harness'
 import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest'
 import { mkdirSync, mkdtempSync, rmSync, writeFileSync } from 'node:fs'
 import { tmpdir } from 'node:os'
@@ -10,8 +15,9 @@ import type { SshTarget } from '../shared/ssh-types'
 import { MAX_RETIREMENT_NAMESPACES } from './worktree-retirement-namespace'
 import { getRuntimeOwnedSshTargetId } from './ssh/ssh-connection-store'
 import { installFakeAppEnvironment } from '../../config/scripts/vitest-host-ports-setup'
+import { resetRetirementCollisionKeyCacheForTests } from './worktree-name-retirement'
 
-const testState = { dir: '' }
+let hasCreatedStoreInCase = false
 
 vi.mock('electron', () => ({
   app: { getPath: () => testState.dir },
@@ -61,10 +67,16 @@ async function createStore(persisted: Record<string, unknown> = {}) {
     JSON.stringify({ ...getDefaultPersistedState(testState.dir), ...persisted }),
     'utf-8'
   )
+  if (!hasCreatedStoreInCase) {
+    hasCreatedStoreInCase = true
+    return createFreshStore()
+  }
   return reloadStore()
 }
 
 beforeEach(() => {
+  hasCreatedStoreInCase = false
+  resetRetirementCollisionKeyCacheForTests()
   testState.dir = mkdtempSync(join(tmpdir(), 'orca-worktree-name-retirement-'))
 })
 
diff --git a/src/main/persistence/leasing-ssh-ptys/ssh-target-state.ts b/src/main/persistence/leasing-ssh-ptys/ssh-target-state.ts
index 2f0ccdc8165f..7f72f2117aba 100644
--- a/src/main/persistence/leasing-ssh-ptys/ssh-target-state.ts
+++ b/src/main/persistence/leasing-ssh-ptys/ssh-target-state.ts
@@ -2,7 +2,6 @@ import type { PersistedState } from '../../../shared/persisted-state-types'
 import type { RemovedSshTargetTombstone, SshTarget } from '../../../shared/ssh-types'
 import type { ProtectedSecretPersistence } from '../../protected-secret-persistence'
 import { sshPtyOwnerLeaseSecretSlot } from '../../protected-secret-persistence'
-import { MAX_CLAUDE_LIVE_PTY_SESSION_IDS } from '../restoring-sessions/pane-alias-normalization'
 import {
   MAX_REMOVED_SSH_TARGET_TOMBSTONES,
   capRemovedSshTargetTombstones,
@@ -19,7 +18,6 @@ export type SshTargetStateOperations = {
   state: PersistedState
   protectedSecrets: Pick<ProtectedSecretPersistence, 'removeRetainedBlob'>
   scheduleSave: () => void
-  flush: () => void
 }
 
 export function getSshTargets(state: PersistedState): SshTarget[] {
@@ -92,41 +90,6 @@ export function removeSshTarget(operations: SshTargetStateOperations, id: string
   operations.scheduleSave()
 }
 
-export function getClaudeLivePtySessionIds(state: PersistedState): string[] {
-  return [...(state.claudeLivePtySessionIds ?? [])]
-}
-
-export function addClaudeLivePtySessionId(
-  operations: SshTargetStateOperations,
-  sessionId: string
-): void {
-  if (sessionId.length === 0 || sessionId.length > 512) {
-    return
-  }
-  const ids = operations.state.claudeLivePtySessionIds ?? []
-  if (ids.includes(sessionId)) {
-    return
-  }
-  // Why: drop oldest at the cap — stale ids get pruned against the daemon at startup, so only recency matters.
-  operations.state.claudeLivePtySessionIds = [...ids, sessionId].slice(
-    -MAX_CLAUDE_LIVE_PTY_SESSION_IDS
-  )
-  // Why: flush sync so a force-quit right after a Claude spawn still seeds the live-PTY gate next launch.
-  operations.flush()
-}
-
-export function removeClaudeLivePtySessionId(
-  operations: SshTargetStateOperations,
-  sessionId: string
-): void {
-  const ids = operations.state.claudeLivePtySessionIds ?? []
-  if (!ids.includes(sessionId)) {
-    return
-  }
-  operations.state.claudeLivePtySessionIds = ids.filter((id) => id !== sessionId)
-  operations.scheduleSave()
-}
-
 export function getDeletedSshConfigAliases(state: PersistedState): string[] {
   return [...(state.deletedSshConfigAliases ?? [])]
 }
diff --git a/src/main/persistence/loading-store/durable-settings-write.test.ts b/src/main/persistence/loading-store/durable-settings-write.test.ts
new file mode 100644
index 000000000000..3a415c8bd667
--- /dev/null
+++ b/src/main/persistence/loading-store/durable-settings-write.test.ts
@@ -0,0 +1,96 @@
+import { expect, it, vi } from 'vitest'
+import {
+  createWorkerMaintenanceFixture,
+  maintenanceBarrier
+} from './profile-state-maintenance-fixture'
+
+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: () => []
+}))
+
+it('waits for the SQLite write before returning or publishing the preference', async () => {
+  const { store, authority, readState } = await createWorkerMaintenanceFixture()
+  const started = maintenanceBarrier()
+  const release = maintenanceBarrier()
+  const write = authority.writeSerializedDomains.bind(authority)
+  vi.spyOn(authority, 'writeSerializedDomains').mockImplementationOnce(async (domains) => {
+    started.resolve()
+    await release.promise
+    await write(domains)
+  })
+  const onChanged = vi.fn()
+  store.onSettingsChanged(onChanged)
+  let settled = false
+  const pending = store.updateSettingsAndFlush(
+    { alwaysForceDeleteWorktrees: true },
+    { notifyListeners: true, originWebContentsId: 7 }
+  )
+  void pending.then(() => {
+    settled = true
+  })
+  await started.promise
+  expect(settled).toBe(false)
+  expect(onChanged).not.toHaveBeenCalled()
+  store.updateSettings({ theme: 'dark' })
+  release.resolve()
+  expect((await pending).theme).toBe('dark')
+  expect(readState().settings.alwaysForceDeleteWorktrees).toBe(true)
+  expect(onChanged).toHaveBeenCalledWith(
+    { alwaysForceDeleteWorktrees: true },
+    expect.objectContaining({ alwaysForceDeleteWorktrees: true }),
+    7
+  )
+})
+
+it('rejects a failed disk write and rolls back without publishing the preference', async () => {
+  const { store, authority, readState } = await createWorkerMaintenanceFixture()
+  const previous = store.getSettings().alwaysForceDeleteWorktrees
+  vi.spyOn(authority, 'writeSerializedDomains').mockRejectedValueOnce(new Error('Disk full'))
+  const onChanged = vi.fn()
+  store.onSettingsChanged(onChanged)
+  await expect(
+    store.updateSettingsAndFlush({ alwaysForceDeleteWorktrees: true }, { notifyListeners: true })
+  ).rejects.toThrow('Disk full')
+  expect(store.getSettings().alwaysForceDeleteWorktrees).toBe(previous)
+  expect(readState().settings.alwaysForceDeleteWorktrees).toBe(previous)
+  expect(onChanged).not.toHaveBeenCalled()
+})
+
+it('rolls back the preference while retaining unrelated concurrent settings edits', async () => {
+  const { store, authority } = await createWorkerMaintenanceFixture()
+  const previous = store.getSettings().alwaysForceDeleteWorktrees
+  const started = maintenanceBarrier()
+  const release = maintenanceBarrier()
+  vi.spyOn(authority, 'writeSerializedDomains').mockImplementationOnce(async () => {
+    started.resolve()
+    await release.promise
+    throw new Error('Disk full')
+  })
+  const pending = store.updateSettingsAndFlush({ alwaysForceDeleteWorktrees: true })
+  const rejected = expect(pending).rejects.toThrow('Disk full')
+  await started.promise
+  store.updateSettings({ theme: 'dark' })
+  release.resolve()
+  await rejected
+  expect(store.getSettings()).toMatchObject({
+    alwaysForceDeleteWorktrees: previous,
+    theme: 'dark'
+  })
+})
+
+it('removes previously absent optional keys after a failed preference payload write', async () => {
+  const { store, authority } = await createWorkerMaintenanceFixture()
+  delete store.getSettings().editorWordWrap
+  const previous = store.getSettings().alwaysForceDeleteWorktrees
+  vi.spyOn(authority, 'writeSerializedDomains').mockRejectedValueOnce(new Error('Disk full'))
+  await expect(
+    store.updateSettingsAndFlush({ alwaysForceDeleteWorktrees: true, editorWordWrap: false })
+  ).rejects.toThrow('Disk full')
+  expect(Object.hasOwn(store.getSettings(), 'editorWordWrap')).toBe(false)
+  expect(store.getSettings().alwaysForceDeleteWorktrees).toBe(previous)
+})
diff --git a/src/main/persistence/loading-store/metadata-lineage-operations.ts b/src/main/persistence/loading-store/metadata-lineage-operations.ts
index 9800b541373a..6279b47f2b11 100644
--- a/src/main/persistence/loading-store/metadata-lineage-operations.ts
+++ b/src/main/persistence/loading-store/metadata-lineage-operations.ts
@@ -1,3 +1,4 @@
+import type { WorkspaceAttachmentMutation } from '../../../shared/workspace-attachment-mutation'
 import type { WorkspaceKey } from '../../../shared/folder-workspace-types'
 import type { WorkspaceLineage, WorktreeLineage } from '../../../shared/worktree/lineage-types'
 import type { WorktreeMeta } from '../../../shared/worktree/meta-types'
@@ -77,7 +78,7 @@ export class MetadataLineageOperations {
   setWorktreeMetaForHost(
     worktreeId: string,
     executionHostId: ExecutionHostId,
-    meta: Partial<WorktreeMeta>
+    meta: Partial<WorktreeMeta> & WorkspaceAttachmentMutation
   ): WorktreeMeta {
     return setWorktreeMetaForHostOperation(
       this[metadataLineageOperationsContext].runtime,
@@ -108,7 +109,10 @@ export class MetadataLineageOperations {
     )
   }
 
-  setWorktreeMeta(worktreeId: string, meta: Partial<WorktreeMeta>): WorktreeMeta {
+  setWorktreeMeta(
+    worktreeId: string,
+    meta: Partial<WorktreeMeta> & WorkspaceAttachmentMutation
+  ): WorktreeMeta {
     const state = this[metadataLineageOperationsContext].runtime.state
     const stored = state.worktreeMeta[worktreeId]
     const executionHostId = meta.hostId ?? stored?.hostId
diff --git a/src/main/persistence/loading-store/normalize-loaded-profile-state.ts b/src/main/persistence/loading-store/normalize-loaded-profile-state.ts
index 1a3ba807c5ab..7045f922de88 100644
--- a/src/main/persistence/loading-store/normalize-loaded-profile-state.ts
+++ b/src/main/persistence/loading-store/normalize-loaded-profile-state.ts
@@ -12,7 +12,6 @@ import {
   normalizeSshTarget
 } from '../leasing-ssh-ptys/ssh-normalization'
 import {
-  normalizeClaudeLivePtySessionIds,
   normalizeLegacyPaneKeyAliasEntries,
   normalizeMigrationUnsupportedPtyEntries
 } from '../restoring-sessions/pane-alias-normalization'
@@ -102,7 +101,6 @@ export function normalizeLoadedProfileState(
       .map(normalizeSshRemotePtyLease)
       .filter((lease): lease is SshRemotePtyLease => lease !== null),
     sshPtyConsumerRecoveries: parsed.sshPtyConsumerRecoveries,
-    claudeLivePtySessionIds: normalizeClaudeLivePtySessionIds(parsed.claudeLivePtySessionIds),
     migrationUnsupportedPtyEntries: normalizeMigrationUnsupportedPtyEntries(
       parsed.migrationUnsupportedPtyEntries
     ),
diff --git a/src/main/persistence/loading-store/profile-preferences.ts b/src/main/persistence/loading-store/profile-preferences.ts
index 153155189611..e3760a5d5f68 100644
--- a/src/main/persistence/loading-store/profile-preferences.ts
+++ b/src/main/persistence/loading-store/profile-preferences.ts
@@ -25,6 +25,7 @@ type ProfilePreferencesRuntime = Pick<
   | 'githubCacheDirty'
   | 'githubCacheGeneration'
   | 'protectedSecrets'
+  | 'runDurableMutation'
   | 'settingsChangeListeners'
   | 'state'
   | 'uiChangeListeners'
@@ -74,6 +75,52 @@ export class ProfilePreferences {
     return updateSettingsOperation(getSettingsMutationOperations(this), updates, options)
   }
 
+  async updateSettingsAndFlush(
+    updates: Partial<GlobalSettings>,
+    options: { notifyListeners?: boolean; originWebContentsId?: number } = {}
+  ): Promise<GlobalSettings> {
+    const { runtime } = this[profilePreferencesContext]
+    let changedUpdates: Partial<GlobalSettings> = {}
+    await runtime.runDurableMutation(() => {
+      const previous = runtime.state.settings
+      const next = this.updateSettings(updates)
+      const previousEntries = new Map(Object.entries(previous))
+      const updateKeys = new Set(Object.keys(updates))
+      changedUpdates = Object.fromEntries(
+        Object.entries(next).filter(
+          ([key, value]) => updateKeys.has(key) && !Object.is(previousEntries.get(key), value)
+        )
+      )
+      return {
+        value: undefined,
+        rollback: () => {
+          const currentEntries = new Map(Object.entries(runtime.state.settings))
+          const nextEntries = new Map(Object.entries(next))
+          const restoredUpdates = Object.fromEntries(
+            Object.entries(previous).filter(
+              ([key]) =>
+                updateKeys.has(key) && Object.is(currentEntries.get(key), nextEntries.get(key))
+            )
+          )
+          const restoredSettings = { ...runtime.state.settings, ...restoredUpdates }
+          for (const key of updateKeys) {
+            if (
+              !previousEntries.has(key) &&
+              Object.is(currentEntries.get(key), nextEntries.get(key))
+            ) {
+              Reflect.deleteProperty(restoredSettings, key)
+            }
+          }
+          runtime.state.settings = restoredSettings
+        }
+      }
+    })
+    if (options.notifyListeners && Object.keys(changedUpdates).length > 0) {
+      notifySettingsChanged(this, changedUpdates, options.originWebContentsId)
+    }
+    return this.getSettings()
+  }
+
   getUI(): PersistedState['ui'] {
     return getPersistedUI(
       this[profilePreferencesContext].runtime.state,
diff --git a/src/main/persistence/loading-store/profile-state-direct-flush.test.ts b/src/main/persistence/loading-store/profile-state-direct-flush.test.ts
index 9cf3d1ec2d1c..9e2bed18bc01 100644
--- a/src/main/persistence/loading-store/profile-state-direct-flush.test.ts
+++ b/src/main/persistence/loading-store/profile-state-direct-flush.test.ts
@@ -93,16 +93,6 @@ describe('SQLite durability barriers with another selective write pending', () =
     })
   })
 
-  it('commits Claude live-PTY admission before returning', () => {
-    const state = fixture()
-    state.pendSession()
-    state.store.addClaudeLivePtySessionId('claude-session')
-    expect(state.read('claudeLivePtySessionIds')).toMatchObject({
-      kind: 'value',
-      value: ['claude-session']
-    })
-  })
-
   it('commits SSH lease admission before returning', () => {
     const state = fixture()
     state.pendSession()
diff --git a/src/main/persistence/loading-store/pty-binding-placement-inertness.test.ts b/src/main/persistence/loading-store/pty-binding-placement-inertness.test.ts
index 2ad1c882f23b..ce412cf4633d 100644
--- a/src/main/persistence/loading-store/pty-binding-placement-inertness.test.ts
+++ b/src/main/persistence/loading-store/pty-binding-placement-inertness.test.ts
@@ -232,7 +232,7 @@ describe('placement on the binding write is inert', () => {
     it(`${scenario.name}: memory and saved state match a write without placement`, async () => {
       const baseline = await bindAndSave(scenario, undefined)
       expect(baseline.result).toBe(true)
-      expect(placementAttributes).toEqual(['absent'])
+      expect(placementAttributes).toEqual([scenario.prebind ? 'leaf_present' : 'absent'])
       const cases = scenario.placements('<existing leaf>')
       for (const [index, [, agreement]] of cases.entries()) {
         const placed = await bindAndSave(scenario, (leaf) => scenario.placements(leaf)[index][0])
diff --git a/src/main/persistence/loading-store/pty-binding-refusals.ts b/src/main/persistence/loading-store/pty-binding-refusals.ts
index 6576ac3d0070..9de369b76829 100644
--- a/src/main/persistence/loading-store/pty-binding-refusals.ts
+++ b/src/main/persistence/loading-store/pty-binding-refusals.ts
@@ -25,7 +25,7 @@ export function ptyBindingIsRefused(
   bindingWorktreeId: 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`). */
+   *  binding lands (older relay reattaches left SSH panes in `local`). */
   partitions: readonly TerminalSessionPartition[]
 ): boolean {
   if (args.expectedSourceBinding) {
diff --git a/src/main/persistence/loading-store/ssh-profile-operations.ts b/src/main/persistence/loading-store/ssh-profile-operations.ts
index ce81cea373b8..ad12108129ef 100644
--- a/src/main/persistence/loading-store/ssh-profile-operations.ts
+++ b/src/main/persistence/loading-store/ssh-profile-operations.ts
@@ -1,17 +1,14 @@
 import type { RemovedSshTargetTombstone, SshTarget } from '../../../shared/ssh-types'
 import {
   type SshTargetStateOperations,
-  addClaudeLivePtySessionId as addClaudeLivePtySessionIdOperation,
   addDeletedSshConfigAlias as addDeletedSshConfigAliasOperation,
   addRemovedSshTargetTombstone as addRemovedSshTargetTombstoneOperation,
   addSshTarget as addSshTargetOperation,
   clearDeletedSshConfigAliases as clearDeletedSshConfigAliasesOperation,
-  getClaudeLivePtySessionIds as getClaudeLivePtySessionIdsOperation,
   getDeletedSshConfigAliases as getDeletedSshConfigAliasesOperation,
   getRemovedSshTargetTombstones as getRemovedSshTargetTombstonesOperation,
   getSshTarget as getSshTargetOperation,
   getSshTargets as getSshTargetsOperation,
-  removeClaudeLivePtySessionId as removeClaudeLivePtySessionIdOperation,
   removeDeletedSshConfigAlias as removeDeletedSshConfigAliasOperation,
   removeRemovedSshTargetTombstone as removeRemovedSshTargetTombstoneOperation,
   releaseRemovedSshTargetTombstone as releaseRemovedSshTargetTombstoneOperation,
@@ -26,22 +23,17 @@ import { allocateSshTargetGeneration as allocateSshTargetGenerationOperation } f
 
 import type { StoreRuntimeState } from './store-runtime-state'
 import type { WriteSchedulingOperations } from './write-scheduling'
-import type { WriteFlushBarrierOperations } from './write-flush-barriers'
 import type { RepoLifecycleOperations } from './repo-lifecycle-operations'
 import { syncProjectHostSetupCompatibilityState } from './repo-lifecycle-operations'
 import { scheduleSave } from './write-scheduling'
 import { forgetSshConnectionGeneration } from '../../ssh/ssh-connection-generation'
 
-type SshProfileOperationsRuntime = Pick<
-  StoreRuntimeState,
-  'dirtyProfileStateDomains' | 'protectedSecrets' | 'state'
->
+type SshProfileOperationsRuntime = Pick<StoreRuntimeState, 'protectedSecrets' | 'state'>
 
 const sshProfileOperationsContext = Symbol('SshProfileOperations')
 type SshProfileOperationsContext = {
   runtime: SshProfileOperationsRuntime
   scheduling: WriteSchedulingOperations
-  flushBarriers: WriteFlushBarrierOperations
   repos: RepoLifecycleOperations
 }
 
@@ -51,10 +43,9 @@ export class SshProfileOperations {
   constructor(
     runtime: SshProfileOperationsRuntime,
     scheduling: WriteSchedulingOperations,
-    flushBarriers: WriteFlushBarrierOperations,
     repos: RepoLifecycleOperations
   ) {
-    this[sshProfileOperationsContext] = { runtime, scheduling, flushBarriers, repos }
+    this[sshProfileOperationsContext] = { runtime, scheduling, repos }
   }
 
   getSshTargets(): SshTarget[] {
@@ -88,18 +79,6 @@ export class SshProfileOperations {
     )
   }
 
-  getClaudeLivePtySessionIds(): string[] {
-    return getClaudeLivePtySessionIdsOperation(this[sshProfileOperationsContext].runtime.state)
-  }
-
-  addClaudeLivePtySessionId(sessionId: string): void {
-    addClaudeLivePtySessionIdOperation(getSshTargetStateOperations(this), sessionId)
-  }
-
-  removeClaudeLivePtySessionId(sessionId: string): void {
-    removeClaudeLivePtySessionIdOperation(getSshTargetStateOperations(this), sessionId)
-  }
-
   getDeletedSshConfigAliases(): string[] {
     return getDeletedSshConfigAliasesOperation(this[sshProfileOperationsContext].runtime.state)
   }
@@ -148,13 +127,7 @@ export function getSshTargetStateOperations(owner: SshProfileOperations): SshTar
   return {
     state: owner[sshProfileOperationsContext].runtime.state,
     protectedSecrets: owner[sshProfileOperationsContext].runtime.protectedSecrets,
-    scheduleSave: () => scheduleSave(owner[sshProfileOperationsContext].scheduling),
-    flush: () => {
-      owner[sshProfileOperationsContext].runtime.dirtyProfileStateDomains?.add(
-        'claudeLivePtySessionIds'
-      )
-      owner[sshProfileOperationsContext].flushBarriers.flush()
-    }
+    scheduleSave: () => scheduleSave(owner[sshProfileOperationsContext].scheduling)
   }
 }
 
diff --git a/src/main/persistence/loading-store/store-domain-composition.ts b/src/main/persistence/loading-store/store-domain-composition.ts
index 4ba2e58881ac..cf3063ad37c8 100644
--- a/src/main/persistence/loading-store/store-domain-composition.ts
+++ b/src/main/persistence/loading-store/store-domain-composition.ts
@@ -183,7 +183,7 @@ export function createStoreDomains(runtime: StoreRuntimeState): StoreDomains {
   const mobileTabSelections = new MobileTabSelectionPersistence(runtime, scheduling)
   const sparsePresets = new SparsePresetPersistence(runtime, scheduling)
   const ptyBindings = new PtyBindingPersistenceOperations(runtime, sessions)
-  const sshProfiles = new SshProfileOperations(runtime, scheduling, flushBarriers, repos)
+  const sshProfiles = new SshProfileOperations(runtime, scheduling, repos)
   const retiredWorktreeNames = new RetiredWorktreeNamePersistence(runtime, scheduling)
   const sshLeases = new SshLeaseRecoveryOperations(
     runtime,
diff --git a/src/main/persistence/loading-store/worktree-identity-metadata.ts b/src/main/persistence/loading-store/worktree-identity-metadata.ts
index 9515986f86a9..d1f2dfd3deed 100644
--- a/src/main/persistence/loading-store/worktree-identity-metadata.ts
+++ b/src/main/persistence/loading-store/worktree-identity-metadata.ts
@@ -1,3 +1,4 @@
+import type { WorkspaceAttachmentMutation } from '../../../shared/workspace-attachment-mutation'
 import { randomUUID } from 'node:crypto'
 import type { WorktreeMeta } from '../../../shared/worktree/meta-types'
 import type { ExecutionHostId } from '../../../shared/execution-host'
@@ -210,7 +211,7 @@ export function setWorktreeMetaForHost(
   scheduling: WriteSchedulingOperations,
   worktreeId: string,
   executionHostId: ExecutionHostId,
-  meta: Partial<WorktreeMeta>
+  meta: Partial<WorktreeMeta> & WorkspaceAttachmentMutation
 ): WorktreeMeta {
   const state = runtime.state
   migrateLegacyWorktreeMetadata(state, worktreeId, executionHostId)
diff --git a/src/main/persistence/loading-store/worktree-meta-write-normalization.ts b/src/main/persistence/loading-store/worktree-meta-write-normalization.ts
index d513122ec6a0..7b101ff73c56 100644
--- a/src/main/persistence/loading-store/worktree-meta-write-normalization.ts
+++ b/src/main/persistence/loading-store/worktree-meta-write-normalization.ts
@@ -7,6 +7,8 @@ import { DEFAULT_WORKSPACE_STATUS_ID } from '../../../shared/workspace-statuses'
 import type { WorktreeMeta } from '../../../shared/worktree/meta-types'
 import { WORKTREE_META_PERSISTED_DEFAULTS } from '../../../shared/worktree/meta-persisted-defaults'
 import { normalizeGitHubPRSuppressionUpdate } from '../../../shared/worktree/github-pr-suppression'
+import type { WorkspaceAttachmentMutation } from '../../../shared/workspace-attachment-mutation'
+import { normalizeWorkspaceAttachmentUpdate } from '../../../shared/workspace-attachments'
 
 type WorktreeMetaIdentity = {
   instanceId: string
@@ -31,12 +33,13 @@ function createDefaultWorktreeMeta(): WorktreeMeta {
 /** Merge and normalize the metadata shape shared by legacy and identity-keyed writes. */
 export function mergeWorktreeMetaForWrite(
   existing: WorktreeMeta | undefined,
-  updates: Partial<WorktreeMeta>,
+  updates: Partial<WorktreeMeta> & WorkspaceAttachmentMutation,
   identity?: WorktreeMetaIdentity
 ): WorktreeMeta {
+  const normalizedUpdates = normalizeWorkspaceAttachmentUpdate(existing, updates)
   const updated = {
     ...(existing ?? createDefaultWorktreeMeta()),
-    ...normalizeGitHubPRSuppressionUpdate(updates),
+    ...normalizeGitHubPRSuppressionUpdate(normalizedUpdates),
     ...identity
   }
   updated.linkedWorkItem = normalizeWorkspaceLinkedItem(updated.linkedWorkItem)
diff --git a/src/main/persistence/profile-state/profile-state-writer-close.test.ts b/src/main/persistence/profile-state/profile-state-writer-close.test.ts
index a082a1cb4ade..cf8b6a442585 100644
--- a/src/main/persistence/profile-state/profile-state-writer-close.test.ts
+++ b/src/main/persistence/profile-state/profile-state-writer-close.test.ts
@@ -68,6 +68,7 @@ it.each([true, false])(
     await waitForPoll()
     vi.advanceTimersByTime(TIMEOUT_MS)
     await waitForPoll()
+    await waitForPoll()
     expect(worker.terminate).toHaveBeenCalledOnce()
     expect(settled).toBe(false)
     worker.emit('exit', 1)
diff --git a/src/main/persistence/profile-state/profile-state-writer-deadline.test.ts b/src/main/persistence/profile-state/profile-state-writer-deadline.test.ts
index 3a60c019717c..95bd251d6cbb 100644
--- a/src/main/persistence/profile-state/profile-state-writer-deadline.test.ts
+++ b/src/main/persistence/profile-state/profile-state-writer-deadline.test.ts
@@ -13,6 +13,11 @@ import {
 
 const TIMEOUT_MS = 30_000
 
+async function drainTimeoutCheck(): Promise<void> {
+  await waitForPoll()
+  await waitForPoll()
+}
+
 afterEach(() => {
   vi.useRealTimers()
   publishSystemResume()
@@ -48,6 +53,16 @@ function harness() {
 }
 
 describe('profile state writer deadline', () => {
+  it('lets a queued reply clear the deadline after the first poll', async () => {
+    const { deadline, onTimeout, unsubscribe, run } = harness()
+    run(TIMEOUT_MS)
+    setImmediate(() => deadline.clear())
+    await drainTimeoutCheck()
+    expect(onTimeout).not.toHaveBeenCalled()
+    expect(unsubscribe).toHaveBeenCalledOnce()
+    expect(vi.getTimerCount()).toBe(0)
+  })
+
   it('times out a request after allowing queued replies to drain', async () => {
     const { onTimeout, onGrace, unsubscribe, run } = harness()
     run(TIMEOUT_MS - 1)
@@ -55,7 +70,7 @@ describe('profile state writer deadline', () => {
     run(1)
     expect(onGrace).not.toHaveBeenCalled()
     expect(onTimeout).not.toHaveBeenCalled()
-    await waitForPoll()
+    await drainTimeoutCheck()
     expect(onTimeout).toHaveBeenCalledExactlyOnceWith(
       expect.objectContaining({ overdueMs: 0, graces: 0, powerState: 'awake' })
     )
@@ -74,7 +89,7 @@ describe('profile state writer deadline', () => {
     run(TIMEOUT_MS - 1)
     expect(onTimeout).not.toHaveBeenCalled()
     run(1)
-    await waitForPoll()
+    await drainTimeoutCheck()
     expect(onTimeout).toHaveBeenCalledExactlyOnceWith(
       expect.objectContaining({ overdueMs: 0, graces: 1 })
     )
@@ -85,7 +100,7 @@ describe('profile state writer deadline', () => {
     stall(PROFILE_STATE_WRITER_OVERDUE_GRACE_MS - 1)
     run(TIMEOUT_MS)
     expect(onGrace).not.toHaveBeenCalled()
-    await waitForPoll()
+    await drainTimeoutCheck()
     expect(onTimeout).toHaveBeenCalledOnce()
   })
 
@@ -99,7 +114,7 @@ describe('profile state writer deadline', () => {
     stall(60 * 60_000)
     run(TIMEOUT_MS)
     expect(onGrace).toHaveBeenCalledTimes(PROFILE_STATE_WRITER_MAX_GRACES)
-    await waitForPoll()
+    await drainTimeoutCheck()
     expect(onTimeout).toHaveBeenCalledExactlyOnceWith(
       expect.objectContaining({ graces: PROFILE_STATE_WRITER_MAX_GRACES })
     )
@@ -114,7 +129,7 @@ describe('profile state writer deadline', () => {
     run(TIMEOUT_MS - 1)
     expect(onTimeout).not.toHaveBeenCalled()
     run(1)
-    await waitForPoll()
+    await drainTimeoutCheck()
     expect(onGrace).toHaveBeenCalledExactlyOnceWith(expect.objectContaining({ graces: 1 }))
     expect(onTimeout).toHaveBeenCalledOnce()
   })
@@ -129,7 +144,7 @@ describe('profile state writer deadline', () => {
     expect(onGrace).toHaveBeenCalledTimes(PROFILE_STATE_WRITER_MAX_GRACES)
     expect(onTimeout).not.toHaveBeenCalled()
     run(TIMEOUT_MS)
-    await waitForPoll()
+    await drainTimeoutCheck()
     expect(onTimeout).toHaveBeenCalledExactlyOnceWith(
       expect.objectContaining({ powerState: 'suspended' })
     )
@@ -148,7 +163,7 @@ describe('profile state writer deadline', () => {
           power().onResume()
         }
         run(1)
-        await waitForPoll()
+        await drainTimeoutCheck()
         expect(onTimeout).toHaveBeenCalledExactlyOnceWith(
           expect.objectContaining({ graces: PROFILE_STATE_WRITER_MAX_GRACES })
         )
@@ -170,7 +185,7 @@ describe('profile state writer deadline', () => {
       run(TIMEOUT_MS)
       // An exhausted resume must not cancel the final queued timeout check.
       power().onResume()
-      await waitForPoll()
+      await drainTimeoutCheck()
       expect(onGrace).toHaveBeenCalledTimes(PROFILE_STATE_WRITER_MAX_GRACES)
       expect(onTimeout).toHaveBeenCalledOnce()
       expect(vi.getTimerCount()).toBe(0)
@@ -183,7 +198,7 @@ describe('profile state writer deadline', () => {
     const { deadline, onTimeout, unsubscribe, run } = harness()
     run(TIMEOUT_MS)
     deadline.clear()
-    await waitForPoll()
+    await drainTimeoutCheck()
     expect(onTimeout).not.toHaveBeenCalled()
     expect(unsubscribe).toHaveBeenCalledOnce()
     expect(vi.getTimerCount()).toBe(0)
@@ -193,10 +208,10 @@ describe('profile state writer deadline', () => {
     const { onTimeout, run, power } = harness()
     run(TIMEOUT_MS)
     power().onResume()
-    await waitForPoll()
+    await drainTimeoutCheck()
     expect(onTimeout).not.toHaveBeenCalled()
     run(TIMEOUT_MS)
-    await waitForPoll()
+    await drainTimeoutCheck()
     expect(onTimeout).toHaveBeenCalledOnce()
     expect(vi.getTimerCount()).toBe(0)
   })
diff --git a/src/main/persistence/profile-state/profile-state-writer-deadline.ts b/src/main/persistence/profile-state/profile-state-writer-deadline.ts
index fc17faea8b7d..9bc2db835004 100644
--- a/src/main/persistence/profile-state/profile-state-writer-deadline.ts
+++ b/src/main/persistence/profile-state/profile-state-writer-deadline.ts
@@ -97,13 +97,15 @@ export function createProfileStateWriterDeadline(
     ) {
       return
     }
-    // Even an on-time timer can run before a reply already queued by the worker.
+    // Windows can deliver a queued worker reply after the first poll following a stall.
     timeoutCheck = setImmediate(() => {
-      timeoutCheck = undefined
-      if (active) {
-        clear()
-        onTimeout(expiry)
-      }
+      timeoutCheck = setImmediate(() => {
+        timeoutCheck = undefined
+        if (active) {
+          clear()
+          onTimeout(expiry)
+        }
+      })
     })
   }
   // Subscription replays the current state synchronously; only later resumes re-arm.
diff --git a/src/main/persistence/profile-state/profile-state-writer-electron-fixture.ts b/src/main/persistence/profile-state/profile-state-writer-electron-fixture.ts
index e67832e8fc7e..12f946c27bb2 100644
--- a/src/main/persistence/profile-state/profile-state-writer-electron-fixture.ts
+++ b/src/main/persistence/profile-state/profile-state-writer-electron-fixture.ts
@@ -38,19 +38,29 @@ async function run(): Promise<void> {
   const counters = new SharedArrayBuffer(8)
   const counts = new Int32Array(counters)
   const failures: string[] = []
+  let phase = 'initialize'
   const initialization = { databasePath, profileId, revision: 0, counters }
   const client = new ProfileStateWriteWorkerClient(initialization, {
     workerPath: join(root, 'observed-worker.cjs'),
     timeoutMs,
-    onFailure: (error) => failures.push(error.message)
+    onFailure: (error) => {
+      failures.push(error.message)
+      console.error('[writer-fixture] failure', {
+        phase,
+        queuedReplies: Atomics.load(counts, 0),
+        workerStarts: Atomics.load(counts, 1)
+      })
+    }
   })
   const write = (marker: string) =>
     client.writeSerializedDomains([{ domain: 'ui', payload: JSON.stringify({ marker }) }])
   const revisions: number[] = []
   try {
     await client.ready
+    phase = 'before'
     assert.equal(await write('before'), 1)
     for (let cycle = 0; cycle < 4; cycle += 1) {
+      phase = `stall-${cycle}`
       let pending: Promise<number> | undefined
       await new Promise<void>((resolve, reject) => {
         // Dispatch from check so the overdue timer runs before the next poll.
@@ -76,6 +86,7 @@ async function run(): Promise<void> {
       }
       revisions.push(await pending)
     }
+    phase = 'after'
     assert.equal(await write('after'), 6)
   } finally {
     await client.close()
diff --git a/src/main/persistence/restoring-sessions/folder-workspace-operations.ts b/src/main/persistence/restoring-sessions/folder-workspace-operations.ts
index 22da252e13ba..0ec27d76aee9 100644
--- a/src/main/persistence/restoring-sessions/folder-workspace-operations.ts
+++ b/src/main/persistence/restoring-sessions/folder-workspace-operations.ts
@@ -9,6 +9,8 @@ import { normalizeWorkspaceLinkedItem } from '../../../shared/workspace-linked-i
 import { isWorkspaceLinkedItemSourceContextMatch } from '../../../shared/workspace-linked-item-source-context'
 import { folderWorkspaceKey } from '../../../shared/workspace-scope'
 import { removeWorkspaceSessionOwnerEverywhere } from './session-owner-removal'
+import type { WorkspaceAttachmentMutation } from '../../../shared/workspace-attachment-mutation'
+import { normalizeWorkspaceAttachmentUpdate } from '../../../shared/workspace-attachments'
 
 export type FolderWorkspaceMutationOperations = {
   state: PersistedState
@@ -56,6 +58,7 @@ export class FolderWorkspacePersistenceOperations {
     name?: string
     folderPath?: string | null
     linkedTask?: FolderWorkspace['linkedTask']
+    linkedItems?: FolderWorkspace['linkedItems']
     linkedTaskSourceContext?: FolderWorkspace['linkedTaskSourceContext']
     connectionId?: string | null
     creatorProvenance?: FolderWorkspace['creatorProvenance']
@@ -76,6 +79,14 @@ export class FolderWorkspacePersistenceOperations {
     const now = Date.now()
     const linkedTask = normalizeWorkspaceLinkedItem(input.linkedTask)
     const sourceContext = normalizeStoredTaskSourceContext(input.linkedTaskSourceContext)
+    const attachmentUpdates =
+      input.linkedItems === undefined
+        ? undefined
+        : normalizeWorkspaceAttachmentUpdate(undefined, {
+            linkedItems: input.linkedItems,
+            linkedWorkItem: linkedTask,
+            linkedTaskSourceContext: sourceContext
+          })
     const workspace: FolderWorkspace = {
       id: randomUUID(),
       projectGroupId: group.id,
@@ -83,10 +94,13 @@ export class FolderWorkspacePersistenceOperations {
       folderPath,
       connectionId: input.connectionId ?? group.connectionId ?? null,
       ...(input.creatorProvenance ? { creatorProvenance: input.creatorProvenance } : {}),
-      linkedTask,
-      linkedTaskSourceContext: isWorkspaceLinkedItemSourceContextMatch(linkedTask, sourceContext)
-        ? sourceContext
-        : null,
+      linkedTask: attachmentUpdates ? (attachmentUpdates.linkedWorkItem ?? null) : linkedTask,
+      ...(attachmentUpdates ? { linkedItems: attachmentUpdates.linkedItems } : {}),
+      linkedTaskSourceContext: attachmentUpdates
+        ? attachmentUpdates.linkedTaskSourceContext
+        : isWorkspaceLinkedItemSourceContextMatch(linkedTask, sourceContext)
+          ? sourceContext
+          : null,
       comment: '',
       isArchived: false,
       isUnread: false,
@@ -113,6 +127,7 @@ export class FolderWorkspacePersistenceOperations {
         | 'name'
         | 'folderPath'
         | 'linkedTask'
+        | 'linkedItems'
         | 'linkedTaskSourceContext'
         | 'comment'
         | 'isArchived'
@@ -127,12 +142,35 @@ export class FolderWorkspacePersistenceOperations {
         | 'lastActivityAt'
         | 'diffComments'
       >
-    >
+    > &
+      WorkspaceAttachmentMutation
   ): FolderWorkspace | null {
     const workspace = this.getFolderWorkspace(id)
     if (!workspace) {
       return null
     }
+    const linkedUpdates = normalizeWorkspaceAttachmentUpdate(
+      {
+        linkedItems: workspace.linkedItems,
+        linkedWorkItem: workspace.linkedTask,
+        linkedTaskSourceContext: workspace.linkedTaskSourceContext
+      },
+      {
+        linkedItemsBase: updates.linkedItemsBase,
+        linkedItems: updates.linkedItems,
+        linkedWorkItem: updates.linkedTask,
+        linkedTaskSourceContext: updates.linkedTaskSourceContext
+      }
+    )
+    if (linkedUpdates.linkedItems !== undefined) {
+      workspace.linkedItems = linkedUpdates.linkedItems
+    }
+    if (linkedUpdates.linkedWorkItem !== undefined) {
+      updates = { ...updates, linkedTask: linkedUpdates.linkedWorkItem }
+    }
+    if (linkedUpdates.linkedTaskSourceContext !== undefined) {
+      updates = { ...updates, linkedTaskSourceContext: linkedUpdates.linkedTaskSourceContext }
+    }
     if (updates.name !== undefined) {
       workspace.name = normalizeFolderWorkspaceName(updates.name, workspace.name)
     }
diff --git a/src/main/persistence/restoring-sessions/pane-alias-normalization.ts b/src/main/persistence/restoring-sessions/pane-alias-normalization.ts
index c7e88c480217..6b9dca94c923 100644
--- a/src/main/persistence/restoring-sessions/pane-alias-normalization.ts
+++ b/src/main/persistence/restoring-sessions/pane-alias-normalization.ts
@@ -40,33 +40,9 @@ export function legacyMigrationUnsupportedRowsToAliasEntries(
   return aliasEntries
 }
 
-// Why: bounds a corrupt/bloated persisted list — the gate only needs the few Claude sessions a daemon can keep alive.
-export const MAX_CLAUDE_LIVE_PTY_SESSION_IDS = 200
-
 // Why: bound removed-SSH-target history so remove/re-add churn can't grow the file unbounded.
 export const MAX_REMOVED_SSH_TARGET_TOMBSTONES = 50
 
-export function normalizeClaudeLivePtySessionIds(value: unknown): string[] {
-  if (!Array.isArray(value)) {
-    return []
-  }
-  // Why: scan newest-first so the cap keeps the most recent ids, matching addClaudeLivePtySessionId's eviction policy.
-  const ids: string[] = []
-  for (let index = value.length - 1; index >= 0; index -= 1) {
-    const entry = value[index]
-    if (typeof entry !== 'string' || entry.length === 0 || entry.length > 512) {
-      continue
-    }
-    if (!ids.includes(entry)) {
-      ids.push(entry)
-    }
-    if (ids.length >= MAX_CLAUDE_LIVE_PTY_SESSION_IDS) {
-      break
-    }
-  }
-  return ids.toReversed()
-}
-
 export function normalizeMigrationUnsupportedPtyEntries(
   value: unknown
 ): MigrationUnsupportedPtyEntry[] {
diff --git a/src/main/persistence/restoring-sessions/session-owner-removal.ts b/src/main/persistence/restoring-sessions/session-owner-removal.ts
index 5fac53546c4c..1cb7a44e004d 100644
--- a/src/main/persistence/restoring-sessions/session-owner-removal.ts
+++ b/src/main/persistence/restoring-sessions/session-owner-removal.ts
@@ -131,3 +131,24 @@ export function removeWorkspaceSessionOwners(
   )
   return next
 }
+
+export function removeWorkspaceSessionOwnersEverywhere(
+  state: Pick<PersistedState, 'workspaceSession' | 'workspaceSessionsByHostId'>,
+  ownerKeys: ReadonlySet<string>
+): void {
+  if (ownerKeys.size === 0) {
+    return
+  }
+  state.workspaceSession = removeWorkspaceSessionOwners(state.workspaceSession, ownerKeys)!
+  const partitions = state.workspaceSessionsByHostId
+  if (!partitions) {
+    return
+  }
+  const next: Record<string, WorkspaceSessionState> = {}
+  for (const [hostId, partition] of Object.entries(partitions)) {
+    if (partition) {
+      next[hostId] = removeWorkspaceSessionOwners(partition, ownerKeys)!
+    }
+  }
+  state.workspaceSessionsByHostId = next
+}
diff --git a/src/main/persistence/terminal-topology/terminal-owner-invariants.ts b/src/main/persistence/terminal-topology/terminal-owner-invariants.ts
index a5311486a06f..fad25738ea31 100644
--- a/src/main/persistence/terminal-topology/terminal-owner-invariants.ts
+++ b/src/main/persistence/terminal-topology/terminal-owner-invariants.ts
@@ -24,7 +24,7 @@ export type TerminalLeafOwner = {
 export type TerminalOwnerConflictReason =
   | 'pty_bound_to_other_leaf'
   | 'leaf_in_other_tab'
-  // Kept apart: the relay reattach writes SSH panes into `local`, so this may be one moved surface.
+  // Kept apart: older relay reattaches left SSH panes in `local`, so this may be one moved surface.
   | 'leaf_in_other_tab_on_other_host'
 
 /** `runtime:` partitions belong to a remote Orca server and are written only by its tab sync. */
@@ -83,7 +83,7 @@ export function isSameTerminal(
 
 /**
  * The saved leaf a binding into `hostId` would duplicate, if any. The same tab:leaf in two
- * partitions is one surface: the relay reattach still binds an SSH pane into `local`.
+ * partitions is one surface: older relay reattaches left SSH panes in `local`.
  */
 export function findTerminalBindingConflict(
   binding: { tabId: string; leafId: string; ptyId: string; incarnationId?: string },
diff --git a/src/main/persistence/terminal-topology/terminal-pane-placement-agreement.ts b/src/main/persistence/terminal-topology/terminal-pane-placement-agreement.ts
index 0a104592d94f..3376859499e2 100644
--- a/src/main/persistence/terminal-topology/terminal-pane-placement-agreement.ts
+++ b/src/main/persistence/terminal-topology/terminal-pane-placement-agreement.ts
@@ -2,7 +2,10 @@ import type { TerminalPanePlacement } from '../../../shared/terminal-pane-placem
 import type { WorkspaceSessionState } from '../../../shared/workspace-session-state-types'
 import { layoutContainsLeafId } from '../restoring-sessions/terminal-layout-normalization'
 
-/** Low-cardinality: it lands on the `persistence.pty-binding` span. */
+/**
+ * Low-cardinality: it lands on the `persistence.pty-binding` span. `absent` counts new leaves with
+ * no placement, which only the mint and graft can place; it should read zero before they go.
+ */
 export type TerminalPanePlacementAgreement =
   | 'absent'
   | 'leaf_present'
@@ -24,14 +27,14 @@ export function terminalPanePlacementAgreement(
   tabId: string,
   leafId: string
 ): TerminalPanePlacementAgreement {
-  if (!placement) {
-    return 'absent'
-  }
   const tabExists = session.tabsByWorktree?.[worktreeId]?.some((tab) => tab.id === tabId) === true
   const root = session.terminalLayoutsByTabId?.[tabId]?.root ?? null
   if (tabExists && layoutContainsLeafId(root, leafId)) {
     return 'leaf_present'
   }
+  if (!placement) {
+    return 'absent'
+  }
   switch (placement.kind) {
     case 'new-tab':
       return tabExists ? 'tab_exists' : 'agrees'
diff --git a/src/main/persistence/terminal-topology/terminal-sleep-quit-resume.test.ts b/src/main/persistence/terminal-topology/terminal-sleep-quit-resume.test.ts
new file mode 100644
index 000000000000..297a99a3eb0b
--- /dev/null
+++ b/src/main/persistence/terminal-topology/terminal-sleep-quit-resume.test.ts
@@ -0,0 +1,167 @@
+import { mkdtempSync, rmSync } from 'node:fs'
+import { tmpdir } from 'node:os'
+import { join } from 'node:path'
+import { afterEach, describe, expect, it, vi } from 'vitest'
+import type { SleepingAgentSessionRecord } from '../../../shared/agent-session-resume'
+import { LOCAL_EXECUTION_HOST_ID } from '../../../shared/execution-host'
+import { buildAgentResumeStartupPlan } from '../../../shared/tui-agent-resume-startup'
+import type { WorkspaceSessionState } from '../../../shared/workspace-session-state-types'
+import { projectTerminalTopologySlice } from '../../runtime/terminal-topology-projection'
+import type { Store } from '../loading-store/store'
+import {
+  emptyTerminalSessionProfile,
+  FIXTURE_GIT_WORKTREE_ID as WORKTREE,
+  openTopologyStore,
+  reopenTopologyStore
+} from './terminal-topology-profile-fixture'
+
+vi.mock('../../telemetry/client', () => ({ track: vi.fn() }))
+vi.mock('../../ssh/ssh-config-parser', () => ({
+  loadUserSshConfig: () => ({ hosts: [] }),
+  sshConfigHostsToTargets: () => []
+}))
+
+// The mirror refactor moves sleeping records into main's own commits and makes window saves
+// presentation-only; a slept agent must still be resumable after quit and relaunch.
+
+const TAB = 'tab-agent'
+const LEAF = '11111111-1111-4111-8111-111111111111'
+const PTY = `${WORKTREE}@@0a1b2c3d`
+const PANE_KEY = `${TAB}:${LEAF}`
+
+const directories: string[] = []
+
+afterEach(() => {
+  for (const directory of directories.splice(0)) {
+    rmSync(directory, { recursive: true, force: true })
+  }
+})
+
+function record(origin: 'worktree-sleep' | 'quit', capturedAt: number): SleepingAgentSessionRecord {
+  return {
+    paneKey: PANE_KEY,
+    tabId: TAB,
+    worktreeId: WORKTREE,
+    agent: 'codex',
+    providerSession: { key: 'session_id', id: `session-${capturedAt}` },
+    prompt: 'finish the task',
+    state: 'waiting',
+    capturedAt,
+    updatedAt: capturedAt,
+    origin
+  }
+}
+
+/** The window's session after it spawned an agent pane, as its debounced save sends it. */
+function windowSessionWithAgentPane(store: Store): WorkspaceSessionState {
+  const session = structuredClone(store.getWorkspaceSession())
+  session.tabsByWorktree = {
+    ...session.tabsByWorktree,
+    [WORKTREE]: [
+      {
+        id: TAB,
+        ptyId: PTY,
+        worktreeId: WORKTREE,
+        title: 'codex',
+        customTitle: null,
+        color: null,
+        sortOrder: 0,
+        createdAt: 1,
+        launchAgent: 'codex'
+      }
+    ]
+  }
+  session.terminalLayoutsByTabId = {
+    ...session.terminalLayoutsByTabId,
+    [TAB]: {
+      root: { type: 'leaf', leafId: LEAF },
+      activeLeafId: LEAF,
+      expandedLeafId: null,
+      ptyIdsByLeafId: { [LEAF]: PTY }
+    }
+  }
+  return session
+}
+
+async function storeWithAgentPane() {
+  const directory = mkdtempSync(join(tmpdir(), 'orca-sleep-quit-resume-'))
+  directories.push(directory)
+  const store = await openTopologyStore(directory, emptyTerminalSessionProfile())
+  const window = windowSessionWithAgentPane(store)
+  store.setWorkspaceSession(structuredClone(window))
+  await expect(
+    store.persistPtyBinding({ worktreeId: WORKTREE, tabId: TAB, leafId: LEAF, ptyId: PTY })
+  ).resolves.toBe(true)
+  return { directory, store, window }
+}
+
+/** What main holds for the slept pane, and what the window would show from its slice. */
+function heldForPane(store: Store) {
+  const session = store.getWorkspaceSession()
+  const slice = projectTerminalTopologySlice(session, LOCAL_EXECUTION_HOST_ID, WORKTREE)
+  return {
+    record: session.sleepingAgentSessionsByPaneKey?.[PANE_KEY],
+    sliceRecord: slice.sleeping[PANE_KEY],
+    tabs: slice.tabs.map((tab) => tab.id),
+    binding: slice.layouts[TAB]?.ptyIdsByLeafId?.[LEAF]
+  }
+}
+
+function resumeCommand(held: SleepingAgentSessionRecord | undefined): string | undefined {
+  return held
+    ? buildAgentResumeStartupPlan({
+        agent: held.agent,
+        providerSession: held.providerSession,
+        cmdOverrides: {},
+        platform: 'linux'
+      })?.launchCommand
+    : undefined
+}
+
+describe('sleep → quit → resume', () => {
+  it('keeps the quit capture over the periodic one through quit and relaunch', async () => {
+    const { directory, store, window } = await storeWithAgentPane()
+    // The agent is slept; the periodic save carries the first capture.
+    window.sleepingAgentSessionsByPaneKey = { [PANE_KEY]: record('worktree-sleep', 1) }
+    store.setWorkspaceSession(structuredClone(window))
+    // Quit: the window's quit capture rides only on the synchronous before-unload stage.
+    window.sleepingAgentSessionsByPaneKey = { [PANE_KEY]: record('quit', 2) }
+    store.stageWorkspaceSessionBeforeUnload(structuredClone(window))
+
+    const relaunched = await reopenTopologyStore(store, directory)
+    try {
+      const expected = {
+        record: record('quit', 2),
+        sliceRecord: record('quit', 2),
+        tabs: [TAB],
+        binding: PTY
+      }
+      expect(heldForPane(relaunched)).toEqual(expected)
+      // The relaunched window's first save is its hydrated copy; the record stays.
+      relaunched.setWorkspaceSession(structuredClone(relaunched.getWorkspaceSession()))
+      expect(heldForPane(relaunched)).toEqual(expected)
+      expect(resumeCommand(heldForPane(relaunched).record)).toBe("codex 'resume' 'session-2'")
+    } finally {
+      await relaunched.freezeWritesAsync()
+    }
+  })
+
+  it('keeps a record that only the before-unload stage carried', async () => {
+    const { directory, store, window } = await storeWithAgentPane()
+    window.sleepingAgentSessionsByPaneKey = { [PANE_KEY]: record('quit', 3) }
+    store.stageWorkspaceSessionBeforeUnload(structuredClone(window))
+
+    const relaunched = await reopenTopologyStore(store, directory)
+    try {
+      expect(heldForPane(relaunched)).toEqual({
+        record: record('quit', 3),
+        sliceRecord: record('quit', 3),
+        tabs: [TAB],
+        binding: PTY
+      })
+      expect(resumeCommand(heldForPane(relaunched).record)).toBe("codex 'resume' 'session-3'")
+    } finally {
+      await relaunched.freezeWritesAsync()
+    }
+  })
+})
diff --git a/src/main/persistence/terminal-topology/terminal-topology-model.test.ts b/src/main/persistence/terminal-topology/terminal-topology-model.test.ts
new file mode 100644
index 000000000000..04a48908298f
--- /dev/null
+++ b/src/main/persistence/terminal-topology/terminal-topology-model.test.ts
@@ -0,0 +1,529 @@
+import { mkdtempSync, rmSync } from 'node:fs'
+import { tmpdir } from 'node:os'
+import { join } from 'node:path'
+import { afterEach, describe, expect, it, vi } from 'vitest'
+import { mulberry32 } from '../../../shared/agent-tui-ansi-fuzz-stream'
+import type { SleepingAgentSessionRecord } from '../../../shared/agent-session-resume'
+import { FLOATING_TERMINAL_WORKTREE_ID } from '../../../shared/constants'
+import { LOCAL_EXECUTION_HOST_ID } from '../../../shared/execution-host'
+import type { TerminalPaneLayoutNode, TerminalTab } from '../../../shared/terminal-tab-types'
+import type { WorkspaceSessionState } from '../../../shared/workspace-session-state-types'
+import { projectTerminalTopologySlice } from '../../runtime/terminal-topology-projection'
+import type { TerminalSurfaceCloseTarget } from '../../../shared/terminal-surface-close-target'
+import { collectTerminalLeafOwners, isSameTerminal } from './terminal-owner-invariants'
+import { closeLeafOrTab } from './terminal-topology-commit'
+import {
+  emptyTerminalSessionProfile,
+  FIXTURE_FOLDER_WORKTREE_ID,
+  FIXTURE_GIT_WORKTREE_ID,
+  openTopologyStore,
+  reopenTopologyStore
+} from './terminal-topology-profile-fixture'
+
+vi.mock('../../telemetry/client', () => ({ track: vi.fn() }))
+vi.mock('../../ssh/ssh-config-parser', () => ({
+  loadUserSshConfig: () => ({ hosts: [] }),
+  sshConfigHostsToTargets: () => []
+}))
+
+/**
+ * Model test for terminal layout as main holds it. Seeded gesture sequences run against main's
+ * real Store, written the way today's desktop window writes them; a plain reference model says
+ * what main must hold after each one. Making the window a mirror of main changes who writes, not
+ * this outcome, so every seed must stay green through that refactor.
+ * Replay one seed: FUZZ_SEED=<n> FUZZ_ITERATIONS=1 pnpm test <this file>.
+ */
+
+const WORKTREES = [
+  FIXTURE_GIT_WORKTREE_ID,
+  FIXTURE_FOLDER_WORKTREE_ID,
+  FLOATING_TERMINAL_WORKTREE_ID
+]
+const FIRST_SEED = Number(process.env.FUZZ_SEED ?? 0x9417)
+const ITERATIONS = Number(process.env.FUZZ_ITERATIONS ?? 6)
+const OPS_PER_SEED = 40
+
+type ModelPane = { ptyId: string | undefined; sleeping: boolean }
+/** What main must hold: tab → leaf → binding, per worktree, in tab order. */
+type Model = Map<string, { worktreeId: string; leaves: Map<string, ModelPane> }>
+
+const directories: string[] = []
+
+function makeIds(random: () => number) {
+  const hex = (length: number): string =>
+    Array.from({ length }, () => Math.floor(random() * 16).toString(16)).join('')
+  return {
+    leaf: () => `${hex(8)}-${hex(4)}-4${hex(3)}-8${hex(3)}-${hex(12)}`,
+    tab: () => `tab-${hex(8)}`,
+    pty: (worktreeId: string) => `${worktreeId}@@${hex(8)}`
+  }
+}
+
+function leafIds(node: TerminalPaneLayoutNode | null | undefined): string[] {
+  if (!node) {
+    return []
+  }
+  return node.type === 'leaf' ? [node.leafId] : [...leafIds(node.first), ...leafIds(node.second)]
+}
+
+function withoutLeaf(node: TerminalPaneLayoutNode, leafId: string): TerminalPaneLayoutNode | null {
+  if (node.type === 'leaf') {
+    return node.leafId === leafId ? null : node
+  }
+  const first = withoutLeaf(node.first, leafId)
+  const second = withoutLeaf(node.second, leafId)
+  if (!first || !second) {
+    return first ?? second
+  }
+  return { ...node, first, second }
+}
+
+function sleepingRecord(
+  worktreeId: string,
+  tabId: string,
+  leafId: string
+): SleepingAgentSessionRecord {
+  return {
+    paneKey: `${tabId}:${leafId}`,
+    tabId,
+    worktreeId,
+    agent: 'codex',
+    providerSession: { key: 'session_id', id: `session-${leafId}` },
+    prompt: 'model',
+    state: 'waiting',
+    capturedAt: 1,
+    updatedAt: 1,
+    origin: 'quit'
+  }
+}
+
+/** The desktop window's copy of the session: it authors tabs and layouts and saves them whole. */
+class WindowSession {
+  constructor(public session: WorkspaceSessionState) {}
+
+  addTab(worktreeId: string, tabId: string, leafId: string): void {
+    const tabs = this.session.tabsByWorktree[worktreeId] ?? []
+    const tab: TerminalTab = {
+      id: tabId,
+      ptyId: null,
+      worktreeId,
+      title: `Terminal ${tabs.length + 1}`,
+      customTitle: null,
+      color: null,
+      sortOrder: tabs.length,
+      createdAt: 1
+    }
+    this.session.tabsByWorktree = { ...this.session.tabsByWorktree, [worktreeId]: [...tabs, tab] }
+    this.setLayout(tabId, { type: 'leaf', leafId }, {})
+  }
+
+  setLayout(tabId: string, root: TerminalPaneLayoutNode, ptyIdsByLeafId: Record<string, string>) {
+    this.session.terminalLayoutsByTabId = {
+      ...this.session.terminalLayoutsByTabId,
+      [tabId]: {
+        root,
+        activeLeafId: leafIds(root)[0] ?? null,
+        expandedLeafId: null,
+        ptyIdsByLeafId
+      }
+    }
+  }
+
+  bind(tabId: string, leafId: string, ptyId: string): void {
+    const layout = this.session.terminalLayoutsByTabId[tabId]
+    if (layout?.root) {
+      this.setLayout(tabId, layout.root, { ...layout.ptyIdsByLeafId, [leafId]: ptyId })
+    }
+    this.setTabPtyId(tabId, ptyId)
+  }
+
+  /** `clearTabPtyId` on exit: the tab's live id goes; the layout keeps the binding as a resume hint. */
+  setTabPtyId(tabId: string, ptyId: string | null): void {
+    this.session.tabsByWorktree = Object.fromEntries(
+      Object.entries(this.session.tabsByWorktree).map(([worktreeId, tabs]) => [
+        worktreeId,
+        tabs.map((tab) => (tab.id === tabId ? { ...tab, ptyId } : tab))
+      ])
+    )
+  }
+
+  removeTab(tabId: string): void {
+    this.session.tabsByWorktree = Object.fromEntries(
+      Object.entries(this.session.tabsByWorktree).map(([worktreeId, tabs]) => [
+        worktreeId,
+        tabs.filter((tab) => tab.id !== tabId)
+      ])
+    )
+    const { [tabId]: _removed, ...layouts } = this.session.terminalLayoutsByTabId
+    void _removed
+    this.session.terminalLayoutsByTabId = layouts
+    this.setSleeping(
+      Object.fromEntries(
+        Object.entries(this.session.sleepingAgentSessionsByPaneKey ?? {}).filter(
+          ([paneKey]) => !paneKey.startsWith(`${tabId}:`)
+        )
+      )
+    )
+  }
+
+  setSleeping(records: Record<string, SleepingAgentSessionRecord>): void {
+    this.session.sleepingAgentSessionsByPaneKey = records
+  }
+
+  snapshot(): WorkspaceSessionState {
+    return structuredClone(this.session)
+  }
+}
+
+/** Fails on a terminal bound to two leaves or a leaf in two tabs, naming both owners. */
+function expectOwnerInvariants(session: WorkspaceSessionState, context: string): void {
+  const owners = collectTerminalLeafOwners({ hostId: LOCAL_EXECUTION_HOST_ID, session })
+  const describe = (owner: (typeof owners)[number]): string =>
+    `${owner.worktreeId} ${owner.tab.id}:${owner.leafId} → ${owner.ptyId ?? 'unbound'}`
+  const breaches: string[] = []
+  for (const [index, left] of owners.entries()) {
+    for (const right of owners.slice(index + 1)) {
+      if (left.leafId === right.leafId && left.tab.id !== right.tab.id) {
+        breaches.push(`leaf in two tabs: ${describe(left)} | ${describe(right)}`)
+      } else if (left.leafId !== right.leafId && isSameTerminal(left, right)) {
+        breaches.push(`terminal on two leaves: ${describe(left)} | ${describe(right)}`)
+      }
+    }
+  }
+  expect(breaches, context).toEqual([])
+}
+
+/** Main's projected slices, reduced to what the model states. */
+function projectedTopology(session: WorkspaceSessionState) {
+  return Object.fromEntries(
+    WORKTREES.map((worktreeId) => {
+      const slice = projectTerminalTopologySlice(session, LOCAL_EXECUTION_HOST_ID, worktreeId)
+      const tabs = slice.tabs.map((tab) => {
+        const layout = slice.layouts[tab.id]
+        return {
+          tabId: tab.id,
+          leaves: Object.fromEntries(
+            leafIds(layout?.root).map((leafId) => [leafId, layout?.ptyIdsByLeafId?.[leafId]])
+          )
+        }
+      })
+      return [worktreeId, { tabs, sleeping: Object.keys(slice.sleeping).sort() }]
+    })
+  )
+}
+
+function expectedTopology(model: Model) {
+  return Object.fromEntries(
+    WORKTREES.map((worktreeId) => {
+      const entries = [...model.entries()].filter(([, tab]) => tab.worktreeId === worktreeId)
+      const tabs = entries.map(([tabId, tab]) => ({
+        tabId,
+        leaves: Object.fromEntries([...tab.leaves].map(([leafId, pane]) => [leafId, pane.ptyId]))
+      }))
+      const sleeping = entries
+        .flatMap(([tabId, tab]) =>
+          [...tab.leaves]
+            .filter(([, pane]) => pane.sleeping)
+            .map(([leafId]) => `${tabId}:${leafId}`)
+        )
+        .sort()
+      return [worktreeId, { tabs, sleeping }]
+    })
+  )
+}
+
+type Op =
+  | 'new_tab'
+  | 'split'
+  | 'close_pane'
+  | 'close_tab'
+  | 'move_pane'
+  | 'pty_exit'
+  | 'respawn'
+  | 'sleep'
+  | 'wake'
+  | 'restart'
+  | 'quit_restart'
+
+const OPS: readonly Op[] = [
+  'new_tab',
+  'new_tab',
+  'split',
+  'split',
+  'close_pane',
+  'close_tab',
+  'move_pane',
+  'pty_exit',
+  'respawn',
+  'sleep',
+  'wake',
+  'restart',
+  'quit_restart'
+]
+
+async function runSeed(seed: number): Promise<string[]> {
+  const random = mulberry32(seed)
+  const pick = <T>(items: readonly T[]): T | undefined =>
+    items.length === 0 ? undefined : items[Math.floor(random() * items.length)]
+  const ids = makeIds(random)
+  const directory = mkdtempSync(join(tmpdir(), 'orca-topology-model-'))
+  directories.push(directory)
+  let store = await openTopologyStore(directory, emptyTerminalSessionProfile())
+  const window = new WindowSession(structuredClone(store.getWorkspaceSession()))
+  const model: Model = new Map()
+  const log: string[] = []
+  const save = (): void => store.setWorkspaceSession(window.snapshot())
+  const panes = () =>
+    [...model].flatMap(([tabId, tab]) =>
+      [...tab.leaves].map(([leafId, pane]) => ({ tabId, leafId, tab, pane }))
+    )
+  const splitTabs = () => [...model].filter(([, tab]) => tab.leaves.size > 1)
+
+  const bind = async (worktreeId: string, tabId: string, leafId: string, ptyId: string) => {
+    await expect(store.persistPtyBinding({ worktreeId, tabId, leafId, ptyId })).resolves.toBe(true)
+    window.bind(tabId, leafId, ptyId)
+    model.get(tabId)!.leaves.set(leafId, { ptyId, sleeping: false })
+  }
+
+  /** `closeTerminalSurfaceFromRenderer`: the window removed the surface; main commits the close. */
+  const commitClose = async (worktreeId: string, target: TerminalSurfaceCloseTarget) => {
+    const refusal = await store.runDurableMutation(
+      closeLeafOrTab({
+        worktreeId,
+        target,
+        options: { allowMissing: true, force: true, closedByLayoutOwner: true, reason: 'user' },
+        requestedSession: store.getWorkspaceSession(),
+        ownerMatches: () => true,
+        hostId: () => LOCAL_EXECUTION_HOST_ID,
+        getSession: (hostId) => store.getWorkspaceSession(hostId),
+        setSession: (session, hostId) => store.setWorkspaceSession(session, hostId),
+        onClosed: () => {}
+      })
+    )
+    expect(refusal).toBeUndefined()
+  }
+
+  const reopen = async (stageQuit: boolean): Promise<void> => {
+    if (stageQuit) {
+      store.stageWorkspaceSessionBeforeUnload(window.snapshot())
+    }
+    store = await reopenTopologyStore(store, directory)
+    window.session = structuredClone(store.getWorkspaceSession())
+  }
+
+  for (let step = 0; step < OPS_PER_SEED; step++) {
+    const op = pick(OPS)!
+    switch (op) {
+      case 'new_tab': {
+        const worktreeId = pick(WORKTREES)!
+        const tabId = ids.tab()
+        const leafId = ids.leaf()
+        const ptyId = ids.pty(worktreeId)
+        // pty:spawn can beat the window's debounced layout save.
+        const spawnFirst = random() < 0.5
+        log.push(
+          `${op} ${worktreeId} ${tabId}:${leafId} ${ptyId}${spawnFirst ? ' spawn-first' : ''}`
+        )
+        model.set(tabId, { worktreeId, leaves: new Map() })
+        window.addTab(worktreeId, tabId, leafId)
+        if (!spawnFirst) {
+          save()
+        }
+        await bind(worktreeId, tabId, leafId, ptyId)
+        save()
+        break
+      }
+      case 'split': {
+        const target = pick(panes())
+        if (!target) {
+          continue
+        }
+        const leafId = ids.leaf()
+        const ptyId = ids.pty(target.tab.worktreeId)
+        const spawnFirst = random() < 0.5
+        const direction = random() < 0.5 ? 'vertical' : 'horizontal'
+        log.push(
+          `${op} ${target.tabId}:${target.leafId} → ${leafId} ${ptyId}${spawnFirst ? ' spawn-first' : ''}`
+        )
+        const layout = window.session.terminalLayoutsByTabId[target.tabId]!
+        window.setLayout(
+          target.tabId,
+          {
+            type: 'split',
+            direction,
+            first: layout.root!,
+            second: { type: 'leaf', leafId }
+          },
+          layout.ptyIdsByLeafId ?? {}
+        )
+        if (!spawnFirst) {
+          save()
+        }
+        await bind(target.tab.worktreeId, target.tabId, leafId, ptyId)
+        save()
+        break
+      }
+      case 'close_pane': {
+        const [tabId, tab] = pick(splitTabs()) ?? []
+        const leafId = tab && pick([...tab.leaves.keys()])
+        if (!tabId || !tab || !leafId) {
+          continue
+        }
+        log.push(`${op} ${tabId}:${leafId}`)
+        const layout = window.session.terminalLayoutsByTabId[tabId]!
+        const { [leafId]: _closed, ...bindings } = layout.ptyIdsByLeafId ?? {}
+        void _closed
+        window.setLayout(tabId, withoutLeaf(layout.root!, leafId)!, bindings)
+        const { [`${tabId}:${leafId}`]: _record, ...sleeping } =
+          window.session.sleepingAgentSessionsByPaneKey ?? {}
+        void _record
+        window.setSleeping(sleeping)
+        tab.leaves.delete(leafId)
+        await commitClose(tab.worktreeId, { kind: 'pane', tabId, leafId })
+        save()
+        break
+      }
+      case 'close_tab': {
+        const tabId = pick([...model.keys()])
+        if (!tabId) {
+          continue
+        }
+        log.push(`${op} ${tabId}`)
+        const { worktreeId } = model.get(tabId)!
+        window.removeTab(tabId)
+        model.delete(tabId)
+        await commitClose(worktreeId, { kind: 'tab', tabId })
+        save()
+        break
+      }
+      case 'move_pane': {
+        const [sourceTabId, source] = pick(splitTabs()) ?? []
+        const leafId = source && pick([...source.leaves.keys()])
+        if (!sourceTabId || !source || !leafId) {
+          continue
+        }
+        const targetTabId = ids.tab()
+        const pane = source.leaves.get(leafId)!
+        log.push(`${op} ${sourceTabId}:${leafId} → ${targetTabId}`)
+        await expect(
+          store.moveTerminalLeafToNewTab({
+            worktreeId: source.worktreeId,
+            sourceTabId,
+            targetTabId,
+            leafId,
+            ptyId: pane.ptyId ?? null
+          })
+        ).resolves.toEqual({ status: 'moved', ptyId: pane.ptyId ?? null })
+        // The window then shows what main moved, as the drag-out does today.
+        const layout = window.session.terminalLayoutsByTabId[sourceTabId]!
+        const { [leafId]: movedPty, ...bindings } = layout.ptyIdsByLeafId ?? {}
+        window.setLayout(sourceTabId, withoutLeaf(layout.root!, leafId)!, bindings)
+        window.addTab(source.worktreeId, targetTabId, leafId)
+        if (movedPty) {
+          window.bind(targetTabId, leafId, movedPty)
+        }
+        const records = { ...window.session.sleepingAgentSessionsByPaneKey }
+        const record = records[`${sourceTabId}:${leafId}`]
+        if (record) {
+          delete records[`${sourceTabId}:${leafId}`]
+          records[`${targetTabId}:${leafId}`] = {
+            ...record,
+            paneKey: `${targetTabId}:${leafId}`,
+            tabId: targetTabId
+          }
+          window.setSleeping(records)
+        }
+        source.leaves.delete(leafId)
+        model.set(targetTabId, {
+          worktreeId: source.worktreeId,
+          leaves: new Map([[leafId, pane]])
+        })
+        save()
+        break
+      }
+      case 'pty_exit': {
+        const target = pick(panes().filter(({ pane }) => pane.ptyId))
+        if (!target) {
+          continue
+        }
+        log.push(`${op} ${target.tabId}:${target.leafId}`)
+        // Main keeps an exited pane's binding; only the window's live id goes.
+        window.setTabPtyId(target.tabId, null)
+        save()
+        break
+      }
+      case 'respawn': {
+        const target = pick(panes())
+        if (!target) {
+          continue
+        }
+        const ptyId = ids.pty(target.tab.worktreeId)
+        log.push(`${op} ${target.tabId}:${target.leafId} ${ptyId}`)
+        const sleeping = target.pane.sleeping
+        await bind(target.tab.worktreeId, target.tabId, target.leafId, ptyId)
+        target.tab.leaves.get(target.leafId)!.sleeping = sleeping
+        save()
+        break
+      }
+      case 'sleep':
+      case 'wake': {
+        const target = pick(panes().filter(({ pane }) => pane.sleeping === (op === 'wake')))
+        if (!target) {
+          continue
+        }
+        log.push(`${op} ${target.tabId}:${target.leafId}`)
+        const paneKey = `${target.tabId}:${target.leafId}`
+        const records = { ...window.session.sleepingAgentSessionsByPaneKey }
+        if (op === 'sleep') {
+          records[paneKey] = sleepingRecord(target.tab.worktreeId, target.tabId, target.leafId)
+        } else {
+          delete records[paneKey]
+        }
+        window.setSleeping(records)
+        target.pane.sleeping = op === 'sleep'
+        save()
+        break
+      }
+      case 'restart':
+      case 'quit_restart': {
+        log.push(op)
+        await reopen(op === 'quit_restart')
+        break
+      }
+    }
+    const context = `seed ${seed}, step ${step}:\n${log.join('\n')}`
+    const session = store.getWorkspaceSession()
+    expectOwnerInvariants(session, context)
+    expect(projectedTopology(session), context).toEqual(expectedTopology(model))
+  }
+
+  // The saved profile, read back cold, holds the same layout.
+  await reopen(false)
+  const context = `seed ${seed}, after reopen:\n${log.join('\n')}`
+  expectOwnerInvariants(store.getWorkspaceSession(), context)
+  expect(projectedTopology(store.getWorkspaceSession()), context).toEqual(expectedTopology(model))
+  await store.freezeWritesAsync()
+  return log
+}
+
+describe('terminal layout model (main session)', () => {
+  afterEach(() => {
+    for (const directory of directories.splice(0)) {
+      rmSync(directory, { recursive: true, force: true })
+    }
+  })
+
+  it('keeps one tab per pane, one pane per terminal, and the expected layout across random gestures', async () => {
+    const ranOps = new Set<string>()
+    for (let iteration = 0; iteration < ITERATIONS; iteration++) {
+      const log = await runSeed(FIRST_SEED + iteration)
+      for (const entry of log) {
+        ranOps.add(entry.split(' ')[0]!)
+      }
+    }
+    // Precondition: the seeds reached every gesture, so a green run is not a quiet one.
+    if (ITERATIONS >= 6) {
+      expect([...ranOps].sort()).toEqual([...new Set(OPS)].sort())
+    }
+  }, 60_000)
+})
diff --git a/src/main/persistence/terminal-topology/terminal-topology-profile-fixture.ts b/src/main/persistence/terminal-topology/terminal-topology-profile-fixture.ts
new file mode 100644
index 000000000000..d6bb5fdda26f
--- /dev/null
+++ b/src/main/persistence/terminal-topology/terminal-topology-profile-fixture.ts
@@ -0,0 +1,46 @@
+import { join } from 'node:path'
+import { getDefaultWorkspaceSession } from '../../../shared/constants'
+import { DelayedAuthority } from '../loading-store/profile-state-delayed-authority-fixture'
+import { Store } from '../loading-store/store'
+import { buildProfileStateCutoverFixture } from '../profile-state-cutover-fixture'
+import { ProfileStateSqliteAuthority } from '../profile-state/profile-state-sqlite-authority'
+
+/** A worktree of the fixture's registered repo, so load keeps its rows. */
+export const FIXTURE_GIT_WORKTREE_ID = 'repo-local::/fixture/local'
+export const FIXTURE_FOLDER_WORKTREE_ID = 'repo-local::/fixture/local::workspace:folder-1'
+
+/** The cutover fixture profile with no terminal session yet. */
+export function emptyTerminalSessionProfile(): string {
+  const state = buildProfileStateCutoverFixture()
+  return JSON.stringify({
+    ...state,
+    // A fixed install id: load mints a random one when it is missing.
+    settings: {
+      ...state.settings,
+      telemetry: { existedBeforeTelemetryRelease: true, optedIn: null, installId: 'install-1' }
+    },
+    workspaceSession: getDefaultWorkspaceSession(),
+    workspaceSessionsByHostId: {}
+  })
+}
+
+/** Opens a real Store on SQLite in `directory`, seeding it first when `seed` is given. */
+export async function openTopologyStore(directory: string, seed?: string): Promise<Store> {
+  const inner = new ProfileStateSqliteAuthority(join(directory, 'profile-state.db'), 'topology')
+  if (seed) {
+    inner.writeSerializedState(Buffer.from(seed))
+  }
+  const store = new Store({
+    dataFile: join(directory, 'orca-data.json'),
+    profileStateAuthority: new DelayedAuthority(inner)
+  })
+  await store.flushPendingOrThrowAsync()
+  return store
+}
+
+/** Quit and relaunch: drain pending writes, close, and load the profile cold. */
+export async function reopenTopologyStore(store: Store, directory: string): Promise<Store> {
+  await store.flushPendingOrThrowAsync()
+  await store.freezeWritesAsync()
+  return openTopologyStore(directory)
+}
diff --git a/src/main/persistence/tracking-repos/project-group-operations.ts b/src/main/persistence/tracking-repos/project-group-operations.ts
index 47a8166e9675..d17eaf47ca97 100644
--- a/src/main/persistence/tracking-repos/project-group-operations.ts
+++ b/src/main/persistence/tracking-repos/project-group-operations.ts
@@ -6,7 +6,7 @@ import {
   normalizeProjectGroupName
 } from '../../../shared/project-groups'
 import { folderWorkspaceKey } from '../../../shared/workspace-scope'
-import { removeWorkspaceSessionOwnerEverywhere } from '../restoring-sessions/session-owner-removal'
+import { removeWorkspaceSessionOwnersEverywhere } from '../restoring-sessions/session-owner-removal'
 
 export type ProjectGroupMutationOperations = {
   state: PersistedState
@@ -105,11 +105,11 @@ export class ProjectGroupPersistenceOperations {
     for (const workspace of this.state.folderWorkspaces ?? []) {
       if (deletedGroupIds.has(workspace.projectGroupId)) {
         removedFolderWorkspaceKeys.add(folderWorkspaceKey(workspace.id))
-        // Every partition, not just the local blob: the same reason `removeFolderWorkspace` does.
-        removeWorkspaceSessionOwnerEverywhere(this.state, folderWorkspaceKey(workspace.id))
         this.removeWorkspaceLineageForFolderParent(workspace.id)
       }
     }
+    // Every partition, not just the local blob: the same reason `removeFolderWorkspace` does.
+    removeWorkspaceSessionOwnersEverywhere(this.state, removedFolderWorkspaceKeys)
     this.state.folderWorkspaces = (this.state.folderWorkspaces ?? []).filter(
       (workspace) => !deletedGroupIds.has(workspace.projectGroupId)
     )
diff --git a/src/main/persistence/tracking-repos/project-group-session-batch.test.ts b/src/main/persistence/tracking-repos/project-group-session-batch.test.ts
new file mode 100644
index 000000000000..04fbee3c9dcd
--- /dev/null
+++ b/src/main/persistence/tracking-repos/project-group-session-batch.test.ts
@@ -0,0 +1,163 @@
+import { afterEach, describe, expect, it, vi } from 'vitest'
+import { getDefaultPersistedState, getDefaultWorkspaceSession } from '../../../shared/constants'
+import { createProjectGroup } from '../../../shared/project-groups'
+import type { FolderWorkspace } from '../../../shared/folder-workspace-types'
+import type { WorkspaceSessionState } from '../../../shared/workspace-session-state-types'
+import { folderWorkspaceKey } from '../../../shared/workspace-scope'
+import { createMinimalPersistedTerminalTab } from '../restoring-sessions/session-owner-fields'
+import { ProjectGroupPersistenceOperations } from './project-group-operations'
+
+function workspace(id: string, projectGroupId: string): FolderWorkspace {
+  return {
+    id,
+    projectGroupId,
+    name: id,
+    folderPath: '/workspace',
+    linkedTask: null,
+    comment: '',
+    isArchived: false,
+    isUnread: false,
+    isPinned: false,
+    sortOrder: 0,
+    lastActivityAt: 0,
+    createdAt: 0,
+    updatedAt: 0
+  }
+}
+
+function session(owners: string[]): WorkspaceSessionState {
+  const result = getDefaultWorkspaceSession()
+  result.activeWorkspaceKey = folderWorkspaceKey(owners[0])
+  result.activeWorktreeId = folderWorkspaceKey(owners[0])
+  result.activeWorktreeIdsOnShutdown = owners.map(folderWorkspaceKey)
+  result.lastVisitedAtByWorktreeId = {}
+  result.defaultTerminalTabsAppliedByWorktreeId = {}
+  result.terminalPtyIncarnationsByPaneKey = {}
+  result.terminalTopologyRevisionByRepoId = { unrelated: 7 }
+  for (const id of owners) {
+    const owner = folderWorkspaceKey(id)
+    result.tabsByWorktree[owner] = [
+      {
+        ...createMinimalPersistedTerminalTab({
+          worktreeId: owner,
+          tabId: id,
+          ptyId: `pty-${id}`,
+          existingTabCount: 0
+        }),
+        createdAt: 0
+      }
+    ]
+    result.terminalLayoutsByTabId[id] = {
+      root: { type: 'leaf', leafId: `leaf-${id}` },
+      activeLeafId: `leaf-${id}`,
+      expandedLeafId: null,
+      buffersByLeafId: { [`leaf-${id}`]: 'scrollback'.repeat(1024) }
+    }
+    result.lastVisitedAtByWorktreeId[`ssh:builder|${owner}`] = 1
+    result.defaultTerminalTabsAppliedByWorktreeId[owner] = true
+    result.terminalPtyIncarnationsByPaneKey[`${id}:leaf-${id}`] = `incarnation-${id}`
+  }
+  return result
+}
+
+function fixture(folderCount: number) {
+  const state = getDefaultPersistedState('/home/test')
+  state.projectGroups = [
+    { ...createProjectGroup({ name: 'Root', createdFrom: 'manual', tabOrder: 0 }), id: 'root' },
+    {
+      ...createProjectGroup({ name: 'Child', createdFrom: 'manual', tabOrder: 1 }),
+      id: 'child',
+      parentGroupId: 'root'
+    },
+    { ...createProjectGroup({ name: 'Other', createdFrom: 'manual', tabOrder: 2 }), id: 'other' }
+  ]
+  const removedIds = Array.from({ length: folderCount }, (_, index) => `removed-${index}`)
+  state.folderWorkspaces = [
+    ...removedIds.map((id, index) => workspace(id, index % 2 ? 'child' : 'root')),
+    workspace('kept', 'other')
+  ]
+  state.workspaceSession = session([...removedIds, 'kept'])
+  state.workspaceSessionsByHostId = {
+    'ssh:builder': session([...removedIds, 'kept']),
+    'runtime:remote': session([...removedIds, 'kept'])
+  }
+  const scheduleSave = vi.fn()
+  const removeWorkspaceLineageForFolderParent = vi.fn()
+  const selected = new Set([...removedIds, 'kept'].map(folderWorkspaceKey))
+  const pruneMobileClientTabSelections = vi.fn((matches: (owner: string) => boolean) => {
+    for (const owner of selected) {
+      if (matches(owner)) {
+        selected.delete(owner)
+      }
+    }
+  })
+  const operations = new ProjectGroupPersistenceOperations({
+    state,
+    scheduleSave,
+    removeWorkspaceLineageForFolderParent,
+    pruneMobileClientTabSelections
+  })
+  return {
+    state,
+    removedIds,
+    selected,
+    operations,
+    scheduleSave,
+    removeWorkspaceLineageForFolderParent,
+    pruneMobileClientTabSelections
+  }
+}
+
+afterEach(() => vi.restoreAllMocks())
+
+describe('project group session removal', () => {
+  it('copies each host session once when deleting many folder workspaces', () => {
+    const { operations } = fixture(24)
+    const clone = vi.spyOn(globalThis, 'structuredClone')
+    expect(operations.deleteProjectGroup('root')).toBe(true)
+    expect(clone).toHaveBeenCalledTimes(3)
+  })
+
+  it('removes the entire subtree from local spill and remote sessions while preserving other owners', () => {
+    const setup = fixture(8)
+    const kept = session(['kept'])
+    kept.activeWorkspaceKey = null
+    kept.activeWorktreeId = null
+    expect(setup.operations.deleteProjectGroup('root')).toBe(true)
+    expect(setup.state.workspaceSession).toEqual(kept)
+    expect(setup.state.workspaceSessionsByHostId).toEqual({
+      'ssh:builder': kept,
+      'runtime:remote': kept
+    })
+    expect(setup.state.projectGroups?.map((group) => group.id)).toEqual(['other'])
+    expect(setup.state.folderWorkspaces.map((entry) => entry.id)).toEqual(['kept'])
+    expect(setup.selected).toEqual(new Set([folderWorkspaceKey('kept')]))
+    expect(setup.removeWorkspaceLineageForFolderParent.mock.calls).toEqual(
+      setup.removedIds.map((id) => [id])
+    )
+    expect(setup.pruneMobileClientTabSelections).toHaveBeenCalledTimes(1)
+    expect(setup.scheduleSave).toHaveBeenCalledTimes(1)
+  })
+
+  it('preserves session references when the deleted group has no folder workspaces', () => {
+    const { state, operations, scheduleSave } = fixture(0)
+    const local = state.workspaceSession
+    const hosts = state.workspaceSessionsByHostId
+    const clone = vi.spyOn(globalThis, 'structuredClone')
+    expect(operations.deleteProjectGroup('root')).toBe(true)
+    expect(state.workspaceSession).toBe(local)
+    expect(state.workspaceSessionsByHostId).toBe(hosts)
+    expect(clone).not.toHaveBeenCalled()
+    expect(scheduleSave).toHaveBeenCalledTimes(1)
+  })
+
+  it('does not prune or save when the requested group does not exist', () => {
+    const setup = fixture(8)
+    const before = structuredClone(setup.state)
+    expect(setup.operations.deleteProjectGroup('missing')).toBe(false)
+    expect(setup.state).toEqual(before)
+    expect(setup.removeWorkspaceLineageForFolderParent).not.toHaveBeenCalled()
+    expect(setup.pruneMobileClientTabSelections).not.toHaveBeenCalled()
+    expect(setup.scheduleSave).not.toHaveBeenCalled()
+  })
+})
diff --git a/src/main/persistence/tracking-repos/worktree-metadata-normalization.ts b/src/main/persistence/tracking-repos/worktree-metadata-normalization.ts
index df4c030f4588..34d47eb208e6 100644
--- a/src/main/persistence/tracking-repos/worktree-metadata-normalization.ts
+++ b/src/main/persistence/tracking-repos/worktree-metadata-normalization.ts
@@ -21,6 +21,7 @@ import {
 } from '../loading-store/worktree-identity-metadata'
 import type { WorktreeMeta } from '../../../shared/worktree/meta-types'
 import { fillDefaultWorktreeMetaFields } from '../../../shared/worktree/meta-persisted-defaults'
+import { getWorkspaceAttachments } from '../../../shared/workspace-attachments'
 
 // Why: worktrees deleted outside Orca orphan their worktreeMeta, so the map grew monotonically (63% dead on a heavy install).
 // GC stays narrow: local-host entries only (a local existsSync would falsely condemn SSH/WSL remote paths) and only after a 30-day idle grace.
@@ -99,6 +100,14 @@ function normalizeLinkedMetadata(meta: WorktreeMeta): boolean {
     ? sourceContext
     : null
   let changed = false
+  const linkedItems = getWorkspaceAttachments(meta)
+  if (
+    meta.linkedItems !== undefined &&
+    JSON.stringify(meta.linkedItems) !== JSON.stringify(linkedItems)
+  ) {
+    meta.linkedItems = linkedItems
+    changed = true
+  }
   if (!areWorkspaceLinkedItemsEqual(meta.linkedWorkItem, linkedWorkItem)) {
     meta.linkedWorkItem = linkedWorkItem
     changed = true
diff --git a/src/main/pi/__fixtures__/command-only.jsonl b/src/main/pi/__fixtures__/command-only.jsonl
new file mode 100644
index 000000000000..e3cefacfc160
--- /dev/null
+++ b/src/main/pi/__fixtures__/command-only.jsonl
@@ -0,0 +1,20 @@
+{"dir":"in","raw":"{\"id\": \"q1\", \"type\": \"get_state\"}"}
+{"dir":"out","raw":"{\"id\":\"q1\",\"type\":\"response\",\"command\":\"get_state\",\"success\":true,\"data\":{\"model\":{\"id\":\"gpt-6.1-sol\",\"name\":\"GPT-6.1 Sol\",\"api\":\"openai-codex-responses\",\"provider\":\"openai-codex\",\"baseUrl\":\"https://chatgpt.com/backend-api\",\"reasoning\":true,\"input\":[\"text\",\"image\"],\"cost\":{\"input\":2,\"output\":10,\"cacheRead\":0.1,\"cacheWrite\":2.5,\"tiers\":[{\"inputTokensAbove\":272000,\"input\":4,\"output\":15,\"cacheRead\":0.2,\"cacheWrite\":5}]},\"contextWindow\":272000,\"maxTokens\":128000,\"thinkingLevelMap\":{\"off\":null,\"minimal\":\"low\",\"low\":\"low\",\"medium\":\"medium\",\"high\":\"high\",\"xhigh\":\"xhigh\",\"max\":\"max\"},\"compat\":{\"supportsOpenAIGrammarTools\":true,\"supportsAdditionalTools\":true,\"supportsToolSearch\":true,\"supportsMidConvoSystemMessages\":true},\"inputLimits\":{\"images\":{\"resize\":{\"maxWidth\":2000,\"maxHeight\":2000,\"maxBytes\":4718592,\"jpegQuality\":80}}},\"type\":\"chat\"},\"thinkingLevel\":\"medium\",\"isStreaming\":false,\"isCompacting\":false,\"steeringMode\":\"one-at-a-time\",\"followUpMode\":\"one-at-a-time\",\"sessionFile\":\"/Users/xxxxxxxxxxxx/orca-qa/task_7daea3cb4c53/projects/pi/command-only/sessions/XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX.jsonl\",\"sessionId\":\"00000000-0000-4000-8000-000000000009\",\"autoCompactionEnabled\":true,\"messageCount\":0,\"pendingMessageCount\":0}}"}
+{"dir":"in","raw":"{\"id\": \"q2\", \"type\": \"set_auto_retry\", \"enabled\": false}"}
+{"dir":"out","raw":"{\"id\":\"q2\",\"type\":\"response\",\"command\":\"set_auto_retry\",\"success\":true}"}
+{"dir":"in","raw":"{\"id\": \"q3\", \"type\": \"set_auto_compaction\", \"enabled\": false}"}
+{"dir":"out","raw":"{\"id\":\"q3\",\"type\":\"response\",\"command\":\"set_auto_compaction\",\"success\":true}"}
+{"dir":"in","raw":"{\"id\": \"q4\", \"type\": \"get_available_models\"}"}
+{"dir":"out","raw":"{\"id\":\"q4\",\"type\":\"response\",\"command\":\"get_available_models\",\"success\":true,\"data\":{\"models\":[{\"id\":\"gpt-5.3-codex-spark\",\"name\":\"GPT-5.3 Codex Spark\",\"api\":\"openai-codex-responses\",\"provider\":\"openai-codex\",\"baseUrl\":\"https://chatgpt.com/backend-api\",\"reasoning\":true,\"input\":[\"text\"],\"cost\":{\"input\":1.75,\"output\":14,\"cacheRead\":0.175,\"cacheWrite\":0},\"contextWindow\":128000,\"maxTokens\":128000,\"thinkingLevelMap\":{\"xhigh\":\"xhigh\",\"minimal\":\"low\"},\"compat\":{\"supportsOpenAIGrammarTools\":true},\"type\":\"chat\"},{\"id\":\"gpt-5.5\",\"name\":\"GPT-5.5\",\"api\":\"openai-codex-responses\",\"provider\":\"openai-codex\",\"baseUrl\":\"https://chatgpt.com/backend-api\",\"reasoning\":true,\"input\":[\"text\",\"image\"],\"cost\":{\"input\":5,\"output\":30,\"cacheRead\":0.5,\"cacheWrite\":0,\"tiers\":[{\"inputTokensAbove\":272000,\"input\":10,\"output\":45,\"cacheRead\":1,\"cacheWrite\":0}]},\"contextWindow\":272000,\"maxTokens\":128000,\"thinkingLevelMap\":{\"xhigh\":\"xhigh\",\"minimal\":\"low\"},\"compat\":{\"supportsOpenAIGrammarTools\":true,\"supportsToolSearch\":true,\"supportsMidConvoSystemMessages\":true},\"inputLimits\":{\"images\":{\"resize\":{\"maxWidth\":2000,\"maxHeight\":2000,\"maxBytes\":4718592,\"jpegQuality\":80}}},\"type\":\"chat\"},{\"id\":\"gpt-5.6-luna\",\"name\":\"GPT-5.6 Luna\",\"api\":\"openai-codex-responses\",\"provider\":\"openai-codex\",\"baseUrl\":\"https://chatgpt.com/backend-api\",\"reasoning\":true,\"input\":[\"text\",\"image\"],\"cost\":{\"input\":0.2,\"output\":1.2,\"cacheRead\":0.02,\"cacheWrite\":0.25,\"tiers\":[{\"inputTokensAbove\":272000,\"input\":0.4,\"output\":1.8,\"cacheRead\":0.04,\"cacheWrite\":0.5}]},\"contextWindow\":272000,\"maxTokens\":128000,\"thinkingLevelMap\":{\"xhigh\":\"xhigh\",\"max\":\"max\",\"minimal\":\"low\"},\"compat\":{\"supportsOpenAIGrammarTools\":true,\"supportsAdditionalTools\":true,\"supportsToolSearch\":true,\"supportsMidConvoSystemMessages\":true},\"inputLimits\":{\"images\":{\"resize\":{\"maxWidth\":2000,\"maxHeight\":2000,\"maxBytes\":4718592,\"jpegQuality\":80}}},\"type\":\"chat\"},{\"id\":\"gpt-5.6-sol\",\"name\":\"GPT-5.6 Sol\",\"api\":\"openai-codex-responses\",\"provider\":\"openai-codex\",\"baseUrl\":\"https://chatgpt.com/backend-api\",\"reasoning\":true,\"input\":[\"text\",\"image\"],\"cost\":{\"input\":4,\"output\":20,\"cacheRead\":0.4,\"cacheWrite\":5,\"tiers\":[{\"inputTokensAbove\":272000,\"input\":8,\"output\":30,\"cacheRead\":0.8,\"cacheWrite\":10}]},\"contextWindow\":272000,\"maxTokens\":128000,\"thinkingLevelMap\":{\"xhigh\":\"xhigh\",\"max\":\"max\",\"minimal\":\"low\"},\"compat\":{\"supportsOpenAIGrammarTools\":true,\"supportsAdditionalTools\":true,\"supportsToolSearch\":true,\"supportsMidConvoSystemMessages\":true},\"inputLimits\":{\"images\":{\"resize\":{\"maxWidth\":2000,\"maxHeight\":2000,\"maxBytes\":4718592,\"jpegQuality\":80}}},\"type\":\"chat\"},{\"id\":\"gpt-5.6-terra\",\"name\":\"GPT-5.6 Terra\",\"api\":\"openai-codex-responses\",\"provider\":\"openai-codex\",\"baseUrl\":\"https://chatgpt.com/backend-api\",\"reasoning\":true,\"input\":[\"text\",\"image\"],\"cost\":{\"input\":2,\"output\":12,\"cacheRead\":0.2,\"cacheWrite\":2.5,\"tiers\":[{\"inputTokensAbove\":272000,\"input\":4,\"output\":18,\"cacheRead\":0.4,\"cacheWrite\":5}]},\"contextWindow\":272000,\"maxTokens\":128000,\"thinkingLevelMap\":{\"xhigh\":\"xhigh\",\"max\":\"max\",\"minimal\":\"low\"},\"compat\":{\"supportsOpenAIGrammarTools\":true,\"supportsAdditionalTools\":true,\"supportsToolSearch\":true,\"supportsMidConvoSystemMessages\":true},\"inputLimits\":{\"images\":{\"resize\":{\"maxWidth\":2000,\"maxHeight\":2000,\"maxBytes\":4718592,\"jpegQuality\":80}}},\"type\":\"chat\"},{\"id\":\"gpt-6-astra\",\"name\":\"GPT-6 Astra\",\"api\":\"openai-codex-responses\",\"provider\":\"openai-codex\",\"baseUrl\":\"https://chatgpt.com/backend-api\",\"reasoning\":true,\"input\":[\"text\",\"image\"],\"cost\":{\"input\":10,\"output\":50,\"cacheRead\":1,\"cacheWrite\":12.5,\"tiers\":[{\"inputTokensAbove\":272000,\"input\":20,\"output\":75,\"cacheRead\":2,\"cacheWrite\":25}]},\"contextWindow\":272000,\"maxTokens\":128000,\"thinkingLevelMap\":{\"off\":null,\"minimal\":\"low\",\"low\":\"low\",\"medium\":\"medium\",\"high\":\"high\",\"xhigh\":\"xhigh\",\"max\":\"max\"},\"compat\":{\"supportsOpenAIGrammarTools\":true,\"supportsAdditionalTools\":true,\"supportsToolSearch\":true,\"supportsMidConvoSystemMessages\":true},\"inputLimits\":{\"images\":{\"resize\":{\"maxWidth\":2000,\"maxHeight\":2000,\"maxBytes\":4718592,\"jpegQuality\":80}}},\"type\":\"chat\"},{\"id\":\"gpt-6-luna\",\"name\":\"GPT-6 Luna\",\"api\":\"openai-codex-responses\",\"provider\":\"openai-codex\",\"baseUrl\":\"https://chatgpt.com/backend-api\",\"reasoning\":true,\"input\":[\"text\",\"image\"],\"cost\":{\"input\":0.1,\"output\":0.5,\"cacheRead\":0.01,\"cacheWrite\":0.125,\"tiers\":[{\"inputTokensAbove\":272000,\"input\":0.2,\"output\":0.75,\"cacheRead\":0.02,\"cacheWrite\":0.25}]},\"contextWindow\":272000,\"maxTokens\":128000,\"thinkingLevelMap\":{\"off\":\"none\",\"minimal\":\"low\",\"low\":\"low\",\"medium\":\"medium\",\"high\":\"high\",\"xhigh\":\"xhigh\",\"max\":\"max\"},\"compat\":{\"supportsOpenAIGrammarTools\":true,\"supportsAdditionalTools\":true,\"supportsToolSearch\":true,\"supportsMidConvoSystemMessages\":true},\"inputLimits\":{\"images\":{\"resize\":{\"maxWidth\":2000,\"maxHeight\":2000,\"maxBytes\":4718592,\"jpegQuality\":80}}},\"type\":\"chat\"},{\"id\":\"gpt-6-sol\",\"name\":\"GPT-6 Sol\",\"api\":\"openai-codex-responses\",\"provider\":\"openai-codex\",\"baseUrl\":\"https://chatgpt.com/backend-api\",\"reasoning\":true,\"input\":[\"text\",\"image\"],\"cost\":{\"input\":2,\"output\":10,\"cacheRead\":0.2,\"cacheWrite\":2.5,\"tiers\":[{\"inputTokensAbove\":272000,\"input\":4,\"output\":15,\"cacheRead\":0.4,\"cacheWrite\":5}]},\"contextWindow\":272000,\"maxTokens\":128000,\"thinkingLevelMap\":{\"off\":\"none\",\"minimal\":\"low\",\"low\":\"low\",\"medium\":\"medium\",\"high\":\"high\",\"xhigh\":\"xhigh\",\"max\":\"max\"},\"compat\":{\"supportsOpenAIGrammarTools\":true,\"supportsAdditionalTools\":true,\"supportsToolSearch\":true,\"supportsMidConvoSystemMessages\":true},\"inputLimits\":{\"images\":{\"resize\":{\"maxWidth\":2000,\"maxHeight\":2000,\"maxBytes\":4718592,\"jpegQuality\":80}}},\"type\":\"chat\"},{\"id\":\"gpt-6.1-sol\",\"name\":\"GPT-6.1 Sol\",\"api\":\"openai-codex-responses\",\"provider\":\"openai-codex\",\"baseUrl\":\"https://chatgpt.com/backend-api\",\"reasoning\":true,\"input\":[\"text\",\"image\"],\"cost\":{\"input\":2,\"output\":10,\"cacheRead\":0.1,\"cacheWrite\":2.5,\"tiers\":[{\"inputTokensAbove\":272000,\"input\":4,\"output\":15,\"cacheRead\":0.2,\"cacheWrite\":5}]},\"contextWindow\":272000,\"maxTokens\":128000,\"thinkingLevelMap\":{\"off\":null,\"minimal\":\"low\",\"low\":\"low\",\"medium\":\"medium\",\"high\":\"high\",\"xhigh\":\"xhigh\",\"max\":\"max\"},\"compat\":{\"supportsOpenAIGrammarTools\":true,\"supportsAdditionalTools\":true,\"supportsToolSearch\":true,\"supportsMidConvoSystemMessages\":true},\"inputLimits\":{\"images\":{\"resize\":{\"maxWidth\":2000,\"maxHeight\":2000,\"maxBytes\":4718592,\"jpegQuality\":80}}},\"type\":\"chat\"}]}}"}
+{"dir":"in","raw":"{\"id\": \"q5\", \"type\": \"set_model\", \"provider\": \"openai-codex\", \"modelId\": \"gpt-5.5\"}"}
+{"dir":"out","raw":"{\"id\":\"q5\",\"type\":\"response\",\"command\":\"set_model\",\"success\":true,\"data\":{\"id\":\"gpt-5.5\",\"name\":\"GPT-5.5\",\"api\":\"openai-codex-responses\",\"provider\":\"openai-codex\",\"baseUrl\":\"https://chatgpt.com/backend-api\",\"reasoning\":true,\"input\":[\"text\",\"image\"],\"cost\":{\"input\":5,\"output\":30,\"cacheRead\":0.5,\"cacheWrite\":0,\"tiers\":[{\"inputTokensAbove\":272000,\"input\":10,\"output\":45,\"cacheRead\":1,\"cacheWrite\":0}]},\"contextWindow\":272000,\"maxTokens\":128000,\"thinkingLevelMap\":{\"xhigh\":\"xhigh\",\"minimal\":\"low\"},\"compat\":{\"supportsOpenAIGrammarTools\":true,\"supportsToolSearch\":true,\"supportsMidConvoSystemMessages\":true},\"inputLimits\":{\"images\":{\"resize\":{\"maxWidth\":2000,\"maxHeight\":2000,\"maxBytes\":4718592,\"jpegQuality\":80}}},\"type\":\"chat\"}}"}
+{"dir":"in","raw":"{\"id\": \"q6\", \"type\": \"set_thinking_level\", \"level\": \"off\"}"}
+{"dir":"out","raw":"{\"type\":\"thinking_level_changed\",\"level\":\"off\"}"}
+{"dir":"out","raw":"{\"id\":\"q6\",\"type\":\"response\",\"command\":\"set_thinking_level\",\"success\":true}"}
+{"dir":"in","raw":"{\"id\": \"q7\", \"type\": \"prompt\", \"message\": \"/qa-local\"}"}
+{"dir":"out","raw":"{\"type\":\"extension_ui_request\",\"id\":\"00000000-0000-4000-8000-000000000010\",\"method\":\"setStatus\",\"statusKey\":\"qa-capture\",\"statusText\":\"local command\"}"}
+{"dir":"out","raw":"{\"type\":\"extension_ui_request\",\"id\":\"00000000-0000-4000-8000-000000000011\",\"method\":\"setTitle\",\"title\":\"RPC capture\"}"}
+{"dir":"out","raw":"{\"type\":\"extension_ui_request\",\"id\":\"00000000-0000-4000-8000-000000000012\",\"method\":\"notify\",\"message\":\"command completed without a model call\",\"notifyType\":\"info\"}"}
+{"dir":"out","raw":"{\"id\":\"q7\",\"type\":\"response\",\"command\":\"prompt\",\"success\":true,\"data\":{\"disposition\":\"handled\"}}"}
+{"dir":"in","raw":"{\"id\": \"q8\", \"type\": \"get_state\"}"}
+{"dir":"out","raw":"{\"id\":\"q8\",\"type\":\"response\",\"command\":\"get_state\",\"success\":true,\"data\":{\"model\":{\"id\":\"gpt-5.5\",\"name\":\"GPT-5.5\",\"api\":\"openai-codex-responses\",\"provider\":\"openai-codex\",\"baseUrl\":\"https://chatgpt.com/backend-api\",\"reasoning\":true,\"input\":[\"text\",\"image\"],\"cost\":{\"input\":5,\"output\":30,\"cacheRead\":0.5,\"cacheWrite\":0,\"tiers\":[{\"inputTokensAbove\":272000,\"input\":10,\"output\":45,\"cacheRead\":1,\"cacheWrite\":0}]},\"contextWindow\":272000,\"maxTokens\":128000,\"thinkingLevelMap\":{\"xhigh\":\"xhigh\",\"minimal\":\"low\"},\"compat\":{\"supportsOpenAIGrammarTools\":true,\"supportsToolSearch\":true,\"supportsMidConvoSystemMessages\":true},\"inputLimits\":{\"images\":{\"resize\":{\"maxWidth\":2000,\"maxHeight\":2000,\"maxBytes\":4718592,\"jpegQuality\":80}}},\"type\":\"chat\"},\"thinkingLevel\":\"off\",\"isStreaming\":false,\"isCompacting\":false,\"steeringMode\":\"one-at-a-time\",\"followUpMode\":\"one-at-a-time\",\"sessionFile\":\"/Users/xxxxxxxxxxxx/orca-qa/task_7daea3cb4c53/projects/pi/command-only/sessions/XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX.jsonl\",\"sessionId\":\"00000000-0000-4000-8000-000000000009\",\"autoCompactionEnabled\":false,\"messageCount\":0,\"pendingMessageCount\":0}}"}
diff --git a/src/main/pi/__fixtures__/compaction.jsonl b/src/main/pi/__fixtures__/compaction.jsonl
new file mode 100644
index 000000000000..c5cde2edb144
--- /dev/null
+++ b/src/main/pi/__fixtures__/compaction.jsonl
@@ -0,0 +1,99 @@
+{"dir":"in","raw":"{\"id\": \"q1\", \"type\": \"get_state\"}"}
+{"dir":"out","raw":"{\"id\":\"q1\",\"type\":\"response\",\"command\":\"get_state\",\"success\":true,\"data\":{\"model\":{\"id\":\"gpt-6.1-sol\",\"name\":\"GPT-6.1 Sol\",\"api\":\"openai-codex-responses\",\"provider\":\"openai-codex\",\"baseUrl\":\"https://chatgpt.com/backend-api\",\"reasoning\":true,\"input\":[\"text\",\"image\"],\"cost\":{\"input\":2,\"output\":10,\"cacheRead\":0.1,\"cacheWrite\":2.5,\"tiers\":[{\"inputTokensAbove\":272000,\"input\":4,\"output\":15,\"cacheRead\":0.2,\"cacheWrite\":5}]},\"contextWindow\":272000,\"maxTokens\":128000,\"thinkingLevelMap\":{\"off\":null,\"minimal\":\"low\",\"low\":\"low\",\"medium\":\"medium\",\"high\":\"high\",\"xhigh\":\"xhigh\",\"max\":\"max\"},\"compat\":{\"supportsOpenAIGrammarTools\":true,\"supportsAdditionalTools\":true,\"supportsToolSearch\":true,\"supportsMidConvoSystemMessages\":true},\"inputLimits\":{\"images\":{\"resize\":{\"maxWidth\":2000,\"maxHeight\":2000,\"maxBytes\":4718592,\"jpegQuality\":80}}},\"type\":\"chat\"},\"thinkingLevel\":\"medium\",\"isStreaming\":false,\"isCompacting\":false,\"steeringMode\":\"one-at-a-time\",\"followUpMode\":\"one-at-a-time\",\"sessionFile\":\"/Users/xxxxxxxxxxxx/orca-qa/task_7daea3cb4c53/projects/pi/steer-then-compact/sessions/XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX.jsonl\",\"sessionId\":\"00000000-0000-4000-8000-000000000049\",\"autoCompactionEnabled\":false,\"messageCount\":0,\"pendingMessageCount\":0}}"}
+{"dir":"in","raw":"{\"id\": \"q2\", \"type\": \"set_auto_retry\", \"enabled\": false}"}
+{"dir":"out","raw":"{\"id\":\"q2\",\"type\":\"response\",\"command\":\"set_auto_retry\",\"success\":true}"}
+{"dir":"in","raw":"{\"id\": \"q3\", \"type\": \"set_auto_compaction\", \"enabled\": false}"}
+{"dir":"out","raw":"{\"id\":\"q3\",\"type\":\"response\",\"command\":\"set_auto_compaction\",\"success\":true}"}
+{"dir":"in","raw":"{\"id\": \"q4\", \"type\": \"get_available_models\"}"}
+{"dir":"out","raw":"{\"id\":\"q4\",\"type\":\"response\",\"command\":\"get_available_models\",\"success\":true,\"data\":{\"models\":[{\"id\":\"gpt-5.3-codex-spark\",\"name\":\"GPT-5.3 Codex Spark\",\"api\":\"openai-codex-responses\",\"provider\":\"openai-codex\",\"baseUrl\":\"https://chatgpt.com/backend-api\",\"reasoning\":true,\"input\":[\"text\"],\"cost\":{\"input\":1.75,\"output\":14,\"cacheRead\":0.175,\"cacheWrite\":0},\"contextWindow\":128000,\"maxTokens\":128000,\"thinkingLevelMap\":{\"xhigh\":\"xhigh\",\"minimal\":\"low\"},\"compat\":{\"supportsOpenAIGrammarTools\":true},\"type\":\"chat\"},{\"id\":\"gpt-5.5\",\"name\":\"GPT-5.5\",\"api\":\"openai-codex-responses\",\"provider\":\"openai-codex\",\"baseUrl\":\"https://chatgpt.com/backend-api\",\"reasoning\":true,\"input\":[\"text\",\"image\"],\"cost\":{\"input\":5,\"output\":30,\"cacheRead\":0.5,\"cacheWrite\":0,\"tiers\":[{\"inputTokensAbove\":272000,\"input\":10,\"output\":45,\"cacheRead\":1,\"cacheWrite\":0}]},\"contextWindow\":272000,\"maxTokens\":128000,\"thinkingLevelMap\":{\"xhigh\":\"xhigh\",\"minimal\":\"low\"},\"compat\":{\"supportsOpenAIGrammarTools\":true,\"supportsToolSearch\":true,\"supportsMidConvoSystemMessages\":true},\"inputLimits\":{\"images\":{\"resize\":{\"maxWidth\":2000,\"maxHeight\":2000,\"maxBytes\":4718592,\"jpegQuality\":80}}},\"type\":\"chat\"},{\"id\":\"gpt-5.6-luna\",\"name\":\"GPT-5.6 Luna\",\"api\":\"openai-codex-responses\",\"provider\":\"openai-codex\",\"baseUrl\":\"https://chatgpt.com/backend-api\",\"reasoning\":true,\"input\":[\"text\",\"image\"],\"cost\":{\"input\":0.2,\"output\":1.2,\"cacheRead\":0.02,\"cacheWrite\":0.25,\"tiers\":[{\"inputTokensAbove\":272000,\"input\":0.4,\"output\":1.8,\"cacheRead\":0.04,\"cacheWrite\":0.5}]},\"contextWindow\":272000,\"maxTokens\":128000,\"thinkingLevelMap\":{\"xhigh\":\"xhigh\",\"max\":\"max\",\"minimal\":\"low\"},\"compat\":{\"supportsOpenAIGrammarTools\":true,\"supportsAdditionalTools\":true,\"supportsToolSearch\":true,\"supportsMidConvoSystemMessages\":true},\"inputLimits\":{\"images\":{\"resize\":{\"maxWidth\":2000,\"maxHeight\":2000,\"maxBytes\":4718592,\"jpegQuality\":80}}},\"type\":\"chat\"},{\"id\":\"gpt-5.6-sol\",\"name\":\"GPT-5.6 Sol\",\"api\":\"openai-codex-responses\",\"provider\":\"openai-codex\",\"baseUrl\":\"https://chatgpt.com/backend-api\",\"reasoning\":true,\"input\":[\"text\",\"image\"],\"cost\":{\"input\":4,\"output\":20,\"cacheRead\":0.4,\"cacheWrite\":5,\"tiers\":[{\"inputTokensAbove\":272000,\"input\":8,\"output\":30,\"cacheRead\":0.8,\"cacheWrite\":10}]},\"contextWindow\":272000,\"maxTokens\":128000,\"thinkingLevelMap\":{\"xhigh\":\"xhigh\",\"max\":\"max\",\"minimal\":\"low\"},\"compat\":{\"supportsOpenAIGrammarTools\":true,\"supportsAdditionalTools\":true,\"supportsToolSearch\":true,\"supportsMidConvoSystemMessages\":true},\"inputLimits\":{\"images\":{\"resize\":{\"maxWidth\":2000,\"maxHeight\":2000,\"maxBytes\":4718592,\"jpegQuality\":80}}},\"type\":\"chat\"},{\"id\":\"gpt-5.6-terra\",\"name\":\"GPT-5.6 Terra\",\"api\":\"openai-codex-responses\",\"provider\":\"openai-codex\",\"baseUrl\":\"https://chatgpt.com/backend-api\",\"reasoning\":true,\"input\":[\"text\",\"image\"],\"cost\":{\"input\":2,\"output\":12,\"cacheRead\":0.2,\"cacheWrite\":2.5,\"tiers\":[{\"inputTokensAbove\":272000,\"input\":4,\"output\":18,\"cacheRead\":0.4,\"cacheWrite\":5}]},\"contextWindow\":272000,\"maxTokens\":128000,\"thinkingLevelMap\":{\"xhigh\":\"xhigh\",\"max\":\"max\",\"minimal\":\"low\"},\"compat\":{\"supportsOpenAIGrammarTools\":true,\"supportsAdditionalTools\":true,\"supportsToolSearch\":true,\"supportsMidConvoSystemMessages\":true},\"inputLimits\":{\"images\":{\"resize\":{\"maxWidth\":2000,\"maxHeight\":2000,\"maxBytes\":4718592,\"jpegQuality\":80}}},\"type\":\"chat\"},{\"id\":\"gpt-6-astra\",\"name\":\"GPT-6 Astra\",\"api\":\"openai-codex-responses\",\"provider\":\"openai-codex\",\"baseUrl\":\"https://chatgpt.com/backend-api\",\"reasoning\":true,\"input\":[\"text\",\"image\"],\"cost\":{\"input\":10,\"output\":50,\"cacheRead\":1,\"cacheWrite\":12.5,\"tiers\":[{\"inputTokensAbove\":272000,\"input\":20,\"output\":75,\"cacheRead\":2,\"cacheWrite\":25}]},\"contextWindow\":272000,\"maxTokens\":128000,\"thinkingLevelMap\":{\"off\":null,\"minimal\":\"low\",\"low\":\"low\",\"medium\":\"medium\",\"high\":\"high\",\"xhigh\":\"xhigh\",\"max\":\"max\"},\"compat\":{\"supportsOpenAIGrammarTools\":true,\"supportsAdditionalTools\":true,\"supportsToolSearch\":true,\"supportsMidConvoSystemMessages\":true},\"inputLimits\":{\"images\":{\"resize\":{\"maxWidth\":2000,\"maxHeight\":2000,\"maxBytes\":4718592,\"jpegQuality\":80}}},\"type\":\"chat\"},{\"id\":\"gpt-6-luna\",\"name\":\"GPT-6 Luna\",\"api\":\"openai-codex-responses\",\"provider\":\"openai-codex\",\"baseUrl\":\"https://chatgpt.com/backend-api\",\"reasoning\":true,\"input\":[\"text\",\"image\"],\"cost\":{\"input\":0.1,\"output\":0.5,\"cacheRead\":0.01,\"cacheWrite\":0.125,\"tiers\":[{\"inputTokensAbove\":272000,\"input\":0.2,\"output\":0.75,\"cacheRead\":0.02,\"cacheWrite\":0.25}]},\"contextWindow\":272000,\"maxTokens\":128000,\"thinkingLevelMap\":{\"off\":\"none\",\"minimal\":\"low\",\"low\":\"low\",\"medium\":\"medium\",\"high\":\"high\",\"xhigh\":\"xhigh\",\"max\":\"max\"},\"compat\":{\"supportsOpenAIGrammarTools\":true,\"supportsAdditionalTools\":true,\"supportsToolSearch\":true,\"supportsMidConvoSystemMessages\":true},\"inputLimits\":{\"images\":{\"resize\":{\"maxWidth\":2000,\"maxHeight\":2000,\"maxBytes\":4718592,\"jpegQuality\":80}}},\"type\":\"chat\"},{\"id\":\"gpt-6-sol\",\"name\":\"GPT-6 Sol\",\"api\":\"openai-codex-responses\",\"provider\":\"openai-codex\",\"baseUrl\":\"https://chatgpt.com/backend-api\",\"reasoning\":true,\"input\":[\"text\",\"image\"],\"cost\":{\"input\":2,\"output\":10,\"cacheRead\":0.2,\"cacheWrite\":2.5,\"tiers\":[{\"inputTokensAbove\":272000,\"input\":4,\"output\":15,\"cacheRead\":0.4,\"cacheWrite\":5}]},\"contextWindow\":272000,\"maxTokens\":128000,\"thinkingLevelMap\":{\"off\":\"none\",\"minimal\":\"low\",\"low\":\"low\",\"medium\":\"medium\",\"high\":\"high\",\"xhigh\":\"xhigh\",\"max\":\"max\"},\"compat\":{\"supportsOpenAIGrammarTools\":true,\"supportsAdditionalTools\":true,\"supportsToolSearch\":true,\"supportsMidConvoSystemMessages\":true},\"inputLimits\":{\"images\":{\"resize\":{\"maxWidth\":2000,\"maxHeight\":2000,\"maxBytes\":4718592,\"jpegQuality\":80}}},\"type\":\"chat\"},{\"id\":\"gpt-6.1-sol\",\"name\":\"GPT-6.1 Sol\",\"api\":\"openai-codex-responses\",\"provider\":\"openai-codex\",\"baseUrl\":\"https://chatgpt.com/backend-api\",\"reasoning\":true,\"input\":[\"text\",\"image\"],\"cost\":{\"input\":2,\"output\":10,\"cacheRead\":0.1,\"cacheWrite\":2.5,\"tiers\":[{\"inputTokensAbove\":272000,\"input\":4,\"output\":15,\"cacheRead\":0.2,\"cacheWrite\":5}]},\"contextWindow\":272000,\"maxTokens\":128000,\"thinkingLevelMap\":{\"off\":null,\"minimal\":\"low\",\"low\":\"low\",\"medium\":\"medium\",\"high\":\"high\",\"xhigh\":\"xhigh\",\"max\":\"max\"},\"compat\":{\"supportsOpenAIGrammarTools\":true,\"supportsAdditionalTools\":true,\"supportsToolSearch\":true,\"supportsMidConvoSystemMessages\":true},\"inputLimits\":{\"images\":{\"resize\":{\"maxWidth\":2000,\"maxHeight\":2000,\"maxBytes\":4718592,\"jpegQuality\":80}}},\"type\":\"chat\"}]}}"}
+{"dir":"in","raw":"{\"id\": \"q5\", \"type\": \"set_model\", \"provider\": \"openai-codex\", \"modelId\": \"gpt-5.5\"}"}
+{"dir":"out","raw":"{\"id\":\"q5\",\"type\":\"response\",\"command\":\"set_model\",\"success\":true,\"data\":{\"id\":\"gpt-5.5\",\"name\":\"GPT-5.5\",\"api\":\"openai-codex-responses\",\"provider\":\"openai-codex\",\"baseUrl\":\"https://chatgpt.com/backend-api\",\"reasoning\":true,\"input\":[\"text\",\"image\"],\"cost\":{\"input\":5,\"output\":30,\"cacheRead\":0.5,\"cacheWrite\":0,\"tiers\":[{\"inputTokensAbove\":272000,\"input\":10,\"output\":45,\"cacheRead\":1,\"cacheWrite\":0}]},\"contextWindow\":272000,\"maxTokens\":128000,\"thinkingLevelMap\":{\"xhigh\":\"xhigh\",\"minimal\":\"low\"},\"compat\":{\"supportsOpenAIGrammarTools\":true,\"supportsToolSearch\":true,\"supportsMidConvoSystemMessages\":true},\"inputLimits\":{\"images\":{\"resize\":{\"maxWidth\":2000,\"maxHeight\":2000,\"maxBytes\":4718592,\"jpegQuality\":80}}},\"type\":\"chat\"}}"}
+{"dir":"in","raw":"{\"id\": \"q6\", \"type\": \"set_thinking_level\", \"level\": \"off\"}"}
+{"dir":"out","raw":"{\"type\":\"thinking_level_changed\",\"level\":\"off\"}"}
+{"dir":"out","raw":"{\"id\":\"q6\",\"type\":\"response\",\"command\":\"set_thinking_level\",\"success\":true}"}
+{"dir":"in","raw":"{\"id\": \"q7\", \"type\": \"prompt\", \"message\": \"Use bash to run exactly: printf capture-start; sleep 20; printf capture-finish. Do not background it. Then reply ORIGINAL_FINISHED.\"}"}
+{"dir":"out","raw":"{\"id\":\"q7\",\"type\":\"response\",\"command\":\"prompt\",\"success\":true,\"data\":{\"disposition\":\"started\"}}"}
+{"dir":"out","raw":"{\"type\":\"agent_start\"}"}
+{"dir":"out","raw":"{\"type\":\"turn_start\"}"}
+{"dir":"out","raw":"{\"type\":\"message_start\",\"message\":{\"role\":\"system\",\"content\":\"\",\"sections\":{\"preamble\":\"You are a protocol capture assistant. Follow exact requests and use only the requested tools. Read and write only within this project. Never read credentials, home directories, or account details.\",\"cwd\":\"<cwd>\\n/Users/xxxxxxxxxxxx/orca-qa/task_7daea3cb4c53/projects/pi/steer-then-compact\\n</cwd>\"},\"timestamp\":1791281787030,\"toolsAdded\":[{\"name\":\"bash\",\"description\":\"Execute a bash command in the current working directory. Returns stdout and stderr. Output is truncated to last 2000 lines or 50KB (whichever is hit first). If truncated, full output is saved to a temp file. Optionally provide a timeout in seconds.\",\"parameters\":{\"type\":\"object\",\"required\":[\"command\"],\"properties\":{\"command\":{\"type\":\"string\",\"description\":\"Shell command to execute\"},\"timeout\":{\"type\":\"number\",\"description\":\"Timeout in seconds (optional, no default timeout)\"}}},\"constrainedSampling\":{\"type\":\"json_schema\",\"strict\":\"prefer\"}}]}}"}
+{"dir":"out","raw":"{\"type\":\"message_end\",\"message\":{\"role\":\"system\",\"content\":\"\",\"sections\":{\"preamble\":\"You are a protocol capture assistant. Follow exact requests and use only the requested tools. Read and write only within this project. Never read credentials, home directories, or account details.\",\"cwd\":\"<cwd>\\n/Users/xxxxxxxxxxxx/orca-qa/task_7daea3cb4c53/projects/pi/steer-then-compact\\n</cwd>\"},\"timestamp\":1791281787030,\"toolsAdded\":[{\"name\":\"bash\",\"description\":\"Execute a bash command in the current working directory. Returns stdout and stderr. Output is truncated to last 2000 lines or 50KB (whichever is hit first). If truncated, full output is saved to a temp file. Optionally provide a timeout in seconds.\",\"parameters\":{\"type\":\"object\",\"required\":[\"command\"],\"properties\":{\"command\":{\"type\":\"string\",\"description\":\"Shell command to execute\"},\"timeout\":{\"type\":\"number\",\"description\":\"Timeout in seconds (optional, no default timeout)\"}}},\"constrainedSampling\":{\"type\":\"json_schema\",\"strict\":\"prefer\"}}]}}"}
+{"dir":"out","raw":"{\"type\":\"message_start\",\"message\":{\"role\":\"user\",\"content\":[{\"type\":\"text\",\"text\":\"Use bash to run exactly: printf capture-start; sleep 20; printf capture-finish. Do not background it. Then reply ORIGINAL_FINISHED.\"}],\"timestamp\":1791281787029}}"}
+{"dir":"out","raw":"{\"type\":\"message_end\",\"message\":{\"role\":\"user\",\"content\":[{\"type\":\"text\",\"text\":\"Use bash to run exactly: printf capture-start; sleep 20; printf capture-finish. Do not background it. Then reply ORIGINAL_FINISHED.\"}],\"timestamp\":1791281787029}}"}
+{"dir":"out","raw":"{\"type\":\"message_start\",\"message\":{\"role\":\"assistant\",\"content\":[],\"api\":\"openai-codex-responses\",\"provider\":\"openai-codex\",\"model\":\"gpt-5.5\",\"usage\":{\"input\":0,\"output\":0,\"cacheRead\":0,\"cacheWrite\":0,\"totalTokens\":0,\"cost\":{\"input\":0,\"output\":0,\"cacheRead\":0,\"cacheWrite\":0,\"total\":0}},\"stopReason\":\"pending\",\"timestamp\":1791281787039,\"responseId\":\"captured.id.000055.xxxxxxxxxxxxxxxxxx.xxxxxxxxxxxxxxxxx\"}}"}
+{"dir":"out","raw":"{\"type\":\"message_update\",\"usage\":{\"input\":0,\"output\":0,\"cacheRead\":0,\"cacheWrite\":0,\"totalTokens\":0,\"cost\":{\"input\":0,\"output\":0,\"cacheRead\":0,\"cacheWrite\":0,\"total\":0}},\"assistantMessageEvent\":{\"type\":\"toolcall_start\",\"contentIndex\":0,\"id\":\"captured.id.000056.xxxxxxxxxx|captured.id.000057.xxxxxxxxxxxxxxxxxx.xxxxxxxxxxxxxxx\",\"toolName\":\"bash\"}}"}
+{"dir":"out","raw":"{\"type\":\"message_update\",\"usage\":{\"input\":0,\"output\":0,\"cacheRead\":0,\"cacheWrite\":0,\"totalTokens\":0,\"cost\":{\"input\":0,\"output\":0,\"cacheRead\":0,\"cacheWrite\":0,\"total\":0}},\"assistantMessageEvent\":{\"type\":\"toolcall_delta\",\"contentIndex\":0,\"delta\":\"{\\\"\"}}"}
+{"dir":"out","raw":"{\"type\":\"message_update\",\"usage\":{\"input\":0,\"output\":0,\"cacheRead\":0,\"cacheWrite\":0,\"totalTokens\":0,\"cost\":{\"input\":0,\"output\":0,\"cacheRead\":0,\"cacheWrite\":0,\"total\":0}},\"assistantMessageEvent\":{\"type\":\"toolcall_delta\",\"contentIndex\":0,\"delta\":\"command\"}}"}
+{"dir":"out","raw":"{\"type\":\"message_update\",\"usage\":{\"input\":0,\"output\":0,\"cacheRead\":0,\"cacheWrite\":0,\"totalTokens\":0,\"cost\":{\"input\":0,\"output\":0,\"cacheRead\":0,\"cacheWrite\":0,\"total\":0}},\"assistantMessageEvent\":{\"type\":\"toolcall_delta\",\"contentIndex\":0,\"delta\":\"\\\":\\\"\"}}"}
+{"dir":"out","raw":"{\"type\":\"message_update\",\"usage\":{\"input\":0,\"output\":0,\"cacheRead\":0,\"cacheWrite\":0,\"totalTokens\":0,\"cost\":{\"input\":0,\"output\":0,\"cacheRead\":0,\"cacheWrite\":0,\"total\":0}},\"assistantMessageEvent\":{\"type\":\"toolcall_delta\",\"contentIndex\":0,\"delta\":\"printf\"}}"}
+{"dir":"out","raw":"{\"type\":\"message_update\",\"usage\":{\"input\":0,\"output\":0,\"cacheRead\":0,\"cacheWrite\":0,\"totalTokens\":0,\"cost\":{\"input\":0,\"output\":0,\"cacheRead\":0,\"cacheWrite\":0,\"total\":0}},\"assistantMessageEvent\":{\"type\":\"toolcall_delta\",\"contentIndex\":0,\"delta\":\" capture\"}}"}
+{"dir":"out","raw":"{\"type\":\"message_update\",\"usage\":{\"input\":0,\"output\":0,\"cacheRead\":0,\"cacheWrite\":0,\"totalTokens\":0,\"cost\":{\"input\":0,\"output\":0,\"cacheRead\":0,\"cacheWrite\":0,\"total\":0}},\"assistantMessageEvent\":{\"type\":\"toolcall_delta\",\"contentIndex\":0,\"delta\":\"-start\"}}"}
+{"dir":"out","raw":"{\"type\":\"message_update\",\"usage\":{\"input\":0,\"output\":0,\"cacheRead\":0,\"cacheWrite\":0,\"totalTokens\":0,\"cost\":{\"input\":0,\"output\":0,\"cacheRead\":0,\"cacheWrite\":0,\"total\":0}},\"assistantMessageEvent\":{\"type\":\"toolcall_delta\",\"contentIndex\":0,\"delta\":\";\"}}"}
+{"dir":"out","raw":"{\"type\":\"message_update\",\"usage\":{\"input\":0,\"output\":0,\"cacheRead\":0,\"cacheWrite\":0,\"totalTokens\":0,\"cost\":{\"input\":0,\"output\":0,\"cacheRead\":0,\"cacheWrite\":0,\"total\":0}},\"assistantMessageEvent\":{\"type\":\"toolcall_delta\",\"contentIndex\":0,\"delta\":\" sleep\"}}"}
+{"dir":"out","raw":"{\"type\":\"message_update\",\"usage\":{\"input\":0,\"output\":0,\"cacheRead\":0,\"cacheWrite\":0,\"totalTokens\":0,\"cost\":{\"input\":0,\"output\":0,\"cacheRead\":0,\"cacheWrite\":0,\"total\":0}},\"assistantMessageEvent\":{\"type\":\"toolcall_delta\",\"contentIndex\":0,\"delta\":\" \"}}"}
+{"dir":"out","raw":"{\"type\":\"message_update\",\"usage\":{\"input\":0,\"output\":0,\"cacheRead\":0,\"cacheWrite\":0,\"totalTokens\":0,\"cost\":{\"input\":0,\"output\":0,\"cacheRead\":0,\"cacheWrite\":0,\"total\":0}},\"assistantMessageEvent\":{\"type\":\"toolcall_delta\",\"contentIndex\":0,\"delta\":\"20\"}}"}
+{"dir":"out","raw":"{\"type\":\"message_update\",\"usage\":{\"input\":0,\"output\":0,\"cacheRead\":0,\"cacheWrite\":0,\"totalTokens\":0,\"cost\":{\"input\":0,\"output\":0,\"cacheRead\":0,\"cacheWrite\":0,\"total\":0}},\"assistantMessageEvent\":{\"type\":\"toolcall_delta\",\"contentIndex\":0,\"delta\":\";\"}}"}
+{"dir":"out","raw":"{\"type\":\"message_update\",\"usage\":{\"input\":0,\"output\":0,\"cacheRead\":0,\"cacheWrite\":0,\"totalTokens\":0,\"cost\":{\"input\":0,\"output\":0,\"cacheRead\":0,\"cacheWrite\":0,\"total\":0}},\"assistantMessageEvent\":{\"type\":\"toolcall_delta\",\"contentIndex\":0,\"delta\":\" printf\"}}"}
+{"dir":"out","raw":"{\"type\":\"message_update\",\"usage\":{\"input\":0,\"output\":0,\"cacheRead\":0,\"cacheWrite\":0,\"totalTokens\":0,\"cost\":{\"input\":0,\"output\":0,\"cacheRead\":0,\"cacheWrite\":0,\"total\":0}},\"assistantMessageEvent\":{\"type\":\"toolcall_delta\",\"contentIndex\":0,\"delta\":\" capture\"}}"}
+{"dir":"out","raw":"{\"type\":\"message_update\",\"usage\":{\"input\":0,\"output\":0,\"cacheRead\":0,\"cacheWrite\":0,\"totalTokens\":0,\"cost\":{\"input\":0,\"output\":0,\"cacheRead\":0,\"cacheWrite\":0,\"total\":0}},\"assistantMessageEvent\":{\"type\":\"toolcall_delta\",\"contentIndex\":0,\"delta\":\"-f\"}}"}
+{"dir":"out","raw":"{\"type\":\"message_update\",\"usage\":{\"input\":0,\"output\":0,\"cacheRead\":0,\"cacheWrite\":0,\"totalTokens\":0,\"cost\":{\"input\":0,\"output\":0,\"cacheRead\":0,\"cacheWrite\":0,\"total\":0}},\"assistantMessageEvent\":{\"type\":\"toolcall_delta\",\"contentIndex\":0,\"delta\":\"inish\"}}"}
+{"dir":"out","raw":"{\"type\":\"message_update\",\"usage\":{\"input\":0,\"output\":0,\"cacheRead\":0,\"cacheWrite\":0,\"totalTokens\":0,\"cost\":{\"input\":0,\"output\":0,\"cacheRead\":0,\"cacheWrite\":0,\"total\":0}},\"assistantMessageEvent\":{\"type\":\"toolcall_delta\",\"contentIndex\":0,\"delta\":\"\\\",\\\"\"}}"}
+{"dir":"out","raw":"{\"type\":\"message_update\",\"usage\":{\"input\":0,\"output\":0,\"cacheRead\":0,\"cacheWrite\":0,\"totalTokens\":0,\"cost\":{\"input\":0,\"output\":0,\"cacheRead\":0,\"cacheWrite\":0,\"total\":0}},\"assistantMessageEvent\":{\"type\":\"toolcall_delta\",\"contentIndex\":0,\"delta\":\"timeout\"}}"}
+{"dir":"out","raw":"{\"type\":\"message_update\",\"usage\":{\"input\":0,\"output\":0,\"cacheRead\":0,\"cacheWrite\":0,\"totalTokens\":0,\"cost\":{\"input\":0,\"output\":0,\"cacheRead\":0,\"cacheWrite\":0,\"total\":0}},\"assistantMessageEvent\":{\"type\":\"toolcall_delta\",\"contentIndex\":0,\"delta\":\"\\\":\"}}"}
+{"dir":"out","raw":"{\"type\":\"message_update\",\"usage\":{\"input\":0,\"output\":0,\"cacheRead\":0,\"cacheWrite\":0,\"totalTokens\":0,\"cost\":{\"input\":0,\"output\":0,\"cacheRead\":0,\"cacheWrite\":0,\"total\":0}},\"assistantMessageEvent\":{\"type\":\"toolcall_delta\",\"contentIndex\":0,\"delta\":\"25\"}}"}
+{"dir":"out","raw":"{\"type\":\"message_update\",\"usage\":{\"input\":0,\"output\":0,\"cacheRead\":0,\"cacheWrite\":0,\"totalTokens\":0,\"cost\":{\"input\":0,\"output\":0,\"cacheRead\":0,\"cacheWrite\":0,\"total\":0}},\"assistantMessageEvent\":{\"type\":\"toolcall_delta\",\"contentIndex\":0,\"delta\":\"}\"}}"}
+{"dir":"out","raw":"{\"type\":\"message_update\",\"usage\":{\"input\":0,\"output\":0,\"cacheRead\":0,\"cacheWrite\":0,\"totalTokens\":0,\"cost\":{\"input\":0,\"output\":0,\"cacheRead\":0,\"cacheWrite\":0,\"total\":0}},\"assistantMessageEvent\":{\"type\":\"toolcall_end\",\"contentIndex\":0,\"toolCall\":{\"type\":\"toolCall\",\"id\":\"captured.id.000056.xxxxxxxxxx|captured.id.000057.xxxxxxxxxxxxxxxxxx.xxxxxxxxxxxxxxx\",\"name\":\"bash\",\"arguments\":{\"command\":\"printf capture-start; sleep 20; printf capture-finish\",\"timeout\":25}}}}"}
+{"dir":"out","raw":"{\"type\":\"message_end\",\"message\":{\"role\":\"assistant\",\"content\":[{\"type\":\"toolCall\",\"id\":\"captured.id.000056.xxxxxxxxxx|captured.id.000057.xxxxxxxxxxxxxxxxxx.xxxxxxxxxxxxxxx\",\"name\":\"bash\",\"arguments\":{\"command\":\"printf capture-start; sleep 20; printf capture-finish\",\"timeout\":25}}],\"api\":\"openai-codex-responses\",\"provider\":\"openai-codex\",\"model\":\"gpt-5.5\",\"usage\":{\"input\":222,\"output\":33,\"cacheRead\":0,\"cacheWrite\":0,\"reasoning\":0,\"totalTokens\":255,\"cost\":{\"input\":0.00111,\"output\":0.00099,\"cacheRead\":0,\"cacheWrite\":0,\"total\":0.0021000000000000003}},\"stopReason\":\"toolUse\",\"timestamp\":1791281787039,\"responseId\":\"captured.id.000055.xxxxxxxxxxxxxxxxxx.xxxxxxxxxxxxxxxxx\",\"rawStopReason\":\"completed\",\"thinkingLevel\":\"off\"}}"}
+{"dir":"out","raw":"{\"type\":\"tool_execution_start\",\"toolCallId\":\"captured.id.000056.xxxxxxxxxx|captured.id.000057.xxxxxxxxxxxxxxxxxx.xxxxxxxxxxxxxxx\",\"toolName\":\"bash\",\"args\":{\"command\":\"printf capture-start; sleep 20; printf capture-finish\",\"timeout\":25}}"}
+{"dir":"in","raw":"{\"id\": \"q8\", \"type\": \"prompt\", \"message\": \"After the running tool completes, reply STEER_CONSUMED instead of ORIGINAL_FINISHED.\", \"streamingBehavior\": \"steer\"}"}
+{"dir":"in","raw":"{\"id\": \"q9\", \"type\": \"prompt\", \"message\": \"Then reply FOLLOWUP_CONSUMED on the next turn.\", \"streamingBehavior\": \"followUp\"}"}
+{"dir":"out","raw":"{\"type\":\"tool_execution_update\",\"toolCallId\":\"captured.id.000056.xxxxxxxxxx|captured.id.000057.xxxxxxxxxxxxxxxxxx.xxxxxxxxxxxxxxx\",\"toolName\":\"bash\",\"args\":{\"command\":\"printf capture-start; sleep 20; printf capture-finish\",\"timeout\":25},\"partialResult\":{\"content\":[]}}"}
+{"dir":"out","raw":"{\"type\":\"queue_update\",\"steering\":[\"After the running tool completes, reply STEER_CONSUMED instead of ORIGINAL_FINISHED.\"],\"followUp\":[]}"}
+{"dir":"out","raw":"{\"type\":\"queue_update\",\"steering\":[\"After the running tool completes, reply STEER_CONSUMED instead of ORIGINAL_FINISHED.\"],\"followUp\":[\"Then reply FOLLOWUP_CONSUMED on the next turn.\"]}"}
+{"dir":"out","raw":"{\"id\":\"q8\",\"type\":\"response\",\"command\":\"prompt\",\"success\":true,\"data\":{\"disposition\":\"queued\"}}"}
+{"dir":"out","raw":"{\"id\":\"q9\",\"type\":\"response\",\"command\":\"prompt\",\"success\":true,\"data\":{\"disposition\":\"queued\"}}"}
+{"dir":"out","raw":"{\"type\":\"tool_execution_update\",\"toolCallId\":\"captured.id.000056.xxxxxxxxxx|captured.id.000057.xxxxxxxxxxxxxxxxxx.xxxxxxxxxxxxxxx\",\"toolName\":\"bash\",\"args\":{\"command\":\"printf capture-start; sleep 20; printf capture-finish\",\"timeout\":25},\"partialResult\":{\"content\":[{\"type\":\"text\",\"text\":\"capture-start\"}],\"details\":{}}}"}
+{"dir":"out","raw":"{\"type\":\"tool_execution_update\",\"toolCallId\":\"captured.id.000056.xxxxxxxxxx|captured.id.000057.xxxxxxxxxxxxxxxxxx.xxxxxxxxxxxxxxx\",\"toolName\":\"bash\",\"args\":{\"command\":\"printf capture-start; sleep 20; printf capture-finish\",\"timeout\":25},\"partialResult\":{\"content\":[{\"type\":\"text\",\"text\":\"capture-startcapture-finish\"}],\"details\":{}}}"}
+{"dir":"out","raw":"{\"type\":\"tool_execution_end\",\"toolCallId\":\"captured.id.000056.xxxxxxxxxx|captured.id.000057.xxxxxxxxxxxxxxxxxx.xxxxxxxxxxxxxxx\",\"toolName\":\"bash\",\"result\":{\"content\":[{\"type\":\"text\",\"text\":\"capture-startcapture-finish\"}],\"structuredContent\":{\"output\":\"capture-startcapture-finish\",\"truncated\":false,\"exit_code\":0,\"wall_time_seconds\":20}},\"isError\":false}"}
+{"dir":"out","raw":"{\"type\":\"message_start\",\"message\":{\"role\":\"toolResult\",\"toolCallId\":\"captured.id.000056.xxxxxxxxxx|captured.id.000057.xxxxxxxxxxxxxxxxxx.xxxxxxxxxxxxxxx\",\"toolName\":\"bash\",\"content\":[{\"type\":\"text\",\"text\":\"capture-startcapture-finish\"}],\"isError\":false,\"timestamp\":1791281821986}}"}
+{"dir":"out","raw":"{\"type\":\"message_end\",\"message\":{\"role\":\"toolResult\",\"toolCallId\":\"captured.id.000056.xxxxxxxxxx|captured.id.000057.xxxxxxxxxxxxxxxxxx.xxxxxxxxxxxxxxx\",\"toolName\":\"bash\",\"content\":[{\"type\":\"text\",\"text\":\"capture-startcapture-finish\"}],\"isError\":false,\"timestamp\":1791281821986}}"}
+{"dir":"out","raw":"{\"type\":\"turn_end\",\"message\":{\"role\":\"assistant\",\"content\":[{\"type\":\"toolCall\",\"id\":\"captured.id.000056.xxxxxxxxxx|captured.id.000057.xxxxxxxxxxxxxxxxxx.xxxxxxxxxxxxxxx\",\"name\":\"bash\",\"arguments\":{\"command\":\"printf capture-start; sleep 20; printf capture-finish\",\"timeout\":25}}],\"api\":\"openai-codex-responses\",\"provider\":\"openai-codex\",\"model\":\"gpt-5.5\",\"usage\":{\"input\":222,\"output\":33,\"cacheRead\":0,\"cacheWrite\":0,\"reasoning\":0,\"totalTokens\":255,\"cost\":{\"input\":0.00111,\"output\":0.00099,\"cacheRead\":0,\"cacheWrite\":0,\"total\":0.0021000000000000003}},\"stopReason\":\"toolUse\",\"timestamp\":1791281787039,\"responseId\":\"captured.id.000055.xxxxxxxxxxxxxxxxxx.xxxxxxxxxxxxxxxxx\",\"rawStopReason\":\"completed\",\"thinkingLevel\":\"off\"},\"toolResults\":[{\"role\":\"toolResult\",\"toolCallId\":\"captured.id.000056.xxxxxxxxxx|captured.id.000057.xxxxxxxxxxxxxxxxxx.xxxxxxxxxxxxxxx\",\"toolName\":\"bash\",\"content\":[{\"type\":\"text\",\"text\":\"capture-startcapture-finish\"}],\"isError\":false,\"timestamp\":1791281821986}]}"}
+{"dir":"out","raw":"{\"type\":\"turn_start\"}"}
+{"dir":"out","raw":"{\"type\":\"queue_update\",\"steering\":[],\"followUp\":[\"Then reply FOLLOWUP_CONSUMED on the next turn.\"]}"}
+{"dir":"out","raw":"{\"type\":\"message_start\",\"message\":{\"role\":\"user\",\"content\":[{\"type\":\"text\",\"text\":\"After the running tool completes, reply STEER_CONSUMED instead of ORIGINAL_FINISHED.\"}],\"timestamp\":1791281801961}}"}
+{"dir":"out","raw":"{\"type\":\"message_end\",\"message\":{\"role\":\"user\",\"content\":[{\"type\":\"text\",\"text\":\"After the running tool completes, reply STEER_CONSUMED instead of ORIGINAL_FINISHED.\"}],\"timestamp\":1791281801961}}"}
+{"dir":"out","raw":"{\"type\":\"message_start\",\"message\":{\"role\":\"assistant\",\"content\":[],\"api\":\"openai-codex-responses\",\"provider\":\"openai-codex\",\"model\":\"gpt-5.5\",\"usage\":{\"input\":0,\"output\":0,\"cacheRead\":0,\"cacheWrite\":0,\"totalTokens\":0,\"cost\":{\"input\":0,\"output\":0,\"cacheRead\":0,\"cacheWrite\":0,\"total\":0}},\"stopReason\":\"pending\",\"timestamp\":1791281821988}}"}
+{"dir":"out","raw":"{\"type\":\"message_update\",\"usage\":{\"input\":0,\"output\":0,\"cacheRead\":0,\"cacheWrite\":0,\"totalTokens\":0,\"cost\":{\"input\":0,\"output\":0,\"cacheRead\":0,\"cacheWrite\":0,\"total\":0}},\"assistantMessageEvent\":{\"type\":\"text_start\",\"contentIndex\":0}}"}
+{"dir":"out","raw":"{\"type\":\"message_update\",\"usage\":{\"input\":0,\"output\":0,\"cacheRead\":0,\"cacheWrite\":0,\"totalTokens\":0,\"cost\":{\"input\":0,\"output\":0,\"cacheRead\":0,\"cacheWrite\":0,\"total\":0}},\"assistantMessageEvent\":{\"type\":\"text_delta\",\"contentIndex\":0,\"delta\":\"STE\"}}"}
+{"dir":"out","raw":"{\"type\":\"message_update\",\"usage\":{\"input\":0,\"output\":0,\"cacheRead\":0,\"cacheWrite\":0,\"totalTokens\":0,\"cost\":{\"input\":0,\"output\":0,\"cacheRead\":0,\"cacheWrite\":0,\"total\":0}},\"assistantMessageEvent\":{\"type\":\"text_delta\",\"contentIndex\":0,\"delta\":\"ER\"}}"}
+{"dir":"out","raw":"{\"type\":\"message_update\",\"usage\":{\"input\":0,\"output\":0,\"cacheRead\":0,\"cacheWrite\":0,\"totalTokens\":0,\"cost\":{\"input\":0,\"output\":0,\"cacheRead\":0,\"cacheWrite\":0,\"total\":0}},\"assistantMessageEvent\":{\"type\":\"text_delta\",\"contentIndex\":0,\"delta\":\"_CON\"}}"}
+{"dir":"out","raw":"{\"type\":\"message_update\",\"usage\":{\"input\":0,\"output\":0,\"cacheRead\":0,\"cacheWrite\":0,\"totalTokens\":0,\"cost\":{\"input\":0,\"output\":0,\"cacheRead\":0,\"cacheWrite\":0,\"total\":0}},\"assistantMessageEvent\":{\"type\":\"text_delta\",\"contentIndex\":0,\"delta\":\"SUM\"}}"}
+{"dir":"out","raw":"{\"type\":\"message_update\",\"usage\":{\"input\":0,\"output\":0,\"cacheRead\":0,\"cacheWrite\":0,\"totalTokens\":0,\"cost\":{\"input\":0,\"output\":0,\"cacheRead\":0,\"cacheWrite\":0,\"total\":0}},\"assistantMessageEvent\":{\"type\":\"text_delta\",\"contentIndex\":0,\"delta\":\"ED\"}}"}
+{"dir":"out","raw":"{\"type\":\"message_update\",\"usage\":{\"input\":0,\"output\":0,\"cacheRead\":0,\"cacheWrite\":0,\"totalTokens\":0,\"cost\":{\"input\":0,\"output\":0,\"cacheRead\":0,\"cacheWrite\":0,\"total\":0}},\"assistantMessageEvent\":{\"type\":\"text_end\",\"contentIndex\":0,\"content\":\"STEER_CONSUMED\"}}"}
+{"dir":"out","raw":"{\"type\":\"message_end\",\"message\":{\"role\":\"assistant\",\"content\":[{\"type\":\"text\",\"text\":\"STEER_CONSUMED\",\"textSignature\":\"{\\\"v\\\":1,\\\"id\\\":\\\"captured.id.000058.xxxxxxxxxxxxxxxxxx.xxxxxxxxxxxxxxxx\\\",\\\"phase\\\":\\\"final_answer\\\"}\"}],\"api\":\"openai-codex-responses\",\"provider\":\"openai-codex\",\"model\":\"gpt-5.5\",\"usage\":{\"input\":293,\"output\":9,\"cacheRead\":0,\"cacheWrite\":0,\"reasoning\":0,\"totalTokens\":302,\"cost\":{\"input\":0.0014650000000000002,\"output\":0.00027,\"cacheRead\":0,\"cacheWrite\":0,\"total\":0.0017350000000000002}},\"stopReason\":\"stop\",\"timestamp\":1791281821988,\"responseId\":\"captured.id.000059.xxxxxxxxxxxxxxxxxx.xxxxxxxxxxxxxxxxx\",\"rawStopReason\":\"completed\",\"thinkingLevel\":\"off\"}}"}
+{"dir":"out","raw":"{\"type\":\"turn_end\",\"message\":{\"role\":\"assistant\",\"content\":[{\"type\":\"text\",\"text\":\"STEER_CONSUMED\",\"textSignature\":\"{\\\"v\\\":1,\\\"id\\\":\\\"captured.id.000058.xxxxxxxxxxxxxxxxxx.xxxxxxxxxxxxxxxx\\\",\\\"phase\\\":\\\"final_answer\\\"}\"}],\"api\":\"openai-codex-responses\",\"provider\":\"openai-codex\",\"model\":\"gpt-5.5\",\"usage\":{\"input\":293,\"output\":9,\"cacheRead\":0,\"cacheWrite\":0,\"reasoning\":0,\"totalTokens\":302,\"cost\":{\"input\":0.0014650000000000002,\"output\":0.00027,\"cacheRead\":0,\"cacheWrite\":0,\"total\":0.0017350000000000002}},\"stopReason\":\"stop\",\"timestamp\":1791281821988,\"responseId\":\"captured.id.000059.xxxxxxxxxxxxxxxxxx.xxxxxxxxxxxxxxxxx\",\"rawStopReason\":\"completed\",\"thinkingLevel\":\"off\"},\"toolResults\":[]}"}
+{"dir":"out","raw":"{\"type\":\"turn_start\"}"}
+{"dir":"out","raw":"{\"type\":\"queue_update\",\"steering\":[],\"followUp\":[]}"}
+{"dir":"out","raw":"{\"type\":\"message_start\",\"message\":{\"role\":\"user\",\"content\":[{\"type\":\"text\",\"text\":\"Then reply FOLLOWUP_CONSUMED on the next turn.\"}],\"timestamp\":1791281801961}}"}
+{"dir":"out","raw":"{\"type\":\"message_end\",\"message\":{\"role\":\"user\",\"content\":[{\"type\":\"text\",\"text\":\"Then reply FOLLOWUP_CONSUMED on the next turn.\"}],\"timestamp\":1791281801961}}"}
+{"dir":"out","raw":"{\"type\":\"message_start\",\"message\":{\"role\":\"assistant\",\"content\":[],\"api\":\"openai-codex-responses\",\"provider\":\"openai-codex\",\"model\":\"gpt-5.5\",\"usage\":{\"input\":0,\"output\":0,\"cacheRead\":0,\"cacheWrite\":0,\"totalTokens\":0,\"cost\":{\"input\":0,\"output\":0,\"cacheRead\":0,\"cacheWrite\":0,\"total\":0}},\"stopReason\":\"pending\",\"timestamp\":1791281825232}}"}
+{"dir":"out","raw":"{\"type\":\"message_update\",\"usage\":{\"input\":0,\"output\":0,\"cacheRead\":0,\"cacheWrite\":0,\"totalTokens\":0,\"cost\":{\"input\":0,\"output\":0,\"cacheRead\":0,\"cacheWrite\":0,\"total\":0}},\"assistantMessageEvent\":{\"type\":\"text_start\",\"contentIndex\":0}}"}
+{"dir":"out","raw":"{\"type\":\"message_update\",\"usage\":{\"input\":0,\"output\":0,\"cacheRead\":0,\"cacheWrite\":0,\"totalTokens\":0,\"cost\":{\"input\":0,\"output\":0,\"cacheRead\":0,\"cacheWrite\":0,\"total\":0}},\"assistantMessageEvent\":{\"type\":\"text_delta\",\"contentIndex\":0,\"delta\":\"FOLLOW\"}}"}
+{"dir":"out","raw":"{\"type\":\"message_update\",\"usage\":{\"input\":0,\"output\":0,\"cacheRead\":0,\"cacheWrite\":0,\"totalTokens\":0,\"cost\":{\"input\":0,\"output\":0,\"cacheRead\":0,\"cacheWrite\":0,\"total\":0}},\"assistantMessageEvent\":{\"type\":\"text_delta\",\"contentIndex\":0,\"delta\":\"UP\"}}"}
+{"dir":"out","raw":"{\"type\":\"message_update\",\"usage\":{\"input\":0,\"output\":0,\"cacheRead\":0,\"cacheWrite\":0,\"totalTokens\":0,\"cost\":{\"input\":0,\"output\":0,\"cacheRead\":0,\"cacheWrite\":0,\"total\":0}},\"assistantMessageEvent\":{\"type\":\"text_delta\",\"contentIndex\":0,\"delta\":\"_CON\"}}"}
+{"dir":"out","raw":"{\"type\":\"message_update\",\"usage\":{\"input\":0,\"output\":0,\"cacheRead\":0,\"cacheWrite\":0,\"totalTokens\":0,\"cost\":{\"input\":0,\"output\":0,\"cacheRead\":0,\"cacheWrite\":0,\"total\":0}},\"assistantMessageEvent\":{\"type\":\"text_delta\",\"contentIndex\":0,\"delta\":\"SUM\"}}"}
+{"dir":"out","raw":"{\"type\":\"message_update\",\"usage\":{\"input\":320,\"output\":9,\"cacheRead\":0,\"cacheWrite\":0,\"reasoning\":0,\"totalTokens\":329,\"cost\":{\"input\":0.0016,\"output\":0.00027,\"cacheRead\":0,\"cacheWrite\":0,\"total\":0.0018700000000000001}},\"assistantMessageEvent\":{\"type\":\"text_delta\",\"contentIndex\":0,\"delta\":\"ED\"}}"}
+{"dir":"out","raw":"{\"type\":\"message_update\",\"usage\":{\"input\":320,\"output\":9,\"cacheRead\":0,\"cacheWrite\":0,\"reasoning\":0,\"totalTokens\":329,\"cost\":{\"input\":0.0016,\"output\":0.00027,\"cacheRead\":0,\"cacheWrite\":0,\"total\":0.0018700000000000001}},\"assistantMessageEvent\":{\"type\":\"text_end\",\"contentIndex\":0,\"content\":\"FOLLOWUP_CONSUMED\"}}"}
+{"dir":"out","raw":"{\"type\":\"message_end\",\"message\":{\"role\":\"assistant\",\"content\":[{\"type\":\"text\",\"text\":\"FOLLOWUP_CONSUMED\",\"textSignature\":\"{\\\"v\\\":1,\\\"id\\\":\\\"captured.id.000060.xxxxxxxxxxxxxxxxxx.xxxxxxxxxxxxxxxx\\\",\\\"phase\\\":\\\"final_answer\\\"}\"}],\"api\":\"openai-codex-responses\",\"provider\":\"openai-codex\",\"model\":\"gpt-5.5\",\"usage\":{\"input\":320,\"output\":9,\"cacheRead\":0,\"cacheWrite\":0,\"reasoning\":0,\"totalTokens\":329,\"cost\":{\"input\":0.0016,\"output\":0.00027,\"cacheRead\":0,\"cacheWrite\":0,\"total\":0.0018700000000000001}},\"stopReason\":\"stop\",\"timestamp\":1791281825232,\"responseId\":\"captured.id.000061.xxxxxxxxxxxxxxxxxx.xxxxxxxxxxxxxxxxx\",\"rawStopReason\":\"completed\",\"thinkingLevel\":\"off\"}}"}
+{"dir":"out","raw":"{\"type\":\"turn_end\",\"message\":{\"role\":\"assistant\",\"content\":[{\"type\":\"text\",\"text\":\"FOLLOWUP_CONSUMED\",\"textSignature\":\"{\\\"v\\\":1,\\\"id\\\":\\\"captured.id.000060.xxxxxxxxxxxxxxxxxx.xxxxxxxxxxxxxxxx\\\",\\\"phase\\\":\\\"final_answer\\\"}\"}],\"api\":\"openai-codex-responses\",\"provider\":\"openai-codex\",\"model\":\"gpt-5.5\",\"usage\":{\"input\":320,\"output\":9,\"cacheRead\":0,\"cacheWrite\":0,\"reasoning\":0,\"totalTokens\":329,\"cost\":{\"input\":0.0016,\"output\":0.00027,\"cacheRead\":0,\"cacheWrite\":0,\"total\":0.0018700000000000001}},\"stopReason\":\"stop\",\"timestamp\":1791281825232,\"responseId\":\"captured.id.000061.xxxxxxxxxxxxxxxxxx.xxxxxxxxxxxxxxxxx\",\"rawStopReason\":\"completed\",\"thinkingLevel\":\"off\"},\"toolResults\":[]}"}
+{"dir":"out","raw":"{\"type\":\"agent_end\",\"messages\":[{\"role\":\"system\",\"content\":\"\",\"sections\":{\"preamble\":\"You are a protocol capture assistant. Follow exact requests and use only the requested tools. Read and write only within this project. Never read credentials, home directories, or account details.\",\"cwd\":\"<cwd>\\n/Users/xxxxxxxxxxxx/orca-qa/task_7daea3cb4c53/projects/pi/steer-then-compact\\n</cwd>\"},\"timestamp\":1791281787030,\"toolsAdded\":[{\"name\":\"bash\",\"description\":\"Execute a bash command in the current working directory. Returns stdout and stderr. Output is truncated to last 2000 lines or 50KB (whichever is hit first). If truncated, full output is saved to a temp file. Optionally provide a timeout in seconds.\",\"parameters\":{\"type\":\"object\",\"required\":[\"command\"],\"properties\":{\"command\":{\"type\":\"string\",\"description\":\"Shell command to execute\"},\"timeout\":{\"type\":\"number\",\"description\":\"Timeout in seconds (optional, no default timeout)\"}}},\"constrainedSampling\":{\"type\":\"json_schema\",\"strict\":\"prefer\"}}]},{\"role\":\"user\",\"content\":[{\"type\":\"text\",\"text\":\"Use bash to run exactly: printf capture-start; sleep 20; printf capture-finish. Do not background it. Then reply ORIGINAL_FINISHED.\"}],\"timestamp\":1791281787029},{\"role\":\"assistant\",\"content\":[{\"type\":\"toolCall\",\"id\":\"captured.id.000056.xxxxxxxxxx|captured.id.000057.xxxxxxxxxxxxxxxxxx.xxxxxxxxxxxxxxx\",\"name\":\"bash\",\"arguments\":{\"command\":\"printf capture-start; sleep 20; printf capture-finish\",\"timeout\":25}}],\"api\":\"openai-codex-responses\",\"provider\":\"openai-codex\",\"model\":\"gpt-5.5\",\"usage\":{\"input\":222,\"output\":33,\"cacheRead\":0,\"cacheWrite\":0,\"reasoning\":0,\"totalTokens\":255,\"cost\":{\"input\":0.00111,\"output\":0.00099,\"cacheRead\":0,\"cacheWrite\":0,\"total\":0.0021000000000000003}},\"stopReason\":\"toolUse\",\"timestamp\":1791281787039,\"responseId\":\"captured.id.000055.xxxxxxxxxxxxxxxxxx.xxxxxxxxxxxxxxxxx\",\"rawStopReason\":\"completed\",\"thinkingLevel\":\"off\"},{\"role\":\"toolResult\",\"toolCallId\":\"captured.id.000056.xxxxxxxxxx|captured.id.000057.xxxxxxxxxxxxxxxxxx.xxxxxxxxxxxxxxx\",\"toolName\":\"bash\",\"content\":[{\"type\":\"text\",\"text\":\"capture-startcapture-finish\"}],\"isError\":false,\"timestamp\":1791281821986},{\"role\":\"user\",\"content\":[{\"type\":\"text\",\"text\":\"After the running tool completes, reply STEER_CONSUMED instead of ORIGINAL_FINISHED.\"}],\"timestamp\":1791281801961},{\"role\":\"assistant\",\"content\":[{\"type\":\"text\",\"text\":\"STEER_CONSUMED\",\"textSignature\":\"{\\\"v\\\":1,\\\"id\\\":\\\"captured.id.000058.xxxxxxxxxxxxxxxxxx.xxxxxxxxxxxxxxxx\\\",\\\"phase\\\":\\\"final_answer\\\"}\"}],\"api\":\"openai-codex-responses\",\"provider\":\"openai-codex\",\"model\":\"gpt-5.5\",\"usage\":{\"input\":293,\"output\":9,\"cacheRead\":0,\"cacheWrite\":0,\"reasoning\":0,\"totalTokens\":302,\"cost\":{\"input\":0.0014650000000000002,\"output\":0.00027,\"cacheRead\":0,\"cacheWrite\":0,\"total\":0.0017350000000000002}},\"stopReason\":\"stop\",\"timestamp\":1791281821988,\"responseId\":\"captured.id.000059.xxxxxxxxxxxxxxxxxx.xxxxxxxxxxxxxxxxx\",\"rawStopReason\":\"completed\",\"thinkingLevel\":\"off\"},{\"role\":\"user\",\"content\":[{\"type\":\"text\",\"text\":\"Then reply FOLLOWUP_CONSUMED on the next turn.\"}],\"timestamp\":1791281801961},{\"role\":\"assistant\",\"content\":[{\"type\":\"text\",\"text\":\"FOLLOWUP_CONSUMED\",\"textSignature\":\"{\\\"v\\\":1,\\\"id\\\":\\\"captured.id.000060.xxxxxxxxxxxxxxxxxx.xxxxxxxxxxxxxxxx\\\",\\\"phase\\\":\\\"final_answer\\\"}\"}],\"api\":\"openai-codex-responses\",\"provider\":\"openai-codex\",\"model\":\"gpt-5.5\",\"usage\":{\"input\":320,\"output\":9,\"cacheRead\":0,\"cacheWrite\":0,\"reasoning\":0,\"totalTokens\":329,\"cost\":{\"input\":0.0016,\"output\":0.00027,\"cacheRead\":0,\"cacheWrite\":0,\"total\":0.0018700000000000001}},\"stopReason\":\"stop\",\"timestamp\":1791281825232,\"responseId\":\"captured.id.000061.xxxxxxxxxxxxxxxxxx.xxxxxxxxxxxxxxxxx\",\"rawStopReason\":\"completed\",\"thinkingLevel\":\"off\"}],\"willRetry\":false}"}
+{"dir":"in","raw":"{\"id\": \"q10\", \"type\": \"get_state\"}"}
+{"dir":"out","raw":"{\"type\":\"agent_settled\"}"}
+{"dir":"out","raw":"{\"id\":\"q10\",\"type\":\"response\",\"command\":\"get_state\",\"success\":true,\"data\":{\"model\":{\"id\":\"gpt-5.5\",\"name\":\"GPT-5.5\",\"api\":\"openai-codex-responses\",\"provider\":\"openai-codex\",\"baseUrl\":\"https://chatgpt.com/backend-api\",\"reasoning\":true,\"input\":[\"text\",\"image\"],\"cost\":{\"input\":5,\"output\":30,\"cacheRead\":0.5,\"cacheWrite\":0,\"tiers\":[{\"inputTokensAbove\":272000,\"input\":10,\"output\":45,\"cacheRead\":1,\"cacheWrite\":0}]},\"contextWindow\":272000,\"maxTokens\":128000,\"thinkingLevelMap\":{\"xhigh\":\"xhigh\",\"minimal\":\"low\"},\"compat\":{\"supportsOpenAIGrammarTools\":true,\"supportsToolSearch\":true,\"supportsMidConvoSystemMessages\":true},\"inputLimits\":{\"images\":{\"resize\":{\"maxWidth\":2000,\"maxHeight\":2000,\"maxBytes\":4718592,\"jpegQuality\":80}}},\"type\":\"chat\"},\"thinkingLevel\":\"off\",\"isStreaming\":false,\"isCompacting\":false,\"steeringMode\":\"one-at-a-time\",\"followUpMode\":\"one-at-a-time\",\"sessionFile\":\"/Users/xxxxxxxxxxxx/orca-qa/task_7daea3cb4c53/projects/pi/steer-then-compact/sessions/XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX.jsonl\",\"sessionId\":\"00000000-0000-4000-8000-000000000049\",\"autoCompactionEnabled\":false,\"messageCount\":8,\"pendingMessageCount\":0}}"}
+{"dir":"in","raw":"{\"id\": \"q11\", \"type\": \"get_messages\"}"}
+{"dir":"out","raw":"{\"id\":\"q11\",\"type\":\"response\",\"command\":\"get_messages\",\"success\":true,\"data\":{\"messages\":[{\"role\":\"system\",\"content\":\"\",\"sections\":{\"preamble\":\"You are a protocol capture assistant. Follow exact requests and use only the requested tools. Read and write only within this project. Never read credentials, home directories, or account details.\",\"cwd\":\"<cwd>\\n/Users/xxxxxxxxxxxx/orca-qa/task_7daea3cb4c53/projects/pi/steer-then-compact\\n</cwd>\"},\"timestamp\":1791281787030,\"toolsAdded\":[{\"name\":\"bash\",\"description\":\"Execute a bash command in the current working directory. Returns stdout and stderr. Output is truncated to last 2000 lines or 50KB (whichever is hit first). If truncated, full output is saved to a temp file. Optionally provide a timeout in seconds.\",\"parameters\":{\"type\":\"object\",\"required\":[\"command\"],\"properties\":{\"command\":{\"type\":\"string\",\"description\":\"Shell command to execute\"},\"timeout\":{\"type\":\"number\",\"description\":\"Timeout in seconds (optional, no default timeout)\"}}},\"constrainedSampling\":{\"type\":\"json_schema\",\"strict\":\"prefer\"}}]},{\"role\":\"user\",\"content\":[{\"type\":\"text\",\"text\":\"Use bash to run exactly: printf capture-start; sleep 20; printf capture-finish. Do not background it. Then reply ORIGINAL_FINISHED.\"}],\"timestamp\":1791281787029},{\"role\":\"assistant\",\"content\":[{\"type\":\"toolCall\",\"id\":\"captured.id.000056.xxxxxxxxxx|captured.id.000057.xxxxxxxxxxxxxxxxxx.xxxxxxxxxxxxxxx\",\"name\":\"bash\",\"arguments\":{\"command\":\"printf capture-start; sleep 20; printf capture-finish\",\"timeout\":25}}],\"api\":\"openai-codex-responses\",\"provider\":\"openai-codex\",\"model\":\"gpt-5.5\",\"usage\":{\"input\":222,\"output\":33,\"cacheRead\":0,\"cacheWrite\":0,\"reasoning\":0,\"totalTokens\":255,\"cost\":{\"input\":0.00111,\"output\":0.00099,\"cacheRead\":0,\"cacheWrite\":0,\"total\":0.0021000000000000003}},\"stopReason\":\"toolUse\",\"timestamp\":1791281787039,\"responseId\":\"captured.id.000055.xxxxxxxxxxxxxxxxxx.xxxxxxxxxxxxxxxxx\",\"rawStopReason\":\"completed\",\"thinkingLevel\":\"off\"},{\"role\":\"toolResult\",\"toolCallId\":\"captured.id.000056.xxxxxxxxxx|captured.id.000057.xxxxxxxxxxxxxxxxxx.xxxxxxxxxxxxxxx\",\"toolName\":\"bash\",\"content\":[{\"type\":\"text\",\"text\":\"capture-startcapture-finish\"}],\"isError\":false,\"timestamp\":1791281821986},{\"role\":\"user\",\"content\":[{\"type\":\"text\",\"text\":\"After the running tool completes, reply STEER_CONSUMED instead of ORIGINAL_FINISHED.\"}],\"timestamp\":1791281801961},{\"role\":\"assistant\",\"content\":[{\"type\":\"text\",\"text\":\"STEER_CONSUMED\",\"textSignature\":\"{\\\"v\\\":1,\\\"id\\\":\\\"captured.id.000058.xxxxxxxxxxxxxxxxxx.xxxxxxxxxxxxxxxx\\\",\\\"phase\\\":\\\"final_answer\\\"}\"}],\"api\":\"openai-codex-responses\",\"provider\":\"openai-codex\",\"model\":\"gpt-5.5\",\"usage\":{\"input\":293,\"output\":9,\"cacheRead\":0,\"cacheWrite\":0,\"reasoning\":0,\"totalTokens\":302,\"cost\":{\"input\":0.0014650000000000002,\"output\":0.00027,\"cacheRead\":0,\"cacheWrite\":0,\"total\":0.0017350000000000002}},\"stopReason\":\"stop\",\"timestamp\":1791281821988,\"responseId\":\"captured.id.000059.xxxxxxxxxxxxxxxxxx.xxxxxxxxxxxxxxxxx\",\"rawStopReason\":\"completed\",\"thinkingLevel\":\"off\"},{\"role\":\"user\",\"content\":[{\"type\":\"text\",\"text\":\"Then reply FOLLOWUP_CONSUMED on the next turn.\"}],\"timestamp\":1791281801961},{\"role\":\"assistant\",\"content\":[{\"type\":\"text\",\"text\":\"FOLLOWUP_CONSUMED\",\"textSignature\":\"{\\\"v\\\":1,\\\"id\\\":\\\"captured.id.000060.xxxxxxxxxxxxxxxxxx.xxxxxxxxxxxxxxxx\\\",\\\"phase\\\":\\\"final_answer\\\"}\"}],\"api\":\"openai-codex-responses\",\"provider\":\"openai-codex\",\"model\":\"gpt-5.5\",\"usage\":{\"input\":320,\"output\":9,\"cacheRead\":0,\"cacheWrite\":0,\"reasoning\":0,\"totalTokens\":329,\"cost\":{\"input\":0.0016,\"output\":0.00027,\"cacheRead\":0,\"cacheWrite\":0,\"total\":0.0018700000000000001}},\"stopReason\":\"stop\",\"timestamp\":1791281825232,\"responseId\":\"captured.id.000061.xxxxxxxxxxxxxxxxxx.xxxxxxxxxxxxxxxxx\",\"rawStopReason\":\"completed\",\"thinkingLevel\":\"off\"}]}}"}
+{"dir":"in","raw":"{\"id\": \"q12\", \"type\": \"compact\"}"}
+{"dir":"out","raw":"{\"type\":\"compaction_start\",\"reason\":\"manual\"}"}
+{"dir":"out","raw":"{\"type\":\"compaction_end\",\"reason\":\"manual\",\"result\":{\"summary\":\"## Goal\\nSummarize the provided conversation for continuity.\\n\\n## Constraints & Preferences\\n- User required the assistant to run exactly: `printf capture-start; sleep 20; printf capture-finish`\\n- User specified not to background the command.\\n- After tool completion, user instructed to reply `STEER_CONSUMED` instead of `ORIGINAL_FINISHED`.\\n\\n## Progress\\n### Done\\n- [x] Ran `printf capture-start; sleep 20; printf capture-finish` via bash without backgrounding.\\n- [x] Tool output was `capture-startcapture-finish`.\\n- [x] Replied `STEER_CONSUMED`.\\n\\n### In Progress\\n- [ ] None.\\n\\n### Blocked\\n- None.\\n\\n## Key Decisions\\n- **Follow latest user instruction**: Replied `STEER_CONSUMED` after the tool completed, replacing the earlier requested `ORIGINAL_FINISHED`.\\n\\n## Next Steps\\n1. Continue from the completed state if further user instructions are provided.\\n\\n## Critical Context\\n- Exact command run: `printf capture-start; sleep 20; printf capture-finish`\\n- Tool output: `capture-startcapture-finish`\\n- Final assistant reply: `STEER_CONSUMED`\\n\\n---\\n\\n**Turn Context (split turn):**\\n\\n## Original Request\\nThe user instructed: “Then reply FOLLOWUP_CONSUMED on the next turn.”\\n\\n## Progress So Far\\n- No work has been completed beyond recording the instruction.\\n\\n## Context Needed to Continue\\n- On the next turn, the assistant should reply exactly: `FOLLOWUP_CONSUMED`\",\"firstKeptEntryId\":\"77988921\",\"tokensBefore\":329,\"estimatedTokensAfter\":559,\"usage\":{\"input\":574,\"output\":317,\"cacheRead\":0,\"cacheWrite\":0,\"reasoning\":0,\"totalTokens\":891,\"cost\":{\"input\":0.00287,\"output\":0.009510000000000001,\"cacheRead\":0,\"cacheWrite\":0,\"total\":0.01238}},\"details\":{\"readFiles\":[],\"modifiedFiles\":[]}},\"aborted\":false,\"willRetry\":false}"}
+{"dir":"out","raw":"{\"id\":\"q12\",\"type\":\"response\",\"command\":\"compact\",\"success\":true,\"data\":{\"summary\":\"## Goal\\nSummarize the provided conversation for continuity.\\n\\n## Constraints & Preferences\\n- User required the assistant to run exactly: `printf capture-start; sleep 20; printf capture-finish`\\n- User specified not to background the command.\\n- After tool completion, user instructed to reply `STEER_CONSUMED` instead of `ORIGINAL_FINISHED`.\\n\\n## Progress\\n### Done\\n- [x] Ran `printf capture-start; sleep 20; printf capture-finish` via bash without backgrounding.\\n- [x] Tool output was `capture-startcapture-finish`.\\n- [x] Replied `STEER_CONSUMED`.\\n\\n### In Progress\\n- [ ] None.\\n\\n### Blocked\\n- None.\\n\\n## Key Decisions\\n- **Follow latest user instruction**: Replied `STEER_CONSUMED` after the tool completed, replacing the earlier requested `ORIGINAL_FINISHED`.\\n\\n## Next Steps\\n1. Continue from the completed state if further user instructions are provided.\\n\\n## Critical Context\\n- Exact command run: `printf capture-start; sleep 20; printf capture-finish`\\n- Tool output: `capture-startcapture-finish`\\n- Final assistant reply: `STEER_CONSUMED`\\n\\n---\\n\\n**Turn Context (split turn):**\\n\\n## Original Request\\nThe user instructed: “Then reply FOLLOWUP_CONSUMED on the next turn.”\\n\\n## Progress So Far\\n- No work has been completed beyond recording the instruction.\\n\\n## Context Needed to Continue\\n- On the next turn, the assistant should reply exactly: `FOLLOWUP_CONSUMED`\",\"firstKeptEntryId\":\"77988921\",\"tokensBefore\":329,\"estimatedTokensAfter\":559,\"usage\":{\"input\":574,\"output\":317,\"cacheRead\":0,\"cacheWrite\":0,\"reasoning\":0,\"totalTokens\":891,\"cost\":{\"input\":0.00287,\"output\":0.009510000000000001,\"cacheRead\":0,\"cacheWrite\":0,\"total\":0.01238}},\"details\":{\"readFiles\":[],\"modifiedFiles\":[]}}}"}
+{"dir":"in","raw":"{\"id\": \"q13\", \"type\": \"get_session_stats\"}"}
+{"dir":"out","raw":"{\"id\":\"q13\",\"type\":\"response\",\"command\":\"get_session_stats\",\"success\":true,\"data\":{\"sessionFile\":\"/Users/xxxxxxxxxxxx/orca-qa/task_7daea3cb4c53/projects/pi/steer-then-compact/sessions/XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX.jsonl\",\"sessionId\":\"00000000-0000-4000-8000-000000000049\",\"userMessages\":3,\"assistantMessages\":3,\"toolCalls\":1,\"toolResults\":1,\"totalMessages\":8,\"tokens\":{\"input\":1409,\"output\":368,\"cacheRead\":0,\"cacheWrite\":0,\"total\":1777},\"cost\":0.018085,\"contextUsage\":{\"tokens\":null,\"contextWindow\":272000,\"percent\":null}}}"}
diff --git a/src/main/pi/__fixtures__/dialogs.jsonl b/src/main/pi/__fixtures__/dialogs.jsonl
new file mode 100644
index 000000000000..11ffe8aa0681
--- /dev/null
+++ b/src/main/pi/__fixtures__/dialogs.jsonl
@@ -0,0 +1,26 @@
+{"dir":"in","raw":"{\"id\": \"q1\", \"type\": \"get_state\"}"}
+{"dir":"out","raw":"{\"id\":\"q1\",\"type\":\"response\",\"command\":\"get_state\",\"success\":true,\"data\":{\"model\":{\"id\":\"gpt-6.1-sol\",\"name\":\"GPT-6.1 Sol\",\"api\":\"openai-codex-responses\",\"provider\":\"openai-codex\",\"baseUrl\":\"https://chatgpt.com/backend-api\",\"reasoning\":true,\"input\":[\"text\",\"image\"],\"cost\":{\"input\":2,\"output\":10,\"cacheRead\":0.1,\"cacheWrite\":2.5,\"tiers\":[{\"inputTokensAbove\":272000,\"input\":4,\"output\":15,\"cacheRead\":0.2,\"cacheWrite\":5}]},\"contextWindow\":272000,\"maxTokens\":128000,\"thinkingLevelMap\":{\"off\":null,\"minimal\":\"low\",\"low\":\"low\",\"medium\":\"medium\",\"high\":\"high\",\"xhigh\":\"xhigh\",\"max\":\"max\"},\"compat\":{\"supportsOpenAIGrammarTools\":true,\"supportsAdditionalTools\":true,\"supportsToolSearch\":true,\"supportsMidConvoSystemMessages\":true},\"inputLimits\":{\"images\":{\"resize\":{\"maxWidth\":2000,\"maxHeight\":2000,\"maxBytes\":4718592,\"jpegQuality\":80}}},\"type\":\"chat\"},\"thinkingLevel\":\"medium\",\"isStreaming\":false,\"isCompacting\":false,\"steeringMode\":\"one-at-a-time\",\"followUpMode\":\"one-at-a-time\",\"sessionFile\":\"/Users/xxxxxxxxxxxx/orca-qa/task_7daea3cb4c53/projects/pi/dialogs/sessions/XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX.jsonl\",\"sessionId\":\"00000000-0000-4000-8000-000000000003\",\"autoCompactionEnabled\":true,\"messageCount\":0,\"pendingMessageCount\":0}}"}
+{"dir":"in","raw":"{\"id\": \"q2\", \"type\": \"set_auto_retry\", \"enabled\": false}"}
+{"dir":"out","raw":"{\"id\":\"q2\",\"type\":\"response\",\"command\":\"set_auto_retry\",\"success\":true}"}
+{"dir":"in","raw":"{\"id\": \"q3\", \"type\": \"set_auto_compaction\", \"enabled\": false}"}
+{"dir":"out","raw":"{\"id\":\"q3\",\"type\":\"response\",\"command\":\"set_auto_compaction\",\"success\":true}"}
+{"dir":"in","raw":"{\"id\": \"q4\", \"type\": \"get_available_models\"}"}
+{"dir":"out","raw":"{\"id\":\"q4\",\"type\":\"response\",\"command\":\"get_available_models\",\"success\":true,\"data\":{\"models\":[{\"id\":\"gpt-5.3-codex-spark\",\"name\":\"GPT-5.3 Codex Spark\",\"api\":\"openai-codex-responses\",\"provider\":\"openai-codex\",\"baseUrl\":\"https://chatgpt.com/backend-api\",\"reasoning\":true,\"input\":[\"text\"],\"cost\":{\"input\":1.75,\"output\":14,\"cacheRead\":0.175,\"cacheWrite\":0},\"contextWindow\":128000,\"maxTokens\":128000,\"thinkingLevelMap\":{\"xhigh\":\"xhigh\",\"minimal\":\"low\"},\"compat\":{\"supportsOpenAIGrammarTools\":true},\"type\":\"chat\"},{\"id\":\"gpt-5.5\",\"name\":\"GPT-5.5\",\"api\":\"openai-codex-responses\",\"provider\":\"openai-codex\",\"baseUrl\":\"https://chatgpt.com/backend-api\",\"reasoning\":true,\"input\":[\"text\",\"image\"],\"cost\":{\"input\":5,\"output\":30,\"cacheRead\":0.5,\"cacheWrite\":0,\"tiers\":[{\"inputTokensAbove\":272000,\"input\":10,\"output\":45,\"cacheRead\":1,\"cacheWrite\":0}]},\"contextWindow\":272000,\"maxTokens\":128000,\"thinkingLevelMap\":{\"xhigh\":\"xhigh\",\"minimal\":\"low\"},\"compat\":{\"supportsOpenAIGrammarTools\":true,\"supportsToolSearch\":true,\"supportsMidConvoSystemMessages\":true},\"inputLimits\":{\"images\":{\"resize\":{\"maxWidth\":2000,\"maxHeight\":2000,\"maxBytes\":4718592,\"jpegQuality\":80}}},\"type\":\"chat\"},{\"id\":\"gpt-5.6-luna\",\"name\":\"GPT-5.6 Luna\",\"api\":\"openai-codex-responses\",\"provider\":\"openai-codex\",\"baseUrl\":\"https://chatgpt.com/backend-api\",\"reasoning\":true,\"input\":[\"text\",\"image\"],\"cost\":{\"input\":0.2,\"output\":1.2,\"cacheRead\":0.02,\"cacheWrite\":0.25,\"tiers\":[{\"inputTokensAbove\":272000,\"input\":0.4,\"output\":1.8,\"cacheRead\":0.04,\"cacheWrite\":0.5}]},\"contextWindow\":272000,\"maxTokens\":128000,\"thinkingLevelMap\":{\"xhigh\":\"xhigh\",\"max\":\"max\",\"minimal\":\"low\"},\"compat\":{\"supportsOpenAIGrammarTools\":true,\"supportsAdditionalTools\":true,\"supportsToolSearch\":true,\"supportsMidConvoSystemMessages\":true},\"inputLimits\":{\"images\":{\"resize\":{\"maxWidth\":2000,\"maxHeight\":2000,\"maxBytes\":4718592,\"jpegQuality\":80}}},\"type\":\"chat\"},{\"id\":\"gpt-5.6-sol\",\"name\":\"GPT-5.6 Sol\",\"api\":\"openai-codex-responses\",\"provider\":\"openai-codex\",\"baseUrl\":\"https://chatgpt.com/backend-api\",\"reasoning\":true,\"input\":[\"text\",\"image\"],\"cost\":{\"input\":4,\"output\":20,\"cacheRead\":0.4,\"cacheWrite\":5,\"tiers\":[{\"inputTokensAbove\":272000,\"input\":8,\"output\":30,\"cacheRead\":0.8,\"cacheWrite\":10}]},\"contextWindow\":272000,\"maxTokens\":128000,\"thinkingLevelMap\":{\"xhigh\":\"xhigh\",\"max\":\"max\",\"minimal\":\"low\"},\"compat\":{\"supportsOpenAIGrammarTools\":true,\"supportsAdditionalTools\":true,\"supportsToolSearch\":true,\"supportsMidConvoSystemMessages\":true},\"inputLimits\":{\"images\":{\"resize\":{\"maxWidth\":2000,\"maxHeight\":2000,\"maxBytes\":4718592,\"jpegQuality\":80}}},\"type\":\"chat\"},{\"id\":\"gpt-5.6-terra\",\"name\":\"GPT-5.6 Terra\",\"api\":\"openai-codex-responses\",\"provider\":\"openai-codex\",\"baseUrl\":\"https://chatgpt.com/backend-api\",\"reasoning\":true,\"input\":[\"text\",\"image\"],\"cost\":{\"input\":2,\"output\":12,\"cacheRead\":0.2,\"cacheWrite\":2.5,\"tiers\":[{\"inputTokensAbove\":272000,\"input\":4,\"output\":18,\"cacheRead\":0.4,\"cacheWrite\":5}]},\"contextWindow\":272000,\"maxTokens\":128000,\"thinkingLevelMap\":{\"xhigh\":\"xhigh\",\"max\":\"max\",\"minimal\":\"low\"},\"compat\":{\"supportsOpenAIGrammarTools\":true,\"supportsAdditionalTools\":true,\"supportsToolSearch\":true,\"supportsMidConvoSystemMessages\":true},\"inputLimits\":{\"images\":{\"resize\":{\"maxWidth\":2000,\"maxHeight\":2000,\"maxBytes\":4718592,\"jpegQuality\":80}}},\"type\":\"chat\"},{\"id\":\"gpt-6-astra\",\"name\":\"GPT-6 Astra\",\"api\":\"openai-codex-responses\",\"provider\":\"openai-codex\",\"baseUrl\":\"https://chatgpt.com/backend-api\",\"reasoning\":true,\"input\":[\"text\",\"image\"],\"cost\":{\"input\":10,\"output\":50,\"cacheRead\":1,\"cacheWrite\":12.5,\"tiers\":[{\"inputTokensAbove\":272000,\"input\":20,\"output\":75,\"cacheRead\":2,\"cacheWrite\":25}]},\"contextWindow\":272000,\"maxTokens\":128000,\"thinkingLevelMap\":{\"off\":null,\"minimal\":\"low\",\"low\":\"low\",\"medium\":\"medium\",\"high\":\"high\",\"xhigh\":\"xhigh\",\"max\":\"max\"},\"compat\":{\"supportsOpenAIGrammarTools\":true,\"supportsAdditionalTools\":true,\"supportsToolSearch\":true,\"supportsMidConvoSystemMessages\":true},\"inputLimits\":{\"images\":{\"resize\":{\"maxWidth\":2000,\"maxHeight\":2000,\"maxBytes\":4718592,\"jpegQuality\":80}}},\"type\":\"chat\"},{\"id\":\"gpt-6-luna\",\"name\":\"GPT-6 Luna\",\"api\":\"openai-codex-responses\",\"provider\":\"openai-codex\",\"baseUrl\":\"https://chatgpt.com/backend-api\",\"reasoning\":true,\"input\":[\"text\",\"image\"],\"cost\":{\"input\":0.1,\"output\":0.5,\"cacheRead\":0.01,\"cacheWrite\":0.125,\"tiers\":[{\"inputTokensAbove\":272000,\"input\":0.2,\"output\":0.75,\"cacheRead\":0.02,\"cacheWrite\":0.25}]},\"contextWindow\":272000,\"maxTokens\":128000,\"thinkingLevelMap\":{\"off\":\"none\",\"minimal\":\"low\",\"low\":\"low\",\"medium\":\"medium\",\"high\":\"high\",\"xhigh\":\"xhigh\",\"max\":\"max\"},\"compat\":{\"supportsOpenAIGrammarTools\":true,\"supportsAdditionalTools\":true,\"supportsToolSearch\":true,\"supportsMidConvoSystemMessages\":true},\"inputLimits\":{\"images\":{\"resize\":{\"maxWidth\":2000,\"maxHeight\":2000,\"maxBytes\":4718592,\"jpegQuality\":80}}},\"type\":\"chat\"},{\"id\":\"gpt-6-sol\",\"name\":\"GPT-6 Sol\",\"api\":\"openai-codex-responses\",\"provider\":\"openai-codex\",\"baseUrl\":\"https://chatgpt.com/backend-api\",\"reasoning\":true,\"input\":[\"text\",\"image\"],\"cost\":{\"input\":2,\"output\":10,\"cacheRead\":0.2,\"cacheWrite\":2.5,\"tiers\":[{\"inputTokensAbove\":272000,\"input\":4,\"output\":15,\"cacheRead\":0.4,\"cacheWrite\":5}]},\"contextWindow\":272000,\"maxTokens\":128000,\"thinkingLevelMap\":{\"off\":\"none\",\"minimal\":\"low\",\"low\":\"low\",\"medium\":\"medium\",\"high\":\"high\",\"xhigh\":\"xhigh\",\"max\":\"max\"},\"compat\":{\"supportsOpenAIGrammarTools\":true,\"supportsAdditionalTools\":true,\"supportsToolSearch\":true,\"supportsMidConvoSystemMessages\":true},\"inputLimits\":{\"images\":{\"resize\":{\"maxWidth\":2000,\"maxHeight\":2000,\"maxBytes\":4718592,\"jpegQuality\":80}}},\"type\":\"chat\"},{\"id\":\"gpt-6.1-sol\",\"name\":\"GPT-6.1 Sol\",\"api\":\"openai-codex-responses\",\"provider\":\"openai-codex\",\"baseUrl\":\"https://chatgpt.com/backend-api\",\"reasoning\":true,\"input\":[\"text\",\"image\"],\"cost\":{\"input\":2,\"output\":10,\"cacheRead\":0.1,\"cacheWrite\":2.5,\"tiers\":[{\"inputTokensAbove\":272000,\"input\":4,\"output\":15,\"cacheRead\":0.2,\"cacheWrite\":5}]},\"contextWindow\":272000,\"maxTokens\":128000,\"thinkingLevelMap\":{\"off\":null,\"minimal\":\"low\",\"low\":\"low\",\"medium\":\"medium\",\"high\":\"high\",\"xhigh\":\"xhigh\",\"max\":\"max\"},\"compat\":{\"supportsOpenAIGrammarTools\":true,\"supportsAdditionalTools\":true,\"supportsToolSearch\":true,\"supportsMidConvoSystemMessages\":true},\"inputLimits\":{\"images\":{\"resize\":{\"maxWidth\":2000,\"maxHeight\":2000,\"maxBytes\":4718592,\"jpegQuality\":80}}},\"type\":\"chat\"}]}}"}
+{"dir":"in","raw":"{\"id\": \"q5\", \"type\": \"set_model\", \"provider\": \"openai-codex\", \"modelId\": \"gpt-5.5\"}"}
+{"dir":"out","raw":"{\"id\":\"q5\",\"type\":\"response\",\"command\":\"set_model\",\"success\":true,\"data\":{\"id\":\"gpt-5.5\",\"name\":\"GPT-5.5\",\"api\":\"openai-codex-responses\",\"provider\":\"openai-codex\",\"baseUrl\":\"https://chatgpt.com/backend-api\",\"reasoning\":true,\"input\":[\"text\",\"image\"],\"cost\":{\"input\":5,\"output\":30,\"cacheRead\":0.5,\"cacheWrite\":0,\"tiers\":[{\"inputTokensAbove\":272000,\"input\":10,\"output\":45,\"cacheRead\":1,\"cacheWrite\":0}]},\"contextWindow\":272000,\"maxTokens\":128000,\"thinkingLevelMap\":{\"xhigh\":\"xhigh\",\"minimal\":\"low\"},\"compat\":{\"supportsOpenAIGrammarTools\":true,\"supportsToolSearch\":true,\"supportsMidConvoSystemMessages\":true},\"inputLimits\":{\"images\":{\"resize\":{\"maxWidth\":2000,\"maxHeight\":2000,\"maxBytes\":4718592,\"jpegQuality\":80}}},\"type\":\"chat\"}}"}
+{"dir":"in","raw":"{\"id\": \"q6\", \"type\": \"set_thinking_level\", \"level\": \"off\"}"}
+{"dir":"out","raw":"{\"type\":\"thinking_level_changed\",\"level\":\"off\"}"}
+{"dir":"out","raw":"{\"id\":\"q6\",\"type\":\"response\",\"command\":\"set_thinking_level\",\"success\":true}"}
+{"dir":"in","raw":"{\"id\": \"q7\", \"type\": \"prompt\", \"message\": \"/qa-dialogs\"}"}
+{"dir":"out","raw":"{\"type\":\"extension_ui_request\",\"id\":\"00000000-0000-4000-8000-000000000004\",\"method\":\"confirm\",\"title\":\"RPC capture confirm\",\"message\":\"Continue the capture?\"}"}
+{"dir":"in","raw":"{\"id\": \"00000000-0000-4000-8000-000000000004\", \"type\": \"extension_ui_response\", \"confirmed\": true}"}
+{"dir":"out","raw":"{\"type\":\"extension_ui_request\",\"id\":\"00000000-0000-4000-8000-000000000005\",\"method\":\"select\",\"title\":\"RPC capture select\",\"options\":[\"Alpha\",\"Beta\"]}"}
+{"dir":"in","raw":"{\"id\": \"00000000-0000-4000-8000-000000000005\", \"type\": \"extension_ui_response\", \"value\": \"Beta\"}"}
+{"dir":"out","raw":"{\"type\":\"extension_ui_request\",\"id\":\"00000000-0000-4000-8000-000000000006\",\"method\":\"input\",\"title\":\"RPC capture input\",\"placeholder\":\"Type a value\"}"}
+{"dir":"in","raw":"{\"id\": \"00000000-0000-4000-8000-000000000006\", \"type\": \"extension_ui_response\", \"value\": \"\"}"}
+{"dir":"out","raw":"{\"type\":\"extension_ui_request\",\"id\":\"00000000-0000-4000-8000-000000000007\",\"method\":\"editor\",\"title\":\"RPC capture editor\",\"prefill\":\"one\\ntwo\"}"}
+{"dir":"in","raw":"{\"id\": \"00000000-0000-4000-8000-000000000007\", \"type\": \"extension_ui_response\", \"value\": \"one\\nchanged
line
end\"}"}
+{"dir":"out","raw":"{\"type\":\"extension_ui_request\",\"id\":\"00000000-0000-4000-8000-000000000008\",\"method\":\"notify\",\"message\":\"{\\\"yes\\\":true,\\\"choice\\\":\\\"Beta\\\",\\\"input\\\":\\\"\\\",\\\"edited\\\":\\\"one\\\\nchanged
line
end\\\"}\",\"notifyType\":\"info\"}"}
+{"dir":"out","raw":"{\"id\":\"q7\",\"type\":\"response\",\"command\":\"prompt\",\"success\":true,\"data\":{\"disposition\":\"handled\"}}"}
+{"dir":"in","raw":"{\"id\": \"q12\", \"type\": \"get_state\"}"}
+{"dir":"out","raw":"{\"id\":\"q12\",\"type\":\"response\",\"command\":\"get_state\",\"success\":true,\"data\":{\"model\":{\"id\":\"gpt-5.5\",\"name\":\"GPT-5.5\",\"api\":\"openai-codex-responses\",\"provider\":\"openai-codex\",\"baseUrl\":\"https://chatgpt.com/backend-api\",\"reasoning\":true,\"input\":[\"text\",\"image\"],\"cost\":{\"input\":5,\"output\":30,\"cacheRead\":0.5,\"cacheWrite\":0,\"tiers\":[{\"inputTokensAbove\":272000,\"input\":10,\"output\":45,\"cacheRead\":1,\"cacheWrite\":0}]},\"contextWindow\":272000,\"maxTokens\":128000,\"thinkingLevelMap\":{\"xhigh\":\"xhigh\",\"minimal\":\"low\"},\"compat\":{\"supportsOpenAIGrammarTools\":true,\"supportsToolSearch\":true,\"supportsMidConvoSystemMessages\":true},\"inputLimits\":{\"images\":{\"resize\":{\"maxWidth\":2000,\"maxHeight\":2000,\"maxBytes\":4718592,\"jpegQuality\":80}}},\"type\":\"chat\"},\"thinkingLevel\":\"off\",\"isStreaming\":false,\"isCompacting\":false,\"steeringMode\":\"one-at-a-time\",\"followUpMode\":\"one-at-a-time\",\"sessionFile\":\"/Users/xxxxxxxxxxxx/orca-qa/task_7daea3cb4c53/projects/pi/dialogs/sessions/XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX.jsonl\",\"sessionId\":\"00000000-0000-4000-8000-000000000003\",\"autoCompactionEnabled\":false,\"messageCount\":0,\"pendingMessageCount\":0}}"}
diff --git a/src/main/pi/__fixtures__/provider-fetch-error.jsonl b/src/main/pi/__fixtures__/provider-fetch-error.jsonl
new file mode 100644
index 000000000000..22f2b663a781
--- /dev/null
+++ b/src/main/pi/__fixtures__/provider-fetch-error.jsonl
@@ -0,0 +1,32 @@
+{"dir":"in","raw":"{\"id\": \"q1\", \"type\": \"get_state\"}"}
+{"dir":"out","raw":"{\"id\":\"q1\",\"type\":\"response\",\"command\":\"get_state\",\"success\":true,\"data\":{\"model\":{\"id\":\"gpt-6.1-sol\",\"name\":\"GPT-6.1 Sol\",\"api\":\"openai-codex-responses\",\"provider\":\"openai-codex\",\"baseUrl\":\"https://chatgpt.com/backend-api\",\"reasoning\":true,\"input\":[\"text\",\"image\"],\"cost\":{\"input\":2,\"output\":10,\"cacheRead\":0.1,\"cacheWrite\":2.5,\"tiers\":[{\"inputTokensAbove\":272000,\"input\":4,\"output\":15,\"cacheRead\":0.2,\"cacheWrite\":5}]},\"contextWindow\":272000,\"maxTokens\":128000,\"thinkingLevelMap\":{\"off\":null,\"minimal\":\"low\",\"low\":\"low\",\"medium\":\"medium\",\"high\":\"high\",\"xhigh\":\"xhigh\",\"max\":\"max\"},\"compat\":{\"supportsOpenAIGrammarTools\":true,\"supportsAdditionalTools\":true,\"supportsToolSearch\":true,\"supportsMidConvoSystemMessages\":true},\"inputLimits\":{\"images\":{\"resize\":{\"maxWidth\":2000,\"maxHeight\":2000,\"maxBytes\":4718592,\"jpegQuality\":80}}},\"type\":\"chat\"},\"thinkingLevel\":\"medium\",\"isStreaming\":false,\"isCompacting\":false,\"steeringMode\":\"one-at-a-time\",\"followUpMode\":\"one-at-a-time\",\"sessionFile\":\"/Users/xxxxxxxxxxxx/orca-qa/task_7daea3cb4c53/projects/pi/basic-r2/sessions/XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX.jsonl\",\"sessionId\":\"00000000-0000-4000-8000-000000000017\",\"autoCompactionEnabled\":true,\"messageCount\":0,\"pendingMessageCount\":0}}"}
+{"dir":"in","raw":"{\"id\": \"q2\", \"type\": \"set_auto_retry\", \"enabled\": false}"}
+{"dir":"out","raw":"{\"id\":\"q2\",\"type\":\"response\",\"command\":\"set_auto_retry\",\"success\":true}"}
+{"dir":"in","raw":"{\"id\": \"q3\", \"type\": \"set_auto_compaction\", \"enabled\": false}"}
+{"dir":"out","raw":"{\"id\":\"q3\",\"type\":\"response\",\"command\":\"set_auto_compaction\",\"success\":true}"}
+{"dir":"in","raw":"{\"id\": \"q4\", \"type\": \"get_available_models\"}"}
+{"dir":"out","raw":"{\"id\":\"q4\",\"type\":\"response\",\"command\":\"get_available_models\",\"success\":true,\"data\":{\"models\":[{\"id\":\"gpt-5.3-codex-spark\",\"name\":\"GPT-5.3 Codex Spark\",\"api\":\"openai-codex-responses\",\"provider\":\"openai-codex\",\"baseUrl\":\"https://chatgpt.com/backend-api\",\"reasoning\":true,\"input\":[\"text\"],\"cost\":{\"input\":1.75,\"output\":14,\"cacheRead\":0.175,\"cacheWrite\":0},\"contextWindow\":128000,\"maxTokens\":128000,\"thinkingLevelMap\":{\"xhigh\":\"xhigh\",\"minimal\":\"low\"},\"compat\":{\"supportsOpenAIGrammarTools\":true},\"type\":\"chat\"},{\"id\":\"gpt-5.5\",\"name\":\"GPT-5.5\",\"api\":\"openai-codex-responses\",\"provider\":\"openai-codex\",\"baseUrl\":\"https://chatgpt.com/backend-api\",\"reasoning\":true,\"input\":[\"text\",\"image\"],\"cost\":{\"input\":5,\"output\":30,\"cacheRead\":0.5,\"cacheWrite\":0,\"tiers\":[{\"inputTokensAbove\":272000,\"input\":10,\"output\":45,\"cacheRead\":1,\"cacheWrite\":0}]},\"contextWindow\":272000,\"maxTokens\":128000,\"thinkingLevelMap\":{\"xhigh\":\"xhigh\",\"minimal\":\"low\"},\"compat\":{\"supportsOpenAIGrammarTools\":true,\"supportsToolSearch\":true,\"supportsMidConvoSystemMessages\":true},\"inputLimits\":{\"images\":{\"resize\":{\"maxWidth\":2000,\"maxHeight\":2000,\"maxBytes\":4718592,\"jpegQuality\":80}}},\"type\":\"chat\"},{\"id\":\"gpt-5.6-luna\",\"name\":\"GPT-5.6 Luna\",\"api\":\"openai-codex-responses\",\"provider\":\"openai-codex\",\"baseUrl\":\"https://chatgpt.com/backend-api\",\"reasoning\":true,\"input\":[\"text\",\"image\"],\"cost\":{\"input\":0.2,\"output\":1.2,\"cacheRead\":0.02,\"cacheWrite\":0.25,\"tiers\":[{\"inputTokensAbove\":272000,\"input\":0.4,\"output\":1.8,\"cacheRead\":0.04,\"cacheWrite\":0.5}]},\"contextWindow\":272000,\"maxTokens\":128000,\"thinkingLevelMap\":{\"xhigh\":\"xhigh\",\"max\":\"max\",\"minimal\":\"low\"},\"compat\":{\"supportsOpenAIGrammarTools\":true,\"supportsAdditionalTools\":true,\"supportsToolSearch\":true,\"supportsMidConvoSystemMessages\":true},\"inputLimits\":{\"images\":{\"resize\":{\"maxWidth\":2000,\"maxHeight\":2000,\"maxBytes\":4718592,\"jpegQuality\":80}}},\"type\":\"chat\"},{\"id\":\"gpt-5.6-sol\",\"name\":\"GPT-5.6 Sol\",\"api\":\"openai-codex-responses\",\"provider\":\"openai-codex\",\"baseUrl\":\"https://chatgpt.com/backend-api\",\"reasoning\":true,\"input\":[\"text\",\"image\"],\"cost\":{\"input\":4,\"output\":20,\"cacheRead\":0.4,\"cacheWrite\":5,\"tiers\":[{\"inputTokensAbove\":272000,\"input\":8,\"output\":30,\"cacheRead\":0.8,\"cacheWrite\":10}]},\"contextWindow\":272000,\"maxTokens\":128000,\"thinkingLevelMap\":{\"xhigh\":\"xhigh\",\"max\":\"max\",\"minimal\":\"low\"},\"compat\":{\"supportsOpenAIGrammarTools\":true,\"supportsAdditionalTools\":true,\"supportsToolSearch\":true,\"supportsMidConvoSystemMessages\":true},\"inputLimits\":{\"images\":{\"resize\":{\"maxWidth\":2000,\"maxHeight\":2000,\"maxBytes\":4718592,\"jpegQuality\":80}}},\"type\":\"chat\"},{\"id\":\"gpt-5.6-terra\",\"name\":\"GPT-5.6 Terra\",\"api\":\"openai-codex-responses\",\"provider\":\"openai-codex\",\"baseUrl\":\"https://chatgpt.com/backend-api\",\"reasoning\":true,\"input\":[\"text\",\"image\"],\"cost\":{\"input\":2,\"output\":12,\"cacheRead\":0.2,\"cacheWrite\":2.5,\"tiers\":[{\"inputTokensAbove\":272000,\"input\":4,\"output\":18,\"cacheRead\":0.4,\"cacheWrite\":5}]},\"contextWindow\":272000,\"maxTokens\":128000,\"thinkingLevelMap\":{\"xhigh\":\"xhigh\",\"max\":\"max\",\"minimal\":\"low\"},\"compat\":{\"supportsOpenAIGrammarTools\":true,\"supportsAdditionalTools\":true,\"supportsToolSearch\":true,\"supportsMidConvoSystemMessages\":true},\"inputLimits\":{\"images\":{\"resize\":{\"maxWidth\":2000,\"maxHeight\":2000,\"maxBytes\":4718592,\"jpegQuality\":80}}},\"type\":\"chat\"},{\"id\":\"gpt-6-astra\",\"name\":\"GPT-6 Astra\",\"api\":\"openai-codex-responses\",\"provider\":\"openai-codex\",\"baseUrl\":\"https://chatgpt.com/backend-api\",\"reasoning\":true,\"input\":[\"text\",\"image\"],\"cost\":{\"input\":10,\"output\":50,\"cacheRead\":1,\"cacheWrite\":12.5,\"tiers\":[{\"inputTokensAbove\":272000,\"input\":20,\"output\":75,\"cacheRead\":2,\"cacheWrite\":25}]},\"contextWindow\":272000,\"maxTokens\":128000,\"thinkingLevelMap\":{\"off\":null,\"minimal\":\"low\",\"low\":\"low\",\"medium\":\"medium\",\"high\":\"high\",\"xhigh\":\"xhigh\",\"max\":\"max\"},\"compat\":{\"supportsOpenAIGrammarTools\":true,\"supportsAdditionalTools\":true,\"supportsToolSearch\":true,\"supportsMidConvoSystemMessages\":true},\"inputLimits\":{\"images\":{\"resize\":{\"maxWidth\":2000,\"maxHeight\":2000,\"maxBytes\":4718592,\"jpegQuality\":80}}},\"type\":\"chat\"},{\"id\":\"gpt-6-luna\",\"name\":\"GPT-6 Luna\",\"api\":\"openai-codex-responses\",\"provider\":\"openai-codex\",\"baseUrl\":\"https://chatgpt.com/backend-api\",\"reasoning\":true,\"input\":[\"text\",\"image\"],\"cost\":{\"input\":0.1,\"output\":0.5,\"cacheRead\":0.01,\"cacheWrite\":0.125,\"tiers\":[{\"inputTokensAbove\":272000,\"input\":0.2,\"output\":0.75,\"cacheRead\":0.02,\"cacheWrite\":0.25}]},\"contextWindow\":272000,\"maxTokens\":128000,\"thinkingLevelMap\":{\"off\":\"none\",\"minimal\":\"low\",\"low\":\"low\",\"medium\":\"medium\",\"high\":\"high\",\"xhigh\":\"xhigh\",\"max\":\"max\"},\"compat\":{\"supportsOpenAIGrammarTools\":true,\"supportsAdditionalTools\":true,\"supportsToolSearch\":true,\"supportsMidConvoSystemMessages\":true},\"inputLimits\":{\"images\":{\"resize\":{\"maxWidth\":2000,\"maxHeight\":2000,\"maxBytes\":4718592,\"jpegQuality\":80}}},\"type\":\"chat\"},{\"id\":\"gpt-6-sol\",\"name\":\"GPT-6 Sol\",\"api\":\"openai-codex-responses\",\"provider\":\"openai-codex\",\"baseUrl\":\"https://chatgpt.com/backend-api\",\"reasoning\":true,\"input\":[\"text\",\"image\"],\"cost\":{\"input\":2,\"output\":10,\"cacheRead\":0.2,\"cacheWrite\":2.5,\"tiers\":[{\"inputTokensAbove\":272000,\"input\":4,\"output\":15,\"cacheRead\":0.4,\"cacheWrite\":5}]},\"contextWindow\":272000,\"maxTokens\":128000,\"thinkingLevelMap\":{\"off\":\"none\",\"minimal\":\"low\",\"low\":\"low\",\"medium\":\"medium\",\"high\":\"high\",\"xhigh\":\"xhigh\",\"max\":\"max\"},\"compat\":{\"supportsOpenAIGrammarTools\":true,\"supportsAdditionalTools\":true,\"supportsToolSearch\":true,\"supportsMidConvoSystemMessages\":true},\"inputLimits\":{\"images\":{\"resize\":{\"maxWidth\":2000,\"maxHeight\":2000,\"maxBytes\":4718592,\"jpegQuality\":80}}},\"type\":\"chat\"},{\"id\":\"gpt-6.1-sol\",\"name\":\"GPT-6.1 Sol\",\"api\":\"openai-codex-responses\",\"provider\":\"openai-codex\",\"baseUrl\":\"https://chatgpt.com/backend-api\",\"reasoning\":true,\"input\":[\"text\",\"image\"],\"cost\":{\"input\":2,\"output\":10,\"cacheRead\":0.1,\"cacheWrite\":2.5,\"tiers\":[{\"inputTokensAbove\":272000,\"input\":4,\"output\":15,\"cacheRead\":0.2,\"cacheWrite\":5}]},\"contextWindow\":272000,\"maxTokens\":128000,\"thinkingLevelMap\":{\"off\":null,\"minimal\":\"low\",\"low\":\"low\",\"medium\":\"medium\",\"high\":\"high\",\"xhigh\":\"xhigh\",\"max\":\"max\"},\"compat\":{\"supportsOpenAIGrammarTools\":true,\"supportsAdditionalTools\":true,\"supportsToolSearch\":true,\"supportsMidConvoSystemMessages\":true},\"inputLimits\":{\"images\":{\"resize\":{\"maxWidth\":2000,\"maxHeight\":2000,\"maxBytes\":4718592,\"jpegQuality\":80}}},\"type\":\"chat\"}]}}"}
+{"dir":"in","raw":"{\"id\": \"q5\", \"type\": \"set_model\", \"provider\": \"openai-codex\", \"modelId\": \"gpt-5.5\"}"}
+{"dir":"out","raw":"{\"id\":\"q5\",\"type\":\"response\",\"command\":\"set_model\",\"success\":true,\"data\":{\"id\":\"gpt-5.5\",\"name\":\"GPT-5.5\",\"api\":\"openai-codex-responses\",\"provider\":\"openai-codex\",\"baseUrl\":\"https://chatgpt.com/backend-api\",\"reasoning\":true,\"input\":[\"text\",\"image\"],\"cost\":{\"input\":5,\"output\":30,\"cacheRead\":0.5,\"cacheWrite\":0,\"tiers\":[{\"inputTokensAbove\":272000,\"input\":10,\"output\":45,\"cacheRead\":1,\"cacheWrite\":0}]},\"contextWindow\":272000,\"maxTokens\":128000,\"thinkingLevelMap\":{\"xhigh\":\"xhigh\",\"minimal\":\"low\"},\"compat\":{\"supportsOpenAIGrammarTools\":true,\"supportsToolSearch\":true,\"supportsMidConvoSystemMessages\":true},\"inputLimits\":{\"images\":{\"resize\":{\"maxWidth\":2000,\"maxHeight\":2000,\"maxBytes\":4718592,\"jpegQuality\":80}}},\"type\":\"chat\"}}"}
+{"dir":"in","raw":"{\"id\": \"q6\", \"type\": \"set_thinking_level\", \"level\": \"off\"}"}
+{"dir":"out","raw":"{\"type\":\"thinking_level_changed\",\"level\":\"off\"}"}
+{"dir":"out","raw":"{\"id\":\"q6\",\"type\":\"response\",\"command\":\"set_thinking_level\",\"success\":true}"}
+{"dir":"in","raw":"{\"id\": \"q7\", \"type\": \"prompt\", \"message\": \"Reply exactly RPC_CAPTURE_OK.\"}"}
+{"dir":"out","raw":"{\"id\":\"q7\",\"type\":\"response\",\"command\":\"prompt\",\"success\":true,\"data\":{\"disposition\":\"started\"}}"}
+{"dir":"out","raw":"{\"type\":\"agent_start\"}"}
+{"dir":"out","raw":"{\"type\":\"turn_start\"}"}
+{"dir":"out","raw":"{\"type\":\"message_start\",\"message\":{\"role\":\"system\",\"content\":\"\",\"sections\":{\"preamble\":\"You are a protocol capture assistant. Follow exact requests and use only the requested tools. Read and write only within this project. Never read credentials, home directories, or account details.\",\"cwd\":\"<cwd>\\n/Users/xxxxxxxxxxxx/orca-qa/task_7daea3cb4c53/projects/pi/basic-r2\\n</cwd>\"},\"timestamp\":1791279374657,\"toolsAdded\":[{\"name\":\"read\",\"description\":\"Read the contents of a file. Supports text files and images (jpg, png, gif, webp, bmp). Images are sent as attachments. For text files, output is truncated to 2000 lines or 50KB (whichever is hit first). Use offset/limit for large files. When you need the full file, continue with offset until complete.\",\"parameters\":{\"type\":\"object\",\"required\":[\"path\"],\"properties\":{\"path\":{\"type\":\"string\",\"description\":\"Path to the file to read (relative or absolute)\"},\"offset\":{\"type\":\"number\",\"description\":\"Line number to start reading from (1-indexed)\"},\"limit\":{\"type\":\"number\",\"description\":\"Maximum number of lines to read\"}}},\"constrainedSampling\":{\"type\":\"json_schema\",\"strict\":\"prefer\"}},{\"name\":\"bash\",\"description\":\"Execute a bash command in the current working directory. Returns stdout and stderr. Output is truncated to last 2000 lines or 50KB (whichever is hit first). If truncated, full output is saved to a temp file. Optionally provide a timeout in seconds.\",\"parameters\":{\"type\":\"object\",\"required\":[\"command\"],\"properties\":{\"command\":{\"type\":\"string\",\"description\":\"Shell command to execute\"},\"timeout\":{\"type\":\"number\",\"description\":\"Timeout in seconds (optional, no default timeout)\"}}},\"constrainedSampling\":{\"type\":\"json_schema\",\"strict\":\"prefer\"}},{\"name\":\"edit\",\"description\":\"Edit a single file using exact text replacement. Every edits[].oldText must match a unique, non-overlapping region of the original file. If two changes affect the same block or nearby lines, merge them into one edit instead of emitting overlapping edits. Do not include large unchanged regions just to connect distant changes.\",\"parameters\":{\"type\":\"object\",\"required\":[\"path\",\"edits\"],\"properties\":{\"path\":{\"type\":\"string\",\"description\":\"Path to the file to edit (relative or absolute)\"},\"edits\":{\"type\":\"array\",\"items\":{\"type\":\"object\",\"required\":[\"oldText\",\"newText\"],\"properties\":{\"oldText\":{\"type\":\"string\",\"description\":\"Exact text for one targeted replacement. It must be unique in the original file and must not overlap with any other edits[].oldText in the same call.\"},\"newText\":{\"type\":\"string\",\"description\":\"Replacement text for this targeted edit.\"}}},\"description\":\"One or more targeted replacements. Each edit is matched against the original file, not incrementally. Do not include overlapping or nested edits. If two changes touch the same block or nearby lines, merge them into one edit instead.\"}}},\"constrainedSampling\":{\"type\":\"json_schema\",\"strict\":\"prefer\"}},{\"name\":\"write\",\"description\":\"Write content to a file. Creates the file if it doesn't exist, overwrites if it does. Automatically creates parent directories.\",\"parameters\":{\"type\":\"object\",\"required\":[\"path\",\"content\"],\"properties\":{\"path\":{\"type\":\"string\",\"description\":\"Path to the file to write (relative or absolute)\"},\"content\":{\"type\":\"string\",\"description\":\"Content to write to the file\"}}},\"constrainedSampling\":{\"type\":\"json_schema\",\"strict\":\"prefer\"}}]}}"}
+{"dir":"out","raw":"{\"type\":\"message_end\",\"message\":{\"role\":\"system\",\"content\":\"\",\"sections\":{\"preamble\":\"You are a protocol capture assistant. Follow exact requests and use only the requested tools. Read and write only within this project. Never read credentials, home directories, or account details.\",\"cwd\":\"<cwd>\\n/Users/xxxxxxxxxxxx/orca-qa/task_7daea3cb4c53/projects/pi/basic-r2\\n</cwd>\"},\"timestamp\":1791279374657,\"toolsAdded\":[{\"name\":\"read\",\"description\":\"Read the contents of a file. Supports text files and images (jpg, png, gif, webp, bmp). Images are sent as attachments. For text files, output is truncated to 2000 lines or 50KB (whichever is hit first). Use offset/limit for large files. When you need the full file, continue with offset until complete.\",\"parameters\":{\"type\":\"object\",\"required\":[\"path\"],\"properties\":{\"path\":{\"type\":\"string\",\"description\":\"Path to the file to read (relative or absolute)\"},\"offset\":{\"type\":\"number\",\"description\":\"Line number to start reading from (1-indexed)\"},\"limit\":{\"type\":\"number\",\"description\":\"Maximum number of lines to read\"}}},\"constrainedSampling\":{\"type\":\"json_schema\",\"strict\":\"prefer\"}},{\"name\":\"bash\",\"description\":\"Execute a bash command in the current working directory. Returns stdout and stderr. Output is truncated to last 2000 lines or 50KB (whichever is hit first). If truncated, full output is saved to a temp file. Optionally provide a timeout in seconds.\",\"parameters\":{\"type\":\"object\",\"required\":[\"command\"],\"properties\":{\"command\":{\"type\":\"string\",\"description\":\"Shell command to execute\"},\"timeout\":{\"type\":\"number\",\"description\":\"Timeout in seconds (optional, no default timeout)\"}}},\"constrainedSampling\":{\"type\":\"json_schema\",\"strict\":\"prefer\"}},{\"name\":\"edit\",\"description\":\"Edit a single file using exact text replacement. Every edits[].oldText must match a unique, non-overlapping region of the original file. If two changes affect the same block or nearby lines, merge them into one edit instead of emitting overlapping edits. Do not include large unchanged regions just to connect distant changes.\",\"parameters\":{\"type\":\"object\",\"required\":[\"path\",\"edits\"],\"properties\":{\"path\":{\"type\":\"string\",\"description\":\"Path to the file to edit (relative or absolute)\"},\"edits\":{\"type\":\"array\",\"items\":{\"type\":\"object\",\"required\":[\"oldText\",\"newText\"],\"properties\":{\"oldText\":{\"type\":\"string\",\"description\":\"Exact text for one targeted replacement. It must be unique in the original file and must not overlap with any other edits[].oldText in the same call.\"},\"newText\":{\"type\":\"string\",\"description\":\"Replacement text for this targeted edit.\"}}},\"description\":\"One or more targeted replacements. Each edit is matched against the original file, not incrementally. Do not include overlapping or nested edits. If two changes touch the same block or nearby lines, merge them into one edit instead.\"}}},\"constrainedSampling\":{\"type\":\"json_schema\",\"strict\":\"prefer\"}},{\"name\":\"write\",\"description\":\"Write content to a file. Creates the file if it doesn't exist, overwrites if it does. Automatically creates parent directories.\",\"parameters\":{\"type\":\"object\",\"required\":[\"path\",\"content\"],\"properties\":{\"path\":{\"type\":\"string\",\"description\":\"Path to the file to write (relative or absolute)\"},\"content\":{\"type\":\"string\",\"description\":\"Content to write to the file\"}}},\"constrainedSampling\":{\"type\":\"json_schema\",\"strict\":\"prefer\"}}]}}"}
+{"dir":"out","raw":"{\"type\":\"message_start\",\"message\":{\"role\":\"user\",\"content\":[{\"type\":\"text\",\"text\":\"Reply exactly RPC_CAPTURE_OK.\"}],\"timestamp\":1791279374657}}"}
+{"dir":"out","raw":"{\"type\":\"message_end\",\"message\":{\"role\":\"user\",\"content\":[{\"type\":\"text\",\"text\":\"Reply exactly RPC_CAPTURE_OK.\"}],\"timestamp\":1791279374657}}"}
+{"dir":"out","raw":"{\"type\":\"message_start\",\"message\":{\"role\":\"assistant\",\"content\":[],\"api\":\"openai-codex-responses\",\"provider\":\"openai-codex\",\"model\":\"gpt-5.5\",\"usage\":{\"input\":0,\"output\":0,\"cacheRead\":0,\"cacheWrite\":0,\"totalTokens\":0,\"cost\":{\"input\":0,\"output\":0,\"cacheRead\":0,\"cacheWrite\":0,\"total\":0}},\"stopReason\":\"error\",\"timestamp\":1791279374699,\"diagnostics\":[{\"type\":\"provider_transport_failure\",\"timestamp\":1791279385277,\"error\":{\"name\":\"Error\",\"message\":\"WebSocket error\",\"stack\":\"Error: WebSocket error\\n    at extractWebSocketError (file:///Users/xxxxxxxxxxxx/orca-qa/task_7daea3cb4c53/pi-1.0.4/node_modules/@earendil-works/pi-ai/dist/api/openai-codex-responses.js:973:12)\\n    at WebSocket.onError (file:///Users/xxxxxxxxxxxx/orca-qa/task_7daea3cb4c53/pi-1.0.4/node_modules/@earendil-works/pi-ai/dist/api/openai-codex-responses.js:845:18)\\n    at [nodejs.internal.kHybridDispatch] (node:internal/event_target:856:20)\\n    at WebSocket.dispatchEvent (node:internal/event_target:789:26)\\n    at fireEvent (/Users/xxxxxxxxxxxx/orca-qa/task_7daea3cb4c53/pi-1.0.4/node_modules/undici/lib/web/websocket/util.js:69:10)\\n    at #onSocketClose (/Users/xxxxxxxxxxxx/orca-qa/task_7daea3cb4c53/pi-1.0.4/node_modules/undici/lib/web/websocket/websocket.js:630:7)\\n    at Object.onSocketClose (/Users/xxxxxxxxxxxx/orca-qa/task_7daea3cb4c53/pi-1.0.4/node_modules/undici/lib/web/websocket/websocket.js:99:45)\\n    at failWebsocketConnection (/Users/xxxxxxxxxxxx/orca-qa/task_7daea3cb4c53/pi-1.0.4/node_modules/undici/lib/web/websocket/connection.js:319:13)\\n    at Object.processResponse (/Users/xxxxxxxxxxxx/orca-qa/task_7daea3cb4c53/pi-1.0.4/node_modules/undici/lib/web/websocket/connection.js:104:11)\\n    at /Users/xxxxxxxxxxxx/orca-qa/task_7daea3cb4c53/pi-1.0.4/node_modules/undici/lib/web/fetch/index.js:1120:19\"},\"details\":{\"configuredTransport\":\"auto\",\"fallbackTransport\":\"sse\",\"eventsEmitted\":false,\"phase\":\"before_message_stream_start\",\"requestBytes\":3761}}],\"errorMessage\":\"fetch failed\",\"thinkingLevel\":\"off\"}}"}
+{"dir":"out","raw":"{\"type\":\"message_end\",\"message\":{\"role\":\"assistant\",\"content\":[],\"api\":\"openai-codex-responses\",\"provider\":\"openai-codex\",\"model\":\"gpt-5.5\",\"usage\":{\"input\":0,\"output\":0,\"cacheRead\":0,\"cacheWrite\":0,\"totalTokens\":0,\"cost\":{\"input\":0,\"output\":0,\"cacheRead\":0,\"cacheWrite\":0,\"total\":0}},\"stopReason\":\"error\",\"timestamp\":1791279374699,\"diagnostics\":[{\"type\":\"provider_transport_failure\",\"timestamp\":1791279385277,\"error\":{\"name\":\"Error\",\"message\":\"WebSocket error\",\"stack\":\"Error: WebSocket error\\n    at extractWebSocketError (file:///Users/xxxxxxxxxxxx/orca-qa/task_7daea3cb4c53/pi-1.0.4/node_modules/@earendil-works/pi-ai/dist/api/openai-codex-responses.js:973:12)\\n    at WebSocket.onError (file:///Users/xxxxxxxxxxxx/orca-qa/task_7daea3cb4c53/pi-1.0.4/node_modules/@earendil-works/pi-ai/dist/api/openai-codex-responses.js:845:18)\\n    at [nodejs.internal.kHybridDispatch] (node:internal/event_target:856:20)\\n    at WebSocket.dispatchEvent (node:internal/event_target:789:26)\\n    at fireEvent (/Users/xxxxxxxxxxxx/orca-qa/task_7daea3cb4c53/pi-1.0.4/node_modules/undici/lib/web/websocket/util.js:69:10)\\n    at #onSocketClose (/Users/xxxxxxxxxxxx/orca-qa/task_7daea3cb4c53/pi-1.0.4/node_modules/undici/lib/web/websocket/websocket.js:630:7)\\n    at Object.onSocketClose (/Users/xxxxxxxxxxxx/orca-qa/task_7daea3cb4c53/pi-1.0.4/node_modules/undici/lib/web/websocket/websocket.js:99:45)\\n    at failWebsocketConnection (/Users/xxxxxxxxxxxx/orca-qa/task_7daea3cb4c53/pi-1.0.4/node_modules/undici/lib/web/websocket/connection.js:319:13)\\n    at Object.processResponse (/Users/xxxxxxxxxxxx/orca-qa/task_7daea3cb4c53/pi-1.0.4/node_modules/undici/lib/web/websocket/connection.js:104:11)\\n    at /Users/xxxxxxxxxxxx/orca-qa/task_7daea3cb4c53/pi-1.0.4/node_modules/undici/lib/web/fetch/index.js:1120:19\"},\"details\":{\"configuredTransport\":\"auto\",\"fallbackTransport\":\"sse\",\"eventsEmitted\":false,\"phase\":\"before_message_stream_start\",\"requestBytes\":3761}}],\"errorMessage\":\"fetch failed\",\"thinkingLevel\":\"off\"}}"}
+{"dir":"out","raw":"{\"type\":\"turn_end\",\"message\":{\"role\":\"assistant\",\"content\":[],\"api\":\"openai-codex-responses\",\"provider\":\"openai-codex\",\"model\":\"gpt-5.5\",\"usage\":{\"input\":0,\"output\":0,\"cacheRead\":0,\"cacheWrite\":0,\"totalTokens\":0,\"cost\":{\"input\":0,\"output\":0,\"cacheRead\":0,\"cacheWrite\":0,\"total\":0}},\"stopReason\":\"error\",\"timestamp\":1791279374699,\"diagnostics\":[{\"type\":\"provider_transport_failure\",\"timestamp\":1791279385277,\"error\":{\"name\":\"Error\",\"message\":\"WebSocket error\",\"stack\":\"Error: WebSocket error\\n    at extractWebSocketError (file:///Users/xxxxxxxxxxxx/orca-qa/task_7daea3cb4c53/pi-1.0.4/node_modules/@earendil-works/pi-ai/dist/api/openai-codex-responses.js:973:12)\\n    at WebSocket.onError (file:///Users/xxxxxxxxxxxx/orca-qa/task_7daea3cb4c53/pi-1.0.4/node_modules/@earendil-works/pi-ai/dist/api/openai-codex-responses.js:845:18)\\n    at [nodejs.internal.kHybridDispatch] (node:internal/event_target:856:20)\\n    at WebSocket.dispatchEvent (node:internal/event_target:789:26)\\n    at fireEvent (/Users/xxxxxxxxxxxx/orca-qa/task_7daea3cb4c53/pi-1.0.4/node_modules/undici/lib/web/websocket/util.js:69:10)\\n    at #onSocketClose (/Users/xxxxxxxxxxxx/orca-qa/task_7daea3cb4c53/pi-1.0.4/node_modules/undici/lib/web/websocket/websocket.js:630:7)\\n    at Object.onSocketClose (/Users/xxxxxxxxxxxx/orca-qa/task_7daea3cb4c53/pi-1.0.4/node_modules/undici/lib/web/websocket/websocket.js:99:45)\\n    at failWebsocketConnection (/Users/xxxxxxxxxxxx/orca-qa/task_7daea3cb4c53/pi-1.0.4/node_modules/undici/lib/web/websocket/connection.js:319:13)\\n    at Object.processResponse (/Users/xxxxxxxxxxxx/orca-qa/task_7daea3cb4c53/pi-1.0.4/node_modules/undici/lib/web/websocket/connection.js:104:11)\\n    at /Users/xxxxxxxxxxxx/orca-qa/task_7daea3cb4c53/pi-1.0.4/node_modules/undici/lib/web/fetch/index.js:1120:19\"},\"details\":{\"configuredTransport\":\"auto\",\"fallbackTransport\":\"sse\",\"eventsEmitted\":false,\"phase\":\"before_message_stream_start\",\"requestBytes\":3761}}],\"errorMessage\":\"fetch failed\",\"thinkingLevel\":\"off\"},\"toolResults\":[]}"}
+{"dir":"out","raw":"{\"type\":\"agent_end\",\"messages\":[{\"role\":\"system\",\"content\":\"\",\"sections\":{\"preamble\":\"You are a protocol capture assistant. Follow exact requests and use only the requested tools. Read and write only within this project. Never read credentials, home directories, or account details.\",\"cwd\":\"<cwd>\\n/Users/xxxxxxxxxxxx/orca-qa/task_7daea3cb4c53/projects/pi/basic-r2\\n</cwd>\"},\"timestamp\":1791279374657,\"toolsAdded\":[{\"name\":\"read\",\"description\":\"Read the contents of a file. Supports text files and images (jpg, png, gif, webp, bmp). Images are sent as attachments. For text files, output is truncated to 2000 lines or 50KB (whichever is hit first). Use offset/limit for large files. When you need the full file, continue with offset until complete.\",\"parameters\":{\"type\":\"object\",\"required\":[\"path\"],\"properties\":{\"path\":{\"type\":\"string\",\"description\":\"Path to the file to read (relative or absolute)\"},\"offset\":{\"type\":\"number\",\"description\":\"Line number to start reading from (1-indexed)\"},\"limit\":{\"type\":\"number\",\"description\":\"Maximum number of lines to read\"}}},\"constrainedSampling\":{\"type\":\"json_schema\",\"strict\":\"prefer\"}},{\"name\":\"bash\",\"description\":\"Execute a bash command in the current working directory. Returns stdout and stderr. Output is truncated to last 2000 lines or 50KB (whichever is hit first). If truncated, full output is saved to a temp file. Optionally provide a timeout in seconds.\",\"parameters\":{\"type\":\"object\",\"required\":[\"command\"],\"properties\":{\"command\":{\"type\":\"string\",\"description\":\"Shell command to execute\"},\"timeout\":{\"type\":\"number\",\"description\":\"Timeout in seconds (optional, no default timeout)\"}}},\"constrainedSampling\":{\"type\":\"json_schema\",\"strict\":\"prefer\"}},{\"name\":\"edit\",\"description\":\"Edit a single file using exact text replacement. Every edits[].oldText must match a unique, non-overlapping region of the original file. If two changes affect the same block or nearby lines, merge them into one edit instead of emitting overlapping edits. Do not include large unchanged regions just to connect distant changes.\",\"parameters\":{\"type\":\"object\",\"required\":[\"path\",\"edits\"],\"properties\":{\"path\":{\"type\":\"string\",\"description\":\"Path to the file to edit (relative or absolute)\"},\"edits\":{\"type\":\"array\",\"items\":{\"type\":\"object\",\"required\":[\"oldText\",\"newText\"],\"properties\":{\"oldText\":{\"type\":\"string\",\"description\":\"Exact text for one targeted replacement. It must be unique in the original file and must not overlap with any other edits[].oldText in the same call.\"},\"newText\":{\"type\":\"string\",\"description\":\"Replacement text for this targeted edit.\"}}},\"description\":\"One or more targeted replacements. Each edit is matched against the original file, not incrementally. Do not include overlapping or nested edits. If two changes touch the same block or nearby lines, merge them into one edit instead.\"}}},\"constrainedSampling\":{\"type\":\"json_schema\",\"strict\":\"prefer\"}},{\"name\":\"write\",\"description\":\"Write content to a file. Creates the file if it doesn't exist, overwrites if it does. Automatically creates parent directories.\",\"parameters\":{\"type\":\"object\",\"required\":[\"path\",\"content\"],\"properties\":{\"path\":{\"type\":\"string\",\"description\":\"Path to the file to write (relative or absolute)\"},\"content\":{\"type\":\"string\",\"description\":\"Content to write to the file\"}}},\"constrainedSampling\":{\"type\":\"json_schema\",\"strict\":\"prefer\"}}]},{\"role\":\"user\",\"content\":[{\"type\":\"text\",\"text\":\"Reply exactly RPC_CAPTURE_OK.\"}],\"timestamp\":1791279374657},{\"role\":\"assistant\",\"content\":[],\"api\":\"openai-codex-responses\",\"provider\":\"openai-codex\",\"model\":\"gpt-5.5\",\"usage\":{\"input\":0,\"output\":0,\"cacheRead\":0,\"cacheWrite\":0,\"totalTokens\":0,\"cost\":{\"input\":0,\"output\":0,\"cacheRead\":0,\"cacheWrite\":0,\"total\":0}},\"stopReason\":\"error\",\"timestamp\":1791279374699,\"diagnostics\":[{\"type\":\"provider_transport_failure\",\"timestamp\":1791279385277,\"error\":{\"name\":\"Error\",\"message\":\"WebSocket error\",\"stack\":\"Error: WebSocket error\\n    at extractWebSocketError (file:///Users/xxxxxxxxxxxx/orca-qa/task_7daea3cb4c53/pi-1.0.4/node_modules/@earendil-works/pi-ai/dist/api/openai-codex-responses.js:973:12)\\n    at WebSocket.onError (file:///Users/xxxxxxxxxxxx/orca-qa/task_7daea3cb4c53/pi-1.0.4/node_modules/@earendil-works/pi-ai/dist/api/openai-codex-responses.js:845:18)\\n    at [nodejs.internal.kHybridDispatch] (node:internal/event_target:856:20)\\n    at WebSocket.dispatchEvent (node:internal/event_target:789:26)\\n    at fireEvent (/Users/xxxxxxxxxxxx/orca-qa/task_7daea3cb4c53/pi-1.0.4/node_modules/undici/lib/web/websocket/util.js:69:10)\\n    at #onSocketClose (/Users/xxxxxxxxxxxx/orca-qa/task_7daea3cb4c53/pi-1.0.4/node_modules/undici/lib/web/websocket/websocket.js:630:7)\\n    at Object.onSocketClose (/Users/xxxxxxxxxxxx/orca-qa/task_7daea3cb4c53/pi-1.0.4/node_modules/undici/lib/web/websocket/websocket.js:99:45)\\n    at failWebsocketConnection (/Users/xxxxxxxxxxxx/orca-qa/task_7daea3cb4c53/pi-1.0.4/node_modules/undici/lib/web/websocket/connection.js:319:13)\\n    at Object.processResponse (/Users/xxxxxxxxxxxx/orca-qa/task_7daea3cb4c53/pi-1.0.4/node_modules/undici/lib/web/websocket/connection.js:104:11)\\n    at /Users/xxxxxxxxxxxx/orca-qa/task_7daea3cb4c53/pi-1.0.4/node_modules/undici/lib/web/fetch/index.js:1120:19\"},\"details\":{\"configuredTransport\":\"auto\",\"fallbackTransport\":\"sse\",\"eventsEmitted\":false,\"phase\":\"before_message_stream_start\",\"requestBytes\":3761}}],\"errorMessage\":\"fetch failed\",\"thinkingLevel\":\"off\"}],\"willRetry\":false}"}
+{"dir":"in","raw":"{\"id\": \"q8\", \"type\": \"get_state\"}"}
+{"dir":"out","raw":"{\"type\":\"agent_settled\"}"}
+{"dir":"out","raw":"{\"id\":\"q8\",\"type\":\"response\",\"command\":\"get_state\",\"success\":true,\"data\":{\"model\":{\"id\":\"gpt-5.5\",\"name\":\"GPT-5.5\",\"api\":\"openai-codex-responses\",\"provider\":\"openai-codex\",\"baseUrl\":\"https://chatgpt.com/backend-api\",\"reasoning\":true,\"input\":[\"text\",\"image\"],\"cost\":{\"input\":5,\"output\":30,\"cacheRead\":0.5,\"cacheWrite\":0,\"tiers\":[{\"inputTokensAbove\":272000,\"input\":10,\"output\":45,\"cacheRead\":1,\"cacheWrite\":0}]},\"contextWindow\":272000,\"maxTokens\":128000,\"thinkingLevelMap\":{\"xhigh\":\"xhigh\",\"minimal\":\"low\"},\"compat\":{\"supportsOpenAIGrammarTools\":true,\"supportsToolSearch\":true,\"supportsMidConvoSystemMessages\":true},\"inputLimits\":{\"images\":{\"resize\":{\"maxWidth\":2000,\"maxHeight\":2000,\"maxBytes\":4718592,\"jpegQuality\":80}}},\"type\":\"chat\"},\"thinkingLevel\":\"off\",\"isStreaming\":false,\"isCompacting\":false,\"steeringMode\":\"one-at-a-time\",\"followUpMode\":\"one-at-a-time\",\"sessionFile\":\"/Users/xxxxxxxxxxxx/orca-qa/task_7daea3cb4c53/projects/pi/basic-r2/sessions/XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX.jsonl\",\"sessionId\":\"00000000-0000-4000-8000-000000000017\",\"autoCompactionEnabled\":false,\"messageCount\":3,\"pendingMessageCount\":0}}"}
+{"dir":"in","raw":"{\"id\": \"q9\", \"type\": \"get_session_stats\"}"}
+{"dir":"out","raw":"{\"id\":\"q9\",\"type\":\"response\",\"command\":\"get_session_stats\",\"success\":true,\"data\":{\"sessionFile\":\"/Users/xxxxxxxxxxxx/orca-qa/task_7daea3cb4c53/projects/pi/basic-r2/sessions/XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX.jsonl\",\"sessionId\":\"00000000-0000-4000-8000-000000000017\",\"userMessages\":1,\"assistantMessages\":1,\"toolCalls\":0,\"toolResults\":0,\"totalMessages\":3,\"tokens\":{\"input\":0,\"output\":0,\"cacheRead\":0,\"cacheWrite\":0,\"total\":0},\"cost\":0,\"contextUsage\":{\"tokens\":820,\"contextWindow\":272000,\"percent\":0.3014705882352941}}}"}
+{"dir":"in","raw":"{\"id\": \"q10\", \"type\": \"get_messages\"}"}
+{"dir":"out","raw":"{\"id\":\"q10\",\"type\":\"response\",\"command\":\"get_messages\",\"success\":true,\"data\":{\"messages\":[{\"role\":\"system\",\"content\":\"\",\"sections\":{\"preamble\":\"You are a protocol capture assistant. Follow exact requests and use only the requested tools. Read and write only within this project. Never read credentials, home directories, or account details.\",\"cwd\":\"<cwd>\\n/Users/xxxxxxxxxxxx/orca-qa/task_7daea3cb4c53/projects/pi/basic-r2\\n</cwd>\"},\"timestamp\":1791279374657,\"toolsAdded\":[{\"name\":\"read\",\"description\":\"Read the contents of a file. Supports text files and images (jpg, png, gif, webp, bmp). Images are sent as attachments. For text files, output is truncated to 2000 lines or 50KB (whichever is hit first). Use offset/limit for large files. When you need the full file, continue with offset until complete.\",\"parameters\":{\"type\":\"object\",\"required\":[\"path\"],\"properties\":{\"path\":{\"type\":\"string\",\"description\":\"Path to the file to read (relative or absolute)\"},\"offset\":{\"type\":\"number\",\"description\":\"Line number to start reading from (1-indexed)\"},\"limit\":{\"type\":\"number\",\"description\":\"Maximum number of lines to read\"}}},\"constrainedSampling\":{\"type\":\"json_schema\",\"strict\":\"prefer\"}},{\"name\":\"bash\",\"description\":\"Execute a bash command in the current working directory. Returns stdout and stderr. Output is truncated to last 2000 lines or 50KB (whichever is hit first). If truncated, full output is saved to a temp file. Optionally provide a timeout in seconds.\",\"parameters\":{\"type\":\"object\",\"required\":[\"command\"],\"properties\":{\"command\":{\"type\":\"string\",\"description\":\"Shell command to execute\"},\"timeout\":{\"type\":\"number\",\"description\":\"Timeout in seconds (optional, no default timeout)\"}}},\"constrainedSampling\":{\"type\":\"json_schema\",\"strict\":\"prefer\"}},{\"name\":\"edit\",\"description\":\"Edit a single file using exact text replacement. Every edits[].oldText must match a unique, non-overlapping region of the original file. If two changes affect the same block or nearby lines, merge them into one edit instead of emitting overlapping edits. Do not include large unchanged regions just to connect distant changes.\",\"parameters\":{\"type\":\"object\",\"required\":[\"path\",\"edits\"],\"properties\":{\"path\":{\"type\":\"string\",\"description\":\"Path to the file to edit (relative or absolute)\"},\"edits\":{\"type\":\"array\",\"items\":{\"type\":\"object\",\"required\":[\"oldText\",\"newText\"],\"properties\":{\"oldText\":{\"type\":\"string\",\"description\":\"Exact text for one targeted replacement. It must be unique in the original file and must not overlap with any other edits[].oldText in the same call.\"},\"newText\":{\"type\":\"string\",\"description\":\"Replacement text for this targeted edit.\"}}},\"description\":\"One or more targeted replacements. Each edit is matched against the original file, not incrementally. Do not include overlapping or nested edits. If two changes touch the same block or nearby lines, merge them into one edit instead.\"}}},\"constrainedSampling\":{\"type\":\"json_schema\",\"strict\":\"prefer\"}},{\"name\":\"write\",\"description\":\"Write content to a file. Creates the file if it doesn't exist, overwrites if it does. Automatically creates parent directories.\",\"parameters\":{\"type\":\"object\",\"required\":[\"path\",\"content\"],\"properties\":{\"path\":{\"type\":\"string\",\"description\":\"Path to the file to write (relative or absolute)\"},\"content\":{\"type\":\"string\",\"description\":\"Content to write to the file\"}}},\"constrainedSampling\":{\"type\":\"json_schema\",\"strict\":\"prefer\"}}]},{\"role\":\"user\",\"content\":[{\"type\":\"text\",\"text\":\"Reply exactly RPC_CAPTURE_OK.\"}],\"timestamp\":1791279374657},{\"role\":\"assistant\",\"content\":[],\"api\":\"openai-codex-responses\",\"provider\":\"openai-codex\",\"model\":\"gpt-5.5\",\"usage\":{\"input\":0,\"output\":0,\"cacheRead\":0,\"cacheWrite\":0,\"totalTokens\":0,\"cost\":{\"input\":0,\"output\":0,\"cacheRead\":0,\"cacheWrite\":0,\"total\":0}},\"stopReason\":\"error\",\"timestamp\":1791279374699,\"diagnostics\":[{\"type\":\"provider_transport_failure\",\"timestamp\":1791279385277,\"error\":{\"name\":\"Error\",\"message\":\"WebSocket error\",\"stack\":\"Error: WebSocket error\\n    at extractWebSocketError (file:///Users/xxxxxxxxxxxx/orca-qa/task_7daea3cb4c53/pi-1.0.4/node_modules/@earendil-works/pi-ai/dist/api/openai-codex-responses.js:973:12)\\n    at WebSocket.onError (file:///Users/xxxxxxxxxxxx/orca-qa/task_7daea3cb4c53/pi-1.0.4/node_modules/@earendil-works/pi-ai/dist/api/openai-codex-responses.js:845:18)\\n    at [nodejs.internal.kHybridDispatch] (node:internal/event_target:856:20)\\n    at WebSocket.dispatchEvent (node:internal/event_target:789:26)\\n    at fireEvent (/Users/xxxxxxxxxxxx/orca-qa/task_7daea3cb4c53/pi-1.0.4/node_modules/undici/lib/web/websocket/util.js:69:10)\\n    at #onSocketClose (/Users/xxxxxxxxxxxx/orca-qa/task_7daea3cb4c53/pi-1.0.4/node_modules/undici/lib/web/websocket/websocket.js:630:7)\\n    at Object.onSocketClose (/Users/xxxxxxxxxxxx/orca-qa/task_7daea3cb4c53/pi-1.0.4/node_modules/undici/lib/web/websocket/websocket.js:99:45)\\n    at failWebsocketConnection (/Users/xxxxxxxxxxxx/orca-qa/task_7daea3cb4c53/pi-1.0.4/node_modules/undici/lib/web/websocket/connection.js:319:13)\\n    at Object.processResponse (/Users/xxxxxxxxxxxx/orca-qa/task_7daea3cb4c53/pi-1.0.4/node_modules/undici/lib/web/websocket/connection.js:104:11)\\n    at /Users/xxxxxxxxxxxx/orca-qa/task_7daea3cb4c53/pi-1.0.4/node_modules/undici/lib/web/fetch/index.js:1120:19\"},\"details\":{\"configuredTransport\":\"auto\",\"fallbackTransport\":\"sse\",\"eventsEmitted\":false,\"phase\":\"before_message_stream_start\",\"requestBytes\":3761}}],\"errorMessage\":\"fetch failed\",\"thinkingLevel\":\"off\"}]}}"}
diff --git a/src/main/pi/__fixtures__/provider-socket-error.jsonl b/src/main/pi/__fixtures__/provider-socket-error.jsonl
new file mode 100644
index 000000000000..f54d5804761d
--- /dev/null
+++ b/src/main/pi/__fixtures__/provider-socket-error.jsonl
@@ -0,0 +1,32 @@
+{"dir":"in","raw":"{\"id\": \"q1\", \"type\": \"get_state\"}"}
+{"dir":"out","raw":"{\"id\":\"q1\",\"type\":\"response\",\"command\":\"get_state\",\"success\":true,\"data\":{\"model\":{\"id\":\"gpt-6.1-sol\",\"name\":\"GPT-6.1 Sol\",\"api\":\"openai-codex-responses\",\"provider\":\"openai-codex\",\"baseUrl\":\"https://chatgpt.com/backend-api\",\"reasoning\":true,\"input\":[\"text\",\"image\"],\"cost\":{\"input\":2,\"output\":10,\"cacheRead\":0.1,\"cacheWrite\":2.5,\"tiers\":[{\"inputTokensAbove\":272000,\"input\":4,\"output\":15,\"cacheRead\":0.2,\"cacheWrite\":5}]},\"contextWindow\":272000,\"maxTokens\":128000,\"thinkingLevelMap\":{\"off\":null,\"minimal\":\"low\",\"low\":\"low\",\"medium\":\"medium\",\"high\":\"high\",\"xhigh\":\"xhigh\",\"max\":\"max\"},\"compat\":{\"supportsOpenAIGrammarTools\":true,\"supportsAdditionalTools\":true,\"supportsToolSearch\":true,\"supportsMidConvoSystemMessages\":true},\"inputLimits\":{\"images\":{\"resize\":{\"maxWidth\":2000,\"maxHeight\":2000,\"maxBytes\":4718592,\"jpegQuality\":80}}},\"type\":\"chat\"},\"thinkingLevel\":\"medium\",\"isStreaming\":false,\"isCompacting\":false,\"steeringMode\":\"one-at-a-time\",\"followUpMode\":\"one-at-a-time\",\"sessionFile\":\"/Users/xxxxxxxxxxxx/orca-qa/task_7daea3cb4c53/projects/pi/tool-bun/sessions/XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX.jsonl\",\"sessionId\":\"00000000-0000-4000-8000-000000000018\",\"autoCompactionEnabled\":true,\"messageCount\":0,\"pendingMessageCount\":0}}"}
+{"dir":"in","raw":"{\"id\": \"q2\", \"type\": \"set_auto_retry\", \"enabled\": false}"}
+{"dir":"out","raw":"{\"id\":\"q2\",\"type\":\"response\",\"command\":\"set_auto_retry\",\"success\":true}"}
+{"dir":"in","raw":"{\"id\": \"q3\", \"type\": \"set_auto_compaction\", \"enabled\": false}"}
+{"dir":"out","raw":"{\"id\":\"q3\",\"type\":\"response\",\"command\":\"set_auto_compaction\",\"success\":true}"}
+{"dir":"in","raw":"{\"id\": \"q4\", \"type\": \"get_available_models\"}"}
+{"dir":"out","raw":"{\"id\":\"q4\",\"type\":\"response\",\"command\":\"get_available_models\",\"success\":true,\"data\":{\"models\":[{\"id\":\"gpt-5.3-codex-spark\",\"name\":\"GPT-5.3 Codex Spark\",\"api\":\"openai-codex-responses\",\"provider\":\"openai-codex\",\"baseUrl\":\"https://chatgpt.com/backend-api\",\"reasoning\":true,\"input\":[\"text\"],\"cost\":{\"input\":1.75,\"output\":14,\"cacheRead\":0.175,\"cacheWrite\":0},\"contextWindow\":128000,\"maxTokens\":128000,\"thinkingLevelMap\":{\"xhigh\":\"xhigh\",\"minimal\":\"low\"},\"compat\":{\"supportsOpenAIGrammarTools\":true},\"type\":\"chat\"},{\"id\":\"gpt-5.5\",\"name\":\"GPT-5.5\",\"api\":\"openai-codex-responses\",\"provider\":\"openai-codex\",\"baseUrl\":\"https://chatgpt.com/backend-api\",\"reasoning\":true,\"input\":[\"text\",\"image\"],\"cost\":{\"input\":5,\"output\":30,\"cacheRead\":0.5,\"cacheWrite\":0,\"tiers\":[{\"inputTokensAbove\":272000,\"input\":10,\"output\":45,\"cacheRead\":1,\"cacheWrite\":0}]},\"contextWindow\":272000,\"maxTokens\":128000,\"thinkingLevelMap\":{\"xhigh\":\"xhigh\",\"minimal\":\"low\"},\"compat\":{\"supportsOpenAIGrammarTools\":true,\"supportsToolSearch\":true,\"supportsMidConvoSystemMessages\":true},\"inputLimits\":{\"images\":{\"resize\":{\"maxWidth\":2000,\"maxHeight\":2000,\"maxBytes\":4718592,\"jpegQuality\":80}}},\"type\":\"chat\"},{\"id\":\"gpt-5.6-luna\",\"name\":\"GPT-5.6 Luna\",\"api\":\"openai-codex-responses\",\"provider\":\"openai-codex\",\"baseUrl\":\"https://chatgpt.com/backend-api\",\"reasoning\":true,\"input\":[\"text\",\"image\"],\"cost\":{\"input\":0.2,\"output\":1.2,\"cacheRead\":0.02,\"cacheWrite\":0.25,\"tiers\":[{\"inputTokensAbove\":272000,\"input\":0.4,\"output\":1.8,\"cacheRead\":0.04,\"cacheWrite\":0.5}]},\"contextWindow\":272000,\"maxTokens\":128000,\"thinkingLevelMap\":{\"xhigh\":\"xhigh\",\"max\":\"max\",\"minimal\":\"low\"},\"compat\":{\"supportsOpenAIGrammarTools\":true,\"supportsAdditionalTools\":true,\"supportsToolSearch\":true,\"supportsMidConvoSystemMessages\":true},\"inputLimits\":{\"images\":{\"resize\":{\"maxWidth\":2000,\"maxHeight\":2000,\"maxBytes\":4718592,\"jpegQuality\":80}}},\"type\":\"chat\"},{\"id\":\"gpt-5.6-sol\",\"name\":\"GPT-5.6 Sol\",\"api\":\"openai-codex-responses\",\"provider\":\"openai-codex\",\"baseUrl\":\"https://chatgpt.com/backend-api\",\"reasoning\":true,\"input\":[\"text\",\"image\"],\"cost\":{\"input\":4,\"output\":20,\"cacheRead\":0.4,\"cacheWrite\":5,\"tiers\":[{\"inputTokensAbove\":272000,\"input\":8,\"output\":30,\"cacheRead\":0.8,\"cacheWrite\":10}]},\"contextWindow\":272000,\"maxTokens\":128000,\"thinkingLevelMap\":{\"xhigh\":\"xhigh\",\"max\":\"max\",\"minimal\":\"low\"},\"compat\":{\"supportsOpenAIGrammarTools\":true,\"supportsAdditionalTools\":true,\"supportsToolSearch\":true,\"supportsMidConvoSystemMessages\":true},\"inputLimits\":{\"images\":{\"resize\":{\"maxWidth\":2000,\"maxHeight\":2000,\"maxBytes\":4718592,\"jpegQuality\":80}}},\"type\":\"chat\"},{\"id\":\"gpt-5.6-terra\",\"name\":\"GPT-5.6 Terra\",\"api\":\"openai-codex-responses\",\"provider\":\"openai-codex\",\"baseUrl\":\"https://chatgpt.com/backend-api\",\"reasoning\":true,\"input\":[\"text\",\"image\"],\"cost\":{\"input\":2,\"output\":12,\"cacheRead\":0.2,\"cacheWrite\":2.5,\"tiers\":[{\"inputTokensAbove\":272000,\"input\":4,\"output\":18,\"cacheRead\":0.4,\"cacheWrite\":5}]},\"contextWindow\":272000,\"maxTokens\":128000,\"thinkingLevelMap\":{\"xhigh\":\"xhigh\",\"max\":\"max\",\"minimal\":\"low\"},\"compat\":{\"supportsOpenAIGrammarTools\":true,\"supportsAdditionalTools\":true,\"supportsToolSearch\":true,\"supportsMidConvoSystemMessages\":true},\"inputLimits\":{\"images\":{\"resize\":{\"maxWidth\":2000,\"maxHeight\":2000,\"maxBytes\":4718592,\"jpegQuality\":80}}},\"type\":\"chat\"},{\"id\":\"gpt-6-astra\",\"name\":\"GPT-6 Astra\",\"api\":\"openai-codex-responses\",\"provider\":\"openai-codex\",\"baseUrl\":\"https://chatgpt.com/backend-api\",\"reasoning\":true,\"input\":[\"text\",\"image\"],\"cost\":{\"input\":10,\"output\":50,\"cacheRead\":1,\"cacheWrite\":12.5,\"tiers\":[{\"inputTokensAbove\":272000,\"input\":20,\"output\":75,\"cacheRead\":2,\"cacheWrite\":25}]},\"contextWindow\":272000,\"maxTokens\":128000,\"thinkingLevelMap\":{\"off\":null,\"minimal\":\"low\",\"low\":\"low\",\"medium\":\"medium\",\"high\":\"high\",\"xhigh\":\"xhigh\",\"max\":\"max\"},\"compat\":{\"supportsOpenAIGrammarTools\":true,\"supportsAdditionalTools\":true,\"supportsToolSearch\":true,\"supportsMidConvoSystemMessages\":true},\"inputLimits\":{\"images\":{\"resize\":{\"maxWidth\":2000,\"maxHeight\":2000,\"maxBytes\":4718592,\"jpegQuality\":80}}},\"type\":\"chat\"},{\"id\":\"gpt-6-luna\",\"name\":\"GPT-6 Luna\",\"api\":\"openai-codex-responses\",\"provider\":\"openai-codex\",\"baseUrl\":\"https://chatgpt.com/backend-api\",\"reasoning\":true,\"input\":[\"text\",\"image\"],\"cost\":{\"input\":0.1,\"output\":0.5,\"cacheRead\":0.01,\"cacheWrite\":0.125,\"tiers\":[{\"inputTokensAbove\":272000,\"input\":0.2,\"output\":0.75,\"cacheRead\":0.02,\"cacheWrite\":0.25}]},\"contextWindow\":272000,\"maxTokens\":128000,\"thinkingLevelMap\":{\"off\":\"none\",\"minimal\":\"low\",\"low\":\"low\",\"medium\":\"medium\",\"high\":\"high\",\"xhigh\":\"xhigh\",\"max\":\"max\"},\"compat\":{\"supportsOpenAIGrammarTools\":true,\"supportsAdditionalTools\":true,\"supportsToolSearch\":true,\"supportsMidConvoSystemMessages\":true},\"inputLimits\":{\"images\":{\"resize\":{\"maxWidth\":2000,\"maxHeight\":2000,\"maxBytes\":4718592,\"jpegQuality\":80}}},\"type\":\"chat\"},{\"id\":\"gpt-6-sol\",\"name\":\"GPT-6 Sol\",\"api\":\"openai-codex-responses\",\"provider\":\"openai-codex\",\"baseUrl\":\"https://chatgpt.com/backend-api\",\"reasoning\":true,\"input\":[\"text\",\"image\"],\"cost\":{\"input\":2,\"output\":10,\"cacheRead\":0.2,\"cacheWrite\":2.5,\"tiers\":[{\"inputTokensAbove\":272000,\"input\":4,\"output\":15,\"cacheRead\":0.4,\"cacheWrite\":5}]},\"contextWindow\":272000,\"maxTokens\":128000,\"thinkingLevelMap\":{\"off\":\"none\",\"minimal\":\"low\",\"low\":\"low\",\"medium\":\"medium\",\"high\":\"high\",\"xhigh\":\"xhigh\",\"max\":\"max\"},\"compat\":{\"supportsOpenAIGrammarTools\":true,\"supportsAdditionalTools\":true,\"supportsToolSearch\":true,\"supportsMidConvoSystemMessages\":true},\"inputLimits\":{\"images\":{\"resize\":{\"maxWidth\":2000,\"maxHeight\":2000,\"maxBytes\":4718592,\"jpegQuality\":80}}},\"type\":\"chat\"},{\"id\":\"gpt-6.1-sol\",\"name\":\"GPT-6.1 Sol\",\"api\":\"openai-codex-responses\",\"provider\":\"openai-codex\",\"baseUrl\":\"https://chatgpt.com/backend-api\",\"reasoning\":true,\"input\":[\"text\",\"image\"],\"cost\":{\"input\":2,\"output\":10,\"cacheRead\":0.1,\"cacheWrite\":2.5,\"tiers\":[{\"inputTokensAbove\":272000,\"input\":4,\"output\":15,\"cacheRead\":0.2,\"cacheWrite\":5}]},\"contextWindow\":272000,\"maxTokens\":128000,\"thinkingLevelMap\":{\"off\":null,\"minimal\":\"low\",\"low\":\"low\",\"medium\":\"medium\",\"high\":\"high\",\"xhigh\":\"xhigh\",\"max\":\"max\"},\"compat\":{\"supportsOpenAIGrammarTools\":true,\"supportsAdditionalTools\":true,\"supportsToolSearch\":true,\"supportsMidConvoSystemMessages\":true},\"inputLimits\":{\"images\":{\"resize\":{\"maxWidth\":2000,\"maxHeight\":2000,\"maxBytes\":4718592,\"jpegQuality\":80}}},\"type\":\"chat\"}]}}"}
+{"dir":"in","raw":"{\"id\": \"q5\", \"type\": \"set_model\", \"provider\": \"openai-codex\", \"modelId\": \"gpt-5.5\"}"}
+{"dir":"out","raw":"{\"id\":\"q5\",\"type\":\"response\",\"command\":\"set_model\",\"success\":true,\"data\":{\"id\":\"gpt-5.5\",\"name\":\"GPT-5.5\",\"api\":\"openai-codex-responses\",\"provider\":\"openai-codex\",\"baseUrl\":\"https://chatgpt.com/backend-api\",\"reasoning\":true,\"input\":[\"text\",\"image\"],\"cost\":{\"input\":5,\"output\":30,\"cacheRead\":0.5,\"cacheWrite\":0,\"tiers\":[{\"inputTokensAbove\":272000,\"input\":10,\"output\":45,\"cacheRead\":1,\"cacheWrite\":0}]},\"contextWindow\":272000,\"maxTokens\":128000,\"thinkingLevelMap\":{\"xhigh\":\"xhigh\",\"minimal\":\"low\"},\"compat\":{\"supportsOpenAIGrammarTools\":true,\"supportsToolSearch\":true,\"supportsMidConvoSystemMessages\":true},\"inputLimits\":{\"images\":{\"resize\":{\"maxWidth\":2000,\"maxHeight\":2000,\"maxBytes\":4718592,\"jpegQuality\":80}}},\"type\":\"chat\"}}"}
+{"dir":"in","raw":"{\"id\": \"q6\", \"type\": \"set_thinking_level\", \"level\": \"off\"}"}
+{"dir":"out","raw":"{\"type\":\"thinking_level_changed\",\"level\":\"off\"}"}
+{"dir":"out","raw":"{\"id\":\"q6\",\"type\":\"response\",\"command\":\"set_thinking_level\",\"success\":true}"}
+{"dir":"in","raw":"{\"id\": \"q7\", \"type\": \"prompt\", \"message\": \"Use the write tool to create capture.txt containing exactly fixture-ok. Then use read to read capture.txt. Reply exactly TOOL_CAPTURE_OK.\"}"}
+{"dir":"out","raw":"{\"id\":\"q7\",\"type\":\"response\",\"command\":\"prompt\",\"success\":true,\"data\":{\"disposition\":\"started\"}}"}
+{"dir":"out","raw":"{\"type\":\"agent_start\"}"}
+{"dir":"out","raw":"{\"type\":\"turn_start\"}"}
+{"dir":"out","raw":"{\"type\":\"message_start\",\"message\":{\"role\":\"system\",\"content\":\"\",\"sections\":{\"preamble\":\"You are a protocol capture assistant. Follow exact requests and use only the requested tools. Read and write only within this project. Never read credentials, home directories, or account details.\",\"cwd\":\"<cwd>\\n/Users/xxxxxxxxxxxx/orca-qa/task_7daea3cb4c53/projects/pi/tool-bun\\n</cwd>\"},\"timestamp\":1791279674452,\"toolsAdded\":[{\"name\":\"read\",\"description\":\"Read the contents of a file. Supports text files and images (jpg, png, gif, webp, bmp). Images are sent as attachments. For text files, output is truncated to 2000 lines or 50KB (whichever is hit first). Use offset/limit for large files. When you need the full file, continue with offset until complete.\",\"parameters\":{\"type\":\"object\",\"required\":[\"path\"],\"properties\":{\"path\":{\"type\":\"string\",\"description\":\"Path to the file to read (relative or absolute)\"},\"offset\":{\"type\":\"number\",\"description\":\"Line number to start reading from (1-indexed)\"},\"limit\":{\"type\":\"number\",\"description\":\"Maximum number of lines to read\"}}},\"constrainedSampling\":{\"type\":\"json_schema\",\"strict\":\"prefer\"}},{\"name\":\"bash\",\"description\":\"Execute a bash command in the current working directory. Returns stdout and stderr. Output is truncated to last 2000 lines or 50KB (whichever is hit first). If truncated, full output is saved to a temp file. Optionally provide a timeout in seconds.\",\"parameters\":{\"type\":\"object\",\"required\":[\"command\"],\"properties\":{\"command\":{\"type\":\"string\",\"description\":\"Shell command to execute\"},\"timeout\":{\"type\":\"number\",\"description\":\"Timeout in seconds (optional, no default timeout)\"}}},\"constrainedSampling\":{\"type\":\"json_schema\",\"strict\":\"prefer\"}},{\"name\":\"edit\",\"description\":\"Edit a single file using exact text replacement. Every edits[].oldText must match a unique, non-overlapping region of the original file. If two changes affect the same block or nearby lines, merge them into one edit instead of emitting overlapping edits. Do not include large unchanged regions just to connect distant changes.\",\"parameters\":{\"type\":\"object\",\"required\":[\"path\",\"edits\"],\"properties\":{\"path\":{\"type\":\"string\",\"description\":\"Path to the file to edit (relative or absolute)\"},\"edits\":{\"type\":\"array\",\"items\":{\"type\":\"object\",\"required\":[\"oldText\",\"newText\"],\"properties\":{\"oldText\":{\"type\":\"string\",\"description\":\"Exact text for one targeted replacement. It must be unique in the original file and must not overlap with any other edits[].oldText in the same call.\"},\"newText\":{\"type\":\"string\",\"description\":\"Replacement text for this targeted edit.\"}}},\"description\":\"One or more targeted replacements. Each edit is matched against the original file, not incrementally. Do not include overlapping or nested edits. If two changes touch the same block or nearby lines, merge them into one edit instead.\"}}},\"constrainedSampling\":{\"type\":\"json_schema\",\"strict\":\"prefer\"}},{\"name\":\"write\",\"description\":\"Write content to a file. Creates the file if it doesn't exist, overwrites if it does. Automatically creates parent directories.\",\"parameters\":{\"type\":\"object\",\"required\":[\"path\",\"content\"],\"properties\":{\"path\":{\"type\":\"string\",\"description\":\"Path to the file to write (relative or absolute)\"},\"content\":{\"type\":\"string\",\"description\":\"Content to write to the file\"}}},\"constrainedSampling\":{\"type\":\"json_schema\",\"strict\":\"prefer\"}}]}}"}
+{"dir":"out","raw":"{\"type\":\"message_end\",\"message\":{\"role\":\"system\",\"content\":\"\",\"sections\":{\"preamble\":\"You are a protocol capture assistant. Follow exact requests and use only the requested tools. Read and write only within this project. Never read credentials, home directories, or account details.\",\"cwd\":\"<cwd>\\n/Users/xxxxxxxxxxxx/orca-qa/task_7daea3cb4c53/projects/pi/tool-bun\\n</cwd>\"},\"timestamp\":1791279674452,\"toolsAdded\":[{\"name\":\"read\",\"description\":\"Read the contents of a file. Supports text files and images (jpg, png, gif, webp, bmp). Images are sent as attachments. For text files, output is truncated to 2000 lines or 50KB (whichever is hit first). Use offset/limit for large files. When you need the full file, continue with offset until complete.\",\"parameters\":{\"type\":\"object\",\"required\":[\"path\"],\"properties\":{\"path\":{\"type\":\"string\",\"description\":\"Path to the file to read (relative or absolute)\"},\"offset\":{\"type\":\"number\",\"description\":\"Line number to start reading from (1-indexed)\"},\"limit\":{\"type\":\"number\",\"description\":\"Maximum number of lines to read\"}}},\"constrainedSampling\":{\"type\":\"json_schema\",\"strict\":\"prefer\"}},{\"name\":\"bash\",\"description\":\"Execute a bash command in the current working directory. Returns stdout and stderr. Output is truncated to last 2000 lines or 50KB (whichever is hit first). If truncated, full output is saved to a temp file. Optionally provide a timeout in seconds.\",\"parameters\":{\"type\":\"object\",\"required\":[\"command\"],\"properties\":{\"command\":{\"type\":\"string\",\"description\":\"Shell command to execute\"},\"timeout\":{\"type\":\"number\",\"description\":\"Timeout in seconds (optional, no default timeout)\"}}},\"constrainedSampling\":{\"type\":\"json_schema\",\"strict\":\"prefer\"}},{\"name\":\"edit\",\"description\":\"Edit a single file using exact text replacement. Every edits[].oldText must match a unique, non-overlapping region of the original file. If two changes affect the same block or nearby lines, merge them into one edit instead of emitting overlapping edits. Do not include large unchanged regions just to connect distant changes.\",\"parameters\":{\"type\":\"object\",\"required\":[\"path\",\"edits\"],\"properties\":{\"path\":{\"type\":\"string\",\"description\":\"Path to the file to edit (relative or absolute)\"},\"edits\":{\"type\":\"array\",\"items\":{\"type\":\"object\",\"required\":[\"oldText\",\"newText\"],\"properties\":{\"oldText\":{\"type\":\"string\",\"description\":\"Exact text for one targeted replacement. It must be unique in the original file and must not overlap with any other edits[].oldText in the same call.\"},\"newText\":{\"type\":\"string\",\"description\":\"Replacement text for this targeted edit.\"}}},\"description\":\"One or more targeted replacements. Each edit is matched against the original file, not incrementally. Do not include overlapping or nested edits. If two changes touch the same block or nearby lines, merge them into one edit instead.\"}}},\"constrainedSampling\":{\"type\":\"json_schema\",\"strict\":\"prefer\"}},{\"name\":\"write\",\"description\":\"Write content to a file. Creates the file if it doesn't exist, overwrites if it does. Automatically creates parent directories.\",\"parameters\":{\"type\":\"object\",\"required\":[\"path\",\"content\"],\"properties\":{\"path\":{\"type\":\"string\",\"description\":\"Path to the file to write (relative or absolute)\"},\"content\":{\"type\":\"string\",\"description\":\"Content to write to the file\"}}},\"constrainedSampling\":{\"type\":\"json_schema\",\"strict\":\"prefer\"}}]}}"}
+{"dir":"out","raw":"{\"type\":\"message_start\",\"message\":{\"role\":\"user\",\"content\":[{\"type\":\"text\",\"text\":\"Use the write tool to create capture.txt containing exactly fixture-ok. Then use read to read capture.txt. Reply exactly TOOL_CAPTURE_OK.\"}],\"timestamp\":1791279674451}}"}
+{"dir":"out","raw":"{\"type\":\"message_end\",\"message\":{\"role\":\"user\",\"content\":[{\"type\":\"text\",\"text\":\"Use the write tool to create capture.txt containing exactly fixture-ok. Then use read to read capture.txt. Reply exactly TOOL_CAPTURE_OK.\"}],\"timestamp\":1791279674451}}"}
+{"dir":"out","raw":"{\"type\":\"message_start\",\"message\":{\"role\":\"assistant\",\"content\":[],\"api\":\"openai-codex-responses\",\"provider\":\"openai-codex\",\"model\":\"gpt-5.5\",\"usage\":{\"input\":0,\"output\":0,\"cacheRead\":0,\"cacheWrite\":0,\"totalTokens\":0,\"cost\":{\"input\":0,\"output\":0,\"cacheRead\":0,\"cacheWrite\":0,\"total\":0}},\"stopReason\":\"error\",\"timestamp\":1791279674486,\"diagnostics\":[{\"type\":\"provider_transport_failure\",\"timestamp\":1791279689495,\"error\":{\"name\":\"Error\",\"message\":\"WebSocket connect timeout after 15000ms\",\"stack\":\"Error: WebSocket connect timeout after 15000ms\\n    at <anonymous> (/Users/xxxxxxxxxxxx/orca-qa/task_7daea3cb4c53/pi-1.0.4/node_modules/@earendil-works/pi-ai/dist/api/openai-codex-responses.js:859:26)\"},\"details\":{\"configuredTransport\":\"auto\",\"fallbackTransport\":\"sse\",\"eventsEmitted\":false,\"phase\":\"before_message_stream_start\",\"requestBytes\":3869}}],\"errorMessage\":\"The socket connection was closed unexpectedly. For more information, pass `verbose: true` in the second argument to fetch()\",\"thinkingLevel\":\"off\"}}"}
+{"dir":"out","raw":"{\"type\":\"message_end\",\"message\":{\"role\":\"assistant\",\"content\":[],\"api\":\"openai-codex-responses\",\"provider\":\"openai-codex\",\"model\":\"gpt-5.5\",\"usage\":{\"input\":0,\"output\":0,\"cacheRead\":0,\"cacheWrite\":0,\"totalTokens\":0,\"cost\":{\"input\":0,\"output\":0,\"cacheRead\":0,\"cacheWrite\":0,\"total\":0}},\"stopReason\":\"error\",\"timestamp\":1791279674486,\"diagnostics\":[{\"type\":\"provider_transport_failure\",\"timestamp\":1791279689495,\"error\":{\"name\":\"Error\",\"message\":\"WebSocket connect timeout after 15000ms\",\"stack\":\"Error: WebSocket connect timeout after 15000ms\\n    at <anonymous> (/Users/xxxxxxxxxxxx/orca-qa/task_7daea3cb4c53/pi-1.0.4/node_modules/@earendil-works/pi-ai/dist/api/openai-codex-responses.js:859:26)\"},\"details\":{\"configuredTransport\":\"auto\",\"fallbackTransport\":\"sse\",\"eventsEmitted\":false,\"phase\":\"before_message_stream_start\",\"requestBytes\":3869}}],\"errorMessage\":\"The socket connection was closed unexpectedly. For more information, pass `verbose: true` in the second argument to fetch()\",\"thinkingLevel\":\"off\"}}"}
+{"dir":"out","raw":"{\"type\":\"turn_end\",\"message\":{\"role\":\"assistant\",\"content\":[],\"api\":\"openai-codex-responses\",\"provider\":\"openai-codex\",\"model\":\"gpt-5.5\",\"usage\":{\"input\":0,\"output\":0,\"cacheRead\":0,\"cacheWrite\":0,\"totalTokens\":0,\"cost\":{\"input\":0,\"output\":0,\"cacheRead\":0,\"cacheWrite\":0,\"total\":0}},\"stopReason\":\"error\",\"timestamp\":1791279674486,\"diagnostics\":[{\"type\":\"provider_transport_failure\",\"timestamp\":1791279689495,\"error\":{\"name\":\"Error\",\"message\":\"WebSocket connect timeout after 15000ms\",\"stack\":\"Error: WebSocket connect timeout after 15000ms\\n    at <anonymous> (/Users/xxxxxxxxxxxx/orca-qa/task_7daea3cb4c53/pi-1.0.4/node_modules/@earendil-works/pi-ai/dist/api/openai-codex-responses.js:859:26)\"},\"details\":{\"configuredTransport\":\"auto\",\"fallbackTransport\":\"sse\",\"eventsEmitted\":false,\"phase\":\"before_message_stream_start\",\"requestBytes\":3869}}],\"errorMessage\":\"The socket connection was closed unexpectedly. For more information, pass `verbose: true` in the second argument to fetch()\",\"thinkingLevel\":\"off\"},\"toolResults\":[]}"}
+{"dir":"out","raw":"{\"type\":\"agent_end\",\"messages\":[{\"role\":\"system\",\"content\":\"\",\"sections\":{\"preamble\":\"You are a protocol capture assistant. Follow exact requests and use only the requested tools. Read and write only within this project. Never read credentials, home directories, or account details.\",\"cwd\":\"<cwd>\\n/Users/xxxxxxxxxxxx/orca-qa/task_7daea3cb4c53/projects/pi/tool-bun\\n</cwd>\"},\"timestamp\":1791279674452,\"toolsAdded\":[{\"name\":\"read\",\"description\":\"Read the contents of a file. Supports text files and images (jpg, png, gif, webp, bmp). Images are sent as attachments. For text files, output is truncated to 2000 lines or 50KB (whichever is hit first). Use offset/limit for large files. When you need the full file, continue with offset until complete.\",\"parameters\":{\"type\":\"object\",\"required\":[\"path\"],\"properties\":{\"path\":{\"type\":\"string\",\"description\":\"Path to the file to read (relative or absolute)\"},\"offset\":{\"type\":\"number\",\"description\":\"Line number to start reading from (1-indexed)\"},\"limit\":{\"type\":\"number\",\"description\":\"Maximum number of lines to read\"}}},\"constrainedSampling\":{\"type\":\"json_schema\",\"strict\":\"prefer\"}},{\"name\":\"bash\",\"description\":\"Execute a bash command in the current working directory. Returns stdout and stderr. Output is truncated to last 2000 lines or 50KB (whichever is hit first). If truncated, full output is saved to a temp file. Optionally provide a timeout in seconds.\",\"parameters\":{\"type\":\"object\",\"required\":[\"command\"],\"properties\":{\"command\":{\"type\":\"string\",\"description\":\"Shell command to execute\"},\"timeout\":{\"type\":\"number\",\"description\":\"Timeout in seconds (optional, no default timeout)\"}}},\"constrainedSampling\":{\"type\":\"json_schema\",\"strict\":\"prefer\"}},{\"name\":\"edit\",\"description\":\"Edit a single file using exact text replacement. Every edits[].oldText must match a unique, non-overlapping region of the original file. If two changes affect the same block or nearby lines, merge them into one edit instead of emitting overlapping edits. Do not include large unchanged regions just to connect distant changes.\",\"parameters\":{\"type\":\"object\",\"required\":[\"path\",\"edits\"],\"properties\":{\"path\":{\"type\":\"string\",\"description\":\"Path to the file to edit (relative or absolute)\"},\"edits\":{\"type\":\"array\",\"items\":{\"type\":\"object\",\"required\":[\"oldText\",\"newText\"],\"properties\":{\"oldText\":{\"type\":\"string\",\"description\":\"Exact text for one targeted replacement. It must be unique in the original file and must not overlap with any other edits[].oldText in the same call.\"},\"newText\":{\"type\":\"string\",\"description\":\"Replacement text for this targeted edit.\"}}},\"description\":\"One or more targeted replacements. Each edit is matched against the original file, not incrementally. Do not include overlapping or nested edits. If two changes touch the same block or nearby lines, merge them into one edit instead.\"}}},\"constrainedSampling\":{\"type\":\"json_schema\",\"strict\":\"prefer\"}},{\"name\":\"write\",\"description\":\"Write content to a file. Creates the file if it doesn't exist, overwrites if it does. Automatically creates parent directories.\",\"parameters\":{\"type\":\"object\",\"required\":[\"path\",\"content\"],\"properties\":{\"path\":{\"type\":\"string\",\"description\":\"Path to the file to write (relative or absolute)\"},\"content\":{\"type\":\"string\",\"description\":\"Content to write to the file\"}}},\"constrainedSampling\":{\"type\":\"json_schema\",\"strict\":\"prefer\"}}]},{\"role\":\"user\",\"content\":[{\"type\":\"text\",\"text\":\"Use the write tool to create capture.txt containing exactly fixture-ok. Then use read to read capture.txt. Reply exactly TOOL_CAPTURE_OK.\"}],\"timestamp\":1791279674451},{\"role\":\"assistant\",\"content\":[],\"api\":\"openai-codex-responses\",\"provider\":\"openai-codex\",\"model\":\"gpt-5.5\",\"usage\":{\"input\":0,\"output\":0,\"cacheRead\":0,\"cacheWrite\":0,\"totalTokens\":0,\"cost\":{\"input\":0,\"output\":0,\"cacheRead\":0,\"cacheWrite\":0,\"total\":0}},\"stopReason\":\"error\",\"timestamp\":1791279674486,\"diagnostics\":[{\"type\":\"provider_transport_failure\",\"timestamp\":1791279689495,\"error\":{\"name\":\"Error\",\"message\":\"WebSocket connect timeout after 15000ms\",\"stack\":\"Error: WebSocket connect timeout after 15000ms\\n    at <anonymous> (/Users/xxxxxxxxxxxx/orca-qa/task_7daea3cb4c53/pi-1.0.4/node_modules/@earendil-works/pi-ai/dist/api/openai-codex-responses.js:859:26)\"},\"details\":{\"configuredTransport\":\"auto\",\"fallbackTransport\":\"sse\",\"eventsEmitted\":false,\"phase\":\"before_message_stream_start\",\"requestBytes\":3869}}],\"errorMessage\":\"The socket connection was closed unexpectedly. For more information, pass `verbose: true` in the second argument to fetch()\",\"thinkingLevel\":\"off\"}],\"willRetry\":false}"}
+{"dir":"in","raw":"{\"id\": \"q8\", \"type\": \"get_state\"}"}
+{"dir":"out","raw":"{\"type\":\"agent_settled\"}"}
+{"dir":"out","raw":"{\"id\":\"q8\",\"type\":\"response\",\"command\":\"get_state\",\"success\":true,\"data\":{\"model\":{\"id\":\"gpt-5.5\",\"name\":\"GPT-5.5\",\"api\":\"openai-codex-responses\",\"provider\":\"openai-codex\",\"baseUrl\":\"https://chatgpt.com/backend-api\",\"reasoning\":true,\"input\":[\"text\",\"image\"],\"cost\":{\"input\":5,\"output\":30,\"cacheRead\":0.5,\"cacheWrite\":0,\"tiers\":[{\"inputTokensAbove\":272000,\"input\":10,\"output\":45,\"cacheRead\":1,\"cacheWrite\":0}]},\"contextWindow\":272000,\"maxTokens\":128000,\"thinkingLevelMap\":{\"xhigh\":\"xhigh\",\"minimal\":\"low\"},\"compat\":{\"supportsOpenAIGrammarTools\":true,\"supportsToolSearch\":true,\"supportsMidConvoSystemMessages\":true},\"inputLimits\":{\"images\":{\"resize\":{\"maxWidth\":2000,\"maxHeight\":2000,\"maxBytes\":4718592,\"jpegQuality\":80}}},\"type\":\"chat\"},\"thinkingLevel\":\"off\",\"isStreaming\":false,\"isCompacting\":false,\"steeringMode\":\"one-at-a-time\",\"followUpMode\":\"one-at-a-time\",\"sessionFile\":\"/Users/xxxxxxxxxxxx/orca-qa/task_7daea3cb4c53/projects/pi/tool-bun/sessions/XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX.jsonl\",\"sessionId\":\"00000000-0000-4000-8000-000000000018\",\"autoCompactionEnabled\":false,\"messageCount\":3,\"pendingMessageCount\":0}}"}
+{"dir":"in","raw":"{\"id\": \"q9\", \"type\": \"get_session_stats\"}"}
+{"dir":"out","raw":"{\"id\":\"q9\",\"type\":\"response\",\"command\":\"get_session_stats\",\"success\":true,\"data\":{\"sessionFile\":\"/Users/xxxxxxxxxxxx/orca-qa/task_7daea3cb4c53/projects/pi/tool-bun/sessions/XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX.jsonl\",\"sessionId\":\"00000000-0000-4000-8000-000000000018\",\"userMessages\":1,\"assistantMessages\":1,\"toolCalls\":0,\"toolResults\":0,\"totalMessages\":3,\"tokens\":{\"input\":0,\"output\":0,\"cacheRead\":0,\"cacheWrite\":0,\"total\":0},\"cost\":0,\"contextUsage\":{\"tokens\":847,\"contextWindow\":272000,\"percent\":0.3113970588235294}}}"}
+{"dir":"in","raw":"{\"id\": \"q10\", \"type\": \"get_messages\"}"}
+{"dir":"out","raw":"{\"id\":\"q10\",\"type\":\"response\",\"command\":\"get_messages\",\"success\":true,\"data\":{\"messages\":[{\"role\":\"system\",\"content\":\"\",\"sections\":{\"preamble\":\"You are a protocol capture assistant. Follow exact requests and use only the requested tools. Read and write only within this project. Never read credentials, home directories, or account details.\",\"cwd\":\"<cwd>\\n/Users/xxxxxxxxxxxx/orca-qa/task_7daea3cb4c53/projects/pi/tool-bun\\n</cwd>\"},\"timestamp\":1791279674452,\"toolsAdded\":[{\"name\":\"read\",\"description\":\"Read the contents of a file. Supports text files and images (jpg, png, gif, webp, bmp). Images are sent as attachments. For text files, output is truncated to 2000 lines or 50KB (whichever is hit first). Use offset/limit for large files. When you need the full file, continue with offset until complete.\",\"parameters\":{\"type\":\"object\",\"required\":[\"path\"],\"properties\":{\"path\":{\"type\":\"string\",\"description\":\"Path to the file to read (relative or absolute)\"},\"offset\":{\"type\":\"number\",\"description\":\"Line number to start reading from (1-indexed)\"},\"limit\":{\"type\":\"number\",\"description\":\"Maximum number of lines to read\"}}},\"constrainedSampling\":{\"type\":\"json_schema\",\"strict\":\"prefer\"}},{\"name\":\"bash\",\"description\":\"Execute a bash command in the current working directory. Returns stdout and stderr. Output is truncated to last 2000 lines or 50KB (whichever is hit first). If truncated, full output is saved to a temp file. Optionally provide a timeout in seconds.\",\"parameters\":{\"type\":\"object\",\"required\":[\"command\"],\"properties\":{\"command\":{\"type\":\"string\",\"description\":\"Shell command to execute\"},\"timeout\":{\"type\":\"number\",\"description\":\"Timeout in seconds (optional, no default timeout)\"}}},\"constrainedSampling\":{\"type\":\"json_schema\",\"strict\":\"prefer\"}},{\"name\":\"edit\",\"description\":\"Edit a single file using exact text replacement. Every edits[].oldText must match a unique, non-overlapping region of the original file. If two changes affect the same block or nearby lines, merge them into one edit instead of emitting overlapping edits. Do not include large unchanged regions just to connect distant changes.\",\"parameters\":{\"type\":\"object\",\"required\":[\"path\",\"edits\"],\"properties\":{\"path\":{\"type\":\"string\",\"description\":\"Path to the file to edit (relative or absolute)\"},\"edits\":{\"type\":\"array\",\"items\":{\"type\":\"object\",\"required\":[\"oldText\",\"newText\"],\"properties\":{\"oldText\":{\"type\":\"string\",\"description\":\"Exact text for one targeted replacement. It must be unique in the original file and must not overlap with any other edits[].oldText in the same call.\"},\"newText\":{\"type\":\"string\",\"description\":\"Replacement text for this targeted edit.\"}}},\"description\":\"One or more targeted replacements. Each edit is matched against the original file, not incrementally. Do not include overlapping or nested edits. If two changes touch the same block or nearby lines, merge them into one edit instead.\"}}},\"constrainedSampling\":{\"type\":\"json_schema\",\"strict\":\"prefer\"}},{\"name\":\"write\",\"description\":\"Write content to a file. Creates the file if it doesn't exist, overwrites if it does. Automatically creates parent directories.\",\"parameters\":{\"type\":\"object\",\"required\":[\"path\",\"content\"],\"properties\":{\"path\":{\"type\":\"string\",\"description\":\"Path to the file to write (relative or absolute)\"},\"content\":{\"type\":\"string\",\"description\":\"Content to write to the file\"}}},\"constrainedSampling\":{\"type\":\"json_schema\",\"strict\":\"prefer\"}}]},{\"role\":\"user\",\"content\":[{\"type\":\"text\",\"text\":\"Use the write tool to create capture.txt containing exactly fixture-ok. Then use read to read capture.txt. Reply exactly TOOL_CAPTURE_OK.\"}],\"timestamp\":1791279674451},{\"role\":\"assistant\",\"content\":[],\"api\":\"openai-codex-responses\",\"provider\":\"openai-codex\",\"model\":\"gpt-5.5\",\"usage\":{\"input\":0,\"output\":0,\"cacheRead\":0,\"cacheWrite\":0,\"totalTokens\":0,\"cost\":{\"input\":0,\"output\":0,\"cacheRead\":0,\"cacheWrite\":0,\"total\":0}},\"stopReason\":\"error\",\"timestamp\":1791279674486,\"diagnostics\":[{\"type\":\"provider_transport_failure\",\"timestamp\":1791279689495,\"error\":{\"name\":\"Error\",\"message\":\"WebSocket connect timeout after 15000ms\",\"stack\":\"Error: WebSocket connect timeout after 15000ms\\n    at <anonymous> (/Users/xxxxxxxxxxxx/orca-qa/task_7daea3cb4c53/pi-1.0.4/node_modules/@earendil-works/pi-ai/dist/api/openai-codex-responses.js:859:26)\"},\"details\":{\"configuredTransport\":\"auto\",\"fallbackTransport\":\"sse\",\"eventsEmitted\":false,\"phase\":\"before_message_stream_start\",\"requestBytes\":3869}}],\"errorMessage\":\"The socket connection was closed unexpectedly. For more information, pass `verbose: true` in the second argument to fetch()\",\"thinkingLevel\":\"off\"}]}}"}
diff --git a/src/main/pi/__fixtures__/signed-out.jsonl b/src/main/pi/__fixtures__/signed-out.jsonl
new file mode 100644
index 000000000000..0c01eb5cc175
--- /dev/null
+++ b/src/main/pi/__fixtures__/signed-out.jsonl
@@ -0,0 +1,12 @@
+{"dir":"in","raw":"{\"id\": \"q1\", \"type\": \"get_state\"}"}
+{"dir":"out","raw":"{\"id\":\"q1\",\"type\":\"response\",\"command\":\"get_state\",\"success\":true,\"data\":{\"model\":{\"id\":\"unknown\",\"name\":\"unknown\",\"api\":\"unknown\",\"provider\":\"unknown\",\"baseUrl\":\"\",\"reasoning\":false,\"input\":[],\"cost\":{\"input\":0,\"output\":0,\"cacheRead\":0,\"cacheWrite\":0},\"contextWindow\":0,\"maxTokens\":0},\"thinkingLevel\":\"off\",\"isStreaming\":false,\"isCompacting\":false,\"steeringMode\":\"one-at-a-time\",\"followUpMode\":\"one-at-a-time\",\"sessionFile\":\"/Users/xxxxxxxxxxxx/orca-qa/task_7daea3cb4c53/projects/pi/signed-out/sessions/XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX.jsonl\",\"sessionId\":\"00000000-0000-4000-8000-000000000013\",\"autoCompactionEnabled\":true,\"messageCount\":0,\"pendingMessageCount\":0}}"}
+{"dir":"in","raw":"{\"id\": \"q2\", \"type\": \"set_auto_retry\", \"enabled\": false}"}
+{"dir":"out","raw":"{\"id\":\"q2\",\"type\":\"response\",\"command\":\"set_auto_retry\",\"success\":true}"}
+{"dir":"in","raw":"{\"id\": \"q3\", \"type\": \"set_auto_compaction\", \"enabled\": false}"}
+{"dir":"out","raw":"{\"id\":\"q3\",\"type\":\"response\",\"command\":\"set_auto_compaction\",\"success\":true}"}
+{"dir":"in","raw":"{\"id\": \"q4\", \"type\": \"get_available_models\"}"}
+{"dir":"out","raw":"{\"id\":\"q4\",\"type\":\"response\",\"command\":\"get_available_models\",\"success\":true,\"data\":{\"models\":[]}}"}
+{"dir":"in","raw":"{\"id\": \"q5\", \"type\": \"prompt\", \"message\": \"Reply exactly SIGNED_OUT_CHECK.\"}"}
+{"dir":"out","raw":"{\"id\":\"q5\",\"type\":\"response\",\"command\":\"prompt\",\"success\":false,\"error\":\"No API key found for the selected model.\\n\\nUse /login to log into a provider via OAuth or API key. See:\\n  /Users/xxxxxxxxxxxx/orca-qa/task_7daea3cb4c53/pi-1.0.4/node_modules/@earendil-works/pi-coding-agent/docs/providers.md\\n  /Users/xxxxxxxxxxxx/orca-qa/task_7daea3cb4c53/pi-1.0.4/node_modules/@earendil-works/pi-coding-agent/docs/models.md\"}"}
+{"dir":"in","raw":"{\"id\": \"q6\", \"type\": \"get_state\"}"}
+{"dir":"out","raw":"{\"id\":\"q6\",\"type\":\"response\",\"command\":\"get_state\",\"success\":true,\"data\":{\"model\":{\"id\":\"unknown\",\"name\":\"unknown\",\"api\":\"unknown\",\"provider\":\"unknown\",\"baseUrl\":\"\",\"reasoning\":false,\"input\":[],\"cost\":{\"input\":0,\"output\":0,\"cacheRead\":0,\"cacheWrite\":0},\"contextWindow\":0,\"maxTokens\":0},\"thinkingLevel\":\"off\",\"isStreaming\":false,\"isCompacting\":false,\"steeringMode\":\"one-at-a-time\",\"followUpMode\":\"one-at-a-time\",\"sessionFile\":\"/Users/xxxxxxxxxxxx/orca-qa/task_7daea3cb4c53/projects/pi/signed-out/sessions/XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX.jsonl\",\"sessionId\":\"00000000-0000-4000-8000-000000000013\",\"autoCompactionEnabled\":false,\"messageCount\":0,\"pendingMessageCount\":0}}"}
diff --git a/src/main/pi/__fixtures__/steer-followup.jsonl b/src/main/pi/__fixtures__/steer-followup.jsonl
new file mode 100644
index 000000000000..c747d395d65d
--- /dev/null
+++ b/src/main/pi/__fixtures__/steer-followup.jsonl
@@ -0,0 +1,93 @@
+{"dir":"in","raw":"{\"id\": \"q1\", \"type\": \"get_state\"}"}
+{"dir":"out","raw":"{\"id\":\"q1\",\"type\":\"response\",\"command\":\"get_state\",\"success\":true,\"data\":{\"model\":{\"id\":\"gpt-6.1-sol\",\"name\":\"GPT-6.1 Sol\",\"api\":\"openai-codex-responses\",\"provider\":\"openai-codex\",\"baseUrl\":\"https://chatgpt.com/backend-api\",\"reasoning\":true,\"input\":[\"text\",\"image\"],\"cost\":{\"input\":2,\"output\":10,\"cacheRead\":0.1,\"cacheWrite\":2.5,\"tiers\":[{\"inputTokensAbove\":272000,\"input\":4,\"output\":15,\"cacheRead\":0.2,\"cacheWrite\":5}]},\"contextWindow\":272000,\"maxTokens\":128000,\"thinkingLevelMap\":{\"off\":null,\"minimal\":\"low\",\"low\":\"low\",\"medium\":\"medium\",\"high\":\"high\",\"xhigh\":\"xhigh\",\"max\":\"max\"},\"compat\":{\"supportsOpenAIGrammarTools\":true,\"supportsAdditionalTools\":true,\"supportsToolSearch\":true,\"supportsMidConvoSystemMessages\":true},\"inputLimits\":{\"images\":{\"resize\":{\"maxWidth\":2000,\"maxHeight\":2000,\"maxBytes\":4718592,\"jpegQuality\":80}}},\"type\":\"chat\"},\"thinkingLevel\":\"medium\",\"isStreaming\":false,\"isCompacting\":false,\"steeringMode\":\"one-at-a-time\",\"followUpMode\":\"one-at-a-time\",\"sessionFile\":\"/Users/xxxxxxxxxxxx/orca-qa/task_7daea3cb4c53/projects/pi/steer-followup-r2/sessions/XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX.jsonl\",\"sessionId\":\"00000000-0000-4000-8000-000000000015\",\"autoCompactionEnabled\":true,\"messageCount\":0,\"pendingMessageCount\":0}}"}
+{"dir":"in","raw":"{\"id\": \"q2\", \"type\": \"set_auto_retry\", \"enabled\": false}"}
+{"dir":"out","raw":"{\"id\":\"q2\",\"type\":\"response\",\"command\":\"set_auto_retry\",\"success\":true}"}
+{"dir":"in","raw":"{\"id\": \"q3\", \"type\": \"set_auto_compaction\", \"enabled\": false}"}
+{"dir":"out","raw":"{\"id\":\"q3\",\"type\":\"response\",\"command\":\"set_auto_compaction\",\"success\":true}"}
+{"dir":"in","raw":"{\"id\": \"q4\", \"type\": \"get_available_models\"}"}
+{"dir":"out","raw":"{\"id\":\"q4\",\"type\":\"response\",\"command\":\"get_available_models\",\"success\":true,\"data\":{\"models\":[{\"id\":\"gpt-5.3-codex-spark\",\"name\":\"GPT-5.3 Codex Spark\",\"api\":\"openai-codex-responses\",\"provider\":\"openai-codex\",\"baseUrl\":\"https://chatgpt.com/backend-api\",\"reasoning\":true,\"input\":[\"text\"],\"cost\":{\"input\":1.75,\"output\":14,\"cacheRead\":0.175,\"cacheWrite\":0},\"contextWindow\":128000,\"maxTokens\":128000,\"thinkingLevelMap\":{\"xhigh\":\"xhigh\",\"minimal\":\"low\"},\"compat\":{\"supportsOpenAIGrammarTools\":true},\"type\":\"chat\"},{\"id\":\"gpt-5.5\",\"name\":\"GPT-5.5\",\"api\":\"openai-codex-responses\",\"provider\":\"openai-codex\",\"baseUrl\":\"https://chatgpt.com/backend-api\",\"reasoning\":true,\"input\":[\"text\",\"image\"],\"cost\":{\"input\":5,\"output\":30,\"cacheRead\":0.5,\"cacheWrite\":0,\"tiers\":[{\"inputTokensAbove\":272000,\"input\":10,\"output\":45,\"cacheRead\":1,\"cacheWrite\":0}]},\"contextWindow\":272000,\"maxTokens\":128000,\"thinkingLevelMap\":{\"xhigh\":\"xhigh\",\"minimal\":\"low\"},\"compat\":{\"supportsOpenAIGrammarTools\":true,\"supportsToolSearch\":true,\"supportsMidConvoSystemMessages\":true},\"inputLimits\":{\"images\":{\"resize\":{\"maxWidth\":2000,\"maxHeight\":2000,\"maxBytes\":4718592,\"jpegQuality\":80}}},\"type\":\"chat\"},{\"id\":\"gpt-5.6-luna\",\"name\":\"GPT-5.6 Luna\",\"api\":\"openai-codex-responses\",\"provider\":\"openai-codex\",\"baseUrl\":\"https://chatgpt.com/backend-api\",\"reasoning\":true,\"input\":[\"text\",\"image\"],\"cost\":{\"input\":0.2,\"output\":1.2,\"cacheRead\":0.02,\"cacheWrite\":0.25,\"tiers\":[{\"inputTokensAbove\":272000,\"input\":0.4,\"output\":1.8,\"cacheRead\":0.04,\"cacheWrite\":0.5}]},\"contextWindow\":272000,\"maxTokens\":128000,\"thinkingLevelMap\":{\"xhigh\":\"xhigh\",\"max\":\"max\",\"minimal\":\"low\"},\"compat\":{\"supportsOpenAIGrammarTools\":true,\"supportsAdditionalTools\":true,\"supportsToolSearch\":true,\"supportsMidConvoSystemMessages\":true},\"inputLimits\":{\"images\":{\"resize\":{\"maxWidth\":2000,\"maxHeight\":2000,\"maxBytes\":4718592,\"jpegQuality\":80}}},\"type\":\"chat\"},{\"id\":\"gpt-5.6-sol\",\"name\":\"GPT-5.6 Sol\",\"api\":\"openai-codex-responses\",\"provider\":\"openai-codex\",\"baseUrl\":\"https://chatgpt.com/backend-api\",\"reasoning\":true,\"input\":[\"text\",\"image\"],\"cost\":{\"input\":4,\"output\":20,\"cacheRead\":0.4,\"cacheWrite\":5,\"tiers\":[{\"inputTokensAbove\":272000,\"input\":8,\"output\":30,\"cacheRead\":0.8,\"cacheWrite\":10}]},\"contextWindow\":272000,\"maxTokens\":128000,\"thinkingLevelMap\":{\"xhigh\":\"xhigh\",\"max\":\"max\",\"minimal\":\"low\"},\"compat\":{\"supportsOpenAIGrammarTools\":true,\"supportsAdditionalTools\":true,\"supportsToolSearch\":true,\"supportsMidConvoSystemMessages\":true},\"inputLimits\":{\"images\":{\"resize\":{\"maxWidth\":2000,\"maxHeight\":2000,\"maxBytes\":4718592,\"jpegQuality\":80}}},\"type\":\"chat\"},{\"id\":\"gpt-5.6-terra\",\"name\":\"GPT-5.6 Terra\",\"api\":\"openai-codex-responses\",\"provider\":\"openai-codex\",\"baseUrl\":\"https://chatgpt.com/backend-api\",\"reasoning\":true,\"input\":[\"text\",\"image\"],\"cost\":{\"input\":2,\"output\":12,\"cacheRead\":0.2,\"cacheWrite\":2.5,\"tiers\":[{\"inputTokensAbove\":272000,\"input\":4,\"output\":18,\"cacheRead\":0.4,\"cacheWrite\":5}]},\"contextWindow\":272000,\"maxTokens\":128000,\"thinkingLevelMap\":{\"xhigh\":\"xhigh\",\"max\":\"max\",\"minimal\":\"low\"},\"compat\":{\"supportsOpenAIGrammarTools\":true,\"supportsAdditionalTools\":true,\"supportsToolSearch\":true,\"supportsMidConvoSystemMessages\":true},\"inputLimits\":{\"images\":{\"resize\":{\"maxWidth\":2000,\"maxHeight\":2000,\"maxBytes\":4718592,\"jpegQuality\":80}}},\"type\":\"chat\"},{\"id\":\"gpt-6-astra\",\"name\":\"GPT-6 Astra\",\"api\":\"openai-codex-responses\",\"provider\":\"openai-codex\",\"baseUrl\":\"https://chatgpt.com/backend-api\",\"reasoning\":true,\"input\":[\"text\",\"image\"],\"cost\":{\"input\":10,\"output\":50,\"cacheRead\":1,\"cacheWrite\":12.5,\"tiers\":[{\"inputTokensAbove\":272000,\"input\":20,\"output\":75,\"cacheRead\":2,\"cacheWrite\":25}]},\"contextWindow\":272000,\"maxTokens\":128000,\"thinkingLevelMap\":{\"off\":null,\"minimal\":\"low\",\"low\":\"low\",\"medium\":\"medium\",\"high\":\"high\",\"xhigh\":\"xhigh\",\"max\":\"max\"},\"compat\":{\"supportsOpenAIGrammarTools\":true,\"supportsAdditionalTools\":true,\"supportsToolSearch\":true,\"supportsMidConvoSystemMessages\":true},\"inputLimits\":{\"images\":{\"resize\":{\"maxWidth\":2000,\"maxHeight\":2000,\"maxBytes\":4718592,\"jpegQuality\":80}}},\"type\":\"chat\"},{\"id\":\"gpt-6-luna\",\"name\":\"GPT-6 Luna\",\"api\":\"openai-codex-responses\",\"provider\":\"openai-codex\",\"baseUrl\":\"https://chatgpt.com/backend-api\",\"reasoning\":true,\"input\":[\"text\",\"image\"],\"cost\":{\"input\":0.1,\"output\":0.5,\"cacheRead\":0.01,\"cacheWrite\":0.125,\"tiers\":[{\"inputTokensAbove\":272000,\"input\":0.2,\"output\":0.75,\"cacheRead\":0.02,\"cacheWrite\":0.25}]},\"contextWindow\":272000,\"maxTokens\":128000,\"thinkingLevelMap\":{\"off\":\"none\",\"minimal\":\"low\",\"low\":\"low\",\"medium\":\"medium\",\"high\":\"high\",\"xhigh\":\"xhigh\",\"max\":\"max\"},\"compat\":{\"supportsOpenAIGrammarTools\":true,\"supportsAdditionalTools\":true,\"supportsToolSearch\":true,\"supportsMidConvoSystemMessages\":true},\"inputLimits\":{\"images\":{\"resize\":{\"maxWidth\":2000,\"maxHeight\":2000,\"maxBytes\":4718592,\"jpegQuality\":80}}},\"type\":\"chat\"},{\"id\":\"gpt-6-sol\",\"name\":\"GPT-6 Sol\",\"api\":\"openai-codex-responses\",\"provider\":\"openai-codex\",\"baseUrl\":\"https://chatgpt.com/backend-api\",\"reasoning\":true,\"input\":[\"text\",\"image\"],\"cost\":{\"input\":2,\"output\":10,\"cacheRead\":0.2,\"cacheWrite\":2.5,\"tiers\":[{\"inputTokensAbove\":272000,\"input\":4,\"output\":15,\"cacheRead\":0.4,\"cacheWrite\":5}]},\"contextWindow\":272000,\"maxTokens\":128000,\"thinkingLevelMap\":{\"off\":\"none\",\"minimal\":\"low\",\"low\":\"low\",\"medium\":\"medium\",\"high\":\"high\",\"xhigh\":\"xhigh\",\"max\":\"max\"},\"compat\":{\"supportsOpenAIGrammarTools\":true,\"supportsAdditionalTools\":true,\"supportsToolSearch\":true,\"supportsMidConvoSystemMessages\":true},\"inputLimits\":{\"images\":{\"resize\":{\"maxWidth\":2000,\"maxHeight\":2000,\"maxBytes\":4718592,\"jpegQuality\":80}}},\"type\":\"chat\"},{\"id\":\"gpt-6.1-sol\",\"name\":\"GPT-6.1 Sol\",\"api\":\"openai-codex-responses\",\"provider\":\"openai-codex\",\"baseUrl\":\"https://chatgpt.com/backend-api\",\"reasoning\":true,\"input\":[\"text\",\"image\"],\"cost\":{\"input\":2,\"output\":10,\"cacheRead\":0.1,\"cacheWrite\":2.5,\"tiers\":[{\"inputTokensAbove\":272000,\"input\":4,\"output\":15,\"cacheRead\":0.2,\"cacheWrite\":5}]},\"contextWindow\":272000,\"maxTokens\":128000,\"thinkingLevelMap\":{\"off\":null,\"minimal\":\"low\",\"low\":\"low\",\"medium\":\"medium\",\"high\":\"high\",\"xhigh\":\"xhigh\",\"max\":\"max\"},\"compat\":{\"supportsOpenAIGrammarTools\":true,\"supportsAdditionalTools\":true,\"supportsToolSearch\":true,\"supportsMidConvoSystemMessages\":true},\"inputLimits\":{\"images\":{\"resize\":{\"maxWidth\":2000,\"maxHeight\":2000,\"maxBytes\":4718592,\"jpegQuality\":80}}},\"type\":\"chat\"}]}}"}
+{"dir":"in","raw":"{\"id\": \"q5\", \"type\": \"set_model\", \"provider\": \"openai-codex\", \"modelId\": \"gpt-5.5\"}"}
+{"dir":"out","raw":"{\"id\":\"q5\",\"type\":\"response\",\"command\":\"set_model\",\"success\":true,\"data\":{\"id\":\"gpt-5.5\",\"name\":\"GPT-5.5\",\"api\":\"openai-codex-responses\",\"provider\":\"openai-codex\",\"baseUrl\":\"https://chatgpt.com/backend-api\",\"reasoning\":true,\"input\":[\"text\",\"image\"],\"cost\":{\"input\":5,\"output\":30,\"cacheRead\":0.5,\"cacheWrite\":0,\"tiers\":[{\"inputTokensAbove\":272000,\"input\":10,\"output\":45,\"cacheRead\":1,\"cacheWrite\":0}]},\"contextWindow\":272000,\"maxTokens\":128000,\"thinkingLevelMap\":{\"xhigh\":\"xhigh\",\"minimal\":\"low\"},\"compat\":{\"supportsOpenAIGrammarTools\":true,\"supportsToolSearch\":true,\"supportsMidConvoSystemMessages\":true},\"inputLimits\":{\"images\":{\"resize\":{\"maxWidth\":2000,\"maxHeight\":2000,\"maxBytes\":4718592,\"jpegQuality\":80}}},\"type\":\"chat\"}}"}
+{"dir":"in","raw":"{\"id\": \"q6\", \"type\": \"set_thinking_level\", \"level\": \"off\"}"}
+{"dir":"out","raw":"{\"type\":\"thinking_level_changed\",\"level\":\"off\"}"}
+{"dir":"out","raw":"{\"id\":\"q6\",\"type\":\"response\",\"command\":\"set_thinking_level\",\"success\":true}"}
+{"dir":"in","raw":"{\"id\": \"q7\", \"type\": \"prompt\", \"message\": \"Use bash to run exactly: printf capture-start; sleep 20; printf capture-finish. Do not background it. Then reply ORIGINAL_FINISHED.\"}"}
+{"dir":"out","raw":"{\"id\":\"q7\",\"type\":\"response\",\"command\":\"prompt\",\"success\":true,\"data\":{\"disposition\":\"started\"}}"}
+{"dir":"out","raw":"{\"type\":\"agent_start\"}"}
+{"dir":"out","raw":"{\"type\":\"turn_start\"}"}
+{"dir":"out","raw":"{\"type\":\"message_start\",\"message\":{\"role\":\"system\",\"content\":\"\",\"sections\":{\"preamble\":\"You are a protocol capture assistant. Follow exact requests and use only the requested tools. Read and write only within this project. Never read credentials, home directories, or account details.\",\"cwd\":\"<cwd>\\n/Users/xxxxxxxxxxxx/orca-qa/task_7daea3cb4c53/projects/pi/steer-followup-r2\\n</cwd>\"},\"timestamp\":1791280240975,\"toolsAdded\":[{\"name\":\"read\",\"description\":\"Read the contents of a file. Supports text files and images (jpg, png, gif, webp, bmp). Images are sent as attachments. For text files, output is truncated to 2000 lines or 50KB (whichever is hit first). Use offset/limit for large files. When you need the full file, continue with offset until complete.\",\"parameters\":{\"type\":\"object\",\"required\":[\"path\"],\"properties\":{\"path\":{\"type\":\"string\",\"description\":\"Path to the file to read (relative or absolute)\"},\"offset\":{\"type\":\"number\",\"description\":\"Line number to start reading from (1-indexed)\"},\"limit\":{\"type\":\"number\",\"description\":\"Maximum number of lines to read\"}}},\"constrainedSampling\":{\"type\":\"json_schema\",\"strict\":\"prefer\"}},{\"name\":\"bash\",\"description\":\"Execute a bash command in the current working directory. Returns stdout and stderr. Output is truncated to last 2000 lines or 50KB (whichever is hit first). If truncated, full output is saved to a temp file. Optionally provide a timeout in seconds.\",\"parameters\":{\"type\":\"object\",\"required\":[\"command\"],\"properties\":{\"command\":{\"type\":\"string\",\"description\":\"Shell command to execute\"},\"timeout\":{\"type\":\"number\",\"description\":\"Timeout in seconds (optional, no default timeout)\"}}},\"constrainedSampling\":{\"type\":\"json_schema\",\"strict\":\"prefer\"}},{\"name\":\"edit\",\"description\":\"Edit a single file using exact text replacement. Every edits[].oldText must match a unique, non-overlapping region of the original file. If two changes affect the same block or nearby lines, merge them into one edit instead of emitting overlapping edits. Do not include large unchanged regions just to connect distant changes.\",\"parameters\":{\"type\":\"object\",\"required\":[\"path\",\"edits\"],\"properties\":{\"path\":{\"type\":\"string\",\"description\":\"Path to the file to edit (relative or absolute)\"},\"edits\":{\"type\":\"array\",\"items\":{\"type\":\"object\",\"required\":[\"oldText\",\"newText\"],\"properties\":{\"oldText\":{\"type\":\"string\",\"description\":\"Exact text for one targeted replacement. It must be unique in the original file and must not overlap with any other edits[].oldText in the same call.\"},\"newText\":{\"type\":\"string\",\"description\":\"Replacement text for this targeted edit.\"}}},\"description\":\"One or more targeted replacements. Each edit is matched against the original file, not incrementally. Do not include overlapping or nested edits. If two changes touch the same block or nearby lines, merge them into one edit instead.\"}}},\"constrainedSampling\":{\"type\":\"json_schema\",\"strict\":\"prefer\"}},{\"name\":\"write\",\"description\":\"Write content to a file. Creates the file if it doesn't exist, overwrites if it does. Automatically creates parent directories.\",\"parameters\":{\"type\":\"object\",\"required\":[\"path\",\"content\"],\"properties\":{\"path\":{\"type\":\"string\",\"description\":\"Path to the file to write (relative or absolute)\"},\"content\":{\"type\":\"string\",\"description\":\"Content to write to the file\"}}},\"constrainedSampling\":{\"type\":\"json_schema\",\"strict\":\"prefer\"}}]}}"}
+{"dir":"out","raw":"{\"type\":\"message_end\",\"message\":{\"role\":\"system\",\"content\":\"\",\"sections\":{\"preamble\":\"You are a protocol capture assistant. Follow exact requests and use only the requested tools. Read and write only within this project. Never read credentials, home directories, or account details.\",\"cwd\":\"<cwd>\\n/Users/xxxxxxxxxxxx/orca-qa/task_7daea3cb4c53/projects/pi/steer-followup-r2\\n</cwd>\"},\"timestamp\":1791280240975,\"toolsAdded\":[{\"name\":\"read\",\"description\":\"Read the contents of a file. Supports text files and images (jpg, png, gif, webp, bmp). Images are sent as attachments. For text files, output is truncated to 2000 lines or 50KB (whichever is hit first). Use offset/limit for large files. When you need the full file, continue with offset until complete.\",\"parameters\":{\"type\":\"object\",\"required\":[\"path\"],\"properties\":{\"path\":{\"type\":\"string\",\"description\":\"Path to the file to read (relative or absolute)\"},\"offset\":{\"type\":\"number\",\"description\":\"Line number to start reading from (1-indexed)\"},\"limit\":{\"type\":\"number\",\"description\":\"Maximum number of lines to read\"}}},\"constrainedSampling\":{\"type\":\"json_schema\",\"strict\":\"prefer\"}},{\"name\":\"bash\",\"description\":\"Execute a bash command in the current working directory. Returns stdout and stderr. Output is truncated to last 2000 lines or 50KB (whichever is hit first). If truncated, full output is saved to a temp file. Optionally provide a timeout in seconds.\",\"parameters\":{\"type\":\"object\",\"required\":[\"command\"],\"properties\":{\"command\":{\"type\":\"string\",\"description\":\"Shell command to execute\"},\"timeout\":{\"type\":\"number\",\"description\":\"Timeout in seconds (optional, no default timeout)\"}}},\"constrainedSampling\":{\"type\":\"json_schema\",\"strict\":\"prefer\"}},{\"name\":\"edit\",\"description\":\"Edit a single file using exact text replacement. Every edits[].oldText must match a unique, non-overlapping region of the original file. If two changes affect the same block or nearby lines, merge them into one edit instead of emitting overlapping edits. Do not include large unchanged regions just to connect distant changes.\",\"parameters\":{\"type\":\"object\",\"required\":[\"path\",\"edits\"],\"properties\":{\"path\":{\"type\":\"string\",\"description\":\"Path to the file to edit (relative or absolute)\"},\"edits\":{\"type\":\"array\",\"items\":{\"type\":\"object\",\"required\":[\"oldText\",\"newText\"],\"properties\":{\"oldText\":{\"type\":\"string\",\"description\":\"Exact text for one targeted replacement. It must be unique in the original file and must not overlap with any other edits[].oldText in the same call.\"},\"newText\":{\"type\":\"string\",\"description\":\"Replacement text for this targeted edit.\"}}},\"description\":\"One or more targeted replacements. Each edit is matched against the original file, not incrementally. Do not include overlapping or nested edits. If two changes touch the same block or nearby lines, merge them into one edit instead.\"}}},\"constrainedSampling\":{\"type\":\"json_schema\",\"strict\":\"prefer\"}},{\"name\":\"write\",\"description\":\"Write content to a file. Creates the file if it doesn't exist, overwrites if it does. Automatically creates parent directories.\",\"parameters\":{\"type\":\"object\",\"required\":[\"path\",\"content\"],\"properties\":{\"path\":{\"type\":\"string\",\"description\":\"Path to the file to write (relative or absolute)\"},\"content\":{\"type\":\"string\",\"description\":\"Content to write to the file\"}}},\"constrainedSampling\":{\"type\":\"json_schema\",\"strict\":\"prefer\"}}]}}"}
+{"dir":"out","raw":"{\"type\":\"message_start\",\"message\":{\"role\":\"user\",\"content\":[{\"type\":\"text\",\"text\":\"Use bash to run exactly: printf capture-start; sleep 20; printf capture-finish. Do not background it. Then reply ORIGINAL_FINISHED.\"}],\"timestamp\":1791280240975}}"}
+{"dir":"out","raw":"{\"type\":\"message_end\",\"message\":{\"role\":\"user\",\"content\":[{\"type\":\"text\",\"text\":\"Use bash to run exactly: printf capture-start; sleep 20; printf capture-finish. Do not background it. Then reply ORIGINAL_FINISHED.\"}],\"timestamp\":1791280240975}}"}
+{"dir":"out","raw":"{\"type\":\"message_start\",\"message\":{\"role\":\"assistant\",\"content\":[],\"api\":\"openai-codex-responses\",\"provider\":\"openai-codex\",\"model\":\"gpt-5.5\",\"usage\":{\"input\":0,\"output\":0,\"cacheRead\":0,\"cacheWrite\":0,\"totalTokens\":0,\"cost\":{\"input\":0,\"output\":0,\"cacheRead\":0,\"cacheWrite\":0,\"total\":0}},\"stopReason\":\"pending\",\"timestamp\":1791280240987}}"}
+{"dir":"out","raw":"{\"type\":\"message_update\",\"usage\":{\"input\":0,\"output\":0,\"cacheRead\":0,\"cacheWrite\":0,\"totalTokens\":0,\"cost\":{\"input\":0,\"output\":0,\"cacheRead\":0,\"cacheWrite\":0,\"total\":0}},\"assistantMessageEvent\":{\"type\":\"toolcall_start\",\"contentIndex\":0,\"id\":\"captured.id.000001.xxxxxxxxxx|captured.id.000002.xxxxxxxxxxxxxxxxxx.xxxxxxxxxxxxxxx\",\"toolName\":\"bash\"}}"}
+{"dir":"out","raw":"{\"type\":\"message_update\",\"usage\":{\"input\":0,\"output\":0,\"cacheRead\":0,\"cacheWrite\":0,\"totalTokens\":0,\"cost\":{\"input\":0,\"output\":0,\"cacheRead\":0,\"cacheWrite\":0,\"total\":0}},\"assistantMessageEvent\":{\"type\":\"toolcall_delta\",\"contentIndex\":0,\"delta\":\"{\\\"\"}}"}
+{"dir":"out","raw":"{\"type\":\"message_update\",\"usage\":{\"input\":0,\"output\":0,\"cacheRead\":0,\"cacheWrite\":0,\"totalTokens\":0,\"cost\":{\"input\":0,\"output\":0,\"cacheRead\":0,\"cacheWrite\":0,\"total\":0}},\"assistantMessageEvent\":{\"type\":\"toolcall_delta\",\"contentIndex\":0,\"delta\":\"command\"}}"}
+{"dir":"out","raw":"{\"type\":\"message_update\",\"usage\":{\"input\":0,\"output\":0,\"cacheRead\":0,\"cacheWrite\":0,\"totalTokens\":0,\"cost\":{\"input\":0,\"output\":0,\"cacheRead\":0,\"cacheWrite\":0,\"total\":0}},\"assistantMessageEvent\":{\"type\":\"toolcall_delta\",\"contentIndex\":0,\"delta\":\"\\\":\\\"\"}}"}
+{"dir":"out","raw":"{\"type\":\"message_update\",\"usage\":{\"input\":0,\"output\":0,\"cacheRead\":0,\"cacheWrite\":0,\"totalTokens\":0,\"cost\":{\"input\":0,\"output\":0,\"cacheRead\":0,\"cacheWrite\":0,\"total\":0}},\"assistantMessageEvent\":{\"type\":\"toolcall_delta\",\"contentIndex\":0,\"delta\":\"printf\"}}"}
+{"dir":"out","raw":"{\"type\":\"message_update\",\"usage\":{\"input\":0,\"output\":0,\"cacheRead\":0,\"cacheWrite\":0,\"totalTokens\":0,\"cost\":{\"input\":0,\"output\":0,\"cacheRead\":0,\"cacheWrite\":0,\"total\":0}},\"assistantMessageEvent\":{\"type\":\"toolcall_delta\",\"contentIndex\":0,\"delta\":\" capture\"}}"}
+{"dir":"out","raw":"{\"type\":\"message_update\",\"usage\":{\"input\":0,\"output\":0,\"cacheRead\":0,\"cacheWrite\":0,\"totalTokens\":0,\"cost\":{\"input\":0,\"output\":0,\"cacheRead\":0,\"cacheWrite\":0,\"total\":0}},\"assistantMessageEvent\":{\"type\":\"toolcall_delta\",\"contentIndex\":0,\"delta\":\"-start\"}}"}
+{"dir":"out","raw":"{\"type\":\"message_update\",\"usage\":{\"input\":0,\"output\":0,\"cacheRead\":0,\"cacheWrite\":0,\"totalTokens\":0,\"cost\":{\"input\":0,\"output\":0,\"cacheRead\":0,\"cacheWrite\":0,\"total\":0}},\"assistantMessageEvent\":{\"type\":\"toolcall_delta\",\"contentIndex\":0,\"delta\":\";\"}}"}
+{"dir":"out","raw":"{\"type\":\"message_update\",\"usage\":{\"input\":0,\"output\":0,\"cacheRead\":0,\"cacheWrite\":0,\"totalTokens\":0,\"cost\":{\"input\":0,\"output\":0,\"cacheRead\":0,\"cacheWrite\":0,\"total\":0}},\"assistantMessageEvent\":{\"type\":\"toolcall_delta\",\"contentIndex\":0,\"delta\":\" sleep\"}}"}
+{"dir":"out","raw":"{\"type\":\"message_update\",\"usage\":{\"input\":0,\"output\":0,\"cacheRead\":0,\"cacheWrite\":0,\"totalTokens\":0,\"cost\":{\"input\":0,\"output\":0,\"cacheRead\":0,\"cacheWrite\":0,\"total\":0}},\"assistantMessageEvent\":{\"type\":\"toolcall_delta\",\"contentIndex\":0,\"delta\":\" \"}}"}
+{"dir":"out","raw":"{\"type\":\"message_update\",\"usage\":{\"input\":0,\"output\":0,\"cacheRead\":0,\"cacheWrite\":0,\"totalTokens\":0,\"cost\":{\"input\":0,\"output\":0,\"cacheRead\":0,\"cacheWrite\":0,\"total\":0}},\"assistantMessageEvent\":{\"type\":\"toolcall_delta\",\"contentIndex\":0,\"delta\":\"20\"}}"}
+{"dir":"out","raw":"{\"type\":\"message_update\",\"usage\":{\"input\":0,\"output\":0,\"cacheRead\":0,\"cacheWrite\":0,\"totalTokens\":0,\"cost\":{\"input\":0,\"output\":0,\"cacheRead\":0,\"cacheWrite\":0,\"total\":0}},\"assistantMessageEvent\":{\"type\":\"toolcall_delta\",\"contentIndex\":0,\"delta\":\";\"}}"}
+{"dir":"out","raw":"{\"type\":\"message_update\",\"usage\":{\"input\":0,\"output\":0,\"cacheRead\":0,\"cacheWrite\":0,\"totalTokens\":0,\"cost\":{\"input\":0,\"output\":0,\"cacheRead\":0,\"cacheWrite\":0,\"total\":0}},\"assistantMessageEvent\":{\"type\":\"toolcall_delta\",\"contentIndex\":0,\"delta\":\" printf\"}}"}
+{"dir":"out","raw":"{\"type\":\"message_update\",\"usage\":{\"input\":0,\"output\":0,\"cacheRead\":0,\"cacheWrite\":0,\"totalTokens\":0,\"cost\":{\"input\":0,\"output\":0,\"cacheRead\":0,\"cacheWrite\":0,\"total\":0}},\"assistantMessageEvent\":{\"type\":\"toolcall_delta\",\"contentIndex\":0,\"delta\":\" capture\"}}"}
+{"dir":"out","raw":"{\"type\":\"message_update\",\"usage\":{\"input\":0,\"output\":0,\"cacheRead\":0,\"cacheWrite\":0,\"totalTokens\":0,\"cost\":{\"input\":0,\"output\":0,\"cacheRead\":0,\"cacheWrite\":0,\"total\":0}},\"assistantMessageEvent\":{\"type\":\"toolcall_delta\",\"contentIndex\":0,\"delta\":\"-f\"}}"}
+{"dir":"out","raw":"{\"type\":\"message_update\",\"usage\":{\"input\":0,\"output\":0,\"cacheRead\":0,\"cacheWrite\":0,\"totalTokens\":0,\"cost\":{\"input\":0,\"output\":0,\"cacheRead\":0,\"cacheWrite\":0,\"total\":0}},\"assistantMessageEvent\":{\"type\":\"toolcall_delta\",\"contentIndex\":0,\"delta\":\"inish\"}}"}
+{"dir":"out","raw":"{\"type\":\"message_update\",\"usage\":{\"input\":0,\"output\":0,\"cacheRead\":0,\"cacheWrite\":0,\"totalTokens\":0,\"cost\":{\"input\":0,\"output\":0,\"cacheRead\":0,\"cacheWrite\":0,\"total\":0}},\"assistantMessageEvent\":{\"type\":\"toolcall_delta\",\"contentIndex\":0,\"delta\":\"\\\",\\\"\"}}"}
+{"dir":"out","raw":"{\"type\":\"message_update\",\"usage\":{\"input\":0,\"output\":0,\"cacheRead\":0,\"cacheWrite\":0,\"totalTokens\":0,\"cost\":{\"input\":0,\"output\":0,\"cacheRead\":0,\"cacheWrite\":0,\"total\":0}},\"assistantMessageEvent\":{\"type\":\"toolcall_delta\",\"contentIndex\":0,\"delta\":\"timeout\"}}"}
+{"dir":"out","raw":"{\"type\":\"message_update\",\"usage\":{\"input\":0,\"output\":0,\"cacheRead\":0,\"cacheWrite\":0,\"totalTokens\":0,\"cost\":{\"input\":0,\"output\":0,\"cacheRead\":0,\"cacheWrite\":0,\"total\":0}},\"assistantMessageEvent\":{\"type\":\"toolcall_delta\",\"contentIndex\":0,\"delta\":\"\\\":\"}}"}
+{"dir":"out","raw":"{\"type\":\"message_update\",\"usage\":{\"input\":0,\"output\":0,\"cacheRead\":0,\"cacheWrite\":0,\"totalTokens\":0,\"cost\":{\"input\":0,\"output\":0,\"cacheRead\":0,\"cacheWrite\":0,\"total\":0}},\"assistantMessageEvent\":{\"type\":\"toolcall_delta\",\"contentIndex\":0,\"delta\":\"30\"}}"}
+{"dir":"out","raw":"{\"type\":\"message_update\",\"usage\":{\"input\":0,\"output\":0,\"cacheRead\":0,\"cacheWrite\":0,\"totalTokens\":0,\"cost\":{\"input\":0,\"output\":0,\"cacheRead\":0,\"cacheWrite\":0,\"total\":0}},\"assistantMessageEvent\":{\"type\":\"toolcall_delta\",\"contentIndex\":0,\"delta\":\"}\"}}"}
+{"dir":"out","raw":"{\"type\":\"message_update\",\"usage\":{\"input\":0,\"output\":0,\"cacheRead\":0,\"cacheWrite\":0,\"totalTokens\":0,\"cost\":{\"input\":0,\"output\":0,\"cacheRead\":0,\"cacheWrite\":0,\"total\":0}},\"assistantMessageEvent\":{\"type\":\"toolcall_end\",\"contentIndex\":0,\"toolCall\":{\"type\":\"toolCall\",\"id\":\"captured.id.000001.xxxxxxxxxx|captured.id.000002.xxxxxxxxxxxxxxxxxx.xxxxxxxxxxxxxxx\",\"name\":\"bash\",\"arguments\":{\"command\":\"printf capture-start; sleep 20; printf capture-finish\",\"timeout\":30}}}}"}
+{"dir":"out","raw":"{\"type\":\"message_end\",\"message\":{\"role\":\"assistant\",\"content\":[{\"type\":\"toolCall\",\"id\":\"captured.id.000001.xxxxxxxxxx|captured.id.000002.xxxxxxxxxxxxxxxxxx.xxxxxxxxxxxxxxx\",\"name\":\"bash\",\"arguments\":{\"command\":\"printf capture-start; sleep 20; printf capture-finish\",\"timeout\":30}}],\"api\":\"openai-codex-responses\",\"provider\":\"openai-codex\",\"model\":\"gpt-5.5\",\"usage\":{\"input\":606,\"output\":33,\"cacheRead\":0,\"cacheWrite\":0,\"reasoning\":0,\"totalTokens\":639,\"cost\":{\"input\":0.00303,\"output\":0.00099,\"cacheRead\":0,\"cacheWrite\":0,\"total\":0.00402}},\"stopReason\":\"toolUse\",\"timestamp\":1791280240987,\"responseId\":\"captured.id.000003.xxxxxxxxxxxxxxxxxx.xxxxxxxxxxxxxxxxx\",\"rawStopReason\":\"completed\",\"thinkingLevel\":\"off\"}}"}
+{"dir":"out","raw":"{\"type\":\"tool_execution_start\",\"toolCallId\":\"captured.id.000001.xxxxxxxxxx|captured.id.000002.xxxxxxxxxxxxxxxxxx.xxxxxxxxxxxxxxx\",\"toolName\":\"bash\",\"args\":{\"command\":\"printf capture-start; sleep 20; printf capture-finish\",\"timeout\":30}}"}
+{"dir":"in","raw":"{\"id\": \"q8\", \"type\": \"prompt\", \"message\": \"After the running tool completes, reply STEER_CONSUMED instead of ORIGINAL_FINISHED.\", \"streamingBehavior\": \"steer\"}"}
+{"dir":"in","raw":"{\"id\": \"q9\", \"type\": \"prompt\", \"message\": \"Then reply FOLLOWUP_CONSUMED on the next turn.\", \"streamingBehavior\": \"followUp\"}"}
+{"dir":"out","raw":"{\"type\":\"tool_execution_update\",\"toolCallId\":\"captured.id.000001.xxxxxxxxxx|captured.id.000002.xxxxxxxxxxxxxxxxxx.xxxxxxxxxxxxxxx\",\"toolName\":\"bash\",\"args\":{\"command\":\"printf capture-start; sleep 20; printf capture-finish\",\"timeout\":30},\"partialResult\":{\"content\":[]}}"}
+{"dir":"out","raw":"{\"type\":\"queue_update\",\"steering\":[\"After the running tool completes, reply STEER_CONSUMED instead of ORIGINAL_FINISHED.\"],\"followUp\":[]}"}
+{"dir":"out","raw":"{\"type\":\"queue_update\",\"steering\":[\"After the running tool completes, reply STEER_CONSUMED instead of ORIGINAL_FINISHED.\"],\"followUp\":[\"Then reply FOLLOWUP_CONSUMED on the next turn.\"]}"}
+{"dir":"out","raw":"{\"id\":\"q8\",\"type\":\"response\",\"command\":\"prompt\",\"success\":true,\"data\":{\"disposition\":\"queued\"}}"}
+{"dir":"out","raw":"{\"id\":\"q9\",\"type\":\"response\",\"command\":\"prompt\",\"success\":true,\"data\":{\"disposition\":\"queued\"}}"}
+{"dir":"out","raw":"{\"type\":\"tool_execution_update\",\"toolCallId\":\"captured.id.000001.xxxxxxxxxx|captured.id.000002.xxxxxxxxxxxxxxxxxx.xxxxxxxxxxxxxxx\",\"toolName\":\"bash\",\"args\":{\"command\":\"printf capture-start; sleep 20; printf capture-finish\",\"timeout\":30},\"partialResult\":{\"content\":[{\"type\":\"text\",\"text\":\"capture-start\"}],\"details\":{}}}"}
+{"dir":"out","raw":"{\"type\":\"tool_execution_update\",\"toolCallId\":\"captured.id.000001.xxxxxxxxxx|captured.id.000002.xxxxxxxxxxxxxxxxxx.xxxxxxxxxxxxxxx\",\"toolName\":\"bash\",\"args\":{\"command\":\"printf capture-start; sleep 20; printf capture-finish\",\"timeout\":30},\"partialResult\":{\"content\":[{\"type\":\"text\",\"text\":\"capture-startcapture-finish\"}],\"details\":{}}}"}
+{"dir":"out","raw":"{\"type\":\"tool_execution_end\",\"toolCallId\":\"captured.id.000001.xxxxxxxxxx|captured.id.000002.xxxxxxxxxxxxxxxxxx.xxxxxxxxxxxxxxx\",\"toolName\":\"bash\",\"result\":{\"content\":[{\"type\":\"text\",\"text\":\"capture-startcapture-finish\"}],\"structuredContent\":{\"output\":\"capture-startcapture-finish\",\"truncated\":false,\"exit_code\":0,\"wall_time_seconds\":20}},\"isError\":false}"}
+{"dir":"out","raw":"{\"type\":\"message_start\",\"message\":{\"role\":\"toolResult\",\"toolCallId\":\"captured.id.000001.xxxxxxxxxx|captured.id.000002.xxxxxxxxxxxxxxxxxx.xxxxxxxxxxxxxxx\",\"toolName\":\"bash\",\"content\":[{\"type\":\"text\",\"text\":\"capture-startcapture-finish\"}],\"isError\":false,\"timestamp\":1791280270461}}"}
+{"dir":"out","raw":"{\"type\":\"message_end\",\"message\":{\"role\":\"toolResult\",\"toolCallId\":\"captured.id.000001.xxxxxxxxxx|captured.id.000002.xxxxxxxxxxxxxxxxxx.xxxxxxxxxxxxxxx\",\"toolName\":\"bash\",\"content\":[{\"type\":\"text\",\"text\":\"capture-startcapture-finish\"}],\"isError\":false,\"timestamp\":1791280270461}}"}
+{"dir":"out","raw":"{\"type\":\"turn_end\",\"message\":{\"role\":\"assistant\",\"content\":[{\"type\":\"toolCall\",\"id\":\"captured.id.000001.xxxxxxxxxx|captured.id.000002.xxxxxxxxxxxxxxxxxx.xxxxxxxxxxxxxxx\",\"name\":\"bash\",\"arguments\":{\"command\":\"printf capture-start; sleep 20; printf capture-finish\",\"timeout\":30}}],\"api\":\"openai-codex-responses\",\"provider\":\"openai-codex\",\"model\":\"gpt-5.5\",\"usage\":{\"input\":606,\"output\":33,\"cacheRead\":0,\"cacheWrite\":0,\"reasoning\":0,\"totalTokens\":639,\"cost\":{\"input\":0.00303,\"output\":0.00099,\"cacheRead\":0,\"cacheWrite\":0,\"total\":0.00402}},\"stopReason\":\"toolUse\",\"timestamp\":1791280240987,\"responseId\":\"captured.id.000003.xxxxxxxxxxxxxxxxxx.xxxxxxxxxxxxxxxxx\",\"rawStopReason\":\"completed\",\"thinkingLevel\":\"off\"},\"toolResults\":[{\"role\":\"toolResult\",\"toolCallId\":\"captured.id.000001.xxxxxxxxxx|captured.id.000002.xxxxxxxxxxxxxxxxxx.xxxxxxxxxxxxxxx\",\"toolName\":\"bash\",\"content\":[{\"type\":\"text\",\"text\":\"capture-startcapture-finish\"}],\"isError\":false,\"timestamp\":1791280270461}]}"}
+{"dir":"out","raw":"{\"type\":\"turn_start\"}"}
+{"dir":"out","raw":"{\"type\":\"queue_update\",\"steering\":[],\"followUp\":[\"Then reply FOLLOWUP_CONSUMED on the next turn.\"]}"}
+{"dir":"out","raw":"{\"type\":\"message_start\",\"message\":{\"role\":\"user\",\"content\":[{\"type\":\"text\",\"text\":\"After the running tool completes, reply STEER_CONSUMED instead of ORIGINAL_FINISHED.\"}],\"timestamp\":1791280250446}}"}
+{"dir":"out","raw":"{\"type\":\"message_end\",\"message\":{\"role\":\"user\",\"content\":[{\"type\":\"text\",\"text\":\"After the running tool completes, reply STEER_CONSUMED instead of ORIGINAL_FINISHED.\"}],\"timestamp\":1791280250446}}"}
+{"dir":"out","raw":"{\"type\":\"message_start\",\"message\":{\"role\":\"assistant\",\"content\":[],\"api\":\"openai-codex-responses\",\"provider\":\"openai-codex\",\"model\":\"gpt-5.5\",\"usage\":{\"input\":0,\"output\":0,\"cacheRead\":0,\"cacheWrite\":0,\"totalTokens\":0,\"cost\":{\"input\":0,\"output\":0,\"cacheRead\":0,\"cacheWrite\":0,\"total\":0}},\"stopReason\":\"pending\",\"timestamp\":1791280270464,\"responseId\":\"captured.id.000004.xxxxxxxxxxxxxxxxxx.xxxxxxxxxxxxxxxxx\"}}"}
+{"dir":"out","raw":"{\"type\":\"message_update\",\"usage\":{\"input\":0,\"output\":0,\"cacheRead\":0,\"cacheWrite\":0,\"totalTokens\":0,\"cost\":{\"input\":0,\"output\":0,\"cacheRead\":0,\"cacheWrite\":0,\"total\":0}},\"assistantMessageEvent\":{\"type\":\"text_start\",\"contentIndex\":0}}"}
+{"dir":"out","raw":"{\"type\":\"message_update\",\"usage\":{\"input\":0,\"output\":0,\"cacheRead\":0,\"cacheWrite\":0,\"totalTokens\":0,\"cost\":{\"input\":0,\"output\":0,\"cacheRead\":0,\"cacheWrite\":0,\"total\":0}},\"assistantMessageEvent\":{\"type\":\"text_delta\",\"contentIndex\":0,\"delta\":\"STE\"}}"}
+{"dir":"out","raw":"{\"type\":\"message_update\",\"usage\":{\"input\":0,\"output\":0,\"cacheRead\":0,\"cacheWrite\":0,\"totalTokens\":0,\"cost\":{\"input\":0,\"output\":0,\"cacheRead\":0,\"cacheWrite\":0,\"total\":0}},\"assistantMessageEvent\":{\"type\":\"text_delta\",\"contentIndex\":0,\"delta\":\"ER\"}}"}
+{"dir":"out","raw":"{\"type\":\"message_update\",\"usage\":{\"input\":0,\"output\":0,\"cacheRead\":0,\"cacheWrite\":0,\"totalTokens\":0,\"cost\":{\"input\":0,\"output\":0,\"cacheRead\":0,\"cacheWrite\":0,\"total\":0}},\"assistantMessageEvent\":{\"type\":\"text_delta\",\"contentIndex\":0,\"delta\":\"_CON\"}}"}
+{"dir":"out","raw":"{\"type\":\"message_update\",\"usage\":{\"input\":0,\"output\":0,\"cacheRead\":0,\"cacheWrite\":0,\"totalTokens\":0,\"cost\":{\"input\":0,\"output\":0,\"cacheRead\":0,\"cacheWrite\":0,\"total\":0}},\"assistantMessageEvent\":{\"type\":\"text_delta\",\"contentIndex\":0,\"delta\":\"SUM\"}}"}
+{"dir":"out","raw":"{\"type\":\"message_update\",\"usage\":{\"input\":0,\"output\":0,\"cacheRead\":0,\"cacheWrite\":0,\"totalTokens\":0,\"cost\":{\"input\":0,\"output\":0,\"cacheRead\":0,\"cacheWrite\":0,\"total\":0}},\"assistantMessageEvent\":{\"type\":\"text_delta\",\"contentIndex\":0,\"delta\":\"ED\"}}"}
+{"dir":"out","raw":"{\"type\":\"message_update\",\"usage\":{\"input\":677,\"output\":9,\"cacheRead\":0,\"cacheWrite\":0,\"reasoning\":0,\"totalTokens\":686,\"cost\":{\"input\":0.0033850000000000004,\"output\":0.00027,\"cacheRead\":0,\"cacheWrite\":0,\"total\":0.0036550000000000003}},\"assistantMessageEvent\":{\"type\":\"text_end\",\"contentIndex\":0,\"content\":\"STEER_CONSUMED\"}}"}
+{"dir":"out","raw":"{\"type\":\"message_end\",\"message\":{\"role\":\"assistant\",\"content\":[{\"type\":\"text\",\"text\":\"STEER_CONSUMED\",\"textSignature\":\"{\\\"v\\\":1,\\\"id\\\":\\\"captured.id.000005.xxxxxxxxxxxxxxxxxx.xxxxxxxxxxxxxxxx\\\",\\\"phase\\\":\\\"final_answer\\\"}\"}],\"api\":\"openai-codex-responses\",\"provider\":\"openai-codex\",\"model\":\"gpt-5.5\",\"usage\":{\"input\":677,\"output\":9,\"cacheRead\":0,\"cacheWrite\":0,\"reasoning\":0,\"totalTokens\":686,\"cost\":{\"input\":0.0033850000000000004,\"output\":0.00027,\"cacheRead\":0,\"cacheWrite\":0,\"total\":0.0036550000000000003}},\"stopReason\":\"stop\",\"timestamp\":1791280270464,\"responseId\":\"captured.id.000004.xxxxxxxxxxxxxxxxxx.xxxxxxxxxxxxxxxxx\",\"rawStopReason\":\"completed\",\"thinkingLevel\":\"off\"}}"}
+{"dir":"out","raw":"{\"type\":\"turn_end\",\"message\":{\"role\":\"assistant\",\"content\":[{\"type\":\"text\",\"text\":\"STEER_CONSUMED\",\"textSignature\":\"{\\\"v\\\":1,\\\"id\\\":\\\"captured.id.000005.xxxxxxxxxxxxxxxxxx.xxxxxxxxxxxxxxxx\\\",\\\"phase\\\":\\\"final_answer\\\"}\"}],\"api\":\"openai-codex-responses\",\"provider\":\"openai-codex\",\"model\":\"gpt-5.5\",\"usage\":{\"input\":677,\"output\":9,\"cacheRead\":0,\"cacheWrite\":0,\"reasoning\":0,\"totalTokens\":686,\"cost\":{\"input\":0.0033850000000000004,\"output\":0.00027,\"cacheRead\":0,\"cacheWrite\":0,\"total\":0.0036550000000000003}},\"stopReason\":\"stop\",\"timestamp\":1791280270464,\"responseId\":\"captured.id.000004.xxxxxxxxxxxxxxxxxx.xxxxxxxxxxxxxxxxx\",\"rawStopReason\":\"completed\",\"thinkingLevel\":\"off\"},\"toolResults\":[]}"}
+{"dir":"out","raw":"{\"type\":\"turn_start\"}"}
+{"dir":"out","raw":"{\"type\":\"queue_update\",\"steering\":[],\"followUp\":[]}"}
+{"dir":"out","raw":"{\"type\":\"message_start\",\"message\":{\"role\":\"user\",\"content\":[{\"type\":\"text\",\"text\":\"Then reply FOLLOWUP_CONSUMED on the next turn.\"}],\"timestamp\":1791280250446}}"}
+{"dir":"out","raw":"{\"type\":\"message_end\",\"message\":{\"role\":\"user\",\"content\":[{\"type\":\"text\",\"text\":\"Then reply FOLLOWUP_CONSUMED on the next turn.\"}],\"timestamp\":1791280250446}}"}
+{"dir":"out","raw":"{\"type\":\"message_start\",\"message\":{\"role\":\"assistant\",\"content\":[],\"api\":\"openai-codex-responses\",\"provider\":\"openai-codex\",\"model\":\"gpt-5.5\",\"usage\":{\"input\":0,\"output\":0,\"cacheRead\":0,\"cacheWrite\":0,\"totalTokens\":0,\"cost\":{\"input\":0,\"output\":0,\"cacheRead\":0,\"cacheWrite\":0,\"total\":0}},\"stopReason\":\"pending\",\"timestamp\":1791280279250}}"}
+{"dir":"out","raw":"{\"type\":\"message_update\",\"usage\":{\"input\":0,\"output\":0,\"cacheRead\":0,\"cacheWrite\":0,\"totalTokens\":0,\"cost\":{\"input\":0,\"output\":0,\"cacheRead\":0,\"cacheWrite\":0,\"total\":0}},\"assistantMessageEvent\":{\"type\":\"text_start\",\"contentIndex\":0}}"}
+{"dir":"out","raw":"{\"type\":\"message_update\",\"usage\":{\"input\":0,\"output\":0,\"cacheRead\":0,\"cacheWrite\":0,\"totalTokens\":0,\"cost\":{\"input\":0,\"output\":0,\"cacheRead\":0,\"cacheWrite\":0,\"total\":0}},\"assistantMessageEvent\":{\"type\":\"text_delta\",\"contentIndex\":0,\"delta\":\"FOLLOW\"}}"}
+{"dir":"out","raw":"{\"type\":\"message_update\",\"usage\":{\"input\":0,\"output\":0,\"cacheRead\":0,\"cacheWrite\":0,\"totalTokens\":0,\"cost\":{\"input\":0,\"output\":0,\"cacheRead\":0,\"cacheWrite\":0,\"total\":0}},\"assistantMessageEvent\":{\"type\":\"text_delta\",\"contentIndex\":0,\"delta\":\"UP\"}}"}
+{"dir":"out","raw":"{\"type\":\"message_update\",\"usage\":{\"input\":0,\"output\":0,\"cacheRead\":0,\"cacheWrite\":0,\"totalTokens\":0,\"cost\":{\"input\":0,\"output\":0,\"cacheRead\":0,\"cacheWrite\":0,\"total\":0}},\"assistantMessageEvent\":{\"type\":\"text_delta\",\"contentIndex\":0,\"delta\":\"_CON\"}}"}
+{"dir":"out","raw":"{\"type\":\"message_update\",\"usage\":{\"input\":0,\"output\":0,\"cacheRead\":0,\"cacheWrite\":0,\"totalTokens\":0,\"cost\":{\"input\":0,\"output\":0,\"cacheRead\":0,\"cacheWrite\":0,\"total\":0}},\"assistantMessageEvent\":{\"type\":\"text_delta\",\"contentIndex\":0,\"delta\":\"SUM\"}}"}
+{"dir":"out","raw":"{\"type\":\"message_update\",\"usage\":{\"input\":0,\"output\":0,\"cacheRead\":0,\"cacheWrite\":0,\"totalTokens\":0,\"cost\":{\"input\":0,\"output\":0,\"cacheRead\":0,\"cacheWrite\":0,\"total\":0}},\"assistantMessageEvent\":{\"type\":\"text_delta\",\"contentIndex\":0,\"delta\":\"ED\"}}"}
+{"dir":"out","raw":"{\"type\":\"message_update\",\"usage\":{\"input\":0,\"output\":0,\"cacheRead\":0,\"cacheWrite\":0,\"totalTokens\":0,\"cost\":{\"input\":0,\"output\":0,\"cacheRead\":0,\"cacheWrite\":0,\"total\":0}},\"assistantMessageEvent\":{\"type\":\"text_end\",\"contentIndex\":0,\"content\":\"FOLLOWUP_CONSUMED\"}}"}
+{"dir":"out","raw":"{\"type\":\"message_end\",\"message\":{\"role\":\"assistant\",\"content\":[{\"type\":\"text\",\"text\":\"FOLLOWUP_CONSUMED\",\"textSignature\":\"{\\\"v\\\":1,\\\"id\\\":\\\"captured.id.000006.xxxxxxxxxxxxxxxxxx.xxxxxxxxxxxxxxxx\\\",\\\"phase\\\":\\\"final_answer\\\"}\"}],\"api\":\"openai-codex-responses\",\"provider\":\"openai-codex\",\"model\":\"gpt-5.5\",\"usage\":{\"input\":704,\"output\":9,\"cacheRead\":0,\"cacheWrite\":0,\"reasoning\":0,\"totalTokens\":713,\"cost\":{\"input\":0.00352,\"output\":0.00027,\"cacheRead\":0,\"cacheWrite\":0,\"total\":0.00379}},\"stopReason\":\"stop\",\"timestamp\":1791280279250,\"responseId\":\"captured.id.000007.xxxxxxxxxxxxxxxxxx.xxxxxxxxxxxxxxxxx\",\"rawStopReason\":\"completed\",\"thinkingLevel\":\"off\"}}"}
+{"dir":"out","raw":"{\"type\":\"turn_end\",\"message\":{\"role\":\"assistant\",\"content\":[{\"type\":\"text\",\"text\":\"FOLLOWUP_CONSUMED\",\"textSignature\":\"{\\\"v\\\":1,\\\"id\\\":\\\"captured.id.000006.xxxxxxxxxxxxxxxxxx.xxxxxxxxxxxxxxxx\\\",\\\"phase\\\":\\\"final_answer\\\"}\"}],\"api\":\"openai-codex-responses\",\"provider\":\"openai-codex\",\"model\":\"gpt-5.5\",\"usage\":{\"input\":704,\"output\":9,\"cacheRead\":0,\"cacheWrite\":0,\"reasoning\":0,\"totalTokens\":713,\"cost\":{\"input\":0.00352,\"output\":0.00027,\"cacheRead\":0,\"cacheWrite\":0,\"total\":0.00379}},\"stopReason\":\"stop\",\"timestamp\":1791280279250,\"responseId\":\"captured.id.000007.xxxxxxxxxxxxxxxxxx.xxxxxxxxxxxxxxxxx\",\"rawStopReason\":\"completed\",\"thinkingLevel\":\"off\"},\"toolResults\":[]}"}
+{"dir":"out","raw":"{\"type\":\"agent_end\",\"messages\":[{\"role\":\"system\",\"content\":\"\",\"sections\":{\"preamble\":\"You are a protocol capture assistant. Follow exact requests and use only the requested tools. Read and write only within this project. Never read credentials, home directories, or account details.\",\"cwd\":\"<cwd>\\n/Users/xxxxxxxxxxxx/orca-qa/task_7daea3cb4c53/projects/pi/steer-followup-r2\\n</cwd>\"},\"timestamp\":1791280240975,\"toolsAdded\":[{\"name\":\"read\",\"description\":\"Read the contents of a file. Supports text files and images (jpg, png, gif, webp, bmp). Images are sent as attachments. For text files, output is truncated to 2000 lines or 50KB (whichever is hit first). Use offset/limit for large files. When you need the full file, continue with offset until complete.\",\"parameters\":{\"type\":\"object\",\"required\":[\"path\"],\"properties\":{\"path\":{\"type\":\"string\",\"description\":\"Path to the file to read (relative or absolute)\"},\"offset\":{\"type\":\"number\",\"description\":\"Line number to start reading from (1-indexed)\"},\"limit\":{\"type\":\"number\",\"description\":\"Maximum number of lines to read\"}}},\"constrainedSampling\":{\"type\":\"json_schema\",\"strict\":\"prefer\"}},{\"name\":\"bash\",\"description\":\"Execute a bash command in the current working directory. Returns stdout and stderr. Output is truncated to last 2000 lines or 50KB (whichever is hit first). If truncated, full output is saved to a temp file. Optionally provide a timeout in seconds.\",\"parameters\":{\"type\":\"object\",\"required\":[\"command\"],\"properties\":{\"command\":{\"type\":\"string\",\"description\":\"Shell command to execute\"},\"timeout\":{\"type\":\"number\",\"description\":\"Timeout in seconds (optional, no default timeout)\"}}},\"constrainedSampling\":{\"type\":\"json_schema\",\"strict\":\"prefer\"}},{\"name\":\"edit\",\"description\":\"Edit a single file using exact text replacement. Every edits[].oldText must match a unique, non-overlapping region of the original file. If two changes affect the same block or nearby lines, merge them into one edit instead of emitting overlapping edits. Do not include large unchanged regions just to connect distant changes.\",\"parameters\":{\"type\":\"object\",\"required\":[\"path\",\"edits\"],\"properties\":{\"path\":{\"type\":\"string\",\"description\":\"Path to the file to edit (relative or absolute)\"},\"edits\":{\"type\":\"array\",\"items\":{\"type\":\"object\",\"required\":[\"oldText\",\"newText\"],\"properties\":{\"oldText\":{\"type\":\"string\",\"description\":\"Exact text for one targeted replacement. It must be unique in the original file and must not overlap with any other edits[].oldText in the same call.\"},\"newText\":{\"type\":\"string\",\"description\":\"Replacement text for this targeted edit.\"}}},\"description\":\"One or more targeted replacements. Each edit is matched against the original file, not incrementally. Do not include overlapping or nested edits. If two changes touch the same block or nearby lines, merge them into one edit instead.\"}}},\"constrainedSampling\":{\"type\":\"json_schema\",\"strict\":\"prefer\"}},{\"name\":\"write\",\"description\":\"Write content to a file. Creates the file if it doesn't exist, overwrites if it does. Automatically creates parent directories.\",\"parameters\":{\"type\":\"object\",\"required\":[\"path\",\"content\"],\"properties\":{\"path\":{\"type\":\"string\",\"description\":\"Path to the file to write (relative or absolute)\"},\"content\":{\"type\":\"string\",\"description\":\"Content to write to the file\"}}},\"constrainedSampling\":{\"type\":\"json_schema\",\"strict\":\"prefer\"}}]},{\"role\":\"user\",\"content\":[{\"type\":\"text\",\"text\":\"Use bash to run exactly: printf capture-start; sleep 20; printf capture-finish. Do not background it. Then reply ORIGINAL_FINISHED.\"}],\"timestamp\":1791280240975},{\"role\":\"assistant\",\"content\":[{\"type\":\"toolCall\",\"id\":\"captured.id.000001.xxxxxxxxxx|captured.id.000002.xxxxxxxxxxxxxxxxxx.xxxxxxxxxxxxxxx\",\"name\":\"bash\",\"arguments\":{\"command\":\"printf capture-start; sleep 20; printf capture-finish\",\"timeout\":30}}],\"api\":\"openai-codex-responses\",\"provider\":\"openai-codex\",\"model\":\"gpt-5.5\",\"usage\":{\"input\":606,\"output\":33,\"cacheRead\":0,\"cacheWrite\":0,\"reasoning\":0,\"totalTokens\":639,\"cost\":{\"input\":0.00303,\"output\":0.00099,\"cacheRead\":0,\"cacheWrite\":0,\"total\":0.00402}},\"stopReason\":\"toolUse\",\"timestamp\":1791280240987,\"responseId\":\"captured.id.000003.xxxxxxxxxxxxxxxxxx.xxxxxxxxxxxxxxxxx\",\"rawStopReason\":\"completed\",\"thinkingLevel\":\"off\"},{\"role\":\"toolResult\",\"toolCallId\":\"captured.id.000001.xxxxxxxxxx|captured.id.000002.xxxxxxxxxxxxxxxxxx.xxxxxxxxxxxxxxx\",\"toolName\":\"bash\",\"content\":[{\"type\":\"text\",\"text\":\"capture-startcapture-finish\"}],\"isError\":false,\"timestamp\":1791280270461},{\"role\":\"user\",\"content\":[{\"type\":\"text\",\"text\":\"After the running tool completes, reply STEER_CONSUMED instead of ORIGINAL_FINISHED.\"}],\"timestamp\":1791280250446},{\"role\":\"assistant\",\"content\":[{\"type\":\"text\",\"text\":\"STEER_CONSUMED\",\"textSignature\":\"{\\\"v\\\":1,\\\"id\\\":\\\"captured.id.000005.xxxxxxxxxxxxxxxxxx.xxxxxxxxxxxxxxxx\\\",\\\"phase\\\":\\\"final_answer\\\"}\"}],\"api\":\"openai-codex-responses\",\"provider\":\"openai-codex\",\"model\":\"gpt-5.5\",\"usage\":{\"input\":677,\"output\":9,\"cacheRead\":0,\"cacheWrite\":0,\"reasoning\":0,\"totalTokens\":686,\"cost\":{\"input\":0.0033850000000000004,\"output\":0.00027,\"cacheRead\":0,\"cacheWrite\":0,\"total\":0.0036550000000000003}},\"stopReason\":\"stop\",\"timestamp\":1791280270464,\"responseId\":\"captured.id.000004.xxxxxxxxxxxxxxxxxx.xxxxxxxxxxxxxxxxx\",\"rawStopReason\":\"completed\",\"thinkingLevel\":\"off\"},{\"role\":\"user\",\"content\":[{\"type\":\"text\",\"text\":\"Then reply FOLLOWUP_CONSUMED on the next turn.\"}],\"timestamp\":1791280250446},{\"role\":\"assistant\",\"content\":[{\"type\":\"text\",\"text\":\"FOLLOWUP_CONSUMED\",\"textSignature\":\"{\\\"v\\\":1,\\\"id\\\":\\\"captured.id.000006.xxxxxxxxxxxxxxxxxx.xxxxxxxxxxxxxxxx\\\",\\\"phase\\\":\\\"final_answer\\\"}\"}],\"api\":\"openai-codex-responses\",\"provider\":\"openai-codex\",\"model\":\"gpt-5.5\",\"usage\":{\"input\":704,\"output\":9,\"cacheRead\":0,\"cacheWrite\":0,\"reasoning\":0,\"totalTokens\":713,\"cost\":{\"input\":0.00352,\"output\":0.00027,\"cacheRead\":0,\"cacheWrite\":0,\"total\":0.00379}},\"stopReason\":\"stop\",\"timestamp\":1791280279250,\"responseId\":\"captured.id.000007.xxxxxxxxxxxxxxxxxx.xxxxxxxxxxxxxxxxx\",\"rawStopReason\":\"completed\",\"thinkingLevel\":\"off\"}],\"willRetry\":false}"}
+{"dir":"in","raw":"{\"id\": \"q10\", \"type\": \"get_state\"}"}
+{"dir":"out","raw":"{\"type\":\"agent_settled\"}"}
+{"dir":"out","raw":"{\"id\":\"q10\",\"type\":\"response\",\"command\":\"get_state\",\"success\":true,\"data\":{\"model\":{\"id\":\"gpt-5.5\",\"name\":\"GPT-5.5\",\"api\":\"openai-codex-responses\",\"provider\":\"openai-codex\",\"baseUrl\":\"https://chatgpt.com/backend-api\",\"reasoning\":true,\"input\":[\"text\",\"image\"],\"cost\":{\"input\":5,\"output\":30,\"cacheRead\":0.5,\"cacheWrite\":0,\"tiers\":[{\"inputTokensAbove\":272000,\"input\":10,\"output\":45,\"cacheRead\":1,\"cacheWrite\":0}]},\"contextWindow\":272000,\"maxTokens\":128000,\"thinkingLevelMap\":{\"xhigh\":\"xhigh\",\"minimal\":\"low\"},\"compat\":{\"supportsOpenAIGrammarTools\":true,\"supportsToolSearch\":true,\"supportsMidConvoSystemMessages\":true},\"inputLimits\":{\"images\":{\"resize\":{\"maxWidth\":2000,\"maxHeight\":2000,\"maxBytes\":4718592,\"jpegQuality\":80}}},\"type\":\"chat\"},\"thinkingLevel\":\"off\",\"isStreaming\":false,\"isCompacting\":false,\"steeringMode\":\"one-at-a-time\",\"followUpMode\":\"one-at-a-time\",\"sessionFile\":\"/Users/xxxxxxxxxxxx/orca-qa/task_7daea3cb4c53/projects/pi/steer-followup-r2/sessions/XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX.jsonl\",\"sessionId\":\"00000000-0000-4000-8000-000000000015\",\"autoCompactionEnabled\":false,\"messageCount\":8,\"pendingMessageCount\":0}}"}
+{"dir":"in","raw":"{\"id\": \"q11\", \"type\": \"get_messages\"}"}
+{"dir":"out","raw":"{\"id\":\"q11\",\"type\":\"response\",\"command\":\"get_messages\",\"success\":true,\"data\":{\"messages\":[{\"role\":\"system\",\"content\":\"\",\"sections\":{\"preamble\":\"You are a protocol capture assistant. Follow exact requests and use only the requested tools. Read and write only within this project. Never read credentials, home directories, or account details.\",\"cwd\":\"<cwd>\\n/Users/xxxxxxxxxxxx/orca-qa/task_7daea3cb4c53/projects/pi/steer-followup-r2\\n</cwd>\"},\"timestamp\":1791280240975,\"toolsAdded\":[{\"name\":\"read\",\"description\":\"Read the contents of a file. Supports text files and images (jpg, png, gif, webp, bmp). Images are sent as attachments. For text files, output is truncated to 2000 lines or 50KB (whichever is hit first). Use offset/limit for large files. When you need the full file, continue with offset until complete.\",\"parameters\":{\"type\":\"object\",\"required\":[\"path\"],\"properties\":{\"path\":{\"type\":\"string\",\"description\":\"Path to the file to read (relative or absolute)\"},\"offset\":{\"type\":\"number\",\"description\":\"Line number to start reading from (1-indexed)\"},\"limit\":{\"type\":\"number\",\"description\":\"Maximum number of lines to read\"}}},\"constrainedSampling\":{\"type\":\"json_schema\",\"strict\":\"prefer\"}},{\"name\":\"bash\",\"description\":\"Execute a bash command in the current working directory. Returns stdout and stderr. Output is truncated to last 2000 lines or 50KB (whichever is hit first). If truncated, full output is saved to a temp file. Optionally provide a timeout in seconds.\",\"parameters\":{\"type\":\"object\",\"required\":[\"command\"],\"properties\":{\"command\":{\"type\":\"string\",\"description\":\"Shell command to execute\"},\"timeout\":{\"type\":\"number\",\"description\":\"Timeout in seconds (optional, no default timeout)\"}}},\"constrainedSampling\":{\"type\":\"json_schema\",\"strict\":\"prefer\"}},{\"name\":\"edit\",\"description\":\"Edit a single file using exact text replacement. Every edits[].oldText must match a unique, non-overlapping region of the original file. If two changes affect the same block or nearby lines, merge them into one edit instead of emitting overlapping edits. Do not include large unchanged regions just to connect distant changes.\",\"parameters\":{\"type\":\"object\",\"required\":[\"path\",\"edits\"],\"properties\":{\"path\":{\"type\":\"string\",\"description\":\"Path to the file to edit (relative or absolute)\"},\"edits\":{\"type\":\"array\",\"items\":{\"type\":\"object\",\"required\":[\"oldText\",\"newText\"],\"properties\":{\"oldText\":{\"type\":\"string\",\"description\":\"Exact text for one targeted replacement. It must be unique in the original file and must not overlap with any other edits[].oldText in the same call.\"},\"newText\":{\"type\":\"string\",\"description\":\"Replacement text for this targeted edit.\"}}},\"description\":\"One or more targeted replacements. Each edit is matched against the original file, not incrementally. Do not include overlapping or nested edits. If two changes touch the same block or nearby lines, merge them into one edit instead.\"}}},\"constrainedSampling\":{\"type\":\"json_schema\",\"strict\":\"prefer\"}},{\"name\":\"write\",\"description\":\"Write content to a file. Creates the file if it doesn't exist, overwrites if it does. Automatically creates parent directories.\",\"parameters\":{\"type\":\"object\",\"required\":[\"path\",\"content\"],\"properties\":{\"path\":{\"type\":\"string\",\"description\":\"Path to the file to write (relative or absolute)\"},\"content\":{\"type\":\"string\",\"description\":\"Content to write to the file\"}}},\"constrainedSampling\":{\"type\":\"json_schema\",\"strict\":\"prefer\"}}]},{\"role\":\"user\",\"content\":[{\"type\":\"text\",\"text\":\"Use bash to run exactly: printf capture-start; sleep 20; printf capture-finish. Do not background it. Then reply ORIGINAL_FINISHED.\"}],\"timestamp\":1791280240975},{\"role\":\"assistant\",\"content\":[{\"type\":\"toolCall\",\"id\":\"captured.id.000001.xxxxxxxxxx|captured.id.000002.xxxxxxxxxxxxxxxxxx.xxxxxxxxxxxxxxx\",\"name\":\"bash\",\"arguments\":{\"command\":\"printf capture-start; sleep 20; printf capture-finish\",\"timeout\":30}}],\"api\":\"openai-codex-responses\",\"provider\":\"openai-codex\",\"model\":\"gpt-5.5\",\"usage\":{\"input\":606,\"output\":33,\"cacheRead\":0,\"cacheWrite\":0,\"reasoning\":0,\"totalTokens\":639,\"cost\":{\"input\":0.00303,\"output\":0.00099,\"cacheRead\":0,\"cacheWrite\":0,\"total\":0.00402}},\"stopReason\":\"toolUse\",\"timestamp\":1791280240987,\"responseId\":\"captured.id.000003.xxxxxxxxxxxxxxxxxx.xxxxxxxxxxxxxxxxx\",\"rawStopReason\":\"completed\",\"thinkingLevel\":\"off\"},{\"role\":\"toolResult\",\"toolCallId\":\"captured.id.000001.xxxxxxxxxx|captured.id.000002.xxxxxxxxxxxxxxxxxx.xxxxxxxxxxxxxxx\",\"toolName\":\"bash\",\"content\":[{\"type\":\"text\",\"text\":\"capture-startcapture-finish\"}],\"isError\":false,\"timestamp\":1791280270461},{\"role\":\"user\",\"content\":[{\"type\":\"text\",\"text\":\"After the running tool completes, reply STEER_CONSUMED instead of ORIGINAL_FINISHED.\"}],\"timestamp\":1791280250446},{\"role\":\"assistant\",\"content\":[{\"type\":\"text\",\"text\":\"STEER_CONSUMED\",\"textSignature\":\"{\\\"v\\\":1,\\\"id\\\":\\\"captured.id.000005.xxxxxxxxxxxxxxxxxx.xxxxxxxxxxxxxxxx\\\",\\\"phase\\\":\\\"final_answer\\\"}\"}],\"api\":\"openai-codex-responses\",\"provider\":\"openai-codex\",\"model\":\"gpt-5.5\",\"usage\":{\"input\":677,\"output\":9,\"cacheRead\":0,\"cacheWrite\":0,\"reasoning\":0,\"totalTokens\":686,\"cost\":{\"input\":0.0033850000000000004,\"output\":0.00027,\"cacheRead\":0,\"cacheWrite\":0,\"total\":0.0036550000000000003}},\"stopReason\":\"stop\",\"timestamp\":1791280270464,\"responseId\":\"captured.id.000004.xxxxxxxxxxxxxxxxxx.xxxxxxxxxxxxxxxxx\",\"rawStopReason\":\"completed\",\"thinkingLevel\":\"off\"},{\"role\":\"user\",\"content\":[{\"type\":\"text\",\"text\":\"Then reply FOLLOWUP_CONSUMED on the next turn.\"}],\"timestamp\":1791280250446},{\"role\":\"assistant\",\"content\":[{\"type\":\"text\",\"text\":\"FOLLOWUP_CONSUMED\",\"textSignature\":\"{\\\"v\\\":1,\\\"id\\\":\\\"captured.id.000006.xxxxxxxxxxxxxxxxxx.xxxxxxxxxxxxxxxx\\\",\\\"phase\\\":\\\"final_answer\\\"}\"}],\"api\":\"openai-codex-responses\",\"provider\":\"openai-codex\",\"model\":\"gpt-5.5\",\"usage\":{\"input\":704,\"output\":9,\"cacheRead\":0,\"cacheWrite\":0,\"reasoning\":0,\"totalTokens\":713,\"cost\":{\"input\":0.00352,\"output\":0.00027,\"cacheRead\":0,\"cacheWrite\":0,\"total\":0.00379}},\"stopReason\":\"stop\",\"timestamp\":1791280279250,\"responseId\":\"captured.id.000007.xxxxxxxxxxxxxxxxxx.xxxxxxxxxxxxxxxxx\",\"rawStopReason\":\"completed\",\"thinkingLevel\":\"off\"}]}}"}
diff --git a/src/main/pi/__fixtures__/stop-mid-tool.jsonl b/src/main/pi/__fixtures__/stop-mid-tool.jsonl
new file mode 100644
index 000000000000..6f68cddfd61c
--- /dev/null
+++ b/src/main/pi/__fixtures__/stop-mid-tool.jsonl
@@ -0,0 +1,64 @@
+{"dir":"in","raw":"{\"id\": \"q1\", \"type\": \"get_state\"}"}
+{"dir":"out","raw":"{\"id\":\"q1\",\"type\":\"response\",\"command\":\"get_state\",\"success\":true,\"data\":{\"model\":{\"id\":\"gpt-6.1-sol\",\"name\":\"GPT-6.1 Sol\",\"api\":\"openai-codex-responses\",\"provider\":\"openai-codex\",\"baseUrl\":\"https://chatgpt.com/backend-api\",\"reasoning\":true,\"input\":[\"text\",\"image\"],\"cost\":{\"input\":2,\"output\":10,\"cacheRead\":0.1,\"cacheWrite\":2.5,\"tiers\":[{\"inputTokensAbove\":272000,\"input\":4,\"output\":15,\"cacheRead\":0.2,\"cacheWrite\":5}]},\"contextWindow\":272000,\"maxTokens\":128000,\"thinkingLevelMap\":{\"off\":null,\"minimal\":\"low\",\"low\":\"low\",\"medium\":\"medium\",\"high\":\"high\",\"xhigh\":\"xhigh\",\"max\":\"max\"},\"compat\":{\"supportsOpenAIGrammarTools\":true,\"supportsAdditionalTools\":true,\"supportsToolSearch\":true,\"supportsMidConvoSystemMessages\":true},\"inputLimits\":{\"images\":{\"resize\":{\"maxWidth\":2000,\"maxHeight\":2000,\"maxBytes\":4718592,\"jpegQuality\":80}}},\"type\":\"chat\"},\"thinkingLevel\":\"medium\",\"isStreaming\":false,\"isCompacting\":false,\"steeringMode\":\"one-at-a-time\",\"followUpMode\":\"one-at-a-time\",\"sessionFile\":\"/Users/xxxxxxxxxxxx/orca-qa/task_7daea3cb4c53/projects/pi/stop-tool-bun/sessions/XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX.jsonl\",\"sessionId\":\"00000000-0000-4000-8000-000000000016\",\"autoCompactionEnabled\":true,\"messageCount\":0,\"pendingMessageCount\":0}}"}
+{"dir":"in","raw":"{\"id\": \"q2\", \"type\": \"set_auto_retry\", \"enabled\": false}"}
+{"dir":"out","raw":"{\"id\":\"q2\",\"type\":\"response\",\"command\":\"set_auto_retry\",\"success\":true}"}
+{"dir":"in","raw":"{\"id\": \"q3\", \"type\": \"set_auto_compaction\", \"enabled\": false}"}
+{"dir":"out","raw":"{\"id\":\"q3\",\"type\":\"response\",\"command\":\"set_auto_compaction\",\"success\":true}"}
+{"dir":"in","raw":"{\"id\": \"q4\", \"type\": \"get_available_models\"}"}
+{"dir":"out","raw":"{\"id\":\"q4\",\"type\":\"response\",\"command\":\"get_available_models\",\"success\":true,\"data\":{\"models\":[{\"id\":\"gpt-5.3-codex-spark\",\"name\":\"GPT-5.3 Codex Spark\",\"api\":\"openai-codex-responses\",\"provider\":\"openai-codex\",\"baseUrl\":\"https://chatgpt.com/backend-api\",\"reasoning\":true,\"input\":[\"text\"],\"cost\":{\"input\":1.75,\"output\":14,\"cacheRead\":0.175,\"cacheWrite\":0},\"contextWindow\":128000,\"maxTokens\":128000,\"thinkingLevelMap\":{\"xhigh\":\"xhigh\",\"minimal\":\"low\"},\"compat\":{\"supportsOpenAIGrammarTools\":true},\"type\":\"chat\"},{\"id\":\"gpt-5.5\",\"name\":\"GPT-5.5\",\"api\":\"openai-codex-responses\",\"provider\":\"openai-codex\",\"baseUrl\":\"https://chatgpt.com/backend-api\",\"reasoning\":true,\"input\":[\"text\",\"image\"],\"cost\":{\"input\":5,\"output\":30,\"cacheRead\":0.5,\"cacheWrite\":0,\"tiers\":[{\"inputTokensAbove\":272000,\"input\":10,\"output\":45,\"cacheRead\":1,\"cacheWrite\":0}]},\"contextWindow\":272000,\"maxTokens\":128000,\"thinkingLevelMap\":{\"xhigh\":\"xhigh\",\"minimal\":\"low\"},\"compat\":{\"supportsOpenAIGrammarTools\":true,\"supportsToolSearch\":true,\"supportsMidConvoSystemMessages\":true},\"inputLimits\":{\"images\":{\"resize\":{\"maxWidth\":2000,\"maxHeight\":2000,\"maxBytes\":4718592,\"jpegQuality\":80}}},\"type\":\"chat\"},{\"id\":\"gpt-5.6-luna\",\"name\":\"GPT-5.6 Luna\",\"api\":\"openai-codex-responses\",\"provider\":\"openai-codex\",\"baseUrl\":\"https://chatgpt.com/backend-api\",\"reasoning\":true,\"input\":[\"text\",\"image\"],\"cost\":{\"input\":0.2,\"output\":1.2,\"cacheRead\":0.02,\"cacheWrite\":0.25,\"tiers\":[{\"inputTokensAbove\":272000,\"input\":0.4,\"output\":1.8,\"cacheRead\":0.04,\"cacheWrite\":0.5}]},\"contextWindow\":272000,\"maxTokens\":128000,\"thinkingLevelMap\":{\"xhigh\":\"xhigh\",\"max\":\"max\",\"minimal\":\"low\"},\"compat\":{\"supportsOpenAIGrammarTools\":true,\"supportsAdditionalTools\":true,\"supportsToolSearch\":true,\"supportsMidConvoSystemMessages\":true},\"inputLimits\":{\"images\":{\"resize\":{\"maxWidth\":2000,\"maxHeight\":2000,\"maxBytes\":4718592,\"jpegQuality\":80}}},\"type\":\"chat\"},{\"id\":\"gpt-5.6-sol\",\"name\":\"GPT-5.6 Sol\",\"api\":\"openai-codex-responses\",\"provider\":\"openai-codex\",\"baseUrl\":\"https://chatgpt.com/backend-api\",\"reasoning\":true,\"input\":[\"text\",\"image\"],\"cost\":{\"input\":4,\"output\":20,\"cacheRead\":0.4,\"cacheWrite\":5,\"tiers\":[{\"inputTokensAbove\":272000,\"input\":8,\"output\":30,\"cacheRead\":0.8,\"cacheWrite\":10}]},\"contextWindow\":272000,\"maxTokens\":128000,\"thinkingLevelMap\":{\"xhigh\":\"xhigh\",\"max\":\"max\",\"minimal\":\"low\"},\"compat\":{\"supportsOpenAIGrammarTools\":true,\"supportsAdditionalTools\":true,\"supportsToolSearch\":true,\"supportsMidConvoSystemMessages\":true},\"inputLimits\":{\"images\":{\"resize\":{\"maxWidth\":2000,\"maxHeight\":2000,\"maxBytes\":4718592,\"jpegQuality\":80}}},\"type\":\"chat\"},{\"id\":\"gpt-5.6-terra\",\"name\":\"GPT-5.6 Terra\",\"api\":\"openai-codex-responses\",\"provider\":\"openai-codex\",\"baseUrl\":\"https://chatgpt.com/backend-api\",\"reasoning\":true,\"input\":[\"text\",\"image\"],\"cost\":{\"input\":2,\"output\":12,\"cacheRead\":0.2,\"cacheWrite\":2.5,\"tiers\":[{\"inputTokensAbove\":272000,\"input\":4,\"output\":18,\"cacheRead\":0.4,\"cacheWrite\":5}]},\"contextWindow\":272000,\"maxTokens\":128000,\"thinkingLevelMap\":{\"xhigh\":\"xhigh\",\"max\":\"max\",\"minimal\":\"low\"},\"compat\":{\"supportsOpenAIGrammarTools\":true,\"supportsAdditionalTools\":true,\"supportsToolSearch\":true,\"supportsMidConvoSystemMessages\":true},\"inputLimits\":{\"images\":{\"resize\":{\"maxWidth\":2000,\"maxHeight\":2000,\"maxBytes\":4718592,\"jpegQuality\":80}}},\"type\":\"chat\"},{\"id\":\"gpt-6-astra\",\"name\":\"GPT-6 Astra\",\"api\":\"openai-codex-responses\",\"provider\":\"openai-codex\",\"baseUrl\":\"https://chatgpt.com/backend-api\",\"reasoning\":true,\"input\":[\"text\",\"image\"],\"cost\":{\"input\":10,\"output\":50,\"cacheRead\":1,\"cacheWrite\":12.5,\"tiers\":[{\"inputTokensAbove\":272000,\"input\":20,\"output\":75,\"cacheRead\":2,\"cacheWrite\":25}]},\"contextWindow\":272000,\"maxTokens\":128000,\"thinkingLevelMap\":{\"off\":null,\"minimal\":\"low\",\"low\":\"low\",\"medium\":\"medium\",\"high\":\"high\",\"xhigh\":\"xhigh\",\"max\":\"max\"},\"compat\":{\"supportsOpenAIGrammarTools\":true,\"supportsAdditionalTools\":true,\"supportsToolSearch\":true,\"supportsMidConvoSystemMessages\":true},\"inputLimits\":{\"images\":{\"resize\":{\"maxWidth\":2000,\"maxHeight\":2000,\"maxBytes\":4718592,\"jpegQuality\":80}}},\"type\":\"chat\"},{\"id\":\"gpt-6-luna\",\"name\":\"GPT-6 Luna\",\"api\":\"openai-codex-responses\",\"provider\":\"openai-codex\",\"baseUrl\":\"https://chatgpt.com/backend-api\",\"reasoning\":true,\"input\":[\"text\",\"image\"],\"cost\":{\"input\":0.1,\"output\":0.5,\"cacheRead\":0.01,\"cacheWrite\":0.125,\"tiers\":[{\"inputTokensAbove\":272000,\"input\":0.2,\"output\":0.75,\"cacheRead\":0.02,\"cacheWrite\":0.25}]},\"contextWindow\":272000,\"maxTokens\":128000,\"thinkingLevelMap\":{\"off\":\"none\",\"minimal\":\"low\",\"low\":\"low\",\"medium\":\"medium\",\"high\":\"high\",\"xhigh\":\"xhigh\",\"max\":\"max\"},\"compat\":{\"supportsOpenAIGrammarTools\":true,\"supportsAdditionalTools\":true,\"supportsToolSearch\":true,\"supportsMidConvoSystemMessages\":true},\"inputLimits\":{\"images\":{\"resize\":{\"maxWidth\":2000,\"maxHeight\":2000,\"maxBytes\":4718592,\"jpegQuality\":80}}},\"type\":\"chat\"},{\"id\":\"gpt-6-sol\",\"name\":\"GPT-6 Sol\",\"api\":\"openai-codex-responses\",\"provider\":\"openai-codex\",\"baseUrl\":\"https://chatgpt.com/backend-api\",\"reasoning\":true,\"input\":[\"text\",\"image\"],\"cost\":{\"input\":2,\"output\":10,\"cacheRead\":0.2,\"cacheWrite\":2.5,\"tiers\":[{\"inputTokensAbove\":272000,\"input\":4,\"output\":15,\"cacheRead\":0.4,\"cacheWrite\":5}]},\"contextWindow\":272000,\"maxTokens\":128000,\"thinkingLevelMap\":{\"off\":\"none\",\"minimal\":\"low\",\"low\":\"low\",\"medium\":\"medium\",\"high\":\"high\",\"xhigh\":\"xhigh\",\"max\":\"max\"},\"compat\":{\"supportsOpenAIGrammarTools\":true,\"supportsAdditionalTools\":true,\"supportsToolSearch\":true,\"supportsMidConvoSystemMessages\":true},\"inputLimits\":{\"images\":{\"resize\":{\"maxWidth\":2000,\"maxHeight\":2000,\"maxBytes\":4718592,\"jpegQuality\":80}}},\"type\":\"chat\"},{\"id\":\"gpt-6.1-sol\",\"name\":\"GPT-6.1 Sol\",\"api\":\"openai-codex-responses\",\"provider\":\"openai-codex\",\"baseUrl\":\"https://chatgpt.com/backend-api\",\"reasoning\":true,\"input\":[\"text\",\"image\"],\"cost\":{\"input\":2,\"output\":10,\"cacheRead\":0.1,\"cacheWrite\":2.5,\"tiers\":[{\"inputTokensAbove\":272000,\"input\":4,\"output\":15,\"cacheRead\":0.2,\"cacheWrite\":5}]},\"contextWindow\":272000,\"maxTokens\":128000,\"thinkingLevelMap\":{\"off\":null,\"minimal\":\"low\",\"low\":\"low\",\"medium\":\"medium\",\"high\":\"high\",\"xhigh\":\"xhigh\",\"max\":\"max\"},\"compat\":{\"supportsOpenAIGrammarTools\":true,\"supportsAdditionalTools\":true,\"supportsToolSearch\":true,\"supportsMidConvoSystemMessages\":true},\"inputLimits\":{\"images\":{\"resize\":{\"maxWidth\":2000,\"maxHeight\":2000,\"maxBytes\":4718592,\"jpegQuality\":80}}},\"type\":\"chat\"}]}}"}
+{"dir":"in","raw":"{\"id\": \"q5\", \"type\": \"set_model\", \"provider\": \"openai-codex\", \"modelId\": \"gpt-5.5\"}"}
+{"dir":"out","raw":"{\"id\":\"q5\",\"type\":\"response\",\"command\":\"set_model\",\"success\":true,\"data\":{\"id\":\"gpt-5.5\",\"name\":\"GPT-5.5\",\"api\":\"openai-codex-responses\",\"provider\":\"openai-codex\",\"baseUrl\":\"https://chatgpt.com/backend-api\",\"reasoning\":true,\"input\":[\"text\",\"image\"],\"cost\":{\"input\":5,\"output\":30,\"cacheRead\":0.5,\"cacheWrite\":0,\"tiers\":[{\"inputTokensAbove\":272000,\"input\":10,\"output\":45,\"cacheRead\":1,\"cacheWrite\":0}]},\"contextWindow\":272000,\"maxTokens\":128000,\"thinkingLevelMap\":{\"xhigh\":\"xhigh\",\"minimal\":\"low\"},\"compat\":{\"supportsOpenAIGrammarTools\":true,\"supportsToolSearch\":true,\"supportsMidConvoSystemMessages\":true},\"inputLimits\":{\"images\":{\"resize\":{\"maxWidth\":2000,\"maxHeight\":2000,\"maxBytes\":4718592,\"jpegQuality\":80}}},\"type\":\"chat\"}}"}
+{"dir":"in","raw":"{\"id\": \"q6\", \"type\": \"set_thinking_level\", \"level\": \"off\"}"}
+{"dir":"out","raw":"{\"type\":\"thinking_level_changed\",\"level\":\"off\"}"}
+{"dir":"out","raw":"{\"id\":\"q6\",\"type\":\"response\",\"command\":\"set_thinking_level\",\"success\":true}"}
+{"dir":"in","raw":"{\"id\": \"q7\", \"type\": \"prompt\", \"message\": \"Use bash to run exactly: printf capture-start; sleep 20; printf capture-finish. Do not background it. Then reply ORIGINAL_FINISHED.\"}"}
+{"dir":"out","raw":"{\"id\":\"q7\",\"type\":\"response\",\"command\":\"prompt\",\"success\":true,\"data\":{\"disposition\":\"started\"}}"}
+{"dir":"out","raw":"{\"type\":\"agent_start\"}"}
+{"dir":"out","raw":"{\"type\":\"turn_start\"}"}
+{"dir":"out","raw":"{\"type\":\"message_start\",\"message\":{\"role\":\"system\",\"content\":\"\",\"sections\":{\"preamble\":\"You are a protocol capture assistant. Follow exact requests and use only the requested tools. Read and write only within this project. Never read credentials, home directories, or account details.\",\"cwd\":\"<cwd>\\n/Users/xxxxxxxxxxxx/orca-qa/task_7daea3cb4c53/projects/pi/stop-tool-bun\\n</cwd>\"},\"timestamp\":1791279790624,\"toolsAdded\":[{\"name\":\"read\",\"description\":\"Read the contents of a file. Supports text files and images (jpg, png, gif, webp, bmp). Images are sent as attachments. For text files, output is truncated to 2000 lines or 50KB (whichever is hit first). Use offset/limit for large files. When you need the full file, continue with offset until complete.\",\"parameters\":{\"type\":\"object\",\"required\":[\"path\"],\"properties\":{\"path\":{\"type\":\"string\",\"description\":\"Path to the file to read (relative or absolute)\"},\"offset\":{\"type\":\"number\",\"description\":\"Line number to start reading from (1-indexed)\"},\"limit\":{\"type\":\"number\",\"description\":\"Maximum number of lines to read\"}}},\"constrainedSampling\":{\"type\":\"json_schema\",\"strict\":\"prefer\"}},{\"name\":\"bash\",\"description\":\"Execute a bash command in the current working directory. Returns stdout and stderr. Output is truncated to last 2000 lines or 50KB (whichever is hit first). If truncated, full output is saved to a temp file. Optionally provide a timeout in seconds.\",\"parameters\":{\"type\":\"object\",\"required\":[\"command\"],\"properties\":{\"command\":{\"type\":\"string\",\"description\":\"Shell command to execute\"},\"timeout\":{\"type\":\"number\",\"description\":\"Timeout in seconds (optional, no default timeout)\"}}},\"constrainedSampling\":{\"type\":\"json_schema\",\"strict\":\"prefer\"}},{\"name\":\"edit\",\"description\":\"Edit a single file using exact text replacement. Every edits[].oldText must match a unique, non-overlapping region of the original file. If two changes affect the same block or nearby lines, merge them into one edit instead of emitting overlapping edits. Do not include large unchanged regions just to connect distant changes.\",\"parameters\":{\"type\":\"object\",\"required\":[\"path\",\"edits\"],\"properties\":{\"path\":{\"type\":\"string\",\"description\":\"Path to the file to edit (relative or absolute)\"},\"edits\":{\"type\":\"array\",\"items\":{\"type\":\"object\",\"required\":[\"oldText\",\"newText\"],\"properties\":{\"oldText\":{\"type\":\"string\",\"description\":\"Exact text for one targeted replacement. It must be unique in the original file and must not overlap with any other edits[].oldText in the same call.\"},\"newText\":{\"type\":\"string\",\"description\":\"Replacement text for this targeted edit.\"}}},\"description\":\"One or more targeted replacements. Each edit is matched against the original file, not incrementally. Do not include overlapping or nested edits. If two changes touch the same block or nearby lines, merge them into one edit instead.\"}}},\"constrainedSampling\":{\"type\":\"json_schema\",\"strict\":\"prefer\"}},{\"name\":\"write\",\"description\":\"Write content to a file. Creates the file if it doesn't exist, overwrites if it does. Automatically creates parent directories.\",\"parameters\":{\"type\":\"object\",\"required\":[\"path\",\"content\"],\"properties\":{\"path\":{\"type\":\"string\",\"description\":\"Path to the file to write (relative or absolute)\"},\"content\":{\"type\":\"string\",\"description\":\"Content to write to the file\"}}},\"constrainedSampling\":{\"type\":\"json_schema\",\"strict\":\"prefer\"}}]}}"}
+{"dir":"out","raw":"{\"type\":\"message_end\",\"message\":{\"role\":\"system\",\"content\":\"\",\"sections\":{\"preamble\":\"You are a protocol capture assistant. Follow exact requests and use only the requested tools. Read and write only within this project. Never read credentials, home directories, or account details.\",\"cwd\":\"<cwd>\\n/Users/xxxxxxxxxxxx/orca-qa/task_7daea3cb4c53/projects/pi/stop-tool-bun\\n</cwd>\"},\"timestamp\":1791279790624,\"toolsAdded\":[{\"name\":\"read\",\"description\":\"Read the contents of a file. Supports text files and images (jpg, png, gif, webp, bmp). Images are sent as attachments. For text files, output is truncated to 2000 lines or 50KB (whichever is hit first). Use offset/limit for large files. When you need the full file, continue with offset until complete.\",\"parameters\":{\"type\":\"object\",\"required\":[\"path\"],\"properties\":{\"path\":{\"type\":\"string\",\"description\":\"Path to the file to read (relative or absolute)\"},\"offset\":{\"type\":\"number\",\"description\":\"Line number to start reading from (1-indexed)\"},\"limit\":{\"type\":\"number\",\"description\":\"Maximum number of lines to read\"}}},\"constrainedSampling\":{\"type\":\"json_schema\",\"strict\":\"prefer\"}},{\"name\":\"bash\",\"description\":\"Execute a bash command in the current working directory. Returns stdout and stderr. Output is truncated to last 2000 lines or 50KB (whichever is hit first). If truncated, full output is saved to a temp file. Optionally provide a timeout in seconds.\",\"parameters\":{\"type\":\"object\",\"required\":[\"command\"],\"properties\":{\"command\":{\"type\":\"string\",\"description\":\"Shell command to execute\"},\"timeout\":{\"type\":\"number\",\"description\":\"Timeout in seconds (optional, no default timeout)\"}}},\"constrainedSampling\":{\"type\":\"json_schema\",\"strict\":\"prefer\"}},{\"name\":\"edit\",\"description\":\"Edit a single file using exact text replacement. Every edits[].oldText must match a unique, non-overlapping region of the original file. If two changes affect the same block or nearby lines, merge them into one edit instead of emitting overlapping edits. Do not include large unchanged regions just to connect distant changes.\",\"parameters\":{\"type\":\"object\",\"required\":[\"path\",\"edits\"],\"properties\":{\"path\":{\"type\":\"string\",\"description\":\"Path to the file to edit (relative or absolute)\"},\"edits\":{\"type\":\"array\",\"items\":{\"type\":\"object\",\"required\":[\"oldText\",\"newText\"],\"properties\":{\"oldText\":{\"type\":\"string\",\"description\":\"Exact text for one targeted replacement. It must be unique in the original file and must not overlap with any other edits[].oldText in the same call.\"},\"newText\":{\"type\":\"string\",\"description\":\"Replacement text for this targeted edit.\"}}},\"description\":\"One or more targeted replacements. Each edit is matched against the original file, not incrementally. Do not include overlapping or nested edits. If two changes touch the same block or nearby lines, merge them into one edit instead.\"}}},\"constrainedSampling\":{\"type\":\"json_schema\",\"strict\":\"prefer\"}},{\"name\":\"write\",\"description\":\"Write content to a file. Creates the file if it doesn't exist, overwrites if it does. Automatically creates parent directories.\",\"parameters\":{\"type\":\"object\",\"required\":[\"path\",\"content\"],\"properties\":{\"path\":{\"type\":\"string\",\"description\":\"Path to the file to write (relative or absolute)\"},\"content\":{\"type\":\"string\",\"description\":\"Content to write to the file\"}}},\"constrainedSampling\":{\"type\":\"json_schema\",\"strict\":\"prefer\"}}]}}"}
+{"dir":"out","raw":"{\"type\":\"message_start\",\"message\":{\"role\":\"user\",\"content\":[{\"type\":\"text\",\"text\":\"Use bash to run exactly: printf capture-start; sleep 20; printf capture-finish. Do not background it. Then reply ORIGINAL_FINISHED.\"}],\"timestamp\":1791279790624}}"}
+{"dir":"out","raw":"{\"type\":\"message_end\",\"message\":{\"role\":\"user\",\"content\":[{\"type\":\"text\",\"text\":\"Use bash to run exactly: printf capture-start; sleep 20; printf capture-finish. Do not background it. Then reply ORIGINAL_FINISHED.\"}],\"timestamp\":1791279790624}}"}
+{"dir":"out","raw":"{\"type\":\"message_start\",\"message\":{\"role\":\"assistant\",\"content\":[],\"api\":\"openai-codex-responses\",\"provider\":\"openai-codex\",\"model\":\"gpt-5.5\",\"usage\":{\"input\":0,\"output\":0,\"cacheRead\":0,\"cacheWrite\":0,\"totalTokens\":0,\"cost\":{\"input\":0,\"output\":0,\"cacheRead\":0,\"cacheWrite\":0,\"total\":0}},\"stopReason\":\"pending\",\"timestamp\":1791279790635}}"}
+{"dir":"out","raw":"{\"type\":\"message_update\",\"usage\":{\"input\":0,\"output\":0,\"cacheRead\":0,\"cacheWrite\":0,\"totalTokens\":0,\"cost\":{\"input\":0,\"output\":0,\"cacheRead\":0,\"cacheWrite\":0,\"total\":0}},\"assistantMessageEvent\":{\"type\":\"toolcall_start\",\"contentIndex\":0,\"id\":\"captured.id.000008.xxxxxxxxxxxxxxxxxx|captured.id.000009.xxxxxxxxxxxxxxxxxx.xxxxxxxxxxxxxxx\",\"toolName\":\"bash\"}}"}
+{"dir":"out","raw":"{\"type\":\"message_update\",\"usage\":{\"input\":0,\"output\":0,\"cacheRead\":0,\"cacheWrite\":0,\"totalTokens\":0,\"cost\":{\"input\":0,\"output\":0,\"cacheRead\":0,\"cacheWrite\":0,\"total\":0}},\"assistantMessageEvent\":{\"type\":\"toolcall_delta\",\"contentIndex\":0,\"delta\":\"{\\\"\"}}"}
+{"dir":"out","raw":"{\"type\":\"message_update\",\"usage\":{\"input\":0,\"output\":0,\"cacheRead\":0,\"cacheWrite\":0,\"totalTokens\":0,\"cost\":{\"input\":0,\"output\":0,\"cacheRead\":0,\"cacheWrite\":0,\"total\":0}},\"assistantMessageEvent\":{\"type\":\"toolcall_delta\",\"contentIndex\":0,\"delta\":\"command\"}}"}
+{"dir":"out","raw":"{\"type\":\"message_update\",\"usage\":{\"input\":0,\"output\":0,\"cacheRead\":0,\"cacheWrite\":0,\"totalTokens\":0,\"cost\":{\"input\":0,\"output\":0,\"cacheRead\":0,\"cacheWrite\":0,\"total\":0}},\"assistantMessageEvent\":{\"type\":\"toolcall_delta\",\"contentIndex\":0,\"delta\":\"\\\":\\\"\"}}"}
+{"dir":"out","raw":"{\"type\":\"message_update\",\"usage\":{\"input\":0,\"output\":0,\"cacheRead\":0,\"cacheWrite\":0,\"totalTokens\":0,\"cost\":{\"input\":0,\"output\":0,\"cacheRead\":0,\"cacheWrite\":0,\"total\":0}},\"assistantMessageEvent\":{\"type\":\"toolcall_delta\",\"contentIndex\":0,\"delta\":\"printf\"}}"}
+{"dir":"out","raw":"{\"type\":\"message_update\",\"usage\":{\"input\":0,\"output\":0,\"cacheRead\":0,\"cacheWrite\":0,\"totalTokens\":0,\"cost\":{\"input\":0,\"output\":0,\"cacheRead\":0,\"cacheWrite\":0,\"total\":0}},\"assistantMessageEvent\":{\"type\":\"toolcall_delta\",\"contentIndex\":0,\"delta\":\" capture\"}}"}
+{"dir":"out","raw":"{\"type\":\"message_update\",\"usage\":{\"input\":0,\"output\":0,\"cacheRead\":0,\"cacheWrite\":0,\"totalTokens\":0,\"cost\":{\"input\":0,\"output\":0,\"cacheRead\":0,\"cacheWrite\":0,\"total\":0}},\"assistantMessageEvent\":{\"type\":\"toolcall_delta\",\"contentIndex\":0,\"delta\":\"-start\"}}"}
+{"dir":"out","raw":"{\"type\":\"message_update\",\"usage\":{\"input\":0,\"output\":0,\"cacheRead\":0,\"cacheWrite\":0,\"totalTokens\":0,\"cost\":{\"input\":0,\"output\":0,\"cacheRead\":0,\"cacheWrite\":0,\"total\":0}},\"assistantMessageEvent\":{\"type\":\"toolcall_delta\",\"contentIndex\":0,\"delta\":\";\"}}"}
+{"dir":"out","raw":"{\"type\":\"message_update\",\"usage\":{\"input\":0,\"output\":0,\"cacheRead\":0,\"cacheWrite\":0,\"totalTokens\":0,\"cost\":{\"input\":0,\"output\":0,\"cacheRead\":0,\"cacheWrite\":0,\"total\":0}},\"assistantMessageEvent\":{\"type\":\"toolcall_delta\",\"contentIndex\":0,\"delta\":\" sleep\"}}"}
+{"dir":"out","raw":"{\"type\":\"message_update\",\"usage\":{\"input\":0,\"output\":0,\"cacheRead\":0,\"cacheWrite\":0,\"totalTokens\":0,\"cost\":{\"input\":0,\"output\":0,\"cacheRead\":0,\"cacheWrite\":0,\"total\":0}},\"assistantMessageEvent\":{\"type\":\"toolcall_delta\",\"contentIndex\":0,\"delta\":\" \"}}"}
+{"dir":"out","raw":"{\"type\":\"message_update\",\"usage\":{\"input\":0,\"output\":0,\"cacheRead\":0,\"cacheWrite\":0,\"totalTokens\":0,\"cost\":{\"input\":0,\"output\":0,\"cacheRead\":0,\"cacheWrite\":0,\"total\":0}},\"assistantMessageEvent\":{\"type\":\"toolcall_delta\",\"contentIndex\":0,\"delta\":\"20\"}}"}
+{"dir":"out","raw":"{\"type\":\"message_update\",\"usage\":{\"input\":0,\"output\":0,\"cacheRead\":0,\"cacheWrite\":0,\"totalTokens\":0,\"cost\":{\"input\":0,\"output\":0,\"cacheRead\":0,\"cacheWrite\":0,\"total\":0}},\"assistantMessageEvent\":{\"type\":\"toolcall_delta\",\"contentIndex\":0,\"delta\":\";\"}}"}
+{"dir":"out","raw":"{\"type\":\"message_update\",\"usage\":{\"input\":0,\"output\":0,\"cacheRead\":0,\"cacheWrite\":0,\"totalTokens\":0,\"cost\":{\"input\":0,\"output\":0,\"cacheRead\":0,\"cacheWrite\":0,\"total\":0}},\"assistantMessageEvent\":{\"type\":\"toolcall_delta\",\"contentIndex\":0,\"delta\":\" printf\"}}"}
+{"dir":"out","raw":"{\"type\":\"message_update\",\"usage\":{\"input\":0,\"output\":0,\"cacheRead\":0,\"cacheWrite\":0,\"totalTokens\":0,\"cost\":{\"input\":0,\"output\":0,\"cacheRead\":0,\"cacheWrite\":0,\"total\":0}},\"assistantMessageEvent\":{\"type\":\"toolcall_delta\",\"contentIndex\":0,\"delta\":\" capture\"}}"}
+{"dir":"out","raw":"{\"type\":\"message_update\",\"usage\":{\"input\":0,\"output\":0,\"cacheRead\":0,\"cacheWrite\":0,\"totalTokens\":0,\"cost\":{\"input\":0,\"output\":0,\"cacheRead\":0,\"cacheWrite\":0,\"total\":0}},\"assistantMessageEvent\":{\"type\":\"toolcall_delta\",\"contentIndex\":0,\"delta\":\"-f\"}}"}
+{"dir":"out","raw":"{\"type\":\"message_update\",\"usage\":{\"input\":0,\"output\":0,\"cacheRead\":0,\"cacheWrite\":0,\"totalTokens\":0,\"cost\":{\"input\":0,\"output\":0,\"cacheRead\":0,\"cacheWrite\":0,\"total\":0}},\"assistantMessageEvent\":{\"type\":\"toolcall_delta\",\"contentIndex\":0,\"delta\":\"inish\"}}"}
+{"dir":"out","raw":"{\"type\":\"message_update\",\"usage\":{\"input\":0,\"output\":0,\"cacheRead\":0,\"cacheWrite\":0,\"totalTokens\":0,\"cost\":{\"input\":0,\"output\":0,\"cacheRead\":0,\"cacheWrite\":0,\"total\":0}},\"assistantMessageEvent\":{\"type\":\"toolcall_delta\",\"contentIndex\":0,\"delta\":\"\\\",\\\"\"}}"}
+{"dir":"out","raw":"{\"type\":\"message_update\",\"usage\":{\"input\":0,\"output\":0,\"cacheRead\":0,\"cacheWrite\":0,\"totalTokens\":0,\"cost\":{\"input\":0,\"output\":0,\"cacheRead\":0,\"cacheWrite\":0,\"total\":0}},\"assistantMessageEvent\":{\"type\":\"toolcall_delta\",\"contentIndex\":0,\"delta\":\"timeout\"}}"}
+{"dir":"out","raw":"{\"type\":\"message_update\",\"usage\":{\"input\":0,\"output\":0,\"cacheRead\":0,\"cacheWrite\":0,\"totalTokens\":0,\"cost\":{\"input\":0,\"output\":0,\"cacheRead\":0,\"cacheWrite\":0,\"total\":0}},\"assistantMessageEvent\":{\"type\":\"toolcall_delta\",\"contentIndex\":0,\"delta\":\"\\\":\"}}"}
+{"dir":"out","raw":"{\"type\":\"message_update\",\"usage\":{\"input\":0,\"output\":0,\"cacheRead\":0,\"cacheWrite\":0,\"totalTokens\":0,\"cost\":{\"input\":0,\"output\":0,\"cacheRead\":0,\"cacheWrite\":0,\"total\":0}},\"assistantMessageEvent\":{\"type\":\"toolcall_delta\",\"contentIndex\":0,\"delta\":\"25\"}}"}
+{"dir":"out","raw":"{\"type\":\"message_update\",\"usage\":{\"input\":0,\"output\":0,\"cacheRead\":0,\"cacheWrite\":0,\"totalTokens\":0,\"cost\":{\"input\":0,\"output\":0,\"cacheRead\":0,\"cacheWrite\":0,\"total\":0}},\"assistantMessageEvent\":{\"type\":\"toolcall_delta\",\"contentIndex\":0,\"delta\":\"}\"}}"}
+{"dir":"out","raw":"{\"type\":\"message_update\",\"usage\":{\"input\":0,\"output\":0,\"cacheRead\":0,\"cacheWrite\":0,\"totalTokens\":0,\"cost\":{\"input\":0,\"output\":0,\"cacheRead\":0,\"cacheWrite\":0,\"total\":0}},\"assistantMessageEvent\":{\"type\":\"toolcall_end\",\"contentIndex\":0,\"toolCall\":{\"type\":\"toolCall\",\"id\":\"captured.id.000008.xxxxxxxxxxxxxxxxxx|captured.id.000009.xxxxxxxxxxxxxxxxxx.xxxxxxxxxxxxxxx\",\"name\":\"bash\",\"arguments\":{\"command\":\"printf capture-start; sleep 20; printf capture-finish\",\"timeout\":25}}}}"}
+{"dir":"out","raw":"{\"type\":\"message_end\",\"message\":{\"role\":\"assistant\",\"content\":[{\"type\":\"toolCall\",\"id\":\"captured.id.000008.xxxxxxxxxxxxxxxxxx|captured.id.000009.xxxxxxxxxxxxxxxxxx.xxxxxxxxxxxxxxx\",\"name\":\"bash\",\"arguments\":{\"command\":\"printf capture-start; sleep 20; printf capture-finish\",\"timeout\":25}}],\"api\":\"openai-codex-responses\",\"provider\":\"openai-codex\",\"model\":\"gpt-5.5\",\"usage\":{\"input\":604,\"output\":33,\"cacheRead\":0,\"cacheWrite\":0,\"reasoning\":0,\"totalTokens\":637,\"cost\":{\"input\":0.00302,\"output\":0.00099,\"cacheRead\":0,\"cacheWrite\":0,\"total\":0.00401}},\"stopReason\":\"toolUse\",\"timestamp\":1791279790635,\"responseId\":\"captured.id.000010.xxxxxxxxxxxxxxxxxx.xxxxxxxxxxxxxxxxx\",\"rawStopReason\":\"completed\",\"thinkingLevel\":\"off\"}}"}
+{"dir":"out","raw":"{\"type\":\"tool_execution_start\",\"toolCallId\":\"captured.id.000008.xxxxxxxxxxxxxxxxxx|captured.id.000009.xxxxxxxxxxxxxxxxxx.xxxxxxxxxxxxxxx\",\"toolName\":\"bash\",\"args\":{\"command\":\"printf capture-start; sleep 20; printf capture-finish\",\"timeout\":25}}"}
+{"dir":"out","raw":"{\"type\":\"tool_execution_update\",\"toolCallId\":\"captured.id.000008.xxxxxxxxxxxxxxxxxx|captured.id.000009.xxxxxxxxxxxxxxxxxx.xxxxxxxxxxxxxxx\",\"toolName\":\"bash\",\"args\":{\"command\":\"printf capture-start; sleep 20; printf capture-finish\",\"timeout\":25},\"partialResult\":{\"content\":[]}}"}
+{"dir":"out","raw":"{\"type\":\"tool_execution_update\",\"toolCallId\":\"captured.id.000008.xxxxxxxxxxxxxxxxxx|captured.id.000009.xxxxxxxxxxxxxxxxxx.xxxxxxxxxxxxxxx\",\"toolName\":\"bash\",\"args\":{\"command\":\"printf capture-start; sleep 20; printf capture-finish\",\"timeout\":25},\"partialResult\":{\"content\":[{\"type\":\"text\",\"text\":\"capture-start\"}],\"details\":{}}}"}
+{"dir":"in","raw":"{\"id\": \"q8\", \"type\": \"abort\"}"}
+{"dir":"out","raw":"{\"type\":\"tool_execution_end\",\"toolCallId\":\"captured.id.000008.xxxxxxxxxxxxxxxxxx|captured.id.000009.xxxxxxxxxxxxxxxxxx.xxxxxxxxxxxxxxx\",\"toolName\":\"bash\",\"result\":{\"content\":[{\"type\":\"text\",\"text\":\"capture-start\\n\\nCommand aborted\"}],\"details\":{}},\"isError\":true}"}
+{"dir":"out","raw":"{\"type\":\"message_start\",\"message\":{\"role\":\"toolResult\",\"toolCallId\":\"captured.id.000008.xxxxxxxxxxxxxxxxxx|captured.id.000009.xxxxxxxxxxxxxxxxxx.xxxxxxxxxxxxxxx\",\"toolName\":\"bash\",\"content\":[{\"type\":\"text\",\"text\":\"capture-start\\n\\nCommand aborted\"}],\"details\":{},\"isError\":true,\"timestamp\":1791279805864}}"}
+{"dir":"out","raw":"{\"type\":\"message_end\",\"message\":{\"role\":\"toolResult\",\"toolCallId\":\"captured.id.000008.xxxxxxxxxxxxxxxxxx|captured.id.000009.xxxxxxxxxxxxxxxxxx.xxxxxxxxxxxxxxx\",\"toolName\":\"bash\",\"content\":[{\"type\":\"text\",\"text\":\"capture-start\\n\\nCommand aborted\"}],\"details\":{},\"isError\":true,\"timestamp\":1791279805864}}"}
+{"dir":"out","raw":"{\"type\":\"turn_end\",\"message\":{\"role\":\"assistant\",\"content\":[{\"type\":\"toolCall\",\"id\":\"captured.id.000008.xxxxxxxxxxxxxxxxxx|captured.id.000009.xxxxxxxxxxxxxxxxxx.xxxxxxxxxxxxxxx\",\"name\":\"bash\",\"arguments\":{\"command\":\"printf capture-start; sleep 20; printf capture-finish\",\"timeout\":25}}],\"api\":\"openai-codex-responses\",\"provider\":\"openai-codex\",\"model\":\"gpt-5.5\",\"usage\":{\"input\":604,\"output\":33,\"cacheRead\":0,\"cacheWrite\":0,\"reasoning\":0,\"totalTokens\":637,\"cost\":{\"input\":0.00302,\"output\":0.00099,\"cacheRead\":0,\"cacheWrite\":0,\"total\":0.00401}},\"stopReason\":\"toolUse\",\"timestamp\":1791279790635,\"responseId\":\"captured.id.000010.xxxxxxxxxxxxxxxxxx.xxxxxxxxxxxxxxxxx\",\"rawStopReason\":\"completed\",\"thinkingLevel\":\"off\"},\"toolResults\":[{\"role\":\"toolResult\",\"toolCallId\":\"captured.id.000008.xxxxxxxxxxxxxxxxxx|captured.id.000009.xxxxxxxxxxxxxxxxxx.xxxxxxxxxxxxxxx\",\"toolName\":\"bash\",\"content\":[{\"type\":\"text\",\"text\":\"capture-start\\n\\nCommand aborted\"}],\"details\":{},\"isError\":true,\"timestamp\":1791279805864}]}"}
+{"dir":"out","raw":"{\"type\":\"turn_start\"}"}
+{"dir":"out","raw":"{\"type\":\"message_start\",\"message\":{\"role\":\"assistant\",\"content\":[],\"api\":\"openai-codex-responses\",\"provider\":\"openai-codex\",\"model\":\"gpt-5.5\",\"usage\":{\"input\":0,\"output\":0,\"cacheRead\":0,\"cacheWrite\":0,\"totalTokens\":0,\"cost\":{\"input\":0,\"output\":0,\"cacheRead\":0,\"cacheWrite\":0,\"total\":0}},\"stopReason\":\"error\",\"errorMessage\":\"The operation was aborted.\",\"timestamp\":1791279805865,\"thinkingLevel\":\"off\"}}"}
+{"dir":"out","raw":"{\"type\":\"message_end\",\"message\":{\"role\":\"assistant\",\"content\":[],\"api\":\"openai-codex-responses\",\"provider\":\"openai-codex\",\"model\":\"gpt-5.5\",\"usage\":{\"input\":0,\"output\":0,\"cacheRead\":0,\"cacheWrite\":0,\"totalTokens\":0,\"cost\":{\"input\":0,\"output\":0,\"cacheRead\":0,\"cacheWrite\":0,\"total\":0}},\"stopReason\":\"error\",\"errorMessage\":\"The operation was aborted.\",\"timestamp\":1791279805865,\"thinkingLevel\":\"off\"}}"}
+{"dir":"out","raw":"{\"type\":\"turn_end\",\"message\":{\"role\":\"assistant\",\"content\":[],\"api\":\"openai-codex-responses\",\"provider\":\"openai-codex\",\"model\":\"gpt-5.5\",\"usage\":{\"input\":0,\"output\":0,\"cacheRead\":0,\"cacheWrite\":0,\"totalTokens\":0,\"cost\":{\"input\":0,\"output\":0,\"cacheRead\":0,\"cacheWrite\":0,\"total\":0}},\"stopReason\":\"error\",\"errorMessage\":\"The operation was aborted.\",\"timestamp\":1791279805865,\"thinkingLevel\":\"off\"},\"toolResults\":[]}"}
+{"dir":"out","raw":"{\"type\":\"agent_end\",\"messages\":[{\"role\":\"system\",\"content\":\"\",\"sections\":{\"preamble\":\"You are a protocol capture assistant. Follow exact requests and use only the requested tools. Read and write only within this project. Never read credentials, home directories, or account details.\",\"cwd\":\"<cwd>\\n/Users/xxxxxxxxxxxx/orca-qa/task_7daea3cb4c53/projects/pi/stop-tool-bun\\n</cwd>\"},\"timestamp\":1791279790624,\"toolsAdded\":[{\"name\":\"read\",\"description\":\"Read the contents of a file. Supports text files and images (jpg, png, gif, webp, bmp). Images are sent as attachments. For text files, output is truncated to 2000 lines or 50KB (whichever is hit first). Use offset/limit for large files. When you need the full file, continue with offset until complete.\",\"parameters\":{\"type\":\"object\",\"required\":[\"path\"],\"properties\":{\"path\":{\"type\":\"string\",\"description\":\"Path to the file to read (relative or absolute)\"},\"offset\":{\"type\":\"number\",\"description\":\"Line number to start reading from (1-indexed)\"},\"limit\":{\"type\":\"number\",\"description\":\"Maximum number of lines to read\"}}},\"constrainedSampling\":{\"type\":\"json_schema\",\"strict\":\"prefer\"}},{\"name\":\"bash\",\"description\":\"Execute a bash command in the current working directory. Returns stdout and stderr. Output is truncated to last 2000 lines or 50KB (whichever is hit first). If truncated, full output is saved to a temp file. Optionally provide a timeout in seconds.\",\"parameters\":{\"type\":\"object\",\"required\":[\"command\"],\"properties\":{\"command\":{\"type\":\"string\",\"description\":\"Shell command to execute\"},\"timeout\":{\"type\":\"number\",\"description\":\"Timeout in seconds (optional, no default timeout)\"}}},\"constrainedSampling\":{\"type\":\"json_schema\",\"strict\":\"prefer\"}},{\"name\":\"edit\",\"description\":\"Edit a single file using exact text replacement. Every edits[].oldText must match a unique, non-overlapping region of the original file. If two changes affect the same block or nearby lines, merge them into one edit instead of emitting overlapping edits. Do not include large unchanged regions just to connect distant changes.\",\"parameters\":{\"type\":\"object\",\"required\":[\"path\",\"edits\"],\"properties\":{\"path\":{\"type\":\"string\",\"description\":\"Path to the file to edit (relative or absolute)\"},\"edits\":{\"type\":\"array\",\"items\":{\"type\":\"object\",\"required\":[\"oldText\",\"newText\"],\"properties\":{\"oldText\":{\"type\":\"string\",\"description\":\"Exact text for one targeted replacement. It must be unique in the original file and must not overlap with any other edits[].oldText in the same call.\"},\"newText\":{\"type\":\"string\",\"description\":\"Replacement text for this targeted edit.\"}}},\"description\":\"One or more targeted replacements. Each edit is matched against the original file, not incrementally. Do not include overlapping or nested edits. If two changes touch the same block or nearby lines, merge them into one edit instead.\"}}},\"constrainedSampling\":{\"type\":\"json_schema\",\"strict\":\"prefer\"}},{\"name\":\"write\",\"description\":\"Write content to a file. Creates the file if it doesn't exist, overwrites if it does. Automatically creates parent directories.\",\"parameters\":{\"type\":\"object\",\"required\":[\"path\",\"content\"],\"properties\":{\"path\":{\"type\":\"string\",\"description\":\"Path to the file to write (relative or absolute)\"},\"content\":{\"type\":\"string\",\"description\":\"Content to write to the file\"}}},\"constrainedSampling\":{\"type\":\"json_schema\",\"strict\":\"prefer\"}}]},{\"role\":\"user\",\"content\":[{\"type\":\"text\",\"text\":\"Use bash to run exactly: printf capture-start; sleep 20; printf capture-finish. Do not background it. Then reply ORIGINAL_FINISHED.\"}],\"timestamp\":1791279790624},{\"role\":\"assistant\",\"content\":[{\"type\":\"toolCall\",\"id\":\"captured.id.000008.xxxxxxxxxxxxxxxxxx|captured.id.000009.xxxxxxxxxxxxxxxxxx.xxxxxxxxxxxxxxx\",\"name\":\"bash\",\"arguments\":{\"command\":\"printf capture-start; sleep 20; printf capture-finish\",\"timeout\":25}}],\"api\":\"openai-codex-responses\",\"provider\":\"openai-codex\",\"model\":\"gpt-5.5\",\"usage\":{\"input\":604,\"output\":33,\"cacheRead\":0,\"cacheWrite\":0,\"reasoning\":0,\"totalTokens\":637,\"cost\":{\"input\":0.00302,\"output\":0.00099,\"cacheRead\":0,\"cacheWrite\":0,\"total\":0.00401}},\"stopReason\":\"toolUse\",\"timestamp\":1791279790635,\"responseId\":\"captured.id.000010.xxxxxxxxxxxxxxxxxx.xxxxxxxxxxxxxxxxx\",\"rawStopReason\":\"completed\",\"thinkingLevel\":\"off\"},{\"role\":\"toolResult\",\"toolCallId\":\"captured.id.000008.xxxxxxxxxxxxxxxxxx|captured.id.000009.xxxxxxxxxxxxxxxxxx.xxxxxxxxxxxxxxx\",\"toolName\":\"bash\",\"content\":[{\"type\":\"text\",\"text\":\"capture-start\\n\\nCommand aborted\"}],\"details\":{},\"isError\":true,\"timestamp\":1791279805864},{\"role\":\"assistant\",\"content\":[],\"api\":\"openai-codex-responses\",\"provider\":\"openai-codex\",\"model\":\"gpt-5.5\",\"usage\":{\"input\":0,\"output\":0,\"cacheRead\":0,\"cacheWrite\":0,\"totalTokens\":0,\"cost\":{\"input\":0,\"output\":0,\"cacheRead\":0,\"cacheWrite\":0,\"total\":0}},\"stopReason\":\"error\",\"errorMessage\":\"The operation was aborted.\",\"timestamp\":1791279805865,\"thinkingLevel\":\"off\"}],\"willRetry\":false}"}
+{"dir":"out","raw":"{\"type\":\"agent_settled\"}"}
+{"dir":"out","raw":"{\"id\":\"q8\",\"type\":\"response\",\"command\":\"abort\",\"success\":true}"}
+{"dir":"in","raw":"{\"id\": \"q9\", \"type\": \"get_state\"}"}
+{"dir":"out","raw":"{\"id\":\"q9\",\"type\":\"response\",\"command\":\"get_state\",\"success\":true,\"data\":{\"model\":{\"id\":\"gpt-5.5\",\"name\":\"GPT-5.5\",\"api\":\"openai-codex-responses\",\"provider\":\"openai-codex\",\"baseUrl\":\"https://chatgpt.com/backend-api\",\"reasoning\":true,\"input\":[\"text\",\"image\"],\"cost\":{\"input\":5,\"output\":30,\"cacheRead\":0.5,\"cacheWrite\":0,\"tiers\":[{\"inputTokensAbove\":272000,\"input\":10,\"output\":45,\"cacheRead\":1,\"cacheWrite\":0}]},\"contextWindow\":272000,\"maxTokens\":128000,\"thinkingLevelMap\":{\"xhigh\":\"xhigh\",\"minimal\":\"low\"},\"compat\":{\"supportsOpenAIGrammarTools\":true,\"supportsToolSearch\":true,\"supportsMidConvoSystemMessages\":true},\"inputLimits\":{\"images\":{\"resize\":{\"maxWidth\":2000,\"maxHeight\":2000,\"maxBytes\":4718592,\"jpegQuality\":80}}},\"type\":\"chat\"},\"thinkingLevel\":\"off\",\"isStreaming\":false,\"isCompacting\":false,\"steeringMode\":\"one-at-a-time\",\"followUpMode\":\"one-at-a-time\",\"sessionFile\":\"/Users/xxxxxxxxxxxx/orca-qa/task_7daea3cb4c53/projects/pi/stop-tool-bun/sessions/XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX.jsonl\",\"sessionId\":\"00000000-0000-4000-8000-000000000016\",\"autoCompactionEnabled\":false,\"messageCount\":5,\"pendingMessageCount\":0}}"}
+{"dir":"in","raw":"{\"id\": \"q10\", \"type\": \"get_messages\"}"}
+{"dir":"out","raw":"{\"id\":\"q10\",\"type\":\"response\",\"command\":\"get_messages\",\"success\":true,\"data\":{\"messages\":[{\"role\":\"system\",\"content\":\"\",\"sections\":{\"preamble\":\"You are a protocol capture assistant. Follow exact requests and use only the requested tools. Read and write only within this project. Never read credentials, home directories, or account details.\",\"cwd\":\"<cwd>\\n/Users/xxxxxxxxxxxx/orca-qa/task_7daea3cb4c53/projects/pi/stop-tool-bun\\n</cwd>\"},\"timestamp\":1791279790624,\"toolsAdded\":[{\"name\":\"read\",\"description\":\"Read the contents of a file. Supports text files and images (jpg, png, gif, webp, bmp). Images are sent as attachments. For text files, output is truncated to 2000 lines or 50KB (whichever is hit first). Use offset/limit for large files. When you need the full file, continue with offset until complete.\",\"parameters\":{\"type\":\"object\",\"required\":[\"path\"],\"properties\":{\"path\":{\"type\":\"string\",\"description\":\"Path to the file to read (relative or absolute)\"},\"offset\":{\"type\":\"number\",\"description\":\"Line number to start reading from (1-indexed)\"},\"limit\":{\"type\":\"number\",\"description\":\"Maximum number of lines to read\"}}},\"constrainedSampling\":{\"type\":\"json_schema\",\"strict\":\"prefer\"}},{\"name\":\"bash\",\"description\":\"Execute a bash command in the current working directory. Returns stdout and stderr. Output is truncated to last 2000 lines or 50KB (whichever is hit first). If truncated, full output is saved to a temp file. Optionally provide a timeout in seconds.\",\"parameters\":{\"type\":\"object\",\"required\":[\"command\"],\"properties\":{\"command\":{\"type\":\"string\",\"description\":\"Shell command to execute\"},\"timeout\":{\"type\":\"number\",\"description\":\"Timeout in seconds (optional, no default timeout)\"}}},\"constrainedSampling\":{\"type\":\"json_schema\",\"strict\":\"prefer\"}},{\"name\":\"edit\",\"description\":\"Edit a single file using exact text replacement. Every edits[].oldText must match a unique, non-overlapping region of the original file. If two changes affect the same block or nearby lines, merge them into one edit instead of emitting overlapping edits. Do not include large unchanged regions just to connect distant changes.\",\"parameters\":{\"type\":\"object\",\"required\":[\"path\",\"edits\"],\"properties\":{\"path\":{\"type\":\"string\",\"description\":\"Path to the file to edit (relative or absolute)\"},\"edits\":{\"type\":\"array\",\"items\":{\"type\":\"object\",\"required\":[\"oldText\",\"newText\"],\"properties\":{\"oldText\":{\"type\":\"string\",\"description\":\"Exact text for one targeted replacement. It must be unique in the original file and must not overlap with any other edits[].oldText in the same call.\"},\"newText\":{\"type\":\"string\",\"description\":\"Replacement text for this targeted edit.\"}}},\"description\":\"One or more targeted replacements. Each edit is matched against the original file, not incrementally. Do not include overlapping or nested edits. If two changes touch the same block or nearby lines, merge them into one edit instead.\"}}},\"constrainedSampling\":{\"type\":\"json_schema\",\"strict\":\"prefer\"}},{\"name\":\"write\",\"description\":\"Write content to a file. Creates the file if it doesn't exist, overwrites if it does. Automatically creates parent directories.\",\"parameters\":{\"type\":\"object\",\"required\":[\"path\",\"content\"],\"properties\":{\"path\":{\"type\":\"string\",\"description\":\"Path to the file to write (relative or absolute)\"},\"content\":{\"type\":\"string\",\"description\":\"Content to write to the file\"}}},\"constrainedSampling\":{\"type\":\"json_schema\",\"strict\":\"prefer\"}}]},{\"role\":\"user\",\"content\":[{\"type\":\"text\",\"text\":\"Use bash to run exactly: printf capture-start; sleep 20; printf capture-finish. Do not background it. Then reply ORIGINAL_FINISHED.\"}],\"timestamp\":1791279790624},{\"role\":\"assistant\",\"content\":[{\"type\":\"toolCall\",\"id\":\"captured.id.000008.xxxxxxxxxxxxxxxxxx|captured.id.000009.xxxxxxxxxxxxxxxxxx.xxxxxxxxxxxxxxx\",\"name\":\"bash\",\"arguments\":{\"command\":\"printf capture-start; sleep 20; printf capture-finish\",\"timeout\":25}}],\"api\":\"openai-codex-responses\",\"provider\":\"openai-codex\",\"model\":\"gpt-5.5\",\"usage\":{\"input\":604,\"output\":33,\"cacheRead\":0,\"cacheWrite\":0,\"reasoning\":0,\"totalTokens\":637,\"cost\":{\"input\":0.00302,\"output\":0.00099,\"cacheRead\":0,\"cacheWrite\":0,\"total\":0.00401}},\"stopReason\":\"toolUse\",\"timestamp\":1791279790635,\"responseId\":\"captured.id.000010.xxxxxxxxxxxxxxxxxx.xxxxxxxxxxxxxxxxx\",\"rawStopReason\":\"completed\",\"thinkingLevel\":\"off\"},{\"role\":\"toolResult\",\"toolCallId\":\"captured.id.000008.xxxxxxxxxxxxxxxxxx|captured.id.000009.xxxxxxxxxxxxxxxxxx.xxxxxxxxxxxxxxx\",\"toolName\":\"bash\",\"content\":[{\"type\":\"text\",\"text\":\"capture-start\\n\\nCommand aborted\"}],\"details\":{},\"isError\":true,\"timestamp\":1791279805864},{\"role\":\"assistant\",\"content\":[],\"api\":\"openai-codex-responses\",\"provider\":\"openai-codex\",\"model\":\"gpt-5.5\",\"usage\":{\"input\":0,\"output\":0,\"cacheRead\":0,\"cacheWrite\":0,\"totalTokens\":0,\"cost\":{\"input\":0,\"output\":0,\"cacheRead\":0,\"cacheWrite\":0,\"total\":0}},\"stopReason\":\"error\",\"errorMessage\":\"The operation was aborted.\",\"timestamp\":1791279805865,\"thinkingLevel\":\"off\"}]}}"}
diff --git a/src/main/pi/rpc-agent-definition.ts b/src/main/pi/rpc-agent-definition.ts
new file mode 100644
index 000000000000..bbbd2d8429a9
--- /dev/null
+++ b/src/main/pi/rpc-agent-definition.ts
@@ -0,0 +1,21 @@
+import type { DirectoryAccountAgentDefinition } from '../native-chat/agent-session-wire/structured-agent-definition'
+
+export const PI_RPC_AGENT: DirectoryAccountAgentDefinition = {
+  agent: 'pi',
+  handleTransport: 'jsonl-rpc',
+  accountHomeVariable: 'PI_CODING_AGENT_DIR',
+  capabilities: {
+    rewind: false,
+    compact: true,
+    threadGoal: false,
+    contextUsage: true,
+    imagePrompts: true,
+    steering: 'inject',
+    approvalEnforcement: 'provider'
+  },
+  restingOptions: {
+    acceptsKey: (key) => key === 'model' || key === 'effort',
+    fallbackModels: () => null,
+    effortDefaultsToModel: false
+  }
+}
diff --git a/src/main/pi/rpc-capture-replay.test.ts b/src/main/pi/rpc-capture-replay.test.ts
new file mode 100644
index 000000000000..a216583e8218
--- /dev/null
+++ b/src/main/pi/rpc-capture-replay.test.ts
@@ -0,0 +1,155 @@
+import { readFileSync } from 'node:fs'
+import { join } from 'node:path'
+import { afterEach, describe, expect, it, vi } from 'vitest'
+import { z } from 'zod'
+import { JsonlRpcTimelineLane } from '../jsonl-rpc/timeline-lane'
+import { PiRpcTurns } from './rpc-turns'
+import { piRpcDialogPresentation } from './rpc-extension-dialogs'
+import {
+  closeProviderTimelineRigs,
+  openProviderTimelineRig
+} from '../native-chat/agent-session-timeline/provider-timeline-assembler-test-support'
+
+const envelope = z.object({ dir: z.enum(['in', 'out']), raw: z.string() })
+const record = z.looseObject({ type: z.string() })
+function capture(name: string) {
+  return readFileSync(join(import.meta.dirname, '__fixtures__', `${name}.jsonl`), 'utf8')
+    .split('\n')
+    .filter(Boolean)
+    .map((line) => {
+      const parsed = envelope.parse(JSON.parse(line))
+      return { dir: parsed.dir, frame: record.parse(JSON.parse(parsed.raw)) }
+    })
+}
+const disposals: (() => void)[] = []
+afterEach(async () => {
+  disposals.splice(0).forEach((dispose) => dispose())
+  await closeProviderTimelineRigs()
+  vi.useRealTimers()
+})
+
+async function replay(name: string) {
+  const frames = capture(name)
+  const states = frames.filter(
+    ({ dir, frame }) => dir === 'out' && frame.type === 'response' && frame.command === 'get_state'
+  )
+  const stats = frames.findLast(
+    ({ dir, frame }) =>
+      dir === 'out' && frame.type === 'response' && frame.command === 'get_session_stats'
+  )?.frame.data
+  const rig = await openProviderTimelineRig({ agent: 'pi', sessionId: 'session-timeline' })
+  const accepted = vi.fn(),
+    failed = vi.fn(),
+    idle = vi.fn(),
+    settled = vi.fn()
+  const lane = new JsonlRpcTimelineLane({
+    sink: rig.sink,
+    sessionId: 'session-timeline',
+    agent: 'pi',
+    generation: 'gen-pi',
+    namespace: 'pi-session',
+    pauseReading: vi.fn(),
+    resumeReading: vi.fn(),
+    onInputAccepted: accepted,
+    onFailed: failed
+  })
+  const turns = new PiRpcTurns({
+    lane,
+    generation: 'gen-pi',
+    send: vi.fn(async () => {}),
+    request: vi.fn(async (command: string) =>
+      command === 'get_state' ? states.at(-1)?.frame.data : stats
+    ),
+    settled,
+    failed,
+    idle
+  })
+  disposals.push(() => {
+    turns.end()
+    lane.dispose()
+  })
+  let sequence = 0
+  for (const { dir, frame } of frames) {
+    if (dir === 'in' && frame.type === 'prompt') {
+      await turns.submit(`send-${++sequence}`, 100, frame)
+    }
+    if (dir === 'in' && frame.type === 'abort') {
+      turns.stop()
+    }
+    if (dir === 'out' && (frame.type !== 'response' || frame.command === 'prompt')) {
+      turns.receive(frame)
+    }
+  }
+  await new Promise<void>((resolve) => setImmediate(resolve))
+  lane.flush()
+  const rows = await rig.rows()
+  return { rows, turns: await rig.turns(), accepted, failed, idle, settled }
+}
+
+describe('scrubbed Pi 1.0.4 RPC captures', () => {
+  it('records tool output, streamed text, and all three consumed inputs in one settled run', async () => {
+    const result = await replay('steer-followup')
+    expect(result.failed).not.toHaveBeenCalled()
+    expect(result.accepted.mock.calls.map(([id]) => id)).toEqual(['send-1', 'send-2', 'send-3'])
+    expect(result.turns).toHaveLength(1)
+    expect(result.turns[0]?.outcome).toBe('success')
+    expect(
+      result.rows.some((row) => row.body.kind === 'tool-call' && row.body.state === 'completed')
+    ).toBe(true)
+    const texts = result.rows.flatMap((row) =>
+      row.body.kind === 'message'
+        ? row.body.blocks.flatMap((block) => (block.type === 'text' ? [block.text] : []))
+        : []
+    )
+    expect(texts.join('\n')).toContain('STEER_CONSUMED')
+    expect(texts.join('\n')).toContain('FOLLOWUP_CONSUMED')
+  })
+  it.each(['provider-fetch-error', 'provider-socket-error'])(
+    'marks captured %s as failure with the provider diagnostic',
+    async (name) => {
+      const result = await replay(name)
+      expect(result.failed).not.toHaveBeenCalled()
+      expect(result.turns[0]?.outcome).toBe('failure')
+      expect(
+        result.rows.filter(
+          (row) => row.body.kind === 'status' && row.body.failure?.kind === 'providerRejected'
+        )
+      ).toHaveLength(1)
+    }
+  )
+  it('treats the captured abort error as cancellation', async () => {
+    const result = await replay('stop-mid-tool')
+    expect(result.failed).not.toHaveBeenCalled()
+    expect(result.turns[0]?.outcome).toBe('cancellation')
+    expect(result.rows.some((row) => row.body.kind === 'status' && row.body.failure)).toBe(false)
+  })
+  it('settles a handled extension command with no agent events', async () => {
+    const result = await replay('command-only')
+    expect(result.failed).not.toHaveBeenCalled()
+    expect(result.turns[0]?.outcome).toBe('success')
+    expect(result.accepted).toHaveBeenCalledWith('send-1')
+  })
+  it('preserves empty answers and literal Unicode separators in captured dialogs', () => {
+    const dialogs = capture('dialogs').flatMap(({ dir, frame }) =>
+      dir === 'out' && frame.type === 'extension_ui_request' ? [frame] : []
+    )
+    const input = piRpcDialogPresentation(dialogs.find((frame) => frame.method === 'input'))
+    const editor = piRpcDialogPresentation(dialogs.find((frame) => frame.method === 'editor'))
+    expect(
+      input?.reply({
+        kind: 'answers',
+        answers: [{ questionId: String(input.id), optionIds: [], other: '' }]
+      })
+    ).toEqual({ value: '' })
+    const body = editor?.body
+    expect(body?.kind === 'question' && body.freeTextInput?.initialValue).toContain('\n')
+    expect(
+      editor?.reply({
+        kind: 'answers',
+        answers: [
+          { questionId: String(editor.id), optionIds: [], other: 'first\u2028second\u2029last' }
+        ]
+      })
+    ).toEqual({ value: 'first\u2028second\u2029last' })
+  })
+})
diff --git a/src/main/pi/rpc-compaction.ts b/src/main/pi/rpc-compaction.ts
new file mode 100644
index 000000000000..728c5c604d11
--- /dev/null
+++ b/src/main/pi/rpc-compaction.ts
@@ -0,0 +1,45 @@
+import { agentSessionFailureFact, providerDiagnostic } from '../../shared/agent-session-failure'
+import { agentSessionFailureWords } from '../../shared/agent-session-failure-words'
+import type {
+  AgentSessionCommandAdmission,
+  StructuredAgentSessionCommandRun
+} from '../native-chat/agent-session-wire/structured-agent-session-adapter'
+import { JsonlRpcResponseError } from '../jsonl-rpc/peer'
+import type { PiRpcSession } from './rpc-session'
+
+export async function compactPiRpcSession(
+  session: PiRpcSession,
+  command: StructuredAgentSessionCommandRun
+): Promise<AgentSessionCommandAdmission> {
+  session.turns.beginCommand(command)
+  try {
+    await session.connection.request('compact', {}, { timeoutMs: null })
+    session.turns.commandCompleted()
+    return { state: 'accepted', providerIdentity: null }
+  } catch (error) {
+    if (!(error instanceof JsonlRpcResponseError)) {
+      throw error
+    }
+    if (error.message === 'Nothing to compact (session too small)') {
+      session.lane.apply([
+        {
+          type: 'item.close',
+          item: `compact-noop:${command.turnId}`,
+          body: { kind: 'status', tone: 'warning', text: error.message }
+        }
+      ])
+      session.turns.commandCompleted()
+      return { state: 'accepted', providerIdentity: null }
+    }
+    session.turns.commandRejected()
+    return {
+      state: 'rejected',
+      ...agentSessionFailureWords(
+        agentSessionFailureFact('providerRejected', {
+          detail: providerDiagnostic(error.message, 'person')
+        }),
+        { agentName: 'Pi', surface: 'rejection' }
+      )
+    }
+  }
+}
diff --git a/src/main/pi/rpc-context-usage.ts b/src/main/pi/rpc-context-usage.ts
new file mode 100644
index 000000000000..9f9b19eaaedf
--- /dev/null
+++ b/src/main/pi/rpc-context-usage.ts
@@ -0,0 +1,108 @@
+import { z } from 'zod'
+import type { ProviderTimelineEvent } from '../native-chat/agent-session-timeline/provider-timeline-event'
+import { piRpcUsageSchema, type PiRpcModel } from './rpc-protocol'
+
+const statsSchema = z.object({
+  contextUsage: z
+    .object({
+      tokens: z.number().nonnegative().nullable().optional(),
+      contextWindow: z.number().positive(),
+      percent: z.number().nullable().optional()
+    })
+    .optional()
+})
+
+export class PiRpcContextUsage {
+  private model?: PiRpcModel
+  private compactedTokens?: number
+
+  compacting(): ProviderTimelineEvent[] {
+    this.compactedTokens = undefined
+    return [{ type: 'context.usage', usage: { used: { kind: 'unknown', capturedAt: Date.now() } } }]
+  }
+
+  compacted(result: unknown): void {
+    const parsed = z.object({ estimatedTokensAfter: z.number().nonnegative() }).safeParse(result)
+    this.compactedTokens = parsed.success ? parsed.data.estimatedTokensAfter : undefined
+  }
+
+  setModel(model: PiRpcModel | undefined, at: number): ProviderTimelineEvent[] {
+    const changed = model?.id !== this.model?.id || model?.provider !== this.model?.provider
+    this.model = model
+    return model?.contextWindow && model.contextWindow > 0
+      ? [
+          {
+            type: 'context.usage',
+            usage: {
+              window: { tokens: model.contextWindow, capturedAt: at },
+              ...(changed ? { used: { kind: 'unknown' as const, capturedAt: at } } : {})
+            }
+          }
+        ]
+      : []
+  }
+
+  live(value: unknown, at: number): ProviderTimelineEvent[] {
+    const usage = piRpcUsageSchema.safeParse(value)
+    if (!usage.success || Object.values(usage.data).every((tokens) => tokens === 0)) {
+      return []
+    }
+    this.compactedTokens = undefined
+    return [
+      {
+        type: 'context.usage',
+        usage: {
+          used: {
+            kind: 'estimate',
+            usage: {
+              inputTokens: usage.data.input,
+              outputTokens: usage.data.output,
+              cacheCreationInputTokens: usage.data.cacheWrite,
+              cacheReadInputTokens: usage.data.cacheRead
+            },
+            capturedAt: at
+          }
+        }
+      }
+    ]
+  }
+
+  stats(value: unknown, at: number): ProviderTimelineEvent[] {
+    const parsed = statsSchema.safeParse(value)
+    const context = parsed.success ? parsed.data.contextUsage : undefined
+    if (!context) {
+      return []
+    }
+    return [
+      {
+        type: 'context.usage',
+        usage: {
+          window: { tokens: context.contextWindow, capturedAt: at },
+          used:
+            context.tokens == null
+              ? this.compactedTokens === undefined
+                ? { kind: 'unknown', capturedAt: at }
+                : {
+                    kind: 'estimate',
+                    usage: {
+                      inputTokens: this.compactedTokens,
+                      outputTokens: 0,
+                      cacheCreationInputTokens: 0,
+                      cacheReadInputTokens: 0
+                    },
+                    capturedAt: at
+                  }
+              : {
+                  kind: 'report',
+                  model: this.model ? `${this.model.provider}/${this.model.id}` : 'unknown',
+                  usedTokens: context.tokens,
+                  windowTokens: context.contextWindow,
+                  percentage: context.percent ?? (context.tokens / context.contextWindow) * 100,
+                  categories: [],
+                  capturedAt: at
+                }
+        }
+      }
+    ]
+  }
+}
diff --git a/src/main/pi/rpc-dialog-callbacks.ts b/src/main/pi/rpc-dialog-callbacks.ts
new file mode 100644
index 000000000000..c9b2f02fa058
--- /dev/null
+++ b/src/main/pi/rpc-dialog-callbacks.ts
@@ -0,0 +1,98 @@
+import type { AgentSessionPromptResponse } from '../../shared/agent-session-question-answer'
+import {
+  AgentSessionPromptAnswerRejectedError,
+  AgentSessionPromptUnavailableError
+} from '../native-chat/agent-session-wire/structured-agent-session-adapter'
+import type { JsonlRpcTimelineLane } from '../jsonl-rpc/timeline-lane'
+import type { JsonlRpcRecord } from '../jsonl-rpc/peer'
+import { piRpcDialogPresentation, type PiRpcDialogPresentation } from './rpc-extension-dialogs'
+
+type Callback = { presentation: PiRpcDialogPresentation; claimed: boolean; bytes: number }
+const DECORATION = new Set(['notify', 'setStatus', 'setWidget', 'setTitle', 'setEditorText'])
+
+export class PiRpcDialogCallbacks {
+  private readonly pending = new Map<string, Callback>()
+  private pendingBytes = 0
+  constructor(
+    private readonly lane: JsonlRpcTimelineLane,
+    private readonly send: (frame: JsonlRpcRecord) => Promise<void>,
+    private readonly onFailed: (error: Error) => void
+  ) {}
+
+  receive(frame: JsonlRpcRecord): void {
+    if (typeof frame.method === 'string' && DECORATION.has(frame.method)) {
+      return
+    }
+    const presentation = piRpcDialogPresentation(frame)
+    if (!presentation) {
+      if (typeof frame.id === 'string' || typeof frame.id === 'number') {
+        void this.send({ type: 'extension_ui_response', id: frame.id, cancelled: true }).catch(
+          (error: unknown) =>
+            this.onFailed(error instanceof Error ? error : new Error(String(error)))
+        )
+      }
+      return
+    }
+    const key = String(presentation.id)
+    const bytes = Buffer.byteLength(JSON.stringify(presentation.body))
+    if (
+      this.pending.has(key) ||
+      this.pending.size >= 64 ||
+      this.pendingBytes + bytes > 8 * 1024 * 1024
+    ) {
+      throw new Error('Pi dialog identity or capacity violation')
+    }
+    this.pending.set(key, { presentation, claimed: false, bytes })
+    this.pendingBytes += bytes
+    this.lane.apply([{ type: 'request.open', request: key, body: presentation.body }])
+  }
+
+  async respond(
+    itemId: string,
+    response: AgentSessionPromptResponse | null,
+    commit: () => Promise<void>,
+    answer = true
+  ): Promise<void> {
+    const entry = [...this.pending].find(([key]) => this.lane.isRequestRow(itemId, key))
+    if (!entry || entry[1].claimed) {
+      throw new AgentSessionPromptUnavailableError(itemId)
+    }
+    const [key, callback] = entry
+    let reply: Record<string, unknown>
+    try {
+      reply = callback.presentation.reply(response)
+    } catch (error) {
+      throw new AgentSessionPromptAnswerRejectedError(
+        error instanceof Error ? error.message : 'Invalid Pi dialog answer'
+      )
+    }
+    callback.claimed = true
+    try {
+      await commit()
+      if (this.pending.get(key) !== callback) {
+        throw new AgentSessionPromptUnavailableError(itemId)
+      }
+      if (answer) {
+        await this.send({ type: 'extension_ui_response', id: callback.presentation.id, ...reply })
+      }
+      this.pending.delete(key)
+      this.pendingBytes -= callback.bytes
+    } catch (error) {
+      callback.claimed = false
+      throw error
+    }
+  }
+
+  cancelAll(): void {
+    for (const [key, callback] of this.pending) {
+      this.lane.apply([{ type: 'request.withdrawn', request: key }])
+      void this.send({
+        type: 'extension_ui_response',
+        id: callback.presentation.id,
+        cancelled: true
+      }).catch(() => {})
+    }
+    this.pending.clear()
+    this.pendingBytes = 0
+  }
+}
diff --git a/src/main/pi/rpc-extension-dialogs.ts b/src/main/pi/rpc-extension-dialogs.ts
new file mode 100644
index 000000000000..0f2f37e1c7d9
--- /dev/null
+++ b/src/main/pi/rpc-extension-dialogs.ts
@@ -0,0 +1,102 @@
+import type { AgentSessionPromptResponse } from '../../shared/agent-session-question-answer'
+import type { ProviderTimelineRequestBody } from '../native-chat/agent-session-timeline/provider-timeline-event'
+import { piRpcDialogSchema } from './rpc-protocol'
+
+const pendingResolution = {
+  state: 'pending',
+  selectedOptionId: null,
+  resolvedBy: null,
+  resolvedAt: null
+} as const
+
+export type PiRpcDialogPresentation = {
+  id: string | number
+  body: ProviderTimelineRequestBody
+  reply: (response: AgentSessionPromptResponse | null) => Record<string, unknown>
+}
+
+/** Terminal decoration is deliberately absent from the chat projection. */
+export function piRpcDialogPresentation(value: unknown): PiRpcDialogPresentation | null {
+  const parsed = piRpcDialogSchema.safeParse(value)
+  if (!parsed.success) {
+    return null
+  }
+  const dialog = parsed.data
+  if (dialog.method === 'confirm') {
+    return {
+      id: dialog.id,
+      body: {
+        kind: 'approval',
+        title: dialog.title,
+        detail: dialog.message ?? null,
+        options: [
+          { id: 'yes', label: 'Yes' },
+          { id: 'no', label: 'No' }
+        ],
+        resolution: pendingResolution
+      },
+      reply: (response) => {
+        if (response === null) {
+          return { cancelled: true }
+        }
+        if (response.kind !== 'option' || !['yes', 'no'].includes(response.optionId)) {
+          throw new Error('Confirmation must select an offered option')
+        }
+        return { confirmed: response.optionId === 'yes' }
+      }
+    }
+  }
+  const questionId = String(dialog.id)
+  const options =
+    dialog.method === 'select'
+      ? dialog.options.map((label, index) => ({
+          id: `option-${index}`,
+          label: label || 'Empty value'
+        }))
+      : []
+  return {
+    id: dialog.id,
+    body: {
+      kind: 'question',
+      question: [dialog.title, dialog.message].filter((text) => text !== undefined).join('\n\n'),
+      options,
+      resolution: pendingResolution,
+      ...(dialog.method === 'select'
+        ? {}
+        : {
+            freeTextQuestionId: questionId,
+            freeTextInput: {
+              allowEmpty: true,
+              ...(dialog.method === 'editor'
+                ? { multiline: true, initialValue: dialog.prefill ?? '' }
+                : {}),
+              ...(dialog.placeholder === undefined ? {} : { placeholder: dialog.placeholder })
+            }
+          })
+    },
+    reply: (response) => {
+      if (response === null) {
+        return { cancelled: true }
+      }
+      if (response.kind !== 'answers' || response.answers.length !== 1) {
+        throw new Error('Dialog requires one answer')
+      }
+      const answer = response.answers[0]
+      if (dialog.method === 'select') {
+        const selected = options.findIndex((option) => option.id === answer.optionIds[0])
+        if (answer.optionIds.length !== 1 || answer.other !== undefined || selected === -1) {
+          throw new Error('Selection must choose an offered option')
+        }
+        return { value: dialog.options[selected] }
+      }
+      if (
+        answer.questionId !== questionId ||
+        answer.optionIds.length !== 0 ||
+        answer.other === undefined
+      ) {
+        throw new Error('Dialog requires a text answer')
+      }
+      return { value: answer.other }
+    }
+  }
+}
diff --git a/src/main/pi/rpc-idle-check.ts b/src/main/pi/rpc-idle-check.ts
new file mode 100644
index 000000000000..5ffe453ac846
--- /dev/null
+++ b/src/main/pi/rpc-idle-check.ts
@@ -0,0 +1,57 @@
+import { piRpcIdle, piRpcStateSchema, type PiRpcState } from './rpc-protocol'
+
+type IdleCheckDeps = {
+  request: () => Promise<unknown>
+  current: (revision: number) => boolean
+  settled: (state: PiRpcState) => void
+  failed: (error: Error) => void
+}
+
+/** Detached compaction and new input invalidate an older settled signal and its idle reply. */
+export class PiRpcIdleCheck {
+  private readonly timers = new Set<ReturnType<typeof setTimeout>>()
+  private ended = false
+  constructor(private readonly deps: IdleCheckDeps) {}
+
+  schedule(revision: number, attempt = 0): void {
+    queueMicrotask(() => {
+      if (this.ended || !this.deps.current(revision)) {
+        return
+      }
+      void this.deps
+        .request()
+        .then((value) => {
+          if (this.ended || !this.deps.current(revision)) {
+            return
+          }
+          const state = piRpcStateSchema.parse(value)
+          if (piRpcIdle(state)) {
+            this.deps.settled(state)
+          }
+        })
+        .catch((error: unknown) => {
+          if (this.ended || !this.deps.current(revision)) {
+            return
+          }
+          if (attempt >= 2) {
+            this.deps.failed(error instanceof Error ? error : new Error(String(error)))
+            return
+          }
+          const timer = setTimeout(() => {
+            this.timers.delete(timer)
+            this.schedule(revision, attempt + 1)
+          }, 100)
+          timer.unref()
+          this.timers.add(timer)
+        })
+    })
+  }
+
+  dispose(): void {
+    this.ended = true
+    for (const timer of this.timers) {
+      clearTimeout(timer)
+    }
+    this.timers.clear()
+  }
+}
diff --git a/src/main/pi/rpc-launch-resolution.test.ts b/src/main/pi/rpc-launch-resolution.test.ts
new file mode 100644
index 000000000000..38132a8d13b9
--- /dev/null
+++ b/src/main/pi/rpc-launch-resolution.test.ts
@@ -0,0 +1,227 @@
+import { mkdtemp, mkdir, writeFile, 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 { AgentSessionJournalIdentity } from '../../shared/agent-session-journal-types'
+import type { AgentSessionProviderHandleLink } from '../../shared/agent-session-provider-handle'
+import { agentSessionProviderHandleKey } from '../../shared/agent-session-provider-handle'
+import { closeTestJournalHostDatabase } from '../native-chat/agent-session-journal/journal-host-database-test-support'
+import { openTestAgentSessionRecordStore } from '../runtime/agent-session-record-store-test-harness'
+import { buildPiRpcLaunch } from './rpc-launch'
+import { createPiRpcLaunchResolver, piRpcProviderLink } from './rpc-launch-resolution'
+
+const probeVersion = vi.fn(async (..._input: unknown[]) => true)
+
+const identity: AgentSessionJournalIdentity = {
+  sessionId: 'session-pi-resolve',
+  workspaceId: 'folder-1',
+  hostId: 'local',
+  agent: 'pi',
+  providerHandle: null
+}
+let root: string
+beforeEach(async () => {
+  probeVersion.mockReset().mockResolvedValue(true)
+  root = await mkdtemp(join(tmpdir(), 'orca-pi-resolver-'))
+})
+afterEach(async () => {
+  closeTestJournalHostDatabase(root)
+  await rm(root, { recursive: true, force: true })
+})
+
+async function setup() {
+  const store = await openTestAgentSessionRecordStore(root)
+  const { record } = await store.reserveOwner({
+    sessionId: identity.sessionId,
+    location: {
+      executionHostId: 'local',
+      wslDistro: null,
+      workspaceId: 'folder-1',
+      workspaceKind: 'folder'
+    },
+    provider: 'pi',
+    accountHome: { variable: 'PI_CODING_AGENT_DIR', path: '/host/account' },
+    expectedFence: null,
+    spawnToken: 'spawn-pi',
+    claimKeyId: 'key-1',
+    handoffOperationId: null,
+    probe: { outcome: 'reservation-unused' },
+    operation: {
+      callerKey: 'client-1',
+      operationId: '1800000000000-00000000000000000000000000000001',
+      fingerprint: 'pi-create'
+    },
+    now: 1_800_000_000_000
+  })
+  const workspace = join(root, 'workspace')
+  await mkdir(workspace)
+  const resolveEnvironment = vi.fn(async () => ({
+    PATH: '/host/bin',
+    HOME: '/host/home',
+    PI_CODING_AGENT_DIR: '/inherited/wrong'
+  }))
+  const resolveCommand = vi.fn((..._input: unknown[]) => '/host/bin/pi')
+  const settings: { agentCmdOverrides: Record<string, string> } = { agentCmdOverrides: {} }
+  const resolver = createPiRpcLaunchResolver({
+    store,
+    resolveWorkspacePath: async () => workspace,
+    resolveEnvironment,
+    resolveCommandSettings: () => settings,
+    resolveCommand,
+    probeVersion
+  })
+  const prior = (
+    file: string,
+    origin: AgentSessionProviderHandleLink['origin'] = 'created'
+  ): AgentSessionProviderHandleLink => ({
+    linkId: 'prior-link',
+    handle: { transport: 'jsonl-rpc', agent: 'pi', nativeId: file },
+    origin,
+    mintedAtFence: 1,
+    observedAt: 100
+  })
+  const withPrior = (link: AgentSessionProviderHandleLink) => {
+    vi.spyOn(store, 'getRecord').mockReturnValue({ ...record, providerHandleChain: [link] })
+  }
+  return { store, record, workspace, resolver, resolveCommand, settings, prior, withPrior }
+}
+
+describe('Pi host launch resolution', () => {
+  it('refuses acquisition if the selected binary was replaced by an unsupported version', async () => {
+    const h = await setup()
+    probeVersion.mockResolvedValue(false)
+    await expect(h.resolver(identity)).rejects.toThrow('structured_agent_session_unsupported')
+    expect(probeVersion).toHaveBeenCalledWith(
+      {
+        program: '/host/bin/pi',
+        cwd: h.workspace,
+        env: { PATH: '/host/bin', HOME: '/host/home', PI_CODING_AGENT_DIR: '/host/account' }
+      },
+      expect.any(Function)
+    )
+  })
+
+  it('uses the runtime workspace, binary and account home for a new folder session', async () => {
+    const h = await setup()
+    const launch = await h.resolver(identity)
+    expect(launch).toMatchObject({
+      command: '/host/bin/pi',
+      cwd: h.workspace,
+      env: { PATH: '/host/bin', HOME: '/host/home', PI_CODING_AGENT_DIR: '/host/account' },
+      previous: null,
+      fullAccess: true
+    })
+    expect(h.resolveCommand).toHaveBeenCalledWith('pi', {
+      pathEnv: '/host/bin',
+      homePath: '/host/home'
+    })
+  })
+
+  it('spawns the binary the Command setting names, and refuses one that is not runnable', async () => {
+    const h = await setup()
+    h.settings.agentCmdOverrides = { pi: `"${process.execPath}"` }
+    await expect(h.resolver(identity)).resolves.toMatchObject({ command: process.execPath })
+    expect(h.resolveCommand).not.toHaveBeenCalled()
+
+    probeVersion.mockClear()
+    h.settings.agentCmdOverrides = { pi: '/missing/pi' }
+    await expect(h.resolver(identity)).rejects.toMatchObject({
+      reason: 'agentCommandNotRunnable'
+    })
+    expect(probeVersion).not.toHaveBeenCalled()
+  })
+
+  it('resumes the same directory and forks a session from a different directory', async () => {
+    const h = await setup()
+    const same = join(root, 'same.jsonl')
+    await writeFile(same, `${JSON.stringify({ type: 'session', cwd: h.workspace })}\n`)
+    h.withPrior(h.prior(same))
+    const resumed = await h.resolver(identity)
+    expect(resumed.sessionFile).toBe(same)
+    expect(resumed.forkFile).toBeUndefined()
+    expect(piRpcProviderLink(resumed, same, 2, 'next', 200).origin).toBe('resumed')
+    expect(() => piRpcProviderLink(resumed, join(root, 'wrong.jsonl'), 2, 'bad', 200)).toThrow(
+      'different session file'
+    )
+
+    const elsewhere = join(root, 'elsewhere.jsonl')
+    await writeFile(elsewhere, `${JSON.stringify({ type: 'session', cwd: join(root, 'other') })}\n`)
+    h.withPrior(h.prior(elsewhere))
+    const forked = await h.resolver(identity)
+    expect(forked.forkFile).toBe(elsewhere)
+    expect(forked.sessionFile).toBeUndefined()
+    expect(piRpcProviderLink(forked, join(root, 'fork.jsonl'), 2, 'fork', 200)).toMatchObject({
+      origin: 'forked',
+      forkedFromKey: agentSessionProviderHandleKey(h.prior(elsewhere).handle)
+    })
+    expect(() => piRpcProviderLink(forked, elsewhere, 2, 'bad', 200)).toThrow('did not fork')
+  })
+
+  it('resumes the stored session file after Orca restarts and reopens the store', async () => {
+    const h = await setup()
+    const file = join(root, 'conversation.jsonl')
+    await writeFile(file, `${JSON.stringify({ type: 'session', cwd: h.workspace })}\n`)
+    const fence = h.record.lease.runtimeFence
+    await h.store.commitProcessIdentity({
+      sessionId: identity.sessionId,
+      fence,
+      process: { hostId: 'local', pid: 4242, processStartTimeMs: 1, spawnToken: 'spawn-pi' },
+      now: 1_800_000_000_001
+    })
+    await h.store.proveOwner({
+      sessionId: identity.sessionId,
+      fence,
+      link: { ...h.prior(file), mintedAtFence: fence },
+      now: 1_800_000_000_002
+    })
+    // A restart: the store is closed and a fresh one reads the record back from disk.
+    closeTestJournalHostDatabase(root)
+    const reopened = await openTestAgentSessionRecordStore(root)
+    const launch = await createPiRpcLaunchResolver({
+      store: reopened,
+      resolveWorkspacePath: async () => h.workspace,
+      resolveEnvironment: async () => ({ PATH: '/host/bin', HOME: '/host/home' }),
+      resolveCommand: () => '/host/bin/pi',
+      probeVersion
+    })(identity)
+    expect(launch.sessionFile).toBe(file)
+    expect(buildPiRpcLaunch(launch).args).toEqual(['--mode', 'rpc', '--session', file])
+  })
+
+  it('distinguishes an unsaved creation from an existing session that could not restore', async () => {
+    const h = await setup()
+    const missing = join(root, 'missing.jsonl')
+    h.withPrior(h.prior(missing))
+    const unsaved = await h.resolver(identity)
+    expect(unsaved.replacement).toBe('unsaved')
+    expect(piRpcProviderLink(unsaved, join(root, 'new.jsonl'), 2, 'new', 200)).toMatchObject({
+      origin: 'created',
+      supersedesKey: agentSessionProviderHandleKey(h.prior(missing).handle)
+    })
+    h.withPrior(h.prior(missing, 'resumed'))
+    const lost = await h.resolver(identity)
+    expect(lost.replacement).toBe('restore-failed')
+    expect(
+      piRpcProviderLink(lost, join(root, 'replacement.jsonl'), 2, 'replace', 200)
+    ).toMatchObject({ replaces: { reason: 'restore-failed', replacedAt: 200 } })
+  })
+
+  it('refuses a different execution host and a foreign account home before resolving paths', async () => {
+    const h = await setup()
+    const record = h.store.getRecord(identity.sessionId)
+    if (!record) {
+      throw new Error('record missing')
+    }
+    vi.spyOn(h.store, 'getRecord').mockReturnValue({
+      ...record,
+      location: { ...record.location, executionHostId: 'ssh:remote' }
+    })
+    await expect(h.resolver(identity)).rejects.toThrow('another execution host')
+    vi.spyOn(h.store, 'getRecord').mockReturnValue({
+      ...record,
+      accountHome: { variable: 'CODEX_HOME', path: '/wrong' }
+    })
+    await expect(h.resolver(identity)).rejects.toThrow('account home')
+    expect(h.resolveCommand).not.toHaveBeenCalled()
+  })
+})
diff --git a/src/main/pi/rpc-launch-resolution.ts b/src/main/pi/rpc-launch-resolution.ts
new file mode 100644
index 000000000000..0bc63833b5e7
--- /dev/null
+++ b/src/main/pi/rpc-launch-resolution.ts
@@ -0,0 +1,211 @@
+import { open, realpath } from 'node:fs/promises'
+import { isAbsolute, normalize } from 'node:path'
+import { z } from 'zod'
+import { agentSessionRefusalError } from '../../shared/agent-session-wire-refusals'
+import {
+  agentSessionProviderHandleChainHead,
+  agentSessionProviderHandleKey,
+  type AgentSessionProviderHandleLink
+} from '../../shared/agent-session-provider-handle'
+import { isLegacyAgentSessionAccountHome } from '../../shared/agent-session-account-home'
+import type { AgentSessionJournalIdentity } from '../../shared/agent-session-journal-types'
+import { LOCAL_EXECUTION_HOST_ID } from '../../shared/execution-host'
+import type { resolveCliCommand } from '../../shared/node-cli-command-resolution'
+import { isStableCliVersionOnLine, probeAgentCliVersion } from '../agent-cli-version-probe'
+import {
+  resolveStructuredAgentCommand,
+  type StructuredAgentCommandSettings
+} from '../native-chat/structured-agent-command-resolution'
+import type { AgentSessionRecordStore } from '../runtime/agent-session-record-store'
+import { isWindowsProcessStartTimeAvailable } from '../windows/windows-process-table'
+import type { PiRpcLaunchOptions } from './rpc-launch'
+
+export type PiRpcResolvedLaunch = PiRpcLaunchOptions & {
+  previous: AgentSessionProviderHandleLink | null
+  replacement?: 'unsaved' | 'restore-failed'
+}
+export type PiRpcLaunchResolverDeps = {
+  store: AgentSessionRecordStore
+  resolveWorkspacePath: (id: string) => Promise<string>
+  resolveEnvironment: () => Promise<NodeJS.ProcessEnv>
+  /** The user's Pi Command setting, re-read per acquisition; none runs the stock binary. */
+  resolveCommandSettings?: () => StructuredAgentCommandSettings
+  resolveCommand?: typeof resolveCliCommand
+  probeVersion?: typeof probeAgentCliVersion
+  resolveFullAccess?: () => boolean
+}
+
+// Stable releases from 0.84.0 emit agent_settled after retries and detached compaction; older
+// Pi (the 0.73.x package included) keeps the terminal chat.
+const PI_RPC_RELEASE_LINES = [
+  { major: 0, floor: '0.84.0' },
+  { major: 1, floor: '1.0.0' }
+] as const
+
+function supportsPiRpcVersion(version: string): boolean {
+  return PI_RPC_RELEASE_LINES.some((line) => isStableCliVersionOnLine(version, line))
+}
+
+/** The binary a Pi launch with `env` spawns; create support resolves through here too. */
+export function resolvePiRpcCommand(
+  env: Readonly<Record<string, string>>,
+  commandSettings: StructuredAgentCommandSettings = {},
+  resolve?: typeof resolveCliCommand
+): string {
+  const homePath = env.HOME ?? env.USERPROFILE
+  return resolveStructuredAgentCommand(
+    'pi',
+    commandSettings,
+    { pathEnv: env.PATH ?? env.Path ?? null, ...(homePath ? { homePath } : {}) },
+    resolve ? { resolve } : {}
+  )
+}
+
+export function piRpcVersionSupported(
+  launch: { command: string; cwd: string; env: Record<string, string> },
+  probe: typeof probeAgentCliVersion = probeAgentCliVersion
+): Promise<boolean> {
+  return probe({ program: launch.command, cwd: launch.cwd, env: launch.env }, supportsPiRpcVersion)
+}
+
+const headerSchema = z.object({ type: z.literal('session'), cwd: z.string().min(1) })
+
+async function sessionDirectory(file: string): Promise<string | null> {
+  let descriptor
+  try {
+    descriptor = await open(file, 'r')
+  } catch (error) {
+    if (error instanceof Error && 'code' in error && error.code === 'ENOENT') {
+      return null
+    }
+    throw error
+  }
+  try {
+    const buffer = Buffer.alloc(64 * 1024)
+    const { bytesRead } = await descriptor.read(buffer, 0, buffer.length, 0)
+    const data = buffer.subarray(0, bytesRead).toString('utf8')
+    const lf = data.indexOf('\n')
+    if (lf === -1) {
+      throw new Error('Pi session header is incomplete or oversized')
+    }
+    return headerSchema.parse(JSON.parse(data.slice(0, lf))).cwd
+  } finally {
+    await descriptor.close()
+  }
+}
+
+async function sameDirectory(left: string, right: string): Promise<boolean> {
+  const canonical = async (value: string): Promise<string> =>
+    realpath(value).catch(() => normalize(value))
+  const [a, b] = await Promise.all([canonical(left), canonical(right)])
+  return process.platform === 'win32' ? a.toLowerCase() === b.toLowerCase() : a === b
+}
+
+/** Reads the execution host's durable record; never resolves another host's files or account. */
+export function createPiRpcLaunchResolver(
+  deps: PiRpcLaunchResolverDeps
+): (identity: AgentSessionJournalIdentity) => Promise<PiRpcResolvedLaunch> {
+  return async (identity) => {
+    const record = deps.store.getRecord(identity.sessionId)
+    if (!record || record.provider !== 'pi') {
+      throw new Error('Pi session record unavailable')
+    }
+    if (
+      record.location.executionHostId !== LOCAL_EXECUTION_HOST_ID ||
+      record.location.wslDistro !== null
+    ) {
+      throw new Error('Pi structured session belongs to another execution host')
+    }
+    if (process.platform === 'win32' && !isWindowsProcessStartTimeAvailable()) {
+      throw new Error('Pi structured sessions require Windows process creation-time proof')
+    }
+    const accountHome = record.accountHome
+    if (
+      !isLegacyAgentSessionAccountHome(accountHome) ||
+      accountHome.variable !== 'PI_CODING_AGENT_DIR'
+    ) {
+      throw new Error('Pi account home does not match its binary')
+    }
+    const cwd = await deps.resolveWorkspacePath(record.location.workspaceId)
+    const env: Record<string, string> = {}
+    for (const [key, value] of Object.entries(await deps.resolveEnvironment())) {
+      if (value !== undefined) {
+        env[key] = value
+      }
+    }
+    env.PI_CODING_AGENT_DIR = accountHome.path
+    const previous = agentSessionProviderHandleChainHead(record.providerHandleChain)
+    let sessionFile: string | undefined
+    let forkFile: string | undefined
+    let replacement: PiRpcResolvedLaunch['replacement']
+    if (previous) {
+      if (
+        previous.handle.transport !== 'jsonl-rpc' ||
+        previous.handle.agent !== 'pi' ||
+        !isAbsolute(previous.handle.nativeId)
+      ) {
+        throw new Error('Pi resume handle is not a host session file')
+      }
+      const source = previous.handle.nativeId
+      const directory = await sessionDirectory(source)
+      if (directory === null) {
+        replacement = previous.origin === 'created' ? 'unsaved' : 'restore-failed'
+      } else if (await sameDirectory(directory, cwd)) {
+        sessionFile = source
+      } else {
+        forkFile = source
+      }
+    }
+    const command = resolvePiRpcCommand(env, deps.resolveCommandSettings?.(), deps.resolveCommand)
+    // Again at every launch: the binary on PATH may have changed since the chat was created.
+    if (!(await piRpcVersionSupported({ command, cwd, env }, deps.probeVersion))) {
+      throw agentSessionRefusalError('structured_agent_session_unsupported', {
+        reason: 'hostUnsupported'
+      })
+    }
+    return {
+      command,
+      cwd,
+      env,
+      fullAccess: deps.resolveFullAccess?.() ?? true,
+      previous,
+      ...(sessionFile ? { sessionFile } : {}),
+      ...(forkFile ? { forkFile } : {}),
+      ...(replacement ? { replacement } : {})
+    }
+  }
+}
+
+export function piRpcProviderLink(
+  launch: PiRpcResolvedLaunch,
+  file: string,
+  fence: number,
+  linkId: string,
+  at: number
+): AgentSessionProviderHandleLink {
+  if (!isAbsolute(file)) {
+    throw new Error('Pi did not return an absolute session file')
+  }
+  const previous = launch.previous
+  if (launch.sessionFile && file !== launch.sessionFile) {
+    throw new Error('Pi resumed a different session file')
+  }
+  if (launch.forkFile && file === launch.forkFile) {
+    throw new Error('Pi did not fork the session for its new directory')
+  }
+  const key = previous ? agentSessionProviderHandleKey(previous.handle) : undefined
+  return {
+    linkId,
+    handle: { transport: 'jsonl-rpc', agent: 'pi', nativeId: file },
+    origin: launch.forkFile ? 'forked' : launch.sessionFile ? 'resumed' : 'created',
+    mintedAtFence: fence,
+    observedAt: at,
+    ...(launch.forkFile && key ? { forkedFromKey: key } : {}),
+    ...(launch.replacement === 'unsaved' && key
+      ? { supersedesKey: key, ...(previous?.replaces ? { replaces: previous.replaces } : {}) }
+      : {}),
+    ...(launch.replacement === 'restore-failed' && key
+      ? { replaces: { key, reason: 'restore-failed', replacedAt: at } }
+      : {})
+  }
+}
diff --git a/src/main/pi/rpc-launch.test.ts b/src/main/pi/rpc-launch.test.ts
new file mode 100644
index 000000000000..678e84dadf36
--- /dev/null
+++ b/src/main/pi/rpc-launch.test.ts
@@ -0,0 +1,110 @@
+import { describe, expect, it } from 'vitest'
+import { resolveProviderChildEnv } from '../provider-process/provider-process-launch'
+import { buildPiRpcLaunch } from './rpc-launch'
+
+const options = { command: 'host-resolved-pi', cwd: '/host/folder', fullAccess: true }
+describe('Pi RPC launch', () => {
+  it('uses the supplied host binary and folder, and lets Pi choose its own session store', () => {
+    expect(buildPiRpcLaunch(options)).toMatchObject({
+      command: options.command,
+      cwd: options.cwd,
+      args: ['--mode', 'rpc']
+    })
+  })
+
+  it.each([
+    '/host/.pi/agent/sessions/session.jsonl',
+    'C:\\Users\\dev\\.pi\\agent\\sessions\\session.jsonl'
+  ])('passes the native session file unchanged: %s', (sessionFile) => {
+    expect(buildPiRpcLaunch({ ...options, sessionFile }).args).toEqual([
+      '--mode',
+      'rpc',
+      '--session',
+      sessionFile
+    ])
+  })
+
+  it('retains selected account and user extension args, but strips inherited pane hook identities after overlays', () => {
+    const launch = buildPiRpcLaunch({
+      ...options,
+      extraArgs: ['--extension', '/host/my extension.ts'],
+      env: {
+        PI_CODING_AGENT_DIR: '/host/account',
+        ORCA_PANE_KEY: 'other-pane',
+        ORCA_AGENT_PANE: 'alias'
+      }
+    })
+    const env = resolveProviderChildEnv(launch, {
+      ORCA_AGENT_HOOK_TOKEN: 'inherited',
+      API_KEY: 'retained'
+    })
+    expect(env).toEqual({ API_KEY: 'retained', PI_CODING_AGENT_DIR: '/host/account' })
+    expect(launch.args).toEqual(['--mode', 'rpc', '--extension', '/host/my extension.ts'])
+  })
+
+  it.each([
+    ['--provider', 'anthropic', '--model', 'model-id'],
+    ['--provider=anthropic', '--model=model-id'],
+    ['--provider=anthropic', '-m', 'model-id'],
+    ['--model', 'anthropic/model-id']
+  ])('accepts paired model/provider selections: %j', (...extraArgs) => {
+    expect(buildPiRpcLaunch({ ...options, extraArgs }).args).toEqual([
+      '--mode',
+      'rpc',
+      ...extraArgs
+    ])
+  })
+
+  it.each([['--provider', 'anthropic'], ['--provider=anthropic'], ['--model'], ['--model=']])(
+    'rejects incomplete provider/model args: %j',
+    (...extraArgs) => {
+      expect(() => buildPiRpcLaunch({ ...options, extraArgs })).toThrow(/requires/)
+    }
+  )
+
+  it.each([
+    '--mode=json',
+    '--print',
+    '-p',
+    '--no-session',
+    '--session=other',
+    '--resume',
+    '--continue'
+  ])('rejects arguments that bypass the chat mode or its session handle: %s', (arg) => {
+    expect(() => buildPiRpcLaunch({ ...options, extraArgs: [arg] })).toThrow('conflicts')
+  })
+
+  it('rejects a supervised permissions request instead of silently running in full access', () => {
+    expect(() => buildPiRpcLaunch({ ...options, fullAccess: false })).toThrow('full access only')
+  })
+
+  it('rejects an empty supplied resume handle', () => {
+    expect(() => buildPiRpcLaunch({ ...options, sessionFile: '' })).toThrow(
+      'requires a session file'
+    )
+  })
+
+  it('scrubs inherited structured identity and injects only this acquisition identity', () => {
+    const inherited = {
+      ORCA_AGENT_SESSION_ID: 'stale',
+      ORCA_STRUCTURED_SESSION: '1',
+      ORCA_TERMINAL_HANDLE: 'structworker_stale',
+      ORCA_AGENT_SESSION_SPAWN_TOKEN: 'old-token'
+    }
+    expect(resolveProviderChildEnv(buildPiRpcLaunch(options), inherited)).toEqual({})
+    const childEnv = resolveProviderChildEnv(
+      buildPiRpcLaunch({
+        ...options,
+        env: inherited,
+        structuredSession: { id: 'this-session', spawnToken: 'this-token' }
+      }),
+      inherited
+    )
+    expect(childEnv).toMatchObject({
+      ORCA_AGENT_SESSION_ID: 'this-session',
+      ORCA_STRUCTURED_SESSION: '1',
+      ORCA_AGENT_SESSION_SPAWN_TOKEN: 'this-token'
+    })
+    expect(childEnv).not.toHaveProperty('ORCA_TERMINAL_HANDLE')
+  })
+})
diff --git a/src/main/pi/rpc-launch.ts b/src/main/pi/rpc-launch.ts
new file mode 100644
index 000000000000..98fba1dfb930
--- /dev/null
+++ b/src/main/pi/rpc-launch.ts
@@ -0,0 +1,119 @@
+import {
+  ORCA_SCRUB_SAFE_LAUNCH_ENV,
+  ORCA_SCRUB_SAFE_PANE_ENV
+} from '../../shared/agent-hook-scrub-safe-env'
+import {
+  AGENT_HOOK_RUNTIME_ENV_KEYS,
+  ORCA_AGENT_SESSION_CALLER_ENV_KEYS
+} from '../ipc/pty/host-env/spawn-env-keys'
+import type { ProviderProcessLaunch } from '../provider-process/provider-process-launch'
+import { structuredSessionChildIdentityEnv } from '../runtime/structured-session-child-identity-env'
+
+export type PiRpcLaunchOptions = {
+  /** Binary and paths are resolved by the execution host before building the launch. */
+  command: string
+  cwd: string
+  fullAccess: boolean
+  extraArgs?: readonly string[]
+  env?: Record<string, string>
+  sessionFile?: string
+  forkFile?: string
+  structuredSession?: { id: string; spawnToken: string }
+}
+
+const CHILD_ENV_TO_DELETE: readonly string[] = [
+  'ORCA_PANE_KEY',
+  'ORCA_TAB_ID',
+  'ORCA_WORKTREE_ID',
+  'ORCA_AGENT_LAUNCH_TOKEN',
+  ORCA_SCRUB_SAFE_PANE_ENV,
+  ORCA_SCRUB_SAFE_LAUNCH_ENV,
+  ...AGENT_HOOK_RUNTIME_ENV_KEYS
+]
+const CALLER_ENV_TO_DELETE = [
+  ...ORCA_AGENT_SESSION_CALLER_ENV_KEYS,
+  'ORCA_TERMINAL_HANDLE',
+  'ORCA_AGENT_SESSION_SPAWN_TOKEN'
+]
+
+/** Pi stores its own sessions; an explicit session file is shared with terminal resumes. */
+export function buildPiRpcLaunch(options: PiRpcLaunchOptions): ProviderProcessLaunch {
+  if (!options.fullAccess) {
+    throw new Error('Pi structured chat supports full access only')
+  }
+  if (options.sessionFile !== undefined && !options.sessionFile.trim()) {
+    throw new Error('Pi resume requires a session file')
+  }
+  if (
+    options.forkFile !== undefined &&
+    (!options.forkFile.trim() || options.sessionFile !== undefined)
+  ) {
+    throw new Error('Pi fork requires one source session file')
+  }
+  const env = { ...options.env }
+  for (const key of CALLER_ENV_TO_DELETE) {
+    delete env[key]
+  }
+  const childEnv = options.structuredSession
+    ? {
+        ...structuredSessionChildIdentityEnv(options.structuredSession.id, env),
+        ORCA_AGENT_SESSION_SPAWN_TOKEN: options.structuredSession.spawnToken
+      }
+    : env
+  const args = [...(options.extraArgs ?? [])]
+  let provider = false
+  let model = false
+  for (let index = 0; index < args.length; index++) {
+    const arg = args[index]
+    const flag = arg.split('=')[0]
+    if (flag === '--provider' || flag === '--model' || flag === '-m') {
+      const value = arg.includes('=') ? arg.slice(arg.indexOf('=') + 1) : args[++index]
+      if (!value || value.startsWith('-')) {
+        throw new Error(`Pi ${flag} requires a value`)
+      }
+      if (flag === '--provider') {
+        provider = true
+      } else {
+        model = true
+      }
+    } else if (
+      [
+        '--mode',
+        '--print',
+        '-p',
+        '--no-session',
+        '--session',
+        '-r',
+        '--resume',
+        '-c',
+        '--continue',
+        '--fork'
+      ].includes(flag)
+    ) {
+      throw new Error(`Pi ${flag} conflicts with the structured chat launch`)
+    }
+  }
+  if (provider && !model) {
+    throw new Error('Pi --provider requires --model')
+  }
+  return {
+    command: options.command,
+    cwd: options.cwd,
+    args: [
+      '--mode',
+      'rpc',
+      ...args,
+      ...(options.sessionFile ? ['--session', options.sessionFile] : []),
+      ...(options.forkFile ? ['--fork', options.forkFile] : [])
+    ],
+    env: childEnv,
+    envToDelete: [
+      ...CHILD_ENV_TO_DELETE,
+      ...(options.structuredSession
+        ? Object.hasOwn(childEnv, 'ORCA_TERMINAL_HANDLE')
+          ? []
+          : ['ORCA_TERMINAL_HANDLE']
+        : CALLER_ENV_TO_DELETE)
+    ]
+  }
+}
diff --git a/src/main/pi/rpc-location.test.ts b/src/main/pi/rpc-location.test.ts
new file mode 100644
index 000000000000..b3c500ba45ff
--- /dev/null
+++ b/src/main/pi/rpc-location.test.ts
@@ -0,0 +1,50 @@
+import { afterEach, describe, expect, it, vi } from 'vitest'
+import type { AgentSessionExecutionLocation } from '../../shared/agent-session-record'
+import { structuredAgentRuntimeRegistration } from '../runtime/structured-agent-runtime-registrations'
+import { isWindowsProcessStartTimeAvailable } from '../windows/windows-process-table'
+import { PiRpcSessionAdapter } from './rpc-session-adapter'
+
+vi.mock('../windows/windows-process-table', () => ({ isWindowsProcessStartTimeAvailable: vi.fn() }))
+
+const originalPlatform = process.platform
+afterEach(() => {
+  Object.defineProperty(process, 'platform', { configurable: true, value: originalPlatform })
+  vi.resetAllMocks()
+})
+
+const local: AgentSessionExecutionLocation = {
+  executionHostId: 'local',
+  wslDistro: null,
+  workspaceId: 'folder-1',
+  workspaceKind: 'folder'
+}
+
+describe('Pi execution host support', () => {
+  it.each([false, true])(
+    'requires Windows process identity proof at both support seams (%s)',
+    (proof) => {
+      Object.defineProperty(process, 'platform', { configurable: true, value: 'win32' })
+      vi.mocked(isWindowsProcessStartTimeAvailable).mockReturnValue(proof)
+      const adapter = new PiRpcSessionAdapter({
+        resolveLaunch: async () => {
+          throw new Error('A location check must not acquire a process')
+        },
+        onLifecycle: vi.fn(),
+        onSettled: vi.fn(),
+        onIdle: vi.fn(),
+        logger: { warn: vi.fn(), error: vi.fn() }
+      })
+      expect(structuredAgentRuntimeRegistration('pi')?.supportsLocation(local)).toBe(proof)
+      expect(adapter.supportsCreate(local, 'pi')).toBe(proof)
+    }
+  )
+
+  it('refuses another execution host and WSL without probing local process identity', () => {
+    const registration = structuredAgentRuntimeRegistration('pi')
+    expect(registration?.supportsLocation({ ...local, executionHostId: 'runtime:remote' })).toBe(
+      false
+    )
+    expect(registration?.supportsLocation({ ...local, wslDistro: 'Ubuntu' })).toBe(false)
+    expect(isWindowsProcessStartTimeAvailable).not.toHaveBeenCalled()
+  })
+})
diff --git a/src/main/pi/rpc-message-dialog-shapes.test.ts b/src/main/pi/rpc-message-dialog-shapes.test.ts
new file mode 100644
index 000000000000..26dc5b781214
--- /dev/null
+++ b/src/main/pi/rpc-message-dialog-shapes.test.ts
@@ -0,0 +1,80 @@
+import { readFileSync } from 'node:fs'
+import { join } from 'node:path'
+import { describe, expect, it } from 'vitest'
+import { z } from 'zod'
+import { PiRpcMessages } from './rpc-messages'
+import { PiRpcContextUsage } from './rpc-context-usage'
+import { piRpcDialogPresentation } from './rpc-extension-dialogs'
+
+describe('recorded Pi message and extension shapes', () => {
+  it('publishes top-level live usage before the assistant message ends', () => {
+    const frameSchema = z.looseObject({
+      type: z.string(),
+      usage: z
+        .object({
+          input: z.number(),
+          output: z.number(),
+          cacheRead: z.number(),
+          cacheWrite: z.number()
+        })
+        .optional()
+    })
+    const frames = readFileSync(
+      join(import.meta.dirname, '__fixtures__', 'steer-followup.jsonl'),
+      'utf8'
+    )
+      .split('\n')
+      .filter(Boolean)
+      .map((line) => {
+        const envelope = z.object({ raw: z.string() }).parse(JSON.parse(line))
+        return frameSchema.parse(JSON.parse(envelope.raw))
+      })
+    const update = frames.find(
+      (frame) =>
+        frame.type === 'message_update' &&
+        frame.usage &&
+        Object.values(frame.usage).some((tokens) => tokens > 0)
+    )
+    expect(update).toBeDefined()
+    const messages = new PiRpcMessages('generation', new PiRpcContextUsage())
+    expect(messages.message(update, 123)).toContainEqual({
+      type: 'context.usage',
+      usage: {
+        used: {
+          kind: 'estimate',
+          usage: {
+            inputTokens: update?.usage?.input,
+            outputTokens: update?.usage?.output,
+            cacheCreationInputTokens: update?.usage?.cacheWrite,
+            cacheReadInputTokens: update?.usage?.cacheRead
+          },
+          capturedAt: 123
+        }
+      }
+    })
+  })
+
+  it.each(['input', 'editor', 'select'])('preserves the provider message for %s', (method) => {
+    const dialog = piRpcDialogPresentation({
+      id: 'dialog',
+      method,
+      title: 'Choose',
+      message: 'Use staging',
+      options: ['value']
+    })
+    expect(dialog?.body).toMatchObject({ kind: 'question', question: 'Choose\n\nUse staging' })
+  })
+
+  it('labels an empty select value while delivering its original string', () => {
+    const dialog = piRpcDialogPresentation({
+      id: 'select',
+      method: 'select',
+      title: 'Choose',
+      options: ['']
+    })
+    expect(dialog?.body).toMatchObject({ options: [{ id: 'option-0', label: 'Empty value' }] })
+    expect(
+      dialog?.reply({ kind: 'answers', answers: [{ questionId: 'q1', optionIds: ['option-0'] }] })
+    ).toEqual({ value: '' })
+  })
+})
diff --git a/src/main/pi/rpc-messages.ts b/src/main/pi/rpc-messages.ts
new file mode 100644
index 000000000000..c463f49c8e1d
--- /dev/null
+++ b/src/main/pi/rpc-messages.ts
@@ -0,0 +1,162 @@
+import { z } from 'zod'
+import type { AgentJournalToolCallItem } from '../../shared/agent-session-journal-types'
+import {
+  boundPayload,
+  boundToolInput,
+  DEFAULT_JOURNAL_PAYLOAD_LIMITS
+} from '../native-chat/agent-session-journal/journal-payload-bounds'
+import type { ProviderTimelineEvent } from '../native-chat/agent-session-timeline/provider-timeline-event'
+import { piRpcMessageEventSchema, piRpcToolEventSchema } from './rpc-protocol'
+import type { PiRpcContextUsage } from './rpc-context-usage'
+
+const resultSchema = z.object({
+  content: z.array(z.object({ type: z.string(), text: z.string().optional() }))
+})
+
+/** Pi does not name assistant messages; ordinals are local to this exact child. */
+export class PiRpcMessages {
+  private ordinal = 0
+  private active?: number
+  private readonly text = new Map<string, { index: number; channel: 'assistant' | 'reasoning' }>()
+  private readonly tools = new Map<string, AgentJournalToolCallItem>()
+
+  constructor(
+    private readonly generation: string,
+    private readonly context: PiRpcContextUsage
+  ) {}
+
+  reset(): void {
+    this.active = undefined
+    this.text.clear()
+    this.tools.clear()
+  }
+
+  message(value: unknown, at: number): ProviderTimelineEvent[] {
+    const parsed = piRpcMessageEventSchema.safeParse(value)
+    if (!parsed.success) {
+      throw new Error('Invalid Pi message event')
+    }
+    const event = parsed.data
+    const message = event.message ?? event.assistantMessageEvent?.partial
+    if (message && message.role !== 'assistant') {
+      return []
+    }
+    if (event.type === 'message_start') {
+      this.active = ++this.ordinal
+      this.text.clear()
+      return []
+    }
+    const events = this.context.live(event.usage ?? message?.usage, at)
+    this.active ??= ++this.ordinal
+    const update = event.assistantMessageEvent
+    if (
+      event.type === 'message_update' &&
+      update?.delta !== undefined &&
+      ['text_delta', 'thinking_delta'].includes(update.type)
+    ) {
+      const channel = update.type === 'text_delta' ? 'assistant' : 'reasoning'
+      const index = update.contentIndex ?? 0
+      const item = this.key(index, channel)
+      if (this.text.size >= 128 && !this.text.has(item)) {
+        throw new Error('Pi message stream capacity exceeded')
+      }
+      this.text.set(item, { index, channel })
+      events.push({ type: 'text.delta', item: { id: item }, channel, text: update.delta })
+    }
+    if (event.type === 'message_end' && message) {
+      const content =
+        typeof message.content === 'string'
+          ? [{ type: 'text', text: message.content }]
+          : message.content
+      content.forEach((block, index) => {
+        const channel =
+          block.type === 'text' ? 'assistant' : block.type === 'thinking' ? 'reasoning' : undefined
+        if (!channel) {
+          return
+        }
+        const item = this.key(index, channel)
+        const text = channel === 'assistant' ? block.text : block.thinking
+        if (text !== undefined) {
+          // A snapshot without deltas still opens the same message row.
+          if (!this.text.has(item) && text) {
+            events.push({ type: 'text.delta', item: { id: item }, channel, text })
+          }
+          events.push({ type: 'text.close', item: { id: item }, text })
+          this.text.delete(item)
+        }
+      })
+      for (const item of this.text.keys()) {
+        events.push({ type: 'text.close', item: { id: item } })
+      }
+      this.text.clear()
+      this.active = undefined
+    }
+    return events
+  }
+
+  tool(value: unknown): ProviderTimelineEvent[] {
+    const parsed = piRpcToolEventSchema.safeParse(value)
+    if (!parsed.success) {
+      throw new Error('Invalid Pi tool event')
+    }
+    const event = parsed.data
+    const previous = this.tools.get(event.toolCallId)
+    const result = event.result ?? event.partialResult
+    const content = resultSchema.safeParse(result)
+    const output =
+      result === undefined
+        ? undefined
+        : content.success
+          ? content.data.content
+              .flatMap((block) => (block.text === undefined ? [] : [block.text]))
+              .join('\n')
+          : JSON.stringify(result)
+    const state =
+      event.type === 'tool_execution_end' ? (event.isError ? 'failed' : 'completed') : 'running'
+    const body: AgentJournalToolCallItem = {
+      kind: 'tool-call',
+      name: event.toolName,
+      callId: event.toolCallId,
+      input:
+        event.args === undefined
+          ? (previous?.input ?? null)
+          : boundToolInput(event.args, DEFAULT_JOURNAL_PAYLOAD_LIMITS),
+      state,
+      ...(output === undefined
+        ? previous?.output
+          ? { output: previous.output }
+          : {}
+        : {
+            output: boundPayload(output, DEFAULT_JOURNAL_PAYLOAD_LIMITS)
+          })
+    }
+    if (state === 'running') {
+      if (this.tools.size >= 128 && !previous) {
+        throw new Error('Pi tool stream capacity exceeded')
+      }
+      this.tools.set(event.toolCallId, body)
+      if (
+        [...this.tools.values()].reduce(
+          (bytes, tool) => bytes + Buffer.byteLength(JSON.stringify(tool)),
+          0
+        ) >
+        1024 * 1024
+      ) {
+        throw new Error('Pi tool stream byte capacity exceeded')
+      }
+    } else {
+      this.tools.delete(event.toolCallId)
+    }
+    return [
+      {
+        type: state === 'running' ? (previous ? 'item.update' : 'item.open') : 'item.close',
+        item: `tool:${event.toolCallId}`,
+        body
+      }
+    ]
+  }
+
+  private key(index: number, channel: string): string {
+    return `message:${this.generation}:${this.active}:${index}:${channel}`
+  }
+}
diff --git a/src/main/pi/rpc-options.test.ts b/src/main/pi/rpc-options.test.ts
new file mode 100644
index 000000000000..5beaefb54ca1
--- /dev/null
+++ b/src/main/pi/rpc-options.test.ts
@@ -0,0 +1,142 @@
+import { describe, expect, it, vi } from 'vitest'
+import {
+  applyPiRpcSessionOption,
+  parsePiModelOptionId,
+  readPiRpcCommands,
+  readPiRpcSessionOptions,
+  type PiRpcRequester
+} from './rpc-options'
+
+function requester(
+  answers: Record<string, unknown>
+): PiRpcRequester & { request: ReturnType<typeof vi.fn> } {
+  return { request: vi.fn(async (command: string) => answers[command]) }
+}
+
+describe('Pi RPC session options', () => {
+  it('reads provider-qualified models and the reported thinking level', async () => {
+    const rpc = requester({
+      get_available_models: {
+        models: [
+          {
+            provider: 'openai-codex',
+            id: 'gpt-6.1-sol',
+            name: 'GPT-6.1 Sol',
+            reasoning: true,
+            thinkingLevelMap: { off: null, low: 'low', medium: 'medium', high: 'high' }
+          },
+          { provider: 'other', id: 'gpt-6.1-sol', name: 'Other Sol', reasoning: false }
+        ]
+      },
+      get_state: {
+        model: { provider: 'openai-codex', id: 'gpt-6.1-sol' },
+        thinkingLevel: 'medium',
+        sessionFile: '/sessions/current.jsonl',
+        isStreaming: false,
+        isCompacting: false
+      }
+    })
+    const result = await readPiRpcSessionOptions(rpc)
+    expect(rpc.request.mock.calls.map((call) => call[0])).toEqual([
+      'get_available_models',
+      'get_state'
+    ])
+    expect(result.current).toEqual({
+      model: 'openai-codex/gpt-6.1-sol',
+      effort: 'medium',
+      confirmed: ['model', 'effort']
+    })
+    expect(result.models.map((model) => [model.id, model.isDefault])).toEqual([
+      ['openai-codex/gpt-6.1-sol', false],
+      ['other/gpt-6.1-sol', false]
+    ])
+    expect(result.models[0]?.efforts.map((effort) => effort.value)).toEqual([
+      'minimal',
+      'low',
+      'medium',
+      'high'
+    ])
+    expect(result.models[1]?.efforts).toEqual([])
+  })
+
+  it('sends both provider and model ID and stores only successful explicit selections', async () => {
+    const rpc = requester({ set_model: {}, set_thinking_level: undefined })
+    const selected = new Map<string, string>()
+    await expect(
+      applyPiRpcSessionOption(rpc, selected, 'model', 'openai-codex/gpt-6.1-sol')
+    ).resolves.toEqual({ model: 'openai-codex/gpt-6.1-sol' })
+    await expect(applyPiRpcSessionOption(rpc, selected, 'effort', 'high')).resolves.toEqual({
+      model: 'openai-codex/gpt-6.1-sol',
+      effort: 'high'
+    })
+    expect(rpc.request.mock.calls).toEqual([
+      ['set_model', { provider: 'openai-codex', modelId: 'gpt-6.1-sol' }],
+      ['set_thinking_level', { level: 'high' }]
+    ])
+    expect(() => parsePiModelOptionId('openai-codex')).toThrow()
+    await expect(applyPiRpcSessionOption(rpc, selected, 'model', '/gpt-6.1-sol')).rejects.toThrow()
+    expect(selected.get('model')).toBe('openai-codex/gpt-6.1-sol')
+    const rejected = requester({})
+    rejected.request.mockRejectedValueOnce(new Error('provider refused model'))
+    await expect(
+      applyPiRpcSessionOption(rejected, selected, 'model', 'other/new-model')
+    ).rejects.toThrow('provider refused model')
+    expect(selected.get('model')).toBe('openai-codex/gpt-6.1-sol')
+  })
+
+  it('rejects malformed provider data and reports only Pi-listed commands', async () => {
+    const malformed = requester({ get_available_models: { models: [{ id: 'missing-provider' }] } })
+    await expect(readPiRpcSessionOptions(malformed)).rejects.toThrow()
+    const rpc = requester({
+      get_commands: {
+        commands: [
+          { name: 'review', description: 'Review changes', source: 'extension' },
+          { name: 'search', source: 'skill' }
+        ]
+      }
+    })
+    expect(await readPiRpcCommands(rpc)).toEqual({
+      commands: [
+        { name: 'review', kind: 'command', description: 'Review changes' },
+        { name: 'search', kind: 'skill' }
+      ]
+    })
+  })
+
+  it('handles a signed-out state with no model', async () => {
+    const rpc = requester({
+      get_available_models: { models: [] },
+      get_state: {
+        model: null,
+        thinkingLevel: 'off',
+        sessionFile: '/sessions/current.jsonl',
+        isStreaming: false,
+        isCompacting: false
+      }
+    })
+    expect((await readPiRpcSessionOptions(rpc)).current).toEqual({
+      model: '',
+      effort: 'off',
+      confirmed: ['effort']
+    })
+  })
+
+  it('keeps ordinary thinking levels when the map only supplies overrides', async () => {
+    const rpc = requester({
+      get_available_models: {
+        models: [
+          {
+            provider: 'openai-codex',
+            id: 'gpt-5.5',
+            reasoning: true,
+            thinkingLevelMap: { minimal: 'low', xhigh: 'xhigh' }
+          }
+        ]
+      },
+      get_state: { sessionFile: '/sessions/current.jsonl', isStreaming: false, isCompacting: false }
+    })
+    expect(
+      (await readPiRpcSessionOptions(rpc)).models[0]?.efforts.map(({ value }) => value)
+    ).toEqual(['off', 'minimal', 'low', 'medium', 'high', 'xhigh'])
+  })
+})
diff --git a/src/main/pi/rpc-options.ts b/src/main/pi/rpc-options.ts
new file mode 100644
index 000000000000..9b59bec398ad
--- /dev/null
+++ b/src/main/pi/rpc-options.ts
@@ -0,0 +1,119 @@
+import { z } from 'zod'
+import type {
+  AgentSessionCommandsResult,
+  AgentSessionOptionsResult
+} from '../../shared/agent-session-wire'
+import { piRpcModelSchema, piRpcStateSchema } from './rpc-protocol'
+
+export type PiRpcRequester = {
+  request(
+    command: string,
+    params?: Record<string, unknown>,
+    options?: { timeoutMs?: number | null }
+  ): Promise<unknown>
+}
+
+const modelSchema = piRpcModelSchema.safeExtend({
+  provider: z.string().min(1),
+  id: z.string().min(1),
+  thinkingLevelMap: z.record(z.string(), z.string().nullable()).optional()
+})
+const modelsSchema = z.object({ models: z.array(modelSchema) })
+const stateSchema = piRpcStateSchema.safeExtend({
+  model: modelSchema.nullish()
+})
+const commandsSchema = z.object({
+  commands: z.array(
+    z.object({
+      name: z.string().min(1),
+      description: z.string().optional(),
+      source: z.string().optional()
+    })
+  )
+})
+
+const THINKING_LEVELS = ['off', 'minimal', 'low', 'medium', 'high', 'xhigh', 'max'] as const
+
+export function piModelOptionId(provider: string, modelId: string): string {
+  if (!provider || !modelId || provider.includes('/')) {
+    throw new Error('Pi model requires an explicit provider and model ID')
+  }
+  return `${provider}/${modelId}`
+}
+
+export function parsePiModelOptionId(value: string): { provider: string; modelId: string } {
+  const slash = value.indexOf('/')
+  if (slash < 1 || slash === value.length - 1) {
+    throw new Error('Pi model requires an explicit provider and model ID')
+  }
+  return { provider: value.slice(0, slash), modelId: value.slice(slash + 1) }
+}
+
+export async function readPiRpcSessionOptions(
+  rpc: PiRpcRequester
+): Promise<AgentSessionOptionsResult> {
+  const models = modelsSchema.parse(await rpc.request('get_available_models')).models
+  const state = stateSchema.parse(await rpc.request('get_state'))
+  const currentModel = state.model
+  const currentId = currentModel ? piModelOptionId(currentModel.provider, currentModel.id) : ''
+  const listed = models.map((model) => {
+    const id = piModelOptionId(model.provider, model.id)
+    const efforts =
+      model.reasoning !== true
+        ? []
+        : THINKING_LEVELS.filter((level) => {
+            const mapped = model.thinkingLevelMap?.[level]
+            return (
+              mapped !== null && ((level !== 'xhigh' && level !== 'max') || mapped !== undefined)
+            )
+          }).map((level) => ({ value: level, label: level }))
+    return {
+      id,
+      label: model.name || id,
+      isDefault: false,
+      efforts
+    }
+  })
+  return {
+    models: listed,
+    current: {
+      model: currentId,
+      ...(state.thinkingLevel ? { effort: state.thinkingLevel } : {}),
+      confirmed: [...(currentId ? ['model'] : []), ...(state.thinkingLevel ? ['effort'] : [])]
+    }
+  }
+}
+
+export async function applyPiRpcSessionOption(
+  rpc: PiRpcRequester,
+  selected: Map<string, string>,
+  key: string,
+  value: string
+): Promise<Readonly<Record<string, string>>> {
+  if (key === 'model') {
+    const model = parsePiModelOptionId(value)
+    modelSchema.parse({ provider: model.provider, id: model.modelId })
+    await rpc.request('set_model', model)
+  } else if (key === 'effort') {
+    if (!THINKING_LEVELS.some((level) => level === value)) {
+      throw new Error(`Unsupported Pi thinking level: ${value}`)
+    }
+    await rpc.request('set_thinking_level', { level: value })
+  } else {
+    throw new Error(`Unsupported Pi option: ${key}`)
+  }
+  selected.set(key, value)
+  return Object.fromEntries(selected)
+}
+
+export async function readPiRpcCommands(rpc: PiRpcRequester): Promise<AgentSessionCommandsResult> {
+  const { commands } = commandsSchema.parse(await rpc.request('get_commands'))
+  return {
+    commands: commands.map((command) => ({
+      name: command.name,
+      kind: command.source === 'skill' ? 'skill' : 'command',
+      ...(command.source === undefined ? { kindUnspecified: true as const } : {}),
+      ...(command.description ? { description: command.description } : {})
+    }))
+  }
+}
diff --git a/src/main/pi/rpc-prompt-delivery.test.ts b/src/main/pi/rpc-prompt-delivery.test.ts
new file mode 100644
index 000000000000..471f9ecf0bc0
--- /dev/null
+++ b/src/main/pi/rpc-prompt-delivery.test.ts
@@ -0,0 +1,125 @@
+import { afterEach, describe, expect, it, vi } from 'vitest'
+import { PiRpcPromptDelivery } from './rpc-prompt-delivery'
+
+const deliveries: PiRpcPromptDelivery[] = []
+afterEach(() => {
+  for (const delivery of deliveries.splice(0)) {
+    delivery.end()
+  }
+  vi.useRealTimers()
+})
+function rig() {
+  const send = vi.fn(async () => {}),
+    accepted = vi.fn(),
+    settled = vi.fn(),
+    beforeWrite = vi.fn()
+  const delivery = new PiRpcPromptDelivery({
+    send,
+    accepted,
+    settled,
+    beforeWrite,
+    commandOnly: vi.fn(),
+    rejectedAfterAcceptance: vi.fn(),
+    failed: vi.fn()
+  })
+  deliveries.push(delivery)
+  return { delivery, send, accepted, settled, beforeWrite }
+}
+const queued = {
+  type: 'response',
+  command: 'prompt',
+  success: true,
+  data: { disposition: 'queued' }
+}
+
+describe('Pi pending prompt delivery bounds and ownership', () => {
+  it('bounds queued prompts even after their acknowledgements arrive', async () => {
+    const h = rig()
+    for (let i = 0; i < 128; i++) {
+      await h.delivery.submit(`prompt:${i}`, i, { type: 'prompt', message: 'queued' })
+      h.delivery.reply(queued)
+    }
+    const before = vi.fn(async () => {})
+    expect(
+      await h.delivery.submit('overflow', 129, { type: 'prompt', message: 'overflow' }, before)
+    ).toMatchObject({ state: 'rejected', rejection: { kind: 'queueFull' } })
+    expect(before).not.toHaveBeenCalled()
+    expect(h.send).toHaveBeenCalledTimes(128)
+    h.delivery.consumeNext()
+    await expect(
+      h.delivery.submit('after-consumption', 130, { type: 'prompt', message: 'next' })
+    ).resolves.toEqual({ state: 'admitted' })
+  })
+
+  it('bounds retained retry payload bytes before journal dispatch admission', async () => {
+    const h = rig()
+    const frame = { type: 'prompt', message: 'x'.repeat(8 * 1024 * 1024 - 128) }
+    for (let i = 0; i < 4; i++) {
+      await h.delivery.submit(`large:${i}`, i, frame)
+    }
+    const before = vi.fn(async () => {})
+    expect(await h.delivery.submit('overflow', 5, frame, before)).toMatchObject({
+      state: 'rejected',
+      rejection: { kind: 'queueFull' }
+    })
+    expect(before).not.toHaveBeenCalled()
+    h.delivery.consumeNext()
+    await expect(h.delivery.submit('fits-after-consumption', 6, frame)).resolves.toEqual({
+      state: 'admitted'
+    })
+  })
+
+  it('does not consume an input whose dispatch commit has not finished', async () => {
+    const h = rig()
+    const pending = Promise.withResolvers<void>()
+    const submitted = h.delivery.submit(
+      'pending',
+      1,
+      { type: 'prompt', message: 'pending' },
+      () => pending.promise
+    )
+    expect(h.delivery.consumeNext()).toBe(false)
+    expect(h.beforeWrite).not.toHaveBeenCalled()
+    pending.resolve()
+    await submitted
+    expect(h.delivery.consumeNext()).toBe(true)
+    expect(h.accepted).toHaveBeenCalledWith('pending', 1)
+  })
+
+  it('associates a later run with the prompt actually written while an auth retry waits', async () => {
+    vi.useFakeTimers()
+    const h = rig()
+    await h.delivery.submit('retrying', 1, { type: 'prompt', message: 'first' })
+    h.delivery.reply({
+      type: 'response',
+      command: 'prompt',
+      success: false,
+      error: 'No API key found for provider'
+    })
+    await h.delivery.submit('second', 2, { type: 'prompt', message: 'second' })
+    h.delivery.consumeNext()
+    expect(h.accepted).toHaveBeenCalledExactlyOnceWith('second', 2)
+    h.delivery.reply(queued)
+    await vi.advanceTimersByTimeAsync(250)
+    h.delivery.consumeNext()
+    expect(h.accepted).toHaveBeenLastCalledWith('retrying', 1)
+  })
+
+  it('settles a pending auth retry as unknown on process teardown', async () => {
+    vi.useFakeTimers()
+    const h = rig()
+    await h.delivery.submit('retrying', 1, { type: 'prompt', message: 'first' })
+    h.delivery.reply({
+      type: 'response',
+      command: 'prompt',
+      success: false,
+      error: 'No API key found for provider'
+    })
+    h.delivery.end()
+    expect(h.settled).toHaveBeenCalledWith(
+      'retrying',
+      expect.objectContaining({ state: 'unknown' })
+    )
+    expect(vi.getTimerCount()).toBe(0)
+  })
+})
diff --git a/src/main/pi/rpc-prompt-delivery.ts b/src/main/pi/rpc-prompt-delivery.ts
new file mode 100644
index 000000000000..eef0f51c0bfd
--- /dev/null
+++ b/src/main/pi/rpc-prompt-delivery.ts
@@ -0,0 +1,203 @@
+import { agentSessionFailureFact, providerDiagnostic } from '../../shared/agent-session-failure'
+import { agentSessionFailureWords } from '../../shared/agent-session-failure-words'
+import type { AgentSessionDispatchOutcome } from '../native-chat/agent-session-wire/structured-agent-session-adapter'
+import type { JsonlRpcRecord } from '../jsonl-rpc/peer'
+import { piRpcPromptReplySchema } from './rpc-protocol'
+
+type Submission = {
+  id: string
+  at: number
+  frame?: JsonlRpcRecord
+  bytes: number
+  accepted: boolean
+  retries: number
+}
+type DeliveryDeps = {
+  send: (frame: JsonlRpcRecord) => Promise<void>
+  accepted: (id: string, at: number) => void
+  commandOnly: () => void
+  rejectedAfterAcceptance: (error: string) => void
+  settled: (id: string, outcome: AgentSessionDispatchOutcome) => void
+  failed: (error: Error) => void
+  beforeWrite?: () => void
+  refused?: () => void
+}
+
+/** Idless prompt acknowledgements are FIFO and may wait indefinitely on extension dialogs. */
+export class PiRpcPromptDelivery {
+  private readonly acknowledgements: Submission[] = []
+  private readonly waiting: Submission[] = []
+  private readonly retries = new Set<ReturnType<typeof setTimeout>>()
+  private readonly pending = new Set<Submission>()
+  private heldBytes = 0
+  private ended = false
+  constructor(private readonly deps: DeliveryDeps) {}
+  get holdsDispatch(): boolean {
+    return this.waiting.length > 0 || this.retries.size > 0
+  }
+
+  async submit(
+    id: string,
+    at: number,
+    frame: JsonlRpcRecord,
+    before?: () => Promise<void>
+  ): Promise<AgentSessionDispatchOutcome> {
+    if (this.ended) {
+      throw new Error('Pi prompt queue unavailable')
+    }
+    const bytes = Buffer.byteLength(JSON.stringify(frame))
+    if (this.pending.size >= 128 || this.heldBytes + bytes > 32 * 1024 * 1024) {
+      return {
+        state: 'rejected',
+        ...agentSessionFailureWords(agentSessionFailureFact('queueFull'), {
+          agentName: 'Pi',
+          surface: 'rejection'
+        })
+      }
+    }
+    const submission: Submission = { id, at, frame, bytes, accepted: false, retries: 0 }
+    this.pending.add(submission)
+    this.heldBytes += bytes
+    try {
+      await before?.()
+      if (this.ended) {
+        throw new Error('Pi ended before writing the prompt')
+      }
+      this.deps.beforeWrite?.()
+      this.acknowledgements.push(submission)
+      this.waiting.push(submission)
+      await this.deps.send(frame)
+      return { state: 'admitted' }
+    } catch {
+      this.remove(submission)
+      this.deps.refused?.()
+      return { state: 'unknown', reason: 'Pi prompt write did not settle' }
+    }
+  }
+
+  consumeNext(): boolean {
+    const submission = this.waiting[0]
+    if (!submission) {
+      return false
+    }
+    this.accept(submission)
+    return true
+  }
+
+  reply(frame: JsonlRpcRecord): void {
+    const reply = piRpcPromptReplySchema.parse(frame)
+    const submission = this.acknowledgements.shift()
+    if (!submission) {
+      throw new Error('Pi prompt reply has no request')
+    }
+    if (!reply.success) {
+      if (
+        !submission.accepted &&
+        reply.error?.startsWith('No API key found for ') &&
+        submission.retries++ < 8
+      ) {
+        this.removeWaiting(submission)
+        const timer = setTimeout(() => {
+          this.retries.delete(timer)
+          if (this.ended) {
+            return
+          }
+          const frame = submission.frame
+          if (!frame) {
+            this.deps.failed(new Error('Pi retry lost its unaccepted prompt'))
+            return
+          }
+          this.acknowledgements.push(submission)
+          this.waiting.push(submission)
+          void this.deps
+            .send(frame)
+            .catch((error: unknown) =>
+              this.deps.failed(error instanceof Error ? error : new Error(String(error)))
+            )
+        }, 250)
+        timer.unref()
+        this.retries.add(timer)
+        return
+      }
+      this.remove(submission)
+      const fact = agentSessionFailureFact(
+        reply.error?.startsWith('No API key found for ') ? 'notSignedIn' : 'providerRejected',
+        { detail: providerDiagnostic(reply.error ?? 'Pi rejected the prompt', 'person') }
+      )
+      this.deps.settled(submission.id, {
+        state: 'rejected',
+        ...agentSessionFailureWords(fact, { agentName: 'Pi', surface: 'rejection' })
+      })
+      if (submission.accepted) {
+        this.deps.rejectedAfterAcceptance(reply.error ?? 'Pi rejected the prompt')
+      } else {
+        this.deps.refused?.()
+      }
+      return
+    }
+    this.releaseFrame(submission)
+    if (reply.data?.disposition === 'handled' || reply.data?.agentInvoked === false) {
+      this.accept(submission)
+      this.deps.commandOnly()
+    }
+    this.finishIfConsumed(submission)
+  }
+
+  end(): void {
+    this.ended = true
+    for (const timer of this.retries) {
+      clearTimeout(timer)
+    }
+    this.retries.clear()
+    for (const submission of this.pending) {
+      if (!submission.accepted) {
+        this.deps.settled(submission.id, {
+          state: 'unknown',
+          reason: 'Pi ended before confirming delivery'
+        })
+      }
+      this.releaseFrame(submission)
+    }
+    this.waiting.length = 0
+    this.acknowledgements.length = 0
+    this.pending.clear()
+  }
+
+  private accept(submission: Submission): void {
+    if (submission.accepted) {
+      return
+    }
+    submission.accepted = true
+    this.removeWaiting(submission)
+    this.releaseFrame(submission)
+    this.finishIfConsumed(submission)
+    this.deps.accepted(submission.id, submission.at)
+  }
+  private remove(submission: Submission): void {
+    for (const list of [this.waiting, this.acknowledgements]) {
+      const index = list.indexOf(submission)
+      if (index !== -1) {
+        list.splice(index, 1)
+      }
+    }
+    this.releaseFrame(submission)
+    this.pending.delete(submission)
+  }
+  private removeWaiting(submission: Submission): void {
+    const index = this.waiting.indexOf(submission)
+    if (index !== -1) {
+      this.waiting.splice(index, 1)
+    }
+  }
+  private releaseFrame(submission: Submission): void {
+    if (submission.frame) {
+      this.heldBytes -= submission.bytes
+      submission.frame = undefined
+    }
+  }
+  private finishIfConsumed(submission: Submission): void {
+    if (!this.waiting.includes(submission) && !this.acknowledgements.includes(submission)) {
+      this.pending.delete(submission)
+    }
+  }
+}
diff --git a/src/main/pi/rpc-prompt.test.ts b/src/main/pi/rpc-prompt.test.ts
new file mode 100644
index 000000000000..f73dd02e5508
--- /dev/null
+++ b/src/main/pi/rpc-prompt.test.ts
@@ -0,0 +1,63 @@
+import { describe, expect, it, vi } from 'vitest'
+import type { AgentJournalMessageItem } from '../../shared/agent-session-journal-types'
+import { PiRpcPromptError, preparePiRpcPrompt } from './rpc-prompt'
+
+const PNG = Buffer.from(
+  'iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAQAAAC1HAwCAAAAC0lEQVR42mP8/x8AAwMCAO+/lXcAAAAASUVORK5CYII=',
+  'base64'
+)
+
+function message(blocks: AgentJournalMessageItem['blocks']): AgentJournalMessageItem {
+  return { kind: 'message', role: 'user', blocks }
+}
+
+describe('Pi RPC prompt preparation', () => {
+  it('encodes host-read image bytes and sends steer/followUp as prompt behavior', async () => {
+    const readLocal = vi.fn(async () => PNG)
+    const body = message([
+      { type: 'text', text: 'Look at this' },
+      { type: 'image-ref', path: '/workspace/screenshot.png' },
+      { type: 'text', text: 'then reply' }
+    ])
+    expect(await preparePiRpcPrompt(body, 'steer', { readLocal })).toEqual({
+      type: 'prompt',
+      message: 'Look at this\nthen reply',
+      streamingBehavior: 'steer',
+      images: [{ type: 'image', data: PNG.toString('base64'), mimeType: 'image/png' }]
+    })
+    expect(readLocal).toHaveBeenCalledWith('/workspace/screenshot.png')
+    expect(
+      (await preparePiRpcPrompt(message([{ type: 'text', text: 'next' }]), 'followUp'))
+        .streamingBehavior
+    ).toBe('followUp')
+  })
+
+  it('rejects URL refs with a typed unsupported attachment failure', async () => {
+    const readLocal = vi.fn(async () => PNG)
+    const rejected = await preparePiRpcPrompt(
+      message([{ type: 'image-ref', url: 'https://example.test/image.png' }]),
+      undefined,
+      { readLocal }
+    ).catch((error: unknown) => error)
+    expect(rejected).toBeInstanceOf(PiRpcPromptError)
+    expect(rejected).toMatchObject({
+      failure: { kind: 'attachmentInvalid', attachment: { reason: 'unsupportedType' } }
+    })
+    expect(readLocal).not.toHaveBeenCalled()
+  })
+
+  it('checks local image MIME against bytes and rejects empty prompts', async () => {
+    const readLocal = vi.fn(async () => PNG)
+    await expect(
+      preparePiRpcPrompt(message([{ type: 'image-ref', path: '/a.jpg' }]), undefined, { readLocal })
+    ).rejects.toThrow()
+    await expect(preparePiRpcPrompt(message([{ type: 'text', text: '' }]))).rejects.toThrow()
+  })
+
+  it('rejects a prompt beyond the RPC writer budget', async () => {
+    const oversizedText = 'x'.repeat(32 * 1024 * 1024)
+    await expect(
+      preparePiRpcPrompt(message([{ type: 'text', text: oversizedText }]))
+    ).rejects.toThrow('RPC write limit')
+  })
+})
diff --git a/src/main/pi/rpc-prompt.ts b/src/main/pi/rpc-prompt.ts
new file mode 100644
index 000000000000..655c96167c5f
--- /dev/null
+++ b/src/main/pi/rpc-prompt.ts
@@ -0,0 +1,174 @@
+import { extname } from 'node:path'
+import { resolveJsonlRpcPeerOptions } from '../jsonl-rpc/peer-limits'
+import type { AgentJournalMessageItem } from '../../shared/agent-session-journal-types'
+import type { NativeChatImageRefBlock } from '../../shared/native-chat-types'
+import {
+  agentSessionFailureFact,
+  type AgentSessionAttachmentProblem,
+  type SubmissionRejectionFact
+} from '../../shared/agent-session-failure'
+import {
+  ClaudeDispatchContentError,
+  readClaudeImage
+} from '../claude/claude-structured-dispatch-content'
+
+const MAX_IMAGE_BYTES = 5 * 1024 * 1024
+const MAX_IMAGE_COUNT = 20
+const MAX_TOTAL_IMAGE_BYTES = 20 * 1024 * 1024
+const MAX_PROMPT_WIRE_BYTES = resolveJsonlRpcPeerOptions().maxLineBytes - 1
+const MIME_BY_EXTENSION: Readonly<Record<string, string>> = {
+  '.gif': 'image/gif',
+  '.jpeg': 'image/jpeg',
+  '.jpg': 'image/jpeg',
+  '.png': 'image/png',
+  '.webp': 'image/webp'
+}
+
+export type PiRpcPrompt = Record<string, unknown> & {
+  type: 'prompt'
+  message: string
+  images: { type: 'image'; data: string; mimeType: string }[]
+  streamingBehavior?: 'steer' | 'followUp'
+}
+
+type ImageReads = {
+  readLocal(path: string): Promise<Buffer>
+}
+
+export class PiRpcPromptError extends Error {
+  constructor(
+    message: string,
+    readonly failure: SubmissionRejectionFact
+  ) {
+    super(message)
+    this.name = 'PiRpcPromptError'
+  }
+}
+
+function attachmentError(
+  message: string,
+  attachment: AgentSessionAttachmentProblem
+): PiRpcPromptError {
+  return new PiRpcPromptError(message, agentSessionFailureFact('attachmentInvalid', { attachment }))
+}
+
+function imageMime(bytes: Uint8Array): string | null {
+  if (
+    bytes.length >= 8 &&
+    Buffer.from(bytes.subarray(0, 8)).equals(Buffer.from('89504e470d0a1a0a', 'hex'))
+  ) {
+    return 'image/png'
+  }
+  if (bytes.length >= 3 && bytes[0] === 0xff && bytes[1] === 0xd8 && bytes[2] === 0xff) {
+    return 'image/jpeg'
+  }
+  if (
+    bytes.length >= 6 &&
+    Buffer.from(bytes.subarray(0, 6))
+      .toString('ascii')
+      .match(/^GIF8[79]a$/)
+  ) {
+    return 'image/gif'
+  }
+  if (
+    bytes.length >= 12 &&
+    Buffer.from(bytes.subarray(0, 4)).toString('ascii') === 'RIFF' &&
+    Buffer.from(bytes.subarray(8, 12)).toString('ascii') === 'WEBP'
+  ) {
+    return 'image/webp'
+  }
+  return null
+}
+
+async function readImage(
+  block: NativeChatImageRefBlock,
+  reads: ImageReads
+): Promise<{ bytes: Buffer; mimeType: string }> {
+  if (block.url) {
+    throw attachmentError('Pi does not accept image URLs', { reason: 'unsupportedType' })
+  }
+  if (!block.path) {
+    throw attachmentError('Pi image needs a local path', { reason: 'noSource' })
+  }
+  const mimeType = MIME_BY_EXTENSION[extname(block.path).toLowerCase()]
+  if (!mimeType) {
+    throw attachmentError('Pi image file type is unsupported', { reason: 'unsupportedType' })
+  }
+  let bytes: Buffer
+  try {
+    bytes = await reads.readLocal(block.path)
+  } catch (error) {
+    if (error instanceof ClaudeDispatchContentError) {
+      throw new PiRpcPromptError('Pi image could not be read', error.failure)
+    }
+    throw new PiRpcPromptError(
+      'Pi image could not be read',
+      agentSessionFailureFact('attachmentUnreadable')
+    )
+  }
+  if (bytes.byteLength === 0) {
+    throw attachmentError('Pi image is empty', { reason: 'empty' })
+  }
+  if (bytes.byteLength > MAX_IMAGE_BYTES) {
+    throw attachmentError('Pi image exceeds the size limit', {
+      reason: 'tooLarge',
+      limit: MAX_IMAGE_BYTES
+    })
+  }
+  if (imageMime(bytes) !== mimeType) {
+    throw attachmentError('Pi image file did not contain a supported image', {
+      reason: 'unsupportedType'
+    })
+  }
+  return { bytes, mimeType }
+}
+
+export async function preparePiRpcPrompt(
+  body: AgentJournalMessageItem,
+  streamingBehavior?: PiRpcPrompt['streamingBehavior'],
+  reads: ImageReads = { readLocal: readClaudeImage }
+): Promise<PiRpcPrompt> {
+  if (body.role !== 'user') {
+    throw new Error('Pi prompt must be a user message')
+  }
+  const texts: string[] = []
+  const images: PiRpcPrompt['images'] = []
+  let totalImageBytes = 0
+  for (const block of body.blocks) {
+    if (block.type === 'text' && block.text.length > 0) {
+      texts.push(block.text)
+    } else if (block.type === 'image-ref') {
+      if (images.length >= MAX_IMAGE_COUNT) {
+        throw attachmentError('Pi prompt has too many images', {
+          reason: 'tooMany',
+          limit: MAX_IMAGE_COUNT
+        })
+      }
+      const { bytes, mimeType } = await readImage(block, reads)
+      totalImageBytes += bytes.byteLength
+      if (totalImageBytes > MAX_TOTAL_IMAGE_BYTES) {
+        throw attachmentError('Pi images exceed the total size limit', {
+          reason: 'totalTooLarge',
+          limit: MAX_TOTAL_IMAGE_BYTES
+        })
+      }
+      images.push({ type: 'image', data: bytes.toString('base64'), mimeType })
+    }
+  }
+  if (texts.length === 0 && images.length === 0) {
+    throw new PiRpcPromptError('Pi prompt is empty', agentSessionFailureFact('emptyMessage'))
+  }
+  const prompt: PiRpcPrompt = {
+    type: 'prompt',
+    message: texts.join('\n'),
+    images,
+    ...(streamingBehavior ? { streamingBehavior } : {})
+  }
+  if (Buffer.byteLength(JSON.stringify(prompt), 'utf8') > MAX_PROMPT_WIRE_BYTES) {
+    throw new PiRpcPromptError(
+      'Pi prompt exceeds the RPC write limit',
+      agentSessionFailureFact('historyTooLarge')
+    )
+  }
+  return prompt
+}
diff --git a/src/main/pi/rpc-protocol.ts b/src/main/pi/rpc-protocol.ts
new file mode 100644
index 000000000000..b4aeab23a4ac
--- /dev/null
+++ b/src/main/pi/rpc-protocol.ts
@@ -0,0 +1,109 @@
+import { z } from 'zod'
+
+export const piRpcModelSchema = z.looseObject({
+  id: z.string(),
+  provider: z.string(),
+  name: z.string().optional(),
+  contextWindow: z.number().nonnegative().optional(),
+  reasoning: z.boolean().optional(),
+  input: z.array(z.string()).optional()
+})
+export type PiRpcModel = z.infer<typeof piRpcModelSchema>
+
+export const piRpcStateSchema = z.looseObject({
+  model: piRpcModelSchema.nullish(),
+  thinkingLevel: z.string().optional(),
+  sessionFile: z.string().min(1),
+  sessionId: z.string().optional(),
+  isStreaming: z.boolean(),
+  isCompacting: z.boolean(),
+  pendingMessageCount: z.number().int().nonnegative().optional()
+})
+export type PiRpcState = z.infer<typeof piRpcStateSchema>
+
+export function piRpcIdle(state: PiRpcState): boolean {
+  return !state.isStreaming && !state.isCompacting && (state.pendingMessageCount ?? 0) === 0
+}
+
+export const piRpcContentSchema = z.looseObject({
+  type: z.string(),
+  text: z.string().optional(),
+  thinking: z.string().optional()
+})
+export const piRpcUsageSchema = z.object({
+  input: z.number().nonnegative(),
+  output: z.number().nonnegative(),
+  cacheRead: z.number().nonnegative(),
+  cacheWrite: z.number().nonnegative()
+})
+export const piRpcMessageSchema = z.looseObject({
+  role: z.string(),
+  content: z.union([z.string(), z.array(piRpcContentSchema)]),
+  stopReason: z.string().optional(),
+  errorMessage: z.string().optional(),
+  usage: piRpcUsageSchema.optional(),
+  timestamp: z.number().optional()
+})
+export const piRpcMessageEventSchema = z.object({
+  type: z.enum(['message_start', 'message_update', 'message_end']),
+  message: piRpcMessageSchema.optional(),
+  usage: piRpcUsageSchema.optional(),
+  assistantMessageEvent: z
+    .looseObject({
+      type: z.string(),
+      delta: z.string().optional(),
+      contentIndex: z.number().int().nonnegative().optional(),
+      partial: piRpcMessageSchema.optional()
+    })
+    .optional()
+})
+export type PiRpcMessageEvent = z.infer<typeof piRpcMessageEventSchema>
+
+export const piRpcToolEventSchema = z.object({
+  type: z.enum(['tool_execution_start', 'tool_execution_update', 'tool_execution_end']),
+  toolCallId: z.string(),
+  toolName: z.string(),
+  args: z.unknown().optional(),
+  partialResult: z.unknown().optional(),
+  result: z.unknown().optional(),
+  isError: z.boolean().optional()
+})
+export type PiRpcToolEvent = z.infer<typeof piRpcToolEventSchema>
+
+export const piRpcPromptReplySchema = z.object({
+  type: z.literal('response'),
+  command: z.literal('prompt'),
+  success: z.boolean(),
+  error: z.string().optional(),
+  data: z
+    .object({
+      disposition: z.enum(['started', 'queued', 'handled']).optional(),
+      agentInvoked: z.boolean().optional()
+    })
+    .optional()
+})
+
+export const piRpcDialogSchema = z.discriminatedUnion('method', [
+  z.object({
+    id: z.union([z.string(), z.number()]),
+    method: z.literal('confirm'),
+    title: z.string(),
+    message: z.string().optional()
+  }),
+  z.object({
+    id: z.union([z.string(), z.number()]),
+    method: z.literal('select'),
+    title: z.string(),
+    message: z.string().optional(),
+    options: z.array(z.string()).min(1).max(64)
+  }),
+  z.object({
+    id: z.union([z.string(), z.number()]),
+    method: z.enum(['input', 'editor']),
+    title: z.string(),
+    message: z.string().optional(),
+    placeholder: z.string().optional(),
+    prefill: z.string().optional()
+  })
+])
+export type PiRpcDialog = z.infer<typeof piRpcDialogSchema>
diff --git a/src/main/pi/rpc-retry-activity.ts b/src/main/pi/rpc-retry-activity.ts
new file mode 100644
index 000000000000..a5b9713dd4ce
--- /dev/null
+++ b/src/main/pi/rpc-retry-activity.ts
@@ -0,0 +1,23 @@
+import { agentSessionFailureFact, providerDiagnostic } from '../../shared/agent-session-failure'
+import { agentSessionFailureWords } from '../../shared/agent-session-failure-words'
+import type { JsonlRpcRecord } from '../jsonl-rpc/peer'
+import type { ProviderTimelineEvent } from '../native-chat/agent-session-timeline/provider-timeline-event'
+
+/** Retries occupy the existing activity surface until the provider resumes or exhausts them. */
+export function piRpcRetryActivity(frame: JsonlRpcRecord): ProviderTimelineEvent {
+  return {
+    type: 'activity',
+    text:
+      frame.type === 'auto_retry_start'
+        ? agentSessionFailureWords(
+            agentSessionFailureFact('providerRetrying', {
+              detail:
+                typeof frame.errorMessage === 'string'
+                  ? providerDiagnostic(frame.errorMessage, 'person')
+                  : undefined
+            }),
+            { agentName: 'Pi', surface: 'row' }
+          ).text
+        : null
+  }
+}
diff --git a/src/main/pi/rpc-runtime-registration.test.ts b/src/main/pi/rpc-runtime-registration.test.ts
new file mode 100644
index 000000000000..b993c63db6a8
--- /dev/null
+++ b/src/main/pi/rpc-runtime-registration.test.ts
@@ -0,0 +1,107 @@
+import { chmod, 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 { runProcess } from '../../shared/child-process/run-process'
+import { PI_RPC_RUNTIME_REGISTRATION } from './rpc-runtime-registration'
+
+vi.mock('../../shared/child-process/run-process', () => ({ runProcess: vi.fn() }))
+
+type LaunchInput = Parameters<NonNullable<typeof PI_RPC_RUNTIME_REGISTRATION.supportsLaunch>>[0]
+function supportsLaunch(launch: LaunchInput): Promise<boolean> {
+  const check = PI_RPC_RUNTIME_REGISTRATION.supportsLaunch
+  if (!check) {
+    throw new Error('Pi registers a launch check')
+  }
+  return check(launch)
+}
+let root: string
+let stockPi: string
+
+function prints(stdout: string, result: Partial<Awaited<ReturnType<typeof runProcess>>> = {}) {
+  vi.mocked(runProcess).mockResolvedValue({
+    code: 0,
+    signal: null,
+    timedOut: false,
+    stdout,
+    stderr: '',
+    ...result
+  })
+}
+
+beforeEach(async () => {
+  vi.mocked(runProcess).mockReset()
+  vi.spyOn(console, 'warn').mockImplementation(() => {})
+  vi.spyOn(console, 'info').mockImplementation(() => {})
+  root = await mkdtemp(join(tmpdir(), 'orca-pi-support-'))
+  stockPi = join(root, process.platform === 'win32' ? 'pi.cmd' : 'pi')
+  await writeFile(stockPi, '')
+  await chmod(stockPi, 0o755)
+})
+afterEach(async () => {
+  vi.restoreAllMocks()
+  await rm(root, { recursive: true, force: true })
+})
+
+const input = (commandSettings: LaunchInput['commandSettings'] = {}): LaunchInput => ({
+  cwd: '/host/workspace',
+  env: { PATH: root, HOME: '/host/home' },
+  commandSettings
+})
+
+describe('Pi launch support before session creation', () => {
+  it.each(['0.84.0', '0.99.0', '1.0.0', '1.0.4\n', 'pi v1.12.3'])(
+    'accepts stable Pi from 0.84.0: %s',
+    async (out) => {
+      prints(out)
+      await expect(supportsLaunch(input())).resolves.toBe(true)
+      expect(runProcess).toHaveBeenCalledWith({
+        program: stockPi,
+        cwd: '/host/workspace',
+        env: { PATH: root, HOME: '/host/home' },
+        args: ['--version'],
+        timeoutMs: 5_000,
+        maxOutputBytes: 4_096,
+        killOnOutputLimit: true
+      })
+    }
+  )
+
+  it.each([
+    '0.73.1',
+    '0.83.9',
+    '0.84.0-rc.1',
+    '1.0.0-rc.1',
+    '1.1.0-preview.1',
+    '2.0.0',
+    'unknown',
+    ''
+  ])('keeps the terminal chat for an older, prerelease or unknown version: %s', async (out) => {
+    prints(out)
+    await expect(supportsLaunch(input())).resolves.toBe(false)
+  })
+
+  it.each([
+    { code: 1, timedOut: false, outputTruncated: false },
+    { code: 0, timedOut: true, outputTruncated: false },
+    { code: 0, timedOut: false, outputTruncated: true }
+  ])('does not infer support from incomplete or failed output: %j', async (result) => {
+    prints('1.0.4', result)
+    await expect(supportsLaunch(input())).resolves.toBe(false)
+  })
+
+  it('probes the binary the Command setting names, not the stock one', async () => {
+    prints('1.0.4')
+    await expect(
+      supportsLaunch(input({ agentCmdOverrides: { pi: `"${process.execPath}"` } }))
+    ).resolves.toBe(true)
+    expect(runProcess).toHaveBeenCalledWith(expect.objectContaining({ program: process.execPath }))
+  })
+
+  it('leaves an unrunnable Command setting to the launch to refuse', async () => {
+    await expect(supportsLaunch(input({ agentCmdOverrides: { pi: '/missing/pi' } }))).resolves.toBe(
+      true
+    )
+    expect(runProcess).not.toHaveBeenCalled()
+  })
+})
diff --git a/src/main/pi/rpc-runtime-registration.ts b/src/main/pi/rpc-runtime-registration.ts
new file mode 100644
index 000000000000..fca0a4b411f0
--- /dev/null
+++ b/src/main/pi/rpc-runtime-registration.ts
@@ -0,0 +1,73 @@
+import { homedir } from 'node:os'
+import { join } from 'node:path'
+import { agentSessionAccountHome } from '../../shared/agent-session-account-home'
+import { isAgentSessionPreSpawnError } from '../native-chat/agent-session-wire/structured-agent-session-adapter'
+import { supportsSupervisedProviderChildLocation } from '../provider-process/supervised-provider-child-location'
+import type {
+  StructuredAgentAdapterContext,
+  StructuredAgentRuntimeAdapter,
+  StructuredAgentRuntimeRegistration
+} from '../runtime/structured-agent-runtime-registrations'
+import { PI_RPC_AGENT } from './rpc-agent-definition'
+import {
+  createPiRpcLaunchResolver,
+  piRpcVersionSupported,
+  resolvePiRpcCommand
+} from './rpc-launch-resolution'
+import { PiRpcSessionAdapter } from './rpc-session-adapter'
+
+function createPiRpcAdapter(context: StructuredAgentAdapterContext): StructuredAgentRuntimeAdapter {
+  const { deps } = context
+  return new PiRpcSessionAdapter({
+    resolveLaunch: createPiRpcLaunchResolver({
+      store: context.store,
+      resolveWorkspacePath: deps.resolveWorkspacePath,
+      resolveEnvironment: async () => ({
+        ...(await context.environment.resolveBaseEnvironment()),
+        ...deps.resolveAgentLaunchEnv?.('pi')
+      }),
+      ...(deps.resolveAgentCommandSettings
+        ? { resolveCommandSettings: deps.resolveAgentCommandSettings }
+        : {})
+    }),
+    ...(deps.openPiConnection ? { openConnection: deps.openPiConnection } : {}),
+    ...(deps.readProcessStartTime ? { readProcessStartTime: deps.readProcessStartTime } : {}),
+    onLifecycle: context.deliverLifecycle,
+    onSettled: ({ sessionId, clientMessageId, outcome }) => {
+      if (outcome.state === 'admitted') {
+        return
+      }
+      context.followUps.onDispatchSettledLate({
+        sessionId,
+        clientMessageId,
+        ...(outcome.state === 'accepted' ? { providerIdentity: outcome.providerIdentity } : outcome)
+      })
+    },
+    onIdle: context.followUps.releaseUnansweredDispatches,
+    logger: deps.logger
+  })
+}
+
+export const PI_RPC_RUNTIME_REGISTRATION: StructuredAgentRuntimeRegistration = {
+  definition: PI_RPC_AGENT,
+  createAdapter: createPiRpcAdapter,
+  supportsLocation: supportsSupervisedProviderChildLocation,
+  supportsLaunch: async ({ cwd, env, commandSettings }) => {
+    let command: string
+    try {
+      command = resolvePiRpcCommand(env, commandSettings)
+    } catch (error) {
+      // An unrunnable Command setting is the launch's refusal to state, not a terminal.
+      if (isAgentSessionPreSpawnError(error)) {
+        return true
+      }
+      throw error
+    }
+    return piRpcVersionSupported({ command, cwd, env })
+  },
+  resolveAccountHome: async ({ launchEnv }) =>
+    agentSessionAccountHome(
+      PI_RPC_AGENT,
+      launchEnv.PI_CODING_AGENT_DIR?.trim() || join(homedir(), '.pi', 'agent')
+    )
+}
diff --git a/src/main/pi/rpc-session-adapter.test.ts b/src/main/pi/rpc-session-adapter.test.ts
new file mode 100644
index 000000000000..023e972a4481
--- /dev/null
+++ b/src/main/pi/rpc-session-adapter.test.ts
@@ -0,0 +1,562 @@
+import { afterEach, describe, expect, it, vi } from 'vitest'
+import { agentJournalItemKey } from '../../shared/agent-session-journal-item-key'
+import type { AgentSessionProcessIdentity } from '../../shared/agent-session-record'
+import { agentJournalTurnBody } from '../../shared/agent-session-turn-record'
+import {
+  AgentSessionAcquisitionRootExitObservedError,
+  type StructuredAgentSessionAcquireInput
+} from '../native-chat/agent-session-wire/structured-agent-session-adapter'
+import {
+  closeProviderTimelineRigs,
+  openProviderTimelineRig
+} from '../native-chat/agent-session-timeline/provider-timeline-assembler-test-support'
+import type { JsonlRpcAgentConnectionOptions } from '../jsonl-rpc/agent-connection'
+import type { JsonlRpcRecord } from '../jsonl-rpc/peer'
+import { JsonlRpcResponseError } from '../jsonl-rpc/peer'
+import type { PiRpcConnection } from './rpc-session'
+import type { ProviderProcessLaunch } from '../provider-process/provider-process-launch'
+import type { StructuredAgentSessionEventSink } from '../native-chat/agent-session-wire/structured-agent-session-event-sink'
+import { PiRpcSessionAdapter } from './rpc-session-adapter'
+
+const sessionId = 'session-timeline'
+const file = '/host/account/sessions/session.jsonl'
+const state = {
+  sessionFile: file,
+  isStreaming: false,
+  isCompacting: false,
+  model: { provider: 'anthropic', id: 'model-1' }
+}
+const cleanups: (() => Promise<void>)[] = []
+afterEach(async () => {
+  for (const cleanup of cleanups.splice(0)) {
+    await cleanup()
+  }
+  await closeProviderTimelineRigs()
+})
+
+class FakeConnection implements PiRpcConnection {
+  pid = 4123
+  closed = false
+  rootVerdict: 'live' | 'unverifiable' | 'exited' = 'live'
+  processless = false
+  deferExit = false
+  lastCloseResult: PiRpcConnection['lastCloseResult'] = null
+  closeResult: Awaited<ReturnType<PiRpcConnection['close']>> = { root: 'exited', tree: 'exited' }
+  readonly sent: JsonlRpcRecord[] = []
+  readonly requests: string[] = []
+  private readonly exitListeners: (() => void)[] = []
+  requestOverride?: (command: string) => Promise<unknown> | undefined
+  abortRequest?: () => void
+  constructor(readonly handlers: JsonlRpcAgentConnectionOptions) {}
+  async request(command: string): Promise<unknown> {
+    this.requests.push(command)
+    const override = this.requestOverride?.(command)
+    if (override) {
+      return override
+    }
+    if (command === 'get_state') {
+      return state
+    }
+    if (command === 'get_available_models') {
+      return { models: [state.model] }
+    }
+    if (command === 'get_commands') {
+      return { commands: [{ name: 'help' }] }
+    }
+    if (command === 'set_thinking_level') {
+      throw new Error('saved effort unavailable')
+    }
+    return {}
+  }
+  async send(frame: JsonlRpcRecord): Promise<void> {
+    this.sent.push(frame)
+  }
+  async close(): Promise<Awaited<ReturnType<PiRpcConnection['close']>>> {
+    this.abortRequest?.()
+    this.closed = true
+    this.rootVerdict = this.closeResult.root
+    this.lastCloseResult = this.closeResult
+    if (this.closeResult.root === 'exited' && !this.deferExit) {
+      this.exit()
+    }
+    return this.closeResult
+  }
+  pauseReading(): void {}
+  resumeReading(): void {}
+  onExit(listener: () => void): void {
+    if (this.rootVerdict === 'exited') {
+      listener()
+    } else {
+      this.exitListeners.push(listener)
+    }
+  }
+  receive(frame: JsonlRpcRecord): void {
+    this.handlers.onRecord?.(frame)
+  }
+  exit(error = new Error('child exited')): void {
+    this.closed = true
+    this.rootVerdict = 'exited'
+    for (const listener of this.exitListeners.splice(0)) {
+      listener()
+    }
+    this.handlers.onExit?.(error, {
+      expected: false,
+      exit: { code: 1, signal: null, processless: false }
+    })
+  }
+}
+
+async function setup(
+  options: Readonly<Record<string, string>> = {},
+  eventSink?: (sink: StructuredAgentSessionEventSink) => StructuredAgentSessionEventSink
+) {
+  const rig = await openProviderTimelineRig({ agent: 'pi', sessionId })
+  const connections: FakeConnection[] = []
+  const lifecycle = vi.fn(),
+    settled = vi.fn(),
+    idle = vi.fn()
+  const onSpawned = vi.fn(async (_process: AgentSessionProcessIdentity) => {
+    expect(connections.at(-1)?.requests).toEqual([])
+  })
+  const input: StructuredAgentSessionAcquireInput = {
+    identity: {
+      sessionId,
+      workspaceId: 'folder-1',
+      hostId: 'local',
+      agent: 'pi',
+      providerHandle: null
+    },
+    fence: 7,
+    spawnToken: 'spawn-token',
+    options,
+    events: eventSink?.(rig.eventSink) ?? rig.eventSink,
+    onSpawned
+  }
+  const resolveLaunch = vi.fn(async () => ({
+    command: '/host/bin/pi',
+    cwd: '/host/folder',
+    fullAccess: true,
+    previous: null
+  }))
+  const openConnection = vi.fn(
+    (_launch: ProviderProcessLaunch, handlers: JsonlRpcAgentConnectionOptions) => {
+      const connection = new FakeConnection(handlers)
+      connections.push(connection)
+      return connection
+    }
+  )
+  const adapter = new PiRpcSessionAdapter({
+    resolveLaunch,
+    readProcessStartTime: async () => 12345,
+    openConnection,
+    onLifecycle: lifecycle,
+    onSettled: settled,
+    onIdle: idle,
+    logger: { warn: vi.fn(), error: vi.fn() }
+  })
+  const acquired = await adapter.acquire(input)
+  const connection = connections[0]
+  if (!connection) {
+    throw new Error('connection missing')
+  }
+  cleanups.push(async () => {
+    await adapter.closeAll().catch(() => {})
+    await adapter.drainObservedExits()
+    adapter.acknowledgeSessionRelease(sessionId)
+  })
+  return {
+    adapter,
+    connection,
+    rig,
+    acquired,
+    onSpawned,
+    lifecycle,
+    settled,
+    idle,
+    input,
+    resolveLaunch,
+    openConnection,
+    connections
+  }
+}
+
+describe('Pi RPC session ownership and delivery', () => {
+  it('does not spawn a start cancelled while resolving its workspace', async () => {
+    const h = await setup()
+    await h.adapter.closeSession(sessionId)
+    const launch = await h.resolveLaunch.mock.results[0]?.value
+    const resolving = Promise.withResolvers<NonNullable<typeof launch>>()
+    h.resolveLaunch.mockImplementationOnce(() => resolving.promise)
+    const controller = new AbortController()
+    const started = h.adapter.acquire({ ...h.input, fence: 8, signal: controller.signal })
+    await Promise.resolve()
+    controller.abort(new Error('Pi closed while starting'))
+    await expect(started).rejects.toThrow('closed while starting')
+    expect(h.connections).toHaveLength(1)
+    await expect(h.adapter.acquire({ ...h.input, fence: 9 })).resolves.toMatchObject({
+      link: { origin: 'created' }
+    })
+    resolving.resolve(launch!)
+    await Promise.resolve()
+    expect(h.connections).toHaveLength(2)
+  })
+
+  it('kills the child and rejects a stalled startup when the host aborts it', async () => {
+    const h = await setup()
+    await h.adapter.closeSession(sessionId)
+    const controller = new AbortController()
+    const opened = Promise.withResolvers<FakeConnection>()
+    const reply = Promise.withResolvers<unknown>()
+    h.openConnection.mockImplementationOnce((_launch, handlers) => {
+      const connection = new FakeConnection(handlers)
+      connection.requestOverride = (command) =>
+        command === 'get_state' ? reply.promise : undefined
+      connection.abortRequest = () => reply.reject(new Error('closed while starting'))
+      h.connections.push(connection)
+      opened.resolve(connection)
+      return connection
+    })
+    const started = h.adapter.acquire({ ...h.input, fence: 8, signal: controller.signal })
+    const child = await opened.promise
+    await Promise.resolve()
+    controller.abort(new Error('Pi closed while starting'))
+    await expect(started).rejects.toThrow('closed while starting')
+    expect(child.rootVerdict).toBe('exited')
+  })
+
+  it('retains final events when exit publication times out under journal backpressure', async () => {
+    let blocked = true
+    const h = await setup({}, (sink) => ({
+      ...sink,
+      tryAppendTransition: (transition) =>
+        blocked
+          ? { accepted: false, reason: 'backpressure' }
+          : sink.tryAppendTransition!(transition)
+    }))
+    vi.useFakeTimers()
+    h.connection.receive({
+      type: 'extension_ui_request',
+      id: 'last-dialog',
+      method: 'input',
+      title: 'Final tail'
+    })
+    h.connection.exit()
+    await vi.advanceTimersByTimeAsync(2_001)
+    expect(h.lifecycle).toHaveBeenCalledOnce()
+    h.adapter.acknowledgeSessionRelease(sessionId)
+    let completed = false
+    const drained = h.adapter.drainObservedExits().then(() => {
+      completed = true
+    })
+    await Promise.resolve()
+    expect(completed).toBe(false)
+    blocked = false
+    await vi.advanceTimersByTimeAsync(250)
+    await drained
+    expect(
+      (await h.rig.rows()).some(
+        (row) => row.body.kind === 'question' && row.body.question === 'Final tail'
+      )
+    ).toBe(true)
+    vi.useRealTimers()
+  })
+  it('lets a new acquisition proceed while the released child drains final stdout', async () => {
+    const h = await setup()
+    h.connection.deferExit = true
+    await h.adapter.closeSession(sessionId)
+    h.adapter.acknowledgeSessionRelease(sessionId)
+    await expect(h.adapter.acquire({ ...h.input, fence: 8 })).resolves.toMatchObject({
+      link: { origin: 'created' }
+    })
+    let drained = false
+    const delivery = h.adapter.drainObservedExits().then(() => {
+      drained = true
+    })
+    await Promise.resolve()
+    expect(drained).toBe(false)
+    h.connection.exit()
+    await delivery
+    expect(h.lifecycle).toHaveBeenCalledWith(
+      expect.objectContaining({ fence: 7, cause: 'requested-close' })
+    )
+  })
+
+  it('preserves an unexpected failure cause during forced cleanup', async () => {
+    const h = await setup()
+    await h.adapter.forceCloseSession(sessionId)
+    await h.adapter.drainObservedExits()
+    expect(h.lifecycle).toHaveBeenCalledWith(
+      expect.objectContaining({ cause: 'unexpected-exit', reason: 'Pi event sink failed' })
+    )
+  })
+  it('records the spawned child before the first startup RPC and links the native file', async () => {
+    const h = await setup({ effort: 'high', unknown: 'old-value' })
+    expect(h.onSpawned).toHaveBeenCalledWith({
+      hostId: 'local',
+      pid: 4123,
+      processStartTimeMs: 12345,
+      spawnToken: 'spawn-token'
+    })
+    expect(h.acquired.process).toEqual(h.onSpawned.mock.calls[0]?.[0])
+    expect(h.acquired.link).toMatchObject({
+      handle: { transport: 'jsonl-rpc', agent: 'pi', nativeId: file },
+      origin: 'created',
+      mintedAtFence: 7
+    })
+    expect(h.adapter.readOptionRestoreFailures(sessionId)).toEqual(['effort', 'unknown'])
+    expect(h.connection.requests).toContain('get_commands')
+  })
+
+  it('admits a send before Pi confirms it and settles only after journal acceptance', async () => {
+    const h = await setup()
+    const result = await h.adapter.dispatch({
+      sessionId,
+      fence: 7,
+      clientMessageId: 'send-1',
+      body: { kind: 'message', role: 'user', blocks: [{ type: 'text', text: 'hello' }] }
+    })
+    expect(result).toEqual({ state: 'admitted' })
+    expect(h.settled).not.toHaveBeenCalled()
+    h.connection.receive({ type: 'agent_start' })
+    expect(h.settled).toHaveBeenCalledWith({
+      sessionId,
+      clientMessageId: 'send-1',
+      fence: 7,
+      outcome: {
+        state: 'accepted',
+        providerIdentity: { provider: 'orca', clientMessageId: 'send-1' }
+      }
+    })
+    expect(h.connection.sent[0]).toMatchObject({ type: 'prompt', message: 'hello' })
+  })
+
+  it('rejects stale fences and a Stop for a different turn before sending abort', async () => {
+    const h = await setup()
+    await expect(
+      h.adapter.dispatch({
+        sessionId,
+        fence: 6,
+        clientMessageId: 'stale',
+        body: { kind: 'message', role: 'user', blocks: [{ type: 'text', text: 'x' }] }
+      })
+    ).rejects.toThrow('not live under this fence')
+    await h.adapter.dispatch({
+      sessionId,
+      fence: 7,
+      clientMessageId: 'send-1',
+      body: { kind: 'message', role: 'user', blocks: [{ type: 'text', text: 'x' }] }
+    })
+    h.connection.receive({ type: 'agent_start' })
+    expect(
+      await h.adapter.cancelTurn({
+        sessionId,
+        fence: 7,
+        turnId: 'other',
+        resolveLiveTurnId: () => h.rig.assembler.openTurnId
+      })
+    ).toEqual({ cancelled: false })
+    expect(h.connection.requests).not.toContain('abort')
+    expect((await h.adapter.cancelTurn({ sessionId, fence: 7 })).cancelled).toBe(true)
+    expect(h.connection.requests).toContain('abort')
+    expect(await h.adapter.closeSession(sessionId)).toBe(true)
+    expect(h.connection.closed).toBe(true)
+  })
+
+  it('keeps a pending manual compaction cancellable and reports root/tree proof honestly', async () => {
+    const h = await setup()
+    const turnId = 'manual-compact'
+    const command = {
+      clientMessageId: 'compact-1',
+      turnId,
+      identity: { provider: 'orca' as const, clientMessageId: 'compact-1' },
+      resultIdentity: { provider: 'orca' as const, clientMessageId: 'compact-result' },
+      running: { kind: 'turn' as const, turnId, state: 'running' as const }
+    }
+    let release: (() => void) | undefined
+    h.connection.requestOverride = (name) =>
+      name === 'compact'
+        ? new Promise<void>((resolve) => {
+            release = resolve
+          })
+        : undefined
+    const compact = h.adapter.compact({ sessionId, fence: 7, command })
+    expect((await h.adapter.cancelTurn({ sessionId, fence: 7 })).cancelled).toBe(true)
+    expect(h.connection.requests).toContain('abort')
+    release?.()
+    await compact
+    h.connection.closeResult = { root: 'exited', tree: 'unverifiable' }
+    await expect(h.adapter.closeSession(sessionId)).rejects.toBeInstanceOf(
+      AgentSessionAcquisitionRootExitObservedError
+    )
+  })
+
+  it('ends the host command row under its original identity after a no-op compaction', async () => {
+    const h = await setup()
+    const command = {
+      clientMessageId: 'compact-1',
+      turnId: 'manual-compact',
+      identity: { provider: 'orca' as const, clientMessageId: 'compact-turn' },
+      resultIdentity: { provider: 'orca' as const, clientMessageId: 'compact-result' },
+      running: { kind: 'turn' as const, turnId: 'manual-compact', state: 'running' as const }
+    }
+    h.rig.journal.appendItem(command.identity, agentJournalTurnBody(command.running), {
+      fence: 1,
+      turnScope: { kind: 'thread' }
+    })
+    h.connection.requestOverride = (name) =>
+      name === 'compact'
+        ? Promise.reject(new JsonlRpcResponseError(name, 'Nothing to compact (session too small)'))
+        : undefined
+    expect(await h.adapter.compact({ sessionId, fence: 7, command })).toEqual({
+      state: 'accepted',
+      providerIdentity: null
+    })
+    await Promise.resolve()
+    await Promise.resolve()
+    expect(
+      (await h.rig.rows()).find((row) => row.itemId === agentJournalItemKey(command.identity))?.body
+    ).toMatchObject({ kind: 'turn', state: 'completed', outcome: 'success' })
+    expect(
+      (await h.rig.rows()).some((row) => row.body.kind === 'status' && row.body.tone === 'warning')
+    ).toBe(true)
+  })
+
+  it('answers a live dialog once after commit and does not claim it after dismissal', async () => {
+    const h = await setup()
+    h.connection.receive({
+      type: 'extension_ui_request',
+      id: 'input-1',
+      method: 'editor',
+      title: 'Edit',
+      prefill: 'draft'
+    })
+    const row = (await h.rig.rows()).find((item) => item.body.kind === 'question')
+    expect(row?.body).toMatchObject({
+      kind: 'question',
+      freeTextInput: { allowEmpty: true, initialValue: 'draft' }
+    })
+    if (!row) {
+      throw new Error('dialog row missing')
+    }
+    let release: (() => void) | undefined
+    const commit = vi.fn(
+      () =>
+        new Promise<void>((resolve) => {
+          release = resolve
+        })
+    )
+    const response = {
+      kind: 'answers' as const,
+      answers: [{ questionId: 'input-1', optionIds: [], other: '' }]
+    }
+    const first = h.adapter.answerPrompt({
+      sessionId,
+      fence: 7,
+      itemId: row.itemId,
+      kind: 'question',
+      response,
+      commit
+    })
+    await expect(
+      h.adapter.answerPrompt({
+        sessionId,
+        fence: 7,
+        itemId: row.itemId,
+        kind: 'question',
+        response,
+        commit: vi.fn()
+      })
+    ).rejects.toThrow('no longer waiting')
+    release?.()
+    await first
+    expect(commit).toHaveBeenCalledTimes(1)
+    expect(h.connection.sent).toContainEqual({
+      type: 'extension_ui_response',
+      id: 'input-1',
+      value: ''
+    })
+    await expect(
+      h.adapter.dismissPrompt({
+        sessionId,
+        fence: 7,
+        itemId: row.itemId,
+        answer: true,
+        commit: vi.fn()
+      })
+    ).rejects.toThrow('no longer waiting')
+  })
+
+  it('releases a failed dialog commit for a later dismissal, with one provider reply', async () => {
+    const h = await setup()
+    h.connection.receive({
+      type: 'extension_ui_request',
+      id: 2,
+      method: 'confirm',
+      title: 'Continue?'
+    })
+    const row = (await h.rig.rows()).find((item) => item.body.kind === 'approval')
+    if (!row) {
+      throw new Error('approval row missing')
+    }
+    await expect(
+      h.adapter.answerPrompt({
+        sessionId,
+        fence: 7,
+        itemId: row.itemId,
+        kind: 'approval',
+        response: { kind: 'option', optionId: 'yes' },
+        commit: async () => {
+          throw new Error('CAS lost')
+        }
+      })
+    ).rejects.toThrow('CAS lost')
+    expect(h.connection.sent).toEqual([])
+    let release: (() => void) | undefined
+    const dismiss = h.adapter.dismissPrompt({
+      sessionId,
+      fence: 7,
+      itemId: row.itemId,
+      answer: true,
+      commit: () =>
+        new Promise<void>((resolve) => {
+          release = resolve
+        })
+    })
+    await expect(
+      h.adapter.answerPrompt({
+        sessionId,
+        fence: 7,
+        itemId: row.itemId,
+        kind: 'approval',
+        response: { kind: 'option', optionId: 'no' },
+        commit: vi.fn()
+      })
+    ).rejects.toThrow('no longer waiting')
+    release?.()
+    await dismiss
+    expect(h.connection.sent).toEqual([{ type: 'extension_ui_response', id: 2, cancelled: true }])
+  })
+
+  it('reports unexpected child exit once and preserves an unproven root on close', async () => {
+    const h = await setup()
+    h.connection.exit(new Error('provider died'))
+    await h.adapter.drainObservedExits()
+    h.connection.exit(new Error('duplicate exit'))
+    await h.adapter.drainObservedExits()
+    expect(h.lifecycle).toHaveBeenCalledTimes(1)
+    expect(h.lifecycle).toHaveBeenCalledWith(
+      expect.objectContaining({
+        type: 'ended',
+        sessionId,
+        fence: 7,
+        acquisitionGeneration: h.acquired.acquisitionGeneration,
+        cause: 'unexpected-exit',
+        reason: 'provider died'
+      })
+    )
+
+    const other = await setup()
+    other.connection.closeResult = { root: 'unverifiable', tree: null }
+    expect(await other.adapter.closeSession(sessionId)).toBe(false)
+  })
+})
diff --git a/src/main/pi/rpc-session-adapter.ts b/src/main/pi/rpc-session-adapter.ts
new file mode 100644
index 000000000000..c746d15b2ebd
--- /dev/null
+++ b/src/main/pi/rpc-session-adapter.ts
@@ -0,0 +1,287 @@
+import { randomUUID } from 'node:crypto'
+import { waitForPromiseWithSignal } from '../../shared/abort-signal-reason'
+import { agentSessionFailureFact } from '../../shared/agent-session-failure'
+import { agentSessionFailureWords } from '../../shared/agent-session-failure-words'
+import {
+  AgentSessionPreSpawnError,
+  AgentSessionAcquisitionRootExitObservedError,
+  AgentSessionAcquisitionExitUnprovenError,
+  AgentSessionAcquisitionExitProvenError,
+  type AgentSessionAcquisition,
+  type StructuredAgentSessionAcquireInput,
+  type StructuredAgentSessionAdapter
+} from '../native-chat/agent-session-wire/structured-agent-session-adapter'
+import { providerSpawnedProcessIdentity } from '../provider-process/provider-spawned-process-identity'
+import { ProviderAcquisitionStarts } from '../provider-process/provider-acquisition-starts'
+import { compactPiRpcSession } from './rpc-compaction'
+import { buildPiRpcLaunch } from './rpc-launch'
+import { piRpcProviderLink, type PiRpcResolvedLaunch } from './rpc-launch-resolution'
+import { PiRpcSession, type PiRpcSessionDeps, type PiRpcConnection } from './rpc-session'
+import { PiRpcPromptError, preparePiRpcPrompt } from './rpc-prompt'
+import { applyPiRpcSessionOption, readPiRpcSessionOptions } from './rpc-options'
+import { supportsSupervisedProviderChildLocation } from '../provider-process/supervised-provider-child-location'
+import { ClaudeDispatchContentError } from '../claude/claude-structured-dispatch-content'
+
+export type PiRpcSessionAdapterDeps = PiRpcSessionDeps & {
+  resolveLaunch: (
+    identity: StructuredAgentSessionAcquireInput['identity']
+  ) => Promise<PiRpcResolvedLaunch>
+  readProcessStartTime?: (pid: number) => Promise<number | null>
+}
+
+export class PiRpcSessionAdapter implements StructuredAgentSessionAdapter {
+  private readonly sessions = new Map<string, PiRpcSession>()
+  private readonly acquiring = new Set<string>()
+  private readonly starts = new ProviderAcquisitionStarts<PiRpcConnection>()
+  private readonly retiring = new Set<Promise<void>>()
+  constructor(private readonly deps: PiRpcSessionAdapterDeps) {}
+
+  supportsLocation = supportsSupervisedProviderChildLocation
+  supportsCreate: NonNullable<StructuredAgentSessionAdapter['supportsCreate']> = (
+    location,
+    agent
+  ) => agent === 'pi' && this.supportsLocation(location)
+
+  async acquire(input: StructuredAgentSessionAcquireInput): Promise<AgentSessionAcquisition> {
+    const id = input.identity.sessionId
+    if (this.acquiring.has(id)) {
+      throw new AgentSessionPreSpawnError(new Error('Pi session already owns a child'))
+    }
+    this.acquiring.add(id)
+    const attempt = this.starts.begin(input.signal)
+    let session: PiRpcSession | undefined
+    try {
+      if (attempt.signal.aborted) {
+        throw new AgentSessionPreSpawnError(new Error('Pi closed while starting'))
+      }
+      if (!(await this.starts.stopFailed(id))) {
+        throw new AgentSessionAcquisitionExitUnprovenError(
+          new Error('Previous Pi start has not exited')
+        )
+      }
+      const previous = this.sessions.get(id)
+      if (previous?.connection.closed && previous.connection.rootVerdict === 'exited') {
+        this.acknowledgeSessionRelease(id)
+      } else if (previous) {
+        throw new AgentSessionPreSpawnError(new Error('Pi session already owns a child'))
+      }
+      let launch: PiRpcResolvedLaunch
+      try {
+        launch = await waitForPromiseWithSignal(
+          this.deps.resolveLaunch(input.identity),
+          attempt.signal
+        )
+      } catch (error) {
+        throw new AgentSessionPreSpawnError(error)
+      }
+      if (attempt.signal.aborted) {
+        throw new AgentSessionPreSpawnError(new Error('Pi closed while starting'))
+      }
+      const spec = buildPiRpcLaunch({
+        ...launch,
+        structuredSession: { id, spawnToken: input.spawnToken }
+      })
+      session = new PiRpcSession(input, randomUUID(), spec, this.deps)
+      this.sessions.set(id, session)
+      this.starts.track(attempt, session.connection)
+      const spawned = providerSpawnedProcessIdentity(
+        input,
+        'Pi RPC',
+        this.deps.readProcessStartTime
+      )
+      if (session.connection.pid !== undefined) {
+        await spawned.onSpawned(session.connection.pid)
+      }
+      const process = await spawned.read(session.connection.pid)
+      const file = await waitForPromiseWithSignal(session.start(), attempt.signal)
+      if (session.connection.closed || attempt.signal.aborted) {
+        throw new Error('Pi exited while starting')
+      }
+      return {
+        process,
+        acquisitionGeneration: session.generation,
+        link: piRpcProviderLink(launch, file, input.fence, randomUUID(), Date.now())
+      }
+    } catch (error) {
+      if (!session) {
+        throw error instanceof AgentSessionPreSpawnError ||
+          error instanceof AgentSessionAcquisitionExitUnprovenError
+          ? error
+          : new AgentSessionPreSpawnError(error)
+      }
+      const result = await session.close(false).catch(() => null)
+      if (result?.root === 'exited') {
+        if (session.connection.processless) {
+          throw new AgentSessionAcquisitionExitProvenError(error)
+        }
+        throw new AgentSessionAcquisitionRootExitObservedError(error)
+      }
+      this.starts.retainFailed(id, session.connection)
+      throw new AgentSessionAcquisitionExitUnprovenError(error)
+    } finally {
+      this.starts.end(attempt)
+      this.acquiring.delete(id)
+    }
+  }
+
+  dispatch: StructuredAgentSessionAdapter['dispatch'] = async (input) => {
+    const session = this.session(input.sessionId, input.fence)
+    let prompt
+    try {
+      prompt = await preparePiRpcPrompt(input.body)
+    } catch (error) {
+      this.deps.logger.warn('Pi prompt could not be prepared', {
+        scope: 'pi-prompt',
+        sessionId: input.sessionId,
+        error
+      })
+      return {
+        state: 'rejected',
+        ...agentSessionFailureWords(
+          error instanceof PiRpcPromptError || error instanceof ClaudeDispatchContentError
+            ? error.failure
+            : agentSessionFailureFact('attachmentUnreadable'),
+          { agentName: 'Pi', surface: 'rejection' }
+        )
+      }
+    }
+    return session.turns.submit(
+      input.clientMessageId,
+      input.requestedAt ?? Date.now(),
+      { ...prompt },
+      input.beforeDispatch
+    )
+  }
+
+  compact: NonNullable<StructuredAgentSessionAdapter['compact']> = async (input) =>
+    compactPiRpcSession(this.session(input.sessionId, input.fence), input.command)
+
+  cancelTurn: StructuredAgentSessionAdapter['cancelTurn'] = async (input) => {
+    const session = this.session(input.sessionId, input.fence)
+    const turnId = input.resolveLiveTurnId ? input.resolveLiveTurnId() : session.lane.openTurnId
+    if (input.turnId !== undefined && input.turnId !== turnId) {
+      return { cancelled: false }
+    }
+    if (!turnId && !session.turns.holdsDispatch) {
+      return { cancelled: false }
+    }
+    session.turns.stop()
+    session.dialogs.cancelAll()
+    await session.connection.request('abort', {}, { timeoutMs: 2_000 })
+    return { cancelled: true, ...(turnId ? { turnId } : {}) }
+  }
+  stopEndsSession(): boolean {
+    return true
+  }
+  awaitStoppedRequestEnd: NonNullable<StructuredAgentSessionAdapter['awaitStoppedRequestEnd']> =
+    async (id, at) => {
+      const session = this.sessions.get(id)
+      const turn = session?.lane.openTurnId
+      if (!session) {
+        return
+      }
+      let timer: ReturnType<typeof setTimeout> | undefined
+      try {
+        if (turn) {
+          await Promise.race([
+            session.lane.whenTurnLeaves(turn),
+            new Promise<void>((resolve) => {
+              timer = setTimeout(resolve, Math.max(0, at + 2_000 - Date.now()))
+              timer.unref()
+            })
+          ])
+        }
+      } finally {
+        clearTimeout(timer)
+      }
+      try {
+        await session.connection.request('get_state', {}, { timeoutMs: 1_000 })
+      } catch (error) {
+        this.deps.logger.warn('Pi checkpoint could not be read before stopping', {
+          scope: 'pi-stop-checkpoint',
+          sessionId: id,
+          error
+        })
+      }
+    }
+  routePromptCancel(): { kind: 'dismiss' } {
+    return { kind: 'dismiss' }
+  }
+  dismissPrompt: NonNullable<StructuredAgentSessionAdapter['dismissPrompt']> = (input) =>
+    this.session(input.sessionId, input.fence).dialogs.respond(
+      input.itemId,
+      null,
+      input.commit,
+      input.answer
+    )
+  answerPrompt: StructuredAgentSessionAdapter['answerPrompt'] = (input) =>
+    this.session(input.sessionId, input.fence).dialogs.respond(
+      input.itemId,
+      input.response,
+      input.commit
+    )
+  setOption: StructuredAgentSessionAdapter['setOption'] = (input) => {
+    const session = this.session(input.sessionId, input.fence)
+    return applyPiRpcSessionOption(session.connection, session.selected, input.key, input.value)
+  }
+  readOptions: NonNullable<StructuredAgentSessionAdapter['readOptions']> = (input) =>
+    readPiRpcSessionOptions(this.session(input.sessionId, input.fence).connection)
+  readCommands = (id: string) => this.sessions.get(id)?.commands
+  readOptionRestoreFailures(id: string): readonly string[] {
+    return this.sessions.get(id)?.skipped ?? []
+  }
+  holdsDispatch(id: string): boolean {
+    return this.sessions.get(id)?.turns.holdsDispatch ?? false
+  }
+
+  async closeSession(id: string, requested = true): Promise<boolean> {
+    const session = this.sessions.get(id)
+    if (!session) {
+      return true
+    }
+    const result = await session.close(requested)
+    if (result.root !== 'exited') {
+      return false
+    }
+    if (result.tree !== 'exited') {
+      throw new AgentSessionAcquisitionRootExitObservedError(new Error('Pi root exit observed'))
+    }
+    return true
+  }
+  releaseAcquisition(input: { sessionId: string }): Promise<boolean> {
+    return this.closeSession(input.sessionId)
+  }
+  forceCloseSession(id: string): Promise<boolean> {
+    this.sessions.get(id)?.fail(new Error('Pi event sink failed'))
+    return this.closeSession(id, false)
+  }
+  disposeSession(id: string): Promise<boolean> {
+    return this.closeSession(id)
+  }
+  acknowledgeSessionRelease(id: string): void {
+    const session = this.sessions.get(id)
+    if (!session?.connection.closed || session.connection.rootVerdict !== 'exited') {
+      return
+    }
+    this.sessions.delete(id)
+    const retirement = session.retire()
+    this.retiring.add(retirement)
+    void retirement.then(() => this.retiring.delete(retirement))
+  }
+  async closeAll(): Promise<void> {
+    await Promise.all([...this.sessions.keys()].map((id) => this.closeSession(id)))
+  }
+  async drainObservedExits(): Promise<void> {
+    await Promise.all([
+      ...this.retiring,
+      ...[...this.sessions.values()].map((session) => session.drainObservedExit())
+    ])
+  }
+  private session(id: string, fence: number): PiRpcSession {
+    const session = this.sessions.get(id)
+    if (!session || session.input.fence !== fence || session.connection.closed) {
+      throw new Error('Pi session is not live under this fence')
+    }
+    return session
+  }
+}
diff --git a/src/main/pi/rpc-session.ts b/src/main/pi/rpc-session.ts
new file mode 100644
index 000000000000..7796ae3a1024
--- /dev/null
+++ b/src/main/pi/rpc-session.ts
@@ -0,0 +1,273 @@
+import type {
+  AgentSessionOptionsResult,
+  AgentSessionSlashCommand
+} from '../../shared/agent-session-wire'
+import type {
+  StructuredAgentSessionAcquireInput,
+  StructuredAgentSessionLifecycleEvent,
+  AgentSessionDispatchOutcome
+} from '../native-chat/agent-session-wire/structured-agent-session-adapter'
+import type { StructuredAgentSessionLogger } from '../native-chat/agent-session-wire/structured-agent-session-logger'
+import { providerTimelineSink } from '../native-chat/agent-session-timeline/provider-timeline-plan'
+import { JsonlRpcTimelineLane } from '../jsonl-rpc/timeline-lane'
+import {
+  JsonlRpcAgentConnection,
+  type JsonlRpcAgentConnectionOptions
+} from '../jsonl-rpc/agent-connection'
+import type { ProviderProcessLaunch } from '../provider-process/provider-process-launch'
+import { PiRpcTurns } from './rpc-turns'
+import { PiRpcDialogCallbacks } from './rpc-dialog-callbacks'
+import { piRpcStateSchema } from './rpc-protocol'
+import { applyPiRpcSessionOption, readPiRpcCommands, readPiRpcSessionOptions } from './rpc-options'
+
+export type PiRpcConnection = Pick<
+  JsonlRpcAgentConnection,
+  | 'request'
+  | 'send'
+  | 'close'
+  | 'pauseReading'
+  | 'resumeReading'
+  | 'pid'
+  | 'closed'
+  | 'rootVerdict'
+  | 'processless'
+  | 'lastCloseResult'
+  | 'onExit'
+>
+export type PiRpcSessionDeps = {
+  openConnection?: (
+    launch: ProviderProcessLaunch,
+    handlers: JsonlRpcAgentConnectionOptions
+  ) => PiRpcConnection
+  onLifecycle: (event: StructuredAgentSessionLifecycleEvent) => void
+  onSettled: (input: {
+    sessionId: string
+    clientMessageId: string
+    fence: number
+    outcome: AgentSessionDispatchOutcome
+  }) => void
+  onIdle: (input: { sessionId: string }) => void
+  logger: StructuredAgentSessionLogger
+}
+
+/** One child owns its transport, dialect, dialogs and timeline, including shutdown retries. */
+export class PiRpcSession {
+  readonly connection: PiRpcConnection
+  readonly lane: JsonlRpcTimelineLane
+  readonly turns: PiRpcTurns
+  readonly dialogs: PiRpcDialogCallbacks
+  readonly selected = new Map<string, string>()
+  readonly skipped: string[] = []
+  commands?: AgentSessionSlashCommand[]
+  options?: AgentSessionOptionsResult
+  requestedClose = false
+  private publishedExit = false
+  private failedCause?: Error
+  private exitDelivery: Promise<void> = Promise.resolve()
+  private releaseAfterExit?: () => void
+
+  constructor(
+    readonly input: StructuredAgentSessionAcquireInput,
+    readonly generation: string,
+    launch: ProviderProcessLaunch,
+    private readonly deps: PiRpcSessionDeps
+  ) {
+    const sink = input.events && providerTimelineSink(input.events)
+    if (!sink) {
+      throw new Error('Pi structured chat requires the shared timeline sink')
+    }
+    this.lane = new JsonlRpcTimelineLane({
+      sink,
+      sessionId: input.identity.sessionId,
+      agent: 'pi',
+      generation,
+      namespace: input.identity.sessionId,
+      pauseReading: () => this.connection?.pauseReading(),
+      resumeReading: () => this.connection?.resumeReading(),
+      onFailed: (reason) => this.fail(new Error(reason)),
+      onInputAccepted: (clientMessageId) =>
+        this.settle(clientMessageId, {
+          state: 'accepted',
+          providerIdentity: { provider: 'orca', clientMessageId }
+        })
+    })
+    this.turns = new PiRpcTurns({
+      lane: this.lane,
+      generation,
+      send: (frame) => this.connection.send(frame),
+      request: (command, params, options) => this.connection.request(command, params, options),
+      settled: (id, outcome) => this.settle(id, outcome),
+      idle: () => {
+        this.dialogs.cancelAll()
+        deps.onIdle({ sessionId: input.identity.sessionId })
+      },
+      failed: (error) => this.fail(error),
+      diagnostic: (error) =>
+        deps.logger.warn('Pi context usage could not be read', {
+          scope: 'pi-context-usage',
+          sessionId: input.identity.sessionId,
+          error
+        })
+    })
+    this.dialogs = new PiRpcDialogCallbacks(
+      this.lane,
+      (frame) => this.connection.send(frame),
+      (error) => this.fail(error)
+    )
+    this.connection = (
+      deps.openConnection ?? ((spec, handlers) => new JsonlRpcAgentConnection(spec, handlers))
+    )(launch, {
+      onRecord: (frame) =>
+        frame.type === 'extension_ui_request'
+          ? this.dialogs.receive(frame)
+          : this.turns.receive(frame),
+      onClose: (error) => this.fail(error),
+      onDiagnostic: (message) =>
+        deps.logger.warn(message, { scope: 'pi-rpc', sessionId: input.identity.sessionId }),
+      onExit: (error) => {
+        this.exitDelivery = this.exit(error)
+          .catch((cause: unknown) =>
+            deps.logger.error('Pi exit publication failed', {
+              scope: 'pi-exit',
+              sessionId: input.identity.sessionId,
+              error: cause
+            })
+          )
+          .finally(() => this.releaseAfterExit?.())
+      }
+    })
+  }
+
+  async start(): Promise<string> {
+    const state = piRpcStateSchema.parse(await this.connection.request('get_state'))
+    this.lane.apply(this.turns.context.setModel(state.model ?? undefined, Date.now()))
+    for (const [key, value] of Object.entries(this.input.options ?? {})) {
+      if (!['model', 'effort'].includes(key)) {
+        this.skipped.push(key)
+        continue
+      }
+      try {
+        await applyPiRpcSessionOption(this.connection, this.selected, key, value)
+      } catch (error) {
+        this.skipped.push(key)
+        this.deps.logger.warn('Pi rejected a saved option', {
+          scope: 'pi-option-restore',
+          sessionId: this.input.identity.sessionId,
+          key,
+          error
+        })
+      }
+    }
+    this.options = await readPiRpcSessionOptions(this.connection)
+    try {
+      this.commands = (await readPiRpcCommands(this.connection)).commands
+    } catch (error) {
+      this.deps.logger.warn('Pi commands could not be read', {
+        scope: 'pi-commands',
+        sessionId: this.input.identity.sessionId,
+        error
+      })
+    }
+    return state.sessionFile
+  }
+
+  async close(requested = true): ReturnType<PiRpcConnection['close']> {
+    this.requestedClose ||= requested
+    this.dialogs.cancelAll()
+    return this.connection.close()
+  }
+
+  fail(error: Error): void {
+    this.failedCause ??= error
+    this.deps.logger.error('Pi RPC session failed', {
+      scope: 'pi-rpc',
+      sessionId: this.input.identity.sessionId,
+      error
+    })
+    void this.close(false)
+      .then((result) => {
+        if (result.root !== 'exited') {
+          this.deps.logger.warn('Pi process exit is unverifiable', {
+            scope: 'pi-stop',
+            sessionId: this.input.identity.sessionId
+          })
+        }
+      })
+      .catch((cause: unknown) =>
+        this.deps.logger.error('Pi process cleanup failed', {
+          scope: 'pi-stop',
+          sessionId: this.input.identity.sessionId,
+          error: cause
+        })
+      )
+  }
+
+  drainObservedExit(): Promise<void> {
+    return this.exitDelivery
+  }
+
+  retire(): Promise<void> {
+    return new Promise((resolve) => {
+      this.releaseAfterExit = () => {
+        this.releaseAfterExit = undefined
+        void this.lane.drained().then(() => {
+          this.lane.dispose()
+          resolve()
+        })
+      }
+      if (this.publishedExit) {
+        void this.exitDelivery.then(() => this.releaseAfterExit?.())
+      }
+    })
+  }
+
+  private async exit(error: Error): Promise<void> {
+    if (this.publishedExit) {
+      return
+    }
+    this.publishedExit = true
+    this.dialogs.cancelAll()
+    this.turns.end()
+    this.lane.finalize()
+    this.lane.apply([
+      { type: 'session.ended', verdict: { state: 'interrupted', completedAt: Date.now() } }
+    ])
+    this.lane.flush()
+    let timer: ReturnType<typeof setTimeout> | undefined
+    try {
+      await Promise.race([
+        this.lane.drained(),
+        new Promise<void>((resolve) => {
+          timer = setTimeout(() => {
+            this.deps.logger.warn('Pi final timeline did not drain before exit publication', {
+              scope: 'pi-exit-drain',
+              sessionId: this.input.identity.sessionId
+            })
+            resolve()
+          }, 2_000)
+          timer.unref()
+        })
+      ])
+    } finally {
+      clearTimeout(timer)
+    }
+    this.deps.onLifecycle({
+      type: 'ended',
+      sessionId: this.input.identity.sessionId,
+      fence: this.input.fence,
+      acquisitionGeneration: this.generation,
+      observedAt: Date.now(),
+      cause: this.requestedClose ? 'requested-close' : 'unexpected-exit',
+      reason: (this.failedCause ?? error).message
+    })
+  }
+
+  private settle(clientMessageId: string, outcome: AgentSessionDispatchOutcome): void {
+    this.deps.onSettled({
+      sessionId: this.input.identity.sessionId,
+      clientMessageId,
+      fence: this.input.fence,
+      outcome
+    })
+  }
+}
diff --git a/src/main/pi/rpc-turn-races.test.ts b/src/main/pi/rpc-turn-races.test.ts
new file mode 100644
index 000000000000..9a17d1d6e17c
--- /dev/null
+++ b/src/main/pi/rpc-turn-races.test.ts
@@ -0,0 +1,245 @@
+import { afterEach, describe, expect, it, vi } from 'vitest'
+import { JsonlRpcTimelineLane } from '../jsonl-rpc/timeline-lane'
+import {
+  closeProviderTimelineRigs,
+  openProviderTimelineRig
+} from '../native-chat/agent-session-timeline/provider-timeline-assembler-test-support'
+import { PiRpcTurns } from './rpc-turns'
+import { PiRpcPromptDelivery } from './rpc-prompt-delivery'
+
+const state = (overrides: Record<string, unknown> = {}) => ({
+  sessionFile: '/host/session.jsonl',
+  isStreaming: false,
+  isCompacting: false,
+  pendingMessageCount: 0,
+  ...overrides
+})
+const pending: (() => void)[] = []
+afterEach(async () => {
+  pending.splice(0).forEach((end) => end())
+  await closeProviderTimelineRigs()
+  vi.useRealTimers()
+})
+
+async function setup(request = vi.fn(async (_command: string): Promise<unknown> => state())) {
+  const rig = await openProviderTimelineRig({ agent: 'pi', sessionId: 'session-timeline' })
+  const accepted = vi.fn(),
+    failed = vi.fn(),
+    idle = vi.fn(),
+    settled = vi.fn()
+  const lane = new JsonlRpcTimelineLane({
+    sink: rig.sink,
+    sessionId: 'session-timeline',
+    agent: 'pi',
+    generation: 'generation-1',
+    namespace: 'session-timeline',
+    pauseReading: vi.fn(),
+    resumeReading: vi.fn(),
+    onInputAccepted: accepted,
+    onFailed: failed
+  })
+  const send = vi.fn(async (_frame: Record<string, unknown>) => {})
+  const turns = new PiRpcTurns({
+    lane,
+    generation: 'generation-1',
+    send,
+    request,
+    settled,
+    failed,
+    idle
+  })
+  pending.push(() => {
+    turns.end()
+    lane.dispose()
+  })
+  const start = async () => {
+    await turns.submit('send-1', 100, { type: 'prompt', message: 'hello' })
+    turns.receive({ type: 'agent_start' })
+  }
+  const flush = async () => {
+    await Promise.resolve()
+    await Promise.resolve()
+    lane.flush()
+  }
+  return { rig, lane, turns, request, accepted, failed, idle, settled, start, flush, send }
+}
+
+describe('Pi turn settlement races', () => {
+  it('chooses steering after asynchronous dispatch admission finishes', async () => {
+    const h = await setup()
+    await h.turns.submit('first', 1, { type: 'prompt', message: 'first' })
+    const gate = Promise.withResolvers<void>()
+    const second = h.turns.submit(
+      'second',
+      2,
+      { type: 'prompt', message: 'second', streamingBehavior: 'followUp' },
+      () => gate.promise
+    )
+    h.turns.receive({ type: 'agent_start' })
+    gate.resolve()
+    await second
+    expect(h.send.mock.calls[1]?.[0]).toMatchObject({
+      message: 'second',
+      streamingBehavior: 'steer'
+    })
+  })
+  it('waits for agent_settled and a host idle probe after agent_end', async () => {
+    const h = await setup()
+    await h.start()
+    h.turns.receive({ type: 'agent_end' })
+    await h.flush()
+    expect(h.request).not.toHaveBeenCalled()
+    expect(h.idle).not.toHaveBeenCalled()
+    expect(await h.rig.turns()).toHaveLength(1)
+    expect((await h.rig.turns())[0]?.state).toBe('running')
+    h.turns.receive({ type: 'agent_settled' })
+    await h.flush()
+    expect(h.request).toHaveBeenCalledWith('get_state')
+    expect((await h.rig.turns())[0]?.outcome).toBe('success')
+    expect(h.idle).toHaveBeenCalledTimes(1)
+  })
+
+  it('invalidates an old idle probe when detached compaction starts after settlement', async () => {
+    let release: ((value: unknown) => void) | undefined
+    const request = vi.fn(
+      (_command: string) =>
+        new Promise<unknown>((resolve) => {
+          release = resolve
+        })
+    )
+    const h = await setup(request)
+    await h.start()
+    h.turns.receive({ type: 'agent_settled' })
+    await Promise.resolve()
+    expect(request).toHaveBeenCalledTimes(1)
+    h.turns.receive({ type: 'auto_compaction_start' })
+    release?.(state())
+    await h.flush()
+    expect(h.idle).not.toHaveBeenCalled()
+    expect((await h.rig.turns())[0]?.state).toBe('running')
+    h.turns.receive({ type: 'auto_compaction_end' })
+    await Promise.resolve()
+    expect(request.mock.calls.filter(([command]) => command === 'get_state')).toHaveLength(2)
+    release?.(state())
+    await h.flush()
+    expect((await h.rig.turns())[0]?.outcome).toBe('success')
+  })
+
+  it('keeps a busy generation open and rejects a probe made stale by new activity', async () => {
+    let release: ((value: unknown) => void) | undefined
+    const request = vi.fn(
+      (_command: string) =>
+        new Promise<unknown>((resolve) => {
+          release = resolve
+        })
+    )
+    const h = await setup(request)
+    await h.start()
+    h.turns.receive({ type: 'agent_settled' })
+    await Promise.resolve()
+    release?.(state({ isStreaming: true }))
+    await h.flush()
+    expect(h.idle).not.toHaveBeenCalled()
+    h.turns.receive({ type: 'agent_settled' })
+    await Promise.resolve()
+    h.turns.receive({ type: 'message_update', message: { role: 'assistant', content: [] } })
+    release?.(state())
+    await h.flush()
+    expect(h.idle).not.toHaveBeenCalled()
+    h.turns.receive({ type: 'agent_settled' })
+    await Promise.resolve()
+    release?.(state())
+    await h.flush()
+    expect((await h.rig.turns())[0]?.outcome).toBe('success')
+  })
+
+  it('settles a provider-handled local command without agent events', async () => {
+    const h = await setup()
+    await h.turns.submit('local-command', 100, { type: 'prompt', message: '/help' })
+    h.turns.receive({
+      type: 'response',
+      command: 'prompt',
+      success: true,
+      data: { disposition: 'handled', agentInvoked: false }
+    })
+    await h.flush()
+    expect(h.accepted).toHaveBeenCalledWith('local-command')
+    expect((await h.rig.turns())[0]?.outcome).toBe('success')
+    expect(h.idle).toHaveBeenCalledTimes(1)
+  })
+
+  it('keeps exhausted auto retry as failure, while successful retry clears it', async () => {
+    for (const succeeded of [false, true]) {
+      const h = await setup()
+      await h.start()
+      h.turns.receive({
+        type: 'message_end',
+        message: {
+          role: 'assistant',
+          content: [],
+          stopReason: 'error',
+          errorMessage: 'provider failed'
+        }
+      })
+      h.turns.receive({ type: 'auto_retry_start' })
+      h.turns.receive({ type: 'auto_retry_end', success: succeeded })
+      if (succeeded) {
+        h.turns.receive({
+          type: 'message_end',
+          message: { role: 'assistant', content: [], stopReason: 'stop' }
+        })
+      }
+      h.turns.receive({ type: 'agent_settled' })
+      await h.flush()
+      expect((await h.rig.turns())[0]?.outcome).toBe(succeeded ? 'success' : 'failure')
+    }
+  })
+})
+
+describe('Pi prompt acknowledgement retries', () => {
+  it('retries only the exact transient auth prefix eight times at 250 ms', async () => {
+    vi.useFakeTimers()
+    const send = vi.fn(async () => {})
+    const settled = vi.fn()
+    const delivery = new PiRpcPromptDelivery({
+      send,
+      settled,
+      accepted: vi.fn(),
+      commandOnly: vi.fn(),
+      rejectedAfterAcceptance: vi.fn(),
+      failed: vi.fn()
+    })
+    await delivery.submit('send-1', 100, { type: 'prompt', message: 'hello' })
+    for (let attempt = 0; attempt < 8; attempt++) {
+      delivery.reply({
+        type: 'response',
+        command: 'prompt',
+        success: false,
+        error: 'No API key found for provider'
+      })
+      await vi.advanceTimersByTimeAsync(249)
+      expect(send).toHaveBeenCalledTimes(attempt + 1)
+      await vi.advanceTimersByTimeAsync(1)
+      expect(send).toHaveBeenCalledTimes(attempt + 2)
+    }
+    delivery.reply({
+      type: 'response',
+      command: 'prompt',
+      success: false,
+      error: 'No API key found for provider'
+    })
+    await vi.advanceTimersByTimeAsync(250)
+    expect(send).toHaveBeenCalledTimes(9)
+    expect(settled).toHaveBeenCalledWith('send-1', expect.objectContaining({ state: 'rejected' }))
+    await delivery.submit('send-2', 101, { type: 'prompt', message: 'again' })
+    delivery.reply({
+      type: 'response',
+      command: 'prompt',
+      success: false,
+      error: 'No API key found elsewhere'
+    })
+    await vi.advanceTimersByTimeAsync(250)
+    expect(send).toHaveBeenCalledTimes(10)
+    delivery.end()
+  })
+})
diff --git a/src/main/pi/rpc-turns.ts b/src/main/pi/rpc-turns.ts
new file mode 100644
index 000000000000..3bb0ff959d2d
--- /dev/null
+++ b/src/main/pi/rpc-turns.ts
@@ -0,0 +1,306 @@
+import { agentSessionFailureFact, providerDiagnostic } from '../../shared/agent-session-failure'
+import { agentSessionFailureWords } from '../../shared/agent-session-failure-words'
+import type {
+  AgentSessionDispatchOutcome,
+  StructuredAgentSessionCommandRun
+} from '../native-chat/agent-session-wire/structured-agent-session-adapter'
+import type { ProviderTimelineEvent } from '../native-chat/agent-session-timeline/provider-timeline-event'
+import type { JsonlRpcRecord } from '../jsonl-rpc/peer'
+import type { JsonlRpcTimelineLane } from '../jsonl-rpc/timeline-lane'
+import { PiRpcContextUsage } from './rpc-context-usage'
+import { PiRpcMessages } from './rpc-messages'
+import { PiRpcPromptDelivery } from './rpc-prompt-delivery'
+import { PiRpcIdleCheck } from './rpc-idle-check'
+import { piRpcRetryActivity } from './rpc-retry-activity'
+import { piRpcMessageSchema } from './rpc-protocol'
+
+export type PiRpcTurnDeps = {
+  lane: JsonlRpcTimelineLane
+  generation: string
+  send: (frame: JsonlRpcRecord) => Promise<void>
+  request: (
+    command: string,
+    params?: Record<string, unknown>,
+    options?: { timeoutMs?: number | null }
+  ) => Promise<unknown>
+  settled: (id: string, outcome: AgentSessionDispatchOutcome) => void
+  idle: () => void
+  failed: (error: Error) => void
+  diagnostic?: (error: unknown) => void
+}
+
+/** Prompt replies can be idless and arrive after dialogs; they have no elapsed-time deadline. */
+export class PiRpcTurns {
+  readonly context = new PiRpcContextUsage()
+  private readonly messages: PiRpcMessages
+  private readonly delivery: PiRpcPromptDelivery
+  private readonly idleCheck: PiRpcIdleCheck
+  private revision = 0
+  private turn = 0
+  private active?: string
+  private settling = false
+  private compacting = false
+  private stopped = false
+  private ended = false
+  private failure?: string
+  private lastStopReason?: string
+
+  constructor(private readonly deps: PiRpcTurnDeps) {
+    this.messages = new PiRpcMessages(deps.generation, this.context)
+    this.idleCheck = new PiRpcIdleCheck({
+      request: () => deps.request('get_state'),
+      current: (revision) =>
+        !this.ended && this.settling && !this.compacting && revision === this.revision,
+      settled: (state) => {
+        this.deps.lane.apply(this.context.setModel(state.model ?? undefined, Date.now()))
+        this.finish()
+      },
+      failed: deps.failed
+    })
+    this.delivery = new PiRpcPromptDelivery({
+      send: (frame) =>
+        deps.send({ ...frame, streamingBehavior: this.working ? 'steer' : 'followUp' }),
+      settled: deps.settled,
+      failed: deps.failed,
+      accepted: (id, at) => {
+        this.open(at)
+        this.deps.lane.apply([{ type: 'input.accepted', clientMessageId: id, requestedAt: at }])
+      },
+      commandOnly: () => {
+        this.skipInitialUserEcho = false
+        this.settling = true
+        this.probe()
+      },
+      rejectedAfterAcceptance: (error) => {
+        this.failure = error
+      },
+      beforeWrite: () => this.touch(),
+      refused: () => {
+        if (this.active) {
+          this.settling = true
+          this.probe()
+        }
+      }
+    })
+  }
+
+  get holdsDispatch(): boolean {
+    return this.delivery.holdsDispatch
+  }
+  get working(): boolean {
+    return this.active !== undefined
+  }
+
+  async submit(
+    id: string,
+    at: number,
+    frame: JsonlRpcRecord,
+    before?: () => Promise<void>
+  ): Promise<AgentSessionDispatchOutcome> {
+    if (this.ended) {
+      throw new Error('Pi session ended before dispatch')
+    }
+    return this.delivery.submit(id, at, frame, before)
+  }
+
+  receive(frame: JsonlRpcRecord): void {
+    if (this.ended) {
+      return
+    }
+    const at = Date.now()
+    switch (frame.type) {
+      case 'response':
+        if (frame.command === 'prompt') {
+          this.delivery.reply(frame)
+        }
+        return
+      case 'agent_start':
+        if (!this.active && !this.delivery.holdsDispatch) {
+          throw new Error('Pi started an unsolicited agent run')
+        }
+        this.touch()
+        this.open(at)
+        this.skipInitialUserEcho = this.delivery.consumeNext()
+        return
+      case 'message_start':
+      case 'message_update':
+      case 'message_end': {
+        this.touch()
+        const message = piRpcMessageSchema.safeParse(frame.message)
+        if (message.success && message.data.role === 'user' && frame.type === 'message_end') {
+          // agent_start already accepted the first prompt; user echoes consume queued inputs.
+          if (this.skipInitialUserEcho) {
+            this.skipInitialUserEcho = false
+          } else {
+            this.delivery.consumeNext()
+          }
+        }
+        if (message.success && message.data.role === 'assistant' && frame.type === 'message_end') {
+          this.lastStopReason = message.data.stopReason
+          this.failure =
+            message.data.stopReason === 'error'
+              ? (message.data.errorMessage ?? 'Pi request failed')
+              : undefined
+        }
+        this.deps.lane.apply(this.messages.message(frame, at))
+        return
+      }
+      case 'tool_execution_start':
+      case 'tool_execution_update':
+      case 'tool_execution_end':
+        this.touch()
+        this.deps.lane.apply(this.messages.tool(frame))
+        return
+      case 'turn_end':
+        this.refreshUsage()
+        break
+      case 'agent_end':
+        // This can precede automatic retry or detached compaction.
+        break
+      case 'agent_settled':
+        this.settling = true
+        this.probe()
+        return
+      case 'compaction_start':
+      case 'auto_compaction_start':
+        this.revision++
+        this.compacting = true
+        this.deps.lane.apply(this.context.compacting())
+        return
+      case 'compaction_end':
+      case 'auto_compaction_end':
+        this.compacting = false
+        this.context.compacted(frame.result)
+        if (frame.willRetry === true) {
+          this.failure = undefined
+          this.lastStopReason = undefined
+        }
+        this.refreshUsage()
+        if (this.settling) {
+          this.probe()
+        }
+        return
+      case 'auto_retry_start':
+        this.touch()
+        this.deps.lane.apply([piRpcRetryActivity(frame)])
+        return
+      case 'auto_retry_end':
+        this.deps.lane.apply([piRpcRetryActivity(frame)])
+        if (frame.success === true) {
+          this.failure = undefined
+          this.lastStopReason = undefined
+        } else {
+          this.failure =
+            typeof frame.finalError === 'string' ? frame.finalError : 'Pi auto-retry failed'
+        }
+        break
+    }
+  }
+
+  stop(): void {
+    this.stopped = true
+  }
+
+  beginCommand(command: StructuredAgentSessionCommandRun): void {
+    if (this.active) {
+      throw new Error('Pi is still working')
+    }
+    this.deps.lane.beginCommand(command)
+    this.active = command.turnId
+    this.failure = undefined
+    this.lastStopReason = undefined
+    this.stopped = false
+    this.revision++
+  }
+
+  commandCompleted(): void {
+    this.settling = true
+    this.probe()
+  }
+
+  commandRejected(): void {
+    if (this.active) {
+      this.deps.lane.forgetCommand(this.active)
+    }
+    this.active = undefined
+    this.settling = false
+    this.revision++
+  }
+
+  end(): void {
+    this.ended = true
+    this.revision++
+    this.idleCheck.dispose()
+    this.delivery.end()
+  }
+
+  private skipInitialUserEcho = false
+  private open(at: number): void {
+    if (this.active) {
+      return
+    }
+    this.active = `run:${this.deps.generation}:${++this.turn}`
+    this.failure = undefined
+    this.lastStopReason = undefined
+    this.stopped = false
+    this.skipInitialUserEcho = true
+    this.deps.lane.apply([{ type: 'turn.open', turn: this.active, at }])
+  }
+
+  private probe(): void {
+    this.idleCheck.schedule(this.revision)
+  }
+
+  private finish(): void {
+    if (!this.active) {
+      this.settling = false
+      return
+    }
+    const outcome = this.stopped
+      ? 'cancellation'
+      : this.failure || this.lastStopReason === 'error'
+        ? 'failure'
+        : 'success'
+    const events: ProviderTimelineEvent[] = []
+    if (outcome === 'failure' && this.failure) {
+      const fact = agentSessionFailureFact('providerRejected', {
+        detail: providerDiagnostic(this.failure, 'person')
+      })
+      events.push({
+        type: 'item.close',
+        item: `error:${this.active}`,
+        body: {
+          kind: 'status',
+          tone: 'error',
+          ...agentSessionFailureWords(fact, { agentName: 'Pi', surface: 'row' })
+        }
+      })
+    }
+    events.push({
+      type: 'turn.end',
+      at: Date.now(),
+      state: this.stopped ? 'interrupted' : 'completed',
+      outcome
+    })
+    this.deps.lane.apply(events)
+    this.active = undefined
+    this.settling = false
+    this.messages.reset()
+    this.deps.idle()
+  }
+
+  private refreshUsage(): void {
+    void this.deps
+      .request('get_session_stats')
+      .then((value) => {
+        if (!this.ended) {
+          this.deps.lane.apply(this.context.stats(value, Date.now()))
+        }
+      })
+      .catch((error: unknown) => this.deps.diagnostic?.(error))
+  }
+  private touch(): void {
+    this.revision++
+    this.settling = false
+  }
+}
diff --git a/src/main/provider-process/provider-acquisition-starts.test.ts b/src/main/provider-process/provider-acquisition-starts.test.ts
new file mode 100644
index 000000000000..b4700448fe00
--- /dev/null
+++ b/src/main/provider-process/provider-acquisition-starts.test.ts
@@ -0,0 +1,82 @@
+import { describe, expect, it, vi } from 'vitest'
+import { ProviderAcquisitionStarts } from './provider-acquisition-starts'
+import type { ProviderProcessCloseResult } from './provider-process-close'
+
+function connection(result: boolean | ProviderProcessCloseResult = false) {
+  const exits: (() => void)[] = []
+  return {
+    close: vi.fn(async (): Promise<boolean | ProviderProcessCloseResult> => result),
+    onExit: (listener: () => void) => {
+      exits.push(listener)
+    },
+    exit: () => {
+      for (const listener of exits.splice(0)) {
+        listener()
+      }
+    }
+  }
+}
+
+describe('provider acquisition ownership', () => {
+  it('stops a connection created after the host already aborted its start', async () => {
+    const starts = new ProviderAcquisitionStarts<ReturnType<typeof connection>>()
+    const controller = new AbortController()
+    const attempt = starts.begin(controller.signal)
+    controller.abort()
+    const child = connection(true)
+    starts.track(attempt, child)
+    expect(child.close).toHaveBeenCalledOnce()
+    starts.end(attempt)
+  })
+
+  it('detaches startup cancellation when ownership transfers to the session', () => {
+    const starts = new ProviderAcquisitionStarts<ReturnType<typeof connection>>()
+    const controller = new AbortController()
+    const attempt = starts.begin(controller.signal)
+    const child = connection(true)
+    starts.track(attempt, child)
+    starts.end(attempt)
+    controller.abort()
+    expect(child.close).not.toHaveBeenCalled()
+  })
+
+  it('retains a failed start after refused cleanup and retries that same child', async () => {
+    const starts = new ProviderAcquisitionStarts<ReturnType<typeof connection>>()
+    const child = connection()
+    child.close
+      .mockResolvedValueOnce(false)
+      .mockRejectedValueOnce(new Error('unreachable'))
+      .mockResolvedValueOnce(true)
+    starts.retainFailed('session', child)
+    expect(await starts.stopFailed('session')).toBe(false)
+    expect(await starts.stopFailed('session')).toBe(false)
+    expect(starts.failedSessionIds()).toEqual(['session'])
+    expect(await starts.stopFailed('session')).toBe(true)
+    expect(starts.failedSessionIds()).toEqual([])
+    expect(child.close).toHaveBeenCalledTimes(3)
+  })
+
+  it('releases ownership on root proof while descendant cleanup remains reported by the connection', async () => {
+    const starts = new ProviderAcquisitionStarts<ReturnType<typeof connection>>()
+    const child = connection({ root: 'unverifiable', tree: 'unverifiable' })
+    child.close
+      .mockResolvedValueOnce({ root: 'unverifiable', tree: 'exited' })
+      .mockResolvedValueOnce({ root: 'exited', tree: 'unverifiable' })
+    starts.retainFailed('session', child)
+    expect(await starts.stopFailed('session')).toBe(false)
+    expect(await starts.stopFailed('session')).toBe(true)
+    expect(starts.failedSessionIds()).toEqual([])
+  })
+
+  it('does not let a previous child exit erase a newer failed owner', () => {
+    const starts = new ProviderAcquisitionStarts<ReturnType<typeof connection>>()
+    const old = connection(),
+      current = connection()
+    starts.retainFailed('session', old)
+    starts.retainFailed('session', current)
+    old.exit()
+    expect(starts.failedSessionIds()).toEqual(['session'])
+    current.exit()
+    expect(starts.failedSessionIds()).toEqual([])
+  })
+})
diff --git a/src/main/acp/acp-structured-starts.ts b/src/main/provider-process/provider-acquisition-starts.ts
similarity index 69%
rename from src/main/acp/acp-structured-starts.ts
rename to src/main/provider-process/provider-acquisition-starts.ts
index b87911174ca1..44857e783eec 100644
--- a/src/main/acp/acp-structured-starts.ts
+++ b/src/main/provider-process/provider-acquisition-starts.ts
@@ -3,22 +3,27 @@
 // process's exit is proven, so the next start or quit retries that same connection's close instead
 // of answering for a process it no longer knows (and never spawns a second one meanwhile).
 
-import type { AcpStructuredConnection } from './acp-structured-connection'
+import type { ProviderProcessCloseResult } from './provider-process-close'
 
-export type AcpStartAttempt = {
+export type ProviderAcquisitionConnection = {
+  close(): Promise<boolean | ProviderProcessCloseResult>
+  onExit(listener: () => void): void
+}
+
+export type ProviderStartAttempt<Connection extends ProviderAcquisitionConnection> = {
   /** The host's: the start's one canceller. */
   readonly signal: AbortSignal
-  connection: AcpStructuredConnection | null
+  connection: Connection | null
   /** What the signal's abort does while the start runs; detached once it ends. */
   readonly stopConnection: () => void
 }
 
-export class AcpStructuredStarts {
-  private readonly failed = new Map<string, AcpStructuredConnection>()
+export class ProviderAcquisitionStarts<Connection extends ProviderAcquisitionConnection> {
+  private readonly failed = new Map<string, Connection>()
 
   /** Registered before anything awaits, so an abort from here on stops this start. */
-  begin(signal: AbortSignal | undefined): AcpStartAttempt {
-    const attempt: AcpStartAttempt = {
+  begin(signal: AbortSignal | undefined): ProviderStartAttempt<Connection> {
+    const attempt: ProviderStartAttempt<Connection> = {
       signal: signal ?? new AbortController().signal,
       connection: null,
       stopConnection: () => void attempt.connection?.close().catch(() => false)
@@ -28,7 +33,7 @@ export class AcpStructuredStarts {
   }
 
   /** The start has its connection; one already aborted goes as soon as it exists. */
-  track(attempt: AcpStartAttempt, connection: AcpStructuredConnection): void {
+  track(attempt: ProviderStartAttempt<Connection>, connection: Connection): void {
     attempt.connection = connection
     if (attempt.signal.aborted) {
       void connection.close().catch(() => false)
@@ -37,12 +42,12 @@ export class AcpStructuredStarts {
 
   /** A connection the start handed over is the session's: an abort after this goes through its
    *  stop, which knows the close was asked for, not this listener, which would read as a crash. */
-  end(attempt: AcpStartAttempt): void {
+  end(attempt: ProviderStartAttempt<Connection>): void {
     attempt.signal.removeEventListener('abort', attempt.stopConnection)
   }
 
   /** A failed start whose process is not proven gone keeps its connection until its exit is. */
-  retainFailed(sessionId: string, connection: AcpStructuredConnection): void {
+  retainFailed(sessionId: string, connection: Connection): void {
     this.failed.set(sessionId, connection)
     connection.onExit(() => {
       if (this.failed.get(sessionId) === connection) {
@@ -57,7 +62,8 @@ export class AcpStructuredStarts {
     if (!connection) {
       return true
     }
-    const proven = await connection.close().catch(() => false)
+    const result = await connection.close().catch(() => false)
+    const proven = typeof result === 'boolean' ? result : result.root === 'exited'
     if (proven && this.failed.get(sessionId) === connection) {
       this.failed.delete(sessionId)
     }
diff --git a/src/main/provider-process/provider-stdio-error-boundary.ts b/src/main/provider-process/provider-stdio-error-boundary.ts
new file mode 100644
index 000000000000..4290a0b1622e
--- /dev/null
+++ b/src/main/provider-process/provider-stdio-error-boundary.ts
@@ -0,0 +1,16 @@
+import type { Readable, Writable } from 'node:stream'
+
+function ignoreLateError(): void {}
+
+export function detachProviderStreamErrorHandler(
+  stream: Readable | Writable,
+  handler: (error: Error) => void
+): void {
+  stream.removeListener('error', handler)
+  if (stream.closed) {
+    return
+  }
+  // Node may emit the write error after its callback has already closed the peer.
+  stream.on('error', ignoreLateError)
+  stream.once('close', () => stream.removeListener('error', ignoreLateError))
+}
diff --git a/src/main/provider-process/provider-stdio-write-queue.test.ts b/src/main/provider-process/provider-stdio-write-queue.test.ts
new file mode 100644
index 000000000000..7acf8c0fa82d
--- /dev/null
+++ b/src/main/provider-process/provider-stdio-write-queue.test.ts
@@ -0,0 +1,39 @@
+import { Writable } from 'node:stream'
+import { describe, expect, it, vi } from 'vitest'
+import { ProviderStdioWriteQueue } from './provider-stdio-write-queue'
+
+// An agent that stopped reading its stdin: the first line is handed over and never completes.
+function stalledQueue() {
+  const output = new Writable({ write() {} })
+  const onFailure = vi.fn()
+  const queue = new ProviderStdioWriteQueue(output, 1024, onFailure, {
+    capacity: () => new Error('capacity'),
+    closed: () => new Error('closed')
+  })
+  return { queue, onFailure }
+}
+
+describe('ProviderStdioWriteQueue aborts', () => {
+  it('drops a line still waiting in the queue and rejects only its request', async () => {
+    const { queue, onFailure } = stalledQueue()
+    void queue.write('active\n')
+    const waiting = new AbortController()
+    const dropped = queue.write('waiting\n', waiting.signal)
+    waiting.abort(new Error('timed out'))
+    await expect(dropped).rejects.toThrow('timed out')
+    // Nothing of it reached the agent, so the connection stays up for the next request.
+    expect(onFailure).not.toHaveBeenCalled()
+    void queue.write('next\n')
+    expect(onFailure).not.toHaveBeenCalled()
+  })
+
+  it('closes the connection when the line being written times out, since it cannot be taken back', () => {
+    const { queue, onFailure } = stalledQueue()
+    const active = new AbortController()
+    void queue.write('active\n', active.signal)
+    active.abort(new Error('timed out'))
+    // The stream owns the line, possibly partly on the pipe; leaving it would hold every later
+    // write, a Stop included, behind a reader that stopped.
+    expect(onFailure).toHaveBeenCalledWith(new Error('timed out'))
+  })
+})
diff --git a/src/main/provider-process/provider-stdio-write-queue.ts b/src/main/provider-process/provider-stdio-write-queue.ts
new file mode 100644
index 000000000000..57a7d92f1910
--- /dev/null
+++ b/src/main/provider-process/provider-stdio-write-queue.ts
@@ -0,0 +1,129 @@
+import type { Writable } from 'node:stream'
+
+type Write = {
+  line: string
+  resolve: () => void
+  reject: (error: Error) => void
+  detachAbort?: () => void
+}
+
+export class ProviderStdioWriteQueue {
+  private readonly queue: Write[] = []
+  private bytes = 0
+  private active?: Write
+  private terminalError?: Error
+  private detachDrain?: () => void
+
+  constructor(
+    private readonly output: Writable,
+    private readonly maxBytes: number,
+    private readonly onFailure: (error: Error) => void,
+    private readonly errors: { capacity: () => Error; closed: () => Error }
+  ) {}
+
+  write(line: string, signal?: AbortSignal): Promise<void> {
+    if (this.terminalError) {
+      return Promise.reject(this.terminalError)
+    }
+    if (signal?.aborted) {
+      return Promise.reject(signal.reason)
+    }
+    const bytes = Buffer.byteLength(line)
+    if (this.bytes + bytes > this.maxBytes) {
+      return Promise.reject(this.errors.capacity())
+    }
+    this.bytes += bytes
+    return new Promise((resolve, reject) => {
+      const write: Write = { line, resolve, reject }
+      const abort = (): void => {
+        // Why: a line already handed to the stream can't be taken back, and later writes wait on it.
+        if (this.active === write) {
+          this.onFailure(
+            signal?.reason instanceof Error ? signal.reason : new Error('Agent write aborted')
+          )
+          return
+        }
+        const index = this.queue.indexOf(write)
+        if (index === -1) {
+          return
+        }
+        this.queue.splice(index, 1)
+        this.bytes -= bytes
+        write.detachAbort?.()
+        reject(signal?.reason)
+      }
+      signal?.addEventListener('abort', abort, { once: true })
+      write.detachAbort = () => signal?.removeEventListener('abort', abort)
+      this.queue.push(write)
+      this.flush()
+    })
+  }
+
+  close(error: Error): void {
+    if (this.terminalError) {
+      return
+    }
+    this.terminalError = error
+    this.detachDrain?.()
+    this.detachDrain = undefined
+    this.active?.detachAbort?.()
+    this.active?.reject(error)
+    this.active = undefined
+    for (const write of this.queue.splice(0)) {
+      write.detachAbort?.()
+      write.reject(error)
+    }
+    this.bytes = 0
+  }
+
+  private flush(): void {
+    if (this.active || this.terminalError) {
+      return
+    }
+    const write = this.queue.shift()
+    if (!write) {
+      return
+    }
+    this.active = write
+    if (this.output.destroyed || !this.output.writable) {
+      this.onFailure(this.errors.closed())
+      return
+    }
+    let completed = false
+    let drained = false
+    let returned = false
+    const finish = (): void => {
+      if (!returned || !completed || !drained || this.terminalError) {
+        return
+      }
+      this.detachDrain?.()
+      this.detachDrain = undefined
+      write.detachAbort?.()
+      this.active = undefined
+      this.bytes -= Buffer.byteLength(write.line)
+      write.resolve()
+      this.flush()
+    }
+    const onDrain = (): void => {
+      drained = true
+      finish()
+    }
+    this.output.once('drain', onDrain)
+    this.detachDrain = () => this.output.removeListener('drain', onDrain)
+    try {
+      const accepted = this.output.write(write.line, (error) => {
+        if (error) {
+          this.onFailure(error)
+          return
+        }
+        completed = true
+        finish()
+      })
+      drained ||= accepted
+      returned = true
+      finish()
+    } catch (error) {
+      this.onFailure(error instanceof Error ? error : new Error(String(error)))
+    }
+  }
+}
diff --git a/src/main/providers/local-pty-windows-spawn-environment.ts b/src/main/providers/local-pty-windows-spawn-environment.ts
index 63ad18883dc9..a1f194e9af0c 100644
--- a/src/main/providers/local-pty-windows-spawn-environment.ts
+++ b/src/main/providers/local-pty-windows-spawn-environment.ts
@@ -1,4 +1,8 @@
 import { win32 as pathWin32 } from 'node:path'
+import {
+  CLAUDE_INJECTED_CONFIG_DIR_ENV,
+  CLAUDE_PROFILE_POINTER_ENV
+} from '../../shared/claude-profile-routing'
 import { ORCA_HERMES_STARTUP_QUERY_ENV } from '../../shared/hermes-startup-query'
 import { isHostCodexHomeForWsl, isWslCodexHomeForHost } from '../pty/codex-home-wsl-env'
 import { addWslEnvKeys } from '../wsl-env'
@@ -55,8 +59,8 @@ export function finalizeWindowsLocalPtySpawnEnvironment(args: {
       // Why: managed WSL Claude passes a Linux CLAUDE_CONFIG_DIR through wsl.exe; non-default vars need WSLENV import.
       addWslEnvKeys(env, ['CLAUDE_CONFIG_DIR'])
     }
-    if (env.ORCA_CLAUDE_PROFILE_POINTER) {
-      addWslEnvKeys(env, ['ORCA_CLAUDE_PROFILE_POINTER', 'ORCA_CLAUDE_INJECTED_CONFIG_DIR'])
+    if (env[CLAUDE_PROFILE_POINTER_ENV]) {
+      addWslEnvKeys(env, [CLAUDE_PROFILE_POINTER_ENV, CLAUDE_INJECTED_CONFIG_DIR_ENV])
     }
     if (env[ORCA_HERMES_STARTUP_QUERY_ENV] !== undefined) {
       // Why: wsl.exe drops custom Windows env vars; the startup wrapper needs this imported inside WSL.
diff --git a/src/main/providers/windows-shell-args.test.ts b/src/main/providers/windows-shell-args.test.ts
index 38352a1b6d48..e6e573263ab9 100644
--- a/src/main/providers/windows-shell-args.test.ts
+++ b/src/main/providers/windows-shell-args.test.ts
@@ -308,7 +308,7 @@ describe('resolveWindowsShellLaunchArgs', () => {
     expect(result.startupCommandDeliveredInShellArgs).toBeUndefined()
   })
 
-  it('keeps a plain Git Bash tab a login shell and wraps one with a startup command', () => {
+  it('gives a plain Git Bash tab the same rcfile as one with a startup command', () => {
     const plain = resolveWindowsShellLaunchArgs(
       'C:\\Program Files\\Git\\bin\\bash.exe',
       'C:\\Users\\alice',
@@ -322,14 +322,12 @@ describe('resolveWindowsShellLaunchArgs', () => {
       "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(plain.shellArgs).toEqual(launched.shellArgs)
+    // Why: only the rcfile carries the account-following claude function and codex --no-daemon wrapper.
+    const rcfile = readFileSync(getGitBashRcfilePath(plain.shellArgs[1]), 'utf8')
+    expect(rcfile).toContain('function claude {')
+    expect(rcfile).toContain('set -- --no-daemon "$@"')
+    expect(rcfile).toContain('source "$HOME/.bash_profile"')
     expect(launched.startupCommandDeliveredInShellArgs).toBeUndefined()
   })
 
diff --git a/src/main/providers/windows-shell-args.ts b/src/main/providers/windows-shell-args.ts
index c5ceade00a44..b905a3fbb302 100644
--- a/src/main/providers/windows-shell-args.ts
+++ b/src/main/providers/windows-shell-args.ts
@@ -29,12 +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'
 
-// 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
-  }
-
+// Why every pane gets the rcfile: it defines the claude function that follows the selected
+// account (and the codex wrapper), as bash panes elsewhere get; it sources the login chain itself.
+function getGitBashLaunchCommand(): string {
   ensureShellReadyWrappersAt()
   const wrapperArgs = getBashWrapperLaunchArgs()
   if (!wrapperArgs) {
@@ -217,10 +214,7 @@ export function resolveWindowsShellLaunchArgs(
 
   if (isWindowsGitBashShellPath(shellPath)) {
     return {
-      shellArgs: [
-        '-c',
-        getGitBashLaunchCommand(Boolean(codexLaunchPreflightCommand) || Boolean(startupCommand))
-      ],
+      shellArgs: ['-c', getGitBashLaunchCommand()],
       effectiveCwd: nativeCwd,
       validationCwd: nativeCwd
     }
diff --git a/src/main/provisioned-root-ssh-adoption.ts b/src/main/provisioned-root-ssh-adoption.ts
index c2e2dfe2c4ba..3f6565382d81 100644
--- a/src/main/provisioned-root-ssh-adoption.ts
+++ b/src/main/provisioned-root-ssh-adoption.ts
@@ -225,6 +225,7 @@ function buildProvisionedRootMeta(
       : {}),
     ...(args.linkedGiteaPR !== undefined ? { linkedGiteaPR: args.linkedGiteaPR } : {}),
     ...(args.linkedWorkItem !== undefined ? { linkedWorkItem: args.linkedWorkItem } : {}),
+    ...(args.linkedItems !== undefined ? { linkedItems: args.linkedItems } : {}),
     ...(args.linkedTaskSourceContext !== undefined
       ? { linkedTaskSourceContext: args.linkedTaskSourceContext }
       : {})
diff --git a/src/main/rate-limits/claude-active-usage-fetch.ts b/src/main/rate-limits/claude-active-usage-fetch.ts
index f285ba13ce93..df9867efd3b4 100644
--- a/src/main/rate-limits/claude-active-usage-fetch.ts
+++ b/src/main/rate-limits/claude-active-usage-fetch.ts
@@ -1,248 +1,86 @@
 import type { ProviderRateLimits } from '../../shared/rate-limit-types'
-import { withMacTailscaleDnsHint } from '../network/macos-tailscale-dns-diagnostic'
-import { completeClaudeOAuthUsageSuccess, fetchClaudeUsageViaCli } from './claude-cli-usage-fetch'
 import {
   readClaudeOAuthCredentials,
   resolveClaudeOAuthCredentialReadOptions
 } from './claude-oauth-credentials'
-import {
-  canRetryClaudeOAuthWithLegacyKeychain,
-  makeClaudeUsageClassificationError,
-  makeLiveClaudeUsageDeferredResult,
-  repairClaudeCredentialsThenRetryOAuth,
-  retryClaudeOAuthWithLegacyKeychain,
-  shouldDeferClaudeUsageForLiveSession
-} from './claude-oauth-recovery'
 import { fetchClaudeOAuthUsage } from './claude-oauth-usage-request'
-import {
-  classifyClaudeCredentialAbsence,
-  classifyClaudeOAuthUsageError
-} from './claude-usage-error-classification'
+import { classifyClaudeOAuthUsageError } from './claude-usage-error-classification'
+import { OAuthUsageError } from './claude-oauth-usage-error'
 import type { ClaudeRateLimitFetchOptions } from './claude-usage-fetch-options'
-import { resolveClaudeUsageRefreshPlan } from './claude-usage-refresh-plan'
-import {
-  abortedClaudeRateLimitResult,
-  makeClaudeUsageResult,
-  metadataForClaudeUsageAttempt,
-  recordClaudeUsageAttempt,
-  warnClaudeUsageFetchFailure
-} from './claude-usage-result'
+import { abortedClaudeRateLimitResult, makeClaudeUsageResult } from './claude-usage-result'
+import { CLAUDE_PROFILE_MISSING_MESSAGE } from '../../shared/claude-profile-routing'
 
+/** Usage observes the account; only a user-started Claude process may refresh its login. */
 export async function fetchActiveClaudeRateLimits(
   options?: ClaudeRateLimitFetchOptions
 ): Promise<ProviderRateLimits> {
+  const usageError = options?.authPreparation?.usageError
+  if (usageError) {
+    return makeClaudeUsageResult('error', usageError, {
+      failureKind:
+        usageError === CLAUDE_PROFILE_MISSING_MESSAGE ? 'missing-credentials' : 'usage-unavailable',
+      attemptedSources: []
+    })
+  }
   if (options?.signal?.aborted) {
     return abortedClaudeRateLimitResult()
   }
-  const attempts = { attemptedSources: [] }
-  const allowCliFallback = options?.allowPtyFallback !== false
-  const plan = resolveClaudeUsageRefreshPlan({
-    authPreparation: options?.authPreparation,
-    allowCliFallback
-  })
-
-  if (options?.authPreparation?.runtime === 'wsl' && !options.authPreparation.wslLinuxConfigDir) {
-    return makeClaudeUsageResult(
-      'error',
-      `WSL Claude config unavailable for ${options.authPreparation.wslDistro ?? 'default distro'}`,
-      {
-        attemptedSources: [],
-        failureKind: 'cli-unavailable',
-        authProvenance: options.authPreparation.provenance
-      }
-    )
-  }
-
-  const oauthCredentials = await readClaudeOAuthCredentials(
+  const credentials = await readClaudeOAuthCredentials(
     resolveClaudeOAuthCredentialReadOptions(options?.authPreparation)
   )
-  if (options?.signal?.aborted) {
-    return abortedClaudeRateLimitResult()
-  }
-
-  if (plan.steps.some((step) => step.source === 'oauth') && oauthCredentials.token) {
-    recordClaudeUsageAttempt(attempts, 'oauth')
-    try {
-      const oauthLimits = await fetchClaudeOAuthUsage(oauthCredentials.token, options?.signal)
-      if (options?.signal?.aborted) {
-        return abortedClaudeRateLimitResult()
-      }
-      return await completeClaudeOAuthUsageSuccess({
-        oauthLimits,
-        oauthCredentials,
-        attempts,
-        options
-      })
-    } catch (error) {
-      warnClaudeUsageFetchFailure(options?.authPreparation, oauthCredentials, error)
-      const classification = classifyClaudeOAuthUsageError(error)
-
-      if (
-        canRetryClaudeOAuthWithLegacyKeychain({
-          classification,
-          oauthCredentials,
-          authPreparation: options?.authPreparation
-        })
-      ) {
-        const legacyResult = await retryClaudeOAuthWithLegacyKeychain({
-          failedToken: oauthCredentials.token,
-          attempts,
-          options
-        })
-        if (legacyResult) {
-          return legacyResult
-        }
-      }
-
-      if (shouldDeferClaudeUsageForLiveSession(options?.authPreparation, classification)) {
-        return makeLiveClaudeUsageDeferredResult({
-          attempts,
-          oauthCredentials,
-          authPreparation: options?.authPreparation
-        })
-      }
-
-      if (classification.shouldAttemptDelegatedRefresh && allowCliFallback) {
-        const repaired = await repairClaudeCredentialsThenRetryOAuth({
-          options,
-          attempts,
-          oauthCredentials
-        })
-        if (repaired) {
-          return repaired
-        }
-      }
-
-      if (classification.shouldAttemptCliFallback && allowCliFallback) {
-        try {
-          return await fetchClaudeUsageViaCli({
-            authPreparation: options?.authPreparation,
-            oauthCredentials,
-            attempts,
-            networkProxySettings: options?.networkProxySettings,
-            signal: options?.signal
-          })
-        } catch (ptyError) {
-          warnClaudeUsageFetchFailure(options?.authPreparation, oauthCredentials, ptyError)
-        }
-      }
-
-      return makeClaudeUsageClassificationError({
-        error,
-        classification,
-        attempts,
-        oauthCredentials,
-        authPreparation: options?.authPreparation
-      })
-    }
+  const metadata = {
+    credentialSource: credentials.source,
+    authProvenance: options?.authPreparation?.provenance ?? 'system'
   }
-
-  const credentialClassification = classifyClaudeCredentialAbsence({
-    hasRefreshableCredentials: oauthCredentials.hasRefreshableCredentials,
-    keychainUnavailable: oauthCredentials.keychainUnavailable,
-    managedRefreshDeferredByLivePty: options?.authPreparation?.managedRefreshDeferredByLivePty
-  })
-
-  if (shouldDeferClaudeUsageForLiveSession(options?.authPreparation, credentialClassification)) {
-    return makeLiveClaudeUsageDeferredResult({
-      attempts,
-      oauthCredentials,
-      authPreparation: options?.authPreparation
-    })
-  }
-
-  if (
-    oauthCredentials.hasRefreshableCredentials &&
-    credentialClassification.shouldAttemptDelegatedRefresh &&
-    allowCliFallback
-  ) {
-    const repaired = await repairClaudeCredentialsThenRetryOAuth({
-      options,
-      attempts,
-      oauthCredentials
-    })
-    if (repaired) {
-      return repaired
-    }
-  }
-
+  // Why: System Default with no Claude login is an API-key or non-Claude user, not a signed-out account.
   if (
-    (oauthCredentials.token ||
-      oauthCredentials.hasRefreshableCredentials ||
-      oauthCredentials.keychainUnavailable) &&
-    credentialClassification.shouldAttemptCliFallback &&
-    allowCliFallback
+    !credentials.token &&
+    !credentials.unavailable &&
+    !credentials.hasRefreshableCredentials &&
+    metadata.authProvenance === 'system'
   ) {
-    try {
-      return await fetchClaudeUsageViaCli({
-        authPreparation: options?.authPreparation,
-        oauthCredentials,
-        attempts,
-        networkProxySettings: options?.networkProxySettings,
-        signal: options?.signal
-      })
-    } catch (error) {
-      warnClaudeUsageFetchFailure(options?.authPreparation, oauthCredentials, error)
-      return makeClaudeUsageResult(
-        'error',
-        withMacTailscaleDnsHint(error instanceof Error ? error.message : 'Unknown error'),
-        {
-          ...metadataForClaudeUsageAttempt({
-            attemptedSources: attempts.attemptedSources,
-            oauthCredentials,
-            authPreparation: options?.authPreparation,
-            failureKind:
-              credentialClassification.failureKind === 'keychain-unavailable'
-                ? 'keychain-unavailable'
-                : 'cli-unavailable'
-          })
-        }
-      )
-    }
-  }
-
-  if (oauthCredentials.keychainUnavailable) {
-    return makeClaudeUsageResult('error', 'Claude Keychain credentials unavailable', {
-      ...metadataForClaudeUsageAttempt({
-        attemptedSources: attempts.attemptedSources,
-        oauthCredentials,
-        authPreparation: options?.authPreparation,
-        failureKind: 'keychain-unavailable'
-      })
+    return makeClaudeUsageResult('unavailable', 'No subscription plan — API key billing', {
+      ...metadata,
+      failureKind: 'missing-credentials',
+      attemptedSources: []
     })
   }
-
-  if (oauthCredentials.hasRefreshableCredentials) {
-    return makeClaudeUsageResult('error', 'Claude OAuth access token unavailable', {
-      ...metadataForClaudeUsageAttempt({
-        attemptedSources: attempts.attemptedSources,
-        oauthCredentials,
-        authPreparation: options?.authPreparation,
-        failureKind: credentialClassification.failureKind
-      })
-    })
+  if (!credentials.token) {
+    return makeClaudeUsageResult(
+      'error',
+      credentials.unavailable
+        ? 'Claude usage is unavailable.'
+        : 'Sign in again to use this account.',
+      {
+        ...metadata,
+        failureKind: credentials.unavailable ? 'keychain-unavailable' : 'missing-credentials',
+        attemptedSources: []
+      }
+    )
   }
-
-  if (allowCliFallback && plan.steps.some((step) => step.source === 'cli')) {
-    try {
-      return await fetchClaudeUsageViaCli({
-        authPreparation: options?.authPreparation,
-        oauthCredentials,
-        attempts,
-        networkProxySettings: options?.networkProxySettings,
-        signal: options?.signal
-      })
-    } catch (error) {
-      warnClaudeUsageFetchFailure(options?.authPreparation, oauthCredentials, error)
-    }
+  try {
+    return await fetchClaudeOAuthUsage(credentials.token, options?.signal)
+  } catch (error) {
+    const { failureKind } = classifyClaudeOAuthUsageError(error)
+    // Why: the 429 wait gates the poll, and both messages tell the user why usage is missing.
+    const retryAfterMs = error instanceof OAuthUsageError ? error.retryAfterMs : null
+    return makeClaudeUsageResult(
+      'error',
+      failureKind === 'stale-token'
+        ? // Why: Claude refreshes its own login when it next runs; System Default has no "account".
+          metadata.authProvenance === 'system'
+          ? 'Claude usage updates the next time Claude runs.'
+          : 'Claude usage has expired. Start Claude in this account to refresh it.'
+        : (failureKind === 'rate-limited' || failureKind === 'missing-scope') &&
+            error instanceof OAuthUsageError
+          ? error.message
+          : 'Claude usage is unavailable.',
+      {
+        ...metadata,
+        failureKind,
+        attemptedSources: ['oauth'],
+        ...(retryAfterMs ? { retryAtMs: Date.now() + retryAfterMs } : {})
+      }
+    )
   }
-
-  return makeClaudeUsageResult('unavailable', 'No subscription plan — API key billing', {
-    ...metadataForClaudeUsageAttempt({
-      attemptedSources: attempts.attemptedSources,
-      oauthCredentials,
-      authPreparation: options?.authPreparation,
-      failureKind: 'missing-credentials'
-    })
-  })
 }
diff --git a/src/main/rate-limits/claude-cli-usage-fetch.ts b/src/main/rate-limits/claude-cli-usage-fetch.ts
deleted file mode 100644
index 70d264a4e68f..000000000000
--- a/src/main/rate-limits/claude-cli-usage-fetch.ts
+++ /dev/null
@@ -1,117 +0,0 @@
-import type { ProviderRateLimits, UsageRateLimitFailureKind } from '../../shared/rate-limit-types'
-import type { NetworkProxySettings } from '../../shared/network-proxy'
-import type { ClaudeRuntimeAuthPreparation } from '../claude-accounts/runtime-auth-service'
-import { fetchViaPty } from './claude-pty'
-import type { ClaudeOAuthCredentialReadResult } from './claude-oauth-credentials'
-import type { ClaudeRateLimitFetchOptions } from './claude-usage-fetch-options'
-import {
-  abortedClaudeRateLimitResult,
-  canSupplementClaudeOAuthUsage,
-  isManagedClaudeAuth,
-  mergeClaudeUsageWindows,
-  metadataForClaudeUsageAttempt,
-  recordClaudeUsageAttempt,
-  type ClaudeUsageAttemptState,
-  warnClaudeUsageFetchFailure,
-  withClaudeUsageMetadata
-} from './claude-usage-result'
-
-function classifyClaudeCliUsageFailure(
-  limits: ProviderRateLimits
-): UsageRateLimitFailureKind | undefined {
-  if (!limits.error) {
-    return undefined
-  }
-  if (/rate limited/i.test(limits.error)) {
-    return 'rate-limited'
-  }
-  if (/plan usage is unavailable|usage is unavailable/i.test(limits.error)) {
-    return 'usage-unavailable'
-  }
-  return 'cli-unavailable'
-}
-
-export async function fetchClaudeUsageViaCli(input: {
-  authPreparation?: ClaudeRuntimeAuthPreparation
-  oauthCredentials: ClaudeOAuthCredentialReadResult
-  attempts: ClaudeUsageAttemptState
-  networkProxySettings?: NetworkProxySettings
-  signal?: AbortSignal
-}): Promise<ProviderRateLimits> {
-  recordClaudeUsageAttempt(input.attempts, 'cli')
-  const limits = await fetchViaPty({
-    authPreparation: input.authPreparation,
-    networkProxySettings: input.networkProxySettings,
-    signal: input.signal
-  })
-  return withClaudeUsageMetadata(
-    limits,
-    metadataForClaudeUsageAttempt({
-      attemptedSources: input.attempts.attemptedSources,
-      oauthCredentials: input.oauthCredentials,
-      authPreparation: input.authPreparation,
-      source: 'cli',
-      failureKind: classifyClaudeCliUsageFailure(limits)
-    })
-  )
-}
-
-async function supplementOAuthUsageFromCli(input: {
-  oauthLimits: ProviderRateLimits
-  authPreparation?: ClaudeRuntimeAuthPreparation
-  oauthCredentials: ClaudeOAuthCredentialReadResult
-  attempts: ClaudeUsageAttemptState
-  allowUsagePanelSupplement: boolean
-  networkProxySettings?: NetworkProxySettings
-  signal?: AbortSignal
-}): Promise<ProviderRateLimits> {
-  if (input.signal?.aborted || !canSupplementClaudeOAuthUsage(input)) {
-    return input.oauthLimits
-  }
-  try {
-    return mergeClaudeUsageWindows(
-      input.oauthLimits,
-      await fetchClaudeUsageViaCli({
-        authPreparation: input.authPreparation,
-        oauthCredentials: input.oauthCredentials,
-        attempts: input.attempts,
-        networkProxySettings: input.networkProxySettings,
-        signal: input.signal
-      })
-    )
-  } catch (error) {
-    warnClaudeUsageFetchFailure(input.authPreparation, input.oauthCredentials, error)
-    return input.oauthLimits
-  }
-}
-
-export async function completeClaudeOAuthUsageSuccess(input: {
-  oauthLimits: ProviderRateLimits
-  oauthCredentials: ClaudeOAuthCredentialReadResult
-  attempts: ClaudeUsageAttemptState
-  options?: ClaudeRateLimitFetchOptions
-}): Promise<ProviderRateLimits> {
-  const limits = await supplementOAuthUsageFromCli({
-    oauthLimits: input.oauthLimits,
-    authPreparation: input.options?.authPreparation,
-    oauthCredentials: input.oauthCredentials,
-    attempts: input.attempts,
-    networkProxySettings: input.options?.networkProxySettings,
-    allowUsagePanelSupplement:
-      input.options?.allowUsagePanelSupplement ??
-      isManagedClaudeAuth(input.options?.authPreparation),
-    signal: input.options?.signal
-  })
-  if (input.options?.signal?.aborted) {
-    return abortedClaudeRateLimitResult()
-  }
-  return withClaudeUsageMetadata(
-    limits,
-    metadataForClaudeUsageAttempt({
-      attemptedSources: input.attempts.attemptedSources,
-      oauthCredentials: input.oauthCredentials,
-      authPreparation: input.options?.authPreparation,
-      source: 'oauth'
-    })
-  )
-}
diff --git a/src/main/rate-limits/claude-fetcher-cli-fallback.test.ts b/src/main/rate-limits/claude-fetcher-cli-fallback.test.ts
deleted file mode 100644
index 428a29106941..000000000000
--- a/src/main/rate-limits/claude-fetcher-cli-fallback.test.ts
+++ /dev/null
@@ -1,490 +0,0 @@
-import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest'
-import { fetchClaudeRateLimits } from './claude-fetcher'
-import { primeClaudeFetcherMocks, restorePlatform } from './claude-fetcher-test-harness'
-import { fetchViaPty } from './claude-pty'
-import {
-  readActiveClaudeKeychainCredentials,
-  readActiveClaudeKeychainCredentialsStrict
-} from '../claude-accounts/keychain'
-import type { ClaudeRuntimeAuthPreparation } from '../claude-accounts/runtime-auth-service'
-
-const { netFetchMock, readFileMock, resolveProxyMock, setProxyMock, appGetPathMock } = vi.hoisted(
-  () => ({
-    netFetchMock: vi.fn(),
-    readFileMock: vi.fn(),
-    resolveProxyMock: vi.fn(),
-    setProxyMock: vi.fn(),
-    appGetPathMock: vi.fn()
-  })
-)
-
-vi.mock('node:fs/promises', () => ({
-  readFile: readFileMock
-}))
-
-vi.mock('electron', () => ({
-  app: {
-    getPath: appGetPathMock
-  },
-  net: {
-    fetch: netFetchMock
-  },
-  session: {
-    defaultSession: {
-      resolveProxy: resolveProxyMock,
-      setProxy: setProxyMock
-    }
-  }
-}))
-
-vi.mock('./claude-pty', () => ({
-  fetchViaPty: vi.fn()
-}))
-
-vi.mock('../claude-accounts/keychain', () => ({
-  deleteActiveClaudeKeychainCredentialsStrict: vi.fn(),
-  readActiveClaudeKeychainCredentials: vi.fn(),
-  readActiveClaudeKeychainCredentialsStrict: vi.fn(),
-  readManagedClaudeKeychainCredentials: vi.fn(),
-  writeActiveClaudeKeychainCredentials: vi.fn(),
-  writeManagedClaudeKeychainCredentials: vi.fn()
-}))
-
-describe('fetchClaudeRateLimits', () => {
-  beforeEach(() => {
-    primeClaudeFetcherMocks({
-      netFetchMock,
-      readFileMock,
-      resolveProxyMock,
-      setProxyMock,
-      appGetPathMock
-    })
-  })
-
-  afterEach(() => {
-    restorePlatform()
-  })
-
-  it('does not mask OAuth usage rate limits with the PTY fallback', async () => {
-    const configDir = '/Users/test/.claude'
-    const authPreparation: ClaudeRuntimeAuthPreparation = {
-      configDir,
-      envPatch: { CLAUDE_CONFIG_DIR: configDir },
-      stripAuthEnv: false,
-      provenance: 'system'
-    }
-    vi.mocked(readActiveClaudeKeychainCredentialsStrict).mockResolvedValueOnce(
-      JSON.stringify({
-        claudeAiOauth: {
-          accessToken: 'expired-oauth-token',
-          refreshToken: 'refresh-token',
-          expiresAt: Date.now() - 60_000
-        }
-      })
-    )
-    netFetchMock.mockResolvedValueOnce(
-      new Response(
-        JSON.stringify({
-          error: {
-            type: 'rate_limit_error',
-            message: 'Rate limited. Please try again later.'
-          }
-        }),
-        { status: 429, headers: { 'retry-after': '3000' } }
-      )
-    )
-
-    const before = Date.now()
-    const result = await fetchClaudeRateLimits({ authPreparation })
-    expect(result).toMatchObject({
-      provider: 'claude',
-      status: 'error',
-      error: 'Claude usage is rate limited right now.',
-      usageMetadata: expect.objectContaining({ failureKind: 'rate-limited' })
-    })
-    expect(result.usageMetadata?.retryAtMs).toBeGreaterThanOrEqual(before + 3000 * 1000)
-    expect(result.usageMetadata?.retryAtMs).toBeLessThanOrEqual(Date.now() + 3000 * 1000)
-
-    expect(netFetchMock).toHaveBeenCalledWith(
-      'https://api.anthropic.com/api/oauth/usage',
-      expect.objectContaining({
-        headers: expect.objectContaining({
-          Authorization: 'Bearer expired-oauth-token'
-        })
-      })
-    )
-    expect(fetchViaPty).not.toHaveBeenCalled()
-  })
-
-  it('omits retryAtMs when a 429 has no Retry-After header', async () => {
-    const configDir = '/Users/test/.claude'
-    const authPreparation: ClaudeRuntimeAuthPreparation = {
-      configDir,
-      envPatch: { CLAUDE_CONFIG_DIR: configDir },
-      stripAuthEnv: false,
-      provenance: 'system'
-    }
-    vi.mocked(readActiveClaudeKeychainCredentialsStrict).mockResolvedValueOnce(
-      JSON.stringify({
-        claudeAiOauth: {
-          accessToken: 'expired-oauth-token',
-          refreshToken: 'refresh-token',
-          expiresAt: Date.now() - 60_000
-        }
-      })
-    )
-    netFetchMock.mockResolvedValueOnce(
-      new Response(
-        JSON.stringify({
-          error: {
-            type: 'rate_limit_error',
-            message: 'Rate limited. Please try again later.'
-          }
-        }),
-        { status: 429 }
-      )
-    )
-
-    const result = await fetchClaudeRateLimits({ authPreparation })
-    expect(result.status).toBe('error')
-    expect(result.usageMetadata?.retryAtMs).toBeUndefined()
-    expect(fetchViaPty).not.toHaveBeenCalled()
-  })
-
-  it('uses CLI fallback for OAuth auth failures when automatic repair is safe', async () => {
-    const configDir = '/Users/test/.claude'
-    const authPreparation: ClaudeRuntimeAuthPreparation = {
-      configDir,
-      envPatch: { CLAUDE_CONFIG_DIR: configDir },
-      stripAuthEnv: false,
-      provenance: 'system'
-    }
-    vi.mocked(readActiveClaudeKeychainCredentialsStrict).mockResolvedValueOnce(
-      JSON.stringify({
-        claudeAiOauth: {
-          accessToken: 'stale-oauth-token',
-          refreshToken: 'refresh-token',
-          expiresAt: Date.now() - 60_000
-        }
-      })
-    )
-    netFetchMock.mockResolvedValueOnce(
-      new Response(
-        JSON.stringify({
-          error: {
-            type: 'authentication_error',
-            message: 'Invalid OAuth token.'
-          }
-        }),
-        { status: 401 }
-      )
-    )
-
-    await expect(fetchClaudeRateLimits({ authPreparation })).resolves.toMatchObject({
-      provider: 'claude',
-      status: 'ok',
-      session: { usedPercent: 56 },
-      usageMetadata: {
-        source: 'cli',
-        attemptedSources: ['oauth', 'cli']
-      }
-    })
-
-    expect(fetchViaPty).toHaveBeenCalledWith({ authPreparation })
-  })
-
-  it('re-reads credentials and retries OAuth once after CLI repair', async () => {
-    const configDir = '/Users/test/.claude'
-    const authPreparation: ClaudeRuntimeAuthPreparation = {
-      configDir,
-      envPatch: { CLAUDE_CONFIG_DIR: configDir },
-      stripAuthEnv: false,
-      provenance: 'system'
-    }
-    vi.mocked(readActiveClaudeKeychainCredentialsStrict)
-      .mockResolvedValueOnce(
-        JSON.stringify({
-          claudeAiOauth: {
-            accessToken: 'stale-oauth-token',
-            refreshToken: 'refresh-token',
-            expiresAt: Date.now() - 60_000
-          }
-        })
-      )
-      // Legacy item absent — the stale-scoped legacy fallback must not preempt
-      // CLI repair in this scenario.
-      .mockResolvedValueOnce(null)
-      .mockResolvedValueOnce(
-        JSON.stringify({
-          claudeAiOauth: {
-            accessToken: 'repaired-oauth-token',
-            refreshToken: 'refresh-token-2',
-            expiresAt: Date.now() + 60_000
-          }
-        })
-      )
-    netFetchMock
-      .mockResolvedValueOnce(
-        new Response(
-          JSON.stringify({
-            error: {
-              type: 'authentication_error',
-              message: 'Invalid OAuth token.'
-            }
-          }),
-          { status: 401 }
-        )
-      )
-      .mockResolvedValueOnce(
-        new Response(
-          JSON.stringify({
-            five_hour: { utilization: 14 },
-            seven_day: { utilization: 27 }
-          }),
-          { status: 200 }
-        )
-      )
-
-    await expect(fetchClaudeRateLimits({ authPreparation })).resolves.toMatchObject({
-      provider: 'claude',
-      status: 'ok',
-      session: { usedPercent: 14 },
-      weekly: { usedPercent: 27 },
-      usageMetadata: {
-        source: 'oauth',
-        attemptedSources: ['oauth', 'cli'],
-        credentialSource: 'scoped-keychain'
-      }
-    })
-
-    expect(fetchViaPty).toHaveBeenCalledWith({ authPreparation })
-    expect(netFetchMock).toHaveBeenNthCalledWith(
-      2,
-      'https://api.anthropic.com/api/oauth/usage',
-      expect.objectContaining({
-        headers: expect.objectContaining({
-          Authorization: 'Bearer repaired-oauth-token'
-        })
-      })
-    )
-  })
-
-  it('explains auth failures when a live Claude terminal owns managed refresh', async () => {
-    const configDir = '/Users/test/.claude'
-    const authPreparation: ClaudeRuntimeAuthPreparation = {
-      configDir,
-      envPatch: { CLAUDE_CONFIG_DIR: configDir },
-      stripAuthEnv: false,
-      managedRefreshDeferredByLivePty: true,
-      provenance: 'managed:account-1'
-    }
-    vi.mocked(readActiveClaudeKeychainCredentialsStrict).mockResolvedValueOnce(
-      JSON.stringify({
-        claudeAiOauth: {
-          accessToken: 'stale-oauth-token',
-          refreshToken: 'refresh-token',
-          expiresAt: Date.now() - 60_000
-        }
-      })
-    )
-    netFetchMock.mockResolvedValueOnce(
-      new Response(
-        JSON.stringify({
-          error: {
-            type: 'authentication_error',
-            message: 'Invalid OAuth token.'
-          }
-        }),
-        { status: 401 }
-      )
-    )
-
-    await expect(
-      fetchClaudeRateLimits({ authPreparation, allowPtyFallback: false })
-    ).resolves.toMatchObject({
-      provider: 'claude',
-      status: 'error',
-      error:
-        'Claude usage refresh is waiting for the live Claude terminal to rotate its credentials.'
-    })
-
-    expect(fetchViaPty).not.toHaveBeenCalled()
-  })
-
-  it('does not start CLI fallback when live Claude owns managed refresh and no token is readable', async () => {
-    const configDir = '/Users/test/.claude'
-    const authPreparation: ClaudeRuntimeAuthPreparation = {
-      configDir,
-      envPatch: { CLAUDE_CONFIG_DIR: configDir },
-      stripAuthEnv: false,
-      managedRefreshDeferredByLivePty: true,
-      provenance: 'managed:account-1'
-    }
-
-    await expect(fetchClaudeRateLimits({ authPreparation })).resolves.toMatchObject({
-      provider: 'claude',
-      status: 'error',
-      error:
-        'Claude usage refresh is waiting for the live Claude terminal to rotate its credentials.',
-      usageMetadata: {
-        failureKind: 'deferred-by-live-session',
-        deferredByLiveClaudeSession: true,
-        attemptedSources: []
-      }
-    })
-
-    expect(fetchViaPty).not.toHaveBeenCalled()
-  })
-
-  it('does not start the PTY fallback when disabled for background fetches', async () => {
-    const configDir = '/Users/test/.claude'
-    const authPreparation: ClaudeRuntimeAuthPreparation = {
-      configDir,
-      envPatch: { CLAUDE_CONFIG_DIR: configDir },
-      stripAuthEnv: false,
-      provenance: 'system'
-    }
-    vi.mocked(readActiveClaudeKeychainCredentialsStrict).mockResolvedValueOnce(
-      JSON.stringify({
-        claudeAiOauth: {
-          accessToken: 'oauth-token',
-          refreshToken: 'refresh-token',
-          expiresAt: Date.now() + 60_000
-        }
-      })
-    )
-    netFetchMock.mockResolvedValueOnce(new Response('temporary failure', { status: 500 }))
-
-    await expect(
-      fetchClaudeRateLimits({ authPreparation, allowPtyFallback: false })
-    ).resolves.toMatchObject({
-      provider: 'claude',
-      status: 'error',
-      error: 'OAuth API returned 500'
-    })
-
-    expect(fetchViaPty).not.toHaveBeenCalled()
-  })
-
-  it('does not start the PTY fallback for refresh-only credentials when disabled', async () => {
-    const configDir = '/Users/test/.claude'
-    const authPreparation: ClaudeRuntimeAuthPreparation = {
-      configDir,
-      envPatch: { CLAUDE_CONFIG_DIR: configDir },
-      stripAuthEnv: false,
-      provenance: 'system'
-    }
-    vi.mocked(readActiveClaudeKeychainCredentialsStrict).mockResolvedValueOnce(
-      JSON.stringify({
-        claudeAiOauth: {
-          refreshToken: 'refresh-token',
-          expiresAt: Date.now() - 60_000
-        }
-      })
-    )
-
-    await expect(
-      fetchClaudeRateLimits({ authPreparation, allowPtyFallback: false })
-    ).resolves.toMatchObject({
-      provider: 'claude',
-      status: 'error',
-      error: 'Claude OAuth access token unavailable'
-    })
-
-    expect(fetchViaPty).not.toHaveBeenCalled()
-  })
-
-  it('falls back to CLI when OAuth credentials are missing in automatic mode', async () => {
-    const authPreparation: ClaudeRuntimeAuthPreparation = {
-      configDir: '/Users/test/.claude',
-      envPatch: {},
-      stripAuthEnv: false,
-      provenance: 'system'
-    }
-
-    await expect(fetchClaudeRateLimits({ authPreparation })).resolves.toMatchObject({
-      provider: 'claude',
-      status: 'ok',
-      session: { usedPercent: 56 },
-      usageMetadata: {
-        source: 'cli',
-        attemptedSources: ['cli'],
-        credentialSource: 'none'
-      }
-    })
-
-    expect(fetchViaPty).toHaveBeenCalledWith({ authPreparation })
-  })
-
-  it('marks CLI plan usage shell results as usage unavailable', async () => {
-    const authPreparation: ClaudeRuntimeAuthPreparation = {
-      configDir: '/Users/test/.claude',
-      envPatch: {},
-      stripAuthEnv: false,
-      provenance: 'system'
-    }
-    vi.mocked(fetchViaPty).mockResolvedValueOnce({
-      provider: 'claude',
-      session: null,
-      weekly: null,
-      updatedAt: 1,
-      error: 'Claude plan usage is unavailable for this Claude CLI session.',
-      status: 'error'
-    })
-
-    await expect(fetchClaudeRateLimits({ authPreparation })).resolves.toMatchObject({
-      provider: 'claude',
-      status: 'error',
-      error: 'Claude plan usage is unavailable for this Claude CLI session.',
-      usageMetadata: {
-        source: 'cli',
-        attemptedSources: ['cli'],
-        failureKind: 'usage-unavailable'
-      }
-    })
-  })
-
-  it('surfaces Keychain read failures as structured usage metadata when CLI fallback is disabled', async () => {
-    vi.mocked(readActiveClaudeKeychainCredentials).mockRejectedValueOnce(
-      new Error('security timed out after 3000ms')
-    )
-
-    await expect(fetchClaudeRateLimits({ allowPtyFallback: false })).resolves.toMatchObject({
-      provider: 'claude',
-      status: 'error',
-      error: 'Claude Keychain credentials unavailable',
-      usageMetadata: {
-        failureKind: 'keychain-unavailable',
-        attemptedSources: [],
-        credentialSource: 'none'
-      }
-    })
-
-    expect(fetchViaPty).not.toHaveBeenCalled()
-  })
-
-  it('uses CLI fallback when Keychain is unavailable in automatic mode', async () => {
-    const authPreparation: ClaudeRuntimeAuthPreparation = {
-      configDir: '/Users/test/.claude',
-      envPatch: {},
-      stripAuthEnv: false,
-      provenance: 'system'
-    }
-    vi.mocked(readActiveClaudeKeychainCredentials).mockRejectedValueOnce(
-      new Error('security timed out after 3000ms')
-    )
-
-    await expect(fetchClaudeRateLimits({ authPreparation })).resolves.toMatchObject({
-      provider: 'claude',
-      status: 'ok',
-      session: { usedPercent: 56 },
-      usageMetadata: {
-        source: 'cli',
-        attemptedSources: ['cli'],
-        credentialSource: 'none'
-      }
-    })
-
-    expect(fetchViaPty).toHaveBeenCalledWith({ authPreparation })
-  })
-})
diff --git a/src/main/rate-limits/claude-fetcher-fable-usage.test.ts b/src/main/rate-limits/claude-fetcher-fable-usage.test.ts
deleted file mode 100644
index 2a84cc4f2af6..000000000000
--- a/src/main/rate-limits/claude-fetcher-fable-usage.test.ts
+++ /dev/null
@@ -1,362 +0,0 @@
-import { beforeEach, afterEach, describe, expect, it, vi } from 'vitest'
-import { fetchClaudeRateLimits } from './claude-fetcher'
-import { primeClaudeFetcherMocks, restorePlatform } from './claude-fetcher-test-harness'
-import { fetchViaPty } from './claude-pty'
-import { readActiveClaudeKeychainCredentialsStrict } from '../claude-accounts/keychain'
-import type { ClaudeRuntimeAuthPreparation } from '../claude-accounts/runtime-auth-service'
-
-const { netFetchMock, readFileMock, resolveProxyMock, setProxyMock, appGetPathMock } = vi.hoisted(
-  () => ({
-    netFetchMock: vi.fn(),
-    readFileMock: vi.fn(),
-    resolveProxyMock: vi.fn(),
-    setProxyMock: vi.fn(),
-    appGetPathMock: vi.fn()
-  })
-)
-
-vi.mock('node:fs/promises', () => ({
-  readFile: readFileMock
-}))
-
-vi.mock('electron', () => ({
-  app: {
-    getPath: appGetPathMock
-  },
-  net: {
-    fetch: netFetchMock
-  },
-  session: {
-    defaultSession: {
-      resolveProxy: resolveProxyMock,
-      setProxy: setProxyMock
-    }
-  }
-}))
-
-vi.mock('./claude-pty', () => ({
-  fetchViaPty: vi.fn()
-}))
-
-vi.mock('../claude-accounts/keychain', () => ({
-  deleteActiveClaudeKeychainCredentialsStrict: vi.fn(),
-  readActiveClaudeKeychainCredentials: vi.fn(),
-  readActiveClaudeKeychainCredentialsStrict: vi.fn(),
-  readManagedClaudeKeychainCredentials: vi.fn(),
-  writeActiveClaudeKeychainCredentials: vi.fn(),
-  writeManagedClaudeKeychainCredentials: vi.fn()
-}))
-
-describe('fetchClaudeRateLimits', () => {
-  beforeEach(() => {
-    primeClaudeFetcherMocks({
-      netFetchMock,
-      readFileMock,
-      resolveProxyMock,
-      setProxyMock,
-      appGetPathMock
-    })
-  })
-
-  afterEach(() => {
-    restorePlatform()
-  })
-
-  it('accepts Claude Code statusline-style rate limit window fields', async () => {
-    const configDir = '/Users/test/.claude'
-    const authPreparation: ClaudeRuntimeAuthPreparation = {
-      configDir,
-      envPatch: { CLAUDE_CONFIG_DIR: configDir },
-      stripAuthEnv: false,
-      provenance: 'system'
-    }
-    vi.mocked(readActiveClaudeKeychainCredentialsStrict).mockResolvedValueOnce(
-      JSON.stringify({
-        claudeAiOauth: {
-          accessToken: 'oauth-token',
-          expiresAt: Date.now() + 60_000
-        }
-      })
-    )
-    netFetchMock.mockResolvedValueOnce(
-      new Response(
-        JSON.stringify({
-          five_hour: { used_percentage: 23.5, resets_at: 1770000000 },
-          seven_day: { used_percentage: 41.2, resets_at: 1770604800 },
-          fable_weekly: { used_percentage: 12.3, resets_at: 1770691200 }
-        }),
-        { status: 200 }
-      )
-    )
-
-    await expect(fetchClaudeRateLimits({ authPreparation })).resolves.toMatchObject({
-      provider: 'claude',
-      status: 'ok',
-      session: { usedPercent: 23.5, resetsAt: 1770000000000 },
-      weekly: { usedPercent: 41.2, resetsAt: 1770604800000 },
-      fableWeekly: { usedPercent: 12.3, resetsAt: 1770691200000 }
-    })
-  })
-
-  it('maps active Fable usage from the scoped OAuth limits array without a PTY read', async () => {
-    const configDir = '/Users/test/.claude'
-    const authPreparation: ClaudeRuntimeAuthPreparation = {
-      configDir,
-      envPatch: { CLAUDE_CONFIG_DIR: configDir },
-      stripAuthEnv: false,
-      provenance: 'managed:account-1'
-    }
-    vi.mocked(readActiveClaudeKeychainCredentialsStrict).mockResolvedValueOnce(
-      JSON.stringify({ claudeAiOauth: { accessToken: 'oauth-token' } })
-    )
-    netFetchMock.mockResolvedValueOnce(
-      new Response(
-        JSON.stringify({
-          five_hour: { utilization: 36 },
-          seven_day: { utilization: 73 },
-          fable_weekly: { utilization: 12 },
-          limits: [
-            { kind: 'weekly_scoped', percent: 55, scope: null },
-            {
-              kind: 'weekly_scoped',
-              percent: 100,
-              resets_at: '2026-07-17T20:00:00.099908+00:00',
-              is_active: true,
-              scope: { model: { display_name: 'Fable' } }
-            }
-          ]
-        }),
-        { status: 200 }
-      )
-    )
-
-    await expect(
-      fetchClaudeRateLimits({ authPreparation, allowUsagePanelSupplement: true })
-    ).resolves.toMatchObject({
-      provider: 'claude',
-      status: 'ok',
-      fableWeekly: {
-        usedPercent: 100,
-        resetsAt: Date.parse('2026-07-17T20:00:00.099908+00:00')
-      },
-      usageMetadata: { attemptedSources: ['oauth'] }
-    })
-    expect(fetchViaPty).not.toHaveBeenCalled()
-  })
-
-  it('surfaces inactive scoped Fable usage over the legacy OAuth fallback', async () => {
-    const configDir = '/Users/test/.claude'
-    const authPreparation: ClaudeRuntimeAuthPreparation = {
-      configDir,
-      envPatch: { CLAUDE_CONFIG_DIR: configDir },
-      stripAuthEnv: false,
-      provenance: 'system'
-    }
-    vi.mocked(readActiveClaudeKeychainCredentialsStrict).mockResolvedValueOnce(
-      JSON.stringify({ claudeAiOauth: { accessToken: 'oauth-token' } })
-    )
-    netFetchMock.mockResolvedValueOnce(
-      new Response(
-        JSON.stringify({
-          five_hour: { utilization: 11 },
-          seven_day: { utilization: 22 },
-          fable_weekly: { utilization: 33 },
-          limits: [
-            {
-              kind: 'weekly_scoped',
-              percent: 90,
-              is_active: false,
-              scope: { model: { display_name: 'fable' } }
-            }
-          ]
-        }),
-        { status: 200 }
-      )
-    )
-
-    await expect(fetchClaudeRateLimits({ authPreparation })).resolves.toMatchObject({
-      fableWeekly: { usedPercent: 90 }
-    })
-  })
-
-  it('surfaces an inactive scoped Fable entry when no legacy Fable field exists (#8979)', async () => {
-    const configDir = '/Users/test/.claude'
-    const authPreparation: ClaudeRuntimeAuthPreparation = {
-      configDir,
-      envPatch: { CLAUDE_CONFIG_DIR: configDir },
-      stripAuthEnv: false,
-      provenance: 'system'
-    }
-    vi.mocked(readActiveClaudeKeychainCredentialsStrict).mockResolvedValueOnce(
-      JSON.stringify({ claudeAiOauth: { accessToken: 'oauth-token' } })
-    )
-    netFetchMock.mockResolvedValueOnce(
-      new Response(
-        JSON.stringify({
-          five_hour: { utilization: 11 },
-          seven_day: { utilization: 22 },
-          limits: [
-            {
-              kind: 'weekly_scoped',
-              percent: 64,
-              resets_at: '2026-07-24T20:00:00+00:00',
-              is_active: false,
-              scope: { model: { display_name: 'Fable' } }
-            }
-          ]
-        }),
-        { status: 200 }
-      )
-    )
-
-    await expect(fetchClaudeRateLimits({ authPreparation })).resolves.toMatchObject({
-      provider: 'claude',
-      status: 'ok',
-      fableWeekly: {
-        usedPercent: 64,
-        resetsAt: Date.parse('2026-07-24T20:00:00+00:00')
-      }
-    })
-  })
-
-  it('supplements managed-account OAuth usage with Fable from the CLI usage panel', async () => {
-    const configDir = '/Users/test/.claude'
-    const authPreparation: ClaudeRuntimeAuthPreparation = {
-      configDir,
-      envPatch: { CLAUDE_CONFIG_DIR: configDir },
-      stripAuthEnv: false,
-      provenance: 'managed:account-1'
-    }
-    vi.mocked(readActiveClaudeKeychainCredentialsStrict).mockResolvedValueOnce(
-      JSON.stringify({
-        claudeAiOauth: {
-          accessToken: 'oauth-token',
-          expiresAt: Date.now() + 60_000
-        }
-      })
-    )
-    netFetchMock.mockResolvedValueOnce(
-      new Response(
-        JSON.stringify({
-          five_hour: { used_percentage: 23.5, resets_at: 1770000000 },
-          seven_day: { used_percentage: 41.2, resets_at: 1770604800 }
-        }),
-        { status: 200 }
-      )
-    )
-    vi.mocked(fetchViaPty).mockResolvedValueOnce({
-      provider: 'claude',
-      session: { usedPercent: 91, windowMinutes: 300, resetsAt: null, resetDescription: null },
-      weekly: null,
-      fableWeekly: {
-        usedPercent: 12.3,
-        windowMinutes: 10080,
-        resetsAt: null,
-        resetDescription: '3d 2h'
-      },
-      updatedAt: 1,
-      error: null,
-      status: 'ok'
-    })
-
-    await expect(fetchClaudeRateLimits({ authPreparation })).resolves.toMatchObject({
-      provider: 'claude',
-      status: 'ok',
-      session: { usedPercent: 23.5, resetsAt: 1770000000000 },
-      weekly: { usedPercent: 41.2, resetsAt: 1770604800000 },
-      fableWeekly: { usedPercent: 12.3, resetDescription: '3d 2h' },
-      usageMetadata: {
-        source: 'oauth',
-        attemptedSources: ['oauth', 'cli']
-      }
-    })
-    expect(fetchViaPty).toHaveBeenCalledWith({ authPreparation })
-  })
-
-  it('supplements system OAuth usage when the service explicitly allows usage-panel reads', async () => {
-    const configDir = '/Users/test/.claude'
-    const authPreparation: ClaudeRuntimeAuthPreparation = {
-      configDir,
-      envPatch: { CLAUDE_CONFIG_DIR: configDir },
-      stripAuthEnv: false,
-      provenance: 'system'
-    }
-    vi.mocked(readActiveClaudeKeychainCredentialsStrict).mockResolvedValueOnce(
-      JSON.stringify({
-        claudeAiOauth: {
-          accessToken: 'oauth-token',
-          expiresAt: Date.now() + 60_000
-        }
-      })
-    )
-    vi.mocked(fetchViaPty).mockResolvedValueOnce({
-      provider: 'claude',
-      session: null,
-      weekly: null,
-      fableWeekly: {
-        usedPercent: 58,
-        windowMinutes: 10080,
-        resetsAt: null,
-        resetDescription: '4d'
-      },
-      updatedAt: 1,
-      error: null,
-      status: 'ok'
-    })
-
-    await expect(
-      fetchClaudeRateLimits({
-        authPreparation,
-        allowPtyFallback: false,
-        allowUsagePanelSupplement: true
-      })
-    ).resolves.toMatchObject({
-      provider: 'claude',
-      status: 'ok',
-      session: { usedPercent: 12 },
-      weekly: { usedPercent: 34 },
-      fableWeekly: { usedPercent: 58, resetDescription: '4d' },
-      usageMetadata: {
-        source: 'oauth',
-        attemptedSources: ['oauth', 'cli']
-      }
-    })
-    expect(fetchViaPty).toHaveBeenCalledWith({ authPreparation })
-  })
-
-  it('ignores bare Fable OAuth usage because the window length is ambiguous', async () => {
-    const configDir = '/Users/test/.claude'
-    const authPreparation: ClaudeRuntimeAuthPreparation = {
-      configDir,
-      envPatch: { CLAUDE_CONFIG_DIR: configDir },
-      stripAuthEnv: false,
-      provenance: 'system'
-    }
-    vi.mocked(readActiveClaudeKeychainCredentialsStrict).mockResolvedValueOnce(
-      JSON.stringify({
-        claudeAiOauth: {
-          accessToken: 'oauth-token',
-          expiresAt: Date.now() + 60_000
-        }
-      })
-    )
-    netFetchMock.mockResolvedValueOnce(
-      new Response(
-        JSON.stringify({
-          five_hour: { utilization: 11 },
-          seven_day: { utilization: 22 },
-          fable: { utilization: 33 }
-        }),
-        { status: 200 }
-      )
-    )
-
-    await expect(fetchClaudeRateLimits({ authPreparation })).resolves.toMatchObject({
-      provider: 'claude',
-      status: 'ok',
-      session: { usedPercent: 11 },
-      weekly: { usedPercent: 22 },
-      fableWeekly: null
-    })
-  })
-})
diff --git a/src/main/rate-limits/claude-fetcher-keychain-credentials.test.ts b/src/main/rate-limits/claude-fetcher-keychain-credentials.test.ts
deleted file mode 100644
index 9a75d3826e5c..000000000000
--- a/src/main/rate-limits/claude-fetcher-keychain-credentials.test.ts
+++ /dev/null
@@ -1,491 +0,0 @@
-import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest'
-import { join } from 'node:path'
-import { fetchClaudeRateLimits } from './claude-fetcher'
-import { primeClaudeFetcherMocks, restorePlatform } from './claude-fetcher-test-harness'
-import { fetchViaPty } from './claude-pty'
-import {
-  readActiveClaudeKeychainCredentials,
-  readActiveClaudeKeychainCredentialsStrict
-} from '../claude-accounts/keychain'
-import type { ClaudeRuntimeAuthPreparation } from '../claude-accounts/runtime-auth-service'
-
-const { netFetchMock, readFileMock, resolveProxyMock, setProxyMock, appGetPathMock } = vi.hoisted(
-  () => ({
-    netFetchMock: vi.fn(),
-    readFileMock: vi.fn(),
-    resolveProxyMock: vi.fn(),
-    setProxyMock: vi.fn(),
-    appGetPathMock: vi.fn()
-  })
-)
-
-vi.mock('node:fs/promises', () => ({
-  readFile: readFileMock
-}))
-
-vi.mock('electron', () => ({
-  app: {
-    getPath: appGetPathMock
-  },
-  net: {
-    fetch: netFetchMock
-  },
-  session: {
-    defaultSession: {
-      resolveProxy: resolveProxyMock,
-      setProxy: setProxyMock
-    }
-  }
-}))
-
-vi.mock('./claude-pty', () => ({
-  fetchViaPty: vi.fn()
-}))
-
-vi.mock('../claude-accounts/keychain', () => ({
-  deleteActiveClaudeKeychainCredentialsStrict: vi.fn(),
-  readActiveClaudeKeychainCredentials: vi.fn(),
-  readActiveClaudeKeychainCredentialsStrict: vi.fn(),
-  readManagedClaudeKeychainCredentials: vi.fn(),
-  writeActiveClaudeKeychainCredentials: vi.fn(),
-  writeManagedClaudeKeychainCredentials: vi.fn()
-}))
-
-describe('fetchClaudeRateLimits', () => {
-  beforeEach(() => {
-    primeClaudeFetcherMocks({
-      netFetchMock,
-      readFileMock,
-      resolveProxyMock,
-      setProxyMock,
-      appGetPathMock
-    })
-  })
-
-  afterEach(() => {
-    restorePlatform()
-  })
-
-  it('does not read host credentials when WSL config resolution fails', async () => {
-    await expect(
-      fetchClaudeRateLimits({
-        authPreparation: {
-          configDir: '/Users/test/.claude',
-          runtime: 'wsl',
-          wslDistro: 'Ubuntu',
-          wslLinuxConfigDir: null,
-          envPatch: {},
-          stripAuthEnv: true,
-          provenance: 'wsl:Ubuntu:system'
-        }
-      })
-    ).resolves.toMatchObject({
-      provider: 'claude',
-      status: 'error',
-      error: 'WSL Claude config unavailable for Ubuntu'
-    })
-
-    expect(readFileMock).not.toHaveBeenCalled()
-    expect(readActiveClaudeKeychainCredentialsStrict).not.toHaveBeenCalled()
-    expect(fetchViaPty).not.toHaveBeenCalled()
-  })
-
-  it('reads scoped Keychain credentials when the Claude config dir is explicit', async () => {
-    const configDir = '/Users/test/.claude'
-    const authPreparation: ClaudeRuntimeAuthPreparation = {
-      configDir,
-      envPatch: { CLAUDE_CONFIG_DIR: configDir },
-      stripAuthEnv: false,
-      provenance: 'system'
-    }
-    vi.mocked(readActiveClaudeKeychainCredentialsStrict).mockResolvedValueOnce(
-      JSON.stringify({
-        claudeAiOauth: {
-          accessToken: 'oauth-token',
-          expiresAt: Date.now() + 60_000
-        }
-      })
-    )
-    readFileMock.mockResolvedValue(
-      JSON.stringify({
-        claudeAiOauth: {
-          accessToken: 'file-oauth-token',
-          expiresAt: Date.now() + 60_000
-        }
-      })
-    )
-
-    await expect(fetchClaudeRateLimits({ authPreparation })).resolves.toMatchObject({
-      provider: 'claude',
-      status: 'ok',
-      session: { usedPercent: 12 },
-      weekly: { usedPercent: 34 }
-    })
-
-    expect(readActiveClaudeKeychainCredentialsStrict).toHaveBeenCalledWith(configDir)
-    expect(netFetchMock).toHaveBeenCalledWith(
-      'https://api.anthropic.com/api/oauth/usage',
-      expect.objectContaining({
-        headers: expect.objectContaining({
-          Authorization: 'Bearer oauth-token',
-          'User-Agent': 'claude-code/2.1.0'
-        })
-      })
-    )
-  })
-
-  it('falls back to the legacy keychain token when the scoped token is rejected as stale', async () => {
-    const configDir = '/Users/test/.claude'
-    const authPreparation: ClaudeRuntimeAuthPreparation = {
-      configDir,
-      envPatch: { CLAUDE_CONFIG_DIR: configDir },
-      stripAuthEnv: false,
-      provenance: 'system'
-    }
-    vi.mocked(readActiveClaudeKeychainCredentialsStrict).mockImplementation(async (dir) =>
-      dir
-        ? JSON.stringify({
-            claudeAiOauth: { accessToken: 'stale-scoped-token', refreshToken: 'refresh-1' }
-          })
-        : JSON.stringify({ claudeAiOauth: { accessToken: 'fresh-legacy-token' } })
-    )
-    netFetchMock.mockImplementation(async (_url: string, init?: RequestInit) => {
-      const auth = (init?.headers as Record<string, string> | undefined)?.Authorization
-      return auth === 'Bearer fresh-legacy-token'
-        ? new Response(
-            JSON.stringify({ five_hour: { utilization: 12 }, seven_day: { utilization: 34 } }),
-            { status: 200 }
-          )
-        : new Response(
-            JSON.stringify({ error: { message: 'Invalid authentication credentials' } }),
-            { status: 401 }
-          )
-    })
-
-    await expect(
-      fetchClaudeRateLimits({ authPreparation, allowPtyFallback: false })
-    ).resolves.toMatchObject({
-      provider: 'claude',
-      status: 'ok',
-      session: { usedPercent: 12 },
-      weekly: { usedPercent: 34 }
-    })
-
-    expect(netFetchMock).toHaveBeenCalledTimes(2)
-    expect(fetchViaPty).not.toHaveBeenCalled()
-  })
-
-  it('prefers a legacy access token over scoped refresh-only credentials', async () => {
-    const configDir = '/Users/test/.claude'
-    const authPreparation: ClaudeRuntimeAuthPreparation = {
-      configDir,
-      envPatch: { CLAUDE_CONFIG_DIR: configDir },
-      stripAuthEnv: false,
-      provenance: 'system'
-    }
-    vi.mocked(readActiveClaudeKeychainCredentialsStrict).mockImplementation(async (dir) =>
-      dir
-        ? JSON.stringify({ claudeAiOauth: { refreshToken: 'refresh-only' } })
-        : JSON.stringify({ claudeAiOauth: { accessToken: 'fresh-legacy-token' } })
-    )
-
-    await expect(fetchClaudeRateLimits({ authPreparation })).resolves.toMatchObject({
-      provider: 'claude',
-      status: 'ok',
-      session: { usedPercent: 12 }
-    })
-
-    expect(netFetchMock).toHaveBeenCalledTimes(1)
-    expect(netFetchMock).toHaveBeenCalledWith(
-      'https://api.anthropic.com/api/oauth/usage',
-      expect.objectContaining({
-        headers: expect.objectContaining({ Authorization: 'Bearer fresh-legacy-token' })
-      })
-    )
-  })
-
-  it('does not retry with the legacy keychain for managed account credentials', async () => {
-    const configDir = '/Users/test/managed-account'
-    const authPreparation: ClaudeRuntimeAuthPreparation = {
-      configDir,
-      envPatch: { CLAUDE_CONFIG_DIR: configDir },
-      stripAuthEnv: true,
-      provenance: 'managed:account-1'
-    }
-    vi.mocked(readActiveClaudeKeychainCredentialsStrict).mockImplementation(async (dir) =>
-      dir ? JSON.stringify({ claudeAiOauth: { accessToken: 'stale-managed-token' } }) : null
-    )
-    netFetchMock.mockResolvedValue(
-      new Response(JSON.stringify({ error: { message: 'Invalid authentication credentials' } }), {
-        status: 401
-      })
-    )
-
-    await expect(
-      fetchClaudeRateLimits({ authPreparation, allowPtyFallback: false })
-    ).resolves.toMatchObject({
-      provider: 'claude',
-      status: 'error'
-    })
-
-    expect(netFetchMock).toHaveBeenCalledTimes(1)
-    expect(readActiveClaudeKeychainCredentialsStrict).not.toHaveBeenCalledWith(undefined)
-  })
-
-  it('does not retry with the legacy keychain for WSL targets', async () => {
-    // Why: a WSL target's stale credentials must never be answered with the
-    // host user's legacy macOS Keychain account.
-    const configDir = '\\\\wsl$\\Ubuntu\\home\\test\\.claude'
-    const authPreparation: ClaudeRuntimeAuthPreparation = {
-      configDir,
-      runtime: 'wsl',
-      wslDistro: 'Ubuntu',
-      wslLinuxConfigDir: '/home/test/.claude',
-      envPatch: { CLAUDE_CONFIG_DIR: '/home/test/.claude' },
-      stripAuthEnv: false,
-      provenance: 'system'
-    }
-    vi.mocked(readActiveClaudeKeychainCredentialsStrict).mockImplementation(async (dir) =>
-      dir
-        ? JSON.stringify({ claudeAiOauth: { accessToken: 'stale-wsl-token' } })
-        : JSON.stringify({ claudeAiOauth: { accessToken: 'fresh-legacy-token' } })
-    )
-    netFetchMock.mockResolvedValue(
-      new Response(JSON.stringify({ error: { message: 'Invalid authentication credentials' } }), {
-        status: 401
-      })
-    )
-
-    await expect(
-      fetchClaudeRateLimits({ authPreparation, allowPtyFallback: false })
-    ).resolves.toMatchObject({
-      provider: 'claude',
-      status: 'error'
-    })
-
-    expect(netFetchMock).toHaveBeenCalledTimes(1)
-    expect(readActiveClaudeKeychainCredentialsStrict).not.toHaveBeenCalledWith(undefined)
-  })
-
-  it('skips the legacy retry when the legacy item mirrors the failed scoped token', async () => {
-    // Why: Claude's usage endpoint has a tight request budget; retrying the
-    // identical token would double the request for a guaranteed second 401.
-    const configDir = '/Users/test/.claude'
-    const authPreparation: ClaudeRuntimeAuthPreparation = {
-      configDir,
-      envPatch: { CLAUDE_CONFIG_DIR: configDir },
-      stripAuthEnv: false,
-      provenance: 'system'
-    }
-    vi.mocked(readActiveClaudeKeychainCredentialsStrict).mockResolvedValue(
-      JSON.stringify({ claudeAiOauth: { accessToken: 'mirrored-token' } })
-    )
-    netFetchMock.mockResolvedValue(
-      new Response(JSON.stringify({ error: { message: 'Invalid authentication credentials' } }), {
-        status: 401
-      })
-    )
-
-    await expect(
-      fetchClaudeRateLimits({ authPreparation, allowPtyFallback: false })
-    ).resolves.toMatchObject({
-      provider: 'claude',
-      status: 'error'
-    })
-
-    expect(netFetchMock).toHaveBeenCalledTimes(1)
-    expect(readActiveClaudeKeychainCredentialsStrict).toHaveBeenCalledWith(undefined)
-  })
-
-  it('falls back to legacy Keychain credentials for host system default without an explicit config dir', async () => {
-    const configDir = '/Users/test/.claude'
-    const authPreparation: ClaudeRuntimeAuthPreparation = {
-      configDir,
-      runtime: 'host',
-      envPatch: {},
-      stripAuthEnv: false,
-      provenance: 'system'
-    }
-    vi.mocked(readActiveClaudeKeychainCredentialsStrict)
-      .mockResolvedValueOnce(null)
-      .mockResolvedValueOnce(
-        JSON.stringify({
-          claudeAiOauth: {
-            accessToken: 'legacy-oauth-token',
-            expiresAt: Date.now() + 60_000
-          }
-        })
-      )
-
-    await expect(fetchClaudeRateLimits({ authPreparation })).resolves.toMatchObject({
-      provider: 'claude',
-      status: 'ok',
-      session: { usedPercent: 12 },
-      weekly: { usedPercent: 34 }
-    })
-
-    expect(readActiveClaudeKeychainCredentialsStrict).toHaveBeenNthCalledWith(1, configDir)
-    expect(readActiveClaudeKeychainCredentialsStrict).toHaveBeenNthCalledWith(2, undefined)
-    expect(readActiveClaudeKeychainCredentials).not.toHaveBeenCalled()
-    expect(netFetchMock).toHaveBeenCalledWith(
-      'https://api.anthropic.com/api/oauth/usage',
-      expect.objectContaining({
-        headers: expect.objectContaining({
-          Authorization: 'Bearer legacy-oauth-token'
-        })
-      })
-    )
-  })
-
-  it('reads scoped Keychain credentials for host system default without an explicit config dir', async () => {
-    const configDir = '/Users/test/.claude'
-    const authPreparation: ClaudeRuntimeAuthPreparation = {
-      configDir,
-      runtime: 'host',
-      envPatch: {},
-      stripAuthEnv: false,
-      provenance: 'system'
-    }
-    vi.mocked(readActiveClaudeKeychainCredentialsStrict).mockResolvedValueOnce(
-      JSON.stringify({
-        claudeAiOauth: {
-          accessToken: 'scoped-oauth-token',
-          expiresAt: Date.now() + 60_000
-        }
-      })
-    )
-
-    await expect(
-      fetchClaudeRateLimits({ authPreparation, allowPtyFallback: false })
-    ).resolves.toMatchObject({
-      provider: 'claude',
-      status: 'ok',
-      session: { usedPercent: 12 },
-      weekly: { usedPercent: 34 }
-    })
-
-    expect(readActiveClaudeKeychainCredentialsStrict).toHaveBeenCalledWith(configDir)
-    expect(readActiveClaudeKeychainCredentials).not.toHaveBeenCalled()
-    expect(fetchViaPty).not.toHaveBeenCalled()
-    expect(netFetchMock).toHaveBeenCalledWith(
-      'https://api.anthropic.com/api/oauth/usage',
-      expect.objectContaining({
-        headers: expect.objectContaining({
-          Authorization: 'Bearer scoped-oauth-token'
-        })
-      })
-    )
-  })
-
-  it('falls back to the credentials file when Keychain access fails', async () => {
-    const configDir = '/Users/test/.claude'
-    const authPreparation: ClaudeRuntimeAuthPreparation = {
-      configDir,
-      envPatch: { CLAUDE_CONFIG_DIR: configDir },
-      stripAuthEnv: false,
-      provenance: 'system'
-    }
-    vi.mocked(readActiveClaudeKeychainCredentialsStrict).mockRejectedValue(
-      new Error('Keychain locked')
-    )
-    readFileMock.mockResolvedValue(
-      JSON.stringify({
-        claudeAiOauth: {
-          accessToken: 'file-oauth-token',
-          expiresAt: Date.now() + 60_000
-        }
-      })
-    )
-
-    await expect(fetchClaudeRateLimits({ authPreparation })).resolves.toMatchObject({
-      provider: 'claude',
-      status: 'ok'
-    })
-
-    expect(readFileMock).toHaveBeenCalledWith(
-      join('/Users/test/.claude', '.credentials.json'),
-      'utf-8'
-    )
-    expect(netFetchMock).toHaveBeenCalledWith(
-      'https://api.anthropic.com/api/oauth/usage',
-      expect.objectContaining({
-        headers: expect.objectContaining({
-          Authorization: 'Bearer file-oauth-token'
-        })
-      })
-    )
-  })
-
-  it('falls back to legacy Keychain when scoped credentials are unusable', async () => {
-    const configDir = '/Users/test/.claude'
-    const authPreparation: ClaudeRuntimeAuthPreparation = {
-      configDir,
-      envPatch: { CLAUDE_CONFIG_DIR: configDir },
-      stripAuthEnv: false,
-      provenance: 'system'
-    }
-    vi.mocked(readActiveClaudeKeychainCredentialsStrict)
-      .mockResolvedValueOnce('{not-json')
-      .mockResolvedValueOnce(
-        JSON.stringify({
-          claudeAiOauth: {
-            accessToken: 'legacy-oauth-token',
-            expiresAt: Date.now() + 60_000
-          }
-        })
-      )
-
-    await expect(fetchClaudeRateLimits({ authPreparation })).resolves.toMatchObject({
-      provider: 'claude',
-      status: 'ok'
-    })
-
-    expect(readActiveClaudeKeychainCredentialsStrict).toHaveBeenNthCalledWith(1, configDir)
-    expect(readActiveClaudeKeychainCredentialsStrict).toHaveBeenNthCalledWith(2, undefined)
-    expect(netFetchMock).toHaveBeenCalledWith(
-      'https://api.anthropic.com/api/oauth/usage',
-      expect.objectContaining({
-        headers: expect.objectContaining({
-          Authorization: 'Bearer legacy-oauth-token'
-        })
-      })
-    )
-  })
-
-  it('tries OAuth usage even when local credential metadata is expired', async () => {
-    const configDir = '/Users/test/.claude'
-    const authPreparation: ClaudeRuntimeAuthPreparation = {
-      configDir,
-      envPatch: { CLAUDE_CONFIG_DIR: configDir },
-      stripAuthEnv: false,
-      provenance: 'system'
-    }
-    vi.mocked(readActiveClaudeKeychainCredentialsStrict).mockResolvedValueOnce(
-      JSON.stringify({
-        claudeAiOauth: {
-          accessToken: 'expired-oauth-token',
-          refreshToken: 'refresh-token',
-          expiresAt: Date.now() - 60_000
-        }
-      })
-    )
-
-    await expect(fetchClaudeRateLimits({ authPreparation })).resolves.toMatchObject({
-      provider: 'claude',
-      status: 'ok',
-      session: { usedPercent: 12 }
-    })
-
-    expect(netFetchMock).toHaveBeenNthCalledWith(
-      1,
-      'https://api.anthropic.com/api/oauth/usage',
-      expect.objectContaining({
-        headers: expect.objectContaining({
-          Authorization: 'Bearer expired-oauth-token'
-        })
-      })
-    )
-    expect(readFileMock).not.toHaveBeenCalled()
-    expect(fetchViaPty).not.toHaveBeenCalled()
-  })
-})
diff --git a/src/main/rate-limits/claude-fetcher-managed-account-usage.test.ts b/src/main/rate-limits/claude-fetcher-managed-account-usage.test.ts
deleted file mode 100644
index c01bcb00f6eb..000000000000
--- a/src/main/rate-limits/claude-fetcher-managed-account-usage.test.ts
+++ /dev/null
@@ -1,425 +0,0 @@
-import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest'
-import { mkdirSync, mkdtempSync, readFileSync, realpathSync, rmSync, writeFileSync } from 'node:fs'
-import { tmpdir } from 'node:os'
-import { join } from 'node:path'
-import { fetchManagedAccountUsage } from './claude-fetcher'
-import {
-  primeClaudeFetcherMocks,
-  restorePlatform,
-  setPlatform
-} from './claude-fetcher-test-harness'
-import { fetchViaPty } from './claude-pty'
-import {
-  deleteActiveClaudeKeychainCredentialsStrict,
-  readManagedClaudeKeychainCredentials,
-  writeActiveClaudeKeychainCredentials,
-  writeManagedClaudeKeychainCredentials
-} from '../claude-accounts/keychain'
-
-const { netFetchMock, readFileMock, resolveProxyMock, setProxyMock, appGetPathMock } = vi.hoisted(
-  () => ({
-    netFetchMock: vi.fn(),
-    readFileMock: vi.fn(),
-    resolveProxyMock: vi.fn(),
-    setProxyMock: vi.fn(),
-    appGetPathMock: vi.fn()
-  })
-)
-
-vi.mock('node:fs/promises', () => ({
-  readFile: readFileMock
-}))
-
-vi.mock('electron', () => ({
-  app: {
-    getPath: appGetPathMock
-  },
-  net: {
-    fetch: netFetchMock
-  },
-  session: {
-    defaultSession: {
-      resolveProxy: resolveProxyMock,
-      setProxy: setProxyMock
-    }
-  }
-}))
-
-vi.mock('./claude-pty', () => ({
-  fetchViaPty: vi.fn()
-}))
-
-vi.mock('../claude-accounts/keychain', () => ({
-  deleteActiveClaudeKeychainCredentialsStrict: vi.fn(),
-  readActiveClaudeKeychainCredentials: vi.fn(),
-  readActiveClaudeKeychainCredentialsStrict: vi.fn(),
-  readManagedClaudeKeychainCredentials: vi.fn(),
-  writeActiveClaudeKeychainCredentials: vi.fn(),
-  writeManagedClaudeKeychainCredentials: vi.fn()
-}))
-
-describe('fetchClaudeRateLimits', () => {
-  let tempDir: string | null = null
-
-  beforeEach(() => {
-    tempDir = null
-    primeClaudeFetcherMocks({
-      netFetchMock,
-      readFileMock,
-      resolveProxyMock,
-      setProxyMock,
-      appGetPathMock
-    })
-  })
-
-  afterEach(() => {
-    restorePlatform()
-    if (tempDir) {
-      rmSync(tempDir, { recursive: true, force: true })
-    }
-  })
-
-  it('does not read inactive managed credentials from unowned auth paths', async () => {
-    setPlatform('linux')
-    tempDir = mkdtempSync(join(tmpdir(), 'orca-claude-fetcher-'))
-    appGetPathMock.mockReturnValue(tempDir)
-    const unownedAuthPath = join(tempDir, 'unowned', 'auth')
-    mkdirSync(unownedAuthPath, { recursive: true })
-    writeFileSync(join(unownedAuthPath, '.orca-managed-claude-auth'), 'account-1\n', 'utf-8')
-    writeFileSync(
-      join(unownedAuthPath, '.credentials.json'),
-      JSON.stringify({
-        claudeAiOauth: {
-          accessToken: 'unowned-token',
-          expiresAt: Date.now() + 60_000
-        }
-      }),
-      'utf-8'
-    )
-
-    await expect(
-      fetchManagedAccountUsage({ id: 'account-1', managedAuthPath: unownedAuthPath })
-    ).resolves.toMatchObject({
-      provider: 'claude',
-      status: 'error',
-      error: 'No credentials'
-    })
-
-    expect(netFetchMock).not.toHaveBeenCalled()
-    expect(readFileMock).not.toHaveBeenCalled()
-  })
-
-  it('supplements inactive managed account OAuth usage with Fable from its usage panel', async () => {
-    setPlatform('linux')
-    tempDir = mkdtempSync(join(tmpdir(), 'orca-claude-fetcher-'))
-    appGetPathMock.mockReturnValue(tempDir)
-    const ownedAuthPath = join(tempDir, 'claude-accounts', 'account-1', 'auth')
-    mkdirSync(ownedAuthPath, { recursive: true })
-    writeFileSync(join(ownedAuthPath, '.orca-managed-claude-auth'), 'account-1\n', 'utf-8')
-    const canonicalAuthPath = realpathSync(ownedAuthPath)
-    writeFileSync(
-      join(ownedAuthPath, '.credentials.json'),
-      JSON.stringify({
-        claudeAiOauth: {
-          accessToken: 'inactive-token',
-          expiresAt: Date.now() + 60_000
-        }
-      }),
-      'utf-8'
-    )
-    vi.mocked(fetchViaPty).mockResolvedValueOnce({
-      provider: 'claude',
-      session: null,
-      weekly: null,
-      fableWeekly: {
-        usedPercent: 42,
-        windowMinutes: 10080,
-        resetsAt: null,
-        resetDescription: '2d'
-      },
-      updatedAt: 1,
-      error: null,
-      status: 'ok'
-    })
-
-    await expect(
-      fetchManagedAccountUsage(
-        { id: 'account-1', managedAuthPath: ownedAuthPath },
-        { allowUsagePanelSupplement: true }
-      )
-    ).resolves.toMatchObject({
-      provider: 'claude',
-      status: 'ok',
-      session: { usedPercent: 12 },
-      weekly: { usedPercent: 34 },
-      fableWeekly: { usedPercent: 42, resetDescription: '2d' }
-    })
-    expect(fetchViaPty).toHaveBeenCalledWith({
-      authPreparation: expect.objectContaining({
-        configDir: canonicalAuthPath,
-        envPatch: { CLAUDE_CONFIG_DIR: canonicalAuthPath },
-        provenance: 'managed:account-1:inactive-preview',
-        stripAuthEnv: true
-      })
-    })
-  })
-
-  it('stages macOS inactive account credentials in a scoped Keychain for Fable preview', async () => {
-    setPlatform('darwin')
-    tempDir = mkdtempSync(join(tmpdir(), 'orca-claude-fetcher-'))
-    appGetPathMock.mockReturnValue(tempDir)
-    const ownedAuthPath = join(tempDir, 'claude-accounts', 'account-1', 'auth')
-    const credentialsJson = JSON.stringify({
-      claudeAiOauth: {
-        accessToken: 'managed-keychain-token',
-        expiresAt: Date.now() + 60_000
-      }
-    })
-    mkdirSync(ownedAuthPath, { recursive: true })
-    writeFileSync(join(ownedAuthPath, '.orca-managed-claude-auth'), 'account-1\n', 'utf-8')
-    const canonicalAuthPath = realpathSync(ownedAuthPath)
-    vi.mocked(readManagedClaudeKeychainCredentials).mockResolvedValueOnce(credentialsJson)
-    vi.mocked(fetchViaPty).mockResolvedValueOnce({
-      provider: 'claude',
-      session: {
-        usedPercent: 12,
-        windowMinutes: 300,
-        resetsAt: null,
-        resetDescription: null
-      },
-      weekly: {
-        usedPercent: 34,
-        windowMinutes: 10080,
-        resetsAt: null,
-        resetDescription: null
-      },
-      fableWeekly: {
-        usedPercent: 58,
-        windowMinutes: 10080,
-        resetsAt: null,
-        resetDescription: '3d'
-      },
-      updatedAt: 1,
-      error: null,
-      status: 'ok'
-    })
-
-    const result = await fetchManagedAccountUsage(
-      { id: 'account-1', managedAuthPath: ownedAuthPath },
-      { allowUsagePanelSupplement: true }
-    )
-
-    expect(result.fableWeekly).toMatchObject({ usedPercent: 58, resetDescription: '3d' })
-    expect(writeActiveClaudeKeychainCredentials).toHaveBeenCalledWith(
-      credentialsJson,
-      canonicalAuthPath
-    )
-    expect(deleteActiveClaudeKeychainCredentialsStrict).toHaveBeenCalledWith(canonicalAuthPath)
-  })
-
-  it('cleans up scoped Keychain credentials when the inactive preview fails', async () => {
-    setPlatform('darwin')
-    tempDir = mkdtempSync(join(tmpdir(), 'orca-claude-fetcher-'))
-    appGetPathMock.mockReturnValue(tempDir)
-    const ownedAuthPath = join(tempDir, 'claude-accounts', 'account-1', 'auth')
-    mkdirSync(ownedAuthPath, { recursive: true })
-    writeFileSync(join(ownedAuthPath, '.orca-managed-claude-auth'), 'account-1\n', 'utf-8')
-    const canonicalAuthPath = realpathSync(ownedAuthPath)
-    vi.mocked(readManagedClaudeKeychainCredentials).mockResolvedValueOnce(
-      JSON.stringify({ claudeAiOauth: { accessToken: 'managed-keychain-token' } })
-    )
-    vi.mocked(fetchViaPty).mockRejectedValueOnce(new Error('preview failed'))
-
-    await expect(
-      fetchManagedAccountUsage(
-        { id: 'account-1', managedAuthPath: ownedAuthPath },
-        { allowUsagePanelSupplement: true }
-      )
-    ).resolves.toMatchObject({
-      provider: 'claude',
-      status: 'ok',
-      session: { usedPercent: 12 },
-      weekly: { usedPercent: 34 },
-      fableWeekly: null
-    })
-
-    expect(deleteActiveClaudeKeychainCredentialsStrict).toHaveBeenCalledWith(canonicalAuthPath)
-  })
-
-  it('stages refreshed macOS inactive account credentials before Fable preview', async () => {
-    setPlatform('darwin')
-    tempDir = mkdtempSync(join(tmpdir(), 'orca-claude-fetcher-'))
-    appGetPathMock.mockReturnValue(tempDir)
-    const ownedAuthPath = join(tempDir, 'claude-accounts', 'account-1', 'auth')
-    const staleCredentialsJson = JSON.stringify({
-      claudeAiOauth: {
-        accessToken: 'stale-access',
-        refreshToken: 'stale-refresh',
-        expiresAt: Date.now() - 60_000
-      }
-    })
-    mkdirSync(ownedAuthPath, { recursive: true })
-    writeFileSync(join(ownedAuthPath, '.orca-managed-claude-auth'), 'account-1\n', 'utf-8')
-    vi.mocked(readManagedClaudeKeychainCredentials).mockResolvedValueOnce(staleCredentialsJson)
-    netFetchMock.mockResolvedValueOnce(
-      new Response(
-        JSON.stringify({
-          access_token: 'fresh-access',
-          expires_in: 3600,
-          refresh_token: 'fresh-refresh'
-        }),
-        { status: 200 }
-      )
-    )
-    netFetchMock.mockResolvedValueOnce(
-      new Response(
-        JSON.stringify({ five_hour: { utilization: 12 }, seven_day: { utilization: 34 } }),
-        {
-          status: 200
-        }
-      )
-    )
-    vi.mocked(fetchViaPty).mockResolvedValueOnce({
-      provider: 'claude',
-      session: {
-        usedPercent: 12,
-        windowMinutes: 300,
-        resetsAt: null,
-        resetDescription: null
-      },
-      weekly: {
-        usedPercent: 34,
-        windowMinutes: 10080,
-        resetsAt: null,
-        resetDescription: null
-      },
-      fableWeekly: {
-        usedPercent: 58,
-        windowMinutes: 10080,
-        resetsAt: null,
-        resetDescription: '3d'
-      },
-      updatedAt: 1,
-      error: null,
-      status: 'ok'
-    })
-
-    const result = await fetchManagedAccountUsage(
-      { id: 'account-1', managedAuthPath: ownedAuthPath },
-      { allowUsagePanelSupplement: true }
-    )
-
-    const stagedCredentialsJson = vi.mocked(writeActiveClaudeKeychainCredentials).mock.calls[0]?.[0]
-    expect(result.fableWeekly).toMatchObject({ usedPercent: 58, resetDescription: '3d' })
-    expect(JSON.parse(stagedCredentialsJson ?? '{}')).toMatchObject({
-      claudeAiOauth: {
-        accessToken: 'fresh-access',
-        refreshToken: 'fresh-refresh'
-      }
-    })
-    expect(writeManagedClaudeKeychainCredentials).toHaveBeenCalledWith(
-      'account-1',
-      stagedCredentialsJson
-    )
-  })
-
-  it('does not merge macOS inactive Fable preview when usage windows belong to another account', async () => {
-    setPlatform('darwin')
-    tempDir = mkdtempSync(join(tmpdir(), 'orca-claude-fetcher-'))
-    appGetPathMock.mockReturnValue(tempDir)
-    const ownedAuthPath = join(tempDir, 'claude-accounts', 'account-1', 'auth')
-    mkdirSync(ownedAuthPath, { recursive: true })
-    writeFileSync(join(ownedAuthPath, '.orca-managed-claude-auth'), 'account-1\n', 'utf-8')
-    vi.mocked(readManagedClaudeKeychainCredentials).mockResolvedValueOnce(
-      JSON.stringify({
-        claudeAiOauth: {
-          accessToken: 'managed-keychain-token',
-          expiresAt: Date.now() + 60_000
-        }
-      })
-    )
-    vi.mocked(fetchViaPty).mockResolvedValueOnce({
-      provider: 'claude',
-      session: {
-        usedPercent: 91,
-        windowMinutes: 300,
-        resetsAt: null,
-        resetDescription: null
-      },
-      weekly: {
-        usedPercent: 3,
-        windowMinutes: 10080,
-        resetsAt: null,
-        resetDescription: null
-      },
-      fableWeekly: {
-        usedPercent: 58,
-        windowMinutes: 10080,
-        resetsAt: null,
-        resetDescription: '3d'
-      },
-      updatedAt: 1,
-      error: null,
-      status: 'ok'
-    })
-
-    const result = await fetchManagedAccountUsage(
-      { id: 'account-1', managedAuthPath: ownedAuthPath },
-      { allowUsagePanelSupplement: true }
-    )
-
-    expect(result.fableWeekly).toBeNull()
-  })
-
-  it('refreshes and persists an expiring inactive account before fetching usage', async () => {
-    setPlatform('linux')
-    tempDir = mkdtempSync(join(tmpdir(), 'orca-claude-fetcher-'))
-    appGetPathMock.mockReturnValue(tempDir)
-    const ownedAuthPath = join(tempDir, 'claude-accounts', 'account-1', 'auth')
-    mkdirSync(ownedAuthPath, { recursive: true })
-    writeFileSync(join(ownedAuthPath, '.orca-managed-claude-auth'), 'account-1\n', 'utf-8')
-    const credentialsPath = join(ownedAuthPath, '.credentials.json')
-    writeFileSync(
-      credentialsPath,
-      JSON.stringify({
-        claudeAiOauth: {
-          accessToken: 'stale-access',
-          refreshToken: 'stale-refresh',
-          expiresAt: Date.now() - 60_000
-        }
-      }),
-      'utf-8'
-    )
-
-    // First net.fetch call is the OAuth refresh (token endpoint); second is the
-    // usage fetch with the refreshed access token.
-    netFetchMock.mockResolvedValueOnce({
-      ok: true,
-      json: async () => ({
-        access_token: 'fresh-access',
-        expires_in: 3600,
-        refresh_token: 'fresh-refresh'
-      })
-    })
-    netFetchMock.mockResolvedValueOnce({
-      ok: true,
-      json: async () => ({ five_hour: { utilization: 12 }, seven_day: { utilization: 34 } })
-    })
-
-    const result = await fetchManagedAccountUsage({
-      id: 'account-1',
-      managedAuthPath: ownedAuthPath
-    })
-
-    expect(result.status).toBe('ok')
-    // Rotated token persisted back to managed storage.
-    const persisted = JSON.parse(readFileSync(credentialsPath, 'utf-8'))
-    expect(persisted.claudeAiOauth.accessToken).toBe('fresh-access')
-    expect(persisted.claudeAiOauth.refreshToken).toBe('fresh-refresh')
-    // Usage fetch used the fresh access token.
-    const usageCall = netFetchMock.mock.calls.find(([url]) =>
-      String(url).includes('/api/oauth/usage')
-    )
-    expect(usageCall?.[1]?.headers?.Authorization).toBe('Bearer fresh-access')
-  })
-})
diff --git a/src/main/rate-limits/claude-fetcher-test-harness.ts b/src/main/rate-limits/claude-fetcher-test-harness.ts
deleted file mode 100644
index f679d8388337..000000000000
--- a/src/main/rate-limits/claude-fetcher-test-harness.ts
+++ /dev/null
@@ -1,67 +0,0 @@
-import { vi } from 'vitest'
-import type { Mock } from 'vitest'
-import { fetchViaPty } from './claude-pty'
-import {
-  deleteActiveClaudeKeychainCredentialsStrict,
-  readActiveClaudeKeychainCredentials,
-  readActiveClaudeKeychainCredentialsStrict,
-  readManagedClaudeKeychainCredentials,
-  writeActiveClaudeKeychainCredentials,
-  writeManagedClaudeKeychainCredentials
-} from '../claude-accounts/keychain'
-
-/** Electron/fs mocks each claude-fetcher test file declares via its own `vi.mock` factories. */
-export type ClaudeFetcherHoistedMocks = {
-  netFetchMock: Mock
-  readFileMock: Mock
-  resolveProxyMock: Mock
-  setProxyMock: Mock
-  appGetPathMock: Mock
-}
-
-const originalPlatform = Object.getOwnPropertyDescriptor(process, 'platform')
-
-export function setPlatform(platform: NodeJS.Platform): void {
-  Object.defineProperty(process, 'platform', {
-    configurable: true,
-    value: platform
-  })
-}
-
-export function restorePlatform(): void {
-  if (originalPlatform) {
-    Object.defineProperty(process, 'platform', originalPlatform)
-  }
-}
-
-/** Default happy-path state: darwin, no keychain credentials, OAuth usage 12/34, PTY session 56. */
-export function primeClaudeFetcherMocks(mocks: ClaudeFetcherHoistedMocks): void {
-  setPlatform('darwin')
-  vi.clearAllMocks()
-  mocks.readFileMock.mockRejectedValue(new Error('missing file'))
-  vi.mocked(readActiveClaudeKeychainCredentials).mockResolvedValue(null)
-  vi.mocked(readActiveClaudeKeychainCredentialsStrict).mockResolvedValue(null)
-  vi.mocked(readManagedClaudeKeychainCredentials).mockResolvedValue(null)
-  vi.mocked(writeActiveClaudeKeychainCredentials).mockResolvedValue()
-  vi.mocked(deleteActiveClaudeKeychainCredentialsStrict).mockResolvedValue()
-  vi.mocked(writeManagedClaudeKeychainCredentials).mockResolvedValue()
-  mocks.appGetPathMock.mockReturnValue('/tmp/orca-claude-fetcher-test')
-  mocks.resolveProxyMock.mockResolvedValue('DIRECT')
-  mocks.netFetchMock.mockResolvedValue(
-    new Response(
-      JSON.stringify({
-        five_hour: { utilization: 12 },
-        seven_day: { utilization: 34 }
-      }),
-      { status: 200 }
-    )
-  )
-  vi.mocked(fetchViaPty).mockResolvedValue({
-    provider: 'claude',
-    session: { usedPercent: 56, windowMinutes: 300, resetsAt: null, resetDescription: null },
-    weekly: null,
-    updatedAt: 1,
-    error: null,
-    status: 'ok'
-  })
-}
diff --git a/src/main/rate-limits/claude-fetcher.ts b/src/main/rate-limits/claude-fetcher.ts
index 42427766a26f..9b03a2eb9713 100644
--- a/src/main/rate-limits/claude-fetcher.ts
+++ b/src/main/rate-limits/claude-fetcher.ts
@@ -1,7 +1,9 @@
 import type { ProviderRateLimits } from '../../shared/rate-limit-types'
 import { fetchActiveClaudeRateLimits } from './claude-active-usage-fetch'
-import type { InactiveClaudeAccount } from './claude-managed-account-credentials'
-import { fetchInactiveClaudeAccountUsage } from './claude-managed-account-usage'
+import {
+  fetchInactiveClaudeAccountUsage,
+  type InactiveClaudeAccount
+} from './claude-managed-account-usage'
 import type {
   ClaudeManagedAccountUsageOptions,
   ClaudeRateLimitFetchOptions
diff --git a/src/main/rate-limits/claude-managed-account-credentials.ts b/src/main/rate-limits/claude-managed-account-credentials.ts
deleted file mode 100644
index 71d505510cf1..000000000000
--- a/src/main/rate-limits/claude-managed-account-credentials.ts
+++ /dev/null
@@ -1,127 +0,0 @@
-import { existsSync, lstatSync, readFileSync } from 'node:fs'
-import path from 'node:path'
-import { parseWslUncPath } from '../../shared/wsl-paths'
-import {
-  deleteActiveClaudeKeychainCredentialsStrict,
-  readActiveClaudeKeychainCredentialsStrict,
-  readManagedClaudeKeychainCredentials,
-  writeActiveClaudeKeychainCredentials,
-  writeManagedClaudeKeychainCredentials
-} from '../claude-accounts/keychain'
-import {
-  readClaudeManagedAuthFile,
-  resolveOwnedClaudeManagedAuthPath,
-  writeClaudeManagedAuthFile
-} from '../claude-accounts/managed-auth-path'
-
-export type InactiveClaudeAccount = {
-  id: string
-  managedAuthPath: string
-  managedAuthRuntime?: 'host' | 'wsl'
-  wslDistro?: string | null
-  wslLinuxAuthPath?: string | null
-}
-
-export type ClaudeManagedCredentialsLocation =
-  | { kind: 'keychain'; accountId: string; managedAuthPath: string }
-  | { kind: 'file'; managedAuthPath: string }
-
-export function resolveClaudeManagedCredentialsLocation(
-  account: InactiveClaudeAccount
-): ClaudeManagedCredentialsLocation | null {
-  if (account.managedAuthRuntime === 'wsl') {
-    const managedAuthPath = resolveOwnedWslClaudeManagedAuthPath(account)
-    return managedAuthPath ? { kind: 'file', managedAuthPath } : null
-  }
-  const managedAuthPath = resolveOwnedClaudeManagedAuthPath(account.id, account.managedAuthPath, {
-    adoptLegacyMarker: true
-  })
-  if (!managedAuthPath) {
-    return null
-  }
-  return process.platform === 'darwin'
-    ? { kind: 'keychain', accountId: account.id, managedAuthPath }
-    : { kind: 'file', managedAuthPath }
-}
-
-export async function readClaudeManagedCredentialsJson(
-  location: ClaudeManagedCredentialsLocation
-): Promise<string | null> {
-  try {
-    return location.kind === 'keychain'
-      ? await readManagedClaudeKeychainCredentials(location.accountId)
-      : readClaudeManagedAuthFile(location.managedAuthPath, '.credentials.json')
-  } catch {
-    return null
-  }
-}
-
-export async function writeClaudeManagedCredentialsJson(
-  location: ClaudeManagedCredentialsLocation,
-  credentialsJson: string
-): Promise<void> {
-  if (location.kind === 'keychain') {
-    await writeManagedClaudeKeychainCredentials(location.accountId, credentialsJson)
-  } else {
-    writeClaudeManagedAuthFile(location.managedAuthPath, '.credentials.json', credentialsJson)
-  }
-}
-
-function resolveOwnedWslClaudeManagedAuthPath(account: InactiveClaudeAccount): string | null {
-  if (process.platform !== 'win32') {
-    return null
-  }
-  const wslInfo = parseWslUncPath(account.managedAuthPath)
-  if (!wslInfo || (account.wslDistro && wslInfo.distro !== account.wslDistro)) {
-    return null
-  }
-  const linuxPath = account.wslLinuxAuthPath ?? wslInfo.linuxPath
-  if (
-    !linuxPath.includes('/.local/share/orca/claude-accounts/') ||
-    !linuxPath.endsWith(`/${account.id}/auth`)
-  ) {
-    return null
-  }
-  try {
-    const markerPath = path.join(account.managedAuthPath, '.orca-managed-claude-auth')
-    if (
-      !existsSync(markerPath) ||
-      lstatSync(markerPath).isSymbolicLink() ||
-      readFileSync(markerPath, 'utf-8').trim() !== account.id
-    ) {
-      return null
-    }
-    return account.managedAuthPath
-  } catch {
-    return null
-  }
-}
-
-export async function withClaudeManagedPreviewKeychainCredentials<T>(
-  location: ClaudeManagedCredentialsLocation,
-  credentialsJson: string,
-  operation: () => Promise<T>
-): Promise<T> {
-  if (location.kind !== 'keychain') {
-    return operation()
-  }
-  await writeActiveClaudeKeychainCredentials(credentialsJson, location.managedAuthPath)
-  try {
-    return await operation()
-  } finally {
-    await deleteActiveClaudeKeychainCredentialsStrict(location.managedAuthPath).catch(() => {})
-  }
-}
-
-export async function readStagedClaudeManagedPreviewCredentials(
-  location: ClaudeManagedCredentialsLocation
-): Promise<string | null> {
-  if (location.kind !== 'keychain') {
-    return null
-  }
-  try {
-    return await readActiveClaudeKeychainCredentialsStrict(location.managedAuthPath)
-  } catch {
-    return null
-  }
-}
diff --git a/src/main/rate-limits/claude-managed-account-usage.ts b/src/main/rate-limits/claude-managed-account-usage.ts
index ddf7b3df7508..b2e419f8bb0e 100644
--- a/src/main/rate-limits/claude-managed-account-usage.ts
+++ b/src/main/rate-limits/claude-managed-account-usage.ts
@@ -1,104 +1,66 @@
 import type { ProviderRateLimits } from '../../shared/rate-limit-types'
-import {
-  isOauthTokenExpiring,
-  refreshClaudeOauthCredentials
-} from '../claude-accounts/oauth-refresh'
-import {
-  readClaudeManagedCredentialsJson,
-  resolveClaudeManagedCredentialsLocation,
-  writeClaudeManagedCredentialsJson,
-  type InactiveClaudeAccount
-} from './claude-managed-account-credentials'
-import { fetchClaudeManagedUsagePanelSupplement } from './claude-managed-usage-panel'
-import { parseClaudeOAuthCredentialsJson } from './claude-oauth-credentials'
-import { fetchClaudeOAuthUsage } from './claude-oauth-usage-request'
+import { getClaudeProfileRouter } from '../claude-accounts/claude-profile-installed-router'
+import { savedWslClaudeAccountHome } from '../claude-accounts/claude-profile-wsl-paths'
+import { toWindowsWslPath } from '../../shared/wsl-paths'
 import type { ClaudeManagedAccountUsageOptions } from './claude-usage-fetch-options'
-import {
-  abortedClaudeRateLimitResult,
-  canSupplementClaudeOAuthUsage,
-  mergeClaudeUsageWindows,
-  warnClaudeUsageFetchFailure
-} from './claude-usage-result'
+import { fetchActiveClaudeRateLimits } from './claude-active-usage-fetch'
+import { claudeUsageUnavailable, makeClaudeUsageResult } from './claude-usage-result'
+import { filterPathsToRunningWslDistrosAsync } from '../wsl-running-path-filter'
 
-function noClaudeManagedCredentialsResult(): ProviderRateLimits {
-  return {
-    provider: 'claude',
-    session: null,
-    weekly: null,
-    updatedAt: Date.now(),
-    error: 'No credentials',
-    status: 'error'
-  }
+/** Usage reads the account's own folder; a host account's comes from its id, never a stored path. */
+export type InactiveClaudeAccount = {
+  id: string
+  managedAuthRuntime?: 'host' | 'wsl'
+  wslDistro?: string | null
+  wslLinuxAuthPath?: string | null
 }
 
 export async function fetchInactiveClaudeAccountUsage(
   account: InactiveClaudeAccount,
   options: ClaudeManagedAccountUsageOptions = {}
 ): Promise<ProviderRateLimits> {
-  if (options.signal?.aborted) {
-    return abortedClaudeRateLimitResult()
-  }
-  const location = resolveClaudeManagedCredentialsLocation(account)
-  let credentialsJson = location ? await readClaudeManagedCredentialsJson(location) : null
-  if (options.signal?.aborted) {
-    return abortedClaudeRateLimitResult()
-  }
-  if (!location || !credentialsJson) {
-    return noClaudeManagedCredentialsResult()
-  }
-
-  let token = parseClaudeOAuthCredentialsJson(credentialsJson, 'credentials-file').token
-  if (isOauthTokenExpiring(credentialsJson)) {
-    const refreshed = await refreshClaudeOauthCredentials(credentialsJson)
-    if (options.signal?.aborted) {
-      return abortedClaudeRateLimitResult()
-    }
-    if (refreshed) {
-      try {
-        await writeClaudeManagedCredentialsJson(location, refreshed)
-      } catch {
-        // Keep the refreshed token for this fetch; a later poll can persist it.
-      }
-      credentialsJson = refreshed
-      token = parseClaudeOAuthCredentialsJson(refreshed, 'credentials-file').token
-    }
-  }
-
-  if (!token) {
-    return noClaudeManagedCredentialsResult()
-  }
-  const oauthLimits = await fetchClaudeOAuthUsage(token, options.signal)
-  if (options.signal?.aborted) {
-    return abortedClaudeRateLimitResult()
+  const configDir =
+    account.managedAuthRuntime === 'wsl'
+      ? savedWslClaudeAccountHome(account)
+      : (getClaudeProfileRouter()?.accountHome(account.id) ?? null)
+  if (!configDir || (account.managedAuthRuntime === 'wsl' && !account.wslDistro)) {
+    return makeClaudeUsageResult('error', 'Sign in again to use this account.', {
+      failureKind: 'missing-credentials',
+      attemptedSources: []
+    })
   }
+  const home =
+    account.managedAuthRuntime === 'wsl' && account.wslDistro
+      ? toWindowsWslPath(configDir, account.wslDistro)
+      : configDir
+  // Why: a stopped distro parks a UNC read for minutes, and the inactive loop is sequential.
   if (
-    !canSupplementClaudeOAuthUsage({
-      oauthLimits,
-      authPreparation: undefined,
-      allowUsagePanelSupplement: options.allowUsagePanelSupplement === true
-    })
+    account.managedAuthRuntime === 'wsl' &&
+    (await filterPathsToRunningWslDistrosAsync([home], { requireConfirmed: true })).length === 0
   ) {
-    return oauthLimits
+    return claudeUsageUnavailable()
   }
-
-  try {
-    return mergeClaudeUsageWindows(
-      oauthLimits,
-      await fetchClaudeManagedUsagePanelSupplement({
-        account,
-        location,
-        credentialsJson,
-        oauthLimits,
-        networkProxySettings: options.networkProxySettings,
-        signal: options.signal
-      })
-    )
-  } catch (error) {
-    warnClaudeUsageFetchFailure(
-      undefined,
-      parseClaudeOAuthCredentialsJson(credentialsJson, 'credentials-file'),
-      error
-    )
-    return oauthLimits
+  const read = fetchActiveClaudeRateLimits({
+    signal: options.signal,
+    authPreparation: {
+      configDir: home,
+      runtime: account.managedAuthRuntime,
+      wslDistro: account.wslDistro,
+      envPatch: { CLAUDE_CONFIG_DIR: configDir },
+      stripAuthEnv: true,
+      provenance: `profile:${account.id}`
+    }
+  })
+  if (account.managedAuthRuntime !== 'wsl') {
+    return read
   }
+  const timeout = AbortSignal.timeout(INACTIVE_WSL_READ_TIMEOUT_MS)
+  return Promise.race([
+    read,
+    new Promise<ProviderRateLimits>((resolve) =>
+      timeout.addEventListener('abort', () => resolve(claudeUsageUnavailable()), { once: true })
+    )
+  ])
 }
+
+const INACTIVE_WSL_READ_TIMEOUT_MS = 10_000
diff --git a/src/main/rate-limits/claude-managed-usage-panel.ts b/src/main/rate-limits/claude-managed-usage-panel.ts
deleted file mode 100644
index 15c1e90169c7..000000000000
--- a/src/main/rate-limits/claude-managed-usage-panel.ts
+++ /dev/null
@@ -1,113 +0,0 @@
-import type { ProviderRateLimits, RateLimitWindow } from '../../shared/rate-limit-types'
-import type { NetworkProxySettings } from '../../shared/network-proxy'
-import type { ClaudeRuntimeAuthPreparation } from '../claude-accounts/runtime-auth-service'
-import { fetchViaPty } from './claude-pty'
-import {
-  readStagedClaudeManagedPreviewCredentials,
-  withClaudeManagedPreviewKeychainCredentials,
-  writeClaudeManagedCredentialsJson,
-  type ClaudeManagedCredentialsLocation,
-  type InactiveClaudeAccount
-} from './claude-managed-account-credentials'
-
-function getManagedUsagePanelAuthPreparation(
-  account: InactiveClaudeAccount,
-  location: ClaudeManagedCredentialsLocation
-): ClaudeRuntimeAuthPreparation | null {
-  if (process.platform === 'win32') {
-    return null
-  }
-  if (account.managedAuthRuntime === 'wsl') {
-    if (!account.wslLinuxAuthPath || !account.wslDistro) {
-      return null
-    }
-    return {
-      configDir: location.managedAuthPath,
-      runtime: 'wsl',
-      wslDistro: account.wslDistro,
-      wslLinuxConfigDir: account.wslLinuxAuthPath,
-      envPatch: { CLAUDE_CONFIG_DIR: account.wslLinuxAuthPath },
-      stripAuthEnv: true,
-      provenance: `managed:${account.id}:inactive-preview`
-    }
-  }
-  return {
-    configDir: location.managedAuthPath,
-    runtime: 'host',
-    wslDistro: null,
-    wslLinuxConfigDir: null,
-    envPatch: { CLAUDE_CONFIG_DIR: location.managedAuthPath },
-    stripAuthEnv: true,
-    provenance: `managed:${account.id}:inactive-preview`
-  }
-}
-
-function windowsAgree(left: RateLimitWindow | null, right: RateLimitWindow | null): boolean {
-  return Boolean(left && right && Math.abs(left.usedPercent - right.usedPercent) <= 1)
-}
-
-function canTrustManagedUsagePanelSupplement(
-  oauthLimits: ProviderRateLimits,
-  cliLimits: ProviderRateLimits,
-  requireMatchingOAuthWindow: boolean
-): boolean {
-  if (!requireMatchingOAuthWindow) {
-    return true
-  }
-  const sharedWindowMatches = [
-    oauthLimits.session && cliLimits.session
-      ? windowsAgree(oauthLimits.session, cliLimits.session)
-      : null,
-    oauthLimits.weekly && cliLimits.weekly
-      ? windowsAgree(oauthLimits.weekly, cliLimits.weekly)
-      : null
-  ].filter((match): match is boolean => match !== null)
-  // Why: older Claude builds may ignore the scoped Keychain and expose the active account.
-  return sharedWindowMatches.length > 0 && sharedWindowMatches.every(Boolean)
-}
-
-export async function fetchClaudeManagedUsagePanelSupplement(input: {
-  account: InactiveClaudeAccount
-  location: ClaudeManagedCredentialsLocation
-  credentialsJson: string
-  oauthLimits: ProviderRateLimits
-  networkProxySettings?: NetworkProxySettings
-  signal?: AbortSignal
-}): Promise<ProviderRateLimits | null> {
-  if (input.signal?.aborted) {
-    return null
-  }
-  const authPreparation = getManagedUsagePanelAuthPreparation(input.account, input.location)
-  if (!authPreparation) {
-    return null
-  }
-
-  return withClaudeManagedPreviewKeychainCredentials(
-    input.location,
-    input.credentialsJson,
-    async () => {
-      const cliLimits = await fetchViaPty({
-        authPreparation,
-        networkProxySettings: input.networkProxySettings,
-        signal: input.signal
-      })
-      if (input.signal?.aborted) {
-        return null
-      }
-      if (
-        !canTrustManagedUsagePanelSupplement(
-          input.oauthLimits,
-          cliLimits,
-          input.location.kind === 'keychain'
-        )
-      ) {
-        return null
-      }
-      const refreshed = await readStagedClaudeManagedPreviewCredentials(input.location)
-      if (refreshed && refreshed !== input.credentialsJson) {
-        await writeClaudeManagedCredentialsJson(input.location, refreshed)
-      }
-      return cliLimits
-    }
-  )
-}
diff --git a/src/main/rate-limits/claude-oauth-credentials.ts b/src/main/rate-limits/claude-oauth-credentials.ts
index 3e14fb2909e7..7fa4d04fbb92 100644
--- a/src/main/rate-limits/claude-oauth-credentials.ts
+++ b/src/main/rate-limits/claude-oauth-credentials.ts
@@ -1,160 +1,137 @@
 import { readFile } from 'node:fs/promises'
 import { homedir } from 'node:os'
 import path from 'node:path'
-import {
-  readActiveClaudeKeychainCredentials,
-  readActiveClaudeKeychainCredentialsStrict
-} from '../claude-accounts/keychain'
-import type { ClaudeRuntimeAuthPreparation } from '../claude-accounts/runtime-auth-service'
-
-type ClaudeCredentials = {
-  claudeAiOauth?: {
-    accessToken?: string
-    refreshToken?: string
-    expiresAt?: number
-  }
-}
+import { z } from 'zod'
+import { isDefinitiveAbsence } from '../../shared/definitive-filesystem-absence'
+import { readActiveClaudeKeychainCredentialsStrict } from '../claude-accounts/keychain'
+import type { ClaudeRuntimeAuthPreparation } from '../claude-accounts/runtime-auth/runtime-auth-types'
+import { readUserClaudeConfigDir } from '../claude-accounts/claude-profile-paths'
+import { getClaudeProfileRouter } from '../claude-accounts/claude-profile-installed-router'
 
 export type ClaudeOAuthCredentialSource =
   | 'scoped-keychain'
   | 'legacy-keychain'
   | 'credentials-file'
   | 'none'
-
 export type ClaudeOAuthCredentialReadResult = {
   token: string | null
   hasRefreshableCredentials: boolean
   source: ClaudeOAuthCredentialSource
   keychainUnavailable?: boolean
+  unavailable?: boolean
 }
-
 type ClaudeOAuthCredentialReadOptions = {
   credentialsFileConfigDir?: string
   keychainConfigDir?: string
+  /** System Default only: a managed profile never reads another login's item. */
+  unsuffixedKeychainFallback?: boolean
 }
-
+const schema = z.object({
+  claudeAiOauth: z
+    .object({
+      accessToken: z.string().optional(),
+      refreshToken: z.string().optional()
+    })
+    .optional()
+})
 export function parseClaudeOAuthCredentialsJson(
   raw: string,
   source: ClaudeOAuthCredentialSource
 ): ClaudeOAuthCredentialReadResult {
   try {
-    const oauth = (JSON.parse(raw) as ClaudeCredentials)?.claudeAiOauth
-    const hasRefreshableCredentials =
-      typeof oauth?.refreshToken === 'string' && oauth.refreshToken.trim() !== ''
-    if (!oauth?.accessToken || typeof oauth.accessToken !== 'string') {
-      return { token: null, hasRefreshableCredentials, source }
-    }
+    const oauth = schema.parse(JSON.parse(raw)).claudeAiOauth
     // Why: expiresAt is not authoritative for the usage endpoint; let the server decide.
-    return { token: oauth.accessToken, hasRefreshableCredentials, source }
+    return {
+      token: oauth?.accessToken || null,
+      hasRefreshableCredentials: Boolean(oauth?.refreshToken),
+      source
+    }
   } catch {
-    return emptyClaudeOAuthCredentialReadResult()
+    return { ...emptyClaudeOAuthCredentialReadResult(), unavailable: true }
   }
 }
-
 export function emptyClaudeOAuthCredentialReadResult(): ClaudeOAuthCredentialReadResult {
   return { token: null, hasRefreshableCredentials: false, source: 'none' }
 }
-
-function unavailableKeychainResult(): ClaudeOAuthCredentialReadResult {
-  return {
-    token: null,
-    hasRefreshableCredentials: false,
-    source: 'none',
-    keychainUnavailable: true
-  }
-}
-
-async function readFromKeychain(configDir?: string): Promise<ClaudeOAuthCredentialReadResult> {
-  if (process.platform !== 'darwin') {
-    return emptyClaudeOAuthCredentialReadResult()
-  }
-
-  if (configDir) {
-    const scoped = await readClaudeCredentialsFromStrictKeychain(configDir, 'scoped-keychain')
-    if (scoped.token) {
-      return scoped
-    }
-
-    const legacy = await readClaudeCredentialsFromStrictKeychain(undefined, 'legacy-keychain')
-    // Why: a real access token must not be shadowed by scoped refresh-only credentials.
-    if (legacy.token) {
-      return legacy
-    }
-    if (scoped.hasRefreshableCredentials) {
-      return scoped
-    }
-    if (legacy.hasRefreshableCredentials) {
-      return legacy
-    }
-    return scoped.keychainUnavailable || legacy.keychainUnavailable
-      ? unavailableKeychainResult()
-      : legacy
-  }
-
-  try {
-    const credentials = await readActiveClaudeKeychainCredentials(configDir)
-    return credentials
-      ? parseClaudeOAuthCredentialsJson(credentials, 'legacy-keychain')
-      : emptyClaudeOAuthCredentialReadResult()
-  } catch {
-    return unavailableKeychainResult()
-  }
-}
-
 export async function readClaudeCredentialsFromStrictKeychain(
   configDir: string | undefined,
   source: ClaudeOAuthCredentialSource
 ): Promise<ClaudeOAuthCredentialReadResult> {
   try {
-    const credentials = await readActiveClaudeKeychainCredentialsStrict(configDir)
-    return credentials
-      ? parseClaudeOAuthCredentialsJson(credentials, source)
+    const contents = await readActiveClaudeKeychainCredentialsStrict(configDir)
+    return contents
+      ? parseClaudeOAuthCredentialsJson(contents, source)
       : emptyClaudeOAuthCredentialReadResult()
   } catch {
-    return unavailableKeychainResult()
+    return {
+      ...emptyClaudeOAuthCredentialReadResult(),
+      unavailable: true,
+      keychainUnavailable: true
+    }
   }
 }
-
-async function readFromCredentialsFile(
-  configDir?: string
+async function readClaudeKeychainCredentials(
+  options?: ClaudeOAuthCredentialReadOptions
 ): Promise<ClaudeOAuthCredentialReadResult> {
-  const credentialPath = path.join(
-    configDir ?? path.join(homedir(), '.claude'),
-    '.credentials.json'
+  if (!options?.keychainConfigDir) {
+    return readClaudeCredentialsFromStrictKeychain(undefined, 'legacy-keychain')
+  }
+  const scoped = await readClaudeCredentialsFromStrictKeychain(
+    options.keychainConfigDir,
+    'scoped-keychain'
   )
-  try {
-    return parseClaudeOAuthCredentialsJson(
-      await readFile(credentialPath, 'utf-8'),
-      'credentials-file'
-    )
-  } catch {
-    return emptyClaudeOAuthCredentialReadResult()
+  if (scoped.token || !options.unsuffixedKeychainFallback) {
+    return scoped
   }
+  const legacy = await readClaudeCredentialsFromStrictKeychain(undefined, 'legacy-keychain')
+  // Why: as before profiles, a token wins over an unreadable item.
+  const candidates = [scoped, legacy]
+  return (
+    candidates.find((candidate) => candidate.token) ??
+    candidates.find((candidate) => candidate.unavailable) ??
+    legacy
+  )
 }
-
 export async function readClaudeOAuthCredentials(
   options?: ClaudeOAuthCredentialReadOptions
 ): Promise<ClaudeOAuthCredentialReadResult> {
-  const keychain = await readFromKeychain(options?.keychainConfigDir)
-  if (keychain.token || keychain.hasRefreshableCredentials) {
+  const keychain =
+    process.platform === 'darwin'
+      ? await readClaudeKeychainCredentials(options)
+      : emptyClaudeOAuthCredentialReadResult()
+  if (keychain.token) {
     return keychain
   }
-
-  const file = await readFromCredentialsFile(options?.credentialsFileConfigDir)
-  if (file.token || file.hasRefreshableCredentials) {
-    return file
+  try {
+    return parseClaudeOAuthCredentialsJson(
+      await readFile(
+        path.join(
+          options?.credentialsFileConfigDir ?? path.join(homedir(), '.claude'),
+          '.credentials.json'
+        ),
+        'utf8'
+      ),
+      'credentials-file'
+    )
+  } catch (error) {
+    return isDefinitiveAbsence(error) ? keychain : { ...keychain, unavailable: true }
   }
-  return keychain.keychainUnavailable ? keychain : emptyClaudeOAuthCredentialReadResult()
 }
-
 export function resolveClaudeOAuthCredentialReadOptions(
   authPreparation?: ClaudeRuntimeAuthPreparation
 ): ClaudeOAuthCredentialReadOptions | undefined {
   if (!authPreparation) {
     return undefined
   }
+  const accountDir = authPreparation.envPatch.CLAUDE_CONFIG_DIR
   return {
     credentialsFileConfigDir: authPreparation.configDir,
-    keychainConfigDir: authPreparation.configDir
+    // Why the user's own folder, login shell first: Claude names System default's item from it.
+    keychainConfigDir:
+      accountDir ??
+      getClaudeProfileRouter()?.userConfigDir() ??
+      readUserClaudeConfigDir(process.env),
+    // An unsuffixed lookup is exclusively System default, never a fallback from an account.
+    unsuffixedKeychainFallback: !accountDir
   }
 }
diff --git a/src/main/rate-limits/claude-oauth-recovery.ts b/src/main/rate-limits/claude-oauth-recovery.ts
deleted file mode 100644
index 58c6bf91cb37..000000000000
--- a/src/main/rate-limits/claude-oauth-recovery.ts
+++ /dev/null
@@ -1,172 +0,0 @@
-import type { ProviderRateLimits } from '../../shared/rate-limit-types'
-import type { ClaudeRuntimeAuthPreparation } from '../claude-accounts/runtime-auth-service'
-import { withMacTailscaleDnsHint } from '../network/macos-tailscale-dns-diagnostic'
-import { completeClaudeOAuthUsageSuccess, fetchClaudeUsageViaCli } from './claude-cli-usage-fetch'
-import {
-  readClaudeCredentialsFromStrictKeychain,
-  readClaudeOAuthCredentials,
-  resolveClaudeOAuthCredentialReadOptions,
-  type ClaudeOAuthCredentialReadResult
-} from './claude-oauth-credentials'
-import { OAuthUsageError } from './claude-oauth-usage-error'
-import { fetchClaudeOAuthUsage } from './claude-oauth-usage-request'
-import type { ClaudeUsageErrorClassification } from './claude-usage-error-classification'
-import type { ClaudeRateLimitFetchOptions } from './claude-usage-fetch-options'
-import {
-  abortedClaudeRateLimitResult,
-  isManagedClaudeAuth,
-  makeClaudeUsageResult,
-  mergeClaudeUsageWindows,
-  metadataForClaudeUsageAttempt,
-  recordClaudeUsageAttempt,
-  type ClaudeUsageAttemptState,
-  warnClaudeUsageFetchFailure,
-  withClaudeUsageMetadata
-} from './claude-usage-result'
-
-const LIVE_REFRESH_DEFERRED_MESSAGE =
-  'Claude usage refresh is waiting for the live Claude terminal to rotate its credentials.'
-
-export function canRetryClaudeOAuthWithLegacyKeychain(input: {
-  classification: ClaudeUsageErrorClassification
-  oauthCredentials: ClaudeOAuthCredentialReadResult
-  authPreparation?: ClaudeRuntimeAuthPreparation
-}): boolean {
-  return (
-    input.classification.failureKind === 'stale-token' &&
-    input.oauthCredentials.source === 'scoped-keychain' &&
-    (input.authPreparation?.runtime ?? 'host') === 'host' &&
-    !isManagedClaudeAuth(input.authPreparation)
-  )
-}
-
-export async function retryClaudeOAuthWithLegacyKeychain(input: {
-  failedToken: string | null
-  attempts: ClaudeUsageAttemptState
-  options?: ClaudeRateLimitFetchOptions
-}): Promise<ProviderRateLimits | null> {
-  const legacy = await readClaudeCredentialsFromStrictKeychain(undefined, 'legacy-keychain')
-  if (!legacy.token || legacy.token === input.failedToken) {
-    return null
-  }
-  if (input.options?.signal?.aborted) {
-    return abortedClaudeRateLimitResult()
-  }
-  try {
-    const limits = await fetchClaudeOAuthUsage(legacy.token, input.options?.signal)
-    if (input.options?.signal?.aborted) {
-      return abortedClaudeRateLimitResult()
-    }
-    return await completeClaudeOAuthUsageSuccess({
-      oauthLimits: limits,
-      oauthCredentials: legacy,
-      attempts: input.attempts,
-      options: input.options
-    })
-  } catch (error) {
-    warnClaudeUsageFetchFailure(input.options?.authPreparation, legacy, error)
-    return null
-  }
-}
-
-export function shouldDeferClaudeUsageForLiveSession(
-  authPreparation: ClaudeRuntimeAuthPreparation | undefined,
-  classification: ClaudeUsageErrorClassification
-): boolean {
-  return Boolean(
-    authPreparation?.managedRefreshDeferredByLivePty &&
-    (classification.failureKind === 'stale-token' ||
-      classification.failureKind === 'refreshable-credentials-without-token' ||
-      classification.failureKind === 'deferred-by-live-session')
-  )
-}
-
-export function makeLiveClaudeUsageDeferredResult(input: {
-  attempts: ClaudeUsageAttemptState
-  oauthCredentials: ClaudeOAuthCredentialReadResult
-  authPreparation?: ClaudeRuntimeAuthPreparation
-}): ProviderRateLimits {
-  return makeClaudeUsageResult('error', LIVE_REFRESH_DEFERRED_MESSAGE, {
-    ...metadataForClaudeUsageAttempt({
-      attemptedSources: input.attempts.attemptedSources,
-      oauthCredentials: input.oauthCredentials,
-      authPreparation: input.authPreparation,
-      failureKind: 'deferred-by-live-session',
-      deferredByLiveClaudeSession: true
-    })
-  })
-}
-
-export function makeClaudeUsageClassificationError(input: {
-  error: unknown
-  classification: ClaudeUsageErrorClassification
-  attempts: ClaudeUsageAttemptState
-  oauthCredentials: ClaudeOAuthCredentialReadResult
-  authPreparation?: ClaudeRuntimeAuthPreparation
-}): ProviderRateLimits {
-  const message =
-    input.error instanceof Error ? input.error.message : String(input.error || 'Unknown error')
-  const retryAfterMs = input.error instanceof OAuthUsageError ? input.error.retryAfterMs : null
-  return makeClaudeUsageResult('error', withMacTailscaleDnsHint(message), {
-    ...metadataForClaudeUsageAttempt({
-      attemptedSources: input.attempts.attemptedSources,
-      oauthCredentials: input.oauthCredentials,
-      authPreparation: input.authPreparation,
-      failureKind: input.classification.failureKind,
-      retryAtMs: retryAfterMs ? Date.now() + retryAfterMs : undefined
-    })
-  })
-}
-
-export async function repairClaudeCredentialsThenRetryOAuth(input: {
-  options?: ClaudeRateLimitFetchOptions
-  attempts: ClaudeUsageAttemptState
-  oauthCredentials: ClaudeOAuthCredentialReadResult
-}): Promise<ProviderRateLimits | null> {
-  if (input.options?.signal?.aborted) {
-    return abortedClaudeRateLimitResult()
-  }
-  let cliResult: ProviderRateLimits | null = null
-  try {
-    cliResult = await fetchClaudeUsageViaCli({
-      authPreparation: input.options?.authPreparation,
-      oauthCredentials: input.oauthCredentials,
-      attempts: input.attempts,
-      networkProxySettings: input.options?.networkProxySettings,
-      signal: input.options?.signal
-    })
-  } catch (error) {
-    warnClaudeUsageFetchFailure(input.options?.authPreparation, input.oauthCredentials, error)
-  }
-
-  if (input.options?.signal?.aborted) {
-    return abortedClaudeRateLimitResult()
-  }
-  const refreshed = await readClaudeOAuthCredentials(
-    resolveClaudeOAuthCredentialReadOptions(input.options?.authPreparation)
-  )
-  if (input.options?.signal?.aborted) {
-    return abortedClaudeRateLimitResult()
-  }
-  if (refreshed.token) {
-    recordClaudeUsageAttempt(input.attempts, 'oauth')
-    try {
-      const retry = await fetchClaudeOAuthUsage(refreshed.token, input.options?.signal)
-      if (input.options?.signal?.aborted) {
-        return abortedClaudeRateLimitResult()
-      }
-      return withClaudeUsageMetadata(
-        mergeClaudeUsageWindows(retry, cliResult),
-        metadataForClaudeUsageAttempt({
-          attemptedSources: input.attempts.attemptedSources,
-          oauthCredentials: refreshed,
-          authPreparation: input.options?.authPreparation,
-          source: 'oauth'
-        })
-      )
-    } catch (error) {
-      warnClaudeUsageFetchFailure(input.options?.authPreparation, refreshed, error)
-    }
-  }
-  return cliResult
-}
diff --git a/src/main/rate-limits/claude-fetcher-extra-usage.test.ts b/src/main/rate-limits/claude-oauth-usage-extra-usage.test.ts
similarity index 66%
rename from src/main/rate-limits/claude-fetcher-extra-usage.test.ts
rename to src/main/rate-limits/claude-oauth-usage-extra-usage.test.ts
index fb56512bd8c6..9911343080c4 100644
--- a/src/main/rate-limits/claude-fetcher-extra-usage.test.ts
+++ b/src/main/rate-limits/claude-oauth-usage-extra-usage.test.ts
@@ -1,94 +1,28 @@
-import { beforeEach, afterEach, describe, expect, it, vi } from 'vitest'
-import { fetchClaudeRateLimits } from './claude-fetcher'
-import { primeClaudeFetcherMocks, restorePlatform } from './claude-fetcher-test-harness'
-import { readActiveClaudeKeychainCredentialsStrict } from '../claude-accounts/keychain'
-import type { ClaudeRuntimeAuthPreparation } from '../claude-accounts/runtime-auth-service'
+import { beforeEach, describe, expect, it, vi } from 'vitest'
+import { fetchClaudeOAuthUsage } from './claude-oauth-usage-request'
 
-const { netFetchMock, readFileMock, resolveProxyMock, setProxyMock, appGetPathMock } = vi.hoisted(
-  () => ({
-    netFetchMock: vi.fn(),
-    readFileMock: vi.fn(),
-    resolveProxyMock: vi.fn(),
-    setProxyMock: vi.fn(),
-    appGetPathMock: vi.fn()
-  })
-)
-
-vi.mock('node:fs/promises', () => ({
-  readFile: readFileMock
-}))
+const { netFetchMock } = vi.hoisted(() => ({ netFetchMock: vi.fn() }))
 
 vi.mock('electron', () => ({
-  app: {
-    getPath: appGetPathMock
-  },
-  net: {
-    fetch: netFetchMock
-  },
-  session: {
-    defaultSession: {
-      resolveProxy: resolveProxyMock,
-      setProxy: setProxyMock
-    }
-  }
-}))
-
-vi.mock('./claude-pty', () => ({
-  fetchViaPty: vi.fn()
+  net: { fetch: netFetchMock },
+  session: { defaultSession: {} }
 }))
 
-vi.mock('../claude-accounts/keychain', () => ({
-  deleteActiveClaudeKeychainCredentialsStrict: vi.fn(),
-  readActiveClaudeKeychainCredentials: vi.fn(),
-  readActiveClaudeKeychainCredentialsStrict: vi.fn(),
-  readManagedClaudeKeychainCredentials: vi.fn(),
-  writeActiveClaudeKeychainCredentials: vi.fn(),
-  writeManagedClaudeKeychainCredentials: vi.fn()
+vi.mock('../network/proxy-settings', () => ({
+  ensureElectronProxyFromEnvironment: vi.fn(async () => {})
 }))
 
-function oauthPrep(): ClaudeRuntimeAuthPreparation {
-  return {
-    configDir: '/Users/test/.claude',
-    envPatch: { CLAUDE_CONFIG_DIR: '/Users/test/.claude' },
-    stripAuthEnv: false,
-    provenance: 'system'
-  }
-}
-
 async function fetchUsageResponse(body: string) {
-  vi.mocked(readActiveClaudeKeychainCredentialsStrict).mockResolvedValueOnce(
-    JSON.stringify({
-      claudeAiOauth: { accessToken: 'oauth-token', expiresAt: Date.now() + 60_000 }
-    })
-  )
   netFetchMock.mockResolvedValueOnce(new Response(body, { status: 200 }))
-  return fetchClaudeRateLimits({ authPreparation: oauthPrep() })
+  return fetchClaudeOAuthUsage('oauth-token')
 }
 
-describe('fetchClaudeRateLimits extra usage', () => {
+describe('Claude OAuth usage extra usage', () => {
   beforeEach(() => {
-    primeClaudeFetcherMocks({
-      netFetchMock,
-      readFileMock,
-      resolveProxyMock,
-      setProxyMock,
-      appGetPathMock
-    })
-  })
-
-  afterEach(() => {
-    restorePlatform()
+    vi.clearAllMocks()
   })
 
   it('maps the usage-credits spend object into a capped balance in major units', async () => {
-    vi.mocked(readActiveClaudeKeychainCredentialsStrict).mockResolvedValueOnce(
-      JSON.stringify({
-        claudeAiOauth: {
-          accessToken: 'oauth-token',
-          expiresAt: Date.now() + 60_000
-        }
-      })
-    )
     netFetchMock.mockResolvedValueOnce(
       new Response(
         JSON.stringify({
@@ -105,7 +39,7 @@ describe('fetchClaudeRateLimits extra usage', () => {
       )
     )
 
-    await expect(fetchClaudeRateLimits({ authPreparation: oauthPrep() })).resolves.toMatchObject({
+    await expect(fetchClaudeOAuthUsage('oauth-token')).resolves.toMatchObject({
       provider: 'claude',
       status: 'ok',
       extraUsage: {
@@ -122,14 +56,6 @@ describe('fetchClaudeRateLimits extra usage', () => {
   })
 
   it('keeps the usage-credits cap visible without inventing an out-of-credits balance', async () => {
-    vi.mocked(readActiveClaudeKeychainCredentialsStrict).mockResolvedValueOnce(
-      JSON.stringify({
-        claudeAiOauth: {
-          accessToken: 'oauth-token',
-          expiresAt: Date.now() + 60_000
-        }
-      })
-    )
     netFetchMock.mockResolvedValueOnce(
       new Response(
         JSON.stringify({
@@ -147,7 +73,7 @@ describe('fetchClaudeRateLimits extra usage', () => {
       )
     )
 
-    await expect(fetchClaudeRateLimits({ authPreparation: oauthPrep() })).resolves.toMatchObject({
+    await expect(fetchClaudeOAuthUsage('oauth-token')).resolves.toMatchObject({
       provider: 'claude',
       status: 'ok',
       extraUsage: {
@@ -163,14 +89,6 @@ describe('fetchClaudeRateLimits extra usage', () => {
   })
 
   it('keeps legacy extra_usage spend data without inventing a missing balance', async () => {
-    vi.mocked(readActiveClaudeKeychainCredentialsStrict).mockResolvedValueOnce(
-      JSON.stringify({
-        claudeAiOauth: {
-          accessToken: 'oauth-token',
-          expiresAt: Date.now() + 60_000
-        }
-      })
-    )
     netFetchMock.mockResolvedValueOnce(
       new Response(
         JSON.stringify({
@@ -188,7 +106,7 @@ describe('fetchClaudeRateLimits extra usage', () => {
       )
     )
 
-    await expect(fetchClaudeRateLimits({ authPreparation: oauthPrep() })).resolves.toMatchObject({
+    await expect(fetchClaudeOAuthUsage('oauth-token')).resolves.toMatchObject({
       provider: 'claude',
       status: 'ok',
       extraUsage: {
diff --git a/src/main/rate-limits/claude-profile-usage.test.ts b/src/main/rate-limits/claude-profile-usage.test.ts
new file mode 100644
index 000000000000..36816ea655ae
--- /dev/null
+++ b/src/main/rate-limits/claude-profile-usage.test.ts
@@ -0,0 +1,271 @@
+import type * as Keychain from '../claude-accounts/keychain'
+import { mkdtempSync, mkdirSync, writeFileSync, rmSync } from 'node:fs'
+import { tmpdir } from 'node:os'
+import { join } from 'node:path'
+import { afterEach, expect, it, vi } from 'vitest'
+const calls = vi.hoisted(() => ({ keychain: vi.fn(), usage: vi.fn(), keychainService: vi.fn() }))
+vi.mock('../macos-keychain/generic-password', () => ({
+  readKeychainPassword: calls.keychainService
+}))
+vi.mock('../claude-accounts/keychain', () => ({
+  readActiveClaudeKeychainCredentialsStrict: calls.keychain
+}))
+const profileRouter = vi.hoisted((): { userConfigDir?: string } => ({}))
+vi.mock('../claude-accounts/claude-profile-installed-router', () => ({
+  getClaudeProfileRouter: () =>
+    profileRouter.userConfigDir ? { userConfigDir: () => profileRouter.userConfigDir } : undefined
+}))
+vi.mock('./claude-oauth-usage-request', () => ({ fetchClaudeOAuthUsage: calls.usage }))
+const runningDistros = vi.hoisted(() => ({
+  filter: vi.fn(async (paths: readonly string[]) => [...paths])
+}))
+vi.mock('../wsl-running-path-filter', () => ({
+  filterPathsToRunningWslDistrosAsync: runningDistros.filter
+}))
+vi.mock('../../shared/child-process/run-process', () => ({
+  spawnProcess: () => {
+    throw new Error('Usage must not launch a process')
+  },
+  runProcess: () => {
+    throw new Error('Usage must not launch a process')
+  }
+}))
+import { fetchActiveClaudeRateLimits } from './claude-active-usage-fetch'
+import {
+  readClaudeOAuthCredentials,
+  resolveClaudeOAuthCredentialReadOptions
+} from './claude-oauth-credentials'
+import { OAuthUsageError } from './claude-oauth-usage-error'
+import { CLAUDE_PROFILE_MISSING_MESSAGE } from '../../shared/claude-profile-routing'
+const roots: string[] = []
+afterEach(() => {
+  roots.splice(0).forEach((root) => rmSync(root, { recursive: true, force: true }))
+  vi.unstubAllGlobals()
+  vi.clearAllMocks()
+})
+function profile() {
+  const home = mkdtempSync(join(tmpdir(), 'claude-usage-'))
+  roots.push(home)
+  calls.keychain.mockResolvedValue(null)
+  const options = {
+    authPreparation: {
+      configDir: home,
+      envPatch: { CLAUDE_CONFIG_DIR: home },
+      stripAuthEnv: true,
+      provenance: 'profile:fake'
+    }
+  }
+  return { home, options }
+}
+function systemDefault() {
+  const home = mkdtempSync(join(tmpdir(), 'claude-usage-default-'))
+  roots.push(home)
+  calls.keychain.mockResolvedValue(null)
+  return {
+    home,
+    options: {
+      authPreparation: { configDir: home, envPatch: {}, stripAuthEnv: false, provenance: 'system' }
+    }
+  }
+}
+it('lets the server decide a locally expired token and never refreshes it', async () => {
+  const f = profile()
+  const file = join(f.home, '.credentials.json')
+  writeFileSync(
+    file,
+    JSON.stringify({
+      claudeAiOauth: { accessToken: 'expired-fake', refreshToken: 'must-not-be-used', expiresAt: 1 }
+    })
+  )
+  vi.stubGlobal('fetch', () => {
+    throw new Error('No refresh endpoint')
+  })
+  calls.usage.mockRejectedValue(new OAuthUsageError('Invalid OAuth token.', 401, true, null))
+  expect(await fetchActiveClaudeRateLimits(f.options)).toMatchObject({
+    status: 'error',
+    error: 'Claude usage has expired. Start Claude in this account to refresh it.',
+    usageMetadata: { failureKind: 'stale-token' }
+  })
+  expect(calls.usage.mock.calls.map(([token]) => token)).toEqual(['expired-fake'])
+  const system = systemDefault()
+  writeFileSync(
+    join(system.home, '.credentials.json'),
+    JSON.stringify({ claudeAiOauth: { accessToken: 'expired-default', expiresAt: 1 } })
+  )
+  calls.usage.mockResolvedValueOnce({ provider: 'claude', status: 'ok' })
+  expect(await fetchActiveClaudeRateLimits(system.options)).toMatchObject({ status: 'ok' })
+  expect(await fetchActiveClaudeRateLimits(system.options)).toMatchObject({
+    error: 'Claude usage updates the next time Claude runs.',
+    usageMetadata: { failureKind: 'stale-token' }
+  })
+})
+it('reads only the requested scoped Keychain, with no unsuffixed fallback', async () => {
+  const f = profile()
+  await readClaudeOAuthCredentials({ credentialsFileConfigDir: f.home, keychainConfigDir: f.home })
+  if (process.platform === 'darwin') {
+    expect(calls.keychain.mock.calls).toEqual([[f.home]])
+  } else {
+    expect(calls.keychain).not.toHaveBeenCalled()
+  }
+})
+it('distinguishes missing, malformed and inaccessible credential observations', async () => {
+  const f = profile()
+  expect(await fetchActiveClaudeRateLimits(f.options)).toMatchObject({
+    usageMetadata: { failureKind: 'missing-credentials' }
+  })
+  writeFileSync(join(f.home, '.credentials.json'), '{')
+  expect(await fetchActiveClaudeRateLimits(f.options)).toMatchObject({
+    usageMetadata: { failureKind: 'keychain-unavailable' }
+  })
+})
+it('reports an unreadable selected account before any credential read and requests no hidden recovery', async () => {
+  const f = profile()
+  expect(
+    await fetchActiveClaudeRateLimits({
+      authPreparation: { ...f.options.authPreparation, usageError: CLAUDE_PROFILE_MISSING_MESSAGE }
+    })
+  ).toMatchObject({ status: 'error', usageMetadata: { failureKind: 'missing-credentials' } })
+  expect(calls.keychain).not.toHaveBeenCalled()
+  writeFileSync(
+    join(f.home, '.credentials.json'),
+    JSON.stringify({ claudeAiOauth: { accessToken: 'fake' } })
+  )
+  calls.usage.mockRejectedValue(new Error('network unavailable'))
+  expect(await fetchActiveClaudeRateLimits(f.options)).toMatchObject({ status: 'error' })
+  expect(calls.usage).toHaveBeenCalledTimes(1)
+})
+
+it('strict Keychain lookup never falls back to the unsuffixed service', async () => {
+  const f = profile()
+  calls.keychainService.mockResolvedValue(null)
+  const actual = await vi.importActual<typeof Keychain>('../claude-accounts/keychain')
+  await actual.readActiveClaudeKeychainCredentialsStrict(f.home)
+  expect(calls.keychainService).toHaveBeenCalled()
+  for (const [service] of calls.keychainService.mock.calls) {
+    expect(service).toMatch(/^Claude Code-credentials-[0-9a-f]{8}$/)
+  }
+  calls.keychainService.mockClear()
+  calls.keychainService.mockRejectedValue(new Error('locked'))
+  await expect(actual.readActiveClaudeKeychainCredentialsStrict(f.home)).rejects.toThrow('locked')
+  expect(calls.keychainService).toHaveBeenCalledTimes(1)
+})
+it('treats an unreadable credential file as unavailable, not a missing login', async () => {
+  const f = profile()
+  mkdirSync(join(f.home, '.credentials.json'))
+  expect(await fetchActiveClaudeRateLimits(f.options)).toMatchObject({
+    usageMetadata: { failureKind: 'keychain-unavailable' }
+  })
+})
+it('hides Claude usage for System Default with no Claude login, instead of asking to sign in again', async () => {
+  const f = systemDefault()
+  expect(await fetchActiveClaudeRateLimits(f.options)).toMatchObject({
+    status: 'unavailable',
+    usageMetadata: { failureKind: 'missing-credentials' }
+  })
+  expect(await fetchActiveClaudeRateLimits(profile().options)).toMatchObject({
+    status: 'error',
+    error: 'Sign in again to use this account.'
+  })
+})
+it("keeps a 429's Retry-After and rate-limit message so polling waits it out", async () => {
+  const f = profile()
+  writeFileSync(
+    join(f.home, '.credentials.json'),
+    JSON.stringify({ claudeAiOauth: { accessToken: 'fake' } })
+  )
+  const message = 'Claude usage is rate limited right now.'
+  calls.usage.mockRejectedValueOnce(new OAuthUsageError(message, 429, true, 3_000_000))
+  const before = Date.now()
+  const limited = await fetchActiveClaudeRateLimits(f.options)
+  expect(limited).toMatchObject({
+    status: 'error',
+    error: message,
+    usageMetadata: { failureKind: 'rate-limited' }
+  })
+  expect(limited.usageMetadata?.retryAtMs).toBeGreaterThanOrEqual(before + 3_000_000)
+  expect(limited.usageMetadata?.retryAtMs).toBeLessThanOrEqual(Date.now() + 3_000_000)
+  calls.usage.mockRejectedValueOnce(new OAuthUsageError(message, 429, true, null))
+  expect((await fetchActiveClaudeRateLimits(f.options)).usageMetadata?.retryAtMs).toBeUndefined()
+})
+it("reads System default's own CLAUDE_CONFIG_DIR Keychain item before the unsuffixed one", async () => {
+  const root = mkdtempSync(join(tmpdir(), 'claude-usage-inherited-'))
+  roots.push(root)
+  const inherited = join(root, 'own-claude-config')
+  vi.stubEnv('CLAUDE_CONFIG_DIR', inherited)
+  try {
+    calls.keychain.mockResolvedValue(null)
+    await readClaudeOAuthCredentials(
+      resolveClaudeOAuthCredentialReadOptions({
+        configDir: inherited,
+        envPatch: {},
+        stripAuthEnv: false,
+        provenance: 'system'
+      })
+    )
+    expect(calls.keychain.mock.calls).toEqual(
+      process.platform === 'darwin' ? [[inherited], [undefined]] : []
+    )
+  } finally {
+    vi.unstubAllEnvs()
+  }
+  const managed = profile()
+  calls.keychain.mockClear()
+  await fetchActiveClaudeRateLimits(managed.options)
+  expect(calls.keychain.mock.calls).toEqual(process.platform === 'darwin' ? [[managed.home]] : [])
+})
+it("names System default's Keychain item from the login shell's CLAUDE_CONFIG_DIR a Dock launch lacks", () => {
+  vi.stubEnv('CLAUDE_CONFIG_DIR', '')
+  profileRouter.userConfigDir = '/shell/claude-config'
+  try {
+    expect(
+      resolveClaudeOAuthCredentialReadOptions({
+        configDir: '/shell/claude-config',
+        envPatch: {},
+        stripAuthEnv: false,
+        provenance: 'system'
+      })?.keychainConfigDir
+    ).toBe('/shell/claude-config')
+  } finally {
+    profileRouter.userConfigDir = undefined
+    vi.unstubAllEnvs()
+  }
+})
+it('reports a host problem as unavailable usage, never as a signed-out account', async () => {
+  const f = profile()
+  expect(
+    await fetchActiveClaudeRateLimits({
+      authPreparation: {
+        ...f.options.authPreparation,
+        usageError: 'Could not read the home folder of WSL distro Ubuntu.'
+      }
+    })
+  ).toMatchObject({ status: 'error', usageMetadata: { failureKind: 'usage-unavailable' } })
+})
+it('asks an inactive account from an older Orca to sign in again, reading nothing', async () => {
+  const { fetchInactiveClaudeAccountUsage } = await import('./claude-managed-account-usage')
+  expect(
+    await fetchInactiveClaudeAccountUsage({
+      id: 'acct',
+      managedAuthRuntime: 'wsl',
+      wslDistro: 'Ubuntu',
+      wslLinuxAuthPath: '/home/u/.local/share/orca/claude-accounts/acct/auth'
+    })
+  ).toMatchObject({ usageMetadata: { failureKind: 'missing-credentials' } })
+  expect(calls.keychain).not.toHaveBeenCalled()
+})
+it('does not read an inactive WSL account through a stopped distro', async () => {
+  const { fetchInactiveClaudeAccountUsage } = await import('./claude-managed-account-usage')
+  runningDistros.filter.mockResolvedValueOnce([])
+  const result = await fetchInactiveClaudeAccountUsage({
+    id: 'acct',
+    managedAuthRuntime: 'wsl',
+    wslDistro: 'Ubuntu',
+    wslLinuxAuthPath: '/home/u/.local/share/orca/claude-profiles/acct/home'
+  })
+  expect(runningDistros.filter).toHaveBeenCalledWith(
+    ['\\\\wsl.localhost\\Ubuntu\\home\\u\\.local\\share\\orca\\claude-profiles\\acct\\home'],
+    { requireConfirmed: true }
+  )
+  expect(result).toMatchObject({ usageMetadata: { failureKind: 'usage-unavailable' } })
+  expect(calls.keychain).not.toHaveBeenCalled()
+})
diff --git a/src/main/rate-limits/claude-pty-reset-parser.ts b/src/main/rate-limits/claude-pty-reset-parser.ts
deleted file mode 100644
index 43137a8cea54..000000000000
--- a/src/main/rate-limits/claude-pty-reset-parser.ts
+++ /dev/null
@@ -1,307 +0,0 @@
-import type { RateLimitWindow } from '../../shared/rate-limit-types'
-import { buildWallClockTimestamp } from './time-zone-wall-clock'
-
-const RESET_LINE_RE = /resets?\s+(?:at\s+|in\s+)?(.+)/i
-const MONTH_PATTERN =
-  'jan(?:uary)?|feb(?:ruary)?|mar(?:ch)?|apr(?:il)?|may|jun(?:e)?|jul(?:y)?|aug(?:ust)?|sep(?:t(?:ember)?)?|oct(?:ober)?|nov(?:ember)?|dec(?:ember)?'
-const MONTH_DAY_COMPACT_RE = new RegExp(
-  `\\b(${MONTH_PATTERN})(\\d{1,2})(?=\\s*at\\s*\\d|\\D|$)`,
-  'i'
-)
-const MONTH_DAY_TIME_RE = new RegExp(
-  `\\b(${MONTH_PATTERN})\\.?\\s+(\\d{1,2})(?:,?\\s*(?:at\\s+)?)?(\\d{1,2})(?::(\\d{2}))?\\s*(am|pm)\\b`,
-  'i'
-)
-const WEEKDAY_TIME_RE =
-  /\b(sun(?:day)?|mon(?:day)?|tue(?:sday)?|wed(?:nesday)?|thu(?:rsday)?|fri(?:day)?|sat(?:urday)?)\.?\s+(?:at\s+)?(\d{1,2})(?::(\d{2}))?\s*(am|pm)\b/i
-const TIME_ONLY_RE = /\b(\d{1,2})(?::(\d{2}))?\s*(am|pm)\b/i
-// Why: newer Codex CLIs print 24-hour reset times ("10:21 on 28 Jul") with no am/pm.
-const TIME_24H_RE = /\b(\d{1,2}):(\d{2})\b/
-const DAY_MONTH_RE = new RegExp(`\\b(?:on\\s+)?(\\d{1,2})\\s+(${MONTH_PATTERN})\\b`, 'i')
-const RELATIVE_RESET_RE = /^(?:\s*\d+\s*(?:d(?:ays?)?|h(?:ours?|rs?)?|m(?:in(?:ute)?s?)?)\s*)+$/i
-const RELATIVE_RESET_TOKEN_RE = /(\d+)\s*(d(?:ays?)?|h(?:ours?|rs?)?|m(?:in(?:ute)?s?)?)/gi
-const IANA_TIME_ZONE_RE = /\(([^()]*)\)?\s*$/
-
-export type ClaudePtyResetMetadata = Pick<RateLimitWindow, 'resetsAt' | 'resetDescription'>
-
-const MONTH_INDEX_BY_NAME: Record<string, number> = {
-  jan: 0,
-  january: 0,
-  feb: 1,
-  february: 1,
-  mar: 2,
-  march: 2,
-  apr: 3,
-  april: 3,
-  may: 4,
-  jun: 5,
-  june: 5,
-  jul: 6,
-  july: 6,
-  aug: 7,
-  august: 7,
-  sep: 8,
-  sept: 8,
-  september: 8,
-  oct: 9,
-  october: 9,
-  nov: 10,
-  november: 10,
-  dec: 11,
-  december: 11
-}
-
-const WEEKDAY_INDEX_BY_NAME: Record<string, number> = {
-  sun: 0,
-  sunday: 0,
-  mon: 1,
-  monday: 1,
-  tue: 2,
-  tuesday: 2,
-  wed: 3,
-  wednesday: 3,
-  thu: 4,
-  thursday: 4,
-  fri: 5,
-  friday: 5,
-  sat: 6,
-  saturday: 6
-}
-
-export function extractClaudePtyResetMetadata(
-  lines: string[],
-  matchesLabel: (line: string) => boolean,
-  isSectionLabel: (line: string) => boolean
-): ClaudePtyResetMetadata {
-  for (let i = 0; i < lines.length; i++) {
-    if (!matchesLabel(lines[i])) {
-      continue
-    }
-    for (let j = i; j < Math.min(i + 14, lines.length); j++) {
-      if (j > i && isSectionLabel(lines[j])) {
-        break
-      }
-      const m = RESET_LINE_RE.exec(lines[j])
-      if (m) {
-        const resetDescription = normalizeResetDescription(m[1])
-        return {
-          resetsAt: parseResetTimestamp(resetDescription),
-          resetDescription
-        }
-      }
-    }
-  }
-  return { resetsAt: null, resetDescription: null }
-}
-
-function normalizeResetDescription(raw: string): string {
-  // Why: Claude's TUI occasionally drops spaces around the Fable reset date
-  // when copied from the PTY buffer, but the value still encodes a real reset.
-  return (
-    raw
-      .trim()
-      // Why: PTY captures keep trailing box-border glyphs from framed status panels.
-      .replace(/[)\s│]+$/, '')
-      .replace(/\s+/g, ' ')
-      .replace(MONTH_DAY_COMPACT_RE, '$1 $2')
-      .replace(/(\d{1,2})\s*at\s*(\d{1,2}(?::\d{2})?\s*(?:am|pm))/i, '$1 at $2')
-      .replace(/(\d)(am|pm)\(/gi, '$1$2 (')
-  )
-}
-
-function parseResetTimestamp(resetDescription: string | null): number | null {
-  if (!resetDescription) {
-    return null
-  }
-
-  return (
-    parseRelativeResetTimestamp(resetDescription) ??
-    parseMonthDayResetTimestamp(resetDescription) ??
-    parseWeekdayResetTimestamp(resetDescription) ??
-    parseTimeOnlyResetTimestamp(resetDescription) ??
-    parseTwentyFourHourResetTimestamp(resetDescription)
-  )
-}
-
-function parseTwentyFourHourResetTimestamp(resetDescription: string): number | null {
-  const resetText = stripResetTimeZone(resetDescription)
-  const timeMatch = TIME_24H_RE.exec(resetText)
-  if (!timeMatch) {
-    return null
-  }
-  const hour = Number(timeMatch[1])
-  const minute = Number(timeMatch[2])
-  if (!isValidClockTime(hour, minute)) {
-    return null
-  }
-
-  const dayMonthMatch = DAY_MONTH_RE.exec(resetText)
-  if (dayMonthMatch) {
-    const day = Number(dayMonthMatch[1])
-    const monthIndex = MONTH_INDEX_BY_NAME[dayMonthMatch[2].toLowerCase()]
-    if (monthIndex === undefined || day < 1 || day > 31) {
-      return null
-    }
-    const now = new Date()
-    const timeZone = extractResetTimeZone(resetDescription)
-    let timestamp = buildWallClockTimestamp(
-      { year: now.getFullYear(), monthIndex, day, hour, minute },
-      timeZone
-    )
-    if (timestamp !== null && timestamp <= Date.now()) {
-      timestamp = buildWallClockTimestamp(
-        { year: now.getFullYear() + 1, monthIndex, day, hour, minute },
-        timeZone
-      )
-    }
-    return timestamp
-  }
-
-  const candidate = new Date()
-  candidate.setHours(hour, minute, 0, 0)
-  if (candidate.getTime() <= Date.now()) {
-    candidate.setDate(candidate.getDate() + 1)
-  }
-  return candidate.getTime()
-}
-
-function parseRelativeResetTimestamp(resetDescription: string): number | null {
-  if (!RELATIVE_RESET_RE.test(resetDescription)) {
-    return null
-  }
-
-  let durationMs = 0
-  for (const match of resetDescription.matchAll(RELATIVE_RESET_TOKEN_RE)) {
-    const amount = Number(match[1])
-    const unit = match[2].toLowerCase()[0]
-    if (!Number.isFinite(amount)) {
-      continue
-    }
-    if (unit === 'd') {
-      durationMs += amount * 24 * 60 * 60_000
-    } else if (unit === 'h') {
-      durationMs += amount * 60 * 60_000
-    } else if (unit === 'm') {
-      durationMs += amount * 60_000
-    }
-  }
-  return durationMs > 0 ? Date.now() + durationMs : null
-}
-
-function parseMonthDayResetTimestamp(resetDescription: string): number | null {
-  const resetText = stripResetTimeZone(resetDescription)
-  const match = MONTH_DAY_TIME_RE.exec(resetText)
-  if (!match) {
-    return null
-  }
-
-  const monthIndex = MONTH_INDEX_BY_NAME[match[1].toLowerCase()]
-  if (monthIndex === undefined) {
-    return null
-  }
-
-  const day = Number(match[2])
-  const hour = parseHour(match[3], match[5])
-  const minute = Number(match[4] ?? 0)
-  if (!isValidClockTime(hour, minute)) {
-    return null
-  }
-
-  const now = new Date()
-  const timeZone = extractResetTimeZone(resetDescription)
-  let timestamp = buildWallClockTimestamp(
-    { year: now.getFullYear(), monthIndex, day, hour, minute },
-    timeZone
-  )
-  if (timestamp !== null && timestamp <= Date.now()) {
-    timestamp = buildWallClockTimestamp(
-      { year: now.getFullYear() + 1, monthIndex, day, hour, minute },
-      timeZone
-    )
-  }
-  return timestamp
-}
-
-function parseWeekdayResetTimestamp(resetDescription: string): number | null {
-  const resetText = stripResetTimeZone(resetDescription)
-  const match = WEEKDAY_TIME_RE.exec(resetText)
-  if (!match) {
-    return null
-  }
-
-  const weekdayIndex = WEEKDAY_INDEX_BY_NAME[match[1].toLowerCase()]
-  if (weekdayIndex === undefined) {
-    return null
-  }
-
-  const now = new Date()
-  const hour = parseHour(match[2], match[4])
-  const minute = Number(match[3] ?? 0)
-  if (!isValidClockTime(hour, minute)) {
-    return null
-  }
-
-  const candidate = new Date(now)
-  const daysUntil = (weekdayIndex - now.getDay() + 7) % 7
-  candidate.setDate(now.getDate() + daysUntil)
-  candidate.setHours(hour, minute, 0, 0)
-  if (candidate.getTime() <= Date.now()) {
-    candidate.setDate(candidate.getDate() + 7)
-  }
-  return candidate.getTime()
-}
-
-function parseTimeOnlyResetTimestamp(resetDescription: string): number | null {
-  const resetText = stripResetTimeZone(resetDescription)
-  const match = TIME_ONLY_RE.exec(resetText)
-  if (!match) {
-    return null
-  }
-
-  const hour = parseHour(match[1], match[3])
-  const minute = Number(match[2] ?? 0)
-  if (!isValidClockTime(hour, minute)) {
-    return null
-  }
-
-  const candidate = new Date()
-  candidate.setHours(hour, minute, 0, 0)
-  if (candidate.getTime() <= Date.now()) {
-    candidate.setDate(candidate.getDate() + 1)
-  }
-  return candidate.getTime()
-}
-
-function parseHour(hourText: string, periodText: string): number {
-  const hour = Number(hourText)
-  const period = periodText.toLowerCase()
-  if (hour < 1 || hour > 12) {
-    return Number.NaN
-  }
-  if (period === 'am') {
-    return hour === 12 ? 0 : hour
-  }
-  return hour === 12 ? 12 : hour + 12
-}
-
-function isValidClockTime(hour: number, minute: number): boolean {
-  return Number.isInteger(hour) && hour >= 0 && hour < 24 && minute >= 0 && minute < 60
-}
-
-function stripResetTimeZone(resetDescription: string): string {
-  return resetDescription.replace(/\s*\([^)]*\)?\s*$/, '').trim()
-}
-
-function extractResetTimeZone(resetDescription: string): string | null {
-  const match = IANA_TIME_ZONE_RE.exec(resetDescription)
-  if (!match?.[1]) {
-    return null
-  }
-  const timeZone = match[1].trim()
-  try {
-    new Intl.DateTimeFormat('en-US', { timeZone })
-    return timeZone
-  } catch {
-    return null
-  }
-}
diff --git a/src/main/rate-limits/claude-pty-stop-markers.ts b/src/main/rate-limits/claude-pty-stop-markers.ts
deleted file mode 100644
index 2bba56c69112..000000000000
--- a/src/main/rate-limits/claude-pty-stop-markers.ts
+++ /dev/null
@@ -1,14 +0,0 @@
-// Why: these substrings indicate the /usage TUI panel has finished rendering.
-export const CLAUDE_USAGE_STOP_SUBSTRINGS = [
-  'Current week (all models)',
-  'Current week (Opus)',
-  'Current week (Sonnet only)',
-  'Current week (Sonnet)',
-  'Weekly limits',
-  'Weekly limit',
-  'Weekly usage',
-  '7-day',
-  'Current session',
-  'Failed to load usage data',
-  'failed to load usage data'
-]
diff --git a/src/main/rate-limits/claude-pty-usage-parser.ts b/src/main/rate-limits/claude-pty-usage-parser.ts
deleted file mode 100644
index 3328d9471600..000000000000
--- a/src/main/rate-limits/claude-pty-usage-parser.ts
+++ /dev/null
@@ -1,166 +0,0 @@
-import type { ProviderRateLimits, RateLimitWindow } from '../../shared/rate-limit-types'
-import { extractClaudePtyResetMetadata } from './claude-pty-reset-parser'
-
-// Why: these patterns match the Claude CLI's /usage TUI panel output.
-// "Current session" shows a percent like "62% used" or "62% left".
-// Weekly labels have varied between "Current week" and "Weekly limits".
-const SESSION_RE = /current\s*session/i
-const WEEKLY_RE = /(?:current\s*week|weekly\s*(?:limits?|usage|rate\s*limits?)|7\s*[- ]?\s*day)/i
-const FABLE_WORD_RE = /\bfable\b/i
-const FABLE_LABEL_RE = /^\s*fable\s*$/i
-// Why: derive from WEEKLY_RE so a future weekly-wording change stays in one place
-// instead of silently reopening the Fable-weekly parsing gap this fix closed.
-const FABLE_WEEKLY_LABEL_RE = new RegExp(
-  `${WEEKLY_RE.source}\\s*(?:\\([^)]*\\bfable\\b[^)]*\\)|[-:]?\\s*\\bfable\\b)`,
-  'i'
-)
-const PERCENT_RE = /(\d{1,3})(?:\.\d+)?\s*%\s*(used|consumed|left|remaining|available)/i
-const ESC = String.fromCharCode(27)
-const BEL = String.fromCharCode(7)
-const OSC_SEQUENCE_RE = new RegExp(`${ESC}\\][^${BEL}]*(?:${BEL}|${ESC}\\\\)`, 'g')
-const CSI_SEQUENCE_RE = new RegExp(`${ESC}\\[[0-9;?]*[ -/]*[@-~]`, 'g')
-
-export function stripTerminalControlSequences(output: string): string {
-  return output.replace(OSC_SEQUENCE_RE, '').replace(CSI_SEQUENCE_RE, '')
-}
-
-/**
- * Extract percent-left from lines following a label match.
- * Scans up to 12 lines after the label to find the associated percent.
- */
-function matchesWeeklyLabel(line: string): boolean {
-  return WEEKLY_RE.test(line) && !FABLE_WORD_RE.test(line)
-}
-
-function matchesFableBoundary(line: string): boolean {
-  return FABLE_LABEL_RE.test(line) || (FABLE_WORD_RE.test(line) && WEEKLY_RE.test(line))
-}
-
-function matchesFableUsageLabel(line: string): boolean {
-  // Why: broad Fable-weekly copy should stop nearby scans, but only a real
-  // Fable usage heading should produce the distinct Fable meter.
-  return FABLE_LABEL_RE.test(line) || FABLE_WEEKLY_LABEL_RE.test(line)
-}
-
-function isSectionLabel(line: string): boolean {
-  return SESSION_RE.test(line) || matchesWeeklyLabel(line) || matchesFableBoundary(line)
-}
-
-function extractPercentAfterLabel(
-  lines: string[],
-  matchesLabel: (line: string) => boolean
-): number | null {
-  for (let i = 0; i < lines.length; i++) {
-    if (!matchesLabel(lines[i])) {
-      continue
-    }
-    // Scan next 12 lines for a percent
-    for (let j = i; j < Math.min(i + 12, lines.length); j++) {
-      if (j > i && isSectionLabel(lines[j])) {
-        break
-      }
-      const m = PERCENT_RE.exec(lines[j])
-      if (m) {
-        const pct = Number.parseFloat(m[1])
-        const word = m[2].toLowerCase()
-        const isUsed = word === 'used' || word === 'consumed'
-        return isUsed ? pct : 100 - pct
-      }
-    }
-  }
-  return null
-}
-
-export function parseClaudePtyUsage(output: string): {
-  session: RateLimitWindow | null
-  weekly: RateLimitWindow | null
-  fableWeekly: RateLimitWindow | null
-} {
-  const lines = output.split(/\r\n|\n|\r/)
-
-  const sessionPct = extractPercentAfterLabel(lines, (line) => SESSION_RE.test(line))
-  const weeklyPct = extractPercentAfterLabel(lines, matchesWeeklyLabel)
-  const fableWeeklyPct = extractPercentAfterLabel(lines, matchesFableUsageLabel)
-  const sessionReset = extractClaudePtyResetMetadata(
-    lines,
-    (line) => SESSION_RE.test(line),
-    isSectionLabel
-  )
-  const weeklyReset = extractClaudePtyResetMetadata(lines, matchesWeeklyLabel, isSectionLabel)
-  const fableWeeklyReset = extractClaudePtyResetMetadata(
-    lines,
-    matchesFableUsageLabel,
-    isSectionLabel
-  )
-
-  const session: RateLimitWindow | null =
-    sessionPct !== null
-      ? {
-          usedPercent: Math.min(100, Math.max(0, sessionPct)),
-          windowMinutes: 300,
-          resetsAt: sessionReset.resetsAt,
-          resetDescription: sessionReset.resetDescription
-        }
-      : null
-
-  const weekly: RateLimitWindow | null =
-    weeklyPct !== null
-      ? {
-          usedPercent: Math.min(100, Math.max(0, weeklyPct)),
-          windowMinutes: 10080,
-          resetsAt: weeklyReset.resetsAt,
-          resetDescription: weeklyReset.resetDescription
-        }
-      : null
-
-  const fableWeekly: RateLimitWindow | null =
-    fableWeeklyPct !== null
-      ? {
-          usedPercent: Math.min(100, Math.max(0, fableWeeklyPct)),
-          windowMinutes: 10080,
-          resetsAt: fableWeeklyReset.resetsAt,
-          resetDescription: fableWeeklyReset.resetDescription
-        }
-      : null
-
-  return { session, weekly, fableWeekly }
-}
-
-const RATE_LIMITED_RE = /rate limited\.?\s+please try again later/i
-const LOAD_FAILED_RE = /failed to load usage data/i
-const CLAUDE_21_USAGE_TABS_RE = /settings?\s+status?\s+config\s+usage\s+stats/i
-const CLAUDE_21_SESSION_STATS_RE = /total\s*cost|total\s*duration|usage:\s*\d+\s*input/i
-
-export function isClaude21UsagePanel(output: string): boolean {
-  return CLAUDE_21_USAGE_TABS_RE.test(output) || CLAUDE_21_SESSION_STATS_RE.test(output)
-}
-
-export function describeClaudeUsageFailure(output: string): string {
-  if (RATE_LIMITED_RE.test(output)) {
-    return 'Claude usage is rate limited right now.'
-  }
-
-  if (LOAD_FAILED_RE.test(output)) {
-    return 'Claude usage is unavailable right now.'
-  }
-
-  if (CLAUDE_21_USAGE_TABS_RE.test(output) || CLAUDE_21_SESSION_STATS_RE.test(output)) {
-    return 'Claude plan usage is unavailable for this Claude CLI session.'
-  }
-
-  // Why: parser failures are an implementation detail of Orca's PTY fallback.
-  // The UI should explain the user-visible outcome, not leak internal parsing
-  // mechanics that the user cannot act on.
-  return 'Claude usage is unavailable right now.'
-}
-
-export function abortedClaudeUsageResult(): ProviderRateLimits {
-  return {
-    provider: 'claude',
-    session: null,
-    weekly: null,
-    updatedAt: Date.now(),
-    error: 'Rate-limit fetch aborted',
-    status: 'error'
-  }
-}
diff --git a/src/main/rate-limits/claude-pty.test.ts b/src/main/rate-limits/claude-pty.test.ts
deleted file mode 100644
index f2fd976821b6..000000000000
--- a/src/main/rate-limits/claude-pty.test.ts
+++ /dev/null
@@ -1,554 +0,0 @@
-import { beforeEach, describe, expect, it, vi } from 'vitest'
-
-const { resolveClaudeCommandMock, spawnMock } = vi.hoisted(() => ({
-  resolveClaudeCommandMock: vi.fn(),
-  spawnMock: vi.fn()
-}))
-
-vi.mock('../codex-cli/command', () => ({
-  resolveClaudeCommand: resolveClaudeCommandMock
-}))
-
-vi.mock('node-pty', () => ({
-  spawn: spawnMock
-}))
-
-import { fetchViaPty } from './claude-pty'
-import { getActiveHiddenRateLimitPtyCount } from './hidden-pty-cleanup'
-
-function makeDisposable() {
-  return { dispose: vi.fn() }
-}
-
-type MockTerm = {
-  onData: ReturnType<typeof vi.fn>
-  onExit: ReturnType<typeof vi.fn>
-  write: ReturnType<typeof vi.fn>
-  kill: ReturnType<typeof vi.fn>
-}
-
-function makeMockTerm(): MockTerm & {
-  emitData: (data: string) => void
-  emitExit: () => void
-} {
-  let dataHandler: ((data: string) => void) | null = null
-  let exitHandler: (() => void) | null = null
-  return {
-    onData: vi.fn((handler: (data: string) => void) => {
-      dataHandler = handler
-      return makeDisposable()
-    }),
-    onExit: vi.fn((handler: () => void) => {
-      exitHandler = handler
-      return makeDisposable()
-    }),
-    write: vi.fn(),
-    kill: vi.fn(),
-    emitData: (data: string) => dataHandler?.(data),
-    emitExit: () => exitHandler?.()
-  }
-}
-
-describe('fetchViaPty', () => {
-  beforeEach(() => {
-    vi.useFakeTimers()
-    vi.clearAllMocks()
-    resolveClaudeCommandMock.mockReturnValue('claude')
-  })
-
-  it('disposes node-pty listeners before killing the hidden PTY on timeout', async () => {
-    const onDataDisposable = makeDisposable()
-    const onExitDisposable = makeDisposable()
-    const killMock = vi.fn()
-
-    spawnMock.mockReturnValue({
-      onData: vi.fn(() => onDataDisposable),
-      onExit: vi.fn(() => onExitDisposable),
-      write: vi.fn(),
-      kill: killMock
-    })
-
-    const resultPromise = fetchViaPty()
-    await vi.advanceTimersByTimeAsync(25_000)
-    await resultPromise
-
-    expect(onDataDisposable.dispose.mock.invocationCallOrder[0]).toBeLessThan(
-      killMock.mock.invocationCallOrder[0]
-    )
-    expect(onExitDisposable.dispose.mock.invocationCallOrder[0]).toBeLessThan(
-      killMock.mock.invocationCallOrder[0]
-    )
-  })
-
-  it('injects the configured proxy into the hidden PTY spawn env', async () => {
-    const term = makeMockTerm()
-    spawnMock.mockReturnValue(term)
-
-    const resultPromise = fetchViaPty({
-      networkProxySettings: { httpProxyUrl: 'http://127.0.0.1:7890' }
-    })
-    await vi.advanceTimersByTimeAsync(0)
-
-    expect(spawnMock).toHaveBeenCalled()
-    const spawnEnv = spawnMock.mock.calls[0]?.[2]?.env as Record<string, string>
-    expect(spawnEnv.HTTPS_PROXY).toBe('http://127.0.0.1:7890')
-    expect(spawnEnv.HTTP_PROXY).toBe('http://127.0.0.1:7890')
-
-    term.emitExit()
-    await resultPromise
-  })
-
-  it('spawns the hidden usage PTY in a bounded non-root cwd', async () => {
-    const term = makeMockTerm()
-    spawnMock.mockReturnValue(term)
-
-    const resultPromise = fetchViaPty()
-    await vi.advanceTimersByTimeAsync(0)
-
-    const spawnCwd = spawnMock.mock.calls[0]?.[2]?.cwd as string
-    expect(spawnCwd).toContain('rate-limit-pty-cwd')
-    expect(spawnCwd).not.toBe('/')
-    expect(spawnCwd).not.toMatch(/^[A-Za-z]:(?:[\\/])?$/)
-
-    term.emitExit()
-    await resultPromise
-  })
-
-  it('leaves the spawn env proxy untouched when no proxy is configured', async () => {
-    const term = makeMockTerm()
-    spawnMock.mockReturnValue(term)
-    const inheritedHttpsProxy = process.env.HTTPS_PROXY
-
-    const resultPromise = fetchViaPty()
-    await vi.advanceTimersByTimeAsync(0)
-
-    const spawnEnv = spawnMock.mock.calls[0]?.[2]?.env as Record<string, string>
-    expect(spawnEnv.HTTPS_PROXY).toBe(inheritedHttpsProxy)
-
-    term.emitExit()
-    await resultPromise
-  })
-
-  it('exports the configured proxy inside the WSL launch command', async () => {
-    // Why: Windows-side spawn env does not cross into the distro, so the proxy
-    // must be exported in the bash command for the inner claude to see it.
-    const term = makeMockTerm()
-    spawnMock.mockReturnValue(term)
-
-    const resultPromise = fetchViaPty({
-      networkProxySettings: { httpProxyUrl: 'http://127.0.0.1:7890' },
-      authPreparation: {
-        configDir: '/home/u/.claude',
-        runtime: 'wsl',
-        wslDistro: 'Ubuntu',
-        wslLinuxConfigDir: '/home/u/.claude',
-        envPatch: { CLAUDE_CONFIG_DIR: '/home/u/.claude' },
-        stripAuthEnv: false,
-        provenance: 'system'
-      }
-    })
-    await vi.advanceTimersByTimeAsync(0)
-
-    const [spawnFile, spawnArgs] = spawnMock.mock.calls[0] as [string, string[]]
-    expect(spawnFile).toBe('wsl.exe')
-    const bashCommand = spawnArgs.at(-1) as string
-    expect(bashCommand).toContain('mkdir -p "$orca_rate_limit_cwd"')
-    expect(bashCommand).toContain('cd "$orca_rate_limit_cwd"')
-    expect(bashCommand).toContain("export HTTPS_PROXY='http://127.0.0.1:7890'")
-    expect(bashCommand).toContain('exec claude')
-
-    term.emitExit()
-    await resultPromise
-  })
-
-  it('kills and unregisters the hidden PTY when the fetch signal aborts', async () => {
-    const term = makeMockTerm()
-    spawnMock.mockReturnValue(term)
-    const controller = new AbortController()
-    const killMock = term.kill
-
-    const resultPromise = fetchViaPty({ signal: controller.signal })
-    await vi.advanceTimersByTimeAsync(0)
-
-    expect(getActiveHiddenRateLimitPtyCount()).toBe(1)
-
-    controller.abort()
-
-    await expect(resultPromise).resolves.toMatchObject({
-      provider: 'claude',
-      status: 'error',
-      error: 'Rate-limit fetch aborted'
-    })
-    expect(killMock).toHaveBeenCalledTimes(1)
-    expect(getActiveHiddenRateLimitPtyCount()).toBe(0)
-  })
-
-  it('clears the startup delay timer when the hidden PTY exits early', async () => {
-    const term = makeMockTerm()
-    spawnMock.mockReturnValue(term)
-
-    const resultPromise = fetchViaPty()
-    await vi.advanceTimersByTimeAsync(0)
-    expect(spawnMock).toHaveBeenCalled()
-    expect(vi.getTimerCount()).toBeGreaterThan(0)
-
-    term.emitExit()
-
-    await expect(resultPromise).resolves.toMatchObject({
-      provider: 'claude',
-      status: 'error'
-    })
-    expect(vi.getTimerCount()).toBe(0)
-  })
-
-  it('clears pending settle timers when the hidden PTY exits after usage output starts', async () => {
-    const term = makeMockTerm()
-    spawnMock.mockReturnValue(term)
-
-    const resultPromise = fetchViaPty()
-    await vi.advanceTimersByTimeAsync(2_000)
-    term.emitData('Current session\r12% used\r')
-    expect(vi.getTimerCount()).toBeGreaterThan(0)
-
-    term.emitExit()
-
-    await expect(resultPromise).resolves.toMatchObject({
-      provider: 'claude',
-      status: 'ok',
-      session: {
-        usedPercent: 12
-      }
-    })
-    expect(vi.getTimerCount()).toBe(0)
-  })
-
-  it('treats Claude 2.1 tabbed /usage session stats as rendered but unavailable', async () => {
-    const term = makeMockTerm()
-    spawnMock.mockReturnValue(term)
-
-    const resultPromise = fetchViaPty()
-
-    await vi.advanceTimersByTimeAsync(2_000)
-    expect(term.write).toHaveBeenCalledWith('/usage\r')
-
-    term.emitData(`
-      Settings  Status  Config   Usage  Stats
-
-      Session
-      Total cost: $0.0000
-      Usage: 0 input, 0 output, 0 cache read, 0 cache write
-    `)
-
-    await vi.advanceTimersByTimeAsync(8_000)
-
-    await expect(resultPromise).resolves.toMatchObject({
-      provider: 'claude',
-      status: 'error',
-      session: null,
-      weekly: null,
-      error: 'Claude plan usage is unavailable for this Claude CLI session.'
-    })
-    expect(term.write).not.toHaveBeenCalledWith('\x1b[D\x1b[D')
-  })
-
-  it('keeps waiting for plan windows after the Claude 2.1 usage shell renders', async () => {
-    const term = makeMockTerm()
-    spawnMock.mockReturnValue(term)
-
-    const resultPromise = fetchViaPty()
-
-    await vi.advanceTimersByTimeAsync(2_000)
-    term.emitData(`
-      Settings  Status  Config   Usage  Stats
-      Session
-      Total cost: $0.0000
-    `)
-
-    await vi.advanceTimersByTimeAsync(1_000)
-    term.emitData('Current session\r12% used\rResets 4:00pm\rCurrent week (all models)\r34% used\r')
-    await vi.advanceTimersByTimeAsync(2_000)
-
-    await expect(resultPromise).resolves.toMatchObject({
-      provider: 'claude',
-      status: 'ok',
-      session: {
-        usedPercent: 12,
-        resetDescription: '4:00pm'
-      },
-      weekly: {
-        usedPercent: 34
-      },
-      error: null
-    })
-  })
-
-  it('parses the newer Claude weekly limits wording for Fable usage', async () => {
-    const term = makeMockTerm()
-    spawnMock.mockReturnValue(term)
-    vi.setSystemTime(new Date(2026, 6, 3, 20, 0))
-
-    const resultPromise = fetchViaPty()
-
-    await vi.advanceTimersByTimeAsync(2_000)
-    term.emitData(`
-      Plan usage limits
-
-      Current session
-      18% remaining
-      Resets in 2h 10m
-
-      Weekly limits
-      Fable
-      42% consumed
-      Resets in 3d 2h
-    `)
-    await vi.advanceTimersByTimeAsync(2_000)
-
-    const result = await resultPromise
-
-    expect(result).toMatchObject({
-      provider: 'claude',
-      status: 'ok',
-      session: {
-        usedPercent: 82,
-        resetsAt: Date.now() + 2 * 60 * 60_000 + 10 * 60_000,
-        resetDescription: '2h 10m'
-      },
-      weekly: null,
-      fableWeekly: {
-        usedPercent: 42,
-        resetsAt: Date.now() + 3 * 24 * 60 * 60_000 + 2 * 60 * 60_000,
-        resetDescription: '3d 2h'
-      },
-      error: null
-    })
-  })
-
-  it('parses generic weekly and Fable weekly limits as separate windows', async () => {
-    const term = makeMockTerm()
-    spawnMock.mockReturnValue(term)
-
-    const resultPromise = fetchViaPty()
-
-    await vi.advanceTimersByTimeAsync(2_000)
-    term.emitData(`
-      Plan usage limits
-
-      Current session
-      18% remaining
-      Resets in 2h 10m
-
-      Current week (all models)
-      84% left
-      Resets in 5d 4h
-
-      Fable
-      42% consumed
-      Resets in 3d 2h
-    `)
-    await vi.advanceTimersByTimeAsync(2_000)
-
-    await expect(resultPromise).resolves.toMatchObject({
-      provider: 'claude',
-      status: 'ok',
-      session: {
-        usedPercent: 82,
-        resetDescription: '2h 10m'
-      },
-      weekly: {
-        usedPercent: 16,
-        resetDescription: '5d 4h'
-      },
-      fableWeekly: {
-        usedPercent: 42,
-        resetDescription: '3d 2h'
-      },
-      error: null
-    })
-  })
-
-  it('parses Claude current-week Fable usage as a distinct weekly window', async () => {
-    const term = makeMockTerm()
-    spawnMock.mockReturnValue(term)
-    vi.setSystemTime(new Date(2026, 6, 3, 20, 0))
-
-    const resultPromise = fetchViaPty()
-
-    await vi.advanceTimersByTimeAsync(2_000)
-    term.emitData(`
-      Plan usage limits
-
-      Current session
-      8% used
-      Resets 3:39am
-
-      Current week (all models)
-      33% used
-      Resets Jul 10 at 12:59pm
-
-      Current week (Fable)
-      62% used
-      Resets Jul10at12:59pm(America/Los_Angeles)
-    `)
-    await vi.advanceTimersByTimeAsync(2_000)
-
-    await expect(resultPromise).resolves.toMatchObject({
-      provider: 'claude',
-      status: 'ok',
-      session: {
-        usedPercent: 8,
-        resetDescription: '3:39am'
-      },
-      weekly: {
-        usedPercent: 33,
-        resetsAt: new Date(2026, 6, 10, 12, 59).getTime(),
-        resetDescription: 'Jul 10 at 12:59pm'
-      },
-      fableWeekly: {
-        usedPercent: 62,
-        resetsAt: Date.parse('2026-07-10T19:59:00.000Z'),
-        resetDescription: 'Jul 10 at 12:59pm (America/Los_Angeles'
-      },
-      error: null
-    })
-  })
-
-  it('does not let an incomplete Fable section consume later usage sections', async () => {
-    const term = makeMockTerm()
-    spawnMock.mockReturnValue(term)
-
-    const resultPromise = fetchViaPty()
-
-    await vi.advanceTimersByTimeAsync(2_000)
-    term.emitData(`
-      Plan usage limits
-
-      Fable
-      Usage unavailable
-
-      Current session
-      12% used
-
-      Current week (all models)
-      84% left
-    `)
-    await vi.advanceTimersByTimeAsync(2_000)
-
-    await expect(resultPromise).resolves.toMatchObject({
-      provider: 'claude',
-      status: 'ok',
-      session: {
-        usedPercent: 12
-      },
-      weekly: {
-        usedPercent: 16
-      },
-      fableWeekly: null,
-      error: null
-    })
-  })
-
-  it('does not treat inline Fable weekly text as a parsed usage label', async () => {
-    const term = makeMockTerm()
-    spawnMock.mockReturnValue(term)
-
-    const resultPromise = fetchViaPty()
-
-    await vi.advanceTimersByTimeAsync(2_000)
-    term.emitData(`
-      Plan usage limits
-
-      Current session
-      Fable weekly usage
-      42% consumed
-
-      Current week (all models)
-      84% left
-    `)
-    await vi.advanceTimersByTimeAsync(2_000)
-
-    await expect(resultPromise).resolves.toMatchObject({
-      provider: 'claude',
-      status: 'ok',
-      session: null,
-      weekly: {
-        usedPercent: 16
-      },
-      fableWeekly: null,
-      error: null
-    })
-  })
-
-  it('keeps waiting after a bare Fable heading until another usage section renders', async () => {
-    const term = makeMockTerm()
-    spawnMock.mockReturnValue(term)
-    let settled = false
-
-    const resultPromise = fetchViaPty().finally(() => {
-      settled = true
-    })
-
-    await vi.advanceTimersByTimeAsync(2_000)
-    term.emitData(`
-      Plan usage limits
-
-      Fable
-    `)
-    await vi.advanceTimersByTimeAsync(2_000)
-
-    expect(settled).toBe(false)
-
-    term.emitData(`
-      42% consumed
-
-      Current session
-      12% used
-    `)
-    await vi.advanceTimersByTimeAsync(2_000)
-
-    await expect(resultPromise).resolves.toMatchObject({
-      provider: 'claude',
-      status: 'ok',
-      session: {
-        usedPercent: 12
-      },
-      fableWeekly: {
-        usedPercent: 42
-      },
-      error: null
-    })
-  })
-
-  it('parses 7-day weekly labels without the old Current week heading', async () => {
-    const term = makeMockTerm()
-    spawnMock.mockReturnValue(term)
-
-    const resultPromise = fetchViaPty()
-
-    await vi.advanceTimersByTimeAsync(2_000)
-    term.emitData(`
-      Usage
-
-      Current session
-      12% used
-
-      7-day
-      84% left
-      Resets Wed at 9:05 PM
-    `)
-    await vi.advanceTimersByTimeAsync(2_000)
-
-    await expect(resultPromise).resolves.toMatchObject({
-      provider: 'claude',
-      status: 'ok',
-      session: {
-        usedPercent: 12
-      },
-      weekly: {
-        usedPercent: 16,
-        resetDescription: 'Wed at 9:05 PM'
-      },
-      error: null
-    })
-  })
-})
diff --git a/src/main/rate-limits/claude-pty.ts b/src/main/rate-limits/claude-pty.ts
deleted file mode 100644
index cbaedbd17f9d..000000000000
--- a/src/main/rate-limits/claude-pty.ts
+++ /dev/null
@@ -1,354 +0,0 @@
-import type { ProviderRateLimits } from '../../shared/rate-limit-types'
-import { buildConfiguredProxyEnv, type NetworkProxySettings } from '../../shared/network-proxy'
-import { resolveClaudeCommand } from '../codex-cli/command'
-// Why: import from the shared module, not the codex-cli re-export, so a test that
-// mocks '../codex-cli/command' does not have to restate this pure helper.
-import { withCliRuntimeOnPath } from '../../shared/node-cli-command-resolution'
-import type { ClaudeRuntimeAuthPreparation } from '../claude-accounts/runtime-auth-service'
-import { applyClaudeEnvPatch } from '../claude-accounts/environment'
-import { withMacTailscaleDnsHint } from '../network/macos-tailscale-dns-diagnostic'
-import { cleanupHiddenRateLimitPty, registerHiddenRateLimitPty } from './hidden-pty-cleanup'
-import {
-  getHiddenRateLimitWslCwdSetupCommands,
-  resolveHiddenRateLimitPtyCwd
-} from './hidden-rate-limit-pty-cwd'
-import {
-  abortedClaudeUsageResult,
-  describeClaudeUsageFailure,
-  isClaude21UsagePanel,
-  parseClaudePtyUsage,
-  stripTerminalControlSequences
-} from './claude-pty-usage-parser'
-import { quoteHiddenRateLimitShellValue } from './hidden-rate-limit-shell'
-import { CLAUDE_USAGE_STOP_SUBSTRINGS } from './claude-pty-stop-markers'
-
-const PTY_TIMEOUT_MS = 25_000
-const MAX_OUTPUT_LENGTH = 100_000 // 100KB buffer limit
-
-// ---------------------------------------------------------------------------
-// PTY fallback — spawn interactive `claude`, send `/usage`, parse the TUI
-// ---------------------------------------------------------------------------
-
-// Why: prompt detection is unreliable because the Claude CLI v2.x renders
-// a status bar and TUI elements that push the `❯` prompt out of any
-// reasonable detection window. Instead we wait a fixed 2s after spawning
-// for the CLI to initialize, then send `/usage\r` directly. Command
-// palette prompts ("Show plan usage limits") are auto-confirmed with Enter.
-const COMMAND_PALETTE_RE = /show plan|usage limits/i
-const TRUST_PROMPT_RE = /do you trust|trust the files|safety check/i
-const STARTUP_DELAY_MS = 2_000
-const SETTLE_AFTER_STOP_MS = 2_000
-const SETTLE_AFTER_CLAUDE_21_USAGE_MS = 8_000
-
-export async function fetchViaPty(options?: {
-  authPreparation?: ClaudeRuntimeAuthPreparation
-  networkProxySettings?: NetworkProxySettings
-  signal?: AbortSignal
-}): Promise<ProviderRateLimits> {
-  if (options?.signal?.aborted) {
-    return abortedClaudeUsageResult()
-  }
-  const pty = await import('node-pty')
-  if (options?.signal?.aborted) {
-    return abortedClaudeUsageResult()
-  }
-
-  return new Promise<ProviderRateLimits>((resolve) => {
-    let output = ''
-    let resolved = false
-    let sentUsage = false
-    let stopDetected = false
-    let claude21UsageDetected = false
-    let startupDelayTimer: ReturnType<typeof setTimeout> | null = null
-    let stopSettleTimer: ReturnType<typeof setTimeout> | null = null
-    let claude21UsageSettleTimer: ReturnType<typeof setTimeout> | null = null
-
-    const claudeCommand = resolveClaudeCommand()
-
-    // Why: node-pty cannot spawn .cmd/.bat batch scripts directly on Windows —
-    // those need cmd.exe as an interpreter. Always route through cmd.exe on win32
-    // and ensure the command path is properly quoted if it contains spaces.
-    const isWin32 = process.platform === 'win32'
-    const spawnEnv = applyClaudeEnvPatch(
-      { ...process.env, TERM: 'xterm-256color' } as Record<string, string>,
-      options?.authPreparation?.envPatch ?? {},
-      { stripAuthEnv: options?.authPreparation?.stripAuthEnv ?? false }
-    )
-    // Why: this hidden usage PTY spawns `claude` directly, not the user's shell
-    // wrapper, so without the configured proxy it would reach api.anthropic.com
-    // from the app's own IP — bypassing the proxy the user set for Claude and
-    // risking rate-limit/geo signals on the account. Falls back to {} when unset.
-    const proxyEnv = buildConfiguredProxyEnv(options?.networkProxySettings)
-    Object.assign(spawnEnv, proxyEnv)
-    const authPreparation = options?.authPreparation
-    const wslConfig =
-      authPreparation?.runtime === 'wsl' &&
-      authPreparation.wslDistro &&
-      authPreparation.wslLinuxConfigDir
-        ? {
-            distro: authPreparation.wslDistro,
-            linuxConfigDir: authPreparation.wslLinuxConfigDir
-          }
-        : null
-    const spawnFile = wslConfig ? 'wsl.exe' : isWin32 ? 'cmd.exe' : claudeCommand
-    const spawnArgs = wslConfig
-      ? [
-          '-d',
-          wslConfig.distro,
-          '--exec',
-          'bash',
-          '-lc',
-          // Why: Windows-side env does not cross into the distro without WSLENV,
-          // so export the configured proxy inside the command for the inner claude.
-          [
-            // Why: hidden usage probes must not inherit a root-like WSL cwd;
-            // keep Claude discovery bounded to a tiny temp directory.
-            ...getHiddenRateLimitWslCwdSetupCommands(),
-            `export CLAUDE_CONFIG_DIR=${quoteHiddenRateLimitShellValue(wslConfig.linuxConfigDir)}`,
-            ...Object.entries(proxyEnv).map(
-              ([key, value]) => `export ${key}=${quoteHiddenRateLimitShellValue(value)}`
-            ),
-            'exec claude'
-          ].join(' && ')
-        ]
-      : isWin32
-        ? ['/c', `"${claudeCommand}"`]
-        : []
-
-    const term = pty.spawn(spawnFile, spawnArgs, {
-      name: 'xterm-256color',
-      cols: 120,
-      rows: 40,
-      // Why: hidden usage PTYs must not inherit the process cwd (e.g. / or a
-      // drive root), which can trigger unbounded file discovery.
-      cwd: resolveHiddenRateLimitPtyCwd(),
-      env: withCliRuntimeOnPath(claudeCommand, spawnEnv)
-    })
-    const termDisposables: { dispose: () => void }[] = [registerHiddenRateLimitPty(term)]
-    let enterInterval: ReturnType<typeof setInterval> | null = null
-    let timeout: ReturnType<typeof setTimeout> | null = null
-
-    function clearFollowupTimers(): void {
-      if (startupDelayTimer) {
-        clearTimeout(startupDelayTimer)
-        startupDelayTimer = null
-      }
-      if (stopSettleTimer) {
-        clearTimeout(stopSettleTimer)
-        stopSettleTimer = null
-      }
-      if (claude21UsageSettleTimer) {
-        clearTimeout(claude21UsageSettleTimer)
-        claude21UsageSettleTimer = null
-      }
-      if (enterInterval) {
-        clearInterval(enterInterval)
-        enterInterval = null
-      }
-    }
-
-    function settleAborted(): void {
-      if (resolved) {
-        return
-      }
-      resolved = true
-      if (timeout) {
-        clearTimeout(timeout)
-        timeout = null
-      }
-      clearFollowupTimers()
-      cleanupHiddenRateLimitPty(term, termDisposables, { kill: true })
-      resolve(abortedClaudeUsageResult())
-    }
-
-    if (options?.signal) {
-      if (options.signal.aborted) {
-        settleAborted()
-        return
-      }
-      options.signal.addEventListener('abort', settleAborted, { once: true })
-      termDisposables.push({
-        dispose: () => options.signal?.removeEventListener('abort', settleAborted)
-      })
-    }
-
-    timeout = setTimeout(() => {
-      if (!resolved) {
-        resolved = true
-        clearFollowupTimers()
-        cleanupHiddenRateLimitPty(term, termDisposables, { kill: true })
-        // Even on timeout, try to parse whatever we collected
-        const clean = stripTerminalControlSequences(output)
-        const { session, weekly, fableWeekly } = parseClaudePtyUsage(clean)
-        if (session || weekly || fableWeekly) {
-          resolve({
-            provider: 'claude',
-            session,
-            weekly,
-            fableWeekly,
-            updatedAt: Date.now(),
-            error: null,
-            status: 'ok'
-          })
-        } else {
-          resolve({
-            provider: 'claude',
-            session: null,
-            weekly: null,
-            updatedAt: Date.now(),
-            error: withMacTailscaleDnsHint(
-              isClaude21UsagePanel(clean)
-                ? describeClaudeUsageFailure(clean)
-                : 'PTY timeout — /usage panel did not render',
-              clean
-            ),
-            status: 'error'
-          })
-        }
-      }
-    }, PTY_TIMEOUT_MS)
-
-    // Why: the Claude TUI may have scrollable panels or prompts.
-    // Sending Enter every 0.8s advances through them.
-    function startEnterPresses(): void {
-      if (enterInterval) {
-        return
-      }
-      enterInterval = setInterval(() => {
-        if (!resolved && !stopDetected) {
-          term.write('\r')
-        }
-      }, 800)
-    }
-
-    function finalize(): void {
-      if (resolved) {
-        return
-      }
-      resolved = true
-      if (timeout) {
-        clearTimeout(timeout)
-        timeout = null
-      }
-      clearFollowupTimers()
-      cleanupHiddenRateLimitPty(term, termDisposables, { kill: true })
-
-      const clean = stripTerminalControlSequences(output)
-      const { session, weekly, fableWeekly } = parseClaudePtyUsage(clean)
-
-      if (!session && !weekly && !fableWeekly) {
-        resolve({
-          provider: 'claude',
-          session: null,
-          weekly: null,
-          updatedAt: Date.now(),
-          error: withMacTailscaleDnsHint(describeClaudeUsageFailure(clean), clean),
-          status: 'error'
-        })
-      } else {
-        resolve({
-          provider: 'claude',
-          session,
-          weekly,
-          fableWeekly,
-          updatedAt: Date.now(),
-          error: null,
-          status: 'ok'
-        })
-      }
-    }
-
-    // Why: wait 2s for the CLI to initialize, then send `/usage\r`
-    // directly without detecting the prompt character (see comment above).
-    startupDelayTimer = setTimeout(() => {
-      startupDelayTimer = null
-      if (resolved) {
-        return
-      }
-      sentUsage = true
-      term.write('/usage\r')
-      startEnterPresses()
-    }, STARTUP_DELAY_MS)
-
-    const onDataDisposable = term.onData((data) => {
-      output += data
-      // Why: prevent memory exhaustion if the CLI process floods output
-      if (output.length > MAX_OUTPUT_LENGTH) {
-        output = output.slice(-MAX_OUTPUT_LENGTH)
-      }
-
-      const cleanChunk = stripTerminalControlSequences(data)
-
-      // Why: the Claude CLI may prompt for first-run setup (trust files,
-      // workspace directory). Auto-accept so we can reach /usage.
-      if (TRUST_PROMPT_RE.test(cleanChunk)) {
-        term.write('y\r')
-        return
-      }
-
-      // Why: Claude CLI v2.x may show a command palette when `/usage` is
-      // entered, listing options like "Show plan usage limits". Auto-confirm
-      // by sending Enter when these prompts appear.
-      if (sentUsage && COMMAND_PALETTE_RE.test(cleanChunk)) {
-        term.write('\r')
-      }
-
-      // Check if we've hit a stop substring indicating the panel rendered
-      if (sentUsage && !stopDetected) {
-        const clean = stripTerminalControlSequences(output)
-        if (!claude21UsageDetected && isClaude21UsagePanel(clean)) {
-          claude21UsageDetected = true
-          if (enterInterval) {
-            clearInterval(enterInterval)
-            enterInterval = null
-          }
-          // Why: Claude 2.1 may render session stats without subscription
-          // plan windows. Give async usage loading a grace period, then finish
-          // with a user-facing unavailable state instead of a false PTY timeout.
-          claude21UsageSettleTimer = setTimeout(finalize, SETTLE_AFTER_CLAUDE_21_USAGE_MS)
-        }
-        for (const sub of CLAUDE_USAGE_STOP_SUBSTRINGS) {
-          if (clean.includes(sub)) {
-            stopDetected = true
-            // Why: 2.0s settle time after detecting the stop substring
-            // allows the full panel to finish rendering.
-            stopSettleTimer = setTimeout(finalize, SETTLE_AFTER_STOP_MS)
-            break
-          }
-        }
-      }
-    })
-    if (onDataDisposable) {
-      termDisposables.push(onDataDisposable)
-    }
-
-    const onExitDisposable = term.onExit(() => {
-      cleanupHiddenRateLimitPty(term, termDisposables, { kill: false })
-      clearFollowupTimers()
-      if (!resolved) {
-        resolved = true
-        if (timeout) {
-          clearTimeout(timeout)
-          timeout = null
-        }
-        const clean = stripTerminalControlSequences(output)
-        const { session, weekly, fableWeekly } = parseClaudePtyUsage(clean)
-        resolve({
-          provider: 'claude',
-          session,
-          weekly,
-          fableWeekly,
-          updatedAt: Date.now(),
-          error:
-            session || weekly || fableWeekly
-              ? null
-              : withMacTailscaleDnsHint('CLI exited before /usage rendered', clean),
-          status: session || weekly || fableWeekly ? 'ok' : 'error'
-        })
-      }
-    })
-    if (onExitDisposable) {
-      termDisposables.push(onExitDisposable)
-    }
-  })
-}
diff --git a/src/main/rate-limits/claude-usage-error-classification.test.ts b/src/main/rate-limits/claude-usage-error-classification.test.ts
index 9371479cfba5..5e60c281674f 100644
--- a/src/main/rate-limits/claude-usage-error-classification.test.ts
+++ b/src/main/rate-limits/claude-usage-error-classification.test.ts
@@ -1,8 +1,5 @@
 import { describe, expect, it } from 'vitest'
-import {
-  classifyClaudeCredentialAbsence,
-  classifyClaudeOAuthUsageError
-} from './claude-usage-error-classification'
+import { classifyClaudeOAuthUsageError } from './claude-usage-error-classification'
 import { OAuthUsageError } from './claude-oauth-usage-error'
 
 describe('classifyClaudeOAuthUsageError', () => {
@@ -47,38 +44,3 @@ describe('classifyClaudeOAuthUsageError', () => {
     })
   })
 })
-
-describe('classifyClaudeCredentialAbsence', () => {
-  it('classifies refresh-only credentials as repairable', () => {
-    expect(classifyClaudeCredentialAbsence({ hasRefreshableCredentials: true })).toMatchObject({
-      failureKind: 'refreshable-credentials-without-token',
-      shouldAttemptDelegatedRefresh: true,
-      shouldAttemptCliFallback: true
-    })
-  })
-
-  it('classifies Keychain read failures separately from missing credentials', () => {
-    expect(
-      classifyClaudeCredentialAbsence({
-        hasRefreshableCredentials: false,
-        keychainUnavailable: true
-      })
-    ).toMatchObject({
-      failureKind: 'keychain-unavailable',
-      shouldAttemptCliFallback: true,
-      shouldAttemptDelegatedRefresh: false
-    })
-  })
-
-  it('classifies live Claude ownership as a deferred state', () => {
-    expect(
-      classifyClaudeCredentialAbsence({
-        hasRefreshableCredentials: true,
-        managedRefreshDeferredByLivePty: true
-      })
-    ).toMatchObject({
-      failureKind: 'deferred-by-live-session',
-      terminal: true
-    })
-  })
-})
diff --git a/src/main/rate-limits/claude-usage-error-classification.ts b/src/main/rate-limits/claude-usage-error-classification.ts
index 71c88c242bd8..440d1155d243 100644
--- a/src/main/rate-limits/claude-usage-error-classification.ts
+++ b/src/main/rate-limits/claude-usage-error-classification.ts
@@ -39,23 +39,6 @@ export function classifyClaudeOAuthUsageError(error: unknown): ClaudeUsageErrorC
   return fallbackOnly('unknown')
 }
 
-export function classifyClaudeCredentialAbsence(input: {
-  hasRefreshableCredentials: boolean
-  keychainUnavailable?: boolean
-  managedRefreshDeferredByLivePty?: boolean
-}): ClaudeUsageErrorClassification {
-  if (input.managedRefreshDeferredByLivePty) {
-    return terminal('deferred-by-live-session')
-  }
-  if (input.keychainUnavailable) {
-    return fallbackOnly('keychain-unavailable')
-  }
-  if (input.hasRefreshableCredentials) {
-    return recoverableAuth('refreshable-credentials-without-token')
-  }
-  return terminal('missing-credentials')
-}
-
 function recoverableAuth(failureKind: UsageRateLimitFailureKind): ClaudeUsageErrorClassification {
   return {
     failureKind,
diff --git a/src/main/rate-limits/claude-usage-refresh-plan.test.ts b/src/main/rate-limits/claude-usage-refresh-plan.test.ts
deleted file mode 100644
index dced9e7815c7..000000000000
--- a/src/main/rate-limits/claude-usage-refresh-plan.test.ts
+++ /dev/null
@@ -1,32 +0,0 @@
-import { describe, expect, it } from 'vitest'
-import { resolveClaudeUsageRefreshPlan } from './claude-usage-refresh-plan'
-
-describe('resolveClaudeUsageRefreshPlan', () => {
-  it('uses OAuth then CLI app auto ordering when CLI fallback is available', () => {
-    expect(resolveClaudeUsageRefreshPlan({ allowCliFallback: true }).steps).toEqual([
-      { source: 'oauth', reason: 'app-auto-preferred-oauth' },
-      { source: 'cli', reason: 'app-auto-fallback-cli' }
-    ])
-  })
-
-  it('keeps web deferred and internal-only for the first parity pass', () => {
-    expect(resolveClaudeUsageRefreshPlan({ allowCliFallback: true }).webDeferred).toBe(true)
-  })
-
-  it('omits CLI fallback for unresolved WSL Claude config', () => {
-    expect(
-      resolveClaudeUsageRefreshPlan({
-        allowCliFallback: true,
-        authPreparation: {
-          configDir: '\\\\wsl.localhost\\Ubuntu\\home\\jin\\.claude',
-          runtime: 'wsl',
-          wslDistro: 'Ubuntu',
-          wslLinuxConfigDir: null,
-          envPatch: {},
-          stripAuthEnv: true,
-          provenance: 'wsl:Ubuntu:system'
-        }
-      }).steps
-    ).toEqual([{ source: 'oauth', reason: 'app-auto-preferred-oauth' }])
-  })
-})
diff --git a/src/main/rate-limits/claude-usage-refresh-plan.ts b/src/main/rate-limits/claude-usage-refresh-plan.ts
deleted file mode 100644
index 06144a15715b..000000000000
--- a/src/main/rate-limits/claude-usage-refresh-plan.ts
+++ /dev/null
@@ -1,47 +0,0 @@
-import type { UsageRateLimitSource } from '../../shared/rate-limit-types'
-import type { ClaudeRuntimeAuthPreparation } from '../claude-accounts/runtime-auth-service'
-
-export type ClaudeUsageRefreshStep = {
-  source: UsageRateLimitSource
-  reason: 'app-auto-preferred-oauth' | 'app-auto-fallback-cli' | 'future-web-fallback-deferred'
-}
-
-export type ClaudeUsageRefreshPlanInput = {
-  authPreparation?: ClaudeRuntimeAuthPreparation
-  allowCliFallback: boolean
-}
-
-export type ClaudeUsageRefreshPlan = {
-  steps: ClaudeUsageRefreshStep[]
-  webDeferred: boolean
-}
-
-export function resolveClaudeUsageRefreshPlan(
-  input: ClaudeUsageRefreshPlanInput
-): ClaudeUsageRefreshPlan {
-  const steps: ClaudeUsageRefreshStep[] = [
-    {
-      source: 'oauth',
-      reason: 'app-auto-preferred-oauth'
-    }
-  ]
-
-  if (input.allowCliFallback && isCliPlausiblyAvailable(input.authPreparation)) {
-    steps.push({
-      source: 'cli',
-      reason: 'app-auto-fallback-cli'
-    })
-  }
-
-  return {
-    steps,
-    webDeferred: true
-  }
-}
-
-function isCliPlausiblyAvailable(authPreparation?: ClaudeRuntimeAuthPreparation): boolean {
-  if (authPreparation?.runtime === 'wsl') {
-    return Boolean(authPreparation.wslDistro && authPreparation.wslLinuxConfigDir)
-  }
-  return true
-}
diff --git a/src/main/rate-limits/claude-usage-result.ts b/src/main/rate-limits/claude-usage-result.ts
index a29cb38d4aad..e1863be724d3 100644
--- a/src/main/rate-limits/claude-usage-result.ts
+++ b/src/main/rate-limits/claude-usage-result.ts
@@ -1,16 +1,4 @@
-import type {
-  ProviderRateLimits,
-  UsageRateLimitFailureKind,
-  UsageRateLimitMetadata,
-  UsageRateLimitSource
-} from '../../shared/rate-limit-types'
-import type { ClaudeRuntimeAuthPreparation } from '../claude-accounts/runtime-auth-service'
-import type { ClaudeOAuthCredentialReadResult } from './claude-oauth-credentials'
-import { OAuthUsageError } from './claude-oauth-usage-error'
-
-export type ClaudeUsageAttemptState = {
-  attemptedSources: UsageRateLimitSource[]
-}
+import type { ProviderRateLimits, UsageRateLimitMetadata } from '../../shared/rate-limit-types'
 
 export function abortedClaudeRateLimitResult(): ProviderRateLimits {
   return {
@@ -23,30 +11,6 @@ export function abortedClaudeRateLimitResult(): ProviderRateLimits {
   }
 }
 
-export function recordClaudeUsageAttempt(
-  state: ClaudeUsageAttemptState,
-  source: UsageRateLimitSource
-): UsageRateLimitSource[] {
-  if (!state.attemptedSources.includes(source)) {
-    state.attemptedSources.push(source)
-  }
-  return state.attemptedSources
-}
-
-export function withClaudeUsageMetadata(
-  limits: ProviderRateLimits,
-  metadata: UsageRateLimitMetadata
-): ProviderRateLimits {
-  return {
-    ...limits,
-    usageMetadata: {
-      ...limits.usageMetadata,
-      ...metadata,
-      attemptedSources: metadata.attemptedSources ?? limits.usageMetadata?.attemptedSources
-    }
-  }
-}
-
 export function makeClaudeUsageResult(
   status: ProviderRateLimits['status'],
   error: string | null,
@@ -63,76 +27,10 @@ export function makeClaudeUsageResult(
   }
 }
 
-export function metadataForClaudeUsageAttempt(input: {
-  attemptedSources: UsageRateLimitSource[]
-  oauthCredentials: ClaudeOAuthCredentialReadResult
-  authPreparation?: ClaudeRuntimeAuthPreparation
-  source?: UsageRateLimitSource
-  failureKind?: UsageRateLimitFailureKind
-  deferredByLiveClaudeSession?: boolean
-  retryAtMs?: number
-}): UsageRateLimitMetadata {
-  return {
-    source: input.source,
-    attemptedSources: [...input.attemptedSources],
-    failureKind: input.failureKind,
-    credentialSource: input.oauthCredentials.source,
-    authProvenance: input.authPreparation?.provenance ?? 'system',
-    deferredByLiveClaudeSession: input.deferredByLiveClaudeSession,
-    retryAtMs: input.retryAtMs
-  }
-}
-
-export function warnClaudeUsageFetchFailure(
-  authPreparation: ClaudeRuntimeAuthPreparation | undefined,
-  credentials: ClaudeOAuthCredentialReadResult,
-  error: unknown
-): void {
-  console.warn('[claude-rate-limits] Claude usage refresh failed', {
-    provenance: authPreparation?.provenance ?? 'system',
-    runtime: authPreparation?.runtime ?? 'host',
-    wslDistro: authPreparation?.wslDistro ?? null,
-    hasExplicitClaudeConfigDir: Boolean(authPreparation?.envPatch.CLAUDE_CONFIG_DIR),
-    credentialSource: credentials.source,
-    keychainUnavailable: credentials.keychainUnavailable,
-    hasRefreshableCredentials: credentials.hasRefreshableCredentials,
-    status: error instanceof OAuthUsageError ? error.status : null,
-    message: error instanceof Error ? error.message : String(error)
+// Why plain: the profile/host reason is shown on the account row, not as raw text in usage.
+export function claudeUsageUnavailable(): ProviderRateLimits {
+  return makeClaudeUsageResult('error', 'Claude usage is unavailable right now.', {
+    failureKind: 'usage-unavailable',
+    attemptedSources: []
   })
 }
-
-export function mergeClaudeUsageWindows(
-  primary: ProviderRateLimits,
-  supplement: ProviderRateLimits | null
-): ProviderRateLimits {
-  if (!supplement) {
-    return primary
-  }
-  return {
-    ...primary,
-    session: primary.session ?? supplement.session,
-    weekly: primary.weekly ?? supplement.weekly,
-    fableWeekly: primary.fableWeekly ?? supplement.fableWeekly ?? null,
-    // Only OAuth reports the extra-usage cap; keep it when the CLI supplements windows.
-    extraUsage: primary.extraUsage ?? supplement.extraUsage ?? null
-  }
-}
-
-export function canSupplementClaudeOAuthUsage(input: {
-  oauthLimits: ProviderRateLimits
-  authPreparation?: ClaudeRuntimeAuthPreparation
-  allowUsagePanelSupplement: boolean
-}): boolean {
-  return Boolean(
-    input.allowUsagePanelSupplement &&
-    !input.authPreparation?.managedRefreshDeferredByLivePty &&
-    !input.oauthLimits.fableWeekly &&
-    (input.oauthLimits.session || input.oauthLimits.weekly)
-  )
-}
-
-export function isManagedClaudeAuth(
-  authPreparation: ClaudeRuntimeAuthPreparation | undefined
-): boolean {
-  return authPreparation?.provenance.startsWith('managed:') === true
-}
diff --git a/src/main/rate-limits/hidden-pty-cleanup.test.ts b/src/main/rate-limits/hidden-pty-cleanup.test.ts
deleted file mode 100644
index 43e8453fa0fd..000000000000
--- a/src/main/rate-limits/hidden-pty-cleanup.test.ts
+++ /dev/null
@@ -1,135 +0,0 @@
-import { afterEach, describe, expect, it, vi } from 'vitest'
-import {
-  cleanupHiddenRateLimitPty,
-  getActiveHiddenRateLimitPtyCount,
-  registerHiddenRateLimitPty
-} from './hidden-pty-cleanup'
-
-function setPlatform(platform: NodeJS.Platform): void {
-  Object.defineProperty(process, 'platform', {
-    configurable: true,
-    value: platform
-  })
-}
-
-describe('cleanupHiddenRateLimitPty', () => {
-  const originalPlatform = process.platform
-
-  afterEach(() => {
-    setPlatform(originalPlatform)
-    vi.clearAllMocks()
-  })
-
-  it('disposes listeners, kills the child, then destroys the PTY fd on POSIX', () => {
-    setPlatform('darwin')
-    const dataDisposable = { dispose: vi.fn() }
-    const exitDisposable = { dispose: vi.fn() }
-    const killMock = vi.fn()
-    const term = {
-      kill: killMock,
-      destroy: vi.fn()
-    }
-
-    cleanupHiddenRateLimitPty(term, [dataDisposable, exitDisposable], { kill: true })
-
-    expect(dataDisposable.dispose.mock.invocationCallOrder[0]).toBeLessThan(
-      killMock.mock.invocationCallOrder[0]
-    )
-    expect(exitDisposable.dispose.mock.invocationCallOrder[0]).toBeLessThan(
-      killMock.mock.invocationCallOrder[0]
-    )
-    expect(killMock.mock.invocationCallOrder[0]).toBeLessThan(
-      term.destroy.mock.invocationCallOrder[0]
-    )
-  })
-
-  it('releases the PTY fd without killing again after natural exit', () => {
-    setPlatform('darwin')
-    const killMock = vi.fn()
-    const term = {
-      kill: killMock,
-      destroy: vi.fn()
-    }
-
-    cleanupHiddenRateLimitPty(term, [], { kill: false })
-
-    expect(killMock).not.toHaveBeenCalled()
-    expect(term.destroy).toHaveBeenCalledTimes(1)
-  })
-
-  it('neutralizes POSIX destroy-time SIGHUP after the intentional kill', () => {
-    setPlatform('linux')
-    const killMock = vi.fn()
-    const term = {
-      kill: killMock,
-      destroy: vi.fn(() => {
-        term.kill('SIGHUP')
-      })
-    }
-
-    cleanupHiddenRateLimitPty(term, [], { kill: true })
-
-    expect(killMock).toHaveBeenCalledTimes(1)
-    expect(killMock).toHaveBeenCalledWith()
-  })
-
-  it('does not destroy after an intentional Windows kill because destroy kills again', () => {
-    setPlatform('win32')
-    const term = {
-      kill: vi.fn(),
-      destroy: vi.fn(() => {
-        term.kill()
-      })
-    }
-
-    cleanupHiddenRateLimitPty(term, [], { kill: true })
-
-    expect(term.kill).toHaveBeenCalledTimes(1)
-    expect(term.destroy).not.toHaveBeenCalled()
-  })
-
-  it('destroys a Windows PTY after natural exit so ConPTY cleanup still runs', () => {
-    setPlatform('win32')
-    const term = {
-      kill: vi.fn(),
-      destroy: vi.fn(() => {
-        term.kill()
-      })
-    }
-
-    cleanupHiddenRateLimitPty(term, [], { kill: false })
-
-    expect(term.kill).toHaveBeenCalledTimes(1)
-    expect(term.destroy).toHaveBeenCalledTimes(1)
-  })
-
-  it('removes registered hidden PTYs when cleanup kills them', () => {
-    setPlatform('darwin')
-    const term = {
-      kill: vi.fn(),
-      destroy: vi.fn()
-    }
-    const registration = registerHiddenRateLimitPty(term)
-
-    expect(getActiveHiddenRateLimitPtyCount()).toBe(1)
-
-    cleanupHiddenRateLimitPty(term, [registration], { kill: true })
-
-    expect(getActiveHiddenRateLimitPtyCount()).toBe(0)
-  })
-
-  it('removes registered hidden PTYs after natural exit cleanup', () => {
-    setPlatform('darwin')
-    const term = {
-      kill: vi.fn(),
-      destroy: vi.fn()
-    }
-    const registration = registerHiddenRateLimitPty(term)
-
-    expect(getActiveHiddenRateLimitPtyCount()).toBe(1)
-
-    cleanupHiddenRateLimitPty(term, [registration], { kill: false })
-
-    expect(getActiveHiddenRateLimitPtyCount()).toBe(0)
-  })
-})
diff --git a/src/main/rate-limits/hidden-pty-cleanup.ts b/src/main/rate-limits/hidden-pty-cleanup.ts
deleted file mode 100644
index 068b937ee844..000000000000
--- a/src/main/rate-limits/hidden-pty-cleanup.ts
+++ /dev/null
@@ -1,58 +0,0 @@
-type HiddenPty = {
-  kill: (signal?: string) => void
-  destroy?: () => void
-}
-
-type Disposable = {
-  dispose: () => void
-}
-
-const activeHiddenRateLimitPtys = new Set<HiddenPty>()
-
-export function registerHiddenRateLimitPty(term: HiddenPty): Disposable {
-  activeHiddenRateLimitPtys.add(term)
-  return {
-    dispose: () => {
-      activeHiddenRateLimitPtys.delete(term)
-    }
-  }
-}
-
-export function getActiveHiddenRateLimitPtyCount(): number {
-  return activeHiddenRateLimitPtys.size
-}
-
-export function cleanupHiddenRateLimitPty(
-  term: HiddenPty,
-  disposables: Disposable[],
-  options: { kill: boolean }
-): void {
-  for (const disposable of disposables.splice(0)) {
-    disposable.dispose()
-  }
-
-  if (options.kill) {
-    try {
-      term.kill()
-    } catch {
-      /* already exited */
-    }
-
-    // Why: node-pty WindowsTerminal.destroy() calls kill() again, which can
-    // close the same ConPTY handle twice after an intentional termination.
-    if (process.platform === 'win32') {
-      return
-    }
-  }
-
-  // Why: node-pty destroy releases the master PTY fd; on POSIX, neutralize
-  // the post-close SIGHUP hook after exit/kill to avoid pid reuse.
-  if (process.platform !== 'win32') {
-    term.kill = () => {}
-  }
-  try {
-    term.destroy?.()
-  } catch {
-    /* already torn down */
-  }
-}
diff --git a/src/main/rate-limits/opencode-go-usage-fetcher.test.ts b/src/main/rate-limits/opencode-go-usage-fetcher.test.ts
index 0c65c2fb7882..f91af85eb068 100644
--- a/src/main/rate-limits/opencode-go-usage-fetcher.test.ts
+++ b/src/main/rate-limits/opencode-go-usage-fetcher.test.ts
@@ -425,9 +425,16 @@ describe('fetchOpenCodeGoRateLimits', () => {
   ])(
     'keeps valid quota when optional billing has an %s',
     async (_label, billingResponse, disabledReason) => {
+      const billingSignals: AbortSignal[] = []
       netFetchMock
         .mockResolvedValueOnce(makeJsonResponse(STATUS_WITH_MONTHLY))
-        .mockResolvedValueOnce(billingResponse)
+        .mockImplementationOnce((_url, init: RequestInit) => {
+          if (init.signal) {
+            billingSignals.push(init.signal)
+          }
+          return Promise.resolve(billingResponse)
+        })
+      const readBody = vi.spyOn(billingResponse, 'text')
 
       const result = await fetchOpenCodeGoRateLimits('auth=mytoken', 'wrk_OVERRIDE123')
 
@@ -436,6 +443,10 @@ describe('fetchOpenCodeGoRateLimits', () => {
       expect(result.extraUsage).toEqual(
         expect.objectContaining({ balance: null, enabled: false, disabledReason })
       )
+      expect(billingSignals).toHaveLength(1)
+      expect(billingSignals[0]?.aborted).toBe(!billingResponse.ok)
+      expect(readBody).toHaveBeenCalledTimes(billingResponse.ok ? 1 : 0)
+      expect(clearStorageDataMock).toHaveBeenCalledTimes(2)
     }
   )
 
diff --git a/src/main/rate-limits/opencode-go-usage-fetcher.ts b/src/main/rate-limits/opencode-go-usage-fetcher.ts
index d8ebf61d17d7..74a96fb372eb 100644
--- a/src/main/rate-limits/opencode-go-usage-fetcher.ts
+++ b/src/main/rate-limits/opencode-go-usage-fetcher.ts
@@ -146,6 +146,7 @@ function startOptionalBillingFetch(openCodeSession: Session, workspaceId: string
         signal: abortController.signal
       })
       if (!response.ok) {
+        abortController.abort()
         return makeOpenCodeGoZenBalance(null, 'refresh-failed')
       }
       const balance = parseOpenCodeGoBillingStatusPayload(await response.text())
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 27e93208c1a1..4366417dc3e7 100644
--- a/src/main/rate-limits/service-account-target-selection.test.ts
+++ b/src/main/rate-limits/service-account-target-selection.test.ts
@@ -551,9 +551,7 @@ describe('RateLimitService', () => {
 
   it('does not cache host Claude usage under an outgoing WSL account', async () => {
     const service = new RateLimitService()
-    service.setInactiveClaudeAccountsResolver(() => [
-      { id: 'wsl-account-1', managedAuthPath: '/tmp/account-1/auth' }
-    ])
+    service.setInactiveClaudeAccountsResolver(() => [{ id: 'wsl-account-1' }])
     service.setClaudeAuthPreparationResolver(async (target) => ({
       configDir:
         target?.runtime === 'wsl'
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 cae71c569e71..469b51e4cf1c 100644
--- a/src/main/rate-limits/service-inactive-account-previews.test.ts
+++ b/src/main/rate-limits/service-inactive-account-previews.test.ts
@@ -78,7 +78,7 @@ describe('RateLimitService', () => {
 
   it('aborts inactive Claude preview fetches on stop', async () => {
     const service = new RateLimitService()
-    const account = { id: 'account-1', managedAuthPath: '/tmp/account-1/auth' }
+    const account = { id: 'account-1' }
     const capturedSignals: { claude?: AbortSignal } = {}
     service.setInactiveClaudeAccountsResolver(() => [account])
     vi.mocked(fetchManagedAccountUsage).mockImplementation(
@@ -212,7 +212,7 @@ describe('RateLimitService', () => {
 
   it('allows usage-panel Fable supplements for inactive Claude account previews', async () => {
     const service = new RateLimitService()
-    const account = { id: 'account-1', managedAuthPath: '/tmp/account-1/auth' }
+    const account = { id: 'account-1' }
     service.setInactiveClaudeAccountsResolver(() => [account])
     vi.mocked(fetchManagedAccountUsage).mockResolvedValueOnce(okProvider('claude', 33, Date.now()))
 
@@ -230,9 +230,7 @@ describe('RateLimitService', () => {
   it('does not start overlapping inactive Claude preview fetches', async () => {
     const service = new RateLimitService()
     const accountFetch = deferred<ProviderRateLimits>()
-    service.setInactiveClaudeAccountsResolver(() => [
-      { id: 'account-1', managedAuthPath: '/tmp/account-1/auth' }
-    ])
+    service.setInactiveClaudeAccountsResolver(() => [{ id: 'account-1' }])
     vi.mocked(fetchManagedAccountUsage).mockReturnValueOnce(accountFetch.promise)
 
     const firstFetch = service.fetchInactiveClaudeAccountsOnOpen()
@@ -401,7 +399,7 @@ describe('RateLimitService', () => {
   it('does not recache an inactive Claude account removed during fetch-on-open', async () => {
     const service = new RateLimitService()
     const accountFetch = deferred<ProviderRateLimits>()
-    let inactiveAccounts = [{ id: 'account-1', managedAuthPath: '/tmp/account-1/auth' }]
+    let inactiveAccounts = [{ id: 'account-1' }]
     service.setInactiveClaudeAccountsResolver(() => inactiveAccounts)
     service.setClaudeAuthPreparationResolver(async () => ({
       configDir: '/tmp/.claude',
@@ -420,7 +418,7 @@ describe('RateLimitService', () => {
     ])
 
     service.evictInactiveClaudeCache('account-1')
-    inactiveAccounts = [{ id: 'account-1', managedAuthPath: '/tmp/account-1/auth' }]
+    inactiveAccounts = [{ id: 'account-1' }]
     await service.refreshForClaudeAccountChange('account-1')
     expect(service.getState().inactiveClaudeAccounts[0]?.accountId).toBe('account-1')
 
@@ -435,9 +433,7 @@ describe('RateLimitService', () => {
   it('does not overwrite inactive Claude cache from a stale same-id fetch', async () => {
     const service = new RateLimitService()
     const accountFetch = deferred<ProviderRateLimits>()
-    service.setInactiveClaudeAccountsResolver(() => [
-      { id: 'account-1', managedAuthPath: '/tmp/account-1/auth' }
-    ])
+    service.setInactiveClaudeAccountsResolver(() => [{ id: 'account-1' }])
     service.setClaudeAuthPreparationResolver(async () => ({
       configDir: '/tmp/.claude',
       envPatch: {},
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 8c35ab77acc7..f6cbc7006200 100644
--- a/src/main/rate-limits/service-live-claude-usage.test.ts
+++ b/src/main/rate-limits/service-live-claude-usage.test.ts
@@ -14,6 +14,12 @@ import {
   resetRateLimitProviderMocks
 } from './rate-limit-service-test-harness'
 
+const profileRouter = vi.hoisted((): { userConfigDir?: string } => ({}))
+vi.mock('../claude-accounts/claude-profile-installed-router', () => ({
+  getClaudeProfileRouter: () =>
+    profileRouter.userConfigDir ? { userConfigDir: () => profileRouter.userConfigDir } : undefined
+}))
+
 vi.mock('./claude-fetcher', () => ({
   fetchClaudeRateLimits: vi.fn(),
   fetchManagedAccountUsage: vi.fn()
@@ -280,6 +286,60 @@ describe('RateLimitService', () => {
     }
   })
 
+  it('attributes statusline posts to System Default when it inherits CLAUDE_CONFIG_DIR', async () => {
+    vi.useFakeTimers()
+    try {
+      vi.mocked(fetchClaudeRateLimits).mockResolvedValue(okProvider('claude', 18))
+      mockFreshBackgroundProviderFetches()
+      vi.stubEnv('CLAUDE_CONFIG_DIR', '/own/claude-config')
+      const service = new RateLimitService()
+      service.setClaudeAuthPreparationResolver(async () => ({
+        configDir: '/own/claude-config',
+        envPatch: {},
+        stripAuthEnv: false,
+        provenance: 'system'
+      }))
+      await service.refresh()
+      service.ingestLiveClaudeRateLimits({
+        configDir: '/own/claude-config',
+        fiveHour: { used_percentage: 44 },
+        sevenDay: null
+      })
+      expect(service.getState().claude?.session?.usedPercent).toBe(44)
+    } finally {
+      vi.unstubAllEnvs()
+      vi.useRealTimers()
+    }
+  })
+
+  it("attributes System Default posts to the login shell's CLAUDE_CONFIG_DIR a Dock launch lacks", async () => {
+    vi.useFakeTimers()
+    try {
+      vi.mocked(fetchClaudeRateLimits).mockResolvedValue(okProvider('claude', 18))
+      mockFreshBackgroundProviderFetches()
+      vi.stubEnv('CLAUDE_CONFIG_DIR', '')
+      profileRouter.userConfigDir = '/shell/claude-config'
+      const service = new RateLimitService()
+      service.setClaudeAuthPreparationResolver(async () => ({
+        configDir: '/shell/claude-config',
+        envPatch: {},
+        stripAuthEnv: false,
+        provenance: 'system'
+      }))
+      await service.refresh()
+      service.ingestLiveClaudeRateLimits({
+        configDir: '/shell/claude-config',
+        fiveHour: { used_percentage: 44 },
+        sevenDay: null
+      })
+      expect(service.getState().claude?.session?.usedPercent).toBe(44)
+    } finally {
+      profileRouter.userConfigDir = undefined
+      vi.unstubAllEnvs()
+      vi.useRealTimers()
+    }
+  })
+
   it('keeps the other window when a statusline post carries only one', async () => {
     vi.useFakeTimers()
     try {
@@ -477,51 +537,4 @@ describe('RateLimitService', () => {
       vi.useRealTimers()
     }
   })
-
-  describe('refreshAfterClaudeLivePtysDrained', () => {
-    function deferredClaudeResult(): ProviderRateLimits {
-      return {
-        ...errorProvider('claude', 'Waiting for Claude session'),
-        usageMetadata: {
-          failureKind: 'deferred-by-live-session',
-          deferredByLiveClaudeSession: true
-        }
-      }
-    }
-
-    it('refetches Claude usage when the current result was deferred by a live session', async () => {
-      const service = new RateLimitService()
-      vi.mocked(fetchClaudeRateLimits).mockResolvedValueOnce(deferredClaudeResult())
-      await service.refresh()
-      expect(service.getState().claude?.usageMetadata?.deferredByLiveClaudeSession).toBe(true)
-      vi.mocked(fetchClaudeRateLimits).mockClear()
-      vi.mocked(fetchClaudeRateLimits).mockResolvedValueOnce(okProvider('claude', 10, Date.now()))
-
-      await service.refreshAfterClaudeLivePtysDrained()
-
-      expect(fetchClaudeRateLimits).toHaveBeenCalledTimes(1)
-      expect(service.getState().claude?.status).toBe('ok')
-    })
-
-    it('does not refetch when the current Claude result was not deferred', async () => {
-      const service = new RateLimitService()
-      vi.mocked(fetchClaudeRateLimits).mockResolvedValueOnce(
-        errorProvider('claude', 'Token expired')
-      )
-      await service.refresh()
-      vi.mocked(fetchClaudeRateLimits).mockClear()
-
-      await service.refreshAfterClaudeLivePtysDrained()
-
-      expect(fetchClaudeRateLimits).not.toHaveBeenCalled()
-    })
-
-    it('does not refetch when there is no Claude state yet', async () => {
-      const service = new RateLimitService()
-
-      await service.refreshAfterClaudeLivePtysDrained()
-
-      expect(fetchClaudeRateLimits).not.toHaveBeenCalled()
-    })
-  })
 })
diff --git a/src/main/rate-limits/service/service-account-refresh.ts b/src/main/rate-limits/service/service-account-refresh.ts
index 6aeacd99583b..944c09be2479 100644
--- a/src/main/rate-limits/service/service-account-refresh.ts
+++ b/src/main/rate-limits/service/service-account-refresh.ts
@@ -191,15 +191,4 @@ export abstract class RateLimitServiceAccountRefresh extends RateLimitServiceIna
     await this.fetchClaudeOnly({ force: true })
     return this.getState()
   }
-
-  async refreshAfterClaudeLivePtysDrained(): Promise<void> {
-    // Why: "Waiting for Claude session" can only recover once no live claude
-    // owns the credentials. Refetch on the last PTY exit instead of leaving
-    // the stale terminal error up until the failure backoff elapses.
-    if (!this.state.claude?.usageMetadata?.deferredByLiveClaudeSession) {
-      return
-    }
-    this.activeFailureStreakByProvider.claude = 0
-    await this.fetchClaudeOnly({ force: true })
-  }
 }
diff --git a/src/main/rate-limits/service/service-fetch-policy.ts b/src/main/rate-limits/service/service-fetch-policy.ts
index cfd4a6e9d58e..907f0512f007 100644
--- a/src/main/rate-limits/service/service-fetch-policy.ts
+++ b/src/main/rate-limits/service/service-fetch-policy.ts
@@ -10,6 +10,8 @@ import {
   type ProviderRateLimits
 } from './service-types'
 import { mapClaudeUsageWindow } from '../claude-usage-window'
+import { readUserClaudeConfigDir } from '../../claude-accounts/claude-profile-paths'
+import { getClaudeProfileRouter } from '../../claude-accounts/claude-profile-installed-router'
 
 export abstract class RateLimitServiceFetchPolicy extends RateLimitServiceFetchTargets {
   protected getMiniMaxCredentialError(message: string): ProviderRateLimits {
@@ -91,7 +93,12 @@ export abstract class RateLimitServiceFetchPolicy extends RateLimitServiceFetchT
       return
     }
     this.lastClaudeAuthSnapshot = {
-      configDir: normalizeClaudeConfigDir(authPreparation?.envPatch.CLAUDE_CONFIG_DIR),
+      // Why the user's own folder: System default passes it through rather than injecting it.
+      configDir: normalizeClaudeConfigDir(
+        authPreparation?.envPatch.CLAUDE_CONFIG_DIR ??
+          getClaudeProfileRouter()?.userConfigDir() ??
+          readUserClaudeConfigDir(process.env)
+      ),
       provenance: authPreparation?.provenance ?? 'system'
     }
   }
diff --git a/src/main/runtime/agent-session-record-store.ts b/src/main/runtime/agent-session-record-store.ts
index e4f73dd32119..c78a433415dc 100644
--- a/src/main/runtime/agent-session-record-store.ts
+++ b/src/main/runtime/agent-session-record-store.ts
@@ -65,7 +65,7 @@ import {
   type AgentSessionReserveRequest,
   type AgentSessionReserveResult
 } from './agent-session-reservation-admission'
-import type { AgentSessionStoreState } from './agent-session-store-state'
+import { heldAgentSessionIds, type AgentSessionStoreState } from './agent-session-store-state'
 import {
   agentSessionVisibleTabIndex,
   listVisibleAgentSessionIds,
@@ -120,6 +120,9 @@ export class AgentSessionRecordStore {
 
   listRecords = (): AgentSessionRecord[] => [...this.state.records.values()]
 
+  /** Every chat this host holds a row for, readable or not. */
+  listHeldSessionIds = (): string[] => heldAgentSessionIds(this.state)
+
   /** Whether this host has recorded a chat, readable or not. Nothing removes a record row. */
   holdsRecords = (): boolean => this.state.records.size > 0 || this.state.unreadableRecords.size > 0
 
diff --git a/src/main/runtime/agent-session-reservation-admission.ts b/src/main/runtime/agent-session-reservation-admission.ts
index 5fbf939d1afc..ff840c755b35 100644
--- a/src/main/runtime/agent-session-reservation-admission.ts
+++ b/src/main/runtime/agent-session-reservation-admission.ts
@@ -47,6 +47,7 @@ import {
 } from './agent-session-lease-transitions'
 import type { AgentSessionStoreState } from './agent-session-store-state'
 import { agentSessionRecordIdentityFields } from './agent-session-record-founding'
+import { agentSessionAccountHomesEqual } from '../../shared/agent-session-account-home'
 
 export type AgentSessionReserveRequest = {
   /** Host-resolved floating directory committed with the first owner reservation. */
@@ -186,8 +187,7 @@ export function applyAgentSessionReservation(
   if (
     !agentSessionExecutionLocationsEqual(existing.location, request.location) ||
     existing.provider !== request.provider ||
-    existing.accountHome.variable !== request.accountHome.variable ||
-    existing.accountHome.path !== request.accountHome.path
+    !agentSessionAccountHomesEqual(existing.accountHome, request.accountHome)
   ) {
     // Why: location, provider, and account are the session identity; changing one is a fork.
     throw agentSessionRefusalError('agent_session_conflict', { reason: 'identityMismatch' })
diff --git a/src/main/runtime/agent-session-runtime-attribution.test.ts b/src/main/runtime/agent-session-runtime-attribution.test.ts
new file mode 100644
index 000000000000..c17d69589b4e
--- /dev/null
+++ b/src/main/runtime/agent-session-runtime-attribution.test.ts
@@ -0,0 +1,150 @@
+// Whether a chat's agent died with the Orca runtime that held it, and how that runtime ended. Only
+// an owner tagged with an earlier runtime of this build can be attributed; anything unknown keeps
+// the death unattributed, so the chat keeps its generic words.
+
+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 } from 'vitest'
+import type { AgentSessionLease } from '../../shared/agent-session-record'
+import {
+  agentSessionLeaseFixture,
+  agentSessionRecordFixture
+} from '../../shared/agent-session-record.test-fixture'
+import {
+  openTestAgentSessionRecordStore,
+  seedTestAgentSessionRecordStore
+} from './agent-session-record-store-test-harness'
+import {
+  agentSessionRuntimeIncarnation,
+  beginAgentSessionRuntimeIncarnationForTest
+} from './agent-session-runtime-attribution'
+import {
+  beginAgentSessionRuntimeRecord,
+  recordAgentSessionRuntimeEnd
+} from './agent-session-runtime-end-record'
+
+const SESSION = 'session-alpha-1'
+const OWNER = {
+  hostId: 'local',
+  pid: 4242,
+  processStartTimeMs: 1_700_000_000_000,
+  spawnToken: 'spawn-owner'
+}
+
+let directory: string
+
+beforeEach(async () => {
+  directory = await mkdtemp(join(tmpdir(), 'orca-runtime-attribution-'))
+})
+
+afterEach(async () => {
+  await rm(directory, { recursive: true, force: true })
+})
+
+/** A lease the runtime before this one held when it went away, as that runtime left it. */
+async function seedHeldBy(runtime: string | null, lease: Partial<AgentSessionLease> = {}) {
+  await seedTestAgentSessionRecordStore(directory, {
+    records: [
+      agentSessionRecordFixture(
+        agentSessionLeaseFixture({
+          ownerProcess: runtime ? { ...OWNER, runtime } : OWNER,
+          unreconciled: true,
+          ...lease
+        })
+      )
+    ]
+  })
+}
+
+/** What that runtime recorded about itself: its start, and its end when it ended gracefully. */
+function recorded(runtime: string, end?: 'quit' | 'update') {
+  beginAgentSessionRuntimeRecord(directory, runtime, 1_000)
+  if (end) {
+    recordAgentSessionRuntimeEnd(end, 50_000)
+  }
+}
+
+async function restartEvidence() {
+  const store = await openTestAgentSessionRecordStore(directory)
+  await store.reconcileOnRestart({ probe: async () => ({ outcome: 'pid-absent' }), now: 90_000 })
+  return store.getRecord(SESSION)?.lease.deathEvidence ?? null
+}
+
+describe("an agent that died with Orca's previous runtime", () => {
+  it('died in a crash when that runtime started and never ended', async () => {
+    await seedHeldBy('runtime-a')
+    recorded('runtime-a')
+    expect(await restartEvidence()).toMatchObject({ kind: 'pid-absent', runtimeEnd: 'crash' })
+  })
+
+  it.each(['update', 'quit'] as const)(
+    'died with the %s that runtime began, when the quit did not finish',
+    async (trigger) => {
+      await seedHeldBy('runtime-a')
+      recorded('runtime-a', trigger)
+      expect(await restartEvidence()).toMatchObject({ runtimeEnd: trigger })
+    }
+  )
+
+  it("is never told by another runtime's end", async () => {
+    await seedHeldBy('runtime-b')
+    recorded('runtime-b')
+    recorded('runtime-a', 'update')
+    expect(await restartEvidence()).toMatchObject({ runtimeEnd: 'crash' })
+  })
+
+  it('names no cause when that runtime left no record', async () => {
+    await seedHeldBy('runtime-a')
+    recorded('runtime-b', 'quit')
+    expect(await restartEvidence()).not.toHaveProperty('runtimeEnd')
+  })
+
+  it("names no cause when that runtime's record cannot be read", async () => {
+    await seedHeldBy('runtime-a')
+    await mkdir(join(directory, 'agent-session-runtimes'), { recursive: true })
+    await writeFile(join(directory, 'agent-session-runtimes', 'runtime-a.json'), '{not json')
+    expect(await restartEvidence()).not.toHaveProperty('runtimeEnd')
+  })
+
+  it('names no cause for an owner an older build recorded', async () => {
+    await seedHeldBy(null)
+    expect(await restartEvidence()).not.toHaveProperty('runtimeEnd')
+  })
+
+  it("names no cause for a terminal's agent", async () => {
+    await seedHeldBy('runtime-a', { claimStatus: 'conflicted' })
+    expect(await restartEvidence()).not.toHaveProperty('runtimeEnd')
+  })
+
+  it('is told once a survivor that outlived the runtime is stopped and proven gone', async () => {
+    await seedHeldBy('runtime-a')
+    recorded('runtime-a')
+    const store = await openTestAgentSessionRecordStore(directory)
+    // The owner was still alive at restart, so it waits in recovery for its stop.
+    await store.reconcileOnRestart({
+      probe: async () => ({ outcome: 'identity-matched', matchedOn: ['spawn-token'] }),
+      now: 90_000
+    })
+    expect(store.getRecord(SESSION)?.lease.handoffStage).toBe('recovering')
+
+    await store.evictProvenDeadOwner({
+      sessionId: SESSION,
+      expectedFence: 7,
+      probe: { outcome: 'pid-absent' },
+      now: 95_000
+    })
+
+    expect(store.getRecord(SESSION)?.lease.deathEvidence).toMatchObject({ runtimeEnd: 'crash' })
+  })
+})
+
+describe('an agent this runtime ran', () => {
+  it("becomes an earlier runtime's after a relaunch", async () => {
+    await seedHeldBy(agentSessionRuntimeIncarnation())
+    // This runtime's store opened, so it recorded its start; it then died without a quit.
+    await openTestAgentSessionRecordStore(directory)
+    beginAgentSessionRuntimeIncarnationForTest()
+    expect(await restartEvidence()).toMatchObject({ runtimeEnd: 'crash' })
+  })
+})
diff --git a/src/main/runtime/agent-session-runtime-attribution.ts b/src/main/runtime/agent-session-runtime-attribution.ts
new file mode 100644
index 000000000000..a3d255169a2f
--- /dev/null
+++ b/src/main/runtime/agent-session-runtime-attribution.ts
@@ -0,0 +1,71 @@
+// Which Orca runtime held each chat's agent, and, when that agent is later proven dead, whether it
+// died with that runtime and how the runtime ended. Applied to every store transaction, so a death
+// any transition proves (a restart's adjudication, recovery's stop of a survivor) is told the same
+// way. When anything is unknown (an owner an older build recorded, a terminal's claim, a runtime
+// with no readable record) the death names no cause and the chat keeps its generic words.
+
+import { randomUUID } from 'node:crypto'
+import type { AgentSessionRecord } from '../../shared/agent-session-record'
+import type { AgentSessionStoreState } from './agent-session-store-state'
+
+/** This Orca runtime: one per process, so a relaunch is a new one. */
+let incarnation = randomUUID()
+
+export function agentSessionRuntimeIncarnation(): string {
+  return incarnation
+}
+
+/** For tests that relaunch Orca inside one process. */
+export function beginAgentSessionRuntimeIncarnationForTest(): void {
+  incarnation = randomUUID()
+}
+
+function attributed(
+  before: AgentSessionRecord | undefined,
+  after: AgentSessionRecord,
+  runtimeEnds: AgentSessionStoreState['runtimeEnds']
+): AgentSessionRecord {
+  const { ownerProcess, deathEvidence } = after.lease
+  // An owner this transaction recorded is this runtime's.
+  if (ownerProcess && !ownerProcess.runtime && ownerProcess !== before?.lease.ownerProcess) {
+    return {
+      ...after,
+      lease: { ...after.lease, ownerProcess: { ...ownerProcess, runtime: incarnation } }
+    }
+  }
+  const heldBy = before?.lease.ownerProcess?.runtime
+  if (
+    !deathEvidence ||
+    deathEvidence === before?.lease.deathEvidence ||
+    deathEvidence.runtimeEnd !== undefined ||
+    !heldBy ||
+    heldBy === incarnation ||
+    // A terminal's agent, which an older build recorded: its transport was never Orca's.
+    before?.lease.claimStatus === 'conflicted' ||
+    !runtimeEnds
+  ) {
+    return after
+  }
+  // Unrecorded, pruned or unreadable: no cause. A crash is only a runtime that started and never ended.
+  const runtimeEnd = runtimeEnds.get(heldBy)
+  if (!runtimeEnd) {
+    return after
+  }
+  return { ...after, lease: { ...after.lease, deathEvidence: { ...deathEvidence, runtimeEnd } } }
+}
+
+/** Stamps what this transaction learned about runtimes onto the records it changed. */
+export function attributeAgentSessionRuntime(
+  published: AgentSessionStoreState,
+  draft: AgentSessionStoreState
+): void {
+  for (const [sessionId, record] of draft.records) {
+    const before = published.records.get(sessionId)
+    if (record !== before) {
+      const next = attributed(before, record, draft.runtimeEnds)
+      if (next !== record) {
+        draft.records.set(sessionId, next)
+      }
+    }
+  }
+}
diff --git a/src/main/runtime/agent-session-runtime-end-record.test.ts b/src/main/runtime/agent-session-runtime-end-record.test.ts
new file mode 100644
index 000000000000..7121f5098b6f
--- /dev/null
+++ b/src/main/runtime/agent-session-runtime-end-record.test.ts
@@ -0,0 +1,173 @@
+// What a runtime records about itself: a start when its store opens, and its end on a graceful exit.
+// A crash is only a runtime known to have started and never ended; anything else names no cause.
+
+import { existsSync } from 'node:fs'
+import { mkdir, mkdtemp, readdir, rm, utimes, 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 * as DurableFileWrite from '../durable-file-write'
+
+const writes = vi.hoisted(() => ({ fail: false }))
+vi.mock('../durable-file-write', async (importOriginal) => {
+  const actual = await importOriginal<typeof DurableFileWrite>()
+  return {
+    ...actual,
+    writeFileDurableSync: (...args: Parameters<typeof actual.writeFileDurableSync>) => {
+      if (writes.fail) {
+        throw new Error('ENOSPC: no space left on device')
+      }
+      actual.writeFileDurableSync(...args)
+    }
+  }
+})
+
+import {
+  beginAgentSessionRuntimeRecord,
+  readAgentSessionRuntimeEnds,
+  recordAgentSessionRuntimeEnd,
+  recordAgentSessionRuntimeEndOnExit
+} from './agent-session-runtime-end-record'
+import { tearDownRuntime, type InstalledRuntime } from './structured-agent-session-runtime-teardown'
+
+const RUNTIME_A = '0000000a-0000-4000-8000-000000000000'
+const RUNTIME_B = '0000000b-0000-4000-8000-000000000000'
+
+let directory: string
+
+beforeEach(async () => {
+  writes.fail = false
+  directory = await mkdtemp(join(tmpdir(), 'orca-runtime-end-'))
+})
+
+afterEach(async () => {
+  await rm(directory, { recursive: true, force: true })
+})
+
+function runtimesDirectory(): string {
+  return join(directory, 'agent-session-runtimes')
+}
+
+describe('what a runtime records about itself', () => {
+  it('reads as a crash once it started and never ended', () => {
+    beginAgentSessionRuntimeRecord(directory, RUNTIME_A, 1)
+    expect(readAgentSessionRuntimeEnds(directory)?.get(RUNTIME_A)).toBe('crash')
+  })
+
+  it.each(['quit', 'update'] as const)('reads as the %s it recorded as it ended', (trigger) => {
+    beginAgentSessionRuntimeRecord(directory, RUNTIME_A, 1)
+    recordAgentSessionRuntimeEnd(trigger, 2)
+    expect(readAgentSessionRuntimeEnds(directory)?.get(RUNTIME_A)).toBe(trigger)
+  })
+
+  it('keeps the first end it recorded', () => {
+    beginAgentSessionRuntimeRecord(directory, RUNTIME_A, 1)
+    recordAgentSessionRuntimeEnd('update', 2)
+    recordAgentSessionRuntimeEnd('quit', 3)
+    expect(readAgentSessionRuntimeEnds(directory)?.get(RUNTIME_A)).toBe('update')
+  })
+
+  it('names no cause for a runtime it has no record of', () => {
+    expect(readAgentSessionRuntimeEnds(directory)).toEqual(new Map())
+    beginAgentSessionRuntimeRecord(directory, RUNTIME_A, 1)
+    expect(readAgentSessionRuntimeEnds(directory)?.has(RUNTIME_B)).toBe(false)
+  })
+
+  it('names no cause for a record it cannot read, and the next start writes its own', async () => {
+    await mkdir(runtimesDirectory(), { recursive: true })
+    await writeFile(join(runtimesDirectory(), `${RUNTIME_A}.json`), '{not json')
+    expect(readAgentSessionRuntimeEnds(directory)?.has(RUNTIME_A)).toBe(false)
+
+    beginAgentSessionRuntimeRecord(directory, RUNTIME_B, 1)
+    recordAgentSessionRuntimeEnd('quit', 2)
+    expect(readAgentSessionRuntimeEnds(directory)?.get(RUNTIME_B)).toBe('quit')
+  })
+
+  it('names no cause when the records cannot be listed', async () => {
+    await writeFile(runtimesDirectory(), 'not a directory')
+    expect(readAgentSessionRuntimeEnds(directory)).toBeNull()
+  })
+
+  it('keeps only the newest records, so a pruned runtime names no cause', async () => {
+    beginAgentSessionRuntimeRecord(directory, RUNTIME_A, 1)
+    // The oldest record by far.
+    await utimes(join(runtimesDirectory(), `${RUNTIME_A}.json`), 1, 1)
+    for (let index = 0; index < 16; index += 1) {
+      beginAgentSessionRuntimeRecord(
+        directory,
+        `00000000-0000-4000-8000-${String(index).padStart(12, '0')}`,
+        index
+      )
+    }
+    const ends = readAgentSessionRuntimeEnds(directory)
+    expect(ends?.size).toBe(16)
+    expect(ends?.has(RUNTIME_A)).toBe(false)
+  })
+
+  it("never loses another runtime's record to its own writes", () => {
+    beginAgentSessionRuntimeRecord(directory, RUNTIME_A, 1)
+    beginAgentSessionRuntimeRecord(directory, RUNTIME_B, 2)
+    recordAgentSessionRuntimeEnd('quit', 3)
+    expect(readAgentSessionRuntimeEnds(directory)).toEqual(
+      new Map([
+        [RUNTIME_A, 'crash'],
+        [RUNTIME_B, 'quit']
+      ])
+    )
+  })
+
+  it('never fails the exit when it cannot be written', async () => {
+    await writeFile(runtimesDirectory(), 'not a directory')
+    expect(() => beginAgentSessionRuntimeRecord(directory, RUNTIME_A, 1)).not.toThrow()
+    expect(() => recordAgentSessionRuntimeEnd('quit', 2)).not.toThrow()
+  })
+
+  it('keeps its end when the same runtime records its start again during the quit', () => {
+    beginAgentSessionRuntimeRecord(directory, RUNTIME_A, 1)
+    recordAgentSessionRuntimeEnd('update', 2)
+    // A host reinstalled by a request that landed during the quit opens its store again.
+    beginAgentSessionRuntimeRecord(directory, RUNTIME_A, 3)
+    expect(readAgentSessionRuntimeEnds(directory)?.get(RUNTIME_A)).toBe('update')
+  })
+
+  it('names no cause, rather than a crash, when its end could not be written', () => {
+    beginAgentSessionRuntimeRecord(directory, RUNTIME_A, 1)
+    writes.fail = true
+    recordAgentSessionRuntimeEnd('quit', 2)
+    expect(readAgentSessionRuntimeEnds(directory)?.has(RUNTIME_A)).toBe(false)
+  })
+
+  it('reads a clean process exit nothing else recorded as a quit, and any other exit as nothing', () => {
+    beginAgentSessionRuntimeRecord(directory, RUNTIME_A, 1)
+    expect(process.listeners('exit')).toContain(recordAgentSessionRuntimeEndOnExit)
+    recordAgentSessionRuntimeEndOnExit(1)
+    expect(readAgentSessionRuntimeEnds(directory)?.get(RUNTIME_A)).toBe('crash')
+    recordAgentSessionRuntimeEndOnExit(0)
+    expect(readAgentSessionRuntimeEnds(directory)?.get(RUNTIME_A)).toBe('quit')
+  })
+
+  it('leaves no temp files behind', async () => {
+    beginAgentSessionRuntimeRecord(directory, RUNTIME_A, 1)
+    recordAgentSessionRuntimeEnd('quit', 2)
+    expect(await readdir(runtimesDirectory())).toEqual([`${RUNTIME_A}.json`])
+  })
+})
+
+describe('a quit', () => {
+  it('records its end before it waits on anything, so a quit that never finishes is still a quit', () => {
+    beginAgentSessionRuntimeRecord(directory, RUNTIME_A, 1)
+    const installed = {
+      host: { stopDelivery: vi.fn(), flushAllStreamedEvents: vi.fn() },
+      adapter: { closeAll: vi.fn() },
+      journalDatabase: { stateDirectory: directory, close: vi.fn() },
+      // A recovery that never drains: the quit's deadline ends the process here.
+      waitForRecovery: () => new Promise<void>(() => {})
+    }
+    // oxlint-disable-next-line typescript/consistent-type-assertions -- SAFETY: teardown reads only the members stubbed above before it parks on the recovery wait.
+    void tearDownRuntime(installed as unknown as InstalledRuntime, 'update')
+
+    expect(readAgentSessionRuntimeEnds(directory)?.get(RUNTIME_A)).toBe('update')
+    expect(installed.host.flushAllStreamedEvents).not.toHaveBeenCalled()
+    expect(existsSync(join(runtimesDirectory(), `${RUNTIME_A}.json`))).toBe(true)
+  })
+})
diff --git a/src/main/runtime/agent-session-runtime-end-record.ts b/src/main/runtime/agent-session-runtime-end-record.ts
new file mode 100644
index 000000000000..c57c593b4dc1
--- /dev/null
+++ b/src/main/runtime/agent-session-runtime-end-record.ts
@@ -0,0 +1,174 @@
+// What each Orca runtime that ran chats here says about itself: that it started, and, when it ends
+// gracefully, how (a quit or an update). A later start reads them to tell an owner that died with a
+// quit from one that died in a crash. A crash is only ever concluded from a runtime known to have
+// started and never ended; a runtime with no readable record names no cause.
+//
+// One file per runtime, written only by that runtime, so two processes sharing the directory never
+// lose each other's word to a read-modify-write. Pruned to the newest few, and losing a record only
+// costs the distinction.
+
+import { mkdirSync, readdirSync, rmSync, statSync } from 'node:fs'
+import { join } from 'node:path'
+import { durableWriteTempPath, writeFileDurableSync } from '../durable-file-write'
+import { readNodeFileSyncWithinLimit } from '../../shared/node-bounded-file-reader'
+import type { AgentSessionOrcaStopCause } from '../../shared/agent-session-orca-stop'
+import {
+  AGENT_SESSION_RESUME_TRIGGERS,
+  type AgentSessionResumeTrigger
+} from '../../shared/agent-session-resume-marker'
+
+const RUNTIMES_DIRECTORY = 'agent-session-runtimes'
+/** Enough runtimes that an owner a few restarts old still finds its runtime's record. */
+const MAX_RUNTIME_RECORDS = 16
+const MAX_RUNTIME_RECORD_BYTES = 4 * 1024
+/** A temp file older than this belongs to a writer that died between write and rename. */
+const STALE_TEMP_FILE_MS = 60_000
+const RECORD_FILE = /^([A-Za-z0-9-]{1,64})\.json$/
+
+type RuntimeRecord = {
+  runtime: string
+  startedAt: number
+  end?: { trigger: AgentSessionResumeTrigger; at: number }
+}
+
+/** This process's runtime, once its store opened: the one record a graceful end rewrites. */
+let current: { path: string; record: RuntimeRecord } | null = null
+
+function writeRecord(path: string, record: RuntimeRecord): void {
+  writeFileDurableSync(durableWriteTempPath(path), path, JSON.stringify(record))
+}
+
+function prune(directory: string, keep: string): void {
+  const records: { name: string; modifiedAt: number }[] = []
+  for (const name of readdirSync(directory)) {
+    const modifiedAt = statSync(join(directory, name), { throwIfNoEntry: false })?.mtimeMs ?? 0
+    if (name.endsWith('.tmp')) {
+      if (Date.now() - modifiedAt > STALE_TEMP_FILE_MS) {
+        rmSync(join(directory, name), { force: true })
+      }
+    } else if (name !== keep) {
+      records.push({ name, modifiedAt })
+    }
+  }
+  records.sort((a, b) => b.modifiedAt - a.modifiedAt)
+  for (const { name } of records.slice(MAX_RUNTIME_RECORDS - 1)) {
+    rmSync(join(directory, name), { force: true })
+  }
+}
+
+/** A graceful exit no call site recorded, such as an `app.exit(0)` or `process.exit(0)`, is a quit:
+ *  Electron emits the process's 'exit' on every quit or exit once its loop runs, and Node on every
+ *  `process.exit`. A non-zero exit records nothing, so it stays a crash. */
+export function recordAgentSessionRuntimeEndOnExit(code: number): void {
+  if (code === 0) {
+    recordAgentSessionRuntimeEnd('quit')
+  }
+}
+
+let exitHookInstalled = false
+
+/** Records that this runtime started. Never throws: a runtime with no record reads as unknown. A
+ *  second start of the same runtime (a host reinstalled during its quit) keeps the end it recorded. */
+export function beginAgentSessionRuntimeRecord(
+  stateDirectory: string,
+  runtime: string,
+  now: number
+): void {
+  const directory = join(stateDirectory, RUNTIMES_DIRECTORY)
+  const name = `${runtime}.json`
+  const path = join(directory, name)
+  const ended = current?.path === path && current.record.end ? current.record : null
+  current = { path, record: ended ?? { runtime, startedAt: now } }
+  if (!exitHookInstalled) {
+    exitHookInstalled = true
+    process.once('exit', recordAgentSessionRuntimeEndOnExit)
+  }
+  try {
+    mkdirSync(directory, { recursive: true })
+    writeRecord(current.path, current.record)
+    prune(directory, name)
+  } catch {
+    // Unwritten, this runtime's owners name no cause when they die.
+  }
+}
+
+/**
+ * The one "this Orca runtime is ending" entry point, for every graceful exit. Synchronous, so an
+ * exit that cannot await still records it; the first call wins. Never throws.
+ */
+export function recordAgentSessionRuntimeEnd(
+  trigger: AgentSessionResumeTrigger,
+  now = Date.now()
+): void {
+  if (!current || current.record.end) {
+    return
+  }
+  current.record = { ...current.record, end: { trigger, at: now } }
+  try {
+    writeRecord(current.path, current.record)
+  } catch {
+    // The start alone would read as a crash; with no record its owners name no cause.
+    try {
+      rmSync(current.path, { force: true })
+    } catch {
+      // Nothing left to try: the start stays, and reads as a crash.
+    }
+  }
+}
+
+function readTrigger(value: unknown): AgentSessionResumeTrigger | undefined {
+  return AGENT_SESSION_RESUME_TRIGGERS.find((trigger) => trigger === value)
+}
+
+/** How a recorded runtime ended: its quit or update, else a crash. Undefined when unreadable. */
+function readRecordedEnd(path: string, runtime: string): AgentSessionOrcaStopCause | undefined {
+  try {
+    const parsed: unknown = JSON.parse(
+      readNodeFileSyncWithinLimit(path, MAX_RUNTIME_RECORD_BYTES).buffer.toString('utf8')
+    )
+    if (
+      typeof parsed !== 'object' ||
+      parsed === null ||
+      !('runtime' in parsed) ||
+      parsed.runtime !== runtime ||
+      !('startedAt' in parsed) ||
+      typeof parsed.startedAt !== 'number'
+    ) {
+      return undefined
+    }
+    if (!('end' in parsed) || parsed.end === undefined) {
+      return 'crash'
+    }
+    const end = parsed.end
+    return readTrigger(
+      typeof end === 'object' && end !== null && 'trigger' in end ? end.trigger : undefined
+    )
+  } catch {
+    return undefined
+  }
+}
+
+/**
+ * How each recorded runtime ended. A runtime missing from the map (never recorded, pruned, or
+ * unreadable) names no cause. Null when the records cannot be listed at all.
+ */
+export function readAgentSessionRuntimeEnds(
+  stateDirectory: string
+): ReadonlyMap<string, AgentSessionOrcaStopCause> | null {
+  const directory = join(stateDirectory, RUNTIMES_DIRECTORY)
+  let names: string[]
+  try {
+    names = readdirSync(directory)
+  } catch (error) {
+    return error instanceof Error && 'code' in error && error.code === 'ENOENT' ? new Map() : null
+  }
+  const ends = new Map<string, AgentSessionOrcaStopCause>()
+  for (const name of names) {
+    const runtime = RECORD_FILE.exec(name)?.[1]
+    const end = runtime ? readRecordedEnd(join(directory, name), runtime) : undefined
+    if (runtime && end) {
+      ends.set(runtime, end)
+    }
+  }
+  return ends
+}
diff --git a/src/main/runtime/agent-session-store-state.ts b/src/main/runtime/agent-session-store-state.ts
index 34d46a6bf1fd..cee15a96ac49 100644
--- a/src/main/runtime/agent-session-store-state.ts
+++ b/src/main/runtime/agent-session-store-state.ts
@@ -3,6 +3,7 @@
 
 import type { AgentSessionOperationRow } from '../../shared/agent-session-operation-ledger'
 import type { AgentSessionRecord } from '../../shared/agent-session-record'
+import type { AgentSessionOrcaStopCause } from '../../shared/agent-session-orca-stop'
 import type { AgentSessionTabTable } from './agent-session-tab-table'
 
 export type RetiredAgentSessionClaimKey = { keyId: string; retiredAt: number }
@@ -15,4 +16,12 @@ export type AgentSessionStoreState = {
   unreadableRecords: Map<string, { reason: string; raw: unknown }>
   /** Chat tab id → the conversation it shows; null until this store first records a tab. */
   sessionTabs: AgentSessionTabTable | null
+  /** How each earlier runtime recorded here ended: its quit or update, or a crash when it started
+   *  and never ended; read once at load. A runtime it lacks, or null, attributes no death to Orca. */
+  runtimeEnds?: ReadonlyMap<string, AgentSessionOrcaStopCause> | null
+}
+
+/** Every session id the state holds a row for, readable or not. */
+export function heldAgentSessionIds(state: AgentSessionStoreState): string[] {
+  return [...state.records.keys(), ...state.unreadableRecords.keys()]
 }
diff --git a/src/main/runtime/agent-session-store-transactions.ts b/src/main/runtime/agent-session-store-transactions.ts
index 778956762d2c..3877da33af42 100644
--- a/src/main/runtime/agent-session-store-transactions.ts
+++ b/src/main/runtime/agent-session-store-transactions.ts
@@ -13,6 +13,14 @@ import { journalOpenRefusalError } from '../native-chat/agent-session-journal/jo
 import { AgentSessionJournalError } from '../native-chat/agent-session-journal/journal-write-guards'
 import type { AgentSessionStoreState } from './agent-session-store-state'
 import { writeAgentSessionStoreRows } from './agent-session-record-rows'
+import {
+  agentSessionRuntimeIncarnation,
+  attributeAgentSessionRuntime
+} from './agent-session-runtime-attribution'
+import {
+  beginAgentSessionRuntimeRecord,
+  readAgentSessionRuntimeEnds
+} from './agent-session-runtime-end-record'
 import {
   agentSessionStoreDraftRowWrites,
   draftAgentSessionStoreState,
@@ -79,7 +87,16 @@ export class AgentSessionStoreTransactions {
     loaded: AgentSessionStoreState
   ) {
     freezeRows(loaded, null)
-    this.published = loaded
+    this.published = {
+      ...loaded,
+      runtimeEnds: readAgentSessionRuntimeEnds(journalDatabase.stateDirectory)
+    }
+    // Before any owner this runtime records: a crash is concluded only from a recorded start.
+    beginAgentSessionRuntimeRecord(
+      journalDatabase.stateDirectory,
+      agentSessionRuntimeIncarnation(),
+      Date.now()
+    )
   }
 
   /** The committed state. A transaction in flight never shows here until its rows have landed. */
@@ -148,6 +165,7 @@ export class AgentSessionStoreTransactions {
     const published = this.published
     const draft = draftAgentSessionStoreState(published)
     const result = apply(draft)
+    attributeAgentSessionRuntime(published, draft)
     const writes = agentSessionStoreDraftRowWrites(published, draft)
     return {
       result,
diff --git a/src/main/runtime/antigravity-readiness-transcripts.test.ts b/src/main/runtime/antigravity-readiness-transcripts.test.ts
index 6ef52c56e21f..845ebdfc8a2b 100644
--- a/src/main/runtime/antigravity-readiness-transcripts.test.ts
+++ b/src/main/runtime/antigravity-readiness-transcripts.test.ts
@@ -8,9 +8,6 @@
  *
  * One case is pinned as a KNOWN DEFECT: the shipped detector refuses a ready screen whose retained
  * tail ends on the error block. That asserts what it does, not what it should.
- *
- * Capture protocol: docs/reference/agent-pty-transcript-capture.md
- * What each transcript decides: docs/reference/antigravity-readiness-evidence.md
  */
 import { existsSync, readFileSync } from 'node:fs'
 import { join } from 'node:path'
@@ -26,15 +23,6 @@ vi.mock('electron', () => ({
 }))
 
 const FIXTURE_DIR = join(__dirname, '__fixtures__')
-const EVIDENCE_DOC = join(
-  __dirname,
-  '..',
-  '..',
-  '..',
-  'docs',
-  'reference',
-  'antigravity-readiness-evidence.md'
-)
 // Why asymmetric: a ready verdict has to survive the settle window, while a refusal only has to
 // hold for one poll. Keeping the refusal short keeps seven transcripts off the suite's clock.
 const READY_TIMEOUT_MS = 2_000
@@ -48,7 +36,7 @@ const ESC = String.fromCharCode(27)
 type TranscriptCase = {
   /** Fixture basename; `<name>.txt` under `__fixtures__/`. */
   name: string
-  /** Capture in docs/reference/antigravity-readiness-evidence.md. */
+  /** Capture group identifier. */
   capture: string
   what: string
   /** What a correct detector must answer. Not what the shipped one answers. */
@@ -114,8 +102,7 @@ const TRANSCRIPTS: readonly TranscriptCase[] = [
     expectReady: true
   },
   // Not captured: this machine's agy has no OAuth session and offers only Gemini models, and
-  // reaching the rest would mean signing the operator out or deleting their config. See
-  // docs/reference/antigravity-readiness-evidence.md § What could not be captured.
+  // reaching the rest would mean signing the operator out or deleting their config.
   {
     name: 'antigravity-ready-business-non-gemini',
     capture: 'A',
@@ -225,13 +212,4 @@ describe('Antigravity readiness, decided by captured transcripts', () => {
       expect(text).toContain(ESC)
     })
   }
-
-  it('documents every transcript the detector is allowed to depend on', () => {
-    // Why a test: the doc is the operator's checklist. A name that drifts out of it is a
-    // transcript nobody will capture, and a case that silently skips forever.
-    const doc = readFileSync(EVIDENCE_DOC, 'utf8')
-    for (const transcript of TRANSCRIPTS) {
-      expect(doc).toContain(`${transcript.name}.txt`)
-    }
-  })
 })
diff --git a/src/main/runtime/browser-screencast-renderer-throttle-lease.test.ts b/src/main/runtime/browser-screencast-renderer-throttle-lease.test.ts
new file mode 100644
index 000000000000..c46ee63acd1f
--- /dev/null
+++ b/src/main/runtime/browser-screencast-renderer-throttle-lease.test.ts
@@ -0,0 +1,179 @@
+/**
+ * A remote browser stream keeps the desktop window drawing for exactly as long as it lives: guest
+ * frames come from the embedder's compositor, which a throttled hidden window stops running.
+ */
+import { beforeEach, describe, expect, it, vi } from 'vitest'
+import type { BrowserScreencastOptions } from '../browser/browser-screencast-stream-types'
+import { createScreencastHarness } from './browser-screencast-subscriber-test-harness'
+import { RuntimeBrowserCommands } from './orca-runtime-browser'
+import { createSinglePageBrowserCommandsHost } from './single-page-browser-commands-host-test-double'
+
+const { webContentsFromId, startBrowserScreencast } = vi.hoisted(() => ({
+  webContentsFromId: vi.fn(),
+  startBrowserScreencast: vi.fn()
+}))
+
+vi.mock('electron', () => ({
+  ipcMain: { on: vi.fn(), removeListener: vi.fn(), handle: vi.fn(), removeHandler: vi.fn() },
+  webContents: { fromId: webContentsFromId }
+}))
+vi.mock('../browser/browser-screencast-stream', () => ({ startBrowserScreencast }))
+
+type PageStream = { options: BrowserScreencastOptions; close: () => void }
+
+function createRig() {
+  const { runtime } = createScreencastHarness()
+  const setBackgroundThrottling = vi.fn()
+  const window = { webContents: { isDestroyed: () => false, setBackgroundThrottling } }
+  Object.assign(runtime, {
+    browserCommands: new RuntimeBrowserCommands(createSinglePageBrowserCommandsHost(window))
+  })
+  const pageStreams: PageStream[] = []
+  // Models Chromium's asynchronous teardown: a held stop leaves the stream open until `close()`.
+  const stopControl = { hold: false }
+  startBrowserScreencast.mockImplementation(
+    async (_guest: unknown, options: BrowserScreencastOptions) => {
+      let close!: () => void
+      const done = new Promise<void>((resolve) => {
+        close = resolve
+      })
+      pageStreams.push({ options, close })
+      return {
+        stop: () => {
+          if (!stopControl.hold) {
+            close()
+          }
+        },
+        done,
+        updateViewport: vi.fn(async () => {}),
+        updateFrameBudget: vi.fn(async () => {})
+      }
+    }
+  )
+
+  const subscribe = (connectionId: string, signal?: AbortSignal) => {
+    const emit = vi.fn()
+    const done = runtime.browserScreencast(
+      { worktree: 'id:wt-1', page: 'page-1', format: 'jpeg' },
+      { connectionId, clientKind: 'mobile', sendBinary: vi.fn(() => true), signal, emit }
+    )
+    const ready = async (): Promise<string> => {
+      await vi.waitFor(() =>
+        expect(emit).toHaveBeenCalledWith(expect.objectContaining({ type: 'ready' }))
+      )
+      return emit.mock.calls.find(([event]) => event.type === 'ready')?.[0].subscriptionId
+    }
+    const eventTypes = (): string[] => emit.mock.calls.map(([event]) => event.type)
+    return { done, ready, eventTypes }
+  }
+
+  return {
+    runtime,
+    subscribe,
+    pageStreams,
+    stopControl,
+    throttleCalls: () => setBackgroundThrottling.mock.calls.map(([allowed]) => allowed)
+  }
+}
+
+describe('remote browser screencast renderer throttle lease', () => {
+  beforeEach(() => {
+    webContentsFromId.mockReset()
+    webContentsFromId.mockReturnValue({ isDestroyed: () => false })
+    startBrowserScreencast.mockReset()
+  })
+
+  it('lifts the window throttle before the stream starts capturing', async () => {
+    const rig = createRig()
+    let callsAtStart: boolean[] = []
+    const started = startBrowserScreencast.getMockImplementation()
+    startBrowserScreencast.mockImplementation(async (...args: unknown[]) => {
+      callsAtStart = rig.throttleCalls()
+      return started?.(...args)
+    })
+
+    const phone = rig.subscribe('conn-phone')
+    await phone.ready()
+
+    expect(callsAtStart).toEqual([false])
+  })
+
+  // Unsubscribe, connection close, ghost eviction and a desktop page close all end through the
+  // page stream's `done`, so one of them stands for all.
+  it('restores it when the stream ends', async () => {
+    const rig = createRig()
+    const phone = rig.subscribe('conn-phone')
+    const subscriptionId = await phone.ready()
+
+    rig.runtime.cleanupSubscription(subscriptionId)
+    await phone.done
+
+    await vi.waitFor(() => expect(rig.throttleCalls()).toEqual([false, true]))
+  })
+
+  it('restores it when the stream fails to start', async () => {
+    const rig = createRig()
+    startBrowserScreencast.mockRejectedValue(new Error('Could not attach debugger.'))
+    const phone = rig.subscribe('conn-phone')
+
+    await expect(phone.done).rejects.toThrow('Could not attach debugger.')
+
+    await vi.waitFor(() => expect(rig.throttleCalls()).toEqual([false, true]))
+  })
+
+  it('ends the stream on an error, then restores it', async () => {
+    const rig = createRig()
+    const phone = rig.subscribe('conn-phone')
+    await phone.ready()
+
+    rig.pageStreams[0].options.onError?.('Browser stream timed out.')
+    await phone.done
+
+    expect(phone.eventTypes()).toEqual(['ready', 'error', 'end'])
+    await vi.waitFor(() => expect(rig.throttleCalls()).toEqual([false, true]))
+  })
+
+  it('starts a fresh stream for a viewer that joins while the errored one tears down', async () => {
+    const rig = createRig()
+    const phone = rig.subscribe('conn-phone')
+    await phone.ready()
+    rig.stopControl.hold = true
+
+    rig.pageStreams[0].options.onError?.('Browser stream timed out.')
+    const guestLookups = webContentsFromId.mock.calls.length
+    const tablet = rig.subscribe('conn-tablet')
+    // Past its guest lookup, the joiner reaches the page record with no further await.
+    await vi.waitFor(() =>
+      expect(webContentsFromId.mock.calls.length).toBeGreaterThan(guestLookups)
+    )
+    await new Promise((resolve) => setImmediate(resolve))
+    rig.pageStreams[0].close()
+    await tablet.ready()
+
+    expect(startBrowserScreencast).toHaveBeenCalledTimes(2)
+    expect(tablet.eventTypes()).toEqual(['ready'])
+    await phone.done
+  })
+
+  it('restores it when the subscription is aborted before ready', async () => {
+    const rig = createRig()
+    let releaseStart!: () => void
+    const started = startBrowserScreencast.getMockImplementation()
+    startBrowserScreencast.mockImplementation(async (...args: unknown[]) => {
+      await new Promise<void>((resolve) => {
+        releaseStart = resolve
+      })
+      return started?.(...args)
+    })
+    const abort = new AbortController()
+    const phone = rig.subscribe('conn-phone', abort.signal)
+    await vi.waitFor(() => expect(releaseStart).toBeTypeOf('function'))
+
+    abort.abort()
+    releaseStart()
+    await phone.done
+
+    expect(phone.eventTypes()).not.toContain('ready')
+    await vi.waitFor(() => expect(rig.throttleCalls()).toEqual([false, true]))
+  })
+})
diff --git a/src/main/runtime/claude-structured-session-integration.test.ts b/src/main/runtime/claude-structured-session-integration.test.ts
index ad2818c2e9bb..628f3f4f6917 100644
--- a/src/main/runtime/claude-structured-session-integration.test.ts
+++ b/src/main/runtime/claude-structured-session-integration.test.ts
@@ -252,8 +252,9 @@ beforeEach(async () => {
         resolveLaunchArgs: () => [],
         resolveClaudeAuthPolicy: () => claudeAuthPolicy,
         openClaudeConnection: claude.openConnection,
-        claudeThinkingDisplay: {
-          argsFor: async () => ({ 'thinking-display': 'summarized' }),
+        claudeCliFlags: {
+          supports: async (flag) => flag.option === '--thinking-display',
+          prewarm: () => {},
           observeExit: () => {}
         },
         // Production's sink wiring onto a real hook server, whose records a Stop reaches.
diff --git a/src/main/runtime/mobile-rpc-allowlist.test.ts b/src/main/runtime/mobile-rpc-allowlist.test.ts
index db0671101a93..08ac7df81b85 100644
--- a/src/main/runtime/mobile-rpc-allowlist.test.ts
+++ b/src/main/runtime/mobile-rpc-allowlist.test.ts
@@ -171,6 +171,7 @@ describe('mobile RPC allowlist', () => {
       'agentSession.subscribe',
       'agentSession.unsubscribe',
       'agentSession.subscribeStatus',
+      'agentSession.readVisual',
       'agentSession.hold',
       'agentSession.release'
     ])
diff --git a/src/main/runtime/mobile-session-layout-projection.ts b/src/main/runtime/mobile-session-layout-projection.ts
index 3dd92091c77b..60ab2aec3d1d 100644
--- a/src/main/runtime/mobile-session-layout-projection.ts
+++ b/src/main/runtime/mobile-session-layout-projection.ts
@@ -249,6 +249,24 @@ export function distributeHeadlessTabsAcrossGroups(
     .filter((group) => group.tabOrder.length > 0)
 }
 
+// Why: a restored split must name one of its own groups as active, never a generated headless id.
+export function pickRestoredActiveGroupId(
+  groups: readonly RuntimeMobileSessionTabGroup[],
+  preferredGroupIds: readonly (string | null | undefined)[],
+  activeTopLevelId: string | null
+): string | null {
+  const groupIds = new Set(groups.map((group) => group.id))
+  const preferred = preferredGroupIds.find((id): id is string => id != null && groupIds.has(id))
+  return (
+    preferred ??
+    (activeTopLevelId
+      ? groups.find((group) => group.tabOrder.includes(activeTopLevelId))?.id
+      : undefined) ??
+    groups[0]?.id ??
+    null
+  )
+}
+
 export function buildMaterializedHeadlessParentLayout(
   leafId: string,
   ptyId: string,
diff --git a/src/main/runtime/native-chat-visuals-workspace-verdict.test.ts b/src/main/runtime/native-chat-visuals-workspace-verdict.test.ts
new file mode 100644
index 000000000000..07ad7372d751
--- /dev/null
+++ b/src/main/runtime/native-chat-visuals-workspace-verdict.test.ts
@@ -0,0 +1,271 @@
+import { mkdirSync, mkdtempSync, realpathSync, rmSync, symlinkSync, writeFileSync } from 'node:fs'
+import { tmpdir } from 'node:os'
+import { join } from 'node:path'
+import { afterEach, describe, expect, it, vi } from 'vitest'
+import type { AgentSessionExecutionLocation } from '../../shared/agent-session-record'
+import { FLOATING_TERMINAL_WORKTREE_ID } from '../../shared/constants'
+import { LOCAL_EXECUTION_HOST_ID } from '../../shared/execution-host'
+import {
+  createNativeChatVisualsWorkspaceVerdicts,
+  readNativeChatVisualsWorkspaceCatalogs,
+  type NativeChatVisualsFilesystem,
+  type NativeChatVisualsWorkspaceCatalogs
+} from './native-chat-visuals-workspace-verdict'
+
+const REPO_PATH = '/work/repo-1'
+const WORKTREE_PATH = '/work/repo-1-feature'
+const WORKTREE_ID = `repo-1::${WORKTREE_PATH}`
+
+function catalogs(
+  options: {
+    repos?: string[]
+    meta?: string[]
+    folders?: string[]
+    others?: Partial<NativeChatVisualsWorkspaceCatalogs['others']>
+  } = {}
+): NativeChatVisualsWorkspaceCatalogs {
+  return {
+    active: {
+      getRepo: (id: string) =>
+        (options.repos ?? ['repo-1']).includes(id) ? { path: REPO_PATH } : undefined,
+      getAllWorktreeMeta: () => Object.fromEntries((options.meta ?? []).map((id) => [id, {}])),
+      getFolderWorkspaces: () => (options.folders ?? []).map((id) => ({ id }))
+    },
+    others: { ids: new Set(), repoIds: new Set(), unreadableProfiles: 0, ...options.others }
+  }
+}
+
+const at = (
+  workspaceId: string,
+  overrides: Partial<AgentSessionExecutionLocation> = {}
+): AgentSessionExecutionLocation => ({
+  executionHostId: LOCAL_EXECUTION_HOST_ID,
+  wslDistro: null,
+  workspaceId,
+  workspaceKind: 'git-worktree',
+  ...overrides
+})
+
+type Presence = 'present' | 'absent' | 'unknown'
+
+function verdictWith(
+  known: NativeChatVisualsWorkspaceCatalogs | null,
+  paths: Record<string, Presence> = {},
+  gitRecords: boolean | null = false
+) {
+  const fs: NativeChatVisualsFilesystem = {
+    presence: vi.fn(async (path: string): Promise<Presence> => paths[path] ?? 'present'),
+    gitRecordsWorktree: vi.fn(async () => gitRecords)
+  }
+  return { verdict: createNativeChatVisualsWorkspaceVerdicts(() => known, fs)(), fs }
+}
+
+describe('whether a chat workspace is provably removed', () => {
+  it('is removed when its project was removed from Orca in every profile', async () => {
+    const { verdict, fs } = verdictWith(catalogs({ repos: [] }))
+    await expect(verdict(at(WORKTREE_ID))).resolves.toBe('removed')
+    expect(fs.presence).not.toHaveBeenCalled()
+  })
+
+  it("keeps a chat whose project or folder only another profile holds (chats are shared, catalogs aren't)", async () => {
+    const { verdict } = verdictWith(
+      catalogs({
+        repos: [],
+        others: { repoIds: new Set(['repo-1']), ids: new Set(['folder:f-2']) }
+      })
+    )
+    await expect(verdict(at(WORKTREE_ID))).resolves.toBe('unverifiable')
+    await expect(verdict(at('folder:f-2', { workspaceKind: 'folder' }))).resolves.toBe('present')
+  })
+
+  it('decides nothing while any profile cannot be read', async () => {
+    const { verdict } = verdictWith(catalogs({ repos: [], others: { unreadableProfiles: 1 } }))
+    await expect(verdict(at(WORKTREE_ID))).resolves.toBe('unverifiable')
+    await expect(verdict(at('folder:gone', { workspaceKind: 'folder' }))).resolves.toBe(
+      'unverifiable'
+    )
+  })
+
+  it('is present while any profile still tracks the worktree', async () => {
+    for (const known of [
+      catalogs({ meta: [WORKTREE_ID] }),
+      catalogs({ others: { ids: new Set([WORKTREE_ID]) } })
+    ]) {
+      const { verdict, fs } = verdictWith(known, { [WORKTREE_PATH]: 'absent' })
+      await expect(verdict(at(WORKTREE_ID))).resolves.toBe('present')
+      expect(fs.presence).not.toHaveBeenCalled()
+    }
+  })
+
+  it('is removed when the worktree folder is gone and git no longer records it', async () => {
+    const { verdict, fs } = verdictWith(catalogs(), { [WORKTREE_PATH]: 'absent' }, false)
+    await expect(verdict(at(WORKTREE_ID))).resolves.toBe('removed')
+    expect(fs.gitRecordsWorktree).toHaveBeenCalledWith(REPO_PATH, WORKTREE_PATH)
+  })
+
+  it('keeps a worktree on an unmounted drive: git still records it, or the project is unreachable', async () => {
+    await expect(
+      verdictWith(catalogs(), { [WORKTREE_PATH]: 'absent' }, true).verdict(at(WORKTREE_ID))
+    ).resolves.toBe('unverifiable')
+    await expect(
+      verdictWith(catalogs(), { [WORKTREE_PATH]: 'absent' }, null).verdict(at(WORKTREE_ID))
+    ).resolves.toBe('unverifiable')
+    await expect(
+      verdictWith(catalogs(), { [WORKTREE_PATH]: 'absent', [REPO_PATH]: 'absent' }).verdict(
+        at(WORKTREE_ID)
+      )
+    ).resolves.toBe('unverifiable')
+  })
+
+  it("never removes the project's own checkout while the project is known", async () => {
+    const { verdict } = verdictWith(catalogs(), { [REPO_PATH]: 'absent' })
+    await expect(verdict(at(`repo-1::${REPO_PATH}`))).resolves.toBe('unverifiable')
+  })
+
+  it('keeps a worktree whose folder is there or unreadable', async () => {
+    await expect(verdictWith(catalogs()).verdict(at(WORKTREE_ID))).resolves.toBe('present')
+    await expect(
+      verdictWith(catalogs(), { [WORKTREE_PATH]: 'unknown' }).verdict(at(WORKTREE_ID))
+    ).resolves.toBe('unverifiable')
+  })
+
+  it('reads a folder workspace from every catalog', async () => {
+    const folder = (id: string) => at(`folder:${id}`, { workspaceKind: 'folder' })
+    const { verdict } = verdictWith(catalogs({ folders: ['f-1'] }))
+    await expect(verdict(folder('f-1'))).resolves.toBe('present')
+    await expect(verdict(folder('f-2'))).resolves.toBe('removed')
+  })
+
+  it('never decides for another host, a WSL distro, the floating workspace, or without catalogs', async () => {
+    const { verdict, fs } = verdictWith(catalogs({ repos: [] }))
+    await expect(verdict(at(WORKTREE_ID, { executionHostId: 'ssh:box' }))).resolves.toBe(
+      'unverifiable'
+    )
+    await expect(verdict(at(WORKTREE_ID, { wslDistro: 'Ubuntu' }))).resolves.toBe('unverifiable')
+    await expect(
+      verdict(at(FLOATING_TERMINAL_WORKTREE_ID, { workspaceKind: 'folder' }))
+    ).resolves.toBe('unverifiable')
+    await expect(verdictWith(null).verdict(at(WORKTREE_ID))).resolves.toBe('unverifiable')
+    expect(fs.presence).not.toHaveBeenCalled()
+  })
+
+  it('reads the catalogs once per run, however many chats it judges', async () => {
+    const read = vi.fn(() => catalogs({ repos: [] }))
+    const verdict = createNativeChatVisualsWorkspaceVerdicts(read)()
+    await verdict(at(WORKTREE_ID))
+    await verdict(at('repo-1::/work/other'))
+    expect(read).toHaveBeenCalledOnce()
+  })
+})
+
+describe("git's own record of a linked worktree", () => {
+  const scratch: string[] = []
+  afterEach(() => {
+    for (const dir of scratch.splice(0)) {
+      rmSync(dir, { recursive: true, force: true })
+    }
+  })
+
+  function repoWithWorktreeRecord(recordedWorktree: string | null): string {
+    const repo = realpathSync(mkdtempSync(join(tmpdir(), 'orca-visuals-git-')))
+    scratch.push(repo)
+    mkdirSync(join(repo, '.git', 'worktrees', 'feature'), { recursive: true })
+    if (recordedWorktree) {
+      writeFileSync(
+        join(repo, '.git', 'worktrees', 'feature', 'gitdir'),
+        `${recordedWorktree}/.git\n`
+      )
+    }
+    return repo
+  }
+
+  it('removes only a worktree git no longer records', async () => {
+    const gone = join(tmpdir(), 'orca-visuals-missing-worktree-a')
+    const verdicts = (repo: string) =>
+      createNativeChatVisualsWorkspaceVerdicts(() => ({
+        ...catalogs(),
+        active: {
+          ...catalogs().active,
+          getRepo: () => ({ path: repo })
+        }
+      }))()
+    const recorded = repoWithWorktreeRecord(gone)
+    await expect(verdicts(recorded)(at(`repo-1::${gone}`))).resolves.toBe('unverifiable')
+    const pruned = repoWithWorktreeRecord(null)
+    await expect(verdicts(pruned)(at(`repo-1::${gone}`))).resolves.toBe('removed')
+  })
+
+  it('reads a record git wrote relative to its own folder', async () => {
+    const repo = repoWithWorktreeRecord(null)
+    const worktree = join(repo, '..', 'orca-visuals-relative-worktree-b')
+    writeFileSync(
+      join(repo, '.git', 'worktrees', 'feature', 'gitdir'),
+      '../../../../orca-visuals-relative-worktree-b/.git\n'
+    )
+    const verdict = createNativeChatVisualsWorkspaceVerdicts(() => ({
+      ...catalogs(),
+      active: { ...catalogs().active, getRepo: () => ({ path: repo }) }
+    }))()
+    await expect(verdict(at(`repo-1::${worktree}`))).resolves.toBe('unverifiable')
+  })
+
+  it('resolves a relative record against the real path when the project was added through a link', async () => {
+    const real = realpathSync(mkdtempSync(join(tmpdir(), 'orca-visuals-real-')))
+    scratch.push(real)
+    const nested = join(real, 'a', 'b', 'c')
+    mkdirSync(join(nested, 'repo', '.git', 'worktrees', 'wt'), { recursive: true })
+    const linkedParent = join(real, 'deep')
+    symlinkSync(nested, linkedParent)
+    const worktree = join(real, 'wts', 'wt')
+    // What git writes: relative from the record folder's real path.
+    writeFileSync(
+      join(nested, 'repo', '.git', 'worktrees', 'wt', 'gitdir'),
+      '../../../../../../../wts/wt/.git\n'
+    )
+    const verdict = createNativeChatVisualsWorkspaceVerdicts(() => ({
+      ...catalogs(),
+      active: { ...catalogs().active, getRepo: () => ({ path: join(linkedParent, 'repo') }) }
+    }))()
+    await expect(verdict(at(`repo-1::${worktree}`))).resolves.toBe('unverifiable')
+  })
+})
+
+describe('reading the catalogs for a sweep run', () => {
+  it('skips the running profile named by its own storage folder', () => {
+    const root = mkdtempSync(join(tmpdir(), 'orca-visuals-profiles-'))
+    try {
+      mkdirSync(join(root, 'profiles', 'running'), { recursive: true })
+      mkdirSync(join(root, 'profiles', 'next'), { recursive: true })
+      const profile = (id: string) => ({
+        id,
+        name: id,
+        kind: 'local',
+        createdAt: 0,
+        updatedAt: 0,
+        lastOpenedAt: 0,
+        avatar: { kind: 'initials', initials: id.slice(0, 2), color: 'neutral' }
+      })
+      // A switch already named the next profile active; this process still runs the old one.
+      writeFileSync(
+        join(root, 'orca-profile-index.json'),
+        JSON.stringify({ activeProfileId: 'next', profiles: [profile('running'), profile('next')] })
+      )
+      for (const id of ['running', 'next']) {
+        writeFileSync(
+          join(root, 'profiles', id, 'orca-data.json'),
+          JSON.stringify({ repos: [{ id: `repo-${id}` }] })
+        )
+      }
+      const read = readNativeChatVisualsWorkspaceCatalogs(
+        {
+          ...catalogs().active,
+          getProfileStorageDirectory: () => join(root, 'profiles', 'running')
+        },
+        root
+      )
+      expect([...read.others.repoIds]).toEqual(['repo-next'])
+    } finally {
+      rmSync(root, { recursive: true, force: true })
+    }
+  })
+})
diff --git a/src/main/runtime/native-chat-visuals-workspace-verdict.ts b/src/main/runtime/native-chat-visuals-workspace-verdict.ts
new file mode 100644
index 000000000000..838283805e88
--- /dev/null
+++ b/src/main/runtime/native-chat-visuals-workspace-verdict.ts
@@ -0,0 +1,204 @@
+// Whether the local workspace a chat ran in is provably gone, for the visuals folder sweep.
+// Chat records and visuals live at the user-data root, shared by every Orca profile, while each
+// profile keeps its own workspace catalog: so only absence from EVERY profile's catalog counts. A
+// worktree still in a known project is gone only when git itself no longer records it. Never runs
+// git or lists a repo's worktrees: that walk can touch protected folders.
+
+import { lstat, readdir, readFile, realpath, stat } from 'node:fs/promises'
+import { basename, dirname, isAbsolute, join, resolve } from 'node:path'
+import type { AgentSessionExecutionLocation } from '../../shared/agent-session-record'
+import { normalizeRuntimePathForComparison } from '../../shared/cross-platform-path'
+import { isDefinitiveAbsence } from '../../shared/definitive-filesystem-absence'
+import { LOCAL_EXECUTION_HOST_ID } from '../../shared/execution-host'
+import { isFloatingWorkspaceId } from '../../shared/floating-workspace-worktree'
+import { splitWorktreeIdForFilesystem } from '../../shared/worktree/id'
+import { folderWorkspaceKey, parseWorkspaceKey } from '../../shared/workspace-scope'
+import type { Store } from '../persistence'
+import { readOtherProfileWorkspaceCatalog } from '../orca-profiles/other-profile-workspace-catalog'
+import {
+  getOrcaProfilesDirectory,
+  getProfileUserDataPath
+} from '../orca-profiles/profile-storage-paths'
+import type { NativeChatVisualsWorkspaceVerdict } from '../native-chat/native-chat-visuals-sweep'
+
+/** This profile's live catalog and every other profile's persisted one. The running profile is
+ *  named by its own storage folder, not the profile index, which a switch rewrites first. */
+export function readNativeChatVisualsWorkspaceCatalogs(
+  store: NativeChatVisualsWorkspaceCatalogs['active'] & Pick<Store, 'getProfileStorageDirectory'>,
+  userDataPath = getProfileUserDataPath()
+): NativeChatVisualsWorkspaceCatalogs {
+  const storage = store.getProfileStorageDirectory()
+  const runningProfileId = samePath(dirname(storage), getOrcaProfilesDirectory(userDataPath))
+    ? basename(storage)
+    : undefined
+  return {
+    active: store,
+    others: readOtherProfileWorkspaceCatalog(userDataPath, {
+      ...(runningProfileId ? { runningProfileId } : {}),
+      // Chat records are never deleted, so this rule is what cleans up; a profile created but never
+      // opened must not switch it off.
+      neverWrittenIsEmpty: true
+    })
+  }
+}
+
+export type NativeChatVisualsWorkspaceCatalogs = {
+  /** The running profile's live catalog: the Store, narrowed to what a verdict reads. */
+  active: {
+    getRepo: (id: string) => { path: string } | undefined
+    getAllWorktreeMeta: () => Readonly<Record<string, unknown>>
+    getFolderWorkspaces: () => readonly { id: string }[]
+  }
+  /** Every other profile's worktree ids, folder workspace keys and project ids. */
+  others: { ids: ReadonlySet<string>; repoIds: ReadonlySet<string>; unreadableProfiles: number }
+}
+
+export type NativeChatVisualsFilesystem = {
+  /** `present`, `absent` (definitively), or `unknown` for any other answer. */
+  presence: (path: string) => Promise<'present' | 'absent' | 'unknown'>
+  /** Whether git in the repo at `repoPath` records a linked worktree at `worktreePath`; null when
+   *  its records can't be read. */
+  gitRecordsWorktree: (repoPath: string, worktreePath: string) => Promise<boolean | null>
+}
+
+async function presence(path: string): Promise<'present' | 'absent' | 'unknown'> {
+  try {
+    await stat(path)
+    return 'present'
+  } catch (error) {
+    return isDefinitiveAbsence(error) ? 'absent' : 'unknown'
+  }
+}
+
+const samePath = (left: string, right: string): boolean =>
+  normalizeRuntimePathForComparison(left) === normalizeRuntimePathForComparison(right)
+
+async function gitRecordsWorktree(repoPath: string, worktreePath: string): Promise<boolean | null> {
+  const gitDir = join(repoPath, '.git')
+  try {
+    // A `.git` file (the repo is itself a linked worktree or a submodule) is not read here.
+    if (!(await lstat(gitDir)).isDirectory()) {
+      return null
+    }
+    let names: string[]
+    try {
+      names = await readdir(join(gitDir, 'worktrees'))
+    } catch (error) {
+      if (isDefinitiveAbsence(error)) {
+        return false
+      }
+      throw error
+    }
+    for (const name of names) {
+      let recorded: string
+      try {
+        recorded = await readFile(join(gitDir, 'worktrees', name, 'gitdir'), 'utf8')
+      } catch (error) {
+        if (isDefinitiveAbsence(error)) {
+          continue
+        }
+        throw error
+      }
+      // The record names the worktree's own `.git` file; git 2.48+ may write it relative to the
+      // record folder's real path, which differs from the stored one when that runs through a link.
+      const gitFile = recorded.trim()
+      const absolute = isAbsolute(gitFile)
+        ? gitFile
+        : resolve(await realpath(join(gitDir, 'worktrees', name)), gitFile)
+      if (samePath(dirname(absolute), worktreePath)) {
+        return true
+      }
+    }
+    return false
+  } catch {
+    return null
+  }
+}
+
+const NODE_FILESYSTEM: NativeChatVisualsFilesystem = { presence, gitRecordsWorktree }
+
+async function worktreeVerdict(
+  catalogs: NativeChatVisualsWorkspaceCatalogs,
+  workspaceId: string,
+  fs: NativeChatVisualsFilesystem
+): Promise<NativeChatVisualsWorkspaceVerdict> {
+  const worktree = splitWorktreeIdForFilesystem(workspaceId)
+  if (!worktree?.repoId || !worktree.worktreePath) {
+    return 'unverifiable'
+  }
+  const repo = catalogs.active.getRepo(worktree.repoId)
+  // The project was removed from Orca in every profile.
+  if (!repo && !catalogs.others.repoIds.has(worktree.repoId)) {
+    return 'removed'
+  }
+  if (
+    Object.hasOwn(catalogs.active.getAllWorktreeMeta(), workspaceId) ||
+    catalogs.others.ids.has(workspaceId)
+  ) {
+    return 'present'
+  }
+  // The project's own checkout, or one only another profile can say anything about.
+  if (!repo || samePath(repo.path, worktree.worktreePath)) {
+    return 'unverifiable'
+  }
+  const own = await fs.presence(worktree.worktreePath)
+  if (own !== 'absent') {
+    return own === 'present' ? 'present' : 'unverifiable'
+  }
+  // A worktree on an unmounted drive is still recorded by git, so absence alone proves nothing.
+  if ((await fs.presence(repo.path)) !== 'present') {
+    return 'unverifiable'
+  }
+  return (await fs.gitRecordsWorktree(repo.path, worktree.worktreePath)) === false
+    ? 'removed'
+    : 'unverifiable'
+}
+
+/**
+ * A verdict function over one snapshot of every profile's catalog; call once per sweep run.
+ * Null catalogs, or any profile whose state can't be read, decide nothing.
+ */
+export function createNativeChatVisualsWorkspaceVerdicts(
+  readCatalogs: () => NativeChatVisualsWorkspaceCatalogs | null,
+  fs: NativeChatVisualsFilesystem = NODE_FILESYSTEM
+): () => (location: AgentSessionExecutionLocation) => Promise<NativeChatVisualsWorkspaceVerdict> {
+  return () => {
+    let snapshot: NativeChatVisualsWorkspaceCatalogs | null | undefined
+    const catalogs = (): NativeChatVisualsWorkspaceCatalogs | null => {
+      if (snapshot === undefined) {
+        try {
+          snapshot = readCatalogs()
+        } catch {
+          snapshot = null
+        }
+      }
+      return snapshot && snapshot.others.unreadableProfiles === 0 ? snapshot : null
+    }
+    return async (location) => {
+      // Another host or a WSL distro owns its own answer; loss of contact is never removal.
+      if (location.executionHostId !== LOCAL_EXECUTION_HOST_ID || location.wslDistro !== null) {
+        return 'unverifiable'
+      }
+      // The floating workspace names a setting, not a place the user removes.
+      if (isFloatingWorkspaceId(location.workspaceId)) {
+        return 'unverifiable'
+      }
+      const known = catalogs()
+      if (!known) {
+        return 'unverifiable'
+      }
+      if (location.workspaceKind !== 'folder') {
+        return worktreeVerdict(known, location.workspaceId, fs)
+      }
+      if (parseWorkspaceKey(location.workspaceId)?.type !== 'folder') {
+        return 'unverifiable'
+      }
+      const listed =
+        known.others.ids.has(location.workspaceId) ||
+        known.active
+          .getFolderWorkspaces()
+          .some((workspace) => folderWorkspaceKey(workspace.id) === location.workspaceId)
+      return listed ? 'present' : 'removed'
+    }
+  }
+}
diff --git a/src/main/runtime/orca-runtime-browser-screencast-fanout.test.ts b/src/main/runtime/orca-runtime-browser-screencast-fanout.test.ts
index 23ff4c882328..38a6f5ce489d 100644
--- a/src/main/runtime/orca-runtime-browser-screencast-fanout.test.ts
+++ b/src/main/runtime/orca-runtime-browser-screencast-fanout.test.ts
@@ -1,9 +1,8 @@
 import { beforeEach, describe, expect, it, vi } from 'vitest'
-import type { AgentBrowserBridge } from '../browser/agent-browser-bridge'
 import { REMOTE_RUNTIME_MAX_OUTBOUND_BINARY_FRAME_BYTES } from '../../shared/remote-runtime-memory-limits'
 import { BROWSER_SCREENCAST_GHOST_SUBSCRIBER_REFUSAL_LIMIT } from './browser-screencast-ghost-subscriber-eviction'
-import type { RuntimeBrowserCommandHost, RuntimeBrowserCommands } from './orca-runtime-browser'
-import { RuntimeBrowserPageRegistry } from './runtime-browser-page-registry'
+import type { RuntimeBrowserCommands } from './orca-runtime-browser'
+import { createSinglePageBrowserCommandsHost } from './single-page-browser-commands-host-test-double'
 
 const { webContentsFromId, startBrowserScreencast } = vi.hoisted(() => ({
   webContentsFromId: vi.fn(),
@@ -24,32 +23,6 @@ function deferred() {
   return { promise, resolve }
 }
 
-function createCommandsHost(): RuntimeBrowserCommandHost {
-  const runtimeBrowserPages = new RuntimeBrowserPageRegistry()
-  const bridge = {
-    getRegisteredTabs: vi.fn(() => new Map([['page-1', 100]])),
-    getActivePageId: vi.fn(() => 'page-1'),
-    tabList: vi.fn(() => ({
-      tabs: [
-        {
-          browserPageId: 'page-1',
-          index: 0,
-          url: 'about:blank',
-          title: 'Browser',
-          active: true
-        }
-      ]
-    }))
-  } as unknown as AgentBrowserBridge
-  return {
-    resolveWorktreeSelector: async () => ({ id: 'wt-1' }),
-    getAgentBrowserBridge: () => bridge,
-    getRuntimeBrowserPageRegistry: () => runtimeBrowserPages,
-    getAvailableAuthoritativeWindow: vi.fn(() => null),
-    getOffscreenBrowserBackend: vi.fn(() => null)
-  } as unknown as RuntimeBrowserCommandHost
-}
-
 describe('RuntimeBrowserCommands screencast fanout', () => {
   beforeEach(() => {
     webContentsFromId.mockReset()
@@ -63,7 +36,7 @@ describe('RuntimeBrowserCommands screencast fanout', () => {
     const stop = vi.fn(() => done.resolve())
     const updateViewport = vi.fn(async () => {})
     startBrowserScreencast.mockResolvedValue({ stop, done: done.promise, updateViewport })
-    const commands = new RuntimeBrowserCommands(createCommandsHost())
+    const commands = new RuntimeBrowserCommands(createSinglePageBrowserCommandsHost())
     const firstSend = vi.fn(() => false)
     const secondSend = vi.fn(() => true)
     const first = await commands.browserScreencast(
@@ -112,7 +85,7 @@ describe('RuntimeBrowserCommands screencast fanout', () => {
     const stop = vi.fn(() => done.resolve())
     const updateViewport = vi.fn(async () => {})
     startBrowserScreencast.mockResolvedValue({ stop, done: done.promise, updateViewport })
-    const commands = new RuntimeBrowserCommands(createCommandsHost())
+    const commands = new RuntimeBrowserCommands(createSinglePageBrowserCommandsHost())
     const sized = await commands.browserScreencast(
       {
         worktree: 'id:wt-1',
@@ -160,7 +133,7 @@ describe('RuntimeBrowserCommands screencast fanout', () => {
         updateFrameBudget: vi.fn(async () => {})
       }
     })
-    const commands = new RuntimeBrowserCommands(createCommandsHost())
+    const commands = new RuntimeBrowserCommands(createSinglePageBrowserCommandsHost())
     const creatorSend = vi.fn(() => true)
     await commands.browserScreencast(
       {
@@ -210,7 +183,7 @@ describe('RuntimeBrowserCommands screencast fanout', () => {
       updateViewport: vi.fn(async () => {}),
       updateFrameBudget
     })
-    const commands = new RuntimeBrowserCommands(createCommandsHost())
+    const commands = new RuntimeBrowserCommands(createSinglePageBrowserCommandsHost())
     const desktop = await commands.browserScreencast(
       {
         worktree: 'id:wt-1',
@@ -271,7 +244,7 @@ describe('RuntimeBrowserCommands screencast fanout', () => {
       updateViewport: vi.fn(async () => {})
     })
     const sendBinary = vi.fn(() => true)
-    const commands = new RuntimeBrowserCommands(createCommandsHost())
+    const commands = new RuntimeBrowserCommands(createSinglePageBrowserCommandsHost())
     const started = await commands.browserScreencast(
       { worktree: 'id:wt-1', page: 'page-1', format: 'jpeg' },
       { sendBinary }
@@ -316,7 +289,7 @@ describe('RuntimeBrowserCommands screencast ghost eviction', () => {
     const stop = vi.fn(() => done.resolve())
     const updateViewport = vi.fn(async () => {})
     startBrowserScreencast.mockResolvedValue({ stop, done: done.promise, updateViewport })
-    const commands = new RuntimeBrowserCommands(createCommandsHost())
+    const commands = new RuntimeBrowserCommands(createSinglePageBrowserCommandsHost())
     const survivorSend = vi.fn(() => true)
     const survivor: Subscription = await commands.browserScreencast(
       {
@@ -374,7 +347,7 @@ describe('RuntimeBrowserCommands screencast ghost eviction', () => {
       done: done.promise,
       updateViewport: vi.fn(async () => {})
     })
-    const commands = new RuntimeBrowserCommands(createCommandsHost())
+    const commands = new RuntimeBrowserCommands(createSinglePageBrowserCommandsHost())
     const only: Subscription = await commands.browserScreencast(
       { worktree: 'id:wt-1', page: 'page-1', format: 'jpeg' },
       { sendBinary: sendUntilQuit(1) }
@@ -394,7 +367,7 @@ describe('RuntimeBrowserCommands screencast ghost eviction', () => {
       done: done.promise,
       updateViewport: vi.fn(async () => {})
     })
-    const commands = new RuntimeBrowserCommands(createCommandsHost())
+    const commands = new RuntimeBrowserCommands(createSinglePageBrowserCommandsHost())
     let sends = 0
     // Why: this is the backpressure shape — a link that drains one frame per window must never
     // be mistaken for a socket that is gone.
@@ -422,7 +395,7 @@ describe('RuntimeBrowserCommands screencast ghost eviction', () => {
       done: done.promise,
       updateViewport: vi.fn(async () => {})
     })
-    const commands = new RuntimeBrowserCommands(createCommandsHost())
+    const commands = new RuntimeBrowserCommands(createSinglePageBrowserCommandsHost())
     let gateOpen = false
     const joinerSend = vi.fn(() => gateOpen)
     const joiner: Subscription = await commands.browserScreencast(
@@ -451,7 +424,7 @@ describe('RuntimeBrowserCommands screencast ghost eviction', () => {
     const stop = vi.fn(() => done.resolve())
     const updateViewport = vi.fn(async () => {})
     startBrowserScreencast.mockResolvedValue({ stop, done: done.promise, updateViewport })
-    const commands = new RuntimeBrowserCommands(createCommandsHost())
+    const commands = new RuntimeBrowserCommands(createSinglePageBrowserCommandsHost())
     const ghostSend = vi.fn(() => true)
     const ghost: Subscription = await commands.browserScreencast(
       {
@@ -504,7 +477,7 @@ describe('RuntimeBrowserCommands screencast ghost eviction', () => {
       done: done.promise,
       updateViewport: vi.fn(async () => {})
     })
-    const commands = new RuntimeBrowserCommands(createCommandsHost())
+    const commands = new RuntimeBrowserCommands(createSinglePageBrowserCommandsHost())
     const anonymousFirst = vi.fn(() => true)
     const anonymousSecond = vi.fn(() => true)
     const identified = vi.fn(() => true)
diff --git a/src/main/runtime/orca-runtime-default-tab-agent-status.test.ts b/src/main/runtime/orca-runtime-default-tab-agent-status.test.ts
new file mode 100644
index 000000000000..6af614603557
--- /dev/null
+++ b/src/main/runtime/orca-runtime-default-tab-agent-status.test.ts
@@ -0,0 +1,240 @@
+// A host-side create dresses its agent's tab as the first orca.yaml default tab. That title
+// belongs to the tab, as the window's setTabCustomTitle makes it: on a headless host the
+// phone must still read the agent's own titles for its status.
+import { describe, expect, it, vi } from 'vitest'
+import { OrcaRuntimeService } from './orca-runtime'
+import { getDefaultWorkspaceSession } from '../../shared/constants'
+import type { WorkspaceSessionState } from '../../shared/workspace-session-state-types'
+import { createMinimalPersistedTerminalTab } from '../persistence/restoring-sessions/session-owner-fields'
+import { buildHeadlessMobileSessionTerminalTabs } from './mobile-session-terminal-projection'
+import type { RuntimeNotifier } from './runtime-notifier-contract'
+import type { RuntimeStore } from './runtime-store-contract'
+import type { TerminalWorkspaceLaunchScope } from './runtime-legacy-worker-terminal-recovery-types'
+import { provisionWorktreeTerminals } from './runtime-worktree-terminal-provisioning'
+
+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 WORKTREE_ID = 'wt-1'
+const AGENT_TAB_ID = 'agent-tab'
+const AGENT_LEAF_ID = '11111111-1111-4111-8111-111111111111'
+const AGENT_PTY_ID = 'pty-agent'
+
+class DefaultTabRuntime extends OrcaRuntimeService {
+  constructor(
+    store: RuntimeStore | null,
+    private readonly connectionId: string | null
+  ) {
+    super(store)
+  }
+
+  protected override async resolveTerminalWorkspaceLaunchScope(): Promise<TerminalWorkspaceLaunchScope> {
+    return {
+      id: WORKTREE_ID,
+      path: '/repo/app',
+      connectionId: this.connectionId,
+      repo: null,
+      folderWorkspace: null
+    }
+  }
+
+  provisioningHost() {
+    return this.getWorktreeTerminalProvisioningHost()
+  }
+
+  ptyTitle(ptyId: string): string | null | undefined {
+    return this.ptysById.get(ptyId)?.title
+  }
+}
+
+function sessionStore(initial: WorkspaceSessionState): {
+  store: RuntimeStore
+  getSession: () => WorkspaceSessionState
+} {
+  let session = initial
+  const store: RuntimeStore = {
+    getRepos: () => [],
+    getRepo: () => undefined,
+    addRepo: vi.fn<RuntimeStore['addRepo']>(),
+    updateRepo: vi.fn<RuntimeStore['updateRepo']>(),
+    getAllWorktreeMeta: () => ({}),
+    getWorktreeMeta: () => undefined,
+    setWorktreeMeta: vi.fn<RuntimeStore['setWorktreeMeta']>(),
+    removeWorktreeMeta: vi.fn<RuntimeStore['removeWorktreeMeta']>(),
+    getGitHubCache: vi.fn<RuntimeStore['getGitHubCache']>(),
+    getWorkspaceSession: () => session,
+    setWorkspaceSession: (next) => {
+      session = next
+    },
+    getSettings: () => ({
+      workspaceDir: '/workspaces',
+      nestWorkspaces: false,
+      refreshLocalBaseRefOnWorktreeCreate: false,
+      branchPrefix: 'none',
+      branchPrefixCustom: ''
+    })
+  }
+  return { store, getSession: () => session }
+}
+
+function notifierWithRename(renameTerminal: RuntimeNotifier['renameTerminal']): RuntimeNotifier {
+  return {
+    worktreesChanged: vi.fn(),
+    reposChanged: vi.fn(),
+    activateWorktree: vi.fn(),
+    createTerminal: vi.fn(),
+    splitTerminal: vi.fn(),
+    renameTerminal,
+    focusTerminal: vi.fn(),
+    closeTerminal: vi.fn(),
+    sleepWorktree: vi.fn(),
+    terminalFitOverrideChanged: vi.fn(),
+    terminalDriverChanged: vi.fn()
+  }
+}
+
+async function createHeadlessRuntimeWithAgent(
+  connectionId: string | null = null,
+  store: RuntimeStore | null = null
+): Promise<{ runtime: DefaultTabRuntime; handle: string }> {
+  const runtime = new DefaultTabRuntime(store, connectionId)
+  let spawned = 0
+  runtime.setPtyController({
+    spawn: vi.fn(async () => ({ id: spawned++ === 0 ? AGENT_PTY_ID : `pty-${spawned}` })),
+    write: () => true,
+    kill: () => true,
+    getForegroundProcess: async () => null
+  })
+  const agent = await runtime.createTerminal(`id:${WORKTREE_ID}`, {
+    tabId: AGENT_TAB_ID,
+    leafId: AGENT_LEAF_ID,
+    launchAgent: 'claude'
+  })
+  return { runtime, handle: agent.handle }
+}
+
+async function dressAgentTab(runtime: DefaultTabRuntime, handle: string): Promise<void> {
+  // Only the handle crosses: the host finds the tab, as it must for a create over SSH too.
+  await provisionWorktreeTerminals(runtime.provisioningHost(), {
+    worktreeSelector: `id:${WORKTREE_ID}`,
+    worktreeId: WORKTREE_ID,
+    worktreePath: '/repo/app',
+    defaultTabs: {
+      runCommands: true,
+      tabs: [{ title: 'Dev', command: 'pnpm dev', color: '#ff0000' }]
+    },
+    primaryTerminalHandle: handle,
+    hasStartupTerminal: true,
+    setupCommandPlatform: 'posix'
+  })
+}
+
+async function agentTab(runtime: OrcaRuntimeService) {
+  const result = await runtime.listMobileSessionTabs(`id:${WORKTREE_ID}`)
+  const tab = result.tabs.find(
+    (candidate) => candidate.type === 'terminal' && candidate.parentTabId === AGENT_TAB_ID
+  )
+  if (tab?.type !== 'terminal') {
+    throw new Error('expected the agent terminal tab')
+  }
+  return tab
+}
+
+describe('the agent tab a host-side create dresses as the first default tab', () => {
+  it.each([
+    ['a local', null],
+    ['an SSH', 'ssh-1']
+  ])(
+    'gives %s agent tab the template title and color before the agent titles itself',
+    async (_, connectionId) => {
+      const { runtime, handle } = await createHeadlessRuntimeWithAgent(connectionId)
+      await dressAgentTab(runtime, handle)
+
+      expect(await agentTab(runtime)).toEqual(
+        expect.objectContaining({ title: 'Dev', color: '#ff0000' })
+      )
+    }
+  )
+
+  it("keeps the phone's status on the agent's own titles", async () => {
+    const { runtime, handle } = await createHeadlessRuntimeWithAgent()
+    await dressAgentTab(runtime, handle)
+
+    runtime.onPtyData(AGENT_PTY_ID, '\x1b]0;⠋ Claude\x07', Date.now())
+
+    expect((await agentTab(runtime)).agentStatus).toEqual(
+      expect.objectContaining({ state: 'working' })
+    )
+  })
+
+  it('titles the tab, never the pane, and keeps the title across a restart', async () => {
+    // The spawn's pty binding has already saved the agent's tab when provisioning runs.
+    const { store, getSession } = sessionStore({
+      ...getDefaultWorkspaceSession(),
+      tabsByWorktree: {
+        [WORKTREE_ID]: [
+          createMinimalPersistedTerminalTab({
+            worktreeId: WORKTREE_ID,
+            tabId: AGENT_TAB_ID,
+            ptyId: AGENT_PTY_ID,
+            existingTabCount: 0
+          })
+        ]
+      }
+    })
+    const { runtime, handle } = await createHeadlessRuntimeWithAgent(null, store)
+    const renameTerminal = vi.fn()
+    runtime.setNotifier(notifierWithRename(renameTerminal))
+
+    await dressAgentTab(runtime, handle)
+
+    expect(renameTerminal).toHaveBeenCalledWith(AGENT_TAB_ID, 'Dev', { recordInteraction: false })
+    expect(runtime.ptyTitle(AGENT_PTY_ID)).toBeNull()
+    // A restarted headless host rebuilds the phone's tabs from the saved session.
+    const session = getSession()
+    expect(
+      buildHeadlessMobileSessionTerminalTabs(
+        WORKTREE_ID,
+        session.tabsByWorktree[WORKTREE_ID] ?? [],
+        session
+      )
+    ).toEqual([
+      expect.objectContaining({ parentTabId: AGENT_TAB_ID, title: 'Dev', color: '#ff0000' })
+    ])
+  })
+
+  it("still titles the tab once the window's graph has taken over the handle", async () => {
+    const { runtime, handle } = await createHeadlessRuntimeWithAgent()
+    const renameTerminal = vi.fn()
+    runtime.setNotifier(notifierWithRename(renameTerminal))
+    runtime.attachWindow(1)
+    runtime.syncWindowGraph(1, {
+      tabs: [
+        {
+          tabId: AGENT_TAB_ID,
+          worktreeId: WORKTREE_ID,
+          title: 'Terminal',
+          activeLeafId: AGENT_LEAF_ID,
+          layout: null
+        }
+      ],
+      leaves: [
+        {
+          tabId: AGENT_TAB_ID,
+          worktreeId: WORKTREE_ID,
+          leafId: AGENT_LEAF_ID,
+          paneRuntimeId: 1,
+          ptyId: AGENT_PTY_ID
+        }
+      ]
+    })
+
+    await runtime.provisioningHost().setTabTitle(handle, 'Dev')
+
+    expect(renameTerminal).toHaveBeenCalledWith(AGENT_TAB_ID, 'Dev', { recordInteraction: false })
+  })
+})
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 0fcdaae95323..c7e3c1d79a12 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
@@ -2,7 +2,6 @@
 import { agentSessionRefusalError } from '../../shared/agent-session-wire-refusals'
 import { OrcaRuntimeWithGetWorktreePs } from './orca-runtime-get-worktree-ps'
 import { getStructuredAgentSessionHost } from '../native-chat/agent-session-wire/structured-agent-session-registry'
-import { resolveStructuredAgentSessionCreateSupport } from '../native-chat/structured-agent-session-create-support'
 import {
   resolveCommittedStructuredAgentSessionAdoptionIntent,
   resolveStructuredAgentSessionAdoptionForCreate
@@ -11,6 +10,7 @@ import { LOCAL_EXECUTION_HOST_ID } from '../../shared/execution-host'
 import { getLocalProjectWorktreeGitOptions } from '../project-runtime-git-options'
 import type { AgentSessionAttachParams } from '../native-chat/agent-session-wire/structured-agent-session-attach'
 import { resolveTuiAgentLaunchEnv } from '../../shared/tui-agent-launch-defaults'
+import { resolveHostStructuredAgentCreateSupport } from './structured-agent-launch-support'
 import { structuredAgentRuntimeRegistration } from './structured-agent-runtime-registrations'
 import { resolveStructuredLaunchSeedOptions } from '../../shared/native-chat-session-option-defaults'
 import { hasPersistedStructuredAgentSessionStore as hasPersistedStructuredAgentSessionStoreOnDisk } from './structured-agent-session-runtime'
@@ -23,7 +23,7 @@ import {
 } from '../../shared/floating-workspace-worktree'
 import { parseWorkspaceKey } from '../../shared/workspace-scope'
 import {
-  agentSessionAccountHome,
+  isLegacyAgentSessionAccountHome,
   type AgentSessionAccountHome
 } from '../../shared/agent-session-account-home'
 import {
@@ -37,24 +37,17 @@ export class OrcaRuntimeWithGetStructuredAgentSessionCreateSupport extends OrcaR
     worktreeSelector: string,
     agent: StructuredAgentId
   ): Promise<{ supported: boolean; reason?: 'agent' | 'remote' | 'wsl' }> {
-    const location = await this.resolveStructuredAgentSessionLocation(worktreeSelector)
-    return resolveStructuredAgentSessionCreateSupport({
+    return resolveHostStructuredAgentCreateSupport({
       agent,
-      location,
-      adapterSupportsCreate: await this.structuredAgentSupportsLocation(agent, location),
-      getSettings: () => this.requireStore().getSettings()
+      worktreeSelector,
+      location: await this.resolveStructuredAgentSessionLocation(worktreeSelector),
+      runtime: this
     })
   }
 
-  /** The agent's own location rule, from its registration: answered without installing the host,
-   *  and false for an agent this runtime does not register. */
-  protected async structuredAgentSupportsLocation(agent: StructuredAgentId, location) {
-    return structuredAgentRuntimeRegistration(agent)?.supportsLocation(location) ?? false
-  }
-
   /** Where a launch of `agent` finds its account, resolved on this host by the agent's own
    *  registration; null for an agent this runtime does not register, whose create is refused. */
-  protected structuredAgentAccountHomePathResolver(
+  protected structuredAgentAccountHomeResolver(
     agent: StructuredAgentId,
     worktree: string,
     purpose: 'launch' | 'read',
@@ -71,7 +64,7 @@ export class OrcaRuntimeWithGetStructuredAgentSessionCreateSupport extends OrcaR
       workspaceTrustSettings: () => this.requireStore().getSettings()
     }
     return async ({ launchEnv, location }) =>
-      registration.resolveAccountHomePath(
+      registration.resolveAccountHome(
         {
           launchEnv,
           location: location ?? null,
@@ -160,18 +153,18 @@ export class OrcaRuntimeWithGetStructuredAgentSessionCreateSupport extends OrcaR
     const hostLaunchDirectory = isFloatingWorkspaceSelector(input.worktree)
       ? (await this.resolveRuntimeFileTarget(input.worktree)).worktree.path
       : undefined
-    const resolveAccountHomePath = this.structuredAgentAccountHomePathResolver(
+    const resolveAccountHome = this.structuredAgentAccountHomeResolver(
       input.agent,
       input.worktree,
       'launch',
       hostLaunchDirectory
     )
-    if (!resolveAccountHomePath) {
+    if (!resolveAccountHome) {
       throw agentSessionRefusalError('structured_agent_session_unsupported', {
         reason: 'hostUnsupported'
       })
     }
-    const resolved = await this.resolveStructuredAgentSessionIntent(input, resolveAccountHomePath)
+    const resolved = await this.resolveStructuredAgentSessionIntent(input, resolveAccountHome)
     return hostLaunchDirectory ? { ...resolved, hostLaunchDirectory } : resolved
   }
 
@@ -183,18 +176,17 @@ export class OrcaRuntimeWithGetStructuredAgentSessionCreateSupport extends OrcaR
   async resolveStructuredAgentAccountHome(
     agent: StructuredAgentId
   ): Promise<AgentSessionAccountHome> {
-    const resolvePath = this.structuredAgentAccountHomePathResolver(agent, '', 'read')
-    if (!resolvePath) {
+    const resolveAccountHome = this.structuredAgentAccountHomeResolver(agent, '', 'read')
+    if (!resolveAccountHome) {
       throw agentSessionRefusalError('structured_agent_session_unsupported', {
         reason: 'hostUnsupported'
       })
     }
-    const definition = this.requireRegisteredStructuredAgent(agent)
     const launchEnv = resolveTuiAgentLaunchEnv(
       agent,
       this.requireStore().getSettings().agentDefaultEnv
     )
-    return agentSessionAccountHome(definition, await resolvePath({ launchEnv, location: null }))
+    return resolveAccountHome({ launchEnv, location: null })
   }
 
   protected async resolveStructuredAgentSessionIntent(
@@ -205,7 +197,7 @@ export class OrcaRuntimeWithGetStructuredAgentSessionCreateSupport extends OrcaR
       callerKey?: string
       resumeFrom?: { providerSessionId: string }
     },
-    resolveAccountHomePath: (context: {
+    resolveAccountHome: (context: {
       launchEnv: NodeJS.ProcessEnv
       location: {
         executionHostId: string
@@ -213,7 +205,7 @@ export class OrcaRuntimeWithGetStructuredAgentSessionCreateSupport extends OrcaR
         workspaceId: string
         workspaceKind: 'folder' | 'git-worktree'
       }
-    }) => string | Promise<string>
+    }) => AgentSessionAccountHome | Promise<AgentSessionAccountHome>
   ): Promise<AgentSessionAttachParams> {
     const support = await this.getStructuredAgentSessionCreateSupport(input.worktree, input.agent)
     // Adopting a conversation reads the agent's own transcript, which only Claude and Codex have
@@ -238,21 +230,27 @@ export class OrcaRuntimeWithGetStructuredAgentSessionCreateSupport extends OrcaR
     if (committedReplay) {
       return committedReplay
     }
-    const selectedAccountHomePath = await resolveAccountHomePath({ launchEnv, location })
+    const selectedAccountHome = await resolveAccountHome({ launchEnv, location })
+    if (input.resumeFrom && !isLegacyAgentSessionAccountHome(selectedAccountHome)) {
+      throw agentSessionRefusalError('structured_agent_session_unsupported', {
+        reason: 'hostUnsupported'
+      })
+    }
     // Adopting pins the account home to wherever the conversation actually lives, which is not
     // necessarily the one a fresh create would pick: Codex resolves its rollout under
     // `accountHome.path`, and Claude reads its transcript under `<home>/projects`. Resuming under
     // the wrong home finds nothing and lands the user in a blank chat wearing the old chat's name.
-    const adoption = input.resumeFrom
-      ? await resolveStructuredAgentSessionAdoptionForCreate({
-          host,
-          settings,
-          agent: input.agent,
-          providerSessionId: input.resumeFrom.providerSessionId,
-          selfSessionId: input.envelope.sessionId,
-          selectedAccountHomePath
-        })
-      : null
+    const adoption =
+      input.resumeFrom && isLegacyAgentSessionAccountHome(selectedAccountHome)
+        ? await resolveStructuredAgentSessionAdoptionForCreate({
+            host,
+            settings,
+            agent: input.agent,
+            providerSessionId: input.resumeFrom.providerSessionId,
+            selfSessionId: input.envelope.sessionId,
+            selectedAccountHomePath: selectedAccountHome.path
+          })
+        : null
     return {
       envelope: {
         sessionId: input.envelope.sessionId,
@@ -263,10 +261,10 @@ export class OrcaRuntimeWithGetStructuredAgentSessionCreateSupport extends OrcaR
       location,
       provider: input.agent,
       agent: input.agent,
-      accountHome: agentSessionAccountHome(
-        definition,
-        adoption ? adoption.accountHomePath : selectedAccountHomePath
-      ),
+      accountHome:
+        adoption && isLegacyAgentSessionAccountHome(selectedAccountHome)
+          ? { variable: selectedAccountHome.variable, path: adoption.accountHomePath }
+          : selectedAccountHome,
       ...(options ? { options } : {}),
       ...(input.resumeFrom && adoption
         ? {
diff --git a/src/main/runtime/orca-runtime-get-worktree-ps.ts b/src/main/runtime/orca-runtime-get-worktree-ps.ts
index 174fcae70857..8ac017498e68 100644
--- a/src/main/runtime/orca-runtime-get-worktree-ps.ts
+++ b/src/main/runtime/orca-runtime-get-worktree-ps.ts
@@ -44,7 +44,11 @@ import { codexStructuredPermissionPolicyForSettings } from '../codex/codex-struc
 import { claudeStructuredAuthPolicyForSettings } from '../claude-accounts/claude-structured-auth-policy'
 import { resolveStructuredAgentCommand } from '../native-chat/structured-agent-command-resolution'
 import { structuredAgentConfiguredArgs } from '../native-chat/structured-agent-configured-args'
-import { claudeThinkingDisplaySupport } from '../claude/claude-thinking-display-support'
+import { claudeCliFlagSupport } from '../claude/claude-cli-flag-support'
+import {
+  createNativeChatVisualsWorkspaceVerdicts,
+  readNativeChatVisualsWorkspaceCatalogs
+} from './native-chat-visuals-workspace-verdict'
 
 export class OrcaRuntimeWithGetWorktreePs extends OrcaRuntimeWithStartTuiIdleVisibleReadProbe {
   async getWorktreePs(
@@ -223,7 +227,14 @@ export class OrcaRuntimeWithGetWorktreePs extends OrcaRuntimeWithStartTuiIdleVis
       resolveClaudeLaunchEnv: () =>
         resolveTuiAgentLaunchEnv('claude', this.requireStore().getSettings().agentDefaultEnv),
       // Wired only here, so a test runtime never runs a real `claude --version`.
-      claudeThinkingDisplay: claudeThinkingDisplaySupport,
+      claudeCliFlags: claudeCliFlagSupport,
+      nativeChatVisuals: {
+        isEnabled: () => this.requireStore().getSettings().nativeChatInlineVisuals !== false,
+        // Chats and their visuals are shared by every profile; each profile keeps its own catalog.
+        workspaceVerdicts: createNativeChatVisualsWorkspaceVerdicts(() =>
+          this.store ? readNativeChatVisualsWorkspaceCatalogs(this.store) : null
+        )
+      },
       resolveShellEnvironmentPolicy: () =>
         nativeChatShellEnvironmentPolicy(this.requireStore().getSettings()),
       resolveClaudeAuthPolicy: () =>
@@ -245,8 +256,7 @@ export class OrcaRuntimeWithGetWorktreePs extends OrcaRuntimeWithStartTuiIdleVis
         isTuiAgent(agent)
           ? resolveTuiAgentLaunchEnv(agent, this.requireStore().getSettings().agentDefaultEnv)
           : {},
-      // Same gate and same settings as agentSession.createSupport, re-read on every acquisition.
-      getClaudeManagedAccountGateSettings: () => this.requireStore().getSettings(),
+      resolveAgentCommandSettings: () => this.requireStore().getSettings(),
       resolveAgentAccountHome: (agent) => this.resolveStructuredAgentAccountHome(agent),
       // Structured chat has no agent CLI hooks, so this projection is what the first-work
       // workspace rename listens to instead of `agentStatus:set`.
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 3b465f643b36..0add054a67c5 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
@@ -27,7 +27,18 @@ export class OrcaRuntimeWithGetWorktreeTerminalProvisioningHost extends OrcaRunt
       createTerminal: (selector, options) =>
         this.createTerminal(selector, options, createdWorktree),
       splitTerminal: (handle, options) => this.splitTerminal(handle, options, createdWorktree),
-      setTabColor: async (worktreeId, tabId, color) => {
+      setTabTitle: async (handle, title) => {
+        const { worktreeId, tabId } = this.getProvisionedTerminalTab(handle)
+        // Why not renameTerminal: it writes the pane's title, stamped to outrank every later
+        // agent title, which would hide the agent's own titles and status for the pane's life.
+        this.notifier?.renameTerminal(tabId, title, { recordInteraction: false })
+        if (!this.getAvailableAuthoritativeWindow()) {
+          this.persistHeadlessTerminalTitle(worktreeId, tabId, title)
+          this.applyHeadlessSessionTabPropsToSnapshot(worktreeId, tabId, { title })
+        }
+      },
+      setTabColor: async (handle, color) => {
+        const { worktreeId, tabId } = this.getProvisionedTerminalTab(handle)
         await this.setMobileSessionTabProps(`id:${worktreeId}`, { tabId, color })
       },
       getSettings: () => this.requireStore().getSettings(),
@@ -37,6 +48,17 @@ export class OrcaRuntimeWithGetWorktreeTerminalProvisioningHost extends OrcaRunt
     }
   }
 
+  protected getProvisionedTerminalTab(handle: string): { worktreeId: string; tabId: string } {
+    const pty = this.getLivePtyForHandle(handle)?.pty
+    if (pty?.tabId) {
+      return { worktreeId: pty.worktreeId, tabId: pty.tabId }
+    }
+    // Why: once the window's graph sync adopts the handle it names the window's leaf, not the
+    // runtime's pty, as renameTerminal also resolves it.
+    const { leaf } = this.getLiveLeafForHandle(handle)
+    return { worktreeId: leaf.worktreeId, tabId: leaf.tabId }
+  }
+
   protected getWorktreeStartupReadinessHost(): WorktreeStartupReadinessHost {
     return {
       getPtyId: (handle) => this.getLivePtyForHandle(handle)?.pty.ptyId ?? null,
diff --git a/src/main/runtime/orca-runtime-hydrate-headless-mobile-session-tabs-from-workspace-session.ts b/src/main/runtime/orca-runtime-hydrate-headless-mobile-session-tabs-from-workspace-session.ts
index 49fdc91573a5..4c25c12bfdb4 100644
--- a/src/main/runtime/orca-runtime-hydrate-headless-mobile-session-tabs-from-workspace-session.ts
+++ b/src/main/runtime/orca-runtime-hydrate-headless-mobile-session-tabs-from-workspace-session.ts
@@ -15,7 +15,8 @@ import {
   collectHeadlessParentTabOrder,
   distributeHeadlessTabsAcrossGroups,
   getHeadlessMobileSessionGroupId,
-  pickHeadlessActiveTerminalTab
+  pickHeadlessActiveTerminalTab,
+  pickRestoredActiveGroupId
 } from './mobile-session-layout-projection'
 import {
   mergeMobileSessionSnapshotTabs,
@@ -236,7 +237,13 @@ export class OrcaRuntimeWithHydrateHeadlessMobileSessionTabsFromWorkspaceSession
           ? this.getMergedMobileSessionPublicationEpoch(existing, tabs)
           : `headless-hydrated:${Date.now().toString(36)}`,
         snapshotVersion: (existing?.snapshotVersion ?? 0) + 1,
-        activeGroupId: existing?.activeGroupId ?? groupId,
+        activeGroupId: hasPersistedSplit
+          ? pickRestoredActiveGroupId(
+              nextTabGroups,
+              [existing?.activeGroupId, session.activeGroupIdByWorktree?.[entryWorktreeId]],
+              activeTopLevelId
+            )
+          : (existing?.activeGroupId ?? groupId),
         activeTabId: mergedActiveTab?.id ?? null,
         activeTabType: mergedActiveTab?.type ?? null,
         tabGroups: nextTabGroups,
diff --git a/src/main/runtime/orca-runtime-persist-headless-session-tab-props.ts b/src/main/runtime/orca-runtime-persist-headless-session-tab-props.ts
index 7c21c0256545..78c31b578346 100644
--- a/src/main/runtime/orca-runtime-persist-headless-session-tab-props.ts
+++ b/src/main/runtime/orca-runtime-persist-headless-session-tab-props.ts
@@ -67,7 +67,12 @@ export class OrcaRuntimeWithPersistHeadlessSessionTabProps extends OrcaRuntimeWi
   protected applyHeadlessSessionTabPropsToSnapshot(
     worktreeId: string,
     tabId: string,
-    props: { color?: string | null; isPinned?: boolean; viewMode?: 'terminal' | 'chat' }
+    props: {
+      title?: string
+      color?: string | null
+      isPinned?: boolean
+      viewMode?: 'terminal' | 'chat'
+    }
   ): void {
     const snapshot = this.mobileSessionTabsByWorktree.get(worktreeId)
     if (!snapshot) {
@@ -81,6 +86,7 @@ export class OrcaRuntimeWithPersistHeadlessSessionTabProps extends OrcaRuntimeWi
       changed = true
       return {
         ...tab,
+        ...(props.title !== undefined ? { title: props.title } : {}),
         ...(props.color !== undefined ? { color: props.color } : {}),
         ...(props.isPinned !== undefined ? { isPinned: props.isPinned } : {}),
         ...(props.viewMode !== undefined ? { viewMode: props.viewMode } : {})
diff --git a/src/main/runtime/orca-runtime-preserved-branch-cleanup.ts b/src/main/runtime/orca-runtime-preserved-branch-cleanup.ts
index 21f0d73cf7a4..daf6037db7af 100644
--- a/src/main/runtime/orca-runtime-preserved-branch-cleanup.ts
+++ b/src/main/runtime/orca-runtime-preserved-branch-cleanup.ts
@@ -100,6 +100,11 @@ export class OrcaRuntimeWithPreservedBranchCleanup extends OrcaRuntimeWithTermin
     return this.getLivePtyForHandle(handle)?.pty.ptyId ?? null
   }
 
+  /** Every provider-session row this host holds, resume-identity-only rows included. */
+  getAgentProviderSessionRows(): AgentStatusIpcPayload[] {
+    return this.getAgentProviderSessionSnapshotFn?.() ?? []
+  }
+
   /** Agent status rows this host holds for a pane, from hooks, OSC and titles alike. */
   getAgentStatusRowsForPane(paneKey: string): AgentStatusIpcPayload[] {
     return this.getAgentProviderSessionRowsForPaneFn?.(paneKey) ?? []
diff --git a/src/main/runtime/orca-runtime-reconcile-headless-mobile-session-browser-tabs.ts b/src/main/runtime/orca-runtime-reconcile-headless-mobile-session-browser-tabs.ts
index 6ce5f8a36502..146f87e095a1 100644
--- a/src/main/runtime/orca-runtime-reconcile-headless-mobile-session-browser-tabs.ts
+++ b/src/main/runtime/orca-runtime-reconcile-headless-mobile-session-browser-tabs.ts
@@ -127,8 +127,8 @@ export class OrcaRuntimeWithReconcileHeadlessMobileSessionBrowserTabs extends Or
    * binds one leaf in two tabs and orphans the PTY under the new one) and refuses the correct ones.
    * Same resolution `restoreReattachedPtyRuntime` already does for its own reattach fence.
    *
-   * Both workspace partitions are read because SSH spawns bind panes into `ssh:<target>` while
-   * reattach binds into `local`; consulting one would report "nowhere" for a pane the other holds.
+   * Both workspace partitions are read because older builds' relay reattach left SSH panes in
+   * `local`; consulting one would report "nowhere" for a pane the other holds.
    */
   protected findCurrentTerminalTabIdForLeaf(targetId: string, leafId: string): string | undefined {
     for (const leaf of this.leaves.values()) {
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 f66240f57390..ed4aa8981b48 100644
--- a/src/main/runtime/orca-runtime-resolve-worktree-removal-target.ts
+++ b/src/main/runtime/orca-runtime-resolve-worktree-removal-target.ts
@@ -24,7 +24,7 @@ import { terminalShellOverrideRefusal } from './terminal-shell-override-host-sup
 import { resolveTerminalStartupCwd } from '../../shared/terminal-startup-cwd'
 import { resolveLocalProjectRuntimeForWorktreeId } from '../local-project-runtime-resolution'
 import { LOCAL_EXECUTION_HOST_ID, parseExecutionHostId } from '../../shared/execution-host'
-import { invalidateAuthorizedRootsCache } from '../ipc/filesystem-auth'
+import { invalidateAuthorizedRootsCacheForRepo } from '../ipc/filesystem-auth'
 import {
   resumeInterruptedWorktreeRemovals,
   retryFailedWorktreeRemoval,
@@ -124,7 +124,7 @@ export class OrcaRuntimeWithResolveWorktreeRemovalTarget extends OrcaRuntimeWith
     this.removeWorktreeMetadataAndHistory(store, worktreeId, removalHostId)
     this.invalidateResolvedWorktreeCache()
     this.invalidateWorktreeScanCacheForRepo(repoId)
-    invalidateAuthorizedRootsCache()
+    invalidateAuthorizedRootsCacheForRepo(store, repoId)
   }
 
   protected removeWorktreeMetadataAndHistory(
diff --git a/src/main/runtime/orca-runtime-structured-agent-registration-seam.test.ts b/src/main/runtime/orca-runtime-structured-agent-registration-seam.test.ts
index 6e313e111af6..00f602c9bea9 100644
--- a/src/main/runtime/orca-runtime-structured-agent-registration-seam.test.ts
+++ b/src/main/runtime/orca-runtime-structured-agent-registration-seam.test.ts
@@ -63,14 +63,17 @@ describe('the structured agent registration list', () => {
 
   it("resolves an account home through the agent's registration, with the read purpose", async () => {
     const claude = structuredAgentRuntimeRegistration('claude')!
-    vi.spyOn(claude, 'resolveAccountHomePath').mockResolvedValue('/accounts/claude')
+    vi.spyOn(claude, 'resolveAccountHome').mockResolvedValue({
+      variable: 'CLAUDE_CONFIG_DIR',
+      path: '/accounts/claude'
+    })
     const { runtime, installHost } = runtimeAt()
 
     expect(await runtime.resolveStructuredAgentAccountHome('claude')).toEqual({
       variable: 'CLAUDE_CONFIG_DIR',
       path: '/accounts/claude'
     })
-    expect(claude.resolveAccountHomePath).toHaveBeenCalledWith(
+    expect(claude.resolveAccountHome).toHaveBeenCalledWith(
       expect.objectContaining({ purpose: 'read', location: null, workspacePath: null }),
       expect.anything()
     )
diff --git a/src/main/runtime/orca-runtime-structured-claude-account-gate.test.ts b/src/main/runtime/orca-runtime-structured-claude-account-gate.test.ts
deleted file mode 100644
index 64b451e9ea90..000000000000
--- a/src/main/runtime/orca-runtime-structured-claude-account-gate.test.ts
+++ /dev/null
@@ -1,112 +0,0 @@
-import { afterEach, describe, expect, it, vi } from 'vitest'
-import { OrcaRuntimeService } from './orca-runtime'
-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 { ClaudeManagedAccountGateSettings } from '../native-chat/claude-structured-managed-account-support'
-
-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') }
-}))
-
-function managedAccount(id: string, managedAuthRuntime: 'host' | 'wsl') {
-  return {
-    id,
-    email: `${id}@example.com`,
-    managedAuthPath: `/managed/${id}`,
-    managedAuthRuntime,
-    authMethod: 'subscription-oauth' as const,
-    createdAt: 0,
-    updatedAt: 0,
-    lastAuthenticatedAt: 0
-  }
-}
-
-const WSL_ONLY: ClaudeManagedAccountGateSettings = {
-  claudeManagedAccounts: [managedAccount('wsl-1', 'wsl')],
-  activeClaudeManagedAccountId: null,
-  activeClaudeManagedAccountIdsByRuntime: { host: null, wsl: { Ubuntu: 'wsl-1' } }
-}
-
-/** Registered Claude accounts with none selected: ambient auth, and the UI names no host identity,
- *  so this must reach structured rather than silently falling back to a terminal session. */
-const ACCOUNTS_PRESENT_NONE_ACTIVE: ClaudeManagedAccountGateSettings = {
-  claudeManagedAccounts: [managedAccount('host-1', 'host'), managedAccount('host-2', 'host')],
-  activeClaudeManagedAccountId: null,
-  activeClaudeManagedAccountIdsByRuntime: { host: null, wsl: {} }
-}
-
-const HOST_SELECTED: ClaudeManagedAccountGateSettings = {
-  claudeManagedAccounts: [managedAccount('host-1', 'host')],
-  activeClaudeManagedAccountId: 'host-1',
-  activeClaudeManagedAccountIdsByRuntime: { host: 'host-1', wsl: {} }
-}
-
-function runtimeWithAccounts(claude: ClaudeManagedAccountGateSettings | null): OrcaRuntimeService {
-  // No store at all is the unreadable-settings case the gate must fail closed on.
-  const runtime = claude
-    ? new OrcaRuntimeService({ getSettings: () => claude } as never)
-    : new OrcaRuntimeService()
-  const internal = runtime as unknown as {
-    resolveStructuredAgentSessionLocation: (selector: string) => Promise<unknown>
-    ensureStructuredAgentSessionHost: () => Promise<void>
-  }
-  internal.resolveStructuredAgentSessionLocation = vi.fn(async () => ({
-    executionHostId: 'local',
-    wslDistro: null,
-    workspaceId: 'workspace-1',
-    workspaceKind: 'git-worktree' as const
-  }))
-  // The adapter's own location answer is irrelevant here; pin it supported so only the account
-  // gate can refuse.
-  internal.ensureStructuredAgentSessionHost = vi.fn(async () => {})
-  setStructuredAgentSessionHost({
-    supportsCreate: () => true
-  } as unknown as StructuredAgentSessionHost)
-  return runtime
-}
-
-afterEach(() => {
-  setStructuredAgentSessionHost(null)
-})
-
-describe('structured Claude managed-account gate', () => {
-  it('refuses Claude under a WSL-only managed account', async () => {
-    const runtime = runtimeWithAccounts(WSL_ONLY)
-    await expect(
-      runtime.getStructuredAgentSessionCreateSupport('id:workspace-1', 'claude')
-    ).resolves.toMatchObject({ supported: false })
-  })
-
-  it('supports Claude when accounts are registered but none is selected', async () => {
-    const runtime = runtimeWithAccounts(ACCOUNTS_PRESENT_NONE_ACTIVE)
-    await expect(
-      runtime.getStructuredAgentSessionCreateSupport('id:workspace-1', 'claude')
-    ).resolves.toMatchObject({ supported: true })
-  })
-
-  it('still supports Claude under a selected host managed account', async () => {
-    const runtime = runtimeWithAccounts(HOST_SELECTED)
-    await expect(
-      runtime.getStructuredAgentSessionCreateSupport('id:workspace-1', 'claude')
-    ).resolves.toMatchObject({ supported: true })
-  })
-
-  it('fails closed for Claude when the account runtime cannot be determined', async () => {
-    const runtime = runtimeWithAccounts(null)
-    await expect(
-      runtime.getStructuredAgentSessionCreateSupport('id:workspace-1', 'claude')
-    ).resolves.toMatchObject({ supported: false })
-  })
-
-  /** The gate is Claude's alone: Codex resolves its account separately and this lane must not
-   *  change any Codex answer. */
-  it('leaves Codex supported under the same WSL-only Claude account', async () => {
-    const runtime = runtimeWithAccounts(WSL_ONLY)
-    await expect(
-      runtime.getStructuredAgentSessionCreateSupport('id:workspace-1', 'codex')
-    ).resolves.toMatchObject({ supported: true })
-  })
-})
diff --git a/src/main/runtime/orca-runtime-structured-claude-gate-wiring.test.ts b/src/main/runtime/orca-runtime-structured-claude-gate-wiring.test.ts
deleted file mode 100644
index 0d9b12f7c528..000000000000
--- a/src/main/runtime/orca-runtime-structured-claude-gate-wiring.test.ts
+++ /dev/null
@@ -1,64 +0,0 @@
-import { describe, expect, it, vi } from 'vitest'
-
-const installed = vi.hoisted(() => ({ deps: null as Record<string, unknown> | null }))
-
-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') }
-}))
-
-vi.mock('./structured-agent-session-runtime', () => ({
-  ensureStructuredAgentSessionHost: vi.fn(async (deps: Record<string, unknown>) => {
-    installed.deps = deps
-  })
-}))
-
-import { OrcaRuntimeService } from './orca-runtime'
-import {
-  readClaudeManagedAccountGateSettings,
-  type ClaudeManagedAccountGateSettings
-} from '../native-chat/claude-structured-managed-account-support'
-
-const SETTINGS = {
-  claudeManagedAccounts: [],
-  activeClaudeManagedAccountId: null,
-  agentDefaultEnv: {},
-  agentDefaultArgs: {}
-} as unknown as ClaudeManagedAccountGateSettings
-
-function gateSettingsGetter(): (() => ClaudeManagedAccountGateSettings) | undefined {
-  const deps: Record<string, unknown> = installed.deps ?? {}
-  const get = deps['getClaudeManagedAccountGateSettings']
-  return typeof get === 'function' ? (get as () => ClaudeManagedAccountGateSettings) : undefined
-}
-
-/** The runtime class this wiring lives on does not typecheck its own `this` calls, so a broken or
- *  missing gate hookup compiles clean. Pin it behaviourally instead. */
-describe('structured Claude managed-account gate wiring', () => {
-  it('hands the host a gate reader that resolves the live settings', async () => {
-    installed.deps = null
-    const runtime = new OrcaRuntimeService({ getSettings: () => SETTINGS } as never)
-
-    await runtime.ensureStructuredAgentSessionHost()
-
-    const get = gateSettingsGetter()
-    expect(typeof get).toBe('function')
-    expect(get?.()).toBe(SETTINGS)
-  })
-
-  /** The installer composes this getter with the fail-closed reader, which is the shape the
-   *  resolver consumes; pin that composition end to end. */
-  it('composes into a null answer instead of throwing when settings cannot be read', async () => {
-    installed.deps = null
-    const runtime = new OrcaRuntimeService()
-
-    await runtime.ensureStructuredAgentSessionHost()
-
-    const get = gateSettingsGetter()
-    expect(typeof get).toBe('function')
-    expect(() => get?.()).toThrow()
-    expect(readClaudeManagedAccountGateSettings(get!)).toBeNull()
-  })
-})
diff --git a/src/main/runtime/orca-runtime-test-lifecycle.spec.ts b/src/main/runtime/orca-runtime-test-lifecycle.spec.ts
index 413035af5094..522a1ca2ac5d 100644
--- a/src/main/runtime/orca-runtime-test-lifecycle.spec.ts
+++ b/src/main/runtime/orca-runtime-test-lifecycle.spec.ts
@@ -1,6 +1,7 @@
 import * as mocks from './orca-runtime-test-mocks.spec'
 import { awaitBackgroundRemovalsInRuntimeTests } from './orca-runtime-background-removal-test-support'
 import { _resetPendingWorktreeRemovalsForTests } from '../worktree-background-removal'
+import { _resetCanonicalRepoKeyCacheForTests } from '../git/canonical-repo-key'
 
 const { MOCK_GIT_WORKTREES, RuntimeBrowserCommands, _resetTerminalViewAttributesForTest } = mocks
 const { addGitHubIssueCommentMock, addGitHubPRReviewCommentMock } = mocks
@@ -63,6 +64,7 @@ const { updateGitLabIssueMock, updateGitLabMRMock, updateGitLabMRReviewersMock,
 awaitBackgroundRemovalsInRuntimeTests(mocks.OrcaRuntimeService.prototype as never)
 
 function resetRuntimeTestMocks(): void {
+  _resetCanonicalRepoKeyCacheForTests()
   _resetPendingWorktreeRemovalsForTests()
   // Why: constructing the browser commands is what pulls the Chromium cluster in, so
   // production installs this at the Electron entry. A Node host installs none and the
diff --git a/src/main/runtime/orca-runtime-tests/mobile-session-tabs-cold-serve-hydrate.spec.ts b/src/main/runtime/orca-runtime-tests/mobile-session-tabs-cold-serve-hydrate.spec.ts
index 81cc968e1848..612efbb77b82 100644
--- a/src/main/runtime/orca-runtime-tests/mobile-session-tabs-cold-serve-hydrate.spec.ts
+++ b/src/main/runtime/orca-runtime-tests/mobile-session-tabs-cold-serve-hydrate.spec.ts
@@ -57,6 +57,28 @@ function makeRestartedServeRuntime(overrides: Partial<WorkspaceSessionState> = {
   return runtime
 }
 
+const SPLIT_GROUPS = [
+  {
+    id: 'group-left',
+    worktreeId: TEST_WORKTREE_ID,
+    activeTabId: 'serve-tab',
+    tabOrder: ['serve-tab']
+  },
+  {
+    id: 'group-right',
+    worktreeId: TEST_WORKTREE_ID,
+    activeTabId: 'daemon-tab',
+    tabOrder: ['daemon-tab']
+  }
+]
+
+// Why: the per-client list projection repairs activeGroupId, so read the host's stored snapshot.
+function storedActiveGroupId(runtime: OrcaRuntimeService): string | null | undefined {
+  const snapshots: Map<string, { activeGroupId?: string | null }> =
+    runtime['mobileSessionTabsByWorktree']
+  return snapshots.get(TEST_WORKTREE_ID)?.activeGroupId
+}
+
 function terminalPtyIds(tabs: readonly { type: string; ptyId?: string | null }[]): string[] {
   return tabs.flatMap((tab) => (tab.type === 'terminal' && tab.ptyId ? [tab.ptyId] : [])).sort()
 }
@@ -104,22 +126,8 @@ describe('OrcaRuntimeService', () => {
 
   it('restores a persisted split group layout on the cold rebuild', async () => {
     const runtime = makeRestartedServeRuntime({
-      tabGroups: {
-        [TEST_WORKTREE_ID]: [
-          {
-            id: 'group-left',
-            worktreeId: TEST_WORKTREE_ID,
-            activeTabId: 'serve-tab',
-            tabOrder: ['serve-tab']
-          },
-          {
-            id: 'group-right',
-            worktreeId: TEST_WORKTREE_ID,
-            activeTabId: 'daemon-tab',
-            tabOrder: ['daemon-tab']
-          }
-        ]
-      }
+      activeGroupIdByWorktree: { [TEST_WORKTREE_ID]: 'group-left' },
+      tabGroups: { [TEST_WORKTREE_ID]: SPLIT_GROUPS }
     })
 
     const listed = await runtime.listMobileSessionTabs(`id:${TEST_WORKTREE_ID}`)
@@ -128,5 +136,44 @@ describe('OrcaRuntimeService', () => {
       ['serve-tab'],
       ['daemon-tab']
     ])
+    expect(storedActiveGroupId(runtime)).toBe('group-left')
+  })
+
+  it('restores the saved active group of a split even when it is not the first group', async () => {
+    const runtime = makeRestartedServeRuntime({
+      activeTabId: 'daemon-tab',
+      activeTabIdByWorktree: { [TEST_WORKTREE_ID]: 'daemon-tab' },
+      activeGroupIdByWorktree: { [TEST_WORKTREE_ID]: 'group-right' },
+      tabGroups: { [TEST_WORKTREE_ID]: SPLIT_GROUPS }
+    })
+
+    const listed = await runtime.listMobileSessionTabs(`id:${TEST_WORKTREE_ID}`)
+
+    expect(storedActiveGroupId(runtime)).toBe('group-right')
+    expect(listed.activeGroupId).toBe('group-right')
+  })
+
+  it('falls back to the active tab group when the saved active group was not restored', async () => {
+    const runtime = makeRestartedServeRuntime({
+      activeTabId: 'daemon-tab',
+      activeTabIdByWorktree: { [TEST_WORKTREE_ID]: 'daemon-tab' },
+      activeGroupIdByWorktree: { [TEST_WORKTREE_ID]: 'group-gone' },
+      tabGroups: { [TEST_WORKTREE_ID]: SPLIT_GROUPS }
+    })
+
+    await runtime.listMobileSessionTabs(`id:${TEST_WORKTREE_ID}`)
+
+    expect(storedActiveGroupId(runtime)).toBe('group-right')
+  })
+
+  it('keeps the headless group active when there is no persisted split', async () => {
+    const runtime = makeRestartedServeRuntime({
+      activeGroupIdByWorktree: { [TEST_WORKTREE_ID]: 'group-gone' }
+    })
+
+    const listed = await runtime.listMobileSessionTabs(`id:${TEST_WORKTREE_ID}`)
+
+    expect(listed.tabGroups).toHaveLength(1)
+    expect(storedActiveGroupId(runtime)).toBe(listed.tabGroups?.[0]?.id)
   })
 })
diff --git a/src/main/runtime/orca-runtime-tests/worktree-removal-and-reconciliation-part-03.spec.ts b/src/main/runtime/orca-runtime-tests/worktree-removal-and-reconciliation-part-03.spec.ts
index 96abf6a97cef..1017a8e99085 100644
--- a/src/main/runtime/orca-runtime-tests/worktree-removal-and-reconciliation-part-03.spec.ts
+++ b/src/main/runtime/orca-runtime-tests/worktree-removal-and-reconciliation-part-03.spec.ts
@@ -350,7 +350,7 @@ describe('OrcaRuntimeService', () => {
       // an unqualified purge would evict a same-id row owned by another host.
       expect(removeWorktreeMeta).toHaveBeenCalledWith(worktreeId, 'local')
       expect(deleteWorktreeHistoryDirMock).toHaveBeenCalledWith(worktreeId)
-      expect(invalidateAuthorizedRootsCacheMock).toHaveBeenCalled()
+      expect(invalidateAuthorizedRootsCacheMock).toHaveBeenCalledWith(runtimeStore, TEST_REPO_ID)
       expect(notifier.worktreesChanged).toHaveBeenCalledWith(TEST_REPO_ID)
     } finally {
       await rm(parentDir, { recursive: true, force: true })
@@ -376,7 +376,7 @@ describe('OrcaRuntimeService', () => {
       // an unqualified purge would evict a same-id row owned by another host.
       expect(removeWorktreeMeta).toHaveBeenCalledWith(worktreeId, 'local')
       expect(deleteWorktreeHistoryDirMock).toHaveBeenCalledWith(worktreeId)
-      expect(invalidateAuthorizedRootsCacheMock).toHaveBeenCalled()
+      expect(invalidateAuthorizedRootsCacheMock).toHaveBeenCalledWith(runtimeStore, TEST_REPO_ID)
       expect(notifier.worktreesChanged).toHaveBeenCalledWith(TEST_REPO_ID)
     } finally {
       await rm(parentDir, { recursive: true, force: true })
diff --git a/src/main/runtime/orca-runtime-tests/worktree-removal-and-reconciliation.spec.ts b/src/main/runtime/orca-runtime-tests/worktree-removal-and-reconciliation.spec.ts
index d371ac3f96f0..89f516dfac2d 100644
--- a/src/main/runtime/orca-runtime-tests/worktree-removal-and-reconciliation.spec.ts
+++ b/src/main/runtime/orca-runtime-tests/worktree-removal-and-reconciliation.spec.ts
@@ -489,6 +489,7 @@ describe('OrcaRuntimeService', () => {
       })
     )
     expect(deleteWorktreeHistoryDirMock).toHaveBeenCalledWith(TEST_WORKTREE_ID)
+    expect(invalidateAuthorizedRootsCacheMock).toHaveBeenCalledWith(store, TEST_REPO_ID)
     expect(result.warning).toBe(
       `orca.yaml archive hook skipped for ${TEST_WORKTREE_PATH}; pass --run-hooks to run it.`
     )
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 8c3724365884..f40f25da7e48 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
@@ -411,6 +411,92 @@ describe('OrcaRuntimeService', () => {
     )
   })
 
+  it('puts the agent a create starts in the first default tab, as the window does', async () => {
+    const metaById: Record<string, WorktreeMeta> = {}
+    const runtimeStore = {
+      ...store,
+      getAllWorktreeMeta: () => metaById,
+      getWorktreeMeta: (worktreeId: string) => metaById[worktreeId],
+      setWorktreeMeta: (worktreeId: string, meta: Partial<WorktreeMeta>) => {
+        metaById[worktreeId] = { ...(metaById[worktreeId] ?? makeWorktreeMeta()), ...meta }
+        return metaById[worktreeId]
+      }
+    }
+    const runtime = new OrcaRuntimeService(runtimeStore as never)
+    const spawn = vi
+      .fn<(options: { command?: string }) => Promise<{ id: string }>>()
+      .mockResolvedValueOnce({ id: 'pty-default-agent' })
+      .mockResolvedValueOnce({ id: 'pty-default-test' })
+    const revealTerminalSession = vi
+      .fn<(worktreeId: string, request: { tabId?: string }) => Promise<{ tabId: string }>>()
+      .mockResolvedValueOnce({ tabId: 'tab-default-agent' })
+      .mockResolvedValueOnce({ tabId: 'tab-default-test' })
+    const renameTerminal = vi.fn()
+    runtime.setPtyController({
+      spawn,
+      write: () => true,
+      kill: () => true,
+      getForegroundProcess: async () => null
+    })
+    runtime.setNotifier({
+      worktreesChanged: vi.fn(),
+      reposChanged: vi.fn(),
+      activateWorktree: vi.fn(),
+      createTerminal: vi.fn(),
+      revealTerminalSession,
+      splitTerminal: vi.fn(),
+      renameTerminal,
+      focusTerminal: vi.fn(),
+      closeTerminal: vi.fn(),
+      sleepWorktree: vi.fn(),
+      terminalFitOverrideChanged: vi.fn(),
+      terminalDriverChanged: vi.fn()
+    })
+
+    computeWorktreePathMock.mockReturnValue('/tmp/workspaces/runtime-default-agent')
+    ensurePathWithinWorkspaceMock.mockReturnValue('/tmp/workspaces/runtime-default-agent')
+    vi.mocked(getDefaultTabsLaunch).mockReturnValue({
+      runCommands: true,
+      tabs: [
+        { title: 'Dev', command: 'pnpm dev' },
+        { title: 'Test', command: 'pnpm test' }
+      ]
+    })
+    vi.mocked(listWorktrees).mockResolvedValue([
+      {
+        path: '/tmp/workspaces/runtime-default-agent',
+        head: 'def',
+        branch: 'runtime-default-agent',
+        isBare: false,
+        isMainWorktree: false
+      }
+    ])
+
+    const result = await runtime.createManagedWorktree({
+      repoSelector: 'id:repo-1',
+      name: 'runtime-default-agent',
+      setupDecision: 'run',
+      createdWithAgent: 'claude',
+      startup: { command: 'claude' }
+    })
+
+    await vi.waitFor(() => expect(revealTerminalSession).toHaveBeenCalledTimes(2))
+    const agentTabId = revealTerminalSession.mock.calls[0]?.[1].tabId
+    expect(agentTabId).toEqual(expect.any(String))
+    expect(renameTerminal).toHaveBeenCalledWith(agentTabId, 'Dev', { recordInteraction: false })
+    // The first template's command never runs beside the agent; only the rest are created.
+    expect(spawn).toHaveBeenCalledTimes(2)
+    expect(spawn.mock.calls.map(([options]) => options.command)).toEqual([
+      expect.stringContaining('claude'),
+      'pnpm test'
+    ])
+    expect(revealTerminalSession).toHaveBeenNthCalledWith(
+      2,
+      result.worktree.id,
+      expect.objectContaining({ title: 'Test', activate: false })
+    )
+  })
+
   it('uses desktop task agent selection and bracketed-pastes startup drafts for local worktrees', async () => {
     vi.useFakeTimers()
     onTestFinished(() => {
diff --git a/src/main/runtime/rpc/methods/accounts.test.ts b/src/main/runtime/rpc/methods/accounts.test.ts
index b8473d00e014..c10d70b7ad99 100644
--- a/src/main/runtime/rpc/methods/accounts.test.ts
+++ b/src/main/runtime/rpc/methods/accounts.test.ts
@@ -15,20 +15,6 @@ function method(name: string) {
 
 describe('account RPC methods', () => {
   it.each([
-    {
-      methodName: 'accounts.addClaudeFromConfigDir',
-      params: {
-        configDir: join(tmpdir(), 'claude-login'),
-        previousLegacyCredentialsSha256: 'a'.repeat(64)
-      },
-      runtimeMethod: 'addClaudeAccountFromConfigDir',
-      expectedSource: join(tmpdir(), 'claude-login'),
-      expectedOptions: {
-        runtime: undefined,
-        wslDistro: null,
-        previousLegacyCredentialsSha256: 'a'.repeat(64)
-      }
-    },
     {
       methodName: 'accounts.addCodexFromHome',
       params: { sourceHome: join(tmpdir(), 'codex-login') },
@@ -50,29 +36,37 @@ describe('account RPC methods', () => {
   })
 
   it.each([
-    ['accounts.addClaudeFromConfigDir', { configDir: join(tmpdir(), 'claude-login') }],
-    ['accounts.addCodexFromHome', { sourceHome: join(tmpdir(), 'codex-login') }],
+    ['accounts.addCodexFromHome', { sourceHome: join(tmpdir(), 'codex-login') }, /only available/],
     [
       'accounts.addDataFromHome',
-      { provider: 'opencode', sourceDataHome: join(tmpdir(), 'login'), label: 'Work' }
-    ]
-  ])('rejects paired-device calls to %s', async (methodName, params) => {
+      { provider: 'opencode', sourceDataHome: join(tmpdir(), 'login'), label: 'Work' },
+      /only available/
+    ],
+    ['accounts.beginClaudeSignIn', {}, /Sign in on the Orca execution host/],
+    ['accounts.finishClaudeSignIn', { accountId: 'a' }, /Sign in on the Orca execution host/]
+  ] as const)('rejects paired-device calls to %s', async (methodName, params, refusal) => {
     const runtime = {
-      addClaudeAccountFromConfigDir: vi.fn(),
-      addCodexAccountFromHome: vi.fn()
-    } as unknown as OrcaRuntimeService
+      addCodexAccountFromHome: vi.fn(),
+      addDataAccountFromHome: vi.fn(),
+      beginClaudeSignIn: vi.fn(),
+      finishClaudeSignIn: vi.fn()
+    }
+    // oxlint-disable-next-line typescript/consistent-type-assertions -- SAFETY: refused calls never reach the runtime; only these stubs are asserted.
+    const runtimeService = runtime as unknown as OrcaRuntimeService
     const addMethod = method(methodName)
     if (isStreamingMethod(addMethod)) {
       throw new Error(`${methodName} must be a request method`)
     }
 
     for (const clientKind of ['mobile', 'runtime'] as const) {
-      await expect(addMethod.handler(params, { runtime, clientKind })).rejects.toThrow(
-        /only available on the Orca host runtime/
-      )
+      await expect(
+        addMethod.handler(params, { runtime: runtimeService, clientKind })
+      ).rejects.toThrow(refusal)
     }
-    expect(runtime.addClaudeAccountFromConfigDir).not.toHaveBeenCalled()
     expect(runtime.addCodexAccountFromHome).not.toHaveBeenCalled()
+    expect(runtime.addDataAccountFromHome).not.toHaveBeenCalled()
+    expect(runtime.beginClaudeSignIn).not.toHaveBeenCalled()
+    expect(runtime.finishClaudeSignIn).not.toHaveBeenCalled()
   })
 
   it('keeps explicit account-list refreshes on the forced refresh lane', async () => {
@@ -227,3 +221,14 @@ describe('account RPC methods', () => {
     await running
   })
 })
+
+it('rejects the retired Claude import even for a local socket, before touching its supplied path', async () => {
+  const old = method('accounts.addClaudeFromConfigDir')
+  if (isStreamingMethod(old)) {
+    throw new Error('Unexpected stream')
+  }
+  // oxlint-disable-next-line typescript/consistent-type-assertions -- SAFETY: Rejection happens before the handler accesses its context.
+  await expect(old.handler({ configDir: '/never-read' }, {} as never)).rejects.toThrow(
+    'Update the Orca CLI to add accounts'
+  )
+})
diff --git a/src/main/runtime/rpc/methods/accounts.ts b/src/main/runtime/rpc/methods/accounts.ts
index 9186e378da24..786bc73985df 100644
--- a/src/main/runtime/rpc/methods/accounts.ts
+++ b/src/main/runtime/rpc/methods/accounts.ts
@@ -4,6 +4,8 @@ import {
   SelectDataAccountParams,
   RemoveDataAccountParams,
   AccountsUnsubscribeParams,
+  BeginClaudeSignInParams,
+  FinishClaudeSignInParams,
   AddClaudeFromConfigDirParams,
   AddCodexFromHomeParams,
   ConsumeCodexResetCreditParams,
@@ -19,15 +21,39 @@ import {
 // registerSubscriptionCleanup's existing-key eviction path.
 let accountsSubscriptionSeq = 0
 
-// Why: bridges the desktop ClaudeAccountService / CodexAccountService /
-// RateLimitService into the WebSocket / local-socket RPC. Read + switch +
-// remove for all clients; interactive add/re-auth flows spawn `claude login`
-// / `codex login` PTYs that need a desktop browser, so they intentionally
-// remain desktop-only. `accounts.addClaudeFromConfigDir` is the exception: it
-// captures an already-authenticated CLAUDE_CONFIG_DIR (no PTY) so the local
-// `orca account add` CLI can register accounts on a headless host; it is gated
-// to the local runtime connection, never a mobile device token. See #1438.
 export const ACCOUNT_METHODS = [
+  // Why local only: sign-in runs `claude auth login` in a terminal on the execution host.
+  defineMethod({
+    name: 'accounts.beginClaudeSignIn',
+    params: BeginClaudeSignInParams,
+    handler: async (params, { runtime, clientKind }) => {
+      if (clientKind !== undefined) {
+        throw new Error('Sign in on the Orca execution host.')
+      }
+      return runtime.beginClaudeSignIn(params)
+    }
+  }),
+  defineMethod({
+    name: 'accounts.finishClaudeSignIn',
+    params: FinishClaudeSignInParams,
+    handler: async (params, { runtime, clientKind }) => {
+      if (clientKind !== undefined) {
+        throw new Error('Sign in on the Orca execution host.')
+      }
+      return runtime.finishClaudeSignIn(params)
+    }
+  }),
+  defineMethod({
+    name: 'accounts.cancelClaudeSignIn',
+    params: FinishClaudeSignInParams,
+    handler: async (params, { runtime, clientKind }) => {
+      if (clientKind !== undefined) {
+        throw new Error('Sign in on the Orca execution host.')
+      }
+      await runtime.cancelClaudeSignIn(params)
+      return {}
+    }
+  }),
   defineMethod({
     name: 'accounts.listData',
     params: null,
@@ -106,17 +132,10 @@ export const ACCOUNT_METHODS = [
   defineMethod({
     name: 'accounts.addClaudeFromConfigDir',
     params: AddClaudeFromConfigDirParams,
-    handler: async (params, { runtime, clientKind }) => {
-      // Why: capturing a host filesystem path is local-socket-only; paired
-      // mobile and remote-runtime tokens must never read host credential paths.
-      if (clientKind !== undefined) {
-        throw new Error('Adding Claude accounts is only available on the Orca host runtime.')
-      }
-      return runtime.addClaudeAccountFromConfigDir(params.configDir, {
-        runtime: params.runtime,
-        wslDistro: params.wslDistro ?? null,
-        previousLegacyCredentialsSha256: params.previousLegacyCredentialsSha256
-      })
+    handler: async () => {
+      throw new Error(
+        'Update the Orca CLI to add accounts. Importing Claude logins is no longer supported.'
+      )
     }
   }),
   defineMethod({
diff --git a/src/main/runtime/rpc/methods/agent-launch-structured-prompt.test.ts b/src/main/runtime/rpc/methods/agent-launch-structured-prompt.test.ts
index 8b0a81df6102..9b7c121a6373 100644
--- a/src/main/runtime/rpc/methods/agent-launch-structured-prompt.test.ts
+++ b/src/main/runtime/rpc/methods/agent-launch-structured-prompt.test.ts
@@ -9,7 +9,7 @@
 import { describe, expect, it, vi } from 'vitest'
 import { commitStructuredAgentSessionLaunchPrompt } from './agent-launch-structured-prompt'
 import { structuredAgentSessionPayloadFingerprint } from '../../../../shared/structured-agent-session-mutation'
-import { structuredAgentSessionSendBody } from '../../../../shared/structured-agent-session-outbox'
+import { structuredAgentSessionSendBody } from '../../../../shared/structured-agent-session-send-mutation'
 import type { StructuredAgentSessionHost } from '../../../native-chat/agent-session-wire/structured-agent-session-host'
 import { recordingStructuredAgentSessionLogger } from '../../../native-chat/agent-session-wire/structured-agent-session-logger-test-support'
 
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 05f1f8a7b3a2..d66326ef2115 100644
--- a/src/main/runtime/rpc/methods/agent-launch-structured-prompt.ts
+++ b/src/main/runtime/rpc/methods/agent-launch-structured-prompt.ts
@@ -8,18 +8,18 @@
  *
  * Nothing here queues. The durable record that the text is owed already exists and is the journal's
  * own submission row: `performSend` appends it before dispatching and the attach path settles it, so
- * a second host-side copy could only disagree with it. What IS reused is the outbox's entry and
+ * a second host-side copy could only disagree with it. What IS reused is the clients' body and
  * envelope builders, so this send is shaped exactly like the renderer's and mobile's — same body,
  * same operation id as client message id, same payload fingerprint.
  *
  * The renderer still delivers its own launch prompts, because its launcher does not call
- * `agent.launch` yet; when it does, its launch-sourced outbox entries become this call.
+ * `agent.launch` yet; when it does, its staged launch prompts become this call.
  */
 
 import {
-  createStructuredAgentSessionOutboxEntry,
-  structuredAgentSessionSendMutation
-} from '../../../../shared/structured-agent-session-outbox'
+  structuredAgentSessionMessageSendMutation,
+  structuredAgentSessionSendBody
+} from '../../../../shared/structured-agent-session-send-mutation'
 import { createStructuredAgentSessionOperationId } from '../../../../shared/structured-agent-session-mutation'
 import { randomUUID } from 'node:crypto'
 import type { StructuredAgentSessionHost } from '../../../native-chat/agent-session-wire/structured-agent-session-host'
@@ -46,16 +46,14 @@ export async function commitStructuredAgentSessionLaunchPrompt(args: {
     return null
   }
   const clientMessageId = createStructuredAgentSessionOperationId(randomUUID)
-  const entry = createStructuredAgentSessionOutboxEntry({
-    clientMessageId,
-    sessionId: args.sessionId,
-    text: args.text,
-    attachments: [],
-    queuedAt: Date.now()
-  })
   try {
     const result = await args.host.send(args.caller, {
-      ...structuredAgentSessionSendMutation(entry, args.fence),
+      ...structuredAgentSessionMessageSendMutation({
+        sessionId: args.sessionId,
+        clientOperationId: clientMessageId,
+        expectedRuntimeFence: args.fence,
+        body: structuredAgentSessionSendBody(args.text, [])
+      }),
       // A person's first prompt, sent for them: kept as a card if a restart or a close comes first.
       personsMessage: true
     })
diff --git a/src/main/runtime/rpc/methods/index.ts b/src/main/runtime/rpc/methods/index.ts
index caed71853054..7658c5e66b6e 100644
--- a/src/main/runtime/rpc/methods/index.ts
+++ b/src/main/runtime/rpc/methods/index.ts
@@ -49,6 +49,8 @@ import { PAIRING_METHODS } from './pairing'
 import { UPDATER_METHODS } from './updater'
 import { AGENT_SESSION_METHODS } from './agent-session'
 import { STRUCTURED_AGENT_SESSION_METHODS } from './structured-agent-session'
+import { STRUCTURED_AGENT_SESSION_ATTACHMENT_METHODS } from './structured-agent-session-attachments'
+import { STRUCTURED_AGENT_SESSION_VISUAL_METHODS } from './structured-agent-session-visual'
 import { STRUCTURED_AGENT_SESSION_AGENTS_METHODS } from './structured-agent-session-agents'
 import { ARTIFACT_METHODS } from './artifacts'
 import { PET_SPEAK_METHODS } from './pet-speak'
@@ -70,6 +72,8 @@ export const ALL_RPC_METHODS = [
   ...WORKTREE_METHODS,
   ...AGENT_SESSION_METHODS,
   ...STRUCTURED_AGENT_SESSION_METHODS,
+  ...STRUCTURED_AGENT_SESSION_ATTACHMENT_METHODS,
+  ...STRUCTURED_AGENT_SESSION_VISUAL_METHODS,
   ...STRUCTURED_AGENT_SESSION_AGENTS_METHODS,
   ...AGENT_LAUNCH_METHODS,
   ...TERMINAL_METHODS,
diff --git a/src/main/runtime/rpc/methods/native-chat-opencode-semantic-pages.test.ts b/src/main/runtime/rpc/methods/native-chat-opencode-semantic-pages.test.ts
index 358b723e1ac3..09c40be523a1 100644
--- a/src/main/runtime/rpc/methods/native-chat-opencode-semantic-pages.test.ts
+++ b/src/main/runtime/rpc/methods/native-chat-opencode-semantic-pages.test.ts
@@ -70,8 +70,12 @@ function fixture() {
 }
 
 function context(): RpcContext {
-  const runtime = { registerSubscriptionCleanup: vi.fn(), cleanupSubscription: vi.fn() }
-  // oxlint-disable-next-line typescript/consistent-type-assertions -- SAFETY: These handlers only register or invoke subscription cleanup on the runtime.
+  const runtime = {
+    getAgentProviderSessionRows: () => [],
+    registerSubscriptionCleanup: vi.fn(),
+    cleanupSubscription: vi.fn()
+  }
+  // oxlint-disable-next-line typescript/consistent-type-assertions -- SAFETY: These handlers only read hook rows and register or invoke subscription cleanup on the runtime.
   return { runtime: runtime as unknown as RpcContext['runtime'], clientKind: 'mobile' }
 }
 
diff --git a/src/main/runtime/rpc/methods/native-chat-opencode-wire-page-budget.test.ts b/src/main/runtime/rpc/methods/native-chat-opencode-wire-page-budget.test.ts
index ec9d872d5d34..d68f2ef76a81 100644
--- a/src/main/runtime/rpc/methods/native-chat-opencode-wire-page-budget.test.ts
+++ b/src/main/runtime/rpc/methods/native-chat-opencode-wire-page-budget.test.ts
@@ -109,8 +109,12 @@ function denseFixture(version: 'v1' | 'v2'): string {
 }
 
 function context(clientKind: RpcContext['clientKind'] = 'mobile'): RpcContext {
-  const runtime = { registerSubscriptionCleanup: vi.fn(), cleanupSubscription: vi.fn() }
-  // oxlint-disable-next-line typescript/consistent-type-assertions -- SAFETY: Native-chat only uses these subscription cleanup methods; its feature emitter records no interaction.
+  const runtime = {
+    getAgentProviderSessionRows: () => [],
+    registerSubscriptionCleanup: vi.fn(),
+    cleanupSubscription: vi.fn()
+  }
+  // oxlint-disable-next-line typescript/consistent-type-assertions -- SAFETY: Native-chat only uses the hook rows and these subscription cleanup methods; its feature emitter records no interaction.
   return { runtime: runtime as unknown as RpcContext['runtime'], clientKind }
 }
 
diff --git a/src/main/runtime/rpc/methods/native-chat-ssh-transcript.test.ts b/src/main/runtime/rpc/methods/native-chat-ssh-transcript.test.ts
new file mode 100644
index 000000000000..af41d481692f
--- /dev/null
+++ b/src/main/runtime/rpc/methods/native-chat-ssh-transcript.test.ts
@@ -0,0 +1,218 @@
+import { mkdtempSync, mkdirSync, 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 type { AgentStatusIpcPayload } from '../../../../shared/agent-status-types'
+import type { NativeChatMessage } from '../../../../shared/native-chat-types'
+import type { IFilesystemProvider } from '../../../providers/types'
+import {
+  registerSshFilesystemProvider,
+  unregisterSshFilesystemProvider
+} from '../../../providers/ssh-filesystem-dispatch'
+import { eraseRpcMethods, type RpcContext } from '../core'
+import { NATIVE_CHAT_METHODS } from './native-chat'
+
+const CONNECTION_ID = 'ssh-target-26057'
+const SESSION_ID = 'claude-session-26057'
+
+let hookRows: Partial<AgentStatusIpcPayload>[] = []
+
+function claudeLines(...texts: string[]): string {
+  return texts
+    .map((text, index) =>
+      JSON.stringify({
+        sessionId: SESSION_ID,
+        uuid: `${SESSION_ID}-${index}`,
+        timestamp: '2026-10-07T03:00:00.000Z',
+        type: 'assistant',
+        message: { role: 'assistant', content: [{ type: 'text', text }] }
+      })
+    )
+    .map((line) => `${line}\n`)
+    .join('')
+}
+
+/** An SSH host's filesystem as the relay serves it: stat plus positional reads. */
+function sshHost(files: Map<string, string>): IFilesystemProvider {
+  const bytes = (path: string): Buffer => {
+    const body = files.get(path)
+    if (body === undefined) {
+      // As the relay delivers it: the multiplexer swaps Node's 'ENOENT' code for its transport code.
+      const error = new Error(`ENOENT: no such file or directory, lstat '${path}'`)
+      Object.defineProperty(error, 'code', { value: -32000 })
+      throw error
+    }
+    return Buffer.from(body)
+  }
+  const provider: Pick<IFilesystemProvider, 'stat' | 'readFileRange'> = {
+    stat: async (path) => ({
+      size: bytes(path).length,
+      type: 'file',
+      mtime: 0,
+      mtimeMs: bytes(path).length,
+      dev: 1,
+      ino: 1
+    }),
+    readFileRange: async (path, position, length) => {
+      const slice = bytes(path).subarray(position, position + length)
+      return { bytes: slice, bytesRead: slice.length }
+    }
+  }
+  // oxlint-disable-next-line typescript/consistent-type-assertions -- SAFETY: transcript reads use only stat and readFileRange.
+  return provider as IFilesystemProvider
+}
+
+function sshHookRow(transcriptPath: string): Partial<AgentStatusIpcPayload> {
+  return {
+    paneKey: 'tab-1:leaf-1',
+    connectionId: CONNECTION_ID,
+    agentType: 'claude',
+    providerSession: { key: 'session_id', id: SESSION_ID, transcriptPath }
+  }
+}
+
+const METHODS = eraseRpcMethods(NATIVE_CHAT_METHODS)
+
+type SubscriptionRuntime = Pick<
+  RpcContext['runtime'],
+  'registerSubscriptionCleanup' | 'cleanupSubscription'
+>
+
+function phoneContext(runtime: Partial<SubscriptionRuntime>): RpcContext {
+  const members = { ...runtime, getAgentProviderSessionRows: () => hookRows }
+  // oxlint-disable-next-line typescript/consistent-type-assertions -- SAFETY: native chat handlers use only the hook rows and the subscription-cleanup members.
+  const handlerRuntime = members as unknown as RpcContext['runtime']
+  return { runtime: handlerRuntime, connectionId: 'phone-1', clientKind: 'mobile' }
+}
+
+function method(name: string): (typeof METHODS)[number] {
+  const found = METHODS.find((candidate) => candidate.name === name)
+  if (!found) {
+    throw new Error(`${name} is not registered`)
+  }
+  return found
+}
+
+function texts(value: unknown): string[] {
+  if (!value || typeof value !== 'object' || !('messages' in value)) {
+    return []
+  }
+  const messages: readonly NativeChatMessage[] = Array.isArray(value.messages) ? value.messages : []
+  return messages.flatMap((message) =>
+    message.blocks.flatMap((block) => (block.type === 'text' ? [block.text] : []))
+  )
+}
+
+async function readSession(
+  transcriptPath: string
+): Promise<{ texts: string[]; error: unknown; notFound: unknown }> {
+  const read = method('nativeChat.readSession')
+  if ('stream' in read) {
+    throw new Error('nativeChat.readSession is a stream')
+  }
+  const page = await read.handler(
+    { agent: 'claude', sessionId: SESSION_ID, transcriptPath },
+    phoneContext({})
+  )
+  return {
+    texts: texts(page),
+    error: page && typeof page === 'object' && 'error' in page ? page.error : undefined,
+    notFound: page && typeof page === 'object' && 'notFound' in page ? page.notFound : undefined
+  }
+}
+
+describe('native chat for an agent whose transcript lives on an SSH host (#26057)', () => {
+  let localDir: string
+  // The path the remote hook reported. A same-named file exists on this machine too, so a read
+  // that answers locally shows the wrong conversation instead of failing quietly.
+  let transcriptPath: string
+
+  beforeEach(() => {
+    localDir = mkdtempSync(join(tmpdir(), 'orca-ssh-transcript-'))
+    transcriptPath = join(localDir, 'projects', 'p', `${SESSION_ID}.jsonl`)
+    mkdirSync(dirname(transcriptPath), { recursive: true })
+    writeFileSync(transcriptPath, claudeLines('LOCAL MACHINE FILE'))
+    hookRows = [sshHookRow(transcriptPath)]
+  })
+
+  afterEach(() => {
+    unregisterSshFilesystemProvider(CONNECTION_ID)
+    rmSync(localDir, { recursive: true, force: true })
+  })
+
+  it('reads the history from the SSH host the hook store attests the session to', async () => {
+    registerSshFilesystemProvider(
+      CONNECTION_ID,
+      sshHost(new Map([[transcriptPath, claudeLines('first remote turn', 'second remote turn')]]))
+    )
+
+    const page = await readSession(transcriptPath)
+
+    expect(page.error).toBeUndefined()
+    expect(page.texts).toEqual(['first remote turn', 'second remote turn'])
+  })
+
+  it('streams the SSH host history and its later turns to a subscribed phone', async () => {
+    const files = new Map([[transcriptPath, claudeLines('remote history')]])
+    registerSshFilesystemProvider(CONNECTION_ID, sshHost(files))
+    const frames: unknown[] = []
+    let cleanup = (): void => {}
+    const subscribe = method('nativeChat.subscribe')
+    if (!('stream' in subscribe)) {
+      throw new Error('nativeChat.subscribe is not a stream')
+    }
+
+    await subscribe.handler(
+      { agent: 'claude', sessionId: SESSION_ID, transcriptPath, subscriptionId: 'sub-1' },
+      phoneContext({
+        registerSubscriptionCleanup: (_id, fn) => {
+          cleanup = fn
+        },
+        cleanupSubscription: () => cleanup()
+      }),
+      (frame) => frames.push(frame)
+    )
+    try {
+      await vi.waitFor(() => expect(texts(frames[0])).toEqual(['remote history']))
+      files.set(transcriptPath, claudeLines('remote history', 'remote follow-up'))
+      await vi.waitFor(
+        () =>
+          expect(
+            frames
+              .filter(
+                (frame) =>
+                  frame && typeof frame === 'object' && 'type' in frame && frame.type === 'appended'
+              )
+              .flatMap((frame) => texts(frame))
+          ).toEqual(['remote follow-up']),
+        { timeout: 5_000 }
+      )
+    } finally {
+      cleanup()
+    }
+  })
+
+  it('reads a transcript the SSH host has not written yet as not found, so the chat keeps waiting', async () => {
+    registerSshFilesystemProvider(CONNECTION_ID, sshHost(new Map()))
+
+    const page = await readSession(transcriptPath)
+
+    expect(page.texts).toEqual([])
+    expect(page.notFound).toBe(true)
+  })
+
+  it('never answers from this machine while the SSH host is disconnected', async () => {
+    const page = await readSession(transcriptPath)
+
+    expect(page.texts).toEqual([])
+    expect(page.error).toBeDefined()
+  })
+
+  it('keeps reading a local session from this machine', async () => {
+    hookRows = [{ ...sshHookRow(transcriptPath), connectionId: null }]
+
+    const page = await readSession(transcriptPath)
+
+    expect(page.texts).toEqual(['LOCAL MACHINE FILE'])
+  })
+})
diff --git a/src/main/runtime/rpc/methods/native-chat-subscription-token.test.ts b/src/main/runtime/rpc/methods/native-chat-subscription-token.test.ts
index e6b3aae471ed..b232bd692616 100644
--- a/src/main/runtime/rpc/methods/native-chat-subscription-token.test.ts
+++ b/src/main/runtime/rpc/methods/native-chat-subscription-token.test.ts
@@ -31,8 +31,9 @@ function phoneConnection(): {
 } {
   const registry = new RuntimeSubscriptionRegistry()
   const context: RpcContext = {
-    // oxlint-disable-next-line typescript/consistent-type-assertions -- SAFETY: the handlers under test only touch these three registry-backed members.
+    // oxlint-disable-next-line typescript/consistent-type-assertions -- SAFETY: the handlers under test only touch these registry-backed members and the hook rows.
     runtime: {
+      getAgentProviderSessionRows: () => [],
       registerSubscriptionCleanup: registry.register.bind(registry),
       cleanupSubscription: registry.cleanup.bind(registry),
       cleanupSubscriptionsByPrefix: registry.cleanupByPrefix.bind(registry)
diff --git a/src/main/runtime/rpc/methods/native-chat.test.ts b/src/main/runtime/rpc/methods/native-chat.test.ts
index 47a6d9e855e9..68f6f821dd40 100644
--- a/src/main/runtime/rpc/methods/native-chat.test.ts
+++ b/src/main/runtime/rpc/methods/native-chat.test.ts
@@ -133,19 +133,22 @@ function subscribeHandler(): (
 }
 
 function streamingContext(clientKind: RpcContext['clientKind']): RpcContext {
-  return {
-    runtime: {
-      registerSubscriptionCleanup: vi.fn(),
-      cleanupSubscription: vi.fn(),
-      cleanupSubscriptionsByPrefix: vi.fn()
-    } as unknown as RpcContext['runtime'],
-    connectionId: 'connection-1',
-    clientKind
+  const runtime = {
+    getAgentProviderSessionRows: () => [],
+    registerSubscriptionCleanup: vi.fn(),
+    cleanupSubscription: vi.fn(),
+    cleanupSubscriptionsByPrefix: vi.fn()
   }
+  // oxlint-disable-next-line typescript/consistent-type-assertions -- SAFETY: native chat handlers use only the hook rows and these subscription members.
+  const handlerRuntime = runtime as unknown as RpcContext['runtime']
+  return { runtime: handlerRuntime, connectionId: 'connection-1', clientKind }
 }
 
 function ctxWith(clientKind: RpcContext['clientKind']): RpcContext {
-  return { runtime: {} as RpcContext['runtime'], clientKind }
+  const runtime = { getAgentProviderSessionRows: () => [] }
+  // oxlint-disable-next-line typescript/consistent-type-assertions -- SAFETY: readSession uses only the hook rows.
+  const handlerRuntime = runtime as unknown as RpcContext['runtime']
+  return { runtime: handlerRuntime, clientKind }
 }
 
 function firstOutput(result: unknown): string {
diff --git a/src/main/runtime/rpc/methods/native-chat.ts b/src/main/runtime/rpc/methods/native-chat.ts
index 99c0178ea0cf..296d55e3b6ee 100644
--- a/src/main/runtime/rpc/methods/native-chat.ts
+++ b/src/main/runtime/rpc/methods/native-chat.ts
@@ -6,6 +6,7 @@ import {
   type NativeChatTranscriptSubscription,
   type SubscribeNativeChatTranscriptArgs
 } from '../../../native-chat/transcript-watch'
+import { nativeChatTranscriptPathOnExecutionHost } from '../../../native-chat/ssh-transcript-path'
 import { defineMethod, defineStreamingMethod, type RpcContext } from '../core'
 import { sanitizeNativeChatRpcBlock } from './native-chat-rpc-block-sanitize'
 import {
@@ -77,13 +78,17 @@ export const NATIVE_CHAT_METHODS = [
   defineMethod({
     name: 'nativeChat.readSession',
     params: NativeChatSession,
-    handler: async (params, { clientKind, signal }) => {
+    handler: async (params, { runtime, clientKind, signal }) => {
       const limit = params.limit ?? MOBILE_NATIVE_CHAT_DEFAULT_WINDOW
       const result = await readNativeChatTranscriptTail(
         {
           agent: params.agent,
           sessionId: params.sessionId,
-          transcriptPath: params.transcriptPath,
+          transcriptPath: nativeChatTranscriptPathOnExecutionHost(
+            runtime.getAgentProviderSessionRows(),
+            params.sessionId,
+            params.transcriptPath
+          ),
           limit,
           beforeOffset: params.beforeOffset
         },
@@ -149,7 +154,11 @@ export const NATIVE_CHAT_METHODS = [
       const subscribeArgs: SubscribeNativeChatTranscriptArgs = {
         agent: params.agent,
         sessionId: params.sessionId,
-        transcriptPath: params.transcriptPath,
+        transcriptPath: nativeChatTranscriptPathOnExecutionHost(
+          runtime.getAgentProviderSessionRows(),
+          params.sessionId,
+          params.transcriptPath
+        ),
         initialLimit: limit,
         onInitialSnapshot: (messages, hasMore, beforeOffset, error, lifecycle) => {
           if (closed) {
diff --git a/src/main/runtime/rpc/methods/session-tab-registered-agent-projection.test.ts b/src/main/runtime/rpc/methods/session-tab-registered-agent-projection.test.ts
index bc446197ca0f..e607e46aa86f 100644
--- a/src/main/runtime/rpc/methods/session-tab-registered-agent-projection.test.ts
+++ b/src/main/runtime/rpc/methods/session-tab-registered-agent-projection.test.ts
@@ -1,6 +1,7 @@
 import { describe, expect, it } from 'vitest'
 import {
   CLAUDE_STRUCTURED_AGENT_SESSION_RUNTIME_CAPABILITY,
+  PI_STRUCTURED_DIALOGS_RUNTIME_CAPABILITY,
   STRUCTURED_AGENT_SESSION_REGISTERED_AGENTS_RUNTIME_CAPABILITY,
   STRUCTURED_AGENT_SESSION_RUNTIME_CAPABILITY
 } from '../../../../shared/protocol-version'
@@ -70,6 +71,24 @@ describe('a tab of an agent beyond Claude and Codex', () => {
     expect(projectSessionTabAgentStatus(payload, 'runtime', REGISTERED_AGENTS_CLIENT)).toBe(payload)
   })
 
+  it('holds a Pi tab for clients that understand registered agents but cannot show Pi dialogs', () => {
+    const payload = {
+      ...snapshot(),
+      tabs: [...snapshot().tabs, chatTab('pi', false)]
+    }
+    const old = projectSessionTabAgentStatus(payload, 'runtime', REGISTERED_AGENTS_CLIENT)
+    expect(old.tabs.map((tab) => tab.id)).not.toContain('agent-session:pi-session')
+    expect(
+      projectSessionTabAgentStatus(payload, 'runtime', [
+        ...REGISTERED_AGENTS_CLIENT,
+        PI_STRUCTURED_DIALOGS_RUNTIME_CAPABILITY
+      ])
+    ).toBe(payload)
+    expect(
+      projectSessionTabAgentStatus(payload, 'mobile', REGISTERED_AGENTS_CLIENT).tabs.at(-1)
+    ).toMatchObject({ title: STRUCTURED_CHAT_UPDATE_REQUIRED_TAB_TITLE })
+  })
+
   it('stays listed on a phone under the title that names the fix', () => {
     const projected = projectSessionTabAgentStatus(snapshot(), 'mobile', TODAYS_CLIENT)
     expect(projected.tabs.map((tab) => tab.title)).toEqual([
diff --git a/src/main/runtime/rpc/methods/structured-agent-session-agents.test.ts b/src/main/runtime/rpc/methods/structured-agent-session-agents.test.ts
new file mode 100644
index 000000000000..20db04b9aeed
--- /dev/null
+++ b/src/main/runtime/rpc/methods/structured-agent-session-agents.test.ts
@@ -0,0 +1,45 @@
+import { describe, expect, it, vi } from 'vitest'
+import { STRUCTURED_AGENT_SESSION_RUNTIME_CAPABILITY } from '../../../../shared/protocol-version'
+import { STRUCTURED_AGENT_RUNTIME_REGISTRATIONS } from '../../structured-agent-runtime-registrations'
+import type { RpcContext } from '../core'
+import { STRUCTURED_AGENT_SESSION_AGENTS_METHODS } from './structured-agent-session-agents'
+
+const [method] = STRUCTURED_AGENT_SESSION_AGENTS_METHODS
+
+const ensureStructuredAgentSessionHost = vi.fn(async () => {
+  throw new Error('the journal would not open')
+})
+
+function context(overrides: Partial<RpcContext>): RpcContext {
+  // oxlint-disable-next-line typescript/consistent-type-assertions -- SAFETY: the handler reads only the caller's capabilities; the runtime stub proves it never installs the host.
+  return { runtime: { ensureStructuredAgentSessionHost }, ...overrides } as unknown as RpcContext
+}
+
+describe('agentSession.agents', () => {
+  it("lists this build's registered agents without installing the host", async () => {
+    const ctx = context({})
+
+    const result = await method.handler({}, ctx)
+
+    expect(result.agents.map(({ agent }) => agent)).toEqual(
+      STRUCTURED_AGENT_RUNTIME_REGISTRATIONS.map(({ definition }) => definition.agent)
+    )
+    expect(result.agents.map(({ agent }) => agent)).toContain('opencode')
+    expect(ensureStructuredAgentSessionHost).not.toHaveBeenCalled()
+  })
+
+  it('still refuses a remote client that cannot read structured sessions', async () => {
+    await expect(
+      method.handler({}, context({ clientKind: 'mobile', clientCapabilities: [] }))
+    ).rejects.toMatchObject({ refusal: { code: 'structured_agent_session_unsupported' } })
+    await expect(
+      method.handler(
+        {},
+        context({
+          clientKind: 'mobile',
+          clientCapabilities: [STRUCTURED_AGENT_SESSION_RUNTIME_CAPABILITY]
+        })
+      )
+    ).resolves.toMatchObject({ agents: expect.any(Array) })
+  })
+})
diff --git a/src/main/runtime/rpc/methods/structured-agent-session-agents.ts b/src/main/runtime/rpc/methods/structured-agent-session-agents.ts
index 6d03767d79f0..8faf017f493d 100644
--- a/src/main/runtime/rpc/methods/structured-agent-session-agents.ts
+++ b/src/main/runtime/rpc/methods/structured-agent-session-agents.ts
@@ -6,18 +6,28 @@
 
 import type { AgentSessionAgentsResult } from '../../../../shared/agent-session-registered-agents'
 import { AGENT_SESSION_AGENTS_METHOD } from '../../../../shared/agent-session-registered-agents'
+import { STRUCTURED_AGENT_RUNTIME_REGISTRATIONS } from '../../structured-agent-runtime-registrations'
 import { defineMethod } from '../core'
-import { requireInstalledStructuredHost } from './structured-agent-session-gate'
+import { requireStructuredCapability } from './structured-agent-session-gate'
 import { AgentsParams } from './structured-agent-session-schemas'
+import { clientReadsStructuredSessionAgent } from './structured-agent-session-policy'
 
 export const STRUCTURED_AGENT_SESSION_AGENTS_METHODS = [
   defineMethod({
     name: AGENT_SESSION_AGENTS_METHOD,
     params: AgentsParams,
-    handler: async (_params, ctx): Promise<AgentSessionAgentsResult> => ({
-      agents: (await requireInstalledStructuredHost(ctx))
-        .agentDefinitions()
-        .map(({ agent, capabilities }) => ({ agent, capabilities: { ...capabilities } }))
-    })
+    // Read from the registrations the host is built from, as createSupport is: the answer is
+    // fixed for this build, so it never waits on, or fails with, installing the host.
+    handler: async (_params, ctx): Promise<AgentSessionAgentsResult> => {
+      requireStructuredCapability(ctx)
+      return {
+        agents: STRUCTURED_AGENT_RUNTIME_REGISTRATIONS.filter(({ definition }) =>
+          clientReadsStructuredSessionAgent(ctx, definition.agent)
+        ).map(({ definition }) => ({
+          agent: definition.agent,
+          capabilities: { ...definition.capabilities }
+        }))
+      }
+    }
   })
 ]
diff --git a/src/main/runtime/rpc/methods/structured-agent-session-attachments.test.ts b/src/main/runtime/rpc/methods/structured-agent-session-attachments.test.ts
new file mode 100644
index 000000000000..e2b33bc9bb6a
--- /dev/null
+++ b/src/main/runtime/rpc/methods/structured-agent-session-attachments.test.ts
@@ -0,0 +1,216 @@
+import { mkdtemp, readFile, rm } from 'node:fs/promises'
+import { tmpdir } from 'node:os'
+import { join } from 'node:path'
+import { afterEach, beforeEach, describe, expect, it } from 'vitest'
+import type { OrcaRuntimeService } from '../../orca-runtime'
+import type { RpcResponse } from '../core'
+import { RpcDispatcher } from '../dispatcher'
+import {
+  AGENT_SESSION_ATTACHMENTS_RUNTIME_CAPABILITY,
+  RUNTIME_CAPABILITIES
+} from '../../../../shared/protocol-version'
+import { AgentSessionAttachmentStore } from '../../../native-chat/agent-session-attachments/agent-session-attachment-store'
+import { setAgentSessionAttachmentStore } from '../../../native-chat/agent-session-attachments/agent-session-attachment-store-registry'
+import { STRUCTURED_AGENT_SESSION_ATTACHMENT_METHODS } from './structured-agent-session-attachments'
+import { isMobileE2EETextPayloadWithinLimit } from '../mobile-e2ee-outbound-admission'
+import {
+  clearStructuredHostStub,
+  installStructuredHostStub,
+  STRUCTURED_CLIENT
+} from './structured-agent-session-rpc.test-fixture'
+
+let root: string
+let store: AgentSessionAttachmentStore
+
+beforeEach(async () => {
+  root = await mkdtemp(join(tmpdir(), 'orca-attachment-rpc-'))
+  store = new AgentSessionAttachmentStore(join(root, 'agent-session-attachments'), {
+    hasSession: (sessionId) => sessionId === 'session-alpha'
+  })
+  setAgentSessionAttachmentStore(store)
+  installStructuredHostStub()
+})
+
+afterEach(async () => {
+  store.clearInFlightForTests()
+  setAgentSessionAttachmentStore(null)
+  clearStructuredHostStub()
+  await rm(root, { recursive: true, force: true })
+})
+
+async function call(
+  method: string,
+  params: unknown,
+  client: { clientId?: string; clientKind?: 'runtime' | 'mobile'; clientCapabilities?: string[] }
+): Promise<RpcResponse> {
+  const dispatcher = new RpcDispatcher({
+    // oxlint-disable-next-line typescript/consistent-type-assertions -- SAFETY: the attachment methods read only the host-install hook and runtime id.
+    runtime: {
+      getRuntimeId: () => 'runtime-1',
+      ensureStructuredAgentSessionHost: async () => {}
+    } as unknown as OrcaRuntimeService,
+    methods: STRUCTURED_AGENT_SESSION_ATTACHMENT_METHODS
+  })
+  const replies: RpcResponse[] = []
+  await dispatcher.dispatchStreaming(
+    { id: 'request-1', authToken: 'token', method, params },
+    // oxlint-disable-next-line typescript/consistent-type-assertions -- SAFETY: the dispatcher writes serialized RpcResponse frames.
+    (raw) => replies.push(JSON.parse(raw) as RpcResponse),
+    client
+  )
+  if (!replies[0]) {
+    throw new Error(`no reply for ${method}`)
+  }
+  return replies[0]
+}
+
+function result<T>(response: RpcResponse): T {
+  if (!response.ok) {
+    throw new Error(`refused: ${JSON.stringify(response)}`)
+  }
+  // oxlint-disable-next-line typescript/consistent-type-assertions -- SAFETY: each caller names the result shape its method returns.
+  return response.result as T
+}
+
+const CLIENT_A = { ...STRUCTURED_CLIENT, clientId: 'client-a' }
+
+async function uploadBytes(name: string, bytes: Buffer): Promise<string> {
+  const { uploadId } = result<{ uploadId: string }>(
+    await call(
+      'agentSessionAttachment.uploadStart',
+      { sessionId: 'session-alpha', name, byteLength: bytes.byteLength },
+      CLIENT_A
+    )
+  )
+  const chunk = 384 * 1024
+  for (let offset = 0; offset < bytes.byteLength; offset += chunk) {
+    result(
+      await call(
+        'agentSessionAttachment.uploadAppend',
+        {
+          uploadId,
+          offset,
+          contentBase64: bytes.subarray(offset, offset + chunk).toString('base64')
+        },
+        CLIENT_A
+      )
+    )
+  }
+  return result<{ path: string }>(
+    await call('agentSessionAttachment.uploadCommit', { uploadId }, CLIENT_A)
+  ).path
+}
+
+describe('agentSessionAttachment.*', () => {
+  it('is advertised, so a client can tell a host with the store from an older one', () => {
+    expect(RUNTIME_CAPABILITIES).toContain(AGENT_SESSION_ATTACHMENTS_RUNTIME_CAPABILITY)
+  })
+
+  it('stores an upload for the chat and hands back the server path', async () => {
+    const { uploadId } = result<{ uploadId: string }>(
+      await call(
+        'agentSessionAttachment.uploadStart',
+        { sessionId: 'session-alpha', name: 'shot.png', byteLength: 3 },
+        CLIENT_A
+      )
+    )
+    result(
+      await call(
+        'agentSessionAttachment.uploadAppend',
+        { uploadId, offset: 0, contentBase64: Buffer.from('png').toString('base64') },
+        CLIENT_A
+      )
+    )
+    const stored = result<{ path: string; name: string }>(
+      await call('agentSessionAttachment.uploadCommit', { uploadId }, CLIENT_A)
+    )
+    expect(stored.name).toBe('shot.png')
+    expect(stored.path.startsWith(store.rootDir)).toBe(true)
+    expect(await readFile(stored.path, 'utf8')).toBe('png')
+
+    const preview = await call('agentSessionAttachment.read', { path: stored.path }, CLIENT_A)
+    expect(preview).toMatchObject({ ok: true, result: { isBinary: true, mimeType: 'image/png' } })
+  })
+
+  it('refuses a client that cannot read structured sessions', async () => {
+    const response = await call(
+      'agentSessionAttachment.uploadStart',
+      { sessionId: 'session-alpha', name: 'shot.png', byteLength: 3 },
+      { clientKind: 'runtime', clientCapabilities: [] }
+    )
+    expect(response).toMatchObject({
+      ok: false,
+      error: { message: expect.stringContaining('structured_agent_session_unsupported') }
+    })
+  })
+
+  it('refuses a declared size over the attachment limit before storing anything', async () => {
+    const response = await call(
+      'agentSessionAttachment.uploadStart',
+      { sessionId: 'session-alpha', name: 'big.bin', byteLength: 51 * 1024 * 1024 },
+      CLIENT_A
+    )
+    expect(response.ok).toBe(false)
+  })
+
+  it("keeps one client's upload out of another's reach", async () => {
+    const { uploadId } = result<{ uploadId: string }>(
+      await call(
+        'agentSessionAttachment.uploadStart',
+        { sessionId: 'session-alpha', name: 'a.txt', byteLength: 1 },
+        CLIENT_A
+      )
+    )
+    const response = await call(
+      'agentSessionAttachment.uploadCommit',
+      { uploadId },
+      {
+        ...STRUCTURED_CLIENT,
+        clientId: 'client-b'
+      }
+    )
+    expect(response).toMatchObject({ ok: false })
+    expect(store.isUploadInFlight(uploadId)).toBe(true)
+  })
+
+  it('refuses an upload for a chat this host does not hold', async () => {
+    const response = await call(
+      'agentSessionAttachment.uploadStart',
+      { sessionId: 'session-elsewhere', name: 'a.txt', byteLength: 1 },
+      CLIENT_A
+    )
+    expect(response).toMatchObject({
+      ok: false,
+      error: { message: expect.stringContaining('not on this host') }
+    })
+  })
+
+  it('answers a remote preview of an image over 3 MiB with a small refusal, not an oversized reply', async () => {
+    const path = await uploadBytes('big.png', Buffer.alloc(3.5 * 1024 * 1024, 7))
+    const replies: string[] = []
+    const dispatcher = new RpcDispatcher({
+      // oxlint-disable-next-line typescript/consistent-type-assertions -- SAFETY: the attachment methods read only the host-install hook and runtime id.
+      runtime: {
+        getRuntimeId: () => 'runtime-1',
+        ensureStructuredAgentSessionHost: async () => {}
+      } as unknown as OrcaRuntimeService,
+      methods: STRUCTURED_AGENT_SESSION_ATTACHMENT_METHODS
+    })
+    await dispatcher.dispatchStreaming(
+      {
+        id: 'request-big',
+        authToken: 'token',
+        method: 'agentSessionAttachment.read',
+        params: { path }
+      },
+      (raw) => replies.push(raw),
+      { ...CLIENT_A, clientKind: 'runtime' }
+    )
+    expect(replies).toHaveLength(1)
+    expect(isMobileE2EETextPayloadWithinLimit(replies[0] ?? '')).toBe(true)
+    expect(JSON.parse(replies[0] ?? '{}')).toMatchObject({
+      ok: false,
+      error: { message: expect.stringContaining('file_too_large') }
+    })
+  })
+})
diff --git a/src/main/runtime/rpc/methods/structured-agent-session-attachments.ts b/src/main/runtime/rpc/methods/structured-agent-session-attachments.ts
new file mode 100644
index 000000000000..2c45d75c662e
--- /dev/null
+++ b/src/main/runtime/rpc/methods/structured-agent-session-attachments.ts
@@ -0,0 +1,76 @@
+// `agentSessionAttachment.*` — files a client attaches to a structured chat, stored on this host.
+//
+// Behind the same gate as `agentSession.*`: only a client that reads structured sessions may write
+// into their store. A namespace of its own, because these reach the attachment store rather than
+// the session host. Clients call them only where the host advertises
+// `agent-session.attachments.v1`; an older host answers `method_not_found`.
+
+import { defineMethod, type RpcContext } from '../core'
+import {
+  requireInstalledStructuredHost,
+  structuredCallerFor
+} from './structured-agent-session-gate'
+import {
+  AttachmentReadParams,
+  AttachmentUploadAppendParams,
+  AttachmentUploadIdParams,
+  AttachmentUploadStartParams
+} from '../../../../shared/rpc-contract/agent-session-attachment-params'
+import { remoteFileContentBudget } from './files-remote-content-budget'
+import type { AgentSessionAttachmentStore } from '../../../native-chat/agent-session-attachments/agent-session-attachment-store'
+import { getAgentSessionAttachmentStore } from '../../../native-chat/agent-session-attachments/agent-session-attachment-store-registry'
+
+async function requireStore(
+  ctx: RpcContext
+): Promise<{ store: AgentSessionAttachmentStore; callerKey: string }> {
+  await requireInstalledStructuredHost(ctx)
+  const store = getAgentSessionAttachmentStore()
+  if (!store) {
+    throw new Error('Chat attachments are not available on this host')
+  }
+  return { store, callerKey: structuredCallerFor(ctx).callerKey }
+}
+
+export const STRUCTURED_AGENT_SESSION_ATTACHMENT_METHODS = [
+  defineMethod({
+    name: 'agentSessionAttachment.uploadStart',
+    params: AttachmentUploadStartParams,
+    handler: async (params, ctx) => {
+      const { store, callerKey } = await requireStore(ctx)
+      return store.startUpload({ callerKey, ...params })
+    }
+  }),
+  defineMethod({
+    name: 'agentSessionAttachment.uploadAppend',
+    params: AttachmentUploadAppendParams,
+    handler: async (params, ctx) => {
+      const { store, callerKey } = await requireStore(ctx)
+      return store.appendChunk({ callerKey, ...params })
+    }
+  }),
+  defineMethod({
+    name: 'agentSessionAttachment.uploadCommit',
+    params: AttachmentUploadIdParams,
+    handler: async (params, ctx) => {
+      const { store, callerKey } = await requireStore(ctx)
+      return store.commitUpload({ callerKey, uploadId: params.uploadId })
+    }
+  }),
+  defineMethod({
+    name: 'agentSessionAttachment.uploadAbort',
+    params: AttachmentUploadIdParams,
+    handler: async (params, ctx) => {
+      const { store, callerKey } = await requireStore(ctx)
+      return store.abortUpload({ callerKey, uploadId: params.uploadId })
+    }
+  }),
+  defineMethod({
+    name: 'agentSessionAttachment.read',
+    params: AttachmentReadParams,
+    handler: async (params, ctx) => {
+      const { store } = await requireStore(ctx)
+      // A remote reply must fit the connection's outbound budget, or the server closes the socket.
+      return store.readPreview(params.path, remoteFileContentBudget(ctx.clientKind, ctx.requestId))
+    }
+  })
+]
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 08ecc212ec1b..a68a41ec1db8 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
@@ -16,7 +16,9 @@ export const STRUCTURED_AGENT_SESSION_CONVERSATION_OUTLINE_METHODS = [
     params: OptionsParams,
     handler: async (params, ctx) =>
       readAgentSessionConversationOutline(
-        await (await requireInstalledStructuredHost(ctx)).journalSnapshot(params.sessionId)
+        await (
+          await requireInstalledStructuredHost(ctx, params.sessionId)
+        ).journalSnapshot(params.sessionId)
       )
   })
 ]
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 754412ffea9d..0b9b25c8005f 100644
--- a/src/main/runtime/rpc/methods/structured-agent-session-gate.ts
+++ b/src/main/runtime/rpc/methods/structured-agent-session-gate.ts
@@ -16,6 +16,7 @@ import type { RpcContext } from '../core'
 import { structuredAgentSessionHostRefusal } from '../../structured-agent-session-host-refusal'
 import {
   createSupportFollowsHostSetting,
+  clientReadsStructuredSessionAgent,
   isStructuredNativeChatEnabled,
   supportsStructuredAgentSessions
 } from './structured-agent-session-policy'
@@ -36,12 +37,21 @@ export function requireStructuredCapability(ctx: RpcContext): void {
   }
 }
 
+export function requireStructuredAgentAudience(ctx: RpcContext, agent: string): void {
+  requireStructuredCapability(ctx)
+  if (!clientReadsStructuredSessionAgent(ctx, agent)) {
+    throw agentSessionRefusalError('structured_agent_session_unsupported', {
+      reason: 'clientCapabilityMissing'
+    })
+  }
+}
+
 /**
  * `agentSession.createSupport` alone also reads the host setting, for a client that leaves the
  * launch mode to the host; it gets the refusal it got before, which it reads as "open a terminal".
  */
-export function requireStructuredCreateSupportAdmission(ctx: RpcContext): void {
-  requireStructuredCapability(ctx)
+export function requireStructuredCreateSupportAdmission(ctx: RpcContext, agent?: string): void {
+  requireStructuredAgentAudience(ctx, agent ?? '')
   if (createSupportFollowsHostSetting(ctx) && !isStructuredNativeChatEnabled(ctx.runtime)) {
     throw agentSessionRefusalError('structured_agent_session_unsupported', {
       reason: 'clientCapabilityMissing'
@@ -49,11 +59,20 @@ export function requireStructuredCreateSupportAdmission(ctx: RpcContext): void {
   }
 }
 
-export function requireStructuredHost(ctx: RpcContext): StructuredAgentSessionHost {
-  requireStructuredCapability(ctx)
+export function requireStructuredHost(ctx: RpcContext, agent?: string): StructuredAgentSessionHost {
+  requireStructuredAgentAudience(ctx, agent ?? '')
   return requireHostOrRefusal()
 }
 
+export function requireStructuredSessionHost(
+  ctx: RpcContext,
+  sessionId: string
+): StructuredAgentSessionHost {
+  const host = requireStructuredHost(ctx)
+  requireStructuredAgentAudience(ctx, host.sessionAgent(sessionId) ?? '')
+  return host
+}
+
 /**
  * The gate for methods that stop or retire work the caller already owns: close, cancel,
  * unsubscribe and release. It asks only what no caller can do without (the wire capability and a
@@ -84,7 +103,13 @@ function requireHostOrRefusal(): StructuredAgentSessionHost {
 /** 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> {
+export async function ensureStructuredHostInstalled(
+  ctx: RpcContext,
+  agent?: string
+): Promise<void> {
+  if (agent) {
+    requireStructuredAgentAudience(ctx, agent)
+  }
   // 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.
   if (!supportsStructuredSessions(ctx)) {
@@ -98,10 +123,11 @@ export async function ensureStructuredHostInstalled(ctx: RpcContext): Promise<vo
 
 /** The host for a read, built first when this process has none: the read RPCs share this one. */
 export async function requireInstalledStructuredHost(
-  ctx: RpcContext
+  ctx: RpcContext,
+  sessionId?: string
 ): Promise<StructuredAgentSessionHost> {
   await ensureStructuredHostInstalled(ctx)
-  return requireStructuredHost(ctx)
+  return sessionId ? requireStructuredSessionHost(ctx, sessionId) : requireStructuredHost(ctx)
 }
 
 /** Mirrors the existing agent-session host-authority derivation so one client
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 e1975f1c7255..ef6e89f8ee81 100644
--- a/src/main/runtime/rpc/methods/structured-agent-session-hold.ts
+++ b/src/main/runtime/rpc/methods/structured-agent-session-hold.ts
@@ -16,8 +16,8 @@ export const STRUCTURED_AGENT_SESSION_HOLD_METHODS = [
   defineMethod({
     name: 'agentSession.hold',
     params: HoldParams,
-    handler: async (_params, ctx) => {
-      await requireInstalledStructuredHost(ctx)
+    handler: async (params, ctx) => {
+      await requireInstalledStructuredHost(ctx, params.sessionId)
       return { held: 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 98d94439b1f8..97833114c2e0 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
@@ -11,17 +11,34 @@
 import { defineMethod } from '../core'
 import {
   requireInstalledStructuredHost,
+  requireStructuredAgentAudience,
   requireStructuredHost
 } from './structured-agent-session-gate'
-import { ModelCatalogParams, OptionsParams } from './structured-agent-session-schemas'
+import {
+  HandoffStatusParams,
+  ModelCatalogParams,
+  OptionsParams
+} from './structured-agent-session-schemas'
 import { agentSessionPinnedLaunchDirectory } from '../../agent-session-record-launch-directory'
 
 export const STRUCTURED_AGENT_SESSION_OPTIONS_READ_METHODS = [
+  defineMethod({
+    name: 'agentSession.handoffStatus',
+    params: HandoffStatusParams,
+    handler: async (params, ctx) =>
+      (await requireInstalledStructuredHost(ctx, params.sessionId)).handoffStatus(params.sessionId)
+  }),
+  defineMethod({
+    name: 'agentSession.commands',
+    params: OptionsParams,
+    handler: async (params, ctx) =>
+      (await requireInstalledStructuredHost(ctx, params.sessionId)).readCommands(params.sessionId)
+  }),
   defineMethod({
     name: 'agentSession.options',
     params: OptionsParams,
     handler: async (params, ctx) =>
-      (await requireInstalledStructuredHost(ctx)).readOptions(params.sessionId)
+      (await requireInstalledStructuredHost(ctx, params.sessionId)).readOptions(params.sessionId)
   }),
   defineMethod({
     name: 'agentSession.modelCatalog',
@@ -29,10 +46,11 @@ export const STRUCTURED_AGENT_SESSION_OPTIONS_READ_METHODS = [
     // A structured chat's read names its session and builds the host, since it may come first;
     // terminal-backed chat's session-less read must not open the journal where none runs.
     handler: async ({ worktree, ...params }, ctx) => {
+      requireStructuredAgentAudience(ctx, params.agent)
       const host =
         params.sessionId === undefined
           ? requireStructuredHost(ctx)
-          : await requireInstalledStructuredHost(ctx)
+          : await requireInstalledStructuredHost(ctx, params.sessionId)
       const catalog = host.deps.modelCatalog
       if (!catalog) {
         return { origin: 'unknown' as const }
diff --git a/src/main/runtime/rpc/methods/structured-agent-session-pi-dialog-capability.test.ts b/src/main/runtime/rpc/methods/structured-agent-session-pi-dialog-capability.test.ts
new file mode 100644
index 000000000000..9b290a449b20
--- /dev/null
+++ b/src/main/runtime/rpc/methods/structured-agent-session-pi-dialog-capability.test.ts
@@ -0,0 +1,386 @@
+import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest'
+import {
+  AGENT_SESSION_PENDING_SEND_RESULT_RUNTIME_CAPABILITY,
+  AGENT_SESSION_TURN_ITEM_CAPABILITY,
+  CLAUDE_STRUCTURED_AGENT_SESSION_RUNTIME_CAPABILITY,
+  PI_STRUCTURED_DIALOGS_RUNTIME_CAPABILITY,
+  SESSION_TABS_SPLIT_GROUP_PLACEMENT_RUNTIME_CAPABILITY,
+  STRUCTURED_AGENT_SESSION_HOLD_RUNTIME_CAPABILITY,
+  STRUCTURED_AGENT_SESSION_REGISTERED_AGENTS_RUNTIME_CAPABILITY,
+  STRUCTURED_AGENT_SESSION_RUNTIME_CAPABILITY
+} from '../../../../shared/protocol-version'
+import { AGENT_LAUNCH_RUNTIME_CAPABILITY } from '../../../../shared/agent-launch-runtime-capability'
+import { remoteRuntimeClientCapabilities } from '../../../../shared/remote-runtime-client-capabilities'
+import { computeAgentSessionPayloadFingerprint } from '../../../../shared/agent-session-mutation-envelope'
+import { STRUCTURED_AGENT_RUNTIME_REGISTRATIONS } from '../../structured-agent-runtime-registrations'
+import { STRUCTURED_AGENT_SESSION_AGENTS_METHODS } from './structured-agent-session-agents'
+import { DESKTOP_RENDERER_RUNTIME_CLIENT_CAPABILITIES } from '../../../ipc/desktop-renderer-runtime-capabilities'
+import type {
+  AgentSessionStatusSummary,
+  AgentSessionTurnCompletion
+} from '../../../../shared/agent-session-wire'
+import type { AgentSessionPromptAttention } from '../../../../shared/agent-session-turn-completion-wire'
+import type { StructuredAgentSessionStatusSubscriber } from '../../../native-chat/agent-session-wire/structured-agent-session-status-feed'
+import type { StructuredAgentSessionTurnCompletionSubscriber } from '../../../native-chat/agent-session-wire/structured-agent-session-turn-completion-feed'
+import {
+  call,
+  clearStructuredHostStub,
+  dispatcher,
+  envelope,
+  hostCalls,
+  installStructuredHostStub,
+  runtimeCalls,
+  SESSION,
+  STRUCTURED_CLIENT
+} from './structured-agent-session-rpc.test-fixture'
+import {
+  CLEANUP_METHODS,
+  WORK_METHODS
+} from './structured-agent-session-gate-classification.test-fixture'
+
+const OLD_CLIENT = {
+  ...STRUCTURED_CLIENT,
+  clientCapabilities: [
+    ...STRUCTURED_CLIENT.clientCapabilities,
+    STRUCTURED_AGENT_SESSION_REGISTERED_AGENTS_RUNTIME_CAPABILITY
+  ]
+}
+const PI_CLIENT = {
+  ...OLD_CLIENT,
+  clientCapabilities: [...OLD_CLIENT.clientCapabilities, PI_STRUCTURED_DIALOGS_RUNTIME_CAPABILITY]
+}
+const MOBILE_CLIENT = {
+  clientKind: 'mobile' as const,
+  // Mirrors the mobile transport list without importing its Expo project into this Node suite.
+  clientCapabilities: remoteRuntimeClientCapabilities([
+    STRUCTURED_AGENT_SESSION_RUNTIME_CAPABILITY,
+    AGENT_SESSION_PENDING_SEND_RESULT_RUNTIME_CAPABILITY,
+    STRUCTURED_AGENT_SESSION_HOLD_RUNTIME_CAPABILITY,
+    CLAUDE_STRUCTURED_AGENT_SESSION_RUNTIME_CAPABILITY,
+    SESSION_TABS_SPLIT_GROUP_PLACEMENT_RUNTIME_CAPABILITY,
+    AGENT_SESSION_TURN_ITEM_CAPABILITY,
+    AGENT_LAUNCH_RUNTIME_CAPABILITY
+  ])
+}
+const DESKTOP_CLIENT = {
+  clientKind: 'runtime' as const,
+  clientCapabilities: [...DESKTOP_RENDERER_RUNTIME_CLIENT_CAPABILITIES]
+}
+const UNSUPPORTED = { message: expect.stringContaining('structured_agent_session_unsupported') }
+
+beforeEach(installStructuredHostStub)
+afterEach(clearStructuredHostStub)
+
+describe('Pi dialog-shape client capability', () => {
+  it('filters only Pi from the registered agent list of an older client', async () => {
+    const registered = STRUCTURED_AGENT_RUNTIME_REGISTRATIONS.map(
+      ({ definition }) => definition.agent
+    )
+    const listing = (agents: string[]) => ({
+      ok: true,
+      result: { agents: agents.map((agent) => ({ agent })) }
+    })
+    expect(registered).toContain('pi')
+
+    expect(
+      await call('agentSession.agents', {}, OLD_CLIENT, {}, STRUCTURED_AGENT_SESSION_AGENTS_METHODS)
+    ).toMatchObject(listing(registered.filter((agent) => agent !== 'pi')))
+    expect(
+      await call('agentSession.agents', {}, PI_CLIENT, {}, STRUCTURED_AGENT_SESSION_AGENTS_METHODS)
+    ).toMatchObject(listing(registered))
+  })
+
+  it('refuses Pi create support before asking the runtime, while other agents keep their path', async () => {
+    expect(
+      await call(
+        'agentSession.createSupport',
+        { worktree: 'id:workspace-1', agent: 'pi' },
+        OLD_CLIENT
+      )
+    ).toMatchObject({ ok: false, error: UNSUPPORTED })
+    expect(runtimeCalls.getStructuredAgentSessionCreateSupport).not.toHaveBeenCalled()
+
+    expect(
+      await call(
+        'agentSession.createSupport',
+        { worktree: 'id:workspace-1', agent: 'grok' },
+        OLD_CLIENT
+      )
+    ).toMatchObject({ ok: true })
+    expect(
+      await call(
+        'agentSession.createSupport',
+        { worktree: 'id:workspace-1', agent: 'pi' },
+        PI_CLIENT
+      )
+    ).toMatchObject({ ok: true })
+  })
+
+  it('refuses Pi create before resolution or attachment', async () => {
+    const params = {
+      envelope: envelope({
+        expectedRuntimeFence: null,
+        payloadFingerprint: computeAgentSessionPayloadFingerprint({
+          method: 'agentSession.create',
+          sessionId: SESSION,
+          fields: { worktree: 'id:workspace-1', agent: 'pi' }
+        })
+      }),
+      worktree: 'id:workspace-1',
+      agent: 'pi'
+    }
+    expect(await call('agentSession.create', params, OLD_CLIENT)).toMatchObject({
+      ok: false,
+      error: UNSUPPORTED
+    })
+    expect(runtimeCalls.resolveStructuredAgentSessionCreateIntent).not.toHaveBeenCalled()
+    expect(hostCalls.attach).not.toHaveBeenCalled()
+    expect(await call('agentSession.create', params, PI_CLIENT)).toMatchObject({ ok: true })
+  })
+
+  it('withholds Pi journal history from a client that cannot show its dialogs', async () => {
+    hostCalls.sessionAgent.mockReturnValue('pi')
+    expect(
+      await call('agentSession.history', { sessionId: SESSION, direction: 'tail' }, OLD_CLIENT)
+    ).toMatchObject({ ok: false, error: UNSUPPORTED })
+    expect(hostCalls.history).not.toHaveBeenCalled()
+    expect(
+      await call('agentSession.history', { sessionId: SESSION, direction: 'tail' }, PI_CLIENT)
+    ).toMatchObject({ ok: true })
+  })
+
+  it.each([
+    ['old D3 desktop', OLD_CLIENT],
+    ['current mobile', MOBILE_CLIENT]
+  ] as const)(
+    'refuses Pi session reads and mutations by ID for %s before host work',
+    async (_label, client) => {
+      hostCalls.sessionAgent.mockReturnValue('pi')
+      for (const { method, params } of WORK_METHODS) {
+        if (
+          method === 'agentSession.createSupport' ||
+          method === 'agentSession.create' ||
+          method === 'agentSession.ensure' ||
+          method === 'agentSession.subscribeStatus' ||
+          method === 'agentSession.reveal'
+        ) {
+          continue
+        }
+        expect(await call(method, params, client), method).toMatchObject({
+          ok: false,
+          error: UNSUPPORTED
+        })
+      }
+      expect(hostCalls.send).not.toHaveBeenCalled()
+      expect(hostCalls.readOptions).not.toHaveBeenCalled()
+      expect(hostCalls.rewind).not.toHaveBeenCalled()
+      expect(hostCalls.respondToPrompt).not.toHaveBeenCalled()
+      expect(hostCalls.setOption).not.toHaveBeenCalled()
+      expect(hostCalls.history).not.toHaveBeenCalled()
+      expect(hostCalls.revealSession).not.toHaveBeenCalled()
+      expect(await call('agentSession.modelCatalog', { agent: 'pi' }, client)).toMatchObject({
+        ok: false,
+        error: UNSUPPORTED
+      })
+      hostCalls.sessionAgent.mockReturnValue('codex')
+      expect(
+        await call('agentSession.modelCatalog', { agent: 'pi', sessionId: SESSION }, client)
+      ).toMatchObject({ ok: false, error: UNSUPPORTED })
+      hostCalls.sessionAgent.mockReturnValue('pi')
+      expect(await call('agentSession.reveal', { sessionId: SESSION }, client)).toMatchObject({
+        ok: true,
+        result: { ok: false, refusal: { code: 'structured_agent_session_unsupported' } }
+      })
+      for (const [method, params] of [
+        ['agentSession.commands', { sessionId: SESSION }],
+        ['agentSession.conversationCommand', { envelope: envelope(), command: 'compact' }],
+        ['agentSession.modelCatalog', { agent: 'codex', sessionId: SESSION }]
+      ] as const) {
+        expect(await call(method, params, client), method).toMatchObject({
+          ok: false,
+          error: UNSUPPORTED
+        })
+      }
+      expect(hostCalls.revealSession).not.toHaveBeenCalled()
+    }
+  )
+
+  it.each([
+    ['old D3 desktop', OLD_CLIENT],
+    ['current mobile', MOBILE_CLIENT]
+  ] as const)('keeps Pi cleanup callable for %s', async (_label, client) => {
+    hostCalls.sessionAgent.mockReturnValue('pi')
+    for (const { method, params } of CLEANUP_METHODS) {
+      expect(await call(method, params, client), method).toMatchObject({ ok: true })
+    }
+    expect(hostCalls.cancel).toHaveBeenCalledOnce()
+    expect(hostCalls.close).toHaveBeenCalledOnce()
+  })
+
+  it('admits current desktop Pi send, options and commands, and preserves other agents', async () => {
+    hostCalls.sessionAgent.mockReturnValue('pi')
+    hostCalls.readCommands = vi.fn(async () => [])
+    for (const method of [
+      'agentSession.send',
+      'agentSession.options',
+      'agentSession.commands'
+    ] as const) {
+      const params =
+        method === 'agentSession.send'
+          ? WORK_METHODS.find((entry) => entry.method === method)?.params
+          : { sessionId: SESSION }
+      expect(await call(method, params, DESKTOP_CLIENT), method).toMatchObject({ ok: true })
+    }
+    expect(hostCalls.send).toHaveBeenCalledOnce()
+    expect(hostCalls.readOptions).toHaveBeenCalledOnce()
+    expect(hostCalls.readCommands).toHaveBeenCalledOnce()
+
+    hostCalls.sessionAgent.mockReturnValue('codex')
+    expect(
+      await call(
+        'agentSession.send',
+        WORK_METHODS.find((entry) => entry.method === 'agentSession.send')?.params,
+        OLD_CLIENT
+      )
+    ).toMatchObject({ ok: true })
+    expect(await call('agentSession.options', { sessionId: SESSION }, MOBILE_CLIENT)).toMatchObject(
+      { ok: true }
+    )
+  })
+
+  it('filters Pi status from the opening snapshot and live updates', async () => {
+    const codex: AgentSessionStatusSummary = {
+      sessionId: 'codex-session',
+      workspaceId: 'workspace-1',
+      agent: 'codex',
+      status: 'idle',
+      latestPrompt: 'hello',
+      updatedAt: 1
+    }
+    const pi: AgentSessionStatusSummary = { ...codex, sessionId: SESSION, agent: 'pi' }
+    hostCalls.subscribeStatus.mockImplementation(
+      (subscriber: StructuredAgentSessionStatusSubscriber) => {
+        subscriber.emit({ type: 'snapshot', sessions: [codex, pi] })
+        subscriber.emit({ type: 'status', session: pi })
+        subscriber.emit({ type: 'status', session: codex })
+        subscriber.emit({ type: 'end' })
+        return () => undefined
+      }
+    )
+    for (const [client, seesPi] of [
+      [OLD_CLIENT, false],
+      [MOBILE_CLIENT, false],
+      [DESKTOP_CLIENT, true]
+    ] as const) {
+      const replies: unknown[] = []
+      await dispatcher().dispatchStreaming(
+        {
+          id: 'status-test',
+          authToken: 'token',
+          method: 'agentSession.subscribeStatus',
+          params: null
+        },
+        (raw) => replies.push(JSON.parse(raw)),
+        client
+      )
+      const serialized = JSON.stringify(replies)
+      expect(serialized).toContain('codex-session')
+      expect(serialized.includes(SESSION)).toBe(seesPi)
+      expect(replies).toHaveLength(seesPi ? 4 : 3)
+    }
+  })
+
+  it('filters Pi turn completions from the global live stream', async () => {
+    hostCalls.sessionAgent.mockImplementation((sessionId: string) =>
+      sessionId === SESSION ? 'pi' : 'codex'
+    )
+    hostCalls.subscribeTurnCompletions = vi.fn(
+      (subscriber: StructuredAgentSessionTurnCompletionSubscriber) => {
+        const completion: AgentSessionTurnCompletion = {
+          scope: {
+            executionHostId: 'local',
+            wslDistro: null,
+            workspaceId: 'workspace-1',
+            workspaceKind: 'git-worktree' as const
+          },
+          sessionId: SESSION,
+          turnId: 'turn-1',
+          outcome: 'success' as const,
+          completedAt: 1
+        }
+        subscriber.emit({ type: 'completion', completion })
+        subscriber.emit({
+          type: 'completion',
+          completion: { ...completion, sessionId: 'codex-session' }
+        })
+        subscriber.emit({ type: 'end' })
+        return () => undefined
+      }
+    )
+    for (const [client, seesPi] of [
+      [OLD_CLIENT, false],
+      [DESKTOP_CLIENT, true]
+    ] as const) {
+      const replies: unknown[] = []
+      await dispatcher().dispatchStreaming(
+        {
+          id: 'completion-test',
+          authToken: 'token',
+          method: 'agentSession.subscribeTurnCompletions',
+          params: null
+        },
+        (raw) => replies.push(JSON.parse(raw)),
+        client
+      )
+      const serialized = JSON.stringify(replies)
+      expect(serialized).toContain('codex-session')
+      expect(serialized.includes(SESSION)).toBe(seesPi)
+      expect(replies).toHaveLength(seesPi ? 3 : 2)
+    }
+  })
+
+  it('filters Pi prompt alerts from a client that asked for prompts', async () => {
+    hostCalls.sessionAgent.mockImplementation((sessionId: string) =>
+      sessionId === SESSION ? 'pi' : 'codex'
+    )
+    hostCalls.subscribeTurnCompletions = vi.fn(
+      (subscriber: StructuredAgentSessionTurnCompletionSubscriber) => {
+        const prompt: AgentSessionPromptAttention = {
+          scope: {
+            executionHostId: 'local',
+            wslDistro: null,
+            workspaceId: 'workspace-1',
+            workspaceKind: 'git-worktree' as const
+          },
+          sessionId: SESSION,
+          promptId: 'prompt-1',
+          raisedAt: 1
+        }
+        subscriber.emit({ type: 'prompt', prompt })
+        subscriber.emit({ type: 'prompt', prompt: { ...prompt, sessionId: 'codex-session' } })
+        subscriber.emit({ type: 'end' })
+        return () => undefined
+      }
+    )
+    for (const [client, seesPi] of [
+      [OLD_CLIENT, false],
+      [DESKTOP_CLIENT, true]
+    ] as const) {
+      const replies: unknown[] = []
+      await dispatcher().dispatchStreaming(
+        {
+          id: 'prompt-test',
+          authToken: 'token',
+          method: 'agentSession.subscribeTurnCompletions',
+          params: { includePrompts: true }
+        },
+        (raw) => replies.push(JSON.parse(raw)),
+        client
+      )
+      const serialized = JSON.stringify(replies)
+      expect(serialized).toContain('codex-session')
+      expect(serialized.includes(SESSION)).toBe(seesPi)
+      expect(replies).toHaveLength(seesPi ? 3 : 2)
+    }
+  })
+})
diff --git a/src/main/runtime/rpc/methods/structured-agent-session-policy.test.ts b/src/main/runtime/rpc/methods/structured-agent-session-policy.test.ts
index 662cc948b7dc..a000ced431a7 100644
--- a/src/main/runtime/rpc/methods/structured-agent-session-policy.test.ts
+++ b/src/main/runtime/rpc/methods/structured-agent-session-policy.test.ts
@@ -1,15 +1,43 @@
 import { describe, expect, it } from 'vitest'
 import {
+  PI_STRUCTURED_DIALOGS_RUNTIME_CAPABILITY,
+  STRUCTURED_AGENT_SESSION_REGISTERED_AGENTS_RUNTIME_CAPABILITY,
   STRUCTURED_AGENT_SESSION_CLIENT_LAUNCH_MODE_CAPABILITY,
   STRUCTURED_AGENT_SESSION_RUNTIME_CAPABILITY
 } from '../../../../shared/protocol-version'
 import {
   createSupportFollowsHostSetting,
+  structuredAgentsReadBy,
+  clientRendersStructuredAgent,
   supportsStructuredAgentSessions
 } from './structured-agent-session-policy'
 
 const CAPABLE = [STRUCTURED_AGENT_SESSION_RUNTIME_CAPABILITY]
 
+describe('Pi audience in a registered-agents client', () => {
+  const registered = [...CAPABLE, STRUCTURED_AGENT_SESSION_REGISTERED_AGENTS_RUNTIME_CAPABILITY]
+
+  it('keeps Pi out of tab and restart audiences until the dialog shape is advertised', () => {
+    expect(clientRendersStructuredAgent(registered, 'pi')).toBe(false)
+    expect(clientRendersStructuredAgent(registered, 'grok')).toBe(true)
+    const audience = structuredAgentsReadBy(
+      { clientKind: 'runtime', clientCapabilities: registered },
+      ['codex', 'grok', 'pi']
+    )
+    expect(audience?.('pi')).toBe(false)
+    expect(audience?.('grok')).toBe(true)
+    expect(
+      structuredAgentsReadBy(
+        {
+          clientKind: 'runtime',
+          clientCapabilities: [...registered, PI_STRUCTURED_DIALOGS_RUNTIME_CAPABILITY]
+        },
+        ['codex', 'grok', 'pi']
+      )
+    ).toBeUndefined()
+  })
+})
+
 describe('supportsStructuredAgentSessions', () => {
   it.each(['runtime', 'mobile'] as const)(
     'admits a %s client that advertises the capability',
diff --git a/src/main/runtime/rpc/methods/structured-agent-session-policy.ts b/src/main/runtime/rpc/methods/structured-agent-session-policy.ts
index 0892f35d7976..4295dee842f0 100644
--- a/src/main/runtime/rpc/methods/structured-agent-session-policy.ts
+++ b/src/main/runtime/rpc/methods/structured-agent-session-policy.ts
@@ -1,5 +1,6 @@
 import {
   CLAUDE_STRUCTURED_AGENT_SESSION_RUNTIME_CAPABILITY,
+  PI_STRUCTURED_DIALOGS_RUNTIME_CAPABILITY,
   STRUCTURED_AGENT_SESSION_CLIENT_LAUNCH_MODE_CAPABILITY,
   STRUCTURED_AGENT_SESSION_REGISTERED_AGENTS_RUNTIME_CAPABILITY,
   STRUCTURED_AGENT_SESSION_RUNTIME_CAPABILITY,
@@ -24,9 +25,7 @@ export function supportsStructuredAgentSessions(
   )
 }
 
-/** Whether a remote client renders `agent`'s chat: the one rule for every surface that withholds
- *  an agent's rows (tabs, restart offers). Codex needs structured support; Claude also its own
- *  capability; any other agent a client that renders the host's registered agents. */
+/** One audience rule for tabs and restart offers. Pi also needs dialog-shape support. */
 export function clientRendersStructuredAgent(
   clientCapabilities: readonly RuntimeCapability[] | undefined,
   agent: string
@@ -37,6 +36,9 @@ export function clientRendersStructuredAgent(
   if (agent === 'codex') {
     return true
   }
+  if (agent === 'pi' && !clientCapabilities.includes(PI_STRUCTURED_DIALOGS_RUNTIME_CAPABILITY)) {
+    return false
+  }
   return clientCapabilities.includes(
     agent === 'claude'
       ? CLAUDE_STRUCTURED_AGENT_SESSION_RUNTIME_CAPABILITY
@@ -44,6 +46,18 @@ export function clientRendersStructuredAgent(
   )
 }
 
+/** Preserve the existing session audience for every agent except Pi. */
+export function clientReadsStructuredSessionAgent(
+  context: Pick<RpcContext, 'clientCapabilities' | 'clientKind'>,
+  agent: string
+): boolean {
+  return (
+    agent !== 'pi' ||
+    context.clientKind === undefined ||
+    clientRendersStructuredAgent(context.clientCapabilities, agent)
+  )
+}
+
 /** The agents this client reads rows of, among those registered or saved here; undefined when it
  *  reads every one, so an action for it is exactly the unscoped one (one fence for every offer). */
 export function structuredAgentsReadBy(
diff --git a/src/main/runtime/rpc/methods/structured-agent-session-queued-methods.ts b/src/main/runtime/rpc/methods/structured-agent-session-queued-methods.ts
index 259ee2dbe148..c98dfa4c787c 100644
--- a/src/main/runtime/rpc/methods/structured-agent-session-queued-methods.ts
+++ b/src/main/runtime/rpc/methods/structured-agent-session-queued-methods.ts
@@ -4,7 +4,7 @@
 
 import { defineMethod } from '../core'
 import {
-  requireStructuredHost as requireHost,
+  requireStructuredSessionHost as requireSessionHost,
   structuredCallerFor as callerFor
 } from './structured-agent-session-gate'
 import {
@@ -16,16 +16,22 @@ export const STRUCTURED_AGENT_SESSION_QUEUED_METHODS = [
   defineMethod({
     name: 'agentSession.queuedMessageSend',
     params: QueuedMessageActionParams,
-    handler: async (params, ctx) => requireHost(ctx).queuedMessageSend(callerFor(ctx), params)
+    handler: async (params, ctx) =>
+      requireSessionHost(ctx, params.envelope.sessionId).queuedMessageSend(callerFor(ctx), params)
   }),
   defineMethod({
     name: 'agentSession.queuedMessageDelete',
     params: QueuedMessageActionParams,
-    handler: async (params, ctx) => requireHost(ctx).queuedMessageDelete(callerFor(ctx), params)
+    handler: async (params, ctx) =>
+      requireSessionHost(ctx, params.envelope.sessionId).queuedMessageDelete(callerFor(ctx), params)
   }),
   defineMethod({
     name: 'agentSession.queuedMessagesResume',
     params: QueuedMessagesResumeParams,
-    handler: async (params, ctx) => requireHost(ctx).queuedMessagesResume(callerFor(ctx), params)
+    handler: async (params, ctx) =>
+      requireSessionHost(ctx, params.envelope.sessionId).queuedMessagesResume(
+        callerFor(ctx),
+        params
+      )
   })
 ]
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 1d1ddfcc5983..c28fe9856f69 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
@@ -11,7 +11,11 @@ import {
   requireStructuredHost,
   structuredCallerFor
 } from './structured-agent-session-gate'
-import { RestartResumableParams, RestartResumeParams } from './structured-agent-session-schemas'
+import {
+  ContinueInterruptedParams,
+  RestartResumableParams,
+  RestartResumeParams
+} from './structured-agent-session-schemas'
 import { structuredAgentsReadBy } from './structured-agent-session-policy'
 
 export const STRUCTURED_AGENT_SESSION_RESTART_RESUME_METHODS = [
@@ -68,6 +72,18 @@ export const STRUCTURED_AGENT_SESSION_RESTART_RESUME_METHODS = [
       )
     }
   }),
+  defineMethod({
+    // Continue on a reply an Orca stop cut off: the same continuation, bound to the cut turn
+    // instead of an offer. Clients gate it on AGENT_SESSION_CONTINUE_INTERRUPTED_RUNTIME_CAPABILITY.
+    // It names one chat the client shows, as a send does, so no agent audience applies.
+    name: 'agentSession.continueInterrupted',
+    params: ContinueInterruptedParams,
+    handler: async (params, ctx) => {
+      await ensureStructuredHostInstalled(ctx)
+      const host = requireStructuredHost(ctx)
+      return host.restartResume.continueInterrupted(params.sessionId, params.turnItemId)
+    }
+  }),
   defineMethod({
     // 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
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 10b5610e3531..118cfb418f59 100644
--- a/src/main/runtime/rpc/methods/structured-agent-session-reveal.ts
+++ b/src/main/runtime/rpc/methods/structured-agent-session-reveal.ts
@@ -20,6 +20,7 @@ import { defineMethod } from '../core'
 import {
   ensureStructuredHostInstalled,
   requireStructuredCapability,
+  requireStructuredAgentAudience,
   requireStructuredHost
 } from './structured-agent-session-gate'
 import { OptionsParams } from './structured-agent-session-schemas'
@@ -33,7 +34,9 @@ export const STRUCTURED_AGENT_SESSION_REVEAL_METHODS = [
       await ensureStructuredHostInstalled(ctx)
       let revealed: StructuredAgentSessionReveal
       try {
-        revealed = await requireStructuredHost(ctx).revealSession(params.sessionId)
+        const host = requireStructuredHost(ctx)
+        requireStructuredAgentAudience(ctx, host.sessionAgent(params.sessionId) ?? '')
+        revealed = await host.revealSession(params.sessionId)
       } catch (error) {
         // The host raises its refusal as the code itself; anything else is a genuine fault and
         // must not be laundered into a tidy "no such chat".
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 43f813b35ee6..c4b3f62700b6 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
@@ -16,7 +16,7 @@ import {
   AGENT_SESSION_PENDING_SEND_RESULT_RUNTIME_CAPABILITY,
   STRUCTURED_AGENT_SESSION_RUNTIME_CAPABILITY
 } from '../../../../shared/protocol-version'
-import type { RpcRequest, RpcResponse } from '../core'
+import type { RpcAnyMethodDeclaration, RpcRequest, RpcResponse } from '../core'
 import { RpcDispatcher } from '../dispatcher'
 import { STRUCTURED_AGENT_SESSION_METHODS } from './structured-agent-session'
 import { createStructuredAgentSessionLogger } from '../../../native-chat/agent-session-wire/structured-agent-session-logger'
@@ -216,7 +216,10 @@ export function hostStub(): StructuredAgentSessionHost {
   return hostCalls as unknown as StructuredAgentSessionHost
 }
 
-export function dispatcher(runtimeOverrides: Record<string, unknown> = {}): RpcDispatcher {
+export function dispatcher(
+  runtimeOverrides: Record<string, unknown> = {},
+  methods: readonly RpcAnyMethodDeclaration[] = STRUCTURED_AGENT_SESSION_METHODS
+): RpcDispatcher {
   reset(runtimeCalls)
   Object.assign(runtimeCalls, {
     getStructuredAgentSessionCreateSupport: vi.fn(async () => ({ supported: true })),
@@ -254,7 +257,7 @@ export function dispatcher(runtimeOverrides: Record<string, unknown> = {}): RpcD
   }
   return new RpcDispatcher({
     runtime: runtime as unknown as OrcaRuntimeService,
-    methods: STRUCTURED_AGENT_SESSION_METHODS
+    methods
   })
 }
 
@@ -269,10 +272,11 @@ export async function call(
     clientCapabilities?: string[]
     signal?: AbortSignal
   },
-  runtimeOverrides: Record<string, unknown> = {}
+  runtimeOverrides: Record<string, unknown> = {},
+  methods?: readonly RpcAnyMethodDeclaration[]
 ): Promise<RpcResponse> {
   const replies: RpcResponse[] = []
-  await dispatcher(runtimeOverrides).dispatchStreaming(
+  await dispatcher(runtimeOverrides, methods).dispatchStreaming(
     request(method, params),
     (raw) => replies.push(JSON.parse(raw) as RpcResponse),
     client
diff --git a/src/main/runtime/rpc/methods/structured-agent-session-schemas.ts b/src/main/runtime/rpc/methods/structured-agent-session-schemas.ts
index f55619350ef1..1f749d50490d 100644
--- a/src/main/runtime/rpc/methods/structured-agent-session-schemas.ts
+++ b/src/main/runtime/rpc/methods/structured-agent-session-schemas.ts
@@ -33,3 +33,4 @@ export {
   ThreadGoalParams,
   UnsubscribeParams
 } from '../../../../shared/rpc-contract/structured-agent-session-params'
+export { ContinueInterruptedParams } from '../../../../shared/rpc-contract/structured-agent-session-continue-params'
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 019c0d63453f..7f6460bdc556 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
@@ -6,7 +6,7 @@ import { agentSessionSendSubmission } from '../../../../shared/agent-session-wir
 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'
+import { requireStructuredSessionHost, structuredCallerFor } from './structured-agent-session-gate'
 
 /**
  * A send answers once the host accepts it. A client that predates that answer cannot show a
@@ -19,7 +19,7 @@ export async function sendStructuredAgentSessionForClient(
   params: Parameters<StructuredAgentSessionHost['send']>[1],
   context: RpcContext
 ) {
-  const host = requireStructuredHost(context)
+  const host = requireStructuredSessionHost(context, params.envelope.sessionId)
   // A client's own send: a restart or a close keeps it as a card if it never reached the agent.
   const result = await host.send(structuredCallerFor(context), { ...params, userSend: true })
   const capabilities = context.clientCapabilities ?? []
diff --git a/src/main/runtime/rpc/methods/structured-agent-session-status-stream.ts b/src/main/runtime/rpc/methods/structured-agent-session-status-stream.ts
index c93401e0e22c..a4a2de579599 100644
--- a/src/main/runtime/rpc/methods/structured-agent-session-status-stream.ts
+++ b/src/main/runtime/rpc/methods/structured-agent-session-status-stream.ts
@@ -6,6 +6,7 @@
 import { defineStreamingMethod, type RpcContext } from '../core'
 import { requireStructuredHost as requireHost } from './structured-agent-session-gate'
 import { structuredAgentSessionStatusSubscriptionId } from './structured-agent-session-subscription-id'
+import { clientReadsStructuredSessionAgent } from './structured-agent-session-policy'
 
 /** Ties a stream to both ends that can close it — the runtime's subscription registry and the
  *  transport abort — so either one runs `onClose` exactly once. */
@@ -53,7 +54,24 @@ export const STRUCTURED_AGENT_SESSION_STATUS_METHODS = [
       if (stream.isClosed()) {
         return
       }
-      dispose = host.subscribeStatus({ id: subscriptionId, emit })
+      dispose = host.subscribeStatus({
+        id: subscriptionId,
+        emit: (event) => {
+          if (event.type === 'snapshot') {
+            emit({
+              ...event,
+              sessions: event.sessions.filter((session) =>
+                clientReadsStructuredSessionAgent(ctx, session.agent)
+              )
+            })
+          } else if (
+            event.type !== 'status' ||
+            clientReadsStructuredSessionAgent(ctx, event.session.agent)
+          ) {
+            emit(event)
+          }
+        }
+      })
       if (stream.isClosed()) {
         dispose()
       }
diff --git a/src/main/runtime/rpc/methods/structured-agent-session-thread-goal.ts b/src/main/runtime/rpc/methods/structured-agent-session-thread-goal.ts
index b28a51500d21..87ba26fe37b9 100644
--- a/src/main/runtime/rpc/methods/structured-agent-session-thread-goal.ts
+++ b/src/main/runtime/rpc/methods/structured-agent-session-thread-goal.ts
@@ -5,7 +5,7 @@
 
 import { defineMethod } from '../core'
 import {
-  requireStructuredHost as requireHost,
+  requireStructuredSessionHost as requireSessionHost,
   structuredCallerFor as callerFor
 } from './structured-agent-session-gate'
 import { ThreadGoalParams } from './structured-agent-session-schemas'
@@ -14,6 +14,7 @@ export const STRUCTURED_AGENT_SESSION_THREAD_GOAL_METHODS = [
   defineMethod({
     name: 'agentSession.threadGoal',
     params: ThreadGoalParams,
-    handler: async (params, ctx) => requireHost(ctx).changeThreadGoal(callerFor(ctx), params)
+    handler: async (params, ctx) =>
+      requireSessionHost(ctx, params.envelope.sessionId).changeThreadGoal(callerFor(ctx), params)
   })
 ]
diff --git a/src/main/runtime/rpc/methods/structured-agent-session-turn-completion-stream.ts b/src/main/runtime/rpc/methods/structured-agent-session-turn-completion-stream.ts
index 24f03ac07eee..a5442097f464 100644
--- a/src/main/runtime/rpc/methods/structured-agent-session-turn-completion-stream.ts
+++ b/src/main/runtime/rpc/methods/structured-agent-session-turn-completion-stream.ts
@@ -17,6 +17,7 @@ import {
 } from './structured-agent-session-schemas'
 import { structuredAgentSessionTurnCompletionSubscriptionId } from './structured-agent-session-subscription-id'
 import { bindStructuredAgentSessionStream } from './structured-agent-session-status-stream'
+import { clientReadsStructuredSessionAgent } from './structured-agent-session-policy'
 
 export const STRUCTURED_AGENT_SESSION_TURN_COMPLETION_METHODS = [
   // Retire only deliveries whose journal cause the client's accepted read covered: the session and
@@ -46,7 +47,21 @@ export const STRUCTURED_AGENT_SESSION_TURN_COMPLETION_METHODS = [
       }
       dispose = host.subscribeTurnCompletions({
         id: subscriptionId,
-        emit,
+        // A client that cannot read an agent's rows is not told that agent's edges either.
+        emit: (event) => {
+          const sessionId =
+            event.type === 'completion'
+              ? event.completion.sessionId
+              : event.type === 'prompt'
+                ? event.prompt.sessionId
+                : undefined
+          if (
+            sessionId === undefined ||
+            clientReadsStructuredSessionAgent(ctx, host.sessionAgent(sessionId) ?? '')
+          ) {
+            emit(event)
+          }
+        },
         includePrompts: params.includePrompts === true
       })
       if (stream.isClosed()) {
diff --git a/src/main/runtime/rpc/methods/structured-agent-session-visual.test.ts b/src/main/runtime/rpc/methods/structured-agent-session-visual.test.ts
new file mode 100644
index 000000000000..8d73e3b374fd
--- /dev/null
+++ b/src/main/runtime/rpc/methods/structured-agent-session-visual.test.ts
@@ -0,0 +1,149 @@
+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 { AgentSessionRecord } from '../../../../shared/agent-session-record'
+import { agentSessionRecordFixture } from '../../../../shared/agent-session-record.test-fixture'
+import { setStructuredAgentSessionHost } from '../../../native-chat/agent-session-wire/structured-agent-session-registry'
+import { nativeChatVisualsFolderFor } from '../../../native-chat/native-chat-visuals-folder'
+import { ALL_RPC_METHODS } from '.'
+import { STRUCTURED_AGENT_SESSION_VISUAL_METHODS } from './structured-agent-session-visual'
+import {
+  call as callStructured,
+  clearStructuredHostStub,
+  hostStub,
+  SESSION,
+  STRUCTURED_CLIENT
+} from './structured-agent-session-rpc.test-fixture'
+
+type CallClient = Parameters<typeof callStructured>[2]
+
+function call(method: string, params: unknown, client: CallClient) {
+  return callStructured(method, params, client, {}, STRUCTURED_AGENT_SESSION_VISUAL_METHODS)
+}
+
+let stateDirectory: string
+vi.mock('../../../orca-profiles/profile-storage-paths', () => ({
+  getProfileUserDataPath: () => stateDirectory
+}))
+let record: AgentSessionRecord | null
+
+beforeEach(async () => {
+  stateDirectory = await mkdtemp(join(tmpdir(), 'orca-visual-rpc-'))
+  record = { ...agentSessionRecordFixture(), sessionId: SESSION }
+  setStructuredAgentSessionHost(
+    Object.assign(hostStub(), {
+      deps: {
+        store: { getRecord: (id: string) => (record?.sessionId === id ? record : null) }
+      }
+    })
+  )
+})
+
+afterEach(async () => {
+  clearStructuredHostStub()
+  await rm(stateDirectory, { recursive: true, force: true })
+})
+
+async function writeVisual(name: string, html: string): Promise<void> {
+  const folder = nativeChatVisualsFolderFor(stateDirectory, SESSION)
+  await mkdir(folder, { recursive: true })
+  await writeFile(join(folder, name), html)
+}
+
+describe('agentSession.readVisual', () => {
+  it('is registered on the runtime manifest', () => {
+    expect(ALL_RPC_METHODS.map((method) => method.name)).toContain('agentSession.readVisual')
+  })
+
+  it("reads a file from the chat's own folder under the host's state directory", async () => {
+    await writeVisual('chart.html', '<p>chart</p>')
+    const reply = await call(
+      'agentSession.readVisual',
+      { sessionId: SESSION, file: 'chart.html' },
+      STRUCTURED_CLIENT
+    )
+    expect(reply).toMatchObject({
+      ok: true,
+      result: { ok: true, html: '<p>chart</p>', sizeBytes: 12 }
+    })
+  })
+
+  it('answers unchanged for the revision the client holds', async () => {
+    await writeVisual('chart.html', '<p>chart</p>')
+    const first = await call(
+      'agentSession.readVisual',
+      { sessionId: SESSION, file: 'chart.html' },
+      STRUCTURED_CLIENT
+    )
+    const result: unknown = first.ok ? first.result : null
+    const revision =
+      typeof result === 'object' && result !== null && 'revision' in result
+        ? String(result.revision)
+        : ''
+    const again = await call(
+      'agentSession.readVisual',
+      { sessionId: SESSION, file: 'chart.html', knownRevision: revision },
+      STRUCTURED_CLIENT
+    )
+    expect(again).toMatchObject({ ok: true, result: { ok: true, unchanged: true, revision } })
+    const againResult: unknown = again.ok ? again.result : null
+    expect(typeof againResult === 'object' && againResult !== null && 'html' in againResult).toBe(
+      false
+    )
+  })
+
+  it('reports a session this host has no record of', async () => {
+    record = null
+    const reply = await call(
+      'agentSession.readVisual',
+      { sessionId: SESSION, file: 'chart.html' },
+      STRUCTURED_CLIENT
+    )
+    expect(reply).toMatchObject({ ok: true, result: { ok: false, error: 'session_not_found' } })
+  })
+
+  it('refuses a chat recorded on another execution host or a WSL distro', async () => {
+    const base = agentSessionRecordFixture()
+    record = {
+      ...base,
+      sessionId: SESSION,
+      location: { ...base.location, executionHostId: 'ssh:box' }
+    }
+    const ssh = await call(
+      'agentSession.readVisual',
+      { sessionId: SESSION, file: 'chart.html' },
+      STRUCTURED_CLIENT
+    )
+    expect(ssh).toMatchObject({ ok: true, result: { ok: false, error: 'unsupported_location' } })
+
+    record = { ...base, sessionId: SESSION, location: { ...base.location, wslDistro: 'Ubuntu' } }
+    const wsl = await call(
+      'agentSession.readVisual',
+      { sessionId: SESSION, file: 'chart.html' },
+      STRUCTURED_CLIENT
+    )
+    expect(wsl).toMatchObject({ ok: true, result: { ok: false, error: 'unsupported_location' } })
+  })
+
+  it.each([
+    ['a path', { sessionId: SESSION, file: '../chart.html' }],
+    ['a non-html file', { sessionId: SESSION, file: 'chart.txt' }],
+    ['a bad session id', { sessionId: '../x', file: 'chart.html' }],
+    ['an unknown field', { sessionId: SESSION, file: 'chart.html', path: '/etc' }],
+    ['a malformed revision', { sessionId: SESSION, file: 'chart.html', knownRevision: 'zz' }]
+  ])('rejects %s as invalid params', async (_name, params) => {
+    const reply = await call('agentSession.readVisual', params, STRUCTURED_CLIENT)
+    expect(reply).toMatchObject({ ok: false, error: { code: 'invalid_argument' } })
+  })
+
+  it('is refused to a client that cannot read structured sessions', async () => {
+    await writeVisual('chart.html', '<p>chart</p>')
+    const reply = await call(
+      'agentSession.readVisual',
+      { sessionId: SESSION, file: 'chart.html' },
+      { clientKind: 'runtime', clientCapabilities: [] }
+    )
+    expect(reply.ok).toBe(false)
+  })
+})
diff --git a/src/main/runtime/rpc/methods/structured-agent-session-visual.ts b/src/main/runtime/rpc/methods/structured-agent-session-visual.ts
new file mode 100644
index 000000000000..ed486013a65d
--- /dev/null
+++ b/src/main/runtime/rpc/methods/structured-agent-session-visual.ts
@@ -0,0 +1,42 @@
+// `agentSession.readVisual` — one HTML visual from a chat's own visuals folder.
+//
+// Additive: an older host answers `method_not_found` (a phone gets `forbidden` from the mobile
+// allowlist gate on a host without the entry), and the client shows the visual as unavailable.
+// The host resolves the folder from its own state directory and record; a client supplies only the
+// session id and a bare file name.
+
+import { LOCAL_EXECUTION_HOST_ID } from '../../../../shared/execution-host'
+import {
+  ReadVisualParams,
+  type AgentSessionReadVisualResult
+} from '../../../../shared/rpc-contract/agent-session-visual-params'
+import { nativeChatVisualsFolderFor } from '../../../native-chat/native-chat-visuals-folder'
+import { getProfileUserDataPath } from '../../../orca-profiles/profile-storage-paths'
+import { readNativeChatVisualFile } from '../../../native-chat/native-chat-visual-file-read'
+import { defineMethod } from '../core'
+import { requireInstalledStructuredHost } from './structured-agent-session-gate'
+
+export const STRUCTURED_AGENT_SESSION_VISUAL_METHODS = [
+  defineMethod({
+    name: 'agentSession.readVisual',
+    params: ReadVisualParams,
+    handler: async (params, ctx): Promise<AgentSessionReadVisualResult> => {
+      const host = await requireInstalledStructuredHost(ctx)
+      const record = host.deps.store.getRecord(params.sessionId)
+      if (!record) {
+        return { ok: false, error: 'session_not_found' }
+      }
+      // Structured chats run on their owning runtime's own filesystem; any other location has no
+      // visuals folder this process can read.
+      if (
+        record.location.executionHostId !== LOCAL_EXECUTION_HOST_ID ||
+        record.location.wslDistro
+      ) {
+        return { ok: false, error: 'unsupported_location' }
+      }
+      // The same state directory the chat host and its journal are opened in on this process.
+      const folder = nativeChatVisualsFolderFor(getProfileUserDataPath(), params.sessionId)
+      return readNativeChatVisualFile(folder, params.file, params.knownRevision)
+    }
+  })
+]
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 370c0bb3f55e..4bbd415cd025 100644
--- a/src/main/runtime/rpc/methods/structured-agent-session.test.ts
+++ b/src/main/runtime/rpc/methods/structured-agent-session.test.ts
@@ -175,7 +175,7 @@ describe('capability gating', () => {
     }
     // Bump deliberately: the whole agentSession.* surface is behind the structured capability,
     // so an additive method is invisible to old clients and needs no protocol bump.
-    expect(STRUCTURED_AGENT_SESSION_METHODS).toHaveLength(33)
+    expect(STRUCTURED_AGENT_SESSION_METHODS).toHaveLength(34)
   })
 
   it('hides the surface from a declared client that did not advertise it', async () => {
diff --git a/src/main/runtime/rpc/methods/structured-agent-session.ts b/src/main/runtime/rpc/methods/structured-agent-session.ts
index d2da7b0f92c2..8536cf27ec0a 100644
--- a/src/main/runtime/rpc/methods/structured-agent-session.ts
+++ b/src/main/runtime/rpc/methods/structured-agent-session.ts
@@ -21,9 +21,11 @@ import {
   ensureStructuredHostInstalled as ensureHostInstalled,
   requireInstalledStructuredHost as requireInstalledHost,
   requireStructuredCapability,
+  requireStructuredAgentAudience,
   requireStructuredCleanupHost,
   requireStructuredCreateSupportAdmission,
   requireStructuredHost as requireHost,
+  requireStructuredSessionHost as requireSessionHost,
   structuredCallerFor as callerFor
 } from './structured-agent-session-gate'
 import type { AgentSessionAttachParams } from '../../../native-chat/agent-session-wire/structured-agent-session-attach'
@@ -56,7 +58,6 @@ import {
   CreateParams,
   CreateSupportParams,
   HistoryParams,
-  HandoffStatusParams,
   OptionsParams,
   RespondParams,
   RespondToQuestionParams,
@@ -75,8 +76,8 @@ import { sendStructuredAgentSessionForClient } from './structured-agent-session-
  * cannot forge that answer.
  */
 async function resolveClientSuppliedAttach(params: z.infer<typeof AttachParams>, ctx: RpcContext) {
-  await ensureHostInstalled(ctx)
-  const host = requireHost(ctx)
+  await ensureHostInstalled(ctx, params.agent)
+  const host = requireHost(ctx, params.agent)
   if (!host.supportsCreate(params.location, params.agent)) {
     throw agentSessionRefusalError('structured_agent_session_unsupported', {
       reason: 'hostUnsupported'
@@ -106,7 +107,7 @@ export const STRUCTURED_AGENT_SESSION_METHODS = [
     handler: async (params, ctx) => {
       requireStructuredCapability(ctx)
       await ensureHostInstalled(ctx)
-      return requireHost(ctx).rewind(callerFor(ctx), params)
+      return requireSessionHost(ctx, params.envelope.sessionId).rewind(callerFor(ctx), params)
     }
   }),
   defineMethod({
@@ -115,7 +116,7 @@ export const STRUCTURED_AGENT_SESSION_METHODS = [
     handler: async (params, ctx) => {
       requireStructuredCapability(ctx)
       await ensureHostInstalled(ctx)
-      const host = requireHost(ctx)
+      const host = requireSessionHost(ctx, params.envelope.sessionId)
       await host.revealSession(params.envelope.sessionId)
       const result = await host.conversationCommand(callerFor(ctx), params)
       if (result.ok && result.value.command === 'clear' && result.value.replacementSessionId) {
@@ -134,7 +135,7 @@ export const STRUCTURED_AGENT_SESSION_METHODS = [
     name: 'agentSession.createSupport',
     params: CreateSupportParams,
     handler: async (params, ctx) => {
-      requireStructuredCreateSupportAdmission(ctx)
+      requireStructuredCreateSupportAdmission(ctx, params.agent)
       const support = await ctx.runtime.getStructuredAgentSessionCreateSupport(
         params.worktree,
         params.agent
@@ -150,7 +151,7 @@ export const STRUCTURED_AGENT_SESSION_METHODS = [
     name: 'agentSession.create',
     params: CreateParams,
     handler: async (params, ctx) => {
-      requireStructuredCapability(ctx)
+      requireStructuredAgentAudience(ctx, params.agent)
       if (params.envelope.expectedRuntimeFence !== null) {
         throw agentSessionRefusalError('agent_session_operation_invalid', {
           reason: 'requestMalformed'
@@ -231,35 +232,31 @@ export const STRUCTURED_AGENT_SESSION_METHODS = [
     name: 'agentSession.respondToApproval',
     params: RespondParams,
     handler: async (params, ctx) =>
-      requireHost(ctx).respondToPrompt(callerFor(ctx), { ...params, kind: 'approval' })
+      requireSessionHost(ctx, params.envelope.sessionId).respondToPrompt(callerFor(ctx), {
+        ...params,
+        kind: 'approval'
+      })
   }),
   defineMethod({
     name: 'agentSession.respondToQuestion',
     params: RespondToQuestionParams,
     handler: async (params, ctx) =>
-      requireHost(ctx).respondToPrompt(callerFor(ctx), { ...params, kind: 'question' })
+      requireSessionHost(ctx, params.envelope.sessionId).respondToPrompt(callerFor(ctx), {
+        ...params,
+        kind: 'question'
+      })
   }),
   defineMethod({
     name: 'agentSession.setOption',
     params: SetOptionParams,
-    handler: async (params, ctx) => requireHost(ctx).setOption(callerFor(ctx), params)
-  }),
-  defineMethod({
-    name: 'agentSession.handoffStatus',
-    params: HandoffStatusParams,
     handler: async (params, ctx) =>
-      (await requireInstalledHost(ctx)).handoffStatus(params.sessionId)
-  }),
-  defineMethod({
-    name: 'agentSession.commands',
-    params: OptionsParams,
-    handler: async (params, ctx) => (await requireInstalledHost(ctx)).readCommands(params.sessionId)
+      requireSessionHost(ctx, params.envelope.sessionId).setOption(callerFor(ctx), params)
   }),
   defineMethod({
     name: 'agentSession.history',
     params: HistoryParams,
     handler: async (params, ctx) => {
-      const host = await requireInstalledHost(ctx)
+      const host = await requireInstalledHost(ctx, params.sessionId)
       return projectTurnItemHistory(
         projectBackgroundTaskHistory(await host.history(params), ctx),
         ctx,
@@ -271,7 +268,7 @@ export const STRUCTURED_AGENT_SESSION_METHODS = [
     name: 'agentSession.subscribe',
     params: SubscribeParams,
     handler: async (params, ctx, emit) => {
-      const host = await requireInstalledHost(ctx)
+      const host = await requireInstalledHost(ctx, params.sessionId)
       const subscriptionId = subscriptionIdFor(ctx, params.sessionId)
       // A stream reads; it never keeps an agent alive or starts one.
       let dispose = (): void => {}
diff --git a/src/main/runtime/rpc/methods/terminal/terminal-originating-pane-methods.ts b/src/main/runtime/rpc/methods/terminal/terminal-originating-pane-methods.ts
index a4897ea3ca6c..2619d9df000f 100644
--- a/src/main/runtime/rpc/methods/terminal/terminal-originating-pane-methods.ts
+++ b/src/main/runtime/rpc/methods/terminal/terminal-originating-pane-methods.ts
@@ -4,7 +4,7 @@ import {
   navigationTargetsHost,
   resolveRuntimeNavigationTarget
 } from '../../../../../shared/runtime-navigation'
-import { TERMINAL_ORIGINATING_PANE_NAVIGATION_RUNTIME_CAPABILITY } from '../../../../../shared/protocol-version'
+import { TERMINAL_ORIGINATING_PANE_NAVIGATION_RUNTIME_CAPABILITY } from '../../../../../shared/terminal-navigation-runtime-capabilities'
 
 export const TERMINAL_ORIGINATING_PANE_METHODS = [
   defineMethod({
diff --git a/src/main/runtime/rpc/methods/worktree-create-args.ts b/src/main/runtime/rpc/methods/worktree-create-args.ts
index 623d553d3d61..54336dcbd68f 100644
--- a/src/main/runtime/rpc/methods/worktree-create-args.ts
+++ b/src/main/runtime/rpc/methods/worktree-create-args.ts
@@ -36,6 +36,7 @@ export function buildManagedWorktreeCreateArgs(
     linkedAzureDevOpsPR: params.linkedAzureDevOpsPR,
     linkedGiteaPR: params.linkedGiteaPR,
     linkedWorkItem: params.linkedWorkItem,
+    linkedItems: params.linkedItems,
     linkedTaskSourceContext: params.linkedTaskSourceContext,
     comment: params.comment,
     displayName: params.displayName,
diff --git a/src/main/runtime/rpc/methods/worktree.ts b/src/main/runtime/rpc/methods/worktree.ts
index 11cdba088902..39bc3d0618d4 100644
--- a/src/main/runtime/rpc/methods/worktree.ts
+++ b/src/main/runtime/rpc/methods/worktree.ts
@@ -157,6 +157,13 @@ export const WORKTREE_METHODS = [
         linkedAzureDevOpsPR: params.linkedAzureDevOpsPR,
         linkedGiteaPR: params.linkedGiteaPR,
         linkedWorkItem: params.linkedWorkItem,
+        linkedItems: params.linkedItems,
+        ...(params.linkedItemsBase !== undefined
+          ? { linkedItemsBase: params.linkedItemsBase }
+          : {}),
+        ...(params.linkedItemsSelectionChanged !== undefined
+          ? { linkedItemsSelectionChanged: params.linkedItemsSelectionChanged }
+          : {}),
         linkedTaskSourceContext: params.linkedTaskSourceContext,
         comment: params.comment,
         isArchived: params.isArchived,
@@ -181,7 +188,7 @@ export const WORKTREE_METHODS = [
                 noParent: params.noParent === true
               }
             : undefined
-      } as Parameters<typeof runtime.updateManagedWorktreeMeta>[1])
+      })
     })
   }),
   defineMethod({
diff --git a/src/main/runtime/runtime-account-controller.ts b/src/main/runtime/runtime-account-controller.ts
index c824301e5a5f..248adf2c18f1 100644
--- a/src/main/runtime/runtime-account-controller.ts
+++ b/src/main/runtime/runtime-account-controller.ts
@@ -2,7 +2,9 @@ import type { ClaudeAccountService } from '../claude-accounts/service'
 import { hasAppEnvironment } from '../../shared/app-environment'
 import { getManagedDataAccountService } from '../managed-data-accounts/service'
 import type {
+  ClaudeAccountSignIn,
   ClaudeRateLimitAccountsState,
+  ClaudeSignInRequest,
   CodexRateLimitAccountsState,
   ManagedDataAccountProvider,
   ManagedDataAccountsState
@@ -164,15 +166,18 @@ export class RuntimeAccountController {
     return this.requireServices().claudeAccounts.removeAccount(accountId)
   }
 
-  addClaudeFromConfigDir(
-    configDir: string,
-    options?: {
-      runtime?: 'host' | 'wsl'
-      wslDistro?: string | null
-      previousLegacyCredentialsSha256?: string | null
-    }
+  beginClaudeSignIn(request: ClaudeSignInRequest): Promise<ClaudeAccountSignIn> {
+    return this.requireServices().claudeAccounts.beginSignIn(request)
+  }
+
+  finishClaudeSignIn(
+    signIn: Omit<ClaudeAccountSignIn, 'configDir'>
   ): Promise<ClaudeRateLimitAccountsState> {
-    return this.requireServices().claudeAccounts.addAccountFromConfigDir(configDir, options)
+    return this.requireServices().claudeAccounts.finishSignIn(signIn)
+  }
+
+  cancelClaudeSignIn(signIn: Omit<ClaudeAccountSignIn, 'configDir'>): Promise<void> {
+    return this.requireServices().claudeAccounts.cancelSignIn(signIn)
   }
 
   removeCodex(accountId: string): Promise<CodexRateLimitAccountsState> {
diff --git a/src/main/runtime/runtime-browser-commands-browser-screencast.ts b/src/main/runtime/runtime-browser-commands-browser-screencast.ts
index d77f2c134109..e57e59100928 100644
--- a/src/main/runtime/runtime-browser-commands-browser-screencast.ts
+++ b/src/main/runtime/runtime-browser-commands-browser-screencast.ts
@@ -17,6 +17,7 @@ import type { BrowserEvalResult, BrowserScreencastResult } from '../../shared/ru
 import { BrowserError } from '../browser/browser-error'
 import { randomUUID } from 'node:crypto'
 import { startBrowserScreencast } from '../browser/browser-screencast-stream'
+import { rendererPublicationThrottle } from '../window/renderer-publication-throttle'
 import { sendRemoteBrowserScreencastFrame } from './remote-browser-screencast-frame-admission'
 import {
   INITIAL_SCREENCAST_SUBSCRIBER_DELIVERY,
@@ -69,6 +70,9 @@ export class RuntimeBrowserCommandsWithBrowserScreencast extends RuntimeBrowserC
         viewportOwnerSubscriptionId: null,
         appliedBudget: budget
       } as ActiveBrowserScreencastPage
+      // Why: guest frames come from the window's compositor, which a throttled hidden window stops.
+      const win = this.host.getAvailableAuthoritativeWindow()
+      const releaseThrottle = win ? rendererPublicationThrottle.acquire(win.webContents) : () => {}
       record.started = startBrowserScreencast(guest, {
         format: params.format,
         ...budget,
@@ -103,6 +107,12 @@ export class RuntimeBrowserCommandsWithBrowserScreencast extends RuntimeBrowserC
           for (const subscriber of record.subscribers.values()) {
             subscriber.emit?.({ type: 'error', message })
           }
+          // Why: every stream error is terminal; marking it stopping makes a newcomer start a fresh
+          // stream instead of joining this one and waiting on frames that will never come.
+          if (record.session) {
+            record.stopping = true
+            record.session.stop()
+          }
         }
       })
       active = record
@@ -113,6 +123,7 @@ export class RuntimeBrowserCommandsWithBrowserScreencast extends RuntimeBrowserC
           return session.done
         })
         .finally(() => {
+          releaseThrottle()
           if (this.activeScreencastsByPageId.get(browserPageId) === record) {
             this.activeScreencastsByPageId.delete(browserPageId)
           }
diff --git a/src/main/runtime/runtime-folder-workspace.ts b/src/main/runtime/runtime-folder-workspace.ts
index 4ecdbc80a8bc..cce0d0f73ac7 100644
--- a/src/main/runtime/runtime-folder-workspace.ts
+++ b/src/main/runtime/runtime-folder-workspace.ts
@@ -55,6 +55,7 @@ export function mergeRuntimeFolderWorkspace(
     linkedAzureDevOpsPR: meta.linkedAzureDevOpsPR ?? null,
     linkedGiteaPR: meta.linkedGiteaPR ?? null,
     linkedWorkItem: meta.linkedWorkItem ?? null,
+    ...(meta.linkedItems !== undefined ? { linkedItems: meta.linkedItems } : {}),
     linkedTaskSourceContext: meta.linkedTaskSourceContext ?? null,
     isArchived: meta.isArchived ?? false,
     isUnread: meta.isUnread ?? false,
diff --git a/src/main/runtime/runtime-folder-worktree-create.ts b/src/main/runtime/runtime-folder-worktree-create.ts
index 34c8d91432d1..6534f84e1990 100644
--- a/src/main/runtime/runtime-folder-worktree-create.ts
+++ b/src/main/runtime/runtime-folder-worktree-create.ts
@@ -108,6 +108,7 @@ export async function createRuntimeFolderWorktree(args: {
       : {}),
     ...(request.linkedGiteaPR !== undefined ? { linkedGiteaPR: request.linkedGiteaPR } : {}),
     ...(request.linkedWorkItem !== undefined ? { linkedWorkItem: request.linkedWorkItem } : {}),
+    ...(request.linkedItems !== undefined ? { linkedItems: request.linkedItems } : {}),
     ...(request.linkedTaskSourceContext !== undefined
       ? { linkedTaskSourceContext: request.linkedTaskSourceContext }
       : {}),
diff --git a/src/main/runtime/runtime-local-worktree-create.test.ts b/src/main/runtime/runtime-local-worktree-create.test.ts
index 979b05b90907..834962fc6b14 100644
--- a/src/main/runtime/runtime-local-worktree-create.test.ts
+++ b/src/main/runtime/runtime-local-worktree-create.test.ts
@@ -90,9 +90,21 @@ import {
   createWorktreeCreateTimingRecorder,
   type WorktreeCreateTimingRecorder
 } from '../worktree-create-timing'
+import type { SparsePreset } from '../../shared/worktree/create-types'
 
 const worktreePath = resolve('/worktrees', 'app')
 
+const writtenMeta: Partial<WorktreeMeta>[] = []
+const WEB_PRESET: SparsePreset = {
+  id: 'preset-web',
+  repoId: 'repo-1',
+  name: 'web',
+  directories: ['apps/web', 'packages/ui'],
+  createdAt: 0,
+  updatedAt: 0
+}
+const readSparsePresets = vi.fn<(repoId: string) => SparsePreset[]>()
+
 function createWorktree(
   request: Partial<RuntimeManagedWorktreeCreateArgs> = {},
   rearm: PreparationRearmHolder = { fire: () => {} },
@@ -106,7 +118,11 @@ function createWorktree(
       refreshLocalBaseRefOnWorktreeCreate: false,
       branchPrefix: ''
     }),
-    setWorktreeMeta: (_id: string, updates: Partial<WorktreeMeta>) => updates
+    setWorktreeMeta: (_id: string, updates: Partial<WorktreeMeta>) => {
+      writtenMeta.push(updates)
+      return updates
+    },
+    getSparsePresets: (repoId: string): SparsePreset[] => readSparsePresets(repoId)
   }
   return createRuntimeLocalManagedWorktree({
     request: { repoSelector: 'repo-1', name: 'app', baseBranch: 'main', ...request },
@@ -162,6 +178,7 @@ beforeEach(() => {
   mocks.resolveInclude.mockResolvedValue(['.env'])
   mocks.copyPaths.mockResolvedValue([])
   mocks.effectiveHooks.mockReturnValue(null)
+  readSparsePresets.mockReturnValue([WEB_PRESET])
 })
 
 describe('runtime prepared-worktree replenishment', () => {
@@ -336,6 +353,30 @@ describe('runtime create Git priority', () => {
     }
   })
 
+  it.each([
+    ['exactly its directories', ['packages/ui', 'apps/web'], 'preset-web'],
+    ['an edited selection', ['apps/web'], undefined]
+  ])('records the sparse preset only for %s', async (_case, directories, recorded) => {
+    writtenMeta.length = 0
+    await createWorktree({ sparseCheckout: { directories, presetId: 'preset-web' } })
+
+    expect(writtenMeta.find((meta) => meta.sparseDirectories)?.sparsePresetId).toBe(recorded)
+  })
+
+  it('still creates the worktree, with no sparse preset, when presets cannot be read', async () => {
+    writtenMeta.length = 0
+    readSparsePresets.mockImplementation(() => {
+      throw new Error('corrupt presets')
+    })
+    await createWorktree({
+      sparseCheckout: { directories: ['apps/web', 'packages/ui'], presetId: 'preset-web' }
+    })
+
+    const sparseMeta = writtenMeta.find((meta) => meta.sparseDirectories)
+    expect(sparseMeta?.sparseDirectories).toEqual(['apps/web', 'packages/ui'])
+    expect(sparseMeta?.sparsePresetId).toBeUndefined()
+  })
+
   it('preserves priority for sparse creates and remote base refreshes', async () => {
     const base = {
       remote: 'origin',
diff --git a/src/main/runtime/runtime-local-worktree-materialization.ts b/src/main/runtime/runtime-local-worktree-materialization.ts
index 9347a7e7ffce..04a064589aab 100644
--- a/src/main/runtime/runtime-local-worktree-materialization.ts
+++ b/src/main/runtime/runtime-local-worktree-materialization.ts
@@ -22,6 +22,7 @@ import { resolveWorktreeSharedDirectories } from '../git/worktree-shared-directo
 import type { RuntimeManagedWorktreeCreateArgs } from './runtime-managed-worktree-create-types'
 import type { RemoteTrackingBase } from './runtime-remote-fetch-controller'
 import type { RuntimeStore } from './runtime-store-contract'
+import { attributedSparsePresetId } from '../ipc/sparse-preset-attribution'
 import type { WorktreeCreateTimingRecorder } from '../worktree-create-timing'
 
 export async function materializeRuntimeLocalWorktree<T>(args: {
@@ -91,7 +92,12 @@ export async function materializeRuntimeLocalWorktree<T>(args: {
         ? {
             sparseDirectories,
             sparseBaseRef: metadataBaseRef,
-            sparsePresetId: request.sparseCheckout?.presetId
+            sparsePresetId: attributedSparsePresetId(
+              () => store.getSparsePresets?.(repo.id) ?? [],
+              repo.id,
+              request.sparseCheckout?.presetId,
+              sparseDirectories
+            )
           }
         : {}),
       ...(request.linkedIssue !== undefined ? { linkedIssue: request.linkedIssue } : {}),
@@ -117,6 +123,7 @@ export async function materializeRuntimeLocalWorktree<T>(args: {
         : {}),
       ...(request.linkedGiteaPR !== undefined ? { linkedGiteaPR: request.linkedGiteaPR } : {}),
       ...(request.linkedWorkItem !== undefined ? { linkedWorkItem: request.linkedWorkItem } : {}),
+      ...(request.linkedItems !== undefined ? { linkedItems: request.linkedItems } : {}),
       ...(request.linkedTaskSourceContext !== undefined
         ? { linkedTaskSourceContext: request.linkedTaskSourceContext }
         : {}),
diff --git a/src/main/runtime/runtime-managed-worktree-create-types.ts b/src/main/runtime/runtime-managed-worktree-create-types.ts
index 08a151bd88ee..6b9c2bc8d037 100644
--- a/src/main/runtime/runtime-managed-worktree-create-types.ts
+++ b/src/main/runtime/runtime-managed-worktree-create-types.ts
@@ -5,6 +5,7 @@ import type {
   CliWorkspaceProvenance,
   GitPushTarget,
   WorkspaceLinkedItem,
+  WorkspaceAttachment,
   Worktree
 } from '../../shared/worktree/types'
 import type { TuiAgent } from '../../shared/tui-agent'
@@ -33,6 +34,7 @@ export type RuntimeManagedWorktreeCreateArgs = {
   linkedAzureDevOpsPR?: number | null
   linkedGiteaPR?: number | null
   linkedWorkItem?: WorkspaceLinkedItem | null
+  linkedItems?: WorkspaceAttachment[]
   linkedTaskSourceContext?: TaskSourceContext | null
   comment?: string
   displayName?: string
diff --git a/src/main/runtime/runtime-notifier-contract.ts b/src/main/runtime/runtime-notifier-contract.ts
index 0777e7e1e7da..973da646e87c 100644
--- a/src/main/runtime/runtime-notifier-contract.ts
+++ b/src/main/runtime/runtime-notifier-contract.ts
@@ -119,7 +119,8 @@ export type RuntimeNotifier = {
       newLeafId?: string
     }
   ): void
-  renameTerminal(tabId: string, title: string | null): void
+  /** `recordInteraction: false` marks a title the host applied, not one the user typed. */
+  renameTerminal(tabId: string, title: string | null, options?: { recordInteraction: false }): void
   focusTerminal(tabId: string, worktreeId: string, leafId?: string | null): void
   focusEditorTab?(tabId: string, worktreeId: string): void
   closeSessionTab?(tabId: string, worktreeId: string): void | Promise<void>
diff --git a/src/main/runtime/runtime-project-group-controller.ts b/src/main/runtime/runtime-project-group-controller.ts
index 2530ef9ad158..f866ccfde866 100644
--- a/src/main/runtime/runtime-project-group-controller.ts
+++ b/src/main/runtime/runtime-project-group-controller.ts
@@ -1,3 +1,4 @@
+import type { WorkspaceAttachmentMutation } from '../../shared/workspace-attachment-mutation'
 import type { FolderWorkspace } from '../../shared/folder-workspace-types'
 import type { ProjectGroup } from '../../shared/project-group-types'
 import type { Repo } from '../../shared/repo-types'
@@ -29,6 +30,7 @@ type FolderWorkspaceUpdates = Partial<
     | 'name'
     | 'folderPath'
     | 'linkedTask'
+    | 'linkedItems'
     | 'linkedTaskSourceContext'
     | 'comment'
     | 'isArchived'
@@ -43,7 +45,8 @@ type FolderWorkspaceUpdates = Partial<
     | 'lastActivityAt'
     | 'diffComments'
   >
->
+> &
+  WorkspaceAttachmentMutation
 
 export class RuntimeProjectGroupController {
   constructor(private readonly deps: RuntimeProjectGroupDependencies) {}
@@ -126,6 +129,7 @@ export class RuntimeProjectGroupController {
     connectionId?: string | null
     creatorProvenance?: FolderWorkspace['creatorProvenance']
     linkedTask?: FolderWorkspace['linkedTask']
+    linkedItems?: FolderWorkspace['linkedItems']
     linkedTaskSourceContext?: FolderWorkspace['linkedTaskSourceContext']
     createdWithAgent?: FolderWorkspace['createdWithAgent']
     pendingFirstAgentMessageRename?: boolean
diff --git a/src/main/runtime/runtime-remote-worktree-create-request.ts b/src/main/runtime/runtime-remote-worktree-create-request.ts
index 0f12caff28c8..a40bc4b0513e 100644
--- a/src/main/runtime/runtime-remote-worktree-create-request.ts
+++ b/src/main/runtime/runtime-remote-worktree-create-request.ts
@@ -55,6 +55,7 @@ export async function requestRuntimeRemoteWorktree(
         : {}),
       ...(args.linkedGiteaPR != null ? { linkedGiteaPR: args.linkedGiteaPR } : {}),
       ...(args.linkedWorkItem !== undefined ? { linkedWorkItem: args.linkedWorkItem } : {}),
+      ...(args.linkedItems !== undefined ? { linkedItems: args.linkedItems } : {}),
       ...(args.linkedTaskSourceContext !== undefined
         ? { linkedTaskSourceContext: args.linkedTaskSourceContext }
         : {}),
diff --git a/src/main/runtime/runtime-rpc/runtime-rpc-mobile-agent-session-methods.ts b/src/main/runtime/runtime-rpc/runtime-rpc-mobile-agent-session-methods.ts
index 53c0a8717031..56b30d837a5d 100644
--- a/src/main/runtime/runtime-rpc/runtime-rpc-mobile-agent-session-methods.ts
+++ b/src/main/runtime/runtime-rpc/runtime-rpc-mobile-agent-session-methods.ts
@@ -23,6 +23,8 @@ export const MOBILE_AGENT_SESSION_RPC_METHODS = [
   'agentSession.unsubscribe',
   // Every session's status on one stream: the phone's chat reads the host's "Stopping…" from it.
   'agentSession.subscribeStatus',
+  // One visual from the chat's own visuals folder, for the transcript's `::orca-visual` lines.
+  'agentSession.readVisual',
   // No-ops on a current host; kept until MIN_COMPATIBLE_RUNTIME_CLIENT_VERSION passes the
   // mobile builds that still call them.
   'agentSession.hold',
diff --git a/src/main/runtime/runtime-service-command-surface.ts b/src/main/runtime/runtime-service-command-surface.ts
index c62fc799dd40..966976e1a946 100644
--- a/src/main/runtime/runtime-service-command-surface.ts
+++ b/src/main/runtime/runtime-service-command-surface.ts
@@ -54,7 +54,9 @@ export type RuntimeServiceCommandSurface = {
   selectCodexAccountForTarget: RuntimeAccountController['selectCodexForTarget']
   consumeCodexRateLimitResetCredit: RuntimeAccountController['consumeCodexResetCredit']
   removeClaudeAccount: RuntimeAccountController['removeClaude']
-  addClaudeAccountFromConfigDir: RuntimeAccountController['addClaudeFromConfigDir']
+  beginClaudeSignIn: RuntimeAccountController['beginClaudeSignIn']
+  finishClaudeSignIn: RuntimeAccountController['finishClaudeSignIn']
+  cancelClaudeSignIn: RuntimeAccountController['cancelClaudeSignIn']
   removeCodexAccount: RuntimeAccountController['removeCodex']
   addCodexAccountFromHome: RuntimeAccountController['addCodexFromHome']
   addDataAccountFromHome: RuntimeAccountController['addDataFromHome']
@@ -154,7 +156,9 @@ export function installRuntimeServiceCommandSurface(
     selectCodexAccountForTarget: accounts.selectCodexForTarget.bind(accounts),
     consumeCodexRateLimitResetCredit: accounts.consumeCodexResetCredit.bind(accounts),
     removeClaudeAccount: accounts.removeClaude.bind(accounts),
-    addClaudeAccountFromConfigDir: accounts.addClaudeFromConfigDir.bind(accounts),
+    beginClaudeSignIn: accounts.beginClaudeSignIn.bind(accounts),
+    finishClaudeSignIn: accounts.finishClaudeSignIn.bind(accounts),
+    cancelClaudeSignIn: accounts.cancelClaudeSignIn.bind(accounts),
     removeCodexAccount: accounts.removeCodex.bind(accounts),
     addCodexAccountFromHome: accounts.addCodexFromHome.bind(accounts),
     addDataAccountFromHome: accounts.addDataFromHome.bind(accounts),
diff --git a/src/main/runtime/runtime-store-contract.ts b/src/main/runtime/runtime-store-contract.ts
index a3787e7f3020..24940d7f2dbb 100644
--- a/src/main/runtime/runtime-store-contract.ts
+++ b/src/main/runtime/runtime-store-contract.ts
@@ -130,6 +130,7 @@ export type RuntimeStore = {
     hostSettingOverrides?: GlobalSettings['hostSettingOverrides']
     agentSkillSharingEnabled?: GlobalSettings['agentSkillSharingEnabled']
     nativeChatSessionOptions?: GlobalSettings['nativeChatSessionOptions']
+    nativeChatInlineVisuals?: GlobalSettings['nativeChatInlineVisuals']
     nativeChatInheritShellEnvironment?: GlobalSettings['nativeChatInheritShellEnvironment']
     nativeChatShellEnvironmentVariables?: GlobalSettings['nativeChatShellEnvironmentVariables']
     aiVaultSearch?: GlobalSettings['aiVaultSearch']
diff --git a/src/main/runtime/runtime-worktree-terminal-provisioning.test.ts b/src/main/runtime/runtime-worktree-terminal-provisioning.test.ts
new file mode 100644
index 000000000000..3ae0cd8e1b95
--- /dev/null
+++ b/src/main/runtime/runtime-worktree-terminal-provisioning.test.ts
@@ -0,0 +1,96 @@
+import { describe, expect, it, vi } from 'vitest'
+import {
+  provisionWorktreeTerminals,
+  type WorktreeTerminalProvisioningHost
+} from './runtime-worktree-terminal-provisioning'
+
+const DEFAULT_TABS = {
+  runCommands: true,
+  tabs: [
+    { title: 'Dev', command: 'pnpm dev', color: '#ff0000' },
+    { title: 'Tests', command: 'pnpm test', color: '#00ff00' }
+  ]
+}
+
+function fakeHost() {
+  let created = 0
+  return {
+    canSpawn: () => true,
+    createTerminal: vi.fn(async () => {
+      created += 1
+      return { handle: `term_${created}` }
+    }),
+    splitTerminal: vi.fn(),
+    setTabTitle: vi.fn(async (_handle: string, _title: string) => {}),
+    setTabColor: vi.fn(async (_handle: string, _color: string) => {}),
+    getSettings: () => ({}),
+    getPtyId: () => undefined,
+    recordSetupCompletionToken: vi.fn()
+  } satisfies Partial<Record<keyof WorktreeTerminalProvisioningHost, unknown>>
+}
+
+function provision(host: ReturnType<typeof fakeHost>, startup: boolean) {
+  return provisionWorktreeTerminals(
+    // oxlint-disable-next-line typescript/consistent-type-assertions -- SAFETY: the fake implements every host member provisioning reaches for default tabs with no setup.
+    host as unknown as WorktreeTerminalProvisioningHost,
+    {
+      worktreeSelector: 'id:wt-1',
+      worktreeId: 'wt-1',
+      worktreePath: '/worktrees/wt-1',
+      defaultTabs: DEFAULT_TABS,
+      primaryTerminalHandle: startup ? 'term_agent' : null,
+      hasStartupTerminal: startup,
+      setupCommandPlatform: 'posix'
+    }
+  )
+}
+
+describe('default tabs beside the agent a create started', () => {
+  it('makes the agent the first default tab, as the window lays it out', async () => {
+    const host = fakeHost()
+    await provision(host, true)
+
+    expect(host.setTabTitle).toHaveBeenCalledWith('term_agent', 'Dev')
+    expect(host.setTabColor).toHaveBeenCalledWith('term_agent', '#ff0000')
+    // The first template's command never runs beside the agent; only the rest are created.
+    expect(host.createTerminal).toHaveBeenCalledTimes(1)
+    expect(host.createTerminal).toHaveBeenCalledWith('id:wt-1', {
+      title: 'Tests',
+      command: 'pnpm test'
+    })
+  })
+
+  it('dresses every created default tab the same way', async () => {
+    const host = fakeHost()
+    await provision(host, false)
+
+    expect(host.createTerminal).toHaveBeenCalledTimes(2)
+    expect(host.setTabTitle.mock.calls).toEqual([
+      ['term_1', 'Dev'],
+      ['term_2', 'Tests']
+    ])
+    expect(host.setTabColor.mock.calls).toEqual([
+      ['term_1', '#ff0000'],
+      ['term_2', '#00ff00']
+    ])
+  })
+
+  it('still colors the tab and creates the rest when titling fails', async () => {
+    const host = fakeHost()
+    host.setTabTitle.mockRejectedValue(new Error('terminal_tab_unresolved'))
+    const warn = vi.spyOn(console, 'warn').mockImplementation(() => {})
+
+    await expect(provision(host, true)).resolves.toEqual({
+      setupSpawned: false,
+      setupTerminalHandle: null
+    })
+
+    expect(host.setTabColor).toHaveBeenCalledWith('term_agent', '#ff0000')
+    expect(host.createTerminal).toHaveBeenCalledTimes(1)
+    expect(warn).toHaveBeenCalledWith(
+      '[worktree-create] Failed to title a default tab for wt-1:',
+      expect.any(Error)
+    )
+    warn.mockRestore()
+  })
+})
diff --git a/src/main/runtime/runtime-worktree-terminal-provisioning.ts b/src/main/runtime/runtime-worktree-terminal-provisioning.ts
index 248757f863a8..3110c5228c65 100644
--- a/src/main/runtime/runtime-worktree-terminal-provisioning.ts
+++ b/src/main/runtime/runtime-worktree-terminal-provisioning.ts
@@ -5,7 +5,7 @@ import { buildObservedSetupCommand } from './orchestration/setup-completion-sign
 import { buildSetupRunnerCommand } from '../../shared/setup-runner-command'
 import type { RuntimeStore } from './runtime-store-contract'
 
-type TerminalResult = { handle: string; tabId?: string | null }
+type TerminalResult = { handle: string }
 export type WorktreeProvisionTerminalOptions = {
   title?: string
   command?: string
@@ -25,7 +25,10 @@ export type WorktreeTerminalProvisioningHost = {
     handle: string,
     options: WorktreeProvisionTerminalOptions
   ) => Promise<TerminalResult>
-  setTabColor: (worktreeId: string, tabId: string, color: string) => Promise<void>
+  // Why: keyed by the terminal; the host resolves its tab, so no create path can forget to pass it.
+  // The title is the tab's own, as the window's setTabCustomTitle sets it, never the pane's title.
+  setTabTitle: (handle: string, title: string) => Promise<void>
+  setTabColor: (handle: string, color: string) => Promise<void>
   getSettings: () => ReturnType<RuntimeStore['getSettings']>
   getPtyId: (handle: string) => string | undefined
   recordSetupCompletionToken: (ptyId: string, token: string) => void
@@ -51,13 +54,20 @@ export async function createWorktreeDefaultTabTerminals(
   selector: string,
   worktreeId: string,
   defaultTabs: CreateWorktreeResult['defaultTabs'] | undefined,
-  surfacing: { surfaceOwner?: false } = {}
+  surfacing: { surfaceOwner?: false } = {},
+  startupHandle?: string
 ): Promise<string[]> {
   if (!defaultTabs || defaultTabs.tabs.length === 0 || !host.canSpawn()) {
     return []
   }
+  const [first, ...rest] = defaultTabs.tabs
+  // The agent the create started is the workspace's first tab, as the window lays it out: it takes
+  // the first template's title and color, and that template's command does not run beside it.
+  if (startupHandle && first) {
+    await dressAsDefaultTab(host, worktreeId, startupHandle, first)
+  }
   const handles: string[] = []
-  for (const template of defaultTabs.tabs) {
+  for (const template of startupHandle ? rest : defaultTabs.tabs) {
     try {
       const command = template.command?.trim()
       const terminal = await host.createTerminal(selector, {
@@ -66,9 +76,7 @@ export async function createWorktreeDefaultTabTerminals(
         ...surfacing
       })
       handles.push(terminal.handle)
-      if (template.color && terminal.tabId) {
-        await host.setTabColor(worktreeId, terminal.tabId, template.color)
-      }
+      await dressAsDefaultTab(host, worktreeId, terminal.handle, template)
     } catch (error) {
       console.warn(`[worktree-create] Failed to create default tab for ${worktreeId}:`, error)
     }
@@ -76,6 +84,30 @@ export async function createWorktreeDefaultTabTerminals(
   return handles
 }
 
+// Why: a tab's look is bookkeeping; a failure is logged and never costs the tab, the other field,
+// or the create.
+async function dressAsDefaultTab(
+  host: WorktreeTerminalProvisioningHost,
+  worktreeId: string,
+  handle: string,
+  template: NonNullable<CreateWorktreeResult['defaultTabs']>['tabs'][number]
+): Promise<void> {
+  if (template.title) {
+    try {
+      await host.setTabTitle(handle, template.title)
+    } catch (error) {
+      console.warn(`[worktree-create] Failed to title a default tab for ${worktreeId}:`, error)
+    }
+  }
+  if (template.color) {
+    try {
+      await host.setTabColor(handle, template.color)
+    } catch (error) {
+      console.warn(`[worktree-create] Failed to color a default tab for ${worktreeId}:`, error)
+    }
+  }
+}
+
 export async function provisionWorktreeTerminals(
   host: WorktreeTerminalProvisioningHost,
   args: WorktreeTerminalProvisioningArgs
@@ -92,7 +124,8 @@ export async function provisionWorktreeTerminals(
       args.worktreeSelector,
       args.worktreeId,
       args.defaultTabs,
-      surfacing
+      surfacing,
+      args.hasStartupTerminal ? (args.primaryTerminalHandle ?? undefined) : undefined
     )
     let primaryHandle = args.primaryTerminalHandle ?? defaultHandles[0] ?? null
     const setupLaunchMode =
diff --git a/src/main/runtime/single-page-browser-commands-host-test-double.ts b/src/main/runtime/single-page-browser-commands-host-test-double.ts
new file mode 100644
index 000000000000..dae6f73e02e1
--- /dev/null
+++ b/src/main/runtime/single-page-browser-commands-host-test-double.ts
@@ -0,0 +1,34 @@
+import { vi } from 'vitest'
+import type { AgentBrowserBridge } from '../browser/agent-browser-bridge'
+import type { RuntimeBrowserCommandHost } from './orca-runtime-browser'
+import { RuntimeBrowserPageRegistry } from './runtime-browser-page-registry'
+
+// The part of the authoritative window a browser stream touches: its renderer's throttle.
+export type AuthoritativeWindowDouble = {
+  webContents: { isDestroyed: () => boolean; setBackgroundThrottling: (allowed: boolean) => void }
+}
+
+/** A browser command host whose worktree `wt-1` has one registered page, `page-1`. */
+export function createSinglePageBrowserCommandsHost(
+  window: AuthoritativeWindowDouble | null = null
+): RuntimeBrowserCommandHost {
+  const runtimeBrowserPages = new RuntimeBrowserPageRegistry()
+  // oxlint-disable-next-line typescript/consistent-type-assertions -- SAFETY: page commands read only these bridge members.
+  const bridge = {
+    getRegisteredTabs: vi.fn(() => new Map([['page-1', 100]])),
+    getActivePageId: vi.fn(() => 'page-1'),
+    tabList: vi.fn(() => ({
+      tabs: [
+        { browserPageId: 'page-1', index: 0, url: 'about:blank', title: 'Browser', active: true }
+      ]
+    }))
+  } as unknown as AgentBrowserBridge
+  // oxlint-disable-next-line typescript/consistent-type-assertions -- SAFETY: page commands read only these host members.
+  return {
+    resolveWorktreeSelector: async () => ({ id: 'wt-1' }),
+    getAgentBrowserBridge: () => bridge,
+    getRuntimeBrowserPageRegistry: () => runtimeBrowserPages,
+    getAvailableAuthoritativeWindow: vi.fn(() => window),
+    getOffscreenBrowserBackend: vi.fn(() => null)
+  } as unknown as RuntimeBrowserCommandHost
+}
diff --git a/src/main/runtime/structured-agent-create-support-opencode-rig.test.ts b/src/main/runtime/structured-agent-create-support-opencode-rig.test.ts
new file mode 100644
index 000000000000..97f258120726
--- /dev/null
+++ b/src/main/runtime/structured-agent-create-support-opencode-rig.test.ts
@@ -0,0 +1,137 @@
+import { chmod, 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 { restoreManagedDataAccountEnvironment } from '../../shared/managed-data-account-environment'
+import { openCodeAcpAccountBinding } from '../opencode/opencode-structured-account-home'
+import { resolveHostStructuredAgentCreateSupport } from './structured-agent-launch-support'
+
+// Live QA run 5 on #25845: the app launched with HOME and every XDG directory pointed into the rig,
+// and OpenCode's Command and per-agent PATH both naming a private 1.18.31. The host's whole create
+// check, with a real `--version` against stand-in scripts, must admit that OpenCode.
+
+const { loginShell } = vi.hoisted(() => {
+  const loginShell: { env: Record<string, string> } = { env: {} }
+  return { loginShell }
+})
+vi.mock('../startup/login-shell-environment', () => ({
+  resolveLoginShellEnvironment: async () => loginShell.env
+}))
+
+let root: string
+let privateOpencode: string
+
+/** A stand-in `opencode` that answers `--version` with `version`; never a real agent CLI. */
+async function fakeOpencode(dir: string, version: string): Promise<string> {
+  await mkdir(dir, { recursive: true })
+  const file = join(dir, 'opencode')
+  await writeFile(file, `#!/bin/sh\necho ${version}\n`)
+  await chmod(file, 0o755)
+  return file
+}
+
+function rigSettings(command: string, extraEnv: Record<string, string> = {}) {
+  return {
+    nativeChatInheritShellEnvironment: true,
+    nativeChatShellEnvironmentVariables: [],
+    agentCmdOverrides: { opencode: command },
+    agentDefaultEnv: {
+      opencode: { PATH: `${join(root, 'oc-prefix', 'bin')}:/usr/bin:/bin`, ...extraEnv }
+    }
+  }
+}
+
+const managedAccounts = {
+  list: () => ({ accounts: [], activeAccountId: null }),
+  restoreOriginalEnvironment: restoreManagedDataAccountEnvironment,
+  environmentForAccount: () => ({})
+}
+
+/** OpenCode's account binding, as create resolves it: the account a new chat would pin. */
+function pinnedAccount(launchEnv: Record<string, string>) {
+  return openCodeAcpAccountBinding(() => managedAccounts).resolve({ launchEnv })
+}
+
+/** `agentSession.createSupport` on this host for a local git worktree under the rig's settings. */
+function createSupport(settings: ReturnType<typeof rigSettings>) {
+  return resolveHostStructuredAgentCreateSupport({
+    agent: 'opencode',
+    worktreeSelector: 'id:workspace-1',
+    location: {
+      executionHostId: 'local',
+      wslDistro: null,
+      workspaceId: 'workspace-1',
+      workspaceKind: 'git-worktree'
+    },
+    runtime: {
+      requireStore: () => ({ getSettings: () => settings }),
+      resolveRuntimeFileTarget: async () => ({ worktree: { path: join(root, 'proj') } })
+    }
+  })
+}
+
+beforeEach(async () => {
+  root = await mkdtemp(join(tmpdir(), 'orca-opencode-rig-'))
+  await mkdir(join(root, 'proj'))
+  const homebrew = await fakeOpencode(join(root, 'homebrew'), '2.0.21')
+  privateOpencode = await fakeOpencode(join(root, 'oc-prefix', 'bin'), '1.18.31')
+  const home = join(root, 'home-r7')
+  loginShell.env = {
+    PATH: `${join(homebrew, '..')}:/usr/bin:/bin`,
+    HOME: home,
+    XDG_CONFIG_HOME: join(home, '.config'),
+    XDG_DATA_HOME: join(home, '.local', 'share'),
+    XDG_STATE_HOME: join(home, '.local', 'state'),
+    XDG_CACHE_HOME: join(home, '.cache')
+  }
+})
+afterEach(async () => {
+  vi.restoreAllMocks()
+  await rm(root, { recursive: true, force: true })
+})
+
+describe.skipIf(process.platform === 'win32')('OpenCode create support under the QA rig', () => {
+  it('admits the private 1.18.31 the Command setting names, with every XDG directory set', async () => {
+    const info = vi.spyOn(console, 'info').mockImplementation(() => {})
+
+    expect(await createSupport(rigSettings(privateOpencode))).toEqual({ supported: true })
+    expect(info).toHaveBeenCalledWith(
+      `[agent-cli-version] ${privateOpencode} --version: 1.18.31 is supported`
+    )
+  })
+
+  it('admits the 2.x first on the shell PATH when the Command names it', async () => {
+    vi.spyOn(console, 'info').mockImplementation(() => {})
+    const homebrew = join(root, 'homebrew', 'opencode')
+
+    expect(await createSupport(rigSettings(homebrew))).toEqual({ supported: true })
+  })
+
+  it('names the check that refused an older Command in the main log', async () => {
+    const warn = vi.spyOn(console, 'warn').mockImplementation(() => {})
+    const older = await fakeOpencode(join(root, 'older'), '1.18.30')
+
+    expect(await createSupport(rigSettings(older))).toEqual({
+      supported: false,
+      reason: 'agent'
+    })
+    expect(warn).toHaveBeenCalledWith(
+      '[structured-create-support] opencode unsupported: installed-agent check refused (reason agent)'
+    )
+  })
+
+  it('admits inline credentials and relative folders, recording no folders for the chat', async () => {
+    vi.spyOn(console, 'info').mockImplementation(() => {})
+    const settings = rigSettings(privateOpencode, {
+      OPENCODE_AUTH_CONTENT: '{}',
+      XDG_DATA_HOME: 'relative/data',
+      XDG_STATE_HOME: 'relative/state'
+    })
+
+    expect(await createSupport(settings)).toEqual({ supported: true })
+    await expect(pinnedAccount(settings.agentDefaultEnv.opencode)).resolves.toEqual({
+      kind: 'opencode',
+      locator: { kind: 'unmanaged' }
+    })
+  })
+})
diff --git a/src/main/runtime/structured-agent-launch-support-probe-omp.test.ts b/src/main/runtime/structured-agent-launch-support-probe-omp.test.ts
new file mode 100644
index 000000000000..393f0158594e
--- /dev/null
+++ b/src/main/runtime/structured-agent-launch-support-probe-omp.test.ts
@@ -0,0 +1,123 @@
+import { chmod, 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 { GlobalSettings } from '../../shared/global-settings-types'
+import { agentSessionRecordFixture } from '../../shared/agent-session-record.test-fixture'
+import { acpLaunchSpecFor } from '../acp/acp-launch-specs'
+import { createAcpStructuredLaunchResolver } from '../acp/acp-structured-launch-resolution'
+import { structuredAgentSupportsLaunch } from './structured-agent-launch-support'
+
+const { loginShell } = vi.hoisted(() => {
+  const loginShell: { env: Record<string, string> } = { env: {} }
+  return { loginShell }
+})
+vi.mock('../startup/login-shell-environment', () => ({
+  resolveLoginShellEnvironment: async () => loginShell.env
+}))
+
+type Settings = Pick<
+  GlobalSettings,
+  'agentDefaultEnv' | 'nativeChatInheritShellEnvironment' | 'nativeChatShellEnvironmentVariables'
+> &
+  Partial<Pick<GlobalSettings, 'agentCmdOverrides'>>
+
+let root: string
+let shellBin: string
+let privateBin: string
+
+/** A stand-in `omp` that answers `--version` as OMP does; never the real agent CLI. */
+async function fakeOmp(dir: string, version: string): Promise<string> {
+  await mkdir(dir, { recursive: true })
+  const file = join(dir, 'omp')
+  await writeFile(file, `#!/bin/sh\necho omp/${version}\n`)
+  await chmod(file, 0o755)
+  return dir
+}
+
+function runtimeWith(settings: Settings) {
+  return {
+    requireStore: () => ({ getSettings: () => settings }),
+    resolveRuntimeFileTarget: async () => ({ worktree: { path: root } })
+  }
+}
+
+function launchWith(settings: Settings) {
+  return createAcpStructuredLaunchResolver(acpLaunchSpecFor('omp')!, {
+    store: {
+      getRecord: () => ({
+        ...agentSessionRecordFixture(),
+        provider: 'omp',
+        providerHandleChain: [],
+        accountHome: { variable: 'PI_CODING_AGENT_DIR', path: join(root, '.omp', 'agent') }
+      })
+    },
+    readJournal: () => null,
+    resolveWorkspacePath: async () => root,
+    resolveEnvironment: async () => loginShell.env,
+    resolveLaunchEnv: () => settings.agentDefaultEnv?.omp ?? {},
+    resolveCommandSettings: () => settings,
+    inheritedEnv: {}
+  })({
+    identity: {
+      sessionId: 'session-alpha-1',
+      workspaceId: 'workspace-1',
+      hostId: 'local',
+      agent: 'omp',
+      providerHandle: null
+    }
+  })
+}
+
+beforeEach(async () => {
+  root = await mkdtemp(join(tmpdir(), 'orca-omp-probe-'))
+  shellBin = await fakeOmp(join(root, 'shell-bin'), '16.2.0')
+  privateBin = await fakeOmp(join(root, 'omp-prefix', 'bin'), '17.0.5')
+  // Orca's resolved login-shell PATH, with an OMP older than ACP support first.
+  loginShell.env = { PATH: `${shellBin}:/usr/bin:/bin`, HOME: root }
+})
+afterEach(async () => {
+  await rm(root, { recursive: true, force: true })
+})
+
+const base = { nativeChatInheritShellEnvironment: true, nativeChatShellEnvironmentVariables: [] }
+
+// Real `--version` runs against stand-in scripts: the whole create check, not a mocked probe.
+describe.skipIf(process.platform === 'win32')('OMP create check and launch, real probe', () => {
+  it('checks and launches the binary the Command setting names', async () => {
+    const settings = {
+      ...base,
+      agentDefaultEnv: {},
+      agentCmdOverrides: { omp: join(privateBin, 'omp') }
+    }
+    expect(await structuredAgentSupportsLaunch('omp', 'id:w', runtimeWith(settings))).toBe(true)
+    const launch = await launchWith(settings)
+    expect(launch.command).toBe(join(privateBin, 'omp'))
+    expect(launch.args).toEqual(['acp'])
+  })
+
+  it('asks the OMP the per-agent PATH names, not the one first on the shell PATH', async () => {
+    const settings = { ...base, agentDefaultEnv: { omp: { PATH: `${privateBin}:/usr/bin:/bin` } } }
+    expect(await structuredAgentSupportsLaunch('omp', 'id:w', runtimeWith(settings))).toBe(true)
+    expect((await launchWith(settings)).command).toBe(join(privateBin, 'omp'))
+  })
+
+  it('keeps an OMP older than 17.0.5 on its terminal-backed chat', async () => {
+    const settings = { ...base, agentDefaultEnv: {} }
+    expect(await structuredAgentSupportsLaunch('omp', 'id:w', runtimeWith(settings))).toBe(false)
+  })
+
+  it('refuses the launch with the setting named when the Command is not runnable', async () => {
+    const settings = {
+      ...base,
+      agentDefaultEnv: {},
+      agentCmdOverrides: { omp: join(root, 'missing', 'omp') }
+    }
+    // Admitted, so the chat states why rather than silently opening a terminal.
+    expect(await structuredAgentSupportsLaunch('omp', 'id:w', runtimeWith(settings))).toBe(true)
+    await expect(launchWith(settings)).rejects.toMatchObject({
+      name: 'AgentSessionPreSpawnError',
+      reason: 'agentCommandNotRunnable'
+    })
+  })
+})
diff --git a/src/main/runtime/structured-agent-launch-support-probe.test.ts b/src/main/runtime/structured-agent-launch-support-probe.test.ts
new file mode 100644
index 000000000000..ba62cfac4228
--- /dev/null
+++ b/src/main/runtime/structured-agent-launch-support-probe.test.ts
@@ -0,0 +1,144 @@
+import { chmod, 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 { GlobalSettings } from '../../shared/global-settings-types'
+import { agentSessionRecordFixture } from '../../shared/agent-session-record.test-fixture'
+import { acpLaunchSpecFor } from '../acp/acp-launch-specs'
+import { createAcpStructuredLaunchResolver } from '../acp/acp-structured-launch-resolution'
+import { structuredAgentSupportsLaunch } from './structured-agent-launch-support'
+
+const { loginShell } = vi.hoisted(() => {
+  const loginShell: { env: Record<string, string> } = { env: {} }
+  return { loginShell }
+})
+vi.mock('../startup/login-shell-environment', () => ({
+  resolveLoginShellEnvironment: async () => loginShell.env
+}))
+
+type Settings = Pick<
+  GlobalSettings,
+  'agentDefaultEnv' | 'nativeChatInheritShellEnvironment' | 'nativeChatShellEnvironmentVariables'
+> &
+  Partial<Pick<GlobalSettings, 'agentCmdOverrides'>>
+
+let root: string
+let shellBin: string
+let privateBin: string
+
+/** A stand-in `opencode` that answers `--version` with `version`; never a real agent CLI. */
+async function fakeOpencode(dir: string, version: string): Promise<string> {
+  await mkdir(dir, { recursive: true })
+  const file = join(dir, 'opencode')
+  await writeFile(file, `#!/bin/sh\necho ${version}\n`)
+  await chmod(file, 0o755)
+  return dir
+}
+
+function runtimeWith(settings: Settings) {
+  return {
+    requireStore: () => ({ getSettings: () => settings }),
+    resolveRuntimeFileTarget: async () => ({ worktree: { path: root } })
+  }
+}
+
+function launchWith(settings: Settings) {
+  return createAcpStructuredLaunchResolver(acpLaunchSpecFor('opencode')!, {
+    store: {
+      getRecord: () => ({
+        ...agentSessionRecordFixture(),
+        provider: 'opencode',
+        providerHandleChain: [],
+        accountHome: { kind: 'opencode', locator: { kind: 'unmanaged' } }
+      })
+    },
+    readJournal: () => null,
+    resolveWorkspacePath: async () => root,
+    resolveEnvironment: async () => loginShell.env,
+    resolveLaunchEnv: () => settings.agentDefaultEnv?.opencode ?? {},
+    resolveCommandSettings: () => settings,
+    inheritedEnv: {}
+  })({
+    identity: {
+      sessionId: 'session-alpha-1',
+      workspaceId: 'workspace-1',
+      hostId: 'local',
+      agent: 'opencode',
+      providerHandle: null
+    }
+  })
+}
+
+beforeEach(async () => {
+  root = await mkdtemp(join(tmpdir(), 'orca-opencode-probe-'))
+  shellBin = await fakeOpencode(join(root, 'homebrew'), '1.18.30')
+  privateBin = await fakeOpencode(join(root, 'oc-prefix', 'bin'), '1.18.31')
+  // Orca's resolved login-shell PATH, with an `opencode` older than the structured chat's first.
+  loginShell.env = { PATH: `${shellBin}:/usr/bin:/bin`, HOME: root }
+})
+afterEach(async () => {
+  await rm(root, { recursive: true, force: true })
+})
+
+const base = { nativeChatInheritShellEnvironment: true, nativeChatShellEnvironmentVariables: [] }
+
+// Real `--version` runs against stand-in scripts: the whole create check, not a mocked probe.
+describe.skipIf(process.platform === 'win32')(
+  'OpenCode create check and launch, real probe',
+  () => {
+    it('asks the OpenCode the per-agent PATH names, not the one first on the shell PATH', async () => {
+      const settings = {
+        ...base,
+        agentDefaultEnv: { opencode: { PATH: `${privateBin}:/usr/bin:/bin` } }
+      }
+      expect(await structuredAgentSupportsLaunch('opencode', 'id:w', runtimeWith(settings))).toBe(
+        true
+      )
+      expect((await launchWith(settings)).command).toBe(join(privateBin, 'opencode'))
+    })
+
+    it('keeps a refused release first on PATH on the terminal chat when nothing points elsewhere', async () => {
+      const settings = { ...base, agentDefaultEnv: {} }
+      expect(await structuredAgentSupportsLaunch('opencode', 'id:w', runtimeWith(settings))).toBe(
+        false
+      )
+    })
+
+    it('runs a stable 2.x first on PATH in the structured chat', async () => {
+      await fakeOpencode(shellBin, '2.0.21')
+      const settings = { ...base, agentDefaultEnv: {} }
+      expect(await structuredAgentSupportsLaunch('opencode', 'id:w', runtimeWith(settings))).toBe(
+        true
+      )
+      expect((await launchWith(settings)).command).toBe(join(shellBin, 'opencode'))
+    })
+
+    it('checks and launches the binary the Command setting names', async () => {
+      const settings = {
+        ...base,
+        agentDefaultEnv: {},
+        agentCmdOverrides: { opencode: join(privateBin, 'opencode') }
+      }
+      expect(await structuredAgentSupportsLaunch('opencode', 'id:w', runtimeWith(settings))).toBe(
+        true
+      )
+      expect((await launchWith(settings)).command).toBe(join(privateBin, 'opencode'))
+    })
+
+    it('refuses the launch with the setting named when the Command is not runnable', async () => {
+      const settings = {
+        ...base,
+        agentDefaultEnv: {},
+        agentCmdOverrides: { opencode: join(root, 'missing', 'opencode') }
+      }
+      // Admitted, so the chat states why rather than silently opening a terminal.
+      expect(await structuredAgentSupportsLaunch('opencode', 'id:w', runtimeWith(settings))).toBe(
+        true
+      )
+      await expect(launchWith(settings)).rejects.toMatchObject({
+        name: 'AgentSessionPreSpawnError',
+        reason: 'agentCommandNotRunnable'
+      })
+    })
+  }
+)
diff --git a/src/main/runtime/structured-agent-launch-support.test.ts b/src/main/runtime/structured-agent-launch-support.test.ts
new file mode 100644
index 000000000000..7335d79e9320
--- /dev/null
+++ b/src/main/runtime/structured-agent-launch-support.test.ts
@@ -0,0 +1,120 @@
+import { chmod, 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 { agentSessionRecordFixture } from '../../shared/agent-session-record.test-fixture'
+import { acpLaunchSpecFor } from '../acp/acp-launch-specs'
+import { createAcpStructuredLaunchResolver } from '../acp/acp-structured-launch-resolution'
+import { structuredAgentSupportsLaunch } from './structured-agent-launch-support'
+
+const { probeAgentCliVersion, loginShell } = vi.hoisted(() => {
+  const loginShell: { env: Record<string, string> } = { env: {} }
+  return { probeAgentCliVersion: vi.fn(), loginShell }
+})
+vi.mock('../agent-cli-version-probe', async (importOriginal) => ({
+  ...(await importOriginal<object>()),
+  probeAgentCliVersion
+}))
+vi.mock('../startup/login-shell-environment', () => ({
+  resolveLoginShellEnvironment: async () => loginShell.env
+}))
+
+let bin: string
+const asked: { program: string; cwd: string; env: Record<string, string> }[] = []
+function installedVersion(version: string): void {
+  probeAgentCliVersion.mockImplementation(async (input, supports) => {
+    asked.push(input)
+    return supports(version)
+  })
+}
+
+const settings = {
+  agentDefaultEnv: { opencode: { OPENCODE_EXTRA: '1' } },
+  nativeChatInheritShellEnvironment: true,
+  nativeChatShellEnvironmentVariables: []
+}
+const runtime = {
+  requireStore: () => ({ getSettings: () => settings }),
+  resolveRuntimeFileTarget: vi.fn(async () => ({ worktree: { path: '/repo/worktree' } }))
+}
+
+beforeEach(async () => {
+  asked.length = 0
+  bin = await mkdtemp(join(tmpdir(), 'orca-opencode-bin-'))
+  const opencode = join(bin, 'opencode')
+  await writeFile(opencode, '#!/bin/sh\n')
+  await chmod(opencode, 0o755)
+  loginShell.env = { PATH: bin, HOME: '/home/user' }
+})
+afterEach(async () => {
+  probeAgentCliVersion.mockReset()
+  runtime.resolveRuntimeFileTarget.mockClear()
+  await rm(bin, { recursive: true, force: true })
+})
+
+describe('structuredAgentSupportsLaunch', () => {
+  it('asks nothing for an agent whose location alone decides', async () => {
+    expect(await structuredAgentSupportsLaunch('grok', 'id:workspace-1', runtime)).toBe(true)
+    expect(probeAgentCliVersion).not.toHaveBeenCalled()
+    expect(runtime.resolveRuntimeFileTarget).not.toHaveBeenCalled()
+  })
+
+  it('allows stable OpenCode 1.x and 2.x, asking in the workspace with the launch env', async () => {
+    for (const [version, supported] of [
+      ['1.18.31', true],
+      ['2.0.14', true],
+      ['2.0.21', true],
+      ['1.18.30', false],
+      ['2.0.13', false],
+      ['2.1.0-beta.1', false],
+      ['3.0.0', false]
+    ] as const) {
+      installedVersion(version)
+      expect(await structuredAgentSupportsLaunch('opencode', 'id:workspace-1', runtime)).toBe(
+        supported
+      )
+    }
+    expect(asked[0]).toMatchObject({
+      cwd: '/repo/worktree',
+      env: { PATH: bin, OPENCODE_EXTRA: '1', OPENCODE_CLIENT: 'acp' }
+    })
+  })
+
+  it('refuses when the version cannot be read', async () => {
+    probeAgentCliVersion.mockResolvedValue(false)
+    expect(await structuredAgentSupportsLaunch('opencode', 'id:workspace-1', runtime)).toBe(false)
+  })
+
+  it.skipIf(process.platform === 'win32')(
+    'asks about the same binary the launch then spawns',
+    async () => {
+      installedVersion('1.18.31')
+      await structuredAgentSupportsLaunch('opencode', 'id:workspace-1', runtime)
+      const launch = await createAcpStructuredLaunchResolver(acpLaunchSpecFor('opencode')!, {
+        store: {
+          getRecord: () => ({
+            ...agentSessionRecordFixture(),
+            provider: 'opencode',
+            providerHandleChain: [],
+            accountHome: { kind: 'opencode', locator: { kind: 'unmanaged' } }
+          })
+        },
+        readJournal: () => null,
+        resolveWorkspacePath: async () => '/repo/worktree',
+        resolveEnvironment: async () => loginShell.env,
+        resolveLaunchEnv: () => settings.agentDefaultEnv.opencode,
+        inheritedEnv: {}
+      })({
+        identity: {
+          sessionId: 'session-alpha-1',
+          workspaceId: 'workspace-1',
+          hostId: 'local',
+          agent: 'opencode',
+          providerHandle: null
+        }
+      })
+      expect(launch.command).toBe(join(bin, 'opencode'))
+      expect(asked.map(({ program }) => program)).toEqual([launch.command, launch.command])
+    }
+  )
+})
diff --git a/src/main/runtime/structured-agent-launch-support.ts b/src/main/runtime/structured-agent-launch-support.ts
new file mode 100644
index 000000000000..5f81b2c91c5b
--- /dev/null
+++ b/src/main/runtime/structured-agent-launch-support.ts
@@ -0,0 +1,85 @@
+import type { AgentSessionExecutionLocation } from '../../shared/agent-session-record'
+import type { StructuredAgentId } from '../../shared/agent-session-provider-handle'
+import type { GlobalSettings } from '../../shared/global-settings-types'
+import { nativeChatShellEnvironmentPolicy } from '../../shared/native-chat-shell-environment'
+import { isTuiAgent } from '../../shared/tui-agent-config'
+import { resolveTuiAgentLaunchEnv } from '../../shared/tui-agent-launch-defaults'
+import {
+  resolveStructuredAgentSessionCreateSupport,
+  warnStructuredAgentSessionCreateUnsupported,
+  type StructuredAgentSessionCreateSupport
+} from '../native-chat/structured-agent-session-create-support'
+import { resolveLoginShellEnvironment } from '../startup/login-shell-environment'
+import { structuredAgentRuntimeRegistration } from './structured-agent-runtime-registrations'
+import { structuredAgentBaseEnvironment } from './structured-agent-shell-environment'
+
+type LaunchEnvironmentSettings = Pick<
+  GlobalSettings,
+  'agentDefaultEnv' | 'nativeChatInheritShellEnvironment' | 'nativeChatShellEnvironmentVariables'
+> &
+  Partial<Pick<GlobalSettings, 'agentCmdOverrides'>>
+
+/** The environment every agent's launch on this host starts from, for a check made before the
+ *  session host is built. */
+async function resolveHostStructuredAgentBaseEnvironment(
+  settings: LaunchEnvironmentSettings
+): Promise<Record<string, string>> {
+  return structuredAgentBaseEnvironment({
+    shellEnv: await resolveLoginShellEnvironment(),
+    policy: nativeChatShellEnvironmentPolicy(settings)
+  })
+}
+
+/** What the check reads from the runtime asking it. */
+type LaunchSupportRuntime = {
+  requireStore(): { getSettings(): LaunchEnvironmentSettings }
+  resolveRuntimeFileTarget(selector: string): Promise<{ worktree: { path: string } }>
+}
+
+/** The agent's own check of what is installed on this host, with the environment and Command
+ *  setting its launch starts from, in the workspace it would launch in; true for an agent whose
+ *  location alone decides. */
+export async function structuredAgentSupportsLaunch(
+  agent: string,
+  worktreeSelector: string,
+  runtime: LaunchSupportRuntime
+): Promise<boolean> {
+  const supportsLaunch = structuredAgentRuntimeRegistration(agent)?.supportsLaunch
+  if (!supportsLaunch) {
+    return true
+  }
+  const settings = runtime.requireStore().getSettings()
+  const env = {
+    ...(await resolveHostStructuredAgentBaseEnvironment(settings)),
+    ...(isTuiAgent(agent) ? resolveTuiAgentLaunchEnv(agent, settings.agentDefaultEnv) : {})
+  }
+  const cwd = (await runtime.resolveRuntimeFileTarget(worktreeSelector)).worktree.path
+  return supportsLaunch({ cwd, env, commandSettings: settings })
+}
+
+/** `agentSession.createSupport` on this host: every refusal it can know before spawning. The
+ *  agent's location rule and installed-agent check from its registration, without installing the
+ *  host. A refusal logs which check said no. */
+export async function resolveHostStructuredAgentCreateSupport(input: {
+  agent: StructuredAgentId
+  worktreeSelector: string
+  location: AgentSessionExecutionLocation
+  runtime: LaunchSupportRuntime
+}): Promise<StructuredAgentSessionCreateSupport> {
+  const { agent, location } = input
+  const supportsLocation =
+    structuredAgentRuntimeRegistration(agent)?.supportsLocation(location) ?? false
+  const supportsLaunch =
+    supportsLocation &&
+    (await structuredAgentSupportsLaunch(agent, input.worktreeSelector, input.runtime))
+  const support = resolveStructuredAgentSessionCreateSupport({
+    location,
+    adapterSupportsCreate: supportsLaunch
+  })
+  warnStructuredAgentSessionCreateUnsupported(
+    agent,
+    support,
+    supportsLocation ? 'installed-agent' : 'location'
+  )
+  return support
+}
diff --git a/src/main/runtime/structured-agent-runtime-registrations-acp.test.ts b/src/main/runtime/structured-agent-runtime-registrations-acp.test.ts
index 5dfc2f7404d2..43b11bdee1cf 100644
--- a/src/main/runtime/structured-agent-runtime-registrations-acp.test.ts
+++ b/src/main/runtime/structured-agent-runtime-registrations-acp.test.ts
@@ -4,12 +4,13 @@ import {
   structuredAgentRuntimeRegistration,
   type StructuredAgentAccountHomeServices
 } from './structured-agent-runtime-registrations'
+import { decideAgentLaunchMode } from '../agent-launch/agent-launch-mode'
 
 describe('ACP agents in the runtime registrations', () => {
   it('registers Grok beside Claude and Codex with its declared capabilities', () => {
     expect(
       STRUCTURED_AGENT_RUNTIME_REGISTRATIONS.map(({ definition }) => definition.agent)
-    ).toEqual(['codex', 'claude', 'grok'])
+    ).toEqual(['pi', 'codex', 'claude', 'grok', 'opencode', 'omp'])
     expect(structuredAgentRuntimeRegistration('grok')?.definition).toMatchObject({
       handleTransport: 'acp',
       accountHomeVariable: 'GROK_HOME',
@@ -25,6 +26,76 @@ describe('ACP agents in the runtime registrations', () => {
     })
   })
 
+  it('registers OpenCode on the ACP lane pinning its tagged account, with image prompts', () => {
+    const definition = structuredAgentRuntimeRegistration('opencode')?.definition
+    expect(definition).toMatchObject({
+      agent: 'opencode',
+      handleTransport: 'acp',
+      accountLocatorKind: 'opencode',
+      capabilities: { imagePrompts: true, steering: 'queue', approvalEnforcement: 'orca' }
+    })
+    expect(definition?.accountHomeVariable).toBeUndefined()
+  })
+
+  it('leaves the `opencode2` agent on its terminal-backed chat, and asks `opencode` its version', () => {
+    expect(structuredAgentRuntimeRegistration('opencode2')).toBeNull()
+    expect(structuredAgentRuntimeRegistration('opencode')?.supportsLaunch).toBeTypeOf('function')
+    // Grok runs whatever is installed: its create asks nothing of the binary.
+    expect(structuredAgentRuntimeRegistration('grok')?.supportsLaunch).toBeUndefined()
+  })
+
+  it('registers OMP on the ACP lane pinning its agent directory, asking its version at create', () => {
+    const registration = structuredAgentRuntimeRegistration('omp')
+    expect(registration?.definition).toMatchObject({
+      agent: 'omp',
+      handleTransport: 'acp',
+      accountHomeVariable: 'PI_CODING_AGENT_DIR',
+      capabilities: { imagePrompts: false, steering: 'queue', approvalEnforcement: 'orca' }
+    })
+    expect(registration?.supportsLaunch).toBeTypeOf('function')
+  })
+
+  it('opens OMP as a structured chat only with the updated structured chat setting on', () => {
+    const settings = {
+      experimentalNativeChat: true,
+      openAgentTabsInChatByDefault: true,
+      experimentalStructuredNativeChat: true
+    }
+    const placement = { agent: 'omp', workspaceKind: 'git-worktree' } as const
+    expect(decideAgentLaunchMode({ placement, settings }).mode).toBe('structured')
+    // Off: OMP keeps the terminal-backed chat it has always had.
+    expect(
+      decideAgentLaunchMode({
+        placement,
+        settings: { ...settings, experimentalStructuredNativeChat: false }
+      })
+    ).toMatchObject({ mode: 'terminal', reason: 'user_default' })
+  })
+
+  it("finds OMP's agent directory from the launch env, else OMP's default", async () => {
+    const { resolveAccountHome } = structuredAgentRuntimeRegistration('omp')!
+    const unused = (): never => {
+      throw new Error('OMP resolves its account home without the runtime')
+    }
+    const resolve = async (launchEnv: NodeJS.ProcessEnv) =>
+      resolveAccountHome(
+        { launchEnv, location: null, purpose: 'read', workspacePath: null },
+        {
+          getClaudeConfigDirectory: unused,
+          prepareCodexLaunchHome: unused,
+          readCodexLaunchHome: unused,
+          workspaceTrustSettings: unused
+        }
+      )
+    await expect(resolve({ PI_CODING_AGENT_DIR: '/data/omp-agent' })).resolves.toEqual({
+      variable: 'PI_CODING_AGENT_DIR',
+      path: '/data/omp-agent'
+    })
+    await expect(resolve({ PI_CODING_AGENT_DIR: '' })).resolves.toMatchObject({
+      path: expect.stringMatching(/[\\/]\.omp[\\/]agent$/)
+    })
+  })
+
   it('takes model and effort picks at rest, and keeps no model list of its own', () => {
     const resting = structuredAgentRuntimeRegistration('grok')!.definition.restingOptions
     expect(['model', 'effort'].map(resting.acceptsKey)).toEqual([true, true])
@@ -33,7 +104,7 @@ describe('ACP agents in the runtime registrations', () => {
   })
 
   it('finds the account home on this runtime from the launch env, else the default', async () => {
-    const { resolveAccountHomePath } = structuredAgentRuntimeRegistration('grok')!
+    const { resolveAccountHome } = structuredAgentRuntimeRegistration('grok')!
     // Grok's resolver asks the runtime for nothing: its home is the launch env's, else the default.
     const unused = (): never => {
       throw new Error('Grok resolves its account home without the runtime')
@@ -44,13 +115,18 @@ describe('ACP agents in the runtime registrations', () => {
       readCodexLaunchHome: unused,
       workspaceTrustSettings: unused
     }
-    const resolve = (launchEnv: NodeJS.ProcessEnv) =>
-      resolveAccountHomePath(
+    const resolve = async (launchEnv: NodeJS.ProcessEnv) =>
+      resolveAccountHome(
         { launchEnv, location: null, purpose: 'read', workspacePath: null },
         services
       )
-    await expect(resolve({ GROK_HOME: '/data/grok' })).resolves.toBe('/data/grok')
-    await expect(resolve({ GROK_HOME: 'relative/grok' })).resolves.toMatch(/\.grok$/)
+    await expect(resolve({ GROK_HOME: '/data/grok' })).resolves.toEqual({
+      variable: 'GROK_HOME',
+      path: '/data/grok'
+    })
+    await expect(resolve({ GROK_HOME: 'relative/grok' })).resolves.toMatchObject({
+      path: expect.stringMatching(/\.grok$/)
+    })
   })
 
   it('runs Grok only where this runtime supervises the child itself', () => {
diff --git a/src/main/runtime/structured-agent-runtime-registrations.ts b/src/main/runtime/structured-agent-runtime-registrations.ts
index a0c0089c8d33..060a87153530 100644
--- a/src/main/runtime/structured-agent-runtime-registrations.ts
+++ b/src/main/runtime/structured-agent-runtime-registrations.ts
@@ -6,17 +6,27 @@ import { supportsClaudeStructuredLocation } from '../claude/claude-structured-lo
 import { supportsSupervisedProviderChildLocation } from '../provider-process/supervised-provider-child-location'
 import { applyStructuredCodexWorkspaceTrust } from '../agent-workspace-trust-spawn'
 import type { AgentSessionExecutionLocation } from '../../shared/agent-session-record'
+import {
+  agentSessionAccountHome,
+  type AgentSessionAccountHome
+} from '../../shared/agent-session-account-home'
 import { CodexStructuredSessionAdapter } from '../codex/codex-structured-session-adapter'
 import { CODEX_STRUCTURED_AGENT } from '../codex/codex-structured-agent-definition'
 import { CLAUDE_STRUCTURED_AGENT } from '../claude/claude-structured-agent-definition'
-import type {
-  StructuredAgentSessionAdapter,
-  StructuredAgentSessionLifecycleEvent
+import {
+  isAgentSessionPreSpawnError,
+  type StructuredAgentSessionAdapter,
+  type StructuredAgentSessionLifecycleEvent
 } from '../native-chat/agent-session-wire/structured-agent-session-adapter'
+import type { StructuredAgentCommandSettings } from '../native-chat/structured-agent-command-resolution'
 import type { StructuredAgentDefinition } from '../native-chat/agent-session-wire/structured-agent-definition'
 import type { StructuredAgentSessionHost } from '../native-chat/agent-session-wire/structured-agent-session-host'
-import { readClaudeManagedAccountGateSettings } from '../native-chat/claude-structured-managed-account-support'
 import { agentModelCatalogStore } from '../native-chat/agent-model-catalog/agent-model-catalog-store'
+import { agentSessionAttachmentStoreRoot } from '../native-chat/agent-session-attachments/agent-session-attachment-references'
+import {
+  createNativeChatVisualsDelivery,
+  type PrepareNativeChatVisuals
+} from '../native-chat/native-chat-visuals-delivery'
 import type { JournalHostDatabase } from '../native-chat/agent-session-journal/journal-host-database'
 import { replayJournal } from '../native-chat/agent-session-journal/journal-open'
 import type { AgentSessionRecordStore } from './agent-session-record-store'
@@ -27,15 +37,19 @@ import { createStructuredClaudeRuntimeAdapter } from './structured-claude-runtim
 import {
   resolveStructuredClaudeAccountHomePath,
   resolveStructuredCodexAccountHomePath,
-  resolveStructuredEnvAccountHomePath,
   type StructuredClaudeAccountHomeDeps,
   type StructuredCodexAccountHomeDeps
 } from './structured-agent-account-home'
 import { ACP_LAUNCH_SPECS, type AcpLaunchSpec } from '../acp/acp-launch-specs'
 import { acpStructuredAgentDefinition } from '../acp/acp-structured-agent-definitions'
 import { createAcpAgentConnection } from '../acp/acp-agent-connection'
-import { createAcpStructuredLaunchResolver } from '../acp/acp-structured-launch-resolution'
+import {
+  acpLaunchVersionSupported,
+  createAcpStructuredLaunchResolver,
+  resolveAcpLaunchCommand
+} from '../acp/acp-structured-launch-resolution'
 import { AcpStructuredSessionAdapter } from '../acp/acp-structured-session-adapter'
+import { PI_RPC_RUNTIME_REGISTRATION } from '../pi/rpc-runtime-registration'
 
 /** What an agent's adapter is built from: the open store and the runtime around it. */
 export type StructuredAgentAdapterContext = {
@@ -81,11 +95,32 @@ export type StructuredAgentRuntimeRegistration = {
   createAdapter: (context: StructuredAgentAdapterContext) => StructuredAgentRuntimeAdapter
   /** Whether this agent's chats can run at `location`; answered without building the host. */
   supportsLocation: (location: AgentSessionExecutionLocation) => boolean
-  /** The account home a chat of this agent pins; see `StructuredAgentAccountHomeRequest`. */
-  resolveAccountHomePath: (
+  /** Whether the agent installed on this host runs a structured chat, asked at create with the
+   *  environment a launch starts from; absent when the location alone decides. */
+  supportsLaunch?: (input: {
+    cwd: string
+    env: Record<string, string>
+    commandSettings: StructuredAgentCommandSettings
+  }) => Promise<boolean>
+  /** The account a chat of this agent pins; see `StructuredAgentAccountHomeRequest`. */
+  resolveAccountHome: (
     request: StructuredAgentAccountHomeRequest,
     services: StructuredAgentAccountHomeServices
-  ) => Promise<string>
+  ) => Promise<AgentSessionAccountHome>
+}
+
+function nativeChatVisualsFor(deps: StructuredAgentSessionRuntimeDeps): {
+  prepareVisuals?: PrepareNativeChatVisuals
+} {
+  return deps.nativeChatVisuals
+    ? {
+        prepareVisuals: createNativeChatVisualsDelivery({
+          stateDirectory: deps.stateDirectory,
+          logger: deps.logger,
+          isEnabled: deps.nativeChatVisuals.isEnabled
+        })
+      }
+    : {}
 }
 
 function createCodexAdapter(context: StructuredAgentAdapterContext): StructuredAgentRuntimeAdapter {
@@ -99,7 +134,8 @@ function createCodexAdapter(context: StructuredAgentAdapterContext): StructuredA
       ...(deps.resolveCodexPermissionPolicy
         ? { resolvePermissionPolicy: deps.resolveCodexPermissionPolicy }
         : {}),
-      ...(deps.resolveCodexCommand ? { resolveCommand: deps.resolveCodexCommand } : {})
+      ...(deps.resolveCodexCommand ? { resolveCommand: deps.resolveCodexCommand } : {}),
+      ...nativeChatVisualsFor(deps)
     }),
     ...(deps.openCodexConnection ? { openConnection: deps.openCodexConnection } : {}),
     ...(deps.readProcessStartTime ? { readProcessStartTime: deps.readProcessStartTime } : {}),
@@ -126,7 +162,8 @@ function createClaudeAdapter(
     store,
     resolveWorkspacePath: deps.resolveWorkspacePath,
     ...(deps.resolveClaudeCommand ? { resolveClaudeCommand: deps.resolveClaudeCommand } : {}),
-    ...(deps.claudeThinkingDisplay ? { claudeThinkingDisplay: deps.claudeThinkingDisplay } : {}),
+    ...(deps.claudeCliFlags ? { claudeCliFlags: deps.claudeCliFlags } : {}),
+    ...nativeChatVisualsFor(deps),
     ...(deps.resolveClaudeLaunchEnv ? { resolveClaudeLaunchEnv: deps.resolveClaudeLaunchEnv } : {}),
     resolveClaudeInheritedEnv: context.environment.resolveClaudeInheritedEnv,
     resolveClaudeLaunchArgs: () => deps.resolveLaunchArgs('claude'),
@@ -134,12 +171,7 @@ function createClaudeAdapter(
     ...(deps.resolveClaudePermissionMode
       ? { resolveClaudePermissionMode: deps.resolveClaudePermissionMode }
       : {}),
-    ...(deps.getClaudeManagedAccountGateSettings
-      ? {
-          readClaudeManagedAccountGate: () =>
-            readClaudeManagedAccountGateSettings(deps.getClaudeManagedAccountGateSettings!)
-        }
-      : {}),
+    attachmentDirectory: agentSessionAttachmentStoreRoot(deps.stateDirectory),
     onLifecycleEvent: context.deliverLifecycle,
     logger: deps.logger,
     onChildWorkEvidence: (sessionId, evidence) =>
@@ -156,22 +188,41 @@ function acpRegistration(spec: AcpLaunchSpec): StructuredAgentRuntimeRegistratio
   return {
     definition: acpStructuredAgentDefinition(spec),
     supportsLocation: (location) => supportsSupervisedProviderChildLocation(location),
-    resolveAccountHomePath: async ({ launchEnv }) =>
-      resolveStructuredEnvAccountHomePath({
-        launchEnv,
-        variable: spec.accountHomeVariable,
-        defaultPath: spec.defaultAccountHome
-      }),
+    ...(spec.supportsVersion
+      ? {
+          supportsLaunch: async ({ cwd, env, commandSettings }) => {
+            const launchEnv = { ...env, ...spec.env }
+            let command: string
+            try {
+              command = resolveAcpLaunchCommand(spec, launchEnv, { commandSettings })
+            } catch (error) {
+              // An unrunnable Command setting is the launch's refusal to state, not a terminal.
+              if (isAgentSessionPreSpawnError(error)) {
+                return true
+              }
+              throw error
+            }
+            return acpLaunchVersionSupported(spec, { command, cwd, env: launchEnv })
+          }
+        }
+      : {}),
+    resolveAccountHome: ({ launchEnv }) => spec.account.resolve({ launchEnv }),
     createAdapter: (context) => {
       const { deps, store, followUps } = context
+      const readJournal = (sessionId: string) =>
+        replayJournal(context.journalDatabase.db, sessionId)
       return new AcpStructuredSessionAdapter({
         spec,
+        readJournal,
         resolveLaunch: createAcpStructuredLaunchResolver(spec, {
           store,
-          readJournal: (sessionId) => replayJournal(context.journalDatabase.db, sessionId),
+          readJournal,
           resolveWorkspacePath: deps.resolveWorkspacePath,
           resolveEnvironment: context.environment.resolveBaseEnvironment,
           ...(deps.resolveAgentLaunchEnv ? { resolveLaunchEnv: deps.resolveAgentLaunchEnv } : {}),
+          ...(deps.resolveAgentCommandSettings
+            ? { resolveCommandSettings: deps.resolveAgentCommandSettings }
+            : {}),
           ...(deps.resolveAgentFullAccess ? { resolveFullAccess: deps.resolveAgentFullAccess } : {})
         }),
         connect: (launch, options) => createAcpAgentConnection(launch, options),
@@ -210,22 +261,30 @@ async function resolveCodexAccountHomePath(
 
 export const STRUCTURED_AGENT_RUNTIME_REGISTRATIONS: readonly StructuredAgentRuntimeRegistration[] =
   [
+    PI_RPC_RUNTIME_REGISTRATION,
     {
       definition: CODEX_STRUCTURED_AGENT,
       createAdapter: createCodexAdapter,
       supportsLocation: (location) => supportsCodexStructuredLocation(location),
-      resolveAccountHomePath: resolveCodexAccountHomePath
+      resolveAccountHome: async (request, services) =>
+        agentSessionAccountHome(
+          CODEX_STRUCTURED_AGENT,
+          await resolveCodexAccountHomePath(request, services)
+        )
     },
     {
       definition: CLAUDE_STRUCTURED_AGENT,
       createAdapter: createClaudeAdapter,
       supportsLocation: supportsClaudeStructuredLocation,
-      resolveAccountHomePath: async ({ launchEnv, location }, services) =>
-        resolveStructuredClaudeAccountHomePath({
-          launchEnv,
-          wslDistro: location?.wslDistro ?? null,
-          getClaudeConfigDirectory: services.getClaudeConfigDirectory
-        })
+      resolveAccountHome: async ({ launchEnv, location }, services) =>
+        agentSessionAccountHome(
+          CLAUDE_STRUCTURED_AGENT,
+          resolveStructuredClaudeAccountHomePath({
+            launchEnv,
+            wslDistro: location?.wslDistro ?? null,
+            getClaudeConfigDirectory: services.getClaudeConfigDirectory
+          })
+        )
     },
     ...ACP_LAUNCH_SPECS.map(acpRegistration)
   ]
diff --git a/src/main/runtime/structured-agent-session-attachment-wiring.test.ts b/src/main/runtime/structured-agent-session-attachment-wiring.test.ts
new file mode 100644
index 000000000000..02323d20fc80
--- /dev/null
+++ b/src/main/runtime/structured-agent-session-attachment-wiring.test.ts
@@ -0,0 +1,67 @@
+import { existsSync } from 'node:fs'
+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 { getAgentSessionAttachmentStore } from '../native-chat/agent-session-attachments/agent-session-attachment-store-registry'
+import { agentSessionAttachmentStoreRoot } from '../native-chat/agent-session-attachments/agent-session-attachment-references'
+import { createStructuredAgentSessionLogger } from '../native-chat/agent-session-wire/structured-agent-session-logger'
+import type Database from '../sqlite/sync-database'
+import type { JournalHostDatabase } from '../native-chat/agent-session-journal/journal-host-database'
+import type { AgentSessionRecordStore } from './agent-session-record-store'
+import {
+  installAgentSessionAttachments,
+  stopAgentSessionAttachments
+} from './structured-agent-session-attachment-wiring'
+
+let stateDirectory: string
+
+beforeEach(async () => {
+  stateDirectory = await mkdtemp(join(tmpdir(), 'orca-attachment-wiring-'))
+})
+
+afterEach(async () => {
+  stopAgentSessionAttachments()
+  await rm(stateDirectory, { recursive: true, force: true })
+})
+
+function install(directory = stateDirectory): void {
+  const records: Pick<AgentSessionRecordStore, 'getRecord' | 'isSessionUnreadable'> = {
+    getRecord: () => null,
+    isSessionUnreadable: () => false
+  }
+  // Written by a newer Orca: the sweep reads no claims, so nothing here touches the connection.
+  const journal: Pick<JournalHostDatabase, 'readOnly' | 'isClosed' | 'db'> = {
+    readOnly: true,
+    isClosed: false,
+    get db(): Database.Database {
+      throw new Error('not opened in this test')
+    }
+  }
+  installAgentSessionAttachments({
+    stateDirectory: directory,
+    store: records,
+    journalDatabase: journal,
+    logger: createStructuredAgentSessionLogger()
+  })
+}
+
+describe('installAgentSessionAttachments', () => {
+  // Claude takes the store as an added directory only if it exists when Claude starts.
+  it('creates the store root the Claude launch is granted, before any upload', () => {
+    install()
+    const root = agentSessionAttachmentStoreRoot(stateDirectory)
+    expect(existsSync(root)).toBe(true)
+    expect(getAgentSessionAttachmentStore()?.rootDir).toBe(root)
+  })
+
+  it('still installs the store when the root cannot be created', async () => {
+    const warn = vi.spyOn(console, 'warn').mockImplementation(() => {})
+    // A file where the state directory should be: nothing can be created under it.
+    const blocked = join(stateDirectory, 'not-a-directory')
+    await writeFile(blocked, '')
+    expect(() => install(blocked)).not.toThrow()
+    expect(getAgentSessionAttachmentStore()?.rootDir).toBe(agentSessionAttachmentStoreRoot(blocked))
+    warn.mockRestore()
+  })
+})
diff --git a/src/main/runtime/structured-agent-session-attachment-wiring.ts b/src/main/runtime/structured-agent-session-attachment-wiring.ts
new file mode 100644
index 000000000000..9ee32ec10f41
--- /dev/null
+++ b/src/main/runtime/structured-agent-session-attachment-wiring.ts
@@ -0,0 +1,68 @@
+// Installs the chat attachment store beside the structured host, and its sweeps. The store lives in
+// the same state directory as the journal, whose database holds the claims the sweeps honor.
+
+import { mkdirSync } from 'node:fs'
+import { AgentSessionAttachmentStore } from '../native-chat/agent-session-attachments/agent-session-attachment-store'
+import { setAgentSessionAttachmentStore } from '../native-chat/agent-session-attachments/agent-session-attachment-store-registry'
+import {
+  startAgentSessionAttachmentSweeps,
+  type AgentSessionAttachmentSweeper
+} from '../native-chat/agent-session-attachments/agent-session-attachment-sweep'
+import { agentSessionAttachmentStoreRoot } from '../native-chat/agent-session-attachments/agent-session-attachment-references'
+import type { JournalHostDatabase } from '../native-chat/agent-session-journal/journal-host-database'
+import type { StructuredAgentSessionLogger } from '../native-chat/agent-session-wire/structured-agent-session-logger'
+import type { AgentSessionRecordStore } from './agent-session-record-store'
+
+const FIRST_SWEEP_DELAY_MS = 60 * 1000
+const SWEEP_INTERVAL_MS = 6 * 60 * 60 * 1000
+
+let sweeper: AgentSessionAttachmentSweeper | null = null
+
+export function installAgentSessionAttachments(deps: {
+  stateDirectory: string
+  store: Pick<AgentSessionRecordStore, 'getRecord' | 'isSessionUnreadable'>
+  journalDatabase: Pick<JournalHostDatabase, 'readOnly' | 'isClosed' | 'db'>
+  logger: StructuredAgentSessionLogger
+}): void {
+  stopAgentSessionAttachments()
+  const root = agentSessionAttachmentStoreRoot(deps.stateDirectory)
+  // Before any Claude starts: Claude drops an added directory that does not exist yet, for good.
+  try {
+    mkdirSync(root, { recursive: true })
+  } catch (error) {
+    deps.logger.warn('chat attachment store could not be created', {
+      scope: 'attachment-store',
+      error
+    })
+  }
+  const attachments = new AgentSessionAttachmentStore(root, {
+    hasSession: (sessionId) => deps.store.getRecord(sessionId) !== null
+  })
+  setAgentSessionAttachmentStore(attachments)
+  sweeper = startAgentSessionAttachmentSweeps(
+    attachments,
+    {
+      database: () =>
+        deps.journalDatabase.readOnly || deps.journalDatabase.isClosed
+          ? null
+          : deps.journalDatabase.db,
+      recordedSessionIds: () => ({
+        // Readable or not: an unreadable chat's claims still protect its uploads.
+        has: (sessionId) =>
+          deps.store.getRecord(sessionId) !== null || deps.store.isSessionUnreadable(sessionId)
+      })
+    },
+    {
+      initialDelayMs: FIRST_SWEEP_DELAY_MS,
+      intervalMs: SWEEP_INTERVAL_MS,
+      onError: (error) =>
+        deps.logger.warn('chat attachment sweep failed', { scope: 'attachment-sweep', error })
+    }
+  )
+}
+
+export function stopAgentSessionAttachments(): void {
+  sweeper?.stop()
+  sweeper = null
+  setAgentSessionAttachmentStore(null)
+}
diff --git a/src/main/runtime/structured-agent-session-runtime-teardown.ts b/src/main/runtime/structured-agent-session-runtime-teardown.ts
index 3275939a4fa0..46e1e456763e 100644
--- a/src/main/runtime/structured-agent-session-runtime-teardown.ts
+++ b/src/main/runtime/structured-agent-session-runtime-teardown.ts
@@ -7,6 +7,7 @@
 import type { AgentSessionResumeTrigger } from '../../shared/agent-session-resume-marker'
 import type { StructuredAgentSessionHost } from '../native-chat/agent-session-wire/structured-agent-session-host'
 import type { JournalHostDatabase } from '../native-chat/agent-session-journal/journal-host-database'
+import { recordAgentSessionRuntimeEnd } from './agent-session-runtime-end-record'
 
 export type InstalledRuntime = {
   host: StructuredAgentSessionHost
@@ -16,6 +17,8 @@ export type InstalledRuntime = {
   /** Resolves after every observed adapter exit has published, and every
    *  recovery callback it raised has settled. */
   waitForRecovery: () => Promise<void>
+  /** Host bookkeeping that runs on timers, stopped before anything else. */
+  stopBackgroundWork?: () => void
 }
 
 /** Why the app is going away, for the resume markers teardown stamps. A module-level latch rather
@@ -35,8 +38,12 @@ export async function tearDownRuntime(
   installed: InstalledRuntime,
   trigger: AgentSessionResumeTrigger
 ): Promise<void> {
+  // First, before any wait: should this quit not finish, the next start must still know it was a
+  // quit and not a crash.
+  recordAgentSessionRuntimeEnd(trigger)
   // An exit settled while recovery drains wakes delivery, which would start a fresh child for
   // teardown to kill; queued messages wait for the next launch instead.
+  installed.stopBackgroundWork?.()
   installed.host.stopDelivery()
   // Drain an in-flight recovery before stopping children; recovery may still
   // be writing lifecycle rows or acquiring a replacement child.
diff --git a/src/main/runtime/structured-agent-session-runtime.ts b/src/main/runtime/structured-agent-session-runtime.ts
index 877516e97488..d57ef89e402a 100644
--- a/src/main/runtime/structured-agent-session-runtime.ts
+++ b/src/main/runtime/structured-agent-session-runtime.ts
@@ -10,6 +10,7 @@
 // A process whose journal will not open installs none and answers every
 // structured request with the refusal that says why.
 
+import type { PiRpcSessionDeps } from '../pi/rpc-session'
 import type { PermissionMode } from '@anthropic-ai/claude-agent-sdk'
 import { existsSync } from 'node:fs'
 import type { AgentSessionRecord } from '../../shared/agent-session-record'
@@ -22,6 +23,7 @@ import {
 } from './structured-agent-session-runtime-teardown'
 import { AgentSessionRecoveryCapsule } from './agent-session-recovery-capsule'
 import type { CodexStructuredPermissionPolicy } from '../codex/codex-structured-permission-policy'
+import type { StructuredAgentCommandSettings } from '../native-chat/structured-agent-command-resolution'
 import type { CodexStructuredSessionAdapterDeps } from '../codex/codex-structured-session-adapter'
 import type { ClaudeStructuredSessionAdapterDeps } from '../claude/claude-structured-session-adapter'
 import { StructuredAgentSessionHost } from '../native-chat/agent-session-wire/structured-agent-session-host'
@@ -29,7 +31,10 @@ import type { StructuredAgentSessionHostDeps } from '../native-chat/agent-sessio
 import { StructuredAgentSessionAdapterRouter } from '../native-chat/agent-session-wire/structured-agent-session-adapter-router'
 import { StructuredAgentRegistry } from '../native-chat/agent-session-wire/structured-agent-registry'
 import { setStructuredAgentSessionHost } from '../native-chat/agent-session-wire/structured-agent-session-registry'
-import type { ClaudeManagedAccountGateSettings } from '../native-chat/claude-structured-managed-account-support'
+import {
+  installAgentSessionAttachments,
+  stopAgentSessionAttachments
+} from './structured-agent-session-attachment-wiring'
 import {
   openAgentSessionRecordStoreOnce,
   releaseAgentSessionRecordStore,
@@ -59,7 +64,11 @@ import {
   modelCatalogHostDeps,
   type RuntimeAgentAccountHomeResolver
 } from './structured-agent-model-catalog-wiring'
-import type { ClaudeThinkingDisplaySupport } from '../claude/claude-thinking-display-support'
+import type { ClaudeCliFlagSupport } from '../claude/claude-cli-flag-support'
+import {
+  scheduleNativeChatVisualsSweep,
+  type NativeChatVisualsSweepDeps
+} from '../native-chat/native-chat-visuals-sweep'
 
 /** Whether this profile holds a structured chat: a record or tab in the journal database. */
 export function hasPersistedStructuredAgentSessionStore(
@@ -89,8 +98,16 @@ export type StructuredAgentSessionRuntimeDeps = {
   resolveWorkspacePath: (workspaceId: string) => Promise<string>
   resolveCodexCommand?: (options?: { pathEnv?: string | null; homePath?: string }) => string
   resolveClaudeCommand?: () => string
-  /** Whether a Claude CLI takes the thinking-display flag; absent never passes it. */
-  claudeThinkingDisplay?: ClaudeThinkingDisplaySupport
+  openPiConnection?: PiRpcSessionDeps['openConnection']
+  /** Which version-gated flags a Claude CLI takes; absent never passes one. */
+  claudeCliFlags?: ClaudeCliFlagSupport
+  /** Gives each chat a visuals folder and the skill that teaches it, and sweeps folders whose chat
+   *  is gone. Wired by the real hosts only, so a test runtime never loads the bundled skill. */
+  nativeChatVisuals?: {
+    /** Read this host's preference when a chat starts a provider process. */
+    isEnabled: () => boolean
+    workspaceVerdicts: NonNullable<NativeChatVisualsSweepDeps['workspaceVerdicts']>
+  }
   /** Provider transports are overridden only to drive the runtime against scripted children. */
   openCodexConnection?: CodexStructuredSessionAdapterDeps['openConnection']
   openClaudeConnection?: ClaudeStructuredSessionAdapterDeps['openConnection']
@@ -111,8 +128,8 @@ export type StructuredAgentSessionRuntimeDeps = {
   resolveAgentFullAccess?: (agent: string) => boolean
   /** The user's per-agent environment overlay, for agents with no lane-specific resolver. */
   resolveAgentLaunchEnv?: (agent: string) => Record<string, string>
-  /** Raw settings getter; the reader that fails closed around it is built here, in checked code. */
-  getClaudeManagedAccountGateSettings?: () => ClaudeManagedAccountGateSettings
+  /** The settings a per-agent Command override is read from, for the same agents. */
+  resolveAgentCommandSettings?: () => StructuredAgentCommandSettings
   resolveEnvironment?: () => Promise<NodeJS.ProcessEnv>
   /** Which login-shell variables Codex and Claude children inherit; absent inherits all. */
   resolveShellEnvironmentPolicy?: () => NativeChatShellEnvironmentPolicy
@@ -193,6 +210,7 @@ export async function stopStructuredAgentSessionRuntime(options?: {
   const pending = installing
   installing = null
   setStructuredAgentSessionHost(null)
+  stopAgentSessionAttachments()
   const outstanding = [...pendingTeardown]
   pendingTeardown.clear()
   const installed = pending ? await pending.catch(() => null) : null
@@ -320,10 +338,26 @@ async function installOnJournal(
     })
   }
   setStructuredAgentSessionHost(host)
+  installAgentSessionAttachments({
+    stateDirectory: deps.stateDirectory,
+    store,
+    journalDatabase,
+    logger: deps.logger
+  })
+  const stopVisualsSweep = deps.nativeChatVisuals
+    ? scheduleNativeChatVisualsSweep({
+        stateDirectory: deps.stateDirectory,
+        listHeldSessionIds: () => (store.readOnly ? null : store.listHeldSessionIds()),
+        locationOf: (sessionId) => store.getRecord(sessionId)?.location ?? null,
+        workspaceVerdicts: deps.nativeChatVisuals.workspaceVerdicts,
+        logger: deps.logger
+      })
+    : undefined
   return {
     host,
     adapter,
     journalDatabase,
-    waitForRecovery: lifecycle.drain
+    waitForRecovery: lifecycle.drain,
+    ...(stopVisualsSweep ? { stopBackgroundWork: stopVisualsSweep } : {})
   }
 }
diff --git a/src/main/runtime/structured-claude-attachment-grant.test.ts b/src/main/runtime/structured-claude-attachment-grant.test.ts
new file mode 100644
index 000000000000..9971f93ccdbf
--- /dev/null
+++ b/src/main/runtime/structured-claude-attachment-grant.test.ts
@@ -0,0 +1,82 @@
+// The chat attachment store reaches Claude's launch as an added directory: the runtime hands its
+// root to the Claude adapter, and the adapter to the launch resolver. Drop either hand-off and
+// Claude asks before reading every attached document.
+
+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 type * as LaunchResolution from '../claude/claude-structured-launch-resolution'
+import type * as ClaudeRuntimeAdapter from './structured-claude-runtime-adapter'
+
+type GrantDeps = { attachmentDirectory?: string }
+
+const captured = vi.hoisted(() => {
+  const adapter: GrantDeps[] = []
+  const resolver: GrantDeps[] = []
+  return { adapter, resolver }
+})
+
+vi.mock('./structured-claude-runtime-adapter', async (importOriginal) => {
+  const actual = await importOriginal<typeof ClaudeRuntimeAdapter>()
+  return {
+    ...actual,
+    createStructuredClaudeRuntimeAdapter: (
+      deps: Parameters<typeof actual.createStructuredClaudeRuntimeAdapter>[0]
+    ) => {
+      captured.adapter.push(deps)
+      return actual.createStructuredClaudeRuntimeAdapter(deps)
+    }
+  }
+})
+
+vi.mock('../claude/claude-structured-launch-resolution', async (importOriginal) => {
+  const actual = await importOriginal<typeof LaunchResolution>()
+  return {
+    ...actual,
+    createClaudeStructuredLaunchResolver: (
+      deps: Parameters<typeof actual.createClaudeStructuredLaunchResolver>[0]
+    ) => {
+      captured.resolver.push(deps)
+      return actual.createClaudeStructuredLaunchResolver(deps)
+    }
+  }
+})
+
+import { agentSessionAttachmentStoreRoot } from '../native-chat/agent-session-attachments/agent-session-attachment-references'
+import { createStructuredAgentSessionLogger } from '../native-chat/agent-session-wire/structured-agent-session-logger'
+import {
+  ensureStructuredAgentSessionHost,
+  stopStructuredAgentSessionRuntime
+} from './structured-agent-session-runtime'
+
+let stateDirectory: string | null = null
+
+afterEach(async () => {
+  await stopStructuredAgentSessionRuntime()
+  if (stateDirectory) {
+    await rm(stateDirectory, { recursive: true, force: true })
+    stateDirectory = null
+  }
+})
+
+describe("structured Claude's read grant for chat attachments", () => {
+  it('hands the store root from the runtime through the adapter to the launch resolver', async () => {
+    stateDirectory = await mkdtemp(join(tmpdir(), 'orca-attachment-grant-'))
+    const directory = stateDirectory
+    await ensureStructuredAgentSessionHost({
+      logger: createStructuredAgentSessionLogger(),
+      stateDirectory: directory,
+      hostId: 'local',
+      claimKeyId: 'key-1',
+      resolveWorkspacePath: async () => directory,
+      resolveClaudeAuthPolicy: () => ({ stripAuthEnv: true }),
+      resolveLaunchArgs: () => [],
+      resolveEnvironment: async () => ({})
+    })
+
+    const root = agentSessionAttachmentStoreRoot(directory)
+    expect(captured.adapter.at(-1)?.attachmentDirectory).toBe(root)
+    expect(captured.resolver.at(-1)?.attachmentDirectory).toBe(root)
+  })
+})
diff --git a/src/main/runtime/structured-claude-runtime-adapter.ts b/src/main/runtime/structured-claude-runtime-adapter.ts
index 288c7a7ddd59..d9abf1cf3885 100644
--- a/src/main/runtime/structured-claude-runtime-adapter.ts
+++ b/src/main/runtime/structured-claude-runtime-adapter.ts
@@ -15,19 +15,22 @@ import {
   recordAgentSessionProviderHandle,
   reviseAgentSessionProviderResumePoint
 } from './agent-session-provider-handle-transition'
-import type { ClaudeManagedAccountGateSettings } from '../native-chat/claude-structured-managed-account-support'
 import type { AgentSessionRecordStore } from './agent-session-record-store'
 import { ClaudeAtRestCommandCatalog } from '../claude/claude-at-rest-commands'
 import { openClaudeStreamJsonConnection } from '../claude/claude-stream-json-connection'
-import type { ClaudeThinkingDisplaySupport } from '../claude/claude-thinking-display-support'
+import type { ClaudeCliFlagSupport } from '../claude/claude-cli-flag-support'
+import { prewarmClaudeCliFlags } from '../claude/claude-cli-flag-prewarm'
+import type { PrepareNativeChatVisuals } from '../native-chat/native-chat-visuals-delivery'
 
 export type StructuredClaudeRuntimeAdapterDeps = {
   store: AgentSessionRecordStore
   resolveWorkspacePath: (workspaceId: string) => Promise<string>
   resolveClaudeLaunchArgs: () => Promise<string[]> | string[]
   resolveClaudeCommand?: () => string
-  /** Whether a Claude CLI takes the thinking-display flag; absent never passes it. */
-  claudeThinkingDisplay?: ClaudeThinkingDisplaySupport
+  /** Which version-gated flags a Claude CLI takes; absent never passes one. */
+  claudeCliFlags?: ClaudeCliFlagSupport
+  /** Each chat's visuals folder and skill; absent leaves chats without visuals. */
+  prepareVisuals?: PrepareNativeChatVisuals
   resolveClaudeLaunchEnv?: () => Promise<Record<string, string>> | Record<string, string>
   /** The env a Claude child inherits before auth stripping; absent inherits Orca's own. */
   resolveClaudeInheritedEnv?: () => Promise<Record<string, string>>
@@ -36,7 +39,8 @@ export type StructuredClaudeRuntimeAdapterDeps = {
   resolveClaudeAuthPolicy: () => Promise<ClaudeStructuredAuthPolicy> | ClaudeStructuredAuthPolicy
   /** The user's Agent Permissions setting for Claude; absent means prompting. */
   resolveClaudePermissionMode?: () => Promise<PermissionMode> | PermissionMode
-  readClaudeManagedAccountGate?: () => ClaudeManagedAccountGateSettings | null
+  /** Where the host stores chat attachments; granted to the agent as a readable directory. */
+  attachmentDirectory?: string
   openClaudeConnection?: ClaudeStructuredSessionAdapterDeps['openConnection']
   readProcessStartTime?: ClaudeStructuredSessionAdapterDeps['readProcessStartTime']
   modelCatalog?: ClaudeStructuredSessionAdapterDeps['modelCatalog']
@@ -82,6 +86,18 @@ export function createStructuredClaudeRuntimeAdapter(
   deps: StructuredClaudeRuntimeAdapterDeps
 ): ClaudeStructuredSessionAdapter {
   const { store } = deps
+  if (deps.claudeCliFlags) {
+    // Before any chat launches, so the first one rarely waits on the version check.
+    void prewarmClaudeCliFlags({
+      cliFlags: deps.claudeCliFlags,
+      store,
+      resolveCommand: deps.resolveClaudeCommand ?? resolveClaudeCommand,
+      ...(deps.resolveClaudeLaunchEnv ? { resolveEnv: deps.resolveClaudeLaunchEnv } : {}),
+      ...(deps.resolveClaudeInheritedEnv
+        ? { resolveInheritedEnv: deps.resolveClaudeInheritedEnv }
+        : {})
+    })
+  }
   return new ClaudeStructuredSessionAdapter({
     atRestCommands: new ClaudeAtRestCommandCatalog({
       resolveWorkspacePath: deps.resolveWorkspacePath
@@ -99,10 +115,9 @@ export function createStructuredClaudeRuntimeAdapter(
       ...(deps.resolveClaudePermissionMode
         ? { resolvePermissionMode: deps.resolveClaudePermissionMode }
         : {}),
-      ...(deps.readClaudeManagedAccountGate
-        ? { readManagedAccountGate: deps.readClaudeManagedAccountGate }
-        : {}),
-      ...(deps.claudeThinkingDisplay ? { thinkingDisplay: deps.claudeThinkingDisplay } : {})
+      ...(deps.attachmentDirectory ? { attachmentDirectory: deps.attachmentDirectory } : {}),
+      ...(deps.claudeCliFlags ? { cliFlags: deps.claudeCliFlags } : {}),
+      ...(deps.prepareVisuals ? { prepareVisuals: deps.prepareVisuals } : {})
     }),
     persistHandle: async ({ sessionId, providerSessionId, leafUuid, fence }) => {
       const currentFence = store.getRecord(sessionId)?.lease.runtimeFence ?? fence
@@ -148,12 +163,12 @@ export function createStructuredClaudeRuntimeAdapter(
   })
 }
 
-/** The child's connection, watched for a CLI refusing the thinking-display flag, so the start that
+/** The child's connection, watched for a CLI refusing a version-gated flag, so the start that
  *  failed on it is the last one to pass it. */
 export function openClaudeConnectionOf(
-  deps: Pick<StructuredClaudeRuntimeAdapterDeps, 'openClaudeConnection' | 'claudeThinkingDisplay'>
+  deps: Pick<StructuredClaudeRuntimeAdapterDeps, 'openClaudeConnection' | 'claudeCliFlags'>
 ): Pick<ClaudeStructuredSessionAdapterDeps, 'openConnection'> {
-  const support = deps.claudeThinkingDisplay
+  const support = deps.claudeCliFlags
   if (!support) {
     return deps.openClaudeConnection ? { openConnection: deps.openClaudeConnection } : {}
   }
diff --git a/src/main/runtime/structured-claude-thinking-display-refusal.test.ts b/src/main/runtime/structured-claude-thinking-display-refusal.test.ts
index 817add96e676..6d5f4925cf50 100644
--- a/src/main/runtime/structured-claude-thinking-display-refusal.test.ts
+++ b/src/main/runtime/structured-claude-thinking-display-refusal.test.ts
@@ -6,7 +6,10 @@ import { join } from 'node:path'
 import { afterEach, describe, expect, it, vi } from 'vitest'
 import { CLAUDE_STRUCTURED_BASE_OPTIONS } from '../claude/claude-structured-launch-resolution'
 import { fakeClaude } from '../claude/claude-structured-session-test-support'
-import { createClaudeThinkingDisplaySupport } from '../claude/claude-thinking-display-support'
+import {
+  CLAUDE_THINKING_DISPLAY_FLAG,
+  createClaudeCliFlagSupport
+} from '../claude/claude-cli-flag-support'
 import { openClaudeConnectionOf } from './structured-claude-runtime-adapter'
 
 const FAKE_CLI = join(
@@ -31,14 +34,20 @@ async function startRefusing(stderr: string) {
   writeFileSync(scenarioPath, JSON.stringify({ steps: [{ stderr }, { exit: 1 }] }))
   const env = { PATH: process.env.PATH ?? '', ORCA_SDK_CONTRACT_SCENARIO_PATH: scenarioPath }
   const probe = vi.fn(async () => '2.1.280')
-  const support = createClaudeThinkingDisplaySupport({
+  const support = createClaudeCliFlagSupport({
     probe,
     keyOf: async (command, cwd) => `${command}\n${cwd}`,
     budgetMs: 1_000,
     now: () => performance.now()
   })
-  const flag = await support.argsFor({ command: FAKE_CLI, cwd: dir, env })
-  const { openConnection } = openClaudeConnectionOf({ claudeThinkingDisplay: support })
+  const flag = (await support.supports(CLAUDE_THINKING_DISPLAY_FLAG, {
+    command: FAKE_CLI,
+    cwd: dir,
+    env
+  }))
+    ? { 'thinking-display': 'summarized' }
+    : null
+  const { openConnection } = openClaudeConnectionOf({ claudeCliFlags: support })
   let exited: Error | null = null
   const connection = await openConnection!(
     {
@@ -63,20 +72,22 @@ describe('a Claude CLI that refuses the thinking-display flag', () => {
       "error: unknown option '--thinking-display'\n"
     )
     expect(flag).toEqual({ 'thinking-display': 'summarized' })
-    await vi.waitFor(async () => expect(await support.argsFor(launch)).toEqual({}))
+    await vi.waitFor(async () =>
+      expect(await support.supports(CLAUDE_THINKING_DISPLAY_FLAG, launch)).toBe(false)
+    )
     expect(probe).toHaveBeenCalledTimes(1)
   })
 
   it('hands the session whether its close was the one Orca began', async () => {
     const claude = fakeClaude()
-    const support = createClaudeThinkingDisplaySupport({
+    const support = createClaudeCliFlagSupport({
       probe: async () => '2.1.280',
       keyOf: async () => null,
       budgetMs: 1_000,
       now: () => performance.now()
     })
     const { openConnection } = openClaudeConnectionOf({
-      claudeThinkingDisplay: support,
+      claudeCliFlags: support,
       openClaudeConnection: claude.openConnection
     })
     const onExit = vi.fn()
@@ -92,6 +103,6 @@ describe('a Claude CLI that refuses the thinking-display flag', () => {
 
   it('records nothing when the start failed for another reason', async () => {
     const { support, launch } = await startRefusing('claude: not signed in\n')
-    await expect(support.argsFor(launch)).resolves.toEqual({ 'thinking-display': 'summarized' })
+    await expect(support.supports(CLAUDE_THINKING_DISPLAY_FLAG, launch)).resolves.toBe(true)
   })
 })
diff --git a/src/main/runtime/structured-session-worktree-teardown.test.ts b/src/main/runtime/structured-session-worktree-teardown.test.ts
index f33d7889b31f..4c4145bab2e5 100644
--- a/src/main/runtime/structured-session-worktree-teardown.test.ts
+++ b/src/main/runtime/structured-session-worktree-teardown.test.ts
@@ -1,6 +1,7 @@
 import { beforeEach, describe, expect, it, vi } from 'vitest'
 import type { AgentSessionRecord } from '../../shared/agent-session-record'
 import type { IPtyProvider } from '../providers/types'
+import { ABANDONED_SWEEP_GRACE_MS } from './forced-sweep-settlement'
 
 const hostRef: { current: unknown } = { current: null }
 
@@ -512,74 +513,107 @@ describe('worktree teardown and structured agent sessions', () => {
   })
 
   it('refuses in agent-session wording when the close outlives the sweep budget', async () => {
-    // A structured close that runs out of time used to reject with the PTY timeout sentinel, which
-    // the classifier reads FIRST — so the toast blamed terminals, and the Force Delete meant to
-    // clear the wedge hit the same rejection again (#11960).
-    installHost({ records: [record('s1', WORKTREE)], closeGate: new Promise<void>(() => {}) })
-    const error = await killAllProcessesForWorktree(
-      WORKTREE,
-      destructiveDeps({ timeoutMs: 5 })
-    ).catch((thrown: Error) => thrown.message)
-    expect(error).toContain('could not confirm these closed: 1 agent session (claude)')
-    expect(isUnstoppedPtyRemovalError(error as string)).toBe(false)
-    expect(classifyWorktreeForceDeleteReason(error as string, true)).toBe('running-agent-session')
+    vi.useFakeTimers({ toFake: ['Date', 'setTimeout', 'clearTimeout'] })
+    try {
+      // A structured close that runs out of time used to reject with the PTY timeout sentinel, which
+      // the classifier reads FIRST — so the toast blamed terminals, and the Force Delete meant to
+      // clear the wedge hit the same rejection again (#11960).
+      installHost({ records: [record('s1', WORKTREE)], closeGate: new Promise<void>(() => {}) })
+      const outcome = killAllProcessesForWorktree(
+        WORKTREE,
+        destructiveDeps({ timeoutMs: 5 })
+      ).catch((thrown: Error) => thrown.message)
+      await vi.advanceTimersByTimeAsync(5)
+      const error = await outcome
+      expect(error).toContain('could not confirm these closed: 1 agent session (claude)')
+      expect(isUnstoppedPtyRemovalError(error as string)).toBe(false)
+      expect(classifyWorktreeForceDeleteReason(error as string, true)).toBe('running-agent-session')
+    } finally {
+      vi.useRealTimers()
+    }
   })
 
   it('never wedges Force Delete on a close that will not settle', async () => {
+    vi.useFakeTimers({ toFake: ['Date', 'setTimeout', 'clearTimeout'] })
     const warn = vi.spyOn(console, 'warn').mockImplementation(() => {})
-    installHost({ records: [record('s1', WORKTREE)], closeGate: new Promise<void>(() => {}) })
-    await expect(
-      killAllProcessesForWorktree(
+    try {
+      installHost({ records: [record('s1', WORKTREE)], closeGate: new Promise<void>(() => {}) })
+      const outcome = killAllProcessesForWorktree(
         WORKTREE,
         destructiveDeps({ allowUnverifiedStop: true, timeoutMs: 5 })
       )
-    ).resolves.toMatchObject({ runtimeStopped: 0 })
-    const message = structuredSessionWarning(warn)
-    expect(message).toContain('could not confirm these closed: 1 agent session (claude)')
-    // The pin: a close that ran out of time was never watched stay attached. This warn is the only
-    // record a forced removal leaves, and the removal.ts split exists precisely so "we could not
-    // confirm" is never reported as "we saw it running" — including here.
-    expect(message).not.toContain('still attached')
-    warn.mockRestore()
+      void outcome.catch(() => undefined)
+      await vi.advanceTimersByTimeAsync(5 + ABANDONED_SWEEP_GRACE_MS)
+      await expect(outcome).resolves.toMatchObject({ runtimeStopped: 0 })
+      const message = structuredSessionWarning(warn)
+      expect(message).toContain('could not confirm these closed: 1 agent session (claude)')
+      // The pin: a close that ran out of time was never watched stay attached. This warn is the only
+      // record a forced removal leaves, and the removal.ts split exists precisely so "we could not
+      // confirm" is never reported as "we saw it running" — including here.
+      expect(message).not.toContain('still attached')
+    } finally {
+      warn.mockRestore()
+      vi.useRealTimers()
+    }
   })
 
   it('names only the sessions still open when the budget expires mid-close', async () => {
-    // The close loop is serial, so a deadline can land part-way through it. A fallback assembled
-    // at the deadline could only name the whole list — so a removal that had already closed the
-    // first chat still told the user both were still there, which is the exact thing this sweep
-    // exists to stop doing: never report state nobody observed.
-    installHost({
-      records: [record('s1', WORKTREE), record('s2', WORKTREE, { provider: 'codex' })],
-      closeGates: { s2: new Promise<void>(() => {}) }
-    })
-    const error = await killAllProcessesForWorktree(
-      WORKTREE,
-      destructiveDeps({ timeoutMs: 40 })
-    ).catch((thrown: Error) => thrown.message)
-    expect(error).toContain('could not confirm these closed: 1 agent session (codex)')
-    expect(error).not.toContain('claude')
+    vi.useFakeTimers({ toFake: ['Date', 'setTimeout', 'clearTimeout'] })
+    try {
+      // The close loop is serial, so a deadline can land part-way through it. A fallback assembled
+      // at the deadline could only name the whole list — so a removal that had already closed the
+      // first chat still told the user both were still there, which is the exact thing this sweep
+      // exists to stop doing: never report state nobody observed.
+      installHost({
+        records: [record('s1', WORKTREE), record('s2', WORKTREE, { provider: 'codex' })],
+        closeGates: { s2: new Promise<void>(() => {}) }
+      })
+      const outcome = killAllProcessesForWorktree(
+        WORKTREE,
+        destructiveDeps({ timeoutMs: 40 })
+      ).catch((thrown: Error) => thrown.message)
+      await vi.advanceTimersByTimeAsync(40)
+      const error = await outcome
+      expect(error).toContain('could not confirm these closed: 1 agent session (codex)')
+      expect(error).not.toContain('claude')
+    } finally {
+      vi.useRealTimers()
+    }
   })
 
   it('counts the closes that landed before the budget expired', async () => {
+    vi.useFakeTimers({ toFake: ['Date', 'setTimeout', 'clearTimeout'] })
     // The other half of the same fallback: it reported zero closes, so the removal log said
     // `structured=0` for a chat it had just ended.
     const warn = vi.spyOn(console, 'warn').mockImplementation(() => {})
     const slowClose = new Promise<void>((resolve) => {
       setTimeout(resolve, 300)
     })
-    installHost({
-      records: [record('s1', WORKTREE), record('s2', WORKTREE, { provider: 'codex' })],
-      closeGates: { s2: slowClose }
-    })
-    const result = await killAllProcessesForWorktree(
-      WORKTREE,
-      destructiveDeps({ allowUnverifiedStop: true, timeoutMs: 40 })
-    )
-    expect(result.structuredStopped).toBe(1)
-    expect(structuredSessionWarning(warn)).toContain(
-      'could not confirm these closed: 1 agent session (codex)'
-    )
-    warn.mockRestore()
+    try {
+      installHost({
+        records: [record('s1', WORKTREE), record('s2', WORKTREE, { provider: 'codex' })],
+        closeGates: { s2: slowClose }
+      })
+      const outcome = killAllProcessesForWorktree(
+        WORKTREE,
+        destructiveDeps({ allowUnverifiedStop: true, timeoutMs: 40 })
+      )
+      void outcome.catch(() => undefined)
+      await vi.advanceTimersByTimeAsync(300)
+      const result = await outcome
+      expect(result.structuredStopped).toBe(1)
+      expect(structuredSessionWarning(warn)).toContain(
+        'could not confirm these closed: 1 agent session (codex)'
+      )
+    } finally {
+      try {
+        await vi.advanceTimersByTimeAsync(300)
+        await slowClose
+      } finally {
+        warn.mockRestore()
+        vi.useRealTimers()
+      }
+    }
   })
 
   it('stops issuing new closes once the budget is spent', async () => {
diff --git a/src/main/runtime/terminal-interactive-wait-visibility.test.ts b/src/main/runtime/terminal-interactive-wait-visibility.test.ts
index b79ea7a3270a..84d7e2042639 100644
--- a/src/main/runtime/terminal-interactive-wait-visibility.test.ts
+++ b/src/main/runtime/terminal-interactive-wait-visibility.test.ts
@@ -3,7 +3,8 @@
 import { readFileSync } from 'node:fs'
 import { makeAgentStatusStoreWiring } from './agent-status-store-wiring.test-fixture'
 import { join } from 'node:path'
-import { describe, expect, it, vi } from 'vitest'
+import { afterEach, describe, expect, it, vi } from 'vitest'
+import { TERMINAL_INTERACTIVE_WAIT_PROBE_TIMEOUT_MS } from './orca-runtime-core'
 import {
   createTranscriptPane,
   type TranscriptPaneOptions,
@@ -56,6 +57,8 @@ async function createPane(
 // that as `working`; the title is identical whether it is running a command or waiting.
 const CURSOR_TITLE = '⠇ Cursor Agent'
 
+afterEach(() => vi.useRealTimers())
+
 describe('terminal interactive-wait visibility (STA-4513, STA-3714)', () => {
   describe('cursor-agent approval menu, the case no hook reports', () => {
     it('names the pending approval on the pane a coordinator inspects', async () => {
@@ -374,13 +377,21 @@ describe('terminal interactive-wait visibility (STA-4513, STA-3714)', () => {
       foregroundProbeHangs: true
     })
 
-    await Promise.all([
-      runtime.getTerminalInteractiveWait(handle),
-      runtime.getTerminalInteractiveWait(handle),
-      runtime.getTerminalInteractiveWait(handle)
-    ])
-
-    expect(probes).toBe(1)
+    vi.useFakeTimers({ toFake: ['Date', 'setTimeout', 'clearTimeout'] })
+    try {
+      const probing = Promise.all([
+        runtime.getTerminalInteractiveWait(handle),
+        runtime.getTerminalInteractiveWait(handle),
+        runtime.getTerminalInteractiveWait(handle)
+      ])
+      void probing.catch(() => undefined)
+      await vi.advanceTimersByTimeAsync(TERMINAL_INTERACTIVE_WAIT_PROBE_TIMEOUT_MS)
+      await probing
+
+      expect(probes).toBe(1)
+    } finally {
+      vi.useRealTimers()
+    }
   }, 20_000)
 
   it('accepts a menu whose keys are rendered as glyphs', async () => {
@@ -419,9 +430,20 @@ describe('terminal interactive-wait visibility (STA-4513, STA-3714)', () => {
       foregroundProbeHangs: true
     })
 
-    await expect(runtime.getTerminalInteractiveWait(handle)).resolves.toBeUndefined()
-    const show = (await runtime.showTerminal(handle)) as Record<string, unknown>
-    expect('agentWait' in show).toBe(false)
+    vi.useFakeTimers({ toFake: ['Date', 'setTimeout', 'clearTimeout'] })
+    try {
+      const waiting = runtime.getTerminalInteractiveWait(handle)
+      void waiting.catch(() => undefined)
+      await vi.advanceTimersByTimeAsync(TERMINAL_INTERACTIVE_WAIT_PROBE_TIMEOUT_MS)
+      await expect(waiting).resolves.toBeUndefined()
+      const showing = runtime.showTerminal(handle)
+      void showing.catch(() => undefined)
+      await vi.advanceTimersByTimeAsync(TERMINAL_INTERACTIVE_WAIT_PROBE_TIMEOUT_MS)
+      const show = await showing
+      expect('agentWait' in show).toBe(false)
+    } finally {
+      vi.useRealTimers()
+    }
   }, 15_000)
 
   it('answers undefined rather than "not waiting" for a pane it cannot read', async () => {
diff --git a/src/main/runtime/terminal-tail-redraw-buffer.ts b/src/main/runtime/terminal-tail-redraw-buffer.ts
index d8971f7ea8be..2dd6d72badd4 100644
--- a/src/main/runtime/terminal-tail-redraw-buffer.ts
+++ b/src/main/runtime/terminal-tail-redraw-buffer.ts
@@ -73,7 +73,7 @@ export function appendNormalizedToMultilineTailBufferUnwindowed(
     ensureCursorRow()
     rows[cursorRow]!.completed = false
   }
-  const writeChar = (char: string): void => {
+  const writeText = (text: string): void => {
     ensureCursorRow()
     markCursorRowRewritten()
     const row = rows[cursorRow]!
@@ -82,9 +82,9 @@ export function appendNormalizedToMultilineTailBufferUnwindowed(
     }
     row.text =
       cursorColumn >= row.text.length
-        ? `${row.text}${char}`
-        : `${row.text.slice(0, cursorColumn)}${char}${row.text.slice(cursorColumn + 1)}`
-    cursorColumn += 1
+        ? `${row.text}${text}`
+        : `${row.text.slice(0, cursorColumn)}${text}${row.text.slice(cursorColumn + text.length)}`
+    cursorColumn += text.length
   }
   const eraseLine = (mode: number): void => {
     ensureCursorRow()
@@ -100,13 +100,28 @@ export function appendNormalizedToMultilineTailBufferUnwindowed(
     }
   }
 
+  let textStart = 0
+  const writePendingText = (end: number): void => {
+    if (end > textStart) {
+      writeText(
+        end === textStart + 1 ? normalizedChunk[textStart]! : normalizedChunk.slice(textStart, end)
+      )
+    }
+    textStart = end + 1
+  }
   for (let index = 0; index < normalizedChunk.length; index += 1) {
     const char = normalizedChunk[index]
     if (char === '\n') {
+      writePendingText(index)
       ensureCursorRow()
       rows[cursorRow]!.completed = true
       newCompleteLines += 1
-      retainNewlyCompletedLine(trimTerminalLineRight(rows[cursorRow]!.text))
+      // Own only retained text; a short erase-to-end result can otherwise pin a large span.
+      const row = rows[cursorRow]!
+      const trimmed = trimTerminalLineRight(row.text)
+      const completedLine = ownRetainedString(trimmed)
+      row.text = trimmed === row.text ? completedLine : ownRetainedString(row.text)
+      retainNewlyCompletedLine(completedLine)
       cursorRow += 1
       cursorColumn = 0
       ensureCursorRow()
@@ -114,19 +129,23 @@ export function appendNormalizedToMultilineTailBufferUnwindowed(
       continue
     }
     if (char === '\r') {
+      writePendingText(index)
       cursorColumn = 0
       continue
     }
     if (char === '\u0008') {
+      writePendingText(index)
       cursorColumn = Math.max(0, cursorColumn - 1)
       continue
     }
     if (char === '\u001b') {
+      writePendingText(index)
       const parsed = parseAnsiControlSequence(normalizedChunk, index)
       if (!parsed) {
         continue
       }
       index = parsed.endIndex
+      textStart = index + 1
       if (parsed.kind !== 'csi' || !hasCanonicalNumericCsiParams(parsed.params)) {
         continue
       }
@@ -145,8 +164,8 @@ export function appendNormalizedToMultilineTailBufferUnwindowed(
       }
       continue
     }
-    writeChar(char)
   }
+  writePendingText(normalizedChunk.length)
 
   return finalizeRetainedTerminalRows(
     rows,
@@ -186,7 +205,10 @@ function finalizeRetainedTerminalRows(
   newlyCompletedLines: string[]
 } {
   let truncated = initialTruncated
-  let retainedRows = rows.map((row) => ({ ...row, text: trimTerminalLineRight(row.text) }))
+  let retainedRows = rows.map((row) => {
+    const trimmed = trimTerminalLineRight(row.text)
+    return { ...row, text: trimmed === row.text ? row.text : ownRetainedString(trimmed) }
+  })
 
   if (retainedRows.length > MAX_TAIL_LINES + 1) {
     const removeCount = retainedRows.length - (MAX_TAIL_LINES + 1)
@@ -242,10 +264,7 @@ function finalizeRetainedTerminalRows(
 
   return {
     lines,
-    // Why only the partial: redraw rows are built character by character and never sliced from
-    // the chunk, but the partial is re-sliced from its own row on every chunk, so it alone can
-    // accumulate a backing string across frames. Owning the rows too costs 20-36% on TUI floods
-    // for no measured retention.
+    // Completed rows own their storage at newline; the final partial may still reference a span.
     partialLine: ownRetainedString(partialLine),
     redrawCursor,
     truncated,
diff --git a/src/main/runtime/terminal-tail-redraw-spans.test.ts b/src/main/runtime/terminal-tail-redraw-spans.test.ts
new file mode 100644
index 000000000000..d68ca1ad0302
--- /dev/null
+++ b/src/main/runtime/terminal-tail-redraw-spans.test.ts
@@ -0,0 +1,60 @@
+import { describe, expect, it, vi } from 'vitest'
+import { appendNormalizedToTailBuffer } from './terminal-tail-buffer'
+
+describe('retained terminal redraw text spans', () => {
+  it('overwrites a long row without copying its suffix for every code unit', () => {
+    const previous = 'p'.repeat(16 * 1024)
+    const replacement = 'x'.repeat(previous.length)
+    const slice = vi.spyOn(String.prototype, 'slice')
+    let copiedSuffixes = 0
+    try {
+      const result = appendNormalizedToTailBuffer([previous], '', `\x1b[1A\r${replacement}\n`)
+      copiedSuffixes = slice.mock.calls.length
+      expect(result.lines).toEqual([replacement])
+      expect(result.newlyCompletedLines).toEqual([replacement])
+      expect(result.redrawCursor).toBeNull()
+    } finally {
+      slice.mockRestore()
+    }
+    expect(copiedSuffixes).toBeLessThan(20)
+  })
+
+  it.each([
+    ['shorter overwrite', '\x1b[1A\rXY\n', 'XYcdef'],
+    ['extending overwrite', '\x1b[1A\r123456789\n', '123456789'],
+    ['erase to end', '\x1b[1A\rXY\x1b[KZ\n', 'XYZ'],
+    ['erase to start', '\x1b[1A\rXY\x1b[2C!\x1b[1KZ\n', '     Z'],
+    ['erase whole line', '\x1b[1A\rXY\x1b[2KZ\n', '  Z'],
+    ['backspace', '\x1b[1A\rXY\bZ\n', 'XZcdef'],
+    ['carriage return', '\x1b[1A\rXY\rZ\n', 'ZYcdef'],
+    ['split surrogate overwrite', '\x1b[1A\r😀\bZ\n', '\ud83dZcdef'],
+    [
+      'Unicode and non-special controls',
+      '\x1b[1A\r漢😀e\u0301\ud800\t\u0000\udfff\bZ\n',
+      '漢😀e\u0301\ud800\t\u0000Z'
+    ]
+  ])('preserves %s', (_name, chunk, expected) => {
+    const result = appendNormalizedToTailBuffer(['abcdef'], '', chunk)
+    expect(result).toEqual({
+      lines: [expected],
+      partialLine: '',
+      redrawCursor: null,
+      truncated: false,
+      newCompleteLines: 1,
+      newlyCompletedLines: [expected]
+    })
+  })
+
+  it('fills a cursor gap before a text span and retains its code-unit column', () => {
+    const result = appendNormalizedToTailBuffer(['abcdef'], '', '\x1b[1A\x1b[9G😀')
+    expect(result.lines).toEqual([])
+    expect(result.partialLine).toBe('abcdef  😀')
+    expect(result.redrawCursor).toBeNull()
+  })
+
+  it('keeps completed trailing spaces available to a later cursor-up rewrite', () => {
+    const result = appendNormalizedToTailBuffer(['abcdef'], '', '\x1b[1A\rab   \n\x1b[1A\x1b[5GX\n')
+    expect(result.lines).toEqual(['ab  Xf'])
+    expect(result.newlyCompletedLines).toEqual(['ab   f', 'ab  Xf'])
+  })
+})
diff --git a/src/main/runtime/terminal-tail-row-retention.test.ts b/src/main/runtime/terminal-tail-row-retention.test.ts
index 0e4effbf9688..e49fd7fdd0ca 100644
--- a/src/main/runtime/terminal-tail-row-retention.test.ts
+++ b/src/main/runtime/terminal-tail-row-retention.test.ts
@@ -79,6 +79,21 @@ describe('retained terminal tail row storage', () => {
     }
   })
 
+  it('does not pin overwritten multiline redraw chunks through completed rows', () => {
+    let lines: string[] = []
+    const before = collectHeap()
+    for (let index = 0; index < 200; index += 1) {
+      const chunk = `\x1b[0A${'x'.repeat(64 * 1024)}\rstep ${index} done\x1b[K\n`
+      const next = appendNormalizedToTailBuffer(lines, '', chunk)
+      lines = next.lines
+    }
+    const retained = collectHeap() - before
+
+    expect(lines).toHaveLength(200)
+    expect(lines.at(-1)).toBe('step 199 done')
+    expect(retained).toBeLessThan(4 * 1024 * 1024)
+  })
+
   it('owns the redraw partial line without re-owning carried rows', () => {
     const own = vi.spyOn(ownership, 'ownRetainedString')
     try {
@@ -93,7 +108,7 @@ describe('retained terminal tail row storage', () => {
 
       expect(redrawn.lines).toEqual(['row one'])
       expect(redrawn.partialLine).toBe('rewritten two')
-      // One call for the partial only: redraw rows are built character by character.
+      // Only the final partial is retained; carried rows need no copies.
       expect(own).toHaveBeenCalledTimes(1)
       expect(own).toHaveBeenLastCalledWith('rewritten two')
     } finally {
diff --git a/src/main/shell-wrapper-generated-file-snapshot.test.ts b/src/main/shell-wrapper-generated-file-snapshot.test.ts
index 9e86ebdd15ca..edc24c7a44a5 100644
--- a/src/main/shell-wrapper-generated-file-snapshot.test.ts
+++ b/src/main/shell-wrapper-generated-file-snapshot.test.ts
@@ -68,6 +68,8 @@ async function expectWrapperFiles(transport: string, root: string): Promise<void
 const CONTRACT_GLOBALS = new Set([
   'BUFFER',
   'CODEX_HOME',
+  // Exported only inside the claude function's subshell, for that one Claude process.
+  'CLAUDE_CONFIG_DIR',
   'HISTFILE',
   'MIMOCODE_HOME',
   'OPENCODE_CONFIG_DIR',
diff --git a/src/main/skills/skill-delete/plan.test.ts b/src/main/skills/skill-delete/plan.test.ts
index 1262435a1ebb..23763188869d 100644
--- a/src/main/skills/skill-delete/plan.test.ts
+++ b/src/main/skills/skill-delete/plan.test.ts
@@ -1,9 +1,10 @@
 import { mkdir, mkdtemp, rm, stat, symlink, utimes, 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 type { SkillDeleteRequest } from '../../../shared/skill-delete-contract'
 import { buildSkillDeletePlan } from './plan'
+import * as SkillDeleteGuards from './guards'
 import { nativeSkillInstallFilesystem } from '../skill-install-filesystem'
 
 /** Windows rejects `symlink` with EPERM without elevation or Developer Mode. */
@@ -12,6 +13,7 @@ const WINDOWS = process.platform === 'win32'
 const roots: string[] = []
 
 afterEach(async () => {
+  vi.restoreAllMocks()
   await Promise.all(roots.splice(0).map((root) => rm(root, { recursive: true, force: true })))
 })
 
@@ -262,3 +264,75 @@ describe('buildSkillDeletePlan freshness guard', () => {
     expect(resolved.plan.skills[0].blocked).toBe('missing')
   })
 })
+
+describe('buildSkillDeletePlan placement matching', () => {
+  it('classifies matching placements without rescanning every unrelated skill', async () => {
+    const { home } = await fixture()
+    const selected: SkillDeleteRequest['skills'] = []
+    for (let index = 0; index < 32; index++) {
+      const name = `skill-${index}`
+      const file = await writeSkill(join(home, '.agents', 'skills', name), name)
+      if (index < 8) {
+        selected.push({ ...(await request(file)).skills[0], id: name, name })
+      }
+    }
+    selected.reverse()
+    const classification = vi.spyOn(SkillDeleteGuards, 'classifySkillPlacement')
+    const resolved = await buildSkillDeletePlan({
+      request: { operationId: 'batch-match', skills: selected },
+      target: { kind: 'native-host', cwd: home },
+      repos: [],
+      filesystem: nativeSkillInstallFilesystem,
+      homeDir: home
+    })
+
+    expect(resolved.plan.skills.map((skill) => skill.id)).toEqual(selected.map((skill) => skill.id))
+    expect(resolved.plan.skills.map((skill) => skill.placements)).toEqual(
+      selected.map((skill) => [
+        expect.objectContaining({ path: skill.directoryPath, kind: 'canonical' })
+      ])
+    )
+    expect(classification).toHaveBeenCalledTimes(selected.length)
+  })
+
+  it.skipIf(WINDOWS)(
+    'keeps directory and file identities distinct in original placement order',
+    async () => {
+      const { home } = await fixture()
+      const canonical = join(home, '.agents', 'skills', 'demo')
+      const file = await writeSkill(canonical, 'demo')
+      await mkdir(join(home, '.claude', 'skills'), { recursive: true })
+      await symlink(canonical, join(home, '.claude', 'skills', 'demo'), 'dir')
+      const aliasFile = join(home, '.codex', 'skills', 'demo')
+      await mkdir(aliasFile, { recursive: true })
+      await symlink(file, join(aliasFile, 'SKILL.md'))
+      await mkdir(join(home, '.grok', 'skills'), { recursive: true })
+      await symlink(file, join(home, '.grok', 'skills', 'points-to-file'))
+      const wrongFile = join(home, '.pi', 'agent', 'skills', 'points-to-directory')
+      await mkdir(wrongFile, { recursive: true })
+      await symlink(canonical, join(wrongFile, 'SKILL.md'), 'dir')
+
+      const resolved = await buildSkillDeletePlan({
+        request: await request(file),
+        target: { kind: 'native-host', cwd: home },
+        repos: [],
+        filesystem: nativeSkillInstallFilesystem,
+        homeDir: home
+      })
+
+      expect(resolved.plan.skills[0].placements.map((placement) => placement.kind)).toEqual([
+        'alias-dir',
+        'alias-file',
+        'canonical'
+      ])
+      expect(resolved.plan.skills[0].placements.map((placement) => placement.path)).toEqual([
+        join(home, '.claude', 'skills', 'demo'),
+        aliasFile,
+        canonical
+      ])
+      expect(
+        resolved.placementRoots.get('skill-id')?.map((placement) => placement.root.sourceKind)
+      ).toEqual(['home', 'home', 'home'])
+    }
+  )
+})
diff --git a/src/main/skills/skill-delete/plan.ts b/src/main/skills/skill-delete/plan.ts
index a17266cad216..4f075ba9ccbb 100644
--- a/src/main/skills/skill-delete/plan.ts
+++ b/src/main/skills/skill-delete/plan.ts
@@ -11,7 +11,11 @@ import {
   normalizedSkillPath,
   type SkillPathSemantics
 } from '../../../shared/skill-path-containment'
-import { enumerateSkillPlacementCandidates, requireEnumerableFilesystem } from './enumeration'
+import {
+  enumerateSkillPlacementCandidates,
+  requireEnumerableFilesystem,
+  type SkillPlacementCandidate
+} from './enumeration'
 import {
   blockedCanonicalReason,
   classifySkillPlacement,
@@ -26,6 +30,8 @@ import type { SkillInstallFilesystem } from '../skill-install-filesystem'
 import type { SkillProviderRootOverrides } from '../skill-provider-destinations'
 import type { SkillScanRoot } from '../skill-discovery-sources'
 
+type IndexedSkillPlacement = { candidate: SkillPlacementCandidate; ordinal: number }
+
 /** Overlapping roots can reach one directory twice. Staging the same path twice
  *  would fail the second rename and roll the whole skill back. */
 function dedupePlacements(
@@ -122,6 +128,21 @@ export async function buildSkillDeletePlan(
     toFilesystemPath
   })
 
+  const candidatesByFile = new Map<string, IndexedSkillPlacement[]>()
+  const candidatesByDirectory = new Map<string, IndexedSkillPlacement[]>()
+  for (const [ordinal, candidate] of candidates.entries()) {
+    const isDirectoryAlias = candidate.entryKind === 'symlink'
+    const identity = isDirectoryAlias ? candidate.directoryRealpath : candidate.skillFileRealpath
+    if (!identity) {
+      continue
+    }
+    const index = isDirectoryAlias ? candidatesByDirectory : candidatesByFile
+    const key = normalizedSkillPath(identity, semantics)
+    const bucket = index.get(key) ?? []
+    bucket.push({ candidate, ordinal })
+    index.set(key, bucket)
+  }
+
   const placementRoots = new Map<string, ClassifiedPlacement[]>()
   const skills = requested.map((skill): SkillDeletePlanEntry => {
     const inspection = inspections.get(skill.skillFilePath)
@@ -140,8 +161,13 @@ export async function buildSkillDeletePlan(
       return blockedEntry(skill, canonicalPath, blocked)
     }
     const placements = dedupePlacements(
-      candidates
-        .map((candidate) => classifySkillPlacement(candidate, canonicalPath, context))
+      [
+        ...(candidatesByFile.get(normalizedSkillPath(canonicalPath, semantics)) ?? []),
+        ...(candidatesByDirectory.get(normalizedSkillPath(api.dirname(canonicalPath), semantics)) ??
+          [])
+      ]
+        .sort((left, right) => left.ordinal - right.ordinal)
+        .map(({ candidate }) => classifySkillPlacement(candidate, canonicalPath, context))
         .filter((placement): placement is ClassifiedPlacement => placement !== null),
       semantics
     )
diff --git a/src/main/skills/skill-package-download-response-lifetime.test.ts b/src/main/skills/skill-package-download-response-lifetime.test.ts
new file mode 100644
index 000000000000..a7c4572801af
--- /dev/null
+++ b/src/main/skills/skill-package-download-response-lifetime.test.ts
@@ -0,0 +1,167 @@
+import { createHash } from 'node:crypto'
+import * as fs from 'node:fs/promises'
+import { createServer, type ServerResponse } from 'node:http'
+import { tmpdir } from 'node:os'
+import { join } from 'node:path'
+import { gzipSync } from 'node:zlib'
+import { afterEach, describe, expect, it, vi } from 'vitest'
+import { SKILL_PACKAGE_CONTENT_TYPE } from '../../shared/skill-package-manifest'
+import { downloadSkillPackageGrant } from './skill-package-download'
+
+vi.mock('node:fs/promises', async (importOriginal) => {
+  const actual = await importOriginal<typeof fs>()
+  return { ...actual, open: vi.fn(actual.open) }
+})
+
+const roots: string[] = []
+const packageBytes = gzipSync(Buffer.from('downloaded package bytes'))
+const archiveSha256 = createHash('sha256').update(packageBytes).digest('hex')
+
+afterEach(async () => {
+  vi.restoreAllMocks()
+  await Promise.all(roots.splice(0).map((root) => fs.rm(root, { recursive: true, force: true })))
+})
+
+async function downloadRoot(): Promise<string> {
+  const root = await fs.mkdtemp(join(tmpdir(), 'orca-skill-response-lifetime-'))
+  roots.push(root)
+  return root
+}
+
+async function storageServer(respond: (path: string, response: ServerResponse) => void) {
+  const streaming = new Set<ServerResponse>()
+  const server = createServer((request, response) => {
+    respond(request.url ?? '/', response)
+    if (response.writableEnded) {
+      return
+    }
+    streaming.add(response)
+    response.write(Buffer.alloc(1024))
+    const timer = setInterval(() => response.write(Buffer.alloc(1024)), 10)
+    response.once('close', () => {
+      clearInterval(timer)
+      streaming.delete(response)
+    })
+  })
+  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('storage server did not bind')
+  }
+  const origin = `http://127.0.0.1:${address.port}`
+  return {
+    origin,
+    streaming,
+    async close(): Promise<void> {
+      server.closeAllConnections()
+      await new Promise<void>((resolve) => server.close(() => resolve()))
+    }
+  }
+}
+
+async function downloadInput(origin: string) {
+  return {
+    url: `${origin}/package`,
+    expiresAt: new Date(Date.now() + 60_000).toISOString(),
+    expectedArchiveSha256: archiveSha256,
+    expectedCompressedBytes: packageBytes.length,
+    temporaryRoot: await downloadRoot(),
+    allowedOrigins: [origin],
+    requireHttps: false
+  }
+}
+
+describe('skill download response ownership', () => {
+  it.each([
+    { kind: 'http-error', error: 'skill-download-transport-failed' },
+    { kind: 'content-type', error: 'skill-download-content-type-invalid' },
+    { kind: 'content-length', error: 'skill-download-size-mismatch' },
+    { kind: 'staging-directory', error: /EEXIST|ENOTDIR/ },
+    { kind: 'archive-open', error: 'archive open failed' }
+  ])('closes an unread streaming response after $kind failure', async ({ kind, error }) => {
+    const storage = await storageServer((_path, response) => {
+      response.writeHead(kind === 'http-error' ? 403 : 200, {
+        'content-type': kind === 'content-type' ? 'text/html' : SKILL_PACKAGE_CONTENT_TYPE,
+        ...(kind === 'content-length' ? { 'content-length': '41943040' } : {})
+      })
+    })
+    try {
+      const input = await downloadInput(storage.origin)
+      if (kind === 'staging-directory') {
+        input.temporaryRoot = join(input.temporaryRoot, 'file')
+        await fs.writeFile(input.temporaryRoot, 'not a directory')
+      }
+      if (kind === 'archive-open') {
+        vi.mocked(fs.open).mockRejectedValueOnce(new Error('archive open failed'))
+      }
+      await expect(downloadSkillPackageGrant(input)).rejects.toThrow(error)
+      await vi.waitFor(() => expect(storage.streaming.size).toBe(0))
+    } finally {
+      await storage.close()
+    }
+  })
+
+  it.each([
+    { kind: 'allowed', error: null },
+    { kind: 'cross-origin', error: 'skill-download-cross-origin-redirect' },
+    { kind: 'missing-location', error: 'skill-download-redirect-invalid' },
+    { kind: 'redirect-limit', error: 'skill-download-redirect-limit' }
+  ])('closes unread $kind redirect bodies', async ({ kind, error }) => {
+    const storage = await storageServer((path, response) => {
+      if (path === '/final') {
+        response.writeHead(200, { 'content-type': SKILL_PACKAGE_CONTENT_TYPE })
+        response.end(packageBytes)
+        return
+      }
+      response.writeHead(
+        307,
+        kind === 'missing-location'
+          ? {}
+          : {
+              location:
+                kind === 'cross-origin'
+                  ? 'http://localhost:1/package'
+                  : kind === 'redirect-limit'
+                    ? '/package'
+                    : '/final'
+            }
+      )
+    })
+    try {
+      const input = await downloadInput(storage.origin)
+      input.allowedOrigins.push('http://localhost:1')
+      if (error) {
+        await expect(downloadSkillPackageGrant(input)).rejects.toThrow(error)
+      } else {
+        const result = await downloadSkillPackageGrant(input)
+        expect(await fs.readFile(result.archivePath)).toEqual(packageBytes)
+        expect(result.archiveSha256).toBe(archiveSha256)
+        await result.cleanup()
+      }
+      await vi.waitFor(() => expect(storage.streaming.size).toBe(0))
+    } finally {
+      await storage.close()
+    }
+  })
+
+  it('preserves complete downloads and checksum failures on a real streaming connection', async () => {
+    const storage = await storageServer((_path, response) => {
+      response.writeHead(200, { 'content-type': SKILL_PACKAGE_CONTENT_TYPE })
+      response.write(packageBytes.subarray(0, 5))
+      response.end(packageBytes.subarray(5))
+    })
+    try {
+      const input = await downloadInput(storage.origin)
+      const result = await downloadSkillPackageGrant(input)
+      expect(result.compressedBytes).toBe(packageBytes.length)
+      expect(result.archiveSha256).toBe(archiveSha256)
+      expect(await fs.readFile(result.archivePath)).toEqual(packageBytes)
+      await result.cleanup()
+      await expect(
+        downloadSkillPackageGrant({ ...input, expectedArchiveSha256: '0'.repeat(64) })
+      ).rejects.toThrow('skill-download-archive-digest-mismatch')
+    } finally {
+      await storage.close()
+    }
+  })
+})
diff --git a/src/main/skills/skill-package-download.ts b/src/main/skills/skill-package-download.ts
index 595b568eeff7..db081f69388f 100644
--- a/src/main/skills/skill-package-download.ts
+++ b/src/main/skills/skill-package-download.ts
@@ -11,6 +11,7 @@ import {
   throwIfSkillDownloadUnavailable
 } from './skill-package-download-availability'
 import { startSkillPhaseOperation } from './skill-operation-observability'
+import { cancelUnreadResponseBody } from '../lib/unread-response-body'
 
 const REDIRECT_STATUSES = new Set([301, 302, 303, 307, 308])
 const MAX_REDIRECTS = 3
@@ -102,18 +103,26 @@ async function fetchWithoutCredentialRedirect(
     if (!REDIRECT_STATUSES.has(response.status)) {
       return response
     }
-    if (redirectCount >= MAX_REDIRECTS) {
-      throw new Error('skill-download-redirect-limit')
-    }
-    const location = response.headers.get('location')
-    if (!location) {
-      throw new Error('skill-download-redirect-invalid')
-    }
-    const redirected = validateUrl(new URL(location, url).href, allowedOrigins, input.requireHttps)
-    if (redirected.origin !== url.origin) {
-      throw new Error('skill-download-cross-origin-redirect')
+    try {
+      if (redirectCount >= MAX_REDIRECTS) {
+        throw new Error('skill-download-redirect-limit')
+      }
+      const location = response.headers.get('location')
+      if (!location) {
+        throw new Error('skill-download-redirect-invalid')
+      }
+      const redirected = validateUrl(
+        new URL(location, url).href,
+        allowedOrigins,
+        input.requireHttps
+      )
+      if (redirected.origin !== url.origin) {
+        throw new Error('skill-download-cross-origin-redirect')
+      }
+      url = redirected
+    } finally {
+      await cancelUnreadResponseBody(response)
     }
-    url = redirected
   }
 }
 
@@ -187,8 +196,9 @@ async function downloadSkillPackageGrantUnobserved(
     now: input.now!,
     expiresAt
   })
+  let response: Response | undefined
   try {
-    const response = await fetchWithoutCredentialRedirect(
+    response = await fetchWithoutCredentialRedirect(
       input,
       allowedOrigins,
       expiresAt,
@@ -276,6 +286,9 @@ async function downloadSkillPackageGrantUnobserved(
       throw error
     }
   } finally {
+    if (response && !response.bodyUsed) {
+      await cancelUnreadResponseBody(response)
+    }
     availability.cleanup()
   }
 }
diff --git a/src/main/skills/skill-package-tar.test.ts b/src/main/skills/skill-package-tar.test.ts
index 4354c5d04431..5ed98a39d549 100644
--- a/src/main/skills/skill-package-tar.test.ts
+++ b/src/main/skills/skill-package-tar.test.ts
@@ -1,5 +1,13 @@
 import { describe, expect, it } from 'vitest'
-import { parseSkillTarHeader, SKILL_TAR_BLOCK_BYTES } from './skill-package-tar'
+import { mkdtemp, rm } from 'node:fs/promises'
+import { join } from 'node:path'
+import { tmpdir } from 'node:os'
+import {
+  openSkillTarGzip,
+  parseSkillTarHeader,
+  SKILL_TAR_BLOCK_BYTES,
+  writeSkillTarGzip
+} from './skill-package-tar'
 
 function writeOctal(header: Buffer, offset: number, length: number, value: number): void {
   header.write(`${value.toString(8).padStart(length - 1, '0')}\0`, offset, length, 'ascii')
@@ -62,3 +70,26 @@ describe('skill package tar envelope', () => {
     }
   })
 })
+
+describe('skill tar reader error ownership', () => {
+  it('observes an abort after the pipeline completes before the first reader request', async () => {
+    const root = await mkdtemp(join(tmpdir(), 'orca-skill-tar-abort-'))
+    try {
+      const archivePath = join(root, 'archive.tar.gz')
+      await writeSkillTarGzip(archivePath, [
+        { path: 'SKILL.md', size: 1, executable: false, bytes: Buffer.from('x') }
+      ])
+      const archive = await openSkillTarGzip(archivePath)
+      await archive.archiveIdentity
+      const failure = Object.assign(new Error('staging directory already exists'), {
+        code: 'EEXIST'
+      })
+      archive.abort(failure)
+      // Observe destruction before lazily attaching the reader's error listener.
+      await new Promise<void>((resolve) => setImmediate(resolve))
+      await expect(archive.reader.readExact(SKILL_TAR_BLOCK_BYTES)).rejects.toBe(failure)
+    } finally {
+      await rm(root, { recursive: true, force: true })
+    }
+  })
+})
diff --git a/src/main/skills/skill-package-tar.ts b/src/main/skills/skill-package-tar.ts
index f8cac20c6332..4a67f7ca5530 100644
--- a/src/main/skills/skill-package-tar.ts
+++ b/src/main/skills/skill-package-tar.ts
@@ -262,6 +262,8 @@ export async function openSkillTarGzip(archivePath: string): Promise<{
     }
   })
   const gunzip = createGunzip()
+  // Observe late aborts before the archive reader starts.
+  gunzip.on('error', () => undefined)
   const completion = pipeline(source, verifier, gunzip)
   const archiveIdentity = completion.then(() => ({
     archiveSha256: archiveHash.digest('hex'),
diff --git a/src/main/ssh/orcad-activation-gate.ts b/src/main/ssh/orcad-activation-gate.ts
index d514d6858e48..3320dae54efe 100644
--- a/src/main/ssh/orcad-activation-gate.ts
+++ b/src/main/ssh/orcad-activation-gate.ts
@@ -39,7 +39,7 @@ export type OrcadActivationVerdict =
   | { decision: 'reject'; code: OrcadActivationRejectCode; reason: string }
 
 export type OrcadActivationExpectation = {
-  /** sha256(orcad.js).slice(0,16) computed from the bytes this client just uploaded. */
+  /** Entry-file content hash computed from the bytes this client just uploaded. */
   buildHash: string
   /** The full content-hashed version this deploy installed. */
   fullVersion: string
diff --git a/src/main/ssh/orcad-local-build-hash.ts b/src/main/ssh/orcad-local-build-hash.ts
index 3740ea6d55c5..30f0bb74e3a1 100644
--- a/src/main/ssh/orcad-local-build-hash.ts
+++ b/src/main/ssh/orcad-local-build-hash.ts
@@ -1,22 +1,10 @@
-/**
- * The build identity the deploy expects the host to answer with.
- *
- * It must be computed the same way `computeOrcadBuildHash` computes it on the host —
- * sha256 of `orcad.js`, first 16 hex characters — or the activation gate would reject every
- * healthy candidate. Keeping the two in one comment is deliberate: they are one contract
- * split across a network, and the version string cannot stand in for it, because
- * `ORCA_VERSION` is whatever the launch command exported and two builds can carry one value.
- */
-import { createHash } from 'node:crypto'
-import { readFileSync } from 'node:fs'
+/** Shares the host build identity so activation verifies the shipped entry bytes. */
 import { join } from 'node:path'
+import { hashOrcadLauncher } from '../../shared/orcad-build-identity'
+import { ORCAD_LAUNCHER_FILENAME } from '../../shared/orcad-artifacts'
 
-export const ORCAD_BUILD_HASH_LENGTH = 16
+export { ORCAD_BUILD_HASH_LENGTH } from '../../shared/orcad-build-identity'
 
 export function computeLocalOrcadBuildHash(localOrcadDir: string): string {
-  const entry = join(localOrcadDir, 'orcad.js')
-  return createHash('sha256')
-    .update(readFileSync(entry))
-    .digest('hex')
-    .slice(0, ORCAD_BUILD_HASH_LENGTH)
+  return hashOrcadLauncher(join(localOrcadDir, ORCAD_LAUNCHER_FILENAME))
 }
diff --git a/src/main/ssh/orcad-remote-build-hash.integration.test.ts b/src/main/ssh/orcad-remote-build-hash.integration.test.ts
new file mode 100644
index 000000000000..df09abefc17a
--- /dev/null
+++ b/src/main/ssh/orcad-remote-build-hash.integration.test.ts
@@ -0,0 +1,42 @@
+import { execFileSync } from 'node:child_process'
+import { createHash } from 'node:crypto'
+import { mkdtempSync, rmSync, writeFileSync } from 'node:fs'
+import { tmpdir } from 'node:os'
+import { join } from 'node:path'
+import { afterEach, beforeEach, expect, it } from 'vitest'
+import { remoteOrcadBuildHashCommand } from './orcad-remote-build-hash'
+import { getRemoteHostPlatform } from './ssh-remote-platform'
+
+let directory = ''
+beforeEach(() => {
+  directory = mkdtempSync(join(tmpdir(), "orcad-hash-'quoted "))
+})
+afterEach(() => {
+  rmSync(directory, { recursive: true, force: true })
+})
+
+it.skipIf(process.platform === 'win32').each([false, true])(
+  'reads the installed build identity for split entry %s through a real POSIX shell',
+  (splitEntry) => {
+    const launcher = join(directory, 'orcad.js')
+    writeFileSync(launcher, 'launcher\n')
+    if (splitEntry) {
+      writeFileSync(join(directory, 'orcad-server.js'), 'server\n')
+    }
+    const command = remoteOrcadBuildHashCommand(getRemoteHostPlatform('linux-x64'), directory)
+    const run = (prefix = ''): string =>
+      execFileSync('/bin/sh', ['-c', prefix + command], { encoding: 'utf8' }).trim()
+    const legacyHash = createHash('sha256').update('launcher\n').digest('hex').slice(0, 16)
+    const expected = `__ORCAD_BUILD_HASH__ ${legacyHash}`
+    expect(run()).toBe(expected)
+    expect(run('command() { [ "$2" = shasum ]; }; ')).toBe(expected)
+  }
+)
+
+it.skipIf(process.platform === 'win32')(
+  'refuses an absent launcher without publishing an empty-file hash',
+  () => {
+    const command = remoteOrcadBuildHashCommand(getRemoteHostPlatform('linux-x64'), directory)
+    expect(() => execFileSync('/bin/sh', ['-c', command], { encoding: 'utf8' })).toThrow()
+  }
+)
diff --git a/src/main/ssh/orcad-remote-build-hash.ts b/src/main/ssh/orcad-remote-build-hash.ts
index 1308c4868f04..203da86b593c 100644
--- a/src/main/ssh/orcad-remote-build-hash.ts
+++ b/src/main/ssh/orcad-remote-build-hash.ts
@@ -1,4 +1,5 @@
-/** The installed slot's `orcad.js` identity, the same 16-hex prefix orcad reports in its health. */
+/** The installed entry bytes, hashed as the server reports them for activation and rollback. */
+import { ORCAD_LAUNCHER_FILENAME } from '../../shared/orcad-artifacts'
 import { shellEscape } from './ssh-connection-utils'
 import { execOrcadRemote, type OrcadRemoteExecTarget } from './orcad-remote-runtime-control'
 import { orcadWindowsBaseDir, orcadWindowsHostOpCommand } from './orcad-remote-windows-node'
@@ -29,12 +30,13 @@ export function remoteOrcadBuildHashCommand(
       host,
       orcadWindowsBaseDir(host, remoteInstallDir),
       'build-hash',
-      [joinRemotePath(host, remoteInstallDir, 'orcad.js')]
+      [joinRemotePath(host, remoteInstallDir, ORCAD_LAUNCHER_FILENAME)]
     )
   }
-  const path = shellEscape(joinRemotePath(host, remoteInstallDir, 'orcad.js'))
+  const path = shellEscape(joinRemotePath(host, remoteInstallDir, ORCAD_LAUNCHER_FILENAME))
   // Why both tools: GNU/busybox ship sha256sum, macOS ships shasum; either prints the digest first.
   return [
+    `[ -f ${path} ] && [ -r ${path} ] || exit 1;`,
     `orca_hash=$(if command -v sha256sum >/dev/null 2>&1; then sha256sum ${path} | awk '{print $1}';`,
     `elif command -v shasum >/dev/null 2>&1; then shasum -a 256 ${path} | awk '{print $1}'; fi);`,
     `case "$orca_hash" in [0-9a-fA-F][0-9a-fA-F]*) printf '%s %.16s\\n' ${shellEscape(BUILD_HASH_MARKER)} "$orca_hash";; esac`
diff --git a/src/main/ssh/orcad-remote-launch-windows.ts b/src/main/ssh/orcad-remote-launch-windows.ts
index ba255e8e3217..b18387f59472 100644
--- a/src/main/ssh/orcad-remote-launch-windows.ts
+++ b/src/main/ssh/orcad-remote-launch-windows.ts
@@ -2,7 +2,7 @@
  * Starting a candidate orcad on a Windows SSH host.
  *
  * Win32-OpenSSH kills the session's job when the session ends, so orcad must leave that job.
- * `orcad.js --windows-breakaway-launch` does it the way the relay does: one CreateProcessW with
+ * The server entry's `--windows-breakaway-launch` mode does it the way the relay does: one CreateProcessW with
  * CREATE_BREAKAWAY_FROM_JOB through the slot's staged process-tree addon. Unlike the relay there
  * is no WMI fallback: Win32_Process.Create is EDR-scored remote execution and refused to a
  * standard user's network logon, so a host that cannot break away refuses the launch.
@@ -28,7 +28,10 @@ import {
   orcadWindowsNodeCommandLine,
   readOrcadWindowsEncodedAnswer
 } from './orcad-remote-windows-node'
-import { ORCAD_WINDOWS_RUNTIME_MARKER } from './orcad-windows-host-script'
+import {
+  ORCAD_WINDOWS_ENTRY_MARKER,
+  ORCAD_WINDOWS_RUNTIME_MARKER
+} from './orcad-windows-host-script'
 import {
   ORCAD_LOG_FILENAME,
   ORCAD_READINESS_FILENAME,
@@ -67,14 +70,27 @@ export function readWindowsOrcadSlotRuntime(output: string): string {
   return runtime
 }
 
+/** Older host-script answers omit the entry; those slots used the single-file launcher. */
+export function readWindowsOrcadSlotEntry(
+  output: string,
+  host: RemoteHostPlatform,
+  slotDir: string
+): string {
+  return (
+    readOrcadWindowsEncodedAnswer(output, ORCAD_WINDOWS_ENTRY_MARKER) ??
+    joinRemotePath(host, slotDir, 'orcad.js')
+  )
+}
+
 export function windowsOrcadLaunchCommand(
   host: RemoteHostPlatform,
   spec: OrcadLaunchSpec,
-  slotRuntime: string
+  slotRuntime: string,
+  slotEntry = joinRemotePath(host, spec.remoteInstallDir, 'orcad.js')
 ): string {
   const dir = spec.remoteInstallDir
   return orcadWindowsNodeCommandLine(slotRuntime, [
-    joinRemotePath(host, dir, 'orcad.js'),
+    slotEntry,
     WINDOWS_BREAKAWAY_LAUNCH_FLAG,
     // The addon creates both with CREATE_ALWAYS, so a previous run's readiness line is gone
     // before the launcher returns.
diff --git a/src/main/ssh/orcad-remote-launch.ts b/src/main/ssh/orcad-remote-launch.ts
index c8468fffbb7d..b1b69f53d9f7 100644
--- a/src/main/ssh/orcad-remote-launch.ts
+++ b/src/main/ssh/orcad-remote-launch.ts
@@ -12,6 +12,7 @@
  * the process's whole life; redirecting means the deploy can disconnect and the supervisor
  * still owns a running service.
  */
+import { ORCAD_LAUNCHER_FILENAME, ORCAD_SERVER_ENTRY_FILENAME } from '../../shared/orcad-artifacts'
 import { shellEscape } from './ssh-connection-utils'
 import {
   isWindowsRemoteHost,
@@ -89,7 +90,7 @@ export function orcadLaunchCommand(host: RemoteHostPlatform, spec: OrcadLaunchSp
   )
   const log = shellEscape(joinRemotePath(host, spec.remoteInstallDir, ORCAD_LOG_FILENAME))
   const pidFile = shellEscape(joinRemotePath(host, spec.remoteInstallDir, ORCAD_PID_FILENAME))
-  const entry = shellEscape(joinRemotePath(host, spec.remoteInstallDir, 'orcad.js'))
+  const entry = shellEscape(joinRemotePath(host, spec.remoteInstallDir, ORCAD_LAUNCHER_FILENAME))
   const baseDir = remoteDirname(spec.remoteInstallDir.replace(/\/+$/u, ''), host)
   // Only `~/.orca-remote` itself; never tighten an unrelated parent a custom slot path names.
   const privateDirs = [
@@ -116,6 +117,7 @@ export function orcadLaunchCommand(host: RemoteHostPlatform, spec: OrcadLaunchSp
     `ORCA_USER_DATA=${shellEscape(spec.userDataDir)}`,
     ...orcadManagedLaunchEnv(spec).map(([name, value]) => `${name}=${shellEscape(value)}`),
     // Keep $! equal to the runtime PID rather than a waiting shell's PID.
+    // Older clients identify the live PID by orcad.js; the pinned launcher loads the body in-place.
     `exec nohup "$orcad_runtime" ${entry}`,
     `--json --bind ${shellEscape(spec.bindHost)} --port ${String(spec.port)}`,
     `> ${readiness} 2>> ${log} < /dev/null &`,
@@ -151,14 +153,15 @@ export function orcadLivenessProbeCommand(
   }
   const pidFile = shellEscape(joinRemotePath(host, remoteInstallDir, ORCAD_PID_FILENAME))
   const readiness = shellEscape(joinRemotePath(host, remoteInstallDir, ORCAD_READINESS_FILENAME))
-  const entry = shellEscape(joinRemotePath(host, remoteInstallDir, 'orcad.js'))
+  const launcher = shellEscape(joinRemotePath(host, remoteInstallDir, ORCAD_LAUNCHER_FILENAME))
+  const server = shellEscape(joinRemotePath(host, remoteInstallDir, ORCAD_SERVER_ENTRY_FILENAME))
   return [
     posixProcessAliveShellFunction({ refuseUnverifiable: true }),
     // A PID is no identity once reused: a process whose command line does not run this slot's
-    // orcad.js is not it. No `ps` answer leaves the plain liveness check to decide.
-    `orcad_entry=${entry};`,
+    // entry is not it. No `ps` answer leaves the plain liveness check to decide.
+    `orcad_launcher=${launcher}; orcad_server=${server};`,
     'orcad_reused() { args=$(ps -o args= -p "$1" 2>/dev/null) && [ -n "$args" ] && ' +
-      'case "$args" in *"$orcad_entry"*) return 1;; *) return 0;; esac; };',
+      'case "$args" in *"$orcad_launcher"* | *"$orcad_server"*) return 1;; *) return 0;; esac; };',
     `pid=$(cat ${pidFile} 2>/dev/null);`,
     'case "$pid" in',
     `"" ) if [ -e ${pidFile} ] || [ -e ${readiness} ]; then echo UNKNOWN; else echo ${ORCAD_NEVER_LAUNCHED}; fi;;`,
diff --git a/src/main/ssh/orcad-remote-preflight.ts b/src/main/ssh/orcad-remote-preflight.ts
index 85e41339422e..31357c7b3eb4 100644
--- a/src/main/ssh/orcad-remote-preflight.ts
+++ b/src/main/ssh/orcad-remote-preflight.ts
@@ -13,8 +13,9 @@ import {
   orcadWindowsNodeCommandLine,
   readOrcadWindowsEncodedAnswer
 } from './orcad-remote-windows-node'
+import { readWindowsOrcadSlotEntry } from './orcad-remote-launch-windows'
 import { ORCAD_WINDOWS_RUNTIME_MARKER } from './orcad-windows-host-script'
-import { orcadNodeSlotRuntimeCommand } from './orcad-remote-runtime'
+import { orcadNodeSlotRuntimeCommand, selectOrcadSlotEntryCommand } from './orcad-remote-runtime'
 import { execCommand } from './ssh-relay-deploy-helpers'
 import { shellEscape } from './ssh-connection-utils'
 import { isWindowsRemoteHost, joinRemotePath, type RemoteHostPlatform } from './ssh-remote-platform'
@@ -31,11 +32,11 @@ export function orcadProfilePreflightCommand(
   const launch = [
     'ORCA_BACKGROUND_LAUNCH=1',
     '"$orcad_runtime"',
-    shellEscape(joinRemotePath(host, directory, 'orcad.js')),
+    '"$orcad_entry"',
     ORCAD_PROFILE_PREFLIGHT_FLAG,
     shellEscape(nonce)
   ].join(' ')
-  return `[ -e ${marker} ] || exit 78; ${orcadNodeSlotRuntimeCommand(host, directory)}${launch}`
+  return `[ -e ${marker} ] || exit 78; ${orcadNodeSlotRuntimeCommand(host, directory)}${selectOrcadSlotEntryCommand(host, directory)}; ${launch}`
 }
 
 /** Failure leaves the incumbent and its data untouched, including an unconfirmed SSH exit. */
@@ -59,7 +60,7 @@ export async function preflightInstalledOrcad(options: {
 }
 
 /**
- * Windows: resolve the slot's node.exe, then run its `orcad.js` with plain argv. No
+ * Windows: resolve the slot's node.exe, then run its selected entry with plain argv. No
  * ORCA_BACKGROUND_LAUNCH here: orcad opens no window, and argv cannot set environment.
  */
 async function windowsOrcadProfilePreflightCommand(
@@ -72,21 +73,19 @@ async function windowsOrcadProfilePreflightCommand(
   nonce: string
 ): Promise<string> {
   const { host, remoteInstallDir } = options
-  const runtime = readOrcadWindowsEncodedAnswer(
-    await execCommand(
-      options.conn,
-      orcadWindowsHostOpCommand(host, orcadWindowsBaseDir(host, remoteInstallDir), 'slot-runtime', [
-        remoteInstallDir
-      ]),
-      { signal: options.signal, wrapCommand: false }
-    ),
-    ORCAD_WINDOWS_RUNTIME_MARKER
+  const slotAnswer = await execCommand(
+    options.conn,
+    orcadWindowsHostOpCommand(host, orcadWindowsBaseDir(host, remoteInstallDir), 'slot-runtime', [
+      remoteInstallDir
+    ]),
+    { signal: options.signal, wrapCommand: false }
   )
+  const runtime = readOrcadWindowsEncodedAnswer(slotAnswer, ORCAD_WINDOWS_RUNTIME_MARKER)
   if (!runtime) {
     throw new Error('The Windows host did not name the runtime this orcad slot needs.')
   }
   return orcadWindowsNodeCommandLine(runtime, [
-    joinRemotePath(host, remoteInstallDir, 'orcad.js'),
+    readWindowsOrcadSlotEntry(slotAnswer, host, remoteInstallDir),
     ORCAD_PROFILE_PREFLIGHT_FLAG,
     nonce
   ])
diff --git a/src/main/ssh/orcad-remote-runtime-control.ts b/src/main/ssh/orcad-remote-runtime-control.ts
index 590834b487b8..9a43e20f4a3b 100644
--- a/src/main/ssh/orcad-remote-runtime-control.ts
+++ b/src/main/ssh/orcad-remote-runtime-control.ts
@@ -9,6 +9,7 @@ import {
 import {
   readWindowsOrcadLaunchReport,
   readWindowsOrcadSlotRuntime,
+  readWindowsOrcadSlotEntry,
   windowsOrcadLaunchCommand,
   windowsOrcadLaunchRuntimeCommand
 } from './orcad-remote-launch-windows'
@@ -104,15 +105,18 @@ export async function launchOrcadAndAwaitReadiness(
   spec: OrcadLaunchSpec
 ): Promise<OrcadReadinessParse> {
   if (isWindowsRemoteHost(target.host)) {
-    const slotRuntime = readWindowsOrcadSlotRuntime(
+    const slotAnswer = await execOrcadRemote(
+      target,
+      windowsOrcadLaunchRuntimeCommand(target.host, spec.remoteInstallDir)
+    )
+    const slotRuntime = readWindowsOrcadSlotRuntime(slotAnswer)
+    const slotEntry = readWindowsOrcadSlotEntry(slotAnswer, target.host, spec.remoteInstallDir)
+    readWindowsOrcadLaunchReport(
       await execOrcadRemote(
         target,
-        windowsOrcadLaunchRuntimeCommand(target.host, spec.remoteInstallDir)
+        windowsOrcadLaunchCommand(target.host, spec, slotRuntime, slotEntry)
       )
     )
-    readWindowsOrcadLaunchReport(
-      await execOrcadRemote(target, windowsOrcadLaunchCommand(target.host, spec, slotRuntime))
-    )
   } else {
     await execOrcadRemote(target, orcadLaunchCommand(target.host, spec))
   }
diff --git a/src/main/ssh/orcad-remote-runtime.ts b/src/main/ssh/orcad-remote-runtime.ts
index df63b5a9c185..672c8df6282f 100644
--- a/src/main/ssh/orcad-remote-runtime.ts
+++ b/src/main/ssh/orcad-remote-runtime.ts
@@ -1,5 +1,7 @@
 import {
   ORCAD_BUILD_TARGET_FILENAME,
+  ORCAD_LAUNCHER_FILENAME,
+  ORCAD_SERVER_ENTRY_FILENAME,
   ORCAD_NODE_RUNTIME_DIR_PREFIX,
   ORCAD_NODE_RUNTIME_MARKER_FILENAME,
   ORCAD_NODE_RUNTIME_POSIX_EXECUTABLE,
@@ -10,6 +12,14 @@ import { assertPosixOrcadHost } from './orcad-remote-host-support'
 import { shellEscape } from './ssh-connection-utils'
 import { joinRemotePath, remoteDirname, type RemoteHostPlatform } from './ssh-remote-platform'
 
+/** New slots start the server directly; rollback still accepts older single-entry slots. */
+export function selectOrcadSlotEntryCommand(host: RemoteHostPlatform, directory: string): string {
+  assertPosixOrcadHost(host)
+  const server = shellEscape(joinRemotePath(host, directory, ORCAD_SERVER_ENTRY_FILENAME))
+  const launcher = shellEscape(joinRemotePath(host, directory, ORCAD_LAUNCHER_FILENAME))
+  return `if [ -f ${server} ]; then orcad_entry=${server}; else orcad_entry=${launcher}; fi`
+}
+
 /**
  * Sets `$orcad_runtime` to the pinned Node a slot's `.runtime-node` names, or exits 78.
  * Assumes the marker exists; callers decide what its absence means.
diff --git a/src/main/ssh/orcad-remote-shell-commands.integration.test.ts b/src/main/ssh/orcad-remote-shell-commands.integration.test.ts
index 9227ccd9a00b..fffede27a02a 100644
--- a/src/main/ssh/orcad-remote-shell-commands.integration.test.ts
+++ b/src/main/ssh/orcad-remote-shell-commands.integration.test.ts
@@ -97,7 +97,8 @@ afterEach(() => {
 
 async function launchTestRuntime(
   legacyWrapper = false,
-  stopRequests = false
+  stopRequests = false,
+  splitEntry = false
 ): Promise<{
   runtimePid: number
   recordedPid: number
@@ -106,7 +107,7 @@ async function launchTestRuntime(
   const terminatedFile = join(versionDir, 'terminated')
   const requestFile = join(versionDir, ORCAD_STOP_REQUEST_FILENAME)
   writeFileSync(
-    join(versionDir, 'orcad.js'),
+    join(versionDir, splitEntry ? 'orcad-server.js' : 'orcad.js'),
     [
       `const fs = require('node:fs');`,
       `process.on('SIGTERM', () => {`,
@@ -131,6 +132,9 @@ async function launchTestRuntime(
       `setTimeout(() => process.exit(1), 10_000);`
     ].join('\n')
   )
+  if (splitEntry) {
+    writeFileSync(join(versionDir, 'orcad.js'), 'require("./orcad-server.js")')
+  }
   let command = orcadLaunchCommand(host, {
     remoteInstallDir: versionDir,
     nodePath: process.execPath,
@@ -372,16 +376,30 @@ describe('state snapshot commands, run for real', () => {
 })
 
 describe('liveness and stop commands, run for real', () => {
-  it('records the runtime PID and waits for that runtime to exit when stopped', async () => {
-    const { runtimePid, recordedPid, terminatedFile } = await launchTestRuntime()
-    expect(recordedPid).toBe(runtimePid)
-    expect(stopTestRuntime()).toBe('stopped')
-    expect(readFileSync(terminatedFile, 'utf8')).toBe('terminated')
-    // An unreaped zombie has exited even though kill -0 still succeeds.
-    expect(sh(`ps -o stat= -p ${runtimePid} || true`).trim()).toMatch(/^(?:Z.*)?$/)
-    expect(existsSync(join(versionDir, ORCAD_PID_FILENAME))).toBe(true)
-    expect(stopTestRuntime()).toBe('already-exited')
-  })
+  it.each([false, true])(
+    'records and stops the runtime PID with split entry %s',
+    async (splitEntry) => {
+      const { runtimePid, recordedPid, terminatedFile } = await launchTestRuntime(
+        false,
+        false,
+        splitEntry
+      )
+      expect(recordedPid).toBe(runtimePid)
+      expect(parseOrcadLiveness(sh(orcadLivenessProbeCommand(host, versionDir)))).toBe('LIVE')
+      // The prior client recognizes only orcad.js when deciding whether this PID was reused.
+      const legacyIdentity = sh(
+        `args=$(ps -o args= -p ${recordedPid}); ` +
+          `case "$args" in *${shellEscape(join(versionDir, 'orcad.js'))}*) echo LIVE;; *) echo DEAD;; esac`
+      ).trim()
+      expect(legacyIdentity).toBe('LIVE')
+      expect(stopTestRuntime()).toBe('stopped')
+      expect(readFileSync(terminatedFile, 'utf8')).toBe('terminated')
+      // An unreaped zombie has exited even though kill -0 still succeeds.
+      expect(sh(`ps -o stat= -p ${runtimePid} || true`).trim()).toMatch(/^(?:Z.*)?$/)
+      expect(existsSync(join(versionDir, ORCAD_PID_FILENAME))).toBe(true)
+      expect(stopTestRuntime()).toBe('already-exited')
+    }
+  )
 
   it('stops a build that consumes stop requests by request file, not by signal', async () => {
     const { terminatedFile } = await launchTestRuntime(false, true)
@@ -513,31 +531,34 @@ describe('liveness and stop commands, run for real', () => {
     }
   })
 
-  it('reports LIVE for a running process and stops it with SIGTERM', async () => {
-    // Stands in for orcad: its command line runs this slot's orcad.js.
-    const child = spawn(
-      process.execPath,
-      ['-e', 'setTimeout(() => {}, 30000)', join(versionDir, 'orcad.js')],
-      { stdio: 'ignore' }
-    )
-    try {
-      writeFileSync(join(versionDir, ORCAD_PID_FILENAME), String(child.pid))
-      expect(parseOrcadLiveness(sh(orcadLivenessProbeCommand(host, versionDir)))).toBe('LIVE')
-
-      const exited = new Promise<NodeJS.Signals | null>((resolve) =>
-        child.once('exit', (_code, signal) => resolve(signal))
+  it.each(['orcad.js', 'orcad-server.js'])(
+    'reports LIVE and stops a running %s even without entry files',
+    async (entry) => {
+      // Stands in for orcad: its command line runs this slot's orcad.js.
+      const child = spawn(
+        process.execPath,
+        ['-e', 'setTimeout(() => {}, 30000)', join(versionDir, entry)],
+        { stdio: 'ignore' }
       )
-      expect(
-        parseOrcadStopOutcome(
-          sh(stopOrcadCommand(host, versionDir, { waitSeconds: 10, justLaunched: true }))
+      try {
+        writeFileSync(join(versionDir, ORCAD_PID_FILENAME), String(child.pid))
+        expect(parseOrcadLiveness(sh(orcadLivenessProbeCommand(host, versionDir)))).toBe('LIVE')
+
+        const exited = new Promise<NodeJS.Signals | null>((resolve) =>
+          child.once('exit', (_code, signal) => resolve(signal))
         )
-      ).toBe('stopped')
-      expect(await exited).toBe('SIGTERM')
-      expect(parseOrcadLiveness(sh(orcadLivenessProbeCommand(host, versionDir)))).toBe('DEAD')
-    } finally {
-      child.kill('SIGKILL')
+        expect(
+          parseOrcadStopOutcome(
+            sh(stopOrcadCommand(host, versionDir, { waitSeconds: 10, justLaunched: true }))
+          )
+        ).toBe('stopped')
+        expect(await exited).toBe('SIGTERM')
+        expect(parseOrcadLiveness(sh(orcadLivenessProbeCommand(host, versionDir)))).toBe('DEAD')
+      } finally {
+        child.kill('SIGKILL')
+      }
     }
-  })
+  )
 
   // `kill -0` succeeds on a zombie, so a probe built on it alone calls an exited process
   // live: the stop loop would time out on a process that is already gone, and GC would keep
diff --git a/src/main/ssh/orcad-remote-windows-commands.test.ts b/src/main/ssh/orcad-remote-windows-commands.test.ts
index 013000dc9553..ede08c7d2844 100644
--- a/src/main/ssh/orcad-remote-windows-commands.test.ts
+++ b/src/main/ssh/orcad-remote-windows-commands.test.ts
@@ -14,6 +14,7 @@ import { orcadLivenessProbeCommand, type OrcadLaunchSpec } from './orcad-remote-
 import {
   OrcadWindowsLaunchRefusedError,
   readWindowsOrcadLaunchReport,
+  readWindowsOrcadSlotEntry,
   windowsOrcadLaunchCommand,
   windowsOrcadLaunchRuntimeCommand
 } from './orcad-remote-launch-windows'
@@ -86,6 +87,18 @@ describe('Windows orcad commands run node.exe directly', () => {
     ['build hash', remoteOrcadBuildHashCommand(host, slot)]
   ]
 
+  it('selects the split server entry and preserves older host-script answers', () => {
+    const server = `${slot}/orcad-server.js`
+    const selected = readWindowsOrcadSlotEntry(encoded('__ORCAD_ENTRY__', server), host, slot)
+    expect(selected).toBe(server)
+    expect(windowsOrcadLaunchCommand(host, spec, SLOT_NODE, selected)).toContain(
+      `${server} --windows-breakaway-launch`
+    )
+    expect(readWindowsOrcadSlotEntry(encoded('__ORCAD_RUNTIME__', SLOT_NODE), host, slot)).toBe(
+      `${slot}/orcad.js`
+    )
+  })
+
   it.each(commands())('%s: no PowerShell hop, no encoding, no WMI or signal', (_name, command) => {
     expect(command).toMatch(/^C:\\Users\\u\\\.orca-remote\\runtimes\\node-[0-9a-f]+\\node\.exe /u)
     expect(command).not.toMatch(
@@ -126,7 +139,10 @@ describe('Windows orcad commands run node.exe directly', () => {
 
   it('never polls across SSH: runtime, launch, then one host-side wait', async () => {
     mockExec
-      .mockResolvedValueOnce(encoded('__ORCAD_RUNTIME__', SLOT_NODE))
+      .mockResolvedValueOnce(
+        encoded('__ORCAD_RUNTIME__', SLOT_NODE) +
+          encoded('__ORCAD_ENTRY__', `${slot}/orcad-server.js`)
+      )
       .mockResolvedValueOnce(
         'ORCA_ORCAD_LAUNCH {"method":"breakaway","pid":4242,"inJob":false}\r\n'
       )
@@ -144,6 +160,9 @@ describe('Windows orcad commands run node.exe directly', () => {
     expect(result).toMatchObject({ state: 'ready', readiness: { runtimeId: 'r1' } })
     expect(mockExec).toHaveBeenCalledTimes(3)
     expect(String(mockExec.mock.calls[1]?.[1]).startsWith(`${SLOT_NODE} `)).toBe(true)
+    expect(String(mockExec.mock.calls[1]?.[1])).toContain(
+      `${slot}/orcad-server.js --windows-breakaway-launch`
+    )
     expect(sleep).not.toHaveBeenCalled()
   })
 })
diff --git a/src/main/ssh/orcad-remote-windows-scripts.test.ts b/src/main/ssh/orcad-remote-windows-scripts.test.ts
index 69d3dfc77b09..d1699ac18d31 100644
--- a/src/main/ssh/orcad-remote-windows-scripts.test.ts
+++ b/src/main/ssh/orcad-remote-windows-scripts.test.ts
@@ -5,6 +5,7 @@
  * every platform. The process-tree addon is faked by a preload that loads `*.node` as a table of
  * creation times, so the identity rules run for real without Windows.
  */
+import { createHash } from 'node:crypto'
 import { existsSync, mkdirSync, mkdtempSync, readFileSync, rmSync, writeFileSync } from 'node:fs'
 import { tmpdir } from 'node:os'
 import { join } from 'node:path'
@@ -22,6 +23,7 @@ import {
   ORCAD_WINDOWS_HOST_SCRIPT,
   ORCAD_WINDOWS_READINESS_MARKER,
   ORCAD_WINDOWS_RUNTIME_MARKER,
+  ORCAD_WINDOWS_ENTRY_MARKER,
   type OrcadWindowsHostOp
 } from './orcad-windows-host-script'
 import { getRemoteHostPlatform } from './ssh-remote-platform'
@@ -317,6 +319,14 @@ describe('Windows slot runtime and file removal', () => {
     expect(readOrcadWindowsEncodedAnswer(plain.stdout, ORCAD_WINDOWS_RUNTIME_MARKER)).toBe(
       join(dir, 'runtimes', `node-${sha}`, 'node.exe')
     )
+    expect(readOrcadWindowsEncodedAnswer(plain.stdout, ORCAD_WINDOWS_ENTRY_MARKER)).toBe(
+      join(slot(), 'orcad.js')
+    )
+    writeFileSync(join(slot(), 'orcad-server.js'), '')
+    const split = await runOp('slot-runtime', [slot()], false)
+    expect(readOrcadWindowsEncodedAnswer(split.stdout, ORCAD_WINDOWS_ENTRY_MARKER)).toBe(
+      join(slot(), 'orcad-server.js')
+    )
     expect(existsSync(join(slot(), ORCAD_STOP_REQUEST_FILENAME))).toBe(true)
     await runOp('slot-runtime', [slot(), 'clear-stop-request'], false)
     expect(existsSync(join(slot(), ORCAD_STOP_REQUEST_FILENAME))).toBe(false)
@@ -345,3 +355,17 @@ describe('Windows slot runtime and file removal', () => {
 it('decodes nothing from output that lacks the marker', () => {
   expect(readOrcadWindowsEncodedAnswer('noise\r\n', ORCAD_WINDOWS_READINESS_MARKER)).toBeNull()
 })
+
+describe('Windows installed build identity', () => {
+  it.each([false, true])('matches the server hash for split entry %s', async (splitEntry) => {
+    const launcher = join(dir, 'orcad.js')
+    writeFileSync(launcher, 'launcher\n')
+    if (splitEntry) {
+      writeFileSync(join(dir, 'orcad-server.js'), 'server\n')
+    }
+    const result = await runOp('build-hash', [launcher], false)
+    expect(result.code).toBe(0)
+    const legacyHash = createHash('sha256').update('launcher\n').digest('hex').slice(0, 16)
+    expect(result.stdout.trim()).toBe(`__ORCAD_BUILD_HASH__ ${legacyHash}`)
+  })
+})
diff --git a/src/main/ssh/orcad-windows-host-script.ts b/src/main/ssh/orcad-windows-host-script.ts
index 9b6957c3d840..c731244c6ffe 100644
--- a/src/main/ssh/orcad-windows-host-script.ts
+++ b/src/main/ssh/orcad-windows-host-script.ts
@@ -13,6 +13,8 @@
  */
 import { createHash } from 'node:crypto'
 import {
+  ORCAD_LAUNCHER_FILENAME,
+  ORCAD_SERVER_ENTRY_FILENAME,
   ORCAD_NODE_RUNTIME_DIR_PREFIX,
   ORCAD_NODE_RUNTIME_MARKER_FILENAME,
   ORCAD_NODE_RUNTIME_WINDOWS_EXECUTABLE,
@@ -43,6 +45,7 @@ export const ORCAD_RECORD_PRESENT_MARKER = '__ORCAD_RECORD_PRESENT__'
 export const ORCAD_BUILD_HASH_MARKER = '__ORCAD_BUILD_HASH__'
 export const ORCAD_WINDOWS_READINESS_MARKER = '__ORCAD_READINESS__'
 export const ORCAD_WINDOWS_RUNTIME_MARKER = '__ORCAD_RUNTIME__'
+export const ORCAD_WINDOWS_ENTRY_MARKER = '__ORCAD_ENTRY__'
 export const ORCAD_WINDOWS_LIVENESS_MANY_MARKER = '__ORCAD_LIVENESS__'
 export const ORCAD_WINDOWS_LOG_TAIL_MARKER = '__ORCAD_LOG_TAIL__'
 /** A slot whose marker names no usable runtime; the POSIX selector exits the same way. */
@@ -271,7 +274,13 @@ const ops = {
     if (mode === 'clear-stop-request') {
       try { fs.unlinkSync(path.join(slotDir, ${text(ORCAD_STOP_REQUEST_FILENAME)})) } catch (error) { if (error.code !== 'ENOENT') process.exit(1) }
     }
-    encoded(${text(ORCAD_WINDOWS_RUNTIME_MARKER)}, Buffer.from(runtime, 'utf8'))
+    const server = path.join(slotDir, ${text(ORCAD_SERVER_ENTRY_FILENAME)})
+    const entry = fs.existsSync(server) ? server : path.join(slotDir, ${text(ORCAD_LAUNCHER_FILENAME)})
+    answer([
+      [${text(ORCAD_WINDOWS_RUNTIME_MARKER)}, Buffer.from(runtime, 'utf8').toString('base64')].join(' '),
+      [${text(ORCAD_WINDOWS_ENTRY_MARKER)}, Buffer.from(entry, 'utf8').toString('base64')].join(' '),
+      ''
+    ].join('\\n'))
   },
 
   // Never exits on its own: it lives as long as the client's exec channel or orcad's socket.
diff --git a/src/main/ssh/pinned-runtime-materializer-node.test.ts b/src/main/ssh/pinned-runtime-materializer-node.test.ts
index be2c29c7201b..1d479fe44fb9 100644
--- a/src/main/ssh/pinned-runtime-materializer-node.test.ts
+++ b/src/main/ssh/pinned-runtime-materializer-node.test.ts
@@ -1,5 +1,5 @@
 import { createHash } from 'node:crypto'
-import { mkdir, mkdtemp, readFile, rm, writeFile } from 'node:fs/promises'
+import { mkdir, mkdtemp, readFile, readdir, 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'
@@ -19,8 +19,13 @@ function sha256(bytes: Uint8Array): string {
   return createHash('sha256').update(bytes).digest('hex')
 }
 
-function fetcherFor(body: Uint8Array): typeof fetch {
-  return vi.fn<typeof fetch>(async () => new Response(Buffer.from(body), { status: 200 }))
+function fetcherFor(body: Uint8Array, signals: AbortSignal[] = []): typeof fetch {
+  return vi.fn<typeof fetch>(async (_url, options) => {
+    if (options?.signal) {
+      signals.push(options.signal)
+    }
+    return new Response(Buffer.from(body), { status: 200 })
+  })
 }
 
 /** A real .tar.gz laid out like the official one, so extraction runs the host's tar. */
@@ -53,7 +58,8 @@ describe.skipIf(process.platform === 'win32')('pinned Node runtime materializer'
     const archive = await nodeDistArchiveFixture(new TextEncoder().encode('node'))
     Object.assign(NODE_RUNTIME_ASSETS[TARGET], { archiveSha256: sha256(archive) })
     const cacheRoot = join(root, 'cache')
-    const fetcher = fetcherFor(archive)
+    const signals: AbortSignal[] = []
+    const fetcher = fetcherFor(archive, signals)
 
     const cached = await materializeNodeRuntimeArchive(TARGET, cacheRoot, { fetcher })
     expect(cached.endsWith(originalAsset.archive)).toBe(true)
@@ -68,6 +74,8 @@ describe.skipIf(process.platform === 'win32')('pinned Node runtime materializer'
     const repaired = await materializeNodeRuntimeArchive(TARGET, cacheRoot, { fetcher })
     expect(repaired).not.toBe(cached)
     expect(sha256(new Uint8Array(await readFile(repaired)))).toBe(sha256(archive))
+    expect(signals).toHaveLength(2)
+    expect(signals.every((signal) => !signal.aborted)).toBe(true)
   })
 
   it('refuses an archive that does not match the pin before caching it', async () => {
@@ -77,3 +85,69 @@ describe.skipIf(process.platform === 'win32')('pinned Node runtime materializer'
     ).rejects.toThrow('Node archive checksum mismatch')
   })
 })
+
+describe('pinned runtime archive request ownership', () => {
+  it.each(['http-error', 'oversized-declaration', 'staging-collision'] as const)(
+    'retires the owned %s request without cancelling its caller',
+    async (failure) => {
+      const cacheRoot = join(root, 'cache')
+      const archiveRoot = join(cacheRoot, 'node', 'archives')
+      const parent = new AbortController()
+      const signals: AbortSignal[] = []
+      const cancel = vi.fn()
+      const fetcher = vi.fn<typeof fetch>(async (_url, options) => {
+        if (options?.signal) {
+          signals.push(options.signal)
+        }
+        if (failure === 'staging-collision') {
+          const stage = (await readdir(archiveRoot)).find((name) => name.startsWith('.download-'))
+          if (!stage) {
+            throw new Error('Missing download staging directory')
+          }
+          await mkdir(join(archiveRoot, stage, originalAsset.archive))
+        }
+        return new Response(new ReadableStream({ cancel }), {
+          status: failure === 'http-error' ? 404 : 200,
+          statusText: 'Unavailable',
+          headers:
+            failure === 'oversized-declaration'
+              ? { 'content-length': String(200 * 1024 * 1024 + 1) }
+              : {}
+        })
+      })
+      const pending = materializeNodeRuntimeArchive(TARGET, cacheRoot, {
+        fetcher,
+        signal: parent.signal
+      })
+      await (failure === 'staging-collision'
+        ? expect(pending).rejects.toMatchObject({ code: 'EEXIST' })
+        : expect(pending).rejects.toThrow(
+            failure === 'http-error'
+              ? 'Node download failed: 404 Unavailable'
+              : 'Node download exceeded the archive size limit'
+          ))
+      expect(cancel).toHaveBeenCalledOnce()
+      expect(signals).toHaveLength(1)
+      expect(signals[0]?.aborted).toBe(true)
+      expect(parent.signal.aborted).toBe(false)
+      expect(await readdir(archiveRoot)).toEqual([])
+    }
+  )
+
+  it('keeps the caller cancellation reason and removes the incomplete stage', async () => {
+    const cacheRoot = join(root, 'cache')
+    const parent = new AbortController()
+    const reason = new Error('deployment cancelled')
+    const cancel = vi.fn()
+    const fetcher = vi.fn<typeof fetch>(async () => {
+      queueMicrotask(() => parent.abort(reason))
+      return new Response(new ReadableStream({ cancel }))
+    })
+    await expect(
+      materializeNodeRuntimeArchive(TARGET, cacheRoot, { fetcher, signal: parent.signal })
+    ).rejects.toBe(reason)
+    expect(parent.signal.reason).toBe(reason)
+    expect(cancel).toHaveBeenCalledOnce()
+    expect(await readdir(join(cacheRoot, 'node', 'archives'))).toEqual([])
+  })
+})
diff --git a/src/main/ssh/runtime-archive-download.test.ts b/src/main/ssh/runtime-archive-download.test.ts
index af5a6e7ebd8b..b715e2e39ff1 100644
--- a/src/main/ssh/runtime-archive-download.test.ts
+++ b/src/main/ssh/runtime-archive-download.test.ts
@@ -21,6 +21,13 @@ function archive(body: Uint8Array = BODY): PinnedRuntimeArchive {
 
 const ok = (body: Uint8Array = BODY): Response => new Response(Buffer.from(body), { status: 200 })
 
+function requestSignal(options: RequestInit | undefined): AbortSignal {
+  if (!options?.signal) {
+    throw new Error('Expected an owned archive request signal')
+  }
+  return options.signal
+}
+
 /** A body that delivers its first half, then fails as Chromium does when the network drops. */
 function droppedMidway(): Response {
   const stream = new ReadableStream<Uint8Array>({
@@ -52,29 +59,56 @@ describe('downloading a pinned runtime archive over a flaky network', () => {
     ['a server error', () => Promise.resolve(new Response('busy', { status: 503 }))],
     ['a reset partway through the body', () => Promise.resolve(droppedMidway())]
   ])('retries after %s and still verifies the checksum', async (_name, first) => {
-    const fetcher = vi.fn<typeof fetch>().mockImplementationOnce(first).mockResolvedValue(ok())
+    const signals: AbortSignal[] = []
+    let retiredBeforeRetry = false
+    const fetcher = vi
+      .fn<typeof fetch>()
+      .mockImplementationOnce(async (_url, options) => {
+        signals.push(requestSignal(options))
+        return first()
+      })
+      .mockImplementation(async (_url, options) => {
+        retiredBeforeRetry = signals[0]?.aborted === true
+        signals.push(requestSignal(options))
+        return ok()
+      })
     await downloadVerifiedArchive(archive(), destination, fetcher, undefined, NO_DELAY)
     expect(fetcher).toHaveBeenCalledTimes(2)
     expect(new Uint8Array(await readFile(destination))).toEqual(BODY)
+    expect(retiredBeforeRetry).toBe(true)
+    expect(signals[0]?.aborted).toBe(true)
+    expect(signals[1]?.aborted).toBe(false)
   })
 
   it('gives up after its bounded attempts with the last error', async () => {
-    const fetcher = vi.fn<typeof fetch>().mockRejectedValue(new Error('net::ERR_NETWORK_CHANGED'))
+    const signals: AbortSignal[] = []
+    const failure = new Error('net::ERR_NETWORK_CHANGED')
+    const fetcher = vi.fn<typeof fetch>(async (_url, options) => {
+      signals.push(requestSignal(options))
+      throw failure
+    })
     await expect(
       downloadVerifiedArchive(archive(), destination, fetcher, undefined, NO_DELAY)
-    ).rejects.toThrow('net::ERR_NETWORK_CHANGED')
+    ).rejects.toBe(failure)
     expect(fetcher).toHaveBeenCalledTimes(NO_DELAY.length + 1)
+    expect(signals).toHaveLength(NO_DELAY.length + 1)
+    expect(signals.every((signal) => signal.aborted)).toBe(true)
   })
 
   it.each([
     ['a missing asset', () => new Response('gone', { status: 404 })],
     ['a checksum mismatch', () => ok(new Uint8Array([9, 9]))]
   ])('never retries %s', async (_name, response) => {
-    const fetcher = vi.fn<typeof fetch>(async () => response())
+    const signals: AbortSignal[] = []
+    const fetcher = vi.fn<typeof fetch>(async (_url, options) => {
+      signals.push(requestSignal(options))
+      return response()
+    })
     await expect(
       downloadVerifiedArchive(archive(), destination, fetcher, undefined, NO_DELAY)
     ).rejects.toThrow()
     expect(fetcher).toHaveBeenCalledTimes(1)
+    expect(signals[0]?.aborted).toBe(true)
   })
 
   it('stops waiting to retry once the caller cancels', async () => {
diff --git a/src/main/ssh/runtime-archive-download.ts b/src/main/ssh/runtime-archive-download.ts
index 57706a419bcf..a37fcca9f2c9 100644
--- a/src/main/ssh/runtime-archive-download.ts
+++ b/src/main/ssh/runtime-archive-download.ts
@@ -151,7 +151,9 @@ async function downloadVerifiedArchiveOnce(
     }
   } catch (error) {
     // Why: the fetch may reject a stalled abort with its own AbortError rather than our reason.
-    throw stall.signal.aborted && !signal?.aborted ? stalled : error
+    const downloadError = stall.signal.aborted && !signal?.aborted ? stalled : error
+    stall.abort()
+    throw downloadError
   } finally {
     clearTimeout(stallTimer)
   }
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 ce223ae0b9c8..7231b20f6e44 100644
--- a/src/main/ssh/ssh-relay-session-reconnect-incarnation.test.ts
+++ b/src/main/ssh/ssh-relay-session-reconnect-incarnation.test.ts
@@ -452,6 +452,8 @@ describe('SshRelaySession reconnect incarnation ordering', () => {
       mayReviveRetiredSurface: false,
       origin: 'relay_reattach'
     })
+    // Into the pane's home partition: a `local` copy shadowed it at the next startup (STA-9544).
+    expect(mockStore.persistPtyBinding).toHaveBeenCalledWith(expect.any(Function), 'ssh:target-1')
     expect(vi.mocked(mockStore.persistPtyBinding).mock.invocationCallOrder[0]).toBeLessThan(
       vi.mocked(mockStore.markSshRemotePtyLeasesAttachedAsync).mock.invocationCallOrder[0]!
     )
diff --git a/src/main/ssh/ssh-relay-session.ts b/src/main/ssh/ssh-relay-session.ts
index d11587af4cf3..e7f7c60a15c0 100644
--- a/src/main/ssh/ssh-relay-session.ts
+++ b/src/main/ssh/ssh-relay-session.ts
@@ -2995,33 +2995,33 @@ export class SshRelaySession {
     if (lease?.worktreeId && lease.tabId && lease.leafId) {
       const { worktreeId, leafId, tabId: leaseTabId } = lease
       let tabId = lease.tabId
+      // The pane's home is this target's partition, where its spawn bound it. Binding into `local`
+      // left a copy there that startup then preferred over the home copy (STA-9544).
+      const hostId = toSshExecutionHostId(this.targetId)
       const bound = await this.store.persistPtyBinding(() => {
         if (!shouldContinue()) {
           return null
         }
-        const session = this.store.getWorkspaceSession?.()
+        const session = this.store.getWorkspaceSession?.(hostId)
+        // Rows an older build left in `local`; the renderer moves them home on its next save.
+        const legacySession = this.store.getWorkspaceSession?.()
         // The lease froze its tabId at write time; `detachTerminalPaneToTab` moves a live pane, so
         // trusting it would fence this reattach to the tab the pane LEFT and refuse a pane that
         // merely moved. Leaf is the identity, the tab is only where it currently sits.
-        // SSH spawns bind panes into `ssh:<target>` while this reattach binds into `local`, so a
-        // fence that consulted only one partition would read "no pane" for a pane the other holds.
-        const hostSession = this.store.getWorkspaceSession?.(toSshExecutionHostId(this.targetId))
         tabId =
           findTerminalTabIdForLeaf(session, leafId) ??
-          findTerminalTabIdForLeaf(hostSession, leafId) ??
+          findTerminalTabIdForLeaf(legacySession, leafId) ??
           leaseTabId
         // Absence of the pane only means "the user closed it" once the persisted membership
         // speaks for this worktree. Before that it means the renderer has not published its
         // layout yet, and refusing there drops a tab the user still has — the regression that
         // reverted this fix twice. Losing a tab is worse than keeping a duplicate, so an
         // unauthoritative session still gets the creating write.
-        // Authority is read from `local` because that is the partition this write lands in — it
-        // is local's absence we would be interpreting. But a pane the other partition still holds
-        // is not gone, so it keeps its creating write: refusing there would strand a live pane
+        // A pane only `local` still holds is not gone either: refusing it would strand a live pane
         // behind a binding reattach can no longer reach.
         const mayCreate =
           !hasHostAuthoritativeTerminalMembership(session, worktreeId) ||
-          findTerminalTabIdForLeaf(hostSession, leafId) !== undefined
+          findTerminalTabIdForLeaf(legacySession, leafId) !== undefined
         return {
           worktreeId: worktreeId,
           tabId,
@@ -3032,7 +3032,7 @@ export class SshRelaySession {
           mayReviveRetiredSurface: false,
           origin: 'relay_reattach' as const
         }
-      })
+      }, hostId)
       if (!shouldContinue()) {
         return 'missing-surface'
       }
diff --git a/src/main/startup/ensure-virtual-display.test.ts b/src/main/startup/ensure-virtual-display.test.ts
index ded8360bce5c..a895ee74edf8 100644
--- a/src/main/startup/ensure-virtual-display.test.ts
+++ b/src/main/startup/ensure-virtual-display.test.ts
@@ -240,8 +240,20 @@ describe('ensureVirtualDisplayForHeadlessServe', () => {
     spawnMock.mockReturnValue({ pid: 4242, once: vi.fn(), kill: vi.fn(), killed: false })
     const { ensureVirtualDisplayForHeadlessServe } = await import('./ensure-virtual-display')
 
-    expect(ensureVirtualDisplayForHeadlessServe({ isServeMode: true })).toBe(false)
-    expect(process.env.DISPLAY).toBeUndefined()
+    vi.useFakeTimers({ toFake: ['Date'] })
+    const sleep = vi
+      .spyOn(Atomics, 'wait')
+      .mockImplementation((_array, _index, _value, timeout) => {
+        vi.setSystemTime(Date.now() + (timeout ?? 0))
+        return 'timed-out'
+      })
+    try {
+      expect(ensureVirtualDisplayForHeadlessServe({ isServeMode: true })).toBe(false)
+      expect(process.env.DISPLAY).toBeUndefined()
+    } finally {
+      sleep.mockRestore()
+      vi.useRealTimers()
+    }
   })
 
   it('accepts the display once the spawned Xvfb owns its lock', async () => {
diff --git a/src/main/startup/main-process-account-services.ts b/src/main/startup/main-process-account-services.ts
index b7d41f6aae5e..1ddd43b0470b 100644
--- a/src/main/startup/main-process-account-services.ts
+++ b/src/main/startup/main-process-account-services.ts
@@ -179,7 +179,6 @@ export function initializeMainProcessAccountServices(): void {
       .filter((account) => !activeIds.has(account.id))
       .map((account) => ({
         id: account.id,
-        managedAuthPath: account.managedAuthPath,
         managedAuthRuntime: account.managedAuthRuntime,
         wslDistro: account.wslDistro,
         wslLinuxAuthPath: account.wslLinuxAuthPath
diff --git a/src/main/startup/main-process-ready-foundation.ts b/src/main/startup/main-process-ready-foundation.ts
index 4403659a2b92..9e4156aaa6d2 100644
--- a/src/main/startup/main-process-ready-foundation.ts
+++ b/src/main/startup/main-process-ready-foundation.ts
@@ -24,11 +24,6 @@ import {
   setDefaultWslDistroOverride
 } from '../git/runner'
 import { wslHookRelayManager } from '../agent-hooks/wsl-hook-relay-manager'
-import {
-  attachClaudeLivePtyPersistence,
-  onLiveClaudePtysDrained,
-  seedLiveClaudePtysFromPersistence
-} from '../claude-accounts/live-pty-gate'
 import { applyAppIcon } from '../app-icon'
 import {
   shouldSuppressDevEducation,
@@ -263,21 +258,6 @@ export async function initializeReadyFoundation(): Promise<void> {
       }
     }
   })
-  // Why: run before ClaudeRuntimeAuthService's constructor sync — a surviving daemon Claude CLI holds the single-use refresh token; early refresh rotates it out mid-session.
-  attachClaudeLivePtyPersistence(store)
-  // Why: while a live claude defers the managed OAuth refresh, usage shows
-  // "Waiting for Claude session"; refetch when the last live PTY exits so the
-  // error clears immediately instead of after the failure backoff.
-  onLiveClaudePtysDrained(() => {
-    void state.rateLimits?.refreshAfterClaudeLivePtysDrained()
-  })
-  const persistedClaudePtyIds = store.getClaudeLivePtySessionIds()
-  seedLiveClaudePtysFromPersistence(persistedClaudePtyIds)
-  if (persistedClaudePtyIds.length > 0) {
-    console.log(
-      `[claude-live-pty] Seeded ${persistedClaudePtyIds.length} persisted Claude session id(s) into the refresh gate`
-    )
-  }
   applyAppIcon(store.getSettings().appIcon)
   if (shouldSuppressDevEducation({ isDev: is.dev })) {
     suppressDevEducationForStore(store)
diff --git a/src/main/startup/main-process-ready-identity-write.test.ts b/src/main/startup/main-process-ready-identity-write.test.ts
index 4d2285e3b8e4..19bb07714e92 100644
--- a/src/main/startup/main-process-ready-identity-write.test.ts
+++ b/src/main/startup/main-process-ready-identity-write.test.ts
@@ -73,9 +73,6 @@ vi.mock('../persistence', () => ({
       return {}
     }
     onSettingsChanged() {}
-    getClaudeLivePtySessionIds() {
-      return []
-    }
     getSshTargets() {
       return []
     }
@@ -87,7 +84,6 @@ vi.mock('../persistence/profile-state/profile-state-startup-authority', () => ({
     store: {
       getSettings: () => ({}),
       onSettingsChanged: () => {},
-      getClaudeLivePtySessionIds: () => [],
       getSshTargets: () => []
     }
   })
@@ -146,11 +142,6 @@ vi.mock('../git/runner', () => ({
 vi.mock('../agent-hooks/wsl-hook-relay-manager', () => ({
   wslHookRelayManager: { setManagedHookSettingsResolver: vi.fn() }
 }))
-vi.mock('../claude-accounts/live-pty-gate', () => ({
-  attachClaudeLivePtyPersistence: vi.fn(),
-  onLiveClaudePtysDrained: vi.fn(),
-  seedLiveClaudePtysFromPersistence: vi.fn()
-}))
 vi.mock('../app-icon', () => ({ applyAppIcon: vi.fn() }))
 vi.mock('./dev-education-suppression', () => ({
   shouldSuppressDevEducation: () => false,
diff --git a/src/main/startup/main-window-core-services.test.ts b/src/main/startup/main-window-core-services.test.ts
index ef986e43ab87..aedb8dfccada 100644
--- a/src/main/startup/main-window-core-services.test.ts
+++ b/src/main/startup/main-window-core-services.test.ts
@@ -112,7 +112,6 @@ describe('main window profile-state update preparation', () => {
 
       expect(preserveAgentAuthBeforeRestartMock).toHaveBeenCalledWith({
         codexRuntimeHome: state.codexRuntimeHome,
-        claudeRuntimeAuth: state.claudeRuntimeAuth,
         store
       })
       expect(store.writeLatestProfileStateJsonExportAsync).not.toHaveBeenCalled()
diff --git a/src/main/startup/main-window-core-services.ts b/src/main/startup/main-window-core-services.ts
index 55fe55b7657b..c5386af283b4 100644
--- a/src/main/startup/main-window-core-services.ts
+++ b/src/main/startup/main-window-core-services.ts
@@ -92,11 +92,7 @@ export function attachMainWindowCoreServices(
         state.isQuitting = true
         stopDesktopRelayStartup()
         state.desktopRelayService?.fenceAndCloseNow()
-        await preserveAgentAuthBeforeRestart({
-          codexRuntimeHome,
-          claudeRuntimeAuth,
-          store
-        })
+        await preserveAgentAuthBeforeRestart({ codexRuntimeHome, store })
       },
       onOrcaProfileAuthMutation: () => notifyDesktopRelayAuthMutated(state.runtimeRpc),
       // Sign-out is the one fence a paired phone can be told about; quit and
@@ -132,7 +128,7 @@ export function attachMainWindowCoreServices(
       onCodexHomePtySpawned: handleCodexHomePtySpawned,
       onPtyExit: handlePtyExit,
       onBeforeUpdateQuit: async () => {
-        await preserveAgentAuthBeforeRestart({ codexRuntimeHome, claudeRuntimeAuth, store })
+        await preserveAgentAuthBeforeRestart({ codexRuntimeHome, store })
         await store.flushPendingOrThrowAsync({ fullCheckpoint: true })
       },
       onBeforeUpdateQuitFailure: 'abort',
diff --git a/src/main/startup/single-instance-lock-headless-exit.test.ts b/src/main/startup/single-instance-lock-headless-exit.test.ts
index f79afa3f5bae..519b57742b1f 100644
--- a/src/main/startup/single-instance-lock-headless-exit.test.ts
+++ b/src/main/startup/single-instance-lock-headless-exit.test.ts
@@ -1,30 +1,17 @@
 import { readFileSync } from 'node:fs'
 import { join } from 'node:path'
 import { describe, expect, it } from 'vitest'
-import { SINGLE_INSTANCE_ALREADY_RUNNING_EXIT_CODE } from './single-instance-lock'
 
 // Why #11935: a pre-`ready` graceful quit is deferred, so a lock-losing headless `orca serve`
 // kept booting into Linux Ozone/X11 init, died with SIGSEGV, and systemd restarted it forever
 // until the leaked AppImage FUSE mounts hit the kernel's 1000-mount ceiling.
 
-function readSystemdUnitBlocks(doc: string): Map<string, string[]> {
-  const blocks = new Map<string, string[]>()
-  // Why: key on the unit's path comment — splitting on directives mixes `[Unit]` and `[Service]` across blocks.
-  for (const match of doc.matchAll(/^# \/etc\/systemd\/system\/(\S+\.service)$/gm)) {
-    const start = match.index + match[0].length
-    const name = match[1]
-    blocks.set(name, [...(blocks.get(name) ?? []), doc.slice(start, doc.indexOf('```', start))])
-  }
-  return blocks
-}
-
 describe('headless lock-loss exit contract', () => {
   const preflightSource = readFileSync(
     join(process.cwd(), 'src/main/startup/main-process-preflight.ts'),
     'utf8'
   )
   const entrySource = readFileSync(join(process.cwd(), 'src/main/index.ts'), 'utf8')
-  const doc = readFileSync(join(process.cwd(), 'docs/reference/headless-linux-server.md'), 'utf8')
 
   it('exits the lock-losing launch immediately instead of scheduling a graceful quit', () => {
     const gateStart = preflightSource.indexOf('if (!hasLock) {')
@@ -48,41 +35,4 @@ describe('headless lock-loss exit contract', () => {
       'shouldActivateDesktopForSecondInstance(argv)'
     )
   })
-
-  it('makes every documented serve unit treat a duplicate owner as terminal', () => {
-    const serveUnits = readSystemdUnitBlocks(doc).get('orca-serve.service') ?? []
-
-    expect(serveUnits.length).toBeGreaterThan(0)
-    for (const unit of serveUnits) {
-      expect(unit).toContain(
-        `RestartPreventExitStatus=${SINGLE_INSTANCE_ALREADY_RUNNING_EXIT_CODE}`
-      )
-      expect(unit).toContain('StartLimitIntervalSec=')
-      expect(unit).toContain('StartLimitBurst=')
-    }
-  })
-
-  it('clears the start limit before every scripted start, which a tripped burst would refuse', () => {
-    const lines = doc.split('\n')
-    const startLines = lines.flatMap((line, index) =>
-      /^\s*sudo systemctl start orca-serve/.test(line) ? [index] : []
-    )
-
-    expect(startLines.length).toBeGreaterThan(0)
-    for (const index of startLines) {
-      expect(lines.slice(Math.max(0, index - 3), index).join('\n')).toContain(
-        'systemctl reset-failed orca-serve'
-      )
-    }
-  })
-
-  it('leaves the Xvfb unit free to self-heal from a transient display flap', () => {
-    const xvfbUnits = readSystemdUnitBlocks(doc).get('orca-xvfb.service') ?? []
-
-    expect(xvfbUnits.length).toBeGreaterThan(0)
-    // Why: a start limit here would down the display unit permanently and take orca-serve with it.
-    for (const unit of xvfbUnits) {
-      expect(unit).not.toContain('StartLimitBurst=')
-    }
-  })
 })
diff --git a/src/main/update-install-exit-watchdog.test.ts b/src/main/update-install-exit-watchdog.test.ts
index 80457230a3c8..43fc6d369b4d 100644
--- a/src/main/update-install-exit-watchdog.test.ts
+++ b/src/main/update-install-exit-watchdog.test.ts
@@ -1,14 +1,20 @@
 import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest'
 
-const { appMock, recordUpdaterLifecycleMock } = vi.hoisted(() => ({
-  appMock: { exit: vi.fn() },
-  recordUpdaterLifecycleMock: vi.fn()
-}))
+const { appMock, recordUpdaterLifecycleMock, recordAgentSessionRuntimeEndMock } = vi.hoisted(
+  () => ({
+    appMock: { exit: vi.fn() },
+    recordUpdaterLifecycleMock: vi.fn(),
+    recordAgentSessionRuntimeEndMock: vi.fn()
+  })
+)
 
 vi.mock('electron', () => ({ app: appMock }))
 vi.mock('./updater-lifecycle-diagnostics', () => ({
   recordUpdaterLifecycle: recordUpdaterLifecycleMock
 }))
+vi.mock('./runtime/agent-session-runtime-end-record', () => ({
+  recordAgentSessionRuntimeEnd: recordAgentSessionRuntimeEndMock
+}))
 
 import {
   armUpdateInstallExitWatchdog,
@@ -21,6 +27,7 @@ describe('update install exit watchdog', () => {
     vi.useFakeTimers()
     appMock.exit.mockClear()
     recordUpdaterLifecycleMock.mockClear()
+    recordAgentSessionRuntimeEndMock.mockClear()
   })
 
   afterEach(() => {
@@ -36,6 +43,8 @@ describe('update install exit watchdog', () => {
 
     vi.advanceTimersByTime(1)
     expect(appMock.exit).toHaveBeenCalledExactlyOnceWith(0)
+    // A wedged teardown may not have reached its own record of the update.
+    expect(recordAgentSessionRuntimeEndMock).toHaveBeenCalledExactlyOnceWith('update')
     expect(recordUpdaterLifecycleMock).toHaveBeenCalledWith(
       'install_exit_watchdog_fired',
       { timeoutMs: UPDATE_INSTALL_EXIT_TIMEOUT_MS },
diff --git a/src/main/update-install-exit-watchdog.ts b/src/main/update-install-exit-watchdog.ts
index 69986d1154ea..4517b5f41c5f 100644
--- a/src/main/update-install-exit-watchdog.ts
+++ b/src/main/update-install-exit-watchdog.ts
@@ -1,5 +1,6 @@
 import { app } from 'electron'
 import { recordUpdaterLifecycle } from './updater-lifecycle-diagnostics'
+import { recordAgentSessionRuntimeEnd } from './runtime/agent-session-runtime-end-record'
 
 // Why 20s: comfortably above a healthy shutdown (renderer buffer capture,
 // daemon final checkpoints, bounded 2s telemetry flush) but bounded — a wedged
@@ -35,6 +36,7 @@ export function armUpdateInstallExitWatchdog(timeoutMs = UPDATE_INSTALL_EXIT_TIM
     )
     // Why exit(0): the quit is already committed and cleanup is wedged, not
     // failed — a clean code keeps ShipIt/launchd on the normal relaunch path.
+    recordAgentSessionRuntimeEnd('update')
     app.exit(0)
   }, timeoutMs)
   // Why unref: the watchdog must never be the thing keeping the process alive.
diff --git a/src/main/window/attach-main-window-services.test.ts b/src/main/window/attach-main-window-services.test.ts
index 6a685f2f9826..bd37b20307ca 100644
--- a/src/main/window/attach-main-window-services.test.ts
+++ b/src/main/window/attach-main-window-services.test.ts
@@ -628,81 +628,6 @@ describe('attachMainWindowServices', () => {
     expect(browserManagerUnregisterAllMock).toHaveBeenCalledTimes(1)
   })
 
-  it('removes the native file-drop relay when the main window closes', () => {
-    const mainWindowOnMock = vi.fn()
-    const mainWindow = createMainWindow({ send: vi.fn() })
-    mainWindow.on = mainWindowOnMock
-
-    attachMainWindowServices(mainWindow as never, createStore(), createRuntime() as never)
-
-    const channel = 'terminal:file-dropped-from-preload'
-    const relayHandler = onMock.mock.calls.find(([event]) => event === channel)?.[1]
-    expect(relayHandler).toBeTypeOf('function')
-    expect(removeAllListenersMock).toHaveBeenCalledWith(channel)
-
-    const closedHandlers = getClosedHandlers(mainWindowOnMock)
-    for (const handler of closedHandlers) {
-      handler()
-    }
-
-    expect(removeListenerMock).toHaveBeenCalledWith(channel, relayHandler)
-  })
-
-  it('relays native file drops only from the owning renderer webContents', () => {
-    const sendMock = vi.fn()
-    const mainWindow = createMainWindow({ send: sendMock })
-
-    attachMainWindowServices(mainWindow as never, createStore(), createRuntime() as never)
-
-    const channel = 'terminal:file-dropped-from-preload'
-    const relayHandler = onMock.mock.calls.find(([event]) => event === channel)?.[1]
-    const payload = { paths: ['/tmp/a'], target: 'editor' }
-
-    relayHandler?.({ sender: { id: 999 } }, payload)
-
-    expect(sendMock).not.toHaveBeenCalled()
-
-    relayHandler?.({ sender: mainWindow.webContents }, payload)
-
-    expect(sendMock).toHaveBeenCalledWith('terminal:file-drop', payload)
-  })
-
-  it('ignores malformed native file-drop payloads from the owning renderer', () => {
-    const sendMock = vi.fn()
-    const mainWindow = createMainWindow({ send: sendMock })
-
-    attachMainWindowServices(mainWindow as never, createStore(), createRuntime() as never)
-
-    const channel = 'terminal:file-dropped-from-preload'
-    const relayHandler = onMock.mock.calls.find(([event]) => event === channel)?.[1]
-
-    relayHandler?.(
-      { sender: mainWindow.webContents },
-      { paths: ['C:\\Users\\alice\\secret.txt'], target: 'browser' }
-    )
-    relayHandler?.(
-      { sender: mainWindow.webContents },
-      { paths: ['/tmp/a'], target: 'file-explorer' }
-    )
-
-    expect(sendMock).not.toHaveBeenCalled()
-  })
-
-  it('ignores native file drops after the owning webContents is destroyed', () => {
-    const sendMock = vi.fn()
-    const mainWindow = createMainWindow({ send: sendMock })
-
-    attachMainWindowServices(mainWindow as never, createStore(), createRuntime() as never)
-
-    const channel = 'terminal:file-dropped-from-preload'
-    const relayHandler = onMock.mock.calls.find(([event]) => event === channel)?.[1]
-    mainWindow.webContents.isDestroyed?.mockReturnValue(true)
-
-    relayHandler?.({ sender: mainWindow.webContents }, { paths: ['/tmp/a'], target: 'editor' })
-
-    expect(sendMock).not.toHaveBeenCalled()
-  })
-
   it('clears the runtime notifier when the owning window closes', () => {
     const mainWindowOnMock = vi.fn()
     const mainWindow = createMainWindow()
diff --git a/src/main/window/attach-main-window-services.ts b/src/main/window/attach-main-window-services.ts
index b448681857ec..4c412e9fedf7 100644
--- a/src/main/window/attach-main-window-services.ts
+++ b/src/main/window/attach-main-window-services.ts
@@ -39,7 +39,7 @@ import {
 import { startFolderRepoGitUpgradeWatch } from '../ipc/folder-repo-git-upgrade'
 import { scheduleMainWindowAutoUpdaterSetup } from './main-window-updater'
 import { registerRuntimeWindowLifecycle } from './runtime-window-lifecycle'
-import { registerFileDropRelay } from './native-file-drop-relay'
+import { registerDroppedPathPreparation } from './dropped-path-preparation-ipc'
 
 export { ensureAutoUpdaterConfigured, registerUpdaterHandlers } from './main-window-updater'
 
@@ -126,7 +126,7 @@ export function attachMainWindowServices(
   }
   registerSshHandlers(store, () => mainWindow, runtime)
   registerRemoteWorkspaceHandlers(store, () => mainWindow, runtime)
-  registerFileDropRelay(mainWindow)
+  registerDroppedPathPreparation(mainWindow)
   registerTccPromptNoticeHandlers(mainWindow)
   scheduleMainWindowAutoUpdaterSetup(mainWindow, store, options)
   registerRuntimeWindowLifecycle(mainWindow, runtime)
diff --git a/src/main/window/clipboard-agent-session-attachment-paste.test.ts b/src/main/window/clipboard-agent-session-attachment-paste.test.ts
new file mode 100644
index 000000000000..8db77235abf8
--- /dev/null
+++ b/src/main/window/clipboard-agent-session-attachment-paste.test.ts
@@ -0,0 +1,120 @@
+// A structured chat on a paired server keeps pasted images in that server's attachment store, not
+// in its temp directory: a temp path has no owner and nothing ever removes it.
+import { beforeEach, describe, expect, it, vi } from 'vitest'
+
+const mocks = vi.hoisted(() => ({
+  handle: vi.fn(),
+  readImage: vi.fn(),
+  callRuntimeEnvironment: vi.fn()
+}))
+
+vi.mock('electron', () => ({
+  app: { getPath: vi.fn(() => '/tmp/client-user-data') },
+  clipboard: { readImage: mocks.readImage },
+  ipcMain: { removeHandler: vi.fn(), handle: mocks.handle },
+  nativeImage: { createFromBuffer: vi.fn() }
+}))
+vi.mock('../ipc/runtime-environment-transport-routing', () => ({
+  callRuntimeEnvironment: mocks.callRuntimeEnvironment
+}))
+vi.mock('../../shared/runtime-environment-store', () => ({
+  resolveEnvironment: (_userDataPath: string, selector: string) => ({ id: selector })
+}))
+vi.mock('./clipboard-remote-file-copy', () => ({
+  cleanupExpiredRemoteClipboardFiles: vi.fn(async () => {}),
+  scheduleLegacyRemoteClipboardFileCleanup: vi.fn(),
+  writeRemoteFileToClipboard: vi.fn()
+}))
+vi.mock('./dashboard-popout-window', () => ({ isDashboardPopoutRenderer: () => false }))
+
+import {
+  registerClipboardHandlers,
+  setTrustedClipboardRendererWebContentsId
+} from './clipboard-ipc-handlers'
+
+function saveHandler(): (...args: unknown[]) => Promise<unknown> {
+  const entry = mocks.handle.mock.calls.find(
+    ([channel]) => channel === 'clipboard:saveImageAsTempFile'
+  )
+  if (!entry) {
+    throw new Error('save handler was not registered')
+  }
+  // oxlint-disable-next-line typescript/consistent-type-assertions -- SAFETY: ipcMain.handle was called with this channel's async handler.
+  return entry[1] as (...args: unknown[]) => Promise<unknown>
+}
+
+const event = {
+  sender: {
+    id: 17,
+    getType: () => 'window',
+    getURL: () => 'file:///orca/index.html',
+    isDestroyed: () => false
+  }
+}
+
+beforeEach(() => {
+  vi.clearAllMocks()
+  setTrustedClipboardRendererWebContentsId(17)
+  mocks.readImage.mockReturnValue({
+    getSize: () => ({ height: 1, width: 1 }),
+    isEmpty: () => false,
+    toPNG: () => Buffer.from('png')
+  })
+  mocks.callRuntimeEnvironment.mockImplementation(async (_userData, _env, method: string) => {
+    if (method === 'agentSessionAttachment.uploadStart') {
+      return { ok: true, result: { uploadId: 'upload-1' } }
+    }
+    if (method === 'agentSessionAttachment.uploadAppend') {
+      return { ok: true, result: { receivedBytes: 3 } }
+    }
+    if (method === 'agentSessionAttachment.uploadCommit') {
+      return {
+        ok: true,
+        result: { path: '/srv/agent-session-attachments/s/upload-1/p.png', name: 'p.png' }
+      }
+    }
+    throw new Error(`unexpected method: ${method}`)
+  })
+})
+
+describe('clipboard:saveImageAsTempFile for a structured chat on a paired server', () => {
+  it("stores the image in the chat's attachment store, pinned to the pairing and server", async () => {
+    // oxlint-disable-next-line typescript/consistent-type-assertions -- SAFETY: the image save path never reads the store.
+    registerClipboardHandlers({} as never)
+
+    await expect(
+      saveHandler()(event, {
+        runtimeEnvironmentId: 'remote-host-1',
+        agentSessionAttachment: {
+          sessionId: 'session-1',
+          expectedEnvironmentPairingRevision: 7,
+          expectedEnvironmentRuntimeId: 'runtime-a'
+        }
+      })
+    ).resolves.toBe('/srv/agent-session-attachments/s/upload-1/p.png')
+
+    const methods = mocks.callRuntimeEnvironment.mock.calls.map((call) => call[2])
+    expect(methods).toEqual([
+      'agentSessionAttachment.uploadStart',
+      'agentSessionAttachment.uploadAppend',
+      'agentSessionAttachment.uploadCommit'
+    ])
+    expect(mocks.callRuntimeEnvironment.mock.calls[0][3]).toMatchObject({
+      sessionId: 'session-1',
+      name: expect.stringMatching(/^orca-paste-.+\.png$/),
+      byteLength: 3
+    })
+    for (const call of mocks.callRuntimeEnvironment.mock.calls) {
+      expect(call[5]).toBe(7)
+      expect(call[7]).toMatchObject({ expectedEnvironmentRuntimeId: 'runtime-a' })
+    }
+  })
+
+  it('keeps the server temp directory for a paste that names no chat', async () => {
+    mocks.callRuntimeEnvironment.mockResolvedValue({ ok: true, result: { uploadId: 'u' } })
+    // oxlint-disable-next-line typescript/consistent-type-assertions -- SAFETY: the image save path never reads the store.
+    registerClipboardHandlers({} as never)
+    await saveHandler()(event, { runtimeEnvironmentId: 'remote-host-1' }).catch(() => {})
+    expect(mocks.callRuntimeEnvironment.mock.calls[0][2]).toBe('clipboard.startImageUpload')
+  })
+})
diff --git a/src/main/window/clipboard-image-temp-file.ts b/src/main/window/clipboard-image-temp-file.ts
index 3a599e4ac5e2..223b89c79a63 100644
--- a/src/main/window/clipboard-image-temp-file.ts
+++ b/src/main/window/clipboard-image-temp-file.ts
@@ -6,11 +6,14 @@ import { requireSshFilesystemProvider } from '../providers/ssh-filesystem-dispat
 import { getAppEnvironment } from '../../shared/app-environment'
 import { isWindowsAbsolutePathLike } from '../../shared/cross-platform-path'
 import { assertClipboardImageByteLengthWithinLimit } from '../../shared/clipboard-image'
+import type { AgentSessionAttachmentClipboardTarget } from '../../shared/agent-session-attachments'
 import { nativeChatPasteFolder } from './native-chat-paste-files'
 
 export type SaveClipboardImageAsTempFileArgs = {
   connectionId?: string | null
   runtimeEnvironmentId?: string | null
+  /** With `runtimeEnvironmentId`: store the image as an attachment of this structured chat. */
+  agentSessionAttachment?: AgentSessionAttachmentClipboardTarget
   /** A native-chat composer paste: kept in Orca's paste folder so its draft can bring it back. */
   forNativeChatDraft?: boolean
 }
diff --git a/src/main/window/clipboard-ipc-handlers.ts b/src/main/window/clipboard-ipc-handlers.ts
index f5fb9032f2dc..05a09a54bb81 100644
--- a/src/main/window/clipboard-ipc-handlers.ts
+++ b/src/main/window/clipboard-ipc-handlers.ts
@@ -39,6 +39,7 @@ import {
   writeRemoteFileToClipboard
 } from './clipboard-remote-file-copy'
 import { saveClipboardImageBufferInRuntime } from './clipboard-runtime-image-upload'
+import { uploadPastedImageToAgentSessionAttachments } from '../ipc/agent-session-attachment-upload'
 import { readWindowsClipboardImageFileAsPng } from './clipboard-windows-image-file'
 import { readClipboardCopiedFilePaths } from './clipboard-copied-file-paths'
 import { buildClipboardImageThumbnail } from './clipboard-image-thumbnail'
@@ -59,6 +60,15 @@ async function saveClipboardImageBufferForTarget(
 ): Promise<string> {
   assertClipboardImageByteLengthWithinLimit(buffer.byteLength)
   const runtimeEnvironmentId = args?.runtimeEnvironmentId?.trim()
+  // A structured chat on a paired server keeps its pasted images in that server's store.
+  if (runtimeEnvironmentId && args?.agentSessionAttachment) {
+    return uploadPastedImageToAgentSessionAttachments(
+      args.agentSessionAttachment,
+      runtimeEnvironmentId,
+      app.getPath('userData'),
+      buffer
+    )
+  }
   // Why (#17679): with a runtime owner, a connectionId names one of the RUNTIME's SSH
   // connections (nested Remote Server -> SSH), not one this process dialed. Looking it up
   // in the local provider registry can only miss, so the runtime must perform the save.
diff --git a/src/main/window/createMainWindow-tray-minimize-close.test.ts b/src/main/window/createMainWindow-tray-minimize-close.test.ts
index 469d83138304..417991f8a0df 100644
--- a/src/main/window/createMainWindow-tray-minimize-close.test.ts
+++ b/src/main/window/createMainWindow-tray-minimize-close.test.ts
@@ -1,5 +1,9 @@
 import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest'
 
+const { recordAgentSessionRuntimeEndMock } = vi.hoisted(() => ({
+  recordAgentSessionRuntimeEndMock: vi.fn()
+}))
+
 vi.mock('electron', async () =>
   (await import('./createMainWindow-test-harness')).electronModuleMock()
 )
@@ -13,6 +17,9 @@ vi.mock('../app-icon', async () => (await import('./createMainWindow-test-harnes
 vi.mock('../browser/browser-manager', async () =>
   (await import('./createMainWindow-test-harness')).browserManagerMock()
 )
+vi.mock('../runtime/agent-session-runtime-end-record', () => ({
+  recordAgentSessionRuntimeEnd: recordAgentSessionRuntimeEndMock
+}))
 
 import { createMainWindow } from './createMainWindow'
 import { ipcMain } from 'electron'
@@ -140,6 +147,17 @@ describe('createMainWindow', () => {
       ])
     })
 
+    it("records the Orca runtime's end, since Windows emits no will-quit for it", () => {
+      setPlatform('win32')
+      recordAgentSessionRuntimeEndMock.mockClear()
+      const { windowHandlers } = setupCloseWindow()
+
+      createMainWindow(null)
+      windowHandlers['session-end']?.({ reasons: ['logoff'] })
+
+      expect(recordAgentSessionRuntimeEndMock).toHaveBeenCalledExactlyOnceWith('quit')
+    })
+
     it.each(['darwin', 'linux'] as const)(
       'does not mark session teardown state on %s',
       (platform) => {
diff --git a/src/main/window/createMainWindow.ts b/src/main/window/createMainWindow.ts
index 41d84d1ab93b..89c01dff078b 100644
--- a/src/main/window/createMainWindow.ts
+++ b/src/main/window/createMainWindow.ts
@@ -31,6 +31,7 @@ import {
 import { installMainWindowWebviewSecurity } from './main-window-webview-security'
 import { rectHasVisibleAreaOnAnyDisplay } from './window-bounds-validation'
 import { installWindowsPathRegistryChangeListener } from '../pty/windows-path-registry-change'
+import { recordAgentSessionRuntimeEnd } from '../runtime/agent-session-runtime-end-record'
 
 export { WINDOW_QUIT_RENDERER_ACK_TIMEOUT_MS }
 
@@ -155,6 +156,8 @@ export function createMainWindow(
           ? event.reasons.filter((reason) => typeof reason === 'string').join(',')
           : ''
       })
+      // Windows emits no will-quit for an OS shutdown or logoff, so its teardown never records it.
+      recordAgentSessionRuntimeEnd('quit')
     })
   }
 
diff --git a/src/main/window/dropped-path-preparation-ipc.test.ts b/src/main/window/dropped-path-preparation-ipc.test.ts
new file mode 100644
index 000000000000..74b8a29a00ac
--- /dev/null
+++ b/src/main/window/dropped-path-preparation-ipc.test.ts
@@ -0,0 +1,192 @@
+import type { BrowserWindow } from 'electron'
+import { join } from 'node:path'
+import { beforeEach, describe, expect, it, vi } from 'vitest'
+import type * as DragTempFileCopy from './dragged-temp-file-copy'
+import type { DragTempCopyItemResult } from './dragged-temp-file-copy'
+
+type IpcListener = (event: { sender: unknown }, payload: unknown) => void
+type InvokeHandler = (event: { sender: unknown }, payload: unknown) => Promise<unknown>
+
+const { materializeMock, sweepMock, ipcListeners, ipcHandlers } = vi.hoisted(() => ({
+  materializeMock: vi.fn(),
+  sweepMock: vi.fn(),
+  ipcListeners: new Map<string, IpcListener>(),
+  ipcHandlers: new Map<string, InvokeHandler>()
+}))
+
+vi.mock('electron', () => ({
+  app: { getPath: () => '/app-temp' },
+  ipcMain: {
+    handle: (channel: string, handler: InvokeHandler) => ipcHandlers.set(channel, handler),
+    removeHandler: (channel: string) => ipcHandlers.delete(channel),
+    on: (channel: string, listener: IpcListener) => ipcListeners.set(channel, listener),
+    removeListener: (channel: string, listener: IpcListener) => {
+      if (ipcListeners.get(channel) === listener) {
+        ipcListeners.delete(channel)
+      }
+    },
+    removeAllListeners: (channel: string) => ipcListeners.delete(channel)
+  }
+}))
+
+vi.mock('./dragged-temp-file-copy', async (importOriginal) => ({
+  ...(await importOriginal<typeof DragTempFileCopy>()),
+  materializeDragTempPaths: materializeMock,
+  scheduleDragTempCopySweep: sweepMock
+}))
+
+vi.mock('./darwin-user-temp-dir', () => ({
+  getDarwinUserTempDir: async () => '/private/var/folders/ab/xyz/T'
+}))
+
+import { registerDroppedPathPreparation } from './dropped-path-preparation-ipc'
+
+const DRAG_TEMP = join('/', 'var', 'T', 'TemporaryItems', 'NSIRD_screencaptureui_1', 'Shot.png')
+const COPY = join('/', 'var', 'T', 'orca-drops-501', 'orca-drop-abc123', 'Shot.png')
+const FINDER = join('/', 'Users', 'me', 'Desktop', 'notes.txt')
+
+function copied(sourcePath: string, destPath = sourcePath): DragTempCopyItemResult {
+  return { sourcePath, status: 'imported', destPath }
+}
+
+function deferred<T>() {
+  let resolve!: (value: T) => void
+  const promise = new Promise<T>((settle) => {
+    resolve = settle
+  })
+  return { promise, resolve }
+}
+
+async function settle(): Promise<void> {
+  await new Promise((resolve) => setTimeout(resolve, 0))
+}
+
+beforeEach(() => {
+  materializeMock.mockReset()
+})
+
+function createWindow() {
+  let destroyed = false
+  const windowListeners = new Map<string, () => void>()
+  const webContents = {
+    isDestroyed: () => destroyed,
+    send: vi.fn(),
+    once: vi.fn<(event: string, listener: () => void) => void>(),
+    removeListener: vi.fn()
+  }
+  const fake = {
+    isDestroyed: () => destroyed,
+    on: (event: string, listener: () => void) => windowListeners.set(event, listener),
+    webContents
+  }
+  // oxlint-disable-next-line typescript/consistent-type-assertions -- SAFETY: the preparation handler only touches the members stubbed above.
+  const window = fake as unknown as BrowserWindow
+  return {
+    window,
+    webContents,
+    close: () => {
+      destroyed = true
+      windowListeners.get('closed')?.()
+    },
+    destroy: () => {
+      destroyed = true
+      webContents.once.mock.calls.find(([event]) => event === 'destroyed')?.[1]()
+    }
+  }
+}
+
+describe('registerDroppedPathPreparation', () => {
+  beforeEach(() => {
+    ipcListeners.clear()
+    ipcHandlers.clear()
+    sweepMock.mockReset()
+  })
+
+  it('registers only the preparation request and starts copy expiry', () => {
+    const { window } = createWindow()
+    registerDroppedPathPreparation(window)
+    expect([...ipcHandlers.keys()]).toEqual(['fs:prepareDroppedPaths'])
+    expect(ipcListeners.size).toBe(0)
+    expect(sweepMock).toHaveBeenCalledOnce()
+  })
+
+  it('prepares ordinary paths only for its own live renderer and validates the request', async () => {
+    const { window, webContents, close } = createWindow()
+    registerDroppedPathPreparation(window)
+    const handler = ipcHandlers.get('fs:prepareDroppedPaths')!
+    const request = { paths: [FINDER], consumer: 'agent' }
+    expect(() => handler({ sender: {} }, request)).toThrow('owning window')
+    for (const invalid of [
+      null,
+      { paths: [FINDER], consumer: 'other' },
+      { paths: [42], consumer: 'agent' }
+    ]) {
+      expect(() => handler({ sender: webContents }, invalid)).toThrow('Invalid')
+    }
+    await expect(handler({ sender: webContents }, request)).resolves.toEqual({
+      paths: [FINDER],
+      failures: []
+    })
+    expect(webContents.send).not.toHaveBeenCalled()
+    close()
+    expect(ipcHandlers.has('fs:prepareDroppedPaths')).toBe(false)
+    expect(() => handler({ sender: webContents }, request)).toThrow('owning window')
+  })
+
+  it('enforces both request caps before preparing any paths', async () => {
+    const { window, webContents } = createWindow()
+    registerDroppedPathPreparation(window)
+    const handler = ipcHandlers.get('fs:prepareDroppedPaths')!
+    await expect(
+      handler(
+        { sender: webContents },
+        { paths: Array.from({ length: 257 }, () => DRAG_TEMP), consumer: 'agent' }
+      )
+    ).resolves.toMatchObject({
+      paths: [],
+      failures: [{ reason: 'too-many-paths', pathCount: 257 }]
+    })
+    await expect(
+      handler({ sender: webContents }, { paths: ['x'.repeat(256 * 1024 + 1)], consumer: 'agent' })
+    ).resolves.toMatchObject({ paths: [], failures: [{ reason: 'paths-too-large' }] })
+    expect(materializeMock).not.toHaveBeenCalled()
+  })
+
+  it('keeps the replacement window handler when an older window closes late', async () => {
+    const first = createWindow()
+    const second = createWindow()
+    registerDroppedPathPreparation(first.window)
+    registerDroppedPathPreparation(second.window)
+    const handler = ipcHandlers.get('fs:prepareDroppedPaths')!
+    first.close()
+    expect(ipcHandlers.get('fs:prepareDroppedPaths')).toBe(handler)
+    await expect(
+      handler({ sender: second.webContents }, { paths: [FINDER], consumer: 'main-reader' })
+    ).resolves.toEqual({ paths: [FINDER], failures: [] })
+  })
+
+  it.skipIf(process.platform !== 'darwin')(
+    'copies from the macOS user temp dir and aborts when the renderer is gone',
+    async () => {
+      const copy = deferred<DragTempCopyItemResult[]>()
+      materializeMock.mockReturnValueOnce(copy.promise)
+      const { window, webContents, destroy } = createWindow()
+      registerDroppedPathPreparation(window)
+      const handler = ipcHandlers.get('fs:prepareDroppedPaths')!
+      const pending = handler({ sender: webContents }, { paths: [DRAG_TEMP], consumer: 'agent' })
+      await settle()
+      expect(materializeMock.mock.calls[0][1]).toMatchObject({
+        platform: 'darwin',
+        sourceTempRoot: '/private/var/folders/ab/xyz/T'
+      })
+      const signal = materializeMock.mock.calls[0][2]
+      expect(signal).toBeInstanceOf(AbortSignal)
+      const rejected = expect(pending).rejects.toThrow('went away')
+      destroy()
+      copy.resolve([copied(DRAG_TEMP, COPY)])
+      await rejected
+      expect(signal.aborted).toBe(true)
+      expect(webContents.send).not.toHaveBeenCalled()
+    }
+  )
+})
diff --git a/src/main/window/dropped-path-preparation-ipc.ts b/src/main/window/dropped-path-preparation-ipc.ts
new file mode 100644
index 000000000000..df87886c0a78
--- /dev/null
+++ b/src/main/window/dropped-path-preparation-ipc.ts
@@ -0,0 +1,78 @@
+import { app, ipcMain, type BrowserWindow } from 'electron'
+import {
+  createRejectedNativeFileDropPayload,
+  validateNativeFileDropPaths
+} from '../../shared/native-file-drop'
+import type {
+  PrepareDroppedPathsRequest,
+  PreparedDroppedPaths
+} from '../../shared/native-file-drop-preparation'
+import { abortWhenRendererGone } from '../ipc/renderer-lifetime-abort'
+import { getDragTempCopyRoot, scheduleDragTempCopySweep } from './dragged-temp-file-copy'
+import {
+  createDroppedPathPreparationQueue,
+  windowDragTempCopyLane
+} from './dropped-path-preparation'
+import { getDarwinUserTempDir } from './darwin-user-temp-dir'
+
+export function registerDroppedPathPreparation(mainWindow: BrowserWindow): void {
+  const prepareChannel = 'fs:prepareDroppedPaths'
+  const mainWebContents = mainWindow.webContents
+  const isWindowGone = (): boolean => mainWindow.isDestroyed() || mainWebContents.isDestroyed()
+  ipcMain.removeHandler(prepareChannel)
+  const prepare = createDroppedPathPreparationQueue(
+    {
+      platform: process.platform,
+      getCopyEnvironment: async () => ({
+        platform: process.platform,
+        sourceTempRoot: await getDarwinUserTempDir(),
+        copyRoot: getDragTempCopyRoot(app.getPath('temp'))
+      }),
+      watchRenderer: () => abortWhenRendererGone(mainWebContents)
+    },
+    windowDragTempCopyLane
+  )
+  const prepareHandler = (
+    event: Electron.IpcMainInvokeEvent,
+    args: unknown
+  ): Promise<PreparedDroppedPaths> => {
+    if (isWindowGone() || event.sender !== mainWebContents) {
+      throw new Error('Dropped paths must come from the owning window')
+    }
+    if (!isPrepareDroppedPathsRequest(args)) {
+      throw new Error('Invalid dropped paths request')
+    }
+    const validation = validateNativeFileDropPaths(args.paths)
+    if (validation.status === 'rejected') {
+      return Promise.resolve({
+        paths: [],
+        failures: [createRejectedNativeFileDropPayload(validation)]
+      })
+    }
+    return Promise.resolve(prepare(args))
+  }
+  ipcMain.handle(prepareChannel, prepareHandler)
+  activePrepareHandler = prepareHandler
+  mainWindow.on('closed', () => {
+    // Why: an old window closing late must not remove the replacement window's handler.
+    if (activePrepareHandler === prepareHandler) {
+      ipcMain.removeHandler(prepareChannel)
+      activePrepareHandler = undefined
+    }
+  })
+  scheduleDragTempCopySweep(() => getDragTempCopyRoot(app.getPath('temp')))
+}
+
+let activePrepareHandler: unknown
+
+function isPrepareDroppedPathsRequest(value: unknown): value is PrepareDroppedPathsRequest {
+  return (
+    !!value &&
+    typeof value === 'object' &&
+    'consumer' in value &&
+    (value.consumer === 'agent' || value.consumer === 'main-reader') &&
+    'paths' in value &&
+    Array.isArray(value.paths) &&
+    value.paths.every((path: unknown) => typeof path === 'string')
+  )
+}
diff --git a/src/main/window/dropped-path-preparation.test.ts b/src/main/window/dropped-path-preparation.test.ts
index d04aa90ef607..54d288d32fae 100644
--- a/src/main/window/dropped-path-preparation.test.ts
+++ b/src/main/window/dropped-path-preparation.test.ts
@@ -2,9 +2,11 @@ import { join } from 'node:path'
 import { beforeEach, describe, expect, it, vi } from 'vitest'
 import type { DragTempCopyItemResult } from './dragged-temp-file-copy'
 import type * as DragTempFileCopy from './dragged-temp-file-copy'
-import type { NativeFileDropPayload } from '../../shared/native-file-drop'
-import { createDragTempCopyLane, MAX_PENDING_DRAG_TEMP_COPIES } from './dropped-path-preparation'
-import { createNativeFileDropQueue } from './native-file-drop-relay'
+import {
+  createDragTempCopyLane,
+  createDroppedPathPreparationQueue,
+  MAX_PENDING_DRAG_TEMP_COPIES
+} from './dropped-path-preparation'
 
 const materialize = vi.hoisted(() => vi.fn())
 vi.mock('electron', () => ({ app: {}, ipcMain: {} }))
@@ -19,19 +21,21 @@ const env = { platform: 'darwin' as const, sourceTempRoot: '/var/T', copyRoot: '
 
 function queue(lane = createDragTempCopyLane(), copyTimeoutMs = 1000) {
   const controller = new AbortController()
-  const forwarded: NativeFileDropPayload[] = []
   const dispose = vi.fn()
-  const enqueue = createNativeFileDropQueue(
+  const enqueue = createDroppedPathPreparationQueue(
     {
       platform: 'darwin',
       getCopyEnvironment: async () => env,
       watchRenderer: () => ({ signal: controller.signal, dispose }),
-      forward: (payload) => forwarded.push(payload),
       copyTimeoutMs
     },
     lane
   )
-  return { enqueue, controller, forwarded, dispose }
+  return {
+    enqueue: async (request: Parameters<typeof enqueue>[0]) => enqueue(request),
+    controller,
+    dispose
+  }
 }
 function deferred() {
   let resolve!: (value: DragTempCopyItemResult[]) => void
@@ -47,12 +51,12 @@ beforeEach(() => {
   materialize.mockReset()
 })
 
-describe('dropped path preparation through the shared relay queue', () => {
+describe('dropped path preparation through the shared copy queue', () => {
   it.each(['agent', 'main-reader'] as const)(
     'passes ordinary paths without copying for %s',
     async (consumer) => {
       const { enqueue } = queue()
-      await expect(enqueue.prepare({ paths: [ORDINARY], consumer })).resolves.toEqual({
+      await expect(enqueue({ paths: [ORDINARY], consumer })).resolves.toEqual({
         paths: [ORDINARY],
         failures: []
       })
@@ -68,7 +72,7 @@ describe('dropped path preparation through the shared relay queue', () => {
         { sourcePath: TEMP, status: 'uncopied', reason: 'storage-full' }
       ])
       const { enqueue } = queue()
-      const result = await enqueue.prepare({ paths: [ORDINARY, TEMP], consumer })
+      const result = await enqueue({ paths: [ORDINARY, TEMP], consumer })
       expect(result.paths).toEqual(consumer === 'agent' ? [ORDINARY] : [ORDINARY, TEMP])
       expect(result.failures).toEqual(
         consumer === 'agent'
@@ -92,7 +96,7 @@ describe('dropped path preparation through the shared relay queue', () => {
       { sourcePath: TEMP, status: 'imported', destPath: COPY },
       { sourcePath: TEMP, status: 'failed', reason: 'missing' }
     ])
-    const result = await queue().enqueue.prepare({
+    const result = await queue().enqueue({
       paths: [ORDINARY, TEMP, TEMP],
       consumer: 'agent'
     })
@@ -100,20 +104,19 @@ describe('dropped path preparation through the shared relay queue', () => {
     expect(result.failures[0]).toMatchObject({ pathCount: 1, commonReason: 'missing' })
   })
 
-  it('serializes requests and the legacy relay together', async () => {
+  it('serializes copy requests from different owners', async () => {
     const first = deferred()
     materialize
       .mockReturnValueOnce(first.promise)
       .mockResolvedValueOnce([{ sourcePath: TEMP, status: 'imported', destPath: COPY }])
-    const { enqueue, forwarded } = queue()
-    enqueue({ paths: [TEMP], target: 'terminal' })
-    const requested = enqueue.prepare({ paths: [TEMP], consumer: 'agent' })
+    const { enqueue } = queue()
+    const chat = enqueue({ paths: [TEMP], consumer: 'agent' })
+    const editor = enqueue({ paths: [TEMP], consumer: 'main-reader' })
     await settle()
     expect(materialize).toHaveBeenCalledTimes(1)
     first.resolve([{ sourcePath: TEMP, status: 'imported', destPath: COPY }])
-    await expect(requested).resolves.toEqual({ paths: [COPY], failures: [] })
-    await settle()
-    expect(forwarded).toEqual([{ paths: [COPY], target: 'terminal' }])
+    await expect(chat).resolves.toEqual({ paths: [COPY], failures: [] })
+    await expect(editor).resolves.toEqual({ paths: [COPY], failures: [] })
     expect(materialize).toHaveBeenCalledTimes(2)
   })
 
@@ -123,10 +126,10 @@ describe('dropped path preparation through the shared relay queue', () => {
     const first = queue(lane)
     const second = queue(lane)
     const results = Array.from({ length: MAX_PENDING_DRAG_TEMP_COPIES }, () =>
-      first.enqueue.prepare({ paths: [TEMP], consumer: 'agent' }).catch(() => undefined)
+      first.enqueue({ paths: [TEMP], consumer: 'agent' }).catch(() => undefined)
     )
     await expect(
-      second.enqueue.prepare({ paths: [ORDINARY, TEMP], consumer: 'agent' })
+      second.enqueue({ paths: [ORDINARY, TEMP], consumer: 'agent' })
     ).resolves.toMatchObject({ paths: [ORDINARY], failures: [{ commonReason: 'busy' }] })
     first.controller.abort(new Error('test ended'))
     await Promise.all(results)
@@ -138,8 +141,8 @@ describe('dropped path preparation through the shared relay queue', () => {
     const copy = deferred()
     materialize.mockReturnValueOnce(copy.promise)
     const { enqueue } = queue()
-    const pending = enqueue.prepare({ paths: [TEMP], consumer: 'agent' })
-    await expect(enqueue.prepare({ paths: [ORDINARY], consumer: 'main-reader' })).resolves.toEqual({
+    const pending = enqueue({ paths: [TEMP], consumer: 'agent' })
+    await expect(enqueue({ paths: [ORDINARY], consumer: 'main-reader' })).resolves.toEqual({
       paths: [ORDINARY],
       failures: []
     })
@@ -150,8 +153,8 @@ describe('dropped path preparation through the shared relay queue', () => {
   it('aborts running and queued requests on reload and releases their listeners', async () => {
     materialize.mockReturnValue(new Promise(() => undefined))
     const { enqueue, controller, dispose } = queue()
-    const running = enqueue.prepare({ paths: [TEMP], consumer: 'agent' })
-    const queued = enqueue.prepare({ paths: [TEMP], consumer: 'agent' })
+    const running = enqueue({ paths: [TEMP], consumer: 'agent' })
+    const queued = enqueue({ paths: [TEMP], consumer: 'agent' })
     const assertions = [
       expect(running).rejects.toThrow('reloaded'),
       expect(queued).rejects.toThrow('reloaded')
@@ -169,12 +172,53 @@ describe('dropped path preparation through the shared relay queue', () => {
       .mockReturnValueOnce(new Promise(() => undefined))
       .mockResolvedValueOnce([{ sourcePath: TEMP, status: 'imported', destPath: COPY }])
     const { enqueue } = queue(undefined, 5)
-    const first = enqueue.prepare({ paths: [ORDINARY, TEMP], consumer: 'agent' })
-    const next = enqueue.prepare({ paths: [TEMP], consumer: 'agent' })
+    const first = enqueue({ paths: [ORDINARY, TEMP], consumer: 'agent' })
+    const next = enqueue({ paths: [TEMP], consumer: 'agent' })
     await expect(first).resolves.toMatchObject({
       paths: [ORDINARY],
       failures: [{ commonReason: 'timed-out' }]
     })
     await expect(next).resolves.toEqual({ paths: [COPY], failures: [] })
   })
+  it('passes drag-temp-looking paths unchanged on Linux and Windows', () => {
+    for (const platform of ['linux', 'win32'] as const) {
+      const enqueue = createDroppedPathPreparationQueue({
+        platform,
+        getCopyEnvironment: async () => env,
+        watchRenderer: () => ({ signal: new AbortController().signal, dispose: vi.fn() })
+      })
+      expect(enqueue({ paths: [TEMP], consumer: 'agent' })).toEqual({ paths: [TEMP], failures: [] })
+    }
+    expect(materialize).not.toHaveBeenCalled()
+  })
+
+  it('reports all lost paths without a shared reason when their failures differ', async () => {
+    materialize.mockResolvedValue([
+      { sourcePath: TEMP, status: 'failed', reason: 'missing' },
+      { sourcePath: TEMP, status: 'failed', reason: 'changed' }
+    ])
+    await expect(queue().enqueue({ paths: [TEMP, TEMP], consumer: 'agent' })).resolves.toEqual({
+      paths: [],
+      failures: [{ byteLength: 0, pathCount: 2, reason: 'temp-copy-failed', target: 'rejected' }]
+    })
+  })
+
+  it('keeps ordinary paths and serves the next drop when the copy environment fails', async () => {
+    const getCopyEnvironment = vi.fn(async () => env)
+    getCopyEnvironment.mockRejectedValueOnce(new Error('no temp path'))
+    const enqueue = createDroppedPathPreparationQueue({
+      platform: 'darwin',
+      getCopyEnvironment,
+      watchRenderer: () => ({ signal: new AbortController().signal, dispose: vi.fn() })
+    })
+    await expect(enqueue({ paths: [ORDINARY, TEMP], consumer: 'agent' })).resolves.toEqual({
+      paths: [ORDINARY],
+      failures: [{ byteLength: 0, pathCount: 1, reason: 'temp-copy-failed', target: 'rejected' }]
+    })
+    materialize.mockResolvedValue([{ sourcePath: TEMP, status: 'imported', destPath: COPY }])
+    await expect(enqueue({ paths: [TEMP], consumer: 'agent' })).resolves.toEqual({
+      paths: [COPY],
+      failures: []
+    })
+  })
 })
diff --git a/src/main/window/history-gc-worktree-ids.ts b/src/main/window/history-gc-worktree-ids.ts
index df6149671928..679375e038fa 100644
--- a/src/main/window/history-gc-worktree-ids.ts
+++ b/src/main/window/history-gc-worktree-ids.ts
@@ -1,6 +1,6 @@
 import type { Store } from '../persistence'
 import { folderWorkspaceKey } from '../../shared/workspace-scope'
-import { getOtherProfileWorktreeIdsForHistoryGc } from './history-gc-profile-worktree-ids'
+import { getOtherProfileWorktreeIdsForHistoryGc } from '../orca-profiles/other-profile-workspace-catalog'
 
 /**
  * Every workspace key that owns shell history, for the history GC's live set.
diff --git a/src/main/plugins/plugin-panel-navigation-guard.test.ts b/src/main/window/host-frame-navigation-guard.test.ts
similarity index 51%
rename from src/main/plugins/plugin-panel-navigation-guard.test.ts
rename to src/main/window/host-frame-navigation-guard.test.ts
index 2889e57cf707..1a4aae3d0420 100644
--- a/src/main/plugins/plugin-panel-navigation-guard.test.ts
+++ b/src/main/window/host-frame-navigation-guard.test.ts
@@ -1,6 +1,7 @@
 import { describe, expect, it } from 'vitest'
 import { PLUGIN_PANEL_FRAME_NAME_PREFIX } from '../../shared/plugins/plugin-panel-bridge'
-import { PluginPanelNavigationRegistry } from './plugin-panel-navigation-guard'
+import { NATIVE_CHAT_VISUAL_FRAME_NAME_PREFIX } from '../../shared/native-chat-visual-shell'
+import { HostFrameNavigationRegistry, hostFrameKindForName } from './host-frame-navigation-guard'
 
 function frame(input: { id: number; name?: string; url?: string }) {
   let destroyed = false
@@ -14,9 +15,9 @@ function frame(input: { id: number; name?: string; url?: string }) {
   }
 }
 
-describe('PluginPanelNavigationRegistry', () => {
+describe('HostFrameNavigationRegistry', () => {
   it('blocks only host-marked plugin srcdoc frames', () => {
-    const registry = new PluginPanelNavigationRegistry()
+    const registry = new HostFrameNavigationRegistry()
     const plugin = frame({ id: 1, name: `${PLUGIN_PANEL_FRAME_NAME_PREFIX}demo` })
     const notebook = frame({ id: 2 })
     registry.register(plugin)
@@ -28,7 +29,7 @@ describe('PluginPanelNavigationRegistry', () => {
   })
 
   it('keeps pre-parse identity after name mutation and prunes destroyed frames', () => {
-    const registry = new PluginPanelNavigationRegistry()
+    const registry = new HostFrameNavigationRegistry()
     const plugin = frame({ id: 1, name: `${PLUGIN_PANEL_FRAME_NAME_PREFIX}demo` })
     registry.register(plugin)
     plugin.name = ''
@@ -38,4 +39,20 @@ describe('PluginPanelNavigationRegistry', () => {
     plugin.destroy()
     expect(registry.shouldBlock(plugin, plugin, 'https://example.com')).toBe(false)
   })
+
+  it('contains chat visual frames the same way, as their own kind', () => {
+    const registry = new HostFrameNavigationRegistry()
+    const visual = frame({ id: 3, name: `${NATIVE_CHAT_VISUAL_FRAME_NAME_PREFIX}abc` })
+    registry.register(visual)
+    expect(hostFrameKindForName(visual.name)).toBe('chat-visual')
+    expect(hostFrameKindForName(`${PLUGIN_PANEL_FRAME_NAME_PREFIX}demo`)).toBe('plugin-panel')
+    expect(hostFrameKindForName('orca-chat-visual')).toBeNull()
+
+    expect(registry.shouldBlock(visual, null, 'about:srcdoc')).toBe(false)
+    // Its own navigation (location, meta refresh, link) and any child it starts are refused.
+    expect(registry.shouldBlock(visual, visual, 'https://example.com')).toBe(true)
+    expect(registry.shouldBlock(visual, null, 'https://example.com')).toBe(true)
+    const child = frame({ id: 4 })
+    expect(registry.shouldBlock(child, visual, 'https://example.com')).toBe(true)
+  })
 })
diff --git a/src/main/plugins/plugin-panel-navigation-guard.ts b/src/main/window/host-frame-navigation-guard.ts
similarity index 62%
rename from src/main/plugins/plugin-panel-navigation-guard.ts
rename to src/main/window/host-frame-navigation-guard.ts
index d183eae98881..110b3705c5d4 100644
--- a/src/main/plugins/plugin-panel-navigation-guard.ts
+++ b/src/main/window/host-frame-navigation-guard.ts
@@ -1,22 +1,40 @@
 import type { WebContents, WebFrameMain } from 'electron'
+import { NATIVE_CHAT_VISUAL_FRAME_NAME_PREFIX } from '../../shared/native-chat-visual-shell'
 import { PLUGIN_PANEL_FRAME_NAME_PREFIX } from '../../shared/plugins/plugin-panel-bridge'
 
 type NavigationFrame = Pick<WebFrameMain, 'frameTreeNodeId' | 'isDestroyed' | 'name'>
 
+/**
+ * Host-built srcdoc frames that hold content Orca did not write. Each kind is only a navigation
+ * containment class: registering a frame grants it nothing (no plugin identity, no actions).
+ */
+const HOST_FRAME_KINDS = [
+  { kind: 'plugin-panel', namePrefix: PLUGIN_PANEL_FRAME_NAME_PREFIX },
+  { kind: 'chat-visual', namePrefix: NATIVE_CHAT_VISUAL_FRAME_NAME_PREFIX }
+] as const
+
+export type HostFrameKind = (typeof HOST_FRAME_KINDS)[number]['kind']
+
 type RegisteredFrame = {
   frame: NavigationFrame
+  kind: HostFrameKind
   initialSrcdocPending: boolean
 }
 
-/** Records host-marked panel frame identities at browsing-context creation,
- * before plugin parsing can mutate window.name. */
-export class PluginPanelNavigationRegistry {
+export function hostFrameKindForName(name: string): HostFrameKind | null {
+  return HOST_FRAME_KINDS.find((entry) => name.startsWith(entry.namePrefix))?.kind ?? null
+}
+
+/** Records host-marked frame identities at browsing-context creation, before their content can
+ * mutate window.name. */
+export class HostFrameNavigationRegistry {
   private readonly frames = new Map<number, RegisteredFrame>()
 
   register(frame: NavigationFrame): void {
     this.prune()
-    if (frame.name.startsWith(PLUGIN_PANEL_FRAME_NAME_PREFIX)) {
-      this.frames.set(frame.frameTreeNodeId, { frame, initialSrcdocPending: true })
+    const kind = hostFrameKindForName(frame.name)
+    if (kind) {
+      this.frames.set(frame.frameTreeNodeId, { frame, kind, initialSrcdocPending: true })
     }
   }
 
@@ -52,8 +70,8 @@ export class PluginPanelNavigationRegistry {
   }
 }
 
-export function registerPluginPanelNavigationGuard(webContents: WebContents): void {
-  const registry = new PluginPanelNavigationRegistry()
+export function registerHostFrameNavigationGuard(webContents: WebContents): void {
+  const registry = new HostFrameNavigationRegistry()
   webContents.on('frame-created', (_event, { frame }) => {
     if (frame) {
       registry.register(frame)
@@ -62,7 +80,7 @@ export function registerPluginPanelNavigationGuard(webContents: WebContents): vo
   webContents.on('did-start-navigation', (event) => {
     if (!event.isMainFrame && event.url === 'about:srcdoc' && event.frame) {
       // Some Chromium builds populate the frame name only when navigation
-      // starts; this event still precedes document parsing and plugin code.
+      // starts; this event still precedes document parsing and frame content.
       registry.register(event.frame)
     }
   })
diff --git a/src/main/window/main-window-webview-security.test.ts b/src/main/window/main-window-webview-security.test.ts
index e54dc6a68369..d47a2f8118ef 100644
--- a/src/main/window/main-window-webview-security.test.ts
+++ b/src/main/window/main-window-webview-security.test.ts
@@ -15,8 +15,8 @@ vi.mock('../browser/browser-manager', () => ({
 vi.mock('../browser/browser-session-registry', () => ({
   browserSessionRegistry: { isAllowedPartition: mocks.isAllowedPartition }
 }))
-vi.mock('../plugins/plugin-panel-navigation-guard', () => ({
-  registerPluginPanelNavigationGuard: mocks.registerPluginGuard
+vi.mock('./host-frame-navigation-guard', () => ({
+  registerHostFrameNavigationGuard: mocks.registerPluginGuard
 }))
 vi.mock('./privileged-window-navigation', () => ({
   installPrivilegedWindowNavigationPolicy: mocks.installNavigationPolicy
diff --git a/src/main/window/main-window-webview-security.ts b/src/main/window/main-window-webview-security.ts
index a662449eb580..7c026d7cf4a3 100644
--- a/src/main/window/main-window-webview-security.ts
+++ b/src/main/window/main-window-webview-security.ts
@@ -20,7 +20,7 @@ import {
   revokeAllDocPreviewGrants
 } from '../browser/doc-preview-grant-registry'
 import { isDocPreviewSession } from '../browser/doc-preview-protocol'
-import { registerPluginPanelNavigationGuard } from '../plugins/plugin-panel-navigation-guard'
+import { registerHostFrameNavigationGuard } from './host-frame-navigation-guard'
 import { installPrivilegedWindowNavigationPolicy } from './privileged-window-navigation'
 
 /**
@@ -54,9 +54,9 @@ export function installMainWindowWebviewSecurity(mainWindow: BrowserWindow): voi
     setDocPreviewFailureSink(null)
     revokeAllDocPreviewGrants()
   })
-  // Why: containment must be listening before any plugin panel frame is created,
-  // so register it with the window's other navigation policy.
-  registerPluginPanelNavigationGuard(mainWindow.webContents)
+  // Why: containment must be listening before any plugin panel or chat visual frame is
+  // created, so register it with the window's other navigation policy.
+  registerHostFrameNavigationGuard(mainWindow.webContents)
 
   const browserWindowClosePreload = join(__dirname, 'browser-window-close-preload.js')
   // Why a preview gets a preload at all: it is our own editor surface, not a browsing guest. This
diff --git a/src/main/window/native-file-drop-relay.test.ts b/src/main/window/native-file-drop-relay.test.ts
deleted file mode 100644
index 7200be84eba4..000000000000
--- a/src/main/window/native-file-drop-relay.test.ts
+++ /dev/null
@@ -1,536 +0,0 @@
-import type { BrowserWindow } from 'electron'
-import { join } from 'node:path'
-import { beforeEach, describe, expect, it, vi } from 'vitest'
-import type { NativeFileDropPayload } from '../../shared/native-file-drop'
-import type * as DragTempFileCopy from './dragged-temp-file-copy'
-import type { DragTempCopyItemResult } from './dragged-temp-file-copy'
-
-type IpcListener = (event: { sender: unknown }, payload: unknown) => void
-type InvokeHandler = (event: { sender: unknown }, payload: unknown) => Promise<unknown>
-
-const { materializeMock, sweepMock, ipcListeners, ipcHandlers } = vi.hoisted(() => ({
-  materializeMock: vi.fn(),
-  sweepMock: vi.fn(),
-  ipcListeners: new Map<string, IpcListener>(),
-  ipcHandlers: new Map<string, InvokeHandler>()
-}))
-
-vi.mock('electron', () => ({
-  app: { getPath: () => '/app-temp' },
-  ipcMain: {
-    handle: (channel: string, handler: InvokeHandler) => ipcHandlers.set(channel, handler),
-    removeHandler: (channel: string) => ipcHandlers.delete(channel),
-    on: (channel: string, listener: IpcListener) => ipcListeners.set(channel, listener),
-    removeListener: (channel: string, listener: IpcListener) => {
-      if (ipcListeners.get(channel) === listener) {
-        ipcListeners.delete(channel)
-      }
-    },
-    removeAllListeners: (channel: string) => ipcListeners.delete(channel)
-  }
-}))
-
-vi.mock('./dragged-temp-file-copy', async (importOriginal) => ({
-  ...(await importOriginal<typeof DragTempFileCopy>()),
-  materializeDragTempPaths: materializeMock,
-  scheduleDragTempCopySweep: sweepMock
-}))
-
-vi.mock('./darwin-user-temp-dir', () => ({
-  getDarwinUserTempDir: async () => '/private/var/folders/ab/xyz/T'
-}))
-
-import {
-  createNativeFileDropQueue,
-  MAX_PENDING_DRAG_TEMP_COPIES,
-  registerFileDropRelay
-} from './native-file-drop-relay'
-
-const DRAG_TEMP = join('/', 'var', 'T', 'TemporaryItems', 'NSIRD_screencaptureui_1', 'Shot.png')
-const OTHER_DRAG_TEMP = join(
-  '/',
-  'var',
-  'T',
-  'TemporaryItems',
-  'NSIRD_screencaptureui_1',
-  'Other.png'
-)
-const COPY = join('/', 'var', 'T', 'orca-drops-501', 'orca-drop-abc123', 'Shot.png')
-const FINDER = join('/', 'Users', 'me', 'Desktop', 'notes.txt')
-const env = { platform: 'darwin' as const, sourceTempRoot: '/var/T', copyRoot: '/var/T/drops' }
-
-function copied(sourcePath: string, destPath = sourcePath): DragTempCopyItemResult {
-  return { sourcePath, status: 'imported', destPath }
-}
-
-function createQueue(
-  overrides: {
-    getCopyEnvironment?: () => Promise<typeof env>
-    forward?: (payload: NativeFileDropPayload) => void
-    copyTimeoutMs?: number
-  } = {}
-) {
-  const forwarded: NativeFileDropPayload[] = []
-  const controller = new AbortController()
-  const enqueue = createNativeFileDropQueue({
-    forward: overrides.forward ?? ((payload) => forwarded.push(payload)),
-    platform: 'darwin',
-    getCopyEnvironment: overrides.getCopyEnvironment ?? (async () => env),
-    watchRenderer: () => ({ signal: controller.signal, dispose: () => undefined }),
-    copyTimeoutMs: overrides.copyTimeoutMs
-  })
-  return { enqueue, forwarded, controller }
-}
-
-function deferred<T>() {
-  let resolve!: (value: T) => void
-  const promise = new Promise<T>((settle) => {
-    resolve = settle
-  })
-  return { promise, resolve }
-}
-
-async function settle(): Promise<void> {
-  await new Promise((resolve) => setTimeout(resolve, 0))
-}
-
-beforeEach(() => {
-  materializeMock.mockReset()
-})
-
-describe('createNativeFileDropQueue', () => {
-  it('forwards a drop with no drag-temp path synchronously without copying', () => {
-    const { enqueue, forwarded } = createQueue()
-    const payload: NativeFileDropPayload = { paths: [FINDER], target: 'editor' }
-
-    enqueue(payload)
-
-    expect(forwarded).toEqual([payload])
-    expect(materializeMock).not.toHaveBeenCalled()
-  })
-
-  it('forwards drag-temp-looking paths untouched off macOS', () => {
-    const forwarded: NativeFileDropPayload[] = []
-    const enqueue = createNativeFileDropQueue({
-      forward: (payload) => forwarded.push(payload),
-      platform: 'linux',
-      getCopyEnvironment: async () => env,
-      watchRenderer: () => ({ signal: new AbortController().signal, dispose: () => undefined })
-    })
-
-    enqueue({ paths: [DRAG_TEMP], target: 'composer' })
-
-    expect(forwarded).toEqual([{ paths: [DRAG_TEMP], target: 'composer' }])
-    expect(materializeMock).not.toHaveBeenCalled()
-  })
-
-  it('swaps in the copy and keeps the drop target fields', async () => {
-    materializeMock.mockResolvedValue([copied(FINDER), copied(DRAG_TEMP, COPY)])
-    const { enqueue, forwarded } = createQueue()
-
-    enqueue({ paths: [FINDER, DRAG_TEMP], target: 'terminal', tabId: 't1', paneLeafId: 'p1' })
-    await settle()
-
-    expect(materializeMock).toHaveBeenCalledWith([FINDER, DRAG_TEMP], env, expect.any(AbortSignal))
-    expect(forwarded).toEqual([
-      { paths: [FINDER, COPY], target: 'terminal', tabId: 't1', paneLeafId: 'p1' }
-    ])
-  })
-
-  it('holds a later plain drop until an earlier copy is forwarded', async () => {
-    const copy = deferred<DragTempCopyItemResult[]>()
-    materializeMock.mockReturnValueOnce(copy.promise)
-    const { enqueue, forwarded } = createQueue()
-
-    enqueue({ paths: [DRAG_TEMP], target: 'composer' })
-    enqueue({ paths: [FINDER], target: 'composer' })
-    await settle()
-    expect(forwarded).toEqual([])
-
-    copy.resolve([copied(DRAG_TEMP, COPY)])
-    await settle()
-
-    expect(forwarded).toEqual([
-      { paths: [COPY], target: 'composer' },
-      { paths: [FINDER], target: 'composer' }
-    ])
-    enqueue({ paths: [FINDER], target: 'editor' })
-    expect(forwarded).toHaveLength(3)
-  })
-
-  it('copies drag-temp drops one at a time, in arrival order', async () => {
-    const copy = deferred<DragTempCopyItemResult[]>()
-    materializeMock
-      .mockReturnValueOnce(copy.promise)
-      .mockResolvedValueOnce([copied(OTHER_DRAG_TEMP, COPY)])
-    const { enqueue, forwarded } = createQueue()
-
-    enqueue({ paths: [DRAG_TEMP], target: 'composer' })
-    enqueue({ paths: [OTHER_DRAG_TEMP], target: 'terminal' })
-    await settle()
-    expect(materializeMock).toHaveBeenCalledTimes(1)
-
-    copy.resolve([copied(DRAG_TEMP, COPY)])
-    await settle()
-
-    expect(forwarded.map((payload) => payload.target)).toEqual(['composer', 'terminal'])
-  })
-
-  it('hands an uncopied file to a target main reads, without reporting it', async () => {
-    materializeMock.mockResolvedValue([
-      { sourcePath: DRAG_TEMP, status: 'uncopied', reason: 'too-large' }
-    ])
-    const { enqueue, forwarded } = createQueue()
-
-    enqueue({ paths: [DRAG_TEMP], target: 'editor' })
-    await settle()
-
-    expect(forwarded).toEqual([{ paths: [DRAG_TEMP], target: 'editor' }])
-  })
-
-  it('withholds an uncopied file from terminals and composers and reports it', async () => {
-    materializeMock.mockResolvedValue([
-      copied(FINDER),
-      { sourcePath: DRAG_TEMP, status: 'uncopied', reason: 'storage-full' }
-    ])
-    const { enqueue, forwarded } = createQueue()
-
-    enqueue({ paths: [FINDER, DRAG_TEMP], target: 'terminal' })
-    await settle()
-
-    expect(forwarded).toEqual([
-      { paths: [FINDER], target: 'terminal' },
-      {
-        byteLength: 0,
-        pathCount: 1,
-        reason: 'temp-copy-failed',
-        target: 'rejected',
-        commonReason: 'storage-full'
-      }
-    ])
-  })
-
-  it('forwards what it could copy and reports the rest with their shared reason', async () => {
-    materializeMock.mockResolvedValue([
-      copied(DRAG_TEMP, COPY),
-      { sourcePath: OTHER_DRAG_TEMP, status: 'failed', reason: 'permission-denied' }
-    ])
-    const { enqueue, forwarded } = createQueue()
-
-    enqueue({ paths: [DRAG_TEMP, OTHER_DRAG_TEMP], target: 'composer', scopeKey: 'pane-1' })
-    await settle()
-
-    expect(forwarded).toEqual([
-      { paths: [COPY], target: 'composer', scopeKey: 'pane-1' },
-      {
-        byteLength: 0,
-        pathCount: 1,
-        reason: 'temp-copy-failed',
-        target: 'rejected',
-        commonReason: 'permission-denied'
-      }
-    ])
-  })
-
-  it('reports a drop that lost every file, with no shared reason when they differ', async () => {
-    materializeMock.mockResolvedValue([
-      { sourcePath: DRAG_TEMP, status: 'failed', reason: 'missing' },
-      { sourcePath: DRAG_TEMP, status: 'failed', reason: 'changed' }
-    ])
-    const { enqueue, forwarded } = createQueue()
-
-    enqueue({ paths: [DRAG_TEMP, DRAG_TEMP], target: 'terminal' })
-    await settle()
-
-    expect(forwarded).toEqual([
-      { byteLength: 0, pathCount: 2, reason: 'temp-copy-failed', target: 'rejected' }
-    ])
-  })
-
-  it('drops a copy whose renderer went away, and keeps serving later drops', async () => {
-    const { enqueue, forwarded, controller } = createQueue()
-    materializeMock.mockImplementationOnce(async () => {
-      controller.abort(new Error('renderer gone'))
-      throw new Error('renderer gone')
-    })
-
-    enqueue({ paths: [DRAG_TEMP], target: 'terminal' })
-    await settle()
-    enqueue({ paths: [FINDER], target: 'editor' })
-
-    expect(forwarded).toEqual([{ paths: [FINDER], target: 'editor' }])
-  })
-
-  it('drops queued drops from a document that reloaded, and serves the new document', async () => {
-    const copy = deferred<DragTempCopyItemResult[]>()
-    materializeMock
-      .mockReturnValueOnce(copy.promise)
-      .mockImplementation(async (paths: string[]) => paths.map((path) => copied(path, COPY)))
-    let document = new AbortController()
-    const forwarded: NativeFileDropPayload[] = []
-    const enqueue = createNativeFileDropQueue({
-      forward: (payload) => forwarded.push(payload),
-      platform: 'darwin',
-      getCopyEnvironment: async () => env,
-      watchRenderer: () => ({ signal: document.signal, dispose: () => undefined })
-    })
-
-    enqueue({ paths: [DRAG_TEMP], target: 'terminal' })
-    await settle()
-    enqueue({ paths: [OTHER_DRAG_TEMP], target: 'editor' })
-    document.abort(new Error('reloaded'))
-    document = new AbortController()
-    enqueue({ paths: [OTHER_DRAG_TEMP], target: 'composer' })
-    copy.resolve([copied(DRAG_TEMP, COPY)])
-    await settle()
-
-    expect(forwarded).toEqual([{ paths: [COPY], target: 'composer' }])
-  })
-
-  it('still delivers the ordinary paths of a drop whose copy stage failed outright', async () => {
-    const { enqueue, forwarded } = createQueue({
-      getCopyEnvironment: async () => {
-        throw new Error('no temp path')
-      }
-    })
-
-    enqueue({ paths: [FINDER, DRAG_TEMP], target: 'composer', scopeKey: 'pane-1' })
-    await settle()
-
-    expect(forwarded).toEqual([
-      { paths: [FINDER], target: 'composer', scopeKey: 'pane-1' },
-      { byteLength: 0, pathCount: 1, reason: 'temp-copy-failed', target: 'rejected' }
-    ])
-  })
-
-  it('forwards a rejected drop at once, without waiting on the copy environment', () => {
-    const getCopyEnvironment = vi.fn(() => new Promise<typeof env>(() => undefined))
-    const { enqueue, forwarded } = createQueue({ getCopyEnvironment })
-    enqueue({ paths: [DRAG_TEMP], target: 'terminal' })
-    const rejected: NativeFileDropPayload = {
-      byteLength: 0,
-      pathCount: 300,
-      reason: 'too-many-paths',
-      target: 'rejected'
-    }
-
-    enqueue(rejected)
-
-    expect(forwarded).toEqual([rejected])
-  })
-
-  it('gives up on a hung copy, says why, and serves the copies behind it', async () => {
-    let copySignal: AbortSignal | undefined
-    materializeMock.mockImplementationOnce((_paths, _env, signal: AbortSignal) => {
-      copySignal = signal
-      return new Promise(() => undefined)
-    })
-    materializeMock.mockResolvedValueOnce([copied(OTHER_DRAG_TEMP, COPY)])
-    const { enqueue, forwarded } = createQueue({ copyTimeoutMs: 5 })
-
-    enqueue({ paths: [FINDER, DRAG_TEMP], target: 'terminal' })
-    enqueue({ paths: [OTHER_DRAG_TEMP], target: 'editor' })
-    await new Promise((resolve) => setTimeout(resolve, 20))
-
-    expect(copySignal?.aborted).toBe(true)
-    expect(forwarded).toEqual([
-      { paths: [FINDER], target: 'terminal' },
-      {
-        byteLength: 0,
-        pathCount: 1,
-        reason: 'temp-copy-failed',
-        target: 'rejected',
-        commonReason: 'timed-out'
-      },
-      { paths: [COPY], target: 'editor' }
-    ])
-  })
-
-  it('refuses drag-temp files past the pending-copy limit but keeps their ordinary paths', async () => {
-    materializeMock.mockReturnValue(new Promise(() => undefined))
-    const { enqueue, forwarded, controller } = createQueue()
-
-    for (let i = 0; i < MAX_PENDING_DRAG_TEMP_COPIES; i += 1) {
-      enqueue({ paths: [DRAG_TEMP], target: 'terminal' })
-    }
-    enqueue({ paths: [FINDER, DRAG_TEMP], target: 'composer' })
-
-    // The ordinary path waits behind the earlier drops; the refusal does not.
-    expect(forwarded).toEqual([
-      {
-        byteLength: 0,
-        pathCount: 1,
-        reason: 'temp-copy-failed',
-        target: 'rejected',
-        commonReason: 'busy'
-      }
-    ])
-    controller.abort(new Error('test done'))
-  })
-
-  it('does not report a copied drop as a failed copy when forwarding it throws', async () => {
-    materializeMock.mockResolvedValueOnce([copied(DRAG_TEMP, COPY)])
-    const forward = vi.fn((_payload: NativeFileDropPayload) => {
-      throw new Error('send failed')
-    })
-    const { enqueue } = createQueue({ forward })
-
-    enqueue({ paths: [DRAG_TEMP], target: 'terminal' })
-    await settle()
-
-    expect(forward.mock.calls).toEqual([[{ paths: [COPY], target: 'terminal' }]])
-  })
-})
-
-const CHANNEL = 'terminal:file-dropped-from-preload'
-
-function createWindow() {
-  let destroyed = false
-  const windowListeners = new Map<string, () => void>()
-  const webContents = {
-    isDestroyed: () => destroyed,
-    send: vi.fn(),
-    once: vi.fn(),
-    removeListener: vi.fn()
-  }
-  const fake = {
-    isDestroyed: () => destroyed,
-    on: (event: string, listener: () => void) => windowListeners.set(event, listener),
-    webContents
-  }
-  // oxlint-disable-next-line typescript/consistent-type-assertions -- SAFETY: the relay only touches the members stubbed above.
-  const window = fake as unknown as BrowserWindow
-  return {
-    window,
-    webContents,
-    close: () => {
-      destroyed = true
-      windowListeners.get('closed')?.()
-    },
-    destroy: () => {
-      destroyed = true
-    }
-  }
-}
-
-function relay(): IpcListener {
-  const listener = ipcListeners.get(CHANNEL)
-  expect(listener).toBeDefined()
-  return listener!
-}
-
-describe('registerFileDropRelay', () => {
-  beforeEach(() => {
-    ipcListeners.clear()
-    ipcHandlers.clear()
-    sweepMock.mockReset()
-  })
-
-  it('relays only well-formed drops from its own renderer, until the window closes', () => {
-    const { window, webContents, close } = createWindow()
-    registerFileDropRelay(window)
-    const drop: NativeFileDropPayload = { paths: [FINDER], target: 'editor' }
-
-    relay()({ sender: { id: 'other-window' } }, drop)
-    relay()({ sender: webContents }, { paths: 'not-a-list', target: 'editor' })
-    // Only main may report a failed copy; a renderer claiming one is ignored.
-    relay()(
-      { sender: webContents },
-      { byteLength: 0, pathCount: 1, reason: 'temp-copy-failed', target: 'rejected' }
-    )
-    relay()({ sender: webContents }, drop)
-
-    expect(webContents.send.mock.calls).toEqual([['terminal:file-drop', drop]])
-    expect(sweepMock).toHaveBeenCalledTimes(1)
-    close()
-    expect(ipcListeners.has(CHANNEL)).toBe(false)
-  })
-
-  it('replaces a listener left by an earlier window', () => {
-    const first = createWindow()
-    const second = createWindow()
-    registerFileDropRelay(first.window)
-    registerFileDropRelay(second.window)
-
-    relay()({ sender: first.webContents }, { paths: [FINDER], target: 'editor' })
-
-    expect(first.webContents.send).not.toHaveBeenCalled()
-  })
-
-  it('prepares ordinary paths only for its own live renderer and validates the request', async () => {
-    const { window, webContents, close } = createWindow()
-    registerFileDropRelay(window)
-    const handler = ipcHandlers.get('fs:prepareDroppedPaths')!
-    const request = { paths: [FINDER], consumer: 'agent' }
-    expect(() => handler({ sender: {} }, request)).toThrow('owning window')
-    for (const invalid of [
-      null,
-      { paths: [FINDER], consumer: 'other' },
-      { paths: [42], consumer: 'agent' }
-    ]) {
-      expect(() => handler({ sender: webContents }, invalid)).toThrow('Invalid')
-    }
-    await expect(handler({ sender: webContents }, request)).resolves.toEqual({
-      paths: [FINDER],
-      failures: []
-    })
-    expect(webContents.send).not.toHaveBeenCalled()
-    close()
-    expect(ipcHandlers.has('fs:prepareDroppedPaths')).toBe(false)
-    expect(() => handler({ sender: webContents }, request)).toThrow('owning window')
-  })
-
-  it('enforces both request caps before preparing any paths', async () => {
-    const { window, webContents } = createWindow()
-    registerFileDropRelay(window)
-    const handler = ipcHandlers.get('fs:prepareDroppedPaths')!
-    await expect(
-      handler(
-        { sender: webContents },
-        { paths: Array.from({ length: 257 }, () => DRAG_TEMP), consumer: 'agent' }
-      )
-    ).resolves.toMatchObject({
-      paths: [],
-      failures: [{ reason: 'too-many-paths', pathCount: 257 }]
-    })
-    await expect(
-      handler({ sender: webContents }, { paths: ['x'.repeat(256 * 1024 + 1)], consumer: 'agent' })
-    ).resolves.toMatchObject({ paths: [], failures: [{ reason: 'paths-too-large' }] })
-    expect(materializeMock).not.toHaveBeenCalled()
-  })
-
-  it('keeps the replacement window handler when an older window closes late', async () => {
-    const first = createWindow()
-    const second = createWindow()
-    registerFileDropRelay(first.window)
-    registerFileDropRelay(second.window)
-    const handler = ipcHandlers.get('fs:prepareDroppedPaths')!
-    first.close()
-    expect(ipcHandlers.get('fs:prepareDroppedPaths')).toBe(handler)
-    await expect(
-      handler({ sender: second.webContents }, { paths: [FINDER], consumer: 'main-reader' })
-    ).resolves.toEqual({ paths: [FINDER], failures: [] })
-  })
-
-  it.skipIf(process.platform !== 'darwin')(
-    'copies from the macOS user temp dir and sends nothing once the window is gone',
-    async () => {
-      const copy = deferred<DragTempCopyItemResult[]>()
-      materializeMock.mockReturnValueOnce(copy.promise)
-      const { window, webContents, destroy } = createWindow()
-      registerFileDropRelay(window)
-
-      relay()({ sender: webContents }, { paths: [DRAG_TEMP], target: 'terminal' })
-      await settle()
-      destroy()
-      copy.resolve([copied(DRAG_TEMP, COPY)])
-      await settle()
-
-      expect(materializeMock.mock.calls[0][1]).toMatchObject({
-        platform: 'darwin',
-        sourceTempRoot: '/private/var/folders/ab/xyz/T'
-      })
-      expect(webContents.send).not.toHaveBeenCalled()
-    }
-  )
-})
diff --git a/src/main/window/native-file-drop-relay.ts b/src/main/window/native-file-drop-relay.ts
deleted file mode 100644
index 3d7d4c8f50bb..000000000000
--- a/src/main/window/native-file-drop-relay.ts
+++ /dev/null
@@ -1,219 +0,0 @@
-import { app, ipcMain } from 'electron'
-import type { BrowserWindow } from 'electron'
-import {
-  createRejectedNativeFileDropPayload,
-  isNativeFileDropPayload,
-  NATIVE_FILE_DROP_TARGET,
-  validateNativeFileDropPaths,
-  type NativeFileDropPayload,
-  type NativeFileDropRejectedPayload
-} from '../../shared/native-file-drop'
-import type {
-  PrepareDroppedPathsRequest,
-  PreparedDroppedPaths
-} from '../../shared/native-file-drop-preparation'
-import { abortWhenRendererGone } from '../ipc/renderer-lifetime-abort'
-import { getDragTempCopyRoot, scheduleDragTempCopySweep } from './dragged-temp-file-copy'
-import {
-  createDroppedPathPreparationQueue,
-  type createDragTempCopyLane,
-  prepareDroppedPaths,
-  windowDragTempCopyLane,
-  type DroppedPathPreparationDeps
-} from './dropped-path-preparation'
-import type { DragTempCopyEnvironment } from './dragged-temp-file-copy'
-import { getDarwinUserTempDir } from './darwin-user-temp-dir'
-
-export { MAX_PENDING_DRAG_TEMP_COPIES } from './dropped-path-preparation'
-
-type AcceptedNativeFileDropPayload = Exclude<NativeFileDropPayload, NativeFileDropRejectedPayload>
-type NativeFileDropQueueDeps = DroppedPathPreparationDeps & {
-  forward: (payload: NativeFileDropPayload) => void
-}
-type NativeFileDropQueue = ((payload: NativeFileDropPayload) => void) & {
-  prepare: (request: PrepareDroppedPathsRequest) => Promise<PreparedDroppedPaths>
-}
-
-export function registerFileDropRelay(mainWindow: BrowserWindow): void {
-  const channel = 'terminal:file-dropped-from-preload'
-  const prepareChannel = 'fs:prepareDroppedPaths'
-  const mainWebContents = mainWindow.webContents
-  const isWindowGone = (): boolean => mainWindow.isDestroyed() || mainWebContents.isDestroyed()
-  ipcMain.removeAllListeners(channel)
-  ipcMain.removeHandler(prepareChannel)
-  const enqueue = createNativeFileDropQueue(
-    {
-      forward: (payload) => {
-        if (!isWindowGone()) {
-          mainWebContents.send('terminal:file-drop', payload)
-        }
-      },
-      platform: process.platform,
-      getCopyEnvironment: async () => ({
-        platform: process.platform,
-        sourceTempRoot: await getDarwinUserTempDir(),
-        copyRoot: getDragTempCopyRoot(app.getPath('temp'))
-      }),
-      watchRenderer: () => abortWhenRendererGone(mainWebContents)
-    },
-    windowDragTempCopyLane
-  )
-  const relayFileDrop = (event: Electron.IpcMainEvent, args: NativeFileDropPayload): void => {
-    if (isWindowGone() || event.sender !== mainWebContents) {
-      return
-    }
-    if (!isNativeFileDropPayload(args) || isTempCopyFailure(args)) {
-      return
-    }
-    enqueue(args)
-  }
-  ipcMain.on(channel, relayFileDrop)
-  const prepareHandler = (
-    event: Electron.IpcMainInvokeEvent,
-    args: unknown
-  ): Promise<PreparedDroppedPaths> => {
-    if (isWindowGone() || event.sender !== mainWebContents) {
-      throw new Error('Dropped paths must come from the owning window')
-    }
-    if (!isPrepareDroppedPathsRequest(args)) {
-      throw new Error('Invalid dropped paths request')
-    }
-    const validation = validateNativeFileDropPaths(args.paths)
-    if (validation.status === 'rejected') {
-      return Promise.resolve({
-        paths: [],
-        failures: [createRejectedNativeFileDropPayload(validation)]
-      })
-    }
-    return enqueue.prepare(args)
-  }
-  ipcMain.handle(prepareChannel, prepareHandler)
-  activePrepareHandler = prepareHandler
-  mainWindow.on('closed', () => {
-    ipcMain.removeListener(channel, relayFileDrop)
-    // Why: an old window closing late must not remove the replacement window's handler.
-    if (activePrepareHandler === prepareHandler) {
-      ipcMain.removeHandler(prepareChannel)
-      activePrepareHandler = undefined
-    }
-  })
-  scheduleDragTempCopySweep(() => getDragTempCopyRoot(app.getPath('temp')))
-}
-
-let activePrepareHandler: unknown
-
-/** Legacy delivery stays ordered; new owners share only the serialized copy work. */
-export function createNativeFileDropQueue(
-  deps: NativeFileDropQueueDeps,
-  lane?: ReturnType<typeof createDragTempCopyLane>
-): NativeFileDropQueue {
-  const prepare = createDroppedPathPreparationQueue(deps, lane)
-  let deliveryTail = Promise.resolve()
-  let queuedDeliveries = 0
-  const deliver = (payloads: NativeFileDropPayload[]): void => {
-    for (const payload of payloads) {
-      deps.forward(payload)
-    }
-  }
-  const enqueueDelivery = (work: () => Promise<void> | void): void => {
-    queuedDeliveries += 1
-    deliveryTail = deliveryTail
-      .then(work)
-      .catch(() => undefined)
-      .finally(() => {
-        queuedDeliveries -= 1
-      })
-  }
-  const forwardInOrder = (payload: NativeFileDropPayload): void => {
-    if (payload.target === 'rejected' || queuedDeliveries === 0) {
-      deps.forward(payload)
-      return
-    }
-    const lifetime = deps.watchRenderer()
-    enqueueDelivery(() => {
-      try {
-        if (!lifetime.signal.aborted) {
-          deps.forward(payload)
-        }
-      } finally {
-        lifetime.dispose()
-      }
-    })
-  }
-  const enqueue = (payload: NativeFileDropPayload): void => {
-    if (payload.target === 'rejected') {
-      forwardInOrder(payload)
-      return
-    }
-    const prepared = prepare({ paths: payload.paths, consumer: legacyConsumer(payload) })
-    if (!(prepared instanceof Promise)) {
-      if (payload.paths.length === 0) {
-        forwardInOrder(payload)
-        return
-      }
-      for (const item of legacyPayloads(payload, prepared)) {
-        forwardInOrder(item)
-      }
-      return
-    }
-    // Why: observe rejection now, even while legacy delivery waits behind an earlier drop.
-    const result = prepared.then(
-      (value) => legacyPayloads(payload, value),
-      () => []
-    )
-    enqueueDelivery(async () => deliver(await result))
-  }
-  return Object.assign(enqueue, {
-    prepare: async (request: PrepareDroppedPathsRequest) => prepare(request)
-  })
-}
-
-export async function prepareNativeFileDrop(
-  payload: AcceptedNativeFileDropPayload,
-  env: DragTempCopyEnvironment,
-  signal?: AbortSignal
-): Promise<NativeFileDropPayload[]> {
-  return legacyPayloads(
-    payload,
-    await prepareDroppedPaths(
-      { paths: payload.paths, consumer: legacyConsumer(payload) },
-      env,
-      signal
-    )
-  )
-}
-
-function legacyConsumer(
-  payload: AcceptedNativeFileDropPayload
-): PrepareDroppedPathsRequest['consumer'] {
-  return payload.target === NATIVE_FILE_DROP_TARGET.terminal ||
-    payload.target === NATIVE_FILE_DROP_TARGET.composer
-    ? 'agent'
-    : 'main-reader'
-}
-
-function legacyPayloads(
-  payload: AcceptedNativeFileDropPayload,
-  prepared: PreparedDroppedPaths
-): NativeFileDropPayload[] {
-  return [
-    ...(prepared.paths.length > 0 ? [{ ...payload, paths: prepared.paths }] : []),
-    ...prepared.failures
-  ]
-}
-
-function isTempCopyFailure(payload: NativeFileDropPayload): boolean {
-  return payload.target === 'rejected' && payload.reason === 'temp-copy-failed'
-}
-
-function isPrepareDroppedPathsRequest(value: unknown): value is PrepareDroppedPathsRequest {
-  return (
-    !!value &&
-    typeof value === 'object' &&
-    'consumer' in value &&
-    (value.consumer === 'agent' || value.consumer === 'main-reader') &&
-    'paths' in value &&
-    Array.isArray(value.paths) &&
-    value.paths.every((path: unknown) => typeof path === 'string')
-  )
-}
diff --git a/src/main/window/runtime-window-lifecycle.ts b/src/main/window/runtime-window-lifecycle.ts
index a4adf03e7f43..8ed8df5b9461 100644
--- a/src/main/window/runtime-window-lifecycle.ts
+++ b/src/main/window/runtime-window-lifecycle.ts
@@ -189,7 +189,8 @@ export function registerRuntimeWindowLifecycle(
         newLeafId: opts.newLeafId
       })
     },
-    renameTerminal: (tabId, title) => send('ui:renameTerminal', { tabId, title }),
+    renameTerminal: (tabId, title, options) =>
+      send('ui:renameTerminal', { tabId, title, ...options }),
     focusTerminal: (tabId, worktreeId, leafId) =>
       send('ui:focusTerminal', { tabId, worktreeId, leafId }),
     focusEditorTab: (tabId, worktreeId) => send('ui:focusEditorTab', { tabId, worktreeId }),
diff --git a/src/main/worktree-removal-close-records.test.ts b/src/main/worktree-removal-close-records.test.ts
index 9d2d2e32e71d..0b3722482c8a 100644
--- a/src/main/worktree-removal-close-records.test.ts
+++ b/src/main/worktree-removal-close-records.test.ts
@@ -1,4 +1,7 @@
-import { closeTestStores, createSqliteTestStore } from './persistence-test-harness'
+import { closeTestStores, createSqliteTestStore, testState } from './persistence-test-harness'
+import { Store as CanonicalStore } from './persistence/loading-store/store'
+import { initDataPath as initCanonicalDataPath } from './persistence/loading-store/user-data-path'
+import { resetRetirementCollisionKeyCacheForTests } from './worktree-name-retirement'
 // Why this file exists: removing a workspace's session rows must take its close records with it,
 // or they hold cap slots until the TTL and read as "emptied on purpose" for a new workspace at the
 // same path.
@@ -15,7 +18,7 @@ import {
   type ClosedTerminalTabTombstonesByTabId
 } from '../shared/closed-terminal-tab-tombstones'
 
-const testState = { dir: '' }
+let hasCreatedStoreInCase = false
 
 vi.mock('./ssh/ssh-config-parser', () => ({
   loadUserSshConfig: vi.fn(),
@@ -37,6 +40,13 @@ vi.mock('./telemetry/client', () => ({ track: vi.fn() }))
 vi.mock('./telemetry/cohort-classifier', () => ({ getCohortAtEmit: vi.fn().mockReturnValue({}) }))
 
 async function createStore() {
+  if (!hasCreatedStoreInCase) {
+    hasCreatedStoreInCase = true
+    initCanonicalDataPath()
+    return createSqliteTestStore(CanonicalStore, {
+      dataFile: join(testState.dir, 'orca-data.json')
+    })
+  }
   vi.resetModules()
   const { Store, initDataPath } = await import('./persistence')
   initDataPath()
@@ -70,6 +80,8 @@ function sessionWithRecords(map: ClosedTerminalTabTombstonesByTabId) {
 
 describe('close records on workspace removal', () => {
   beforeEach(() => {
+    hasCreatedStoreInCase = false
+    resetRetirementCollisionKeyCacheForTests()
     testState.dir = mkdtempSync(join(tmpdir(), 'orca-test-'))
   })
 
diff --git a/src/main/worktree-removal-session-partition-fencing.test.ts b/src/main/worktree-removal-session-partition-fencing.test.ts
index 03dc50a3dd54..8a5f1dad8a45 100644
--- a/src/main/worktree-removal-session-partition-fencing.test.ts
+++ b/src/main/worktree-removal-session-partition-fencing.test.ts
@@ -1,4 +1,7 @@
-import { closeTestStores, createSqliteTestStore } from './persistence-test-harness'
+import { closeTestStores, createSqliteTestStore, testState } from './persistence-test-harness'
+import { Store as CanonicalStore } from './persistence/loading-store/store'
+import { initDataPath as initCanonicalDataPath } from './persistence/loading-store/user-data-path'
+import { resetRetirementCollisionKeyCacheForTests } from './worktree-name-retirement'
 // Why this file exists: worktree removal writes to host session partitions, and the two hazards below
 // are only visible across a removal followed by a renderer session write — persistence.test.ts covers
 // removal and partitioning separately, so neither suite catches the interaction.
@@ -10,7 +13,7 @@ import type { TerminalTab } from '../shared/terminal-tab-types'
 import { getDefaultWorkspaceSession } from '../shared/constants'
 import { toRuntimeExecutionHostId } from '../shared/execution-host'
 
-const testState = { dir: '' }
+let hasCreatedStoreInCase = false
 
 vi.mock('./ssh/ssh-config-parser', () => ({
   loadUserSshConfig: vi.fn(),
@@ -32,6 +35,13 @@ vi.mock('./telemetry/client', () => ({ track: vi.fn() }))
 vi.mock('./telemetry/cohort-classifier', () => ({ getCohortAtEmit: vi.fn().mockReturnValue({}) }))
 
 async function createStore() {
+  if (!hasCreatedStoreInCase) {
+    hasCreatedStoreInCase = true
+    initCanonicalDataPath()
+    return createSqliteTestStore(CanonicalStore, {
+      dataFile: join(testState.dir, 'orca-data.json')
+    })
+  }
   vi.resetModules()
   const { Store, initDataPath } = await import('./persistence')
   initDataPath()
@@ -56,6 +66,8 @@ const LIVE = 'repo-gone::/workspace/live'
 
 describe('worktree removal across host session partitions', () => {
   beforeEach(() => {
+    hasCreatedStoreInCase = false
+    resetRetirementCollisionKeyCacheForTests()
     testState.dir = mkdtempSync(join(tmpdir(), 'orca-test-'))
   })
 
diff --git a/src/preload/api/filesystem-api.ts b/src/preload/api/filesystem-api.ts
index 737a1b87594a..5e822328195a 100644
--- a/src/preload/api/filesystem-api.ts
+++ b/src/preload/api/filesystem-api.ts
@@ -27,6 +27,10 @@ import type {
   PythonEnvironments
 } from '../../shared/notebook-kernel-types'
 import type { RuntimeUploadFileStreamRequest } from '../../shared/runtime-upload-staging-contract'
+import type {
+  AgentSessionAttachmentPathUploadResult,
+  AgentSessionAttachmentUploadTarget
+} from '../../shared/agent-session-attachments'
 import type {
   PrepareDroppedPathsRequest,
   PreparedDroppedPaths
@@ -201,6 +205,10 @@ export type FilesystemApi = {
         connectionId?: string
       } & SshMutationExpectation
     ) => Promise<ResolveDroppedPathsResult>
+    /** Uploads client-local files into a paired server's store for one structured chat. */
+    uploadPathsToAgentSessionAttachments: (
+      args: AgentSessionAttachmentUploadTarget & { paths: string[] }
+    ) => Promise<AgentSessionAttachmentPathUploadResult>
     watchWorktree: (args: { worktreePath: string; connectionId?: string }) => Promise<void>
     unwatchWorktree: (args: { worktreePath: string; connectionId?: string }) => Promise<void>
     onFsChanged: (callback: (payload: FsChangedPayload) => void) => () => void
diff --git a/src/preload/api/fs-bridge.ts b/src/preload/api/fs-bridge.ts
index c60917d427a1..6fc8e9b69d8c 100644
--- a/src/preload/api/fs-bridge.ts
+++ b/src/preload/api/fs-bridge.ts
@@ -7,6 +7,10 @@ import type {
 import type { SshMutationExpectation } from '../../shared/ssh-types'
 import type { LocalFileAccess } from '../../shared/local-file-access'
 import type { RuntimeUploadFileStreamRequest } from '../../shared/runtime-upload-staging-contract'
+import type {
+  AgentSessionAttachmentPathUploadResult,
+  AgentSessionAttachmentUploadTarget
+} from '../../shared/agent-session-attachments'
 import type { SearchResult } from '../../shared/code-search-types'
 import type { FsChangedPayload } from '../../shared/filesystem-entry-types'
 import type {
@@ -211,6 +215,10 @@ export const fsApi = {
     } & SshMutationExpectation
   ): Promise<ResolveDroppedPathsResult> =>
     ipcRenderer.invoke('fs:resolveDroppedPathsForAgent', args),
+  uploadPathsToAgentSessionAttachments: (
+    args: AgentSessionAttachmentUploadTarget & { paths: string[] }
+  ): Promise<AgentSessionAttachmentPathUploadResult> =>
+    ipcRenderer.invoke('fs:uploadPathsToAgentSessionAttachments', args),
   watchWorktree: (args: { worktreePath: string; connectionId?: string }): Promise<void> =>
     ipcRenderer.invoke('fs:watchWorktree', args),
   unwatchWorktree: (args: { worktreePath: string; connectionId?: string }): Promise<void> =>
diff --git a/src/preload/api/gh-bridge-pull-requests-and-work-items.ts b/src/preload/api/gh-bridge-pull-requests-and-work-items.ts
index 3e4a5f6ce2a9..22294f6dc4e3 100644
--- a/src/preload/api/gh-bridge-pull-requests-and-work-items.ts
+++ b/src/preload/api/gh-bridge-pull-requests-and-work-items.ts
@@ -59,6 +59,7 @@ export const ghPullRequestsAndWorkItemsApi = {
   workItemByOwnerRepo: (args: {
     repoPath: string
     repoId?: string | null
+    sourceContext?: TaskSourceContext | null
     owner: string
     repo: string
     host?: string
diff --git a/src/preload/api/github-work-item-api.ts b/src/preload/api/github-work-item-api.ts
index db5842eb2cfb..47a098e2cdc7 100644
--- a/src/preload/api/github-work-item-api.ts
+++ b/src/preload/api/github-work-item-api.ts
@@ -65,6 +65,7 @@ export type GithubWorkItemApi = {
   workItemByOwnerRepo: (args: {
     repoPath: string
     repoId?: string
+    sourceContext?: TaskSourceContext | null
     owner: string
     repo: string
     host?: string
diff --git a/src/preload/api/pty-api.ts b/src/preload/api/pty-api.ts
index 229ef1a5414c..cbcf78a4abe2 100644
--- a/src/preload/api/pty-api.ts
+++ b/src/preload/api/pty-api.ts
@@ -145,6 +145,8 @@ export type PtyApi = {
   /** Runs the fix with the pane's own Codex; true only once verified. Local panes only. */
   disableCodexSharedServerAutoStart: (id: string) => Promise<boolean>
   stopCodexSharedServer: (id: string) => Promise<boolean>
+  /** A local pane whose daemon predates per-account Claude folders; false for any other pane. */
+  openedBeforeClaudeAccounts: (id: string) => Promise<boolean>
   getCwd: (id: string) => Promise<string>
   getSize: (id: string) => Promise<{ cols: number; rows: number } | null>
   listSessions: (scope?: PtySessionListScope) => Promise<PtyListedSession[]>
diff --git a/src/preload/api/pty-bridge-stream-and-serialization.ts b/src/preload/api/pty-bridge-stream-and-serialization.ts
index e0b2e7f2bf67..3d72ac5e518f 100644
--- a/src/preload/api/pty-bridge-stream-and-serialization.ts
+++ b/src/preload/api/pty-bridge-stream-and-serialization.ts
@@ -23,6 +23,8 @@ export const ptyStreamAndSerializationApi = {
     ipcRenderer.invoke('pty:disableCodexSharedServerAutoStart', { id }),
   stopCodexSharedServer: (id: string): Promise<boolean> =>
     ipcRenderer.invoke('pty:stopCodexSharedServer', { id }),
+  openedBeforeClaudeAccounts: (id: string): Promise<boolean> =>
+    ipcRenderer.invoke('pty:openedBeforeClaudeAccounts', { id }),
   getCwd: (id: string): Promise<string> => ipcRenderer.invoke('pty:getCwd', { id }),
   getSize: (id: string): Promise<{ cols: number; rows: number } | null> =>
     ipcRenderer.invoke('pty:getSize', { id }),
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 b7d9345daf70..73b800c0e3d8 100644
--- a/src/preload/api/ui-bridge-clipboard-and-window-controls.ts
+++ b/src/preload/api/ui-bridge-clipboard-and-window-controls.ts
@@ -1,3 +1,4 @@
+import type { AgentSessionAttachmentClipboardTarget } from '../../shared/agent-session-attachments'
 import { ipcRenderer, webFrame } from 'electron'
 import type {
   RuntimeMobileMarkdownRequest,
@@ -9,12 +10,10 @@ import {
   type RichMarkdownContextMenuCommandPayload,
   type RichMarkdownContextMenuTableTarget
 } from '../../shared/rich-markdown-context-menu'
-import type { NativeFileDropPayload } from '../../shared/native-file-drop'
 import type { RuntimeNavigationTarget } from '../../shared/runtime-navigation'
 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'
 import type { PreloadApi } from '../api-types'
 
 export const uiClipboardAndWindowControlsApi = {
@@ -93,6 +92,7 @@ export const uiClipboardAndWindowControlsApi = {
   saveClipboardImageAsTempFile: (args?: {
     connectionId?: string | null
     runtimeEnvironmentId?: string | null
+    agentSessionAttachment?: AgentSessionAttachmentClipboardTarget
     /** A native-chat composer paste, kept where its draft can bring it back. */
     forNativeChatDraft?: boolean
   }): Promise<string | null> => ipcRenderer.invoke('clipboard:saveImageAsTempFile', args),
@@ -128,8 +128,6 @@ export const uiClipboardAndWindowControlsApi = {
         }
       | string
   ): Promise<{ ok: boolean; reason?: string }> => ipcRenderer.invoke('clipboard:writeFile', args),
-  onFileDrop: (callback: (data: NativeFileDropPayload) => void): (() => void) =>
-    subscribeNativeFileDrop(callback),
   getZoomLevel: (): number => webFrame.getZoomLevel(),
   setZoomLevel: (level: number): void => webFrame.setZoomLevel(level),
   syncTrafficLights: (zoomFactor: number): void =>
diff --git a/src/preload/api/ui-bridge-terminal-and-session-tabs.ts b/src/preload/api/ui-bridge-terminal-and-session-tabs.ts
index 458a50c05841..a9555fae256d 100644
--- a/src/preload/api/ui-bridge-terminal-and-session-tabs.ts
+++ b/src/preload/api/ui-bridge-terminal-and-session-tabs.ts
@@ -145,11 +145,11 @@ export const uiTerminalAndSessionTabsApi = {
     return () => ipcRenderer.removeListener('ui:splitTerminal', listener)
   },
   onRenameTerminal: (
-    callback: (data: { tabId: string; title: string | null }) => void
+    callback: (data: { tabId: string; title: string | null; recordInteraction?: false }) => void
   ): (() => void) => {
     const listener = (
       _event: Electron.IpcRendererEvent,
-      data: { tabId: string; title: string | null }
+      data: { tabId: string; title: string | null; recordInteraction?: false }
     ) => callback(data)
     ipcRenderer.on('ui:renameTerminal', listener)
     return () => ipcRenderer.removeListener('ui:renameTerminal', listener)
diff --git a/src/preload/api/ui-command-event-api.ts b/src/preload/api/ui-command-event-api.ts
index 2e8c61a00d06..fd5b632c78a5 100644
--- a/src/preload/api/ui-command-event-api.ts
+++ b/src/preload/api/ui-command-event-api.ts
@@ -202,7 +202,7 @@ export type UiCommandEventApi = {
     }) => void
   ) => () => void
   onRenameTerminal: (
-    callback: (data: { tabId: string; title: string | null }) => void
+    callback: (data: { tabId: string; title: string | null; recordInteraction?: false }) => void
   ) => () => void
   onFocusTerminal: (
     callback: (data: {
diff --git a/src/preload/api/ui-window-api.ts b/src/preload/api/ui-window-api.ts
index e18fa1513948..c06dd79dab70 100644
--- a/src/preload/api/ui-window-api.ts
+++ b/src/preload/api/ui-window-api.ts
@@ -1,6 +1,6 @@
+import type { AgentSessionAttachmentClipboardTarget } from '../../shared/agent-session-attachments'
 import type { ClipboardImageThumbnail } from '../../shared/clipboard-image'
 import type { ReadClipboardTextOptions } from '../../shared/clipboard-text'
-import type { NativeFileDropPayload } from '../../shared/native-file-drop'
 import type {
   RichMarkdownContextMenuCommandPayload,
   RichMarkdownContextMenuTableTarget
@@ -12,6 +12,7 @@ export type UiWindowApi = {
   saveClipboardImageAsTempFile: (args?: {
     connectionId?: string | null
     runtimeEnvironmentId?: string | null
+    agentSessionAttachment?: AgentSessionAttachmentClipboardTarget
     /** A native-chat composer paste, kept where its draft can bring it back. */
     forNativeChatDraft?: boolean
   }) => Promise<string | null>
@@ -37,7 +38,6 @@ export type UiWindowApi = {
         }
       | string
   ) => Promise<{ ok: boolean; reason?: string }>
-  onFileDrop: (callback: (data: NativeFileDropPayload) => void) => () => void
   getZoomLevel: () => number
   setZoomLevel: (level: number) => void
   syncTrafficLights: (zoomFactor: number) => void
diff --git a/src/preload/index.ts b/src/preload/index.ts
index 5f64a1e2e351..fcccbffe7d44 100644
--- a/src/preload/index.ts
+++ b/src/preload/index.ts
@@ -1,9 +1,6 @@
 import { contextBridge, ipcRenderer } from 'electron'
 import type { PreloadApi } from './api-types'
-import {
-  installBrowserFindListener,
-  installNativeFileDropHandlers
-} from './preload-runtime-support'
+import { installBrowserFindListener } from './preload-runtime-support'
 import { appApi } from './api/app-bridge'
 import { orcaProfilesApi } from './api/orca-profiles-bridge'
 import { platformApi } from './api/platform-bridge'
@@ -87,7 +84,6 @@ import { mobileApi } from './api/mobile-bridge'
 import { agentStatusApi } from './api/agent-status-bridge'
 import { speechApi } from './api/speech-bridge'
 
-installNativeFileDropHandlers()
 installBrowserFindListener()
 
 // Custom APIs for renderer. Each domain bridge owns its IPC contract.
diff --git a/src/preload/preload-file-drop-absence.test.ts b/src/preload/preload-file-drop-absence.test.ts
new file mode 100644
index 000000000000..618a683b6b3d
--- /dev/null
+++ b/src/preload/preload-file-drop-absence.test.ts
@@ -0,0 +1,25 @@
+// @vitest-environment happy-dom
+import { expect, it, vi } from 'vitest'
+
+vi.mock('electron', () => ({
+  ipcRenderer: { on: vi.fn(), removeListener: vi.fn(), send: vi.fn() },
+  webUtils: { getPathForFile: vi.fn() }
+}))
+
+it('registers no document drop or dragover listeners in preload', async () => {
+  const addListener = vi.spyOn(document, 'addEventListener')
+  try {
+    const preload = await import('./preload-runtime-support')
+    if (
+      'installNativeFileDropHandlers' in preload &&
+      typeof preload.installNativeFileDropHandlers === 'function'
+    ) {
+      preload.installNativeFileDropHandlers()
+    }
+    expect(
+      addListener.mock.calls.filter(([type]) => type === 'drop' || type === 'dragover')
+    ).toEqual([])
+  } finally {
+    addListener.mockRestore()
+  }
+})
diff --git a/src/preload/preload-native-file-drop-release.test.ts b/src/preload/preload-native-file-drop-release.test.ts
deleted file mode 100644
index dd556fb2e5ea..000000000000
--- a/src/preload/preload-native-file-drop-release.test.ts
+++ /dev/null
@@ -1,122 +0,0 @@
-// @vitest-environment happy-dom
-import { beforeAll, beforeEach, describe, expect, it, vi } from 'vitest'
-import { OS_FILE_DROP_OWNER_ATTRIBUTE } from '../shared/native-file-drop-preparation'
-import { ORCA_INTERNAL_FILE_DRAG_TYPE } from '../shared/native-file-drop'
-
-const electron = vi.hoisted(() => ({
-  send: vi.fn(),
-  getPathForFile: vi.fn((file: File) => `/drop/${file.name}`),
-  on: vi.fn(),
-  removeListener: vi.fn()
-}))
-vi.mock('electron', () => ({
-  ipcRenderer: electron,
-  webUtils: { getPathForFile: electron.getPathForFile }
-}))
-import { installNativeFileDropHandlers } from './preload-runtime-support'
-
-function dispatch(target: Element, type = 'drop', types = ['Files']) {
-  const event = new Event(type, { bubbles: true, cancelable: true, composed: true })
-  const transfer = { types, files: [new File(['x'], 'notes.txt')], dropEffect: 'none' }
-  Object.defineProperty(event, 'dataTransfer', { value: transfer })
-  const stop = vi.spyOn(event, 'stopPropagation')
-  target.dispatchEvent(event)
-  return { event, transfer, stop }
-}
-
-function root(owner: boolean, legacy = false) {
-  const element = document.createElement('div')
-  if (owner) {
-    element.setAttribute(OS_FILE_DROP_OWNER_ATTRIBUTE, '')
-  }
-  if (legacy) {
-    element.dataset.nativeFileDropTarget = 'terminal'
-  }
-  document.body.append(element)
-  return element
-}
-
-beforeAll(() => {
-  installNativeFileDropHandlers()
-  installNativeFileDropHandlers()
-})
-beforeEach(() => {
-  document.body.replaceChildren()
-  electron.send.mockClear()
-  electron.getPathForFile.mockClear()
-})
-
-describe('preload migration release', () => {
-  it.each([false, true])(
-    'keeps unmarked and legacy roots on the relay exactly once: legacy=%s',
-    (legacy) => {
-      const { event, stop } = dispatch(root(false, legacy))
-      expect(event.defaultPrevented).toBe(true)
-      expect(stop).toHaveBeenCalledTimes(1)
-      expect(electron.send).toHaveBeenCalledExactlyOnceWith('terminal:file-dropped-from-preload', {
-        paths: ['/drop/notes.txt'],
-        target: legacy ? 'terminal' : 'editor'
-      })
-    }
-  )
-
-  it.each(['drop', 'dragover'])('leaves %s inside a migrated owner untouched', (type) => {
-    const owner = root(true)
-    const child = document.createElement('span')
-    owner.append(child)
-    const { event, transfer, stop } = dispatch(child, type)
-    expect(event.defaultPrevented).toBe(false)
-    expect(stop).not.toHaveBeenCalled()
-    expect(transfer.dropEffect).toBe('none')
-    expect(electron.send).not.toHaveBeenCalled()
-    expect(electron.getPathForFile).not.toHaveBeenCalled()
-  })
-
-  it.each(['drop', 'dragover'])('keeps a nested legacy boundary on the legacy %s path', (type) => {
-    const owner = root(true)
-    const legacy = root(false, true)
-    owner.append(legacy)
-    const { event, transfer } = dispatch(legacy, type)
-    expect(event.defaultPrevented).toBe(true)
-    if (type === 'drop') {
-      expect(electron.send).toHaveBeenCalledExactlyOnceWith('terminal:file-dropped-from-preload', {
-        paths: ['/drop/notes.txt'],
-        target: 'terminal'
-      })
-    } else {
-      expect(transfer.dropEffect).toBe('copy')
-      expect(electron.send).not.toHaveBeenCalled()
-    }
-  })
-
-  it('chooses an inner owner over an outer legacy boundary', () => {
-    const legacy = root(false, true)
-    const owner = root(true)
-    legacy.append(owner)
-    expect(dispatch(owner).event.defaultPrevented).toBe(false)
-    expect(electron.send).not.toHaveBeenCalled()
-  })
-
-  it.each(['drop', 'dragover'])(
-    'leaves internal %s unchanged even inside a migrated owner',
-    (type) => {
-      const { event, transfer, stop } = dispatch(root(true), type, [
-        'Files',
-        ORCA_INTERNAL_FILE_DRAG_TYPE
-      ])
-      expect(event.defaultPrevented).toBe(false)
-      expect(stop).not.toHaveBeenCalled()
-      expect(transfer.dropEffect).toBe('none')
-      expect(electron.send).not.toHaveBeenCalled()
-    }
-  )
-
-  it('keeps the existing non-file drop cancellation, regardless of owner markers', () => {
-    const event = new Event('drop', { bubbles: true, cancelable: true })
-    Object.defineProperty(event, 'dataTransfer', { value: { types: ['text/plain'], files: [] } })
-    root(true).dispatchEvent(event)
-    expect(event.defaultPrevented).toBe(true)
-    expect(electron.send).not.toHaveBeenCalled()
-    expect(dispatch(root(true), 'dragover', ['text/plain']).event.defaultPrevented).toBe(false)
-  })
-})
diff --git a/src/preload/preload-runtime-support.ts b/src/preload/preload-runtime-support.ts
index 424e276418ed..2d043bb8cd0e 100644
--- a/src/preload/preload-runtime-support.ts
+++ b/src/preload/preload-runtime-support.ts
@@ -1,23 +1,9 @@
-import { ipcRenderer, webUtils } from 'electron'
+import { ipcRenderer } from 'electron'
 import { createBrowserClientPageRendererRequests } from './browser-client-page-renderer-requests'
 import { createBrowserFindSubscriptions } from './browser-find-subscriptions'
 import { registerRendererRestartIpcRelays } from './renderer-restart-wiring'
 import { createUpdaterQuitAbortRelay } from '../shared/renderer-restart-preparation'
 import { ORCA_UPDATER_QUIT_AND_INSTALL_ABORTED_EVENT } from '../shared/updater-renderer-events'
-import { OS_FILE_DROP_OWNER_ATTRIBUTE } from '../shared/native-file-drop-preparation'
-import {
-  ORCA_INTERNAL_FILE_DRAG_TYPE,
-  createNativeFileDropPayload,
-  createRejectedNativeFileDropPayload,
-  hasNativeFileDragTypes,
-  NATIVE_FILE_DROP_MAX_PATHS,
-  resolveNativeFileDropPath,
-  type NativeDropResolution,
-  type NativeFileDropPayload,
-  type NativeFileDropPathEntry,
-  type NativeFileDropRejectedPayload
-} from '../shared/native-file-drop'
-
 /** Joins the synchronous unload checkpoint with its durable renderer write. */
 export async function awaitBeforeUnloadCheckpoint(): Promise<void> {
   const result = (await ipcRenderer.invoke('app:await-before-unload-checkpoint')) as {
@@ -44,148 +30,6 @@ export function getLinuxDisplayServer(): 'wayland' | 'x11' | null {
   return process.env.DISPLAY ? 'x11' : null
 }
 
-type NativeFileDropCallback = (data: NativeFileDropPayload) => void
-const nativeFileDropCallbacks: NativeFileDropCallback[] = []
-let nativeFileDropListenerRegistered = false
-let nativeFileDropHandlersInstalled = false
-
-const onNativeFileDrop = (_event: Electron.IpcRendererEvent, data: NativeFileDropPayload): void => {
-  for (const callback of Array.from(nativeFileDropCallbacks)) {
-    callback(data)
-  }
-}
-
-export function subscribeNativeFileDrop(callback: NativeFileDropCallback): () => void {
-  nativeFileDropCallbacks.push(callback)
-  if (!nativeFileDropListenerRegistered) {
-    ipcRenderer.on('terminal:file-drop', onNativeFileDrop)
-    nativeFileDropListenerRegistered = true
-  }
-  return () => {
-    const callbackIndex = nativeFileDropCallbacks.indexOf(callback)
-    if (callbackIndex !== -1) {
-      nativeFileDropCallbacks.splice(callbackIndex, 1)
-    }
-    if (nativeFileDropCallbacks.length === 0 && nativeFileDropListenerRegistered) {
-      ipcRenderer.removeListener('terminal:file-drop', onNativeFileDrop)
-      nativeFileDropListenerRegistered = false
-    }
-  }
-}
-
-function resolveNativeFileDrop(event: DragEvent): NativeDropResolution | null {
-  const pathEntries: NativeFileDropPathEntry[] = []
-  for (const entry of event.composedPath()) {
-    if (entry instanceof HTMLElement) {
-      pathEntries.push({
-        nativeFileDropTarget: entry.dataset.nativeFileDropTarget,
-        nativeFileDropDir: entry.dataset.nativeFileDropDir,
-        composerScopeKey: entry.dataset.composerScopeKey,
-        terminalTabId: entry.dataset.terminalTabId,
-        terminalPaneLeafId: entry.dataset.terminalPaneLeafId ?? entry.dataset.leafId
-      })
-    }
-  }
-  return resolveNativeFileDropPath(pathEntries)
-}
-
-function nearestDropBoundaryIsOwner(event: DragEvent): boolean {
-  for (const entry of event.composedPath()) {
-    if (!(entry instanceof HTMLElement)) {
-      continue
-    }
-    if (entry.hasAttribute(OS_FILE_DROP_OWNER_ATTRIBUTE)) {
-      return true
-    }
-    if (entry.hasAttribute('data-native-file-drop-target')) {
-      return false
-    }
-  }
-  return false
-}
-
-/** Installs the one preload-side listener that converts native File objects to paths. */
-export function installNativeFileDropHandlers(): void {
-  // Preload entry points can be evaluated more than once in tests and during development reloads;
-  // duplicate document listeners retain every closure and process each drop repeatedly.
-  if (nativeFileDropHandlersInstalled) {
-    return
-  }
-  document.addEventListener(
-    'dragover',
-    (event) => {
-      if (event.dataTransfer && !hasNativeFileDragTypes(event.dataTransfer.types)) {
-        return
-      }
-      if (hasNativeFileDragTypes(event.dataTransfer?.types) && nearestDropBoundaryIsOwner(event)) {
-        return
-      }
-      event.preventDefault()
-      if (event.dataTransfer) {
-        event.dataTransfer.dropEffect = 'copy'
-      }
-    },
-    true
-  )
-  document.addEventListener(
-    'drop',
-    (event) => {
-      if (event.dataTransfer?.types.includes(ORCA_INTERNAL_FILE_DRAG_TYPE)) {
-        return
-      }
-      if (hasNativeFileDragTypes(event.dataTransfer?.types) && nearestDropBoundaryIsOwner(event)) {
-        return
-      }
-      event.preventDefault()
-      event.stopPropagation()
-      const files = event.dataTransfer?.files
-      if (!files || files.length === 0) {
-        return
-      }
-      const resolution = resolveNativeFileDrop(event)
-      if (files.length > NATIVE_FILE_DROP_MAX_PATHS) {
-        ipcRenderer.send(
-          'terminal:file-dropped-from-preload',
-          createRejectedNativeFileDropPayload({
-            byteLength: 0,
-            pathCount: files.length,
-            reason: 'too-many-paths',
-            status: 'rejected'
-          })
-        )
-        return
-      }
-      const paths: string[] = []
-      for (let index = 0; index < files.length; index += 1) {
-        const filePath = webUtils.getPathForFile(files[index])
-        if (filePath) {
-          paths.push(filePath)
-        }
-      }
-      if (resolution?.target === 'rejected') {
-        return
-      }
-      if (paths.length === 0) {
-        // The OS offered file items we could read no path from (promised or
-        // virtual files). Report it — silence here is #15782.
-        ipcRenderer.send('terminal:file-dropped-from-preload', {
-          byteLength: 0,
-          pathCount: files.length,
-          reason: 'unresolved-paths',
-          target: 'rejected'
-        } satisfies NativeFileDropRejectedPayload)
-        return
-      }
-      const payload = createNativeFileDropPayload(resolution, paths)
-      if (payload) {
-        ipcRenderer.send('terminal:file-dropped-from-preload', payload)
-      }
-    },
-    true
-  )
-  nativeFileDropHandlersInstalled = true
-}
-
 export const browserFindSubscriptions = createBrowserFindSubscriptions()
 export const browserClientPageRendererRequests = createBrowserClientPageRendererRequests({
   ipc: ipcRenderer,
diff --git a/src/relay/dispatcher-bulk-admission.test.ts b/src/relay/dispatcher-bulk-admission.test.ts
new file mode 100644
index 000000000000..e5b0fbf2aaf3
--- /dev/null
+++ b/src/relay/dispatcher-bulk-admission.test.ts
@@ -0,0 +1,184 @@
+import { describe, expect, it } from 'vitest'
+import { createBulkWriteHarness, nextBulkWriteTurn } from './dispatcher-bulk-write-test-harness'
+
+describe('bulk admission and sink settlement', () => {
+  it('streams more than four fixed-bulk frames without tripping the teardown watchdog', async () => {
+    const harness = createBulkWriteHarness()
+    try {
+      const sequences = Array.from({ length: 8 }, (_, seq) => seq)
+      const completion = Promise.all(
+        sequences.map((seq) =>
+          harness.dispatcher.notifyBulk('fs.streamChunk', { streamId: 1, seq, data: 'fixed' })
+        )
+      ).then(
+        () => ({ ok: true }),
+        (error: unknown) => ({ ok: false, error })
+      )
+      await nextBulkWriteTurn()
+      await harness.drain()
+      expect(await completion).toEqual({ ok: true })
+      expect(harness.frames.filter((frame) => frame.method === 'fs.streamChunk')).toEqual(
+        sequences.map((seq) => ({ method: 'fs.streamChunk', seq }))
+      )
+    } finally {
+      harness.dispose()
+    }
+  })
+
+  it('retires a fixed-bulk retry when a closed writer settles it before its client closes', async () => {
+    const harness = createBulkWriteHarness(2048, 800)
+    try {
+      expect(harness.fillProducerQueue()).toBeGreaterThan(1000)
+      const completion = harness.dispatcher.notifyBulk('fs.streamChunk', {
+        streamId: 1,
+        data: 'fixed'
+      })
+      const assertion = expect(completion).rejects.toThrow('Relay writer is closed')
+      await nextBulkWriteTurn()
+      expect(harness.dispatcher.capacityRetryCount).toBe(1)
+      expect(harness.dispatcher.fixedBulkAdmissions).toEqual([])
+      expect(harness.frames).toEqual([{ method: 'pty.data' }])
+      expect(harness.pending).toHaveLength(1)
+      harness.sink.destroy(new Error('stream destroyed'))
+      await nextBulkWriteTurn()
+      const pendingWrite = harness.pending.shift()
+      if (!pendingWrite) {
+        throw new Error('Expected the native writable callback to remain pending')
+      }
+      pendingWrite.complete(new Error('pending native write failed'))
+      await assertion
+      expect(harness.sink.writableLength).toBe(0)
+      expect(harness.dispatcher.fixedBulkAdmissions).toEqual([
+        {
+          clientClosed: false,
+          writerCanAdmitZero: false,
+          retainedProducerBytes: 0,
+          settledBeforeReturn: true,
+          accepted: false
+        }
+      ])
+      expect(harness.dispatcher.capacityRetryCount).toBe(0)
+      expect(harness.dispatcher.retainedPublicationBytes).toBe(0)
+    } finally {
+      harness.dispose()
+    }
+  })
+
+  it('ignores a captured capacity retry after its frame is admitted', async () => {
+    const harness = createBulkWriteHarness()
+    try {
+      harness.fillProducerQueue()
+      const completion = harness.dispatcher.notifyBulk('git.responseChunk', {
+        streamId: 1,
+        seq: 0,
+        data: 'g'.repeat(40 * 1024)
+      })
+      await nextBulkWriteTurn()
+      const retry = harness.dispatcher.lastCapacityRetry
+      if (!retry) {
+        throw new Error('Expected a capacity-blocked retry')
+      }
+      await harness.reachBulk('git.responseChunk')
+      expect(harness.dispatcher.capacityRetryCount).toBe(0)
+      retry()
+      await harness.drain()
+      await completion
+      expect(harness.frames.filter((frame) => frame.method === 'git.responseChunk')).toEqual([
+        { method: 'git.responseChunk', seq: 0 }
+      ])
+    } finally {
+      harness.dispose()
+    }
+  })
+
+  it('sends a capacity-blocked frame once and advances the client chain after its callback', async () => {
+    const harness = createBulkWriteHarness()
+    try {
+      expect(harness.fillProducerQueue()).toBeGreaterThan(0)
+      let firstSettled = false
+      const first = harness.dispatcher
+        .notifyBulk('git.responseChunk', { streamId: 1, seq: 0, data: 'g'.repeat(40 * 1024) })
+        .then(() => {
+          firstSettled = true
+        })
+      const second = harness.dispatcher.notifyBulk('git.responseChunk', {
+        streamId: 1,
+        seq: 1,
+        data: 'following'
+      })
+      await nextBulkWriteTurn()
+      await harness.reachBulk('git.responseChunk')
+      expect(firstSettled).toBe(false)
+      expect(harness.frames.some((frame) => frame.seq === 1)).toBe(false)
+      await harness.releaseOne()
+      await harness.drain()
+      await Promise.all([first, second])
+      expect(harness.frames.filter((frame) => frame.method === 'git.responseChunk')).toEqual([
+        { method: 'git.responseChunk', seq: 0 },
+        { method: 'git.responseChunk', seq: 1 }
+      ])
+    } finally {
+      harness.dispose()
+    }
+  })
+
+  it('preserves the admitted frame’s sink failure', async () => {
+    const harness = createBulkWriteHarness()
+    try {
+      const error = new Error('owned sink failure')
+      const result = harness.dispatcher.notifyBulk('git.responseChunk', { streamId: 1, seq: 0 })
+      const assertion = expect(result).rejects.toBe(error)
+      await nextBulkWriteTurn()
+      await harness.releaseOne(error)
+      await assertion
+    } finally {
+      harness.dispose()
+    }
+  })
+
+  it('settles disposal while an admitted bulk frame awaits its callback', async () => {
+    const harness = createBulkWriteHarness()
+    try {
+      let settled = false
+      const result = harness.dispatcher
+        .notifyBulk('git.responseChunk', { streamId: 1, seq: 0 })
+        .then(() => {
+          settled = true
+        })
+      await nextBulkWriteTurn()
+      expect(settled).toBe(false)
+      harness.dispatcher.dispose()
+      await result
+      expect(settled).toBe(true)
+    } finally {
+      harness.dispose()
+    }
+  })
+
+  it('keeps fixed bulk behind retained producers and sends it once', async () => {
+    const harness = createBulkWriteHarness()
+    try {
+      const producerFrames = harness.fillProducerQueue()
+      let settled = false
+      const result = harness.dispatcher
+        .notifyBulk('fs.streamChunk', { streamId: 1, data: 'fixed' })
+        .then(() => {
+          settled = true
+        })
+      await nextBulkWriteTurn()
+      expect(harness.frames.some((frame) => frame.method === 'fs.streamChunk')).toBe(false)
+      await harness.reachBulk('fs.streamChunk')
+      expect(harness.frames.filter((frame) => frame.method === 'pty.data')).toHaveLength(
+        producerFrames
+      )
+      expect(settled).toBe(false)
+      await harness.releaseOne()
+      await result
+      expect(harness.frames.filter((frame) => frame.method === 'fs.streamChunk')).toEqual([
+        { method: 'fs.streamChunk' }
+      ])
+    } finally {
+      harness.dispose()
+    }
+  })
+})
diff --git a/src/relay/dispatcher-bulk-failed-admission.test.ts b/src/relay/dispatcher-bulk-failed-admission.test.ts
new file mode 100644
index 000000000000..3d207b0b1b93
--- /dev/null
+++ b/src/relay/dispatcher-bulk-failed-admission.test.ts
@@ -0,0 +1,56 @@
+import { expect, it } from 'vitest'
+import { RelayDispatcher } from './dispatcher'
+import type { PreparedRelayFrame, RelayClient } from './dispatcher-contract'
+import type { SinkWriteSettlement } from './dispatcher-client-writer'
+
+class FailedAdmissionDispatcher extends RelayDispatcher {
+  attempts = 0
+
+  wake(): void {
+    this.notifyLegacyCapacityIfLow()
+  }
+
+  listeners(): number {
+    return this.legacyCapacityListeners.size
+  }
+
+  protected override publishPreparedToClient(
+    client: RelayClient,
+    frame: PreparedRelayFrame,
+    lane: 'interactive' | 'ordinary' | 'fixed-bulk' | 'bulk',
+    onSettled: (result: SinkWriteSettlement) => void = () => {}
+  ): boolean {
+    this.attempts++
+    if (this.attempts === 1) {
+      return false
+    }
+    if (this.attempts === 2) {
+      this.notifyLegacyCapacityIfLow()
+      return false
+    }
+    if (this.attempts > 6) {
+      throw new Error('Admission retry did not remain bounded')
+    }
+    return super.publishPreparedToClient(client, frame, lane, onSettled)
+  }
+}
+
+it('preserves a capacity wake during a failed admission without needing another event', async () => {
+  let writes = 0
+  const dispatcher = new FailedAdmissionDispatcher(() => {
+    writes++
+    return true
+  })
+  try {
+    const completion = dispatcher.notifyBulk('git.responseChunk', { streamId: 1, seq: 0 })
+    await new Promise<void>((resolve) => setImmediate(resolve))
+    expect(dispatcher.attempts).toBe(1)
+    dispatcher.wake()
+    expect(dispatcher.attempts).toBe(3)
+    await completion
+    expect(writes).toBe(1)
+    expect(dispatcher.listeners()).toBe(0)
+  } finally {
+    dispatcher.dispose()
+  }
+})
diff --git a/src/relay/dispatcher-bulk-retirement-admission.test.ts b/src/relay/dispatcher-bulk-retirement-admission.test.ts
new file mode 100644
index 000000000000..d0d026088e4e
--- /dev/null
+++ b/src/relay/dispatcher-bulk-retirement-admission.test.ts
@@ -0,0 +1,48 @@
+import { expect, it } from 'vitest'
+import { createBulkWriteHarness, nextBulkWriteTurn } from './dispatcher-bulk-write-test-harness'
+
+it('admits each bulk frame once when retiring PTY writes releases capacity during admission', async () => {
+  const calibration = createBulkWriteHarness()
+  let capacity: number
+  try {
+    capacity = calibration.fillProducerQueue('live')
+  } finally {
+    calibration.dispose()
+  }
+
+  const failures: { retired: number; sequences: (number | undefined)[] }[] = []
+  let admissionRetryWakeCount = 0
+  const midpoint = Math.floor(capacity / 2)
+  for (let retired = midpoint - 100; retired <= midpoint + 20; retired++) {
+    const harness = createBulkWriteHarness()
+    let ptyAdmitted = true
+    harness.dispatcher.registerPtyDataPublicationAdmission(
+      (_client, params) => ptyAdmitted || params.id !== 'dying'
+    )
+    try {
+      harness.fillProducerQueue('live', capacity - retired)
+      harness.fillProducerQueue('dying', retired)
+      const completion = harness.dispatcher.notifyBulk('git.responseChunk', {
+        streamId: 1,
+        seq: 0,
+        data: 'g'.repeat(40 * 1024)
+      })
+      await nextBulkWriteTurn()
+      expect(harness.dispatcher.capacityRetryCount).toBe(1)
+      ptyAdmitted = false
+      await harness.drain()
+      await completion
+      admissionRetryWakeCount += harness.dispatcher.admissionRetryWakeCount
+      const sequences = harness.frames
+        .filter((frame) => frame.method === 'git.responseChunk')
+        .map((frame) => frame.seq)
+      if (sequences.length !== 1 || sequences[0] !== 0) {
+        failures.push({ retired, sequences })
+      }
+    } finally {
+      harness.dispose()
+    }
+  }
+  expect(failures).toEqual([])
+  expect(admissionRetryWakeCount).toBeGreaterThan(0)
+})
diff --git a/src/relay/dispatcher-bulk-write-test-harness.ts b/src/relay/dispatcher-bulk-write-test-harness.ts
new file mode 100644
index 000000000000..29f1c02d4f8f
--- /dev/null
+++ b/src/relay/dispatcher-bulk-write-test-harness.ts
@@ -0,0 +1,192 @@
+import { Writable } from 'node:stream'
+import { RelayDispatcher } from './dispatcher'
+import type { PreparedRelayFrame, RelayClient } from './dispatcher-contract'
+import type { DispatcherWriterLane, SinkWriteSettlement } from './dispatcher-client-writer'
+import { FrameDecoder, MessageType, parseJsonRpcMessage } from './protocol'
+
+type WrittenFrame = { method: string; seq?: number }
+type PendingWrite = { frame: WrittenFrame; complete: (error?: Error | null) => void }
+type FixedBulkAdmission = {
+  clientClosed: boolean
+  writerCanAdmitZero: boolean
+  retainedProducerBytes: number
+  settledBeforeReturn: boolean
+  accepted: boolean
+}
+export const nextBulkWriteTurn = (): Promise<void> =>
+  new Promise((resolve) => setImmediate(resolve))
+
+class BulkWriteDispatcher extends RelayDispatcher {
+  admissionRetryWakeCount = 0
+  fixedBulkAdmissions: FixedBulkAdmission[] = []
+  lastCapacityRetry: (() => void) | null = null
+  private bulkAdmissionDepth = 0
+  private consecutiveFixedBulkRejections = 0
+
+  get capacityRetryCount(): number {
+    return this.legacyCapacityListeners.size
+  }
+
+  get retainedPublicationBytes(): number {
+    return this.publicationLedger.retainedBytes
+  }
+
+  override onLegacyPtyCapacity(listener: () => void): () => void {
+    this.lastCapacityRetry = listener
+    return super.onLegacyPtyCapacity(listener)
+  }
+
+  protected override publishPreparedToClient(
+    client: RelayClient,
+    frame: PreparedRelayFrame,
+    lane: 'interactive' | 'ordinary' | 'fixed-bulk' | 'bulk',
+    onSettled: (result: SinkWriteSettlement) => void = () => {}
+  ): boolean {
+    if (lane !== 'bulk') {
+      return super.publishPreparedToClient(client, frame, lane, onSettled)
+    }
+    this.bulkAdmissionDepth++
+    try {
+      return super.publishPreparedToClient(client, frame, lane, onSettled)
+    } finally {
+      this.bulkAdmissionDepth--
+    }
+  }
+
+  protected override notifyLegacyCapacityIfLow(): void {
+    if (
+      this.bulkAdmissionDepth > 0 &&
+      this.capacityRetryCount > 0 &&
+      this.legacyRetentionBelowLowWater
+    ) {
+      this.admissionRetryWakeCount++
+    }
+    super.notifyLegacyCapacityIfLow()
+  }
+
+  protected override enqueuePreparedFrame(
+    client: RelayClient,
+    frame: PreparedRelayFrame,
+    lane: DispatcherWriterLane,
+    onSettled: (result: SinkWriteSettlement) => void = () => {},
+    controlOverflow: 'close-client' | 'reject' = 'close-client'
+  ): boolean {
+    if (lane !== 'fixed-bulk') {
+      return super.enqueuePreparedFrame(client, frame, lane, onSettled, controlOverflow)
+    }
+    if (this.consecutiveFixedBulkRejections >= 4) {
+      throw new Error('Settled fixed-bulk admission retried during writer teardown')
+    }
+    const before = {
+      clientClosed: client.closed,
+      writerCanAdmitZero: client.writer.canEnqueueProducer(0),
+      retainedProducerBytes: client.writer.retainedProducerBytes
+    }
+    let settledBeforeReturn = false
+    const accepted = super.enqueuePreparedFrame(
+      client,
+      frame,
+      lane,
+      (result) => {
+        settledBeforeReturn = true
+        onSettled(result)
+      },
+      controlOverflow
+    )
+    this.fixedBulkAdmissions.push({ ...before, settledBeforeReturn, accepted })
+    this.consecutiveFixedBulkRejections = accepted ? 0 : this.consecutiveFixedBulkRejections + 1
+    return accepted
+  }
+}
+
+export function createBulkWriteHarness(highWaterMark = 64 * 1024, producerDataLength = 1024) {
+  const frames: WrittenFrame[] = []
+  const pending: PendingWrite[] = []
+  const sink = new Writable({
+    highWaterMark,
+    write(bytes: Buffer, _encoding, complete) {
+      let frame: WrittenFrame | undefined
+      const decoder = new FrameDecoder((decoded) => {
+        if (decoded.type !== MessageType.Regular) {
+          return
+        }
+        const message = parseJsonRpcMessage(decoded.payload)
+        if (!('method' in message)) {
+          return
+        }
+        frame = {
+          method: message.method,
+          ...(typeof message.params?.seq === 'number' ? { seq: message.params.seq } : {})
+        }
+      })
+      decoder.feed(bytes)
+      if (!frame) {
+        throw new Error('Expected one notification frame')
+      }
+      frames.push(frame)
+      pending.push({ frame, complete })
+    }
+  })
+  sink.on('error', () => {})
+  const dispatcher = new BulkWriteDispatcher(
+    (bytes, settled) =>
+      sink.write(bytes, (error) => settled(error ? { ok: false, error } : { ok: true })),
+    {
+      supportsWriteCallback: true,
+      writableLength: () => sink.writableLength,
+      writableHighWaterMark: () => sink.writableHighWaterMark,
+      waitWriteDrain: (callback) => {
+        sink.once('drain', callback)
+        return () => sink.off('drain', callback)
+      }
+    }
+  )
+  return {
+    dispatcher,
+    sink,
+    frames,
+    pending,
+    fillProducerQueue(id = 'test-pty', limit = Number.POSITIVE_INFINITY): number {
+      let admitted = 0
+      const params = { id, data: 'p'.repeat(producerDataLength) }
+      while (admitted < limit && dispatcher.tryNotifyPtyData(params)) {
+        admitted++
+      }
+      return admitted
+    },
+    async releaseOne(error?: Error): Promise<void> {
+      pending.shift()?.complete(error)
+      await nextBulkWriteTurn()
+    },
+    async reachBulk(method: string): Promise<void> {
+      for (let count = 0; count < 3000; count++) {
+        if (pending[0]?.frame.method === method) {
+          return
+        }
+        if (!pending.length) {
+          throw new Error('No pending write before bulk admission')
+        }
+        pending.shift()?.complete()
+        await nextBulkWriteTurn()
+      }
+      throw new Error('Bulk write did not arrive within admitted queue bound')
+    },
+    async drain(): Promise<void> {
+      for (let count = 0; count < 4000; count++) {
+        if (!pending.length) {
+          await nextBulkWriteTurn()
+          if (!pending.length) {
+            return
+          }
+        }
+        pending.shift()?.complete()
+        await nextBulkWriteTurn()
+      }
+      throw new Error('Sink did not drain within admitted queue bound')
+    },
+    dispose(): void {
+      dispatcher.dispose()
+      sink.destroy()
+    }
+  }
+}
diff --git a/src/relay/dispatcher-producer-transport.ts b/src/relay/dispatcher-producer-transport.ts
index 089a69577d1e..5c1b721531cf 100644
--- a/src/relay/dispatcher-producer-transport.ts
+++ b/src/relay/dispatcher-producer-transport.ts
@@ -113,31 +113,43 @@ export abstract class RelayDispatcherProducerTransport extends RelayDispatcherRp
     }
     return new Promise<void>((resolve, reject) => {
       let removeCapacityListener: (() => void) | null = null
+      let retryFinished = false
       const finish = (): void => {
+        retryFinished = true
         removeCapacityListener?.()
         removeCapacityListener = null
       }
       const tryPublish = (): void => {
-        if (this.disposed || client.closed) {
-          finish()
-          resolve()
-          return
-        }
-        if (
-          this.publishPreparedToClient(client, frame, lane, (result) => {
+        // Retiring queued PTY output can release capacity before admission returns.
+        this.runPublicationTransaction(() => {
+          if (retryFinished) {
+            return
+          }
+          if (this.disposed || client.closed) {
             finish()
-            if (result.ok || this.disposed || client.closed) {
-              resolve()
-            } else {
-              reject(result.error)
-            }
-          })
-        ) {
-          return
-        }
-        if (!removeCapacityListener) {
-          removeCapacityListener = this.onLegacyPtyCapacity(tryPublish)
-        }
+            resolve()
+            return
+          }
+          if (
+            this.publishPreparedToClient(client, frame, lane, (result) => {
+              finish()
+              if (result.ok || this.disposed || client.closed) {
+                resolve()
+              } else {
+                reject(result.error)
+              }
+            })
+          ) {
+            finish()
+            return
+          }
+          if (retryFinished) {
+            return
+          }
+          if (!removeCapacityListener) {
+            removeCapacityListener = this.onLegacyPtyCapacity(tryPublish)
+          }
+        })
       }
       tryPublish()
     })
diff --git a/src/renderer/src/App.tsx b/src/renderer/src/App.tsx
index 892c445d100b..1ed1194a66bb 100644
--- a/src/renderer/src/App.tsx
+++ b/src/renderer/src/App.tsx
@@ -101,8 +101,8 @@ function App(): React.JSX.Element {
             <BrowserWebAuthnAccountDialog />
           </LinkRoutingPreferenceDialogProvider>
         </ConfirmationDialogProvider>
+        <Toaster closeButton toastOptions={{ className: 'font-sans text-sm' }} />
       </TooltipProvider>
-      <Toaster closeButton toastOptions={{ className: 'font-sans text-sm' }} />
       <SkillFreshnessNudge />
       <WorktreeBaseFallbackDialog />
       <PinnedTabCloseDialog />
diff --git a/src/renderer/src/app-shell/remote-workspace-unplaced-upload-suppression.test.tsx b/src/renderer/src/app-shell/remote-workspace-unplaced-upload-suppression.test.tsx
index 81aaf945e367..3b65dbd380f3 100644
--- a/src/renderer/src/app-shell/remote-workspace-unplaced-upload-suppression.test.tsx
+++ b/src/renderer/src/app-shell/remote-workspace-unplaced-upload-suppression.test.tsx
@@ -21,7 +21,8 @@ import type {
 import type { DirectSshAuthority, SshProviderEpoch } from '../../../shared/ssh-types'
 import type { DirectSshPreparationInput } from '../hooks/direct-ssh-reconnect-coordinator'
 import { createRemoteWorkspaceTargetSync } from '../hooks/remote-workspace-target-sync'
-import { makeWorktree } from '../store/slices/store-test-helpers'
+import { isDirectSshRemoteWorkspaceApplyInProgress } from '../hooks/remote-workspace-snapshot-apply'
+import { makeWorktree } from '../store/slices/worktrees-slice-test-fixtures'
 
 vi.mock('sonner', () => ({ toast: { info: vi.fn(), success: vi.fn(), error: vi.fn() } }))
 vi.mock('@/lib/agent-status', async (importOriginal) => {
@@ -31,6 +32,7 @@ vi.mock('@/lib/agent-status', async (importOriginal) => {
 
 import { useAppStore } from '@/store'
 import { useAppSessionPersistence } from './use-app-session-persistence'
+import * as workspaceSessionHostPersistence from '../lib/workspace-session-host-persistence'
 
 const TARGET_ID = 'target-a'
 const REPO_ROOT = '/srv/proj'
@@ -111,6 +113,7 @@ function installWindowApi(sessionPatch = vi.fn(async () => {})): void {
 
 function seedStore(withHostCatalog: boolean): void {
   useAppStore.setState({
+    ...useAppStore.getInitialState(),
     workspaceSessionReady: true,
     hydrationSucceeded: true,
     repos: [
@@ -199,6 +202,30 @@ function createSync(
   })
 }
 
+// The initial full write must settle before measured upload responses are installed.
+async function renderSettledPersistence() {
+  const pendingWrites: Promise<void>[] = []
+  const persistByHost = workspaceSessionHostPersistence.patchWorkspaceSessionByHost
+  const observeWrite = vi.spyOn(workspaceSessionHostPersistence, 'patchWorkspaceSessionByHost')
+  observeWrite.mockImplementation((...args) => {
+    const result = persistByHost(...args)
+    pendingWrites.push(result.written)
+    return result
+  })
+  try {
+    installWindowApi()
+    const persistence = renderHook(() => useAppSessionPersistence())
+    await vi.advanceTimersByTimeAsync(DEBOUNCE_MS)
+    expect(pendingWrites).toHaveLength(1)
+    await Promise.all(pendingWrites)
+    expect(uploads).not.toHaveBeenCalled()
+    return persistence
+  } finally {
+    await Promise.allSettled(pendingWrites)
+    observeWrite.mockRestore()
+  }
+}
+
 /** A local edit the persistence subscriber must want to write, then let it settle. */
 async function touchSessionAndSettle(marker: string): Promise<void> {
   await vi.advanceTimersByTimeAsync(WRITE_SUPPRESSION_MS)
@@ -230,16 +257,25 @@ function authorizeUploadsAtRevision(revision: number): void {
   })
 }
 
+let nextCaseTime = Date.now()
+
 beforeEach(() => {
-  vi.useFakeTimers()
+  vi.useFakeTimers({ now: nextCaseTime })
   uploads.mockReset()
   uploads.mockResolvedValue([])
   installWindowApi()
 })
 
-afterEach(() => {
-  cleanup()
-  vi.useRealTimers()
+afterEach(async () => {
+  try {
+    cleanup()
+    await vi.advanceTimersByTimeAsync(WRITE_SUPPRESSION_MS)
+    expect(isDirectSshRemoteWorkspaceApplyInProgress()).toBe(false)
+  } finally {
+    // The shared apply deadline must not outlive a rollback of this fixture's clock.
+    nextCaseTime = Date.now()
+    vi.useRealTimers()
+  }
 })
 
 describe('uploads from a client that could not place the host tabs', () => {
@@ -363,6 +399,7 @@ describe('uploads from a client that could not place the host tabs', () => {
 
   it('keeps a later same-lineage upload after the earlier result advances the revision', async () => {
     seedStore(true)
+    const persistence = await renderSettledPersistence()
     authorizeUploadsAtRevision(7)
     const secondLocalWrite = deferred<void>()
     let localWriteCount = 0
@@ -379,7 +416,6 @@ describe('uploads from a client that could not place the host tabs', () => {
       }
     ])
     installWindowApi(sessionPatch)
-    const persistence = renderHook(() => useAppSessionPersistence())
 
     await vi.advanceTimersByTimeAsync(WRITE_SUPPRESSION_MS)
     useAppStore.setState({ activeTabId: 'first-local-write' })
@@ -423,6 +459,7 @@ describe('uploads from a client that could not place the host tabs', () => {
 
   it('retains transient upload authority so the next local edit retries', async () => {
     seedStore(true)
+    const persistence = await renderSettledPersistence()
     authorizeUploadsAtRevision(7)
     uploads.mockResolvedValueOnce([
       {
@@ -436,7 +473,6 @@ describe('uploads from a client that could not place the host tabs', () => {
         result: { ok: true, snapshot: snapshot(8, 'observation-7') }
       }
     ])
-    const persistence = renderHook(() => useAppSessionPersistence())
 
     await touchSessionAndSettle('transient-failure')
     await flushMicrotasks()
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 d64925a8a3b3..246670406f99 100644
--- a/src/renderer/src/app-shell/use-app-shell-services.ts
+++ b/src/renderer/src/app-shell/use-app-shell-services.ts
@@ -4,7 +4,6 @@ import { useIpcEvents } from '../hooks/useIpcEvents'
 import { useAutomationDispatchEvents } from '../hooks/useAutomationDispatchEvents'
 import { useAutoAckViewedAgent } from '../hooks/useAutoAckViewedAgent'
 import { useEditorExternalWatch } from '../hooks/useEditorExternalWatch'
-import { useGlobalFileDrop } from '../hooks/useGlobalFileDrop'
 import { useAppMenuPaste } from '../hooks/useAppMenuPaste'
 import { useAppMenuSelectionActions } from '../hooks/useAppMenuSelectionActions'
 import { useLargeTextControlPaste } from '../hooks/useLargeTextControlPaste'
@@ -23,6 +22,7 @@ import { useTerminalViewerColorPublication } from './use-terminal-viewer-color-p
 import { useBrowserIdentityMigrationNotice } from '../components/browser-pane/browser-user-agent-migration-notice'
 import { useCodexTerminalServerIsolationNotice } from '../components/terminal-pane/codex-terminal-server-isolation-notice'
 import { useCodexSharedSettingsNotice } from '../components/terminal-pane/codex-shared-settings-notice'
+import { useClaudeAccountSignInNotice } from '../lib/claude-account-sign-in-notice'
 import { useVisibleReviewRefreshReporting } from './use-visible-review-refresh-reporting'
 import { useVisibleHostedReviewRefresh } from './use-visible-hosted-review-refresh'
 
@@ -54,7 +54,6 @@ export function useAppShellServices(): void {
   useGitStatusPolling({ enabled: workspaceSessionReady })
   // Why: wire file-change watching at App level so the editor keeps hearing FS changes when Explorer unmounts (right-sidebar switches to Source Control/Checks).
   useEditorExternalWatch()
-  useGlobalFileDrop()
   useAutoAckViewedAgent()
   useAppMenuPaste()
   useAppMenuSelectionActions()
@@ -64,4 +63,5 @@ export function useAppShellServices(): void {
   useBrowserIdentityMigrationNotice()
   useCodexTerminalServerIsolationNotice()
   useCodexSharedSettingsNotice()
+  useClaudeAccountSignInNotice()
 }
diff --git a/src/renderer/src/app-shell/use-visible-hosted-review-refresh.test.tsx b/src/renderer/src/app-shell/use-visible-hosted-review-refresh.test.tsx
index f1936bfe77a2..c876c5f4a08e 100644
--- a/src/renderer/src/app-shell/use-visible-hosted-review-refresh.test.tsx
+++ b/src/renderer/src/app-shell/use-visible-hosted-review-refresh.test.tsx
@@ -15,6 +15,7 @@ vi.mock('@/store', () => ({
 vi.mock('@/lib/web-client-location', () => ({ isWebClientLocation: mocks.web }))
 vi.mock('@/store/github/visible-hosted-review-refresh-targets', () => ({
   visibleHostedReviewRefreshInputsChanged: () => true,
+  getVisibleHostedReviewWorkspaces: () => [],
   getVisibleHostedReviewRefreshTargets: () => [
     {
       key: 'review',
diff --git a/src/renderer/src/app-shell/use-visible-hosted-review-refresh.ts b/src/renderer/src/app-shell/use-visible-hosted-review-refresh.ts
index 033a3657c629..455ee69d12ab 100644
--- a/src/renderer/src/app-shell/use-visible-hosted-review-refresh.ts
+++ b/src/renderer/src/app-shell/use-visible-hosted-review-refresh.ts
@@ -3,6 +3,7 @@ import { useAppStore } from '@/store'
 import { isWindowVisible } from '@/lib/window-visibility-interval'
 import { isWebClientLocation } from '@/lib/web-client-location'
 import { createVisibleHostedReviewRefreshScheduler } from '@/store/github/visible-hosted-review-refresh-scheduler'
+import { getWorkspaceReferenceRefreshTargets } from '@/components/sidebar/workspace-reference-refresh-targets'
 import {
   getVisibleHostedReviewRefreshTargets,
   visibleHostedReviewRefreshInputsChanged
@@ -14,13 +15,19 @@ export function useVisibleHostedReviewRefresh({ enabled }: { enabled: boolean })
       return
     }
     const scheduler = createVisibleHostedReviewRefreshScheduler()
-    const update = (): void =>
-      scheduler.update(
-        getVisibleHostedReviewRefreshTargets(useAppStore.getState(), useAppStore.getState, {
-          selectedOnly: isWebClientLocation()
-        })
-      )
-    const visibilityChanged = (): void => scheduler.setVisible(isWindowVisible())
+    const update = (): void => {
+      const state = useAppStore.getState()
+      const selectedOnly = isWebClientLocation()
+      scheduler.update([
+        ...getVisibleHostedReviewRefreshTargets(state, useAppStore.getState, { selectedOnly }),
+        ...getWorkspaceReferenceRefreshTargets(state, { selectedOnly })
+      ])
+    }
+    const visibilityChanged = (): void => {
+      scheduler.setVisible(false)
+      update()
+      scheduler.setVisible(isWindowVisible())
+    }
     const unsubscribe = useAppStore.subscribe((state, previous) => {
       if (visibleHostedReviewRefreshInputsChanged(state, previous)) {
         update()
diff --git a/src/renderer/src/assets/main.css b/src/renderer/src/assets/main.css
index 629d711e93cc..cb5f526fe999 100644
--- a/src/renderer/src/assets/main.css
+++ b/src/renderer/src/assets/main.css
@@ -121,6 +121,8 @@
   --color-status-warning: var(--status-warning);
   --color-status-warning-background: var(--status-warning-background);
   --color-status-warning-border: var(--status-warning-border);
+  --color-callout-note: var(--callout-note);
+  --color-callout-important: var(--callout-important);
   --color-workspace-status-done: var(--workspace-status-done);
   --color-workspace-status-review: var(--workspace-status-review);
   --color-workspace-status-progress: var(--workspace-status-progress);
@@ -393,6 +395,9 @@
   --status-warning: #ca8a04;
   --status-warning-background: color-mix(in srgb, var(--status-warning) 10%, transparent);
   --status-warning-border: color-mix(in srgb, var(--status-warning) 25%, transparent);
+  /* GitHub's own hues for the two callout kinds no status token covers. */
+  --callout-note: #0969da;
+  --callout-important: #8250df;
   --git-decoration-added: #587c0c;
   --git-decoration-modified: #895503;
   --git-decoration-deleted: #ad0707;
@@ -416,6 +421,8 @@
   --status-warning: #eab308;
   --status-warning-background: color-mix(in srgb, var(--status-warning) 10%, transparent);
   --status-warning-border: color-mix(in srgb, var(--status-warning) 25%, transparent);
+  --callout-note: #4493f8;
+  --callout-important: #ab7df8;
   --git-decoration-added: #81b88b;
   --git-decoration-modified: #e2c08d;
   --git-decoration-deleted: #c74e39;
@@ -3333,3 +3340,58 @@ html.native-shell .app-layout {
     inset 0 1px 0 0 color-mix(in srgb, var(--foreground) 5%, transparent),
     0 10px 24px rgba(0, 0, 0, 0.18);
 }
+
+.workspace-reference-stack {
+  isolation: isolate;
+  position: relative;
+  display: inline-flex;
+  width: 14px;
+  height: 14px;
+  flex-shrink: 0;
+  color: var(--muted-foreground);
+}
+
+.workspace-reference-stack-front,
+.workspace-reference-stack-ghost {
+  position: absolute;
+  inset: 0;
+  display: inline-flex;
+  align-items: center;
+  justify-content: center;
+}
+
+.workspace-reference-stack-front {
+  z-index: 2;
+}
+
+.workspace-reference-stack-ghost[data-depth='1'] {
+  transform: translate(-1.5px, 2px);
+  opacity: 0.45;
+  z-index: 1;
+}
+
+.workspace-reference-stack-ghost[data-depth='2'] {
+  transform: translate(-3px, 4px);
+  opacity: 0.25;
+}
+
+.workspace-reference-stack svg {
+  width: 14px;
+  height: 14px;
+}
+
+.workspace-reference-stack-count {
+  position: absolute;
+  top: -8px;
+  right: -5px;
+  z-index: 3;
+  font-size: 11px;
+  font-weight: 600;
+  line-height: 11px;
+  color: var(--worktree-sidebar-foreground);
+  text-shadow: 0px 1px 1px var(--background);
+}
+
+.workspace-reference-stack-count[data-multiple-digits='true'] {
+  letter-spacing: -0.02em;
+}
diff --git a/src/renderer/src/assets/markdown-preview.css b/src/renderer/src/assets/markdown-preview.css
index 16c948345513..7f6c520d15f5 100644
--- a/src/renderer/src/assets/markdown-preview.css
+++ b/src/renderer/src/assets/markdown-preview.css
@@ -822,6 +822,14 @@
   color: rgba(0, 0, 0, 0.6);
 }
 
+/* Border and title colors come from the callout component. */
+.markdown-body [data-callout] {
+  margin: 0.75em 0;
+  padding: 0.25em 1em;
+  border-left-width: 3px;
+  border-left-style: solid;
+}
+
 .markdown-body table {
   margin: 1em 0;
   border-collapse: collapse;
diff --git a/src/renderer/src/components/JiraIssueWorkspace.tsx b/src/renderer/src/components/JiraIssueWorkspace.tsx
index 6572692929ae..e8676b14b698 100644
--- a/src/renderer/src/components/JiraIssueWorkspace.tsx
+++ b/src/renderer/src/components/JiraIssueWorkspace.tsx
@@ -1,7 +1,7 @@
 /* oxlint-disable react-doctor/no-adjust-state-on-prop-change -- Why: Jira issue hydration, comments, transitions, priorities, and user options are loaded from provider IPC for the selected issue. */
 import React, { useCallback, useEffect, useMemo, useRef, useState } from 'react'
 import { toast } from 'sonner'
-import { VisuallyHidden } from 'radix-ui'
+import * as VisuallyHidden from 'radix-ui/visually-hidden'
 import { Sheet, SheetContent, SheetDescription, SheetTitle } from '@/components/ui/sheet'
 import {
   getCommentBodySubmitState,
diff --git a/src/renderer/src/components/LinearIssueWorkspace.tsx b/src/renderer/src/components/LinearIssueWorkspace.tsx
index e5808aa5459a..cafe1be15060 100644
--- a/src/renderer/src/components/LinearIssueWorkspace.tsx
+++ b/src/renderer/src/components/LinearIssueWorkspace.tsx
@@ -1,5 +1,5 @@
 import React, { useCallback, useMemo } from 'react'
-import { VisuallyHidden } from 'radix-ui'
+import * as VisuallyHidden from 'radix-ui/visually-hidden'
 
 import { LinearIssueTextEditor } from '@/components/LinearIssueTextEditor'
 import { Sheet, SheetContent, SheetDescription, SheetTitle } from '@/components/ui/sheet'
diff --git a/src/renderer/src/components/NativeChatResumeFailureDetails.tsx b/src/renderer/src/components/NativeChatResumeFailureDetails.tsx
index f0bd41a1792f..968c0fc0769b 100644
--- a/src/renderer/src/components/NativeChatResumeFailureDetails.tsx
+++ b/src/renderer/src/components/NativeChatResumeFailureDetails.tsx
@@ -99,7 +99,7 @@ export function ResumeFailureGuidanceLine({
 }): React.JSX.Element {
   const guidance = resumeFailureGuidance(failure)
   return (
-    <div className="ml-6 mb-1 flex items-center gap-2 rounded-md border border-status-warning-border bg-status-warning-background px-2 py-1.5 text-[11px]">
+    <div className="mb-1 flex items-center gap-2 rounded-md border border-status-warning-border bg-status-warning-background px-2 py-1.5 text-[11px]">
       <span className="min-w-0 flex-1">
         <span className="font-semibold">
           {translate('auto.components.NativeChatResumeOutcomeRow.toResume', 'To resume:')}
diff --git a/src/renderer/src/components/NativeChatResumeOnRestartAgentRow.tsx b/src/renderer/src/components/NativeChatResumeOnRestartAgentRow.tsx
index 84d9aa4eba1c..6d6120e6e8d0 100644
--- a/src/renderer/src/components/NativeChatResumeOnRestartAgentRow.tsx
+++ b/src/renderer/src/components/NativeChatResumeOnRestartAgentRow.tsx
@@ -1,4 +1,4 @@
-import { Checkbox } from './ui/checkbox'
+import { useContext } from 'react'
 import { AgentIcon } from '@/lib/agent-catalog-icon'
 import { agentTypeToIconAgent, formatAgentTypeLabel } from '@/lib/agent-status'
 import { formatShortTimeAgo } from '@/lib/short-time-ago'
@@ -10,10 +10,13 @@ import {
 } from './native-chat-resume-failure-guidance'
 import { ResumeFailureGuidanceLine, ResumeFailureStatus } from './NativeChatResumeFailureDetails'
 import { resumeActivityLabel } from './native-chat-resume-activity-label'
+import { ResumeTreeRow } from './NativeChatResumeTreeRow'
+import { ResumeTreeDepthContext } from './native-chat-resume-tree-state'
 
 /**
- * One offered chat, laid out like the sidebar's compact agent row: provider glyph, the chat's name,
- * then the model and an age on the right.
+ * One offered chat as a leaf of the resume tree: its checkbox in the list's shared left column, then,
+ * indented for its depth, the provider glyph, "name - what it was doing", the model and an age —
+ * the pieces of the sidebar's compact agent row.
  *
  * The sidebar's own `CompactAgentRow` cannot be reused — it takes a `DashboardAgentRow`, which
  * requires a live pane, tab and status entry, and every chat here is by definition stopped. The
@@ -26,11 +29,13 @@ import { resumeActivityLabel } from './native-chat-resume-activity-label'
  * a fault, `done` a finish, `working` a spinner. A missing dot beats a dot that says these agents
  * are running.
  *
- * Under the name, what the chat was doing when Orca went away — mid-reply, waiting on the user,
+ * After the name, what the chat was doing when Orca went away — mid-reply, waiting on the user,
  * subagents or monitoring — so rows the sidebar showed as working for different reasons differ.
  *
  * A chat an earlier resume could not carry on is the same row — selectable where a retry can run,
  * so Resume retries it — plus a status icon, a dismiss control, and a line saying what to do.
+ *
+ * A leaf of the resume tree; the enclosing workspace node supplies its depth.
  */
 export function ResumeCandidateRow({
   candidate,
@@ -59,35 +64,50 @@ export function ResumeCandidateRow({
     translate('auto.components.NativeChatResumeOnRestartModal.untitled', 'Untitled chat')
   const model = candidate.model?.trim() ?? ''
   const activity = resumeActivityLabel(candidate.activity)
-  const row = (
-    <label className="flex min-w-0 flex-1 cursor-pointer items-center gap-2 rounded px-1 py-1 hover:bg-accent/50">
-      {/* Identifies the agent AND its workspace: the accessible name has to distinguish rows that
-            would otherwise all read the same. */}
-      <Checkbox
-        checked={checked}
-        disabled={disabled || (failure !== undefined && !resumeFailureSelectable(failure))}
-        onCheckedChange={(next) => onCheckedChange(next === true)}
-        className="shrink-0"
-        aria-label={translate(
-          'auto.components.NativeChatResumeOnRestartModal.selectAgent',
-          'Resume {{value0}} chat "{{value1}}" in {{value2}}',
-          { value0: agentLabel, value1: title, value2: workspaceName }
-        )}
-      />
+  const depth = useContext(ResumeTreeDepthContext)
+  const act = (action: ResumeFailureAction) => onFailureAction?.(action, candidate.sessionId)
+  return (
+    <ResumeTreeRow
+      depth={depth}
+      name={title}
+      checked={checked}
+      disabled={disabled || (failure !== undefined && !resumeFailureSelectable(failure))}
+      onCheckedChange={onCheckedChange}
+      // Identifies the agent AND its workspace: rows would otherwise all read the same.
+      checkboxLabel={translate(
+        'auto.components.NativeChatResumeOnRestartModal.selectAgent',
+        'Resume {{value0}} chat "{{value1}}" in {{value2}}',
+        { value0: agentLabel, value1: title, value2: workspaceName }
+      )}
+      compact
+      // Outside the label, so pressing them never toggles the checkbox.
+      trailing={
+        failure && (
+          <ResumeFailureStatus
+            failure={failure}
+            title={title}
+            workspaceName={workspaceName}
+            disabled={disabled}
+            onAction={act}
+          />
+        )
+      }
+      below={
+        failure && (
+          <ResumeFailureGuidanceLine failure={failure} disabled={disabled} onAction={act} />
+        )
+      }
+    >
       {/* AgentIcon carries no label of its own, so the provider was invisible to assistive tech. */}
       <span role="img" aria-label={agentLabel} className="inline-flex shrink-0">
-        <AgentIcon agent={agentTypeToIconAgent(candidate.agent)} size={14} />
+        <AgentIcon agent={agentTypeToIconAgent(candidate.agent)} size={13} />
       </span>
-      <span className="flex min-w-0 flex-1 flex-col">
-        <span className="truncate text-xs font-medium">{title}</span>
-        {activity && (
-          <span
-            className="truncate text-[11px] text-muted-foreground"
-            title={activity.detail || undefined}
-          >
-            {activity.summary}
-          </span>
-        )}
+      <span
+        className="min-w-0 flex-1 truncate text-xs"
+        title={activity ? `${title} - ${activity.detail || activity.summary}` : title}
+      >
+        <span className="text-foreground/90">{title}</span>
+        {activity && <span className="text-muted-foreground"> - {activity.summary}</span>}
       </span>
       {model && (
         <span
@@ -101,26 +121,6 @@ export function ResumeCandidateRow({
       <span className="shrink-0 text-[11px] tabular-nums text-muted-foreground">
         {formatShortTimeAgo(candidate.recordedAt, listedAt)}
       </span>
-    </label>
-  )
-  if (!failure) {
-    return <li>{row}</li>
-  }
-  const act = (action: ResumeFailureAction) => onFailureAction?.(action, candidate.sessionId)
-  return (
-    <li className="flex flex-col">
-      {/* Outside the label, so pressing them never toggles the checkbox. */}
-      <div className="flex items-center gap-1">
-        {row}
-        <ResumeFailureStatus
-          failure={failure}
-          title={title}
-          workspaceName={workspaceName}
-          disabled={disabled}
-          onAction={act}
-        />
-      </div>
-      <ResumeFailureGuidanceLine failure={failure} disabled={disabled} onAction={act} />
-    </li>
+    </ResumeTreeRow>
   )
 }
diff --git a/src/renderer/src/components/NativeChatResumeOnRestartGroups.selection.test.tsx b/src/renderer/src/components/NativeChatResumeOnRestartGroups.selection.test.tsx
new file mode 100644
index 000000000000..0e24e13d8bf4
--- /dev/null
+++ b/src/renderer/src/components/NativeChatResumeOnRestartGroups.selection.test.tsx
@@ -0,0 +1,187 @@
+// @vitest-environment happy-dom
+
+// The resume tree as a control: tri-state at every level, exclusions, busy, and collapsing.
+
+import { act } from 'react'
+import { createRoot, type Root } from 'react-dom/client'
+import { afterEach, beforeEach, expect, it } from 'vitest'
+import { useAppStore } from '../store'
+import { getHostContextLabel } from '../../../shared/worktree/host-context-labels'
+import type { ExecutionHostId } from '../../../shared/execution-host'
+import {
+  candidate,
+  chatBox,
+  countOf,
+  disclosureOf,
+  nodeBox,
+  onToggleSpy,
+  queryChatBox,
+  seedTree,
+  treeOutline,
+  unretryable,
+  worktree
+} from './native-chat-resume-tree.test-support'
+import { ResumeTreeHarness as Harness } from './NativeChatResumeTreeHarness.test-support'
+
+globalThis.IS_REACT_ACT_ENVIRONMENT = true
+let root: Root
+let container: HTMLElement
+
+function render(props: React.ComponentProps<typeof Harness>): void {
+  act(() => root.render(<Harness {...props} />))
+}
+
+function state(box: HTMLElement): string | null {
+  return box.getAttribute('aria-checked')
+}
+
+beforeEach(() => {
+  onToggleSpy.mockReset()
+  useAppStore.setState(useAppStore.getInitialState(), true)
+  container = document.createElement('div')
+  document.body.append(container)
+  root = createRoot(container)
+})
+
+afterEach(() => {
+  act(() => root.unmount())
+  container.remove()
+  useAppStore.setState(useAppStore.getInitialState(), true)
+})
+
+it('is tri-state at every level, each node over every chat under it', () => {
+  const remote: ExecutionHostId = 'ssh:build-server'
+  render({ candidates: seedTree({ parent: remote, child: remote }) })
+  const machine = getHostContextLabel(remote)
+  expect([machine, 'orca', 'parent', 'child', 'other'].map((name) => countOf(name))).toEqual([
+    '4 of 4',
+    '4 of 4',
+    '3 of 3',
+    '2 of 2',
+    '1 of 1'
+  ])
+
+  act(() => chatBox('in-child').click())
+  expect([machine, 'orca', 'parent', 'child', 'other'].map((name) => state(nodeBox(name)))).toEqual(
+    ['mixed', 'mixed', 'mixed', 'mixed', 'true']
+  )
+  expect(countOf(machine)).toBe('3 of 4')
+  expect(countOf('child')).toBe('1 of 2')
+
+  // Partly selected: ticking selects everything under the node, nested workspaces included.
+  act(() => nodeBox('parent').click())
+  expect(state(chatBox('in-child'))).toBe('true')
+  expect(state(nodeBox(machine))).toBe('true')
+
+  act(() => nodeBox(machine).click())
+  for (const id of ['in-parent', 'in-child', 'also-in-child', 'in-other']) {
+    expect(state(chatBox(id))).toBe('false')
+  }
+  expect(countOf('orca')).toBe('0 of 4')
+})
+
+it('selects every eligible chat in a project, never an unretryable one or another project’s', () => {
+  const candidates = seedTree()
+  const mobile = worktree('mobile', { repoId: 'repo-2', id: 'repo-2::/mobile/mobile' })
+  useAppStore.setState((current) => ({
+    repos: [
+      ...current.repos,
+      { id: 'repo-2', path: '/mobile', displayName: 'orca-mobile', badgeColor: '#999', addedAt: 1 }
+    ],
+    worktreesByRepo: { ...current.worktreesByRepo, 'repo-2': [mobile] }
+  }))
+  const stuck = unretryable(candidates[3]!)
+  render({
+    candidates: [...candidates, candidate('in-mobile', mobile)],
+    initiallySelected: ['in-mobile'],
+    failureFor: (sessionId) => (sessionId === 'in-other' ? stuck : undefined)
+  })
+  expect(countOf('orca')).toBe('0 of 3')
+  expect(chatBox('in-other').hasAttribute('disabled')).toBe(true)
+
+  act(() => nodeBox('orca').click())
+  expect(countOf('orca')).toBe('3 of 3')
+  expect(state(nodeBox('orca'))).toBe('true')
+  const touched = onToggleSpy.mock.calls.map(([sessionId]) => sessionId)
+  expect(touched).not.toContain('in-other')
+  expect(touched).not.toContain('in-mobile')
+  expect(countOf('orca-mobile')).toBe('1 of 1')
+})
+
+it('disables a node with nothing it could select', () => {
+  const candidates = seedTree()
+  render({
+    candidates,
+    initiallySelected: [],
+    failureFor: (sessionId) => (sessionId === 'in-other' ? unretryable(candidates[3]!) : undefined)
+  })
+
+  expect(nodeBox('other').hasAttribute('disabled')).toBe(true)
+  expect(countOf('other')).toBeUndefined()
+})
+
+it('disables every checkbox while a resume runs', () => {
+  render({ candidates: seedTree(), busy: true })
+
+  const boxes = [...container.querySelectorAll('[role="checkbox"]')]
+  expect(boxes).toHaveLength(8)
+  for (const box of boxes) {
+    expect(box.hasAttribute('disabled')).toBe(true)
+  }
+})
+
+it('selects a whole row by clicking anywhere on it, but its arrow only folds', () => {
+  render({ candidates: seedTree(), initiallySelected: [] })
+
+  act(() => itemLabelBody('child').click())
+  expect(state(chatBox('in-child'))).toBe('true')
+
+  act(() => disclosureOf('other').click())
+  expect(state(nodeBox('other'))).toBe('false')
+  expect(queryChatBox('in-other')).toBeNull()
+})
+
+function itemLabelBody(name: string): HTMLElement {
+  return nodeBox(name).closest('label')!.querySelector<HTMLElement>(':scope > :last-child')!
+}
+
+it('starts expanded; collapsing hides a node’s rows and keeps their selection', () => {
+  render({ candidates: seedTree() })
+  const parent = disclosureOf('parent')
+  expect(parent.getAttribute('aria-expanded')).toBe('true')
+  expect(parent.getAttribute('aria-label')).toBe('Collapse parent')
+  expect(parent.tabIndex).toBe(-1)
+  act(() => chatBox('in-child').click())
+
+  act(() => parent.click())
+  expect(treeOutline()).toEqual([
+    '1:project:orca',
+    '2:workspace:parent',
+    '2:workspace:other',
+    '3:chat:in-other'
+  ])
+  expect(disclosureOf('parent').getAttribute('aria-label')).toBe('Expand parent')
+  expect(nodeBox('parent').closest('[role="treeitem"]')?.getAttribute('aria-expanded')).toBe(
+    'false'
+  )
+  // Hidden, not forgotten: the node still counts the pick made inside it.
+  expect(state(nodeBox('parent'))).toBe('mixed')
+  expect(countOf('parent')).toBe('2 of 3')
+
+  act(() => disclosureOf('parent').click())
+  expect(state(chatBox('in-child'))).toBe('false')
+  expect(state(chatBox('also-in-child'))).toBe('true')
+})
+
+it('toggles the chats of a collapsed node', () => {
+  render({ candidates: seedTree(), initiallySelected: [] })
+
+  act(() => disclosureOf('parent').click())
+  act(() => nodeBox('parent').click())
+  expect(countOf('parent')).toBe('3 of 3')
+  expect(onToggleSpy.mock.calls.map(([sessionId]) => sessionId).toSorted()).toEqual([
+    'also-in-child',
+    'in-child',
+    'in-parent'
+  ])
+})
diff --git a/src/renderer/src/components/NativeChatResumeOnRestartGroups.test.tsx b/src/renderer/src/components/NativeChatResumeOnRestartGroups.test.tsx
new file mode 100644
index 000000000000..70c7dfdbf24e
--- /dev/null
+++ b/src/renderer/src/components/NativeChatResumeOnRestartGroups.test.tsx
@@ -0,0 +1,251 @@
+// @vitest-environment happy-dom
+
+// The resume tree's shape: levels, depth, where child workspaces go, and when machines show.
+
+import { act } from 'react'
+import { createRoot, type Root } from 'react-dom/client'
+import { afterEach, beforeEach, expect, it } from 'vitest'
+import { useAppStore } from '../store'
+import { getDefaultSettings } from '../../../shared/constants'
+import { getHostContextLabel } from '../../../shared/worktree/host-context-labels'
+import type { ExecutionHostId } from '../../../shared/execution-host'
+import type { ResumeCandidate } from './native-chat-resume-on-restart-grouping'
+import {
+  candidate,
+  chatBox,
+  itemOf,
+  lineage,
+  nodeBox,
+  onToggleSpy,
+  seedTree,
+  treeOutline,
+  worktree
+} from './native-chat-resume-tree.test-support'
+import { ResumeTreeHarness as Harness } from './NativeChatResumeTreeHarness.test-support'
+
+globalThis.IS_REACT_ACT_ENVIRONMENT = true
+let root: Root
+let container: HTMLElement
+
+function render(props: React.ComponentProps<typeof Harness>): void {
+  act(() => root.render(<Harness {...props} />))
+}
+
+beforeEach(() => {
+  onToggleSpy.mockReset()
+  useAppStore.setState(useAppStore.getInitialState(), true)
+  container = document.createElement('div')
+  document.body.append(container)
+  root = createRoot(container)
+})
+
+afterEach(() => {
+  act(() => root.unmount())
+  container.remove()
+  useAppStore.setState(useAppStore.getInitialState(), true)
+})
+
+const LOCAL_TREE = [
+  '1:project:orca',
+  '2:workspace:parent',
+  '3:chat:in-parent',
+  '3:workspace:child',
+  '4:chat:in-child',
+  '4:chat:also-in-child',
+  '2:workspace:other',
+  '3:chat:in-other'
+]
+
+it('lists project, workspace and chat levels, a child workspace after its parent’s chats', () => {
+  render({ candidates: seedTree() })
+
+  expect(treeOutline()).toEqual(LOCAL_TREE)
+})
+
+it('keeps every checkbox in the left column and indents what follows it 18px a level', () => {
+  render({ candidates: seedTree() })
+
+  for (const item of container.querySelectorAll<HTMLElement>('[role="treeitem"]')) {
+    const row = item.querySelector('label')!
+    const cell = (n: number) => row.querySelector<HTMLElement>(`:scope > :nth-child(${n})`)
+    const disclosure = cell(3)
+    // The checkbox cell comes first, before any indent.
+    expect(cell(1)?.querySelector('[role="checkbox"]')).not.toBeNull()
+    const level = Number(item.getAttribute('aria-level'))
+    expect(cell(2)?.style.width).toBe(`${(level - 1) * 18}px`)
+    // Every row keeps the arrow's slot, so icons line up; only a node with children has an arrow.
+    expect(disclosure?.getAttribute('aria-hidden')).toBe('true')
+    const arrow = item.querySelector<HTMLElement>('button[aria-expanded]')
+    expect(arrow !== null).toBe(item.hasAttribute('aria-expanded'))
+    // Laid over its slot, outside the label, so it never toggles the checkbox.
+    expect(arrow?.closest('label') ?? null).toBeNull()
+    if (arrow) {
+      expect(arrow.style.left).toBe(`${28 + (level - 1) * 18}px`)
+    }
+  }
+})
+
+it('reads levels apart by weight, with no row dividers or bands', () => {
+  render({ candidates: seedTree() })
+
+  expect(itemOf(nodeBox('orca')).querySelector('.font-semibold')?.textContent).toBe('orca')
+  expect(itemOf(nodeBox('parent')).querySelector('.font-medium')?.textContent).toBe('parent')
+  // Every row element but the checkboxes, which keep their own outline.
+  const rows = container.querySelectorAll(
+    '[role="treeitem"], [role="treeitem"] *:not([role="checkbox"])'
+  )
+  for (const element of rows) {
+    expect([...element.classList].filter((name) => /^(border|bg-)/.test(name))).toEqual([])
+  }
+})
+
+it('shows the branch for a git worktree, muted after its name', () => {
+  render({ candidates: seedTree() })
+
+  const branch = [...itemOf(nodeBox('parent')).querySelectorAll('span')].find(
+    (span) => span.textContent === 'parent-branch'
+  )
+  expect(branch?.classList.contains('text-muted-foreground')).toBe(true)
+})
+
+it('starts at projects when every chat is on this machine', () => {
+  render({ candidates: seedTree() })
+
+  expect(container.textContent).not.toContain(getHostContextLabel('local'))
+  expect(container.querySelector('[aria-label^="Select all chats on"]')).toBeNull()
+})
+
+it('heads a single SSH host with its machine node, named and marked SSH', () => {
+  const remote: ExecutionHostId = 'ssh:build-server'
+  render({ candidates: seedTree({ parent: remote, child: remote }) })
+
+  const machine = getHostContextLabel(remote)
+  expect(treeOutline()).toEqual([
+    `1:machine:${machine}`,
+    ...LOCAL_TREE.map((row) => row.replace(/^(\d)/, (level) => String(Number(level) + 1)))
+  ])
+  expect(itemOf(nodeBox(machine)).textContent).toContain('SSH')
+  // The machine node names the host, so no workspace repeats it.
+  expect(itemOf(nodeBox('parent')).textContent).not.toContain(machine)
+})
+
+// A paired Orca server's runtime host is not this machine, but it is not SSH either.
+it('heads a runtime host with its machine node and no SSH chip', () => {
+  const runtime: ExecutionHostId = 'runtime:env-1'
+  render({ candidates: seedTree({ parent: runtime, child: runtime }) })
+
+  const machine = getHostContextLabel(runtime)
+  expect(treeOutline()[0]).toBe(`1:machine:${machine}`)
+  expect(itemOf(nodeBox(machine)).textContent).not.toContain('SSH')
+})
+
+// A target saved through Add SSH target gets a generated id; the sidebar names it by its label.
+it('names an SSH machine by its saved name, not its target id', () => {
+  const targetId = 'ssh-1728291234567-abc12d'
+  const remote: ExecutionHostId = `ssh:${targetId}`
+  const candidates = seedTree({ parent: remote, child: remote })
+  useAppStore.setState({ sshTargetLabels: new Map([[targetId, 'devbox']]) })
+  render({ candidates })
+
+  expect(itemOf(nodeBox('devbox')).getAttribute('aria-level')).toBe('1')
+  expect(container.textContent).not.toContain(targetId)
+})
+
+it('gives each machine its own branch when chats span hosts', () => {
+  const remote: ExecutionHostId = 'ssh:build-server'
+  const candidates = seedTree({ parent: 'local', child: remote })
+  render({ candidates })
+
+  const local = getHostContextLabel('local')
+  const machine = getHostContextLabel(remote)
+  // The child is on another host, so it does not nest under the local parent.
+  expect(treeOutline()).toEqual([
+    `1:machine:${machine}`,
+    '2:project:orca',
+    '3:workspace:child',
+    '4:chat:in-child',
+    '4:chat:also-in-child',
+    `1:machine:${local}`,
+    '2:project:orca',
+    '3:workspace:parent',
+    '4:chat:in-parent',
+    '3:workspace:other',
+    '4:chat:in-other'
+  ])
+  expect(itemOf(nodeBox(local)).textContent).not.toContain('SSH')
+})
+
+it('lists every offered chat exactly once, even with one workspace id on two hosts', () => {
+  const remote: ExecutionHostId = 'ssh:build-server'
+  const candidates = seedTree()
+  const remoteParent = worktree('parent', { hostId: remote, instanceId: 'instance-remote' })
+  useAppStore.setState((state) => ({
+    worktreesByRepo: { 'repo-1': [...state.worktreesByRepo['repo-1']!, remoteParent] }
+  }))
+  const twin = candidate('on-remote', remoteParent)
+  render({ candidates: [...candidates, twin] })
+
+  for (const entry of [...candidates, twin]) {
+    expect(
+      container.querySelectorAll(`[role="checkbox"][aria-label*="Prompt ${entry.sessionId}"]`)
+    ).toHaveLength(1)
+  }
+  // Same id, different machine: two separate workspace nodes.
+  expect(container.querySelectorAll('[aria-label="Select all chats in parent"]')).toHaveLength(2)
+})
+
+it('names a workspace the store does not know by its id, with the kind the host recorded', () => {
+  const unknown: ResumeCandidate = {
+    ...candidate('lost', worktree('gone')),
+    workspaceId: 'folder:missing-folder',
+    workspaceKind: 'folder'
+  }
+  render({ candidates: [unknown] })
+
+  const row = itemOf(nodeBox('folder:missing-folder'))
+  expect(row.querySelector('svg.lucide-folder')).not.toBeNull()
+  expect(chatBox('lost').getAttribute('aria-label')).toContain('in folder:missing-folder')
+})
+
+// Its project is unknown too: a nameless "Select all chats in " checkbox would help no one.
+it('gives workspaces the store cannot place no project node', () => {
+  const unknown: ResumeCandidate = {
+    ...candidate('lost', worktree('gone')),
+    workspaceId: 'folder:missing-folder',
+    workspaceKind: 'folder'
+  }
+  render({ candidates: [...seedTree(), unknown] })
+
+  expect(treeOutline()).toEqual([...LOCAL_TREE, '1:workspace:folder:missing-folder', '2:chat:lost'])
+  expect(container.querySelector('[aria-label="Select all chats in "]')).toBeNull()
+})
+
+// Why: the sidebar nests a child only under a parent on its own host; no host id matches only none.
+it.each([
+  ['both local', 'local', 'local', true],
+  ['neither with a host id', undefined, undefined, true],
+  ['parent without a host id, child local', undefined, 'local', false],
+  ['parent local, child without a host id', 'local', undefined, false]
+] as const)(
+  '%s: nests the child exactly as the sidebar does',
+  (_, parentHost, childHost, nests) => {
+    render({ candidates: seedTree({ parent: parentHost, child: childHost }) })
+
+    expect(treeOutline()).toContain(nests ? '3:workspace:child' : '2:workspace:child')
+    expect(container.querySelectorAll('[role="checkbox"][aria-label^="Resume"]')).toHaveLength(4)
+  }
+)
+
+it('lists every chat when workspace lineage loops', () => {
+  const a = worktree('a')
+  const b = worktree('b')
+  useAppStore.setState({
+    settings: getDefaultSettings(''),
+    worktreesByRepo: { 'repo-1': [a, b] },
+    worktreeLineageById: { [a.id]: lineage(a, b), [b.id]: lineage(b, a) }
+  })
+  render({ candidates: [candidate('in-a', a), candidate('in-b', b)] })
+
+  expect(chatBox('in-a')).toBeTruthy()
+  expect(chatBox('in-b')).toBeTruthy()
+})
diff --git a/src/renderer/src/components/NativeChatResumeOnRestartGroups.tsx b/src/renderer/src/components/NativeChatResumeOnRestartGroups.tsx
index 6f8bb64f4f1e..0444159c26b8 100644
--- a/src/renderer/src/components/NativeChatResumeOnRestartGroups.tsx
+++ b/src/renderer/src/components/NativeChatResumeOnRestartGroups.tsx
@@ -1,162 +1,338 @@
-import { Folder, FolderTree, GitBranch } from 'lucide-react'
+import { useMemo } from 'react'
+import { Folder, FolderTree, GitBranch, Monitor } from 'lucide-react'
 import { RepoIconGlyph } from '@/components/repo/repo-icon'
 import { WorktreeHostContextBadge } from '@/components/sidebar/WorktreeHostContextBadge'
+import { useSidebarHostScopeOptions } from '@/components/sidebar/use-sidebar-host-scope-options'
+import { translate } from '@/i18n/i18n'
+import {
+  resolveWorktreeBranchLabel,
+  resolveWorktreeDisplayName
+} from '@/lib/worktree-default-display-name'
 import { getHostContextLabel } from '../../../shared/worktree/host-context-labels'
-import { LOCAL_EXECUTION_HOST_ID } from '../../../shared/execution-host'
-import type { AgentSessionWorkspaceKind } from '../../../shared/agent-session-record'
+import {
+  LOCAL_EXECUTION_HOST_ID,
+  parseExecutionHostId,
+  type ExecutionHostId
+} from '../../../shared/execution-host'
 import { useAppStore } from '../store'
+import {
+  useLineageAncestors,
+  useRepoIdByWorkspace,
+  useWorkspaceWorktree
+} from './native-chat-resume-workspace-lookups'
 import { ResumeCandidateRow } from './NativeChatResumeOnRestartAgentRow'
+import { ResumeTreeCount, ResumeTreeRow } from './NativeChatResumeTreeRow'
+import {
+  chatState,
+  coveredKeys,
+  ResumeTreeDepthContext,
+  useResumeTreeExpansion,
+  type FailureProps,
+  type TreeProps
+} from './native-chat-resume-tree-state'
 import {
   groupResumeCandidates,
+  groupResumeCandidatesByHost,
   groupResumeWorkspacesByRepo,
+  nestResumeWorkspaces,
   resolveResumeGroupHeader,
+  resumeSelectionState,
   resumeWorkspaceKind,
+  resumeWorkspaceCandidates,
+  toggleResumeSelection,
   type ResumeCandidate,
-  type ResumeFailure,
-  type ResumeWorkspaceGroup
+  type ResumeWorkspaceGroup,
+  type ResumeWorkspaceNode
 } from './native-chat-resume-on-restart-grouping'
-import type { ResumeFailureAction } from './native-chat-resume-failure-guidance'
 
 export type { ResumeCandidate } from './native-chat-resume-on-restart-grouping'
 
 /**
- * The offered chats in the sidebar's three tiers: repo/project, then workspace, then agent sessions.
+ * The offered chats as a tree: machine, then project, then workspace (a child workspace is a node
+ * inside its parent, after the parent's chats), then the chats.
  *
- * Reused from the sidebar rather than rebuilt: `RepoIconGlyph` for a repo's own glyph, `FolderTree`
- * from the sidebar's `PROJECT_GROUP_META` for a project group, and `WorktreeHostContextBadge` —
- * extracted from the sidebar card's meta row so both surfaces render one chip. The label inside it
- * comes from `getHostContextLabel`, which is the sidebar's own source for "Local Mac".
+ * Every node's checkbox sits in one column at the left edge and covers every selectable chat under
+ * it; levels read apart by icon and weight, nesting by indent and the disclosure arrows. The machine
+ * level shows only when the machine is not obvious (a remote host, or chats on more than one), and
+ * then it is what names the host, so no workspace repeats it.
  *
- * The sidebar has NO resolver for git-worktree vs folder-workspace glyphs: both kinds render the
- * same card, and the apparent difference is its status lane picking `GitBranch` when the workspace
- * has a branch identity. That single sidebar precedent is what the workspace glyph follows here.
+ * A workspace the store does not know yet (host connecting, or deleted) is named by its id.
  */
 
-type StoreState = ReturnType<typeof useAppStore.getState>
-
-/** Lets a row that an earlier resume could not carry on show what went wrong and what to do. */
-type FailureProps = {
-  failureFor?: (sessionId: string) => ResumeFailure | undefined
-  onFailureAction?: (action: ResumeFailureAction, sessionId: string) => void
-}
-
-function resolveWorkspaceWorktree(store: StoreState, workspaceId: string) {
+/** A group node: its row, then (while open) what is under it. */
+function GroupNode({
+  nodeKey,
+  depth,
+  name,
+  checkboxLabel,
+  covered,
+  tree,
+  label,
+  children
+}: {
+  nodeKey: string
+  depth: number
+  name: string
+  checkboxLabel: string
+  /** Every selectable chat under this node. */
+  covered: readonly string[]
+  tree: TreeProps
+  label: React.ReactNode
+  children: React.ReactNode
+}): React.JSX.Element {
+  const selection = resumeSelectionState(covered, tree.selected)
+  const expanded = tree.isExpanded(nodeKey)
   return (
-    store.getKnownWorktreeById(workspaceId) ??
-    store.allWorktrees().find((entry) => entry.id === workspaceId)
-  )
-}
-
-/** Selectors return primitives, so repeated runs cannot churn equality. */
-function useWorkspaceName(workspaceId: string): string {
-  return useAppStore(
-    (store) => resolveWorkspaceWorktree(store, workspaceId)?.displayName ?? workspaceId
-  )
-}
-
-/**
- * The repo owning each workspace, as one narrow subscription.
- *
- * Selected as a joined string rather than a map so the selector returns a PRIMITIVE: a fresh object
- * or array would fail the equality check on every store change and re-render the whole list.
- */
-function useRepoIdByWorkspace(
-  workspaceIds: readonly string[]
-): (workspaceId: string) => string | null {
-  const key = workspaceIds.join('\0')
-  const joined = useAppStore((store) =>
-    key
-      .split('\0')
-      .map((id) => resolveWorkspaceWorktree(store, id)?.repoId ?? '')
-      .join('\0')
+    <>
+      <ResumeTreeRow
+        depth={depth}
+        expanded={expanded}
+        onExpandedChange={(next) => tree.setExpanded(nodeKey, next)}
+        name={name}
+        checked={selection.checked}
+        disabled={tree.busy || selection.total === 0}
+        onCheckedChange={() => toggleResumeSelection(covered, selection, tree.onToggle)}
+        checkboxLabel={checkboxLabel}
+      >
+        {label}
+        <ResumeTreeCount selectedCount={selection.selectedCount} total={selection.total} />
+      </ResumeTreeRow>
+      {/* Collapsing unmounts the rows only; their selection lives with the dialog. */}
+      {expanded && children}
+    </>
   )
-  const repoIds = joined.split('\0')
-  return (workspaceId: string) => {
-    const index = workspaceIds.indexOf(workspaceId)
-    const repoId = index === -1 ? '' : (repoIds[index] ?? '')
-    return repoId === '' ? null : repoId
-  }
 }
 
-/** The glyph for the workspace itself. Kind comes from the host's record, never from a name. */
-function WorkspaceKindGlyph({ kind }: { kind: AgentSessionWorkspaceKind }): React.JSX.Element {
-  return kind === 'folder' ? (
-    <Folder className="size-3.5 shrink-0 text-muted-foreground" aria-hidden="true" />
-  ) : (
-    <GitBranch className="size-3.5 shrink-0 text-muted-foreground" aria-hidden="true" />
+function WorkspaceNode({
+  node,
+  hostId,
+  depth,
+  tree
+}: {
+  node: ResumeWorkspaceNode
+  hostId: ExecutionHostId
+  depth: number
+  tree: TreeProps
+}): React.JSX.Element {
+  const { group } = node
+  const first = group.candidates[0]
+  const worktree = useWorkspaceWorktree(group.workspaceId, first?.executionHostId)
+  const kind = first ? resumeWorkspaceKind(first) : 'git-worktree'
+  // Kind comes from the host's record, never from a name.
+  const KindGlyph = kind === 'folder' ? Folder : GitBranch
+  const name = (worktree && resolveWorktreeDisplayName(worktree)) || group.workspaceId
+  const branch = worktree && kind === 'git-worktree' ? resolveWorktreeBranchLabel(worktree) : ''
+  return (
+    <GroupNode
+      nodeKey={`workspace:${hostId}:${group.workspaceId}`}
+      depth={depth}
+      name={name}
+      checkboxLabel={translate(
+        'auto.components.NativeChatResumeOnRestartModal.selectWorkspace',
+        'Select all chats in {{value0}}',
+        { value0: name }
+      )}
+      covered={coveredKeys(resumeWorkspaceCandidates(node), tree)}
+      tree={tree}
+      label={
+        <>
+          <KindGlyph className="size-3.5 shrink-0 text-muted-foreground" aria-hidden="true" />
+          <span className="min-w-0 truncate text-[13px] font-medium text-foreground">{name}</span>
+          {branch && (
+            <span className="min-w-0 shrink-2 truncate text-[11px] text-muted-foreground">
+              {branch}
+            </span>
+          )}
+        </>
+      }
+    >
+      <ResumeTreeDepthContext.Provider value={depth + 1}>
+        {group.candidates.map((candidate) => {
+          const chat = chatState(candidate, tree)
+          return (
+            <ResumeCandidateRow
+              key={chat.key}
+              candidate={candidate}
+              workspaceName={name}
+              listedAt={tree.listedAt}
+              checked={chat.checked}
+              disabled={tree.busy}
+              onCheckedChange={chat.onCheckedChange}
+              failure={chat.failure}
+              onFailureAction={tree.onFailureAction}
+            />
+          )
+        })}
+      </ResumeTreeDepthContext.Provider>
+      {node.children.map((child) => (
+        <WorkspaceNode
+          key={child.group.workspaceId}
+          node={child}
+          hostId={hostId}
+          depth={depth + 1}
+          tree={tree}
+        />
+      ))}
+    </GroupNode>
   )
 }
 
 /**
- * The top tier: a git repo, or the project group a folder workspace belongs to.
+ * A git repo, or the project group a folder workspace belongs to.
  *
  * A folder workspace's synthetic worktree carries `repoId` of `folder-workspace:<projectGroupId>` —
  * never null — so "no repo" cannot be detected by testing for absence. `projectGroupIdFromRepoId`
  * is the only thing that separates the two, and the sidebar likewise titles these with the project
  * group's name.
  */
-function RepoHeader({ repoId }: { repoId: string | null }): React.JSX.Element {
+function ProjectNode({
+  repoId,
+  hostId,
+  workspaces,
+  depth,
+  tree
+}: {
+  repoId: string
+  hostId: ExecutionHostId
+  workspaces: readonly ResumeWorkspaceNode[]
+  depth: number
+  tree: TreeProps
+}): React.JSX.Element {
   const repos = useAppStore((store) => store.repos)
   const projectGroups = useAppStore((store) => store.projectGroups)
   const header = resolveResumeGroupHeader(repoId, repos, projectGroups)
   return (
-    <div className="flex items-center gap-1.5 px-0.5">
-      {/* A repo shows its own configured glyph; a project group uses the FolderTree the sidebar's
-          own PROJECT_GROUP_META uses. */}
-      {header.kind === 'project' ? (
-        <FolderTree className="size-3.5 shrink-0 text-muted-foreground" aria-hidden="true" />
-      ) : (
-        <RepoIconGlyph repoIcon={header.repoIcon} className="size-3.5" iconClassName="size-3.5" />
+    <GroupNode
+      nodeKey={`project:${hostId}:${repoId}`}
+      depth={depth}
+      name={header.name}
+      checkboxLabel={translate(
+        'auto.components.NativeChatResumeOnRestartModal.selectProject',
+        'Select all chats in {{value0}}',
+        { value0: header.name }
       )}
-      <span className="min-w-0 flex-1 truncate text-xs font-semibold">{header.name}</span>
-    </div>
+      covered={coveredKeys(workspaces.flatMap(resumeWorkspaceCandidates), tree)}
+      tree={tree}
+      label={
+        <>
+          {/* A repo shows its own configured glyph; a project group uses the FolderTree the
+              sidebar's own PROJECT_GROUP_META uses. */}
+          {header.kind === 'project' ? (
+            <FolderTree className="size-3.5 shrink-0 text-muted-foreground" aria-hidden="true" />
+          ) : (
+            <RepoIconGlyph
+              repoIcon={header.repoIcon}
+              className="size-3.5 text-muted-foreground"
+              iconClassName="size-3.5"
+            />
+          )}
+          <span className="min-w-0 truncate text-[13px] font-semibold">{header.name}</span>
+        </>
+      }
+    >
+      {workspaces.map((node) => (
+        <WorkspaceNode
+          key={node.group.workspaceId}
+          node={node}
+          hostId={hostId}
+          depth={depth + 1}
+          tree={tree}
+        />
+      ))}
+    </GroupNode>
   )
 }
 
-function WorkspaceGroup({
-  group,
-  listedAt,
-  busy,
-  selected,
-  onToggle,
-  failureFor,
-  onFailureAction
+/** A machine's projects, each a node; workspaces the store cannot place sit at project depth. */
+function MachineContents({
+  hostId,
+  workspaces,
+  depth,
+  tree
 }: {
-  group: ResumeWorkspaceGroup
-  listedAt: number
-  busy: boolean
-  selected: ReadonlySet<string>
-  onToggle: (sessionId: string, checked: boolean) => void
-} & FailureProps): React.JSX.Element {
-  const name = useWorkspaceName(group.workspaceId)
-  const first = group.candidates[0]
-  const kind = first ? resumeWorkspaceKind(first) : 'git-worktree'
-  // Shown for every workspace, local included. The sidebar hides it on a single-host install; this
-  // list is a one-off prompt with no surrounding context, so the machine is always worth naming.
-  const hostLabel = getHostContextLabel(first?.executionHostId ?? LOCAL_EXECUTION_HOST_ID)
+  hostId: ExecutionHostId
+  workspaces: readonly ResumeWorkspaceGroup[]
+  depth: number
+  tree: TreeProps
+}): React.JSX.Element {
+  const byId = new Map(workspaces.map((group) => [group.workspaceId, group]))
+  const lookup =
+    <T,>(read: (group: ResumeWorkspaceGroup) => T, fallback: T) =>
+    (id: string) => {
+      const group = byId.get(id)
+      return group ? read(group) : fallback
+    }
+  const ancestorsOf = lookup(tree.ancestorsOf, [])
   return (
-    <section className="flex flex-col gap-0.5">
-      <div className="flex items-center gap-1.5 px-0.5">
-        <WorkspaceKindGlyph kind={kind} />
-        <span className="min-w-0 truncate text-xs font-medium">{name}</span>
-        <WorktreeHostContextBadge label={hostLabel} />
-      </div>
-      <ul className="flex flex-col pl-1">
-        {group.candidates.map((candidate) => (
-          <ResumeCandidateRow
-            key={candidate.sessionId}
-            candidate={candidate}
-            workspaceName={name}
-            listedAt={listedAt}
-            checked={selected.has(candidate.sessionId)}
-            disabled={busy}
-            onCheckedChange={(checked) => onToggle(candidate.sessionId, checked)}
-            failure={failureFor?.(candidate.sessionId)}
-            onFailureAction={onFailureAction}
+    <>
+      {groupResumeWorkspacesByRepo(workspaces, lookup(tree.repoIdOf, null)).map((repoGroup) => {
+        const nodes = nestResumeWorkspaces(repoGroup.workspaces, ancestorsOf)
+        // A group the store cannot place has no project to name or select; Select all covers it.
+        return repoGroup.repoId === null ? (
+          nodes.map((node) => (
+            <WorkspaceNode
+              key={node.group.workspaceId}
+              node={node}
+              hostId={hostId}
+              depth={depth}
+              tree={tree}
+            />
+          ))
+        ) : (
+          <ProjectNode
+            key={repoGroup.repoId}
+            repoId={repoGroup.repoId}
+            hostId={hostId}
+            workspaces={nodes}
+            depth={depth}
+            tree={tree}
           />
-        ))}
-      </ul>
-    </section>
+        )
+      })}
+    </>
+  )
+}
+
+function MachineNode({
+  hostId,
+  candidates,
+  workspaces,
+  hostLabelById,
+  tree
+}: {
+  hostId: ExecutionHostId
+  candidates: readonly ResumeCandidate[]
+  workspaces: readonly ResumeWorkspaceGroup[]
+  hostLabelById: ReadonlyMap<ExecutionHostId, string>
+  tree: TreeProps
+}): React.JSX.Element {
+  const name = getHostContextLabel(hostId, { hostLabelById })
+  return (
+    <GroupNode
+      nodeKey={`machine:${hostId}`}
+      depth={0}
+      name={name}
+      checkboxLabel={translate(
+        'auto.components.NativeChatResumeOnRestartModal.selectMachine',
+        'Select all chats on {{value0}}',
+        { value0: name }
+      )}
+      covered={coveredKeys(candidates, tree)}
+      tree={tree}
+      label={
+        <>
+          <Monitor className="size-3.5 shrink-0 text-muted-foreground" aria-hidden="true" />
+          <span className="min-w-0 truncate text-[13px] font-bold">{name}</span>
+          {parseExecutionHostId(hostId)?.kind === 'ssh' && (
+            <WorktreeHostContextBadge
+              label={translate('auto.components.NativeChatResumeOnRestartModal.sshHost', 'SSH')}
+            />
+          )}
+        </>
+      }
+    >
+      <MachineContents hostId={hostId} workspaces={workspaces} depth={1} tree={tree} />
+    </GroupNode>
   )
 }
 
@@ -175,30 +351,59 @@ export function ResumeOnRestartGroups({
   selected: ReadonlySet<string>
   onToggle: (sessionId: string, checked: boolean) => void
 } & FailureProps): React.JSX.Element {
-  const workspaces = groupResumeCandidates(candidates)
-  const repoIdFor = useRepoIdByWorkspace(workspaces.map((group) => group.workspaceId))
-  const repoGroups = groupResumeWorkspacesByRepo(workspaces, repoIdFor)
+  const machines = useMemo(
+    () =>
+      groupResumeCandidatesByHost(candidates).map((machine) => ({
+        ...machine,
+        workspaces: groupResumeCandidates(machine.candidates)
+      })),
+    [candidates]
+  )
+  const allWorkspaces = useMemo(() => machines.flatMap((machine) => machine.workspaces), [machines])
+  const repoIdOf = useRepoIdByWorkspace(allWorkspaces)
+  const ancestorsOf = useLineageAncestors(allWorkspaces)
+  const { hostOptions } = useSidebarHostScopeOptions()
+  const hostLabelById = useMemo(
+    () => new Map(hostOptions.map((host) => [host.id, host.label])),
+    [hostOptions]
+  )
+  const expansion = useResumeTreeExpansion()
+  const tree: TreeProps = {
+    listedAt,
+    busy,
+    selected,
+    onToggle,
+    ...expansion,
+    repoIdOf,
+    ancestorsOf,
+    failureFor,
+    onFailureAction
+  }
+  // Why: the machine is worth a level only when it is not obvious.
+  const showMachines =
+    machines.length > 1 || machines.some((machine) => machine.hostId !== LOCAL_EXECUTION_HOST_ID)
   return (
-    <div className="flex flex-col gap-2.5">
-      {repoGroups.map((repoGroup) => (
-        <section key={repoGroup.repoId ?? 'no-repo'} className="flex flex-col gap-1">
-          <RepoHeader repoId={repoGroup.repoId} />
-          <div className="flex flex-col gap-1.5 pl-2">
-            {repoGroup.workspaces.map((workspace) => (
-              <WorkspaceGroup
-                key={workspace.workspaceId}
-                group={workspace}
-                listedAt={listedAt}
-                busy={busy}
-                selected={selected}
-                onToggle={onToggle}
-                failureFor={failureFor}
-                onFailureAction={onFailureAction}
-              />
-            ))}
-          </div>
-        </section>
-      ))}
+    <div className="flex flex-col">
+      {machines.map((machine) =>
+        showMachines ? (
+          <MachineNode
+            key={machine.hostId}
+            hostId={machine.hostId}
+            candidates={machine.candidates}
+            workspaces={machine.workspaces}
+            hostLabelById={hostLabelById}
+            tree={tree}
+          />
+        ) : (
+          <MachineContents
+            key={machine.hostId}
+            hostId={machine.hostId}
+            workspaces={machine.workspaces}
+            depth={0}
+            tree={tree}
+          />
+        )
+      )}
     </div>
   )
 }
diff --git a/src/renderer/src/components/NativeChatResumeOnRestartModal.list.test.tsx b/src/renderer/src/components/NativeChatResumeOnRestartModal.list.test.tsx
new file mode 100644
index 000000000000..bac1011793ed
--- /dev/null
+++ b/src/renderer/src/components/NativeChatResumeOnRestartModal.list.test.tsx
@@ -0,0 +1,301 @@
+// @vitest-environment happy-dom
+
+// The dialog's list as a control: initial focus, Select all, and keyboard movement.
+
+import { act } from 'react'
+import { createRoot, type Root } from 'react-dom/client'
+import { afterEach, beforeEach, expect, it, vi } from 'vitest'
+import { useAppStore } from '../store'
+import { getDefaultSettings } from '../../../shared/constants'
+import { NativeChatResumeOnRestartModal } from './NativeChatResumeOnRestartModal'
+import { NativeChatResumeStatusSegment } from './status-bar/NativeChatResumeStatusSegment'
+import { TooltipProvider } from './ui/tooltip'
+import {
+  button,
+  chatBox,
+  failure,
+  namedBox,
+  offered
+} from './native-chat-resume-on-restart-modal.test-support'
+import {
+  consumeNativeChatResumeOnRestartDialogRequest,
+  requestNativeChatResumeOnRestartDialog
+} from './native-chat-resume-on-restart-dialog'
+import { _resetNativeChatRestartOffer } from './native-chat-resume-on-restart-store'
+
+const rpc = vi.hoisted(() => vi.fn())
+vi.mock('@/runtime/structured-agent-session-client', () => ({
+  callStructuredAgentSession: rpc,
+  subscribeStructuredAgentSessionStatus: () => new Promise(() => {})
+}))
+vi.mock('@/lib/activate-ai-vault-structured-session', () => ({
+  activateAiVaultStructuredSession: vi.fn(async () => true)
+}))
+vi.mock('sonner', () => ({ toast: vi.fn() }))
+
+globalThis.IS_REACT_ACT_ENVIRONMENT = true
+let root: Root
+let container: HTMLDivElement
+
+/** Rows carry tooltips, so every mount needs the provider the app shell supplies. */
+async function mount(node: React.ReactNode): Promise<void> {
+  await act(async () => root.render(<TooltipProvider>{node}</TooltipProvider>))
+}
+
+beforeEach(() => {
+  rpc.mockReset()
+  _resetNativeChatRestartOffer()
+  consumeNativeChatResumeOnRestartDialogRequest()
+  useAppStore.setState(useAppStore.getInitialState(), true)
+  useAppStore.setState({
+    settings: { ...getDefaultSettings(''), experimentalStructuredNativeChat: true }
+  })
+  container = document.createElement('div')
+  document.body.append(container)
+  root = createRoot(container)
+})
+
+afterEach(() => {
+  act(() => root.unmount())
+  container.remove()
+  useAppStore.setState(useAppStore.getInitialState(), true)
+  _resetNativeChatRestartOffer()
+  consumeNativeChatResumeOnRestartDialogRequest()
+})
+
+// Left to the dialog, focus lands on the scrollable list and draws a ring around it.
+it('opens with focus on the resume action', async () => {
+  rpc.mockResolvedValue({ sessions: offered })
+  await mount(<NativeChatResumeOnRestartModal />)
+  expect(document.activeElement?.textContent?.trim()).toBe('Resume 2 chats')
+})
+
+it('uses the sidebar surface without a border around the resume list', async () => {
+  rpc.mockResolvedValue({ sessions: offered })
+  await mount(<NativeChatResumeOnRestartModal />)
+  const list = document.querySelector('[aria-label="Chats that would be resumed"]')
+  expect(list).not.toBeNull()
+  expect(list?.classList.contains('bg-worktree-sidebar')).toBe(true)
+  expect(list?.classList.contains('border')).toBe(false)
+})
+
+// The resume list is a tree; it keeps the list's accessible name.
+it('exposes the list as a named tree of leveled items', async () => {
+  rpc.mockResolvedValue({ sessions: offered })
+  await mount(<NativeChatResumeOnRestartModal />)
+  const tree = document.querySelector('[role="tree"][aria-label="Chats that would be resumed"]')
+  expect(tree).not.toBeNull()
+  expect(
+    document.querySelector('[role="group"][aria-label="Chats that would be resumed"]')
+  ).toBeNull()
+  const levels = [...tree!.querySelectorAll('[role="treeitem"]')].map((item) =>
+    item.getAttribute('aria-level')
+  )
+  // Select all, then this workspace (no project the store knows) and its two chats.
+  expect(levels).toEqual(['1', '1', '2', '2'])
+  // The one divider sits under Select all.
+  const selectAllItem = namedBox('Select all chats').closest('[role="treeitem"]')
+  expect(selectAllItem?.parentElement?.classList.contains('border-b')).toBe(true)
+})
+
+it('folds the focused node with Left and opens it with Right, keeping focus and ticks', async () => {
+  rpc.mockResolvedValue({ sessions: offered })
+  await mount(<NativeChatResumeOnRestartModal />)
+  const workspace = namedBox('Select all chats in workspace')
+  const press = async (key: string) =>
+    act(async () => {
+      document.activeElement?.dispatchEvent(new KeyboardEvent('keydown', { key, bubbles: true }))
+    })
+  await act(async () => chatBox('a').click())
+  workspace.focus()
+
+  await press('ArrowLeft')
+  expect(workspace.closest('[role="treeitem"]')?.getAttribute('aria-expanded')).toBe('false')
+  expect(document.querySelector('[aria-label*="Prompt a"]')).toBeNull()
+  expect(document.activeElement).toBe(workspace)
+  // Left again on a closed node does nothing.
+  await press('ArrowLeft')
+  expect(workspace.closest('[role="treeitem"]')?.getAttribute('aria-expanded')).toBe('false')
+
+  await press('ArrowRight')
+  expect(workspace.closest('[role="treeitem"]')?.getAttribute('aria-expanded')).toBe('true')
+  expect(chatBox('a').getAttribute('aria-checked')).toBe('false')
+  expect(chatBox('b').getAttribute('aria-checked')).toBe('true')
+  expect(button('Resume 1 chat')).toBeTruthy()
+})
+
+it('keeps initial focus inside the dialog with no resumable chats', async () => {
+  rpc.mockResolvedValue({ sessions: [], failed: [failure('b')] })
+  await mount(<NativeChatResumeOnRestartModal />)
+  await act(async () => requestNativeChatResumeOnRestartDialog())
+  const dialog = document.querySelector('[role="dialog"]')
+  expect(button('Resume 0 chats').disabled).toBe(true)
+  expect(dialog).not.toBeNull()
+  expect(dialog?.contains(document.activeElement)).toBe(true)
+})
+
+it('keeps initial focus inside the dialog when reopened during resume', async () => {
+  const continued = Promise.withResolvers<unknown>()
+  rpc.mockImplementation((_target, method) =>
+    method === 'agentSession.restartResumable'
+      ? Promise.resolve({ sessions: offered })
+      : continued.promise
+  )
+  await mount(
+    <>
+      <NativeChatResumeOnRestartModal />
+      <NativeChatResumeStatusSegment iconOnly={false} />
+    </>
+  )
+  await act(async () => button('Resume 2 chats').click())
+  const opener = button('Resuming 2 chats')
+  await act(async () => {
+    opener.focus()
+    opener.click()
+  })
+  const dialog = document.querySelector('[role="dialog"]')
+  expect(button('Resuming…').disabled).toBe(true)
+  expect(dialog).not.toBeNull()
+  expect(dialog?.contains(document.activeElement)).toBe(true)
+  await act(async () => continued.resolve({ sessions: [], failed: [], resumed: [], continued: [] }))
+})
+
+it('starts the list with a tri-state Select all that counts the selection', async () => {
+  rpc.mockResolvedValue({ sessions: offered })
+  await mount(<NativeChatResumeOnRestartModal />)
+  const list = document.querySelector('[aria-label="Chats that would be resumed"]')!
+  const selectAll = namedBox('Select all chats')
+  // First row of the list, in the same left column as every other checkbox.
+  expect(list.querySelector('[role="checkbox"]')).toBe(selectAll)
+  expect(selectAll.closest('label')?.firstElementChild?.contains(selectAll)).toBe(true)
+  const count = () => selectAll.closest('label')?.querySelector('.tabular-nums')?.textContent
+  expect(selectAll.getAttribute('aria-checked')).toBe('true')
+  expect(count()).toBe('2 of 2 selected')
+
+  await act(async () => chatBox('a').click())
+  expect(selectAll.getAttribute('aria-checked')).toBe('mixed')
+  expect(count()).toBe('1 of 2 selected')
+
+  await act(async () => selectAll.click())
+  expect(chatBox('a').getAttribute('aria-checked')).toBe('true')
+  expect(button('Resume 2 chats').disabled).toBe(false)
+
+  await act(async () => selectAll.click())
+  expect(selectAll.getAttribute('aria-checked')).toBe('false')
+  expect(count()).toBe('0 of 2 selected')
+  expect(button('Resume 0 chats').disabled).toBe(true)
+})
+
+it('leaves a failure a retry cannot fix out of Select all', async () => {
+  rpc.mockResolvedValue({ sessions: [offered[0]], failed: [{ ...failure('b'), retryable: false }] })
+  await mount(<NativeChatResumeOnRestartModal />)
+  await act(async () => requestNativeChatResumeOnRestartDialog())
+  const selectAll = namedBox('Select all chats')
+  expect(selectAll.closest('label')?.textContent).toContain('1 of 1 selected')
+
+  await act(async () => selectAll.click())
+  await act(async () => selectAll.click())
+  expect(chatBox('a').getAttribute('aria-checked')).toBe('true')
+  expect(chatBox('b').getAttribute('aria-checked')).toBe('false')
+  expect(button('Resume 1 chat').disabled).toBe(false)
+})
+
+it('disables Select all and the workspace checkbox while a resume runs', async () => {
+  const continued = Promise.withResolvers<unknown>()
+  rpc.mockImplementation((_target, method) =>
+    method === 'agentSession.restartResumable'
+      ? Promise.resolve({ sessions: offered })
+      : continued.promise
+  )
+  await mount(
+    <>
+      <NativeChatResumeOnRestartModal />
+      <NativeChatResumeStatusSegment iconOnly={false} />
+    </>
+  )
+  await act(async () => button('Resume 2 chats').click())
+  await act(async () => button('Resuming 2 chats').click())
+  const list = document.querySelector('[aria-label="Chats that would be resumed"]')!
+  const boxes = [...list.querySelectorAll('[role="checkbox"]')]
+  expect(boxes).toHaveLength(4)
+  for (const box of boxes) {
+    expect(box.hasAttribute('disabled')).toBe(true)
+  }
+  await act(async () => continued.resolve({ sessions: [], failed: [], resumed: [], continued: [] }))
+})
+
+it('moves between the list’s checkboxes with the arrow keys', async () => {
+  rpc.mockResolvedValue({ sessions: offered })
+  await mount(<NativeChatResumeOnRestartModal />)
+  // This workspace has no repo the store knows, so no project row sits between.
+  const order = [
+    namedBox('Select all chats'),
+    namedBox('Select all chats in workspace'),
+    chatBox('a'),
+    chatBox('b')
+  ]
+  const press = async (key: string) =>
+    act(async () => {
+      document.activeElement?.dispatchEvent(new KeyboardEvent('keydown', { key, bubbles: true }))
+    })
+  order[0]!.focus()
+  for (const next of order.slice(1)) {
+    await press('ArrowDown')
+    expect(document.activeElement).toBe(next)
+  }
+  // The last checkbox is the end of the list: focus never leaves it for the footer.
+  await press('ArrowDown')
+  expect(document.activeElement).toBe(order[3])
+  await press('ArrowUp')
+  expect(document.activeElement).toBe(order[2])
+})
+
+async function pressOn(element: Element, key: string): Promise<void> {
+  await act(async () => {
+    element.dispatchEvent(new KeyboardEvent('keydown', { key, bubbles: true }))
+  })
+}
+
+// Tab lands on the tree itself; its arrows must lead into the rows from there.
+it('enters the tree from its own Tab stop with the arrow, Home and End keys', async () => {
+  rpc.mockResolvedValue({ sessions: offered })
+  await mount(<NativeChatResumeOnRestartModal />)
+  const tree = document.querySelector<HTMLElement>('[role="tree"]')!
+  const first = namedBox('Select all chats')
+  const last = chatBox('b')
+
+  for (const [key, expected] of [
+    ['ArrowDown', first],
+    ['Home', first],
+    ['ArrowUp', last],
+    ['End', last]
+  ] as const) {
+    tree.focus()
+    await pressOn(tree, key)
+    expect(document.activeElement).toBe(expected)
+  }
+  // From a row, Home and End jump to the ends too.
+  await pressOn(last, 'Home')
+  expect(document.activeElement).toBe(first)
+  await pressOn(first, 'End')
+  expect(document.activeElement).toBe(last)
+})
+
+// Chromium focuses a pressed button; the keyboard must not be stranded on the arrow.
+it('hands focus from a pressed arrow to its row’s checkbox', async () => {
+  rpc.mockResolvedValue({ sessions: offered })
+  await mount(<NativeChatResumeOnRestartModal />)
+  const workspace = namedBox('Select all chats in workspace')
+  const arrow = workspace
+    .closest('[role="treeitem"]')!
+    .querySelector<HTMLButtonElement>('button[aria-expanded]')!
+
+  arrow.focus()
+  await act(async () => arrow.click())
+  expect(arrow.getAttribute('aria-expanded')).toBe('false')
+  expect(document.activeElement).toBe(workspace)
+  await pressOn(workspace, 'ArrowRight')
+  expect(arrow.getAttribute('aria-expanded')).toBe('true')
+  await pressOn(workspace, 'ArrowDown')
+  expect(document.activeElement).toBe(chatBox('a'))
+})
diff --git a/src/renderer/src/components/NativeChatResumeOnRestartModal.test.tsx b/src/renderer/src/components/NativeChatResumeOnRestartModal.test.tsx
index 988e82c96a50..2ed87aa5f310 100644
--- a/src/renderer/src/components/NativeChatResumeOnRestartModal.test.tsx
+++ b/src/renderer/src/components/NativeChatResumeOnRestartModal.test.tsx
@@ -11,6 +11,14 @@ import { NativeChatResumeStatusSegment } from './status-bar/NativeChatResumeStat
 import { TooltipProvider } from './ui/tooltip'
 import { lastToastShow } from './native-chat-resume-toast.test-support'
 import type { ResumeCandidate } from './native-chat-resume-on-restart-grouping'
+import {
+  button,
+  chatBox,
+  chatBoxes,
+  dontAskAgain,
+  failure,
+  offered
+} from './native-chat-resume-on-restart-modal.test-support'
 import {
   consumeNativeChatResumeOnRestartDialogRequest,
   getNativeChatResumeOnRestartDialogRequest,
@@ -37,46 +45,12 @@ vi.mock('sonner', () => ({ toast: vi.fn() }))
 globalThis.IS_REACT_ACT_ENVIRONMENT = true
 let root: Root
 let container: HTMLDivElement
-const offered: ResumeCandidate[] = ['a', 'b'].map((sessionId) => ({
-  sessionId,
-  workspaceId: 'workspace',
-  agent: 'codex',
-  trigger: 'quit',
-  latestPrompt: `Prompt ${sessionId}`,
-  recordedAt: 1_800_000_000_000,
-  executionHostId: 'local',
-  workspaceKind: 'git-worktree'
-}))
-
-/** A chat the host acted on and could not carry on, as it reports it. */
-function failure(sessionId: string, reason = 'agent_session_restart_work_superseded') {
-  const candidate = offered.find((entry) => entry.sessionId === sessionId)!
-  return { ...candidate, failedAt: candidate.recordedAt + 60_000, outcome: 'refused', reason }
-}
 
 /** Outcome rows carry tooltips, so every mount needs the provider the app shell supplies. */
 async function mount(node: React.ReactNode): Promise<void> {
   await act(async () => root.render(<TooltipProvider>{node}</TooltipProvider>))
 }
 
-function button(text: string): HTMLButtonElement {
-  const found = [...document.querySelectorAll('button')].find(
-    (entry) => entry.textContent?.trim() === text || entry.getAttribute('aria-label') === text
-  )
-  if (!found) {
-    throw new Error(`Missing button: ${text}`)
-  }
-  return found
-}
-
-function checkbox(index: number): HTMLElement {
-  const found = document.querySelectorAll<HTMLElement>('[role="checkbox"]')[index]
-  if (!found) {
-    throw new Error(`Missing checkbox: ${index}`)
-  }
-  return found
-}
-
 function offerIds(): string[] {
   return getNativeChatRestartOffer().candidates.map((candidate) => candidate.sessionId)
 }
@@ -126,8 +100,8 @@ it('keeps next-launch preference out of the current resume action', async () =>
     return action.promise
   })
   await mount(<NativeChatResumeOnRestartModal />)
-  await act(async () => checkbox(1).click())
-  await act(async () => checkbox(2).click())
+  await act(async () => chatBox('b').click())
+  await act(async () => dontAskAgain().click())
   await act(async () => button('Resume 1 chat').click())
   expect(useAppStore.getState().settings?.nativeChatResumeWorkOnRestart).toBe(true)
   expect(rpc.mock.calls.map((call) => [call[1], call[2]])).toEqual([
@@ -148,8 +122,10 @@ it('keeps next-launch preference out of the current resume action', async () =>
 it('offers exactly Dismiss all and the resume action', async () => {
   rpc.mockResolvedValue({ sessions: offered })
   await mount(<NativeChatResumeOnRestartModal />)
-  // Row and preference checkboxes are buttons too; the controls are what is left after them.
-  const controls = document.querySelectorAll('[role="dialog"] button:not([role="checkbox"])')
+  // Checkboxes and tree arrows are buttons too; the controls are what is left after them.
+  const controls = document.querySelectorAll(
+    '[role="dialog"] button:not([role="checkbox"]):not([aria-expanded])'
+  )
   expect([...controls].map((entry) => entry.textContent?.trim())).toEqual([
     'Dismiss all',
     'Resume 2 chats',
@@ -183,7 +159,7 @@ it('says under each chat what it was doing when Orca went away', async () => {
 it('snoozes to the status-bar offer when the dialog is closed', async () => {
   rpc.mockResolvedValue({ sessions: offered })
   await mount(<NativeChatResumeOnRestartModal />)
-  await act(async () => checkbox(2).click())
+  await act(async () => dontAskAgain().click())
   await act(async () => button('Close').click())
   expect(useAppStore.getState().settings?.nativeChatResumeWorkOnRestart).toBe(true)
   expect(rpc.mock.calls.map((call) => call[1])).toEqual(['agentSession.restartResumable'])
@@ -228,7 +204,7 @@ it('saves Don’t ask again when the offer is dismissed outright', async () => {
     method === 'agentSession.restartResumable' ? { sessions: offered } : { dismissed: 2 }
   )
   await mount(<NativeChatResumeOnRestartModal />)
-  await act(async () => checkbox(2).click())
+  await act(async () => dontAskAgain().click())
   await act(async () => button('Dismiss all').click())
   expect(useAppStore.getState().settings?.nativeChatResumeWorkOnRestart).toBe(true)
 })
@@ -255,7 +231,7 @@ it('never re-offers a resumed chat when the status entry reopens the dialog', as
       <NativeChatResumeStatusSegment iconOnly={false} />
     </>
   )
-  await act(async () => checkbox(1).click())
+  await act(async () => chatBox('b').click())
   await act(async () => button('Resume 1 chat').click())
   expect(offerIds()).toEqual(['b'])
   // The action closes the dialog itself; the status entry is the way back to what is left.
@@ -264,8 +240,8 @@ it('never re-offers a resumed chat when the status entry reopens the dialog', as
   await act(async () => button('1 chat to resume').click())
   expect(document.querySelector('[role="dialog"]')).not.toBeNull()
   expect(offerIds()).toEqual(['b'])
-  // One offered row plus the preference box — never the resumed chat again.
-  expect(document.querySelectorAll('[role="checkbox"]')).toHaveLength(2)
+  // One offered row — never the resumed chat again.
+  expect(chatBoxes()).toHaveLength(1)
 })
 
 // The resume outlives the dialog, as a skill update does: the status bar carries it while in flight.
@@ -326,15 +302,15 @@ it('keeps a dialog reopened mid-resume open over the chats still offered', async
       <NativeChatResumeStatusSegment iconOnly={false} />
     </>
   )
-  await act(async () => checkbox(2).click())
+  await act(async () => chatBox('c').click())
   await act(async () => button('Resume 2 chats').click())
   expect(document.querySelector('[role="dialog"]')).toBeNull()
   await act(async () => button('1 chat to resume').click())
   expect(document.querySelector('[role="dialog"]')).not.toBeNull()
   // Mid-run the ticks say what is running, so the chat left out reads as left out.
   const rowC = () => document.querySelector('[role="checkbox"][aria-label*="Prompt c"]')
-  expect(checkbox(0).getAttribute('data-state')).toBe('checked')
-  expect(checkbox(1).getAttribute('data-state')).toBe('checked')
+  expect(chatBox('a').getAttribute('data-state')).toBe('checked')
+  expect(chatBox('b').getAttribute('data-state')).toBe('checked')
   expect(rowC()?.getAttribute('data-state')).toBe('unchecked')
 
   await act(async () =>
@@ -350,20 +326,20 @@ it('keeps a dialog reopened mid-resume open over the chats still offered', async
   expect(dialog?.textContent).not.toContain('Prompt a')
   // The run is over, so the chat left out is actionable again, and this opening ticks it afresh.
   expect(button('Dismiss all').disabled).toBe(false)
-  expect(checkbox(0).getAttribute('data-state')).toBe('checked')
+  expect(chatBox('c').getAttribute('data-state')).toBe('checked')
   expect(button('Resume 1 chat').disabled).toBe(false)
 })
 
 it('starts each opening from the default ticks, not the ones left at the last close', async () => {
   rpc.mockResolvedValue({ sessions: offered })
   await mount(<NativeChatResumeOnRestartModal />)
-  await act(async () => checkbox(1).click())
+  await act(async () => chatBox('b').click())
   expect(button('Resume 1 chat')).toBeTruthy()
   await act(async () => button('Close').click())
   expect(document.querySelector('[role="dialog"]')).toBeNull()
 
   await act(async () => requestNativeChatResumeOnRestartDialog())
-  expect(checkbox(1).getAttribute('data-state')).toBe('checked')
+  expect(chatBox('b').getAttribute('data-state')).toBe('checked')
   expect(button('Resume 2 chats').disabled).toBe(false)
 })
 
@@ -381,7 +357,7 @@ it('settles the offer for the chats a resume reattached', async () => {
         }
   )
   await mount(<NativeChatResumeOnRestartModal />)
-  await act(async () => checkbox(1).click())
+  await act(async () => chatBox('b').click())
   await act(async () => button('Resume 1 chat').click())
   expect(offerIds()).toEqual(['b'])
 })
@@ -506,8 +482,8 @@ it('dispatches the selected action while a future preference save is still pendi
         }
   )
   await mount(<NativeChatResumeOnRestartModal />)
-  await act(async () => checkbox(1).click())
-  await act(async () => checkbox(2).click())
+  await act(async () => chatBox('b').click())
+  await act(async () => dontAskAgain().click())
   await act(async () => button('Resume 1 chat').click())
   expect(rpc.mock.calls.at(-1)?.slice(1)).toEqual([
     'agentSession.restartContinue',
@@ -693,9 +669,11 @@ it('keeps a lost resume request marked failed when its Dismiss fails', async ()
 
 /** Every button in the dialog, in order; row checkboxes are buttons too, so they are left out. */
 function dialogControls(): (string | null)[] {
-  return [...document.querySelectorAll('[role="dialog"] button:not([role="checkbox"])')].map(
-    (entry) => entry.textContent?.trim() || entry.getAttribute('aria-label')
-  )
+  return [
+    ...document.querySelectorAll(
+      '[role="dialog"] button:not([role="checkbox"]):not([aria-expanded])'
+    )
+  ].map((entry) => entry.textContent?.trim() || entry.getAttribute('aria-label'))
 }
 
 // A chat the resume could not carry on stays in the same dialog — same title, checkboxes and
@@ -729,7 +707,7 @@ it('lists a chat the resume could not carry on when the dialog reopens, with wha
   expect(dialog?.textContent).not.toContain('Dismiss failed')
   // The resumed chat left the list as it always did; the failed one is a row with a checkbox.
   expect(dialog?.textContent).not.toContain('Prompt a')
-  expect(document.querySelectorAll('[role="checkbox"]')).toHaveLength(2)
+  expect(chatBoxes()).toHaveLength(1)
   expect(document.querySelector('[aria-label="Prompt b: Couldn’t resume"]')).not.toBeNull()
   expect(dialog?.textContent).toContain('To resume:')
   expect(dialog?.textContent).toContain('Open the chat and reply.')
@@ -741,7 +719,7 @@ it('lists a chat the resume could not carry on when the dialog reopens, with wha
     'Close'
   ])
   // A retry cannot fix newer work in the chat, so it is not pre-selected for one.
-  expect(checkbox(0).getAttribute('data-state')).toBe('unchecked')
+  expect(chatBox('b').getAttribute('data-state')).toBe('unchecked')
 
   await act(async () => button('Open chat').click())
   expect(activate).toHaveBeenCalledWith({
@@ -778,7 +756,7 @@ it.each(['footer', 'row'] as const)(
       'Close it there, then retry.'
     )
     // A retry can fix an ownership clash, so the row starts selected.
-    expect(checkbox(0).getAttribute('data-state')).toBe('checked')
+    expect(chatBox('b').getAttribute('data-state')).toBe('checked')
 
     await act(async () => button(from === 'footer' ? 'Resume 1 chat' : 'Retry').click())
     expect(rpc.mock.calls.at(-1)?.slice(1)).toEqual([
@@ -860,13 +838,13 @@ it('keeps a failure the host marks unretryable out of Resume, even after a tick'
   await mount(<NativeChatResumeOnRestartModal />)
   await act(async () => requestNativeChatResumeOnRestartDialog())
   // An older host sends no flag, and the row stays selectable as it always was.
-  expect(checkbox(0).hasAttribute('disabled')).toBe(false)
-  await act(async () => checkbox(0).click())
+  expect(chatBox('b').hasAttribute('disabled')).toBe(false)
+  await act(async () => chatBox('b').click())
   expect(button('Resume 1 chat').disabled).toBe(false)
 
   failed = [{ ...failure('b'), retryable: false }]
   await act(async () => void (await refreshNativeChatRestartOffer()))
-  expect(checkbox(0).hasAttribute('disabled')).toBe(true)
+  expect(chatBox('b').hasAttribute('disabled')).toBe(true)
   expect(button('Resume 0 chats').disabled).toBe(true)
   expect(button('Open chat').disabled).toBe(false)
 })
@@ -887,14 +865,14 @@ it('dismisses one failed chat by name, and every record through Dismiss all', as
   )
   await mount(<NativeChatResumeOnRestartModal />)
   await act(async () => requestNativeChatResumeOnRestartDialog())
-  expect(document.querySelectorAll('[role="checkbox"]')).toHaveLength(3)
+  expect(chatBoxes()).toHaveLength(2)
   await act(async () => button('Dismiss "Prompt a" in workspace').click())
   expect(rpc.mock.calls.at(-1)?.slice(1)).toEqual([
     'agentSession.restartResumableDismiss',
     { sessionIds: ['a'] }
   ])
   expect(document.querySelector('[role="dialog"]')?.textContent).not.toContain('Prompt a')
-  expect(document.querySelectorAll('[role="checkbox"]')).toHaveLength(2)
+  expect(chatBoxes()).toHaveLength(1)
   await act(async () => button('Dismiss all').click())
   expect(rpc.mock.calls.at(-1)?.slice(1)).toEqual(['agentSession.restartResumableDismiss', {}])
   expect(document.querySelector('[role="dialog"]')).toBeNull()
diff --git a/src/renderer/src/components/NativeChatResumeOnRestartModal.tsx b/src/renderer/src/components/NativeChatResumeOnRestartModal.tsx
index 4d7e7c8bfb7f..640c62c9f3e4 100644
--- a/src/renderer/src/components/NativeChatResumeOnRestartModal.tsx
+++ b/src/renderer/src/components/NativeChatResumeOnRestartModal.tsx
@@ -1,4 +1,4 @@
-import { useCallback, useMemo, useState, useSyncExternalStore } from 'react'
+import { useCallback, useMemo, useRef, useState, useSyncExternalStore } from 'react'
 import { useNativeChatRestartOfferEnabled } from './native-chat-restart-offer-gate'
 import { RotateCcw } from 'lucide-react'
 import { Button } from './ui/button'
@@ -15,12 +15,18 @@ import { useAppStore } from '../store'
 import { translate } from '@/i18n/i18n'
 import { activateAiVaultStructuredSession } from '@/lib/activate-ai-vault-structured-session'
 import { ResumeOnRestartGroups } from './NativeChatResumeOnRestartGroups'
+import { ResumeTreeRow } from './NativeChatResumeTreeRow'
 import {
   resumeFailureGuidance,
   resumeFailureSelectable,
   type ResumeFailureAction
 } from './native-chat-resume-failure-guidance'
-import type { ResumeCandidate, ResumeFailure } from './native-chat-resume-on-restart-grouping'
+import {
+  resumeSelectionState,
+  toggleResumeSelection,
+  type ResumeCandidate,
+  type ResumeFailure
+} from './native-chat-resume-on-restart-grouping'
 import {
   consumeNativeChatResumeOnRestartDialogRequest,
   getNativeChatResumeOnRestartDialogRequest,
@@ -64,6 +70,56 @@ function selectedByDefault(failure: ResumeFailure | undefined): boolean {
   return guidance.primary === 'retry' || guidance.secondary === 'retry'
 }
 
+/**
+ * Tree keys. On a row's checkbox: Up/Down step between the enabled checkboxes, Home/End jump to the
+ * first/last, Left collapses and Right expands the node through its own disclosure; Space toggles
+ * natively. On the tree itself (its Tab stop): Down/Home enter at the first checkbox, Up/End at
+ * the last.
+ */
+function moveInTree(event: React.KeyboardEvent<HTMLElement>): void {
+  const target = event.target
+  if (!(target instanceof HTMLElement)) {
+    return
+  }
+  const boxes = [
+    ...event.currentTarget.querySelectorAll<HTMLElement>('[role="checkbox"]:not(:disabled)')
+  ]
+  const onTree = target === event.currentTarget
+  if (!onTree && target.getAttribute('role') !== 'checkbox') {
+    return
+  }
+  const jump =
+    event.key === 'Home' || (onTree && event.key === 'ArrowDown')
+      ? boxes[0]
+      : event.key === 'End' || (onTree && event.key === 'ArrowUp')
+        ? boxes.at(-1)
+        : undefined
+  if (jump) {
+    event.preventDefault()
+    jump.focus()
+    return
+  }
+  if (onTree) {
+    return
+  }
+  if (event.key === 'ArrowDown' || event.key === 'ArrowUp') {
+    event.preventDefault()
+    boxes[boxes.indexOf(target) + (event.key === 'ArrowDown' ? 1 : -1)]?.focus()
+    return
+  }
+  if (event.key === 'ArrowLeft' || event.key === 'ArrowRight') {
+    event.preventDefault()
+    // Rows are flat treeitems, so the nearest one is this checkbox's own node.
+    const disclosure = target
+      .closest('[role="treeitem"]')
+      ?.querySelector<HTMLButtonElement>('button[aria-expanded]')
+    const open = disclosure?.getAttribute('aria-expanded') === 'true'
+    if (disclosure && open === (event.key === 'ArrowLeft')) {
+      disclosure.click()
+    }
+  }
+}
+
 export function NativeChatResumeOnRestartModal(): React.JSX.Element | null {
   const offerEnabled = useNativeChatRestartOfferEnabled()
   const { candidates, failed, listedAt } = useNativeChatRestartOffer(offerEnabled)
@@ -81,6 +137,7 @@ export function NativeChatResumeOnRestartModal(): React.JSX.Element | null {
   )
   const updateSettings = useAppStore((store) => store.updateSettings)
   const [dontAskAgain, setDontAskAgain] = useState(false)
+  const resumeButtonRef = useRef<HTMLButtonElement>(null)
   // The store's: the resume outlives this dialog, which can close or reopen mid-run.
   const resuming = useNativeChatRestartResuming()
   const busy = resuming.length > 0
@@ -97,24 +154,31 @@ export function NativeChatResumeOnRestartModal(): React.JSX.Element | null {
       setOverrides(new Map())
     }
   }
-  /** Derived from the host's own list, so an action can never name a chat it did not list. */
-  const chosen = useMemo(
+  /** Every chat a tick can name; a failure the host marks unretryable is left out. */
+  const selectable = useMemo(
     () =>
       rows
         .filter((row) => {
           const failure = failureBySession.get(row.sessionId)
-          // A tick made before the host marked it unretryable must not carry into the action.
-          return (
-            (!failure || resumeFailureSelectable(failure)) &&
-            (overrides.get(row.sessionId) ?? selectedByDefault(failure))
-          )
+          return !failure || resumeFailureSelectable(failure)
         })
         .map((row) => row.sessionId),
-    [rows, overrides, failureBySession]
+    [rows, failureBySession]
+  )
+  /** Derived from the host's own list, so an action can never name a chat it did not list. */
+  const chosen = useMemo(
+    () =>
+      // A tick made before the host marked it unretryable must not carry into the action.
+      selectable.filter(
+        (sessionId) =>
+          overrides.get(sessionId) ?? selectedByDefault(failureBySession.get(sessionId))
+      ),
+    [selectable, overrides, failureBySession]
   )
   const selected = useMemo(() => new Set(chosen), [chosen])
   // Mid-run the ticks show what is running; this opening's own ticks may name chats left out of it.
   const ticked = useMemo(() => (busy ? new Set(resuming) : selected), [busy, resuming, selected])
+  const allSelection = resumeSelectionState(selectable, ticked)
 
   const toggleSelected = useCallback((sessionId: string, checked: boolean) => {
     setOverrides((current) => new Map(current).set(sessionId, checked))
@@ -176,6 +240,10 @@ export function NativeChatResumeOnRestartModal(): React.JSX.Element | null {
   }
 
   const interruptedByUpdate = rows.some((row) => row.trigger === 'update')
+  const selectAllLabel = translate(
+    'auto.components.NativeChatResumeOnRestartModal.selectAllLabel',
+    'Select all'
+  )
 
   return (
     <Dialog
@@ -188,7 +256,20 @@ export function NativeChatResumeOnRestartModal(): React.JSX.Element | null {
     >
       {/* Height is capped, never the data: the list scrolls inside the dialog so the header and
           the primary action stay put however many chats were interrupted. */}
-      <DialogContent className="grid-rows-[auto_minmax(0,1fr)_auto_auto] sm:max-w-xl max-h-[85vh]">
+      {/* Wide enough for a nested chat row to keep its name, model and age on one line. */}
+      <DialogContent
+        className="grid-rows-[auto_minmax(0,1fr)_auto] sm:max-w-3xl max-h-[85vh]"
+        // Keep the scrollable list out of initial focus, including while Resume is disabled.
+        onOpenAutoFocus={(event) => {
+          event.preventDefault()
+          const resumeButton = resumeButtonRef.current
+          if (resumeButton && !resumeButton.disabled) {
+            resumeButton.focus()
+          } else if (event.currentTarget instanceof HTMLElement) {
+            event.currentTarget.focus()
+          }
+        }}
+      >
         <DialogHeader>
           <DialogTitle>
             {/* Plain wrapper owns the icon spacing; DialogTitle owns its own. */}
@@ -214,13 +295,44 @@ export function NativeChatResumeOnRestartModal(): React.JSX.Element | null {
         </DialogHeader>
 
         <div
+          role="tree"
           tabIndex={0}
           aria-label={translate(
             'auto.components.NativeChatResumeOnRestartModal.listLabel',
             'Chats that would be resumed'
           )}
-          className="min-h-0 overflow-y-auto scrollbar-sleek rounded-md border bg-muted/35 p-1.5"
+          // The sidebar's own surface, so its workspaces read here as they do there.
+          className="min-h-0 overflow-y-auto scrollbar-sleek rounded-md bg-worktree-sidebar p-1.5 pb-2"
+          onKeyDown={moveInTree}
         >
+          {/* Here, not in the groups: a list may hold one set of groups per machine. The tree's one
+              divider sets it apart from the nodes. */}
+          <div className="mb-1 border-b border-worktree-sidebar-border pb-0.5">
+            <ResumeTreeRow
+              depth={0}
+              name={selectAllLabel}
+              checked={allSelection.checked}
+              disabled={busy || allSelection.total === 0}
+              onCheckedChange={() =>
+                toggleResumeSelection(selectable, allSelection, toggleSelected)
+              }
+              checkboxLabel={translate(
+                'auto.components.NativeChatResumeOnRestartModal.selectAll',
+                'Select all chats'
+              )}
+            >
+              <span className="min-w-0 truncate text-xs font-semibold text-muted-foreground">
+                {selectAllLabel}
+              </span>
+              <span className="ml-auto shrink-0 pl-2 text-[11px] tabular-nums text-muted-foreground">
+                {translate(
+                  'auto.components.NativeChatResumeOnRestartModal.selectedCount',
+                  '{{value0}} of {{value1}} selected',
+                  { value0: allSelection.selectedCount, value1: allSelection.total }
+                )}
+              </span>
+            </ResumeTreeRow>
+          </div>
           <ResumeOnRestartGroups
             candidates={rows}
             listedAt={listedAt}
@@ -232,37 +344,38 @@ export function NativeChatResumeOnRestartModal(): React.JSX.Element | null {
           />
         </div>
 
-        <label className="flex items-start gap-2.5">
-          <Checkbox
-            checked={dontAskAgain}
-            disabled={busy}
-            onCheckedChange={(next) => setDontAskAgain(next === true)}
-            className="mt-0.5"
-          />
-          <span className="min-w-0 space-y-0.5">
-            <span className="block text-sm">
-              {translate(
-                'auto.components.NativeChatResumeOnRestartModal.dontAskAgain',
-                "Don't ask again (resume automatically)"
-              )}
-            </span>
-            {/* Where to undo it; what it does is the body copy's job. */}
-            <span className="block text-xs text-muted-foreground">
-              {translate(
-                'auto.components.NativeChatResumeOnRestartModal.dontAskAgainHint',
-                'You can turn this off in Settings → Experimental → Chat UI.'
-              )}
-            </span>
-          </span>
-        </label>
-
         {/* Two controls: one deletes the offer, one acts on it. Closing snoozes, so it needs none. */}
-        <DialogFooter className="sm:justify-between">
+        <DialogFooter className="sm:items-center">
+          {/* Why order-last: the narrow footer stacks bottom-up, so this keeps the option above the actions. */}
+          <label className="order-last flex min-w-0 items-start gap-2.5 sm:order-none sm:mr-auto">
+            <Checkbox
+              checked={dontAskAgain}
+              disabled={busy}
+              onCheckedChange={(next) => setDontAskAgain(next === true)}
+              className="mt-0.5"
+            />
+            <span className="min-w-0 space-y-0.5">
+              <span className="block text-sm">
+                {translate(
+                  'auto.components.NativeChatResumeOnRestartModal.dontAskAgain',
+                  "Don't ask again (resume automatically)"
+                )}
+              </span>
+              {/* Where to undo it; what it does is the body copy's job. */}
+              <span className="block text-xs text-muted-foreground">
+                {translate(
+                  'auto.components.NativeChatResumeOnRestartModal.dontAskAgainHint',
+                  'You can turn this off in Settings → Experimental → Chat UI.'
+                )}
+              </span>
+            </span>
+          </label>
           {/* Quiet, explicit cleanup of the durable records. */}
           <Button variant="ghost" size="sm" disabled={busy} onClick={() => void dismissAll()}>
             {translate('auto.components.NativeChatResumeOnRestartModal.dismissAll', 'Dismiss all')}
           </Button>
           <Button
+            ref={resumeButtonRef}
             variant="default"
             size="sm"
             disabled={busy || chosen.length === 0}
diff --git a/src/renderer/src/components/NativeChatResumeTreeHarness.test-support.tsx b/src/renderer/src/components/NativeChatResumeTreeHarness.test-support.tsx
new file mode 100644
index 000000000000..449a92887612
--- /dev/null
+++ b/src/renderer/src/components/NativeChatResumeTreeHarness.test-support.tsx
@@ -0,0 +1,47 @@
+// The resume tree mounted with selection state, as the dialog owns it, for the tree's tests.
+
+import { useState } from 'react'
+import { ResumeOnRestartGroups } from './NativeChatResumeOnRestartGroups'
+import { TooltipProvider } from './ui/tooltip'
+import type { ResumeCandidate, ResumeFailure } from './native-chat-resume-on-restart-grouping'
+import { onToggleSpy } from './native-chat-resume-tree.test-support'
+
+/** Owns the selection the way the dialog does, so group toggles show their effect. */
+export function ResumeTreeHarness({
+  candidates,
+  initiallySelected,
+  busy = false,
+  failureFor
+}: {
+  candidates: ResumeCandidate[]
+  initiallySelected?: string[]
+  busy?: boolean
+  failureFor?: (sessionId: string) => ResumeFailure | undefined
+}): React.JSX.Element {
+  const [selected, setSelected] = useState<ReadonlySet<string>>(
+    () => new Set(initiallySelected ?? candidates.map((entry) => entry.sessionId))
+  )
+  return (
+    <TooltipProvider>
+      <ResumeOnRestartGroups
+        candidates={candidates}
+        listedAt={1_800_000_060_000}
+        busy={busy}
+        selected={selected}
+        onToggle={(sessionId, checked) => {
+          onToggleSpy(sessionId, checked)
+          setSelected((current) => {
+            const next = new Set(current)
+            if (checked) {
+              next.add(sessionId)
+            } else {
+              next.delete(sessionId)
+            }
+            return next
+          })
+        }}
+        failureFor={failureFor}
+      />
+    </TooltipProvider>
+  )
+}
diff --git a/src/renderer/src/components/NativeChatResumeTreeRow.tsx b/src/renderer/src/components/NativeChatResumeTreeRow.tsx
new file mode 100644
index 000000000000..fe5df6e9d9c2
--- /dev/null
+++ b/src/renderer/src/components/NativeChatResumeTreeRow.tsx
@@ -0,0 +1,140 @@
+import { ChevronRight } from 'lucide-react'
+import { translate } from '@/i18n/i18n'
+import { Checkbox } from './ui/checkbox'
+
+/** Indent per tree level, right of the shared checkbox column. */
+const RESUME_TREE_INDENT_PX = 18
+
+/** Width of the checkbox column (w-7). */
+const RESUME_TREE_CHECKBOX_COLUMN_PX = 28
+
+/** Where a row's body starts: the checkbox column, the arrow slot (size-4.5) and the body's pl-1. */
+const RESUME_TREE_BODY_OFFSET_PX = RESUME_TREE_CHECKBOX_COLUMN_PX + 18 + 4
+
+/**
+ * One row of the resume tree: the checkbox in the list's single left column, the indent for its
+ * depth, a disclosure arrow (an empty slot on a leaf, so icons line up), then the caller's body.
+ *
+ * The row is a flat `treeitem` carrying its own `aria-level`, so the tree's keyboard handling can
+ * find a row's disclosure without walking nested groups.
+ */
+export function ResumeTreeRow({
+  depth,
+  expanded,
+  onExpandedChange,
+  name,
+  checked,
+  disabled,
+  onCheckedChange,
+  checkboxLabel,
+  compact = false,
+  trailing,
+  below,
+  children
+}: {
+  depth: number
+  /** Absent on a leaf; a node with children is open or closed. */
+  expanded?: boolean
+  onExpandedChange?: (expanded: boolean) => void
+  /** Names the node in its disclosure's label. */
+  name: string
+  checked: boolean | 'indeterminate'
+  disabled: boolean
+  onCheckedChange: (checked: boolean) => void
+  checkboxLabel: string
+  /** A chat row sits a little tighter than a group row. */
+  compact?: boolean
+  /** Controls beside the row that must not toggle its checkbox. */
+  trailing?: React.ReactNode
+  /** A line under the row, aligned with its body. */
+  below?: React.ReactNode
+  children: React.ReactNode
+}): React.JSX.Element {
+  const indent = depth * RESUME_TREE_INDENT_PX
+  return (
+    <div role="treeitem" aria-level={depth + 1} aria-expanded={expanded} className="flex flex-col">
+      <div className="group/row relative flex min-w-0 items-center gap-1">
+        <label
+          data-compact={compact}
+          className="flex h-7 min-w-0 flex-1 cursor-pointer items-center rounded-md pr-2.5 group-hover/row:bg-worktree-sidebar-accent has-[:disabled]:cursor-default data-[compact=true]:h-6.5"
+        >
+          <span className="flex w-7 shrink-0 justify-center">
+            <Checkbox
+              checked={checked}
+              disabled={disabled}
+              onCheckedChange={(next) => onCheckedChange(next === true)}
+              aria-label={checkboxLabel}
+            />
+          </span>
+          <span aria-hidden="true" className="shrink-0" style={{ width: indent }} />
+          {/* The arrow's slot, kept on a leaf too so icons line up. */}
+          <span aria-hidden="true" className="size-4.5 shrink-0" />
+          <span className="flex min-w-0 flex-1 items-center gap-1.5 pl-1">{children}</span>
+        </label>
+        {expanded !== undefined && (
+          // Laid over its slot rather than inside the label, so pressing it never toggles the
+          // checkbox. Off the tab order: Left/Right on the row's checkbox do the same.
+          <button
+            type="button"
+            tabIndex={-1}
+            aria-expanded={expanded}
+            aria-label={
+              expanded
+                ? translate(
+                    'auto.components.NativeChatResumeOnRestartModal.collapseNode',
+                    'Collapse {{value0}}',
+                    { value0: name }
+                  )
+                : translate(
+                    'auto.components.NativeChatResumeOnRestartModal.expandNode',
+                    'Expand {{value0}}',
+                    { value0: name }
+                  )
+            }
+            onClick={(event) => {
+              onExpandedChange?.(!expanded)
+              // A pointer press focuses the arrow, where no tree key works; hand focus to the
+              // row's checkbox, or to the tree when that is disabled.
+              const row = event.currentTarget.closest('[role="treeitem"]')
+              const box = row?.querySelector<HTMLElement>('[role="checkbox"]:not(:disabled)')
+              const next = box ?? row?.closest<HTMLElement>('[role="tree"]')
+              next?.focus()
+            }}
+            className="group/disclosure absolute top-1/2 flex size-4.5 -translate-y-1/2 items-center justify-center rounded-sm text-muted-foreground hover:bg-foreground/8"
+            style={{ left: RESUME_TREE_CHECKBOX_COLUMN_PX + indent }}
+          >
+            <ChevronRight className="size-3 transition-transform group-aria-expanded/disclosure:rotate-90 motion-reduce:transition-none" />
+          </button>
+        )}
+        {trailing}
+      </div>
+      {below && (
+        <div className="pr-2.5" style={{ paddingLeft: RESUME_TREE_BODY_OFFSET_PX + indent }}>
+          {below}
+        </div>
+      )}
+    </div>
+  )
+}
+
+/** A group node's "x of y" on the right of its row. */
+export function ResumeTreeCount({
+  selectedCount,
+  total
+}: {
+  selectedCount: number
+  total: number
+}): React.JSX.Element | null {
+  if (total === 0) {
+    return null
+  }
+  return (
+    <span className="ml-auto shrink-0 pl-2 text-[11px] tabular-nums text-muted-foreground">
+      {translate(
+        'auto.components.NativeChatResumeOnRestartModal.workspaceSelectedCount',
+        '{{value0}} of {{value1}}',
+        { value0: selectedCount, value1: total }
+      )}
+    </span>
+  )
+}
diff --git a/src/renderer/src/components/NewWorkspaceComposerCard.file-drop.test.tsx b/src/renderer/src/components/NewWorkspaceComposerCard.file-drop.test.tsx
new file mode 100644
index 000000000000..7146e77d6d13
--- /dev/null
+++ b/src/renderer/src/components/NewWorkspaceComposerCard.file-drop.test.tsx
@@ -0,0 +1,278 @@
+// @vitest-environment happy-dom
+import type * as ReactI18nextModule from 'react-i18next'
+import { act, renderHook } from '@testing-library/react'
+import { useNewWorkspaceComposerFileDrop } from './new-workspace/use-new-workspace-composer-file-drop'
+import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest'
+import { renderCard, unmountCard } from './NewWorkspaceComposerCard.test-fixture'
+import { createRef } from 'react'
+import { resolveComposerAttachmentTarget } from '../hooks/composer-state/composer-attachment-target'
+import { useAttachmentDropState } from '../hooks/composer-state/attachment-drop-state'
+import type { ProjectGroup } from '../../../shared/project-group-types'
+
+const uploads = vi.hoisted(() => ({ importPaths: vi.fn() }))
+vi.mock('@/runtime/runtime-file-client', () => ({
+  importExternalPathsToRuntime: uploads.importPaths
+}))
+
+vi.mock('@/store', () => ({
+  useAppStore: Object.assign(
+    (selector: (state: unknown) => unknown) => selector({ settings: {}, projects: [], repos: [] }),
+    {
+      getState: () => ({
+        sshConnectionStates: connections,
+        sshStateByEnvironment: runtimeConnections
+      })
+    }
+  )
+}))
+vi.mock('react-i18next', async (importOriginal) => ({
+  ...(await importOriginal<typeof ReactI18nextModule>()),
+  useTranslation: () => ({})
+}))
+vi.mock('@/components/contextual-tours/use-contextual-tour', () => ({
+  useContextualTour: () => {}
+}))
+vi.mock('@/components/sidebar/AddRemoteHostDialog', () => ({ AddRemoteHostDialog: () => null }))
+vi.mock('./new-workspace/NewWorkspaceComposerProjectSection', () => ({
+  NewWorkspaceComposerProjectSection: () => null
+}))
+vi.mock('./new-workspace/NewWorkspaceComposerNameSection', () => ({
+  NewWorkspaceComposerNameSection: () => null
+}))
+vi.mock('./new-workspace/NewWorkspaceComposerAgentSection', () => ({
+  NewWorkspaceComposerAgentSection: () => null
+}))
+vi.mock('./new-workspace/NewWorkspaceComposerAdvancedSection', () => ({
+  NewWorkspaceComposerAdvancedSection: () => null
+}))
+vi.mock('./new-workspace/NewWorkspaceComposerFooter', () => ({
+  NewWorkspaceComposerFooter: () => <textarea />
+}))
+
+const runtimeConnections = vi.hoisted(
+  () => new Map<string, { connectionStates: Map<string, { connectionGeneration: number }> }>()
+)
+const connections = vi.hoisted(() => new Map<string, { connectionGeneration: number }>())
+const prepare = vi.fn(async ({ paths }: { paths: string[] }) => ({ paths, failures: [] }))
+const cards: HTMLDivElement[] = []
+beforeEach(() => {
+  vi.clearAllMocks()
+  connections.clear()
+  runtimeConnections.clear()
+  uploads.importPaths.mockResolvedValue({
+    results: [
+      {
+        status: 'imported',
+        destPath: '/folder/.orca/drops/a.txt',
+        kind: 'file'
+      }
+    ]
+  })
+  vi.stubGlobal('api', {
+    fs: {
+      getPathForFile: (file: File) => `/drop/${file.name}`,
+      prepareDroppedPaths: prepare
+    }
+  })
+})
+afterEach(() => {
+  for (const card of cards.splice(0)) {
+    unmountCard(card)
+  }
+  vi.unstubAllGlobals()
+})
+async function card(
+  attach: (paths: string[], current: () => boolean) => Promise<void>,
+  path = '/repo'
+) {
+  const container = await renderCard({
+    selectedRepoPath: path,
+    selectedRepoExecutionHostId: 'local',
+    onNativeFileDrop: attach,
+    projectHostSetupOptions: []
+  })
+  cards.push(container)
+  return container
+}
+async function drop(container: HTMLDivElement) {
+  const event = new Event('drop', { bubbles: true, cancelable: true, composed: true })
+  Object.defineProperty(event, 'isTrusted', { value: true })
+  Object.defineProperty(event, 'dataTransfer', {
+    value: { types: ['Files'], files: [new File(['x'], 'a.txt')] }
+  })
+  await act(async () => {
+    container.querySelector('textarea')!.dispatchEvent(event)
+  })
+}
+describe('new workspace card file drop ownership', () => {
+  it.each([
+    ['/folder/source-repo', false],
+    ['/outside/source-repo', false],
+    ['/folder/source-repo', true],
+    ['/outside/source-repo', true]
+  ] as const)(
+    'uploads into the selected folder project with task source %s (changes during preparation: %s)',
+    async (sourcePath, changesSource) => {
+      const attach = vi.fn()
+      const group: ProjectGroup = {
+        id: 'folder-project',
+        name: 'Folder',
+        parentPath: '/folder',
+        connectionId: 'ssh-a',
+        parentGroupId: null,
+        createdFrom: 'manual',
+        tabOrder: 0,
+        isCollapsed: false,
+        color: null,
+        createdAt: 0,
+        updatedAt: 0
+      }
+      connections.set('ssh-a', { connectionGeneration: 1 })
+      const initialProps: { source: string } = { source: sourcePath }
+      const hook = renderHook(
+        ({ source }: { source: string }) => {
+          const target = resolveComposerAttachmentTarget({
+            selectedProjectGroup: group,
+            selectedRepoPath: source,
+            selectedRepoExecutionHostId: 'ssh:ssh-a',
+            selectedRepoSettings: {},
+            connectionId: 'ssh-a'
+          })
+          const dropState = useAttachmentDropState({
+            agentPromptRef: { current: '' },
+            cancelPromptCaretFrame: () => {},
+            promptCaretFrameRef: { current: null },
+            promptTextareaRef: createRef<HTMLTextAreaElement>(),
+            connectionId: target.connectionId,
+            selectedRepoPath: target.path ?? undefined,
+            selectedRepoSettings: target.settings,
+            setAgentPrompt: () => {},
+            setAttachmentPaths: attach
+          })
+          return useNewWorkspaceComposerFileDrop({
+            projectPath: target.path,
+            hostId: target.hostId,
+            connectionId: target.connectionId,
+            applyDrop: dropState.applyNativeDrop
+          })
+        },
+        { initialProps }
+      )
+      const owner = document.createElement('div')
+      const textarea = document.createElement('textarea')
+      owner.append(textarea)
+      document.body.append(owner)
+      act(() => hook.result.current(owner))
+      try {
+        const gate = Promise.withResolvers<{ paths: string[]; failures: never[] }>()
+        prepare.mockImplementationOnce(() => gate.promise)
+        await drop(owner)
+        if (changesSource) {
+          hook.rerender({ source: '/different-task-source' })
+        }
+        await act(async () => gate.resolve({ paths: ['/drop/a.txt'], failures: [] }))
+        expect(uploads.importPaths).toHaveBeenCalledExactlyOnceWith(
+          expect.objectContaining({ worktreePath: '/folder', connectionId: 'ssh-a' }),
+          ['/drop/a.txt'],
+          '/folder/.orca/drops',
+          expect.any(Object)
+        )
+        expect(attach).toHaveBeenCalledOnce()
+      } finally {
+        act(() => hook.result.current(null))
+        hook.unmount()
+        owner.remove()
+      }
+    }
+  )
+  it('delivers to the card under the cursor even when another card mounts later', async () => {
+    const first = vi.fn(async () => {})
+    const second = vi.fn(async () => {})
+    const a = await card(first, '/repo-a')
+    const b = await card(second, '/repo-b')
+    await drop(a)
+    expect(first).toHaveBeenCalledExactlyOnceWith(['/drop/a.txt'], expect.any(Function))
+    expect(second).not.toHaveBeenCalled()
+    await drop(b)
+    expect(second).toHaveBeenCalledExactlyOnceWith(['/drop/a.txt'], expect.any(Function))
+    unmountCard(b)
+    cards.splice(cards.indexOf(b), 1)
+    await drop(a)
+    expect(first).toHaveBeenCalledTimes(2)
+  })
+  it('keeps a preparation captured for the original card when another card mounts', async () => {
+    const gate = Promise.withResolvers<{ paths: string[]; failures: never[] }>()
+    prepare.mockImplementationOnce(() => gate.promise)
+    const first = vi.fn(async () => {})
+    const second = vi.fn(async () => {})
+    const a = await card(first)
+    await drop(a)
+    await card(second)
+    await act(async () => gate.resolve({ paths: ['/prepared/a.txt'], failures: [] }))
+    expect(first).toHaveBeenCalledExactlyOnceWith(['/prepared/a.txt'], expect.any(Function))
+    expect(second).not.toHaveBeenCalled()
+  })
+  it('abandons a preparation when its card unmounts', async () => {
+    const gate = Promise.withResolvers<{ paths: string[]; failures: never[] }>()
+    prepare.mockImplementationOnce(() => gate.promise)
+    const attach = vi.fn(async () => {})
+    const a = await card(attach)
+    await drop(a)
+    unmountCard(a)
+    cards.splice(cards.indexOf(a), 1)
+    await act(async () => gate.resolve({ paths: ['/prepared/a.txt'], failures: [] }))
+    expect(attach).not.toHaveBeenCalled()
+  })
+  it.each(['project', 'host', 'connection', 'runtime connection'] as const)(
+    'refuses a captured destination after its %s changes',
+    async (change) => {
+      const gate = Promise.withResolvers<{ paths: string[]; failures: never[] }>()
+      prepare.mockImplementationOnce(() => gate.promise)
+      const applyDrop = vi.fn(async () => {})
+      connections.set('ssh-a', { connectionGeneration: 1 })
+      runtimeConnections.set('runtime-a', {
+        connectionStates: new Map([['ssh-a', { connectionGeneration: 1 }]])
+      })
+      const input: Parameters<typeof useNewWorkspaceComposerFileDrop>[0] = {
+        projectPath: '/repo',
+        hostId: change === 'runtime connection' ? 'runtime:runtime-a' : 'ssh:ssh-a',
+        connectionId: 'ssh-a',
+        applyDrop
+      }
+      const hook = renderHook(
+        (args: Parameters<typeof useNewWorkspaceComposerFileDrop>[0]) =>
+          useNewWorkspaceComposerFileDrop(args),
+        { initialProps: input }
+      )
+      const owner = document.createElement('div')
+      const target = document.createElement('textarea')
+      owner.append(target)
+      document.body.append(owner)
+      act(() => hook.result.current(owner))
+      const event = new Event('drop', { bubbles: true, cancelable: true, composed: true })
+      Object.defineProperty(event, 'isTrusted', { value: true })
+      Object.defineProperty(event, 'dataTransfer', {
+        value: { types: ['Files'], files: [new File(['x'], 'a.txt')] }
+      })
+      await act(async () => target.dispatchEvent(event))
+      if (change === 'runtime connection') {
+        runtimeConnections.set('runtime-a', {
+          connectionStates: new Map([['ssh-a', { connectionGeneration: 2 }]])
+        })
+      } else if (change === 'connection') {
+        connections.set('ssh-a', { connectionGeneration: 2 })
+      } else {
+        hook.rerender({
+          ...input,
+          projectPath: change === 'project' ? '/other' : input.projectPath,
+          hostId: change === 'host' ? 'local' : input.hostId
+        })
+      }
+      await act(async () => gate.resolve({ paths: ['/prepared/a.txt'], failures: [] }))
+      expect(applyDrop).not.toHaveBeenCalled()
+      act(() => hook.result.current(null))
+      hook.unmount()
+      owner.remove()
+    }
+  )
+})
diff --git a/src/renderer/src/components/NewWorkspaceComposerCard.quick-file-drop.test.tsx b/src/renderer/src/components/NewWorkspaceComposerCard.quick-file-drop.test.tsx
new file mode 100644
index 000000000000..1fe178fa7031
--- /dev/null
+++ b/src/renderer/src/components/NewWorkspaceComposerCard.quick-file-drop.test.tsx
@@ -0,0 +1,113 @@
+// @vitest-environment happy-dom
+import { act, cleanup, render, renderHook } from '@testing-library/react'
+import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest'
+import { useAppStore } from '@/store'
+import { useComposerState } from '@/hooks/useComposerState'
+import NewWorkspaceComposerCard from './NewWorkspaceComposerCard'
+import { TooltipProvider } from '@/components/ui/tooltip'
+import type * as I18nModule from '@/i18n/i18n'
+import type * as ReactI18nextModule from 'react-i18next'
+
+vi.mock('@/components/contextual-tours/use-contextual-tour', () => ({
+  useContextualTour: () => {}
+}))
+vi.mock('@/i18n/i18n', async (importOriginal) => ({
+  ...(await importOriginal<typeof I18nModule>()),
+  translate: (_key: string, fallback: string) => fallback
+}))
+vi.mock('react-i18next', async (importOriginal) => ({
+  ...(await importOriginal<typeof ReactI18nextModule>()),
+  useTranslation: () => ({})
+}))
+
+const prepare = vi.fn(async ({ paths }: { paths: string[] }) => ({ paths, failures: [] }))
+const stat = vi.fn(async () => ({ isDirectory: false }))
+beforeEach(() => {
+  vi.clearAllMocks()
+  vi.stubGlobal('api', {
+    fs: {
+      getPathForFile: (file: File) => `/drop/${file.name}`,
+      prepareDroppedPaths: prepare,
+      stat
+    },
+    gh: {
+      repoSlug: vi.fn(async () => null),
+      listWorkItems: vi.fn(async () => ({ items: [], hasMore: false }))
+    },
+    sparsePresets: { list: vi.fn(async () => []) },
+    worktrees: { listRetiredNames: vi.fn(async () => ({ names: [], exhaustedTiers: 0 })) },
+    preflight: { detectAgents: vi.fn(async () => []) }
+  })
+  useAppStore.setState({
+    repos: [
+      {
+        id: 'local-project',
+        path: '/project',
+        displayName: 'Project',
+        badgeColor: 'var(--muted-foreground)',
+        addedAt: 0
+      }
+    ],
+    activeRepoId: 'local-project',
+    activeModal: 'new-workspace-composer',
+    projects: [],
+    projectGroups: [],
+    projectHostSetups: [],
+    newWorkspaceDraft: null,
+    worktreesByRepo: {},
+    sparsePresetsByRepo: {}
+  })
+})
+afterEach(() => {
+  cleanup()
+  vi.unstubAllGlobals()
+})
+
+type FileDragTransfer = { types: string[]; files: File[]; dropEffect: string }
+
+function gesture(target: Element, type: string, transfer: FileDragTransfer) {
+  const event = new Event(type, { bubbles: true, cancelable: true, composed: true })
+  Object.defineProperty(event, 'isTrusted', { value: true })
+  Object.defineProperty(event, 'dataTransfer', { value: transfer })
+  target.dispatchEvent(event)
+}
+
+describe('quick-create modal card without an attachment destination', () => {
+  it('refuses an OS drop with the selected local project and does not show an accepting ring', async () => {
+    const hook = renderHook(() =>
+      useComposerState({
+        initialRepoId: 'local-project',
+        persistDraft: false
+      })
+    )
+    expect(hook.result.current.cardProps.selectedRepoPath).toBe('/project')
+    expect(hook.result.current.cardProps.selectedRepoExecutionHostId).toBe('local')
+    const { container } = render(
+      <TooltipProvider>
+        <NewWorkspaceComposerCard
+          {...hook.result.current.cardProps}
+          composerRef={hook.result.current.composerRef}
+          onComposerNodeChange={hook.result.current.onComposerNodeChange}
+          onCreate={() => {}}
+          primaryActionLabel="Create workspace"
+          quickAgent={null}
+          onQuickAgentChange={() => {}}
+        />
+      </TooltipProvider>
+    )
+    const card = container.querySelector('[data-workspace-composer-root]')!
+    expect(container.querySelector('textarea')?.getAttribute('placeholder')).toBe('Write a note')
+    expect(container.querySelector('[data-attachment-path]')).toBeNull()
+    const transfer = { types: ['Files'], files: [new File(['x'], 'notes.txt')], dropEffect: 'link' }
+    await act(async () => {
+      gesture(card, 'dragenter', transfer)
+      gesture(card, 'dragover', transfer)
+    })
+    expect(transfer.dropEffect).toBe('none')
+    expect(card.className).not.toContain('ring-2')
+    await act(async () => gesture(card, 'drop', transfer))
+    expect(prepare).not.toHaveBeenCalled()
+    expect(stat).not.toHaveBeenCalled()
+    expect(hook.result.current.cardProps.attachmentPaths).toEqual([])
+  })
+})
diff --git a/src/renderer/src/components/NewWorkspaceComposerCard.test-fixture.tsx b/src/renderer/src/components/NewWorkspaceComposerCard.test-fixture.tsx
index c8eb2b56f436..32047cce15a4 100644
--- a/src/renderer/src/components/NewWorkspaceComposerCard.test-fixture.tsx
+++ b/src/renderer/src/components/NewWorkspaceComposerCard.test-fixture.tsx
@@ -1,9 +1,16 @@
 import React, { act } from 'react'
-import { createRoot } from 'react-dom/client'
+import { createRoot, type Root } from 'react-dom/client'
 import NewWorkspaceComposerCard from './NewWorkspaceComposerCard'
 import type { NewWorkspaceProjectOption } from '@/lib/new-workspace-project-options'
 import type { ProjectHostSetupOption } from '@/lib/project-host-setup-options'
 
+const cardRoots = new WeakMap<HTMLDivElement, Root>()
+export function unmountCard(container: HTMLDivElement): void {
+  act(() => cardRoots.get(container)?.unmount())
+  cardRoots.delete(container)
+  container.remove()
+}
+
 export const projectOptions: NewWorkspaceProjectOption[] = [
   {
     kind: 'project-group',
@@ -47,6 +54,7 @@ export async function renderCard(
   const container = document.createElement('div')
   document.body.appendChild(container)
   const root = createRoot(container)
+  cardRoots.set(container, root)
   act(() => {
     root.render(
       <NewWorkspaceComposerCard
diff --git a/src/renderer/src/components/NewWorkspaceComposerCard.tsx b/src/renderer/src/components/NewWorkspaceComposerCard.tsx
index 5dac7dc8246d..1f62bbd97493 100644
--- a/src/renderer/src/components/NewWorkspaceComposerCard.tsx
+++ b/src/renderer/src/components/NewWorkspaceComposerCard.tsx
@@ -36,6 +36,7 @@ import {
   type NewWorkspaceComposerCardProps
 } from './new-workspace/new-workspace-composer-card-props'
 import { getSshStatusLabel } from './new-workspace/new-workspace-composer-ssh-status'
+import { useNewWorkspaceComposerFileDrop } from './new-workspace/use-new-workspace-composer-file-drop'
 import { useComposerFileDragOver } from './new-workspace/use-composer-file-drag-over'
 
 // Why lazy: this pulls the ~41 KB project-location browser onto the boot graph, and nothing
@@ -83,6 +84,12 @@ export default function NewWorkspaceComposerCard(
   const projectHostSetupOptions = props.projectHostSetupOptions ?? EMPTY_PROJECT_HOST_SETUP_OPTIONS
   const ephemeralVmRecipes = props.ephemeralVmRecipes ?? EMPTY_EPHEMERAL_VM_RECIPES
   const { isFileDragOver, dragHandlers } = useComposerFileDragOver()
+  const attachDropOwner = useNewWorkspaceComposerFileDrop({
+    projectPath: props.selectedRepoPath,
+    hostId: selectedRepoExecutionHostId,
+    connectionId: props.selectedRepoConnectionId,
+    applyDrop: props.onNativeFileDrop
+  })
   const openModal = useAppStore((state) => state.openModal)
   const activeModal = useAppStore((state) => state.activeModal)
   const defaultTuiAgent = useAppStore((state) => state.settings?.defaultTuiAgent ?? null)
@@ -184,12 +191,13 @@ export default function NewWorkspaceComposerCard(
       if (!node) {
         cancelNameInputFocusFrame()
       }
+      attachDropOwner(node)
       if (composerRef) {
         composerRef.current = node
       }
       onComposerNodeChange?.(node)
     },
-    [cancelNameInputFocusFrame, composerRef, onComposerNodeChange]
+    [attachDropOwner, cancelNameInputFocusFrame, composerRef, onComposerNodeChange]
   )
   const focusNameInput = React.useCallback((): void => {
     cancelNameInputFocusFrame()
@@ -289,12 +297,15 @@ export default function NewWorkspaceComposerCard(
       ref={setComposerNode}
       data-workspace-composer-root="true"
       data-sparse-preset-editing={sparseEditing ? 'true' : undefined}
-      data-native-file-drop-target="composer"
       onDragEnter={dragHandlers.onDragEnter}
       onDragLeave={dragHandlers.onDragLeave}
       className={cn(
         'flex min-h-0 min-w-0 flex-1 flex-col gap-1 rounded-md transition',
-        isFileDragOver && 'ring-2 ring-ring/30',
+        isFileDragOver &&
+          props.selectedRepoPath &&
+          selectedRepoExecutionHostId &&
+          props.onNativeFileDrop &&
+          'ring-2 ring-ring/30',
         containerClassName
       )}
     >
diff --git a/src/renderer/src/components/activity/ActivityPrototypePage-test-fixtures.ts b/src/renderer/src/components/activity/ActivityPrototypePage-test-fixtures.ts
index 181f96869a27..1aa95c86c954 100644
--- a/src/renderer/src/components/activity/ActivityPrototypePage-test-fixtures.ts
+++ b/src/renderer/src/components/activity/ActivityPrototypePage-test-fixtures.ts
@@ -4,7 +4,8 @@ import { makePaneKey } from '../../../../shared/stable-pane-id'
 import type { TerminalTab } from '../../../../shared/terminal-tab-types'
 import type { Worktree } from '../../../../shared/worktree/types'
 import type { RetainedAgentEntry } from '@/store/slices/agent-status'
-import { buildActivityEvents, buildAgentPaneThreads } from './ActivityPrototypePage'
+import { buildActivityEvents } from './activity-event-builder'
+import { buildAgentPaneThreads } from './activity-thread-builder'
 
 export const LEAF_ID = '11111111-1111-4111-8111-111111111111'
 export const LEAF_ID_2 = '22222222-2222-4222-8222-222222222222'
diff --git a/src/renderer/src/components/activity/ActivityPrototypePage.filter-focus-shortcut.test.ts b/src/renderer/src/components/activity/ActivityPrototypePage.filter-focus-shortcut.test.ts
index da8fe2e2df24..6a4f2c64d688 100644
--- a/src/renderer/src/components/activity/ActivityPrototypePage.filter-focus-shortcut.test.ts
+++ b/src/renderer/src/components/activity/ActivityPrototypePage.filter-focus-shortcut.test.ts
@@ -3,7 +3,7 @@ import {
   handleActivityFilterFocusShortcut,
   isActivityFilterFocusShortcut,
   shouldIgnoreActivityFilterFocusShortcutTarget
-} from './ActivityPrototypePage'
+} from './activity-filter-focus-shortcut'
 
 describe('activity filter focus shortcut', () => {
   it('matches Cmd+F on Mac and Ctrl+F elsewhere without extra modifiers', () => {
diff --git a/src/renderer/src/components/activity/ActivityPrototypePage.test.ts b/src/renderer/src/components/activity/ActivityPrototypePage.test.ts
index 2a960cb464e5..9f6587be094f 100644
--- a/src/renderer/src/components/activity/ActivityPrototypePage.test.ts
+++ b/src/renderer/src/components/activity/ActivityPrototypePage.test.ts
@@ -8,13 +8,16 @@ import { makePaneKey } from '../../../../shared/stable-pane-id'
 import type { TerminalTab } from '../../../../shared/terminal-tab-types'
 import {
   ACTIVITY_SEARCH_QUERY_MAX_BYTES,
-  activityThreadResponseRenderPreview,
   activityThreadMatchesSearchQuery,
-  buildActivityEvents,
-  buildAgentPaneThreads,
   buildActivityThreadGroups,
   isActivitySearchQueryTooLarge
-} from './ActivityPrototypePage'
+} from './activity-thread-grouping'
+import {
+  activityThreadResponseRenderPreview,
+  activityThreadStatusId
+} from './activity-thread-presentation'
+import { buildActivityEvents } from './activity-event-builder'
+import { buildAgentPaneThreads } from './activity-thread-builder'
 import {
   makeActivityResult,
   makeRepo,
@@ -29,7 +32,6 @@ import {
   PANE_KEY_2,
   PANE_KEY_3
 } from './ActivityPrototypePage-test-fixtures'
-import { activityThreadStatusId } from './activity-thread-presentation'
 
 describe('buildActivityEvents', () => {
   it('keeps every pane visible before applying the global activity cap', () => {
diff --git a/src/renderer/src/components/activity/ActivityPrototypePage.thread-grouping.test.ts b/src/renderer/src/components/activity/ActivityPrototypePage.thread-grouping.test.ts
index 42f45f1683d2..9a53c4ada07c 100644
--- a/src/renderer/src/components/activity/ActivityPrototypePage.thread-grouping.test.ts
+++ b/src/renderer/src/components/activity/ActivityPrototypePage.thread-grouping.test.ts
@@ -4,13 +4,10 @@ import { describe, expect, it } from 'vitest'
 import type { AgentStatusEntry } from '../../../../shared/agent-status-types'
 import { formatAgentTypeLabel } from '@/lib/agent-status'
 import { TooltipProvider } from '@/components/ui/tooltip'
-import {
-  buildActivityThreadGroups,
-  buildActivityEvents,
-  buildAgentPaneThreads,
-  getActivityThreadGroup,
-  ThreadAgentStateIndicator
-} from './ActivityPrototypePage'
+import { buildActivityThreadGroups, getActivityThreadGroup } from './activity-thread-grouping'
+import { buildActivityEvents } from './activity-event-builder'
+import { buildAgentPaneThreads } from './activity-thread-builder'
+import { ThreadAgentStateIndicator } from './activity-thread-controls'
 import {
   makeActivityResult,
   makeRepo,
diff --git a/src/renderer/src/components/activity/ActivityThreadOptionsMenu.test.tsx b/src/renderer/src/components/activity/ActivityThreadOptionsMenu.test.tsx
index c5cedcb2443d..544101f7ff2b 100644
--- a/src/renderer/src/components/activity/ActivityThreadOptionsMenu.test.tsx
+++ b/src/renderer/src/components/activity/ActivityThreadOptionsMenu.test.tsx
@@ -6,7 +6,7 @@ import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest'
 
 import { TooltipProvider } from '@/components/ui/tooltip'
 import { useAppStore } from '@/store'
-import { ActivityThreadOptionsMenu } from './ActivityPrototypePage'
+import { ActivityThreadOptionsMenu } from './activity-thread-controls'
 import type { ActivityGroupBy } from './activity-thread-types'
 import { makeRepo } from './ActivityPrototypePage-test-fixtures'
 
diff --git a/src/renderer/src/components/activity/activity-clear-completed-state-lifetime.test.ts b/src/renderer/src/components/activity/activity-clear-completed-state-lifetime.test.ts
index 8bbfbe03ee2c..834f6e6e51d4 100644
--- a/src/renderer/src/components/activity/activity-clear-completed-state-lifetime.test.ts
+++ b/src/renderer/src/components/activity/activity-clear-completed-state-lifetime.test.ts
@@ -1,6 +1,6 @@
 import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest'
 import { useAppStore } from '@/store'
-import { makeOpenFile } from '@/store/slices/store-test-helpers'
+import { makeOpenFile } from '../../store/slices/store-session-test-harness'
 import { makeRetainedDoneEntry, makeTab, makeWorktree } from './ActivityPrototypePage-test-fixtures'
 import type { AgentPaneThread } from './activity-thread-types'
 
diff --git a/src/renderer/src/components/activity/activity-portal-readiness-decay.react185.test.tsx b/src/renderer/src/components/activity/activity-portal-readiness-decay.react185.test.tsx
index f9a6581d608a..50e2383aa63d 100644
--- a/src/renderer/src/components/activity/activity-portal-readiness-decay.react185.test.tsx
+++ b/src/renderer/src/components/activity/activity-portal-readiness-decay.react185.test.tsx
@@ -2,7 +2,7 @@
 import { act } from 'react'
 import { createRoot, type Root } from 'react-dom/client'
 import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest'
-import { useActivityTerminalPortalStatus } from './ActivityPrototypePage'
+import { useActivityTerminalPortalStatus } from './activity-terminal-portal-status'
 import {
   ACTIVITY_PORTAL_READINESS_BURST_WINDOW_MS,
   ACTIVITY_PORTAL_READINESS_MAX_FLIPS
diff --git a/src/renderer/src/components/activity/activity-portal-readiness-loop.react185.test.tsx b/src/renderer/src/components/activity/activity-portal-readiness-loop.react185.test.tsx
index 2389e753bb3e..209dece6a78d 100644
--- a/src/renderer/src/components/activity/activity-portal-readiness-loop.react185.test.tsx
+++ b/src/renderer/src/components/activity/activity-portal-readiness-loop.react185.test.tsx
@@ -5,7 +5,7 @@ import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest'
 
 ;(globalThis as { IS_REACT_ACT_ENVIRONMENT?: boolean }).IS_REACT_ACT_ENVIRONMENT = true
 
-import { useActivityTerminalPortalStatus } from './ActivityPrototypePage'
+import { useActivityTerminalPortalStatus } from './activity-terminal-portal-status'
 import {
   findActivityTerminalPortal,
   type ActivityTerminalPortalTarget
diff --git a/src/renderer/src/components/activity/activity-portal-readiness-subscription-churn.react185.test.tsx b/src/renderer/src/components/activity/activity-portal-readiness-subscription-churn.react185.test.tsx
index d8b9c3caff41..135b784887a7 100644
--- a/src/renderer/src/components/activity/activity-portal-readiness-subscription-churn.react185.test.tsx
+++ b/src/renderer/src/components/activity/activity-portal-readiness-subscription-churn.react185.test.tsx
@@ -3,7 +3,7 @@ import { act, useState } from 'react'
 import { flushSync } from 'react-dom'
 import { createRoot, type Root } from 'react-dom/client'
 import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest'
-import { useActivityTerminalPortalStatus } from './ActivityPrototypePage'
+import { useActivityTerminalPortalStatus } from './activity-terminal-portal-status'
 import { ACTIVITY_PORTAL_READINESS_MAX_FLIPS } from './activity-portal-readiness-oscillation'
 
 ;(globalThis as { IS_REACT_ACT_ENVIRONMENT?: boolean }).IS_REACT_ACT_ENVIRONMENT = true
diff --git a/src/renderer/src/components/activity/activity-status-group-header.test.ts b/src/renderer/src/components/activity/activity-status-group-header.test.ts
index cbcf468b900d..5c60c422fe9f 100644
--- a/src/renderer/src/components/activity/activity-status-group-header.test.ts
+++ b/src/renderer/src/components/activity/activity-status-group-header.test.ts
@@ -1,10 +1,8 @@
 import { describe, expect, it } from 'vitest'
 import type { AgentStatusEntry } from '../../../../shared/agent-status-types'
-import {
-  buildActivityEvents,
-  buildActivityThreadGroups,
-  buildAgentPaneThreads
-} from './ActivityPrototypePage'
+import { buildActivityEvents } from './activity-event-builder'
+import { buildActivityThreadGroups } from './activity-thread-grouping'
+import { buildAgentPaneThreads } from './activity-thread-builder'
 import {
   makeRepo,
   makeTabWithIds,
diff --git a/src/renderer/src/components/activity/activity-thread-hover-card.tsx b/src/renderer/src/components/activity/activity-thread-hover-card.tsx
index 064235f175ec..849d8f92e25f 100644
--- a/src/renderer/src/components/activity/activity-thread-hover-card.tsx
+++ b/src/renderer/src/components/activity/activity-thread-hover-card.tsx
@@ -126,7 +126,9 @@ function ActivityThreadHoverCardContent({
     issueCacheKey: review.issueCacheKey,
     fetchIssue: foundation.fetchIssue,
     showLinearIssue: true,
-    fetchLinearIssue: foundation.fetchLinearIssue
+    fetchLinearIssue: foundation.fetchLinearIssue,
+    linearSourceContext: review.linearSourceContext,
+    linearWorkspaceId: review.linearWorkspaceId
   })
 
   const secondary = useWorktreeCardSecondaryDetails({
diff --git a/src/renderer/src/components/agent-child-row-parity.test.tsx b/src/renderer/src/components/agent-child-row-parity.test.tsx
index eb7721d2f2f1..5c49e83efab2 100644
--- a/src/renderer/src/components/agent-child-row-parity.test.tsx
+++ b/src/renderer/src/components/agent-child-row-parity.test.tsx
@@ -12,7 +12,7 @@ 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 { buildBackgroundTaskGroupsFromViews } from '../../../shared/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'
diff --git a/src/renderer/src/components/agent-child-row-text.ts b/src/renderer/src/components/agent-child-row-text.ts
index b48cff3dbd86..16a272f9a621 100644
--- a/src/renderer/src/components/agent-child-row-text.ts
+++ b/src/renderer/src/components/agent-child-row-text.ts
@@ -1,3 +1,7 @@
+import {
+  agentChildRowLeadTrail,
+  agentChildRowName as sharedAgentChildRowName
+} from '../../../shared/agent-child-row-lead-trail'
 import type { AgentChildRowModel } from '../../../shared/agent-child-row-model'
 import { formatAgentTypeLabel } from '../../../shared/agent-type-label'
 import { agentStateLabel } from '@/components/AgentStateDot'
@@ -58,15 +62,9 @@ export function agentChildRowMessageLine(row: AgentChildRowModel): string {
 
 /** 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)
+  return sharedAgentChildRowName(row, agentStateLabel)
 }
 
 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 }
+  return agentChildRowLeadTrail(row, agentChildRowName(row), agentChildRowDetailText(row, now))
 }
diff --git a/src/renderer/src/components/artifacts/ArtifactDetailDrawer.tsx b/src/renderer/src/components/artifacts/ArtifactDetailDrawer.tsx
index a95f5170e773..b77c6028fabe 100644
--- a/src/renderer/src/components/artifacts/ArtifactDetailDrawer.tsx
+++ b/src/renderer/src/components/artifacts/ArtifactDetailDrawer.tsx
@@ -1,4 +1,4 @@
-import { VisuallyHidden } from 'radix-ui'
+import * as VisuallyHidden from 'radix-ui/visually-hidden'
 import type { ArtifactListItem } from '../../../../shared/artifacts'
 import { Sheet, SheetContent, SheetDescription, SheetTitle } from '@/components/ui/sheet'
 import { translate } from '@/i18n/i18n'
diff --git a/src/renderer/src/components/editor/details-markdown-html.ts b/src/renderer/src/components/editor/details-markdown-html.ts
index 9b826012a3f7..7eaedf97cd31 100644
--- a/src/renderer/src/components/editor/details-markdown-html.ts
+++ b/src/renderer/src/components/editor/details-markdown-html.ts
@@ -1,4 +1,9 @@
 import type { MarkdownToken } from '@tiptap/core'
+import {
+  getMarkdownFenceRanges,
+  isInsideMarkdownFenceRange,
+  type MarkdownFenceRanges
+} from './markdown-fence-scanner'
 
 // Toggle summaries can render at heading scales 1–5, mirroring the plain
 // heading levels the slash menu / toolbar dropdown offer (h1–h5).
@@ -36,10 +41,6 @@ export type DetailsHtmlBlock = {
   inner: string
 }
 
-// Fence ranges depend only on the scanned string, so callers scanning one body
-// repeatedly compute them once and share them across sibling matches.
-export type MarkdownFenceRanges = readonly (readonly [number, number])[]
-
 export type DetailsSummaryHtml = {
   attributes: string
   content: string
@@ -91,48 +92,12 @@ export function renderDetailsAttributes(attrs: Record<string, unknown> | undefin
   return attributes.join(' ')
 }
 
-function markdownFenceRanges(content: string): MarkdownFenceRanges {
-  const ranges: [number, number][] = []
-  let offset = 0
-  let openFence: { closingPattern: RegExp; start: number } | null = null
-
-  for (const lineMatch of content.matchAll(/[^\r\n]*(?:\r\n|\n|\r|$)/g)) {
-    const line = lineMatch[0]
-    if (line === '') {
-      break
-    }
-
-    const lineText = line.replace(/(?:\r\n|\n|\r)$/u, '')
-    if (openFence) {
-      // Built once per fence: rebuilding it per line recompiled the same regex for every fenced line.
-      if (openFence.closingPattern.test(lineText)) {
-        ranges.push([openFence.start, offset + line.length])
-        openFence = null
-      }
-    } else {
-      const openingFenceMatch = lineText.match(/^ {0,3}(`{3,}|~{3,})/u)
-      if (openingFenceMatch?.[1]) {
-        openFence = {
-          closingPattern: new RegExp(
-            `^ {0,3}${openingFenceMatch[1][0]}{${openingFenceMatch[1].length},}\\s*$`
-          ),
-          start: offset
-        }
-      }
-    }
-
-    offset += line.length
-  }
-
-  if (openFence) {
-    ranges.push([openFence.start, content.length])
-  }
-
-  return ranges
-}
-
-function isInsideRange(index: number, ranges: MarkdownFenceRanges): boolean {
-  return ranges.some(([start, end]) => index >= start && index < end)
+export function createDetailsMatcher(content: string): (start: number) => DetailsHtmlBlock | null {
+  let fenceRanges: MarkdownFenceRanges | undefined
+  return (start) =>
+    /^<details\b[^>]*>/i.test(content.slice(start))
+      ? matchDetailsHtmlBlock(content, start, (fenceRanges ??= getMarkdownFenceRanges(content)))
+      : null
 }
 
 export function matchDetailsHtmlBlock(
@@ -147,7 +112,7 @@ export function matchDetailsHtmlBlock(
 
   const detailsTagPattern = /<\/?details\b[^>]*>/gi
   detailsTagPattern.lastIndex = start
-  const fenceRanges = precomputedFenceRanges ?? markdownFenceRanges(content)
+  const fenceRanges = precomputedFenceRanges ?? getMarkdownFenceRanges(content)
 
   let depth = 0
 
@@ -158,7 +123,7 @@ export function matchDetailsHtmlBlock(
     }
 
     const tag = tagMatch[0]
-    if (tagMatch.index !== start && isInsideRange(tagMatch.index, fenceRanges)) {
+    if (tagMatch.index !== start && isInsideMarkdownFenceRange(tagMatch.index, fenceRanges)) {
       continue
     }
 
@@ -302,7 +267,7 @@ function stripEditableNestedDetails(bodyHtml: string, nestingLevel: number): str
       return null
     }
 
-    fenceRanges ??= markdownFenceRanges(bodyHtml)
+    fenceRanges ??= getMarkdownFenceRanges(bodyHtml)
     const nested = matchDetailsHtmlBlock(bodyHtml, nestedStart, fenceRanges)
     if (!nested || !isEditableDetailsHtmlBlock(nested, nestingLevel + 1)) {
       return null
diff --git a/src/renderer/src/hooks/useGlobalFileDrop.escaping-link.test.tsx b/src/renderer/src/components/editor/editor-dropped-file-open.escaping-link.test.ts
similarity index 72%
rename from src/renderer/src/hooks/useGlobalFileDrop.escaping-link.test.tsx
rename to src/renderer/src/components/editor/editor-dropped-file-open.escaping-link.test.ts
index c03f7a441465..02198a89201a 100644
--- a/src/renderer/src/hooks/useGlobalFileDrop.escaping-link.test.tsx
+++ b/src/renderer/src/components/editor/editor-dropped-file-open.escaping-link.test.ts
@@ -1,8 +1,4 @@
-// @vitest-environment happy-dom
-
-import { cleanup, renderHook } from '@testing-library/react'
-import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest'
-import type { NativeFileDropPayload } from '../../../shared/native-file-drop'
+import { beforeEach, describe, expect, it, vi } from 'vitest'
 
 const mocks = vi.hoisted(() => ({
   statUserOpenedPath: vi.fn(),
@@ -31,33 +27,15 @@ vi.mock('@/store', () => ({
   }
 }))
 
-import { useGlobalFileDrop } from './useGlobalFileDrop'
-
-let dropListener: ((data: NativeFileDropPayload) => void) | null = null
+import { captureEditorFileDropOpen } from './editor-dropped-file-open'
 
 beforeEach(() => {
   mocks.statUserOpenedPath.mockReset()
   mocks.openFile.mockReset()
-  vi.stubGlobal('api', {
-    ui: {
-      onFileDrop: (listener: (data: NativeFileDropPayload) => void) => {
-        dropListener = listener
-        return () => {
-          dropListener = null
-        }
-      }
-    }
-  })
-})
-
-afterEach(() => {
-  cleanup()
-  vi.unstubAllGlobals()
 })
 
 async function dropOnTabStrip(path: string): Promise<void> {
-  renderHook(() => useGlobalFileDrop())
-  dropListener?.({ target: 'editor', paths: [path] })
+  await captureEditorFileDropOpen({ worktreeId: 'wt-1' })([path])
   await vi.waitFor(() => expect(mocks.openFile).toHaveBeenCalledTimes(1))
 }
 
diff --git a/src/renderer/src/hooks/useGlobalFileDrop.test.ts b/src/renderer/src/components/editor/editor-dropped-file-open.test.ts
similarity index 59%
rename from src/renderer/src/hooks/useGlobalFileDrop.test.ts
rename to src/renderer/src/components/editor/editor-dropped-file-open.test.ts
index 975401dc0e37..5409651b6669 100644
--- a/src/renderer/src/hooks/useGlobalFileDrop.test.ts
+++ b/src/renderer/src/components/editor/editor-dropped-file-open.test.ts
@@ -2,9 +2,8 @@ import { describe, expect, it } from 'vitest'
 import {
   getEditorFileDropOperationContext,
   getEditorFileDropSettingsForWorktree,
-  getNativeFileDropRejectionMessage,
   shouldUploadRemoteEditorFileDrop
-} from './useGlobalFileDrop'
+} from './editor-dropped-file-open'
 
 describe('shouldUploadRemoteEditorFileDrop', () => {
   it('does not upload editor drops for local workspaces', () => {
@@ -88,64 +87,4 @@ describe('shouldUploadRemoteEditorFileDrop', () => {
       connectionId: 'ssh-1'
     })
   })
-
-  it('formats metadata-only rejection messages for oversized native drops', () => {
-    expect(
-      getNativeFileDropRejectionMessage({
-        byteLength: 0,
-        pathCount: 999,
-        reason: 'too-many-paths',
-        target: 'rejected'
-      })
-    ).toEqual({
-      description: 'Drop 256 or fewer files at a time.',
-      title: 'Drop contains too many files.'
-    })
-
-    const message = getNativeFileDropRejectionMessage({
-      byteLength: 300_000,
-      pathCount: 2,
-      reason: 'paths-too-large',
-      target: 'rejected'
-    })
-    expect(message).toEqual({
-      description: 'Drop fewer files or use a shorter path list.',
-      title: 'Drop path list is too large.'
-    })
-    expect(JSON.stringify(message)).not.toContain('secret')
-  })
-
-  it('explains drag-temp files main could not copy, using their shared reason', () => {
-    const rejection = { byteLength: 0, reason: 'temp-copy-failed', target: 'rejected' } as const
-    expect(
-      getNativeFileDropRejectionMessage({
-        ...rejection,
-        pathCount: 1,
-        commonReason: 'permission-denied'
-      })
-    ).toEqual({ description: 'Permission denied.', title: "Orca couldn't copy 1 dropped file." })
-    expect(
-      getNativeFileDropRejectionMessage({ ...rejection, pathCount: 2, commonReason: 'timed-out' })
-    ).toEqual({
-      description: 'Copying took too long. Try the drop again.',
-      title: "Orca couldn't copy 2 dropped files."
-    })
-    expect(getNativeFileDropRejectionMessage({ ...rejection, pathCount: 2 }).description).toBe(
-      'Try the drop again.'
-    )
-  })
-
-  it('names the drop whose file items carried no readable path (#15782)', () => {
-    expect(
-      getNativeFileDropRejectionMessage({
-        byteLength: 0,
-        pathCount: 2,
-        reason: 'unresolved-paths',
-        target: 'rejected'
-      })
-    ).toEqual({
-      description: 'Save them to disk first, then drop the saved files.',
-      title: "Orca couldn't read a path for the dropped files."
-    })
-  })
 })
diff --git a/src/renderer/src/components/editor/editor-dropped-file-open.ts b/src/renderer/src/components/editor/editor-dropped-file-open.ts
new file mode 100644
index 000000000000..a07b57b658c0
--- /dev/null
+++ b/src/renderer/src/components/editor/editor-dropped-file-open.ts
@@ -0,0 +1,258 @@
+import { toast } from 'sonner'
+import { detectLanguage } from '@/lib/language-detect'
+import { isPathInsideWorktree, toWorktreeRelativePath } from '@/lib/terminal-links'
+import { useAppStore } from '@/store'
+import { getConnectionId } from '@/lib/connection-context'
+import { joinPath } from '@/lib/path'
+import {
+  getRuntimeEnvironmentIdForWorktree,
+  type WorktreeRuntimeOwnerState
+} from '@/lib/worktree-runtime-owner'
+import {
+  importExternalPathsToRuntime,
+  type RuntimeFileOperationArgs
+} from '@/runtime/runtime-file-client'
+import type { GlobalSettings } from '../../../../shared/global-settings-types'
+import { translate } from '@/i18n/i18n'
+import { captureWorktreeSshMutationExpectation } from '@/lib/ssh-mutation-expectation'
+import { statUserOpenedPath } from '@/lib/user-opened-local-path'
+import { FLOATING_TERMINAL_WORKTREE_ID } from '../../../../shared/constants'
+import { openDocumentInFloatingWorkspace } from '@/lib/open-document-in-floating-workspace'
+
+export function getEditorFileDropSettingsForWorktree(
+  store: WorktreeRuntimeOwnerState,
+  worktreeId: string
+): Pick<GlobalSettings, 'activeRuntimeEnvironmentId'> {
+  const runtimeEnvironmentId = getRuntimeEnvironmentIdForWorktree(store, worktreeId)
+  // Why: OS drops target the selected worktree. Use that worktree's host owner
+  // so a focused runtime cannot hijack local/SSH editor drops.
+  return {
+    ...store.settings,
+    activeRuntimeEnvironmentId: runtimeEnvironmentId
+  }
+}
+
+export function shouldUploadRemoteEditorFileDrop(
+  settings: Pick<GlobalSettings, 'activeRuntimeEnvironmentId'> | null | undefined,
+  connectionId: string | null | undefined
+): boolean {
+  return Boolean(settings?.activeRuntimeEnvironmentId?.trim() || connectionId?.trim())
+}
+
+export function getEditorFileDropOperationContext(
+  store: WorktreeRuntimeOwnerState,
+  worktreeId: string,
+  worktreePath: string | null | undefined,
+  connectionId: string | undefined
+): RuntimeFileOperationArgs {
+  return {
+    settings: getEditorFileDropSettingsForWorktree(store, worktreeId),
+    worktreeId,
+    worktreePath,
+    connectionId
+  }
+}
+
+export type EditorFileDropDestination = {
+  worktreeId: string
+  /** When omitted, the store chooses this workspace's default editor destination. */
+  groupId?: string
+}
+
+type EditorFileDropContext = {
+  fileContext: RuntimeFileOperationArgs
+  worktreePath: string | undefined
+  connectionId: string | undefined
+}
+
+function captureEditorFileDropContext(worktreeId: string): EditorFileDropContext | null {
+  const store = useAppStore.getState()
+  const worktreePath = store.getKnownWorktreeById(worktreeId)?.path
+  const connectionId = getConnectionId(worktreeId) ?? undefined
+  try {
+    return {
+      fileContext: {
+        ...getEditorFileDropOperationContext(store, worktreeId, worktreePath, connectionId),
+        ...captureWorktreeSshMutationExpectation(store, worktreeId)
+      },
+      worktreePath,
+      connectionId
+    }
+  } catch {
+    return null
+  }
+}
+
+function sameEditorFileDropOwner(a: EditorFileDropContext, b: EditorFileDropContext): boolean {
+  const left = a.fileContext
+  const right = b.fileContext
+  return (
+    a.worktreePath === b.worktreePath &&
+    a.connectionId === b.connectionId &&
+    left.settings?.activeRuntimeEnvironmentId === right.settings?.activeRuntimeEnvironmentId &&
+    left.expectedExecutionHostId === right.expectedExecutionHostId &&
+    left.expectedSshTargetId === right.expectedSshTargetId &&
+    left.expectedSshConnectionGeneration === right.expectedSshConnectionGeneration
+  )
+}
+
+function showOwnerChangedError(): void {
+  toast.error(
+    translate(
+      'auto.hooks.useGlobalFileDrop.ownerChanged',
+      "Couldn't verify which host owns this workspace. Try again after it reconnects."
+    )
+  )
+}
+
+export function editorGroupStillExists({
+  worktreeId,
+  groupId
+}: EditorFileDropDestination): boolean {
+  if (!groupId) {
+    return true
+  }
+  const groups = useAppStore.getState().groupsByWorktree[worktreeId] ?? []
+  return groups.some((group) => group.id === groupId)
+}
+
+/**
+ * Captures the destination workspace's host at drop time and returns the open
+ * step; a host change before preparation finishes refuses instead of re-routing.
+ */
+export function captureEditorFileDropOpen(
+  destination: EditorFileDropDestination
+): (paths: readonly string[]) => Promise<void> {
+  const captured = captureEditorFileDropContext(destination.worktreeId)
+  if (!captured) {
+    showOwnerChangedError()
+    return async () => undefined
+  }
+  return async (paths) => {
+    if (paths.length === 0 || !editorGroupStillExists(destination)) {
+      return
+    }
+    const current = captureEditorFileDropContext(destination.worktreeId)
+    if (!current || !sameEditorFileDropOwner(captured, current)) {
+      showOwnerChangedError()
+      return
+    }
+    await openEditorFileDropPaths(captured, destination, paths)
+  }
+}
+
+async function openEditorFileDropPaths(
+  { fileContext, worktreePath, connectionId }: EditorFileDropContext,
+  destination: EditorFileDropDestination,
+  paths: readonly string[]
+): Promise<void> {
+  const store = useAppStore.getState()
+  const { worktreeId, groupId } = destination
+  const groupOptions = groupId ? { targetGroupId: groupId } : null
+  const dropSettings = fileContext.settings
+  const runtimeEnvironmentId = dropSettings?.activeRuntimeEnvironmentId ?? null
+  if (shouldUploadRemoteEditorFileDrop(dropSettings, connectionId)) {
+    if (!worktreePath) {
+      toast.error(
+        translate(
+          'auto.hooks.useGlobalFileDrop.245faa95b9',
+          'No remote workspace path is available for dropped files.'
+        )
+      )
+      return
+    }
+    try {
+      // Why: OS file drops provide client-local paths. Remote runtime and
+      // SSH editors must upload into the server worktree before opening.
+      const destinationDir = joinPath(worktreePath, '.orca/drops')
+      const { results } = await importExternalPathsToRuntime(
+        fileContext,
+        [...paths],
+        destinationDir,
+        { ensureDestinationDir: true }
+      )
+      if (!editorGroupStillExists(destination)) {
+        return
+      }
+      for (const result of results) {
+        if (!editorGroupStillExists(destination)) {
+          return
+        }
+        if (result.status !== 'imported' || result.kind === 'directory') {
+          continue
+        }
+        const maybeRelative = toWorktreeRelativePath(result.destPath, worktreePath)
+        store.setActiveTabType('editor', worktreeId)
+        store.openFile(
+          {
+            filePath: result.destPath,
+            relativePath: maybeRelative ?? result.destPath,
+            worktreeId,
+            runtimeEnvironmentId: runtimeEnvironmentId ?? undefined,
+            language: detectLanguage(result.destPath),
+            mode: 'edit'
+          },
+          { suppressActiveRuntimeFallback: runtimeEnvironmentId === null, ...groupOptions }
+        )
+      }
+      if (results.some((result) => result.status !== 'imported')) {
+        toast.error(
+          translate(
+            'auto.hooks.useGlobalFileDrop.d720e2f855',
+            'Some dropped files could not be uploaded.'
+          )
+        )
+      }
+    } catch {
+      toast.error(
+        translate('auto.hooks.useGlobalFileDrop.38c9f034ff', 'Failed to upload dropped files.')
+      )
+    }
+    return
+  }
+
+  // Sequential, so a multi-file drop opens its tabs in drop order.
+  for (const filePath of paths) {
+    try {
+      const stat = await statUserOpenedPath(fileContext, filePath)
+      if (!editorGroupStillExists(destination)) {
+        return
+      }
+      if (stat.isDirectory) {
+        continue
+      }
+      let relativePath = filePath
+      // Why: a project link out of the project keeps its absolute path, so it reads as
+      // user-named instead of being refused as a project file.
+      if (worktreePath && !stat.escapesWorktree && isPathInsideWorktree(filePath, worktreePath)) {
+        const maybeRelative = toWorktreeRelativePath(filePath, worktreePath)
+        if (maybeRelative !== null && maybeRelative.length > 0) {
+          relativePath = maybeRelative
+        }
+      }
+      store.setActiveTabType('editor', worktreeId)
+      if (worktreeId === FLOATING_TERMINAL_WORKTREE_ID) {
+        openDocumentInFloatingWorkspace(
+          store.openFile,
+          { filePath, relativePath },
+          groupOptions ?? {}
+        )
+        continue
+      }
+      const file = {
+        filePath,
+        relativePath,
+        worktreeId,
+        language: detectLanguage(filePath),
+        mode: 'edit' as const
+      }
+      if (groupOptions) {
+        store.openFile(file, groupOptions)
+      } else {
+        store.openFile(file)
+      }
+    } catch {
+      // Ignore files that cannot be stat'd.
+    }
+  }
+}
diff --git a/src/renderer/src/components/editor/export-css.ts b/src/renderer/src/components/editor/export-css.ts
index 858c45b5a6c9..094950573311 100644
--- a/src/renderer/src/components/editor/export-css.ts
+++ b/src/renderer/src/components/editor/export-css.ts
@@ -60,6 +60,29 @@ html, body {
   border-left: 0.25em solid #d0d7de;
 }
 
+.orca-export-root [data-callout] {
+  margin: 0 0 1em;
+  padding: 0 1em;
+  border-left: 0.25em solid var(--callout);
+}
+
+.orca-export-root [data-callout] > :first-child {
+  display: flex;
+  align-items: center;
+  gap: 0.4em;
+  margin-bottom: 0.25em;
+  color: var(--callout);
+  font-weight: 600;
+}
+
+.orca-export-root [data-callout] > :first-child svg { width: 1em; height: 1em; }
+
+.orca-export-root [data-callout="note"] { --callout: #0969da; }
+.orca-export-root [data-callout="tip"] { --callout: #1a7f37; }
+.orca-export-root [data-callout="important"] { --callout: #8250df; }
+.orca-export-root [data-callout="warning"] { --callout: #9a6700; }
+.orca-export-root [data-callout="caution"] { --callout: #cf222e; }
+
 .orca-export-root code,
 .orca-export-root pre {
   font-family: "SF Mono", Menlo, Consolas, "Liberation Mono", monospace;
diff --git a/src/renderer/src/components/editor/ipynb-ansi.test.ts b/src/renderer/src/components/editor/ipynb-ansi.test.ts
index 54e5bfe4f868..eb431cc9040e 100644
--- a/src/renderer/src/components/editor/ipynb-ansi.test.ts
+++ b/src/renderer/src/components/editor/ipynb-ansi.test.ts
@@ -1,4 +1,4 @@
-import { describe, expect, it } from 'vitest'
+import { describe, expect, it, vi } from 'vitest'
 import { parseAnsiSegments } from './ipynb-ansi'
 
 describe('parseAnsiSegments', () => {
@@ -6,6 +6,52 @@ describe('parseAnsiSegments', () => {
     expect(parseAnsiSegments('hello\nworld')).toEqual([{ text: 'hello\nworld' }])
   })
 
+  it('does not scan plain accumulated output for SGR or stripping patterns', () => {
+    const text = 'iteration α🐋\tvalue\n'.repeat(100_000)
+    const matchAll = vi.spyOn(String.prototype, 'matchAll')
+    const replace = vi.spyOn(String.prototype, 'replace')
+    let segments: ReturnType<typeof parseAnsiSegments>
+    let scans: number
+    try {
+      segments = parseAnsiSegments(text)
+      scans = matchAll.mock.calls.length + replace.mock.calls.length
+    } finally {
+      matchAll.mockRestore()
+      replace.mockRestore()
+    }
+    expect(segments).toEqual([{ text }])
+    expect(scans).toBe(0)
+    expect(parseAnsiSegments('')).toEqual([])
+  })
+
+  it.each([
+    '\u001b]title\u0007',
+    '\u001b]title\u001b\\',
+    '\u009dtitle\u009c',
+    '\u001bPpayload\u001b\\',
+    '\u001b_payload\u001b\\',
+    '\u001b^payload\u001b\\',
+    '\u001bXpayload\u001b\\',
+    '\u0090payload\u009c',
+    '\u0098payload\u009c',
+    '\u009epayload\u009c',
+    '\u009fpayload\u009c',
+    '\u009b31m',
+    '\u001b[K',
+    '\u001b(B'
+  ])('preserves stripping for every supported introducer: %j', (sequence) => {
+    expect(parseAnsiSegments(`before${sequence}after`)).toEqual([{ text: 'beforeafter' }])
+  })
+
+  it('preserves non-ANSI controls, unicode and incomplete escape semantics', () => {
+    const text = '\u0000\u0007\u0008\t\n\r\u0085\u009c\u00a0α🐋\u2028\u2029'
+    expect(parseAnsiSegments(text)).toEqual([{ text }])
+    expect(parseAnsiSegments('before\u001b]unfinished')).toEqual([{ text: 'beforeunfinished' }])
+    expect(parseAnsiSegments('before\u009dunfinished')).toEqual([
+      { text: 'before\u009dunfinished' }
+    ])
+  })
+
   it('applies and resets 16-color and bold attributes', () => {
     expect(parseAnsiSegments('a\u001b[1;32mb\u001b[0mc\u001b[91md\u001b[39me')).toEqual([
       { text: 'a' },
diff --git a/src/renderer/src/components/editor/ipynb-ansi.ts b/src/renderer/src/components/editor/ipynb-ansi.ts
index 8e033963edef..61b33c787f45 100644
--- a/src/renderer/src/components/editor/ipynb-ansi.ts
+++ b/src/renderer/src/components/editor/ipynb-ansi.ts
@@ -15,6 +15,8 @@ export type AnsiSegment = AnsiStyle & { text: string }
 
 // oxlint-disable-next-line no-control-regex -- matches the ESC byte that introduces SGR sequences.
 const SGR_PATTERN = /\u001b\[([0-9;]*)m/g
+// oxlint-disable-next-line no-control-regex -- introducers accepted by the SGR parser and shared ANSI stripping patterns.
+const ANSI_INTRODUCER_PATTERN = /[\u001b\u0090\u0098\u009b\u009d-\u009f]/
 
 function xterm256Color(index: number): AnsiColor {
   if (index < 16) {
@@ -76,6 +78,9 @@ function applySgr(style: AnsiStyle, params: string): AnsiStyle {
 
 /** Splits terminal output into styled runs; non-SGR escape sequences are dropped. */
 export function parseAnsiSegments(input: string): AnsiSegment[] {
+  if (!ANSI_INTRODUCER_PATTERN.test(input)) {
+    return input ? [{ text: input }] : []
+  }
   const segments: AnsiSegment[] = []
   let style: AnsiStyle = {}
   let offset = 0
diff --git a/src/renderer/src/components/editor/ipynb-cell-mutations.ts b/src/renderer/src/components/editor/ipynb-cell-mutations.ts
index dc754519aef7..aaf1f4d92006 100644
--- a/src/renderer/src/components/editor/ipynb-cell-mutations.ts
+++ b/src/renderer/src/components/editor/ipynb-cell-mutations.ts
@@ -146,6 +146,16 @@ export function updateIpynbCellRun(
   executionCount: number | null
 ): string {
   const root = parseNotebookRoot(content)
+  applyIpynbCellRun(root, index, outputs, executionCount)
+  return serializeNotebook(root)
+}
+
+function applyIpynbCellRun(
+  root: Record<string, unknown>,
+  index: number,
+  outputs: Record<string, unknown>[],
+  executionCount: number | null
+): void {
   const cell = ensureCell(root, index)
   // Like Jupyter, store stream text as lines so notebook diffs stay line-oriented.
   cell.outputs = outputs.map((output) =>
@@ -154,7 +164,27 @@ export function updateIpynbCellRun(
       : output
   )
   cell.execution_count = executionCount
-  return serializeNotebook(root)
+}
+
+export function updateIpynbCellRuns(
+  content: string,
+  updates: { index: number; outputs: Record<string, unknown>[]; executionCount: number | null }[]
+): string {
+  if (updates.length === 0) {
+    return content
+  }
+  const root = parseNotebookRoot(content)
+  let changed = false
+  for (const update of updates) {
+    try {
+      applyIpynbCellRun(root, update.index, update.outputs, update.executionCount)
+      changed = true
+    } catch {
+      // Preserve the successful prefix when a later cell no longer exists.
+      break
+    }
+  }
+  return changed ? serializeNotebook(root) : content
 }
 
 export function clearIpynbOutputs(content: string): string {
diff --git a/src/renderer/src/components/editor/ipynb-kernel-outputs.test.ts b/src/renderer/src/components/editor/ipynb-kernel-outputs.test.ts
index fb1bf06c530b..b29d6c67917d 100644
--- a/src/renderer/src/components/editor/ipynb-kernel-outputs.test.ts
+++ b/src/renderer/src/components/editor/ipynb-kernel-outputs.test.ts
@@ -1,4 +1,4 @@
-import { describe, expect, it } from 'vitest'
+import { describe, expect, it, vi } from 'vitest'
 import type { KernelOutputType } from '../../../../shared/notebook-kernel-types'
 import {
   applyKernelOutput,
@@ -9,6 +9,41 @@ import {
 
 const EMPTY: LiveOutputs = { outputs: [], clearOnNextOutput: false }
 
+// Frozen pre-fix stream reducer: the parity oracle must not share the incremental implementation.
+function originalStreamOutput(
+  live: LiveOutputs,
+  type: 'stream' | 'clear_output',
+  content: Record<string, unknown>
+): LiveOutputs {
+  if (type === 'clear_output') {
+    return content.wait
+      ? { ...live, clearOnNextOutput: true }
+      : { ...live, outputs: [], clearOnNextOutput: false }
+  }
+  const normalize = (text: string): string =>
+    text.replace(/\r+\n/g, '\n').replace(/^[^\n]*\r(?=[^\n])/gm, '')
+  const outputs = live.clearOnNextOutput ? [] : live.outputs
+  const last = outputs.at(-1)
+  const output =
+    last?.output_type === 'stream' && last.name === content.name
+      ? { ...last, text: normalize(`${String(last.text)}${String(content.text ?? '')}`) }
+      : {
+          output_type: type,
+          name: content.name ?? 'stdout',
+          text: normalize(String(content.text ?? ''))
+        }
+  return {
+    ...live,
+    outputs: [
+      ...(last?.output_type === 'stream' && last.name === content.name
+        ? outputs.slice(0, -1)
+        : outputs),
+      output
+    ],
+    clearOnNextOutput: false
+  }
+}
+
 function apply(messages: [KernelOutputType, Record<string, unknown>][]): LiveOutputs {
   return messages.reduce((live, [type, content]) => applyKernelOutput(live, type, content), EMPTY)
 }
@@ -25,6 +60,88 @@ describe('collapseCarriageReturns', () => {
 })
 
 describe('applyKernelOutput', () => {
+  it('does not normalize accumulated LF-only or LF-free text again on append', () => {
+    for (const chunk of ['log entry\n'.repeat(400), 'x'.repeat(4320)]) {
+      let live = EMPTY
+      const replace = vi.spyOn(String.prototype, 'replace')
+      let normalizeCalls: number
+      try {
+        for (let frame = 0; frame < 512; frame += 1) {
+          live = applyKernelOutput(live, 'stream', { name: 'stdout', text: chunk })
+        }
+        normalizeCalls = replace.mock.calls.length
+      } finally {
+        replace.mockRestore()
+      }
+      expect(normalizeCalls).toBe(2)
+      expect(live.outputs).toEqual([
+        { output_type: 'stream', name: 'stdout', text: chunk.repeat(512) }
+      ])
+    }
+  })
+
+  it('matches the original reducer across randomized stream names, clears, and control boundaries', () => {
+    let seed = 0x51a7cafe
+    const next = (): number => {
+      seed = (Math.imul(seed, 1664525) + 1013904223) >>> 0
+      return seed
+    }
+    const characters = ['x', ' ', '\r', '\n', '\u2028', '\u2029', '\ud83d', '\ude80']
+    for (let scenario = 0; scenario < 30; scenario += 1) {
+      let original = EMPTY
+      let incremental = EMPTY
+      for (let frame = 0; frame < 300; frame += 1) {
+        const clear = next() % 17 === 0
+        let text = ''
+        const length = next() % 32
+        for (let index = 0; index < length; index += 1) {
+          text += characters[next() % characters.length]
+        }
+        const content = clear
+          ? { wait: next() % 2 === 0 }
+          : { name: next() % 3 === 0 ? undefined : next() % 2 === 0 ? 'stdout' : 'stderr', text }
+        const type = clear ? 'clear_output' : 'stream'
+        original = originalStreamOutput(original, type, content)
+        incremental = applyKernelOutput(incremental, type, content)
+        expect(incremental).toEqual(original)
+      }
+    }
+  })
+
+  it('preserves a completed prefix when progress rewrites and CRLF split between frames', () => {
+    const prefix = 'completed line\n'.repeat(10_000)
+    const chunks = [`${prefix}0%`, '\r', '1%', '\r\r', '\nnext', '\r100%', '\r', '', '\n']
+    let original = EMPTY
+    let incremental = EMPTY
+    for (const text of chunks) {
+      const content = { name: 'stdout', text }
+      original = originalStreamOutput(original, 'stream', content)
+      incremental = applyKernelOutput(incremental, 'stream', content)
+      expect(incremental).toEqual(original)
+    }
+    expect(incremental.outputs[0]?.text).toBe(`${prefix}\n100%\n`)
+  })
+
+  it('normalizes reconstructed and externally changed output text using the original semantics', () => {
+    const reconstructed: LiveOutputs = {
+      outputs: [{ output_type: 'stream', name: 'stdout', text: ['old\r', 'value\n'], metadata: 1 }],
+      clearOnNextOutput: false
+    }
+    const content = { name: 'stdout', text: '\rnew' }
+    expect(applyKernelOutput(reconstructed, 'stream', content)).toEqual(
+      originalStreamOutput(reconstructed, 'stream', content)
+    )
+    const changed = applyKernelOutput(EMPTY, 'stream', { name: 'stdout', text: 'initial\n' })
+    const output = changed.outputs[0]
+    if (!output) {
+      throw new Error('Missing stream output')
+    }
+    output.text = 'prefix\rchanged'
+    expect(applyKernelOutput(changed, 'stream', content)).toEqual(
+      originalStreamOutput(changed, 'stream', content)
+    )
+  })
+
   it('merges consecutive chunks of one stream and collapses progress rewrites across them', () => {
     const live = apply([
       ['stream', { name: 'stdout', text: 'step 1' }],
diff --git a/src/renderer/src/components/editor/ipynb-kernel-outputs.ts b/src/renderer/src/components/editor/ipynb-kernel-outputs.ts
index 50b8574ad22b..41a312adbb50 100644
--- a/src/renderer/src/components/editor/ipynb-kernel-outputs.ts
+++ b/src/renderer/src/components/editor/ipynb-kernel-outputs.ts
@@ -10,11 +10,57 @@ export type LiveOutputs = {
   clearOnNextOutput: boolean
 }
 
+type StreamText = { text: string; tailStart: number; trailingReturn: boolean }
+
+// Why: weak output keys keep cursors off saved notebook data and release them with discarded outputs.
+const streamTextByOutput = new WeakMap<NotebookOutput, StreamText>()
+
 /** Applies terminal-style `\r` rewrites (progress bars), keeping a trailing `\r` for the next chunk. */
 export function collapseCarriageReturns(text: string): string {
   return text.replace(/\r+\n/g, '\n').replace(/^[^\n]*\r(?=[^\n])/gm, '')
 }
 
+function splitStreamText(text: string, prefix = ''): StreamText {
+  const tailStart = text.lastIndexOf('\n') + 1
+  return {
+    text: prefix + text,
+    tailStart: prefix.length + tailStart,
+    trailingReturn: text.endsWith('\r')
+  }
+}
+
+function appendStreamText(previous: StreamText, chunk: string): StreamText {
+  if (previous.trailingReturn || chunk.includes('\r')) {
+    // Why: carriage returns can rewrite only the unfinished line, never the LF-completed prefix.
+    return splitStreamText(
+      collapseCarriageReturns(previous.text.slice(previous.tailStart) + chunk),
+      previous.text.slice(0, previous.tailStart)
+    )
+  }
+  const tailStart = chunk.lastIndexOf('\n') + 1
+  // Why: inspecting the growing text (even endsWith) flattens V8 ropes on every frame.
+  return {
+    text: previous.text + chunk,
+    tailStart: tailStart === 0 ? previous.tailStart : previous.text.length + tailStart,
+    trailingReturn: false
+  }
+}
+
+function streamOutput(content: Record<string, unknown>, previous?: NotebookOutput): NotebookOutput {
+  const previousText = previous ? String(previous.text) : ''
+  const chunk = String(content.text ?? '')
+  const cached = previous ? streamTextByOutput.get(previous) : undefined
+  const stream =
+    cached && cached.text === previousText
+      ? appendStreamText(cached, chunk)
+      : splitStreamText(collapseCarriageReturns(previousText + chunk))
+  const output = previous
+    ? { ...previous, text: stream.text }
+    : { output_type: 'stream', name: content.name ?? 'stdout', text: stream.text }
+  streamTextByOutput.set(output, stream)
+  return output
+}
+
 function displayId(value: unknown): unknown {
   return isRecord(value) && isRecord(value.transient) ? value.transient.display_id : undefined
 }
@@ -61,21 +107,13 @@ export function applyKernelOutput<T extends LiveOutputs>(
   const outputs = live.clearOnNextOutput ? [] : live.outputs
   const last = outputs.at(-1)
   if (type === 'stream' && last?.output_type === 'stream' && last.name === content.name) {
-    const text = collapseCarriageReturns(`${String(last.text)}${String(content.text ?? '')}`)
     return {
       ...live,
-      outputs: [...outputs.slice(0, -1), { ...last, text }],
+      outputs: [...outputs.slice(0, -1), streamOutput(content, last)],
       clearOnNextOutput: false
     }
   }
-  const output =
-    type === 'stream'
-      ? {
-          output_type: type,
-          name: content.name ?? 'stdout',
-          text: collapseCarriageReturns(String(content.text ?? ''))
-        }
-      : toOutput(type, content)
+  const output = type === 'stream' ? streamOutput(content) : toOutput(type, content)
   return { ...live, outputs: [...outputs, output], clearOnNextOutput: false }
 }
 
diff --git a/src/renderer/src/components/editor/local-log-tail-decoder.test.ts b/src/renderer/src/components/editor/local-log-tail-decoder.test.ts
index 33d9b3e5eb38..cde5af6d0f0a 100644
--- a/src/renderer/src/components/editor/local-log-tail-decoder.test.ts
+++ b/src/renderer/src/components/editor/local-log-tail-decoder.test.ts
@@ -1,6 +1,6 @@
 import { describe, expect, it } from 'vitest'
 import type { LocalLogTailReadResult } from '../../../../shared/local-log-tail-types'
-import { LocalLogTailDecoder } from './local-log-tail-decoder'
+import { LocalLogTailDecoder, LOCAL_LOG_TAIL_MAX_BYTES } from './local-log-tail-decoder'
 
 const IDENTITY = '1:2:3'
 
@@ -57,4 +57,74 @@ describe('LocalLogTailDecoder', () => {
 
     expect(result).toEqual({ kind: 'reset' })
   })
+
+  it('scans only newly decoded bytes while a large JSONL record is incomplete', () => {
+    const decoder = new LocalLogTailDecoder('', IDENTITY)
+    const bytes = Buffer.from('x'.repeat(256 * 1024))
+    const frames = 32
+    const realLastIndexOf = String.prototype.lastIndexOf
+    let scannedCharacters = 0
+    let output = ''
+    String.prototype.lastIndexOf = function (
+      this: string,
+      searchString: string,
+      position?: number
+    ): number {
+      scannedCharacters += this.length
+      return realLastIndexOf.call(this, searchString, position)
+    }
+    try {
+      for (let frame = 1; frame <= frames; frame += 1) {
+        const result = decoder.apply(chunk(bytes, frame * bytes.length))
+        if (result.kind === 'append') {
+          output += result.content
+        }
+      }
+      const completed = decoder.apply(chunk(Buffer.from('\n'), frames * bytes.length + 1))
+      if (completed.kind === 'append') {
+        output += completed.content
+      }
+    } finally {
+      String.prototype.lastIndexOf = realLastIndexOf
+    }
+    expect(output).toBe(`${'x'.repeat(bytes.length * frames)}\n`)
+    expect(scannedCharacters).toBeLessThanOrEqual(bytes.length * frames + 1)
+  })
+
+  it('preserves exact completed records at every UTF-8 byte boundary', () => {
+    const text = '雪🐋\rfirst\n\nα second\r\nlast 🦀\nunfinished'
+    const bytes = Buffer.from(text)
+    for (let cut = 0; cut <= bytes.length; cut += 1) {
+      const decoder = new LocalLogTailDecoder('header 雪\nold unfinished', IDENTITY)
+      const offset = decoder.nextByteOffset
+      const first = decoder.apply(chunk(bytes.subarray(0, cut), offset + cut, { hasMore: true }))
+      const second = decoder.apply(chunk(bytes.subarray(cut), offset + bytes.length))
+      const completed = decoder.apply(chunk(Buffer.from('\n'), offset + bytes.length + 1))
+      const outputs = [first, second, completed]
+      expect(outputs.every((output) => output.kind === 'append')).toBe(true)
+      expect(
+        outputs.map((output) => (output.kind === 'append' ? output.content : '')).join('')
+      ).toBe(`${text}\n`)
+      expect(decoder.nextByteOffset).toBe(offset + bytes.length + 1)
+      expect(decoder.expectedIdentity).toBe(IDENTITY)
+    }
+  })
+
+  it('leaves pending text and offsets unchanged on reset and size limit', () => {
+    const decoder = new LocalLogTailDecoder('', IDENTITY)
+    decoder.apply(chunk(Buffer.from('pending'), 7))
+    expect(decoder.apply(chunk(Buffer.from('ignored\n'), 0, { reset: true }))).toEqual({
+      kind: 'reset'
+    })
+    expect(decoder.apply(chunk(Buffer.from('ignored\n'), LOCAL_LOG_TAIL_MAX_BYTES + 1))).toEqual({
+      kind: 'limit'
+    })
+    expect(decoder.nextByteOffset).toBe(7)
+    expect(decoder.expectedIdentity).toBe(IDENTITY)
+    expect(decoder.apply(chunk(Buffer.from('\n'), 8))).toEqual({
+      kind: 'append',
+      content: 'pending\n',
+      hasMore: false
+    })
+  })
 })
diff --git a/src/renderer/src/components/editor/local-log-tail-decoder.ts b/src/renderer/src/components/editor/local-log-tail-decoder.ts
index 99c06a080e1c..802c98a3dcd2 100644
--- a/src/renderer/src/components/editor/local-log-tail-decoder.ts
+++ b/src/renderer/src/components/editor/local-log-tail-decoder.ts
@@ -50,8 +50,12 @@ export class LocalLogTailDecoder {
 
     this.byteOffset = result.nextByteOffset
     this.fileIdentity = result.fileIdentity
-    this.lineCarry += this.decoder.decode(decodeBase64(result.contentBase64), { stream: true })
-    const lastCompleteLineEnd = this.lineCarry.lastIndexOf('\n') + 1
+    const decoded = this.decoder.decode(decodeBase64(result.contentBase64), { stream: true })
+    const chunkLineEnd = decoded.lastIndexOf('\n') + 1
+    const previousCarryLength = this.lineCarry.length
+    this.lineCarry += decoded
+    // Why: the carry has no LF, so only newly decoded text can complete a record.
+    const lastCompleteLineEnd = chunkLineEnd === 0 ? 0 : previousCarryLength + chunkLineEnd
     if (lastCompleteLineEnd === 0) {
       return { kind: 'append', content: '', hasMore: result.hasMore }
     }
diff --git a/src/renderer/src/components/editor/markdown-preview-local-images.test.ts b/src/renderer/src/components/editor/markdown-preview-local-images.test.ts
index 3f4b8f8f4475..5c5e54b21c6a 100644
--- a/src/renderer/src/components/editor/markdown-preview-local-images.test.ts
+++ b/src/renderer/src/components/editor/markdown-preview-local-images.test.ts
@@ -1,4 +1,6 @@
 import { describe, expect, it, vi } from 'vitest'
+import { unified } from 'unified'
+import type * as Unified from 'unified'
 import {
   MARKDOWN_PREVIEW_LOCAL_IMAGE_PREWARM_CONCURRENCY,
   MARKDOWN_PREVIEW_LOCAL_IMAGE_PREWARM_LIMIT,
@@ -7,6 +9,11 @@ import {
   type MarkdownPreviewLocalImageCandidate
 } from './markdown-preview-local-images'
 
+vi.mock('unified', async (importOriginal) => {
+  const actual = await importOriginal<typeof Unified>()
+  return { ...actual, unified: vi.fn(() => actual.unified()) }
+})
+
 async function flushPromises(): Promise<void> {
   await Promise.resolve()
   await Promise.resolve()
@@ -17,6 +24,25 @@ function markdownImages(count: number): string {
 }
 
 describe('extractMarkdownPreviewLocalImageCandidates', () => {
+  it.each([
+    '# Notes\n\nA [link](./page.md) and ordinary text.',
+    '&#33;[Entity](./image.png)\n！[Fullwidth](./image.png)',
+    '<img src="./image.png" />\n[logo]: ./image.png'
+  ])('skips the image-prewarm parser when no image introducer exists', (markdown) => {
+    vi.mocked(unified).mockClear()
+
+    expect(extractMarkdownPreviewLocalImageCandidates(markdown, '/repo/docs/readme.md')).toEqual([])
+    expect(unified).not.toHaveBeenCalled()
+
+    expect(
+      extractMarkdownPreviewLocalImageCandidates(
+        `${markdown}\n\n![Logo](./logo.png)`,
+        '/repo/docs/readme.md'
+      )
+    ).toHaveLength(1)
+    expect(unified).toHaveBeenCalledOnce()
+  })
+
   it('extracts direct, reference-style, and GFM table images in document order', () => {
     const candidates = extractMarkdownPreviewLocalImageCandidates(
       [
diff --git a/src/renderer/src/components/editor/markdown-preview-local-images.ts b/src/renderer/src/components/editor/markdown-preview-local-images.ts
index bd14a540f517..c366c3bc76a2 100644
--- a/src/renderer/src/components/editor/markdown-preview-local-images.ts
+++ b/src/renderer/src/components/editor/markdown-preview-local-images.ts
@@ -70,7 +70,7 @@ export function extractMarkdownPreviewLocalImageCandidates(
   options: ExtractLocalImageCandidatesOptions = {}
 ): MarkdownPreviewLocalImageCandidate[] {
   const limit = Math.max(0, options.limit ?? MARKDOWN_PREVIEW_LOCAL_IMAGE_PREWARM_LIMIT)
-  if (limit === 0) {
+  if (limit === 0 || !markdown.includes('!')) {
     return []
   }
 
diff --git a/src/renderer/src/components/editor/markdown-preview-plugins.ts b/src/renderer/src/components/editor/markdown-preview-plugins.ts
index 84b365245879..9a46696d7362 100644
--- a/src/renderer/src/components/editor/markdown-preview-plugins.ts
+++ b/src/renderer/src/components/editor/markdown-preview-plugins.ts
@@ -10,6 +10,10 @@ import remarkFrontmatter from 'remark-frontmatter'
 import remarkGfm from 'remark-gfm'
 import remarkMath from 'remark-math'
 import { remarkMarkdownDocLinks } from './markdown-doc-links'
+import {
+  GITHUB_CALLOUT_SANITIZE_ATTRIBUTE,
+  remarkGitHubCallouts
+} from '@/lib/remark-github-callouts'
 
 const markdownPreviewSanitizeSchema = {
   ...defaultSchema,
@@ -24,6 +28,10 @@ const markdownPreviewSanitizeSchema = {
     ...defaultSchema.attributes,
     '*': [...(defaultSchema.attributes?.['*'] ?? []), 'id'],
     a: [...(defaultSchema.attributes?.a ?? []), 'href', 'title'],
+    blockquote: [
+      ...(defaultSchema.attributes?.blockquote ?? []),
+      GITHUB_CALLOUT_SANITIZE_ATTRIBUTE
+    ],
     code: [
       ...(defaultSchema.attributes?.code ?? []),
       ['className', /^language-[\w-]+$/, 'math-inline', 'math-display']
@@ -54,6 +62,7 @@ type MarkdownPluginList = NonNullable<ReactMarkdownOptions['remarkPlugins']>
 export const MARKDOWN_REMARK_PLUGINS: MarkdownPluginList = [
   remarkGfm,
   remarkCjkFriendly,
+  remarkGitHubCallouts,
   remarkBreaks,
   remarkFrontmatter,
   remarkMath,
diff --git a/src/renderer/src/components/editor/markdown-rich-mode.test.ts b/src/renderer/src/components/editor/markdown-rich-mode.test.ts
index 85d3e2fbddd9..a476341cc443 100644
--- a/src/renderer/src/components/editor/markdown-rich-mode.test.ts
+++ b/src/renderer/src/components/editor/markdown-rich-mode.test.ts
@@ -112,15 +112,41 @@ describe('getMarkdownRichModeUnsupportedMessage', () => {
     expect(getMarkdownRichModeUnsupportedMessage(content)).toBeNull()
   })
 
-  it('still blocks large documents with actual html or jsx', () => {
+  it('allows large documents with source-preserving html without creating an editor', () => {
     const prefix = 'a'.repeat(50_001)
+    const roundTripSpy = vi.spyOn(roundTrip, 'getRichMarkdownRoundTripOutput')
 
-    expect(getMarkdownRichModeUnsupportedMessage(`${prefix}\n<span>text</span>\n`)).not.toBeNull()
-    expect(getMarkdownRichModeUnsupportedMessage(`${prefix}\n<id>text</id>\n`)).not.toBeNull()
-    expect(getMarkdownRichModeUnsupportedMessage(`${prefix}\n<Widget />\n`)).not.toBeNull()
-    expect(
-      getMarkdownRichModeUnsupportedMessage(`${prefix}\n<project-id value="1">\n`)
-    ).not.toBeNull()
+    expect(getMarkdownRichModeUnsupportedMessage(`${prefix}\n<span>text</span>\n`)).toBeNull()
+    expect(getMarkdownRichModeUnsupportedMessage(`${prefix}\n<id>text</id>\n`)).toBeNull()
+    expect(getMarkdownRichModeUnsupportedMessage(`${prefix}\n<Widget />\n`)).toBeNull()
+    expect(getMarkdownRichModeUnsupportedMessage(`${prefix}\n<project-id value="1">\n`)).toBeNull()
+    expect(roundTripSpy).not.toHaveBeenCalled()
+  })
+
+  it('allows a large anchored document after its size limit is explicitly overridden', () => {
+    const content = `${'a'.repeat(RICH_MARKDOWN_MAX_SIZE_BYTES)}\n\n<a id="section"></a>\n\n## Section\n`
+
+    expect(getMarkdownRichModeEligibility({ content, sizeOverridden: false })).toEqual({
+      exceedsSizeLimit: true,
+      unsupportedMessage: null
+    })
+    expect(getMarkdownRichModeEligibility({ content, sizeOverridden: true })).toEqual({
+      exceedsSizeLimit: false,
+      unsupportedMessage: null
+    })
+  })
+
+  it('still blocks large editable html that requires a round trip', () => {
+    const content = `${'a'.repeat(50_001)}\n\n<details>\n<summary>Toggle</summary>\n\nBody\n\n</details>\n`
+    const roundTripSpy = vi.spyOn(roundTrip, 'getRichMarkdownRoundTripOutput')
+
+    expect(getMarkdownRichModeUnsupportedMessage(content)).not.toBeNull()
+    expect(roundTripSpy).not.toHaveBeenCalled()
+  })
+
+  it('falls back safely when large markup cannot be encoded', () => {
+    const content = `${'a'.repeat(50_001)}\n<span title="\ud800">text</span>`
+    expect(getMarkdownRichModeUnsupportedMessage(content)).not.toBeNull()
   })
 
   it('allows block html and mdx-like tags by preserving them as passthrough nodes', () => {
@@ -169,7 +195,7 @@ describe('getMarkdownRichModeUnsupportedMessage', () => {
   })
 
   it('keeps unsupported content blocked when it also exceeds the size limit', () => {
-    const content = `${'a'.repeat(RICH_MARKDOWN_MAX_SIZE_BYTES + 1)}<Widget />`
+    const content = `${'a'.repeat(RICH_MARKDOWN_MAX_SIZE_BYTES + 1)}\n\n[ref]: https://example.com\n`
 
     expect(getMarkdownRichModeEligibility({ content, sizeOverridden: false })).toEqual({
       exceedsSizeLimit: true,
diff --git a/src/renderer/src/components/editor/markdown-rich-mode.ts b/src/renderer/src/components/editor/markdown-rich-mode.ts
index cced3ef52c1d..905318923cfb 100644
--- a/src/renderer/src/components/editor/markdown-rich-mode.ts
+++ b/src/renderer/src/components/editor/markdown-rich-mode.ts
@@ -1,9 +1,14 @@
 import { defaultSchema } from 'rehype-sanitize'
 import { normalizeDetailsOpeningTag } from './details-markdown-html'
-import { getRichMarkdownRoundTripOutput } from './markdown-round-trip'
+import {
+  getRichMarkdownPassthroughOutput,
+  getRichMarkdownRoundTripOutput
+} from './markdown-round-trip'
 import { extractFrontMatter } from './markdown-frontmatter'
 import { canRenderMarkdownAtSize } from './markdown-rich-size-limit'
 import { translate } from '@/i18n/i18n'
+import { encodeRawMarkdownHtmlForRichEditor } from './raw-markdown-html'
+import { createRichMarkdownEditorCodec } from './rich-markdown-source-transport'
 
 export type MarkdownRichModeUnsupportedReason =
   | 'html-or-jsx'
@@ -101,12 +106,7 @@ export function getMarkdownRichModeUnsupportedReason(
 
   const contentWithoutCode = stripMarkdownCode(body)
 
-  // Why: run cheap regex checks first. If no unsupported syntax is detected,
-  // rich mode is safe — no need for the expensive round-trip check. The
-  // round-trip (which synchronously creates a throwaway TipTap editor, parses
-  // the full document, and serializes it back) is only needed as a second
-  // opinion when HTML is detected, to verify the HTML survives the round-trip
-  // before blocking the user from rich mode.
+  // Only documents containing embedded HTML need a preservation proof.
   const htmlMatcher = UNSUPPORTED_PATTERNS.find((m) => m.reason === 'html-or-jsx')
   const hasHtml = htmlMatcher && hasHtmlOrJsx(contentWithoutCode, htmlMatcher.pattern)
 
@@ -120,10 +120,10 @@ export function getMarkdownRichModeUnsupportedReason(
   }
 
   if (hasHtml) {
-    // Why: the round-trip check creates a throwaway TipTap Editor synchronously
-    // on the main thread. For large files this blocks for seconds, so we skip it and conservatively block rich mode for HTML files
-    // above this threshold.
-    const roundTripOutput = body.length <= 50_000 ? getRichMarkdownRoundTripOutput(body) : null
+    const roundTripOutput =
+      body.length > 50_000
+        ? getLargeMarkdownRoundTripOutput(body, htmlMatcher!.pattern)
+        : getRichMarkdownRoundTripOutput(body)
     if (roundTripOutput && preservesEmbeddedHtml(contentWithoutCode, roundTripOutput)) {
       return null
     }
@@ -133,6 +133,22 @@ export function getMarkdownRichModeUnsupportedReason(
   return null
 }
 
+function getLargeMarkdownRoundTripOutput(body: string, htmlPattern: RegExp): string | null {
+  try {
+    const codec = createRichMarkdownEditorCodec()
+    const encoded = encodeRawMarkdownHtmlForRichEditor(body, codec, {
+      htmlSuperscriptLinks: true
+    })
+    // Remaining HTML needs DOM parsing; keep large editable toggles on the bounded fallback.
+    if (hasHtmlOrJsx(stripMarkdownCode(encoded), htmlPattern)) {
+      return null
+    }
+    return getRichMarkdownPassthroughOutput(encoded, codec)
+  } catch {
+    return null
+  }
+}
+
 export function getMarkdownRichModeEligibilityDecision({
   content,
   sizeOverridden
diff --git a/src/renderer/src/components/editor/markdown-round-trip.ts b/src/renderer/src/components/editor/markdown-round-trip.ts
index 2655ca225b3c..83360e325d6b 100644
--- a/src/renderer/src/components/editor/markdown-round-trip.ts
+++ b/src/renderer/src/components/editor/markdown-round-trip.ts
@@ -1,12 +1,49 @@
-import { Editor } from '@tiptap/core'
+import { Editor, getSchema } from '@tiptap/core'
+import { MarkdownManager } from '@tiptap/markdown'
 import { encodeRawMarkdownHtmlForRichEditor } from './raw-markdown-html'
 import { createRichMarkdownExtensions } from './rich-markdown-extensions'
-import { createRichMarkdownEditorCodec } from './rich-markdown-source-transport'
+import {
+  createRichMarkdownEditorCodec,
+  type RichMarkdownEditorCodec
+} from './rich-markdown-source-transport'
 import { createRichMarkdownHtmlSuperscriptLinkContext } from './rich-markdown-html-superscript-link-context'
 
 const roundTripCache = new Map<string, string | null>()
 const MAX_CACHE_ENTRIES = 20
 
+function createRoundTripExtensions(codec: RichMarkdownEditorCodec) {
+  return createRichMarkdownExtensions({
+    codec,
+    htmlSuperscriptLinks: true,
+    htmlSuperscriptLinkContext: createRichMarkdownHtmlSuperscriptLinkContext({
+      sourceFilePath: '',
+      worktreeId: '',
+      worktreeRoot: null,
+      sourceOwner: { kind: 'unknown' }
+    })
+  })
+}
+
+/** Validate encoded passthrough markup with the production parser, without an EditorView. */
+export function getRichMarkdownPassthroughOutput(
+  encoded: string,
+  codec: RichMarkdownEditorCodec
+): string | null {
+  try {
+    const extensions = createRoundTripExtensions(codec)
+    const manager = new MarkdownManager({
+      marked: codec.marked,
+      markedOptions: { gfm: true },
+      extensions
+    })
+    const document = manager.parse(encoded)
+    getSchema(extensions).nodeFromJSON(document).check()
+    return manager.serialize(document)
+  } catch {
+    return null
+  }
+}
+
 export function getRichMarkdownRoundTripOutput(content: string): string | null {
   const cached = roundTripCache.get(content)
   if (cached !== undefined) {
@@ -17,19 +54,9 @@ export function getRichMarkdownRoundTripOutput(content: string): string | null {
 
   try {
     const codec = createRichMarkdownEditorCodec()
-    const context = createRichMarkdownHtmlSuperscriptLinkContext({
-      sourceFilePath: '',
-      worktreeId: '',
-      worktreeRoot: null,
-      sourceOwner: { kind: 'unknown' }
-    })
     const editor = new Editor({
       element: null,
-      extensions: createRichMarkdownExtensions({
-        codec,
-        htmlSuperscriptLinks: true,
-        htmlSuperscriptLinkContext: context
-      }),
+      extensions: createRoundTripExtensions(codec),
       content: encodeRawMarkdownHtmlForRichEditor(content, codec, {
         htmlSuperscriptLinks: true
       }),
diff --git a/src/renderer/src/components/editor/monaco-markdown-doc-link-decorations.offset-scan.test.ts b/src/renderer/src/components/editor/monaco-markdown-doc-link-decorations.offset-scan.test.ts
index 1892e18d1ca7..1e7a25e58678 100644
--- a/src/renderer/src/components/editor/monaco-markdown-doc-link-decorations.offset-scan.test.ts
+++ b/src/renderer/src/components/editor/monaco-markdown-doc-link-decorations.offset-scan.test.ts
@@ -162,4 +162,74 @@ describe('getMarkdownDocLinkDecorationRanges offset scan', () => {
     // than one tail scan per line.
     expect(indexOfCalls).toBeLessThanOrEqual(8)
   })
+
+  it('visits inline-code span offsets linearly across a generated link index', () => {
+    const pairs = 500
+    const content = '`[[hidden]]` [[shown]] '.repeat(pairs)
+    const realPush = Array.prototype.push
+    let spanReads = 0
+    Array.prototype.push = function <T>(this: T[], ...values: T[]): number {
+      const length = realPush.call(this, ...values)
+      // Why: the production scanner stores spans as flat numeric pairs; count their reads without changing values.
+      if (values.length === 2 && values.every((value) => typeof value === 'number')) {
+        for (let index = 0; index < values.length; index += 1) {
+          const value = values[index]
+          Object.defineProperty(this, length - values.length + index, {
+            configurable: true,
+            enumerable: true,
+            get: () => {
+              spanReads += 1
+              return value
+            }
+          })
+        }
+      }
+      return length
+    }
+    let ranges: IRange[]
+    try {
+      ranges = getMarkdownDocLinkDecorationRanges(content)
+    } finally {
+      Array.prototype.push = realPush
+    }
+    expect(ranges).toEqual(referenceDecorationRanges(content))
+    expect(ranges).toHaveLength(pairs)
+    expect(spanReads).toBeLessThanOrEqual(pairs * 8)
+  })
+
+  it('matches the frozen scan across random inline-code and link boundaries', () => {
+    const fragments = [
+      '[[note]]',
+      '[[note|label]]',
+      '[[invalid]',
+      '`code`',
+      '`[[note]]`',
+      '\\`',
+      '[[a]] [[b]]',
+      '\\[[x]]',
+      '```',
+      '~~~',
+      '\r\n',
+      '\n',
+      'α🐋',
+      ' ]] ',
+      '[[]]',
+      '[[a\nb]]',
+      '`'
+    ]
+    let seed = 182
+    const random = (): number => {
+      seed = (Math.imul(seed, 1664525) + 1013904223) >>> 0
+      return seed >>> 16
+    }
+    for (let scenario = 0; scenario < 1_000; scenario += 1) {
+      let content = ''
+      for (let chunk = 0; chunk < 30; chunk += 1) {
+        content += fragments[random() % fragments.length]
+      }
+      expect(getMarkdownDocLinkDecorationRanges(content)).toEqual(
+        referenceDecorationRanges(content)
+      )
+    }
+  })
 })
diff --git a/src/renderer/src/components/editor/monaco-markdown-doc-link-decorations.ts b/src/renderer/src/components/editor/monaco-markdown-doc-link-decorations.ts
index 04e932c35187..12fe622252ab 100644
--- a/src/renderer/src/components/editor/monaco-markdown-doc-link-decorations.ts
+++ b/src/renderer/src/components/editor/monaco-markdown-doc-link-decorations.ts
@@ -33,15 +33,6 @@ function collectInlineCodeSpans(
   }
 }
 
-function isInsideSpan(index: number, spans: number[]): boolean {
-  for (let cursor = 0; cursor < spans.length; cursor += 2) {
-    if (index >= spans[cursor] && index < spans[cursor + 1]) {
-      return true
-    }
-  }
-  return false
-}
-
 export function getMarkdownDocLinkDecorationRanges(content: string): IRange[] {
   const ranges: IRange[] = []
   const inlineCodeSpans: number[] = []
@@ -58,6 +49,7 @@ export function getMarkdownDocLinkDecorationRanges(content: string): IRange[] {
     }
 
     let spansCollected = false
+    let spanCursor = 0
     let searchFrom = lineStart
     while (searchFrom < lineEnd) {
       if (nextOpen !== -1 && nextOpen < searchFrom) {
@@ -80,7 +72,11 @@ export function getMarkdownDocLinkDecorationRanges(content: string): IRange[] {
         collectInlineCodeSpans(content, lineStart, lineEnd, inlineCodeSpans)
         spansCollected = true
       }
-      if (!isInsideSpan(start, inlineCodeSpans)) {
+      // Why: spans and link offsets are ordered, so each span needs only one forward visit.
+      while (spanCursor < inlineCodeSpans.length && inlineCodeSpans[spanCursor + 1] <= start) {
+        spanCursor += 2
+      }
+      if (spanCursor >= inlineCodeSpans.length || start < inlineCodeSpans[spanCursor]) {
         const target = getMarkdownDocLinkTarget(content.slice(start + 2, end))
         if (target) {
           ranges.push({
diff --git a/src/renderer/src/components/editor/raw-markdown-html-line-start.test.ts b/src/renderer/src/components/editor/raw-markdown-html-line-start.test.ts
new file mode 100644
index 000000000000..2687b35366d5
--- /dev/null
+++ b/src/renderer/src/components/editor/raw-markdown-html-line-start.test.ts
@@ -0,0 +1,25 @@
+import { expect, it } from 'vitest'
+import { encodeRawMarkdownHtmlForRichEditor } from './raw-markdown-html'
+import { createRichMarkdownEditorCodec } from './rich-markdown-source-transport'
+
+it.each(['<a id="section"></a>', '<!-- multi\nline --><a id="section"></a>'])(
+  'keeps markup following a consumed details block inline: %s',
+  (suffix) => {
+    const codec = createRichMarkdownEditorCodec()
+    const { transport } = codec
+    const details = '<details class="custom"><summary>Toggle</summary>Body</details>'
+    const anchor = '<a id="section">'
+    const expectedSuffix = suffix.startsWith('<!--')
+      ? transport.create('inline-html', '<!-- multi\nline -->')
+      : ''
+    expect(encodeRawMarkdownHtmlForRichEditor(details + suffix, codec)).toBe(
+      transport.create('block-html', details) +
+        expectedSuffix +
+        transport.create('inline-html', anchor) +
+        transport.create('inline-html', '</a>')
+    )
+    expect(encodeRawMarkdownHtmlForRichEditor(`${details}\n${details}`, codec)).toBe(
+      `${transport.create('block-html', details)}\n${transport.create('block-html', details)}`
+    )
+  }
+)
diff --git a/src/renderer/src/components/editor/raw-markdown-html-nodes.ts b/src/renderer/src/components/editor/raw-markdown-html-nodes.ts
new file mode 100644
index 000000000000..edc7c3a03412
--- /dev/null
+++ b/src/renderer/src/components/editor/raw-markdown-html-nodes.ts
@@ -0,0 +1,130 @@
+import { Node, mergeAttributes } from '@tiptap/core'
+import { createMarkdownTokenizerStart } from './markdown-tokenizer-start'
+import {
+  skipInlineTransportStartScan,
+  type RichMarkdownSourceKind,
+  type RichMarkdownSourceTransport
+} from './rich-markdown-source-transport'
+
+export function createRichMarkdownLiteral(transport: RichMarkdownSourceTransport) {
+  return createRawSourceNode({
+    name: 'richMarkdownLiteral',
+    kind: 'literal',
+    inline: true,
+    transport,
+    marker: 'data-rich-markdown-literal'
+  })
+}
+
+export function createRawMarkdownHtmlInline(transport: RichMarkdownSourceTransport) {
+  return createRawSourceNode({
+    name: 'rawMarkdownHtmlInline',
+    kind: 'inline-html',
+    inline: true,
+    transport,
+    marker: 'data-raw-markdown-html-inline',
+    className: 'raw-markdown-html-inline'
+  })
+}
+
+function createRawSourceNode({
+  name,
+  kind,
+  inline,
+  transport,
+  marker,
+  className
+}: {
+  name: string
+  kind: RichMarkdownSourceKind
+  inline: boolean
+  transport: RichMarkdownSourceTransport
+  marker: string
+  className?: string
+}) {
+  return Node.create({
+    name,
+    inline,
+    group: inline ? 'inline' : 'block',
+    atom: true,
+    selectable: true,
+
+    addAttributes() {
+      return {
+        value: {
+          default: '',
+          rendered: false
+        }
+      }
+    },
+
+    // Why: converting embedded HTML tags into placeholder tokens before the
+    // markdown parser runs keeps marked's built-in paragraph tokenization intact
+    // while still letting Orca round-trip the raw markup verbatim.
+    markdownTokenName: name,
+    markdownTokenizer: {
+      name,
+      level: inline ? 'inline' : 'block',
+      start: inline
+        ? skipInlineTransportStartScan
+        : createMarkdownTokenizerStart(transport.startFor(kind)),
+      tokenize(src) {
+        const matched = transport.match(src, kind)
+        if (!matched) {
+          return undefined
+        }
+
+        return {
+          type: name,
+          raw: matched.raw,
+          text: matched.value,
+          block: !inline
+        }
+      }
+    },
+    parseMarkdown: (token, helpers) => {
+      if (token.type !== name) {
+        return []
+      }
+
+      return helpers.createNode(name, {
+        value: typeof token.text === 'string' ? token.text : ''
+      })
+    },
+    renderMarkdown: (node) => (typeof node.attrs?.value === 'string' ? node.attrs.value : ''),
+    renderText: ({ node }) => (typeof node.attrs.value === 'string' ? node.attrs.value : ''),
+
+    parseHTML() {
+      return [
+        {
+          tag: `${inline ? 'span' : 'div'}[${marker}]`,
+          getAttrs: (element: HTMLElement) => ({ value: element.textContent ?? '' })
+        }
+      ]
+    },
+
+    renderHTML({ HTMLAttributes, node }) {
+      const value = typeof node.attrs.value === 'string' ? node.attrs.value : ''
+      return [
+        inline ? 'span' : 'div',
+        mergeAttributes(HTMLAttributes, {
+          [marker]: '',
+          contenteditable: 'false',
+          class: className
+        }),
+        inline ? value : ['pre', value]
+      ]
+    }
+  })
+}
+
+export function createRawMarkdownHtmlBlock(transport: RichMarkdownSourceTransport) {
+  return createRawSourceNode({
+    name: 'rawMarkdownHtmlBlock',
+    kind: 'block-html',
+    inline: false,
+    transport,
+    marker: 'data-raw-markdown-html-block',
+    className: 'raw-markdown-html-block'
+  })
+}
diff --git a/src/renderer/src/components/editor/raw-markdown-html.details-fences.test.ts b/src/renderer/src/components/editor/raw-markdown-html.details-fences.test.ts
new file mode 100644
index 000000000000..33f5c1b6a305
--- /dev/null
+++ b/src/renderer/src/components/editor/raw-markdown-html.details-fences.test.ts
@@ -0,0 +1,70 @@
+import { afterEach, describe, expect, it, vi } from 'vitest'
+import { encodeRawMarkdownHtmlForRichEditor } from './raw-markdown-html'
+import { createRichMarkdownEditorCodec } from './rich-markdown-source-transport'
+import * as fenceScanner from './markdown-fence-scanner'
+
+vi.mock('./markdown-fence-scanner', { spy: true })
+
+const key = '0123456789abcdef0123456789abcdef'
+
+afterEach(() => vi.restoreAllMocks())
+
+describe('raw Markdown details fence scanning', () => {
+  it('scans the document once for sibling toggles', () => {
+    const content = Array.from(
+      { length: 50 },
+      (_, index) => `<details><summary>Section ${index}</summary>\n\nBody ${index}\n\n</details>`
+    ).join('\n\n')
+    const scanFences = vi.mocked(fenceScanner.getMarkdownFenceRanges)
+    scanFences.mockClear()
+
+    expect(encodeRawMarkdownHtmlForRichEditor(content, createRichMarkdownEditorCodec(key))).toBe(
+      content
+    )
+    expect(scanFences).toHaveBeenCalledTimes(1)
+  })
+
+  it.each([
+    'Plain text\n\nMore plain text',
+    '<details',
+    '<details open\nStill no opening tag terminator',
+    '```html\n<details><summary>Code</summary>\n\nBody\n\n</details>\n```'
+  ])('does not scan fences when no opening tag is matched: %j', (content) => {
+    const scanFences = vi.mocked(fenceScanner.getMarkdownFenceRanges)
+    scanFences.mockClear()
+    expect(encodeRawMarkdownHtmlForRichEditor(content, createRichMarkdownEditorCodec(key))).toBe(
+      content
+    )
+    expect(scanFences).toHaveBeenCalledTimes(0)
+  })
+
+  it('preserves nested and mixed-case editable toggles', () => {
+    const content =
+      '<DeTaIlS open><SuMmArY>Outer</SuMmArY>\n\n<details><summary>Inner</summary>\n\nBody\n\n</details>\n\n</DeTaIlS>'
+    expect(encodeRawMarkdownHtmlForRichEditor(content, createRichMarkdownEditorCodec(key))).toBe(
+      content
+    )
+  })
+
+  it('uses each document’s own fences when the codec is reused', () => {
+    const codec = createRichMarkdownEditorCodec(key)
+    const first = '<details><summary>First</summary>\n\nBody\n\n</details>'
+    const second =
+      '<details><summary>Second</summary>\n\n```html\n</details>\n```\n\nBody\n\n</details>'
+    expect(encodeRawMarkdownHtmlForRichEditor(first, codec)).toBe(first)
+    expect(encodeRawMarkdownHtmlForRichEditor(second, codec)).toBe(
+      codec.transport.create('block-html', second)
+    )
+    expect(encodeRawMarkdownHtmlForRichEditor(first, codec)).toBe(first)
+  })
+
+  it('preserves fenced code before a non-editable sibling', () => {
+    const codec = createRichMarkdownEditorCodec(key)
+    const editable = '<details><summary>Editable</summary>\n\nBody\n\n</details>'
+    const raw = '<details class="custom"><summary>Raw</summary>\n\nBody\n\n</details>'
+    const prefix = '~~~html\n<details><summary>Code</summary></details>\n~~~\n\n'
+    expect(encodeRawMarkdownHtmlForRichEditor(`${prefix}${editable}\n\n${raw}`, codec)).toBe(
+      `${prefix}${editable}\n\n${codec.transport.create('block-html', raw)}`
+    )
+  })
+})
diff --git a/src/renderer/src/components/editor/raw-markdown-html.ts b/src/renderer/src/components/editor/raw-markdown-html.ts
index 226979b030c7..1c6c334b90ba 100644
--- a/src/renderer/src/components/editor/raw-markdown-html.ts
+++ b/src/renderer/src/components/editor/raw-markdown-html.ts
@@ -1,17 +1,8 @@
-import { createMarkdownTokenizerStart } from './markdown-tokenizer-start'
-import { Node, mergeAttributes } from '@tiptap/core'
-import { isEditableDetailsHtmlBlock, matchDetailsHtmlBlock } from './details-markdown-html'
+import { createDetailsMatcher, isEditableDetailsHtmlBlock } from './details-markdown-html'
 import { formatMarkdownDocLinkBody, parseMarkdownDocLink } from './markdown-doc-links'
 import { normalizeMarkdownReferenceLinks } from './markdown-reference-link-normalization'
-import type {
-  RichMarkdownEditorCodec,
-  RichMarkdownSourceKind,
-  RichMarkdownSourceTransport
-} from './rich-markdown-source-transport'
-import {
-  isReservedRichMarkdownTransportBody,
-  skipInlineTransportStartScan
-} from './rich-markdown-source-transport'
+import type { RichMarkdownEditorCodec } from './rich-markdown-source-transport'
+import { isReservedRichMarkdownTransportBody } from './rich-markdown-source-transport'
 import { matchHtmlSuperscriptLinkSource } from './rich-markdown-html-superscript-link-source'
 
 const INLINE_HTML_PATTERN = /^<!--[\s\S]*?-->|^<\/?[A-Za-z][\w.:-]*(?:\s[^<>]*?)?\/?>/
@@ -54,10 +45,10 @@ export function encodeRawMarkdownHtmlForRichEditor(
   { htmlSuperscriptLinks = false }: { htmlSuperscriptLinks?: boolean } = {}
 ): string {
   const normalizedContent = normalizeMarkdownReferenceLinks(content)
+  const matchDetails = createDetailsMatcher(normalizedContent)
   const lastCommentClose = normalizedContent.lastIndexOf('-->')
   const { transport } = codec
   let index = 0
-  let isLineStart = true
   let activeFence: '`' | '~' | null = null
   let activeFenceLength = 0
   let result = ''
@@ -67,6 +58,7 @@ export function encodeRawMarkdownHtmlForRichEditor(
   let fenceMatch: RegExpExecArray | null = null
 
   while (index < normalizedContent.length) {
+    const isLineStart = index === 0 || normalizedContent[index - 1] === '\n'
     if (isLineStart) {
       // Reuse the lookahead across blank lines, preserving cross-line fence semantics.
       if (index > fenceProbe) {
@@ -91,7 +83,6 @@ export function encodeRawMarkdownHtmlForRichEditor(
     if (activeFence) {
       const nextChar = normalizedContent[index]
       result += nextChar
-      isLineStart = nextChar === '\n'
       index += 1
       continue
     }
@@ -125,14 +116,13 @@ export function encodeRawMarkdownHtmlForRichEditor(
       if (closingIndex !== -1) {
         const rawSpan = normalizedContent.slice(index, closingIndex + tickCount)
         result += rawSpan
-        isLineStart = rawSpan.endsWith('\n')
         index = closingIndex + tickCount
         continue
       }
     }
 
     if (isLineStart) {
-      const detailsHtml = matchDetailsHtmlBlock(normalizedContent, index)
+      const detailsHtml = matchDetails(index)
       if (detailsHtml && isEditableDetailsHtmlBlock(detailsHtml)) {
         // Why: <details>/<summary> is an editable rich-mode node; raw passthrough
         // would make toggle blocks reopen as inert HTML instead.
@@ -213,132 +203,8 @@ export function encodeRawMarkdownHtmlForRichEditor(
 
     const nextChar = normalizedContent[index]
     result += nextChar
-    isLineStart = nextChar === '\n'
     index += 1
   }
 
   return result
 }
-
-export function createRichMarkdownLiteral(transport: RichMarkdownSourceTransport) {
-  return createRawSourceNode({
-    name: 'richMarkdownLiteral',
-    kind: 'literal',
-    inline: true,
-    transport,
-    marker: 'data-rich-markdown-literal'
-  })
-}
-
-export function createRawMarkdownHtmlInline(transport: RichMarkdownSourceTransport) {
-  return createRawSourceNode({
-    name: 'rawMarkdownHtmlInline',
-    kind: 'inline-html',
-    inline: true,
-    transport,
-    marker: 'data-raw-markdown-html-inline',
-    className: 'raw-markdown-html-inline'
-  })
-}
-
-function createRawSourceNode({
-  name,
-  kind,
-  inline,
-  transport,
-  marker,
-  className
-}: {
-  name: string
-  kind: RichMarkdownSourceKind
-  inline: boolean
-  transport: RichMarkdownSourceTransport
-  marker: string
-  className?: string
-}) {
-  return Node.create({
-    name,
-    inline,
-    group: inline ? 'inline' : 'block',
-    atom: true,
-    selectable: true,
-
-    addAttributes() {
-      return {
-        value: {
-          default: '',
-          rendered: false
-        }
-      }
-    },
-
-    // Why: converting embedded HTML tags into placeholder tokens before the
-    // markdown parser runs keeps marked's built-in paragraph tokenization intact
-    // while still letting Orca round-trip the raw markup verbatim.
-    markdownTokenName: name,
-    markdownTokenizer: {
-      name,
-      level: inline ? 'inline' : 'block',
-      start: inline
-        ? skipInlineTransportStartScan
-        : createMarkdownTokenizerStart(transport.startFor(kind)),
-      tokenize(src) {
-        const matched = transport.match(src, kind)
-        if (!matched) {
-          return undefined
-        }
-
-        return {
-          type: name,
-          raw: matched.raw,
-          text: matched.value,
-          block: !inline
-        }
-      }
-    },
-    parseMarkdown: (token, helpers) => {
-      if (token.type !== name) {
-        return []
-      }
-
-      return helpers.createNode(name, {
-        value: typeof token.text === 'string' ? token.text : ''
-      })
-    },
-    renderMarkdown: (node) => (typeof node.attrs?.value === 'string' ? node.attrs.value : ''),
-    renderText: ({ node }) => (typeof node.attrs.value === 'string' ? node.attrs.value : ''),
-
-    parseHTML() {
-      return [
-        {
-          tag: `${inline ? 'span' : 'div'}[${marker}]`,
-          getAttrs: (element: HTMLElement) => ({ value: element.textContent ?? '' })
-        }
-      ]
-    },
-
-    renderHTML({ HTMLAttributes, node }) {
-      const value = typeof node.attrs.value === 'string' ? node.attrs.value : ''
-      return [
-        inline ? 'span' : 'div',
-        mergeAttributes(HTMLAttributes, {
-          [marker]: '',
-          contenteditable: 'false',
-          class: className
-        }),
-        inline ? value : ['pre', value]
-      ]
-    }
-  })
-}
-
-export function createRawMarkdownHtmlBlock(transport: RichMarkdownSourceTransport) {
-  return createRawSourceNode({
-    name: 'rawMarkdownHtmlBlock',
-    kind: 'block-html',
-    inline: false,
-    transport,
-    marker: 'data-raw-markdown-html-block',
-    className: 'raw-markdown-html-block'
-  })
-}
diff --git a/src/renderer/src/components/editor/restored-editor-workspace-runtime-owner.test.tsx b/src/renderer/src/components/editor/restored-editor-workspace-runtime-owner.test.tsx
index b92e8eb2de66..a410a99492ab 100644
--- a/src/renderer/src/components/editor/restored-editor-workspace-runtime-owner.test.tsx
+++ b/src/renderer/src/components/editor/restored-editor-workspace-runtime-owner.test.tsx
@@ -5,7 +5,7 @@ import { createRoot, type Root } from 'react-dom/client'
 import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest'
 import type * as RuntimeFileClient from '@/runtime/runtime-file-client'
 import { useAppStore } from '@/store'
-import { makeWorktree } from '@/store/slices/store-test-helpers'
+import { makeWorktree } from '../../store/slices/worktrees-slice-test-fixtures'
 import type { FileContent } from './editor-panel-content-types'
 import {
   useEditorPanelFileContentLoader,
diff --git a/src/renderer/src/components/editor/rich-markdown-extensions.ts b/src/renderer/src/components/editor/rich-markdown-extensions.ts
index fd1d8fc7f9d3..e317ee0d0e85 100644
--- a/src/renderer/src/components/editor/rich-markdown-extensions.ts
+++ b/src/renderer/src/components/editor/rich-markdown-extensions.ts
@@ -24,7 +24,7 @@ import {
   createRawMarkdownHtmlBlock,
   createRawMarkdownHtmlInline,
   createRichMarkdownLiteral
-} from './raw-markdown-html'
+} from './raw-markdown-html-nodes'
 import {
   createOrcaDetailsExtensions,
   getRichMarkdownPlaceholder
diff --git a/src/renderer/src/components/editor/rich-markdown-large-html.test.ts b/src/renderer/src/components/editor/rich-markdown-large-html.test.ts
new file mode 100644
index 000000000000..f65fd52fcb60
--- /dev/null
+++ b/src/renderer/src/components/editor/rich-markdown-large-html.test.ts
@@ -0,0 +1,155 @@
+// @vitest-environment happy-dom
+import { Editor } from '@tiptap/core'
+import { expect, it, vi } from 'vitest'
+import { encodeRawMarkdownHtmlForRichEditor } from './raw-markdown-html'
+import { createRichMarkdownEditorCodec } from './rich-markdown-source-transport'
+import { createRichMarkdownExtensions } from './rich-markdown-extensions'
+import { getMarkdownRichModeUnsupportedReason } from './markdown-rich-mode'
+import { commitRichMarkdownSerialization } from './rich-markdown-serialization-commit'
+import { createRichMarkdownHtmlSuperscriptLinkContext } from './rich-markdown-html-superscript-link-context'
+import * as fenceScanner from './markdown-fence-scanner'
+
+function createEditor(source: string): Editor {
+  const codec = createRichMarkdownEditorCodec()
+  return new Editor({
+    element: null,
+    extensions: createRichMarkdownExtensions({
+      codec,
+      htmlSuperscriptLinks: true,
+      htmlSuperscriptLinkContext: createRichMarkdownHtmlSuperscriptLinkContext({
+        sourceFilePath: '',
+        worktreeId: '',
+        worktreeRoot: null,
+        sourceOwner: { kind: 'unknown' }
+      })
+    }),
+    content: encodeRawMarkdownHtmlForRichEditor(source, codec, { htmlSuperscriptLinks: true }),
+    contentType: 'markdown'
+  })
+}
+
+it.each([200, 50_000, 50_001])(
+  'preserves anchors and editable tables at %i characters',
+  (length) => {
+    const suffix =
+      '\n\n<a id="section"></a>\n\n## Section\n\n| Issue | State |\n| --- | --- |\n| [Report](https://example.com) | OPEN |\n'
+    const source = 'a'.repeat(length - suffix.length) + suffix
+    expect(source).toHaveLength(length)
+    expect(getMarkdownRichModeUnsupportedReason(source)).toBeNull()
+    const editor = createEditor(source)
+    const refs = {
+      originalSourceRef: { current: source },
+      baseCanonicalRef: { current: editor.getMarkdown() },
+      lastCommittedMarkdownRef: { current: source }
+    }
+    try {
+      editor.state.doc.check()
+      const anchor = editor.state.doc.child(1)
+      expect(anchor.type.name).toBe('paragraph')
+      expect(anchor.childCount).toBe(2)
+      expect(anchor.textBetween(0, anchor.content.size, '', (node) => node.attrs.value)).toBe(
+        '<a id="section"></a>'
+      )
+      let position = -1
+      editor.state.doc.descendants((node, pos) => {
+        if (node.isText && node.text === 'OPEN') {
+          position = pos
+        }
+      })
+      expect(position).toBeGreaterThan(0)
+      editor.commands.insertContentAt({ from: position, to: position + 4 }, 'CLOSED')
+      const result = commitRichMarkdownSerialization(editor, refs, (markdown) => {
+        const reopened = createEditor(markdown)
+        try {
+          return reopened.getMarkdown()
+        } finally {
+          reopened.destroy()
+        }
+      })
+      expect(result.markdown.startsWith(source.slice(0, source.indexOf('| Issue')))).toBe(true)
+      expect(result.markdown).toContain('CLOSED')
+      const reopened = createEditor(result.markdown)
+      try {
+        reopened.state.doc.check()
+        expect(reopened.getJSON()).toEqual(editor.getJSON())
+      } finally {
+        reopened.destroy()
+      }
+    } finally {
+      editor.destroy()
+    }
+  }
+)
+
+it.each([
+  '    <span>indented</span>',
+  '[link](https://example.com "<span>title</span>")',
+  '[link](<span>)'
+])('blocks markup that the parser keeps as transport text: %s', (markup) => {
+  for (const length of [200, 50_000, 50_001, 120_000]) {
+    const source = `${'a'.repeat(length)}\n\n${markup}\n`
+    expect(getMarkdownRichModeUnsupportedReason(source)).toBe('html-or-jsx')
+  }
+})
+
+it('preserves markup in the edited paragraph through successive saves and reopening', () => {
+  const markup = '<span title="keep">text</span> <sup><a href="https://example.com">1</a></sup>'
+  const source = `${'a'.repeat(50_001)}\n\nBefore ${markup} after\n`
+  expect(getMarkdownRichModeUnsupportedReason(source)).toBeNull()
+  const editor = createEditor(source)
+  const refs = {
+    originalSourceRef: { current: source },
+    baseCanonicalRef: { current: editor.getMarkdown() },
+    lastCommittedMarkdownRef: { current: source }
+  }
+  let expected = source
+  try {
+    for (const [search, replacement] of [
+      ['Before', 'Changed'],
+      ['after', 'tail']
+    ]) {
+      let position = -1
+      editor.state.doc.descendants((node, pos) => {
+        if (node.isText && node.text?.includes(search)) {
+          position = pos + node.text.indexOf(search)
+        }
+      })
+      expect(position).toBeGreaterThan(0)
+      editor.commands.insertContentAt(
+        { from: position, to: position + search.length },
+        { type: 'text', text: replacement }
+      )
+      expected = expected.replace(search, replacement)
+      const result = commitRichMarkdownSerialization(editor, refs, (markdown) => {
+        const reopened = createEditor(markdown)
+        try {
+          return reopened.getMarkdown()
+        } finally {
+          reopened.destroy()
+        }
+      })
+      expect(result.markdown).toBe(expected)
+      expect(result.markdown).not.toContain('ORCA_RICH_MD:')
+      const reopened = createEditor(result.markdown)
+      try {
+        reopened.state.doc.check()
+        expect(reopened.getJSON()).toEqual(editor.getJSON())
+      } finally {
+        reopened.destroy()
+      }
+    }
+  } finally {
+    editor.destroy()
+  }
+})
+
+it('scans whole-document fence ranges once for thousands of passthrough details blocks', () => {
+  const source = '<details class="custom"><summary>Toggle</summary>Body</details>\n\n'.repeat(4_000)
+  const scan = vi.spyOn(fenceScanner, 'getMarkdownFenceRanges')
+  try {
+    expect(getMarkdownRichModeUnsupportedReason(source)).toBeNull()
+    expect(scan.mock.calls.filter(([content]) => content === source)).toHaveLength(1)
+  } finally {
+    scan.mockRestore()
+  }
+})
diff --git a/src/renderer/src/components/editor/selection-copy.test.ts b/src/renderer/src/components/editor/selection-copy.test.ts
index edc750dbdf3b..d658cfa79804 100644
--- a/src/renderer/src/components/editor/selection-copy.test.ts
+++ b/src/renderer/src/components/editor/selection-copy.test.ts
@@ -1,5 +1,33 @@
 import { describe, expect, it } from 'vitest'
-import { formatCopiedSelectionWithContext, getContextualCopyLineRange } from './selection-copy'
+import {
+  canCopySelectionWithContext,
+  formatCopiedSelectionWithContext,
+  getContextualCopyLineRange
+} from './selection-copy'
+
+describe('contextual copy eligibility', () => {
+  it('matches formatting eligibility for line boundaries and whitespace-only selections', () => {
+    for (const startLineNumber of [1, 2, 44]) {
+      for (const endLineNumber of [1, 2, 3, 44, 45]) {
+        for (const endColumn of [1, 2, 15]) {
+          const selection = { startLineNumber, startColumn: 1, endLineNumber, endColumn }
+          const expected =
+            endLineNumber !== startLineNumber &&
+            (endColumn === 1 ? endLineNumber - 1 : endLineNumber) >= startLineNumber
+          expect(canCopySelectionWithContext(selection)).toBe(expected)
+          expect(
+            formatCopiedSelectionWithContext({
+              relativePath: '',
+              language: 'plaintext',
+              selection,
+              selectedText: ' \n'
+            }) !== null
+          ).toBe(expected)
+        }
+      }
+    }
+  })
+})
 
 describe('formatCopiedSelectionWithContext', () => {
   it('formats multi-line selections with file and line context', () => {
diff --git a/src/renderer/src/components/editor/selection-copy.ts b/src/renderer/src/components/editor/selection-copy.ts
index 689fe7bcd025..9630a09487dd 100644
--- a/src/renderer/src/components/editor/selection-copy.ts
+++ b/src/renderer/src/components/editor/selection-copy.ts
@@ -13,15 +13,10 @@ export function formatCopiedSelectionWithContext({
   selection,
   selectedText
 }: FormatCopiedSelectionArgs): string | null {
-  const { startLine, endLine } = getContextualCopyLineRange(selection)
-  const isSingleLineSelection = selection.startLineNumber === selection.endLineNumber
-  if (isSingleLineSelection) {
-    return null
-  }
-
-  if (endLine < startLine) {
+  if (!canCopySelectionWithContext(selection)) {
     return null
   }
+  const { startLine, endLine } = getContextualCopyLineRange(selection)
 
   const codeFenceLanguage = getCodeFenceLanguage(language)
   const codeBlock = selectedText.endsWith('\n') ? selectedText : `${selectedText}\n`
@@ -30,6 +25,13 @@ export function formatCopiedSelectionWithContext({
   return `File: ${relativePath}\n${lineLabel}\n\n\`\`\`${codeFenceLanguage}\n${codeBlock}\`\`\``
 }
 
+export function canCopySelectionWithContext(selection: IRange): boolean {
+  return (
+    selection.startLineNumber !== selection.endLineNumber &&
+    getInclusiveEndLine(selection) >= selection.startLineNumber
+  )
+}
+
 export function getContextualCopyLineRange(selection: IRange): {
   startLine: number
   endLine: number
diff --git a/src/renderer/src/components/editor/setup-contextual-copy.test.ts b/src/renderer/src/components/editor/setup-contextual-copy.test.ts
index 8141a2ff3d34..d42bd0d39f57 100644
--- a/src/renderer/src/components/editor/setup-contextual-copy.test.ts
+++ b/src/renderer/src/components/editor/setup-contextual-copy.test.ts
@@ -29,6 +29,8 @@ vi.mock('@/lib/primary-selection', () => ({
   setPrimarySelectionText: () => {}
 }))
 
+vi.mock('./editor-shortcuts', () => ({ editorShortcutMatches: () => true }))
+
 describe('setupContextualCopy', () => {
   afterEach(() => {
     vi.unstubAllGlobals()
@@ -85,9 +87,16 @@ describe('setupContextualCopy', () => {
     expect(setInterval).not.toHaveBeenCalled()
   })
 
-  it('polls a focused editor while a contextual copy hint is visible', () => {
-    const setInterval = vi.fn(() => 1)
+  it('refreshes a visible hint without reading selection text and extracts it only on copy', async () => {
+    let refreshHint = (): void => {}
+    let keydown = (_event: KeyboardEvent): void => {}
+    const setInterval = vi.fn((callback: () => void) => {
+      refreshHint = callback
+      return 1
+    })
+    const writeClipboardText = vi.fn(async (_text: string) => {})
     vi.stubGlobal('window', {
+      api: { ui: { writeClipboardText } },
       clearInterval: vi.fn(),
       clearTimeout: vi.fn(),
       setInterval,
@@ -111,16 +120,24 @@ describe('setupContextualCopy', () => {
       getStartPosition: () => ({ lineNumber: 1, column: 1 }),
       getEndPosition: () => ({ lineNumber: 2, column: 4 })
     }
+    const selectedText = `${'x'.repeat(4 * 1024 * 1024)}\ntwo`
+    const getValueInRange = vi.fn(() => selectedText)
+    // oxlint-disable-next-line typescript/consistent-type-assertions -- SAFETY: The editor stub implements every method setupContextualCopy invokes in this scenario.
     const editorInstance = {
       addContentWidget: vi.fn(),
       getContainerDomNode: () => ({
-        addEventListener: vi.fn(),
-        removeEventListener: vi.fn()
+        addEventListener: (type: string, callback: (event: KeyboardEvent) => void) => {
+          if (type === 'keydown') {
+            keydown = callback
+          }
+        },
+        removeEventListener: vi.fn(),
+        getBoundingClientRect: () => ({ left: 0, top: 0, width: 500 })
       }),
       getLayoutInfo: () => ({ height: 500 }),
       getModel: () => ({
         getLineMaxColumn: () => 4,
-        getValueInRange: () => 'one\ntwo'
+        getValueInRange
       }),
       getScrolledVisiblePosition: () => ({ top: 20, left: 8, height: 16 }),
       getSelection: () => selection,
@@ -148,6 +165,20 @@ describe('setupContextualCopy', () => {
     })
 
     expect(setInterval).toHaveBeenCalledTimes(1)
+    for (let tick = 0; tick < 20; tick += 1) {
+      refreshHint()
+    }
+    expect(getValueInRange).not.toHaveBeenCalled()
+
+    // oxlint-disable-next-line typescript/consistent-type-assertions -- SAFETY: Shortcut matching is mocked; the handler reads only these event methods.
+    keydown({ preventDefault: vi.fn(), stopPropagation: vi.fn() } as unknown as KeyboardEvent)
+    await Promise.resolve()
+    expect(getValueInRange).toHaveBeenCalledTimes(1)
+    expect(writeClipboardText).toHaveBeenCalledWith(
+      `File: src/example.ts\nLines: 1-2\n\n\`\`\`ts\n${selectedText}\n\`\`\``
+    )
+    refreshHint()
+    expect(getValueInRange).toHaveBeenCalledTimes(1)
   })
 
   it('clears editor-scoped contextual copy cleanup on dispose', () => {
diff --git a/src/renderer/src/components/editor/setup-contextual-copy.ts b/src/renderer/src/components/editor/setup-contextual-copy.ts
index b69236617b8e..274584924742 100644
--- a/src/renderer/src/components/editor/setup-contextual-copy.ts
+++ b/src/renderer/src/components/editor/setup-contextual-copy.ts
@@ -3,7 +3,11 @@ import { formatShortcutLabel } from '@/hooks/useShortcutLabel'
 import { monaco } from '@/lib/monaco-setup'
 import { useAppStore } from '@/store'
 import { editorShortcutMatches } from './editor-shortcuts'
-import { formatCopiedSelectionWithContext, getContextualCopyLineRange } from './selection-copy'
+import {
+  canCopySelectionWithContext,
+  formatCopiedSelectionWithContext,
+  getContextualCopyLineRange
+} from './selection-copy'
 import {
   PRIMARY_SELECTION_MAX_LENGTH,
   isPrimarySelectionEnabled,
@@ -87,8 +91,10 @@ export function setupContextualCopy({
 
   const updateCopyHint = (): void => {
     updateCopyHintLabel()
-    const contextualCopyText = getContextualCopyText()
-    if (!contextualCopyText) {
+    const model = editorInstance.getModel()
+    const selection = editorInstance.getSelection()
+    // Why: hint ticks need selection bounds; extracting the selected text scales with file size.
+    if (!model || !selection || selection.isEmpty() || !canCopySelectionWithContext(selection)) {
       copyHintNode.style.display = 'none'
       copyHintWidgetPosition = null
       editorInstance.layoutContentWidget(copyHintWidget)
@@ -102,15 +108,6 @@ export function setupContextualCopy({
       return
     }
 
-    const model = editorInstance.getModel()
-    const selection = editorInstance.getSelection()
-    if (!model || !selection) {
-      copyHintNode.style.display = 'none'
-      copyHintWidgetPosition = null
-      editorInstance.layoutContentWidget(copyHintWidget)
-      return
-    }
-
     const { startLine, endLine } = getContextualCopyLineRange(selection)
     const startVisiblePosition = editorInstance.getScrolledVisiblePosition(
       selection.getStartPosition()
diff --git a/src/renderer/src/components/editor/use-editor-group-file-drop-owner.remote.test.tsx b/src/renderer/src/components/editor/use-editor-group-file-drop-owner.remote.test.tsx
new file mode 100644
index 000000000000..9d13093bb61a
--- /dev/null
+++ b/src/renderer/src/components/editor/use-editor-group-file-drop-owner.remote.test.tsx
@@ -0,0 +1,177 @@
+// @vitest-environment happy-dom
+import { act, cleanup, render, waitFor } from '@testing-library/react'
+import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest'
+import type { PreparedDroppedPaths } from '../../../../shared/native-file-drop-preparation'
+import { useAppStore } from '@/store'
+import {
+  RUNTIME_WORKTREE_PATH as RUNTIME_PATH,
+  seedRemoteDropWorkspaces,
+  sshConnectionStatesAt,
+  SSH_WORKTREE_PATH as SSH_PATH
+} from '@/lib/remote-workspace-drop-test-fixtures'
+import { joinPath } from '@/lib/path'
+import { useEditorGroupFileDropOwner } from './use-editor-group-file-drop-owner'
+
+const mocks = vi.hoisted(() => ({
+  importPaths: vi.fn(),
+  prepare: vi.fn(),
+  openFile: vi.fn(),
+  setActiveTabType: vi.fn(),
+  toastError: vi.fn()
+}))
+vi.mock('sonner', () => ({ toast: { error: mocks.toastError } }))
+vi.mock('@/runtime/runtime-file-client', () => ({
+  importExternalPathsToRuntime: mocks.importPaths
+}))
+
+function EditorStrip({ worktreeId, groupId }: { worktreeId: string; groupId: string }) {
+  const attach = useEditorGroupFileDropOwner({ worktreeId, groupId })
+  return <div ref={attach} data-testid="strip" />
+}
+
+function dropFile(target: Element): void {
+  const transfer = { types: ['Files'], files: [new File(['x'], 'shot.png')], dropEffect: 'move' }
+  const event = new Event('drop', { bubbles: true, cancelable: true, composed: true })
+  Object.defineProperty(event, 'dataTransfer', { value: transfer })
+  Object.defineProperty(event, 'isTrusted', { value: true })
+  act(() => {
+    target.dispatchEvent(event)
+  })
+}
+
+beforeEach(() => {
+  seedRemoteDropWorkspaces()
+  useAppStore.setState({ openFile: mocks.openFile, setActiveTabType: mocks.setActiveTabType })
+  mocks.prepare.mockImplementation(async ({ paths }: { paths: string[] }) => ({
+    paths,
+    failures: []
+  }))
+  mocks.importPaths.mockImplementation(async (_context, paths: string[], dir: string) => ({
+    results: paths.map((path) => ({
+      status: 'imported',
+      kind: 'file',
+      destPath: joinPath(dir, path.split('/').pop() ?? path)
+    }))
+  }))
+  vi.stubGlobal('api', {
+    fs: {
+      getPathForFile: (file: File) => `/Users/me/Desktop/${file.name}`,
+      prepareDroppedPaths: mocks.prepare
+    }
+  })
+})
+
+afterEach(() => {
+  cleanup()
+  vi.unstubAllGlobals()
+  vi.clearAllMocks()
+})
+
+describe('editor group OS file drops on remote workspaces', () => {
+  it("uploads an SSH group's drop into that workspace and opens it in that group", async () => {
+    const view = render(<EditorStrip worktreeId="wt-ssh" groupId="group-ssh" />)
+    dropFile(view.getByTestId('strip'))
+    await waitFor(() => expect(mocks.openFile).toHaveBeenCalledTimes(1))
+    const [context, paths, dir] = mocks.importPaths.mock.calls[0]
+    expect(context).toMatchObject({
+      worktreeId: 'wt-ssh',
+      worktreePath: SSH_PATH,
+      connectionId: 'ssh-1',
+      settings: { activeRuntimeEnvironmentId: null },
+      expectedExecutionHostId: 'ssh:ssh-1',
+      expectedSshTargetId: 'ssh-1',
+      expectedSshConnectionGeneration: 3
+    })
+    expect(paths).toEqual(['/Users/me/Desktop/shot.png'])
+    expect(dir).toBe(joinPath(SSH_PATH, '.orca/drops'))
+    expect(mocks.openFile).toHaveBeenCalledWith(
+      expect.objectContaining({
+        filePath: joinPath(SSH_PATH, '.orca/drops/shot.png'),
+        worktreeId: 'wt-ssh'
+      }),
+      { suppressActiveRuntimeFallback: true, targetGroupId: 'group-ssh' }
+    )
+  })
+
+  it("uploads through the workspace's own runtime, not the focused one", async () => {
+    const view = render(<EditorStrip worktreeId="wt-runtime" groupId="group-runtime" />)
+    dropFile(view.getByTestId('strip'))
+    await waitFor(() => expect(mocks.openFile).toHaveBeenCalledTimes(1))
+    expect(mocks.importPaths.mock.calls[0][0]).toMatchObject({
+      worktreeId: 'wt-runtime',
+      settings: { activeRuntimeEnvironmentId: 'owner-runtime' }
+    })
+    expect(mocks.importPaths.mock.calls[0][2]).toBe(joinPath(RUNTIME_PATH, '.orca/drops'))
+    expect(mocks.openFile).toHaveBeenCalledWith(
+      expect.objectContaining({ worktreeId: 'wt-runtime', runtimeEnvironmentId: 'owner-runtime' }),
+      { suppressActiveRuntimeFallback: false, targetGroupId: 'group-runtime' }
+    )
+  })
+
+  it.each(['wt-ssh', 'wt-runtime'])(
+    'opens nothing when the group closes during upload in %s and keeps preparation feedback',
+    async (worktreeId) => {
+      let finish: (result: {
+        results: { status: 'imported'; kind: 'file'; destPath: string }[]
+      }) => void = () => undefined
+      mocks.importPaths.mockImplementationOnce(() => new Promise((resolve) => (finish = resolve)))
+      mocks.prepare.mockResolvedValueOnce({
+        paths: ['/Users/me/Desktop/shot.png'],
+        failures: [{ target: 'rejected', reason: 'unresolved-paths', pathCount: 1, byteLength: 0 }]
+      })
+      const groupId = worktreeId === 'wt-ssh' ? 'group-ssh' : 'group-runtime'
+      const view = render(<EditorStrip worktreeId={worktreeId} groupId={groupId} />)
+      dropFile(view.getByTestId('strip'))
+      await waitFor(() => expect(mocks.importPaths).toHaveBeenCalledTimes(1))
+      expect(mocks.toastError).toHaveBeenCalledTimes(1)
+      view.unmount()
+      useAppStore.setState((state) => ({
+        groupsByWorktree: {
+          ...state.groupsByWorktree,
+          [worktreeId]: [{ id: 'group-other', worktreeId, activeTabId: null, tabOrder: [] }]
+        }
+      }))
+      await act(async () =>
+        finish({ results: [{ status: 'imported', kind: 'file', destPath: '/uploaded/shot.png' }] })
+      )
+      expect(mocks.openFile).not.toHaveBeenCalled()
+      expect(mocks.setActiveTabType).not.toHaveBeenCalled()
+      expect(mocks.toastError).toHaveBeenCalledTimes(1)
+    }
+  )
+
+  it('refuses when the SSH connection changes before preparation finishes', async () => {
+    let finish: (prepared: PreparedDroppedPaths) => void = () => undefined
+    mocks.prepare.mockImplementationOnce(
+      () => new Promise<PreparedDroppedPaths>((resolve) => (finish = resolve))
+    )
+    const view = render(<EditorStrip worktreeId="wt-ssh" groupId="group-ssh" />)
+    dropFile(view.getByTestId('strip'))
+    // A reconnect is a new connection generation: the captured host no longer holds.
+    useAppStore.setState({ sshConnectionStates: sshConnectionStatesAt(4) })
+    await act(async () => finish({ paths: ['/Users/me/Desktop/shot.png'], failures: [] }))
+    await waitFor(() => expect(mocks.toastError).toHaveBeenCalledTimes(1))
+    expect(mocks.toastError.mock.calls[0][0]).toMatch(/Couldn't verify which host owns/)
+    expect(mocks.importPaths).not.toHaveBeenCalled()
+    expect(mocks.openFile).not.toHaveBeenCalled()
+  })
+
+  it('refuses when the workspace runtime owner changes before preparation finishes', async () => {
+    let finish: (prepared: PreparedDroppedPaths) => void = () => undefined
+    mocks.prepare.mockImplementationOnce(
+      () => new Promise<PreparedDroppedPaths>((resolve) => (finish = resolve))
+    )
+    const view = render(<EditorStrip worktreeId="wt-runtime" groupId="group-runtime" />)
+    dropFile(view.getByTestId('strip'))
+    useAppStore.setState((state) => ({
+      repos: state.repos.map((repo) =>
+        repo.id === 'repo-rt' ? { ...repo, executionHostId: 'runtime:new-owner' as const } : repo
+      )
+    }))
+    await act(async () => finish({ paths: ['/Users/me/Desktop/shot.png'], failures: [] }))
+    await waitFor(() => expect(mocks.toastError).toHaveBeenCalledTimes(1))
+    expect(mocks.toastError.mock.calls[0][0]).toMatch(/Couldn't verify which host owns/)
+    expect(mocks.importPaths).not.toHaveBeenCalled()
+    expect(mocks.openFile).not.toHaveBeenCalled()
+  })
+})
diff --git a/src/renderer/src/components/editor/use-editor-group-file-drop-owner.test.tsx b/src/renderer/src/components/editor/use-editor-group-file-drop-owner.test.tsx
new file mode 100644
index 000000000000..a33abd776bfe
--- /dev/null
+++ b/src/renderer/src/components/editor/use-editor-group-file-drop-owner.test.tsx
@@ -0,0 +1,275 @@
+// @vitest-environment happy-dom
+import { Suspense, use } from 'react'
+import { act, cleanup, render, waitFor } from '@testing-library/react'
+import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest'
+import type { PreparedDroppedPaths } from '../../../../shared/native-file-drop-preparation'
+import { FLOATING_TERMINAL_WORKTREE_ID } from '../../../../shared/constants'
+import { createOsFileDropSequence } from '@/hooks/use-os-file-drop-owner'
+import type * as OsFileDropOwnerModule from '@/hooks/use-os-file-drop-owner'
+import { useEditorGroupFileDropOwner } from './use-editor-group-file-drop-owner'
+
+const mocks = vi.hoisted(() => {
+  const groupsByWorktree: Record<string, { id: string }[]> = {}
+  return {
+    openFile: vi.fn(),
+    setActiveTabType: vi.fn(),
+    stat: vi.fn(),
+    prepare: vi.fn(),
+    toastError: vi.fn(),
+    groupsByWorktree
+  }
+})
+vi.mock('sonner', () => ({ toast: { error: mocks.toastError } }))
+vi.mock('@/hooks/use-os-file-drop-owner', async (importOriginal) => {
+  const actual = await importOriginal<typeof OsFileDropOwnerModule>()
+  return { ...actual, createOsFileDropSequence: vi.fn(actual.createOsFileDropSequence) }
+})
+vi.mock('@/lib/connection-context', () => ({ getConnectionId: () => null }))
+vi.mock('@/lib/ssh-mutation-expectation', () => ({
+  // Like the real lookup, a workspace with no host record fails closed.
+  captureWorktreeSshMutationExpectation: (_state: unknown, worktreeId: string) => {
+    if (!worktreeId.startsWith('wt-') && worktreeId !== FLOATING_TERMINAL_WORKTREE_ID) {
+      throw new Error('unresolved host')
+    }
+    return { expectedExecutionHostId: 'local' }
+  }
+}))
+vi.mock('@/lib/worktree-runtime-owner', () => ({
+  getRuntimeEnvironmentIdForWorktree: () => null
+}))
+vi.mock('@/lib/user-opened-local-path', () => ({ statUserOpenedPath: mocks.stat }))
+vi.mock('@/store', () => ({
+  useAppStore: {
+    getState: () => ({
+      settings: {},
+      activeWorktreeId: 'wt-active',
+      groupsByWorktree: mocks.groupsByWorktree,
+      getKnownWorktreeById: (id: string) => ({ id, path: `/repos/${id}` }),
+      setActiveTabType: mocks.setActiveTabType,
+      openFile: mocks.openFile
+    })
+  }
+}))
+
+function EditorArea({ worktreeId, groupId }: { worktreeId: string; groupId: string }) {
+  const attachArea = useEditorGroupFileDropOwner({ worktreeId, groupId })
+  return <div ref={attachArea} data-testid={`${groupId}:area`} />
+}
+
+function EditorGroup({
+  worktreeId,
+  groupId,
+  editorTabActive = true
+}: {
+  worktreeId: string
+  groupId: string
+  editorTabActive?: boolean
+}) {
+  const attachStrip = useEditorGroupFileDropOwner({ worktreeId, groupId })
+  return (
+    <>
+      <div ref={attachStrip} data-testid={`${groupId}:strip`} />
+      {/* Like TabGroupPanel, the editor area only renders while an editor tab is active. */}
+      {editorTabActive ? <EditorArea worktreeId={worktreeId} groupId={groupId} /> : null}
+    </>
+  )
+}
+
+function deferredPreparation(): (prepared: PreparedDroppedPaths) => void {
+  let finish: (prepared: PreparedDroppedPaths) => void = () => undefined
+  mocks.prepare.mockImplementationOnce(
+    () => new Promise<PreparedDroppedPaths>((resolve) => (finish = resolve))
+  )
+  return (prepared) => finish(prepared)
+}
+
+function dropFile(target: Element, name: string): void {
+  const transfer = { types: ['Files'], files: [new File(['x'], name)], dropEffect: 'move' }
+  const event = new Event('drop', { bubbles: true, cancelable: true, composed: true })
+  Object.defineProperty(event, 'dataTransfer', { value: transfer })
+  Object.defineProperty(event, 'isTrusted', { value: true })
+  act(() => {
+    target.dispatchEvent(event)
+  })
+}
+
+const openedPaths = (): string[] => mocks.openFile.mock.calls.map(([file]) => file.filePath)
+
+beforeEach(() => {
+  mocks.groupsByWorktree = {
+    'wt-b': [{ id: 'group-b' }],
+    [FLOATING_TERMINAL_WORKTREE_ID]: [{ id: 'floating-group' }]
+  }
+  mocks.stat.mockResolvedValue({ isDirectory: false, escapesWorktree: false })
+  mocks.prepare.mockImplementation(async ({ paths }: { paths: string[] }) => ({
+    paths,
+    failures: []
+  }))
+  vi.stubGlobal('api', {
+    fs: {
+      getPathForFile: (file: File) => `/repos/wt-b/${file.name}`,
+      prepareDroppedPaths: mocks.prepare
+    }
+  })
+})
+
+afterEach(() => {
+  cleanup()
+  vi.unstubAllGlobals()
+  vi.clearAllMocks()
+})
+
+describe('editor group OS file drops', () => {
+  it.each(['strip', 'area'])(
+    'opens a file dropped on the %s in that group and worktree, not the active one',
+    async (root) => {
+      const view = render(<EditorGroup worktreeId="wt-b" groupId="group-b" />)
+      dropFile(view.getByTestId(`group-b:${root}`), 'notes.md')
+      await waitFor(() => expect(mocks.openFile).toHaveBeenCalledTimes(1))
+      expect(mocks.prepare).toHaveBeenCalledWith({
+        paths: ['/repos/wt-b/notes.md'],
+        consumer: 'main-reader'
+      })
+      expect(mocks.openFile).toHaveBeenCalledWith(
+        expect.objectContaining({
+          filePath: '/repos/wt-b/notes.md',
+          relativePath: 'notes.md',
+          worktreeId: 'wt-b'
+        }),
+        { targetGroupId: 'group-b' }
+      )
+      expect(mocks.setActiveTabType).toHaveBeenCalledWith('editor', 'wt-b')
+    }
+  )
+
+  it('opens a file dropped on the floating panel as a local floating tab', async () => {
+    const view = render(
+      <EditorGroup worktreeId={FLOATING_TERMINAL_WORKTREE_ID} groupId="floating-group" />
+    )
+    dropFile(view.getByTestId('floating-group:strip'), 'scratch.md')
+    await waitFor(() => expect(mocks.openFile).toHaveBeenCalledTimes(1))
+    expect(mocks.openFile).toHaveBeenCalledWith(
+      expect.objectContaining({
+        filePath: '/repos/wt-b/scratch.md',
+        worktreeId: FLOATING_TERMINAL_WORKTREE_ID,
+        runtimeEnvironmentId: null
+      }),
+      { preview: false, suppressActiveRuntimeFallback: true, targetGroupId: 'floating-group' }
+    )
+  })
+
+  it('applies a strip drop then an area drop in drop order when the first prepares slower', async () => {
+    const pending: (() => void)[] = []
+    mocks.prepare.mockImplementation(
+      ({ paths }: { paths: string[] }) =>
+        new Promise<PreparedDroppedPaths>((resolve) =>
+          pending.push(() => resolve({ paths, failures: [] }))
+        )
+    )
+    const view = render(<EditorGroup worktreeId="wt-b" groupId="group-b" />)
+    dropFile(view.getByTestId('group-b:strip'), 'first.ts')
+    dropFile(view.getByTestId('group-b:area'), 'second.ts')
+    expect(pending).toHaveLength(2)
+    await act(async () => pending[1]())
+    expect(mocks.openFile).not.toHaveBeenCalled()
+    await act(async () => pending[0]())
+    await waitFor(() => expect(mocks.openFile).toHaveBeenCalledTimes(2))
+    expect(openedPaths()).toEqual(['/repos/wt-b/first.ts', '/repos/wt-b/second.ts'])
+  })
+
+  it('still opens in the group when switching to a terminal tab unmounts the editor area', async () => {
+    const finish = deferredPreparation()
+    const view = render(<EditorGroup worktreeId="wt-b" groupId="group-b" />)
+    dropFile(view.getByTestId('group-b:area'), 'shot.png')
+    view.rerender(<EditorGroup worktreeId="wt-b" groupId="group-b" editorTabActive={false} />)
+    await act(async () => finish({ paths: ['/repos/wt-b/shot.png'], failures: [] }))
+    await waitFor(() => expect(mocks.openFile).toHaveBeenCalledTimes(1))
+    expect(mocks.openFile).toHaveBeenCalledWith(
+      expect.objectContaining({ filePath: '/repos/wt-b/shot.png', worktreeId: 'wt-b' }),
+      { targetGroupId: 'group-b' }
+    )
+  })
+
+  it('opens nothing once the group closes during preparation, but still reports failures', async () => {
+    const finish = deferredPreparation()
+    const view = render(<EditorGroup worktreeId="wt-b" groupId="group-b" />)
+    dropFile(view.getByTestId('group-b:area'), 'shot.png')
+    view.unmount()
+    mocks.groupsByWorktree['wt-b'] = [{ id: 'group-other' }]
+    await act(async () =>
+      finish({
+        paths: ['/repos/wt-b/shot.png'],
+        failures: [
+          {
+            target: 'rejected',
+            reason: 'temp-copy-failed',
+            commonReason: 'copy-failed',
+            pathCount: 1,
+            byteLength: 1
+          }
+        ]
+      })
+    )
+    await waitFor(() => expect(mocks.toastError).toHaveBeenCalledTimes(1))
+    expect(mocks.stat).not.toHaveBeenCalled()
+    expect(mocks.openFile).not.toHaveBeenCalled()
+  })
+
+  it('keeps drop order when both roots remount while preparation is pending', async () => {
+    const finish = deferredPreparation()
+    const first = render(<EditorGroup worktreeId="wt-b" groupId="group-b" />)
+    dropFile(first.getByTestId('group-b:area'), 'first.ts')
+    first.unmount()
+    const second = render(<EditorGroup worktreeId="wt-b" groupId="group-b" />)
+    dropFile(second.getByTestId('group-b:strip'), 'second.ts')
+    await act(async () => undefined)
+    expect(mocks.openFile).not.toHaveBeenCalled()
+    await act(async () => finish({ paths: ['/repos/wt-b/first.ts'], failures: [] }))
+    await waitFor(() => expect(mocks.openFile).toHaveBeenCalledTimes(2))
+    expect(openedPaths()).toEqual(['/repos/wt-b/first.ts', '/repos/wt-b/second.ts'])
+  })
+
+  it.each(['group', 'workspace'])(
+    'opens nothing when the destination %s closes during stat and keeps preparation feedback',
+    async (closed) => {
+      let finish: (stat: { isDirectory: boolean; escapesWorktree: boolean }) => void = () =>
+        undefined
+      mocks.stat.mockImplementationOnce(() => new Promise((resolve) => (finish = resolve)))
+      mocks.prepare.mockResolvedValueOnce({
+        paths: ['/repos/wt-b/shot.png'],
+        failures: [{ target: 'rejected', reason: 'unresolved-paths', pathCount: 1, byteLength: 0 }]
+      })
+      const view = render(<EditorGroup worktreeId="wt-b" groupId="group-b" />)
+      dropFile(view.getByTestId('group-b:area'), 'shot.png')
+      await waitFor(() => expect(mocks.stat).toHaveBeenCalledTimes(1))
+      expect(mocks.toastError).toHaveBeenCalledTimes(1)
+      view.unmount()
+      if (closed === 'workspace') {
+        delete mocks.groupsByWorktree['wt-b']
+      } else {
+        mocks.groupsByWorktree['wt-b'] = [{ id: 'group-other' }]
+      }
+      await act(async () => finish({ isDirectory: false, escapesWorktree: false }))
+      expect(mocks.openFile).not.toHaveBeenCalled()
+      expect(mocks.setActiveTabType).not.toHaveBeenCalled()
+      expect(mocks.toastError).toHaveBeenCalledTimes(1)
+    }
+  )
+
+  it('creates no shared sequence for a render that never commits', async () => {
+    const never = new Promise<never>(() => undefined)
+    function SuspendedGroup() {
+      useEditorGroupFileDropOwner({ worktreeId: 'wt-b', groupId: 'group-suspended' })
+      use(never)
+      return null
+    }
+    await act(async () => {
+      render(
+        <Suspense fallback={null}>
+          <SuspendedGroup />
+        </Suspense>
+      )
+    })
+    expect(createOsFileDropSequence).not.toHaveBeenCalled()
+  })
+})
diff --git a/src/renderer/src/components/editor/use-editor-group-file-drop-owner.ts b/src/renderer/src/components/editor/use-editor-group-file-drop-owner.ts
new file mode 100644
index 000000000000..599505604931
--- /dev/null
+++ b/src/renderer/src/components/editor/use-editor-group-file-drop-owner.ts
@@ -0,0 +1,79 @@
+import { useLayoutEffect, useMemo, useRef } from 'react'
+import { toast } from 'sonner'
+import {
+  createOsFileDropSequence,
+  useOsFileDropOwner,
+  type OsFileDropSequence
+} from '@/hooks/use-os-file-drop-owner'
+import { getNativeFileDropRejectionMessage } from '@/lib/native-file-drop-rejection-message'
+import {
+  captureEditorFileDropOpen,
+  editorGroupStillExists,
+  type EditorFileDropDestination
+} from './editor-dropped-file-open'
+
+type GroupSequenceEntry = { sequence: OsFileDropSequence; owners: number }
+
+// The tab strip and editor area are sibling roots of one group and render in different trees.
+const groupSequences = new Map<string, GroupSequenceEntry>()
+
+function groupSequenceEntry(key: string): GroupSequenceEntry {
+  const existing = groupSequences.get(key)
+  if (existing) {
+    return existing
+  }
+  const entry = { sequence: createOsFileDropSequence(), owners: 0 }
+  groupSequences.set(key, entry)
+  return entry
+}
+
+function useEditorGroupFileDropSequence(key: string): OsFileDropSequence {
+  useLayoutEffect(() => {
+    const entry = groupSequenceEntry(key)
+    entry.owners += 1
+    return () => {
+      entry.owners -= 1
+      // Why: wait for queued drops, so a root remounting in the same commit keeps their order.
+      void entry.sequence.deliveryTail.then(() => {
+        if (entry.owners === 0 && groupSequences.get(key) === entry) {
+          groupSequences.delete(key)
+        }
+      })
+    }
+  }, [key])
+  // Resolved when a drop queues, never during render.
+  return useMemo(
+    () => ({
+      get deliveryTail() {
+        return groupSequenceEntry(key).sequence.deliveryTail
+      },
+      set deliveryTail(tail: Promise<void>) {
+        groupSequenceEntry(key).sequence.deliveryTail = tail
+      }
+    }),
+    [key]
+  )
+}
+
+/** Opens OS files dropped on this group's tab strip or editor area in that group's worktree. */
+export function useEditorGroupFileDropOwner({
+  worktreeId,
+  groupId
+}: EditorFileDropDestination): (root: HTMLElement | null) => void {
+  const rootRef = useRef<HTMLElement | null>(null)
+  const sequence = useEditorGroupFileDropSequence(`${worktreeId}\0${groupId ?? ''}`)
+  return useOsFileDropOwner(rootRef, {
+    consumer: 'main-reader',
+    sequence,
+    captureDestination: () => captureEditorFileDropOpen({ worktreeId, groupId }),
+    // Why: switching to a terminal tab unmounts the editor area; the open step checks the group.
+    isDestinationLive: () => editorGroupStillExists({ worktreeId, groupId }),
+    onDrop: async (prepared, { destination }) => {
+      for (const failure of prepared.failures) {
+        const message = getNativeFileDropRejectionMessage(failure)
+        toast.error(message.title, { description: message.description })
+      }
+      await destination?.(prepared.paths)
+    }
+  })
+}
diff --git a/src/renderer/src/components/editor/use-markdown-preview-components.tsx b/src/renderer/src/components/editor/use-markdown-preview-components.tsx
index 1b7d21b2dee7..e40d83ad2def 100644
--- a/src/renderer/src/components/editor/use-markdown-preview-components.tsx
+++ b/src/renderer/src/components/editor/use-markdown-preview-components.tsx
@@ -22,6 +22,8 @@ import type { MarkdownPreviewReviewActions } from './use-markdown-preview-review
 import type { MarkdownPreviewViewport } from './use-markdown-preview-viewport'
 import { useLocalImageSrc } from './useLocalImageSrc'
 import { documentResourceAccess } from '@/lib/local-file-access'
+import { MarkdownGitHubCallout } from '@/components/markdown-github-callout'
+import { readGitHubCalloutKind } from '@/lib/remark-github-callouts'
 
 export function useMarkdownPreviewComponents({
   foundation,
@@ -187,12 +189,18 @@ export function useMarkdownPreviewComponents({
       },
       p: ({ node, children, ...props }) =>
         wrapAnnotatedBlock('p', node as MarkdownPreviewPositionNode, <p {...props}>{children}</p>),
-      blockquote: ({ node, children, ...props }) =>
-        wrapAnnotatedBlock(
+      blockquote: ({ node, children, ...props }) => {
+        const calloutKind = readGitHubCalloutKind(node?.properties.dataCallout)
+        return wrapAnnotatedBlock(
           'blockquote',
           node as MarkdownPreviewPositionNode,
-          <blockquote {...props}>{children}</blockquote>
-        ),
+          calloutKind ? (
+            <MarkdownGitHubCallout kind={calloutKind}>{children}</MarkdownGitHubCallout>
+          ) : (
+            <blockquote {...props}>{children}</blockquote>
+          )
+        )
+      },
       table: ({ node, children, ...props }) =>
         wrapAnnotatedBlock(
           'table',
diff --git a/src/renderer/src/components/editor/useIpynbCellExecution.test.tsx b/src/renderer/src/components/editor/useIpynbCellExecution.test.tsx
index 8ec4469134d9..8dfb540ff5c2 100644
--- a/src/renderer/src/components/editor/useIpynbCellExecution.test.tsx
+++ b/src/renderer/src/components/editor/useIpynbCellExecution.test.tsx
@@ -1,22 +1,28 @@
 // @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 { parseIpynb } from './ipynb-parse'
+import type { KernelFrameEvent } from '../../../../shared/notebook-kernel-types'
 
-const { getConnectionIdMock, notebookApi, toastError } = vi.hoisted(() => {
+const { getConnectionIdMock, notebookApi, toastError, frameListener } = vi.hoisted(() => {
+  const frameListener = { current: (_event: KernelFrameEvent): void => {} }
   const notebookApi = {
     listPythonEnvironments: vi.fn(),
     startKernel: vi.fn(),
     execute: vi.fn(),
     shutdownKernel: vi.fn(),
-    onKernelFrame: vi.fn(() => () => {})
+    onKernelFrame: vi.fn((listener: (event: KernelFrameEvent) => void) => {
+      frameListener.current = listener
+      return () => {}
+    })
   }
   // The kernel session subscribes to kernel frames when it loads.
   Object.defineProperty(window, 'api', { configurable: true, value: { notebook: notebookApi } })
   return {
     getConnectionIdMock: vi.fn((): string | null => null),
     notebookApi,
-    toastError: vi.fn()
+    toastError: vi.fn(),
+    frameListener
   }
 })
 
@@ -26,6 +32,8 @@ vi.mock('sonner', () => ({ toast: { error: toastError } }))
 vi.mock('@/store', () => ({ useAppStore: { subscribe: () => () => {} } }))
 
 import { useIpynbCellExecution } from './useIpynbCellExecution'
+import { runCells, trustNotebook } from './ipynb-kernel-session'
+import { getSession } from './ipynb-kernel-store'
 
 function notebookContent(withIds: boolean): string {
   return JSON.stringify({
@@ -63,17 +71,21 @@ function renderExecution(filePath: string, applyContent = vi.fn(), withIds = tru
   return { hook, applyContent, content: () => content }
 }
 
-describe('notebook cell execution', () => {
-  beforeEach(() => {
-    vi.clearAllMocks()
-    getConnectionIdMock.mockReturnValue(null)
-    notebookApi.listPythonEnvironments.mockResolvedValue({
-      workspace: [{ path: '/repo/.venv/bin/python', name: '.venv', version: '3.12.1' }],
-      path: []
-    })
-    notebookApi.startKernel.mockResolvedValue({ status: 'ready' })
+beforeEach(() => {
+  vi.clearAllMocks()
+  getConnectionIdMock.mockReturnValue(null)
+  notebookApi.listPythonEnvironments.mockResolvedValue({
+    workspace: [{ path: '/repo/.venv/bin/python', name: '.venv', version: '3.12.1' }],
+    path: []
   })
+  notebookApi.startKernel.mockResolvedValue({ status: 'ready' })
+})
+
+afterEach(() => {
+  vi.restoreAllMocks()
+})
 
+describe('notebook cell execution', () => {
   it('asks for trust before running, then runs the cell in a kernel', async () => {
     const { hook } = renderExecution('/repo/trust.ipynb')
 
@@ -117,3 +129,148 @@ describe('notebook cell execution', () => {
     expect(cell?.key).toBe(cells[1]?.id)
   })
 })
+
+function completedNotebookContent(count: number): string {
+  return JSON.stringify({
+    nbformat: 4,
+    nbformat_minor: 5,
+    metadata: { language_info: { name: 'python' }, custom: { keep: true } },
+    cells: Array.from({ length: count }, (_, index) => ({
+      id: `cell-${index}`,
+      cell_type: 'code',
+      metadata: { tags: ['keep'] },
+      execution_count: null,
+      outputs: [],
+      source: [`print(${index})\n`]
+    }))
+  })
+}
+
+async function finishHiddenRuns(filePath: string, count: number): Promise<void> {
+  trustNotebook(filePath)
+  await runCells(
+    filePath,
+    Array.from({ length: count }, (_, index) => ({
+      key: `cell-${index}`,
+      code: `print(${index})`
+    })),
+    '/repo'
+  )
+  for (let index = 0; index < count; index += 1) {
+    frameListener.current({
+      filePath,
+      frame: { type: 'stream', content: { name: 'stdout', text: `α😀 ${index}\nsecond\n` } }
+    })
+    frameListener.current({
+      filePath,
+      frame: {
+        type: 'display_data',
+        content: {
+          data: { 'text/plain': `result ${index}` },
+          metadata: { keep: true },
+          transient: { display_id: `display-${index}` }
+        }
+      }
+    })
+    frameListener.current({
+      filePath,
+      frame: { type: 'done', status: 'ok', execution_count: index + 1 }
+    })
+  }
+}
+
+function mountFinishedNotebook(filePath: string, content: string) {
+  const applyContent = vi.fn()
+  const flushSourceDrafts = vi.fn(() => content)
+  const hook = renderHook(() =>
+    useIpynbCellExecution({
+      filePath,
+      worktreeId: 'worktree-a',
+      rootPath: '/repo',
+      flushSourceDrafts,
+      applyContent
+    })
+  )
+  return { hook, applyContent, flushSourceDrafts }
+}
+
+describe('finished notebook runs retained while the viewer is hidden', () => {
+  it('persists all completed outputs with one serialization when the viewer remounts', async () => {
+    const filePath = '/repo/hidden-batch.ipynb'
+    const content = completedNotebookContent(20)
+    await finishHiddenRuns(filePath, 20)
+    expect(Object.values(getSession(filePath).runs).every((run) => !run.committed)).toBe(true)
+    const serialize = vi.spyOn(JSON, 'stringify')
+    const { hook, applyContent, flushSourceDrafts } = mountFinishedNotebook(filePath, content)
+    expect(serialize).toHaveBeenCalledTimes(1)
+    serialize.mockRestore()
+    expect(flushSourceDrafts).toHaveBeenCalledTimes(1)
+    expect(applyContent).toHaveBeenCalledTimes(1)
+    const saved: unknown = applyContent.mock.calls[0]?.[0]
+    expect(typeof saved).toBe('string')
+    if (typeof saved !== 'string') {
+      throw new Error('Expected saved notebook text')
+    }
+    const cells = parseIpynb(saved).cells
+    expect(cells).toHaveLength(20)
+    for (let index = 0; index < cells.length; index += 1) {
+      expect(cells[index]?.executionCount).toBe(index + 1)
+      expect(cells[index]?.outputs[0]).toEqual({
+        kind: 'stream',
+        name: 'stdout',
+        text: `α😀 ${index}\nsecond\n`
+      })
+      expect(cells[index]?.outputs[1]).toMatchObject({
+        kind: 'display',
+        items: [{ mime: 'text/plain', value: `result ${index}` }]
+      })
+    }
+    expect(saved).toContain('"custom"')
+    expect(saved).toContain('"tags"')
+    expect(saved).not.toContain('"transient"')
+    expect(
+      Object.values(getSession(filePath).runs).every(
+        (run) => run.committed && run.outputs.length === 0
+      )
+    ).toBe(true)
+    hook.unmount()
+  })
+
+  it('preserves the saved prefix when a later raw cell refuses the update and retires every run', async () => {
+    const filePath = '/repo/hidden-refused-middle.ipynb'
+    const content = completedNotebookContent(3)
+    const raw: unknown = JSON.parse(content)
+    if (typeof raw !== 'object' || raw === null || !('cells' in raw) || !Array.isArray(raw.cells)) {
+      throw new Error('Expected notebook cells')
+    }
+    raw.cells.splice(1, 0, null)
+    await finishHiddenRuns(filePath, 3)
+    const { hook, applyContent } = mountFinishedNotebook(filePath, JSON.stringify(raw))
+    expect(applyContent).toHaveBeenCalledTimes(1)
+    const saved: unknown = applyContent.mock.calls[0]?.[0]
+    if (typeof saved !== 'string') {
+      throw new Error('Expected saved prefix')
+    }
+    const cells = parseIpynb(saved).cells
+    expect(cells.map((cell) => cell.executionCount)).toEqual([1, null, null])
+    expect(cells.map((cell) => cell.outputs.length)).toEqual([2, 0, 0])
+    expect(
+      Object.values(getSession(filePath).runs).every(
+        (run) => run.committed && run.outputs.length === 0
+      )
+    ).toBe(true)
+    hook.unmount()
+  })
+
+  it.each(['{', '{"cells":[null,{"id":"cell-0","cell_type":"code","source":[]}]}'])(
+    'retires runs without changing a document that refuses its first update: %s',
+    async (content) => {
+      const filePath = `/repo/hidden-refused-first-${content}.ipynb`
+      await finishHiddenRuns(filePath, 1)
+      const { hook, applyContent } = mountFinishedNotebook(filePath, content)
+      expect(applyContent).not.toHaveBeenCalled()
+      expect(getSession(filePath).runs['cell-0']).toMatchObject({ committed: true, outputs: [] })
+      hook.unmount()
+    }
+  )
+})
diff --git a/src/renderer/src/components/editor/useIpynbCellExecution.ts b/src/renderer/src/components/editor/useIpynbCellExecution.ts
index 42b95a6a6ed0..97bf5346d0f9 100644
--- a/src/renderer/src/components/editor/useIpynbCellExecution.ts
+++ b/src/renderer/src/components/editor/useIpynbCellExecution.ts
@@ -2,7 +2,7 @@ import { useEffect, useState } from 'react'
 import { toast } from 'sonner'
 import { translate } from '@/i18n/i18n'
 import { getConnectionId } from '@/lib/connection-context'
-import { clearIpynbOutputs, updateIpynbCellRun, withIpynbCellIds } from './ipynb-cell-mutations'
+import { clearIpynbOutputs, updateIpynbCellRuns, withIpynbCellIds } from './ipynb-cell-mutations'
 import { toStoredOutputs } from './ipynb-kernel-outputs'
 import {
   forgetFinishedRuns,
@@ -48,18 +48,23 @@ export function useIpynbCellExecution({
     let nextContent = latestContent
     try {
       const cells = parseIpynb(latestContent).cells
+      const updates: {
+        index: number
+        outputs: Record<string, unknown>[]
+        executionCount: number | null
+      }[] = []
       for (const key of uncommittedRunKeys) {
         const run = getCellRun(filePath, key)
         const index = cells.findIndex((cell, cellIndex) => getIpynbCellKey(cell, cellIndex) === key)
         if (run && index !== -1) {
-          nextContent = updateIpynbCellRun(
-            nextContent,
+          updates.push({
             index,
-            toStoredOutputs(run.outputs),
-            run.executionCount
-          )
+            outputs: toStoredOutputs(run.outputs),
+            executionCount: run.executionCount
+          })
         }
       }
+      nextContent = updateIpynbCellRuns(latestContent, updates)
     } catch {
       // An unparseable document has no cells to take outputs; drop them.
     }
diff --git a/src/renderer/src/components/file-path-cursor-tooltip.tsx b/src/renderer/src/components/file-path-cursor-tooltip.tsx
index 4d28b5cae888..f346a2c32b09 100644
--- a/src/renderer/src/components/file-path-cursor-tooltip.tsx
+++ b/src/renderer/src/components/file-path-cursor-tooltip.tsx
@@ -1,5 +1,5 @@
 import React from 'react'
-import { Slot } from 'radix-ui'
+import * as Slot from 'radix-ui/slot'
 import { Tooltip, TooltipContent, TooltipTrigger } from '@/components/ui/tooltip'
 
 // Clears the pointer without putting the label under the cursor's own hotspot.
diff --git a/src/renderer/src/components/floating-terminal/use-floating-terminal-close-actions.test.tsx b/src/renderer/src/components/floating-terminal/use-floating-terminal-close-actions.test.tsx
index 3907c88c0208..28988ed23f97 100644
--- a/src/renderer/src/components/floating-terminal/use-floating-terminal-close-actions.test.tsx
+++ b/src/renderer/src/components/floating-terminal/use-floating-terminal-close-actions.test.tsx
@@ -3,7 +3,11 @@ import { renderHook } from '@testing-library/react'
 import { beforeEach, describe, expect, it, vi } from 'vitest'
 import { FLOATING_TERMINAL_WORKTREE_ID, getDefaultSettings } from '../../../../shared/constants'
 import { useAppStore } from '@/store'
-import { makeOpenFile, makeTabGroup, makeUnifiedTab } from '@/store/slices/store-test-helpers'
+import {
+  makeOpenFile,
+  makeTabGroup,
+  makeUnifiedTab
+} from '../../store/slices/store-session-test-harness'
 import { useFloatingTerminalCloseActions } from './use-floating-terminal-close-actions'
 
 const requestEditorFileClose = vi.hoisted(() => vi.fn())
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 f07fe236c70d..b26fd971b116 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
@@ -38,7 +38,12 @@ export default function GitHubItemDialog({
   const issueAttachedWorkspace = useMemo(
     () =>
       workItem?.type === 'issue'
-        ? findGithubIssueWorkspaceAttachment(allWorktrees, effectiveRepoId, workItem.number)
+        ? findGithubIssueWorkspaceAttachment(
+            allWorktrees,
+            effectiveRepoId,
+            workItem.number,
+            workItem.url
+          )
         : null,
     [allWorktrees, effectiveRepoId, workItem]
   )
@@ -51,7 +56,8 @@ export default function GitHubItemDialog({
       const currentAttached = findGithubIssueWorkspaceAttachment(
         useAppStore.getState().allWorktrees(),
         effectiveRepoId,
-        item.number
+        item.number,
+        item.url
       )
       if (!currentAttached) {
         onUse(item)
diff --git a/src/renderer/src/components/github-project/ProjectItemSlugDialog.tsx b/src/renderer/src/components/github-project/ProjectItemSlugDialog.tsx
index bf176e802c34..06dc94deb4ca 100644
--- a/src/renderer/src/components/github-project/ProjectItemSlugDialog.tsx
+++ b/src/renderer/src/components/github-project/ProjectItemSlugDialog.tsx
@@ -8,7 +8,7 @@
 // simplified surface; it also routes every write through slug-addressed
 // mutation helpers and patches the Project table cache on success.
 import React from 'react'
-import { VisuallyHidden } from 'radix-ui'
+import * as VisuallyHidden from 'radix-ui/visually-hidden'
 import { Sheet, SheetContent, SheetDescription, SheetTitle } from '@/components/ui/sheet'
 import type { GitHubItemDialogProjectOrigin } from '@/components/GitHubItemDialog'
 import { SlugDialogBody } from './slug-dialog/SlugDialogBody'
diff --git a/src/renderer/src/components/gitlab-item-dialog/gitlab-item-dialog-view.tsx b/src/renderer/src/components/gitlab-item-dialog/gitlab-item-dialog-view.tsx
index 5a4bc3efed34..08fbda906825 100644
--- a/src/renderer/src/components/gitlab-item-dialog/gitlab-item-dialog-view.tsx
+++ b/src/renderer/src/components/gitlab-item-dialog/gitlab-item-dialog-view.tsx
@@ -1,6 +1,6 @@
 import { ImeTextarea } from '@/lib/ime-text-field'
 import { CircleDot, ExternalLink, GitMerge, LoaderCircle, RefreshCw, Send, X } from 'lucide-react'
-import { VisuallyHidden } from 'radix-ui'
+import * as VisuallyHidden from 'radix-ui/visually-hidden'
 import { Button } from '@/components/ui/button'
 import {
   Sheet,
diff --git a/src/renderer/src/components/linear-item-drawer-sheet.tsx b/src/renderer/src/components/linear-item-drawer-sheet.tsx
index 94d4263bbf75..247266424b0d 100644
--- a/src/renderer/src/components/linear-item-drawer-sheet.tsx
+++ b/src/renderer/src/components/linear-item-drawer-sheet.tsx
@@ -8,7 +8,7 @@ import {
   Plus,
   X
 } from 'lucide-react'
-import { VisuallyHidden } from 'radix-ui'
+import * as VisuallyHidden from 'radix-ui/visually-hidden'
 
 import { Button } from '@/components/ui/button'
 import { ButtonGroup } from '@/components/ui/button-group'
diff --git a/src/renderer/src/components/markdown-github-callout.tsx b/src/renderer/src/components/markdown-github-callout.tsx
new file mode 100644
index 000000000000..234a31814d82
--- /dev/null
+++ b/src/renderer/src/components/markdown-github-callout.tsx
@@ -0,0 +1,70 @@
+import type React from 'react'
+import {
+  Info,
+  Lightbulb,
+  MessageSquareWarning,
+  OctagonAlert,
+  TriangleAlert,
+  type LucideIcon
+} from 'lucide-react'
+import { translate } from '@/i18n/i18n'
+import { cn } from '@/lib/utils'
+import type { GitHubCalloutKind } from '@/lib/remark-github-callouts'
+
+const CALLOUT_PRESENTATIONS: Record<
+  GitHubCalloutKind,
+  { Icon: LucideIcon; label: () => string; borderClassName: string; titleClassName: string }
+> = {
+  note: {
+    Icon: Info,
+    label: () => translate('components.markdown-callout.note', 'Note'),
+    borderClassName: 'border-callout-note',
+    titleClassName: 'text-callout-note'
+  },
+  tip: {
+    Icon: Lightbulb,
+    label: () => translate('components.markdown-callout.tip', 'Tip'),
+    borderClassName: 'border-status-success',
+    titleClassName: 'text-status-success'
+  },
+  important: {
+    Icon: MessageSquareWarning,
+    label: () => translate('components.markdown-callout.important', 'Important'),
+    borderClassName: 'border-callout-important',
+    titleClassName: 'text-callout-important'
+  },
+  warning: {
+    Icon: TriangleAlert,
+    label: () => translate('components.markdown-callout.warning', 'Warning'),
+    borderClassName: 'border-status-warning',
+    titleClassName: 'text-status-warning'
+  },
+  caution: {
+    Icon: OctagonAlert,
+    label: () => translate('components.markdown-callout.caution', 'Caution'),
+    borderClassName: 'border-destructive',
+    titleClassName: 'text-destructive'
+  }
+}
+
+// Why: a <div>, not a <blockquote> — quote styles mute the body, and a callout's body is ordinary text.
+export function MarkdownGitHubCallout({
+  kind,
+  className,
+  children
+}: {
+  kind: GitHubCalloutKind
+  className?: string
+  children?: React.ReactNode
+}): React.JSX.Element {
+  const { Icon, label, borderClassName, titleClassName } = CALLOUT_PRESENTATIONS[kind]
+  return (
+    <div role="note" data-callout={kind} className={cn(borderClassName, className)}>
+      <div className={cn('flex items-center gap-1.5 font-medium', titleClassName)}>
+        <Icon aria-hidden className="size-[1em] shrink-0" />
+        {label()}
+      </div>
+      {children}
+    </div>
+  )
+}
diff --git a/src/renderer/src/components/native-chat-launch-resume-decision.test.tsx b/src/renderer/src/components/native-chat-launch-resume-decision.test.tsx
new file mode 100644
index 000000000000..51ef0de7a6da
--- /dev/null
+++ b/src/renderer/src/components/native-chat-launch-resume-decision.test.tsx
@@ -0,0 +1,110 @@
+// @vitest-environment happy-dom
+// Until the launch decides whether it resumes this machine's chats itself, nothing else offers to
+// carry one on; from its decision on, the chats it resumes are named, with no moment in between.
+
+import { act } from 'react'
+import { createRoot, type Root } from 'react-dom/client'
+import { afterEach, beforeEach, expect, it, vi } from 'vitest'
+import { useAppStore } from '../store'
+import { getDefaultSettings } from '../../../shared/constants'
+import type { ResumeCandidate } from './native-chat-resume-on-restart-grouping'
+import {
+  _resetNativeChatRestartOffer,
+  useNativeChatRestartOffer,
+  useNativeChatRestartResuming
+} from './native-chat-resume-on-restart-store'
+import {
+  _resetNativeChatLaunchResumeDecision,
+  useNativeChatLaunchResumePending
+} from './native-chat-launch-resume-decision'
+
+const rpc = vi.hoisted(() => vi.fn())
+vi.mock('@/runtime/structured-agent-session-client', () => ({
+  callStructuredAgentSession: rpc,
+  subscribeStructuredAgentSessionStatus: () => new Promise(() => {})
+}))
+vi.mock('sonner', () => ({ toast: vi.fn() }))
+
+globalThis.IS_REACT_ACT_ENVIRONMENT = true
+let root: Root
+let container: HTMLDivElement
+const offered: ResumeCandidate[] = ['a', 'b'].map((sessionId) => ({
+  sessionId,
+  workspaceId: 'workspace',
+  agent: 'codex',
+  trigger: 'quit',
+  latestPrompt: `Prompt ${sessionId}`,
+  recordedAt: 1_800_000_000_000,
+  executionHostId: 'local',
+  workspaceKind: 'git-worktree'
+}))
+
+/** What Continue reads, rendered each time it changes. */
+const seen: { pending: boolean; resuming: readonly string[] }[] = []
+function Probe({ launch }: { launch: boolean }): null {
+  useNativeChatRestartOffer(launch)
+  seen.push({
+    pending: useNativeChatLaunchResumePending(),
+    resuming: useNativeChatRestartResuming()
+  })
+  return null
+}
+
+function settings(autoResume: boolean | undefined): void {
+  useAppStore.setState({
+    settings: {
+      ...getDefaultSettings(''),
+      experimentalStructuredNativeChat: true,
+      ...(autoResume === undefined ? {} : { nativeChatResumeWorkOnRestart: autoResume })
+    }
+  })
+}
+
+beforeEach(() => {
+  rpc.mockReset()
+  _resetNativeChatRestartOffer()
+  _resetNativeChatLaunchResumeDecision()
+  useAppStore.setState(useAppStore.getInitialState(), true)
+  seen.length = 0
+  container = document.createElement('div')
+  document.body.appendChild(container)
+  root = createRoot(container)
+})
+
+afterEach(async () => {
+  await act(async () => root.unmount())
+  container.remove()
+})
+
+it('holds Continue back from the settings wait until the opted-in launch names its chats', async () => {
+  const read = Promise.withResolvers<unknown>()
+  rpc.mockImplementation((_target, method) =>
+    method === 'agentSession.restartResumable' ? read.promise : new Promise(() => {})
+  )
+  // Settings not loaded yet: the launch may still resume.
+  await act(async () => root.render(<Probe launch={false} />))
+  expect(seen.at(-1)).toEqual({ pending: true, resuming: [] })
+
+  settings(true)
+  await act(async () => root.render(<Probe launch />))
+  expect(seen.at(-1)).toEqual({ pending: true, resuming: [] })
+
+  await act(async () => read.resolve({ sessions: offered }))
+
+  expect(seen.at(-1)).toEqual({ pending: false, resuming: ['a', 'b'] })
+  // Never a render where the launch had decided and its chats were not yet named.
+  expect(seen.some((entry) => !entry.pending && entry.resuming.length === 0)).toBe(false)
+})
+
+it('holds nothing back once the launch found nothing to resume', async () => {
+  settings(true)
+  rpc.mockResolvedValue({ sessions: [] })
+  await act(async () => root.render(<Probe launch />))
+  expect(seen.at(-1)).toEqual({ pending: false, resuming: [] })
+})
+
+it('holds nothing back when the launch asks instead of resuming', () => {
+  settings(false)
+  act(() => root.render(<Probe launch={false} />))
+  expect(seen.at(-1)).toEqual({ pending: false, resuming: [] })
+})
diff --git a/src/renderer/src/components/native-chat-launch-resume-decision.ts b/src/renderer/src/components/native-chat-launch-resume-decision.ts
new file mode 100644
index 000000000000..c5f6d49af55a
--- /dev/null
+++ b/src/renderer/src/components/native-chat-launch-resume-decision.ts
@@ -0,0 +1,43 @@
+// Whether this launch has made its one resume decision: nothing offered, ask, or resume (from then
+// on the store's `resuming` names the chats). Until then an opted-in launch may still resume any of
+// this machine's chats, so nothing else offers to carry one on.
+
+import { useSyncExternalStore } from 'react'
+import { useAppStore } from '../store'
+
+let decided = false
+const listeners = new Set<() => void>()
+
+function subscribe(listener: () => void): () => void {
+  listeners.add(listener)
+  return () => {
+    listeners.delete(listener)
+  }
+}
+
+function getDecided(): boolean {
+  return decided
+}
+
+export function markNativeChatLaunchResumeDecided(): void {
+  if (!decided) {
+    decided = true
+    for (const listener of listeners) {
+      listener()
+    }
+  }
+}
+
+/** Whether this launch may still resume this machine's chats on its own: "resume automatically" is
+ *  on, or its setting has not loaded yet, and the launch has not decided. */
+export function useNativeChatLaunchResumePending(): boolean {
+  const launchDecided = useSyncExternalStore(subscribe, getDecided, getDecided)
+  const autoResume = useAppStore((state) => state.settings?.nativeChatResumeWorkOnRestart)
+  return !launchDecided && autoResume !== false
+}
+
+/** @internal - tests need a clean module between cases. */
+export function _resetNativeChatLaunchResumeDecision(): void {
+  decided = false
+  listeners.clear()
+}
diff --git a/src/renderer/src/components/native-chat-resume-on-restart-grouping.test.ts b/src/renderer/src/components/native-chat-resume-on-restart-grouping.test.ts
index 9f8bcb17dcb8..1becb5fd78d6 100644
--- a/src/renderer/src/components/native-chat-resume-on-restart-grouping.test.ts
+++ b/src/renderer/src/components/native-chat-resume-on-restart-grouping.test.ts
@@ -4,9 +4,14 @@ import { describe, expect, it } from 'vitest'
 import {
   allResumeSessionIds,
   groupResumeCandidates,
+  groupResumeCandidatesByHost,
   groupResumeWorkspacesByRepo,
+  nestResumeWorkspaces,
   resolveResumeGroupHeader,
+  resumeSelectionState,
   resumeWorkspaceKind,
+  resumeWorkspaceCandidates,
+  toggleResumeSelection,
   type ResumeCandidate
 } from './native-chat-resume-on-restart-grouping'
 
@@ -129,3 +134,120 @@ describe('naming the group header', () => {
     expect(header.kind).toBe('project')
   })
 })
+
+describe('nesting child workspaces', () => {
+  const group = (workspaceId: string) => ({ workspaceId, candidates: [] })
+  const nestedWorkspaceIds = (nodes: ReturnType<typeof nestResumeWorkspaces>): unknown =>
+    nodes.map((node) => [node.group.workspaceId, nestedWorkspaceIds(node.children)])
+
+  it('puts a child under its nearest listed ancestor, skipping one with nothing to resume', () => {
+    // grandchild -> child (not listed) -> parent
+    const ancestors: Record<string, string[]> = { grandchild: ['child', 'parent'], parent: [] }
+    const nested = nestResumeWorkspaces(
+      [group('grandchild'), group('other'), group('parent')],
+      (id) => ancestors[id] ?? []
+    )
+
+    expect(nestedWorkspaceIds(nested)).toEqual([
+      ['other', []],
+      ['parent', [['grandchild', []]]]
+    ])
+  })
+
+  it('keeps a child whose ancestors are all unlisted at the top, in offer order', () => {
+    const nested = nestResumeWorkspaces([group('a'), group('b')], () => ['elsewhere'])
+
+    expect(nestedWorkspaceIds(nested)).toEqual([
+      ['a', []],
+      ['b', []]
+    ])
+  })
+
+  // Lineage from two hosts can disagree; a chat under no root would be resumed without being seen.
+  it('places every workspace when ancestors loop', () => {
+    const ancestors: Record<string, string[]> = { a: ['b'], b: ['a'], c: ['a'] }
+    const nested = nestResumeWorkspaces(
+      [group('a'), group('b'), group('c'), group('d')],
+      (id) => ancestors[id] ?? []
+    )
+
+    expect(nestedWorkspaceIds(nested)).toEqual([
+      [
+        'a',
+        [
+          ['b', []],
+          ['c', []]
+        ]
+      ],
+      ['d', []]
+    ])
+  })
+})
+
+describe('group checkboxes', () => {
+  it('covers a workspace and every workspace nested under it', () => {
+    const chats = (workspaceId: string, ...sessionIds: string[]) => ({
+      workspaceId,
+      candidates: sessionIds.map((sessionId) => candidate({ sessionId, workspaceId }))
+    })
+    const [root] = nestResumeWorkspaces(
+      [chats('parent', 'p1'), chats('child', 'c1', 'c2'), chats('grandchild', 'g1')],
+      (id) => ({ child: ['parent'], grandchild: ['child', 'parent'] })[id] ?? []
+    )
+
+    expect(resumeWorkspaceCandidates(root!).map((entry) => entry.sessionId)).toEqual([
+      'p1',
+      'c1',
+      'c2',
+      'g1'
+    ])
+  })
+
+  it.each([
+    [['a', 'b'], true, 2],
+    [['a'], 'indeterminate', 1],
+    [[], false, 0]
+  ] as const)('with %j ticked reads %s', (ticked, checked, selectedCount) => {
+    expect(resumeSelectionState(['a', 'b'], new Set(ticked))).toEqual({
+      checked,
+      selectedCount,
+      total: 2
+    })
+  })
+
+  it('reads unchecked when it covers nothing', () => {
+    expect(resumeSelectionState([], new Set(['a'])).checked).toBe(false)
+  })
+
+  it('ticks everything unless everything is ticked, then unticks it', () => {
+    const calls: [string, boolean][] = []
+    const record = (sessionId: string, checked: boolean) => calls.push([sessionId, checked])
+    toggleResumeSelection(['a', 'b'], resumeSelectionState(['a', 'b'], new Set(['a'])), record)
+    toggleResumeSelection(['a', 'b'], resumeSelectionState(['a', 'b'], new Set(['a', 'b'])), record)
+
+    expect(calls).toEqual([
+      ['a', true],
+      ['b', true],
+      ['a', false],
+      ['b', false]
+    ])
+  })
+})
+
+describe('grouping by machine', () => {
+  it('groups by host in first-seen order, a missing host id counting as this machine', () => {
+    const groups = groupResumeCandidatesByHost([
+      candidate({ sessionId: 'a', executionHostId: 'ssh:box' }),
+      candidate({ sessionId: 'b', executionHostId: undefined }),
+      candidate({ sessionId: 'c', executionHostId: 'ssh:box' }),
+      candidate({ sessionId: 'd', executionHostId: 'local' })
+    ])
+
+    expect(
+      groups.map((group) => [group.hostId, group.candidates.map((entry) => entry.sessionId)])
+    ).toEqual([
+      ['ssh:box', ['a', 'c']],
+      ['local', ['b', 'd']]
+    ])
+  })
+})
diff --git a/src/renderer/src/components/native-chat-resume-on-restart-grouping.ts b/src/renderer/src/components/native-chat-resume-on-restart-grouping.ts
index 9a49b4c389d3..76c90706ba80 100644
--- a/src/renderer/src/components/native-chat-resume-on-restart-grouping.ts
+++ b/src/renderer/src/components/native-chat-resume-on-restart-grouping.ts
@@ -1,6 +1,6 @@
 import { parseWorkspaceKey } from '../../../shared/workspace-scope'
 import type { AgentSessionWorkspaceKind } from '../../../shared/agent-session-record'
-import type { ExecutionHostId } from '../../../shared/execution-host'
+import { LOCAL_EXECUTION_HOST_ID, type ExecutionHostId } from '../../../shared/execution-host'
 import { projectGroupIdFromRepoId } from '../../../shared/folder-workspace-worktree'
 import type { RepoIcon } from '../../../shared/repo-icon'
 import type { AgentSessionRestartActivity } from '../../../shared/agent-session-restart-activity'
@@ -75,6 +75,28 @@ export function resumeWorkspaceKind(candidate: ResumeCandidate): AgentSessionWor
   )
 }
 
+export type ResumeMachineGroup = {
+  hostId: ExecutionHostId
+  candidates: ResumeCandidate[]
+}
+
+/** Groups by the machine each chat runs on, in first-seen order; no host id means this machine. */
+export function groupResumeCandidatesByHost(
+  candidates: readonly ResumeCandidate[]
+): ResumeMachineGroup[] {
+  const groups = new Map<ExecutionHostId, ResumeCandidate[]>()
+  for (const candidate of candidates) {
+    const hostId = candidate.executionHostId ?? LOCAL_EXECUTION_HOST_ID
+    const existing = groups.get(hostId)
+    if (existing) {
+      existing.push(candidate)
+    } else {
+      groups.set(hostId, [candidate])
+    }
+  }
+  return [...groups].map(([hostId, entries]) => ({ hostId, candidates: entries }))
+}
+
 /** Groups by workspace, preserving the order the host offered them so the list is stable. */
 export function groupResumeCandidates(
   candidates: readonly ResumeCandidate[]
@@ -115,6 +137,94 @@ export function groupResumeWorkspacesByRepo(
   return [...groups.values()]
 }
 
+export type ResumeWorkspaceNode = {
+  group: ResumeWorkspaceGroup
+  children: ResumeWorkspaceNode[]
+}
+
+/**
+ * Nests each workspace under its nearest LISTED ancestor, as the sidebar nests child workspaces.
+ *
+ * `ancestorsOf` is nearest-first; an ancestor with nothing to resume is skipped, so its listed
+ * descendants attach to the next listed one up, or stay at the top. Offer order is kept.
+ */
+export function nestResumeWorkspaces(
+  workspaces: readonly ResumeWorkspaceGroup[],
+  ancestorsOf: (workspaceId: string) => readonly string[]
+): ResumeWorkspaceNode[] {
+  const nodes = new Map<string, ResumeWorkspaceNode>(
+    workspaces.map((group) => [group.workspaceId, { group, children: [] }])
+  )
+  const parentOf = new Map<ResumeWorkspaceNode, ResumeWorkspaceNode>()
+  for (const node of nodes.values()) {
+    const parentId = ancestorsOf(node.group.workspaceId).find(
+      (id) => id !== node.group.workspaceId && nodes.has(id)
+    )
+    const parent = parentId === undefined ? undefined : nodes.get(parentId)
+    if (parent) {
+      parentOf.set(node, parent)
+    }
+  }
+  // Why: a loop in the parent chain would leave its members under no root, and a ticked chat that
+  // renders nowhere would still be resumed; the loop is cut where the walk first comes back.
+  for (const node of nodes.values()) {
+    const seen = new Set([node])
+    let up = parentOf.get(node)
+    while (up && !seen.has(up)) {
+      seen.add(up)
+      up = parentOf.get(up)
+    }
+    if (up) {
+      parentOf.delete(up)
+    }
+  }
+  const roots: ResumeWorkspaceNode[] = []
+  for (const node of nodes.values()) {
+    const parent = parentOf.get(node)
+    if (parent) {
+      parent.children.push(node)
+    } else {
+      roots.push(node)
+    }
+  }
+  return roots
+}
+
+/** A workspace's chats followed by those of every workspace nested under it, in list order. */
+export function resumeWorkspaceCandidates(node: ResumeWorkspaceNode): ResumeCandidate[] {
+  return [...node.group.candidates, ...node.children.flatMap(resumeWorkspaceCandidates)]
+}
+
+export type ResumeSelectionState = {
+  checked: boolean | 'indeterminate'
+  selectedCount: number
+  total: number
+}
+
+/** A group checkbox's state over the selectable chats it covers. */
+export function resumeSelectionState(
+  sessionIds: readonly string[],
+  selected: ReadonlySet<string>
+): ResumeSelectionState {
+  const selectedCount = sessionIds.filter((sessionId) => selected.has(sessionId)).length
+  const total = sessionIds.length
+  const checked =
+    total > 0 && selectedCount === total ? true : selectedCount > 0 ? 'indeterminate' : false
+  return { checked, selectedCount, total }
+}
+
+/** Ticks every chat a group covers unless all already are, then unticks them. */
+export function toggleResumeSelection(
+  sessionIds: readonly string[],
+  state: ResumeSelectionState,
+  onToggle: (sessionId: string, checked: boolean) => void
+): void {
+  const next = state.selectedCount < state.total
+  for (const sessionId of sessionIds) {
+    onToggle(sessionId, next)
+  }
+}
+
 export type ResumeGroupHeader =
   | { kind: 'repo'; name: string; repoIcon: RepoIcon | null }
   | { kind: 'project'; name: string }
diff --git a/src/renderer/src/components/native-chat-resume-on-restart-modal.test-support.ts b/src/renderer/src/components/native-chat-resume-on-restart-modal.test-support.ts
new file mode 100644
index 000000000000..993a170ba0f1
--- /dev/null
+++ b/src/renderer/src/components/native-chat-resume-on-restart-modal.test-support.ts
@@ -0,0 +1,63 @@
+// Fixtures and DOM lookups shared by the resume dialog's test files.
+
+import type { ResumeCandidate } from './native-chat-resume-on-restart-grouping'
+
+export const offered: ResumeCandidate[] = ['a', 'b'].map((sessionId) => ({
+  sessionId,
+  workspaceId: 'workspace',
+  agent: 'codex',
+  trigger: 'quit',
+  latestPrompt: `Prompt ${sessionId}`,
+  recordedAt: 1_800_000_000_000,
+  executionHostId: 'local',
+  workspaceKind: 'git-worktree'
+}))
+
+/** A chat the host acted on and could not carry on, as it reports it. */
+export function failure(sessionId: string, reason = 'agent_session_restart_work_superseded') {
+  const candidate = offered.find((entry) => entry.sessionId === sessionId)!
+  return { ...candidate, failedAt: candidate.recordedAt + 60_000, outcome: 'refused', reason }
+}
+
+export function button(text: string): HTMLButtonElement {
+  const found = [...document.querySelectorAll('button')].find(
+    (entry) => entry.textContent?.trim() === text || entry.getAttribute('aria-label') === text
+  )
+  if (!found) {
+    throw new Error(`Missing button: ${text}`)
+  }
+  return found
+}
+
+/** A chat's own checkbox; its accessible name carries the prompt. */
+export function chatBox(sessionId: string): HTMLElement {
+  const found = document.querySelector<HTMLElement>(
+    `[role="checkbox"][aria-label*="Prompt ${sessionId}"]`
+  )
+  if (!found) {
+    throw new Error(`Missing chat checkbox: ${sessionId}`)
+  }
+  return found
+}
+
+export function chatBoxes(): HTMLElement[] {
+  return [...document.querySelectorAll<HTMLElement>('[role="checkbox"][aria-label^="Resume "]')]
+}
+
+export function namedBox(name: string): HTMLElement {
+  const found = document.querySelector<HTMLElement>(`[role="checkbox"][aria-label="${name}"]`)
+  if (!found) {
+    throw new Error(`Missing checkbox: ${name}`)
+  }
+  return found
+}
+
+export function dontAskAgain(): HTMLElement {
+  const found = [...document.querySelectorAll('label')]
+    .find((label) => label.textContent?.includes("Don't ask again"))
+    ?.querySelector<HTMLElement>('[role="checkbox"]')
+  if (!found) {
+    throw new Error('Missing Don’t ask again checkbox')
+  }
+  return found
+}
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 105f541b87d9..9111eae70dbe 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
@@ -6,6 +6,7 @@ import {
 } from '@/runtime/structured-agent-session-status-feed'
 import type { AgentSessionStatusSummary } from '../../../shared/agent-session-wire'
 import { useAppStore } from '../store'
+import { markNativeChatLaunchResumeDecided } from './native-chat-launch-resume-decision'
 import {
   announceRestartResults,
   type RestartContinuationOutcome
@@ -294,6 +295,8 @@ export async function continueNativeChatRestartOffer(
   let outcome: Parameters<typeof announceRestartResults>
   resumeBatches.add(batch)
   syncResuming()
+  // `resuming` now names the chats, so the launch's one resume decision is made.
+  markNativeChatLaunchResumeDecided()
   try {
     const result = await callStructuredAgentSession<
       HostOfferPayload & { continued?: RestartContinuationOutcome[] }
@@ -401,7 +404,7 @@ export function useNativeChatRestartOffer(enabled: boolean): NativeChatRestartOf
   useEffect(() => {
     if (enabled) {
       // Fetched after mount, never awaited by startup: the workspace is usable first.
-      launch ??= loadLaunchOffer()
+      launch ??= loadLaunchOffer().finally(markNativeChatLaunchResumeDecided)
     }
   }, [enabled])
   return useSyncExternalStore(subscribe, getNativeChatRestartOffer, getNativeChatRestartOffer)
diff --git a/src/renderer/src/components/native-chat-resume-tree-state.ts b/src/renderer/src/components/native-chat-resume-tree-state.ts
new file mode 100644
index 000000000000..cd99733cad28
--- /dev/null
+++ b/src/renderer/src/components/native-chat-resume-tree-state.ts
@@ -0,0 +1,83 @@
+import { createContext, useState } from 'react'
+import type {
+  ResumeCandidate,
+  ResumeFailure,
+  ResumeWorkspaceGroup
+} from './native-chat-resume-on-restart-grouping'
+import {
+  resumeFailureSelectable,
+  type ResumeFailureAction
+} from './native-chat-resume-failure-guidance'
+
+// The resume tree's shared state: which nodes are open, how deep a chat row sits, and how a chat
+// is read by its key.
+
+/**
+ * Which nodes are open. Everything starts expanded; the state is this mount's own, so a dialog that
+ * unmounts its tree on close reopens it fully expanded. Never persisted.
+ */
+export function useResumeTreeExpansion(): {
+  isExpanded: (key: string) => boolean
+  setExpanded: (key: string, expanded: boolean) => void
+} {
+  const [collapsed, setCollapsed] = useState<ReadonlySet<string>>(() => new Set())
+  return {
+    isExpanded: (key) => !collapsed.has(key),
+    setExpanded: (key, expanded) =>
+      setCollapsed((current) => {
+        const next = new Set(current)
+        if (expanded) {
+          next.delete(key)
+        } else {
+          next.add(key)
+        }
+        return next
+      })
+  }
+}
+
+/** The tree depth a chat row renders at; the enclosing workspace node provides it. */
+export const ResumeTreeDepthContext = createContext(0)
+
+/** Lets a row that an earlier resume could not carry on show what went wrong and what to do. */
+export type FailureProps = {
+  failureFor?: (sessionId: string) => ResumeFailure | undefined
+  onFailureAction?: (action: ResumeFailureAction, sessionId: string) => void
+}
+
+/** What every node needs from the tree as a whole. */
+export type TreeProps = {
+  listedAt: number
+  busy: boolean
+  selected: ReadonlySet<string>
+  onToggle: (sessionId: string, checked: boolean) => void
+  isExpanded: (key: string) => boolean
+  setExpanded: (key: string, expanded: boolean) => void
+  repoIdOf: (group: ResumeWorkspaceGroup) => string | null
+  ancestorsOf: (group: ResumeWorkspaceGroup) => readonly string[]
+} & FailureProps
+
+/**
+ * The one place a chat's key is read: its row's tick, toggle and failure, and every group's
+ * coverage all go through here, so a change of key stays in this function.
+ */
+export function chatState(candidate: ResumeCandidate, tree: TreeProps) {
+  const key = candidate.sessionId
+  const failure = tree.failureFor?.(key)
+  return {
+    key,
+    checked: tree.selected.has(key),
+    onCheckedChange: (checked: boolean) => tree.onToggle(key, checked),
+    failure,
+    // A group checkbox never ticks a failure a retry cannot fix.
+    selectable: !failure || resumeFailureSelectable(failure)
+  }
+}
+
+/** The keys a group checkbox covers: every selectable chat under it. */
+export function coveredKeys(candidates: readonly ResumeCandidate[], tree: TreeProps): string[] {
+  return candidates
+    .map((candidate) => chatState(candidate, tree))
+    .filter((chat) => chat.selectable)
+    .map((chat) => chat.key)
+}
diff --git a/src/renderer/src/components/native-chat-resume-tree.test-support.ts b/src/renderer/src/components/native-chat-resume-tree.test-support.ts
new file mode 100644
index 000000000000..733063fcf240
--- /dev/null
+++ b/src/renderer/src/components/native-chat-resume-tree.test-support.ts
@@ -0,0 +1,151 @@
+// Fixtures and DOM lookups shared by the resume tree's test files.
+
+import { vi, type Mock } from 'vitest'
+import { useAppStore } from '../store'
+import { getDefaultSettings } from '../../../shared/constants'
+import type { ExecutionHostId } from '../../../shared/execution-host'
+import type { WorktreeLineage } from '../../../shared/worktree/lineage-types'
+import type { Worktree } from '../../../shared/worktree/types'
+import type { ResumeCandidate, ResumeFailure } from './native-chat-resume-on-restart-grouping'
+
+export function worktree(name: string, overrides: Partial<Worktree> = {}): Worktree {
+  return {
+    id: `repo-1::/repo/${name}`,
+    instanceId: `instance-${name}`,
+    repoId: 'repo-1',
+    path: `/repo/${name}`,
+    displayName: name,
+    branch: `refs/heads/${name}-branch`,
+    head: 'abc123',
+    isBare: false,
+    isMainWorktree: false,
+    comment: '',
+    linkedIssue: null,
+    linkedPR: null,
+    linkedLinearIssue: null,
+    isArchived: false,
+    isUnread: false,
+    isPinned: false,
+    sortOrder: 0,
+    lastActivityAt: 1,
+    ...overrides
+  }
+}
+
+export function candidate(sessionId: string, workspace: Worktree): ResumeCandidate {
+  return {
+    sessionId,
+    workspaceId: workspace.id,
+    agent: 'codex',
+    trigger: 'quit',
+    latestPrompt: `Prompt ${sessionId}`,
+    recordedAt: 1_800_000_000_000,
+    executionHostId: workspace.hostId ?? 'local',
+    workspaceKind: 'git-worktree'
+  }
+}
+
+export function lineage(child: Worktree, parent: Worktree): WorktreeLineage {
+  return {
+    worktreeId: child.id,
+    worktreeInstanceId: child.instanceId!,
+    parentWorktreeId: parent.id,
+    parentWorktreeInstanceId: parent.instanceId!,
+    origin: 'cli',
+    capture: { source: 'explicit-cli-flag', confidence: 'explicit' },
+    createdAt: 1
+  }
+}
+
+/** A failure the host says a retry cannot fix. */
+export function unretryable(entry: ResumeCandidate): ResumeFailure {
+  return {
+    ...entry,
+    failedAt: 1_800_000_030_000,
+    outcome: 'refused',
+    reason: 'agent_session_restart_work_superseded',
+    retryable: false
+  }
+}
+
+/** Repo "orca": parent (1 chat) > child (2 chats), plus an unrelated root workspace "other". */
+export function seedTree(hosts: { parent?: ExecutionHostId; child?: ExecutionHostId } = {}) {
+  // An explicit undefined is a row with no host id (older metadata).
+  const parentHost = 'parent' in hosts ? hosts.parent : 'local'
+  const parent = worktree('parent', { hostId: parentHost })
+  const child = worktree('child', { hostId: 'child' in hosts ? hosts.child : 'local' })
+  const other = worktree('other', { hostId: parentHost })
+  useAppStore.setState({
+    settings: getDefaultSettings(''),
+    repos: [
+      { id: 'repo-1', path: '/repo', displayName: 'orca', badgeColor: '#999999', addedAt: 1 }
+    ],
+    worktreesByRepo: { 'repo-1': [parent, child, other] },
+    worktreeLineageById: { [child.id]: lineage(child, parent) }
+  })
+  return [
+    candidate('in-child', child),
+    candidate('in-parent', parent),
+    candidate('also-in-child', child),
+    candidate('in-other', other)
+  ]
+}
+
+export const onToggleSpy: Mock<(sessionId: string, checked: boolean) => void> = vi.fn()
+
+/** A group node's checkbox: workspace or project ("in"), machine ("on"). */
+export function nodeBox(name: string): HTMLElement {
+  const box = document.querySelector<HTMLElement>(
+    `[role="checkbox"][aria-label="Select all chats in ${name}"], [role="checkbox"][aria-label="Select all chats on ${name}"]`
+  )
+  if (!box) {
+    throw new Error(`Missing node checkbox: ${name}`)
+  }
+  return box
+}
+
+export function chatBox(sessionId: string): HTMLElement {
+  const box = document.querySelector<HTMLElement>(
+    `[role="checkbox"][aria-label*="Prompt ${sessionId}"]`
+  )
+  if (!box) {
+    throw new Error(`Missing chat checkbox: ${sessionId}`)
+  }
+  return box
+}
+
+export function queryChatBox(sessionId: string): HTMLElement | null {
+  return document.querySelector<HTMLElement>(`[role="checkbox"][aria-label*="Prompt ${sessionId}"]`)
+}
+
+export function itemOf(box: HTMLElement): HTMLElement {
+  return box.closest<HTMLElement>('[role="treeitem"]')!
+}
+
+/** The group node's "x of y". */
+export function countOf(name: string): string | undefined {
+  return itemOf(nodeBox(name)).querySelector('.tabular-nums')?.textContent ?? undefined
+}
+
+export function disclosureOf(name: string): HTMLButtonElement {
+  return itemOf(nodeBox(name)).querySelector<HTMLButtonElement>('button[aria-expanded]')!
+}
+
+/** Each tree row in order, as level:kind:name, kind read off the name's weight. */
+export function treeOutline(): string[] {
+  return [...document.querySelectorAll<HTMLElement>('[role="treeitem"]')].map((item) => {
+    const level = item.getAttribute('aria-level')
+    const label = item.querySelector('[role="checkbox"]')?.getAttribute('aria-label') ?? ''
+    const chat = /Prompt ([\w-]+)/.exec(label)?.[1]
+    if (chat) {
+      return `${level}:chat:${chat}`
+    }
+    const name = /^Select all chats (?:in|on) (.+)$/.exec(label)?.[1]
+    const kind = item.querySelector('.font-bold')
+      ? 'machine'
+      : item.querySelector('.font-semibold')
+        ? 'project'
+        : 'workspace'
+    return `${level}:${kind}:${name}`
+  })
+}
diff --git a/src/renderer/src/components/native-chat-resume-workspace-lookups.ts b/src/renderer/src/components/native-chat-resume-workspace-lookups.ts
new file mode 100644
index 000000000000..52d4ffd8d5a1
--- /dev/null
+++ b/src/renderer/src/components/native-chat-resume-workspace-lookups.ts
@@ -0,0 +1,84 @@
+import { useMemo } from 'react'
+import {
+  getCyclicProjectedWorktreeLineageIds,
+  getSidebarLineageAncestors
+} from '@/components/sidebar/worktree-lineage-projection'
+import {
+  getAllWorktreesFromState,
+  getWorktreeMapFromState,
+  getWorktreeOnHostFromState
+} from '@/store/selectors'
+import {
+  composeWorktreeHostIdentity,
+  getWorktreeHostIdentity
+} from '../../../shared/worktree/host-qualified-identity'
+import type { ExecutionHostId } from '../../../shared/execution-host'
+import { useAppStore } from '../store'
+import type { ResumeWorkspaceGroup } from './native-chat-resume-on-restart-grouping'
+
+// Store lookups the resume tree makes for its workspaces, each on the workspace's own host.
+
+/** The store's row for a workspace on its own host; folder workspaces included. Stable per row. */
+export function useWorkspaceWorktree(workspaceId: string, hostId: ExecutionHostId | undefined) {
+  return useAppStore((store) => store.getKnownWorktreeById(workspaceId, hostId))
+}
+
+/**
+ * The repo owning each workspace, as one narrow subscription.
+ *
+ * Selected as a joined string rather than a map so the selector returns a PRIMITIVE: a fresh object
+ * or array would fail the equality check on every store change and re-render the whole list.
+ * Keyed by the group itself: the same workspace id can be listed on two machines.
+ */
+export function useRepoIdByWorkspace(
+  workspaces: readonly ResumeWorkspaceGroup[]
+): (group: ResumeWorkspaceGroup) => string | null {
+  const ids = workspaces.map((group) => group.workspaceId)
+  const hosts = workspaces.map((group) => group.candidates[0]?.executionHostId)
+  const joined = useAppStore((store) =>
+    ids.map((id, index) => store.getKnownWorktreeById(id, hosts[index])?.repoId ?? '').join('\0')
+  )
+  const repoIds = joined.split('\0')
+  return (group) => {
+    const index = workspaces.indexOf(group)
+    const repoId = index === -1 ? '' : (repoIds[index] ?? '')
+    return repoId === '' ? null : repoId
+  }
+}
+
+/** Each workspace's lineage ancestors, nearest first, by the sidebar's own nesting rule. */
+export function useLineageAncestors(
+  workspaces: readonly ResumeWorkspaceGroup[]
+): (group: ResumeWorkspaceGroup) => readonly string[] {
+  const worktreesByRepo = useAppStore((store) => store.worktreesByRepo)
+  const worktreeLineageById = useAppStore((store) => store.worktreeLineageById)
+  const ancestors = useMemo(() => {
+    const state = { worktreesByRepo }
+    // Why: archived rows never render in the sidebar, so nothing nests under them.
+    const rows = new Map(
+      getAllWorktreesFromState(state)
+        .filter((worktree) => !worktree.isArchived)
+        .map((worktree) => [getWorktreeHostIdentity(worktree), worktree])
+    )
+    const cyclic = getCyclicProjectedWorktreeLineageIds(
+      worktreeLineageById,
+      getWorktreeMapFromState(state)
+    )
+    return new Map(
+      workspaces.map((group) => {
+        // Why: a row with no host id (older metadata) is still the chat's workspace.
+        const target =
+          getWorktreeOnHostFromState(
+            state,
+            group.workspaceId,
+            group.candidates[0]?.executionHostId
+          ) ?? rows.get(composeWorktreeHostIdentity(undefined, group.workspaceId))
+        const parents = target
+          ? getSidebarLineageAncestors(target, worktreeLineageById, rows, cyclic)
+          : []
+        return [group, parents.map((parent) => parent.id)]
+      })
+    )
+  }, [workspaces, worktreesByRepo, worktreeLineageById])
+  return (group) => ancestors.get(group) ?? []
+}
diff --git a/src/renderer/src/components/native-chat/NativeChatBackgroundTaskRun.tsx b/src/renderer/src/components/native-chat/NativeChatBackgroundTaskRun.tsx
index 9958a6ef4eb5..793522c711d7 100644
--- a/src/renderer/src/components/native-chat/NativeChatBackgroundTaskRun.tsx
+++ b/src/renderer/src/components/native-chat/NativeChatBackgroundTaskRun.tsx
@@ -7,10 +7,10 @@ import {
   normalizeBackgroundTaskState
 } from '../../../../shared/native-chat-background-task-row'
 import type { NativeChatBackgroundTaskBlock } from '../../../../shared/native-chat-types'
+import { formatBackgroundTaskTokens } from '../../../../shared/background-task-roster'
 import {
   backgroundTaskStateReason,
   backgroundTaskStateWord,
-  formatBackgroundTaskTokens,
   resolveBackgroundTaskName
 } from './background-task-roster'
 import { KIND_ICONS } from './NativeChatBackgroundTasksStatus'
diff --git a/src/renderer/src/components/native-chat/NativeChatBackgroundTasksStatus.test.tsx b/src/renderer/src/components/native-chat/NativeChatBackgroundTasksStatus.test.tsx
index b7c2947dc769..5d32aacf2b3b 100644
--- a/src/renderer/src/components/native-chat/NativeChatBackgroundTasksStatus.test.tsx
+++ b/src/renderer/src/components/native-chat/NativeChatBackgroundTasksStatus.test.tsx
@@ -204,6 +204,31 @@ describe('background-tasks strip header', () => {
     expect(header.textContent).toBe('1 agent · 1 shell')
   })
 
+  describe('on a narrow strip', () => {
+    const wideWindow = window.innerWidth
+    afterEach(() => {
+      window.innerWidth = wideWindow
+    })
+
+    it('totals a breakdown across kinds', () => {
+      window.innerWidth = 320
+      const header = renderHeader([
+        { id: 'a1', kind: 'agent' },
+        { id: 'c1', kind: 'command' }
+      ])
+      expect(header).toHaveAttribute('aria-label', '2 background tasks')
+    })
+
+    it('keeps one kind in its attention form', () => {
+      window.innerWidth = 320
+      const header = renderHeader([
+        { id: 'a1', kind: 'agent', state: 'waiting' },
+        { id: 'a2', kind: 'agent', state: 'waiting' }
+      ])
+      expect(header).toHaveAttribute('aria-label', '2 agents waiting — needs approval')
+    })
+  })
+
   it('carries no icon on a collapsed total, which spans kinds', () => {
     const header = renderHeader([
       { id: 'a1', kind: 'agent' },
diff --git a/src/renderer/src/components/native-chat/NativeChatBackgroundTasksStatus.tsx b/src/renderer/src/components/native-chat/NativeChatBackgroundTasksStatus.tsx
index 0c444552474c..fbec194581fd 100644
--- a/src/renderer/src/components/native-chat/NativeChatBackgroundTasksStatus.tsx
+++ b/src/renderer/src/components/native-chat/NativeChatBackgroundTasksStatus.tsx
@@ -10,22 +10,24 @@ 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 {
-  backgroundTaskGroupLabel,
-  backgroundTaskRowElapsedLabel,
-  backgroundTaskRowTicks,
-  buildBackgroundTaskGroups,
+  backgroundTasksHeaderText,
+  NARROW_BACKGROUND_TASKS_STRIP_REM
+} from '../../../../shared/background-task-header-content'
+import {
+  backgroundTaskRowMeta,
+  backgroundTaskRowStopId,
+  backgroundTasksStripTicks,
   buildBackgroundTaskGroupsFromViews,
-  formatBackgroundTaskTokens,
   type BackgroundTaskGroup
-} from './background-task-roster'
+} from '../../../../shared/background-task-roster'
+import { backgroundTasksHeaderContent } from './background-task-header-content'
+import { backgroundTaskGroupLabel, buildBackgroundTaskGroups } from './background-task-roster'
+import { sayBackgroundTaskTranslated as say } from './background-task-words-text'
 
-/** Below this strip width (border-box, live root font size) the header drops
- *  its per-kind breakdown for an honest total. A narrow split pane on a wide
- *  monitor must behave like a narrow window, so no viewport media query. */
-const NARROW_STRIP_REM = 24
+/** Border-box width at the live root font size; no viewport media query, so a
+ *  narrow split pane on a wide monitor behaves like a narrow window. */
+const NARROW_STRIP_REM = NARROW_BACKGROUND_TASKS_STRIP_REM
 
 function rootFontSizePx(): number {
   const parsed = Number.parseFloat(getComputedStyle(document.documentElement).fontSize)
@@ -80,16 +82,8 @@ function BackgroundTaskRow(props: {
 }): React.JSX.Element {
   const { row, now } = props
   const Icon = KIND_ICONS[row.kind]
-  const meta = [
-    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
+  const meta = backgroundTaskRowMeta(row, now)
+  const stopId = backgroundTaskRowStopId(row, props.supportsTaskStop)
   return (
     <>
       <li className="flex h-6 min-w-0 items-center gap-2 text-foreground/80">
@@ -113,17 +107,11 @@ function BackgroundTaskRow(props: {
             type="button"
             variant="ghost"
             size="xs"
-            aria-label={translate(
-              'components.native-chat.backgroundTasks.stopTask',
-              'Stop {{value0}}',
-              {
-                value0: agentChildRowName(row)
-              }
-            )}
+            aria-label={say('stopTask', { value0: agentChildRowName(row) })}
             disabled={props.stoppingTaskIds.has(stopId)}
             onClick={() => props.onStop(stopId)}
           >
-            {translate('components.native-chat.backgroundTasks.stop', 'Stop')}
+            {say('stop')}
           </Button>
         ) : null}
       </li>
@@ -148,10 +136,6 @@ function BackgroundTaskRow(props: {
   )
 }
 
-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[]
@@ -191,13 +175,9 @@ export function NativeChatBackgroundTasksStatus(props: {
         : 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
-  // 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 now = useNow(1_000, props.isVisible && backgroundTasksStripTicks(groups, expanded))
   const header = backgroundTasksHeaderContent(groups, { narrow, now })
-  const headerText = `${header.segments.map((segment) => segment.text).join(' · ')}${header.detail ? `${header.segments.length > 0 ? ' — ' : ''}${header.detail}` : ''}`
+  const headerText = backgroundTasksHeaderText(header)
   return (
     <div
       data-native-chat-background-tasks="true"
@@ -288,12 +268,7 @@ export function NativeChatBackgroundTasksStatus(props: {
                   </div>
                 ))
               ) : (
-                <p>
-                  {translate(
-                    'components.native-chat.backgroundTasks.detailsUnavailable',
-                    'Task details are unavailable for this session.'
-                  )}
-                </p>
+                <p>{say('detailsUnavailable')}</p>
               )}
               {!props.supportsTaskStop && props.supportsStopAll ? (
                 <div className={groups.length > 0 ? 'mt-2 border-t border-border pt-2' : 'mt-2'}>
@@ -301,14 +276,11 @@ export function NativeChatBackgroundTasksStatus(props: {
                     type="button"
                     variant="ghost"
                     size="xs"
-                    aria-label={translate(
-                      'components.native-chat.backgroundTasks.stopAll',
-                      'Stop background tasks'
-                    )}
+                    aria-label={say('stopAll')}
                     disabled={props.stoppingAll}
                     onClick={() => props.onStop()}
                   >
-                    {translate('components.native-chat.backgroundTasks.stop', 'Stop')}
+                    {say('stop')}
                   </Button>
                 </div>
               ) : null}
diff --git a/src/renderer/src/components/native-chat/NativeChatComposer.paste-remount.test.tsx b/src/renderer/src/components/native-chat/NativeChatComposer.paste-remount.test.tsx
new file mode 100644
index 000000000000..f5509b5b10df
--- /dev/null
+++ b/src/renderer/src/components/native-chat/NativeChatComposer.paste-remount.test.tsx
@@ -0,0 +1,256 @@
+// @vitest-environment happy-dom
+
+// A screenshot pasted into a chat on a paired server is still uploading when an agent prompt card
+// replaces the composer. The real composer, attachment and paste hooks keep the upload, and Send
+// waits for it, whenever the composer comes back; a rich-text paste's image is owed from the start.
+
+import { act, cleanup, render } from '@testing-library/react'
+import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest'
+import type { ClipboardEventLike } from './native-chat-clipboard-payload'
+
+type FieldProps = {
+  onPaste?: (event: ClipboardEventLike) => void
+  imageAttachments?: { path: string; pending?: boolean }[]
+  sendButtonDisabled?: boolean
+}
+
+const mocks = vi.hoisted(() => {
+  const state: { fieldProps: FieldProps | null } = { fieldProps: null }
+  return { state, prepare: vi.fn(), save: vi.fn() }
+})
+
+vi.mock('../../store', () => {
+  const state = {
+    dictationState: 'idle',
+    settings: { voice: { enabled: false }, nativeChatSessionOptions: {} },
+    agentStatusByPaneKey: {},
+    updateSettings: vi.fn(),
+    clearNativeChatLaunchDraft: vi.fn(),
+    markNativeChatLaunchDraftAdopted: vi.fn()
+  }
+  const useAppStore = (selector: (value: typeof state) => unknown) => selector(state)
+  useAppStore.getState = () => state
+  return { useAppStore }
+})
+vi.mock('@/runtime/runtime-terminal-inspection', () => ({
+  isRemoteRuntimePtyId: () => false,
+  sendRuntimePtyInput: vi.fn()
+}))
+vi.mock('@/lib/agent-paste-draft', () => ({ getSettingsForAgentTabRuntimeOwner: () => ({}) }))
+vi.mock('@/lib/native-chat-telemetry', () => ({
+  emitNativeChatMessageSent: vi.fn(),
+  emitNativeChatPickerItemAccepted: vi.fn(),
+  emitNativeChatPickerOpened: vi.fn(),
+  emitNativeChatSendClassified: vi.fn()
+}))
+vi.mock('./NativeChatComposerField', () => ({
+  NativeChatComposerField: (props: FieldProps) => {
+    mocks.state.fieldProps = props
+    return <div data-testid="native-chat-composer-field" />
+  }
+}))
+vi.mock('./use-native-chat-skills', () => ({
+  useNativeChatSkills: () => ({ status: 'ready', skills: [], error: null, retry: () => {} })
+}))
+vi.mock('./use-native-chat-external-attachments', () => ({
+  useNativeChatExternalAttachments: () => ({
+    attachExternalPaths: vi.fn(),
+    resolveAttachmentOwner: () => ({
+      kind: 'runtime-session',
+      environmentId: 'env-1',
+      pairingRevision: 1,
+      sessionId: 'session-1'
+    })
+  })
+}))
+vi.mock('./native-chat-attachment-upload', async (importOriginal) => ({
+  ...(await importOriginal<object>()),
+  prepareNativeChatSessionAttachmentUpload: mocks.prepare
+}))
+
+import { NativeChatComposer } from './NativeChatComposer'
+import {
+  clearNativeChatDraftCacheForTests,
+  writeNativeChatDraftCache
+} from './native-chat-draft-cache'
+import {
+  clearNativeChatAttachmentCacheForTests,
+  readNativeChatAttachmentCache
+} from './use-native-chat-composer-attachments'
+
+const PANE = 'tab-1::session-1'
+const STORED = '/srv/agent-session-attachments/0b6f8a52-4a3e-4c4e-9a59-1d5d1f2b8c01/orca-paste.png'
+
+function composer(): React.JSX.Element {
+  return (
+    <NativeChatComposer
+      terminalTabId="tab-1"
+      paneKey={PANE}
+      targetPtyId={null}
+      agent="claude"
+      structuredTransport={{
+        send: vi.fn(() => true),
+        dispatchCommand: vi.fn(async () => ({ handled: false, accepted: false, error: null })),
+        optionsSurface: {
+          getSnapshot: () => [],
+          setOption: vi.fn(),
+          invokeAction: vi.fn(),
+          subscribe: () => () => {}
+        },
+        optionSnapshot: [],
+        onError: vi.fn(),
+        runtime: 'remote',
+        sessionId: 'session-1',
+        runtimeEnvironmentId: 'env-1'
+      }}
+    />
+  )
+}
+
+/** The preload bridge: what this test drives, and an inert subscription for everything else. */
+function installPreloadApi(ui: Record<string, unknown>): void {
+  const inert = (): (() => void) => () => {}
+  const namespace = (own: Record<string, unknown>): Record<string, unknown> =>
+    new Proxy(own, {
+      get: (target, key) => (typeof key === 'string' && key in target ? target[key] : inert)
+    })
+  Object.defineProperty(window, 'api', {
+    configurable: true,
+    value: new Proxy<Record<string, unknown>>(
+      { ui: namespace(ui) },
+      { get: (target, key) => (key === 'ui' ? target.ui : namespace({})) }
+    )
+  })
+}
+
+function imagePaste(text?: string): ClipboardEventLike {
+  const data = new DataTransfer()
+  data.items.add(new File(['image'], 'image.png', { type: 'image/png' }))
+  if (text) {
+    data.setData('text/plain', text)
+  }
+  return new ClipboardEvent('paste', { clipboardData: data, cancelable: true })
+}
+
+function holdUpload(): (path: string) => void {
+  let finishUpload: (path: string) => void = () => {}
+  mocks.save.mockReturnValue(
+    new Promise<string>((resolve) => {
+      finishUpload = resolve
+    })
+  )
+  installPreloadApi({ saveClipboardImageAsTempFile: mocks.save })
+  return (path) => finishUpload(path)
+}
+
+beforeEach(() => {
+  clearNativeChatAttachmentCacheForTests()
+  clearNativeChatDraftCacheForTests()
+  mocks.state.fieldProps = null
+  mocks.prepare.mockResolvedValue({
+    ok: true,
+    target: {
+      environmentId: 'env-1',
+      sessionId: 'session-1',
+      expectedEnvironmentPairingRevision: 1,
+      expectedEnvironmentRuntimeId: 'runtime-a'
+    }
+  })
+  vi.stubGlobal(
+    'URL',
+    Object.assign(URL, { createObjectURL: () => 'blob:x', revokeObjectURL: () => {} })
+  )
+})
+
+afterEach(() => {
+  cleanup()
+  vi.unstubAllGlobals()
+})
+
+describe('a paste into a chat on a paired server', () => {
+  it('is still there when the composer returns from a prompt card that replaced it mid-upload', async () => {
+    let finishUpload: (path: string) => void = () => {}
+    mocks.save.mockReturnValue(
+      new Promise<string>((resolve) => {
+        finishUpload = resolve
+      })
+    )
+    installPreloadApi({ saveClipboardImageAsTempFile: mocks.save })
+    const view = render(composer())
+    await act(async () => mocks.state.fieldProps?.onPaste?.(imagePaste()))
+    expect(mocks.state.fieldProps?.imageAttachments).toMatchObject([{ pending: true }])
+
+    // The agent asks a question: its card takes the composer's place while the image uploads.
+    view.unmount()
+    await act(async () => finishUpload(STORED))
+
+    expect(readNativeChatAttachmentCache(PANE).map((attachment) => attachment.path)).toEqual([
+      STORED
+    ])
+    render(composer())
+    expect(mocks.state.fieldProps?.imageAttachments).toMatchObject([{ path: STORED }])
+  })
+
+  it('still holds Send when the composer returns before the upload has finished', async () => {
+    const finishUpload = holdUpload()
+    // Something typed, so only the pending image can hold Send.
+    writeNativeChatDraftCache(PANE, 'look at this')
+    const first = render(composer())
+    await act(async () => mocks.state.fieldProps?.onPaste?.(imagePaste()))
+    first.unmount()
+
+    // Back from the prompt card while the image is still on its way to the server.
+    render(composer())
+    expect(mocks.state.fieldProps?.sendButtonDisabled).toBe(true)
+    expect(mocks.state.fieldProps?.imageAttachments).toMatchObject([{ pending: true }])
+
+    await act(async () => finishUpload(STORED))
+    expect(mocks.state.fieldProps?.imageAttachments).toMatchObject([{ path: STORED }])
+    expect(mocks.state.fieldProps?.imageAttachments?.[0]?.pending).toBeFalsy()
+  })
+
+  it('holds Send for rich text while the server is still asked whether it takes the image', async () => {
+    const prepared = Promise.withResolvers<unknown>()
+    mocks.prepare.mockReturnValue(prepared.promise)
+    holdUpload()
+    // What the user typed, and the pasted text with it: Send is open before the paste.
+    writeNativeChatDraftCache(PANE, 'look at this caption')
+    render(composer())
+    expect(mocks.state.fieldProps?.sendButtonDisabled).toBe(false)
+    await act(async () => mocks.state.fieldProps?.onPaste?.(imagePaste('caption')))
+
+    // The text is in; the image is not yet anywhere, but it is owed to this message.
+    expect(mocks.state.fieldProps?.sendButtonDisabled).toBe(true)
+  })
+
+  it("shows a rich-text paste's image once the server answers, even in a composer that came back", async () => {
+    const prepared = Promise.withResolvers<unknown>()
+    mocks.prepare.mockReturnValue(prepared.promise)
+    const finishUpload = holdUpload()
+    writeNativeChatDraftCache(PANE, 'look at this caption')
+    const first = render(composer())
+    await act(async () => mocks.state.fieldProps?.onPaste?.(imagePaste('caption')))
+    // A prompt card replaces the composer while the server is still being asked.
+    first.unmount()
+    render(composer())
+    expect(mocks.state.fieldProps?.sendButtonDisabled).toBe(true)
+
+    await act(async () =>
+      prepared.resolve({
+        ok: true,
+        target: {
+          environmentId: 'env-1',
+          sessionId: 'session-1',
+          expectedEnvironmentPairingRevision: 1,
+          expectedEnvironmentRuntimeId: 'runtime-a'
+        }
+      })
+    )
+    // Shown, so the user can see it and remove it while it uploads.
+    expect(mocks.state.fieldProps?.imageAttachments).toMatchObject([{ pending: true }])
+    expect(mocks.state.fieldProps?.imageAttachments?.[0]).not.toHaveProperty('hidden')
+
+    await act(async () => finishUpload(STORED))
+    expect(mocks.state.fieldProps?.imageAttachments).toMatchObject([{ path: STORED }])
+  })
+})
diff --git a/src/renderer/src/components/native-chat/NativeChatComposer.test.tsx b/src/renderer/src/components/native-chat/NativeChatComposer.test.tsx
index a915e70327d1..85bfeff55736 100644
--- a/src/renderer/src/components/native-chat/NativeChatComposer.test.tsx
+++ b/src/renderer/src/components/native-chat/NativeChatComposer.test.tsx
@@ -123,7 +123,8 @@ vi.mock('./use-native-chat-composer-attachments', () => ({
       attachResolvedPaths: vi.fn(),
       clearImageAttachments: vi.fn(),
       flushPendingAttachments: mocks.flushPendingAttachments,
-      removeImageAttachment: vi.fn()
+      removeImageAttachment: vi.fn(),
+      pendingChips: { begin: vi.fn(), resolve: vi.fn(), drop: vi.fn(), attachReferences: vi.fn() }
     }
   }
 }))
@@ -216,8 +217,7 @@ describe('NativeChatComposer', () => {
       configurable: true,
       value: {
         git: { discoverCommitMessageModels: mocks.discoverCommitMessageModels },
-        pty: { getMainBufferSnapshot: mocks.getMainBufferSnapshot },
-        ui: { onFileDrop: () => vi.fn() }
+        pty: { getMainBufferSnapshot: mocks.getMainBufferSnapshot }
       }
     })
   })
diff --git a/src/renderer/src/components/native-chat/NativeChatComposer.tsx b/src/renderer/src/components/native-chat/NativeChatComposer.tsx
index dac43fa42c12..2dd6a57b55a0 100644
--- a/src/renderer/src/components/native-chat/NativeChatComposer.tsx
+++ b/src/renderer/src/components/native-chat/NativeChatComposer.tsx
@@ -4,20 +4,19 @@ import { forwardRef, useCallback, useState } from 'react'
 import { useNativeChatComposerInterrupt } from './use-native-chat-composer-interrupt'
 import { useNativeChatContextUsageSummary } from './use-native-chat-context-usage-summary'
 import { getSettingsForAgentTabRuntimeOwner } from '@/lib/agent-paste-draft'
-import { EMPTY_HISTORY, type HistoryState } from './native-chat-composer-state'
 import { useNativeChatMentionFiles } from './use-native-chat-mention-files'
 import { useNativeChatDraft } from './use-native-chat-draft'
+import { useNativeChatComposerRecall } from './use-native-chat-composer-recall'
 import { useNativeChatLaunchDraftAdoption } from './use-native-chat-launch-draft-adoption'
 import { NativeChatComposerField } from './NativeChatComposerField'
 import type { NativeChatResolvedTarget } from './native-chat-composer-target'
 import { useNativeChatComposerAttachments } from './use-native-chat-composer-attachments'
 import { nativeChatImageSendBlock } from './native-chat-image-reattach'
 import { useNativeChatComposerHandle } from './use-native-chat-composer-handle'
-import { useNativeChatExternalAttachments } from './use-native-chat-external-attachments'
+import { useNativeChatFileDrops } from './use-native-chat-file-drops'
 import { useNativeChatComposerKeyDown } from './use-native-chat-composer-keydown'
 import { useNativeChatSendLifecycle } from './use-native-chat-send-lifecycle'
 import { useNativeChatSessionOptions } from './use-native-chat-session-options'
-import { useNativeChatFileAttachmentActions } from './use-native-chat-file-attachment-actions'
 import { useNativeChatDictation } from './use-native-chat-dictation'
 import { useNativeChatSessionOptionCommand } from './use-native-chat-session-option-command'
 import { useNativeChatComposerCatalog } from './use-native-chat-composer-catalog'
@@ -31,7 +30,6 @@ import { useNativeChatPtyComposerSend } from './use-native-chat-pty-composer-sen
 import { useNativeChatHeldQueueComposerSend } from './use-native-chat-held-queue-composer-send'
 import { useImeEnterGestureOwnership } from '@/lib/ime-composition-keyboard-event'
 import { useNativeChatComposerAppMenuSelection } from './use-native-chat-composer-app-menu-selection'
-import { useNativeChatWorkspaceFileDrop } from './use-native-chat-workspace-file-drop'
 import { useNativeChatComposerSubmit } from './use-native-chat-composer-submit'
 
 export type {
@@ -71,6 +69,7 @@ const NativeChatComposerPane = forwardRef<NativeChatComposerHandle, NativeChatCo
       launchSeed,
       structuredTransport,
       steerQueued,
+      recallSource,
       inputOwnedByCard = false,
       notices: chatNotices
     },
@@ -96,10 +95,14 @@ const NativeChatComposerPane = forwardRef<NativeChatComposerHandle, NativeChatCo
       setDraft,
       setCaret
     })
-    const [history, setHistory] = useState<HistoryState>(EMPTY_HISTORY)
     const [activeSuggestion, setActiveSuggestion] = useState(0)
     const { notices, setNotice } = useNativeChatComposerNotice(chatNotices)
     const { textareaRef } = useNativeChatComposerAppMenuSelection(imeEnterGesture.isComposing)
+    const recall = useNativeChatComposerRecall({
+      draft,
+      source: recallSource,
+      inputRef: textareaRef
+    })
     const { cancelPendingSends, trackPendingSend } = useNativeChatSendLifecycle(
       terminalTabId,
       targetPtyId,
@@ -118,7 +121,7 @@ const NativeChatComposerPane = forwardRef<NativeChatComposerHandle, NativeChatCo
       draft,
       caret,
       agentCommands,
-      recalledFromHistory: history.index !== null,
+      recalledFromHistory: recall.active,
       sessionSkillNames,
       textareaRef,
       setDraft,
@@ -175,29 +178,25 @@ const NativeChatComposerPane = forwardRef<NativeChatComposerHandle, NativeChatCo
       imageAttachments,
       attachResolvedPaths,
       clearImageAttachments,
-      removeImageAttachment,
-      beginPendingImageAttachment,
-      resolvePendingImageAttachment,
-      dropPendingImageAttachment
+      removeImageAttachment
     } = attachments
-    useNativeChatWorkspaceFileDrop({
-      terminalTabId,
-      structuredWorktreeId: structuredTransport?.worktreeId,
-      disabled,
-      paneKey,
-      attachResolvedPaths,
-      setNotice
-    })
     const imageBlock = nativeChatImageSendBlock(imageAttachments)
+    const sendHeld = disabled || structuredTransport?.sendOut === true || imageBlock.holdsSend
     const sendButtonDisabled = isWorking
       ? !hasPty || !onStop
-      : disabled || imageBlock.holdsSend || (draft.trim() === '' && imageAttachments.length === 0)
+      : sendHeld || (draft.trim() === '' && imageAttachments.length === 0)
 
-    const { attachExternalPaths, resolveAttachmentOwner } = useNativeChatExternalAttachments({
+    const { pickAttachments, resolveAttachmentOwner } = useNativeChatFileDrops({
+      paneKey,
+      draftScopeKey,
+      targetPtyId,
+      structuredTransport,
       terminalTabId,
       structuredWorktreeId: structuredTransport?.worktreeId,
+      structuredSession: structuredTransport,
       disabled,
       attachResolvedPaths,
+      pendingChips: attachments.pendingChips,
       setNotice
     })
 
@@ -207,7 +206,6 @@ const NativeChatComposerPane = forwardRef<NativeChatComposerHandle, NativeChatCo
       draft,
       setDraft,
       setCaret,
-      setHistory,
       setActiveSuggestion,
       targetKey: JSON.stringify([
         paneKey,
@@ -220,13 +218,14 @@ const NativeChatComposerPane = forwardRef<NativeChatComposerHandle, NativeChatCo
       disabled,
       resolveAttachmentOwner,
       attachResolvedPaths,
-      beginPendingImageAttachment,
-      resolvePendingImageAttachment,
-      dropPendingImageAttachment,
+      beginPendingImageAttachment: attachments.beginPendingImageAttachment,
+      // Settles into the scope cache, which outlives a composer a prompt card unmounted.
+      resolvePendingImageAttachment: attachments.pendingChips.resolve,
+      revealPendingImageAttachment: attachments.revealPendingImageAttachment,
+      dropPendingImageAttachment: attachments.dropPendingImageAttachment,
       setNotice
     })
 
-    const { pickAttachments } = useNativeChatFileAttachmentActions(paneKey, attachExternalPaths)
     const dictation = useNativeChatDictation(textareaRef)
     const { dispatch: dispatchSessionOptionCommand, isDispatching: isDispatchingSessionOption } =
       useNativeChatSessionOptionCommand({
@@ -234,8 +233,7 @@ const NativeChatComposerPane = forwardRef<NativeChatComposerHandle, NativeChatCo
         disabled,
         onSlashCommand,
         onSubmitted,
-        resolveTarget,
-        setHistory
+        resolveTarget
       })
 
     const { surface: ptySessionOptionsSurface, snapshot: ptySessionOptionsSnapshot } =
@@ -259,7 +257,6 @@ const NativeChatComposerPane = forwardRef<NativeChatComposerHandle, NativeChatCo
       structuredTransport,
       isComposing: imeEnterGesture.isComposing,
       clearSkillOrigin,
-      setHistory,
       setDraft,
       setCaret
     })
@@ -275,7 +272,6 @@ const NativeChatComposerPane = forwardRef<NativeChatComposerHandle, NativeChatCo
       answerCommandLocally,
       sessionOptionsSurface: ptySessionOptionsSurface,
       trackPendingSend,
-      setHistory,
       setDraft,
       setCaret,
       clearSkillOrigin,
@@ -304,8 +300,7 @@ const NativeChatComposerPane = forwardRef<NativeChatComposerHandle, NativeChatCo
       sendPty,
       sendStructured,
       setDraft,
-      setCaret,
-      setHistory
+      setCaret
     })
 
     const interrupt = useNativeChatComposerInterrupt({
@@ -334,7 +329,7 @@ const NativeChatComposerPane = forwardRef<NativeChatComposerHandle, NativeChatCo
       completeMention,
       activeSuggestion,
       draft,
-      history,
+      recall: recall.recall,
       isComposing: imeEnterGesture.isComposing,
       completePickerItem: goalMode.interceptPick(completeItem),
       dispatchPickerCommand: goalMode.interceptPick(dispatchPickerCommand),
@@ -345,14 +340,12 @@ const NativeChatComposerPane = forwardRef<NativeChatComposerHandle, NativeChatCo
       ...(steerQueued ? { steerQueued } : {}),
       setActiveSuggestion,
       setDraft,
-      setCaret,
-      setHistory
+      setCaret
     })
 
     const handleDraftChange = useCallback(
       (value: string, element: NativeChatComposerInput) => {
         setDraft(value)
-        setHistory((prev) => ({ entries: prev.entries, index: null }))
         syncCaret(element)
         handleDraftOrCaretChange(value, element.selectionStart ?? value.length)
         setActiveSuggestion(0)
@@ -362,7 +355,6 @@ const NativeChatComposerPane = forwardRef<NativeChatComposerHandle, NativeChatCo
 
     return (
       <NativeChatComposerField
-        dropScopeKey={paneKey}
         draftScopeKey={draftScopeKey}
         textareaRef={textareaRef}
         draft={draft}
@@ -374,6 +366,7 @@ const NativeChatComposerPane = forwardRef<NativeChatComposerHandle, NativeChatCo
         activeSuggestion={activeSuggestion}
         notices={notices}
         imageAttachments={imageAttachments}
+        attachmentEnvironmentId={structuredTransport?.runtimeEnvironmentId ?? undefined}
         sendButtonDisabled={sendButtonDisabled}
         sendBlockedReason={imageBlock.reason}
         isWorking={isWorking}
diff --git a/src/renderer/src/components/native-chat/NativeChatComposerField.tsx b/src/renderer/src/components/native-chat/NativeChatComposerField.tsx
index 1e8726146a7e..0abc1c22bc63 100644
--- a/src/renderer/src/components/native-chat/NativeChatComposerField.tsx
+++ b/src/renderer/src/components/native-chat/NativeChatComposerField.tsx
@@ -2,9 +2,9 @@ import { NativeChatPromptEditor } from './NativeChatPromptEditor'
 import type { NativeChatComposerInput } from './native-chat-composer-input'
 import type { ClipboardEventHandler, KeyboardEventHandler, RefObject } from 'react'
 import { useLayoutEffect, useRef } from 'react'
+import { flushSync } from 'react-dom'
 import type { useImeEnterGestureOwnership } from '@/lib/ime-composition-keyboard-event'
 import { cn } from '@/lib/utils'
-import { NATIVE_FILE_DROP_TARGET } from '../../../../shared/native-file-drop'
 import type { ComposerAutocomplete, NativeChatPickerItem } from './native-chat-composer-state'
 import { NativeChatMentionMenu, NativeChatPickerMenu } from './NativeChatAutocompleteMenus'
 import type { NativeChatMentionFiles } from './use-native-chat-mention-files'
@@ -35,7 +35,6 @@ import { useNativeChatComposerDraftUnsaved } from './use-native-chat-draft-unsav
 export type NativeChatComposerFieldProps = {
   /** Pane identity published to the drop pipeline so a native file drop lands
    *  only in the composer it was dropped on. */
-  dropScopeKey: string
   /** Owner of the draft the editor's document is saved with. */
   draftScopeKey: string
   textareaRef: RefObject<NativeChatComposerInput | null>
@@ -48,6 +47,8 @@ export type NativeChatComposerFieldProps = {
   activeSuggestion: number
   notices: readonly NativeChatComposerNotice[]
   imageAttachments: readonly NativeChatComposerImageAttachment[]
+  /** The paired server a structured chat runs on, which reads back files stored there. */
+  attachmentEnvironmentId?: string
   sendButtonDisabled: boolean
   /** Why the send button is disabled, when the user can do something about it. */
   sendBlockedReason?: string | null
@@ -97,6 +98,10 @@ export type NativeChatComposerImageAttachment = {
   previewUrl?: string
   /** True while the pasted image is still being written to disk or uploaded. */
   pending?: boolean
+  /** The file's name while it uploads: a dropped or picked file, not a pasted image. */
+  pendingName?: string
+  /** Owed to the message but not shown yet: a rich-text paste's image while its server is asked. */
+  hidden?: true
   /** Set on an image the draft names but can't send: the file to attach again. */
   unavailableName?: string
 }
@@ -123,7 +128,6 @@ function imeComposedSegment(base: string, settled: string): string {
 }
 
 export function NativeChatComposerField({
-  dropScopeKey,
   draftScopeKey,
   textareaRef,
   draft,
@@ -135,6 +139,7 @@ export function NativeChatComposerField({
   activeSuggestion,
   notices,
   imageAttachments,
+  attachmentEnvironmentId,
   sendButtonDisabled,
   sendBlockedReason,
   isWorking,
@@ -169,6 +174,7 @@ export function NativeChatComposerField({
   sessionOptionsPickerRequest,
   goalMode
 }: NativeChatComposerFieldProps): React.JSX.Element {
+  const shownAttachments = imageAttachments.filter((attachment) => !attachment.hidden)
   const draftNotSaved = useNativeChatComposerDraftUnsaved(draftScopeKey)
   const optionCount =
     autocomplete.mode === 'slash'
@@ -260,8 +266,6 @@ export function NativeChatComposerField({
             className="mb-1.5"
           />
           <div
-            data-native-file-drop-target={NATIVE_FILE_DROP_TARGET.composer}
-            data-composer-scope-key={dropScopeKey}
             className={cn(
               // Why: always-on hairline (token-level border, not focus ring) —
               // no focus/click border flash. The box is a container, not a
@@ -278,12 +282,13 @@ export function NativeChatComposerField({
               '[contain:paint]'
             )}
           >
-            {imageAttachments.length > 0 ? (
+            {shownAttachments.length > 0 ? (
               <div className="mb-2 flex flex-wrap gap-2 px-1 pt-1.5">
-                {imageAttachments.map((attachment) => (
+                {shownAttachments.map((attachment) => (
                   <NativeChatImageAttachmentPreview
                     key={attachment.id}
                     attachment={attachment}
+                    hostEnvironmentId={attachmentEnvironmentId}
                     onRemove={onRemoveImageAttachment}
                   />
                 ))}
@@ -310,6 +315,11 @@ export function NativeChatComposerField({
                 }
               }}
               onCompositionStart={() => {
+                if (imeEnterGesture.isComposing()) {
+                  imeEnterGesture.setComposing(false)
+                  // Settle the interrupted composition before the new one takes browser ownership.
+                  flushSync(() => settleImeValue(textareaRef.current!))
+                }
                 compositionBaseRef.current = textareaRef.current!.value
                 imeEnterGesture.setComposing(true)
               }}
diff --git a/src/renderer/src/components/native-chat/NativeChatComposerNotices.test.tsx b/src/renderer/src/components/native-chat/NativeChatComposerNotices.test.tsx
index 767580f359c8..3acba880bab5 100644
--- a/src/renderer/src/components/native-chat/NativeChatComposerNotices.test.tsx
+++ b/src/renderer/src/components/native-chat/NativeChatComposerNotices.test.tsx
@@ -20,6 +20,7 @@ describe('NativeChatComposerNotices', () => {
       <NativeChatComposerNotices
         notices={[
           { key: 'composer', kind: 'attachment', text: 'Worktree not ready.' },
+          { key: 'host', kind: 'host', tone: 'warning', text: 'Build box is offline' },
           { key: 'session', kind: 'error', text: 'Orca couldn’t save your message.' },
           { key: 'slash', kind: 'error', text: 'sonnet-9 is not an available model.' }
         ]}
@@ -29,7 +30,8 @@ describe('NativeChatComposerNotices', () => {
     expect(texts).toEqual([
       'Orca couldn’t save your message.',
       'sonnet-9 is not an available model.',
-      'Worktree not ready.'
+      'Worktree not ready.',
+      'Build box is offline'
     ])
     expect(container.querySelectorAll('[data-notice-kind="error"]')).toHaveLength(2)
   })
diff --git a/src/renderer/src/components/native-chat/NativeChatComposerNotices.tsx b/src/renderer/src/components/native-chat/NativeChatComposerNotices.tsx
index de15a5a5630e..0aefd2903326 100644
--- a/src/renderer/src/components/native-chat/NativeChatComposerNotices.tsx
+++ b/src/renderer/src/components/native-chat/NativeChatComposerNotices.tsx
@@ -1,4 +1,4 @@
-import { AlertCircle, Paperclip, X } from 'lucide-react'
+import { AlertCircle, Paperclip, ServerOff, X } from 'lucide-react'
 import { Button } from '@/components/ui/button'
 import { translate } from '@/i18n/i18n'
 import { cn } from '@/lib/utils'
@@ -55,7 +55,8 @@ export function NativeChatPromptSlotNotices({
 
 function NoticeRow({ notice }: { notice: NativeChatComposerNotice }): React.JSX.Element {
   const isError = notice.kind === 'error'
-  const Icon = isError ? AlertCircle : Paperclip
+  const isHostWarning = notice.kind === 'host' && notice.tone === 'warning'
+  const Icon = notice.kind === 'host' ? ServerOff : isError ? AlertCircle : Paperclip
   const dismissLabel = translate('components.native-chat.notices.dismiss', 'Dismiss')
   return (
     <li data-notice-kind={notice.kind} className={cn(isError && 'bg-destructive/5')}>
@@ -64,19 +65,30 @@ function NoticeRow({ notice }: { notice: NativeChatComposerNotice }): React.JSX.
           aria-hidden
           className={cn(
             'mt-0.5 size-3.5 shrink-0',
-            isError ? 'text-destructive' : 'text-muted-foreground'
+            'text-muted-foreground',
+            isError && 'text-destructive',
+            isHostWarning && 'text-destructive'
           )}
         />
         <p
           className={cn(
-            'min-w-0 flex-1 select-text py-px leading-5 [overflow-wrap:anywhere]',
-            isError ? 'text-foreground' : 'text-muted-foreground'
+            'min-w-0 flex-1 select-text py-px leading-5',
+            notice.kind === 'host' ? 'truncate' : '[overflow-wrap:anywhere]',
+            'text-muted-foreground',
+            isError && 'text-foreground',
+            isHostWarning && 'text-destructive'
           )}
         >
           {notice.text}
         </p>
         {notice.action ? (
-          <Button type="button" variant="outline" size="xs" onClick={notice.action.onClick}>
+          <Button
+            type="button"
+            variant="outline"
+            size="xs"
+            disabled={notice.action.disabled}
+            onClick={notice.action.onClick}
+          >
             {notice.action.label}
           </Button>
         ) : null}
diff --git a/src/renderer/src/components/native-chat/NativeChatContextUsageRing.test.tsx b/src/renderer/src/components/native-chat/NativeChatContextUsageRing.test.tsx
index 290c66355b50..094feedf5baa 100644
--- a/src/renderer/src/components/native-chat/NativeChatContextUsageRing.test.tsx
+++ b/src/renderer/src/components/native-chat/NativeChatContextUsageRing.test.tsx
@@ -249,7 +249,6 @@ describe('NativeChatContextUsageRing', () => {
   it('spends an Escape typed in the composer on closing the card, not on stopping the agent', async () => {
     const { NativeChatContextUsageRing } = await import('./NativeChatContextUsageRing')
     const { useNativeChatComposerKeyDown } = await import('./use-native-chat-composer-keydown')
-    const { EMPTY_HISTORY } = await import('./native-chat-composer-state')
     const interrupt = vi.fn()
     function ComposerWithRing(): React.JSX.Element {
       const onKeyDown = useNativeChatComposerKeyDown({
@@ -258,7 +257,6 @@ describe('NativeChatContextUsageRing', () => {
         completeMention: vi.fn(),
         activeSuggestion: 0,
         draft: '',
-        history: EMPTY_HISTORY,
         isComposing: () => false,
         completePickerItem: vi.fn(),
         dispatchPickerCommand: vi.fn(),
@@ -267,8 +265,7 @@ describe('NativeChatContextUsageRing', () => {
         send: vi.fn(),
         setActiveSuggestion: vi.fn(),
         setDraft: vi.fn(),
-        setCaret: vi.fn(),
-        setHistory: vi.fn()
+        setCaret: vi.fn()
       })
       return (
         <>
diff --git a/src/renderer/src/components/native-chat/NativeChatDiffCard.tsx b/src/renderer/src/components/native-chat/NativeChatDiffCard.tsx
index 1d9f7321b82d..791516203541 100644
--- a/src/renderer/src/components/native-chat/NativeChatDiffCard.tsx
+++ b/src/renderer/src/components/native-chat/NativeChatDiffCard.tsx
@@ -1,3 +1,4 @@
+import { NativeChatExpandable } from './NativeChatExpandable'
 import { useLayoutEffect, useMemo, useRef } from 'react'
 import { useNativeChatDisclosure } from './native-chat-disclosure-store'
 import { ChevronRight, FilePlus2, FileMinus2, FilePen } from 'lucide-react'
@@ -105,6 +106,32 @@ function DiffRow({ line, gutterWidth }: { line: NativeChatEditLine; gutterWidth:
   )
 }
 
+/** The card's rows. Its own component so a collapsed card builds none of them. */
+function DiffCardRows({
+  lines,
+  gutterWidth
+}: {
+  lines: NativeChatEditFile['lines']
+  gutterWidth: number
+}): React.JSX.Element {
+  const seen = new Map<string, number>()
+  return (
+    // Focusable so the rows can be scrolled from the keyboard.
+    <div
+      data-native-chat-code-content
+      tabIndex={0}
+      className="ml-6 mt-1 max-h-72 overflow-auto rounded-lg border border-chat-code-border bg-chat-code-surface py-1 font-mono text-xs leading-relaxed text-chat-foreground scrollbar-sleek focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-inset focus-visible:ring-ring/70"
+    >
+      {lines.map((line) => {
+        const signature = `${line.kind}:${line.oldLineNumber}:${line.newLineNumber}:${line.text}`
+        const occurrence = seen.get(signature) ?? 0
+        seen.set(signature, occurrence + 1)
+        return <DiffRow key={`${signature}:${occurrence}`} line={line} gutterWidth={gutterWidth} />
+      })}
+    </div>
+  )
+}
+
 /** Inline card for one file an agent edited: verb header, path with change
  *  counts, and the unified rows. The gutter is blank when the provider gave no
  *  resolved ranges, because a snippet-relative number would read as a file
@@ -114,20 +141,15 @@ export function NativeChatDiffCard({
   file,
   revealSignal,
   onReveal,
-  initiallyExpanded = false,
   disclosureKey
 }: {
   file: NativeChatEditFile
   revealSignal?: number
   onReveal?: (element: HTMLElement) => void
-  initiallyExpanded?: boolean
   /** Identity this card's open state is remembered under while it is unmounted. */
   disclosureKey?: string
 }): React.JSX.Element {
-  const { open: expanded, setOpen: setExpanded } = useNativeChatDisclosure(
-    disclosureKey,
-    initiallyExpanded
-  )
+  const { open: expanded, setOpen: setExpanded } = useNativeChatDisclosure(disclosureKey, false)
   const cardRef = useRef<HTMLDivElement>(null)
   useLayoutEffect(() => {
     if (revealSignal && cardRef.current) {
@@ -204,25 +226,10 @@ export function NativeChatDiffCard({
           className="ml-auto shrink-0"
         />
       </div>
-      {hasBody && expanded ? (
-        // Focusable so the rows can be scrolled from the keyboard.
-        <div
-          data-native-chat-code-content
-          tabIndex={0}
-          className="ml-6 mt-1 max-h-72 overflow-auto rounded-lg border border-chat-code-border bg-chat-code-surface py-1 font-mono text-xs leading-relaxed text-chat-foreground scrollbar-sleek focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-inset focus-visible:ring-ring/70"
-        >
-          {(() => {
-            const seen = new Map<string, number>()
-            return file.lines.map((line) => {
-              const signature = `${line.kind}:${line.oldLineNumber}:${line.newLineNumber}:${line.text}`
-              const occurrence = seen.get(signature) ?? 0
-              seen.set(signature, occurrence + 1)
-              return (
-                <DiffRow key={`${signature}:${occurrence}`} line={line} gutterWidth={gutterWidth} />
-              )
-            })
-          })()}
-        </div>
+      {hasBody ? (
+        <NativeChatExpandable open={expanded}>
+          <DiffCardRows lines={file.lines} gutterWidth={gutterWidth} />
+        </NativeChatExpandable>
       ) : null}
     </div>
   )
diff --git a/src/renderer/src/components/native-chat/NativeChatExpandable.tsx b/src/renderer/src/components/native-chat/NativeChatExpandable.tsx
new file mode 100644
index 000000000000..44e4c838452f
--- /dev/null
+++ b/src/renderer/src/components/native-chat/NativeChatExpandable.tsx
@@ -0,0 +1,19 @@
+import { Collapsible, CollapsibleContent } from '@/components/ui/collapsible'
+
+/** Grows and shrinks its content so the rows around it move instead of jumping. Children
+ *  mount only while open or closing, so open-only work belongs in a child component. */
+export function NativeChatExpandable({
+  open,
+  children
+}: {
+  open: boolean
+  children: React.ReactNode
+}): React.JSX.Element {
+  return (
+    <Collapsible open={open}>
+      <CollapsibleContent animation="height" data-native-chat-member-detail>
+        {children}
+      </CollapsibleContent>
+    </Collapsible>
+  )
+}
diff --git a/src/renderer/src/components/native-chat/NativeChatHostOutageNotice.tsx b/src/renderer/src/components/native-chat/NativeChatHostOutageNotice.tsx
deleted file mode 100644
index 50b96f36f4cd..000000000000
--- a/src/renderer/src/components/native-chat/NativeChatHostOutageNotice.tsx
+++ /dev/null
@@ -1,64 +0,0 @@
-import { useState } from 'react'
-import { WifiOff } from 'lucide-react'
-import { Button } from '@/components/ui/button'
-import { connectRuntimeHostAndReloadProjects } from '@/components/status-bar/runtime-environment-explicit-connect'
-import { useMountedRef } from '@/hooks/useMountedRef'
-import { translate } from '@/i18n/i18n'
-import { cn } from '@/lib/utils'
-import type { NativeChatHostOutage } from './use-native-chat-host-outage'
-
-/** One line naming the chat's host while Orca can't reach it; offline offers the status bar's
- *  Connect unless the host refused us. The live region stays mounted while empty, so it is announced. */
-export function NativeChatHostOutageNotice({
-  outage
-}: {
-  outage: NativeChatHostOutage | null
-}): React.JSX.Element {
-  const [connecting, setConnecting] = useState(false)
-  const mountedRef = useMountedRef()
-  const reconnect = (environmentId: string): void => {
-    setConnecting(true)
-    void connectRuntimeHostAndReloadProjects(environmentId).finally(() => {
-      if (mountedRef.current) {
-        setConnecting(false)
-      }
-    })
-  }
-  const offline = outage?.kind === 'offline'
-  return (
-    <div role="status">
-      {outage ? (
-        <div
-          className={cn(
-            'mx-auto flex w-full max-w-(--chat-content-max-width) items-center gap-2 px-4 py-1 text-xs',
-            offline ? 'text-status-warning' : 'text-muted-foreground'
-          )}
-        >
-          <WifiOff className="size-3.5 shrink-0" aria-hidden />
-          <p className="min-w-0 flex-1 truncate">
-            {offline
-              ? translate('components.native-chat.hostOutage.offline', '{{hostName}} is offline', {
-                  hostName: outage.hostLabel
-                })
-              : translate(
-                  'components.native-chat.hostOutage.reconnecting',
-                  '{{hostName}} is reconnecting…',
-                  { hostName: outage.hostLabel }
-                )}
-          </p>
-          {outage.canReconnect ? (
-            <Button
-              type="button"
-              variant="ghost"
-              size="xs"
-              disabled={connecting}
-              onClick={() => reconnect(outage.environmentId)}
-            >
-              {translate('components.native-chat.hostOutage.reconnect', 'Reconnect')}
-            </Button>
-          ) : null}
-        </div>
-      ) : null}
-    </div>
-  )
-}
diff --git a/src/renderer/src/components/native-chat/NativeChatImageAttachmentPreview.test.tsx b/src/renderer/src/components/native-chat/NativeChatImageAttachmentPreview.test.tsx
index 286365db2176..b8d9400235e8 100644
--- a/src/renderer/src/components/native-chat/NativeChatImageAttachmentPreview.test.tsx
+++ b/src/renderer/src/components/native-chat/NativeChatImageAttachmentPreview.test.tsx
@@ -24,9 +24,18 @@ afterEach(() => {
   mocks.useLocalImageSrc.mockReset()
 })
 
-function renderPreview(attachment: NativeChatComposerImageAttachment): void {
+function renderPreview(
+  attachment: NativeChatComposerImageAttachment,
+  hostEnvironmentId?: string
+): void {
   vi.stubGlobal('IntersectionObserver', undefined)
-  render(<NativeChatImageAttachmentPreview attachment={attachment} onRemove={vi.fn()} />)
+  render(
+    <NativeChatImageAttachmentPreview
+      attachment={attachment}
+      hostEnvironmentId={hostEnvironmentId}
+      onRemove={vi.fn()}
+    />
+  )
 }
 
 async function clickOn(target: Element): Promise<void> {
@@ -65,6 +74,58 @@ describe('NativeChatImageAttachmentPreview', () => {
     })
   })
 
+  // The path names a file on the paired server; this machine's disk must never be asked for it.
+  it('reads a stored chip back through the server that holds it', () => {
+    mocks.useLocalImageSrc.mockReturnValue('blob:from-server')
+    const path = '/srv/agent-session-attachments/u1/shot.png'
+    renderPreview({ id: 'a1', path }, 'env-1')
+
+    for (const call of mocks.useLocalImageSrc.mock.calls) {
+      expect(call[3]).toEqual({
+        settings: { activeRuntimeEnvironmentId: 'env-1' },
+        worktreeId: null,
+        worktreePath: null
+      })
+    }
+    expect(mocks.useLocalImageSrc).toHaveBeenCalledWith(path, path, undefined, expect.anything(), {
+      kind: 'chat-image'
+    })
+    expect(screen.getByRole('img', { name: 'shot.png' }).getAttribute('src')).toBe(
+      'blob:from-server'
+    )
+  })
+
+  it("keeps any other path on the chat's usual read route", () => {
+    mocks.useLocalImageSrc.mockReturnValue(undefined)
+    renderPreview({ id: 'a1', path: '/repo/docs/shot.png' }, 'env-1')
+
+    expect(mocks.useLocalImageSrc).toHaveBeenCalledWith(
+      '/repo/docs/shot.png',
+      '/repo/docs/shot.png',
+      undefined,
+      undefined,
+      { kind: 'chat-image' }
+    )
+  })
+
+  it('shows a dropped file by name and kind while it uploads', () => {
+    mocks.useLocalImageSrc.mockReturnValue(undefined)
+    renderPreview({ id: 'a1', path: '', pending: true, pendingName: 'report.pdf' })
+
+    expect(screen.getByRole('button', { name: 'Uploading report.pdf…' })).toBeTruthy()
+    expect(screen.getByText('report.pdf')).toBeTruthy()
+    expect(document.querySelector('.lucide-file-text')).toBeTruthy()
+    expect(document.querySelector('.lucide-image')).toBeFalsy()
+  })
+
+  it('shows a dropped image as an image while it uploads', () => {
+    mocks.useLocalImageSrc.mockReturnValue(undefined)
+    renderPreview({ id: 'a1', path: '', pending: true, pendingName: 'shot.png' })
+
+    expect(screen.getByText('shot.png')).toBeTruthy()
+    expect(document.querySelector('.lucide-image')).toBeTruthy()
+  })
+
   it('offers the full-size file, not the clipboard thumbnail, to the chat copy menu', () => {
     mocks.useLocalImageSrc.mockReturnValue('blob:on-disk-1')
     renderPreview({ id: 'a1', path: '/tmp/example.png', previewUrl: 'data:thumbnail' })
diff --git a/src/renderer/src/components/native-chat/NativeChatImageAttachmentPreview.tsx b/src/renderer/src/components/native-chat/NativeChatImageAttachmentPreview.tsx
index 0ef722cd3a84..a46a6c2eeddb 100644
--- a/src/renderer/src/components/native-chat/NativeChatImageAttachmentPreview.tsx
+++ b/src/renderer/src/components/native-chat/NativeChatImageAttachmentPreview.tsx
@@ -1,22 +1,29 @@
-import { useEffect, useRef, useState } from 'react'
-import { Image as ImageIcon, ImageOff, Loader2, X } from 'lucide-react'
+import { useEffect, useMemo, useRef, useState } from 'react'
+import { FileText, Image as ImageIcon, ImageOff, Loader2, X } from 'lucide-react'
 import { Dialog, DialogContent, DialogDescription, DialogTitle } from '@/components/ui/dialog'
 import { translate } from '@/i18n/i18n'
 import { basename } from '@/lib/path'
 import { useLocalImageSrc } from '@/components/editor/useLocalImageSrc'
 import { copyableNativeChatImageSrc, keepPreviewOpenForChatMenu } from './native-chat-image-copy'
-import { isNativeChatPastedImagePath } from './native-chat-image-paste'
+import {
+  isNativeChatImageAttachmentPath,
+  isNativeChatPastedImagePath
+} from './native-chat-image-paste'
 import type { NativeChatComposerImageAttachment } from './NativeChatComposerField'
+import { isAgentSessionAttachmentStorePath } from '../../../../shared/agent-session-attachments'
 import { chatImageAccess } from '@/lib/local-file-access'
 
 type Props = {
   attachment: NativeChatComposerImageAttachment
+  /** The paired server the chat runs on; a file stored there is read back through it. */
+  hostEnvironmentId?: string
   onRemove: (id: string) => void
 }
 
 /** Thumbnail for a pending image, with an in-app full-size preview on click. */
 export function NativeChatImageAttachmentPreview({
   attachment,
+  hostEnvironmentId,
   onRemove
 }: Props): React.JSX.Element {
   if (attachment.unavailableName !== undefined) {
@@ -28,7 +35,13 @@ export function NativeChatImageAttachmentPreview({
       />
     )
   }
-  return <NativeChatImageThumbnail attachment={attachment} onRemove={onRemove} />
+  return (
+    <NativeChatImageThumbnail
+      attachment={attachment}
+      hostEnvironmentId={hostEnvironmentId}
+      onRemove={onRemove}
+    />
+  )
 }
 
 function attachmentLabel(path: string): string {
@@ -98,7 +111,11 @@ function NativeChatUnavailableImageChip({
   )
 }
 
-function NativeChatImageThumbnail({ attachment, onRemove }: Props): React.JSX.Element {
+function NativeChatImageThumbnail({
+  attachment,
+  hostEnvironmentId,
+  onRemove
+}: Props): React.JSX.Element {
   const [isOpen, setIsOpen] = useState(false)
   const [isNearViewport, setIsNearViewport] = useState(false)
   const thumbnailRef = useRef<HTMLDivElement>(null)
@@ -124,11 +141,27 @@ function NativeChatImageThumbnail({ attachment, onRemove }: Props): React.JSX.El
     return () => observer.disconnect()
   }, [])
   const isPending = attachment.pending === true
+  // A stored attachment is a path on the paired server, read back through that server.
+  const readEnvironmentId =
+    hostEnvironmentId && isAgentSessionAttachmentStorePath(attachment.path)
+      ? hostEnvironmentId
+      : undefined
+  const hostReadContext = useMemo(
+    () =>
+      readEnvironmentId
+        ? {
+            settings: { activeRuntimeEnvironmentId: readEnvironmentId },
+            worktreeId: null,
+            worktreePath: null
+          }
+        : undefined,
+    [readEnvironmentId]
+  )
   const localSrc = useLocalImageSrc(
     !isPending && (isNearViewport || isOpen) ? attachment.path : undefined,
     attachment.path,
     attachment.connectionId,
-    undefined,
+    hostReadContext,
     // Why chat-image: a draft handed off from the host queue may carry paths a paired client chose.
     chatImageAccess()
   )
@@ -137,11 +170,16 @@ function NativeChatImageThumbnail({ attachment, onRemove }: Props): React.JSX.El
   const thumbnailSrc = attachment.previewUrl ?? localSrc
   const fullSizeSrc = localSrc ?? attachment.previewUrl
   const filename = attachmentLabel(attachment.path)
-  const pendingLabel = translate(
-    'components.native-chat.composer.imageSaving',
-    'Saving pasted image…'
-  )
-  const label = isPending ? pendingLabel : filename
+  const pendingLabel = attachment.pendingName
+    ? translate('components.native-chat.composer.uploadingFile', 'Uploading {{name}}…', {
+        name: attachment.pendingName
+      })
+    : translate('components.native-chat.composer.imageSaving', 'Saving pasted image…')
+  const label = isPending ? (attachment.pendingName ?? pendingLabel) : filename
+  // A dropped document uploads as a chip too, and becomes an `@` reference once stored.
+  const isFile =
+    attachment.pendingName !== undefined && !isNativeChatImageAttachmentPath(attachment.pendingName)
+  const KindIcon = isFile ? FileText : ImageIcon
   // The thumbnail may be the downscaled clipboard preview; copy only the file.
   const copySrc = copyableNativeChatImageSrc(localSrc)
 
@@ -167,8 +205,15 @@ function NativeChatImageThumbnail({ attachment, onRemove }: Props): React.JSX.El
               alt={label}
               className={`size-full object-cover${isPending ? ' opacity-50' : ''}`}
             />
+          ) : attachment.pendingName ? (
+            <span className="flex max-w-full flex-col items-center gap-0.5 px-1">
+              <KindIcon className="size-5 shrink-0 text-muted-foreground" />
+              <span className="max-w-full truncate text-xs text-muted-foreground">
+                {attachment.pendingName}
+              </span>
+            </span>
           ) : (
-            <ImageIcon className="size-5 text-muted-foreground" />
+            <KindIcon className="size-5 text-muted-foreground" />
           )}
         </button>
         {isPending ? (
diff --git a/src/renderer/src/components/native-chat/NativeChatInlineVisual.tsx b/src/renderer/src/components/native-chat/NativeChatInlineVisual.tsx
new file mode 100644
index 000000000000..eda0f0e7f9ea
--- /dev/null
+++ b/src/renderer/src/components/native-chat/NativeChatInlineVisual.tsx
@@ -0,0 +1,111 @@
+import { useEffect, useRef, useState } from 'react'
+import { Maximize2 } from 'lucide-react'
+import { Button } from '@/components/ui/button'
+import { Tooltip, TooltipContent, TooltipTrigger } from '@/components/ui/tooltip'
+import { translate } from '@/i18n/i18n'
+import { useAppStore } from '@/store'
+import { NATIVE_CHAT_VISUAL_RESERVED_HEIGHT, NativeChatVisualFrame } from './NativeChatVisualFrame'
+import { observeTranscriptVisibility } from './NativeChatTranscriptChrome'
+import type { NativeChatVisualOwner } from './native-chat-visual-owner'
+import { useNativeChatVisualDocument } from './use-native-chat-visual-document'
+
+export function NativeChatVisualUnavailable(): React.JSX.Element {
+  return (
+    <p className="my-2 text-xs text-muted-foreground">
+      {translate('components.native-chat.visualUnavailable', 'Visualization unavailable')}
+    </p>
+  )
+}
+
+/**
+ * A visual inside an assistant reply. Its frame mounts once the reply scrolls near it and stays
+ * mounted, so what the reader did in it survives scrolling away and back.
+ */
+export function NativeChatInlineVisual({
+  owner,
+  messageId,
+  file,
+  title
+}: {
+  owner: NativeChatVisualOwner
+  messageId: string
+  file: string
+  title: string | null
+}): React.JSX.Element {
+  const boxRef = useRef<HTMLDivElement | null>(null)
+  const [near, setNear] = useState(false)
+  const [retired, setRetired] = useState(false)
+  const openRightSidebarVisual = useAppStore((state) => state.openRightSidebarVisual)
+  const state = useNativeChatVisualDocument(
+    { target: owner.target, sessionId: owner.sessionId, file },
+    near
+  )
+
+  useEffect(() => {
+    const element = boxRef.current
+    if (!element || near) {
+      return
+    }
+    return observeTranscriptVisibility(element, (visible) => {
+      if (visible) {
+        setNear(true)
+      }
+    })
+  }, [near])
+
+  if (retired || state.status === 'unavailable') {
+    return <NativeChatVisualUnavailable />
+  }
+  const label = title ?? file
+  const openLabel = translate('components.native-chat.visualOpenInSidebar', 'Open in sidebar')
+
+  return (
+    <div ref={boxRef} className="group/visual relative my-3">
+      {state.status === 'ready' && near ? (
+        <>
+          <NativeChatVisualFrame
+            document={state.document}
+            title={label}
+            layout="inline"
+            themeScope={boxRef}
+            onRetired={() => setRetired(true)}
+          />
+          <div className="absolute top-2 right-2 transition-opacity can-hover:opacity-0 group-hover/visual:opacity-100 focus-within:opacity-100">
+            <Tooltip>
+              <TooltipTrigger asChild>
+                <Button
+                  variant="outline"
+                  size="icon-xs"
+                  aria-label={openLabel}
+                  onClick={() =>
+                    openRightSidebarVisual({
+                      target: owner.target,
+                      sessionId: owner.sessionId,
+                      tabId: owner.tabId,
+                      worktreeId: owner.worktreeId,
+                      messageId,
+                      file,
+                      title
+                    })
+                  }
+                >
+                  <Maximize2 />
+                </Button>
+              </TooltipTrigger>
+              <TooltipContent side="top" sideOffset={4}>
+                {openLabel}
+              </TooltipContent>
+            </Tooltip>
+          </div>
+        </>
+      ) : (
+        <div
+          role="status"
+          aria-label={translate('components.native-chat.visualLoading', 'Loading visualization')}
+          className="w-full rounded-md bg-muted/30"
+          style={{ height: NATIVE_CHAT_VISUAL_RESERVED_HEIGHT }}
+        />
+      )}
+    </div>
+  )
+}
diff --git a/src/renderer/src/components/native-chat/NativeChatInterruptedContinue.test.tsx b/src/renderer/src/components/native-chat/NativeChatInterruptedContinue.test.tsx
new file mode 100644
index 000000000000..de80b08e4c0b
--- /dev/null
+++ b/src/renderer/src/components/native-chat/NativeChatInterruptedContinue.test.tsx
@@ -0,0 +1,266 @@
+// @vitest-environment happy-dom
+import '@testing-library/jest-dom/vitest'
+import { cleanup, fireEvent, render, screen, waitFor } from '@testing-library/react'
+import { useState } from 'react'
+import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest'
+
+const mocks = vi.hoisted(() => {
+  const hostLabel = (): string | null => 'studio-mac'
+  const capability = (): 'unknown' | 'supported' | 'unsupported' => 'supported'
+  const resuming: readonly string[] = []
+  return {
+    call: vi.fn(),
+    capability: capability(),
+    hostLabel: hostLabel(),
+    resuming,
+    launchPending: false
+  }
+})
+
+vi.mock('@/i18n/i18n', () => ({ translate: (_key: string, fallback: string) => fallback }))
+vi.mock('@/runtime/structured-agent-session-client', () => ({
+  callStructuredAgentSession: mocks.call
+}))
+vi.mock('@/runtime/structured-agent-session-host-capability', () => ({
+  useStructuredAgentSessionHostCapabilityState: () => mocks.capability
+}))
+vi.mock('../native-chat-resume-on-restart-store', () => ({
+  useNativeChatRestartResuming: () => mocks.resuming
+}))
+vi.mock('../native-chat-launch-resume-decision', () => ({
+  useNativeChatLaunchResumePending: () => mocks.launchPending
+}))
+vi.mock('./use-structured-agent-session-host-label', () => ({
+  useStructuredAgentSessionHostLabel: () => mocks.hostLabel
+}))
+
+import { TooltipProvider } from '@/components/ui/tooltip'
+import { agentJournalItemKey } from '../../../../shared/agent-session-journal-item-key'
+import type {
+  AgentJournalRenderItem,
+  AgentJournalSubmission
+} from '../../../../shared/agent-session-journal-types'
+import type { RuntimeClientTarget } from '@/runtime/runtime-client-target'
+import {
+  NativeChatInterruptedContinue,
+  useNativeChatInterruptedContinuation
+} from './NativeChatInterruptedContinue'
+
+const TURN = agentJournalItemKey({ provider: 'codex', threadId: 't', turnId: 'cut', ordinal: 1 })
+const PAIRED: RuntimeClientTarget = { kind: 'environment', environmentId: 'studio-mac' }
+
+const cutChat: AgentJournalRenderItem[] = [
+  {
+    itemId: TURN,
+    revision: 2,
+    sequence: 1,
+    observedAt: 1,
+    body: { kind: 'turn', turnId: 'cut', state: 'interrupted', startedAt: 1, completedAt: 5 }
+  },
+  {
+    itemId: agentJournalItemKey({ provider: 'orca', clientMessageId: 'stale-session:s:death-1-5' }),
+    revision: 1,
+    sequence: 2,
+    observedAt: 6,
+    turnScope: { kind: 'turn', turnItemId: TURN },
+    body: { kind: 'status', text: 'Codex stopped.', tone: 'error', orcaStop: { cause: 'crash' } }
+  }
+]
+
+type Props = {
+  journalItems?: readonly AgentJournalRenderItem[]
+  submissions?: readonly Pick<AgentJournalSubmission, 'dispatchState'>[]
+  isWorking?: boolean
+  target?: RuntimeClientTarget
+}
+
+function Harness(props: Props): React.JSX.Element {
+  // The chat's own composer error, as NativeChatStructuredSession holds it.
+  const [composerError, setComposerError] = useState<string | null>(null)
+  const continuation = useNativeChatInterruptedContinuation({
+    composer: { clearError: () => setComposerError(null) },
+    target: props.target ?? PAIRED,
+    sessionId: 'session-1',
+    journalItems: props.journalItems ?? cutChat,
+    submissions: props.submissions ?? [],
+    isWorking: props.isWorking ?? false
+  })
+  return (
+    <TooltipProvider delayDuration={0}>
+      <span data-testid="offered">{continuation.offeredTurnItemId ?? 'none'}</span>
+      <span data-testid="available">{String(continuation.view.continueAvailable)}</span>
+      <span data-testid="error">
+        {composerError ?? continuation.continueError?.text ?? 'none'}
+      </span>
+      <button type="button" onClick={() => setComposerError(ATTACHMENTS)}>
+        compose
+      </button>
+      <NativeChatInterruptedContinue continuation={continuation} />
+    </TooltipProvider>
+  )
+}
+
+const continueButton = () => screen.queryByRole('button', { name: 'Continue' })
+const FAILED = "Couldn't continue this chat. Try again, or send a message."
+const ATTACHMENTS = 'Remove attachments before using a chat-session command.'
+
+beforeEach(() => {
+  mocks.capability = 'supported'
+  mocks.resuming = []
+  mocks.launchPending = false
+  mocks.hostLabel = 'studio-mac'
+  mocks.call.mockReset()
+})
+
+afterEach(cleanup)
+
+describe('Continue on a reply an Orca stop cut off', () => {
+  it("asks the chat's own host, paired or local, to continue that cut turn", () => {
+    mocks.call.mockResolvedValue({ outcome: 'pending' })
+    render(<Harness />)
+    expect(screen.getByTestId('offered')).toHaveTextContent(TURN)
+
+    fireEvent.click(continueButton()!)
+
+    expect(mocks.call).toHaveBeenCalledExactlyOnceWith(PAIRED, 'agentSession.continueInterrupted', {
+      sessionId: 'session-1',
+      turnItemId: TURN
+    })
+    // Gone once asked, and the row gets its own way on back: the journal shows what came of it.
+    expect(continueButton()).toBeNull()
+    expect(screen.getByTestId('offered')).toHaveTextContent('none')
+  })
+
+  it('says what it does, for a reader and on hover', () => {
+    render(<Harness />)
+    expect(continueButton()).toHaveAccessibleDescription(
+      'Continue, and the agent first checks whether its last step finished.'
+    )
+  })
+
+  it('is not offered by a host without the operation; the user continues by sending', () => {
+    mocks.capability = 'unsupported'
+    render(<Harness />)
+    expect(continueButton()).toBeNull()
+    expect(screen.getByTestId('available')).toHaveTextContent('false')
+  })
+
+  it('tells the rows the same thing before the host answers, after it answers, and after a click', () => {
+    mocks.capability = 'unknown'
+    mocks.call.mockResolvedValue({ outcome: 'pending' })
+    const { rerender } = render(<Harness />)
+    expect(screen.getByTestId('available')).toHaveTextContent('true')
+    expect(continueButton()).toBeNull()
+
+    mocks.capability = 'supported'
+    rerender(<Harness />)
+    expect(screen.getByTestId('available')).toHaveTextContent('true')
+    fireEvent.click(continueButton()!)
+
+    expect(screen.getByTestId('available')).toHaveTextContent('true')
+  })
+
+  it('is not offered while the restart prompt or the launch is resuming this chat', () => {
+    mocks.resuming = ['session-1']
+    render(<Harness />)
+    expect(continueButton()).toBeNull()
+  })
+
+  it("is not offered on this machine's chats while the launch may still resume them", () => {
+    mocks.launchPending = true
+    render(<Harness target={{ kind: 'local' }} />)
+    expect(continueButton()).toBeNull()
+    cleanup()
+    // The launch resumes only this machine's chats; a paired server's chat is its own.
+    render(<Harness />)
+    expect(continueButton()).toBeInTheDocument()
+  })
+
+  it('is not offered once anything was sent, or while the agent works', () => {
+    render(<Harness submissions={[{ dispatchState: 'pending' }]} />)
+    expect(continueButton()).toBeNull()
+    cleanup()
+    render(<Harness isWorking />)
+    expect(continueButton()).toBeNull()
+  })
+
+  it('is not offered for a cut no Orca stop explains', () => {
+    render(<Harness journalItems={cutChat.slice(0, 1)} />)
+    expect(continueButton()).toBeNull()
+  })
+
+  it('says so once, in the composer, and offers it again when the host refuses', async () => {
+    mocks.call.mockResolvedValue({ outcome: 'refused', reason: 'agent_session_not_attached' })
+    render(<Harness />)
+
+    fireEvent.click(continueButton()!)
+    await waitFor(() => expect(continueButton()).toBeInTheDocument())
+    expect(screen.getByTestId('error')).toHaveTextContent(FAILED)
+    // A retry clears the line until its own answer, which sets the same one line again.
+    fireEvent.click(continueButton()!)
+    expect(screen.getByTestId('error')).toHaveTextContent('none')
+    await waitFor(() => expect(continueButton()).toBeInTheDocument())
+    expect(screen.getByTestId('error')).toHaveTextContent(FAILED)
+  })
+
+  it('says so and offers it again when the request fails', async () => {
+    mocks.call.mockRejectedValue(new Error('offline'))
+    render(<Harness />)
+
+    fireEvent.click(continueButton()!)
+
+    await waitFor(() => expect(screen.getByTestId('error')).toHaveTextContent(FAILED))
+    expect(continueButton()).toBeInTheDocument()
+  })
+
+  it('replaces an older composer error with its own failure, and clears it when it goes through', async () => {
+    mocks.call.mockResolvedValueOnce({ outcome: 'refused', reason: 'agent_session_conflict' })
+    mocks.call.mockResolvedValueOnce({ outcome: 'pending' })
+    render(<Harness />)
+    fireEvent.click(screen.getByRole('button', { name: 'compose' }))
+    expect(screen.getByTestId('error')).toHaveTextContent(ATTACHMENTS)
+
+    fireEvent.click(continueButton()!)
+    await waitFor(() => expect(continueButton()).toBeInTheDocument())
+    expect(screen.getByTestId('error')).toHaveTextContent(FAILED)
+
+    fireEvent.click(screen.getByRole('button', { name: 'compose' }))
+    expect(screen.getByTestId('error')).toHaveTextContent(ATTACHMENTS)
+    fireEvent.click(continueButton()!)
+    await waitFor(() => expect(mocks.call).toHaveBeenCalledTimes(2))
+    expect(screen.getByTestId('error')).toHaveTextContent('none')
+  })
+
+  it('leaves an unrelated composer error alone when the chat moves on by itself', () => {
+    const { rerender } = render(<Harness />)
+    fireEvent.click(screen.getByRole('button', { name: 'compose' }))
+    rerender(<Harness submissions={[{ dispatchState: 'pending' }]} />)
+    expect(screen.getByTestId('error')).toHaveTextContent(ATTACHMENTS)
+  })
+
+  it('drops the line once the chat was continued, here or by another client', async () => {
+    // The answer was lost after the host accepted it.
+    mocks.call.mockRejectedValue(new Error('timed out'))
+    const { rerender } = render(<Harness />)
+    fireEvent.click(continueButton()!)
+    await waitFor(() => expect(screen.getByTestId('error')).toHaveTextContent(FAILED))
+
+    // The journal then shows the continuation on its way: the chat is no longer on that cut.
+    rerender(<Harness submissions={[{ dispatchState: 'pending' }]} />)
+
+    expect(screen.getByTestId('error')).toHaveTextContent('none')
+  })
+
+  it('leaves no line when a retry finds the chat already continued', async () => {
+    mocks.call.mockRejectedValueOnce(new Error('timed out'))
+    mocks.call.mockResolvedValueOnce({ outcome: 'superseded' })
+    render(<Harness />)
+    fireEvent.click(continueButton()!)
+    await waitFor(() => expect(screen.getByTestId('error')).toHaveTextContent(FAILED))
+
+    fireEvent.click(continueButton()!)
+
+    await waitFor(() => expect(mocks.call).toHaveBeenCalledTimes(2))
+    expect(screen.getByTestId('error')).toHaveTextContent('none')
+  })
+})
diff --git a/src/renderer/src/components/native-chat/NativeChatInterruptedContinue.tsx b/src/renderer/src/components/native-chat/NativeChatInterruptedContinue.tsx
new file mode 100644
index 000000000000..2e3e0be96de3
--- /dev/null
+++ b/src/renderer/src/components/native-chat/NativeChatInterruptedContinue.tsx
@@ -0,0 +1,143 @@
+import { useId, useMemo, useState } from 'react'
+import { Play } from 'lucide-react'
+import { Button } from '@/components/ui/button'
+import { Tooltip, TooltipContent, TooltipTrigger } from '@/components/ui/tooltip'
+import { translate } from '@/i18n/i18n'
+import { callStructuredAgentSession } from '@/runtime/structured-agent-session-client'
+import { useStructuredAgentSessionHostCapabilityState } from '@/runtime/structured-agent-session-host-capability'
+import type { RuntimeClientTarget } from '@/runtime/runtime-client-target'
+import type {
+  AgentJournalRenderItem,
+  AgentJournalSubmission
+} from '../../../../shared/agent-session-journal-types'
+import { latestNativeChatOrcaStopCut } from '../../../../shared/native-chat-orca-stop-cut'
+import { AGENT_SESSION_CONTINUE_INTERRUPTED_RUNTIME_CAPABILITY } from '../../../../shared/agent-session-continue-interrupted-capability'
+import type { NativeChatOrcaStopView } from './native-chat-orca-stop-context'
+import { useStructuredAgentSessionHostLabel } from './use-structured-agent-session-host-label'
+import { useNativeChatRestartResuming } from '../native-chat-resume-on-restart-store'
+import { useNativeChatLaunchResumePending } from '../native-chat-launch-resume-decision'
+import type { NativeChatComposerNoticeContent } from './native-chat-composer-notice'
+
+type ContinueAnswer = { outcome?: string }
+
+export type NativeChatInterruptedContinuation = {
+  /** What the chat's rows are told: the machine's name and whether its host can continue a cut. */
+  view: NativeChatOrcaStopView
+  /** The cut turn Continue is offered on right now, if any. */
+  offeredTurnItemId: string | null
+  /** A Continue that did not go through, for the composer's notice card: shown while the chat
+   *  still sits on that cut and gone once it is continued from anywhere. */
+  continueError: (NativeChatComposerNoticeContent & { onDismiss: () => void }) | null
+  continueNow: () => void
+}
+
+/**
+ * Continue, while the chat's latest turn is a reply an Orca stop cut off and nothing was sent since.
+ * Offered only by a host that has the operation; an older host writes no row naming the stop, so it
+ * never has a cut to offer it on, and the user continues by sending a message.
+ */
+export function useNativeChatInterruptedContinuation(input: {
+  target: RuntimeClientTarget
+  sessionId: string
+  journalItems: readonly AgentJournalRenderItem[]
+  submissions: readonly Pick<AgentJournalSubmission, 'dispatchState'>[]
+  isWorking: boolean
+  /** The composer's own error; a Continue click is the user's newer action, so it clears it. */
+  composer: { clearError: () => void }
+}): NativeChatInterruptedContinuation {
+  const { target, sessionId } = input
+  const hostLabel = useStructuredAgentSessionHostLabel(target)
+  const capability = useStructuredAgentSessionHostCapabilityState(
+    target,
+    AGENT_SESSION_CONTINUE_INTERRUPTED_RUNTIME_CAPABILITY
+  )
+  // The restart prompt or the launch's own resume is carrying this chat on, or the launch may still
+  // decide to; it resumes only this machine's chats.
+  const launchPending = useNativeChatLaunchResumePending() && target.kind === 'local'
+  const resuming = useNativeChatRestartResuming().includes(sessionId) || launchPending
+  const cut = useMemo(
+    () => latestNativeChatOrcaStopCut(input.journalItems, input.submissions),
+    [input.journalItems, input.submissions]
+  )
+  // The cut this client already asked to continue: hidden until the journal shows what came of it.
+  const [asked, setAsked] = useState<string | null>(null)
+  const [failedOn, setFailedOn] = useState<string | null>(null)
+  const offered =
+    capability === 'supported' && cut && !input.isWorking && !resuming && asked !== cut.turnItemId
+      ? cut.turnItemId
+      : null
+  const continueNow = (): void => {
+    if (offered === null) {
+      return
+    }
+    const turnItemId = offered
+    // Nothing was accepted: one line in the composer, which a retry replaces rather than repeats.
+    const failed = (): void => {
+      setAsked((current) => (current === turnItemId ? null : current))
+      setFailedOn(turnItemId)
+    }
+    setAsked(turnItemId)
+    setFailedOn(null)
+    input.composer.clearError()
+    void callStructuredAgentSession<ContinueAnswer>(target, 'agentSession.continueInterrupted', {
+      sessionId,
+      turnItemId
+    }).then((answer) => (answer.outcome === 'refused' ? failed() : undefined), failed)
+  }
+  // Unknown counts as able: a host that writes cause rows has Continue, and the words stay put.
+  const continueAvailable = capability !== 'unsupported'
+  // One object per change, so the chat's rows re-render only when what they show changes.
+  const view = useMemo(() => ({ hostLabel, continueAvailable }), [hostLabel, continueAvailable])
+  const failedHere =
+    failedOn !== null && cut?.turnItemId === failedOn
+      ? translate(
+          'components.native-chat.interruptedContinue.failed',
+          "Couldn't continue this chat. Try again, or send a message."
+        )
+      : null
+  return {
+    view,
+    offeredTurnItemId: offered,
+    continueError: failedHere ? { text: failedHere, onDismiss: () => setFailedOn(null) } : null,
+    continueNow
+  }
+}
+
+export function NativeChatInterruptedContinue({
+  continuation
+}: {
+  continuation: NativeChatInterruptedContinuation
+}): React.JSX.Element | null {
+  const explanationId = useId()
+  if (continuation.offeredTurnItemId === null) {
+    return null
+  }
+  const explanation = translate(
+    'components.native-chat.interruptedContinue.explanation',
+    'Continue, and the agent first checks whether its last step finished.'
+  )
+  return (
+    <div className="mx-auto flex w-full max-w-4xl items-center justify-end px-4 py-1">
+      <Tooltip>
+        <TooltipTrigger asChild>
+          <Button
+            type="button"
+            variant="ghost"
+            size="xs"
+            aria-describedby={explanationId}
+            onClick={continuation.continueNow}
+          >
+            <Play className="size-3" />
+            {translate('components.native-chat.interruptedContinue.continue', 'Continue')}
+          </Button>
+        </TooltipTrigger>
+        <TooltipContent side="top" sideOffset={4}>
+          {explanation}
+        </TooltipContent>
+      </Tooltip>
+      <span id={explanationId} className="sr-only">
+        {explanation}
+      </span>
+    </div>
+  )
+}
diff --git a/src/renderer/src/components/native-chat/NativeChatMarkdown.tsx b/src/renderer/src/components/native-chat/NativeChatMarkdown.tsx
index 3f2e89fb07ea..4033b51fc620 100644
--- a/src/renderer/src/components/native-chat/NativeChatMarkdown.tsx
+++ b/src/renderer/src/components/native-chat/NativeChatMarkdown.tsx
@@ -1,11 +1,33 @@
 import type { ComponentProps } from 'react'
 import CommentMarkdown from '@/components/sidebar/CommentMarkdown'
 import { cn } from '@/lib/utils'
+import { withoutPendingNativeChatVisualDirectiveTail } from '../../../../shared/native-chat-visual-directive'
+import { useNativeChatVisualMarkdownExtension } from './native-chat-visual-markdown-extension'
 import './native-chat-markdown.css'
 
+type NativeChatMarkdownProps = ComponentProps<typeof CommentMarkdown> & {
+  /** On assistant prose in a structured chat: this message may show visuals. */
+  visualMessageId?: string
+  /** The reply is still arriving, so an unfinished visual line at its end is held back. */
+  streaming?: boolean
+}
+
 export function NativeChatMarkdown({
   className,
+  visualMessageId,
+  streaming = false,
+  content,
   ...props
-}: ComponentProps<typeof CommentMarkdown>): React.JSX.Element {
-  return <CommentMarkdown {...props} className={cn('native-chat-markdown', className)} />
+}: NativeChatMarkdownProps): React.JSX.Element {
+  const extension = useNativeChatVisualMarkdownExtension(visualMessageId)
+  return (
+    <CommentMarkdown
+      {...props}
+      content={
+        extension && streaming ? withoutPendingNativeChatVisualDirectiveTail(content) : content
+      }
+      extension={extension}
+      className={cn('native-chat-markdown', className)}
+    />
+  )
 }
diff --git a/src/renderer/src/components/native-chat/NativeChatMarkdown.visual.test.tsx b/src/renderer/src/components/native-chat/NativeChatMarkdown.visual.test.tsx
new file mode 100644
index 000000000000..c0414b00e7e8
--- /dev/null
+++ b/src/renderer/src/components/native-chat/NativeChatMarkdown.visual.test.tsx
@@ -0,0 +1,173 @@
+// @vitest-environment happy-dom
+
+import '@testing-library/jest-dom/vitest'
+
+import { cleanup, render, waitFor } from '@testing-library/react'
+import type { ReactNode } from 'react'
+import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest'
+
+const callRuntimeRpc = vi.fn()
+vi.mock('@/runtime/runtime-rpc-client', () => ({
+  callRuntimeRpc: (...args: unknown[]) => callRuntimeRpc(...args)
+}))
+
+import { NativeChatMarkdown } from './NativeChatMarkdown'
+import { MessageRow } from './NativeChatMessageRow'
+import {
+  NativeChatVisualOwnerContext,
+  type NativeChatVisualOwner
+} from './native-chat-visual-owner'
+import { clearNativeChatVisualCacheForTests } from './native-chat-visual-read-client'
+import { TooltipProvider } from '@/components/ui/tooltip'
+import { useAppStore } from '@/store'
+import { getDefaultSettings } from '../../../../shared/constants'
+
+const owner: NativeChatVisualOwner = {
+  target: { kind: 'local' },
+  sessionId: 'session-alpha',
+  tabId: 'tab-1',
+  worktreeId: 'wt-1'
+}
+const LINE = '::orca-visual{file="usage.html" title="Usage"}'
+
+function withOwner(children: ReactNode, value: NativeChatVisualOwner | null = owner): ReactNode {
+  return (
+    <TooltipProvider>
+      <NativeChatVisualOwnerContext.Provider value={value}>
+        {children}
+      </NativeChatVisualOwnerContext.Provider>
+    </TooltipProvider>
+  )
+}
+
+// The transcript mounts a visual once it scrolls near; here every visual is in view at once.
+class InViewObserver {
+  constructor(private readonly callback: (entries: Partial<IntersectionObserverEntry>[]) => void) {}
+  observe(target: Element): void {
+    this.callback([{ target, isIntersecting: true }])
+  }
+  unobserve(): void {}
+  disconnect(): void {}
+}
+
+beforeEach(() => {
+  vi.stubGlobal('IntersectionObserver', InViewObserver)
+  clearNativeChatVisualCacheForTests()
+  callRuntimeRpc.mockReset()
+  callRuntimeRpc.mockResolvedValue({ ok: true, revision: 'r1', sizeBytes: 9, html: '<p>v</p>' })
+})
+
+afterEach(() => {
+  cleanup()
+  vi.unstubAllGlobals()
+})
+
+describe('NativeChatMarkdown visuals', () => {
+  it('still renders an existing reply after inline visuals are turned off', async () => {
+    const settings = useAppStore.getState().settings
+    useAppStore.setState({
+      settings: { ...getDefaultSettings('/tmp'), nativeChatInlineVisuals: false }
+    })
+    try {
+      const { container } = render(
+        withOwner(<NativeChatMarkdown content={LINE} visualMessageId="m1" />)
+      )
+      await waitFor(() => expect(container.querySelector('iframe')).not.toBeNull())
+      expect(container).not.toHaveTextContent('::orca-visual')
+    } finally {
+      useAppStore.setState({ settings })
+    }
+  })
+
+  it('holds back an unfinished directive at the end of a streaming reply', () => {
+    const { container } = render(
+      withOwner(
+        <NativeChatMarkdown
+          content={'Here it is:\n::orca-visual{file="usa'}
+          visualMessageId="m1"
+          streaming
+        />
+      )
+    )
+    expect(container).toHaveTextContent('Here it is:')
+    expect(container).not.toHaveTextContent('::orca-visual')
+  })
+
+  it('shows unfinished syntax as text once the reply is no longer streaming', () => {
+    const { container } = render(
+      withOwner(
+        <NativeChatMarkdown content={'Here it is:\n::orca-visual{file="usa'} visualMessageId="m1" />
+      )
+    )
+    expect(container).toHaveTextContent('::orca-visual{file="usa')
+  })
+
+  it('keeps a mounted visual frame while the rest of the reply streams in', async () => {
+    const { container, rerender } = render(
+      withOwner(
+        <NativeChatMarkdown content={`Intro\n\n${LINE}\n\nMore`} visualMessageId="m1" streaming />
+      )
+    )
+    await waitFor(() => expect(container.querySelector('iframe')).not.toBeNull())
+    const frame = container.querySelector('iframe')
+    rerender(
+      withOwner(
+        <NativeChatMarkdown
+          content={`Intro\n\n${LINE}\n\nMore text arriving now`}
+          visualMessageId="m1"
+          streaming
+        />
+      )
+    )
+    expect(container.querySelector('iframe')).toBe(frame)
+    expect(container).toHaveTextContent('More text arriving now')
+    expect(callRuntimeRpc).toHaveBeenCalledTimes(1)
+  })
+
+  it('shows one muted line when the host refuses the file', async () => {
+    callRuntimeRpc.mockResolvedValue({ ok: false, error: 'outside_folder' })
+    const { container } = render(
+      withOwner(<NativeChatMarkdown content={LINE} visualMessageId="m1" />)
+    )
+    await waitFor(() => expect(container).toHaveTextContent('Visualization unavailable'))
+    expect(container.querySelector('iframe')).toBeNull()
+  })
+
+  it('leaves the line as text where visuals do not apply', () => {
+    const noMessage = render(withOwner(<NativeChatMarkdown content={LINE} />))
+    expect(noMessage.container).toHaveTextContent('::orca-visual')
+    cleanup()
+    const noOwner = render(
+      withOwner(<NativeChatMarkdown content={LINE} visualMessageId="m1" />, null)
+    )
+    expect(noOwner.container).toHaveTextContent('::orca-visual')
+    expect(callRuntimeRpc).not.toHaveBeenCalled()
+  })
+
+  it('holds the tail of a text row while its turn works, though the row carries no state', () => {
+    const row = (activeTurnIsWorking: boolean, trailingRun = true) =>
+      withOwner(
+        <MessageRow
+          message={{
+            id: 'm1',
+            role: 'assistant',
+            timestamp: 0,
+            source: 'transcript',
+            blocks: [{ type: 'text', text: 'Here it is:\n::orca-visual{file="usa' }]
+          }}
+          expandSignal={false}
+          activeTurnIsWorking={activeTurnIsWorking}
+          trailingRun={trailingRun}
+          onScrollMessageToTop={vi.fn()}
+        />
+      )
+    const { container, rerender } = render(row(true))
+    expect(container).toHaveTextContent('Here it is:')
+    expect(container).not.toHaveTextContent('::orca-visual')
+    rerender(row(false))
+    expect(container).toHaveTextContent('::orca-visual{file="usa')
+    // An earlier row of a still-working turn has stopped growing, so it shows what it says.
+    rerender(row(true, false))
+    expect(container).toHaveTextContent('::orca-visual{file="usa')
+  })
+})
diff --git a/src/renderer/src/components/native-chat/NativeChatMessageList.message-rail-windowing.test.tsx b/src/renderer/src/components/native-chat/NativeChatMessageList.message-rail-windowing.test.tsx
index 7fc08a3036b5..561fd7fa1185 100644
--- a/src/renderer/src/components/native-chat/NativeChatMessageList.message-rail-windowing.test.tsx
+++ b/src/renderer/src/components/native-chat/NativeChatMessageList.message-rail-windowing.test.tsx
@@ -109,7 +109,6 @@ describe('revealing a diff from a turn rollup', () => {
     scrollTranscript(container, 6000)
     expect(screen.getByText('Edited')).toBeInTheDocument()
     scrollTo.mockClear()
-    fireEvent.click(screen.getByRole('button', { name: 'Your messages' }))
     fireEvent.click(screen.getByRole('button', { name: 'Second prompt' }))
     expect(scrollTo.mock.calls).toEqual([
       [{ top: 6000, behavior: 'auto' }],
@@ -164,12 +163,7 @@ describe('jumping to a message from the rail', () => {
     index % 10 === 0 ? userMarker(index) : marker(index)
   )
 
-  /** Open the hover panel through the trigger and click the first prompt. */
   function jumpToFirstPrompt(): void {
-    fireEvent.click(screen.getByRole('button', { name: 'Your messages' }))
-    act(() => {
-      vi.advanceTimersByTime(300)
-    })
     fireEvent.click(screen.getByRole('button', { name: 'prompt-0' }))
     act(() => {
       vi.advanceTimersByTime(300)
diff --git a/src/renderer/src/components/native-chat/NativeChatMessageList.opening-send.test.tsx b/src/renderer/src/components/native-chat/NativeChatMessageList.opening-send.test.tsx
index 6f3270700018..84c3cc4e218b 100644
--- a/src/renderer/src/components/native-chat/NativeChatMessageList.opening-send.test.tsx
+++ b/src/renderer/src/components/native-chat/NativeChatMessageList.opening-send.test.tsx
@@ -15,8 +15,10 @@ import type {
   AgentJournalSubmission,
   AgentJournalTurnScope
 } from '../../../../shared/agent-session-journal-types'
-import type { StructuredAgentSessionOutboxEntry } from '../../../../shared/structured-agent-session-outbox'
-import { projectStructuredAgentSessionMessages } from '../../../../shared/structured-agent-session-message-projection'
+import {
+  projectStructuredAgentSessionMessages,
+  type StructuredAgentSessionOptimisticMessage
+} from '../../../../shared/structured-agent-session-message-projection'
 import { selectStructuredAgentSettledTurns } from '../../../../shared/structured-agent-session-turn-timing'
 import { NativeChatMessageList } from './NativeChatMessageList'
 import { installNativeChatMessageListTestViewport } from './native-chat-message-list-test-viewport'
@@ -103,27 +105,25 @@ const FIRST_TURN_PROVIDER_KEY = 'codex:thread:turn-first:0'
 const inFirstTurn: AgentJournalTurnScope = { kind: 'turn', turnItemId: 'turn-first' }
 
 /** This client's own send the host has not recorded yet: its lane still runs the first handover. */
-const unrecorded = (clientMessageId: string, text: string): StructuredAgentSessionOutboxEntry => ({
+const unrecorded = (
+  clientMessageId: string,
+  text: string
+): StructuredAgentSessionOptimisticMessage => ({
   clientMessageId,
-  sessionId: 'session-1',
   body: { kind: 'message', role: 'user', blocks: [{ type: 'text', text }] },
-  previewUris: [],
-  state: 'dispatching',
-  queuedAt: NOW + 100,
-  lastAttemptAt: NOW + 100,
-  retryAfterUnknownSubmittedAt: null
+  queuedAt: NOW + 100
 })
 
 function frame(
   items: AgentJournalRenderItem[],
   submissions: AgentJournalSubmission[],
-  outbox: StructuredAgentSessionOutboxEntry[],
+  optimistic: StructuredAgentSessionOptimisticMessage[],
   stopping = false
 ): React.JSX.Element {
   return (
     <NativeChatMessageList
       session={{
-        messages: projectStructuredAgentSessionMessages(items, outbox, submissions, {
+        messages: projectStructuredAgentSessionMessages(items, optimistic, submissions, {
           rejectedInPlace: true
         }),
         status: 'ready',
@@ -209,7 +209,7 @@ describe('a message sent while the turn ahead is still opening', () => {
       ...agentSessionFailureWords(agentSessionFailureFact('cancelled'), { surface: 'rejection' })
     })
     view.rerender(frame(queued, [...submissions, withdrawn], [], true))
-    const stopRow = screen.getByText('Stopped before the agent started')
+    const stopRow = screen.getByText('Stopped manually')
     expect(follows(screen.getByText('B'), liveStatus())).toBe(true)
     expect(follows(stopRow, screen.getByText('B'))).toBe(true)
     expect(follows(liveActivity(), stopRow)).toBe(true)
@@ -221,10 +221,9 @@ describe('a message sent while the turn ahead is still opening', () => {
     const view = render(frame(items, submissions, [unrecorded('b', 'B')], true))
     waitsAtTheTail('B')
 
-    const typedWhileStopping: StructuredAgentSessionOutboxEntry = {
+    const typedWhileStopping: StructuredAgentSessionOptimisticMessage = {
       ...unrecorded('c', 'C'),
       queuedAt: NOW + 300,
-      lastAttemptAt: NOW + 300,
       sentWhileStopping: true
     }
     view.rerender(frame(items, submissions, [unrecorded('b', 'B'), typedWhileStopping], true))
@@ -238,7 +237,7 @@ describe('a message sent while the turn ahead is still opening', () => {
     steps: [
       AgentJournalRenderItem[],
       AgentJournalSubmission[],
-      StructuredAgentSessionOutboxEntry[]
+      StructuredAgentSessionOptimisticMessage[]
     ][]
   ): void {
     const view = render(<div />)
@@ -312,22 +311,4 @@ describe('a message sent while the turn ahead is still opening', () => {
       [steered, [warm, echoed(first), echoed(handedOver)], []]
     ])
   })
-
-  // The host holds nothing for a send only the user's Retry sends again, so it stays where it is.
-  it.each([
-    ['unconfirmed', { state: 'unconfirmed' as const, retryAfterUnknownSubmittedAt: NOW - 50_000 }],
-    ['outlived by a Stop', { state: 'queued' as const, outlivedStop: true as const }]
-  ])('does not move a send waiting on Retry (%s) behind the opening turn', (_, retry) => {
-    const { items, submissions } = openingFirst()
-    const awaitingRetry: StructuredAgentSessionOutboxEntry = {
-      ...unrecorded('c', 'C'),
-      queuedAt: NOW - 50_000,
-      lastAttemptAt: NOW - 50_000,
-      ...retry
-    }
-
-    render(frame(items, submissions, [awaitingRetry]))
-
-    expect(follows(liveActivity(), screen.getByText('C'))).toBe(true)
-  })
 })
diff --git a/src/renderer/src/components/native-chat/NativeChatMessageList.rail-history-jump.test.tsx b/src/renderer/src/components/native-chat/NativeChatMessageList.rail-history-jump.test.tsx
index 492269cc82ea..f849085733e5 100644
--- a/src/renderer/src/components/native-chat/NativeChatMessageList.rail-history-jump.test.tsx
+++ b/src/renderer/src/components/native-chat/NativeChatMessageList.rail-history-jump.test.tsx
@@ -277,8 +277,6 @@ describe('jumping from the rail while following the end', () => {
     expect(distanceFromBottom()).toBe(0)
     expect(screen.queryByText(prompt) !== null).toBe(loaded)
 
-    fireEvent.click(screen.getByRole('button', { name: 'Your messages' }))
-    await frame()
     fireEvent.click(screen.getByRole('button', { name: prompt }))
     await settle(60)
 
@@ -302,13 +300,11 @@ describe('jumping from the rail while following the end', () => {
     render(<PagedTranscript holdPage={holdPage} />)
     await settle(10)
 
-    fireEvent.click(screen.getByRole('button', { name: 'Your messages' }))
-    await frame()
     fireEvent.click(screen.getByRole('button', { name: 'prompt-5' }))
     await frame()
     // Anti-vacuous: the older page is in flight.
     expect(releaseFirstPage).not.toBeNull()
-    // The list stays open while the pick pages in, so the reader picks again in place.
+    // The reader picks again while the first pick is still paging in.
     fireEvent.click(screen.getByRole('button', { name: 'prompt-45' }))
     await settle(40)
     act(() => releaseFirstPage?.())
@@ -341,27 +337,23 @@ describe('jumping from the rail while following the end', () => {
   }
 
   async function pickUnloadedWhilePaging(prompt: string): Promise<void> {
-    fireEvent.click(screen.getByRole('button', { name: 'Your messages' }))
-    await frame()
     fireEvent.click(screen.getByRole('button', { name: prompt }))
     await frame()
   }
 
-  it('keeps the list open with the pick marked busy until its history lands', async () => {
+  it('marks the pick busy until its history lands', async () => {
     const pages = holdFirstPage()
     render(<PagedTranscript holdPage={pages.holdPage} />)
     await settle(10)
     await pickUnloadedWhilePaging('prompt-5')
     expect(pages.asked()).toBe(1)
 
-    // The failure mode: picking closed the list, so the busy item was never seen.
-    expect(screen.getByRole('dialog')).toBeTruthy()
     expect(screen.getByRole('button', { name: 'prompt-5' }).getAttribute('aria-busy')).toBe('true')
 
     pages.release()
     await settle(60)
 
-    expect(screen.queryByRole('dialog')).toBeNull()
+    expect(screen.getByRole('button', { name: 'prompt-5' }).getAttribute('aria-busy')).toBeNull()
     expect(Math.abs(rowOffsetFromViewportTop('prompt-5'))).toBeLessThanOrEqual(2)
   })
 
@@ -382,8 +374,8 @@ describe('jumping from the rail while following the end', () => {
 
     input()
     await frame()
-    // Abandoning the jump settles the pick: nothing is left pulsing in an open list.
-    expect(screen.queryByRole('dialog')).toBeNull()
+    // Abandoning the jump settles the pick: nothing is left pulsing on the rail.
+    expect(screen.getByRole('button', { name: 'prompt-5' }).getAttribute('aria-busy')).toBeNull()
     pages.release()
     await settle(60)
 
@@ -401,7 +393,7 @@ describe('jumping from the rail while following the end', () => {
     expect(pages.asked()).toBe(1)
 
     // The rail forwards its wheel to the transcript: the reader is scrolling.
-    fireEvent.wheel(screen.getByRole('button', { name: 'Your messages' }), { deltaY: -40 })
+    fireEvent.wheel(screen.getByRole('toolbar', { name: 'Your messages' }), { deltaY: -40 })
     await frame()
     // Anti-vacuous: the wheel moved the transcript.
     expect(distanceFromBottom()).toBe(40)
@@ -413,22 +405,6 @@ describe('jumping from the rail while following the end', () => {
     expect(distanceFromBottom()).toBe(40)
   })
 
-  it('keeps paging when the reader wheels the open message list', async () => {
-    const pages = holdFirstPage()
-    render(<PagedTranscript holdPage={pages.holdPage} />)
-    await settle(10)
-    await pickUnloadedWhilePaging('prompt-5')
-    expect(pages.asked()).toBe(1)
-
-    // The list scrolls itself; the transcript is not being read.
-    fireEvent.wheel(screen.getByRole('dialog'), { deltaY: -40 })
-    pages.release()
-    await settle(60)
-
-    expect(pages.asked()).toBeGreaterThan(1)
-    expect(Math.abs(rowOffsetFromViewportTop('prompt-5'))).toBeLessThanOrEqual(2)
-  })
-
   it('stays at the latest message when "Jump to latest" is pressed while the jump pages', async () => {
     const pages = holdFirstPage()
     render(<PagedTranscript holdPage={pages.holdPage} />)
@@ -466,8 +442,6 @@ describe('jumping from the rail while following the end', () => {
     render(<PagedTranscript />)
     await settle(10)
 
-    fireEvent.click(screen.getByRole('button', { name: 'Your messages' }))
-    await frame()
     fireEvent.click(screen.getByRole('button', { name: 'prompt-45' }))
     await frame()
 
@@ -556,7 +530,6 @@ describe('revealing a diff while a rail jump pages', () => {
     vi.spyOn(HTMLElement.prototype, 'scrollTo').mockImplementation(scrollTo)
     const { container } = render(<DiffTranscript holdPage={holdPage} />)
 
-    fireEvent.click(screen.getByRole('button', { name: 'Your messages' }))
     fireEvent.click(screen.getByRole('button', { name: 'Oldest prompt' }))
     // Anti-vacuous: the older page is in flight.
     expect(holdPage).toHaveBeenCalledTimes(1)
diff --git a/src/renderer/src/components/native-chat/NativeChatMessageList.reader-navigation.test.tsx b/src/renderer/src/components/native-chat/NativeChatMessageList.reader-navigation.test.tsx
index 91ef38b065a9..ebf753e19561 100644
--- a/src/renderer/src/components/native-chat/NativeChatMessageList.reader-navigation.test.tsx
+++ b/src/renderer/src/components/native-chat/NativeChatMessageList.reader-navigation.test.tsx
@@ -309,6 +309,8 @@ describe('reader navigation', () => {
       const composer = {
         focus,
         insertTypedText,
+        acceptsText: () => true,
+        appendText: vi.fn(),
         handlePasteEvent: vi.fn(),
         pasteFromClipboard: vi.fn(),
         contains: () => false
diff --git a/src/renderer/src/components/native-chat/NativeChatMessageList.stopped-before-start.test.tsx b/src/renderer/src/components/native-chat/NativeChatMessageList.stopped-before-start.test.tsx
index 1e81cceb83b7..b3a263bc8ef3 100644
--- a/src/renderer/src/components/native-chat/NativeChatMessageList.stopped-before-start.test.tsx
+++ b/src/renderer/src/components/native-chat/NativeChatMessageList.stopped-before-start.test.tsx
@@ -27,7 +27,7 @@ beforeAll(() => {
 afterAll(() => restoreViewport())
 afterEach(cleanup)
 
-const STOP_ROW = 'Stopped before the agent started'
+const STOP_ROW = 'Stopped manually'
 const THREAD: AgentJournalTurnScope = { kind: 'thread' }
 let sequence = 0
 
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 e85b8209ed80..459c810e96a3 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
@@ -10,6 +10,7 @@ import type { NativeChatMessage } from '../../../../shared/native-chat-types'
 import { NativeChatMessageList } from './NativeChatMessageList'
 import { projectNativeChatTaskListFrames } from './native-chat-task-list-frames'
 import { installNativeChatMessageListTestViewport } from './native-chat-message-list-test-viewport'
+import { openToolRunMembers } from './native-chat-tool-run-members-test-support'
 
 let restoreViewport = (): void => {}
 beforeAll(() => {
@@ -180,6 +181,7 @@ describe('live Codex checklist frames', () => {
     }
     render(transcript([frame(1, 'pending'), command]))
     expect(screen.getByRole('button', { name: 'Tasks 0 of 1 tasks completed' })).toBeInTheDocument()
+    openToolRunMembers()
     expect(screen.getByText('Verification failed', { selector: 'pre' })).toHaveClass(
       'text-destructive'
     )
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 bff8c8b623c9..a0b2efd5d224 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
@@ -22,6 +22,7 @@ vi.mock('../../../../shared/native-chat-edit-normalize', async (importOriginal)
   }
 })
 const { NativeChatMessageList } = await import('./NativeChatMessageList')
+const { openToolRunMembers } = await import('./native-chat-tool-run-members-test-support')
 let restoreViewport = (): void => {}
 beforeAll(() => {
   restoreViewport = installNativeChatMessageListTestViewport()
@@ -72,6 +73,7 @@ it('does not re-diff expanded historical edits when an unrelated answer streams'
   })
   const { rerender } = render(<Transcript items={[...items, tail]} />)
   expect(cost.edits).toBe(20)
+  openToolRunMembers()
   cost.edits = 0
   cost.milliseconds = 0
   for (let frame = 0; frame < 20; frame += 1) {
diff --git a/src/renderer/src/components/native-chat/NativeChatMessageList.tsx b/src/renderer/src/components/native-chat/NativeChatMessageList.tsx
index a7aad33bec9f..599a21b010a0 100644
--- a/src/renderer/src/components/native-chat/NativeChatMessageList.tsx
+++ b/src/renderer/src/components/native-chat/NativeChatMessageList.tsx
@@ -4,7 +4,7 @@ import {
 } from './native-chat-appearance-style'
 import { NativeChatJumpToLatest } from './NativeChatJumpToLatest'
 import { useNativeChatRowTypography } from './use-native-chat-row-typography'
-import { useCallback, useLayoutEffect, useMemo, useRef, useState } from 'react'
+import { useCallback, useMemo, useRef, useState } from 'react'
 import type { CommentMarkdownLinkClickHandler } from '@/components/sidebar/CommentMarkdown'
 import { translate } from '@/i18n/i18n'
 import type { NativeChatLiveSession } from './use-native-chat-live-session'
@@ -47,6 +47,7 @@ import type {
   NativeChatRailOutlineEntry
 } from './native-chat-message-rail-items'
 import { useNativeChatRailHistoryJump } from './use-native-chat-rail-history-jump'
+import { useNativeChatRailJumpLanding } from './use-native-chat-rail-jump-landing'
 import { useNativeChatReaderScrollInput } from './native-chat-reader-scroll-input'
 import { useNativeChatMessageListHandle } from './use-native-chat-reveal-latest'
 
@@ -241,6 +242,7 @@ export function NativeChatMessageList({
       showsTailRow: tailRow !== null,
       isVisible,
       alignToViewportTop: transcriptWindow.alignToViewportTop,
+      isAlignPending: transcriptWindow.isAlignPending,
       scrollToEnd: transcriptWindow.scrollToEnd,
       restoreScrollOffset: transcriptWindow.restoreScrollOffset,
       consumeProgrammaticScroll: transcriptWindow.consumeProgrammaticScroll,
@@ -257,10 +259,10 @@ export function NativeChatMessageList({
   const rail = useNativeChatMessageRail({
     scrollRef,
     slots,
+    turnRows,
     virtualItems: transcriptWindow.virtualItems,
     outline: railOutline
   })
-  const servicedRailJumpRef = useRef(0)
   const requestRailJump = useCallback((item: NativeChatRailItem) => {
     navigationSequence.current += 1
     setNavigationRequest({
@@ -314,29 +316,17 @@ export function NativeChatMessageList({
   useNativeChatMessageListHandle(ref, jumpToLatest)
   const readerScrollInput = useNativeChatReaderScrollInput(scrollRef, {
     onReaderScroll: beginNavigation,
+    onTakeScroll: transcriptWindow.cancelAlign,
     onLeaveEnd: readerLeavesEnd
   })
-  // Pinning the target mounts it in the same commit, so the row exists by the time
-  // layout runs. Routed through `scrollMessageToTop` rather than the virtualizer
-  // because that is what releases the bottom pin — without it the next streamed
-  // token snaps the reader straight back down.
-  //
-  // Serviced once per request, then released. `slots` takes a new identity on
-  // every render, so an effect that merely depended on it would re-scroll to this
-  // row forever; and a request left standing would keep its pin, which outranks
-  // the diff reveal that shares it.
-  useLayoutEffect(() => {
-    if (railJump === null || servicedRailJumpRef.current === railJump.requestId) {
-      return
-    }
-    servicedRailJumpRef.current = railJump.requestId
-    const index = nativeChatSlotIndexOf(slots, railJump.messageId)
-    const row = scrollRef.current?.querySelector<HTMLElement>(`[data-index="${index}"]`)
-    if (row) {
-      scrollMessageToTop(row)
-    }
-    setNavigationRequest(null)
-  }, [railJump, scrollMessageToTop, slots])
+  useNativeChatRailJumpLanding({
+    railJump,
+    slots,
+    scrollRef,
+    scrollMessageToTop,
+    onActivate: rail.onActivate,
+    release: setNavigationRequest
+  })
 
   const rowContext = useMemo<NativeChatTranscriptRowContext>(
     () => ({
diff --git a/src/renderer/src/components/native-chat/NativeChatMessageList.unsent-message.test.tsx b/src/renderer/src/components/native-chat/NativeChatMessageList.unsent-message.test.tsx
index 28affc5512d5..9b2e1dc8ef92 100644
--- a/src/renderer/src/components/native-chat/NativeChatMessageList.unsent-message.test.tsx
+++ b/src/renderer/src/components/native-chat/NativeChatMessageList.unsent-message.test.tsx
@@ -16,10 +16,6 @@ import type {
 } from '../../../../shared/agent-session-journal-types'
 import { agentJournalSubmissionKey } from '../../../../shared/agent-session-journal-item-key'
 import type { NativeChatSettledTurns } from '../../../../shared/native-chat-turn-status'
-import {
-  createStructuredAgentSessionOutboxEntry,
-  type StructuredAgentSessionOutboxEntry
-} from '../../../../shared/structured-agent-session-outbox'
 import { DISPATCH_REJECTED_HOST_RESTARTED } from '../../../../shared/structured-agent-session-dispatch-rejection'
 import { NativeChatMessageList } from './NativeChatMessageList'
 import { structuredAgentSessionDeliveryNotices } from './structured-agent-session-delivery-notices'
@@ -107,56 +103,6 @@ function submission(
   }
 }
 
-function unsentEntry(kind: 'held' | 'rejected'): StructuredAgentSessionOutboxEntry {
-  const entry = createStructuredAgentSessionOutboxEntry({
-    clientMessageId: 'held',
-    sessionId: 'session-1',
-    text: 'HELD PROMPT',
-    attachments: [],
-    queuedAt: 500
-  })
-  return kind === 'held'
-    ? {
-        ...entry,
-        lastAttemptAt: 500,
-        lastFailure: { kind: 'refused', code: 'agent_session_journal_unreadable' }
-      }
-    : { ...entry, state: 'rejected', lastFailure: { kind: 'rejected', reason: null } }
-}
-
-function list(phase: Phase, scoped: boolean, outbox: StructuredAgentSessionOutboxEntry[]) {
-  const items = journal(phase, scoped)
-  const submissions = [
-    submission('seed', 'accepted'),
-    submission('new', phase === 'done' ? 'accepted' : 'pending')
-  ]
-  const settledTurns: NativeChatSettledTurns = new Map([
-    [SEED, { startedAt: 1, workedSeconds: 3 }],
-    ...(phase === 'done' ? [[NEW, { startedAt: 2, workedSeconds: 5 }] as const] : [])
-  ])
-  return (
-    <NativeChatMessageList
-      session={{
-        messages: projectStructuredAgentSessionMessages(items, outbox, submissions),
-        status: phase === 'done' ? 'ready' : 'working',
-        sessionId: 'session-1',
-        agent: 'claude',
-        hasMore: false,
-        loadingEarlier: false,
-        olderHistoryGeneration: 0,
-        loadEarlier: vi.fn(),
-        readPhase: 'ready'
-      }}
-      journalItems={items}
-      journalSubmissions={submissions}
-      isWorking={phase !== 'done'}
-      workingStartedAt={phase === 'done' ? null : Date.now() - 1500}
-      settledTurns={settledTurns}
-      expandSignal={false}
-    />
-  )
-}
-
 /** The drawn sequence of the prompts, bars and live activity line, top to bottom. */
 function drawn(container: HTMLElement): string[] {
   const out: string[] = []
@@ -174,48 +120,6 @@ function drawn(container: HTMLElement): string[] {
   return out
 }
 
-describe.each([
-  ['held for its Retry', 'held'],
-  ['rejected', 'rejected']
-] as const)('a message %s, below a newer turn', (_label, kind) => {
-  it.each([
-    ['states each row turn', true],
-    ['states no turn scope', false]
-  ])(
-    'keeps the newer turn bar with that turn while it runs and once done (host %s)',
-    (_host, scoped) => {
-      const outbox = [unsentEntry(kind)]
-      const { container, rerender } = render(list('in flight', scoped, outbox))
-      expect(drawn(container)).toEqual([
-        'SEED PROMPT',
-        'WORKED',
-        'NEW PROMPT',
-        'WORKING',
-        'ACTIVITY',
-        'HELD PROMPT'
-      ])
-      rerender(list('running', scoped, outbox))
-      expect(drawn(container)).toEqual([
-        'SEED PROMPT',
-        'WORKED',
-        'NEW PROMPT',
-        'WORKING',
-        'ACTIVITY',
-        'HELD PROMPT'
-      ])
-      rerender(list('done', scoped, outbox))
-      expect(drawn(container)).toEqual([
-        'SEED PROMPT',
-        'WORKED',
-        'NEW PROMPT',
-        'WORKED',
-        'HELD PROMPT'
-      ])
-      expect(container.textContent).toContain('Worked for 5s')
-    }
-  )
-})
-
 describe('a message the host rejected after a crash, with no outbox entry left', () => {
   const LOST = agentJournalSubmissionKey('lost')
 
@@ -260,14 +164,12 @@ describe('a message the host rejected after a crash, with no outbox entry left',
         }}
         journalItems={items}
         journalSubmissions={submissions}
-        deliveryNotices={structuredAgentSessionDeliveryNotices(
-          [],
-          'Claude',
-          vi.fn(),
+        deliveryNotices={structuredAgentSessionDeliveryNotices({
+          pending: [],
           submissions,
-          [],
-          new Set()
-        )}
+          agentName: 'Claude',
+          startFailures: []
+        })}
         isWorking={phase !== 'done'}
         workingStartedAt={phase === 'done' ? null : Date.now() - 1500}
         settledTurns={settledTurns}
diff --git a/src/renderer/src/components/native-chat/NativeChatMessageRail.test.tsx b/src/renderer/src/components/native-chat/NativeChatMessageRail.test.tsx
index fdcac435cd8e..d0b027254ee4 100644
--- a/src/renderer/src/components/native-chat/NativeChatMessageRail.test.tsx
+++ b/src/renderer/src/components/native-chat/NativeChatMessageRail.test.tsx
@@ -1,258 +1,145 @@
 // @vitest-environment happy-dom
-import { act, cleanup, fireEvent, render, screen, waitFor } from '@testing-library/react'
-import { createRef, useImperativeHandle, useState } from 'react'
+import { cleanup, fireEvent, render, screen, waitFor } from '@testing-library/react'
 import userEvent from '@testing-library/user-event'
-import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest'
+import { useEffect, useState } from 'react'
+import { afterEach, describe, expect, it, vi } from 'vitest'
 import { NativeChatMessageRail } from './NativeChatMessageRail'
+import { useNativeChatMessageRail } from './use-native-chat-message-rail'
 
 afterEach(cleanup)
 
-const items = Array.from({ length: 3 }, (_, index) => ({
-  id: `prompt-${index}`,
-  text: `Prompt ${index}`,
-  slotIndex: index,
-  hasImages: false
-}))
-const overflowItems = Array.from({ length: 20 }, (_, index) => ({
-  id: `overflow-prompt-${index}`,
-  text: `Overflow prompt ${index}`,
-  slotIndex: index,
-  hasImages: false
-}))
-
-function retainClosingPopover(): ReturnType<typeof vi.spyOn> {
-  const getStyle = window.getComputedStyle.bind(window)
-  return vi.spyOn(window, 'getComputedStyle').mockImplementation((element, ...args) => {
-    const style = getStyle(element, ...args)
-    if (element.getAttribute('data-slot') !== 'popover-content') {
-      return style
-    }
-    return new Proxy(style, {
-      get: (target, property) =>
-        property === 'animationName'
-          ? element.getAttribute('data-state') === 'closed'
-            ? 'exit'
-            : 'enter'
-          : // oxlint-disable-next-line anti-slop/no-reflect-get -- Proxy trap passes CSSStyleDeclaration properties through unchanged.
-            Reflect.get(target, property)
-    })
+const NO_SLOTS: never[] = []
+const NO_ROWS = { messages: [], turnKeys: [] }
+
+/** The rail over the real hook, on a thread known only from the host's outline.
+ *  The first two prompts have replies; past 20 the ticks are sampled. */
+function Rail({
+  count = 3,
+  activeIndex,
+  scroller,
+  ...rest
+}: Partial<React.ComponentProps<typeof NativeChatMessageRail>> & {
+  count?: number
+  activeIndex?: number
+  scroller?: HTMLDivElement
+}): React.JSX.Element {
+  const [scrollRef] = useState(() => ({ current: scroller ?? document.createElement('div') }))
+  const [outline] = useState(() =>
+    Array.from({ length: count }, (_, index) => ({
+      id: `prompt-${index}`,
+      text: `Prompt ${index}`,
+      hasImages: false,
+      reply: index < 2 ? `Reply ${index}` : undefined
+    }))
+  )
+  const rail = useNativeChatMessageRail({
+    scrollRef,
+    slots: NO_SLOTS,
+    turnRows: NO_ROWS,
+    virtualItems: NO_SLOTS,
+    outline
   })
-}
-
-const unloadedItems = [
-  { id: 'unloaded-prompt', text: 'Unloaded prompt', slotIndex: null, hasImages: false },
-  ...items
-]
-
-/** Stands in for the transcript: an unloaded pick stays pending until settled. */
-function PagingRail({ ref }: { ref?: React.Ref<{ settle: () => void }> }): React.JSX.Element {
-  const [pendingId, setPendingId] = useState<string | null>(null)
-  useImperativeHandle(ref, () => ({ settle: () => setPendingId(null) }), [])
+  const { onActivate } = rail
+  useEffect(() => {
+    if (activeIndex !== undefined) {
+      onActivate(`prompt-${activeIndex}`)
+    }
+  }, [activeIndex, onActivate])
   return (
-    <NativeChatMessageRail
-      rail={{ items: unloadedItems, ticks: unloadedItems, activeId: null, visible: true }}
-      scrollRef={{ current: document.createElement('div') }}
-      onSelect={(item) => setPendingId(item.slotIndex === null ? item.id : null)}
-      pendingId={pendingId}
-    />
+    <>
+      <input aria-label="Composer" />
+      <NativeChatMessageRail rail={rail} scrollRef={scrollRef} onSelect={vi.fn()} {...rest} />
+    </>
   )
 }
 
-describe('message rail interaction', () => {
-  it('keeps the list open on an unloaded pick until its jump settles', async () => {
-    const user = userEvent.setup()
-    const paging = createRef<{ settle: () => void }>()
-    render(<PagingRail ref={paging} />)
-    await user.hover(screen.getByRole('button', { name: 'Your messages' }))
-    await screen.findByRole('dialog')
+const tick = (name: string): HTMLElement => screen.getByRole('button', { name })
+const preview = (): HTMLElement | null =>
+  document.querySelector<HTMLElement>('[data-slot="hover-card-content"]')
 
-    await user.click(screen.getByRole('button', { name: 'Unloaded prompt' }))
-    expect(screen.getByRole('dialog')).toBeTruthy()
-    expect(screen.getByRole('button', { name: 'Unloaded prompt' }).getAttribute('aria-busy')).toBe(
-      'true'
-    )
-
-    act(() => paging.current?.settle())
-    await waitFor(() => expect(screen.queryByRole('dialog')).toBeNull())
+describe('message rail interaction', () => {
+  it('previews only the hovered tick: its message and the reply to it', async () => {
+    render(<Rail />)
+    fireEvent.pointerEnter(tick('Prompt 1'), { pointerType: 'mouse' })
+    await waitFor(() => expect(preview()).not.toBeNull())
+    expect(preview()?.textContent).toBe('Prompt 1Reply 1')
+
+    fireEvent.pointerEnter(tick('Prompt 0'), { pointerType: 'mouse' })
+    await waitFor(() => expect(preview()?.textContent).toBe('Prompt 0Reply 0'))
   })
 
-  it('closes a list held for a pending pick on Escape', async () => {
-    const user = userEvent.setup()
-    render(<PagingRail />)
-    await user.hover(screen.getByRole('button', { name: 'Your messages' }))
-    await screen.findByRole('dialog')
-    await user.click(screen.getByRole('button', { name: 'Unloaded prompt' }))
-    expect(screen.getByRole('dialog')).toBeTruthy()
-
-    await user.keyboard('{Escape}')
-    await waitFor(() => expect(screen.queryByRole('dialog')).toBeNull())
+  it('previews the message alone while the agent has not replied', async () => {
+    render(<Rail />)
+    fireEvent.pointerEnter(tick('Prompt 2'), { pointerType: 'mouse' })
+    await waitFor(() => expect(preview()).not.toBeNull())
+    expect(preview()?.textContent).toBe('Prompt 2')
   })
 
-  it('opens from the keyboard, reaches prompts, jumps, and restores focus', async () => {
-    const user = userEvent.setup()
+  it('jumps to the clicked tick', async () => {
     const select = vi.fn()
-    render(
-      <NativeChatMessageRail
-        rail={{
-          items: overflowItems,
-          ticks: overflowItems,
-          activeId: overflowItems[12].id,
-          visible: true
-        }}
-        scrollRef={{ current: document.createElement('div') }}
-        onSelect={select}
-      />
-    )
-    const trigger = screen.getByRole('button', { name: 'Your messages' })
-    await user.tab()
-    expect(document.activeElement).toBe(trigger)
-    await user.keyboard('{Enter}')
-    await waitFor(() =>
-      expect(document.activeElement).toBe(
-        screen.getByRole('button', { name: 'Overflow prompt 12' })
-      )
-    )
-    await user.keyboard('{Enter}')
-    expect(select).toHaveBeenCalledWith(overflowItems[12])
-    await waitFor(() => expect(document.activeElement).toBe(trigger))
-    expect(screen.queryByRole('dialog')).toBeNull()
-    await user.keyboard('{Enter}')
-    await user.keyboard('{Escape}')
-    await waitFor(() => expect(document.activeElement).toBe(trigger))
-    expect(screen.queryByRole('dialog')).toBeNull()
+    render(<Rail onSelect={select} />)
+    await userEvent.setup().click(tick('Prompt 1'))
+    expect(select).toHaveBeenCalledWith(expect.objectContaining({ id: 'prompt-1' }))
   })
 
-  it('focuses the current prompt when a hover preview becomes interactive', async () => {
-    render(
-      <NativeChatMessageRail
-        rail={{
-          items: overflowItems,
-          ticks: overflowItems,
-          activeId: overflowItems[12].id,
-          visible: true
-        }}
-        scrollRef={{ current: document.createElement('div') }}
-        onSelect={vi.fn()}
-      />
-    )
-    const trigger = screen.getByRole('button', { name: 'Your messages' })
-    fireEvent.pointerEnter(trigger, { pointerType: 'mouse' })
-    await screen.findByRole('dialog')
-    fireEvent.click(trigger)
-    expect(document.activeElement).toBe(screen.getByRole('button', { name: 'Overflow prompt 12' }))
+  it('keeps focus where it was while a hover preview opens and closes', async () => {
+    render(<Rail />)
+    const composer = screen.getByRole('textbox')
+    composer.focus()
+    const rail = screen.getByRole('toolbar', { name: 'Your messages' })
+    fireEvent.pointerEnter(rail, { pointerType: 'mouse' })
+    fireEvent.pointerEnter(tick('Prompt 0'), { pointerType: 'mouse' })
+    await waitFor(() => expect(preview()).not.toBeNull())
+    expect(document.activeElement).toBe(composer)
+    fireEvent.pointerLeave(rail, { pointerType: 'mouse' })
+    await waitFor(() => expect(preview()).toBeNull())
+    expect(document.activeElement).toBe(composer)
   })
 
-  it('focuses the first prompt on direct open when no prompt is current', async () => {
+  it('is one tab stop on the current tick, walked by arrow keys, each previewing itself', async () => {
     const user = userEvent.setup()
-    render(
-      <NativeChatMessageRail
-        rail={{ items: overflowItems, ticks: overflowItems, activeId: null, visible: true }}
-        scrollRef={{ current: document.createElement('div') }}
-        onSelect={vi.fn()}
-      />
-    )
-    const trigger = screen.getByRole('button', { name: 'Your messages' })
-    trigger.focus()
-    await user.keyboard('{Enter}')
-    await waitFor(() =>
-      expect(document.activeElement).toBe(screen.getByRole('button', { name: 'Overflow prompt 0' }))
-    )
-  })
+    const select = vi.fn()
+    render(<Rail activeIndex={1} onSelect={select} />)
+    screen.getByRole('textbox').focus()
+    await user.tab()
+    expect(document.activeElement).toBe(tick('Prompt 1'))
+    await waitFor(() => expect(preview()).not.toBeNull())
+    expect(preview()?.textContent).toBe('Prompt 1Reply 1')
 
-  it('refocuses the current prompt when closed content is reopened before unmount', async () => {
-    const styleSpy = retainClosingPopover()
-    const user = userEvent.setup()
-    try {
-      render(
-        <NativeChatMessageRail
-          rail={{
-            items: overflowItems,
-            ticks: overflowItems,
-            activeId: overflowItems[12].id,
-            visible: true
-          }}
-          scrollRef={{ current: document.createElement('div') }}
-          onSelect={vi.fn()}
-        />
-      )
-      const trigger = screen.getByRole('button', { name: 'Your messages' })
-      trigger.focus()
-      await user.keyboard('{Enter}')
-      await user.keyboard('{Escape}')
-      await waitFor(() =>
-        expect(
-          document.querySelector('[data-slot="popover-content"]')?.getAttribute('data-state')
-        ).toBe('closed')
-      )
+    await user.keyboard('{ArrowUp}')
+    expect(document.activeElement).toBe(tick('Prompt 0'))
+    await waitFor(() => expect(preview()?.textContent).toBe('Prompt 0Reply 0'))
+    await user.keyboard('{End}{Enter}')
+    expect(select).toHaveBeenCalledWith(expect.objectContaining({ id: 'prompt-2' }))
 
-      trigger.focus()
-      fireEvent.click(trigger)
-      await waitFor(() =>
-        expect(document.activeElement).toBe(
-          screen.getByRole('button', { name: 'Overflow prompt 12' })
-        )
-      )
-    } finally {
-      styleSpy.mockRestore()
-    }
+    await user.keyboard('{Escape}')
+    await waitFor(() => expect(preview()).toBeNull())
+    expect(document.activeElement).toBe(tick('Prompt 2'))
+    await user.tab()
+    expect(screen.getByRole('toolbar').contains(document.activeElement)).toBe(false)
   })
 
-  it('preserves interactive focus when the current prompt changes', async () => {
+  // A long thread draws only some ticks; the keyboard still reaches every message,
+  // and the tick it lands on stays drawn while it holds focus.
+  it('walks every message with the arrow keys, sampled onto the rail or not', async () => {
     const user = userEvent.setup()
-    const { rerender } = render(
-      <NativeChatMessageRail
-        rail={{
-          items: overflowItems,
-          ticks: overflowItems,
-          activeId: overflowItems[12].id,
-          visible: true
-        }}
-        scrollRef={{ current: document.createElement('div') }}
-        onSelect={vi.fn()}
-      />
-    )
-    const trigger = screen.getByRole('button', { name: 'Your messages' })
-    trigger.focus()
-    await user.keyboard('{Enter}')
-    const focusedPrompt = screen.getByRole('button', { name: 'Overflow prompt 12' })
-    expect(document.activeElement).toBe(focusedPrompt)
-
-    rerender(
-      <NativeChatMessageRail
-        rail={{
-          items: overflowItems,
-          ticks: overflowItems,
-          activeId: overflowItems[13].id,
-          visible: true
-        }}
-        scrollRef={{ current: document.createElement('div') }}
-        onSelect={vi.fn()}
-      />
-    )
-
-    expect(document.activeElement).toBe(focusedPrompt)
+    render(<Rail count={60} />)
+    // Anti-vacuous: the second message has no tick until the keyboard reaches it.
+    expect(screen.queryByRole('button', { name: 'Prompt 1' })).toBeNull()
+    screen.getByRole('textbox').focus()
+    await user.tab()
+    expect(document.activeElement).toBe(tick('Prompt 0'))
+    await user.keyboard('{ArrowDown}')
+    expect(document.activeElement).toBe(tick('Prompt 1'))
+    await waitFor(() => expect(preview()?.textContent).toBe('Prompt 1Reply 1'))
+    await user.keyboard('{ArrowDown}')
+    expect(document.activeElement).toBe(tick('Prompt 2'))
   })
 
-  it('keeps focus in the transcript while a hover preview opens and closes', async () => {
-    render(
-      <>
-        <input aria-label="Composer" />
-        <NativeChatMessageRail
-          rail={{ items, ticks: items, activeId: null, visible: true }}
-          scrollRef={{ current: document.createElement('div') }}
-          onSelect={vi.fn()}
-        />
-      </>
-    )
-    const composer = screen.getByRole('textbox')
-    composer.focus()
-    const trigger = screen.getByRole('button', { name: 'Your messages' })
-    fireEvent.pointerEnter(trigger, { pointerType: 'mouse' })
-    await screen.findByRole('dialog')
-    expect(document.activeElement).toBe(composer)
-    fireEvent.pointerLeave(trigger, { pointerType: 'mouse' })
-    await waitFor(() => expect(screen.queryByRole('dialog')).toBeNull())
-    expect(document.activeElement).toBe(composer)
+  it('marks a tick whose history is still paging in as busy', () => {
+    render(<Rail pendingId="prompt-0" />)
+    expect(tick('Prompt 0').getAttribute('aria-busy')).toBe('true')
+    expect(tick('Prompt 1').getAttribute('aria-busy')).toBeNull()
   })
 
   it.each([
@@ -262,205 +149,11 @@ describe('message rail interaction', () => {
   ])('forwards wheel delta mode %i', (deltaMode, expected) => {
     const element = document.createElement('div')
     Object.defineProperty(element, 'clientHeight', { value: 400 })
-    render(
-      <NativeChatMessageRail
-        rail={{ items, ticks: items, activeId: null, visible: true }}
-        scrollRef={{ current: element }}
-        onSelect={vi.fn()}
-      />
-    )
-    fireEvent.wheel(screen.getByRole('button', { name: 'Your messages' }), { deltaY: 7, deltaMode })
-    expect(element.scrollTop).toBe(expected)
-  })
-
-  // happy-dom has no layout, so these pin which row the panel scrolls to, not
-  // the resulting offset. The offset itself only exists in a real browser.
-  describe('opening position', () => {
-    const scrolled: Element[] = []
-    let scrollIntoView: ReturnType<typeof vi.spyOn>
-
-    beforeEach(() => {
-      scrolled.length = 0
-      scrollIntoView = vi
-        .spyOn(Element.prototype, 'scrollIntoView')
-        .mockImplementation(function mockScrollIntoView(this: Element) {
-          scrolled.push(this)
-        })
-    })
-    afterEach(() => scrollIntoView.mockRestore())
-
-    it('scrolls the panel to the message the reader is on', async () => {
-      render(
-        <NativeChatMessageRail
-          rail={{ items, ticks: items, activeId: items[2].id, visible: true }}
-          scrollRef={{ current: document.createElement('div') }}
-          onSelect={vi.fn()}
-        />
-      )
-      fireEvent.pointerEnter(screen.getByRole('button', { name: 'Your messages' }), {
-        pointerType: 'mouse'
-      })
-      await screen.findByRole('dialog')
-      expect(scrolled).toEqual([screen.getByRole('button', { name: 'Prompt 2' })])
-      expect(scrollIntoView).toHaveBeenCalledWith({ block: 'nearest' })
-    })
-
-    it('rechecks the current row when messages are inserted before it', async () => {
-      const { rerender } = render(
-        <NativeChatMessageRail
-          rail={{ items, ticks: items, activeId: items[2].id, visible: true }}
-          scrollRef={{ current: document.createElement('div') }}
-          onSelect={vi.fn()}
-        />
-      )
-      fireEvent.pointerEnter(screen.getByRole('button', { name: 'Your messages' }), {
-        pointerType: 'mouse'
-      })
-      await screen.findByRole('dialog')
-      scrolled.length = 0
-
-      const shiftedItems = [
-        { id: 'older-prompt', text: 'Older prompt', slotIndex: 0, hasImages: false },
-        ...items.map((item) => ({ ...item, slotIndex: item.slotIndex + 1 }))
-      ]
-      rerender(
-        <NativeChatMessageRail
-          rail={{ items: shiftedItems, ticks: shiftedItems, activeId: items[2].id, visible: true }}
-          scrollRef={{ current: document.createElement('div') }}
-          onSelect={vi.fn()}
-        />
-      )
-
-      expect(scrolled).toEqual([screen.getByRole('button', { name: 'Prompt 2' })])
-    })
-
-    it('rechecks the current row when the same number of messages is reordered', async () => {
-      const { rerender } = render(
-        <NativeChatMessageRail
-          rail={{ items, ticks: items, activeId: items[2].id, visible: true }}
-          scrollRef={{ current: document.createElement('div') }}
-          onSelect={vi.fn()}
-        />
-      )
-      fireEvent.pointerEnter(screen.getByRole('button', { name: 'Your messages' }), {
-        pointerType: 'mouse'
-      })
-      await screen.findByRole('dialog')
-      scrolled.length = 0
-
-      const reorderedItems = [items[2], items[0], items[1]]
-      rerender(
-        <NativeChatMessageRail
-          rail={{
-            items: reorderedItems,
-            ticks: reorderedItems,
-            activeId: items[2].id,
-            visible: true
-          }}
-          scrollRef={{ current: document.createElement('div') }}
-          onSelect={vi.fn()}
-        />
-      )
-
-      expect(scrolled).toEqual([screen.getByRole('button', { name: 'Prompt 2' })])
-    })
-
-    // Pressing an item focuses it, which turns a hover preview interactive. Scrolling
-    // the lit row into view at that moment moved the list under the pointer, so the
-    // release landed on the list instead of the pressed item and the click was lost.
-    it('does not move the list or focus when a press makes a hover preview interactive', async () => {
-      const user = userEvent.setup()
-      const select = vi.fn()
-      render(
-        <NativeChatMessageRail
-          rail={{
-            items: overflowItems,
-            ticks: overflowItems,
-            activeId: overflowItems[19].id,
-            visible: true
-          }}
-          scrollRef={{ current: document.createElement('div') }}
-          onSelect={select}
-        />
-      )
-      await user.hover(screen.getByRole('button', { name: 'Your messages' }))
-      await screen.findByRole('dialog')
-      // Anti-vacuous: opening revealed the lit row.
-      expect(scrolled).toEqual([screen.getByRole('button', { name: 'Overflow prompt 19' })])
-      scrolled.length = 0
-
-      const older = screen.getByRole('button', { name: 'Overflow prompt 0' })
-      await user.pointer({ keys: '[MouseLeft>]', target: older })
-      expect(scrolled).toEqual([])
-      expect(document.activeElement).toBe(older)
-      await user.pointer({ keys: '[/MouseLeft]', target: older })
-      expect(select).toHaveBeenCalledWith(overflowItems[0])
-    })
-
-    it('does not move the list while a picked message pages in', async () => {
-      const { rerender } = render(
-        <NativeChatMessageRail
-          rail={{ items, ticks: items, activeId: items[2].id, visible: true }}
-          scrollRef={{ current: document.createElement('div') }}
-          onSelect={vi.fn()}
-        />
-      )
-      fireEvent.pointerEnter(screen.getByRole('button', { name: 'Your messages' }), {
-        pointerType: 'mouse'
-      })
-      await screen.findByRole('dialog')
-      // Anti-vacuous: opening revealed the lit row.
-      expect(scrolled).toEqual([screen.getByRole('button', { name: 'Prompt 2' })])
-      scrolled.length = 0
-
-      // A landed page gives every row a new slot while the pick is still pending.
-      const pagedItems = items.map((item) => ({ ...item, slotIndex: item.slotIndex + 5 }))
-      rerender(
-        <NativeChatMessageRail
-          rail={{ items: pagedItems, ticks: pagedItems, activeId: items[2].id, visible: true }}
-          scrollRef={{ current: document.createElement('div') }}
-          onSelect={vi.fn()}
-          pendingId={items[0].id}
-        />
-      )
-
-      expect(scrolled).toEqual([])
-    })
-
-    it('reveals the lit row when the list opens from the keyboard', async () => {
-      const user = userEvent.setup()
-      render(
-        <NativeChatMessageRail
-          rail={{
-            items: overflowItems,
-            ticks: overflowItems,
-            activeId: overflowItems[12].id,
-            visible: true
-          }}
-          scrollRef={{ current: document.createElement('div') }}
-          onSelect={vi.fn()}
-        />
-      )
-      screen.getByRole('button', { name: 'Your messages' }).focus()
-      await user.keyboard('{Enter}')
-      const lit = screen.getByRole('button', { name: 'Overflow prompt 12' })
-      await waitFor(() => expect(document.activeElement).toBe(lit))
-      expect(scrolled).toContain(lit)
-    })
-
-    it('leaves the panel alone when no message is lit', async () => {
-      render(
-        <NativeChatMessageRail
-          rail={{ items, ticks: items, activeId: null, visible: true }}
-          scrollRef={{ current: document.createElement('div') }}
-          onSelect={vi.fn()}
-        />
-      )
-      fireEvent.pointerEnter(screen.getByRole('button', { name: 'Your messages' }), {
-        pointerType: 'mouse'
-      })
-      await screen.findByRole('dialog')
-      expect(scrolled).toEqual([])
+    render(<Rail scroller={element} />)
+    fireEvent.wheel(screen.getByRole('toolbar', { name: 'Your messages' }), {
+      deltaY: 7,
+      deltaMode
     })
+    expect(element.scrollTop).toBe(expected)
   })
 })
diff --git a/src/renderer/src/components/native-chat/NativeChatMessageRail.tsx b/src/renderer/src/components/native-chat/NativeChatMessageRail.tsx
index 945610e4c932..8a8a794ecc44 100644
--- a/src/renderer/src/components/native-chat/NativeChatMessageRail.tsx
+++ b/src/renderer/src/components/native-chat/NativeChatMessageRail.tsx
@@ -1,11 +1,15 @@
 // The rail itself: a column of ticks down the right edge of the transcript, one
-// per user message, with a hover panel that previews them and jumps on click.
+// per user message. Each tick previews its own message and the agent's reply
+// while hovered or focused, and jumps to the message on click.
 
-import { memo, useEffect, useLayoutEffect, useRef, useState } from 'react'
-import { Popover, PopoverContent, PopoverTrigger } from '@/components/ui/popover'
+import { memo, useLayoutEffect, useRef, useState } from 'react'
+import { HoverCard, HoverCardContent, HoverCardTrigger } from '@/components/ui/hover-card'
 import { cn } from '@/lib/utils'
 import { translate } from '@/i18n/i18n'
-import type { NativeChatRailItem } from './native-chat-message-rail-items'
+import {
+  NATIVE_CHAT_RAIL_ROOMY_TICKS,
+  type NativeChatRailItem
+} from './native-chat-message-rail-items'
 import type { NativeChatMessageRailState } from './use-native-chat-message-rail'
 
 const WHEEL_DELTA_LINE = 1
@@ -22,82 +26,25 @@ function railItemLabel(item: NativeChatRailItem): string {
     : translate('components.native-chat.railEmptyMessage', 'Message')
 }
 
-type NativeChatMessageRailMode = 'hover' | 'interactive' | null
+/** Where the card sits, and the reply it showed, latched on close for its exit animation. */
+type NativeChatRailPreviewTarget = { id: string; top: number; reply: string }
 
-function NativeChatMessageRailItems({
-  mode,
-  items,
-  activeId,
-  pendingId,
-  onSelect
-}: {
-  mode: NativeChatMessageRailMode
-  items: readonly NativeChatRailItem[]
-  activeId: string | null
-  pendingId: string | null
-  onSelect: (item: NativeChatRailItem) => void
-}): React.JSX.Element {
-  const listRef = useRef<HTMLUListElement>(null)
-  const currentItemRef = useRef<HTMLButtonElement>(null)
-  const previousMode = useRef<NativeChatMessageRailMode>(null)
-
-  const open = mode !== null
-  // Reveal the lit row when the list opens or its rows shift — not when a hover
-  // preview turns interactive, which a press on an item does: moving the list
-  // then slides the item out from under the pointer and the click is lost. Nor
-  // while a picked item pages in: each landed page shifts the rows under it.
-  useLayoutEffect(() => {
-    if (open && activeId !== null && items.length > 0 && pendingId === null) {
-      currentItemRef.current?.scrollIntoView({ block: 'nearest' })
-    }
-  }, [activeId, items, open, pendingId])
-
-  // Entering interactive from the rail moves focus into the list; entering it by
-  // focusing an item already put focus where the reader chose.
-  useLayoutEffect(() => {
-    if (
-      mode === 'interactive' &&
-      previousMode.current !== 'interactive' &&
-      !listRef.current?.contains(document.activeElement)
-    ) {
-      const focusTarget =
-        (activeId === null ? null : currentItemRef.current) ??
-        listRef.current?.querySelector<HTMLButtonElement>('button')
-      focusTarget?.focus({ preventScroll: true })
-    }
-    previousMode.current = mode
-  }, [activeId, mode])
+/** From a tick's centre up to the card's top edge, so the card's first line meets
+ *  the tick: the card's `p-4` plus half a `text-xs leading-snug` line. */
+const PREVIEW_FIRST_LINE_PX = 24
 
-  return (
-    <ul ref={listRef} className="scrollbar-sleek max-h-64 overflow-y-auto overflow-x-hidden">
-      {items.map((item) => (
-        <li key={item.id}>
-          <button
-            type="button"
-            ref={item.id === activeId ? currentItemRef : undefined}
-            onClick={() => onSelect(item)}
-            aria-current={item.id === activeId ? 'true' : undefined}
-            aria-busy={item.id === pendingId ? true : undefined}
-            data-current={item.id === activeId}
-            className={cn(
-              'flex w-full cursor-pointer rounded-md px-2 py-1.5 text-left transition-colors hover:bg-accent hover:text-accent-foreground focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-ring',
-              item.id === activeId && 'bg-accent'
-            )}
-          >
-            <span
-              className={cn(
-                'line-clamp-2 text-xs leading-snug',
-                item.id === activeId ? 'text-foreground' : 'text-muted-foreground',
-                item.id === pendingId && 'animate-pulse'
-              )}
-            >
-              {railItemLabel(item)}
-            </span>
-          </button>
-        </li>
-      ))}
-    </ul>
-  )
+/** How far a navigation key moves through the messages; null for any other key. */
+function railKeyStep(key: string, index: number, count: number): number | null {
+  if (key === 'ArrowDown') {
+    return index + 1
+  }
+  if (key === 'ArrowUp') {
+    return index - 1
+  }
+  if (key === 'Home') {
+    return 0
+  }
+  return key === 'End' ? count - 1 : null
 }
 
 export const NativeChatMessageRail = memo(function NativeChatMessageRail({
@@ -115,75 +62,80 @@ export const NativeChatMessageRail = memo(function NativeChatMessageRail({
   /** A tick whose older history is still paging in. */
   pendingId?: string | null
 }): React.JSX.Element | null {
-  // Hover preserves focus; activation enters the focus-managed prompt picker.
-  const [mode, setMode] = useState<NativeChatMessageRailMode>(null)
-  // A pick that pages history in keeps the list open, its item pulsing, until the
-  // jump lands or is abandoned; then it closes as any pick does.
-  const [heldId, setHeldId] = useState<string | null>(null)
-  if (heldId !== null && (heldId !== pendingId || mode === null)) {
-    setHeldId(null)
-    setMode(null)
-  }
-  const closeTimer = useRef<ReturnType<typeof setTimeout> | null>(null)
-  const restoreFocus = useRef(false)
-  const open = mode !== null
-  const cancelClose = (): void => {
-    if (closeTimer.current !== null) {
-      clearTimeout(closeTimer.current)
+  const [target, setTarget] = useState<NativeChatRailPreviewTarget | null>(null)
+  const railRef = useRef<HTMLDivElement>(null)
+  /** A message an arrow key asked to focus, whose tick may not be drawn until the next render. */
+  const focusRequest = useRef<string | null>(null)
+  const { ticks, items, focusId } = rail
+
+  useLayoutEffect(() => {
+    if (focusRequest.current !== focusId) {
+      return
     }
-    closeTimer.current = null
-  }
-  const leavePreview = (): void => {
-    cancelClose()
-    if (mode === 'hover') {
-      closeTimer.current = setTimeout(() => setMode(null), 120)
+    const index = ticks.findIndex((item) => item.id === focusId)
+    if (index !== -1) {
+      focusRequest.current = null
+      railRef.current?.querySelectorAll('button')[index]?.focus()
     }
-  }
-  useEffect(
-    () => () => {
-      if (closeTimer.current !== null) {
-        clearTimeout(closeTimer.current)
-      }
-    },
-    []
-  )
+  }, [focusId, ticks])
+
   if (!rail.visible) {
     return null
   }
 
+  const previewed = target === null ? null : (ticks.find((item) => item.id === target.id) ?? null)
+  const previewedId = rail.previewId !== null && previewed ? previewed.id : null
+  const reply = previewedId === null ? (target?.reply ?? '') : rail.previewReply
+  // One tab stop for the whole rail; arrow keys walk it from there.
+  const tabId =
+    [focusId, rail.activeId].find((id) => ticks.some((item) => item.id === id)) ?? ticks[0]?.id
+
+  const show = (item: NativeChatRailItem, element: HTMLElement): void => {
+    setTarget({ id: item.id, top: element.offsetTop + element.offsetHeight / 2, reply: '' })
+    rail.onPreview(item.id)
+  }
+  const close = (): void => {
+    setTarget((current) => current && { ...current, reply: rail.previewReply })
+    rail.onPreview(null)
+  }
+
   return (
-    <Popover
-      open={open}
-      onOpenChange={(open) => {
-        cancelClose()
-        if (open) {
-          restoreFocus.current = true
-        }
-        setMode(open ? 'interactive' : null)
-      }}
+    // One card for the whole rail, moved to the tick it previews: a card per tick
+    // would animate out and in again on every step between neighbours. The ticks
+    // open it; the card's own hover, blur and Escape handling closes it.
+    <HoverCard
+      open={previewedId !== null}
+      onOpenChange={(next) => !next && close()}
+      openDelay={0}
+      closeDelay={100}
     >
-      <PopoverTrigger asChild>
-        <button
-          type="button"
+      <HoverCardTrigger asChild>
+        <div
+          ref={railRef}
+          role="toolbar"
           data-native-chat-rail
           aria-label={translate('components.native-chat.railLabel', 'Your messages')}
-          onPointerEnter={(event) => {
-            if (event.pointerType === 'touch') {
-              return
-            }
-            cancelClose()
-            if (mode === null) {
-              restoreFocus.current = false
+          aria-orientation="vertical"
+          onBlur={(event) => {
+            if (!event.currentTarget.contains(event.relatedTarget)) {
+              rail.onFocusItem(null)
             }
-            setMode((current) => current ?? 'hover')
           }}
-          onPointerLeave={leavePreview}
-          onClick={(event) => {
-            cancelClose()
-            if (mode === 'hover') {
-              event.preventDefault()
-              restoreFocus.current = true
-              setMode('interactive')
+          onKeyDown={(event) => {
+            // Through every message, not only the drawn ticks: a long thread samples them.
+            const next = railKeyStep(
+              event.key,
+              items.findIndex((item) => item.id === tabId),
+              items.length
+            )
+            if (next === null) {
+              return
+            }
+            event.preventDefault()
+            const item = items[next]
+            if (item) {
+              focusRequest.current = item.id
+              rail.onFocusItem(item.id)
             }
           }}
           // The rail overlays the transcript without being inside it, so a wheel
@@ -206,56 +158,70 @@ export const NativeChatMessageRail = memo(function NativeChatMessageRail({
             onReaderScroll?.(event.deltaY * scale)
             element.scrollTop += event.deltaY * scale
           }}
-          className="group/rail absolute inset-y-0 right-[14px] z-10 flex w-4 cursor-default flex-col items-center justify-center gap-2 focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-ring"
+          className="absolute top-1/2 right-2.5 z-10 flex w-6 -translate-y-1/2 flex-col"
         >
-          {rail.ticks.map((item) => (
-            <span
-              key={item.id}
-              aria-hidden
-              className={cn(
-                'h-[3px] shrink-0 rounded-full transition-all duration-150',
-                item.id === rail.activeId
-                  ? 'w-5 bg-foreground/30 group-hover/rail:bg-foreground/70'
-                  : 'w-3 bg-foreground/10 group-hover/rail:bg-foreground/25'
-              )}
-            />
-          ))}
-        </button>
-      </PopoverTrigger>
-      <PopoverContent
+          {ticks.map((item) => {
+            // The pointer or keyboard owns the fill while a preview is open; otherwise
+            // the fill reports the scroll position.
+            const lit = item.id === (previewedId ?? rail.activeId)
+            return (
+              <button
+                key={item.id}
+                type="button"
+                tabIndex={item.id === tabId ? 0 : -1}
+                aria-label={railItemLabel(item)}
+                aria-current={item.id === rail.activeId ? 'true' : undefined}
+                aria-busy={item.id === pendingId ? true : undefined}
+                onPointerEnter={(event) => {
+                  if (event.pointerType !== 'touch') {
+                    show(item, event.currentTarget)
+                  }
+                }}
+                onFocus={(event) => {
+                  rail.onFocusItem(item.id)
+                  // A click focuses the tick too, and must not reopen the preview it dismissed.
+                  if (event.currentTarget.matches(':focus-visible')) {
+                    show(item, event.currentTarget)
+                  }
+                }}
+                onClick={() => onSelect(item)}
+                // Padding, not a gap, so the pointer never falls between two ticks.
+                className={cn(
+                  'flex w-full shrink-0 cursor-pointer items-center justify-center rounded-sm focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-ring',
+                  ticks.length > NATIVE_CHAT_RAIL_ROOMY_TICKS ? 'py-0.5' : 'py-1'
+                )}
+              >
+                <span
+                  aria-hidden
+                  className={cn(
+                    'h-[3px] rounded-full transition-[width,background-color] duration-150',
+                    lit ? 'w-5 bg-foreground' : 'w-3 bg-foreground/50',
+                    item.id === pendingId && 'animate-pulse'
+                  )}
+                />
+              </button>
+            )
+          })}
+        </div>
+      </HoverCardTrigger>
+      <HoverCardContent
         side="left"
-        align="center"
-        aria-label={translate('components.native-chat.railLabel', 'Your messages')}
-        className="w-72 p-1"
-        onPointerEnter={cancelClose}
-        onPointerLeave={leavePreview}
-        onFocusCapture={() => {
-          cancelClose()
-          restoreFocus.current = true
-          setMode('interactive')
-        }}
-        onOpenAutoFocus={(event) => event.preventDefault()}
-        onCloseAutoFocus={(event) => {
-          if (!restoreFocus.current) {
-            event.preventDefault()
-          }
-        }}
+        align="start"
+        alignOffset={(target?.top ?? 0) - PREVIEW_FIRST_LINE_PX}
+        sideOffset={8}
+        className="w-72"
       >
-        <NativeChatMessageRailItems
-          mode={mode}
-          items={rail.items}
-          activeId={rail.activeId}
-          pendingId={pendingId}
-          onSelect={(item) => {
-            onSelect(item)
-            if (item.slotIndex === null) {
-              setHeldId(item.id)
-            } else {
-              setMode(null)
-            }
-          }}
-        />
-      </PopoverContent>
-    </Popover>
+        {previewed ? (
+          <div className="flex flex-col gap-1">
+            <p className="line-clamp-2 text-xs leading-snug text-foreground">
+              {railItemLabel(previewed)}
+            </p>
+            {reply.length > 0 ? (
+              <p className="line-clamp-3 text-xs leading-snug text-muted-foreground">{reply}</p>
+            ) : null}
+          </div>
+        ) : null}
+      </HoverCardContent>
+    </HoverCard>
   )
 })
diff --git a/src/renderer/src/components/native-chat/NativeChatMessageRow.test.tsx b/src/renderer/src/components/native-chat/NativeChatMessageRow.test.tsx
index a7e8ef689bcd..44ad235f4aa6 100644
--- a/src/renderer/src/components/native-chat/NativeChatMessageRow.test.tsx
+++ b/src/renderer/src/components/native-chat/NativeChatMessageRow.test.tsx
@@ -6,6 +6,7 @@ import type { NativeChatMessage } from '../../../../shared/native-chat-types'
 import { MessageRow, type NativeChatDeliveryNotice } from './NativeChatMessageRow'
 import { TooltipProvider } from '@/components/ui/tooltip'
 import type { NativeChatRewindSurface } from './use-native-chat-rewind'
+import { readNativeChatQuotableSelection } from './native-chat-quote-selection'
 
 const confirm = vi.hoisted(() => vi.fn())
 vi.mock('@/components/confirmation-dialog-context', () => ({
@@ -90,6 +91,37 @@ describe('MessageRow control visibility', () => {
     })
   })
 
+  it('copies an assistant reply without its visual lines, which mean nothing outside Orca', async () => {
+    const writeClipboardText = vi.fn().mockResolvedValue(undefined)
+    Object.assign(window, { api: { ui: { writeClipboardText } } })
+
+    render(
+      <TooltipProvider>
+        <MessageRow
+          message={{
+            id: 'message',
+            role: 'assistant',
+            timestamp: 0,
+            source: 'transcript',
+            blocks: [
+              {
+                type: 'text',
+                text: 'Here it is.\n\n::orca-visual{file="usage.html" title="Usage"}\n\nDone.'
+              }
+            ]
+          }}
+          expandSignal={false}
+          onScrollMessageToTop={vi.fn()}
+        />
+      </TooltipProvider>
+    )
+    fireEvent.click(screen.getByRole('button', { name: 'Copy message' }))
+
+    await waitFor(() => {
+      expect(writeClipboardText).toHaveBeenCalledWith('Here it is.\n\nDone.')
+    })
+  })
+
   it('omits the copy button on image-only user messages', () => {
     render(
       <MessageRow
@@ -127,6 +159,19 @@ describe('MessageRow control visibility', () => {
   )
 })
 
+describe('which messages can be quoted', () => {
+  it.each([
+    ['assistant', 'Message text'],
+    ['user', undefined],
+    ['system', undefined]
+  ] as const)('a selection in a %s message', (role, quoted) => {
+    const { container } = renderMessage(role)
+    window.getSelection()!.selectAllChildren(screen.getByText('Message text'))
+
+    expect(readNativeChatQuotableSelection(container)?.text).toBe(quoted)
+  })
+})
+
 describe('MessageRow send mode', () => {
   function renderUser(sentAs?: NativeChatMessage['sentAs']) {
     return render(
@@ -175,27 +220,16 @@ describe('what a user message says about its delivery', () => {
     )
   }
 
-  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', () => {
+  it('says why under the message, with no control where the surface has none', () => {
     renderUser({ text: 'Not delivered — check the terminal' })
 
     expect(screen.getByText('Not delivered — check the terminal')).toBeInTheDocument()
-    expect(screen.queryByRole('button', { name: 'Retry' })).toBeNull()
+    expect(screen.queryByRole('button', { name: 'Dismiss' })).toBeNull()
   })
 
   it('says nothing when it went through', () => {
     renderUser()
-    expect(screen.queryByRole('button', { name: 'Retry' })).toBeNull()
+    expect(screen.queryByRole('button', { name: 'Dismiss' })).toBeNull()
   })
 
   // Muted, in the time's place, and shown without hover: a message nothing confirmed yet never
@@ -211,7 +245,7 @@ describe('what a user message says about its delivery', () => {
     expect(sending.parentElement!.parentElement).toHaveClass('group')
     expect(copy).toHaveClass('can-hover:opacity-0', 'group-hover:opacity-100')
     expect(screen.queryByRole('time')).toBeNull()
-    expect(screen.queryByRole('button', { name: 'Retry' })).toBeNull()
+    expect(screen.queryByRole('button', { name: 'Dismiss' })).toBeNull()
   })
 
   it('keeps the same row when the message is confirmed, with the time back in its place', () => {
diff --git a/src/renderer/src/components/native-chat/NativeChatMessageRow.tsx b/src/renderer/src/components/native-chat/NativeChatMessageRow.tsx
index 9705cc64ceaa..5bfdc76d76c1 100644
--- a/src/renderer/src/components/native-chat/NativeChatMessageRow.tsx
+++ b/src/renderer/src/components/native-chat/NativeChatMessageRow.tsx
@@ -1,10 +1,11 @@
 import { memo, useCallback, useRef } from 'react'
 import { NativeChatRewindAction } from './NativeChatRewindAction'
 import type { NativeChatRewindSurface } from './use-native-chat-rewind'
-import { Goal, RotateCcw } from 'lucide-react'
+import { Goal } from 'lucide-react'
 import { Button } from '@/components/ui/button'
 import type { CommentMarkdownLinkClickHandler } from '@/components/sidebar/CommentMarkdown'
 import { NativeChatMarkdown } from './NativeChatMarkdown'
+import { NATIVE_CHAT_QUOTE_SOURCE_PROPS } from './native-chat-quote-selection'
 import { cn } from '@/lib/utils'
 import { translate } from '@/i18n/i18n'
 import type {
@@ -14,6 +15,7 @@ import type {
 import { deriveNativeChatRowContent } from '../../../../shared/native-chat-row-content'
 import { NativeChatToolRun } from './NativeChatToolRun'
 import { NativeChatReasoningRow } from './NativeChatReasoningRow'
+import { NativeChatUserMessageFold } from './NativeChatUserMessageFold'
 import { NativeChatCodeBlock } from './NativeChatCodeBlock'
 import { NativeChatNoticeRow } from './NativeChatNoticeRow'
 import { nativeChatBlocksInOwnWords } from './native-chat-stopped-before-start-row'
@@ -37,8 +39,8 @@ import { useNativeChatWorkRun } from './use-native-chat-work-run'
  *  place of its time, or that it did not go through, with its own Retry when the surface can send
  *  it again. */
 export type NativeChatDeliveryNotice =
-  | { sending: true; text?: never; onRetry?: never; onDismiss?: never }
-  | { sending?: never; text: string; onRetry?: () => void; onDismiss?: () => void }
+  | { sending: true; text?: never; onDismiss?: never }
+  | { sending?: never; text: string; onDismiss?: () => void }
 
 const USER_META_REVEAL =
   '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'
@@ -88,6 +90,8 @@ type MessageRowProps = {
   activeTurnIsWorking?: boolean
   /** This row's tool run is the turn's last, so it is the one still live. */
   trailingRun?: boolean
+  /** Hover controls would overlap the next row. */
+  continuesTurn?: boolean
   /** Align this message's top to the top of the scroll viewport. */
   onScrollMessageToTop: (el: HTMLElement) => void
   onLinkClick?: CommentMarkdownLinkClickHandler
@@ -119,6 +123,7 @@ export const MessageRow = memo(function MessageRow({
   expandSignal,
   activeTurnIsWorking,
   trailingRun,
+  continuesTurn = false,
   onScrollMessageToTop,
   onLinkClick,
   allowFileUriLinks = false,
@@ -152,6 +157,14 @@ export const MessageRow = memo(function MessageRow({
       onScrollMessageToTop(rowRef.current)
     }
   }, [onScrollMessageToTop])
+  // "Show less" sits at the bottom of an open prompt; folding it can leave the reader past it.
+  const returnToView = useCallback(() => {
+    const row = rowRef.current
+    const viewport = row?.closest('[data-native-chat-scroll]')
+    if (row && viewport && row.getBoundingClientRect().top < viewport.getBoundingClientRect().top) {
+      onScrollMessageToTop(row)
+    }
+  }, [onScrollMessageToTop])
 
   // Skip rows with nothing renderable so the transcript shows no empty/ghost
   // bubble.
@@ -224,14 +237,20 @@ export const MessageRow = memo(function MessageRow({
                 runtimeContext={runtimeContext}
                 enablePreview={runtimeContext !== undefined}
               />
-              <NativeChatMarkdown
-                content={markdown}
-                variant="document"
-                className="text-sm native-chat-message-text"
-                renderCodeBlock={NativeChatCodeBlock}
-                onLinkClick={onLinkClick}
-                allowFileUriLinks={allowFileUriLinks}
-              />
+              <NativeChatUserMessageFold
+                messageId={message.id}
+                markdown={markdown}
+                onRefolded={returnToView}
+              >
+                <NativeChatMarkdown
+                  content={markdown}
+                  variant="document"
+                  className="text-sm native-chat-message-text"
+                  renderCodeBlock={NativeChatCodeBlock}
+                  onLinkClick={onLinkClick}
+                  allowFileUriLinks={allowFileUriLinks}
+                />
+              </NativeChatUserMessageFold>
             </>
           ) : (
             <NativeChatImageAttachments
@@ -261,15 +280,6 @@ export const MessageRow = memo(function MessageRow({
                 {translate('components.native-chat.dismissDeliveryNotice', 'Dismiss')}
               </Button>
             ) : null}
-            {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>
@@ -293,7 +303,7 @@ export const MessageRow = memo(function MessageRow({
   // A thought heading a run reads inside it, so the row has no words of its own.
   const words = isReasoning ? '' : markdown
   // Assistant controls reveal on hover and keyboard focus; system asides stay chrome-free.
-  const showControls = !isSystem && words.length > 0
+  const showControls = !isSystem && words.length > 0 && !continuesTurn
 
   return (
     <div
@@ -319,6 +329,15 @@ export const MessageRow = memo(function MessageRow({
           onLinkClick={onLinkClick}
           allowFileUriLinks={allowFileUriLinks}
           linkifyFilePaths={onLinkClick !== undefined}
+          {...(isSystem ? {} : NATIVE_CHAT_QUOTE_SOURCE_PROPS)}
+          visualMessageId={message.role === 'assistant' ? message.id : undefined}
+          // Structured text streams in place with no per-row state: only the live turn's frontier
+          // row, still ending in prose, can be mid-sentence.
+          streaming={
+            activeTurnIsWorking === true &&
+            trailingRun === true &&
+            message.blocks.at(-1)?.type === 'text'
+          }
         />
       ) : null}
       {run || tools.length > 0 || subagentGroups.length > 0 || backgroundTasks.length > 0 ? (
@@ -333,6 +352,7 @@ export const MessageRow = memo(function MessageRow({
           subagentRoster={subagentRoster}
           subagentDisclosure={subagentDisclosure}
           backgroundTasks={backgroundTasks}
+          followsProse={markdown.length > 0 || hasImages}
           expandSignal={expandSignal}
           activeTurnIsWorking={activeTurnIsWorking}
           trailing={trailingRun}
diff --git a/src/renderer/src/components/native-chat/NativeChatNoticeRow.test.tsx b/src/renderer/src/components/native-chat/NativeChatNoticeRow.test.tsx
index 083933547d5c..db62bc280a7e 100644
--- a/src/renderer/src/components/native-chat/NativeChatNoticeRow.test.tsx
+++ b/src/renderer/src/components/native-chat/NativeChatNoticeRow.test.tsx
@@ -5,18 +5,122 @@ import { afterEach, describe, expect, it, vi } from 'vitest'
 import { projectStructuredItemsToNativeChat } from '../../../../shared/structured-agent-session-projection'
 import type { AgentJournalStatusItem } from '../../../../shared/agent-session-journal-types'
 import { MessageRow } from './NativeChatMessageRow'
+import {
+  NativeChatOrcaStopContext,
+  type NativeChatOrcaStopView
+} from './native-chat-orca-stop-context'
 
 afterEach(cleanup)
 
-function renderStatus(body: AgentJournalStatusItem) {
+function orcaStopView(
+  hostLabel: string | null,
+  continueAvailable: boolean
+): NativeChatOrcaStopView {
+  return { hostLabel, continueAvailable }
+}
+
+function renderStatus(
+  body: AgentJournalStatusItem,
+  hostLabel: string | null = null,
+  continueAvailable = false
+) {
   const [message] = projectStructuredItemsToNativeChat([
-    { itemId: 'notice', sequence: 1, revision: 1, observedAt: 1, body }
+    {
+      itemId: 'notice',
+      sequence: 1,
+      revision: 1,
+      observedAt: 1,
+      body,
+      turnScope: { kind: 'turn', turnItemId: 'cut-turn' }
+    }
   ])
+  const view = orcaStopView(hostLabel, continueAvailable)
   return render(
-    <MessageRow message={message!} expandSignal={false} onScrollMessageToTop={vi.fn()} />
+    <NativeChatOrcaStopContext.Provider value={view}>
+      <MessageRow message={message!} expandSignal={false} onScrollMessageToTop={vi.fn()} />
+    </NativeChatOrcaStopContext.Provider>
   )
 }
 
+const LEGACY_TEXT =
+  'Codex stopped while this response was in progress. You can continue in this conversation.'
+
+function orcaStopRow(cause: string): AgentJournalStatusItem {
+  return {
+    kind: 'status',
+    text: LEGACY_TEXT,
+    tone: 'error',
+    presentation: 'orca-stop',
+    orcaStop: { cause }
+  }
+}
+
+describe('the row an Orca stop leaves', () => {
+  it.each([
+    ['update', 'Orca on studio-mac restarted for an update while this response was in progress.'],
+    ['quit', 'Orca on studio-mac was closed while this response was in progress.'],
+    ['crash', 'Orca on studio-mac stopped unexpectedly while this response was in progress.']
+  ])('names a %s and the machine, muted', (cause, sentence) => {
+    renderStatus(orcaStopRow(cause), 'studio-mac')
+    const row = screen.getByText(`${sentence} You can continue in this conversation.`)
+    expect(row.parentElement?.parentElement).toHaveClass('text-muted-foreground')
+    expect(screen.queryByText(LEGACY_TEXT)).toBeNull()
+  })
+
+  it('leaves the way on to Continue wherever its host can continue a cut', () => {
+    renderStatus(orcaStopRow('update'), 'studio-mac', true)
+    expect(
+      screen.getByText(
+        'Orca on studio-mac restarted for an update while this response was in progress.'
+      )
+    ).toBeInTheDocument()
+  })
+
+  // A client that re-words unnamed host rows keeps this row's presentation and cause, neutral.
+  it('stays neutral, naming the cause, as a reader that re-presented it neutral hands it on', () => {
+    // Its words and tone replaced, and the failure fact the old words came from dropped with them.
+    const represented: AgentJournalStatusItem = {
+      kind: 'status',
+      text: 'This response was interrupted. You can continue in this conversation.',
+      tone: 'notice',
+      presentation: 'orca-stop',
+      orcaStop: { cause: 'crash' }
+    }
+    renderStatus(represented, 'studio-mac', true)
+    expect(
+      screen.getByText(
+        'Orca on studio-mac stopped unexpectedly while this response was in progress.'
+      ).parentElement?.parentElement
+    ).toHaveClass('text-muted-foreground')
+    cleanup()
+    renderStatus(represented, null, true)
+    expect(
+      screen.getByText('This response was interrupted. You can continue in this conversation.')
+        .parentElement?.parentElement
+    ).toHaveClass('text-muted-foreground')
+  })
+
+  it('keeps the host words for a cause this build does not know', () => {
+    renderStatus(orcaStopRow('power-loss'), 'studio-mac')
+    expect(screen.getByText(LEGACY_TEXT)).toBeInTheDocument()
+  })
+
+  it('keeps the host words when the chat has no machine to name, muted all the same', () => {
+    renderStatus(orcaStopRow('update'), null)
+    expect(screen.getByText(LEGACY_TEXT).parentElement?.parentElement).toHaveClass(
+      'text-muted-foreground'
+    )
+  })
+
+  it('keeps the host words for a stop Orca did not cause', () => {
+    const { orcaStop: _orcaStop, presentation: _presentation, ...agentExit } = orcaStopRow('update')
+    renderStatus(agentExit, 'studio-mac')
+    expect(screen.getByText(LEGACY_TEXT).parentElement?.parentElement).toHaveClass(
+      'text-destructive'
+    )
+  })
+})
+
 describe('notice rows', () => {
   it('renders compaction as a centered separator', () => {
     renderStatus({ kind: 'status', text: 'Context compacted', presentation: 'compaction' })
diff --git a/src/renderer/src/components/native-chat/NativeChatNoticeRow.tsx b/src/renderer/src/components/native-chat/NativeChatNoticeRow.tsx
index 66ac58aeb752..47856cdaae84 100644
--- a/src/renderer/src/components/native-chat/NativeChatNoticeRow.tsx
+++ b/src/renderer/src/components/native-chat/NativeChatNoticeRow.tsx
@@ -11,7 +11,16 @@ import {
   type AgentSessionHostStatusPresentation
 } from '../../../../shared/agent-session-host-status-rows'
 import type { NativeChatTextBlock } from '../../../../shared/native-chat-types'
+import { useNativeChatOrcaStopView } from './native-chat-orca-stop-context'
+import { nativeChatOrcaStopRowText } from './native-chat-orca-stop-words'
+import { AGENT_SESSION_ORCA_STOP_PRESENTATION } from '../../../../shared/agent-session-orca-stop'
 import { ProviderFrameRow } from './NativeChatTranscriptChrome'
+import { Button } from '@/components/ui/button'
+import {
+  isClaudeSignInFailureKind,
+  nativeChatClaudeSignInLabel,
+  useNativeChatClaudeSignInView
+} from './native-chat-claude-sign-in'
 
 const HOST_STATUS_WORDS: Record<AgentSessionHostStatusPresentation, () => string> = {
   'history-repaired': () =>
@@ -35,6 +44,8 @@ export function NativeChatNoticeRow({
   onLinkClick?: CommentMarkdownLinkClickHandler
   allowFileUriLinks?: boolean
 }): React.JSX.Element {
+  const orcaStopView = useNativeChatOrcaStopView()
+  const claudeSignIn = useNativeChatClaudeSignInView()
   if (block.presentation === 'compaction') {
     const label = translate('components.native-chat.notices.compaction', 'Context compacted')
     return (
@@ -87,7 +98,16 @@ export function NativeChatNoticeRow({
       </Card>
     )
   }
-  const tone = block.tone
+  // The host's row about an Orca stop names the cause and the machine, muted: Orca stopped, not the
+  // agent. With no machine to name it keeps the host's own words.
+  const { orcaStop } = block
+  const { hostLabel, continueAvailable } = orcaStopView
+  const named = orcaStop !== undefined && hostLabel !== null
+  const text = named
+    ? nativeChatOrcaStopRowText(orcaStop.cause, hostLabel, { continueAvailable })
+    : block.text
+  const tone =
+    named || block.presentation === AGENT_SESSION_ORCA_STOP_PRESENTATION ? 'notice' : block.tone
   const Icon =
     tone === 'warning'
       ? AlertTriangle
@@ -108,8 +128,19 @@ export function NativeChatNoticeRow({
     >
       <div className="flex items-start gap-2">
         {Icon ? <Icon aria-hidden="true" className="mt-0.5 size-4 shrink-0" /> : null}
-        <p className="min-w-0 whitespace-pre-wrap break-words">{block.text}</p>
+        <p className="min-w-0 whitespace-pre-wrap break-words">{text}</p>
       </div>
+      {claudeSignIn && isClaudeSignInFailureKind(block.failure?.kind) ? (
+        <Button
+          type="button"
+          variant="outline"
+          size="xs"
+          disabled={claudeSignIn.signingIn}
+          onClick={claudeSignIn.signIn}
+        >
+          {nativeChatClaudeSignInLabel(claudeSignIn)}
+        </Button>
+      ) : null}
       {block.providerFrame ? (
         <ProviderFrameRow
           block={block}
diff --git a/src/renderer/src/components/native-chat/NativeChatPaneFileDropSurface.tsx b/src/renderer/src/components/native-chat/NativeChatPaneFileDropSurface.tsx
index 64732a566e63..48157e3f595e 100644
--- a/src/renderer/src/components/native-chat/NativeChatPaneFileDropSurface.tsx
+++ b/src/renderer/src/components/native-chat/NativeChatPaneFileDropSurface.tsx
@@ -1,7 +1,9 @@
 import { createContext, useContext, useLayoutEffect, useMemo, useRef, useState } from 'react'
 import { Paperclip } from 'lucide-react'
 import { translate } from '@/i18n/i18n'
-import { NATIVE_FILE_DROP_TARGET } from '../../../../shared/native-file-drop'
+import { toast } from 'sonner'
+import { createOsFileDropSequence, useOsFileDropOwner } from '@/hooks/use-os-file-drop-owner'
+import { getNativeFileDropRejectionMessage } from '@/lib/native-file-drop-rejection-message'
 import {
   makeNativeChatPaneFileDropHandlers,
   type NativeChatPaneDropClaim
@@ -11,7 +13,7 @@ import {
  *  event time, so a guarded composer answers for the drag in front of it. */
 export type NativeChatPaneDropRegistration = {
   getClaim: () => NativeChatPaneDropClaim
-  scopeKey: string
+  destinationKey: string
 }
 
 type RegisterPaneDropClaim = (registration: NativeChatPaneDropRegistration) => () => void
@@ -28,10 +30,10 @@ export function useNativeChatPaneFileDropClaim(claim: NativeChatPaneDropClaim):
   useLayoutEffect(() => {
     claimRef.current = claim
   })
-  const { scopeKey, disabled } = claim
+  const { destinationKey, disabled } = claim
   const registration = useMemo<NativeChatPaneDropRegistration>(
-    () => ({ getClaim: () => claimRef.current, scopeKey }),
-    [scopeKey]
+    () => ({ getClaim: () => claimRef.current, destinationKey }),
+    [destinationKey]
   )
   // A guard transition ends the current hover before the next paint.
   useLayoutEffect(() => register?.(registration), [disabled, register, registration])
@@ -46,6 +48,22 @@ export function NativeChatPaneFileDropSurface({
 }): React.JSX.Element {
   const [registration, setRegistration] = useState<NativeChatPaneDropRegistration | null>(null)
   const [isDragActive, setIsDragActive] = useState(false)
+  const ownerRef = useRef<HTMLElement | null>(null)
+  const [sequence] = useState(createOsFileDropSequence)
+  const attachOwner = useOsFileDropOwner(ownerRef, {
+    consumer: 'agent',
+    sequence,
+    canAccept: () => Boolean(registration && !registration.getClaim().disabled),
+    captureDestination: () => registration?.getClaim().captureExternalDrop(),
+    onDrop: async (prepared, { destination }) => {
+      setIsDragActive(false)
+      for (const failure of prepared.failures) {
+        const message = getNativeFileDropRejectionMessage(failure)
+        toast.error(message.title, { description: message.description })
+      }
+      await destination?.(prepared.paths)
+    }
+  })
   const register = useMemo<RegisterPaneDropClaim>(
     () => (next) => {
       setRegistration(next)
@@ -64,7 +82,7 @@ export function NativeChatPaneFileDropSurface({
       }),
     [registration]
   )
-  // Subscribe before hover renders: preload can consume a drop before that commit.
+  // End hover even when the gesture finishes outside this pane.
   useLayoutEffect(() => {
     if (!registration) {
       return
@@ -80,14 +98,7 @@ export function NativeChatPaneFileDropSurface({
 
   return (
     <NativeChatPaneFileDropContext.Provider value={register}>
-      <div
-        className={className}
-        // Why: the preload route reads the nearest marker, so publishing the
-        // composer's scope here is what widens an OS drop to the whole pane.
-        data-native-file-drop-target={registration ? NATIVE_FILE_DROP_TARGET.composer : undefined}
-        data-composer-scope-key={registration?.scopeKey}
-        {...handlers}
-      >
+      <div className={className} ref={attachOwner} {...handlers}>
         {children}
         {isDragActive ? <NativeChatPaneFileDropOverlay /> : null}
       </div>
diff --git a/src/renderer/src/components/native-chat/NativeChatPromptEditor.tsx b/src/renderer/src/components/native-chat/NativeChatPromptEditor.tsx
index 0f02869acb4d..d2655c0ceaf5 100644
--- a/src/renderer/src/components/native-chat/NativeChatPromptEditor.tsx
+++ b/src/renderer/src/components/native-chat/NativeChatPromptEditor.tsx
@@ -222,6 +222,24 @@ export function NativeChatPromptEditor({
               editor.view.dom.focus()
             },
             contains: (node) => editor.view.dom.contains(node),
+            isCaretOnVisualEdge: (edge) => {
+              const { selection, doc } = editor.state
+              if (!selection.empty) {
+                return false
+              }
+              const { text } = promptTextMap(doc)
+              // An empty composer has one line: no layout read on the path every recall starts from.
+              if (text === '') {
+                return true
+              }
+              const caret = promptTextOffset(doc, selection.from)
+              const beyond = edge === 'start' ? text.slice(0, caret) : text.slice(caret)
+              // Why both: the text check covers other paragraphs, the view covers soft wraps.
+              return (
+                !beyond.includes('\n') &&
+                editor.view.endOfTextblock(edge === 'start' ? 'up' : 'down')
+              )
+            },
             select: () => {
               editor.commands.selectAll()
             },
diff --git a/src/renderer/src/components/native-chat/NativeChatQuestionCard.test.tsx b/src/renderer/src/components/native-chat/NativeChatQuestionCard.test.tsx
index 189815f24786..bb403e19f5fd 100644
--- a/src/renderer/src/components/native-chat/NativeChatQuestionCard.test.tsx
+++ b/src/renderer/src/components/native-chat/NativeChatQuestionCard.test.tsx
@@ -5,6 +5,7 @@ import { createRoot } from 'react-dom/client'
 import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest'
 import { NativeChatQuestionCard } from './NativeChatQuestionCard'
 import type { AskAnswerSelection, AskPrompt } from './native-chat-interactive-prompt'
+import { NATIVE_CHAT_QUESTION_AUTO_ADVANCE_MS } from '../../../../shared/native-chat-question-auto-advance'
 
 // The card resolves its own label-keyed selection state into the index-based
 // answer the delivery layer needs. These tests pin that resolution — the exact
@@ -23,12 +24,14 @@ beforeEach(() => {
 afterEach(() => {
   act(() => root.unmount())
   container.remove()
+  vi.useRealTimers()
 })
 
 function render(
   prompt: AskPrompt,
   onAnswer: (s: AskAnswerSelection[]) => void,
-  allowOther: boolean | readonly boolean[] = true
+  allowOther: boolean | readonly boolean[] = true,
+  shouldFocus = false
 ): void {
   act(() => {
     root.render(
@@ -37,11 +40,28 @@ function render(
         onAnswer={onAnswer}
         onCancel={() => {}}
         allowOther={allowOther}
+        shouldFocus={shouldFocus}
       />
     )
   })
 }
 
+function pressKey(init: KeyboardEventInit, target: EventTarget = document.body): KeyboardEvent {
+  const event = new KeyboardEvent('keydown', { bubbles: true, cancelable: true, ...init })
+  act(() => {
+    target.dispatchEvent(event)
+  })
+  return event
+}
+
+function passAutoAdvanceBeat(): void {
+  act(() => vi.advanceTimersByTime(NATIVE_CHAT_QUESTION_AUTO_ADVANCE_MS))
+}
+
+function cardTitle(): string | null | undefined {
+  return container.querySelector('[data-testid="native-chat-question-card-title"]')?.textContent
+}
+
 function click(button: Element | undefined, describe: string): void {
   if (!button) {
     throw new Error(`button not found: ${describe}`)
@@ -84,6 +104,21 @@ function optionPressed(label: string): string | null | undefined {
     ?.getAttribute('aria-pressed')
 }
 
+const indentThenFruits: AskPrompt = {
+  questions: [
+    {
+      question: 'Do you prefer tabs or spaces?',
+      multiSelect: false,
+      options: [{ label: 'Tabs' }, { label: 'Spaces' }]
+    },
+    {
+      question: 'Which fruit?',
+      multiSelect: false,
+      options: [{ label: 'Apple' }, { label: 'Banana' }]
+    }
+  ]
+}
+
 const tabsOrSpaces: AskPrompt = {
   questions: [
     {
@@ -356,4 +391,134 @@ describe('NativeChatQuestionCard', () => {
 
     expect(onAnswer).toHaveBeenCalledWith([{ indices: [1], other: 'Desktop app' }])
   })
+
+  it('moves to the next question after a pick and sends after the last one', () => {
+    vi.useFakeTimers()
+    const onAnswer = vi.fn()
+    render(indentThenFruits, onAnswer)
+
+    clickOption('Spaces')
+    expect(optionPressed('Spaces')).toBe('true')
+    expect(cardTitle()).toBe('Do you prefer tabs or spaces?')
+    passAutoAdvanceBeat()
+    expect(cardTitle()).toBe('Which fruit?')
+    expect(onAnswer).not.toHaveBeenCalled()
+    clickOption('Apple')
+    passAutoAdvanceBeat()
+
+    expect(onAnswer).toHaveBeenCalledExactlyOnceWith([
+      { indices: [1], other: '' },
+      { indices: [0], other: '' }
+    ])
+  })
+
+  it('sends nothing when the question is cancelled before the pick moves on', () => {
+    vi.useFakeTimers()
+    const onAnswer = vi.fn()
+    render(tabsOrSpaces, onAnswer)
+
+    clickOption('Spaces')
+    click(container.querySelector('button[aria-label="Cancel"]') ?? undefined, 'Cancel')
+    passAutoAdvanceBeat()
+
+    expect(onAnswer).not.toHaveBeenCalled()
+  })
+
+  it('picks the numbered option when its number key is pressed', () => {
+    vi.useFakeTimers()
+    const onAnswer = vi.fn()
+    render(tabsOrSpaces, onAnswer, true, true)
+
+    pressKey({ key: '2' })
+    passAutoAdvanceBeat()
+
+    expect(onAnswer).toHaveBeenCalledExactlyOnceWith([{ indices: [1], other: '' }])
+  })
+
+  it('toggles multi-select options by number key and waits for Submit', () => {
+    vi.useFakeTimers()
+    const onAnswer = vi.fn()
+    render(
+      {
+        questions: [
+          {
+            question: 'Which fruits?',
+            multiSelect: true,
+            options: [{ label: 'Apple' }, { label: 'Banana' }, { label: 'Cherry' }]
+          }
+        ]
+      },
+      onAnswer,
+      true,
+      true
+    )
+
+    pressKey({ key: '1' })
+    pressKey({ key: '3' })
+    pressKey({ key: '1' })
+    passAutoAdvanceBeat()
+    expect(onAnswer).not.toHaveBeenCalled()
+    clickAction('Submit')
+
+    expect(onAnswer).toHaveBeenCalledExactlyOnceWith([{ indices: [2], other: '' }])
+  })
+
+  it('keeps the keyboard on the card when the focused option is replaced by the next question', () => {
+    vi.useFakeTimers()
+    container.setAttribute('data-native-chat-root', 'true')
+    render(indentThenFruits, vi.fn(), true, true)
+    const spaces = container.querySelectorAll<HTMLElement>('button[aria-pressed]')[1]!
+
+    act(() => spaces.focus())
+    clickOption('Spaces')
+    passAutoAdvanceBeat()
+
+    expect(cardTitle()).toBe('Which fruit?')
+    expect(document.activeElement).toBe(container.querySelector('[role="group"]'))
+  })
+
+  it('picks from a number key pressed anywhere inside its own chat pane', () => {
+    vi.useFakeTimers()
+    const onAnswer = vi.fn()
+    container.setAttribute('data-native-chat-root', 'true')
+    render(tabsOrSpaces, onAnswer, true, true)
+
+    pressKey({ key: '2' }, container.querySelector('button[aria-pressed]')!)
+    passAutoAdvanceBeat()
+
+    expect(onAnswer).toHaveBeenCalledExactlyOnceWith([{ indices: [1], other: '' }])
+  })
+
+  it.each<{
+    when: string
+    shouldFocus?: boolean
+    from?: 'answer-field' | 'outside-pane'
+    init: KeyboardEventInit
+  }>([
+    { when: 'typed into the answer field', from: 'answer-field', init: { key: '1' } },
+    { when: 'pressed on another surface', from: 'outside-pane', init: { key: '1' } },
+    { when: 'pressed while another pane has the keyboard', shouldFocus: false, init: { key: '1' } },
+    { when: 'past the last option', init: { key: '3' } },
+    { when: 'held with a modifier', init: { key: '1', metaKey: true } }
+  ])('leaves a number key alone when $when', ({ shouldFocus = true, from, init }) => {
+    vi.useFakeTimers()
+    const onAnswer = vi.fn()
+    container.setAttribute('data-native-chat-root', 'true')
+    render(tabsOrSpaces, onAnswer, true, shouldFocus)
+    const outside = document.body.appendChild(document.createElement('button'))
+
+    const event = pressKey(
+      init,
+      from === 'answer-field'
+        ? container.querySelector('input')!
+        : from === 'outside-pane'
+          ? outside
+          : document.body
+    )
+    passAutoAdvanceBeat()
+    outside.remove()
+
+    expect(event.defaultPrevented).toBe(false)
+    expect(onAnswer).not.toHaveBeenCalled()
+  })
 })
diff --git a/src/renderer/src/components/native-chat/NativeChatQuestionCard.tsx b/src/renderer/src/components/native-chat/NativeChatQuestionCard.tsx
index dbb90df8b9f0..295deb19f685 100644
--- a/src/renderer/src/components/native-chat/NativeChatQuestionCard.tsx
+++ b/src/renderer/src/components/native-chat/NativeChatQuestionCard.tsx
@@ -1,4 +1,5 @@
 import { ImeInput } from '@/lib/ime-text-field'
+import { Textarea } from '@/components/ui/textarea'
 import { useRef, useState, type RefObject } from 'react'
 import { Check, Pencil, X } from 'lucide-react'
 import { cn } from '@/lib/utils'
@@ -6,7 +7,10 @@ import { translate } from '@/i18n/i18n'
 import type { AskAnswerSelection, AskPrompt } from './native-chat-interactive-prompt'
 import { NativeChatPromptCollapseToggle } from './NativeChatPromptCollapse'
 import { useNativeChatPromptCardFocus } from './use-native-chat-prompt-card-focus'
+import { useNativeChatQuestionAutoAdvance } from './use-native-chat-question-auto-advance'
+import { useNativeChatQuestionNumberKeys } from './use-native-chat-question-number-keys'
 import { isEditableTarget } from '@/lib/editable-target'
+import type { AgentJournalFreeTextInput } from '../../../../shared/agent-session-journal-types'
 
 export type NativeChatQuestionCardProps = {
   prompt: AskPrompt
@@ -16,11 +20,12 @@ export type NativeChatQuestionCardProps = {
   /** Deliver the chosen answer (per-question option indices + free text). */
   onAnswer: (selections: AskAnswerSelection[]) => void
   allowOther?: boolean | readonly boolean[]
+  freeTextInputs?: readonly (AgentJournalFreeTextInput | undefined)[]
   /** Dismiss the prompt (sends Escape to the agent). */
   onCancel: () => void
   /** Fold the card to a strip and give the input back, writing nothing; Escape does too. */
   onCollapse?: () => void
-  /** Take focus when the card takes the input region. */
+  /** Take focus when the card takes the input region; number keys pick while it holds. */
   shouldFocus?: boolean
   /** Exposes the free-text row so pane-level Paste can target it while the
    *  card replaces the composer. */
@@ -35,8 +40,9 @@ const TYPED_ANSWER = -1
  * Native renderer for an agent's AskUserQuestion prompt: a numbered pick-list
  * (mobile/Claude-Code parity) with a header + close, a hover-highlighted row per
  * option, and an optional free-text row for a custom answer. Single-select
- * holds one answer (an option or the typed text, whichever was chosen last);
- * multi-select toggles options, adds any typed text, and confirms via the trailing action.
+ * holds one answer (an option or the typed text, whichever was chosen last) and
+ * picking an option moves on by itself; multi-select toggles options, adds any typed
+ * text, and confirms via the trailing action. Number keys pick the numbered row.
  * Multi-question prompts step through tabs across the top. Neutral shadcn tokens.
  */
 export function NativeChatQuestionCard({
@@ -45,28 +51,37 @@ export function NativeChatQuestionCard({
   isCancelling = false,
   onAnswer,
   allowOther = true,
+  freeTextInputs,
   onCancel,
   onCollapse,
   shouldFocus = false,
   answerInputRef
 }: NativeChatQuestionCardProps): React.JSX.Element {
   const cardRef = useRef<HTMLDivElement>(null)
-  useNativeChatPromptCardFocus(cardRef, shouldFocus)
+  const autoAdvance = useNativeChatQuestionAutoAdvance()
   const [index, setIndex] = useState(0)
+  useNativeChatPromptCardFocus(cardRef, shouldFocus, index)
   // Keep option identity by index: labels are display text and are not guaranteed
   // unique, while Claude's selector commits the numbered row (STA-1860).
   const [selections, setSelections] = useState<number[][]>(() => prompt.questions.map(() => []))
-  const [otherText, setOtherText] = useState<string[]>(() => prompt.questions.map(() => ''))
+  const [otherText, setOtherText] = useState<string[]>(() =>
+    prompt.questions.map((_, qi) => freeTextInputs?.[qi]?.initialValue ?? '')
+  )
 
   const total = prompt.questions.length
   const isLast = index === total - 1
   const q = prompt.questions[index]!
   const questionAllowsOther = Array.isArray(allowOther) ? (allowOther[index] ?? false) : allowOther
+  const freeTextInput = freeTextInputs?.[index]
+  const acceptsEmpty = (qi: number): boolean =>
+    freeTextInputs?.[qi]?.allowEmpty === true && prompt.questions[qi]?.options.length === 0
+  const typedText = (qi: number, oth = otherText): string =>
+    freeTextInputs?.[qi]?.allowEmpty ? (oth[qi] ?? '') : (oth[qi] ?? '').trim()
 
   // Picking an option replaces a chosen typed answer on single-select; the text stays in
   // the field, unsent, until the user types or clicks there again.
   const typedAnswerChosen = (qi: number, sel = selections, oth = otherText): boolean =>
-    (sel[qi] ?? []).includes(TYPED_ANSWER) && (oth[qi] ?? '').trim().length > 0
+    acceptsEmpty(qi) || ((sel[qi] ?? []).includes(TYPED_ANSWER) && typedText(qi, oth).length > 0)
 
   const chooseTypedAnswer = (qi: number): void => {
     setSelections((prev) => {
@@ -83,6 +98,7 @@ export function NativeChatQuestionCard({
     (sel[qi] ?? []).filter((choice) => choice !== TYPED_ANSWER)
 
   const setOther = (qi: number, value: string): void => {
+    autoAdvance.cancel()
     setOtherText((prev) => {
       const next = [...prev]
       next[qi] = value
@@ -99,21 +115,23 @@ export function NativeChatQuestionCard({
     const picked = pickedOptions(qi, sel)
       .map((optionIndex) => question?.options[optionIndex]?.label ?? '')
       .filter((label) => label.length > 0)
-    const other = typedAnswerChosen(qi, sel, oth) ? (oth[qi] ?? '').trim() : ''
+    const other = typedAnswerChosen(qi, sel, oth) ? typedText(qi, oth) : ''
     return [...picked, ...(other ? [other] : [])].join(', ')
   }
 
-  const currentAnswered = answerFor(index).length > 0
+  const currentAnswered = answerFor(index).length > 0 || acceptsEmpty(index)
   const currentTypedAnswerChosen = typedAnswerChosen(index)
 
   const submitAll = (sel: number[][], oth: string[]): void => {
     const resolved: AskAnswerSelection[] = prompt.questions.map((_, i) => {
       return {
         indices: pickedOptions(i, sel),
-        other: typedAnswerChosen(i, sel, oth) ? (oth[i] ?? '').trim() : ''
+        other: typedAnswerChosen(i, sel, oth) ? typedText(i, oth) : ''
       }
     })
-    const anyAnswered = resolved.some((s) => s.indices.length > 0 || (s.other ?? '').length > 0)
+    const anyAnswered = resolved.some(
+      (s, i) => s.indices.length > 0 || (s.other ?? '').length > 0 || acceptsEmpty(i)
+    )
     if (anyAnswered) {
       onAnswer(resolved)
     }
@@ -130,23 +148,29 @@ export function NativeChatQuestionCard({
     }
   }
 
-  // Selecting only highlights the row; submitting is an explicit step via the
-  // trailing Send/Next button. (Auto-submitting on the first click dismissed the
-  // card before the user saw any feedback, which read as "nothing happened".)
+  // A single-select pick answers the question, so the card moves on after a beat that
+  // shows the row chosen; picking it again in that beat takes the answer back.
   const pickOption = (optionIndex: number): void => {
-    setSelections((prev) => {
-      const next = prev.map((s) => [...s])
-      const cur = next[index] ?? []
-      if (q.multiSelect) {
-        next[index] = cur.includes(optionIndex)
-          ? cur.filter((pickedIndex) => pickedIndex !== optionIndex)
-          : [...cur, optionIndex].sort((a, b) => a - b)
-      } else {
-        next[index] = cur.includes(optionIndex) ? [] : [optionIndex]
-      }
-      return next
-    })
+    const cur = selections[index] ?? []
+    const picked = !cur.includes(optionIndex)
+    const chosen = !picked
+      ? cur.filter((pickedIndex) => pickedIndex !== optionIndex)
+      : q.multiSelect
+        ? [...cur, optionIndex].sort((a, b) => a - b)
+        : [optionIndex]
+    const next = selections.map((s, i) => (i === index ? chosen : s))
+    setSelections(next)
+    autoAdvance.cancel()
+    if (picked && !q.multiSelect) {
+      autoAdvance.schedule(() => advanceOrSubmit(next, otherText))
+    }
   }
+  useNativeChatQuestionNumberKeys(
+    cardRef,
+    shouldFocus && !isSubmitting,
+    q.options.length,
+    pickOption
+  )
 
   // Trailing action (also fired by Enter). On any non-final question this just
   // advances — "Next" when answered, "Skip" when not — so skipping one question
@@ -155,11 +179,12 @@ export function NativeChatQuestionCard({
   // dismisses, but a reflexive Enter in the empty field is a no-op so it can't
   // throw away the whole prompt.
   const confirm = (fromKeyboard = false): void => {
+    autoAdvance.cancel()
     if (!isLast) {
       advanceOrSubmit(selections, otherText)
       return
     }
-    const anyAnswered = prompt.questions.some((_, i) => answerFor(i).length > 0)
+    const anyAnswered = prompt.questions.some((_, i) => answerFor(i).length > 0 || acceptsEmpty(i))
     if (anyAnswered) {
       submitAll(selections, otherText)
     } else if (!fromKeyboard) {
@@ -167,6 +192,22 @@ export function NativeChatQuestionCard({
     }
   }
 
+  // Leaving the question by any other route drops a pending auto-advance.
+  const goTo = (questionIndex: number): void => {
+    autoAdvance.cancel()
+    setIndex(questionIndex)
+  }
+  const cancel = (): void => {
+    autoAdvance.cancel()
+    onCancel()
+  }
+  const collapse = onCollapse
+    ? (): void => {
+        autoAdvance.cancel()
+        onCollapse()
+      }
+    : undefined
+
   return (
     // Part of the composer: docked in the bottom input region, matching the
     // composer's width and padding, rendered as the "ask" dialog card directly
@@ -183,13 +224,13 @@ export function NativeChatQuestionCard({
         if (
           event.key === 'Escape' &&
           !event.nativeEvent.isComposing &&
-          onCollapse &&
+          collapse &&
           !isSubmitting &&
           !isEditableTarget(event.target)
         ) {
           event.preventDefault()
           event.stopPropagation()
-          onCollapse()
+          collapse()
         }
       }}
     >
@@ -201,7 +242,7 @@ export function NativeChatQuestionCard({
                 key={i}
                 type="button"
                 disabled={isSubmitting}
-                onClick={() => setIndex(i)}
+                onClick={() => goTo(i)}
                 className={cn(
                   'flex shrink-0 items-center gap-1 rounded-md px-2 py-1 text-xs font-medium disabled:pointer-events-none',
                   i === index
@@ -231,16 +272,16 @@ export function NativeChatQuestionCard({
             >
               {q.question}
             </p>
-            {onCollapse ? (
+            {collapse ? (
               <NativeChatPromptCollapseToggle
                 expanded
                 disabled={isSubmitting}
-                onToggle={onCollapse}
+                onToggle={collapse}
               />
             ) : null}
             <button
               type="button"
-              onClick={onCancel}
+              onClick={cancel}
               disabled={isCancelling}
               aria-label={translate('components.native-chat.question.cancel', 'Cancel')}
               className="flex size-6 shrink-0 items-center justify-center rounded-md text-muted-foreground transition-colors hover:bg-accent hover:text-accent-foreground focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-ring"
@@ -285,35 +326,49 @@ export function NativeChatQuestionCard({
                       AskUserQuestion tool result: it reaches the model but never the command
                       parser, so `/compact` and friends are inert, while a skill name can
                       still be acted on. */}
-                  <ImeInput
-                    ref={answerInputRef}
-                    disabled={isSubmitting}
-                    value={otherText[index]}
-                    onChange={(e) => setOther(index, e.target.value)}
-                    // Click, not focus: tabbing through the field toward Submit must not
-                    // replace the option the user just picked.
-                    onClick={() => {
-                      if ((otherText[index] ?? '').trim().length > 0) {
-                        chooseTypedAnswer(index)
-                      }
-                    }}
-                    onKeyDown={(e) => {
-                      if (e.key === 'Enter') {
-                        e.preventDefault()
-                        confirm(true)
+                  {freeTextInput?.multiline ? (
+                    <Textarea
+                      disabled={isSubmitting}
+                      value={otherText[index]}
+                      onChange={(e) => setOther(index, e.target.value)}
+                      onClick={autoAdvance.cancel}
+                      placeholder={freeTextInput.placeholder}
+                    />
+                  ) : (
+                    <ImeInput
+                      ref={answerInputRef}
+                      disabled={isSubmitting}
+                      value={otherText[index]}
+                      onChange={(e) => setOther(index, e.target.value)}
+                      // Click, not focus: tabbing through the field toward Submit must not
+                      // replace the option the user just picked.
+                      onClick={() => {
+                        autoAdvance.cancel()
+                        if ((otherText[index] ?? '').trim().length > 0) {
+                          chooseTypedAnswer(index)
+                        }
+                      }}
+                      onKeyDown={(e) => {
+                        if (e.key === 'Enter') {
+                          e.preventDefault()
+                          confirm(true)
+                        }
+                      }}
+                      placeholder={
+                        freeTextInput?.placeholder ??
+                        translate(
+                          'components.native-chat.question.otherPlaceholder',
+                          'Type your answer'
+                        )
                       }
-                    }}
-                    placeholder={translate(
-                      'components.native-chat.question.otherPlaceholder',
-                      'Type your answer'
-                    )}
-                    className={cn(
-                      'min-w-0 flex-1 bg-transparent text-sm outline-none placeholder:text-muted-foreground/60 disabled:cursor-default disabled:opacity-50',
-                      currentTypedAnswerChosen || !otherText[index]
-                        ? 'text-foreground'
-                        : 'text-muted-foreground'
-                    )}
-                  />
+                      className={cn(
+                        'min-w-0 flex-1 bg-transparent text-sm outline-none placeholder:text-muted-foreground/60 disabled:cursor-default disabled:opacity-50',
+                        currentTypedAnswerChosen || !otherText[index]
+                          ? 'text-foreground'
+                          : 'text-muted-foreground'
+                      )}
+                    />
+                  )}
                 </>
               ) : (
                 <span className="flex-1" />
diff --git a/src/renderer/src/components/native-chat/NativeChatQueuedMessageCard.tsx b/src/renderer/src/components/native-chat/NativeChatQueuedMessageCard.tsx
index d9dad7cb8291..8c09a70a2d1c 100644
--- a/src/renderer/src/components/native-chat/NativeChatQueuedMessageCard.tsx
+++ b/src/renderer/src/components/native-chat/NativeChatQueuedMessageCard.tsx
@@ -17,14 +17,11 @@ import {
 import { Tooltip, TooltipContent, TooltipTrigger } from '@/components/ui/tooltip'
 import { ShortcutKeyCombo } from '@/components/ShortcutKeyCombo'
 import { translate } from '@/i18n/i18n'
-import { structuredAgentSessionAttemptFailureParts } from '../../../../shared/structured-agent-session-send-disposition'
+import { structuredAgentSessionAttemptFailureParts } from '../../../../shared/structured-agent-session-rejection-words'
 import { classifyDispatchRejection } from '../../../../shared/structured-agent-session-dispatch-rejection'
 import { readWholeAgentSessionFailureFact } from '../../../../shared/agent-session-failure'
 import { agentSessionWriteNoticeText } from './agent-session-write-notice-text'
-import {
-  QUEUED_MESSAGE_PAUSED_KEPT,
-  QUEUED_MESSAGE_PAUSED_SEND_FAILED
-} from '../../../../shared/agent-session-wire'
+import { QUEUED_MESSAGE_PAUSED_SEND_FAILED } from '../../../../shared/agent-session-wire'
 import { isMacPlatform } from './native-chat-shortcut'
 import {
   queuedMessageCardSteers,
@@ -67,12 +64,6 @@ export function queuedMessageCardCaption(card: QueuedMessageCard): string | null
           "Couldn't send — press Send to retry."
         )
       }
-      if (card.pausedReason === QUEUED_MESSAGE_PAUSED_KEPT) {
-        return translate(
-          'components.native-chat.queuedMessages.pausedKept',
-          'Not sent yet — press Send to send it.'
-        )
-      }
       return translate('components.native-chat.queuedMessages.paused', 'Paused')
     case 'behind-returned':
       return translate(
diff --git a/src/renderer/src/components/native-chat/NativeChatQueuedMessageList.test.tsx b/src/renderer/src/components/native-chat/NativeChatQueuedMessageList.test.tsx
index 65150b38c631..fc43152b8a77 100644
--- a/src/renderer/src/components/native-chat/NativeChatQueuedMessageList.test.tsx
+++ b/src/renderer/src/components/native-chat/NativeChatQueuedMessageList.test.tsx
@@ -305,7 +305,6 @@ describe('NativeChatQueuedMessageList', () => {
 
   it.each([
     ['stopped', 'Queue paused because you interrupted'],
-    ['cleared', 'Queue paused after you cleared the conversation'],
     ['some-newer-reason', 'Queue paused']
   ])(
     "a queue the host holds ('%s') shows one header row above the cards, with Resume; the held card still reads Steer",
@@ -526,22 +525,6 @@ describe('NativeChatQueuedMessageList', () => {
     expect(screen.getAllByRole('button', { name: 'Send' }).length).toBeGreaterThan(0)
   })
 
-  // A message the host kept after a restart or a close is not a mid-turn steer: on an idle chat
-  // its action is plainly Send, and its caption says it was never sent.
-  it('a kept card says it was not sent yet and offers Send, with no Resume over it', async () => {
-    renderList(
-      // The controller names no pause over a card held on its own (`queuedMessagesQueuePause`).
-      controller([card({ messageId: 'held', hold: 'paused', pausedReason: 'kept' })], null)
-    )
-    const [row] = screen.getAllByRole('listitem')
-    expect(row?.textContent).toContain('Not sent yet — press Send to send it.')
-    expect(row?.textContent).not.toContain('kept')
-    fireEvent.focus(screen.getByRole('button', { name: 'Send' }))
-    expect((await screen.findAllByText('Send this message now')).length).toBeGreaterThan(0)
-    expect(screen.queryByRole('button', { name: 'Steer' })).toBeNull()
-    expect(screen.queryByRole('button', { name: 'Resume' })).toBeNull()
-  })
-
   it('an absent or unknown pause marker reads as a plain pause, never raw', () => {
     renderList(
       controller([
@@ -581,11 +564,7 @@ describe('NativeChatQueuedMessageList', () => {
   ])(
     'offers Turn off queueing and the send chord only when the host queues sends ($queueCapable)',
     async ({ queueCapable, offered }) => {
-      const owner = controller(
-        [card({ messageId: 'kept', hold: 'paused', pausedReason: 'kept' })],
-        null,
-        queueCapable
-      )
+      const owner = controller([card({ messageId: 'kept', hold: 'paused' })], null, queueCapable)
       renderList(owner)
       fireEvent.focus(screen.getByRole('button', { name: 'Send' }))
       const hint = await screen.findAllByText('Send this message now')
diff --git a/src/renderer/src/components/native-chat/NativeChatQueuedMessageList.tsx b/src/renderer/src/components/native-chat/NativeChatQueuedMessageList.tsx
index 460b15c886a0..ea5b454f9974 100644
--- a/src/renderer/src/components/native-chat/NativeChatQueuedMessageList.tsx
+++ b/src/renderer/src/components/native-chat/NativeChatQueuedMessageList.tsx
@@ -88,11 +88,6 @@ function queuePauseText(pause: { reason: string }): string {
         'components.native-chat.queuedMessages.queuePausedStopped',
         'Queue paused because you interrupted'
       )
-    case 'cleared':
-      return translate(
-        'components.native-chat.queuedMessages.queuePausedCleared',
-        'Queue paused after you cleared the conversation'
-      )
     default:
       return translate('components.native-chat.queuedMessages.queuePaused', 'Queue paused')
   }
diff --git a/src/renderer/src/components/native-chat/NativeChatReasoningRow.tsx b/src/renderer/src/components/native-chat/NativeChatReasoningRow.tsx
index 040bd6c6206d..5784ee7ceedd 100644
--- a/src/renderer/src/components/native-chat/NativeChatReasoningRow.tsx
+++ b/src/renderer/src/components/native-chat/NativeChatReasoningRow.tsx
@@ -64,7 +64,7 @@ export function NativeChatReasoningRow({
             <NativeChatReasoningChevron />
           </button>
         </CollapsibleTrigger>
-        <CollapsibleContent>
+        <CollapsibleContent animation="height" data-native-chat-member-detail>
           <NativeChatReasoningBody
             markdown={markdown}
             onLinkClick={onLinkClick}
diff --git a/src/renderer/src/components/native-chat/NativeChatResolutionReceipt.empty-answer.test.tsx b/src/renderer/src/components/native-chat/NativeChatResolutionReceipt.empty-answer.test.tsx
new file mode 100644
index 000000000000..7d8dee6187ba
--- /dev/null
+++ b/src/renderer/src/components/native-chat/NativeChatResolutionReceipt.empty-answer.test.tsx
@@ -0,0 +1,59 @@
+// @vitest-environment happy-dom
+import '@testing-library/jest-dom/vitest'
+import { cleanup, render, screen } from '@testing-library/react'
+import { afterEach, describe, expect, it } from 'vitest'
+import type { AgentJournalQuestionItem } from '../../../../shared/agent-session-journal-types'
+import { NativeChatResolutionReceipt } from './NativeChatResolutionReceipt'
+import { nativeChatReceiptAnswers } from './native-chat-resolution-receipt'
+
+afterEach(cleanup)
+
+// A Pi input dialog the user answered with nothing: the provider accepts an empty answer.
+const emptyInput: AgentJournalQuestionItem = {
+  kind: 'question',
+  question: 'Enter text',
+  options: [],
+  freeTextQuestionId: 'text',
+  freeTextInput: { allowEmpty: true },
+  resolution: {
+    state: 'resolved',
+    selectedOptionId: 'text:',
+    answers: [{ questionId: 'text', optionIds: [], other: '' }],
+    resolvedBy: null,
+    resolvedAt: 1000
+  }
+}
+
+describe('an explicitly empty text answer', () => {
+  it('reads as answered with nothing, not as an answer Orca cannot read', () => {
+    render(<NativeChatResolutionReceipt body={emptyInput} />)
+
+    expect(screen.getByText('Empty answer')).toBeInTheDocument()
+    expect(screen.queryByText('Selected answer unavailable')).toBeNull()
+    expect(nativeChatReceiptAnswers(emptyInput)).toEqual([{ question: null, answer: '' }])
+  })
+
+  it('counts whitespace alone as empty', () => {
+    const blank = {
+      ...emptyInput,
+      resolution: {
+        ...emptyInput.resolution,
+        answers: [{ questionId: 'text', optionIds: [], other: '  \n ' }]
+      }
+    }
+    expect(nativeChatReceiptAnswers(blank)).toEqual([{ question: null, answer: '' }])
+  })
+
+  it('still says unavailable when the answer names no text and no option', () => {
+    const missing = {
+      ...emptyInput,
+      resolution: {
+        ...emptyInput.resolution,
+        answers: [{ questionId: 'text', optionIds: [] }]
+      }
+    }
+    render(<NativeChatResolutionReceipt body={missing} />)
+
+    expect(screen.getByText('Selected answer unavailable')).toBeInTheDocument()
+  })
+})
diff --git a/src/renderer/src/components/native-chat/NativeChatResolutionReceipt.tsx b/src/renderer/src/components/native-chat/NativeChatResolutionReceipt.tsx
index a1906a27197b..f3e585ae5f9f 100644
--- a/src/renderer/src/components/native-chat/NativeChatResolutionReceipt.tsx
+++ b/src/renderer/src/components/native-chat/NativeChatResolutionReceipt.tsx
@@ -72,11 +72,13 @@ export function NativeChatResolutionReceipt({
             <p>{answer.question}</p>
           ) : null}
           <p className="line-clamp-3 whitespace-pre-wrap break-words">
-            {answer.answer ??
-              translate(
-                'components.native-chat.receipt.unavailable',
-                'Selected answer unavailable'
-              )}
+            {answer.answer === ''
+              ? translate('components.native-chat.receipt.emptyAnswer', 'Empty answer')
+              : (answer.answer ??
+                translate(
+                  'components.native-chat.receipt.unavailable',
+                  'Selected answer unavailable'
+                ))}
           </p>
         </div>
       ))}
diff --git a/src/renderer/src/components/native-chat/NativeChatResolvedView.prompt-card-composer.test.tsx b/src/renderer/src/components/native-chat/NativeChatResolvedView.prompt-card-composer.test.tsx
index aa8b7750803d..e7ed96426f3a 100644
--- a/src/renderer/src/components/native-chat/NativeChatResolvedView.prompt-card-composer.test.tsx
+++ b/src/renderer/src/components/native-chat/NativeChatResolvedView.prompt-card-composer.test.tsx
@@ -51,6 +51,8 @@ vi.mock('./NativeChatComposer', async () => {
             return true
           },
           insertTypedText: composer.typed,
+          acceptsText: () => true,
+          appendText: () => {},
           handlePasteEvent: () => {},
           pasteFromClipboard: () => {},
           contains: () => false
diff --git a/src/renderer/src/components/native-chat/NativeChatResolvedView.tsx b/src/renderer/src/components/native-chat/NativeChatResolvedView.tsx
index 9d8444dc73a0..2c12d5ec41c1 100644
--- a/src/renderer/src/components/native-chat/NativeChatResolvedView.tsx
+++ b/src/renderer/src/components/native-chat/NativeChatResolvedView.tsx
@@ -49,7 +49,7 @@ import {
   emptyNativeChatContextMenuActions,
   useNativeChatContextMenu
 } from './use-native-chat-context-menu'
-import { selectNativeChatRuntimeEnvironmentId } from './native-chat-runtime-owner'
+import { createNativeChatRuntimeSelector } from './native-chat-runtime-owner'
 import { useNativeChatPasteBridge } from './use-native-chat-paste-bridge'
 import { LinkActionPopover } from '@/components/link-actions/LinkActionPopover'
 import { useNativeChatLinkActions } from './use-native-chat-link-actions'
@@ -77,9 +77,8 @@ export function NativeChatResolvedView({
 }: NativeChatResolvedViewProps): React.JSX.Element {
   // Primitive owner selection (no useShallow): routes the pane's read/subscribe to
   // the remote runtime host for a runtime-owned pane; null keeps the local path.
-  const runtimeEnvironmentId = useAppStore((s) =>
-    selectNativeChatRuntimeEnvironmentId(s, terminalTabId)
-  )
+  const selectOwner = useMemo(() => createNativeChatRuntimeSelector(terminalTabId), [terminalTabId])
+  const runtimeEnvironmentId = useAppStore(selectOwner)
   const keybindings = useAppStore((s) => s.keybindings)
   const session = useNativeChatRetainedSession({
     paneKey,
@@ -132,13 +131,10 @@ export function NativeChatResolvedView({
   // replaces the composer.
   const questionAnswerInputRef = useRef<HTMLInputElement>(null)
   const fileLinkContext = useNativeChatFileLinkContext(terminalTabId)
-  const pasteClipboardIntoComposer = useNativeChatPasteBridge({
-    rootRef,
-    composerRef,
-    questionAnswerInputRef
-  })
+  const onPaste = useNativeChatPasteBridge({ rootRef, composerRef, questionAnswerInputRef })
   const contextMenu = useNativeChatContextMenu({
     rootRef,
+    composerRef,
     enabled: isVisible,
     onSwitchToTerminal,
     splitShortcutLabels: {
@@ -146,7 +142,7 @@ export function NativeChatResolvedView({
       down: formatShortcutLabel('terminal.splitDown', keybindings)
     },
     actions: {
-      onPaste: pasteClipboardIntoComposer,
+      onPaste,
       ...(contextMenuActions ?? emptyNativeChatContextMenuActions)
     }
   })
@@ -236,8 +232,7 @@ export function NativeChatResolvedView({
     canSend,
     transcriptSettled: session.readPhase === 'ready'
   })
-  const shownPromptCard = promptCardPresentation.card
-  const collapsedCard = promptCardPresentation.collapsedCard
+  const { card: shownPromptCard, collapsedCard } = promptCardPresentation
   const mountedPromptCard = shownPromptCard ?? collapsedCard
   useNativeChatComposerRevealFocus({
     rootRef,
@@ -342,9 +337,8 @@ export function NativeChatResolvedView({
       data-native-chat-working={isWorking ? 'true' : 'false'}
       tabIndex={-1}
       onPointerDownCapture={(event) => {
+        contextMenu.onPointerDownCapture(event)
         if (event.button === 2) {
-          contextMenu.onSelectionCapture()
-          event.preventDefault()
           event.stopPropagation()
           return
         }
@@ -368,8 +362,6 @@ export function NativeChatResolvedView({
         }
         routeNativeChatRootKeyToInput(event, composerRef.current, questionAnswerInputRef.current)
       }}
-      onMouseUpCapture={contextMenu.onSelectionCapture}
-      onKeyUpCapture={contextMenu.onSelectionCapture}
       onContextMenuCapture={contextMenu.onContextMenuCapture}
       className={cn(
         NATIVE_CHAT_APPEARANCE_ROOT_CLASS,
@@ -441,6 +433,7 @@ export function NativeChatResolvedView({
           onSwitchToTerminal={onSwitchToTerminal}
           readTerminalScreen={readTerminalScreen}
           launchSeed={{ ...launchDraftSignal, ownsTabWideLaunchDraft }}
+          recallSource={{ messages: sessionWithPending.messages, commands: commandMarkers }}
         />
       </div>
       {contextMenu.menu}
diff --git a/src/renderer/src/components/native-chat/NativeChatRewindAction.target.test.tsx b/src/renderer/src/components/native-chat/NativeChatRewindAction.target.test.tsx
index 5fee5da21435..020edb91bb06 100644
--- a/src/renderer/src/components/native-chat/NativeChatRewindAction.target.test.tsx
+++ b/src/renderer/src/components/native-chat/NativeChatRewindAction.target.test.tsx
@@ -84,7 +84,7 @@ describe('rewind target after send acceptance', () => {
       expect(hook.result.current.send('Just sent', [])).toBe(true)
     })
     await waitFor(() => expect(hook.result.current.messages).toHaveLength(1))
-    const entry = hook.result.current.outbox[0]!
+    const entry = hook.result.current.pending[0]!
     const optimisticId = agentJournalSubmissionKey(entry.clientMessageId)
     const confirm = mocks.confirm.mockResolvedValue(true)
     const row = () => (
@@ -129,7 +129,7 @@ describe('rewind target after send acceptance', () => {
     }
     hook.rerender()
     await waitFor(() => expect(hook.result.current.rewind.disabledReason).toBeNull())
-    expect(hook.result.current.outbox).toEqual([])
+    expect(hook.result.current.pending).toEqual([])
     expect(hook.result.current.messages.map((message) => message.id)).toEqual([itemId])
     if (keySource === 'provider') {
       await act(() => hook.result.current.rewind.request(optimisticId, confirm))
diff --git a/src/renderer/src/components/native-chat/NativeChatSelectionQuote.test.tsx b/src/renderer/src/components/native-chat/NativeChatSelectionQuote.test.tsx
new file mode 100644
index 000000000000..e08011eed662
--- /dev/null
+++ b/src/renderer/src/components/native-chat/NativeChatSelectionQuote.test.tsx
@@ -0,0 +1,148 @@
+// @vitest-environment happy-dom
+import { act, cleanup, fireEvent, render, screen } from '@testing-library/react'
+import { useRef } from 'react'
+import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest'
+import type { NativeChatComposerHandle } from './native-chat-composer-types'
+import { NativeChatSelectionQuote } from './NativeChatSelectionQuote'
+import { NATIVE_CHAT_QUOTE_SOURCE_PROPS } from './native-chat-quote-selection'
+
+vi.mock('@/i18n/i18n', () => ({ translate: (_key: string, fallback: string) => fallback }))
+
+const appendText = vi.fn<(text: string) => void>()
+const acceptsText = vi.fn(() => true)
+const composer: NativeChatComposerHandle = {
+  focus: () => true,
+  insertTypedText: () => true,
+  appendText,
+  acceptsText,
+  handlePasteEvent: () => {},
+  pasteFromClipboard: () => {},
+  contains: () => false
+}
+
+function Chat(): React.JSX.Element {
+  const rootRef = useRef<HTMLDivElement>(null)
+  return (
+    <div ref={rootRef}>
+      <p data-testid="user">my own prompt</p>
+      <div {...NATIVE_CHAT_QUOTE_SOURCE_PROPS}>
+        <pre data-testid="first">{'Use the draft store.\n\nIt already appends.'}</pre>
+      </div>
+      <time data-testid="time" style={{ userSelect: 'none' }}>
+        10:42
+      </time>
+      <p data-testid="next">a tool line</p>
+      <NativeChatSelectionQuote rootRef={rootRef} composerRef={{ current: composer }} enabled />
+    </div>
+  )
+}
+
+function select(from: HTMLElement, to: HTMLElement = from, endOffset?: number): void {
+  const range = document.createRange()
+  range.setStart(from.firstChild!, 0)
+  range.setEnd(to.firstChild!, endOffset ?? to.textContent!.length)
+  const selection = window.getSelection()!
+  selection.removeAllRanges()
+  selection.addRange(range)
+  document.dispatchEvent(new Event('selectionchange'))
+}
+
+function settle(): void {
+  act(() => {
+    vi.runOnlyPendingTimers()
+  })
+}
+
+function releaseSelection(from: HTMLElement, to: HTMLElement = from, endOffset?: number): void {
+  fireEvent.pointerDown(from, { button: 0 })
+  select(from, to, endOffset)
+  fireEvent.mouseUp(to, { button: 0 })
+  settle()
+}
+
+describe('NativeChatSelectionQuote', () => {
+  beforeEach(() => {
+    vi.useFakeTimers()
+  })
+
+  afterEach(() => {
+    cleanup()
+    window.getSelection()?.removeAllRanges()
+    appendText.mockClear()
+    acceptsText.mockReset().mockReturnValue(true)
+    vi.useRealTimers()
+  })
+
+  it('quotes a selection from an agent reply into the composer as a blockquote', () => {
+    render(<Chat />)
+    releaseSelection(screen.getByTestId('first'))
+
+    const quote = screen.getByRole('button', { name: 'Add to chat' })
+    fireEvent.pointerDown(quote, { button: 0 })
+    fireEvent.click(quote)
+
+    expect(appendText).toHaveBeenCalledWith('> Use the draft store.\n>\n> It already appends.\n\n')
+    expect(screen.queryByRole('button', { name: 'Add to chat' })).toBeNull()
+  })
+
+  it('offers nothing for a selection outside an agent reply', () => {
+    render(<Chat />)
+    releaseSelection(screen.getByTestId('user'))
+    expect(screen.queryByRole('button', { name: 'Add to chat' })).toBeNull()
+
+    releaseSelection(screen.getByTestId('user'), screen.getByTestId('first'))
+    expect(screen.queryByRole('button', { name: 'Add to chat' })).toBeNull()
+  })
+
+  it('takes a selection that runs on over text that cannot be selected', () => {
+    render(<Chat />)
+    releaseSelection(screen.getByTestId('first'), screen.getByTestId('time'))
+    expect(screen.getByRole('button', { name: 'Add to chat' })).toBeTruthy()
+
+    // A triple-click's range: it ends at the very start of the next block.
+    releaseSelection(screen.getByTestId('first'), screen.getByTestId('next'), 0)
+    expect(screen.getByRole('button', { name: 'Add to chat' })).toBeTruthy()
+
+    releaseSelection(screen.getByTestId('first'), screen.getByTestId('next'))
+    expect(screen.queryByRole('button', { name: 'Add to chat' })).toBeNull()
+  })
+
+  it('offers nothing when a press leaves the selection as it was', () => {
+    render(<Chat />)
+    releaseSelection(screen.getByTestId('first'))
+    fireEvent.pointerDown(screen.getByTestId('time'), { button: 0 })
+    fireEvent.mouseUp(screen.getByTestId('time'), { button: 0 })
+    settle()
+
+    expect(screen.queryByRole('button', { name: 'Add to chat' })).toBeNull()
+  })
+
+  it('offers a selection made with the keyboard', () => {
+    render(<Chat />)
+    select(screen.getByTestId('first'))
+    fireEvent.keyUp(screen.getByTestId('first'), { key: 'ArrowRight', shiftKey: true })
+    settle()
+
+    expect(screen.getByRole('button', { name: 'Add to chat' })).toBeTruthy()
+  })
+
+  it('offers nothing while the composer cannot take text', () => {
+    acceptsText.mockReturnValue(false)
+    render(<Chat />)
+    releaseSelection(screen.getByTestId('first'))
+
+    expect(screen.queryByRole('button', { name: 'Add to chat' })).toBeNull()
+  })
+
+  it('withdraws the offer once the selection is gone', () => {
+    render(<Chat />)
+    releaseSelection(screen.getByTestId('first'))
+    expect(screen.getByRole('button', { name: 'Add to chat' })).toBeTruthy()
+
+    act(() => {
+      window.getSelection()!.removeAllRanges()
+      document.dispatchEvent(new Event('selectionchange'))
+    })
+    expect(screen.queryByRole('button', { name: 'Add to chat' })).toBeNull()
+  })
+})
diff --git a/src/renderer/src/components/native-chat/NativeChatSelectionQuote.tsx b/src/renderer/src/components/native-chat/NativeChatSelectionQuote.tsx
new file mode 100644
index 000000000000..a5311357a639
--- /dev/null
+++ b/src/renderer/src/components/native-chat/NativeChatSelectionQuote.tsx
@@ -0,0 +1,155 @@
+import { useEffect, useMemo, useRef, useState, type RefObject } from 'react'
+import { MessageSquarePlus } from 'lucide-react'
+import { Button } from '@/components/ui/button'
+import { Popover, PopoverAnchor, PopoverContent } from '@/components/ui/popover'
+import { addViewportSizeChangeListener } from '@/hooks/viewport-size-change-listener'
+import { translate } from '@/i18n/i18n'
+import type { NativeChatComposerHandle } from './native-chat-composer-types'
+import {
+  formatNativeChatQuote,
+  readNativeChatQuotableSelection
+} from './native-chat-quote-selection'
+
+// Why: shown at once, a double-click's action would sit under the pointer and take the third click.
+const DOUBLE_CLICK_SETTLE_MS = 500
+
+/** The selected text, and the point the offer is drawn at, which moves with that text. */
+type QuoteRequest = {
+  text: string
+  anchor: { getBoundingClientRect: () => DOMRect; contextElement?: Element }
+}
+
+/** Offers "Add to chat" beside a selection made in an agent's reply. */
+export function NativeChatSelectionQuote({
+  rootRef,
+  composerRef,
+  enabled
+}: {
+  rootRef: RefObject<HTMLElement | null>
+  composerRef: RefObject<NativeChatComposerHandle | null>
+  enabled: boolean
+}): React.JSX.Element {
+  const [request, setRequest] = useState<QuoteRequest | null>(null)
+  const contentRef = useRef<HTMLDivElement>(null)
+  const virtualRef = useMemo(() => ({ current: request?.anchor ?? null }), [request])
+
+  useEffect(() => {
+    const root = rootRef.current
+    if (!enabled || !root) {
+      return
+    }
+    let selectionChanged = false
+    let timer: number | undefined
+    const close = (): void => {
+      window.clearTimeout(timer)
+      setRequest(null)
+    }
+    const onPointerDown = (event: PointerEvent): void => {
+      if (event.target instanceof Node && contentRef.current?.contains(event.target)) {
+        return
+      }
+      close()
+      selectionChanged = false
+    }
+    // `point` is where the pointer was released; a keyboard selection is offered at its end.
+    const offer = (point: { x: number; y: number } | null, delay = 0): void => {
+      // A press or key that left the selection as it was (a scrollbar, a timestamp) selected nothing.
+      if (!selectionChanged) {
+        return
+      }
+      selectionChanged = false
+      window.clearTimeout(timer)
+      timer = window.setTimeout(() => {
+        // Only offered where the text would land.
+        const quotable = composerRef.current?.acceptsText()
+          ? readNativeChatQuotableSelection(root)
+          : null
+        if (!quotable) {
+          setRequest(null)
+          return
+        }
+        const { text, range } = quotable
+        const held = range.getBoundingClientRect()
+        const end = [...range.getClientRects()].at(-1) ?? held
+        const dx = (point?.x ?? end.right) - held.left
+        const dy = (point?.y ?? end.top) - held.top
+        setRequest({
+          text,
+          anchor: {
+            getBoundingClientRect: () => {
+              const now = range.getBoundingClientRect()
+              return new DOMRect(now.left + dx, now.top + dy)
+            },
+            // Why: lets the popover follow the text's scroller, and hide once it is clipped.
+            contextElement: range.startContainer.parentElement ?? undefined
+          }
+        })
+      }, delay)
+    }
+    const onMouseUp = (event: MouseEvent): void => {
+      if (event.button === 0) {
+        offer(
+          { x: event.clientX, y: event.clientY },
+          event.detail === 2 ? DOUBLE_CLICK_SETTLE_MS : 0
+        )
+      }
+    }
+    const onKeyUp = (): void => offer(null)
+    const onSelectionChange = (): void => {
+      selectionChanged = true
+      setRequest((current) =>
+        current && readNativeChatQuotableSelection(root)?.text !== current.text ? null : current
+      )
+    }
+    document.addEventListener('pointerdown', onPointerDown, true)
+    document.addEventListener('selectionchange', onSelectionChange)
+    window.addEventListener('mouseup', onMouseUp)
+    document.addEventListener('keyup', onKeyUp)
+    window.addEventListener('blur', close)
+    const removeResizeListener = addViewportSizeChangeListener(close)
+    return () => {
+      close()
+      document.removeEventListener('pointerdown', onPointerDown, true)
+      document.removeEventListener('selectionchange', onSelectionChange)
+      window.removeEventListener('mouseup', onMouseUp)
+      document.removeEventListener('keyup', onKeyUp)
+      window.removeEventListener('blur', close)
+      removeResizeListener()
+    }
+  }, [composerRef, enabled, rootRef])
+
+  return (
+    <Popover open={request !== null} onOpenChange={(open) => !open && setRequest(null)}>
+      <PopoverAnchor virtualRef={virtualRef} />
+      {request ? (
+        <PopoverContent
+          ref={contentRef}
+          align="start"
+          side="top"
+          sideOffset={6}
+          collisionPadding={8}
+          hideWhenDetached
+          onOpenAutoFocus={(event) => event.preventDefault()}
+          onCloseAutoFocus={(event) => event.preventDefault()}
+          // Keeps the selection, and the focus, where they are until the quote is taken.
+          onMouseDown={(event) => event.preventDefault()}
+        >
+          <div className="p-0.5">
+            <Button
+              variant="ghost"
+              size="xs"
+              onClick={() => {
+                // Taken or not (the composer may have locked since), the offer is spent.
+                composerRef.current?.appendText(formatNativeChatQuote(request.text))
+                setRequest(null)
+              }}
+            >
+              <MessageSquarePlus />
+              {translate('components.native-chat.addSelectionToChat', 'Add to chat')}
+            </Button>
+          </div>
+        </PopoverContent>
+      ) : null}
+    </Popover>
+  )
+}
diff --git a/src/renderer/src/components/native-chat/NativeChatStructuredQuestionCard.test.tsx b/src/renderer/src/components/native-chat/NativeChatStructuredQuestionCard.test.tsx
new file mode 100644
index 000000000000..947da6cf4dcf
--- /dev/null
+++ b/src/renderer/src/components/native-chat/NativeChatStructuredQuestionCard.test.tsx
@@ -0,0 +1,129 @@
+// @vitest-environment happy-dom
+import { act } from 'react'
+import { createRoot } from 'react-dom/client'
+import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest'
+import { NativeChatStructuredQuestionCard } from './NativeChatStructuredQuestionCard'
+import type { AgentJournalQuestion } from '../../../../shared/agent-session-journal-types'
+
+let container: HTMLDivElement
+let root: ReturnType<typeof createRoot>
+beforeEach(() => {
+  container = document.createElement('div')
+  document.body.appendChild(container)
+  root = createRoot(container)
+})
+afterEach(() => {
+  act(() => root.unmount())
+  container.remove()
+})
+
+function render(question: AgentJournalQuestion) {
+  const onAnswer = vi.fn()
+  const onCancel = vi.fn()
+  act(() =>
+    root.render(
+      <NativeChatStructuredQuestionCard
+        questions={[question]}
+        onAnswer={onAnswer}
+        onCancel={onCancel}
+      />
+    )
+  )
+  return { onAnswer, onCancel }
+}
+function submit(): void {
+  const button = [...container.querySelectorAll('button')].find(
+    (node) => node.textContent?.trim() === 'Submit'
+  )
+  if (!button) {
+    throw new Error('Missing Submit button')
+  }
+  act(() => button.dispatchEvent(new MouseEvent('click', { bubbles: true })))
+}
+
+const input: AgentJournalQuestion = {
+  id: 'text',
+  question: 'Enter text',
+  options: [],
+  multiSelect: false,
+  freeTextQuestionId: 'text',
+  freeTextInput: { allowEmpty: true, placeholder: 'Provider placeholder' }
+}
+
+describe('structured extension question cards', () => {
+  it('submits an empty input as an answer', () => {
+    const { onAnswer } = render(input)
+    expect(container.querySelector('input')?.placeholder).toBe('Provider placeholder')
+    submit()
+    expect(onAnswer).toHaveBeenCalledWith({
+      kind: 'answers',
+      answers: [{ questionId: 'text', optionIds: [], other: '' }]
+    })
+  })
+
+  it('renders the editor prefill and preserves whitespace, newlines and Unicode separators', () => {
+    const text = ' first\nsecond\u2028third\u2029fourth '
+    const { onAnswer } = render({
+      ...input,
+      freeTextInput: { allowEmpty: true, multiline: true, initialValue: text }
+    })
+    expect(container.querySelector('textarea')?.value).toBe(text)
+    expect(container.querySelector('input')).toBeNull()
+    submit()
+    expect(onAnswer).toHaveBeenCalledWith({
+      kind: 'answers',
+      answers: [{ questionId: 'text', optionIds: [], other: text }]
+    })
+  })
+
+  it('submits the text the user edited in the editor, not its prefill', () => {
+    const { onAnswer } = render({
+      ...input,
+      freeTextInput: { allowEmpty: true, multiline: true, initialValue: 'prefill' }
+    })
+    const textarea = container.querySelector('textarea')
+    if (!textarea) {
+      throw new Error('Missing editor textarea')
+    }
+    const setValue = Object.getOwnPropertyDescriptor(HTMLTextAreaElement.prototype, 'value')?.set
+    act(() => {
+      setValue?.call(textarea, 'prefill, then edited\nsecond line')
+      textarea.dispatchEvent(new Event('input', { bubbles: true }))
+    })
+    submit()
+    expect(onAnswer).toHaveBeenCalledWith({
+      kind: 'answers',
+      answers: [{ questionId: 'text', optionIds: [], other: 'prefill, then edited\nsecond line' }]
+    })
+  })
+
+  it('keeps legacy empty input disabled', () => {
+    const { onAnswer } = render({ ...input, freeTextInput: undefined })
+    expect(
+      [...container.querySelectorAll('button')].some(
+        (button) => button.textContent?.trim() === 'Submit'
+      )
+    ).toBe(false)
+    expect(onAnswer).not.toHaveBeenCalled()
+  })
+
+  it('keeps select-only questions limited to their offered values', () => {
+    const { onAnswer } = render({
+      id: 'q1',
+      question: 'Select',
+      options: [{ id: 'opaque-index-0', label: 'Choice' }],
+      multiSelect: false
+    })
+    expect(container.querySelector('input')).toBeNull()
+    const button = container.querySelector('button[aria-pressed]')
+    if (!button) {
+      throw new Error('Missing choice button')
+    }
+    act(() => button.dispatchEvent(new MouseEvent('click', { bubbles: true })))
+    submit()
+    expect(onAnswer).toHaveBeenCalledWith({
+      kind: 'answers',
+      answers: [{ questionId: 'q1', optionIds: ['opaque-index-0'] }]
+    })
+  })
+})
diff --git a/src/renderer/src/components/native-chat/NativeChatStructuredQuestionCard.tsx b/src/renderer/src/components/native-chat/NativeChatStructuredQuestionCard.tsx
new file mode 100644
index 000000000000..20643c738068
--- /dev/null
+++ b/src/renderer/src/components/native-chat/NativeChatStructuredQuestionCard.tsx
@@ -0,0 +1,61 @@
+import type { RefObject } from 'react'
+import type { AgentJournalQuestion } from '../../../../shared/agent-session-journal-types'
+import type { AgentSessionPromptResponse } from '../../../../shared/agent-session-question-answer'
+import { NativeChatQuestionCard } from './NativeChatQuestionCard'
+
+export function NativeChatStructuredQuestionCard({
+  questions,
+  onAnswer,
+  onCancel,
+  isSubmitting,
+  shouldFocus,
+  answerInputRef
+}: {
+  questions: readonly AgentJournalQuestion[]
+  onAnswer: (response: AgentSessionPromptResponse) => void
+  onCancel: () => void
+  isSubmitting?: boolean
+  shouldFocus?: boolean
+  answerInputRef?: RefObject<HTMLInputElement | null>
+}): React.JSX.Element {
+  return (
+    <NativeChatQuestionCard
+      prompt={{
+        questions: questions.map((question) => ({
+          question: question.question,
+          ...(question.header ? { header: question.header } : {}),
+          multiSelect: question.multiSelect,
+          options: question.options.map((option) => ({
+            label: option.label,
+            ...(option.description ? { description: option.description } : {})
+          }))
+        }))
+      }}
+      allowOther={questions.map((question) => Boolean(question.freeTextQuestionId))}
+      freeTextInputs={questions.map((question) => question.freeTextInput)}
+      onAnswer={(answers) => {
+        const chosen = questions.map((question, index) => {
+          const answer = answers[index]
+          const other = question.freeTextInput?.allowEmpty ? answer?.other : answer?.other?.trim()
+          return {
+            questionId: question.id,
+            optionIds: (answer?.indices ?? []).flatMap((optionIndex) => {
+              const id = question.options[optionIndex]?.id
+              return id ? [id] : []
+            }),
+            ...(other !== undefined && (other.length > 0 || question.freeTextInput?.allowEmpty)
+              ? { other }
+              : {})
+          }
+        })
+        if (chosen.every((answer) => answer.optionIds.length > 0 || answer.other !== undefined)) {
+          onAnswer({ kind: 'answers', answers: chosen })
+        }
+      }}
+      onCancel={onCancel}
+      isSubmitting={isSubmitting}
+      shouldFocus={shouldFocus}
+      answerInputRef={answerInputRef}
+    />
+  )
+}
diff --git a/src/renderer/src/components/native-chat/NativeChatStructuredSession.host-outage.test.tsx b/src/renderer/src/components/native-chat/NativeChatStructuredSession.host-outage.test.tsx
index b3f4b5a0f0fc..f3e2a6ac4bde 100644
--- a/src/renderer/src/components/native-chat/NativeChatStructuredSession.host-outage.test.tsx
+++ b/src/renderer/src/components/native-chat/NativeChatStructuredSession.host-outage.test.tsx
@@ -1,8 +1,10 @@
 // @vitest-environment happy-dom
 
+import '@testing-library/jest-dom/vitest'
 import { act, cleanup, fireEvent, render, screen } from '@testing-library/react'
 import { afterEach, beforeEach, expect, it, vi } from 'vitest'
 import type { RuntimeEnvironmentStatus } from '../../../../shared/runtime-host-status'
+import type { AgentJournalRenderItem } from '../../../../shared/agent-session-journal-types'
 
 const { mocks, moduleFactories, resetStructuredSessionMocks } = await vi.hoisted(async () =>
   (await import('./NativeChatStructuredSession.test-harness')).createStructuredSessionMocks()
@@ -70,8 +72,8 @@ function setHost(status: RuntimeEnvironmentStatus): void {
   })
 }
 
-function renderPane(): void {
-  render(
+function paneElement(): React.JSX.Element {
+  return (
     <NativeChatStructuredSession
       isVisible
       isFocusedGroup
@@ -83,6 +85,37 @@ function renderPane(): void {
   )
 }
 
+function renderPane() {
+  return render(paneElement())
+}
+
+function promptItem(kind: 'approval' | 'question'): AgentJournalRenderItem {
+  const options = [{ id: 'allow', label: 'Approve' }]
+  const resolution = {
+    state: 'pending' as const,
+    selectedOptionId: null,
+    resolvedBy: null,
+    resolvedAt: null
+  }
+  return {
+    itemId: 'host-outage-prompt',
+    revision: 1,
+    sequence: 1,
+    observedAt: 1,
+    body:
+      kind === 'approval'
+        ? {
+            kind,
+            title: 'Run the plan?',
+            detail: null,
+            subject: { kind: 'plan', text: 'x' },
+            options,
+            resolution
+          }
+        : { kind, question: 'Run the plan?', options, resolution }
+  }
+}
+
 beforeEach(() => {
   vi.useFakeTimers({ toFake: ['setTimeout', 'clearTimeout'] })
   useAppStore.setState({
@@ -127,7 +160,8 @@ it('adds no host line and no read line to a loaded chat while its host stays con
 it('names a reconnecting host above the composer only once the grace has passed', () => {
   renderPane()
   // Mounted before its words arrive, so a screen reader announces them.
-  const region = screen.getByRole('status')
+  const region = screen.getByRole('list')
+  expect(region).toHaveAttribute('aria-live', 'polite')
   expect(region.textContent).toBe('')
   setHost(hostStatus('unavailable', 'disconnected'))
   act(() => {
@@ -139,11 +173,16 @@ it('names a reconnecting host above the composer only once the grace has passed'
     vi.advanceTimersByTime(1)
   })
   expect(region.textContent).toBe('Build box is reconnecting…')
+  expect(screen.getByText('Build box is reconnecting…')).toHaveClass('text-muted-foreground')
+  expect(document.querySelector('.lucide-server-off')).toHaveClass('text-muted-foreground')
+  expect(screen.getByRole('listitem')).toHaveAttribute('data-notice-kind', 'host')
+  expect(screen.queryByRole('status')).toBeNull()
   expect(screen.queryByRole('button', { name: 'Reconnect' })).toBeNull()
   expect(screen.getByTestId('structured-composer')).toBeTruthy()
 
   setHost(hostStatus('verified', 'ready'))
   expect(screen.queryByText(/Build box/)).toBeNull()
+  expect(screen.getByRole('list')).toBe(region)
 })
 
 it('says a disconnected host is offline at once and offers Reconnect', async () => {
@@ -151,7 +190,8 @@ it('says a disconnected host is offline at once and offers Reconnect', async ()
   renderPane()
   setHost(hostStatus('blocked', 'disconnected', true))
 
-  expect(screen.getByText('Build box is offline')).toBeTruthy()
+  expect(screen.getByText('Build box is offline')).toHaveClass('text-destructive')
+  expect(document.querySelector('.lucide-server-off')).toHaveClass('text-destructive')
   expect(mocks.messageListProps?.session?.hasMore).toBe(false)
 
   reconnectHost.mockResolvedValue(true)
@@ -159,6 +199,36 @@ it('says a disconnected host is offline at once and offers Reconnect', async ()
     fireEvent.click(screen.getByRole('button', { name: 'Reconnect' }))
   })
   expect(reconnectHost).toHaveBeenCalledWith('remote-host')
+  setHost(hostStatus('verified', 'ready'))
+  expect(mocks.messageListProps?.session?.hasMore).toBe(true)
+})
+
+it('disables Reconnect until its attempt settles and allows another attempt after failure', async () => {
+  let finish: (reachable: boolean) => void = () => {}
+  reconnectHost.mockImplementation(
+    () =>
+      new Promise<boolean>((resolve) => {
+        finish = resolve
+      })
+  )
+  renderPane()
+  setHost(hostStatus('blocked', 'disconnected', true))
+  const reconnect = screen.getByRole('button', { name: 'Reconnect' })
+  fireEvent.click(reconnect)
+  expect(reconnect).toBeDisabled()
+  fireEvent.click(reconnect)
+  expect(reconnectHost).toHaveBeenCalledTimes(1)
+
+  await act(async () => {
+    finish(false)
+  })
+  expect(reconnect).toBeEnabled()
+  expect(screen.getAllByText('Build box is offline')).toHaveLength(1)
+  fireEvent.click(reconnect)
+  expect(reconnectHost).toHaveBeenCalledTimes(2)
+  await act(async () => {
+    finish(true)
+  })
 })
 
 it('offers no Reconnect for a host that refused us, and promises no delivery in the composer', () => {
@@ -172,6 +242,57 @@ it('offers no Reconnect for a host that refused us, and promises no delivery in
   expect(screen.queryByText(/Messages send when/)).toBeNull()
 })
 
+it.each(['approval', 'question'] as const)(
+  'keeps the empty %s notice region mounted when its first host row arrives',
+  (kind) => {
+    mocks.promptItems = [promptItem(kind)]
+    renderPane()
+    const region = screen.getByRole('list')
+    expect(region.textContent).toBe('')
+    expect(region).toHaveAttribute('aria-live', 'polite')
+    setHost(hostStatus('blocked', 'disconnected', true))
+    expect(screen.getByRole('list')).toBe(region)
+    expect(region.textContent).toBe('Build box is offlineReconnect')
+    expect(screen.getByRole('listitem')).toHaveAttribute('data-notice-kind', 'host')
+    expect(screen.queryByRole('status')).toBeNull()
+  }
+)
+
+it.each(['approval', 'question'] as const)(
+  'keeps the host row and pending Reconnect when a %s takes the composer slot',
+  async (kind) => {
+    let finish: () => void = () => {}
+    reconnectHost.mockImplementation(
+      () =>
+        new Promise<boolean>((resolve) => {
+          finish = () => resolve(false)
+        })
+    )
+    const pane = renderPane()
+    setHost(hostStatus('blocked', 'disconnected', true))
+    fireEvent.click(screen.getByRole('button', { name: 'Reconnect' }))
+    mocks.promptItems = [promptItem(kind)]
+    pane.rerender(paneElement())
+
+    expect(screen.queryByTestId('structured-composer')).toBeNull()
+    expect(document.querySelector(`[data-native-chat-${kind}-card-mock]`)).toBeTruthy()
+    expect(screen.getAllByText('Build box is offline')).toHaveLength(1)
+    expect(screen.getByRole('listitem')).toHaveAttribute('data-notice-kind', 'host')
+    expect(screen.getByRole('button', { name: 'Reconnect' })).toBeDisabled()
+    expect(screen.queryByRole('button', { name: 'Dismiss' })).toBeNull()
+    const region = screen.getByRole('list')
+
+    await act(async () => {
+      finish()
+    })
+    expect(screen.getByRole('button', { name: 'Reconnect' })).toBeEnabled()
+    setHost(hostStatus('verified', 'ready'))
+    expect(screen.queryByText('Build box is offline')).toBeNull()
+    expect(screen.getByRole('list')).toBe(region)
+    expect(region).toHaveAttribute('aria-live', 'polite')
+  }
+)
+
 it('says the outage once: a lost read beside messages adds no line of its own', () => {
   mocks.status = 'error'
   renderPane()
@@ -180,6 +301,8 @@ it('says the outage once: a lost read beside messages adds no line of its own',
   expect(screen.getByTestId('message-list')).toBeTruthy()
   expect(screen.getByText('Build box is offline')).toBeTruthy()
   expect(screen.queryByText(/couldn't be loaded/)).toBeNull()
+  expect(document.querySelectorAll('[data-notice-kind="host"]')).toHaveLength(1)
+  expect(document.querySelectorAll('[data-notice-kind="error"]')).toHaveLength(0)
 })
 
 it('says the outage once: a chat that never loaded waits quietly instead of failing', () => {
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 4be08aa86945..4056dbf1e245 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
@@ -1,6 +1,6 @@
 // @vitest-environment happy-dom
 
-import { cleanup, fireEvent, render, screen, waitFor } from '@testing-library/react'
+import { cleanup, fireEvent, render, screen } from '@testing-library/react'
 import { afterEach, describe, expect, it, vi } from 'vitest'
 import { FLOATING_TERMINAL_WORKTREE_ID } from '../../../../shared/constants'
 
@@ -11,6 +11,9 @@ const { mocks, moduleFactories, resetStructuredSessionMocks } = await vi.hoisted
 vi.mock('@/lib/structured-agent-session-launch', () =>
   moduleFactories.structuredAgentSessionLaunch()
 )
+vi.mock('@/lib/structured-agent-session-launch-message', () =>
+  moduleFactories.structuredAgentSessionLaunchMessage()
+)
 vi.mock('@/runtime/structured-agent-session-client', () =>
   moduleFactories.structuredAgentSessionClient()
 )
@@ -26,7 +29,6 @@ vi.mock('./NativeChatApprovalCard', () => moduleFactories.nativeChatApprovalCard
 vi.mock('./NativeChatQuestionCard', () => moduleFactories.nativeChatQuestionCard())
 
 import { NativeChatStructuredSession } from './NativeChatStructuredSession'
-import { readOutbox } from './structured-agent-session-outbox-storage'
 import { agentSessionRefusalFailure } from '../../../../shared/agent-session-write-failure'
 
 const NOT_SIGNED_IN = {
@@ -50,7 +52,7 @@ function sessionView(): React.JSX.Element {
   )
 }
 
-function composerSend(): (text: string, attachments: unknown[]) => boolean {
+function composerSend(): (text: string, attachments: unknown[]) => boolean | 'queued' {
   const send = mocks.composerProps?.structuredTransport?.send
   if (typeof send !== 'function') {
     throw new Error('Structured composer transport was not installed')
@@ -195,92 +197,39 @@ describe('NativeChatStructuredSession launch lifecycle', () => {
     expect(screen.getByText('Chat connection could not be confirmed.')).toBeTruthy()
   })
 
-  it('keeps the durable outbox parked until publication, then dispatches it once', async () => {
-    mocks.mode = 'outbox'
-    mocks.launchLifecycle = 'visibility-unknown'
-    mocks.call.mockResolvedValue({
-      ok: true,
-      value: { submission: { clientMessageId: 'client-1', dispatchState: 'accepted' } }
-    })
-    const { rerender } = render(sessionView())
-    const send = mocks.composerProps?.structuredTransport?.send
-    if (typeof send !== 'function') {
-      throw new Error('Structured composer transport was not installed')
-    }
-
-    expect(send('queued while launching', [])).toBe(true)
-    expect(mocks.call).not.toHaveBeenCalled()
-    fireEvent.click(screen.getByRole('button', { name: 'Retry' }))
-    expect(mocks.call).not.toHaveBeenCalled()
-
-    mocks.launchLifecycle = 'published'
-    rerender(sessionView())
-    await waitFor(() => expect(mocks.call).toHaveBeenCalledOnce())
-    expect(mocks.call).toHaveBeenCalledWith(
-      { kind: 'local' },
-      'agentSession.send',
-      expect.objectContaining({ envelope: expect.objectContaining({ sessionId: 'session-1' }) })
-    )
-  })
-
-  it('relaunches a failed start on send, then delivers the message once it publishes', async () => {
-    mocks.mode = 'outbox'
+  // The message rides the restart as its first message, held until the chat exists.
+  it('relaunches a failed start on send, with the message as its first message', () => {
     mocks.launchLifecycle = 'failed'
-    mocks.call.mockResolvedValue({
-      ok: true,
-      value: { submission: { clientMessageId: 'client-1', dispatchState: 'accepted' } }
-    })
-    const { rerender } = render(sessionView())
+    render(sessionView())
 
     expect(composerSend()('restart and say hi', [])).toBe(true)
     // The relaunch is launch Retry's own: a new create operation under the same session.
     expect(mocks.retryLaunch).toHaveBeenCalledExactlyOnceWith('wt-1', 'session-1')
-    expect(mocks.call).not.toHaveBeenCalled()
-
-    mocks.launchLifecycle = 'published'
-    rerender(sessionView())
-    await waitFor(() => expect(mocks.call).toHaveBeenCalledOnce())
-    expect(mocks.call).toHaveBeenCalledWith(
-      { kind: 'local' },
-      'agentSession.send',
-      expect.objectContaining({ envelope: expect.objectContaining({ sessionId: 'session-1' }) })
+    expect(mocks.relaunchWithMessage).toHaveBeenCalledWith(
+      'wt-1',
+      'session-1',
+      'restart and say hi'
     )
+    expect(mocks.send).not.toHaveBeenCalled()
   })
 
-  it('keeps the message queued with the reason shown when the relaunch fails again', async () => {
-    mocks.mode = 'outbox'
-    mocks.launchLifecycle = 'failed'
-    mocks.call.mockResolvedValue({
-      ok: true,
-      value: { submission: { clientMessageId: 'client-1', dispatchState: 'accepted' } }
-    })
-    const { rerender } = render(sessionView())
-
-    expect(composerSend()('still there?', [])).toBe(true)
-    mocks.launchFailure = NOT_SIGNED_IN
-    rerender(sessionView())
-
-    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({
-        state: 'queued',
-        body: expect.objectContaining({ blocks: [{ type: 'text', text: 'still there?' }] })
-      })
-    ])
+  it.each(['pending', 'visibility-unknown'] as const)(
+    'takes no send while the chat is %s: Send is off and the text stays',
+    (lifecycle) => {
+      mocks.launchLifecycle = lifecycle
+      render(sessionView())
 
-    fireEvent.click(screen.getByRole('button', { name: 'Retry' }))
-    mocks.launchLifecycle = 'published'
-    rerender(sessionView())
-    await waitFor(() => expect(mocks.call).toHaveBeenCalledOnce())
-  })
+      expect(composerSend()('sent while starting', [])).toBe(false)
+      expect(mocks.composerProps?.structuredTransport?.sendOut).toBe(true)
+      expect(mocks.retryLaunch).not.toHaveBeenCalled()
+      expect(mocks.send).not.toHaveBeenCalled()
+    }
+  )
 
-  // The parked messages are the transcript here, and the reader may have scrolled up among them.
-  it('brings the latest into view when launch Retry relaunches behind a parked message', async () => {
-    mocks.mode = 'outbox'
+  // Launch Retry relaunches the chat, and the reader may have scrolled up in it.
+  it('brings the latest into view when launch Retry relaunches a failed chat', async () => {
     mocks.launchLifecycle = 'failed'
     render(sessionView())
-    expect(composerSend()('still there?', [])).toBe(true)
     await screen.findByRole('button', { name: 'Retry' })
     mocks.revealLatest.mockClear()
 
@@ -289,15 +238,6 @@ describe('NativeChatStructuredSession launch lifecycle', () => {
     expect(mocks.revealLatest).toHaveBeenCalledOnce()
   })
 
-  it('leaves a send into an unconfirmed start parked without relaunching', () => {
-    mocks.mode = 'outbox'
-    mocks.launchLifecycle = 'visibility-unknown'
-    render(sessionView())
-
-    expect(composerSend()('queued while unconfirmed', [])).toBe(true)
-    expect(mocks.retryLaunch).not.toHaveBeenCalled()
-  })
-
   it.each([null, 'published'] as const)(
     'enables provider transport for lifecycle %s',
     (lifecycle) => {
diff --git a/src/renderer/src/components/native-chat/NativeChatStructuredSession.newer-approval.test.tsx b/src/renderer/src/components/native-chat/NativeChatStructuredSession.newer-approval.test.tsx
index a2777c8c8dbe..52b9a19e6b81 100644
--- a/src/renderer/src/components/native-chat/NativeChatStructuredSession.newer-approval.test.tsx
+++ b/src/renderer/src/components/native-chat/NativeChatStructuredSession.newer-approval.test.tsx
@@ -88,6 +88,25 @@ it('sends nothing for the card when no turn is running', () => {
   expect(mocks.cancel).not.toHaveBeenCalled()
 })
 
+it('cancels a Pi extension dialog outside a model turn', () => {
+  mocks.promptItems = [NEWER_APPROVAL]
+  render(
+    <NativeChatStructuredSession
+      isVisible
+      isFocusedGroup
+      tabId="pi-dialog-tab"
+      sessionId="pi-dialog-session"
+      target={{ kind: 'local' }}
+      agent="pi"
+    />
+  )
+  mocks.approvalCardProps?.onCancel?.()
+  expect(mocks.cancel).toHaveBeenCalledWith(undefined, {
+    itemId: 'approval-item',
+    expectedRevision: 3
+  })
+})
+
 function renderSession() {
   render(
     <NativeChatStructuredSession
diff --git a/src/renderer/src/components/native-chat/NativeChatStructuredSession.test-composer.tsx b/src/renderer/src/components/native-chat/NativeChatStructuredSession.test-composer.tsx
index 5a0a6fd5365f..c490cd6b691b 100644
--- a/src/renderer/src/components/native-chat/NativeChatStructuredSession.test-composer.tsx
+++ b/src/renderer/src/components/native-chat/NativeChatStructuredSession.test-composer.tsx
@@ -21,6 +21,8 @@ export function createStructuredSessionComposerMock(mocks: {
             return true
           },
           insertTypedText: () => true,
+          appendText: () => {},
+          acceptsText: () => true,
           handlePasteEvent: mocks.handlePasteEvent,
           pasteFromClipboard: mocks.pasteFromClipboard,
           contains: (node: Node | null) => fieldRef.current?.contains(node) === true
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 ea0cfd265b54..fde56b4d944a 100644
--- a/src/renderer/src/components/native-chat/NativeChatStructuredSession.test-harness.tsx
+++ b/src/renderer/src/components/native-chat/NativeChatStructuredSession.test-harness.tsx
@@ -36,8 +36,8 @@ function absent<T>(): T | undefined {
   return undefined
 }
 
-/** Stands in for the transcript: renders only each message's delivery notice and its Retry, or the
- *  row's quiet "Sending…" while nothing has confirmed it. */
+/** Stands in for the transcript: renders only each message's delivery notice, or the row's quiet
+ *  "Sending…" while nothing has confirmed it. */
 export function DeliveryNoticesMock({
   notices
 }: {
@@ -48,11 +48,6 @@ export function DeliveryNoticesMock({
       {[...(notices ?? [])].map(([id, notice]) => (
         <div key={id} data-message-id={id}>
           <span>{notice.sending ? 'Sending…' : notice.text}</span>
-          {notice.onRetry ? (
-            <button type="button" onClick={notice.onRetry}>
-              Retry
-            </button>
-          ) : null}
         </div>
       ))}
     </div>
@@ -135,8 +130,9 @@ export function createStructuredSessionMocks() {
     launchFailure: nullable<AgentSessionWriteRefusal>(),
     launchResumes: false,
     retryLaunch: vi.fn<(worktreeId: string, sessionId: string) => unknown>(),
+    relaunchWithMessage: vi.fn<(worktreeId: string, sessionId: string, text: string) => void>(),
     controllerProps: nullable<{ transportEnabled?: boolean }>(),
-    mode: 'static' as 'static' | 'outbox',
+    send: vi.fn<(text: string, attachments?: unknown[]) => boolean>(() => true),
     status: 'ready' as 'idle' | 'loading' | 'ready' | 'error',
     readRefusal: absent<AgentSessionRefusalReference>(),
     messages: null as null | unknown[],
@@ -200,10 +196,6 @@ export function createStructuredSessionMocks() {
       subscribeStructuredAgentSessionStatus: async () => ({ unsubscribe: () => {} })
     }),
     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
@@ -211,48 +203,33 @@ export function createStructuredSessionMocks() {
           transportEnabled?: boolean
         }) => {
           mocks.controllerProps = props
-          const outbox = useStructuredAgentSessionOutbox({
-            journalItems: mocks.journalItems,
-            sessionId: props.sessionId,
-            target: props.target,
-            fence: props.transportEnabled === false ? null : 1,
-            submissions: mocks.submissions as never
-          })
           return {
             journalItems: mocks.journalItems,
-            messages:
-              mocks.messages ??
-              (mocks.mode === 'outbox'
-                ? projectStructuredAgentSessionMessages([], outbox.outbox, [], {
-                    rejectedInPlace: true
-                  })
-                : [
-                    {
-                      id: 'message-1',
-                      role: 'assistant',
-                      source: 'transcript',
-                      timestamp: 1,
-                      blocks: [
-                        {
-                          type: 'text',
-                          text: '[file](file:///repo/src/main.ts)'
-                        }
-                      ]
-                    }
-                  ]),
+            messages: mocks.messages ?? [
+              {
+                id: 'message-1',
+                role: 'assistant',
+                source: 'transcript',
+                timestamp: 1,
+                blocks: [
+                  {
+                    type: 'text',
+                    text: '[file](file:///repo/src/main.ts)'
+                  }
+                ]
+              }
+            ],
             status: mocks.status,
-            error: outbox.error,
+            error: null,
             readRefusal: mocks.readRefusal,
             hasOlder: mocks.hasOlder,
             loadingOlder: mocks.loadingOlder,
             olderHistoryGeneration: mocks.olderHistoryGeneration,
             loadOlder: mocks.loadOlder,
             prompts: mocks.promptItems,
-            outbox: outbox.outbox,
-            failedHere: outbox.failedHere,
+            pending: [],
             submissions: mocks.submissions,
-            send: outbox.send,
-            retry: outbox.retry,
+            send: mocks.send,
             isWorking: mocks.isWorking,
             backgroundTasks: {
               show: mocks.showBackgroundTasks || mocks.monitoringBackgroundTasks,
@@ -328,6 +305,20 @@ export function createStructuredSessionMocks() {
       },
       useStructuredAgentSessionLaunchFailure: () => mocks.launchFailure
     }),
+    structuredAgentSessionLaunchMessage: () => ({
+      relaunchFailedStructuredAgentSessionWithMessage: (
+        worktreeId: string,
+        sessionId: string,
+        text: string
+      ) => {
+        if (mocks.launchLifecycle !== 'failed') {
+          return null
+        }
+        mocks.retryLaunch(worktreeId, sessionId)
+        mocks.relaunchWithMessage(worktreeId, sessionId, text)
+        return new Promise(() => {})
+      }
+    }),
     useNativeChatFontSize: () => ({
       useNativeChatFontSize: () => undefined
     }),
@@ -371,9 +362,10 @@ export function createStructuredSessionMocks() {
     mocks.launchFailure = null
     mocks.launchResumes = false
     mocks.retryLaunch.mockReset()
+    mocks.relaunchWithMessage.mockReset()
     mocks.lifecycleLookup.mockReset()
     mocks.controllerProps = null
-    mocks.mode = 'static'
+    mocks.send.mockClear()
     mocks.status = 'ready'
     mocks.readRefusal = undefined
     mocks.messages = null
diff --git a/src/renderer/src/components/native-chat/NativeChatStructuredSession.test.tsx b/src/renderer/src/components/native-chat/NativeChatStructuredSession.test.tsx
index 410aaff4160b..5fd922be40b5 100644
--- a/src/renderer/src/components/native-chat/NativeChatStructuredSession.test.tsx
+++ b/src/renderer/src/components/native-chat/NativeChatStructuredSession.test.tsx
@@ -32,7 +32,6 @@ vi.mock('./NativeChatQuestionCard', () => moduleFactories.nativeChatQuestionCard
 
 import { NativeChatStructuredSession } from './NativeChatStructuredSession'
 import { structuredAgentSessionPaneKey } from '../../../../shared/structured-agent-session-projection'
-import { seededEntry, seedOutbox } from './NativeChatStructuredSession.test-harness'
 import { structuredAgentSessionDraftScopeKey } from './native-chat-composer-draft-store'
 
 describe('NativeChatStructuredSession', () => {
@@ -746,6 +745,34 @@ describe('NativeChatStructuredSession', () => {
     })
   })
 
+  it('gives a question card the keyboard, holds it while its answer is with the host, and frees it on a refusal', async () => {
+    mocks.promptItems = legacySingleQuestionPromptItems
+    render(
+      <NativeChatStructuredSession
+        isVisible
+        isFocusedGroup
+        tabId="structured-tab-hold"
+        sessionId="session-hold"
+        target={{ kind: 'local' }}
+        agent="claude"
+      />
+    )
+    let refuse: (result: null) => void = () => {}
+    mocks.respond.mockReturnValueOnce(
+      new Promise<null>((resolve) => {
+        refuse = resolve
+      })
+    )
+
+    // The card owns this pane's keyboard, which is what turns its number keys on.
+    expect(mocks.questionCardProps?.shouldFocus).toBe(true)
+    act(() => mocks.questionCardProps?.onAnswer([{ indices: [1], other: '' }]))
+    expect(mocks.questionCardProps?.isSubmitting).toBe(true)
+    await act(async () => refuse(null))
+
+    expect(mocks.questionCardProps?.isSubmitting).toBe(false)
+  })
+
   // The reader may have scrolled far up; what they just did has to come into view.
   it('brings the latest into view at the press for the submits this pane makes', async () => {
     mocks.promptItems = legacySingleQuestionPromptItems
@@ -795,32 +822,6 @@ describe('NativeChatStructuredSession', () => {
     expect(mocks.revealLatest).toHaveBeenCalledTimes(2)
   })
 
-  it('reveals the latest when a delivery notice retries its message', async () => {
-    mocks.mode = 'outbox'
-    mocks.call.mockResolvedValue({
-      ok: true,
-      value: { submission: { clientMessageId: 'op-head', dispatchState: 'accepted' } }
-    })
-    seedOutbox('session-retry-reveal', [
-      seededEntry('session-retry-reveal', 'op-head', 'first', 'unconfirmed')
-    ])
-    render(
-      <NativeChatStructuredSession
-        isVisible
-        isFocusedGroup
-        tabId="structured-tab-retry-reveal"
-        sessionId="session-retry-reveal"
-        target={{ kind: 'local' }}
-        agent="codex"
-      />
-    )
-
-    fireEvent.click(await screen.findByRole('button', { name: /Retry/ }))
-
-    expect(mocks.revealLatest).toHaveBeenCalledOnce()
-    await waitFor(() => expect(mocks.call).toHaveBeenCalledOnce())
-  })
-
   it("brings the latest into view when a queued card's Steer sends it now", () => {
     mocks.queuedCards = [
       { messageId: 'draft-1', position: 1, text: 'Also check SSH', state: 'waiting', hold: 'turn' }
diff --git a/src/renderer/src/components/native-chat/NativeChatStructuredSession.tsx b/src/renderer/src/components/native-chat/NativeChatStructuredSession.tsx
index b8926ec61770..5d34f797df60 100644
--- a/src/renderer/src/components/native-chat/NativeChatStructuredSession.tsx
+++ b/src/renderer/src/components/native-chat/NativeChatStructuredSession.tsx
@@ -4,15 +4,17 @@ import { useNativeChatStoreAppearanceStyle } from './use-native-chat-store-appea
 import { useMemo, useRef, useState } from 'react'
 import { agentSessionPromptQuestions } from '../../../../shared/agent-session-question-answer'
 import { structuredAgentSessionPaneKey } from '../../../../shared/structured-agent-session-projection'
-import type { NativeChatLiveSession } from './use-native-chat-live-session'
+import { useStructuredChatLiveSession } from './use-structured-chat-live-session'
 import { NativeChatApprovalCard } from './NativeChatApprovalCard'
 import { NativeChatComposer, type NativeChatComposerHandle } from './NativeChatComposer'
+import type { NativeChatOptionPickerRequest } from './native-chat-composer-types'
 import { structuredAgentSessionDraftScopeKey } from './native-chat-composer-draft-store'
 import { NativeChatEmptyState } from './NativeChatEmptyState'
 import { NativeChatLoadingCue } from './NativeChatLoadingCue'
 import { NativeChatMessageList } from './NativeChatMessageList'
 import { useStructuredNativeChatSubmitReveal } from './use-structured-native-chat-submit-reveal'
-import { NativeChatQuestionCard } from './NativeChatQuestionCard'
+import { useStructuredPromptResponseHold } from './use-structured-prompt-response-hold'
+import { NativeChatStructuredQuestionCard } from './NativeChatStructuredQuestionCard'
 import { selectNativeChatViewState, structuredChatHistoryPhase } from './native-chat-view-state'
 import { useNativeChatComposerRevealFocus } from './use-native-chat-composer-reveal-focus'
 import { useNativeChatFontSize } from './use-native-chat-font-size'
@@ -26,6 +28,11 @@ import { useStructuredNativeChatPaneCommands } from './use-structured-native-cha
 import type { NativeChatStructuredViewProps } from './native-chat-view-types'
 import { NativeChatStructuredSessionStatus } from './NativeChatStructuredSessionStatus'
 import { useNativeChatLaunchDraftSignal } from './use-native-chat-launch-draft-adoption'
+import {
+  NativeChatInterruptedContinue,
+  useNativeChatInterruptedContinuation
+} from './NativeChatInterruptedContinue'
+import { NativeChatOrcaStopContext } from './native-chat-orca-stop-context'
 import { structuredSessionNotices } from './native-chat-structured-session-notices'
 import { NativeChatPromptSlotNotices } from './NativeChatComposerNotices'
 import { useNativeChatComposerError } from './use-native-chat-composer-notice'
@@ -43,10 +50,14 @@ import { NativeChatThreadGoalBanner } from './NativeChatThreadGoalBanner'
 import { structuredAgentSessionReadFailureNotice } from './structured-agent-session-read-failure-notice'
 import { useStructuredAgentSessionDeliveryNotices } from './use-structured-agent-session-delivery-notices'
 import { useNativeChatHostOutage } from './use-native-chat-host-outage'
-import { NativeChatHostOutageNotice } from './NativeChatHostOutageNotice'
+import { useNativeChatHostOutageNotice } from './use-native-chat-host-outage-notice'
 import { pendingPromptsAllUnanswerableHere } from '../../../../shared/agent-session-approval-subject'
-
-type OptionPickerRequest = { id: string; sequence: number }
+import { useStructuredAgentSessionStartFailureFacts } from './use-structured-agent-session-start-failure-facts'
+import {
+  isClaudeSignInFailureKind,
+  NativeChatClaudeSignInContext,
+  useNativeChatClaudeSignIn
+} from './native-chat-claude-sign-in'
 
 export function NativeChatStructuredSession(
   props: Omit<NativeChatStructuredViewProps, 'mode'>
@@ -54,7 +65,7 @@ export function NativeChatStructuredSession(
   const ownerWorktreeId = useNativeChatTabOwnerWorktreeId(props.tabId)
   const fileLinkContext = useNativeChatFileLinkContext(props.tabId)
   const provisionalLaunch = useNativeChatProvisionalLaunch(ownerWorktreeId, props.sessionId)
-  const { sendThroughRelaunch } = provisionalLaunch
+  const { sendThroughLaunch } = provisionalLaunch
   // The host's own word on whether the provider child has answered startup yet.
   const hostExecution = useStructuredAgentSessionHostExecution(props.sessionId, props.target)
   const paneKey = useMemo(
@@ -64,6 +75,8 @@ export function NativeChatStructuredSession(
   // Chat-wide: absent means on; only an explicit off keeps mid-turn sends immediate.
   const queueFollowUps = useAppStore((store) => store.settings?.nativeChatQueueFollowUps !== false)
   const composerRef = useRef<NativeChatComposerHandle>(null)
+  // Paste target while a question card replaces the composer.
+  const questionAnswerInputRef = useRef<HTMLInputElement>(null)
   const { rewindHost, focusComposer } = useNativeChatRewindHost(props, composerRef)
   const controller = useStructuredAgentSession({
     ...props,
@@ -86,7 +99,8 @@ export function NativeChatStructuredSession(
     transcriptLoading: controller.status === 'idle' || controller.status === 'loading'
   })
   const { composerError, reportComposerError } = useNativeChatComposerError()
-  const [optionPickerRequest, setOptionPickerRequest] = useState<OptionPickerRequest | null>(null)
+  const [optionPickerRequest, setOptionPickerRequest] =
+    useState<NativeChatOptionPickerRequest | null>(null)
   const rootRef = useRef<HTMLDivElement>(null)
   const paneCommands = useStructuredNativeChatPaneCommands({
     tabId: props.tabId,
@@ -94,51 +108,41 @@ export function NativeChatStructuredSession(
     isVisible: props.isVisible,
     rootRef,
     composerRef,
+    questionAnswerInputRef,
     terminalPaneActions: props.contextMenuActions,
     sessionId: props.sessionId,
     target: props.target
   })
   const historyPhase = structuredChatHistoryPhase(provisionalLaunch, controller.status)
   const hostOutage = useNativeChatHostOutage(props.target)
-  const session = useMemo<NativeChatLiveSession>(
-    () => ({
-      messages: controller.messages,
-      status:
-        controller.status === 'error'
-          ? 'error'
-          : historyPhase !== 'known'
-            ? 'loading'
-            : controller.isWorking
-              ? 'working'
-              : controller.messages.length === 0
-                ? 'empty'
-                : 'ready',
-      sessionId: props.sessionId,
-      agent: props.agent,
-      ...(controller.error ? { error: controller.error } : {}),
-      // Older pages can't load while the host is unreachable, so the row waits for it.
-      hasMore: controller.hasOlder && hostOutage === null,
-      loadingEarlier: controller.loadingOlder,
-      olderHistoryGeneration: controller.olderHistoryGeneration,
-      loadEarlier: controller.loadOlder,
-      readPhase:
-        controller.status === 'loading'
-          ? 'loading'
-          : controller.status === 'error'
-            ? 'error'
-            : 'ready'
-    }),
-    [controller, historyPhase, hostOutage, props.agent, props.sessionId]
+  const hostNotice = useNativeChatHostOutageNotice(hostOutage)
+  const session = useStructuredChatLiveSession(
+    controller,
+    historyPhase,
+    props.sessionId,
+    props.agent,
+    hostOutage === null
   )
   const submits = useStructuredNativeChatSubmitReveal(controller, provisionalLaunch.retry)
-  const { retryDelivery, revealLatest } = submits
+  const { revealLatest } = submits
+  const promptResponse = useStructuredPromptResponseHold(submits.respond)
   const agentLabel = structuredAgentLabel(props.agent)
+  const continuation = useNativeChatInterruptedContinuation({
+    target: props.target,
+    sessionId: props.sessionId,
+    journalItems: controller.journalItems,
+    submissions: controller.submissions,
+    isWorking: controller.isWorking,
+    composer: { clearError: () => reportComposerError(null) }
+  })
+  const startFailures = useStructuredAgentSessionStartFailureFacts(
+    controller.journalItems,
+    props.agent === 'claude'
+  )
   const deliveryNotices = useStructuredAgentSessionDeliveryNotices({
-    outbox: controller.outbox,
+    pending: controller.pending,
     submissions: controller.submissions,
     journalItems: controller.journalItems,
-    failedHere: controller.failedHere,
-    retry: retryDelivery,
     agentName: agentLabel
   })
   // Nothing reads an unread history, so its pane stays blank beside the Retry line.
@@ -170,8 +174,8 @@ export function NativeChatStructuredSession(
   const composerShown = (prompt === null || promptsUnanswerable) && !readFailedFinally
   const approval = prompt?.body.kind === 'approval' ? chatApprovalFromJournal(prompt.body) : null
   const cancelPrompt = () => {
-    if (controller.turnId && prompt) {
-      void controller.cancel(controller.turnId, {
+    if (prompt && (controller.turnId || props.agent === 'pi')) {
+      void controller.cancel(controller.turnId ?? undefined, {
         itemId: prompt.itemId,
         expectedRevision: prompt.revision
       })
@@ -189,7 +193,8 @@ export function NativeChatStructuredSession(
   const structuredTransport = useNativeChatStructuredComposerTransport({
     props,
     controller,
-    sendThroughRelaunch,
+    sendThroughLaunch,
+    starting: provisionalLaunch.starting,
     worktreeId: ownerWorktreeId ?? undefined,
     optionPickerRequest,
     setOptionPickerRequest,
@@ -202,20 +207,29 @@ export function NativeChatStructuredSession(
   const sessionError =
     viewState.kind === 'error' || !readFailure ? controller.error : readFailure.text
   const launch = { ...provisionalLaunch, retry: submits.retryLaunch }
-  const notices = structuredSessionNotices({ launch, agentLabel, sessionError, composerError })
+  const claudeSignIn = useNativeChatClaudeSignIn({
+    agent: props.agent,
+    target: props.target,
+    failure: provisionalLaunch.failure,
+    failureRows: startFailures.filter((fact) => isClaudeSignInFailureKind(fact.kind)).length
+  })
+  const notices = structuredSessionNotices({
+    launch,
+    agentLabel,
+    sessionError,
+    composerError: composerError ?? continuation.continueError,
+    claudeSignIn
+  })
+  if (hostNotice) {
+    notices.push(hostNotice)
+  }
   return (
     <div
       ref={rootRef}
       data-native-chat-root="true"
       data-native-chat-working={controller.isWorking ? 'true' : 'false'}
       tabIndex={-1}
-      onPointerDownCapture={(event) => {
-        if (event.button === 2) {
-          paneCommands.onSelectionCapture()
-        }
-      }}
-      onMouseUpCapture={paneCommands.onSelectionCapture}
-      onKeyUpCapture={paneCommands.onSelectionCapture}
+      onPointerDownCapture={paneCommands.onPointerDownCapture}
       onKeyDownCapture={paneCommands.onKeyDownCapture}
       onContextMenuCapture={paneCommands.onContextMenuCapture}
       className={cn(
@@ -238,41 +252,45 @@ export function NativeChatStructuredSession(
           <NativeChatEmptyState kind="empty" agent={props.agent} />
         ) : (
           <NativeChatRewindContext.Provider value={controller.rewind.surface}>
-            <NativeChatMessageList
-              // A rewind replaces the conversation; nothing the old transcript held carries over.
-              key={controller.epoch ?? undefined}
-              ref={submits.messageListRef}
-              session={session}
-              journalItems={controller.journalItems}
-              journalSubmissions={controller.submissions}
-              journalLatestTurn={controller.latestTurn}
-              subagentRoster={controller.subagentRoster}
-              railOutline={controller.railOutline}
-              isVisible={props.isVisible}
-              isWorking={controller.isWorking}
-              expandSignal={false}
-              workingStartedAt={controller.workingStartedAt}
-              settledTurns={controller.settledTurns}
-              awaitingInput={prompt === null ? null : 'shown'}
-              turnActivity={controller.turnActivity}
-              stopping={stopControls.stopping}
-              onLinkClick={onLinkClick}
-              allowFileUriLinks={onLinkClick !== undefined}
-              runtimeContext={imageRuntimeContext}
-              deliveryNotices={deliveryNotices}
-            />
+            <NativeChatOrcaStopContext.Provider value={continuation.view}>
+              <NativeChatClaudeSignInContext.Provider value={claudeSignIn}>
+                <NativeChatMessageList
+                  // A rewind replaces the conversation; nothing the old transcript held carries over.
+                  key={controller.epoch ?? undefined}
+                  ref={submits.messageListRef}
+                  session={session}
+                  journalItems={controller.journalItems}
+                  journalSubmissions={controller.submissions}
+                  journalLatestTurn={controller.latestTurn}
+                  subagentRoster={controller.subagentRoster}
+                  railOutline={controller.railOutline}
+                  isVisible={props.isVisible}
+                  isWorking={controller.isWorking}
+                  expandSignal={false}
+                  workingStartedAt={controller.workingStartedAt}
+                  settledTurns={controller.settledTurns}
+                  awaitingInput={prompt === null ? null : 'shown'}
+                  turnActivity={controller.turnActivity}
+                  stopping={stopControls.stopping}
+                  onLinkClick={onLinkClick}
+                  allowFileUriLinks={onLinkClick !== undefined}
+                  runtimeContext={imageRuntimeContext}
+                  deliveryNotices={deliveryNotices}
+                />
+              </NativeChatClaudeSignInContext.Provider>
+            </NativeChatOrcaStopContext.Provider>
           </NativeChatRewindContext.Provider>
         )}
       </div>
       {readFailedFinally ? null : (
         <>
+          <NativeChatInterruptedContinue continuation={continuation} />
           {/* Host-held drafts, never transcript rows. Above the status area, so running shells and agents sit next to the composer. */}
           <NativeChatQueuedMessageList
             controller={submits.queuedMessages}
             steerHeld={stopControls.stopping}
             focusComposer={focusComposer}
           />
-          <NativeChatHostOutageNotice outage={hostOutage} />
           <NativeChatStructuredSessionStatus
             sessionId={props.sessionId}
             paneKey={paneKey}
@@ -300,7 +318,10 @@ export function NativeChatStructuredSession(
             <NativeChatApprovalCard
               key={`${prompt.itemId}:${prompt.revision}`}
               approval={approval}
-              onChoose={(optionId) => void submits.respond(prompt, { kind: 'option', optionId })}
+              onChoose={(optionId) =>
+                void promptResponse.respond(prompt, { kind: 'option', optionId })
+              }
+              isSubmitting={promptResponse.holds(prompt)}
               onCancel={cancelPrompt}
               shouldFocus={!promptsUnanswerable && props.isVisible && props.isFocusedGroup}
               onLinkClick={onLinkClick}
@@ -308,35 +329,14 @@ export function NativeChatStructuredSession(
             />
           ) : null}
           {prompt && questionBody ? (
-            <NativeChatQuestionCard
+            <NativeChatStructuredQuestionCard
               key={`${prompt.itemId}:${prompt.revision}`}
-              prompt={{
-                questions: questions.map((question) => ({
-                  question: question.question,
-                  ...(question.header ? { header: question.header } : {}),
-                  multiSelect: question.multiSelect,
-                  options: question.options.map((option) => ({
-                    label: option.label,
-                    ...(option.description ? { description: option.description } : {})
-                  }))
-                }))
-              }}
-              allowOther={questions.map((question) => Boolean(question.freeTextQuestionId))}
-              onAnswer={(answers) => {
-                const chosen = questions.map((question, questionIndex) => {
-                  const answer = answers[questionIndex]
-                  const other = answer?.other?.trim()
-                  const optionIds = (answer?.indices ?? []).flatMap((optionIndex) => {
-                    const optionId = question.options[optionIndex]?.id
-                    return optionId ? [optionId] : []
-                  })
-                  return { questionId: question.id, optionIds, ...(other ? { other } : {}) }
-                })
-                if (chosen.every((answer) => answer.optionIds.length > 0 || answer.other)) {
-                  void submits.respond(prompt, { kind: 'answers', answers: chosen })
-                }
-              }}
+              questions={questions}
+              onAnswer={(response) => void promptResponse.respond(prompt, response)}
+              isSubmitting={promptResponse.holds(prompt)}
               onCancel={cancelPrompt}
+              shouldFocus={!promptsUnanswerable && props.isVisible && props.isFocusedGroup}
+              answerInputRef={questionAnswerInputRef}
             />
           ) : null}
           {composerShown ? (
@@ -352,6 +352,7 @@ export function NativeChatStructuredSession(
               structuredTransport={structuredTransport}
               launchSeed={{ ...launchDraftSignal, ownsTabWideLaunchDraft: true }}
               notices={notices}
+              recallSource={{ messages: session.messages }}
             />
           ) : null}
         </>
diff --git a/src/renderer/src/components/native-chat/NativeChatStructuredSessionDelivery.probe.test.tsx b/src/renderer/src/components/native-chat/NativeChatStructuredSessionDelivery.probe.test.tsx
deleted file mode 100644
index b0e51894dcff..000000000000
--- a/src/renderer/src/components/native-chat/NativeChatStructuredSessionDelivery.probe.test.tsx
+++ /dev/null
@@ -1,363 +0,0 @@
-// The automatic probe of an unconfirmed outbox head: when it resends under the same
-// operation id, and when it parks the entry for the user's Retry instead.
-
-// @vitest-environment happy-dom
-
-import { act, cleanup, render, screen } 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-size', () => moduleFactories.useNativeChatFontSize())
-vi.mock('./use-native-chat-file-link-context', () => moduleFactories.useNativeChatFileLinkContext())
-vi.mock('./use-native-chat-tab-owner', () => moduleFactories.useNativeChatTabOwner())
-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'
-import {
-  advanceProbeClock,
-  seededEntry,
-  seedOutbox,
-  useProbeClock
-} from './NativeChatStructuredSession.test-harness'
-
-describe('NativeChatStructuredSession delivery probe', () => {
-  afterEach(() => {
-    cleanup()
-    vi.useRealTimers()
-    localStorage.clear()
-    resetStructuredSessionMocks()
-  })
-
-  it('resends a transport-unconfirmed head so later messages are not wedged', async () => {
-    useProbeClock()
-    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
-    await act(async () => {
-      expect(send?.('first', [])).toBe(true)
-    })
-    expect(mocks.call).toHaveBeenCalledOnce()
-
-    await act(async () => {
-      expect(send?.('second', [])).toBe(true)
-    })
-    await advanceProbeClock(999)
-    expect(mocks.call).toHaveBeenCalledOnce()
-    await advanceProbeClock(1)
-    // The head is probed automatically, clears, and the queue drains.
-    expect(mocks.call).toHaveBeenCalledTimes(3)
-    expect(screen.queryByText('Message delivery is unconfirmed.')).toBeNull()
-  }, 20000)
-
-  it('probes the same operation without marking an explicit user retry', async () => {
-    useProbeClock()
-    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
-    await act(async () => {
-      expect(send?.('first', [])).toBe(true)
-    })
-    await advanceProbeClock(999)
-    expect(mocks.call).toHaveBeenCalledOnce()
-    await advanceProbeClock(1)
-    expect(mocks.call).toHaveBeenCalledTimes(2)
-
-    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 () => {
-    useProbeClock()
-    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
-    await act(async () => {
-      expect(send?.('first', [])).toBe(true)
-    })
-    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 advanceProbeClock(3000)
-    // From the row on, only the user's Retry moves it, so it says so.
-    expect(screen.getByText('Message delivery is unconfirmed.')).toBeTruthy()
-    expect(mocks.call).toHaveBeenCalledOnce()
-  }, 20000)
-
-  it('still probes while streaming batches rebuild the submissions array', async () => {
-    useProbeClock()
-    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
-    await act(async () => {
-      expect(send?.('first', [])).toBe(true)
-    })
-    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 vi.advanceTimersByTimeAsync(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 () => {
-    useProbeClock()
-    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
-    await act(async () => {
-      expect(send?.('first', [])).toBe(true)
-    })
-    expect(mocks.call).toHaveBeenCalledOnce()
-
-    await advanceProbeClock(300)
-    rerender(makeView({ kind: 'environment', environmentId: 'env-1' }))
-    await advanceProbeClock(600)
-    expect(mocks.call).toHaveBeenCalledOnce()
-    await advanceProbeClock(399)
-    expect(mocks.call).toHaveBeenCalledOnce()
-    await advanceProbeClock(1)
-    expect(mocks.call).toHaveBeenCalledTimes(2)
-  }, 10000)
-
-  it('never auto-probes an entry the user already force-retried', async () => {
-    useProbeClock()
-    mocks.mode = 'outbox'
-    mocks.submissions = []
-    mocks.call.mockRejectedValue(new Error('socket closed'))
-    seedOutbox('session-forced', [seededEntry('session-forced', 'op-head', 'first', 'unconfirmed')])
-
-    render(
-      <NativeChatStructuredSession
-        isVisible
-        isFocusedGroup
-        tabId="structured-tab-forced"
-        sessionId="session-forced"
-        target={{ kind: 'local' }}
-        agent="codex"
-      />
-    )
-
-    await advanceProbeClock(3000)
-    // Only the user's Retry moves it, so it says so.
-    expect(screen.getByText('Message delivery is unconfirmed.')).toBeTruthy()
-    expect(mocks.call).not.toHaveBeenCalled()
-  }, 20000)
-
-  it('does not hot-loop when the host answers pending', async () => {
-    useProbeClock()
-    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
-    await act(async () => {
-      expect(send?.('first', [])).toBe(true)
-    })
-    expect(mocks.call).toHaveBeenCalledOnce()
-
-    // A host-pending entry stays parked until the journal answers it.
-    await advanceProbeClock(999)
-    expect(mocks.call).toHaveBeenCalledOnce()
-    await advanceProbeClock(1)
-    expect(mocks.call).toHaveBeenCalledOnce()
-    await advanceProbeClock(1500)
-    expect(mocks.call).toHaveBeenCalledOnce()
-  }, 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/NativeChatStructuredSessionDelivery.test.tsx b/src/renderer/src/components/native-chat/NativeChatStructuredSessionDelivery.test.tsx
deleted file mode 100644
index ebd56bd94653..000000000000
--- a/src/renderer/src/components/native-chat/NativeChatStructuredSessionDelivery.test.tsx
+++ /dev/null
@@ -1,620 +0,0 @@
-// The delivery notice and the outbox queue behind it: which entry a Retry acts
-// on, and when no notice is owed at all. The automatic probe is in the .probe suite.
-
-// @vitest-environment happy-dom
-
-import { act, cleanup, fireEvent, render, screen, waitFor } from '@testing-library/react'
-import React, { forwardRef, useImperativeHandle, useRef } from 'react'
-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(),
-  fileLinkClick: vi.fn(),
-  mode: 'static' as 'static' | 'outbox',
-  messageListProps: null as null | {
-    allowFileUriLinks?: boolean
-    onLinkClick?: (...args: unknown[]) => void
-    runtimeContext?: unknown
-  },
-  composerProps: null as null | {
-    structuredTransport?: Record<string, unknown>
-    isWorking?: boolean
-  },
-  questionCardProps: null as NativeChatQuestionCardProps | null,
-  promptItems: [] as AgentJournalRenderItem[],
-  noJournalItems: Array.of<AgentJournalRenderItem>(),
-  respond: vi.fn(),
-  handlePasteEvent: vi.fn(),
-  pasteFromClipboard: vi.fn(),
-  submissions: [] as unknown[],
-  monitoringBackgroundTasks: false,
-  supportsBackgroundTaskStop: false,
-  supportsBackgroundTaskStopAll: true,
-  backgroundTasks: [] as AgentSessionBackgroundTask[],
-  stopBackgroundTask: vi.fn()
-}))
-
-vi.mock('@/runtime/structured-agent-session-client', () => ({
-  callStructuredAgentSession: mocks.call,
-  // The pane activates the host status feed for its startup phase; nothing here drives it.
-  subscribeStructuredAgentSessionStatus: async () => ({ unsubscribe: () => {} })
-}))
-
-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
-      target: { kind: 'local' } | { kind: 'environment'; environmentId: string }
-    }) => {
-      const outbox = useStructuredAgentSessionOutbox({
-        journalItems: mocks.noJournalItems,
-        sessionId: props.sessionId,
-        target: props.target,
-        fence: 1,
-        submissions: mocks.submissions as never
-      })
-      return {
-        journalItems: [],
-        messages:
-          mocks.mode === 'outbox'
-            ? projectStructuredAgentSessionMessages([], outbox.outbox, [], {
-                rejectedInPlace: true
-              })
-            : [
-                {
-                  id: 'message-1',
-                  role: 'assistant',
-                  source: 'transcript',
-                  timestamp: 1,
-                  blocks: [{ type: 'text', text: '[file](file:///repo/src/main.ts)' }]
-                }
-              ],
-        status: 'ready' as const,
-        error: outbox.error,
-        hasOlder: false,
-        loadingOlder: false,
-        loadOlder: vi.fn(),
-        prompts: mocks.promptItems,
-        outbox: outbox.outbox,
-        failedHere: outbox.failedHere,
-        submissions: mocks.submissions,
-        send: outbox.send,
-        retry: outbox.retry,
-        isWorking: false,
-        isMonitoringBackgroundTasks: mocks.monitoringBackgroundTasks,
-        supportsBackgroundTaskStop: mocks.supportsBackgroundTaskStop,
-        supportsBackgroundTaskStopAll: mocks.supportsBackgroundTaskStopAll,
-        backgroundTasks: mocks.backgroundTasks,
-        turnId: null,
-        epoch: 'epoch-1',
-        rewind: { surface: undefined },
-        cancel: vi.fn(),
-        queuedMessages: {
-          cards: [],
-          turnRunning: false,
-          steer: vi.fn(async () => {}),
-          remove: vi.fn(async () => {}),
-          edit: vi.fn(async () => {}),
-          steerNewest: () => false,
-          queueResume: undefined
-        },
-        stopBackgroundTask: (taskId?: string) => mocks.stopBackgroundTask(props.sessionId, taskId),
-        respond: mocks.respond,
-        optionSnapshot: [
-          {
-            id: 'model',
-            label: 'Model',
-            category: 'model',
-            kind: {
-              type: 'select',
-              currentValue: 'gpt-live',
-              choices: [{ value: 'gpt-live', label: 'GPT Live' }]
-            },
-            valueSource: 'reported',
-            settable: true
-          }
-        ],
-        optionSurface: {
-          getSnapshot: () => [],
-          setOption: vi.fn(),
-          invokeAction: vi.fn(),
-          subscribe: () => () => {}
-        },
-        setStructuredOption: vi.fn()
-      }
-    }
-  }
-})
-
-vi.mock('./use-native-chat-font-size', () => ({
-  useNativeChatFontSize: () => undefined
-}))
-
-vi.mock('./use-native-chat-file-link-context', () => ({
-  useNativeChatFileLinkContext: () => ({
-    worktreeId: 'wt-1',
-    worktreePath: '/repo',
-    runtimeEnvironmentId: null
-  })
-}))
-
-vi.mock('./use-native-chat-tab-owner', () => ({
-  useNativeChatTabOwnerWorktreeId: () => 'wt-1'
-}))
-
-vi.mock('./use-native-chat-file-link-click', () => ({
-  useNativeChatFileLinkClick: (context: unknown) => (context ? mocks.fileLinkClick : undefined)
-}))
-
-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) => {
-    mocks.composerProps = props
-    const fieldRef = useRef<HTMLTextAreaElement>(null)
-    useImperativeHandle(ref, () => ({
-      // Match the real composer so focus ownership is observable in this split suite.
-      focus: () => {
-        fieldRef.current?.focus()
-        return true
-      },
-      insertTypedText: () => true,
-      handlePasteEvent: mocks.handlePasteEvent,
-      pasteFromClipboard: mocks.pasteFromClipboard,
-      contains: (node: Node | null) => fieldRef.current?.contains(node) === true
-    }))
-    return <textarea ref={fieldRef} data-testid="structured-composer" />
-  })
-}))
-vi.mock('./NativeChatEmptyState', () => ({ NativeChatEmptyState: () => null }))
-vi.mock('./NativeChatApprovalCard', () => ({ NativeChatApprovalCard: () => null }))
-vi.mock('./NativeChatQuestionCard', () => ({
-  NativeChatQuestionCard: (props: NativeChatQuestionCardProps) => {
-    mocks.questionCardProps = props
-    return null
-  }
-}))
-
-import { NativeChatStructuredSession } from './NativeChatStructuredSession'
-import {
-  advanceProbeClock,
-  seededEntry,
-  seedOutbox,
-  useProbeClock
-} from './NativeChatStructuredSession.test-harness'
-import {
-  appendStructuredAgentSessionOutboxMessage,
-  getStructuredAgentSessionOutbox
-} from './structured-agent-session-outbox-storage'
-
-const REFUSED_RESTART = "The agent couldn't restart. Your message was not sent."
-
-describe('NativeChatStructuredSession delivery', () => {
-  afterEach(() => {
-    cleanup()
-    vi.useRealTimers()
-    mocks.call.mockReset()
-    mocks.mode = 'static'
-    mocks.messageListProps = null
-    mocks.composerProps = null
-    mocks.questionCardProps = null
-    mocks.promptItems = []
-    mocks.respond.mockReset()
-    mocks.handlePasteEvent.mockReset()
-    mocks.pasteFromClipboard.mockReset()
-    mocks.submissions = []
-    mocks.monitoringBackgroundTasks = false
-    mocks.supportsBackgroundTaskStop = false
-    mocks.supportsBackgroundTaskStopAll = true
-    mocks.stopBackgroundTask.mockReset()
-    mocks.backgroundTasks = []
-  })
-
-  // Resent under its own id until the host answers, so its row says only that it is still sending.
-  it('says a send whose answer was lost is sending until it confirms on its own, with no Retry', async () => {
-    useProbeClock()
-    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
-    await act(async () => {
-      expect(send?.('hello', [])).toBe(true)
-    })
-    // From the moment it is sent, through the lost answer, until the host confirms it.
-    expect(getStructuredAgentSessionOutbox('session-1')).toMatchObject([{ state: 'unconfirmed' }])
-    expect(screen.getByText('Sending…')).toBeTruthy()
-    expect(screen.queryByText('Message delivery is unconfirmed.')).toBeNull()
-    expect(screen.queryByRole('button', { name: /Retry/ })).toBeNull()
-
-    await advanceProbeClock(1000)
-    expect(mocks.call).toHaveBeenCalledTimes(2)
-    expect(mocks.call.mock.calls[1]?.[2]).toEqual(mocks.call.mock.calls[0]?.[2])
-    expect(screen.queryByText('Sending…')).toBeNull()
-    expect(getStructuredAgentSessionOutbox('session-1')).toEqual([])
-    expect(screen.queryByText('Message delivery is unconfirmed.')).toBeNull()
-  }, 10000)
-
-  // Reopened mid-send, the send is read back in doubt; the probe resends it under its own id.
-  function seedMidSend(sessionId: string, patch: Record<string, unknown> = {}): void {
-    seedOutbox(sessionId, [
-      {
-        ...seededEntry(sessionId, 'op-sent', 'first', 'queued'),
-        state: 'dispatching',
-        lastAttemptAt: 1,
-        retryAfterUnknownSubmittedAt: null,
-        ...patch
-      }
-    ])
-  }
-
-  function renderSession(sessionId: string): void {
-    render(
-      <NativeChatStructuredSession
-        isVisible
-        isFocusedGroup
-        tabId={`structured-tab-${sessionId}`}
-        sessionId={sessionId}
-        target={{ kind: 'local' }}
-        agent="codex"
-      />
-    )
-  }
-
-  it('says a send reopened mid-send is sending while it is resent, until it settles', async () => {
-    useProbeClock()
-    mocks.mode = 'outbox'
-    mocks.submissions = []
-    mocks.call.mockResolvedValue({
-      ok: true,
-      value: { submission: { clientMessageId: 'op-sent', dispatchState: 'accepted' } }
-    })
-    seedMidSend('session-reopened')
-
-    renderSession('session-reopened')
-
-    expect(getStructuredAgentSessionOutbox('session-reopened')).toMatchObject([
-      { clientMessageId: 'op-sent', state: 'unconfirmed' }
-    ])
-    expect(screen.getByText('Sending…')).toBeTruthy()
-    expect(screen.queryByText('Message delivery is unconfirmed.')).toBeNull()
-    expect(screen.queryByRole('button', { name: /Retry/ })).toBeNull()
-    await advanceProbeClock(1000)
-    expect(mocks.call).toHaveBeenCalledOnce()
-    expect(mocks.call.mock.calls[0]?.[2]).toMatchObject({
-      envelope: { clientOperationId: 'op-sent' }
-    })
-    expect(getStructuredAgentSessionOutbox('session-reopened')).toEqual([])
-    expect(screen.queryByText('Sending…')).toBeNull()
-    expect(screen.queryByText('Message delivery is unconfirmed.')).toBeNull()
-  }, 10000)
-
-  it('says a send reopened mid-send is unconfirmed, with its Retry, when the journal holds unknown', async () => {
-    useProbeClock()
-    mocks.mode = 'outbox'
-    const sessionId = 'session-reopened-unknown'
-    mocks.submissions = [
-      {
-        clientMessageId: 'op-sent',
-        fence: 1,
-        payloadFingerprint: 'fp',
-        dispatchState: 'unknown',
-        providerItemId: null,
-        reason: null,
-        submittedAt: 1,
-        resolvedAt: null
-      }
-    ]
-    seedMidSend(sessionId)
-
-    renderSession(sessionId)
-
-    expect(screen.getByText('Message delivery is unconfirmed.')).toBeTruthy()
-    expect(screen.getByRole('button', { name: /Retry/ })).toBeTruthy()
-    expect(screen.queryByText('Sending…')).toBeNull()
-    await advanceProbeClock(1500)
-    expect(mocks.call).not.toHaveBeenCalled()
-  })
-
-  it('says a send a Stop outlived is unconfirmed when reopened, as nothing resends it', async () => {
-    useProbeClock()
-    mocks.mode = 'outbox'
-    mocks.submissions = []
-    seedMidSend('session-reopened-stopped', { outlivedStop: true })
-
-    renderSession('session-reopened-stopped')
-
-    expect(screen.getByText('Message delivery is unconfirmed.')).toBeTruthy()
-    expect(screen.getByRole('button', { name: /Retry/ })).toBeTruthy()
-    expect(screen.queryByText('Sending…')).toBeNull()
-    await advanceProbeClock(1500)
-    expect(mocks.call).not.toHaveBeenCalled()
-  }, 10000)
-
-  it('retries the head, not a later stuck message', async () => {
-    mocks.mode = 'outbox'
-    mocks.submissions = []
-    mocks.call.mockResolvedValue({
-      ok: true,
-      value: { submission: { clientMessageId: 'client-1', dispatchState: 'accepted' } }
-    })
-    seedOutbox('session-retry-head', [
-      seededEntry('session-retry-head', 'op-head', 'first', 'unconfirmed'),
-      seededEntry('session-retry-head', 'op-later', 'second', 'unconfirmed')
-    ])
-
-    render(
-      <NativeChatStructuredSession
-        isVisible
-        isFocusedGroup
-        tabId="structured-tab-retry-head"
-        sessionId="session-retry-head"
-        target={{ kind: 'local' }}
-        agent="codex"
-      />
-    )
-
-    await waitFor(() => expect(screen.getByText('Message delivery is unconfirmed.')).toBeTruthy())
-    fireEvent.click(screen.getByRole('button', { name: /Retry/ }))
-
-    await waitFor(() => expect(mocks.call).toHaveBeenCalledOnce())
-    const request = mocks.call.mock.calls[0]?.[2] as { envelope: { clientOperationId: string } }
-    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'),
-      // Refused before the host recorded it, so its Retry is the only way it goes again.
-      {
-        ...seededEntry('session-held-rejected', 'op-rejected', 'second', 'queued'),
-        state: 'rejected',
-        lastFailure: { kind: 'refused', code: 'agent_session_owner_restart_failed' }
-      }
-    ])
-
-    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(REFUSED_RESTART)).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(REFUSED_RESTART)).toBeTruthy()
-    expect(screen.getAllByRole('button', { name: /Retry/ })).toHaveLength(1)
-    expect(mocks.call).toHaveBeenCalledOnce()
-  })
-
-  // Until the journal carries the row, the message's own copy words it; the host has it, so no Retry.
-  it("words a failed start its reply rejected by the chat's agent, with no Retry", async () => {
-    mocks.mode = 'outbox'
-    mocks.submissions = []
-    mocks.call.mockImplementation(
-      async (
-        _target: unknown,
-        _method: unknown,
-        params: { envelope: { clientOperationId: string } }
-      ) => ({
-        ok: true,
-        value: {
-          clientMessageId: params.envelope.clientOperationId,
-          submission: {
-            clientMessageId: params.envelope.clientOperationId,
-            fence: 1,
-            payloadFingerprint: 'fingerprint',
-            dispatchState: 'rejected',
-            providerItemId: null,
-            reason: 'Codex stopped before it finished starting. Send your message to try again.',
-            rejection: { kind: 'providerStartFailed' },
-            submittedAt: 1,
-            resolvedAt: 2
-          }
-        }
-      })
-    )
-
-    render(
-      <NativeChatStructuredSession
-        isVisible
-        isFocusedGroup
-        tabId="structured-tab-start-failed"
-        sessionId="session-start-failed"
-        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(
-        screen.getByText(
-          'Codex stopped before it finished starting. Send your message to try again.'
-        )
-      ).toBeTruthy()
-    )
-    expect(screen.queryByRole('button', { name: /Retry/ })).toBeNull()
-    expect(mocks.call).toHaveBeenCalledOnce()
-  })
-
-  // A copy an earlier session left in the outbox gives way to the host's row.
-  it("words a rejected message from its journal row, not the message's own copy, with no Retry", async () => {
-    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()
-    expect(screen.queryByRole('button', { name: /Retry/ })).toBeNull()
-  })
-
-  it('names the stuck message behind an admitted head, and its Retry sends that one', async () => {
-    mocks.mode = 'outbox'
-    mocks.submissions = []
-    // The head is admitted -- written and awaiting the provider -- so the entry behind it is the
-    // one holding the queue, and Retry acts on it instead of waiting for the head to clear.
-    mocks.call.mockResolvedValue({
-      ok: true,
-      value: { submission: { clientMessageId: 'op-head', dispatchState: 'pending' } }
-    })
-    seedOutbox('session-quiet-head', [
-      seededEntry('session-quiet-head', 'op-head', 'first', 'queued'),
-      seededEntry('session-quiet-head', 'op-later', 'second', 'unconfirmed')
-    ])
-
-    render(
-      <NativeChatStructuredSession
-        isVisible
-        isFocusedGroup
-        tabId="structured-tab-quiet-head"
-        sessionId="session-quiet-head"
-        target={{ kind: 'local' }}
-        agent="codex"
-      />
-    )
-
-    await waitFor(() => expect(mocks.call).toHaveBeenCalledOnce())
-    expect(mocks.call.mock.calls[0]?.[2]).toMatchObject({
-      envelope: { clientOperationId: 'op-head' }
-    })
-
-    await waitFor(() => expect(screen.getByText('Message delivery is unconfirmed.')).toBeTruthy())
-    fireEvent.click(screen.getByRole('button', { name: /Retry/ }))
-
-    await waitFor(() => expect(mocks.call).toHaveBeenCalledTimes(2))
-    expect(mocks.call.mock.calls[1]?.[2]).toMatchObject({
-      envelope: { clientOperationId: 'op-later' }
-    })
-  })
-
-  // A cause seen while the chat was open is worded in full; one read back after the chat is
-  // reopened may have cleared, until a Retry it still stops brings it back.
-  it('words a refusal seen here in full, and after a reopen only once its Retry is refused', async () => {
-    const newerOrca =
-      'Chats were saved by a newer Orca. Your message was not sent. Update Orca to keep using them.'
-    mocks.mode = 'outbox'
-    mocks.call.mockResolvedValue({
-      ok: false,
-      refusal: {
-        code: 'agent_session_journal_unreadable',
-        message: 'newer',
-        details: { reason: 'journalWrittenByNewerOrca' }
-      }
-    })
-    const view = (): React.JSX.Element => (
-      <NativeChatStructuredSession
-        isVisible
-        isFocusedGroup
-        tabId="tab-held"
-        sessionId="session-held"
-        target={{ kind: 'local' }}
-        agent="codex"
-      />
-    )
-    const first = render(view())
-    // The composer's own enqueue.
-    act(() => {
-      expect(appendStructuredAgentSessionOutboxMessage('session-held', 'hello')).not.toBeNull()
-    })
-    await waitFor(() => expect(screen.getByText(newerOrca)).toBeTruthy())
-    first.unmount()
-
-    render(view())
-    await waitFor(() => expect(screen.getByText('Your message was not sent.')).toBeTruthy())
-    expect(mocks.call).toHaveBeenCalledOnce()
-    fireEvent.click(screen.getByRole('button', { name: /Retry/ }))
-    await waitFor(() => expect(mocks.call).toHaveBeenCalledTimes(2))
-    await waitFor(() => expect(screen.getByText(newerOrca)).toBeTruthy())
-  })
-})
diff --git a/src/renderer/src/components/native-chat/NativeChatStructuredSessionStatus.tsx b/src/renderer/src/components/native-chat/NativeChatStructuredSessionStatus.tsx
index d61ec6cb345d..7705c4cd4bd2 100644
--- a/src/renderer/src/components/native-chat/NativeChatStructuredSessionStatus.tsx
+++ b/src/renderer/src/components/native-chat/NativeChatStructuredSessionStatus.tsx
@@ -1,6 +1,6 @@
 import { useState } from 'react'
 import { NativeChatBackgroundTasksStatus } from './NativeChatBackgroundTasksStatus'
-import type { StructuredSessionBackgroundTasksView } from './structured-session-background-tasks-view'
+import type { StructuredSessionBackgroundTasksView } from '../../../../shared/structured-session-background-tasks-view'
 import { useStructuredSessionChildRowContext } from './use-structured-session-child-row-context'
 
 type StoppingBackgroundTasks = {
diff --git a/src/renderer/src/components/native-chat/NativeChatSubagentRun.test.tsx b/src/renderer/src/components/native-chat/NativeChatSubagentRun.test.tsx
index ddbb96347e3a..5ff08f5fa66c 100644
--- a/src/renderer/src/components/native-chat/NativeChatSubagentRun.test.tsx
+++ b/src/renderer/src/components/native-chat/NativeChatSubagentRun.test.tsx
@@ -234,7 +234,6 @@ describe('NativeChatToolRun with a spawn group', () => {
         blocks={[]}
         subagentGroups={[group([{ id: 'a', label: 'read', state: 'completed' }])]}
         expandSignal={false}
-        expandOverride={false}
         activeTurnIsWorking={false}
       />
     )
@@ -242,7 +241,7 @@ describe('NativeChatToolRun with a spawn group', () => {
     expect(screen.getByText('Ran 1 subagent')).toBeInTheDocument()
   })
 
-  // The roster-only branch returns a `mt-3` wrapper whenever it has rows, so a
+  // The roster-only branch returns a spacing wrapper whenever it has rows, so a
   // group that draws nothing must not count as one — that wrapper would be the
   // empty bubble with a margin that the message row refuses to emit.
   it('draws nothing at all for a spawn group that carries no children', () => {
@@ -251,7 +250,6 @@ describe('NativeChatToolRun with a spawn group', () => {
         blocks={[]}
         subagentGroups={[group([])]}
         expandSignal={false}
-        expandOverride={false}
         activeTurnIsWorking={false}
       />
     )
@@ -259,24 +257,6 @@ describe('NativeChatToolRun with a spawn group', () => {
     expect(container).toBeEmptyDOMElement()
   })
 
-  // The roster-only escape above is keyed on `blocks.length === 0`, so a group
-  // sharing its message with tool calls falls through to the settled-turn guard
-  // — which returned bare null and took the roster with it.
-  it('keeps a roster that shares its message with tool calls on a collapsed turn', () => {
-    render(
-      <NativeChatToolRun
-        blocks={[{ type: 'tool-call', name: 'shell', input: { command: 'ls' } }]}
-        subagentGroups={[group([{ id: 'a', label: 'read', state: 'completed' }])]}
-        expandSignal={false}
-        expandOverride={false}
-        activeTurnIsWorking={false}
-      />
-    )
-
-    expect(screen.getByText('Ran 1 subagent')).toBeInTheDocument()
-    expect(screen.queryByText('shell')).toBeNull()
-  })
-
   it('renders the roster alongside the tool activity of its turn', () => {
     render(
       <NativeChatToolRun
diff --git a/src/renderer/src/components/native-chat/NativeChatSubagentRun.tsx b/src/renderer/src/components/native-chat/NativeChatSubagentRun.tsx
index a5d9b2a28376..d78e370619cc 100644
--- a/src/renderer/src/components/native-chat/NativeChatSubagentRun.tsx
+++ b/src/renderer/src/components/native-chat/NativeChatSubagentRun.tsx
@@ -1,12 +1,13 @@
-import { useMemo, useState } from 'react'
+import { useState } from 'react'
 import { Bot, ChevronRight } from 'lucide-react'
 import { cn } from '@/lib/utils'
-import { translate } from '@/i18n/i18n'
 import { useNow } from '@/hooks/use-now'
 import {
-  normalizeSubagentState,
-  summarizeSubagentGroup
-} from '../../../../shared/native-chat-subagent-summary'
+  formatSubagentTokens,
+  nativeChatSubagentGroupHeader,
+  subagentStateLabel
+} from '../../../../shared/native-chat-subagent-group-header'
+import { normalizeSubagentState } from '../../../../shared/native-chat-subagent-summary'
 import type {
   NativeChatSubagentEntry,
   NativeChatSubagentGroupBlock,
@@ -14,79 +15,7 @@ import type {
 } from '../../../../shared/native-chat-types'
 import { formatNativeChatDuration } from './NativeChatWorkingStatus'
 import { nativeChatSubagentEntryRuns } from './native-chat-subagent-sections'
-
-/** Compact token counts: the row shows scale, not an exact ledger. */
-function formatSubagentTokens(tokens: number): string {
-  if (tokens < 1_000) {
-    return String(Math.round(tokens))
-  }
-  const scaled = tokens < 1_000_000 ? tokens / 1_000 : tokens / 1_000_000
-  const suffix = tokens < 1_000_000 ? 'k' : 'M'
-  return `${scaled.toFixed(1).replace(/\.0$/, '')}${suffix}`
-}
-
-/** The group's one-line verdict. A single-child group reads as a bare word; any
- *  larger group always carries the count, because "working" alone would not say
- *  how many of the children it covers. `completed` never takes one: every child
- *  finishing is the whole group finishing. */
-function subagentStateLabel(
-  state: NativeChatSubagentState,
-  count: number,
-  groupTotal: number
-): string {
-  if (state === 'completed') {
-    return translate('components.native-chat.subagents.state.completed', 'completed')
-  }
-  if (groupTotal <= 1) {
-    switch (state) {
-      case 'working':
-        return translate('components.native-chat.subagents.state.working', 'working')
-      case 'idle':
-        return translate('components.native-chat.subagents.state.idle', 'idle')
-      case 'failed':
-        return translate('components.native-chat.subagents.state.failed', 'failed')
-      case 'stopped':
-        return translate('components.native-chat.subagents.state.stopped', 'stopped')
-      case 'unverifiable':
-        return translate(
-          'components.native-chat.subagents.state.unverifiable',
-          'status unavailable'
-        )
-    }
-  }
-  switch (state) {
-    case 'working':
-      return translate(
-        'components.native-chat.subagents.state.workingCount',
-        '{{value0}} working',
-        {
-          value0: count
-        }
-      )
-    case 'idle':
-      return translate('components.native-chat.subagents.state.idleCount', '{{value0}} idle', {
-        value0: count
-      })
-    case 'failed':
-      return translate('components.native-chat.subagents.state.failedCount', '{{value0}} failed', {
-        value0: count
-      })
-    case 'stopped':
-      return translate(
-        'components.native-chat.subagents.state.stoppedCount',
-        '{{value0}} stopped',
-        {
-          value0: count
-        }
-      )
-    case 'unverifiable':
-      return translate(
-        'components.native-chat.subagents.state.unverifiableCount',
-        '{{value0}} with status unavailable',
-        { value0: count }
-      )
-  }
-}
+import { sayNativeChatSubagentGroupTranslated as say } from './native-chat-subagent-group-words-text'
 
 const STATE_DOT_CLASS: Record<NativeChatSubagentState, string> = {
   working: 'bg-foreground/70',
@@ -180,7 +109,7 @@ export function NativeChatSubagentEntries({
               {agent.label}
             </span>
             <span className="ml-auto shrink-0 font-sans text-xs tabular-nums text-chat-foreground-faint">
-              {subagentStateLabel(state, 1, 1)}
+              {subagentStateLabel(state, 1, 1, say)}
               {typeof agent.tokens === 'number' ? ` · ${formatSubagentTokens(agent.tokens)}` : null}
             </span>
           </>
@@ -248,45 +177,12 @@ export function NativeChatSubagentRun({
   const open = heldOpen ?? localOpen
   const setOpen = onSetOpen ?? setLocalOpen
   const agents = block.agents
-  const summary = useMemo(() => summarizeSubagentGroup(agents), [agents])
-  if (summary.total === 0) {
+  // Not memoized: its words follow the reader's language, which can change under the same roster.
+  const header = nativeChatSubagentGroupHeader(agents, say)
+  if (header.total === 0) {
     return null
   }
-
-  const working = summary.working > 0
-  const headline = working
-    ? summary.total === 1
-      ? translate('components.native-chat.subagents.startedOne', 'Kicked off 1 subagent')
-      : translate('components.native-chat.subagents.startedN', 'Kicked off {{value0}} subagents', {
-          value0: summary.total
-        })
-    : summary.total === 1
-      ? translate('components.native-chat.subagents.ranOne', 'Ran 1 subagent')
-      : translate('components.native-chat.subagents.ranN', 'Ran {{value0}} subagents', {
-          value0: summary.total
-        })
-  const verdictState: NativeChatSubagentState = working
-    ? 'working'
-    : (summary.settledState ?? 'idle')
-  const verdict = working
-    ? subagentStateLabel('working', summary.working, summary.total)
-    : subagentStateLabel(verdictState, summary.settledCount, summary.total)
-  // A child that already failed must not wait for its siblings to be readable.
-  const alertState = working ? summary.adverseState : null
-  const alert =
-    alertState === null ? null : subagentStateLabel(alertState, summary.adverseCount, summary.total)
-  // A child settled with no terminal stamp — swept by the reopen, or given the
-  // provider's verdict after that — stopped being observable at an unknown
-  // moment. Measuring to `now` would report the time since the host died as how
-  // long the child ran, on a row that is not even counting. A sibling's stamp is
-  // no better: in a mixed group it would present that sibling's duration as the
-  // group's while a child's run length is still unknown.
-  const runLengthUnknown = agents.some(
-    (agent) =>
-      normalizeSubagentState(agent.state) !== 'working' && typeof agent.settledAt !== 'number'
-  )
-  const clockStartedAt =
-    !runLengthUnknown && (working || summary.settledAt !== null) ? summary.clockStartedAt : null
+  const { working, headline, verdictState, verdict, alertState, alert, clockStartedAt } = header
 
   return (
     <div>
@@ -313,16 +209,12 @@ export function NativeChatSubagentRun({
               {' · '}
               <SubagentElapsed
                 startedAt={clockStartedAt}
-                settledAt={summary.settledAt}
+                settledAt={header.settledAt}
                 counting={working}
               />
             </span>
           ) : null}
-          {summary.tokens !== null
-            ? ` · ${translate('components.native-chat.subagents.tokens', '{{value0}} tokens', {
-                value0: formatSubagentTokens(summary.tokens)
-              })}`
-            : null}
+          {header.tokens !== null ? ` · ${header.tokens}` : null}
         </span>
         <ChevronRight
           className={cn(
diff --git a/src/renderer/src/components/native-chat/NativeChatTaskList.tsx b/src/renderer/src/components/native-chat/NativeChatTaskList.tsx
index 3ddaa8959e8d..c7db6cceaf6b 100644
--- a/src/renderer/src/components/native-chat/NativeChatTaskList.tsx
+++ b/src/renderer/src/components/native-chat/NativeChatTaskList.tsx
@@ -165,7 +165,7 @@ export function NativeChatTaskList({
               <ChevronRight aria-hidden className="size-3.5 group-data-[state=open]:rotate-90" />
               {translate('components.native-chat.taskList.showAll', 'Full task list')}
             </CollapsibleTrigger>
-            <CollapsibleContent>
+            <CollapsibleContent animation="height" data-native-chat-member-detail>
               <Checklist list={list} />
             </CollapsibleContent>
           </Collapsible>
diff --git a/src/renderer/src/components/native-chat/NativeChatToolLine.test.tsx b/src/renderer/src/components/native-chat/NativeChatToolLine.test.tsx
index b95638812f2f..1a1195c9cb52 100644
--- a/src/renderer/src/components/native-chat/NativeChatToolLine.test.tsx
+++ b/src/renderer/src/components/native-chat/NativeChatToolLine.test.tsx
@@ -10,43 +10,55 @@ afterEach(cleanup)
 
 describe('tool sentence rows', () => {
   it.each([
-    ['Bash', { command: 'pnpm test' }, 'Ran', 'pnpm test'],
-    ['Read', { file_path: '/repo/src/main.ts' }, 'Read', 'main.ts'],
-    ['Edit', { file_path: 'C:\\repo\\main.ts' }, 'Edited', 'main.ts'],
-    ['Write', { file_path: '/repo/new.ts' }, 'Edited', 'new.ts'],
-    ['MultiEdit', { file_path: '/repo/main.ts' }, 'Edited', 'main.ts'],
-    ['Grep', { pattern: 'TODO', path: '/repo' }, 'Searched', 'TODO'],
-    ['Glob', { pattern: '**/*.ts' }, 'Searched', '**/*.ts'],
-    ['search', { query: 'settings', command: 'rg settings' }, 'Searched', 'settings'],
-    ['web_search', { query: 'react docs' }, 'Searched the web', 'react docs'],
-    ['WebFetch', { url: 'https://example.com/docs' }, 'Fetched', 'example.com/docs'],
-    ['CreateWidget', { description: 'a widget' }, 'CreateWidget', 'a widget'],
-    ['list', { directory: '/repo' }, 'Listed', '/repo'],
-    ['exec', { command: 'git diff' }, 'Ran', 'git diff'],
-    ['local_shell', { command: 'pwd' }, 'Ran', 'pwd']
-  ])('describes %s with a verb and target', (name, input, verb, target) => {
+    ['Bash', { command: 'pnpm test' }, 'Ran', 'pnpm test', false],
+    ['Read', { file_path: '/repo/src/main.ts' }, 'Read', 'main.ts', true],
+    ['Edit', { file_path: 'C:\\repo\\main.ts' }, 'Edited', 'main.ts', true],
+    ['Write', { file_path: '/repo/new.ts' }, 'Edited', 'new.ts', true],
+    ['MultiEdit', { file_path: '/repo/main.ts' }, 'Edited', 'main.ts', true],
+    ['Grep', { pattern: 'TODO', path: '/repo' }, 'Searched', 'TODO', true],
+    ['Glob', { pattern: '**/*.ts' }, 'Searched', '**/*.ts', true],
+    ['search', { query: 'settings', command: 'rg settings' }, 'Searched', 'settings', true],
+    ['web_search', { query: 'react docs' }, 'Searched the web', 'react docs', true],
+    ['WebFetch', { url: 'https://example.com/docs' }, 'Fetched', 'example.com/docs', true],
+    ['CreateWidget', { description: 'a widget' }, 'CreateWidget', 'a widget', true],
+    ['list', { directory: '/repo' }, 'Listed', '/repo', true],
+    ['exec', { command: 'git diff' }, 'Ran', 'git diff', false],
+    ['local_shell', { command: 'pwd' }, 'Ran', 'pwd', false]
+  ])('describes %s with a verb and target', (name, input, verb, target, verbShown) => {
     const { container } = render(
-      <NativeChatToolLine
-        block={{ type: 'tool-call', name, input, state: 'completed' }}
-        initiallyExpanded={false}
-      />
+      <NativeChatToolLine block={{ type: 'tool-call', name, input, state: 'completed' }} />
     )
-    expect(screen.getByText(verb, { selector: 'span:not(.sr-only)' })).toBeInTheDocument()
+    // A command is its own row: the run's header already says it ran.
+    expect(screen.queryByText(verb, { selector: 'span:not(.sr-only)' }) !== null).toBe(verbShown)
     expect(screen.getByText(target, { selector: 'span:not(.sr-only)' })).toHaveClass(
       'text-chat-foreground'
     )
     expect(screen.getByRole('button')).toHaveAccessibleName(new RegExp(name))
+    expect(screen.getByRole('button')).toHaveAccessibleName(new RegExp(verb))
     expect(container.querySelector('.font-semibold')).toBeNull()
-    expect(container.querySelector('.font-mono') !== null).toBe(
-      ['Bash', 'exec', 'local_shell'].includes(name)
-    )
+  })
+
+  it('tints the glyph of a failed call, and of no other', () => {
+    const glyphOf = (state: 'completed' | 'failed', isError: boolean): Element | null => {
+      const { container, unmount } = render(
+        <NativeChatToolLine
+          block={{ type: 'tool-call', name: 'Bash', input: { command: 'ls src' }, state }}
+          result={{ type: 'tool-result', output: 'out', isError }}
+        />
+      )
+      const tinted = container.querySelector('.text-destructive\\/70')
+      unmount()
+      return tinted
+    }
+    expect(glyphOf('failed', true)).not.toBeNull()
+    expect(glyphOf('completed', true)).not.toBeNull()
+    expect(glyphOf('completed', false)).toBeNull()
   })
 
   it('retains full paths in titles and accessible targets', () => {
     render(
       <NativeChatToolLine
         block={{ type: 'tool-call', name: 'Read', input: { file_path: '/repo/src/main.ts' } }}
-        initiallyExpanded={false}
       />
     )
     expect(screen.getByTitle('/repo/src/main.ts')).toHaveTextContent('main.ts')
@@ -64,7 +76,6 @@ describe('tool sentence rows', () => {
           state: 'completed',
           mcpIdentity: { server: 'my_server', tool: 'shell' }
         }}
-        initiallyExpanded={false}
       />
     )
     expect(screen.getByText('My server')).toBeInTheDocument()
@@ -81,7 +92,7 @@ describe('tool sentence rows', () => {
       input: { file_path: 'main.ts', old_string: 'same\nold\n', new_string: 'same\nnew\nextra\n' },
       state: 'completed'
     }
-    render(<NativeChatToolRun blocks={[block]} expandSignal={false} expandOverride />)
+    render(<NativeChatToolRun blocks={[block]} expandSignal />)
     expect(screen.getByRole('button', { name: /^Edited main\.ts/ })).toBeInTheDocument()
     expect(screen.getByText('+2')).toBeInTheDocument()
     expect(screen.getByText('-1')).toBeInTheDocument()
@@ -96,7 +107,6 @@ describe('tool sentence rows', () => {
           input: { file_path: 'main.ts' },
           state: 'completed'
         }}
-        initiallyExpanded={false}
       />
     )
     expect(screen.queryByText(/^[+-]\d+$/)).toBeNull()
@@ -113,12 +123,7 @@ describe('tool sentence rows', () => {
     ['web_search', { query: 'docs' }, 'Searching the web'],
     ['WebFetch', { url: 'https://example.com/docs' }, 'Fetching']
   ])('uses present tense for a running %s', (name, input, verb) => {
-    render(
-      <NativeChatToolLine
-        block={{ type: 'tool-call', name, input, state: 'running' }}
-        initiallyExpanded={false}
-      />
-    )
+    render(<NativeChatToolLine block={{ type: 'tool-call', name, input, state: 'running' }} />)
     expect(screen.getByText(verb)).toBeInTheDocument()
   })
 
@@ -131,7 +136,6 @@ describe('tool sentence rows', () => {
           input: { file_path: '/repo/a.ts', old_string: 'missing', new_string: 'new' },
           state
         }}
-        initiallyExpanded={false}
       />
     )
     expect(screen.getByRole('button')).toHaveAccessibleName(
@@ -151,7 +155,6 @@ describe('tool sentence rows', () => {
           state: 'completed'
         }}
         result={{ type: 'tool-result', output: 'String to replace not found', isError: true }}
-        initiallyExpanded={false}
       />
     )
     expect(screen.getByRole('button')).toHaveAccessibleName('Edit Tried to edit /repo/a.ts')
@@ -163,7 +166,6 @@ describe('tool sentence rows', () => {
       <NativeChatToolLine
         block={{ type: 'tool-call', name: 'Bash', input: { command: 'pwd' } }}
         result={{ type: 'tool-result', output: '/repo' }}
-        initiallyExpanded={false}
       />
     )
     expect(screen.getByText('Ran')).toBeInTheDocument()
@@ -177,7 +179,6 @@ describe('tool sentence rows', () => {
       render(
         <NativeChatToolLine
           block={{ type: 'tool-call', name: 'WebFetch', input, state: 'completed' }}
-          initiallyExpanded={false}
         />
       )
       expect(screen.getByTitle(url)).toHaveTextContent(url.slice('https://'.length))
@@ -196,7 +197,6 @@ describe('tool sentence rows', () => {
           durationMs: 1200
         }}
         result={{ type: 'tool-result', output: 'command failed', isError: true }}
-        initiallyExpanded={false}
       />
     )
     const button = screen.getByRole('button')
@@ -233,7 +233,6 @@ describe('tool sentence rows', () => {
             exitCode
           }}
           result={result}
-          initiallyExpanded={false}
         />
       )
       expect(screen.getByText('Ran')).toBeInTheDocument()
@@ -252,7 +251,6 @@ describe('tool sentence rows', () => {
       <NativeChatToolLine
         block={{ type: 'tool-call', name, input, state: 'completed' }}
         result={{ type: 'tool-result', output: 'unavailable', isError: true }}
-        initiallyExpanded={false}
       />
     )
     expect(screen.getByText(verb)).toBeInTheDocument()
@@ -262,37 +260,34 @@ describe('tool sentence rows', () => {
     ['Bash', { command: 'pnpm test' }],
     ['exec', JSON.stringify({ cmd: 'pnpm test' })],
     ['Bash', 'pnpm test']
-  ])('omits duplicate input for a complete %s command chip', (name, input) => {
+  ])('omits duplicate input for a complete %s command row', (name, input) => {
     const { container } = render(
       <NativeChatToolLine
         block={{ type: 'tool-call', name, input, state: 'completed' }}
         result={{ type: 'tool-result', output: 'all passed' }}
       />
     )
-    expect(screen.getByTitle('pnpm test')).toHaveClass('font-mono')
+    fireEvent.click(screen.getByRole('button'))
     expect(container.querySelectorAll('pre')).toHaveLength(1)
     expect(container.querySelector('pre')).toHaveTextContent('all passed')
   })
 
   it.each([
-    [{ command: 'pnpm test', description: 'Run the suite' }, '"description": "Run the suite"'],
-    [{ command: ['printf', '%s', 'a b'] }, '"command": [\n    "printf",\n    "%s",\n    "a b"'],
-    [{ command: '/bin/zsh -lc "pnpm test"' }, '/bin/zsh -lc \\"pnpm test\\"']
-  ])(
-    'keeps the original command input accessible when the chip omits structure',
-    (input, detail) => {
-      const { container } = render(
-        <NativeChatToolLine
-          block={{ type: 'tool-call', name: 'Bash', input, state: 'completed' }}
-          initiallyExpanded={false}
-        />
-      )
-      expect(screen.getByRole('button')).toHaveAttribute('aria-expanded', 'false')
-      expect(container.querySelector('pre')).toBeNull()
-      fireEvent.click(screen.getByRole('button'))
-      expect(container.querySelector('pre')?.textContent).toContain(detail)
-    }
-  )
+    [{ command: 'pnpm test', description: 'Run the suite' }],
+    [{ command: ['printf', '%s', 'a b'] }],
+    [{ command: '/bin/zsh -lc "pnpm test"' }]
+  ])('opens a command to its output alone, never its raw arguments', (input) => {
+    const { container } = render(
+      <NativeChatToolLine
+        block={{ type: 'tool-call', name: 'Bash', input, state: 'completed' }}
+        result={{ type: 'tool-result', output: 'all passed' }}
+      />
+    )
+    fireEvent.click(screen.getByRole('button'))
+    expect([...container.querySelectorAll('pre')].map((pre) => pre.textContent)).toEqual([
+      'all passed'
+    ])
+  })
 
   it('does not offer empty detail for a short command without output', () => {
     const { container } = render(
@@ -313,7 +308,6 @@ describe('tool sentence rows', () => {
         <NativeChatToolLine
           block={{ type: 'tool-call', name: 'exec', input, state: 'completed' }}
           result={{ type: 'tool-result', output: 'all passed' }}
-          initiallyExpanded={false}
         />
       )
       expect(screen.getByTitle(command)).toHaveTextContent(/…$/)
@@ -331,19 +325,57 @@ describe('tool sentence rows', () => {
     const { container } = render(
       <NativeChatToolLine
         block={{ type: 'tool-call', name: 'Bash', input: { command }, state: 'completed' }}
-        initiallyExpanded={false}
       />
     )
     fireEvent.click(screen.getByRole('button'))
     expect(container.querySelector('pre')?.textContent).toBe(command)
   })
 
-  it('retains structured input detail for other tools', () => {
-    const input = { file_path: '/repo/a.ts', offset: 10 }
+  it('opens an edit that has not landed to the change it proposes', () => {
+    const { container } = render(
+      <NativeChatToolLine
+        block={{
+          type: 'tool-call',
+          name: 'Edit',
+          state: 'running',
+          input: { file_path: '/repo/a.ts', old_string: 'was', new_string: 'now' }
+        }}
+      />
+    )
+    expect(container.textContent).not.toContain('now')
+    fireEvent.click(screen.getByRole('button'))
+    expect(container.textContent).toContain('now')
+  })
+
+  it.each(['exec', 'shell', 'Bash'])('offers nothing to open on a running %s command', (name) => {
+    render(
+      <NativeChatToolLine
+        block={{ type: 'tool-call', name, input: { command: 'ls' }, state: 'running' }}
+      />
+    )
+    expect(screen.getByRole('button')).not.toHaveAttribute('aria-expanded')
+  })
+
+  it('offers nothing to open on a call that has produced no output', () => {
+    render(
+      <NativeChatToolLine
+        block={{ type: 'tool-call', name: 'lookup_ticket', input: { ticket: 'ORC-1' } }}
+      />
+    )
+    expect(screen.getByRole('button')).not.toHaveAttribute('aria-expanded')
+  })
+
+  it('shows a read as its output alone, not the arguments its row already names', () => {
     const { container } = render(
-      <NativeChatToolLine block={{ type: 'tool-call', name: 'Read', input }} />
+      <NativeChatToolLine
+        block={{ type: 'tool-call', name: 'Read', input: { file_path: '/repo/a.ts', offset: 10 } }}
+        result={{ type: 'tool-result', output: 'const a = 1' }}
+      />
     )
-    expect(container.querySelector('pre')?.textContent).toBe(JSON.stringify(input, null, 2))
+    fireEvent.click(screen.getByRole('button'))
+    expect([...container.querySelectorAll('pre')].map((pre) => pre.textContent)).toEqual([
+      'const a = 1'
+    ])
   })
 
   it.each(['Task', 'Agent'])(
@@ -356,17 +388,13 @@ describe('tool sentence rows', () => {
         query: 'not the description'
       }
       const { rerender } = render(
-        <NativeChatToolLine
-          block={{ type: 'tool-call', name, input, state: 'running' }}
-          initiallyExpanded={false}
-        />
+        <NativeChatToolLine block={{ type: 'tool-call', name, input, state: 'running' }} />
       )
       expect(screen.getByText('Subagent')).toBeInTheDocument()
       expect(screen.getByTitle(description).textContent).toBe(description)
       rerender(
         <NativeChatToolLine
           block={{ type: 'tool-call', name, input: JSON.stringify(input), state: 'completed' }}
-          initiallyExpanded={false}
         />
       )
       expect(screen.getByText('Subagent')).toBeInTheDocument()
@@ -385,7 +413,6 @@ describe('tool sentence rows', () => {
           state: 'completed',
           mcpIdentity: { server: 'my_server', tool: 'Agent' }
         }}
-        initiallyExpanded={false}
       />
     )
     expect(screen.getByText('My server')).toBeInTheDocument()
@@ -393,12 +420,7 @@ describe('tool sentence rows', () => {
   })
 
   it('still renders result-only rows', () => {
-    render(
-      <NativeChatToolLine
-        block={{ type: 'tool-result', output: 'first\nsecond' }}
-        initiallyExpanded={false}
-      />
-    )
+    render(<NativeChatToolLine block={{ type: 'tool-result', output: 'first\nsecond' }} />)
     fireEvent.click(screen.getByRole('button', { name: /Result/ }))
     expect(screen.getByText('first second', { selector: 'pre' })).toHaveClass(
       'text-chat-foreground'
diff --git a/src/renderer/src/components/native-chat/NativeChatToolLine.tsx b/src/renderer/src/components/native-chat/NativeChatToolLine.tsx
index ae8273e7bc77..e2da7527543f 100644
--- a/src/renderer/src/components/native-chat/NativeChatToolLine.tsx
+++ b/src/renderer/src/components/native-chat/NativeChatToolLine.tsx
@@ -1,11 +1,13 @@
 import type { CommentMarkdownLinkClickHandler } from '@/components/sidebar/CommentMarkdown'
 import { ChevronRight } from 'lucide-react'
 import { cn } from '@/lib/utils'
+import { agentJournalToolCallLifecycle } from '../../../../shared/agent-journal-tool-call-lifecycle'
 import { translate } from '@/i18n/i18n'
 import {
   isToolCallBlock,
   isToolResultBlock,
   type NativeChatBlock,
+  type NativeChatToolCallBlock,
   type NativeChatToolResultBlock
 } from '../../../../shared/native-chat-types'
 import {
@@ -16,15 +18,65 @@ import {
 import { NativeChatToolIcon } from './NativeChatToolIcon'
 import { NativeChatDiffView } from './NativeChatDiffView'
 import { nativeChatToolLineLabel } from './native-chat-tool-line-label'
-import { diffFromText, diffFromToolCall, type DiffLine } from './native-chat-diff'
+import { diffFromText, diffFromToolCall } from './native-chat-diff'
+import { NativeChatExpandable } from './NativeChatExpandable'
 import { useNativeChatDisclosure } from './native-chat-disclosure-store'
-import { createToolInputDisplay, truncateToolDetail } from './native-chat-tool-summary'
+import { truncateToolDetail } from './native-chat-tool-summary'
 
-/** A tool sentence with input and output behind its own remembered disclosure. */
+const NO_SEARCH_RESULTS: NonNullable<NativeChatToolCallBlock['webSearchResults']> = []
+
+/** What an opened row shows. Its own component so a row diffs only while it is open. */
+function ToolLineDetail({
+  block,
+  body,
+  fullCommand,
+  results,
+  onLinkClick
+}: {
+  block: NativeChatBlock
+  body: NativeChatToolResultBlock | undefined
+  fullCommand: string | null
+  results: NonNullable<NativeChatToolCallBlock['webSearchResults']>
+  onLinkClick?: CommentMarkdownLinkClickHandler
+}): React.JSX.Element {
+  const diff = isToolCallBlock(block)
+    ? diffFromToolCall(block.name, block.input)
+    : isToolResultBlock(block)
+      ? diffFromText(block.output)
+      : null
+  return (
+    <div className="ml-6 space-y-1.5 py-1">
+      {results.length > 0 ? (
+        <NativeChatSearchResults results={results} onLinkClick={onLinkClick} />
+      ) : null}
+      {diff ? <NativeChatDiffView lines={diff} /> : null}
+      {!diff && fullCommand ? (
+        <pre
+          data-native-chat-code-content
+          className="max-h-64 overflow-auto whitespace-pre-wrap break-words rounded-lg border border-chat-code-border bg-chat-code-surface p-2 font-mono text-xs text-chat-foreground scrollbar-sleek"
+        >
+          {fullCommand}
+        </pre>
+      ) : null}
+      {body ? (
+        <pre
+          data-native-chat-code-content
+          className={cn(
+            'max-h-64 overflow-auto whitespace-pre-wrap break-words rounded-lg border border-chat-code-border bg-chat-code-surface p-2 font-mono text-xs scrollbar-sleek',
+            body.isError ? 'text-destructive' : 'text-chat-foreground'
+          )}
+        >
+          {truncateToolDetail(body.output)}
+        </pre>
+      ) : null}
+    </div>
+  )
+}
+
+/** A tool sentence with its output behind its own remembered disclosure. */
 export function NativeChatToolLine({
   block,
   result,
-  initiallyExpanded = true,
   disclosureKey,
   onLinkClick
 }: {
@@ -33,52 +85,38 @@ export function NativeChatToolLine({
    *  as a `Result` row of its own, so an opened run lists the work, not twice
    *  as many rows half of which say `Result`. */
   result?: NativeChatToolResultBlock
-  initiallyExpanded?: boolean
   /** Identity this line's open state is remembered under while it is unmounted. */
   disclosureKey?: string
   onLinkClick?: CommentMarkdownLinkClickHandler
 }): React.JSX.Element | null {
-  const { open: expanded, setOpen: setExpanded } = useNativeChatDisclosure(
-    disclosureKey,
-    initiallyExpanded
-  )
+  const { open: expanded, setOpen: setExpanded } = useNativeChatDisclosure(disclosureKey, false)
 
   let name: string
-  let preview: string
-  let diff: DiffLine[] | null = null
-  let body: { output: string; isError?: boolean } | null = null
-  let detail: string | null = null
-  let inputHasDetail = false
+  let resultPreview = ''
   const isCall = isToolCallBlock(block)
   const label = isCall ? nativeChatToolLineLabel(block, result) : null
+  // A call opens to its output; its arguments are the row's own words, bar a shortened command.
+  const fullCommand = label?.commandDetail ?? null
 
   if (isCall) {
     name = block.name
-    const inputDisplay = createToolInputDisplay(block.input)
-    preview = inputDisplay.label
-    inputHasDetail =
-      label?.commandDetail !== undefined ? label.commandDetail !== null : inputDisplay.hasDetail
-    diff = expanded ? diffFromToolCall(block.name, block.input) : null
-    detail =
-      expanded && !diff
-        ? label?.commandDetail !== undefined
-          ? label.commandDetail
-          : inputDisplay.formatDetail()
-        : null
-    if (result) {
-      body = { output: result.output, isError: result.isError }
-    }
   } else if (isToolResultBlock(block)) {
     name = translate('components.native-chat.tool.result', 'Result')
-    preview = block.output.split('\n')[0]?.slice(0, 80) ?? ''
-    diff = expanded ? diffFromText(block.output) : null
-    body = { output: block.output, isError: block.isError }
+    resultPreview = block.output.split('\n')[0]?.slice(0, 80) ?? ''
   } else {
     return null
   }
+  const body = isCall ? result : block
 
-  const hasResults = isCall && (block.webSearchResults?.length ?? 0) > 0
-  const hasDetail = diff !== null || body !== null || inputHasDetail || hasResults
+  // A call the reader stopped was cut short, not failed.
+  const lifecycle = isCall ? agentJournalToolCallLifecycle(block) : null
+  const failed = lifecycle === 'failed' || (lifecycle !== 'interrupted' && result?.isError === true)
+  const commandAlone = label?.command === true && label.verb !== null && label.target.length > 0
+  const results = (isCall ? block.webSearchResults : undefined) ?? NO_SEARCH_RESULTS
+  // An edit that has not landed has no output yet, but the change it proposes is worth opening.
+  const proposesChange = () => isCall && diffFromToolCall(block.name, block.input) !== null
+  const hasDetail =
+    body !== undefined || fullCommand !== null || results.length > 0 || proposesChange()
 
   return (
     <div>
@@ -96,7 +134,7 @@ export function NativeChatToolLine({
           <NativeChatToolIcon
             mcpIdentity={block.mcpIdentity}
             rowWord={name}
-            className="text-chat-foreground-faint"
+            className={failed ? 'text-destructive/70' : 'text-chat-foreground-faint'}
           />
         ) : (
           /* A result's word is translated copy, not a tool name, so there is no
@@ -104,68 +142,53 @@ export function NativeChatToolLine({
           <span aria-hidden className="size-4 shrink-0" />
         )}
         {label?.verb && label.verb !== name ? <span className="sr-only">{name} </span> : null}
-        <span
-          className={cn(
-            'text-chat-foreground-faint transition-colors group-hover/tool-line:text-chat-foreground',
-            label?.verb ? 'shrink-0' : 'min-w-0 truncate'
-          )}
-        >
-          {label?.verb ??
-            (isCall ? <NativeChatToolName name={name} mcpIdentity={block.mcpIdentity} /> : name)}
-        </span>
-        {(label?.target ?? preview) ? (
+        {commandAlone ? (
+          // The run's header already says these ran; the row is the command itself.
+          <span className="sr-only">{label?.verb} </span>
+        ) : (
           <span
             className={cn(
-              'min-w-0 truncate text-chat-foreground transition-colors group-hover/tool-line:text-chat-foreground-strong',
-              label?.command &&
-                'rounded-md border border-chat-inline-code-border bg-chat-inline-code-surface px-1.5 font-mono text-xs'
+              'text-chat-foreground-faint transition-colors group-hover/tool-line:text-chat-foreground',
+              label?.verb ? 'shrink-0' : 'min-w-0 truncate'
             )}
-            data-native-chat-code-content={label?.command ? true : undefined}
-            title={label?.title ?? preview}
+          >
+            {label?.verb ??
+              (isCall ? <NativeChatToolName name={name} mcpIdentity={block.mcpIdentity} /> : name)}
+          </span>
+        )}
+        {(label?.target ?? resultPreview) ? (
+          <span
+            className="min-w-0 truncate text-chat-foreground transition-colors group-hover/tool-line:text-chat-foreground-strong"
+            title={label?.title ?? resultPreview}
             aria-hidden={label?.filePath ? true : undefined}
           >
-            {label?.target ?? preview}
+            {label?.target ?? resultPreview}
           </span>
         ) : null}
         {label?.filePath ? <span className="sr-only">{label.filePath}</span> : null}
-        {isCall ? <NativeChatCommandMetadata block={block} /> : null}
-        {hasDetail ? (
-          // Hover reveal is keyed to this row's own named group: a bare `group`
-          // also answers to the message row's, lighting every chevron at once.
-          <ChevronRight
-            className={cn(
-              'size-3.5 shrink-0 text-chat-foreground-faint transition-all',
-              expanded ? 'rotate-90 opacity-100' : 'opacity-0 group-hover/tool-line:opacity-100'
-            )}
-          />
-        ) : null}
-      </button>
-      {hasDetail && expanded ? (
-        <div className="ml-6 space-y-1.5 py-1">
-          {isCall && hasResults ? (
-            <NativeChatSearchResults results={block.webSearchResults} onLinkClick={onLinkClick} />
-          ) : null}
-          {diff ? <NativeChatDiffView lines={diff} /> : null}
-          {!diff && detail ? (
-            <pre
-              data-native-chat-code-content
-              className="max-h-64 overflow-auto whitespace-pre-wrap break-words rounded-lg border border-chat-code-border bg-chat-code-surface p-2 font-mono text-xs text-chat-foreground scrollbar-sleek"
-            >
-              {detail}
-            </pre>
-          ) : null}
-          {body ? (
-            <pre
-              data-native-chat-code-content
+        {/* Held at the row's right edge, so the carets of a run line up in one column. */}
+        <span className="ml-auto flex shrink-0 items-center gap-1.5 pl-2">
+          {isCall ? <NativeChatCommandMetadata block={block} /> : null}
+          {hasDetail ? (
+            <ChevronRight
               className={cn(
-                'max-h-64 overflow-auto whitespace-pre-wrap break-words rounded-lg border border-chat-code-border bg-chat-code-surface p-2 font-mono text-xs scrollbar-sleek',
-                body.isError ? 'text-destructive' : 'text-chat-foreground'
+                'size-3.5 shrink-0 text-chat-foreground-faint transition-transform',
+                expanded && 'rotate-90'
               )}
-            >
-              {truncateToolDetail(body.output)}
-            </pre>
+            />
           ) : null}
-        </div>
+        </span>
+      </button>
+      {hasDetail ? (
+        <NativeChatExpandable open={expanded}>
+          <ToolLineDetail
+            block={block}
+            body={body}
+            fullCommand={fullCommand}
+            results={results}
+            onLinkClick={onLinkClick}
+          />
+        </NativeChatExpandable>
       ) : null}
     </div>
   )
diff --git a/src/renderer/src/components/native-chat/NativeChatToolRun.appearance.test.tsx b/src/renderer/src/components/native-chat/NativeChatToolRun.appearance.test.tsx
index b707c7cd38ca..89d3fb9941b0 100644
--- a/src/renderer/src/components/native-chat/NativeChatToolRun.appearance.test.tsx
+++ b/src/renderer/src/components/native-chat/NativeChatToolRun.appearance.test.tsx
@@ -5,6 +5,7 @@ import { afterEach, describe, expect, it } from 'vitest'
 import type { NativeChatBlock } from '../../../../shared/native-chat-types'
 import { NativeChatToolRun } from './NativeChatToolRun'
 import { nativeChatAppearanceStyle } from './native-chat-appearance-style'
+import { openToolRunMembers } from './native-chat-tool-run-members-test-support'
 
 afterEach(cleanup)
 
@@ -64,6 +65,7 @@ describe('tool-run summary in a matching chat', () => {
     expect(container.querySelector('pre')).toBeNull()
 
     fireEvent.click(screen.getByRole('button'))
+    openToolRunMembers()
 
     expect(container.querySelector('pre')).toHaveTextContent(command)
   })
@@ -93,7 +95,7 @@ describe('tool-run summary in a matching chat', () => {
     expect(summary).toHaveClass('min-w-0', 'line-clamp-2')
 
     const slots = Array.from(header.children).filter((child) => child !== summary)
-    expect(slots.length).toBeGreaterThanOrEqual(3)
+    expect(slots.length).toBeGreaterThanOrEqual(2)
     for (const slot of slots) {
       expect(slot).toHaveClass('flex', 'h-[1lh]', 'items-center')
     }
@@ -101,6 +103,7 @@ describe('tool-run summary in a matching chat', () => {
     expect(header.firstElementChild?.querySelector('svg')).toBeInTheDocument()
     expect(header.children[1]).toBe(summary)
     expect(header.querySelector('.lucide-check')?.parentElement).toHaveClass('h-[1lh]')
-    expect(header.querySelector('.lucide-chevron-right')?.parentElement).toHaveClass('h-[1lh]')
+    // The header carries no caret: the whole line is the toggle.
+    expect(header.querySelector('.lucide-chevron-right')).toBeNull()
   })
 })
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 b4257648efaf..7da579274658 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
@@ -10,6 +10,7 @@ import {
   NativeChatDisclosureContext,
   useNativeChatDisclosures
 } from './native-chat-disclosure-store'
+import { openToolRunMembers } from './native-chat-tool-run-members-test-support'
 
 afterEach(cleanup)
 
@@ -96,6 +97,7 @@ describe('NativeChatToolRun awaiting-input row', () => {
         activeTurnIsWorking={false}
       />
     )
+    openToolRunMembers()
     expect(screen.queryByText('Awaiting user input:')).toBeNull()
     expect(screen.queryByText('Asked:')).toBeNull()
     expect(screen.getAllByText('Question rejected').length).toBeGreaterThan(0)
diff --git a/src/renderer/src/components/native-chat/NativeChatToolRun.identity.test.tsx b/src/renderer/src/components/native-chat/NativeChatToolRun.identity.test.tsx
index 516f3d79e862..2a3f98b272c0 100644
--- a/src/renderer/src/components/native-chat/NativeChatToolRun.identity.test.tsx
+++ b/src/renderer/src/components/native-chat/NativeChatToolRun.identity.test.tsx
@@ -11,6 +11,7 @@ import {
   NativeChatDisclosureContext,
   useNativeChatDisclosures
 } from './native-chat-disclosure-store'
+import { openToolRunMembers } from './native-chat-tool-run-members-test-support'
 
 vi.mock('./NativeChatDiffCard', () => ({ NativeChatDiffCard: () => null }))
 vi.mock('./NativeChatDiffView', () => ({ NativeChatDiffView: () => null }))
@@ -18,7 +19,8 @@ vi.mock('./NativeChatDiffView', () => ({ NativeChatDiffView: () => null }))
 const disclosureWrite = vi.fn()
 const capturedDisclosures = {
   read: (_key: string) => undefined,
-  write: (key: string, open: boolean) => disclosureWrite(key, open)
+  write: (key: string, open: boolean) => disclosureWrite(key, open),
+  runScroll: new Map()
 }
 
 afterEach(() => {
@@ -41,14 +43,13 @@ const shellResult: NativeChatToolResultBlock = {
   isError: true
 }
 
-function ToolRunDisclosureHarness({ expandOverride }: { expandOverride: boolean }) {
+function ToolRunDisclosureHarness({ expandSignal }: { expandSignal: boolean }) {
   const disclosures = useNativeChatDisclosures()
   return (
     <NativeChatDisclosureContext.Provider value={disclosures}>
       <NativeChatToolRun
         blocks={[shell]}
-        expandSignal={false}
-        expandOverride={expandOverride}
+        expandSignal={expandSignal}
         activeTurnIsWorking={false}
         disclosureId="message-1"
       />
@@ -58,16 +59,16 @@ function ToolRunDisclosureHarness({ expandOverride }: { expandOverride: boolean
 
 describe('inline tool annotations', () => {
   it('restores a per-run deviation when its turn returns to the same disclosure state', () => {
-    const { rerender } = render(<ToolRunDisclosureHarness expandOverride />)
+    const { rerender } = render(<ToolRunDisclosureHarness expandSignal />)
     const run = screen.getByRole('button', { expanded: true })
 
     fireEvent.click(run)
     expect(run.getAttribute('aria-expanded')).toBe('false')
 
-    rerender(<ToolRunDisclosureHarness expandOverride={false} />)
-    expect(screen.queryByRole('button')).toBeNull()
+    rerender(<ToolRunDisclosureHarness expandSignal={false} />)
+    fireEvent.click(screen.getByRole('button', { name: /missing-command/ }))
 
-    rerender(<ToolRunDisclosureHarness expandOverride />)
+    rerender(<ToolRunDisclosureHarness expandSignal />)
     expect(
       screen.getByRole('button', { name: /missing-command/ }).getAttribute('aria-expanded')
     ).toBe('false')
@@ -101,7 +102,7 @@ describe('inline tool annotations', () => {
 
     fireEvent.click(screen.getAllByRole('button')[2]!)
 
-    expect(disclosureWrite).toHaveBeenCalledExactlyOnceWith('line:message-1:call:call-b', false)
+    expect(disclosureWrite).toHaveBeenCalledExactlyOnceWith('line:message-1:call:call-b', true)
   })
 
   it('keeps occurrence identity as the fallback for calls without provider IDs', () => {
@@ -119,7 +120,7 @@ describe('inline tool annotations', () => {
 
     expect(disclosureWrite).toHaveBeenCalledExactlyOnceWith(
       'line:message-1:tool-call:shell:{"command":"missing-command"}:1',
-      false
+      true
     )
   })
 
@@ -138,18 +139,13 @@ describe('inline tool annotations', () => {
 
     expect(disclosureWrite).toHaveBeenCalledExactlyOnceWith(
       'line:message-1:tool-call:shell:{"command":"missing-command"}:1',
-      false
+      true
     )
   })
 
   it('keeps command completion annotations on the collapsed tool line', () => {
     render(
-      <NativeChatToolRun
-        blocks={[shell, shellResult]}
-        expandSignal={false}
-        expandOverride
-        activeTurnIsWorking={false}
-      />
+      <NativeChatToolRun blocks={[shell, shellResult]} expandSignal activeTurnIsWorking={false} />
     )
     expect(screen.getByText('exit 127').closest('button')).toBe(
       screen.getByText('400ms').closest('button')
@@ -185,14 +181,7 @@ describe('inline tool annotations', () => {
       state: 'completed',
       webSearchResults: [{ title: 'Reference docs', url: 'https://example.com/docs' }]
     }
-    render(
-      <NativeChatToolRun
-        blocks={[block]}
-        expandSignal={false}
-        expandOverride
-        onLinkClick={onLinkClick}
-      />
-    )
+    render(<NativeChatToolRun blocks={[block]} expandSignal onLinkClick={onLinkClick} />)
     expect(screen.queryByRole('link')).toBeNull()
     fireEvent.click(screen.getByText('Searched the web').closest('button')!)
     const link = screen.getByRole('link', { name: /Reference docs/ })
@@ -280,6 +269,7 @@ it('filters untrusted persisted result URLs at the renderer boundary', () => {
       onLinkClick={onLinkClick}
     />
   )
+  openToolRunMembers()
   const links = screen.getAllByRole('link')
   expect(links).toHaveLength(1)
   fireEvent.click(links[0]!)
diff --git a/src/renderer/src/components/native-chat/NativeChatToolRun.members.test.tsx b/src/renderer/src/components/native-chat/NativeChatToolRun.members.test.tsx
new file mode 100644
index 000000000000..f119194d53d6
--- /dev/null
+++ b/src/renderer/src/components/native-chat/NativeChatToolRun.members.test.tsx
@@ -0,0 +1,173 @@
+// @vitest-environment happy-dom
+
+import { cleanup, fireEvent, render } from '@testing-library/react'
+import { afterEach, describe, expect, it, vi } from 'vitest'
+import type { NativeChatBlock } from '../../../../shared/native-chat-types'
+import {
+  NativeChatDisclosureContext,
+  useNativeChatDisclosures
+} from './native-chat-disclosure-store'
+import { NativeChatToolRun } from './NativeChatToolRun'
+import { revealNativeChatToolRunMember } from './NativeChatToolRunMembers'
+
+afterEach(() => {
+  cleanup()
+  vi.restoreAllMocks()
+})
+
+const VIEWPORT = 200
+
+function calls(count: number): NativeChatBlock[] {
+  return Array.from({ length: count }, (_, index) => ({
+    type: 'tool-call' as const,
+    name: 'Read',
+    callId: `call-${index}`,
+    input: `{"file_path":"src/file-${index}.ts"}`
+  }))
+}
+
+/** happy-dom lays nothing out, so the box's geometry is whatever the test says it is. */
+function layOut(contentHeight: { current: number }): void {
+  vi.spyOn(HTMLElement.prototype, 'scrollHeight', 'get').mockImplementation(
+    () => contentHeight.current
+  )
+  vi.spyOn(HTMLElement.prototype, 'clientHeight', 'get').mockReturnValue(VIEWPORT)
+}
+
+function membersBox(container: HTMLElement): HTMLElement {
+  const box = container.querySelector<HTMLElement>('[data-native-chat-tool-run-members]')
+  if (!box) {
+    throw new Error('members box did not render')
+  }
+  return box
+}
+
+/** A live run inside the transcript's disclosure store, which is what remembers its box. */
+function Transcript({
+  mounted = true,
+  count = 3
+}: {
+  mounted?: boolean
+  count?: number
+}): React.JSX.Element {
+  const disclosures = useNativeChatDisclosures()
+  return (
+    <NativeChatDisclosureContext.Provider value={disclosures}>
+      {mounted ? (
+        <NativeChatToolRun
+          blocks={calls(count)}
+          expandSignal
+          activeTurnIsWorking
+          disclosureId="message-1"
+        />
+      ) : null}
+    </NativeChatDisclosureContext.Provider>
+  )
+}
+
+describe('NativeChatToolRun members box', () => {
+  it('keeps a live run on its newest call until the reader scrolls away', () => {
+    const contentHeight = { current: 600 }
+    layOut(contentHeight)
+    const run = (count: number): React.JSX.Element => (
+      <NativeChatToolRun blocks={calls(count)} expandSignal activeTurnIsWorking />
+    )
+    const { container, rerender } = render(run(3))
+    const box = membersBox(container)
+    expect(box.scrollTop).toBe(600)
+
+    contentHeight.current = 900
+    rerender(run(4))
+    expect(box.scrollTop).toBe(900)
+
+    box.scrollTop = 100
+    fireEvent.scroll(box)
+    contentHeight.current = 1200
+    rerender(run(5))
+    expect(box.scrollTop).toBe(100)
+
+    box.scrollTop = 1200 - VIEWPORT
+    fireEvent.scroll(box)
+    contentHeight.current = 1500
+    rerender(run(6))
+    expect(box.scrollTop).toBe(1500)
+  })
+
+  it('comes back where the reader left it after windowing unmounts the row', () => {
+    const contentHeight = { current: 900 }
+    layOut(contentHeight)
+    const { container, rerender } = render(<Transcript mounted count={3} />)
+    const box = membersBox(container)
+    box.scrollTop = 100
+    fireEvent.scroll(box)
+
+    rerender(<Transcript mounted={false} count={3} />)
+    contentHeight.current = 1200
+    rerender(<Transcript mounted count={4} />)
+
+    // Neither back at the newest call nor following again: both were the reader's choice.
+    expect(membersBox(container).scrollTop).toBe(100)
+  })
+
+  it('forgets its place when the reader closes it', () => {
+    layOut({ current: 900 })
+    const { container } = render(<Transcript />)
+    const box = membersBox(container)
+    box.scrollTop = 100
+    fireEvent.scroll(box)
+
+    const header = container.querySelector<HTMLElement>('[data-native-chat-tool-run-state]')!
+    fireEvent.click(header)
+    fireEvent.click(header)
+
+    // A live run the reader reopens shows what it is doing now.
+    expect(membersBox(container).scrollTop).toBe(900)
+  })
+
+  it('opens a settled run at its first call', () => {
+    layOut({ current: 600 })
+    const { container } = render(
+      <NativeChatToolRun blocks={calls(3)} expandSignal activeTurnIsWorking={false} />
+    )
+    expect(membersBox(container).scrollTop).toBe(0)
+  })
+
+  it('brings a revealed member to the top of the box and reports the box', () => {
+    layOut({ current: 600 })
+    const { container } = render(
+      <NativeChatToolRun blocks={calls(3)} expandSignal activeTurnIsWorking={false} />
+    )
+    const box = membersBox(container)
+    const member = box.querySelectorAll('button')[2]!
+    vi.spyOn(box, 'getBoundingClientRect').mockReturnValue(new DOMRect(0, 40, 300, VIEWPORT))
+    vi.spyOn(member, 'getBoundingClientRect').mockReturnValue(new DOMRect(0, 340, 300, 26))
+
+    expect(revealNativeChatToolRunMember(member)).toBe(box)
+    expect(box.scrollTop).toBe(300)
+  })
+})
+
+describe('NativeChatToolRun asides', () => {
+  it('draws the rows it is handed among its calls, in order', () => {
+    const blocks = calls(2)
+    const { container } = render(
+      <NativeChatToolRun
+        blocks={blocks}
+        asides={{
+          before: new Map([[blocks[1]!, [<p key="between">between</p>]]]),
+          after: [<p key="last">last</p>]
+        }}
+        expandSignal
+        activeTurnIsWorking={false}
+      />
+    )
+    const rows = [...membersBox(container).querySelectorAll('button, p')].map(
+      (row) => row.textContent ?? ''
+    )
+    expect(rows).toHaveLength(4)
+    expect(rows[0]).toContain('file-0.ts')
+    expect(rows[1]).toBe('between')
+    expect(rows[2]).toContain('file-1.ts')
+    expect(rows[3]).toBe('last')
+  })
+})
diff --git a/src/renderer/src/components/native-chat/NativeChatToolRun.test.tsx b/src/renderer/src/components/native-chat/NativeChatToolRun.test.tsx
index 03d6da18f641..df11f8b7596c 100644
--- a/src/renderer/src/components/native-chat/NativeChatToolRun.test.tsx
+++ b/src/renderer/src/components/native-chat/NativeChatToolRun.test.tsx
@@ -8,6 +8,7 @@ import type { AgentJournalRenderItem } from '../../../../shared/agent-session-jo
 import type { NativeChatBlock } from '../../../../shared/native-chat-types'
 import { projectStructuredItemToNativeChat } from '../../../../shared/structured-agent-session-projection'
 import { NativeChatToolRun } from './NativeChatToolRun'
+import { openToolRunMembers } from './native-chat-tool-run-members-test-support'
 
 afterEach(cleanup)
 
@@ -70,6 +71,7 @@ describe('NativeChatToolRun', () => {
     ]
 
     const { container } = render(<NativeChatToolRun blocks={blocks} expandSignal />)
+    openToolRunMembers()
 
     expect(screen.getByText('after')).toBeInTheDocument()
     expect(screen.getByText('before')).toBeInTheDocument()
@@ -103,6 +105,7 @@ describe('NativeChatToolRun', () => {
     const { container } = render(
       <NativeChatToolRun blocks={projected?.blocks ?? []} expandSignal />
     )
+    openToolRunMembers()
 
     // Row grounds come from the diff tokens, not a hardcoded palette value.
     expect(screen.getByText('after').closest('div')).toHaveClass('bg-[var(--diff-added-ground)]')
@@ -122,6 +125,7 @@ describe('NativeChatToolRun', () => {
     ]
 
     const { container } = render(<NativeChatToolRun blocks={blocks} expandSignal />)
+    openToolRunMembers()
 
     const editRow = screen.getByRole('button', { name: /^Edit Tried to edit \/repo\/a\.ts/ })
     expect(within(editRow).queryByText('Edited')).toBeNull()
@@ -143,7 +147,6 @@ describe('NativeChatToolRun', () => {
 
     const commandRow = screen.getByRole('button', { name: /^exec Ran git diff/ })
     expect(within(commandRow).queryByText('Edited')).toBeNull()
-    expect(within(commandRow).getByText('git diff')).toHaveClass('font-mono')
     expect(container).toHaveTextContent('git diff')
   })
 
@@ -159,6 +162,7 @@ describe('NativeChatToolRun', () => {
     ]
 
     render(<NativeChatToolRun blocks={blocks} expandSignal />)
+    openToolRunMembers()
 
     // Exact, because a snippet-relative number would sit ahead of the marker.
     expect(screen.getByText('now').closest('div')?.textContent).toBe('+now')
@@ -187,6 +191,7 @@ describe('NativeChatToolRun', () => {
     ]
 
     render(<NativeChatToolRun blocks={blocks} expandSignal />)
+    openToolRunMembers()
 
     const separators = screen.getAllByRole('separator')
     expect(separators).toHaveLength(1)
@@ -221,8 +226,8 @@ describe('NativeChatToolRun', () => {
       { type: 'tool-result', output: '@@ -1,3 +1,3 @@\n ctx\n-was\n+now\n… (48210 bytes)' }
     ]
 
-    // A defined expandOverride opens the run while leaving each card closed.
-    render(<NativeChatToolRun blocks={blocks} expandSignal={false} expandOverride />)
+    // An opened run lists its cards closed.
+    render(<NativeChatToolRun blocks={blocks} expandSignal />)
 
     expect(screen.getByText('Diff truncated')).toBeInTheDocument()
     expect(screen.queryByText('was')).toBeNull()
@@ -567,36 +572,6 @@ describe('NativeChatToolRun', () => {
     expect(container.querySelector('.lucide-check')).toBeInTheDocument()
   })
 
-  it('keeps settled tool activity behind the completed turn disclosure', () => {
-    const blocks: NativeChatBlock[] = [
-      { type: 'tool-call', name: 'shell', input: { command: 'git log -1' }, state: 'failed' },
-      { type: 'tool-result', output: 'exit 128', isError: true }
-    ]
-
-    const { rerender, container } = render(
-      <NativeChatToolRun
-        blocks={blocks}
-        expandSignal={false}
-        expandOverride={false}
-        activeTurnIsWorking={false}
-      />
-    )
-
-    expect(screen.queryByText('git log -1')).toBeNull()
-    expect(screen.queryByText('exit 128')).toBeNull()
-
-    rerender(
-      <NativeChatToolRun
-        blocks={blocks}
-        expandSignal={false}
-        expandOverride
-        activeTurnIsWorking={false}
-      />
-    )
-
-    expect(runHeader(container)).toHaveTextContent('git log -1')
-  })
-
   // Opening a turn lists the work; a call's output is one more click. Printing
   // every result beside its call doubled an opened run's height with rows whose
   // own word was `Result`.
@@ -606,16 +581,7 @@ describe('NativeChatToolRun', () => {
       { type: 'tool-result', output: 'exit 128', isError: true }
     ]
 
-    // Opened from the turn's own caret, which is the path that leaves each
-    // call's line collapsed.
-    render(
-      <NativeChatToolRun
-        blocks={blocks}
-        expandSignal={false}
-        expandOverride
-        activeTurnIsWorking={false}
-      />
-    )
+    render(<NativeChatToolRun blocks={blocks} expandSignal activeTurnIsWorking={false} />)
 
     expect(screen.queryByText('Result')).toBeNull()
     expect(screen.queryByText('exit 128')).toBeNull()
@@ -758,7 +724,7 @@ describe('NativeChatToolRun', () => {
     })
 
     const { container } = render(
-      <NativeChatToolRun blocks={projected?.blocks ?? []} expandSignal={false} expandOverride />
+      <NativeChatToolRun blocks={projected?.blocks ?? []} expandSignal />
     )
 
     // The run renders an edited-file card, so a wrench above it reads as a tool
@@ -907,9 +873,7 @@ describe('NativeChatToolRun', () => {
 
     it('scopes a row’s reveal to that row rather than the whole message', () => {
       // Open run, collapsed children — the state the turn caret leaves behind.
-      const { container } = render(
-        <NativeChatToolRun blocks={run} expandSignal={false} expandOverride />
-      )
+      const { container } = render(<NativeChatToolRun blocks={run} expandSignal />)
 
       const revealed = hoverRevealed(container)
       expect(revealed.length).toBeGreaterThan(0)
@@ -919,9 +883,7 @@ describe('NativeChatToolRun', () => {
     })
 
     it('puts every reveal inside the row button that governs it', () => {
-      const { container } = render(
-        <NativeChatToolRun blocks={run} expandSignal={false} expandOverride />
-      )
+      const { container } = render(<NativeChatToolRun blocks={run} expandSignal />)
 
       hoverRevealed(container).forEach(({ element, classes }) => {
         const scope = /group-hover\/([a-z-]+):/.exec(classes)?.[1]
@@ -930,15 +892,13 @@ describe('NativeChatToolRun', () => {
       })
     })
 
-    it('hides a collapsed chevron on every row until its own row is hovered', () => {
-      const { container } = render(
-        <NativeChatToolRun blocks={run} expandSignal={false} expandOverride />
-      )
+    it('keeps every row’s chevron in view at the row’s right edge', () => {
+      const { container } = render(<NativeChatToolRun blocks={run} expandSignal />)
 
       const chevrons = [...container.querySelectorAll('.border-l button svg.lucide-chevron-right')]
       expect(chevrons.length).toBeGreaterThan(1)
       chevrons.forEach((chevron) => {
-        expect(chevron.getAttribute('class')).toContain('group-hover/tool-line:opacity-100')
+        expect(chevron.getAttribute('class')).not.toContain('opacity-0')
       })
     })
   })
@@ -993,6 +953,7 @@ describe('NativeChatToolRun task lists', () => {
         expandSignal
       />
     )
+    openToolRunMembers()
     expect(screen.getByText('Invalid arguments', { selector: 'pre' })).toBeInTheDocument()
     expect(screen.getByText('Update rejected', { selector: 'pre' })).toBeInTheDocument()
     expect(screen.queryByText('1/1')).toBeNull()
diff --git a/src/renderer/src/components/native-chat/NativeChatToolRun.tsx b/src/renderer/src/components/native-chat/NativeChatToolRun.tsx
index 723aa5cc6949..0d0e10a1e219 100644
--- a/src/renderer/src/components/native-chat/NativeChatToolRun.tsx
+++ b/src/renderer/src/components/native-chat/NativeChatToolRun.tsx
@@ -1,9 +1,9 @@
 import type { CommentMarkdownLinkClickHandler } from '@/components/sidebar/CommentMarkdown'
 import { useMemo } from 'react'
 import { useTranslation } from 'react-i18next'
+import { NativeChatExpandable } from './NativeChatExpandable'
 import { useNativeChatDisclosure } from './native-chat-disclosure-store'
-import { NativeChatToolLine } from './NativeChatToolLine'
-import { Check, ChevronRight } from 'lucide-react'
+import { Check } from 'lucide-react'
 import { cn } from '@/lib/utils'
 import { translate } from '@/i18n/i18n'
 import {
@@ -14,16 +14,9 @@ import {
   type NativeChatToolCallBlock
 } from '../../../../shared/native-chat-types'
 import { isRenderableSubagentGroup } from '../../../../shared/native-chat-subagent-summary'
-import { NativeChatDiffCard } from './NativeChatDiffCard'
 import type { NativeChatDiffReveal } from './native-chat-turn-diffs'
-import { buildEditCards, NO_EDIT_CARDS } from './native-chat-edit-cards'
 import { countToolCalls } from './native-chat-tool-summary'
 import { nativeChatToolRunSentence } from './native-chat-tool-run-label'
-import { nativeChatToolLineLabel } from './native-chat-tool-line-label'
-import {
-  NO_NATIVE_CHAT_TOOL_PAIRING,
-  pairNativeChatToolResults
-} from '../../../../shared/native-chat-tool-pairing'
 import {
   describeLatestToolCall,
   NATIVE_CHAT_TOOL_ACTIVITY_COPY,
@@ -36,8 +29,6 @@ import {
   nativeChatAskRunSubject
 } from '../../../../shared/native-chat-ask-row'
 import { NativeChatAwaitingInputRow } from './NativeChatAwaitingInputRow'
-import { NativeChatTaskList } from './NativeChatTaskList'
-import { buildNativeChatTaskListRows } from './native-chat-task-list-history'
 import { NativeChatBackgroundTaskRun } from './NativeChatBackgroundTaskRun'
 import { NativeChatSubagentRun } from './NativeChatSubagentRun'
 import type {
@@ -46,6 +37,8 @@ import type {
 } from './native-chat-subagent-sections'
 import { NativeChatToolRunIcon } from './NativeChatToolIcon'
 import { NativeChatToolRunCallCounts } from './NativeChatToolRunCallCounts'
+import { NativeChatToolRunMembers, revealNativeChatToolRunMember } from './NativeChatToolRunMembers'
+import { NativeChatToolRunMemberList } from './NativeChatToolRunMemberList'
 
 /** Rows drawn among an open run's lines, each keyed: before the block they are keyed by, or
  *  after the last. */
@@ -69,10 +62,10 @@ export function NativeChatToolRun({
   subagentRoster,
   subagentDisclosure,
   backgroundTasks = NO_BACKGROUND_TASKS,
+  followsProse = true,
   expandSignal,
   activeTurnIsWorking,
   trailing,
-  expandOverride,
   disclosureId,
   onLinkClick,
   asides
@@ -89,10 +82,10 @@ export function NativeChatToolRun({
   subagentDisclosure?: NativeChatSubagentDisclosure
   /** Background tasks that belong with this run's activity, one row each. */
   backgroundTasks?: NativeChatBackgroundTaskBlock[]
+  /** The row draws prose above this run, which the run then sits just under. */
+  followsProse?: boolean
   /** Legacy view-level default; production native-chat entry points pass false. */
   expandSignal: boolean
-  /** Optional external control for callers that intentionally own this run's disclosure. */
-  expandOverride?: boolean
   /** Structured lifecycle state, when available, keeps orphaned running calls from spinning. */
   activeTurnIsWorking?: boolean
   /** Whether this run is the working turn's last. Only that run is live: a run
@@ -107,16 +100,23 @@ export function NativeChatToolRun({
 }): React.JSX.Element | null {
   // This row owns the language subscription for its tool, diff, and task labels.
   useTranslation()
+  const spacing = followsProse ? 'mt-2' : undefined
+  // Rows drawn among the calls count as work too: a reader at the end follows them arriving.
+  const asideCount = useMemo(
+    () =>
+      asides
+        ? asides.after.length +
+          Array.from(asides.before.values()).reduce((count, rows) => count + rows.length, 0)
+        : 0,
+    [asides]
+  )
   // A reader's deviation belongs to the controlling disclosure state, so returning
   // to that state restores the same choice without writing to the store mid-render.
   const runKey =
     disclosureId === undefined
       ? undefined
-      : `run:${disclosureId}:${expandOverride ?? '-'}:${expandSignal}:${revealedDiff?.requestId ?? '-'}`
-  const { open, setOpen } = useNativeChatDisclosure(
-    runKey,
-    revealedDiff ? true : (expandOverride ?? expandSignal)
-  )
+      : `run:${disclosureId}:${expandSignal}:${revealedDiff?.requestId ?? '-'}`
+  const { open, setOpen } = useNativeChatDisclosure(runKey, revealedDiff ? true : expandSignal)
 
   // Childless groups are dropped so `subagentRows.length` stays an honest test of
   // "something will draw": the roster-only branch below returns a margin-bearing
@@ -178,29 +178,13 @@ export function NativeChatToolRun({
     failedCallCount,
     interruptedCallCount
   } = nativeChatToolRunOutcome(headerBlocks, { activeTurnIsWorking })
-  // An externally opened run keeps child tools collapsed; normal callers leave
-  // the run's own disclosure independent from the turn status bar.
-  const expandToolLines = expandOverride === undefined ? open : false
-  // Diffing every edit is the run's most expensive work, so a collapsed run —
-  // which renders none of it — never pays for it.
-  const taskLists = useMemo(
+  // The card sits inside the run's own scroll box, so that box has to move too.
+  const revealDiff = useMemo(
     () =>
-      open
-        ? buildNativeChatTaskListRows(blocks, {
-            todowrite: previousTodoWrite,
-            update_plan: previousUpdatePlan
-          })
-        : null,
-    [open, blocks, previousTodoWrite, previousUpdatePlan]
-  )
-  // Rollups cache counts only; detailed diff rows are built when the run opens.
-  const { editCards, consumedResults } = useMemo(
-    () => (open ? buildEditCards(blocks) : NO_EDIT_CARDS),
-    [open, blocks]
-  )
-  const { resultByCall, pairedResults } = useMemo(
-    () => (open ? pairNativeChatToolResults(headerBlocks) : NO_NATIVE_CHAT_TOOL_PAIRING),
-    [open, headerBlocks]
+      onRevealDiff
+        ? (card: HTMLElement) => onRevealDiff(revealNativeChatToolRunMember(card))
+        : undefined,
+    [onRevealDiff]
   )
   // Only the settled header reads this. It stands over a sentence that speaks
   // for every call in the run, so a glyph taken from one of them would assert a
@@ -218,36 +202,12 @@ export function NativeChatToolRun({
 
   // A roster with no tool calls beside it is the whole run: rendering the tool
   // header too would announce "1 tool call" for activity that has none.
-  //
-  // Ordered BEFORE the completed-turn guard below on purpose. That guard hides
-  // TOOL activity behind the turn-status disclosure, and a roster row has none
-  // to hide: it is the compact summary this row exists to leave behind. Bailing
-  // there instead dropped it from every settled turn — the default state of the
-  // whole transcript — and left the caller, which counts a spawn group as
-  // renderable, drawing the empty bubble it explicitly guards against.
   if (blocks.length === 0) {
-    return standaloneRows.length > 0 ? <div className="mt-3">{standaloneRows}</div> : null
-  }
-
-  // Completed turn activity belongs behind the turn-status disclosure. Keeping
-  // 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 (
-    expandOverride === false &&
-    !(revealedDiff && open) &&
-    !live &&
-    activeTurnIsWorking === false
-  ) {
-    // The roster is not tool activity, so it survives this guard exactly as it
-    // survives the tool-less escape above — otherwise a group sharing a message
-    // with tool calls is dropped from every settled turn.
-    return standaloneRows.length > 0 ? <div className="mt-3">{standaloneRows}</div> : null
+    return standaloneRows.length > 0 ? <div className={spacing}>{standaloneRows}</div> : null
   }
 
   return (
-    // Extra top margin sets the tool run apart from the assistant prose above it
-    // so the turn's activity doesn't crowd the message text.
-    <div className="mt-3">
+    <div className={spacing}>
       {standaloneRows}
       {hasAskCall ? (
         <NativeChatAwaitingInputRow
@@ -305,119 +265,32 @@ export function NativeChatToolRun({
           ) : null}
           {latestCallLabel ? (
             <span className="flex h-[1lh] min-w-0 items-center">
-              <span
-                className={cn(
-                  'min-w-0 truncate font-sans text-xs text-chat-foreground-faint',
-                  latestCall &&
-                    nativeChatToolLineLabel(latestCall).command &&
-                    'rounded-md border border-chat-inline-code-border bg-chat-inline-code-surface px-1.5 font-mono text-chat-foreground'
-                )}
-              >
+              <span className="min-w-0 truncate font-sans text-xs text-chat-foreground-faint">
                 {latestCallLabel}
               </span>
             </span>
           ) : null}
-          {/* Revealed on hover of this header alone — see NativeChatToolLine on
-              why the group is named — and points down when open. */}
-          <span className="flex h-[1lh] shrink-0 items-center">
-            <ChevronRight
-              className={cn(
-                'size-3.5 shrink-0 text-chat-foreground-faint transition-all',
-                open ? 'rotate-90 opacity-100' : 'opacity-0 group-hover/tool-run:opacity-100'
-              )}
-            />
-          </span>
         </button>
       )}
-      {open && showsHeader ? (
-        // Members are indented under the header because nothing else marks the
-        // run's extent — flush rows are indistinguishable from the blocks after
-        // them, so the batch has no visible end.
-        <div className="ml-[7px] mt-0.5 border-l border-chat-code-border pl-[13px]">
-          {(() => {
-            const seen = new Map<string, number>()
-            const lines = headerBlocks.map((block, blockIndex) => {
-              const taskList = taskLists?.rows.get(block)
-              if (taskList) {
-                return <NativeChatTaskList key={`tasks:${blockIndex}`} {...taskList} />
-              }
-              if (taskLists?.consumedResults.has(block)) {
-                return null
-              }
-              const edit = editCards.get(block)
-              if (edit) {
-                return (
-                  <div key={`edit:${edit.key}`}>
-                    {edit.files.map((file, fileIndex) => (
-                      <NativeChatDiffCard
-                        key={`${edit.key}:${fileIndex}`}
-                        file={file}
-                        revealSignal={
-                          revealedDiff?.editKey === edit.key && revealedDiff.fileIndex === fileIndex
-                            ? revealedDiff.requestId
-                            : undefined
-                        }
-                        onReveal={onRevealDiff}
-                        initiallyExpanded={expandToolLines}
-                        disclosureKey={
-                          disclosureId === undefined
-                            ? undefined
-                            : `diff:${disclosureId}:${edit.key}:${fileIndex}`
-                        }
-                      />
-                    ))}
-                  </div>
-                )
-              }
-              // A result its call now owns is drawn by that call's line, not as
-              // a row of its own.
-              if (consumedResults.has(block) || pairedResults.has(block)) {
-                return null
-              }
-              const signature =
-                block.type === 'tool-call'
-                  ? `${block.type}:${block.name}:${JSON.stringify(block.input)}`
-                  : block.type === 'tool-result'
-                    ? `${block.type}:${block.output}`
-                    : `${block.type}`
-              const occurrence = seen.get(signature) ?? 0
-              seen.set(signature, occurrence + 1)
-              const providerCallId =
-                block.type === 'tool-call' &&
-                block.callId !== undefined &&
-                block.callId.trim().length > 0
-                  ? block.callId
-                  : undefined
-              const lineIdentity =
-                providerCallId !== undefined
-                  ? `call:${providerCallId}`
-                  : `${signature}:${occurrence}`
-              return (
-                <NativeChatToolLine
-                  key={lineIdentity}
-                  block={block}
-                  result={block.type === 'tool-call' ? resultByCall.get(block) : undefined}
-                  onLinkClick={onLinkClick}
-                  initiallyExpanded={expandToolLines}
-                  disclosureKey={
-                    disclosureId === undefined ? undefined : `line:${disclosureId}:${lineIdentity}`
-                  }
-                />
-              )
-            })
-            // One flat keyed list with or without asides, so a row gaining its first never remounts a line.
-            return asides
-              ? [
-                  ...headerBlocks.flatMap((block, blockIndex) => [
-                    ...(asides.before.get(block) ?? []),
-                    lines[blockIndex]
-                  ]),
-                  ...asides.after
-                ]
-              : lines
-          })()}
-        </div>
-      ) : null}
+      <NativeChatExpandable open={open && showsHeader}>
+        <NativeChatToolRunMembers
+          followKey={blocks.length + asideCount}
+          startsAtEnd={live && !revealedDiff}
+          memoryKey={runKey}
+        >
+          <NativeChatToolRunMemberList
+            blocks={blocks}
+            headerBlocks={headerBlocks}
+            asides={asides}
+            previousTodoWrite={previousTodoWrite}
+            previousUpdatePlan={previousUpdatePlan}
+            revealedDiff={revealedDiff}
+            onRevealDiff={revealDiff}
+            disclosureId={disclosureId}
+            onLinkClick={onLinkClick}
+          />
+        </NativeChatToolRunMembers>
+      </NativeChatExpandable>
     </div>
   )
 }
diff --git a/src/renderer/src/components/native-chat/NativeChatToolRunCallCounts.test.tsx b/src/renderer/src/components/native-chat/NativeChatToolRunCallCounts.test.tsx
index db84b566d519..d8ac91b19413 100644
--- a/src/renderer/src/components/native-chat/NativeChatToolRunCallCounts.test.tsx
+++ b/src/renderer/src/components/native-chat/NativeChatToolRunCallCounts.test.tsx
@@ -9,6 +9,7 @@ import { interruptedAgentJournalToolCall } from '../../../../shared/agent-journa
 import type { NativeChatBlock } from '../../../../shared/native-chat-types'
 import { projectStructuredItemToNativeChat } from '../../../../shared/structured-agent-session-projection'
 import { NativeChatToolRun } from './NativeChatToolRun'
+import { openToolRunMembers } from './native-chat-tool-run-members-test-support'
 
 afterEach(cleanup)
 
@@ -78,6 +79,7 @@ describe('NativeChatToolRun call counts', () => {
       })
     )
     const { container } = render(<NativeChatToolRun blocks={blocks} expandSignal />)
+    openToolRunMembers()
     const body = [...container.querySelectorAll('pre')].find((pre) => pre.textContent === 'partial')
     expect(body).toBeDefined()
     expect(body).not.toHaveClass('text-destructive')
diff --git a/src/renderer/src/components/native-chat/NativeChatToolRunMemberList.tsx b/src/renderer/src/components/native-chat/NativeChatToolRunMemberList.tsx
new file mode 100644
index 000000000000..68a18d6a84dc
--- /dev/null
+++ b/src/renderer/src/components/native-chat/NativeChatToolRunMemberList.tsx
@@ -0,0 +1,131 @@
+import { useMemo } from 'react'
+import type { CommentMarkdownLinkClickHandler } from '@/components/sidebar/CommentMarkdown'
+import type { NativeChatBlock, NativeChatToolCallBlock } from '../../../../shared/native-chat-types'
+import { pairNativeChatToolResults } from '../../../../shared/native-chat-tool-pairing'
+import { NativeChatDiffCard } from './NativeChatDiffCard'
+import { NativeChatTaskList } from './NativeChatTaskList'
+import { NativeChatToolLine } from './NativeChatToolLine'
+import { buildEditCards } from './native-chat-edit-cards'
+import { buildNativeChatTaskListRows } from './native-chat-task-list-history'
+import type { NativeChatDiffReveal } from './native-chat-turn-diffs'
+import type { NativeChatToolRunAsides } from './NativeChatToolRun'
+
+/** A row's identity when its provider gave none: what it says, and which repeat of that it is. */
+function contentIdentity(block: NativeChatBlock, seen: Map<string, number>): string {
+  const signature =
+    block.type === 'tool-call'
+      ? `${block.type}:${block.name}:${JSON.stringify(block.input)}`
+      : block.type === 'tool-result'
+        ? `${block.type}:${block.output}`
+        : `${block.type}`
+  const occurrence = seen.get(signature) ?? 0
+  seen.set(signature, occurrence + 1)
+  return `${signature}:${occurrence}`
+}
+
+/** An opened run's members in order, each one line until opened. Mounted only while the
+ *  run is open, so a collapsed run pays for none of the diffing and pairing done here. */
+export function NativeChatToolRunMemberList({
+  blocks,
+  headerBlocks,
+  previousTodoWrite,
+  previousUpdatePlan,
+  revealedDiff,
+  onRevealDiff,
+  disclosureId,
+  onLinkClick,
+  asides
+}: {
+  /** Every tool block of the run; `headerBlocks` is those minus its asks. */
+  blocks: NativeChatBlock[]
+  headerBlocks: NativeChatBlock[]
+  /** Rows the transcript draws among the calls, such as the thoughts between them. */
+  asides?: NativeChatToolRunAsides
+  previousTodoWrite?: NativeChatToolCallBlock
+  previousUpdatePlan?: NativeChatToolCallBlock
+  revealedDiff?: NativeChatDiffReveal
+  onRevealDiff?: (element: HTMLElement) => void
+  disclosureId?: string
+  onLinkClick?: CommentMarkdownLinkClickHandler
+}): React.JSX.Element {
+  const taskLists = useMemo(
+    () =>
+      buildNativeChatTaskListRows(blocks, {
+        todowrite: previousTodoWrite,
+        update_plan: previousUpdatePlan
+      }),
+    [blocks, previousTodoWrite, previousUpdatePlan]
+  )
+  const { editCards, consumedResults } = useMemo(() => buildEditCards(blocks), [blocks])
+  const { resultByCall, pairedResults } = useMemo(
+    () => pairNativeChatToolResults(headerBlocks),
+    [headerBlocks]
+  )
+
+  const seen = new Map<string, number>()
+  const member = (block: NativeChatBlock, blockIndex: number): React.ReactNode => {
+    const taskList = taskLists.rows.get(block)
+    if (taskList) {
+      return <NativeChatTaskList key={`tasks:${blockIndex}`} {...taskList} />
+    }
+    if (taskLists.consumedResults.has(block)) {
+      return null
+    }
+    const edit = editCards.get(block)
+    if (edit) {
+      return (
+        <div key={`edit:${edit.key}`}>
+          {edit.files.map((file, fileIndex) => (
+            <NativeChatDiffCard
+              key={`${edit.key}:${fileIndex}`}
+              file={file}
+              revealSignal={
+                revealedDiff?.editKey === edit.key && revealedDiff.fileIndex === fileIndex
+                  ? revealedDiff.requestId
+                  : undefined
+              }
+              onReveal={onRevealDiff}
+              disclosureKey={
+                disclosureId === undefined
+                  ? undefined
+                  : `diff:${disclosureId}:${edit.key}:${fileIndex}`
+              }
+            />
+          ))}
+        </div>
+      )
+    }
+    // A result its call now owns is drawn by that call's line, not as a row of its own.
+    if (consumedResults.has(block) || pairedResults.has(block)) {
+      return null
+    }
+    const providerCallId =
+      block.type === 'tool-call' && block.callId !== undefined && block.callId.trim().length > 0
+        ? block.callId
+        : undefined
+    const lineIdentity =
+      providerCallId !== undefined ? `call:${providerCallId}` : contentIdentity(block, seen)
+    return (
+      <NativeChatToolLine
+        key={lineIdentity}
+        block={block}
+        result={block.type === 'tool-call' ? resultByCall.get(block) : undefined}
+        onLinkClick={onLinkClick}
+        disclosureKey={
+          disclosureId === undefined ? undefined : `line:${disclosureId}:${lineIdentity}`
+        }
+      />
+    )
+  }
+
+  // One flat keyed list with or without asides, so a row gaining its first never remounts a line.
+  return (
+    <>
+      {headerBlocks.flatMap((block, blockIndex) => [
+        ...(asides?.before.get(block) ?? []),
+        member(block, blockIndex)
+      ])}
+      {asides?.after}
+    </>
+  )
+}
diff --git a/src/renderer/src/components/native-chat/NativeChatToolRunMembers.tsx b/src/renderer/src/components/native-chat/NativeChatToolRunMembers.tsx
new file mode 100644
index 000000000000..f63c6c58ce84
--- /dev/null
+++ b/src/renderer/src/components/native-chat/NativeChatToolRunMembers.tsx
@@ -0,0 +1,132 @@
+import { useCallback, useContext, useEffect, useLayoutEffect, useRef, useState } from 'react'
+import { cn } from '@/lib/utils'
+import { distanceFromBottom, NATIVE_CHAT_FOLLOW_REARM_PX } from './native-chat-autoscroll'
+import { setWithLRU } from '@/lib/scroll-cache'
+import {
+  MAX_NATIVE_CHAT_DISCLOSURES,
+  NativeChatDisclosureContext
+} from './native-chat-disclosure-store'
+
+/** The height of every detail a reader has opened in a member, each marked by its owner. */
+function openDetailHeight(content: HTMLElement): number {
+  let height = 0
+  for (const detail of content.querySelectorAll<HTMLElement>('[data-native-chat-member-detail]')) {
+    height += detail.offsetHeight
+  }
+  return height
+}
+
+/** Scrolls a member to the top of its run's box. Returns the box for the transcript to
+ *  align to: a member's own offset ignores the box's scroll. */
+export function revealNativeChatToolRunMember(member: HTMLElement): HTMLElement {
+  const scroller = member.closest<HTMLElement>('[data-native-chat-tool-run-members]')
+  if (!scroller) {
+    return member
+  }
+  scroller.scrollTop += member.getBoundingClientRect().top - scroller.getBoundingClientRect().top
+  return scroller
+}
+
+/** An opened run's members in a bounded scroll box, so live work fills it instead of lengthening the page. */
+export function NativeChatToolRunMembers({
+  followKey,
+  startsAtEnd,
+  memoryKey,
+  children
+}: {
+  /** How much work the run holds: a reader at the end follows it growing. Opening a detail must not count. */
+  followKey: number
+  /** A live run opens on what it is doing now; a settled one reads from its top. */
+  startsAtEnd: boolean
+  /** The run's disclosure key. Windowing unmounts an off-screen row; its box comes back as the reader left it. */
+  memoryKey?: string
+  children: React.ReactNode
+}): React.JSX.Element {
+  const scrollerRef = useRef<HTMLDivElement | null>(null)
+  const contentRef = useRef<HTMLDivElement | null>(null)
+  // An edge fades while members lie past it, so a full box reads as scrollable.
+  const [fades, setFades] = useState({ top: false, bottom: false })
+  const runScroll = useContext(NativeChatDisclosureContext)?.runScroll
+  const [remembered] = useState(() =>
+    memoryKey === undefined ? undefined : runScroll?.get(memoryKey)
+  )
+  const followsEndRef = useRef(remembered?.followsEnd ?? startsAtEnd)
+
+  useLayoutEffect(() => {
+    if (scrollerRef.current && remembered && !remembered.followsEnd) {
+      scrollerRef.current.scrollTop = remembered.top
+    }
+  }, [remembered])
+
+  // Before paint: follow only if the reader was at the end before the new work.
+  useLayoutEffect(() => {
+    const scroller = scrollerRef.current
+    if (scroller && followsEndRef.current) {
+      scroller.scrollTop = scroller.scrollHeight
+    }
+  }, [followKey])
+
+  const readPosition = useCallback(() => {
+    const scroller = scrollerRef.current
+    if (!scroller) {
+      return
+    }
+    const fromEnd = distanceFromBottom(scroller)
+    followsEndRef.current = fromEnd <= NATIVE_CHAT_FOLLOW_REARM_PX
+    const top = scroller.scrollTop > 1
+    const bottom = fromEnd > 1
+    setFades((current) =>
+      current.top === top && current.bottom === bottom ? current : { top, bottom }
+    )
+    if (runScroll && memoryKey !== undefined) {
+      setWithLRU(
+        runScroll,
+        memoryKey,
+        { top: scroller.scrollTop, followsEnd: followsEndRef.current },
+        MAX_NATIVE_CHAT_DISCLOSURES
+      )
+    }
+  }, [memoryKey, runScroll])
+
+  useEffect(() => {
+    const scroller = scrollerRef.current
+    const content = contentRef.current
+    if (!scroller || !content || typeof ResizeObserver === 'undefined') {
+      return
+    }
+    let roomForDetails = 0
+    const observer = new ResizeObserver(() => {
+      const opened = openDetailHeight(content)
+      if (opened !== roomForDetails) {
+        roomForDetails = opened
+        // A variable, not state: a detail animating open would re-render every frame.
+        scroller.style.setProperty('--native-chat-opened-detail', `${opened}px`)
+      }
+      readPosition()
+    })
+    observer.observe(content)
+    // The box's cap moves with an opened detail, which changes what lies past its edges.
+    observer.observe(scroller)
+    return () => observer.disconnect()
+  }, [readPosition])
+
+  return (
+    // Indented under the header: nothing else marks where the run's rows end.
+    <div
+      ref={scrollerRef}
+      onScroll={readPosition}
+      className={cn(
+        'scrollbar-sleek ml-[7px] mt-0.5 overflow-y-auto border-l border-chat-code-border pl-[13px]',
+        // Contains the members' absolute sr-only labels, which otherwise lengthen the page.
+        'relative',
+        // Room for the list plus what the reader has opened in it, up to half the window.
+        'max-h-[min(50dvh,calc(18rem+var(--native-chat-opened-detail,0px)))]',
+        fades.top && 'mask-t-from-[calc(100%-1.5rem)]',
+        fades.bottom && 'mask-b-from-[calc(100%-1.5rem)]'
+      )}
+      data-native-chat-tool-run-members
+    >
+      <div ref={contentRef}>{children}</div>
+    </div>
+  )
+}
diff --git a/src/renderer/src/components/native-chat/NativeChatTranscriptChrome.tsx b/src/renderer/src/components/native-chat/NativeChatTranscriptChrome.tsx
index e2f712c742c2..ac9d54d748d0 100644
--- a/src/renderer/src/components/native-chat/NativeChatTranscriptChrome.tsx
+++ b/src/renderer/src/components/native-chat/NativeChatTranscriptChrome.tsx
@@ -7,6 +7,7 @@ import type { NativeChatBlock } from '../../../../shared/native-chat-types'
 import { NativeChatCopyButton } from './NativeChatCopyButton'
 import { NativeChatMessageTimestamp } from './NativeChatMessageTimestamp'
 import { nativeChatProviderFrameSummary } from '../../../../shared/native-chat-provider-frame-summary'
+import { withoutNativeChatVisualDirectiveLines } from '../../../../shared/native-chat-visual-directive'
 import { Dialog, DialogContent, DialogDescription, DialogTitle } from '@/components/ui/dialog'
 import {
   getLocalImageCacheKey,
@@ -24,7 +25,10 @@ type VisibilityListener = (isVisible: boolean) => void
 const visibilityListeners = new Map<Element, VisibilityListener>()
 let visibilityObserver: IntersectionObserver | null = null
 
-function observeTranscriptVisibility(element: Element, listener: VisibilityListener): () => void {
+export function observeTranscriptVisibility(
+  element: Element,
+  listener: VisibilityListener
+): () => void {
   if (typeof IntersectionObserver === 'undefined') {
     listener(true)
     return () => {}
@@ -289,7 +293,8 @@ export function NativeChatAgentControls({
 }): React.JSX.Element {
   return (
     <div className={cn('flex items-center gap-1', className)}>
-      <NativeChatCopyButton text={markdown} />
+      {/* A visual line means nothing pasted outside Orca, so the copy leaves it out. */}
+      <NativeChatCopyButton text={withoutNativeChatVisualDirectiveLines(markdown)} />
       <button
         type="button"
         onClick={onScrollToTop}
diff --git a/src/renderer/src/components/native-chat/NativeChatTranscriptRow.tsx b/src/renderer/src/components/native-chat/NativeChatTranscriptRow.tsx
index e4c7609bbc4b..8922e5691282 100644
--- a/src/renderer/src/components/native-chat/NativeChatTranscriptRow.tsx
+++ b/src/renderer/src/components/native-chat/NativeChatTranscriptRow.tsx
@@ -92,7 +92,8 @@ export const NativeChatTranscriptRow = memo(function NativeChatTranscriptRow({
     />
   ) : null
   return (
-    <div className={cn('flex flex-col gap-5', sectionClassName)}>
+    // The negative margin shortens the measured row, which is what moves the next one up.
+    <div className={cn('flex flex-col gap-5', slot.continuesTurn && '-mb-3', sectionClassName)}>
       {/* A turn with no user bubble carries its bar above its first row. */}
       {slot.statusAbove ? statusRow : null}
       {!slot.drawsMessage ? null : receipt ? (
@@ -110,6 +111,7 @@ export const NativeChatTranscriptRow = memo(function NativeChatTranscriptRow({
           expandSignal={context.expandSignal}
           activeTurnIsWorking={slot.activeTurnIsWorking}
           trailingRun={slot.trailingRun}
+          continuesTurn={slot.continuesTurn}
           onScrollMessageToTop={context.onScrollMessageToTop}
           onLinkClick={context.onLinkClick}
           allowFileUriLinks={context.allowFileUriLinks}
diff --git a/src/renderer/src/components/native-chat/NativeChatUserMessageFold.test.tsx b/src/renderer/src/components/native-chat/NativeChatUserMessageFold.test.tsx
new file mode 100644
index 000000000000..bb1eb85a410c
--- /dev/null
+++ b/src/renderer/src/components/native-chat/NativeChatUserMessageFold.test.tsx
@@ -0,0 +1,100 @@
+// @vitest-environment happy-dom
+import '@testing-library/jest-dom/vitest'
+import { cleanup, fireEvent, render, screen } from '@testing-library/react'
+import { afterEach, describe, expect, it, vi } from 'vitest'
+import type { NativeChatMessage } from '../../../../shared/native-chat-types'
+import {
+  NativeChatDisclosureContext,
+  useNativeChatDisclosures
+} from './native-chat-disclosure-store'
+import { MessageRow } from './NativeChatMessageRow'
+import { TooltipProvider } from '@/components/ui/tooltip'
+
+vi.mock('@/components/confirmation-dialog-context', () => ({
+  useConfirmationDialog: () => vi.fn()
+}))
+
+afterEach(() => {
+  cleanup()
+  vi.restoreAllMocks()
+})
+
+const LONG_TEXT = Array(40).fill('line').join('\n')
+
+function prompt(id: string, text = LONG_TEXT): NativeChatMessage {
+  return { id, role: 'user', timestamp: 0, source: 'transcript', blocks: [{ type: 'text', text }] }
+}
+
+/** happy-dom lays nothing out, so the prompt's full height against its clip is supplied. */
+function renderPrompt(initial: NativeChatMessage, fullHeightPx = 800) {
+  vi.spyOn(HTMLElement.prototype, 'scrollHeight', 'get').mockReturnValue(fullHeightPx)
+  vi.spyOn(HTMLElement.prototype, 'clientHeight', 'get').mockReturnValue(176)
+  function Transcript({ message }: { message: NativeChatMessage | null }) {
+    const disclosures = useNativeChatDisclosures()
+    return (
+      <TooltipProvider>
+        <NativeChatDisclosureContext.Provider value={disclosures}>
+          {message ? (
+            <MessageRow message={message} expandSignal={false} onScrollMessageToTop={vi.fn()} />
+          ) : null}
+        </NativeChatDisclosureContext.Provider>
+      </TooltipProvider>
+    )
+  }
+  const view = render(<Transcript message={initial} />)
+  return {
+    show: (message: NativeChatMessage | null) => view.rerender(<Transcript message={message} />)
+  }
+}
+
+const folded = () => document.querySelector('[data-native-chat-user-message-folded]')
+const showFull = () => screen.queryByRole('button', { name: 'Show full message' })
+const showLess = () => screen.queryByRole('button', { name: 'Show less' })
+
+describe('a long sent prompt', () => {
+  it.each([
+    ['8 lines', Array(8).fill('line').join('\n'), false],
+    ['9 lines', Array(9).fill('line').join('\n'), true],
+    ['600 characters', 'x'.repeat(600), false],
+    ['601 characters', 'x'.repeat(601), true]
+  ])('at %s, folds: %s', (_label, text, folds) => {
+    renderPrompt(prompt('prompt', text))
+    expect(folded() !== null).toBe(folds)
+    expect(showFull() !== null).toBe(folds)
+  })
+
+  it('opens and folds again', () => {
+    renderPrompt(prompt('prompt'))
+    fireEvent.click(showFull()!)
+    expect(folded()).toBeNull()
+
+    fireEvent.click(showLess()!)
+    expect(folded()).not.toBeNull()
+    expect(showFull()).toBeInTheDocument()
+  })
+
+  it('shows no fade or toggle when a long text already fits its preview', () => {
+    renderPrompt(prompt('prompt'), 150)
+    expect(folded()).toBeNull()
+    expect(showFull()).toBeNull()
+  })
+
+  it('measures again when a longer copy of the message replaces one that fit', () => {
+    const { show } = renderPrompt(prompt('prompt'), 150)
+    expect(showFull()).toBeNull()
+
+    vi.spyOn(HTMLElement.prototype, 'scrollHeight', 'get').mockReturnValue(800)
+    show(prompt('prompt', `${LONG_TEXT}\nmore`))
+    expect(folded()).not.toBeNull()
+    expect(showFull()).toBeInTheDocument()
+  })
+
+  it('stays open after its row leaves the window and returns', () => {
+    const { show } = renderPrompt(prompt('prompt'))
+    fireEvent.click(showFull()!)
+    show(null)
+    show(prompt('prompt'))
+    expect(folded()).toBeNull()
+    expect(showLess()).toBeInTheDocument()
+  })
+})
diff --git a/src/renderer/src/components/native-chat/NativeChatUserMessageFold.tsx b/src/renderer/src/components/native-chat/NativeChatUserMessageFold.tsx
new file mode 100644
index 000000000000..fe429c5517ce
--- /dev/null
+++ b/src/renderer/src/components/native-chat/NativeChatUserMessageFold.tsx
@@ -0,0 +1,86 @@
+import { useId, useLayoutEffect, useMemo, useRef, useState } from 'react'
+import { Button } from '@/components/ui/button'
+import { translate } from '@/i18n/i18n'
+import { cn } from '@/lib/utils'
+import { useNativeChatDisclosure } from './native-chat-disclosure-store'
+import { nativeChatUserMessageFolds } from './native-chat-user-message-fold'
+
+export function NativeChatUserMessageFold({
+  messageId,
+  markdown,
+  onRefolded,
+  children
+}: {
+  messageId: string
+  markdown: string
+  /** After the reader folded the prompt again, once its new height is laid out. */
+  onRefolded?: () => void
+  children: React.ReactNode
+}): React.JSX.Element {
+  const disclosure = useNativeChatDisclosure(`user-message:${messageId}`, false)
+  const longText = useMemo(() => nativeChatUserMessageFolds(markdown), [markdown])
+  // The text rule can pick a prompt that already fits the clip; that one gets no fade or toggle.
+  // Tied to the text it was measured for: a superseding copy of the message is measured again.
+  const [measured, setMeasured] = useState({ markdown, fits: false })
+  const fits = measured.markdown === markdown && measured.fits
+  const folds = longText && !fits
+  const folded = folds && !disclosure.open
+  const clipRef = useRef<HTMLDivElement | null>(null)
+  const clipId = useId()
+  const toggledRef = useRef(false)
+  useLayoutEffect(() => {
+    const clip = clipRef.current
+    if (folded && clip) {
+      const fitsNow = clip.scrollHeight <= clip.clientHeight
+      setMeasured((current) =>
+        current.markdown === markdown && current.fits === fitsNow
+          ? current
+          : { markdown, fits: fitsNow }
+      )
+    }
+    if (toggledRef.current) {
+      toggledRef.current = false
+      if (folded) {
+        onRefolded?.()
+      }
+    }
+  }, [folded, markdown, onRefolded])
+
+  return (
+    <>
+      <div
+        ref={clipRef}
+        id={clipId}
+        data-native-chat-user-message-folded={folded ? '' : undefined}
+        className={cn(folded && 'max-h-44 overflow-hidden mask-b-from-[calc(100%-1.75rem)]')}
+        // Tabbing to a link under the fold scrolls the preview to it; the top returns once focus leaves.
+        onBlur={(event) => {
+          if (document.hasFocus() && !event.currentTarget.contains(event.relatedTarget)) {
+            event.currentTarget.scrollTop = 0
+          }
+        }}
+      >
+        {children}
+      </div>
+      {folds ? (
+        <div className="-mr-1.5 -mb-1 mt-1 flex select-none justify-end">
+          <Button
+            type="button"
+            variant="ghost"
+            size="xs"
+            aria-expanded={disclosure.open}
+            aria-controls={clipId}
+            onClick={() => {
+              toggledRef.current = true
+              disclosure.setOpen(!disclosure.open)
+            }}
+          >
+            {disclosure.open
+              ? translate('components.native-chat.userMessage.showLess', 'Show less')
+              : translate('components.native-chat.userMessage.showFull', 'Show full message')}
+          </Button>
+        </div>
+      ) : null}
+    </>
+  )
+}
diff --git a/src/renderer/src/components/native-chat/NativeChatView.tsx b/src/renderer/src/components/native-chat/NativeChatView.tsx
index d17de41a8542..e496ce9ad338 100644
--- a/src/renderer/src/components/native-chat/NativeChatView.tsx
+++ b/src/renderer/src/components/native-chat/NativeChatView.tsx
@@ -4,6 +4,7 @@ import { NativeChatResolvedView } from './NativeChatResolvedView'
 import { useNativeChatStatusEntry } from './use-native-chat-status-entry'
 import type { NativeChatViewProps } from './native-chat-view-types'
 import { NativeChatPaneFileDropSurface } from './NativeChatPaneFileDropSurface'
+import { NativeChatVisualOwnerProvider } from './native-chat-visual-owner'
 
 export type { NativeChatViewProps } from './native-chat-view-types'
 
@@ -12,7 +13,14 @@ export default function NativeChatView(props: NativeChatViewProps): React.JSX.El
   return (
     <NativeChatPaneFileDropSurface className="relative flex h-full min-h-0 min-w-0 w-full">
       {props.mode === 'structured' ? (
-        <NativeChatStructuredSession key={props.sessionId} {...props} />
+        <NativeChatVisualOwnerProvider
+          key={props.sessionId}
+          target={props.target}
+          sessionId={props.sessionId}
+          tabId={props.tabId}
+        >
+          <NativeChatStructuredSession {...props} />
+        </NativeChatVisualOwnerProvider>
       ) : (
         <NativeChatBridgeView {...props} />
       )}
diff --git a/src/renderer/src/components/native-chat/NativeChatVisualFrame.test.tsx b/src/renderer/src/components/native-chat/NativeChatVisualFrame.test.tsx
new file mode 100644
index 000000000000..15399fbb63de
--- /dev/null
+++ b/src/renderer/src/components/native-chat/NativeChatVisualFrame.test.tsx
@@ -0,0 +1,176 @@
+// @vitest-environment happy-dom
+
+import '@testing-library/jest-dom/vitest'
+
+import { act, cleanup, render } from '@testing-library/react'
+import { useRef } from 'react'
+import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest'
+import {
+  NATIVE_CHAT_VISUAL_FRAME_NAME_PREFIX,
+  NATIVE_CHAT_VISUAL_OPEN_LINK_TYPE,
+  NATIVE_CHAT_VISUAL_SIZE_TYPE,
+  NATIVE_CHAT_VISUAL_THEME_TYPE
+} from '../../../../shared/native-chat-visual-shell'
+
+const openHttpLink = vi.fn()
+vi.mock('@/lib/http-link-routing', () => ({
+  openHttpLink: (...args: unknown[]) => openHttpLink(...args)
+}))
+
+import { NativeChatVisualFrame } from './NativeChatVisualFrame'
+
+const visual = { revision: 'r1', html: '<p>chart</p>' }
+
+function Harness(props: { layout?: 'inline' | 'panel'; onRetired?: () => void }) {
+  const scope = useRef<HTMLDivElement | null>(null)
+  return (
+    <div ref={scope}>
+      <NativeChatVisualFrame
+        document={visual}
+        title="Chart"
+        layout={props.layout ?? 'inline'}
+        themeScope={scope}
+        onRetired={props.onRetired ?? (() => {})}
+      />
+    </div>
+  )
+}
+
+function frameOf(container: HTMLElement): HTMLIFrameElement {
+  const frame = container.querySelector('iframe')
+  if (!frame) {
+    throw new Error('no frame')
+  }
+  return frame
+}
+
+function channelOf(frame: HTMLIFrameElement): string {
+  return frame.name.slice(NATIVE_CHAT_VISUAL_FRAME_NAME_PREFIX.length)
+}
+
+function post(data: unknown, source: MessageEventSource | null): void {
+  act(() => {
+    window.dispatchEvent(new MessageEvent('message', { data, source }))
+  })
+}
+
+function setUserActivation(isActive: boolean): void {
+  Object.defineProperty(navigator, 'userActivation', {
+    configurable: true,
+    value: { isActive, hasBeenActive: isActive }
+  })
+}
+
+beforeEach(() => {
+  openHttpLink.mockReset()
+})
+
+afterEach(() => {
+  cleanup()
+  document.documentElement.classList.remove('dark')
+})
+
+describe('NativeChatVisualFrame', () => {
+  it('runs the visual in a scripts-only sandbox, named for host registration, with its CSP first', () => {
+    const { container } = render(<Harness />)
+    const frame = frameOf(container)
+    expect(frame.getAttribute('sandbox')).toBe('allow-scripts')
+    expect(frame.name.startsWith(NATIVE_CHAT_VISUAL_FRAME_NAME_PREFIX)).toBe(true)
+    const srcdoc = frame.getAttribute('srcdoc') ?? ''
+    expect(srcdoc.indexOf('Content-Security-Policy')).toBeLessThan(srcdoc.indexOf('<p>chart</p>'))
+    expect(channelOf(frame)).toMatch(/^[0-9a-f]{32}$/)
+  })
+
+  it('fits its height to what the frame reports, ignoring other windows and channels', () => {
+    const { container } = render(<Harness />)
+    const frame = frameOf(container)
+    const box = frame.parentElement
+    const channel = channelOf(frame)
+    post({ type: NATIVE_CHAT_VISUAL_SIZE_TYPE, channel, height: 420 }, frame.contentWindow)
+    expect(box).toHaveStyle({ height: '420px' })
+    post({ type: NATIVE_CHAT_VISUAL_SIZE_TYPE, channel, height: 900 }, window)
+    post({ type: NATIVE_CHAT_VISUAL_SIZE_TYPE, channel: 'other', height: 900 }, frame.contentWindow)
+    expect(box).toHaveStyle({ height: '420px' })
+  })
+
+  it('restyles in place on a theme change instead of reloading the visual', () => {
+    const { container } = render(<Harness />)
+    const frame = frameOf(container)
+    const contentWindow = frame.contentWindow
+    if (!contentWindow) {
+      throw new Error('no content window')
+    }
+    const postMessage = vi.spyOn(contentWindow, 'postMessage')
+    act(() => {
+      frame.dispatchEvent(new Event('load'))
+    })
+    expect(postMessage).toHaveBeenCalledWith(
+      expect.objectContaining({ type: NATIVE_CHAT_VISUAL_THEME_TYPE, colorScheme: 'light' }),
+      '*'
+    )
+    const srcdoc = frame.getAttribute('srcdoc')
+    act(() => {
+      document.documentElement.classList.add('dark')
+    })
+    return vi.waitFor(() => {
+      expect(postMessage).toHaveBeenLastCalledWith(
+        expect.objectContaining({ type: NATIVE_CHAT_VISUAL_THEME_TYPE, colorScheme: 'dark' }),
+        '*'
+      )
+      expect(frameOf(container)).toBe(frame)
+      expect(frame.getAttribute('srcdoc')).toBe(srcdoc)
+    })
+  })
+
+  it('opens a link only while the frame has focus and the user has just acted', () => {
+    const { container } = render(<Harness />)
+    const frame = frameOf(container)
+    const channel = channelOf(frame)
+    const link = { type: NATIVE_CHAT_VISUAL_OPEN_LINK_TYPE, channel, url: 'https://example.com/' }
+
+    setUserActivation(true)
+    post(link, frame.contentWindow)
+    expect(openHttpLink).not.toHaveBeenCalled()
+
+    frame.tabIndex = 0
+    frame.focus()
+    setUserActivation(false)
+    post(link, frame.contentWindow)
+    expect(openHttpLink).not.toHaveBeenCalled()
+
+    setUserActivation(true)
+    post(link, window)
+    post({ ...link, url: 'javascript:alert(1)' }, frame.contentWindow)
+    expect(openHttpLink).not.toHaveBeenCalled()
+
+    post(link, frame.contentWindow)
+    expect(openHttpLink).toHaveBeenCalledWith('https://example.com/', { forceSystemBrowser: true })
+    // A burst of requests opens at most one page.
+    post(link, frame.contentWindow)
+    expect(openHttpLink).toHaveBeenCalledTimes(1)
+  })
+
+  it('retires itself if the frame loads a second document', () => {
+    const onRetired = vi.fn()
+    const { container } = render(<Harness onRetired={onRetired} />)
+    const frame = frameOf(container)
+    act(() => {
+      frame.dispatchEvent(new Event('load'))
+    })
+    expect(onRetired).not.toHaveBeenCalled()
+    act(() => {
+      frame.dispatchEvent(new Event('load'))
+    })
+    expect(onRetired).toHaveBeenCalledTimes(1)
+  })
+
+  it('fills a panel instead of fitting its height', () => {
+    const { container } = render(<Harness layout="panel" />)
+    const frame = frameOf(container)
+    post(
+      { type: NATIVE_CHAT_VISUAL_SIZE_TYPE, channel: channelOf(frame), height: 420 },
+      frame.contentWindow
+    )
+    expect(frame.parentElement?.style.height).toBe('')
+  })
+})
diff --git a/src/renderer/src/components/native-chat/NativeChatVisualFrame.tsx b/src/renderer/src/components/native-chat/NativeChatVisualFrame.tsx
new file mode 100644
index 000000000000..6e34a8845efe
--- /dev/null
+++ b/src/renderer/src/components/native-chat/NativeChatVisualFrame.tsx
@@ -0,0 +1,169 @@
+import { useEffect, useLayoutEffect, useMemo, useRef, useState, type RefObject } from 'react'
+import { cn } from '@/lib/utils'
+import { openHttpLink } from '@/lib/http-link-routing'
+import {
+  NATIVE_CHAT_VISUAL_FRAME_NAME_PREFIX,
+  buildNativeChatVisualDocument,
+  nativeChatVisualThemeMessage,
+  readNativeChatVisualFrameMessage
+} from '../../../../shared/native-chat-visual-shell'
+import type { NativeChatVisualDocument } from './native-chat-visual-read-client'
+import { createNativeChatVisualHeightGovernor } from '../../../../shared/native-chat-visual-height-governor'
+import { useNativeChatVisualTheme } from './use-native-chat-visual-theme'
+
+/** Height reserved before a visual reports its own, so the reply below does not jump far. */
+export const NATIVE_CHAT_VISUAL_RESERVED_HEIGHT = 160
+// Chromium keeps a click's activation for about five seconds; one open per window means one click
+// in the visual opens at most one page.
+const LINK_COOLDOWN_MS = 5_000
+
+function newChannel(): string {
+  const bytes = new Uint8Array(16)
+  crypto.getRandomValues(bytes)
+  return Array.from(bytes, (byte) => byte.toString(16).padStart(2, '0')).join('')
+}
+
+/**
+ * One agent-written visual in an opaque-origin frame that may run scripts and nothing else. Inline
+ * it fits its height to the page; in a panel it fills the panel. A theme change restyles the page in
+ * place, so interaction state survives it. The frame is never allowed to become another page: the
+ * main process refuses its navigation, and a second load (a navigation that got through anyway)
+ * retires it.
+ */
+export function NativeChatVisualFrame({
+  document: visual,
+  title,
+  layout,
+  themeScope,
+  onRetired
+}: {
+  document: NativeChatVisualDocument
+  title: string
+  layout: 'inline' | 'panel'
+  /** An element already mounted where the frame sits, so the first paint wears that scope's theme. */
+  themeScope: RefObject<Element | null>
+  onRetired: () => void
+}): React.JSX.Element {
+  const frameRef = useRef<HTMLIFrameElement | null>(null)
+  const theme = useNativeChatVisualTheme(themeScope)
+  // The latest theme for the next document build and the load-time post, without rebuilding on it.
+  const themeRef = useRef(theme)
+  useLayoutEffect(() => {
+    themeRef.current = theme
+  }, [theme])
+  const [height, setHeight] = useState(NATIVE_CHAT_VISUAL_RESERVED_HEIGHT)
+  const loadsRef = useRef(0)
+
+  // Built once per revision: the theme at build time paints first, later themes arrive by message.
+  const built = useMemo(() => {
+    const channel = newChannel()
+    return {
+      channel,
+      srcDoc: buildNativeChatVisualDocument({
+        html: visual.html,
+        channel,
+        theme: themeRef.current
+      })
+    }
+  }, [visual.html])
+
+  useEffect(() => {
+    loadsRef.current = 0
+    const governor = createNativeChatVisualHeightGovernor()
+    let deferred: ReturnType<typeof setTimeout> | null = null
+    let latestReported: number | null = null
+    let lastLinkAt = -Infinity
+    const applyHeight = (): void => {
+      deferred = null
+      if (latestReported === null) {
+        return
+      }
+      const decision = governor.decide(latestReported, performance.now())
+      if (decision.kind === 'apply') {
+        setHeight(decision.height)
+      } else if (decision.kind === 'defer') {
+        deferred = setTimeout(applyHeight, decision.retryInMs)
+      }
+    }
+    const onMessage = (event: MessageEvent): void => {
+      const frame = frameRef.current
+      if (!frame || event.source !== frame.contentWindow) {
+        return
+      }
+      const message = readNativeChatVisualFrameMessage(event.data, built.channel)
+      if (!message) {
+        return
+      }
+      if (message.kind === 'size') {
+        if (layout === 'inline') {
+          latestReported = message.height
+          if (!deferred) {
+            applyHeight()
+          }
+        }
+        return
+      }
+      // A link opens only from a real gesture in this very frame: it must hold focus and the user
+      // must have just acted. This stops opens on load, not a page that waits for the next click,
+      // and it cannot prove the click was on the link the page names.
+      const now = performance.now()
+      if (
+        window.document.activeElement !== frame ||
+        navigator.userActivation?.isActive !== true ||
+        now - lastLinkAt < LINK_COOLDOWN_MS
+      ) {
+        return
+      }
+      lastLinkAt = now
+      openHttpLink(message.url, { forceSystemBrowser: true })
+    }
+    window.addEventListener('message', onMessage)
+    return () => {
+      window.removeEventListener('message', onMessage)
+      if (deferred) {
+        clearTimeout(deferred)
+      }
+    }
+  }, [built.channel, layout])
+
+  useEffect(() => {
+    if (loadsRef.current > 0) {
+      frameRef.current?.contentWindow?.postMessage(
+        nativeChatVisualThemeMessage(theme, built.channel),
+        '*'
+      )
+    }
+  }, [built.channel, theme])
+
+  return (
+    <div
+      className={cn('w-full', layout === 'panel' && 'flex min-h-0 flex-1')}
+      style={layout === 'inline' ? { height } : undefined}
+    >
+      <iframe
+        key={built.channel}
+        ref={frameRef}
+        name={`${NATIVE_CHAT_VISUAL_FRAME_NAME_PREFIX}${built.channel}`}
+        title={title}
+        srcDoc={built.srcDoc}
+        // Never allow-same-origin: the opaque origin keeps the page away from Orca's own.
+        sandbox="allow-scripts"
+        referrerPolicy="no-referrer"
+        className="block size-full border-0 bg-transparent"
+        style={{ colorScheme: theme.colorScheme }}
+        onLoad={() => {
+          loadsRef.current += 1
+          if (loadsRef.current > 1) {
+            onRetired()
+            return
+          }
+          // Covers a theme change that landed while the page loaded.
+          frameRef.current?.contentWindow?.postMessage(
+            nativeChatVisualThemeMessage(themeRef.current, built.channel),
+            '*'
+          )
+        }}
+      />
+    </div>
+  )
+}
diff --git a/src/renderer/src/components/native-chat/NativeChatVisualPanel.tsx b/src/renderer/src/components/native-chat/NativeChatVisualPanel.tsx
new file mode 100644
index 000000000000..0cd959116862
--- /dev/null
+++ b/src/renderer/src/components/native-chat/NativeChatVisualPanel.tsx
@@ -0,0 +1,80 @@
+import { useEffect, useRef, useState } from 'react'
+import { X } from 'lucide-react'
+import { Button } from '@/components/ui/button'
+import { Tooltip, TooltipContent, TooltipTrigger } from '@/components/ui/tooltip'
+import { translate } from '@/i18n/i18n'
+import { useAppStore } from '@/store'
+import type { RightSidebarVisualState } from '@/store/slices/editor/actions/right-sidebar-state'
+import { findNativeChatTabOwnerWorktreeId } from './native-chat-file-link'
+import { NativeChatVisualFrame } from './NativeChatVisualFrame'
+import { NativeChatVisualUnavailable } from './NativeChatInlineVisual'
+import { useNativeChatVisualDocument } from './use-native-chat-visual-document'
+
+/**
+ * A chat visual opened in the right sidebar: the same isolated frame as inline, filling the panel.
+ * It belongs to its chat and workspace, so it closes when the chat tab goes away or the user moves
+ * to another workspace.
+ */
+export default function NativeChatVisualPanel({
+  route
+}: {
+  route: RightSidebarVisualState
+}): React.JSX.Element {
+  const panelRef = useRef<HTMLDivElement | null>(null)
+  const [retired, setRetired] = useState(false)
+  const closeRightSidebarVisual = useAppStore((state) => state.closeRightSidebarVisual)
+  const ownerPresent = useAppStore(
+    (state) =>
+      state.activeWorktreeId === route.worktreeId &&
+      findNativeChatTabOwnerWorktreeId(state, route.tabId) === route.worktreeId
+  )
+  const state = useNativeChatVisualDocument(
+    { target: route.target, sessionId: route.sessionId, file: route.file },
+    ownerPresent
+  )
+
+  useEffect(() => {
+    if (!ownerPresent) {
+      closeRightSidebarVisual()
+    }
+  }, [closeRightSidebarVisual, ownerPresent])
+
+  const label = route.title ?? route.file
+  const closeLabel = translate('components.native-chat.visualClose', 'Close visualization')
+
+  return (
+    <div ref={panelRef} className="flex min-h-0 flex-1 flex-col">
+      <div className="flex h-9 min-h-9 items-center justify-between gap-2 border-b border-border pr-1 pl-3">
+        <span className="min-w-0 truncate text-[13px] text-foreground">{label}</span>
+        <Tooltip>
+          <TooltipTrigger asChild>
+            <Button
+              variant="ghost"
+              size="icon-xs"
+              aria-label={closeLabel}
+              onClick={closeRightSidebarVisual}
+            >
+              <X />
+            </Button>
+          </TooltipTrigger>
+          <TooltipContent side="bottom" sideOffset={4}>
+            {closeLabel}
+          </TooltipContent>
+        </Tooltip>
+      </div>
+      {retired || state.status === 'unavailable' ? (
+        <div className="px-3">
+          <NativeChatVisualUnavailable />
+        </div>
+      ) : state.status === 'ready' ? (
+        <NativeChatVisualFrame
+          document={state.document}
+          title={label}
+          layout="panel"
+          themeScope={panelRef}
+          onRetired={() => setRetired(true)}
+        />
+      ) : null}
+    </div>
+  )
+}
diff --git a/src/renderer/src/components/native-chat/StructuredAgentSessionAttentionBridge.test.tsx b/src/renderer/src/components/native-chat/StructuredAgentSessionAttentionBridge.test.tsx
index 362512bf694c..99a01c6d4379 100644
--- a/src/renderer/src/components/native-chat/StructuredAgentSessionAttentionBridge.test.tsx
+++ b/src/renderer/src/components/native-chat/StructuredAgentSessionAttentionBridge.test.tsx
@@ -73,12 +73,8 @@ import {
   getStructuredAgentSessionStatusFeed,
   resetStructuredAgentSessionStatusFeedsForTests
 } from '@/runtime/structured-agent-session-status-feed'
-import {
-  makeTabGroup,
-  makeUnifiedTab,
-  makeWorktree,
-  TEST_REPO
-} from '@/store/slices/store-test-helpers'
+import { makeTabGroup, makeUnifiedTab } from '../../store/slices/store-session-test-harness'
+import { makeWorktree, TEST_REPO } from '../../store/slices/worktrees-slice-test-fixtures'
 
 // Worktree ids encode their repo (`repoId::path`); the unread reducer buckets by that prefix.
 const WORKSPACE = 'repo1::/tmp/wt'
diff --git a/src/renderer/src/components/native-chat/agent-session-failure-words-text.test.ts b/src/renderer/src/components/native-chat/agent-session-failure-words-text.test.ts
index 143a0dd4e8b1..40d67de0c335 100644
--- a/src/renderer/src/components/native-chat/agent-session-failure-words-text.test.ts
+++ b/src/renderer/src/components/native-chat/agent-session-failure-words-text.test.ts
@@ -21,7 +21,7 @@ import {
 import { AGENT_SESSION_WRITE_NOTICE_COPY } from '../../../../shared/agent-session-write-notice-copy'
 import { agentSessionWriteNoticeParts } from '../../../../shared/agent-session-refusal-notice'
 import { agentSessionRefusalFailure } from '../../../../shared/agent-session-write-failure'
-import { structuredAgentSessionRejectionParts } from '../../../../shared/structured-agent-session-send-disposition'
+import { structuredAgentSessionRejectionParts } from '../../../../shared/structured-agent-session-rejection-words'
 import { sayAgentSessionFailureTranslated } from './agent-session-failure-words-text'
 import { agentSessionWriteNoticeText } from './agent-session-write-notice-text'
 
diff --git a/src/renderer/src/components/native-chat/agent-session-failure-words-text.ts b/src/renderer/src/components/native-chat/agent-session-failure-words-text.ts
index a1b020aeba8a..51f3f4f4c94c 100644
--- a/src/renderer/src/components/native-chat/agent-session-failure-words-text.ts
+++ b/src/renderer/src/components/native-chat/agent-session-failure-words-text.ts
@@ -114,6 +114,16 @@ const PIECES: Record<AgentSessionFailureCopyId, (values: AgentSessionFailureCopy
         'components.native-chat.failureWords.historyInOtherAccount',
         COPY.historyInOtherAccount
       ),
+    claudeAccountFolderMissing: () =>
+      translate(
+        'components.native-chat.failureWords.claudeAccountFolderMissing',
+        COPY.claudeAccountFolderMissing
+      ),
+    claudeAccountSetupFailed: () =>
+      translate(
+        'components.native-chat.failureWords.claudeAccountSetupFailed',
+        COPY.claudeAccountSetupFailed
+      ),
     agentCommandNotRunnable: (values) =>
       translate(
         'components.native-chat.failureWords.agentCommandNotRunnable',
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
index 44f5e737f2a4..67029a9c0c7f 100644
--- 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
@@ -70,6 +70,10 @@ const SENTENCES: Record<AgentSessionWriteNoticeSentence, () => string> = {
   unreachable: () => translate('components.native-chat.writeNotice.unreachable', COPY.unreachable),
   recordFailed: () =>
     translate('components.native-chat.writeNotice.recordFailed', COPY.recordFailed),
+  attachmentExpired: () =>
+    translate('components.native-chat.writeNotice.attachmentExpired', COPY.attachmentExpired),
+  reattachFile: () =>
+    translate('components.native-chat.writeNotice.reattachFile', COPY.reattachFile),
   conversationCleared: () =>
     translate('components.native-chat.writeNotice.conversationCleared', COPY.conversationCleared),
   openCurrentConversation: () =>
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 43da166c7a34..8bf2b7885c6c 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
@@ -1,193 +1,15 @@
-// The background-tasks strip HEADER: the one line that speaks for the whole
-// roster while the strip is collapsed. Counting and phrasing only — grouping,
-// row state and the state vocabulary live in `background-task-roster.ts`.
+// Desktop words for the background-tasks strip header (`shared/background-task-header-content.ts`).
 
-import type {
-  AgentSessionBackgroundTask,
-  AgentSessionBackgroundTaskRunState
-} from '../../../../shared/agent-session-wire'
-import { translate } from '@/i18n/i18n'
 import {
-  backgroundTaskCountedState,
-  backgroundTaskElapsedLabel,
-  backgroundTaskStateReason,
-  backgroundTaskStateWord,
-  type BackgroundTaskGroup
-} from './background-task-roster'
+  backgroundTasksHeaderContent as headerContent,
+  type BackgroundTasksHeaderContent
+} from '../../../../shared/background-task-header-content'
+import type { BackgroundTaskGroup } from '../../../../shared/background-task-roster'
+import { sayBackgroundTaskTranslated } from './background-task-words-text'
 
-type TaskKind = AgentSessionBackgroundTask['kind']
-type RunState = AgentSessionBackgroundTaskRunState
-
-function kindCountLabel(kind: TaskKind, count: number): string {
-  const value = { value0: count }
-  switch (kind) {
-    case 'agent':
-      return count === 1
-        ? translate('components.native-chat.backgroundTasks.countAgentsOne', '1 agent')
-        : translate(
-            'components.native-chat.backgroundTasks.countAgentsMany',
-            '{{value0}} agents',
-            value
-          )
-    case 'command':
-      return count === 1
-        ? translate('components.native-chat.backgroundTasks.countShellOne', '1 shell')
-        : translate(
-            'components.native-chat.backgroundTasks.countShellMany',
-            '{{value0}} shells',
-            value
-          )
-    case 'monitor':
-      return count === 1
-        ? translate('components.native-chat.backgroundTasks.countMonitorsOne', '1 monitor')
-        : translate(
-            'components.native-chat.backgroundTasks.countMonitorsMany',
-            '{{value0}} monitors',
-            value
-          )
-    case 'workflow':
-      return count === 1
-        ? translate('components.native-chat.backgroundTasks.countWorkflowsOne', '1 workflow')
-        : translate(
-            'components.native-chat.backgroundTasks.countWorkflowsMany',
-            '{{value0}} workflows',
-            value
-          )
-    case 'unknown':
-      return count === 1
-        ? translate('components.native-chat.backgroundTasks.countTasksOne', '1 task')
-        : translate(
-            'components.native-chat.backgroundTasks.countTasksMany',
-            '{{value0}} tasks',
-            value
-          )
-  }
-}
-
-/** How many kind segments the header may enumerate before an honest total
- *  replaces the breakdown entirely — never a partial enumeration. */
-const HEADER_SEGMENT_CAP = 3
-
-/** Done comes last but must be present: the headline counts settled rows too,
- *  so omitting it made the breakdown contradict its own count. */
-const HEADER_STATE_ORDER: readonly RunState[] = [
-  'working',
-  'monitoring',
-  'waiting',
-  'blocked',
-  'unverifiable',
-  'idle',
-  'done'
-]
-
-const ATTENTION_STATES: ReadonlySet<RunState> = new Set(['waiting', 'unverifiable', 'blocked'])
-
-export type BackgroundTasksHeaderSegment = {
-  text: string
-  /** The kind this segment counts, so the renderer can lead it with that kind's
-   *  icon. Null when the segment spans kinds (the collapsed total), which no
-   *  single icon can stand for. */
-  kind: TaskKind | null
-}
-
-export type BackgroundTasksHeaderContent = {
-  /** Emphasised segments, joined with a muted separator by the renderer. */
-  segments: BackgroundTasksHeaderSegment[]
-  /** Muted " — …" tail; null when the segments say everything. */
-  detail: string | null
-}
-
-/** Every variant in the signed-off mock, plus the overflow and narrow forms.
- *  Any lossy form (fallback or total) leaves the detail reachable — the strip
- *  stays expandable regardless of task count. */
 export function backgroundTasksHeaderContent(
   groups: readonly BackgroundTaskGroup[],
   options: { narrow: boolean; now: number }
 ): BackgroundTasksHeaderContent {
-  const all = groups.flatMap((group) => group.tasks)
-  if (all.length === 0) {
-    return {
-      segments: [],
-      detail: translate(
-        'components.native-chat.backgroundTasks.monitoring',
-        'Monitoring background tasks'
-      )
-    }
-  }
-  if (groups.length > HEADER_SEGMENT_CAP || (options.narrow && all.length > 1)) {
-    return {
-      segments: [
-        {
-          text: translate(
-            'components.native-chat.backgroundTasks.headerTotal',
-            '{{value0}} background tasks',
-            {
-              value0: all.length
-            }
-          ),
-          kind: null
-        }
-      ],
-      detail: null
-    }
-  }
-  if (groups.length > 1) {
-    return {
-      segments: groups.map((group) => ({
-        text: kindCountLabel(group.kind, group.tasks.length),
-        kind: group.kind
-      })),
-      detail: null
-    }
-  }
-  const group = groups[0]
-  const count = group.tasks.length
-  const uniformState = group.tasks.every((entry) => entry.state === group.tasks[0].state)
-    ? group.tasks[0].state
-    : null
-  if (uniformState && ATTENTION_STATES.has(uniformState)) {
-    return {
-      segments: [
-        {
-          text: backgroundTaskCountedState(kindCountLabel(group.kind, count), uniformState),
-          kind: group.kind
-        }
-      ],
-      detail: backgroundTaskStateReason(uniformState)
-    }
-  }
-  if (count === 1) {
-    const entry = group.tasks[0]
-    const subject =
-      group.kind === 'command'
-        ? translate(
-            'components.native-chat.backgroundTasks.countShellCommandOne',
-            '1 shell command'
-          )
-        : kindCountLabel(group.kind, 1)
-    // A still-growing clock on finished work would lie, exactly as on the row.
-    const elapsed =
-      group.kind === 'command' && !entry.row.settled
-        ? backgroundTaskElapsedLabel(entry.row.firstObservedAt, options.now)
-        : null
-    return {
-      segments: [{ text: subject, kind: group.kind }],
-      detail: elapsed ?? backgroundTaskStateWord(entry.state)
-    }
-  }
-  const stateCounts = HEADER_STATE_ORDER.map((state) => ({
-    state,
-    count: group.tasks.filter((entry) => entry.state === state).length
-  })).filter((entry) => entry.count > 0)
-  return {
-    segments: [{ text: kindCountLabel(group.kind, count), kind: group.kind }],
-    // Done is accounted for in the muted detail but never earns its own emphasised
-    // segment: a finished sibling claims no colour above the composer.
-    detail:
-      stateCounts.length > 0
-        ? stateCounts
-            .map((entry) => backgroundTaskCountedState(entry.count, entry.state))
-            .join(', ')
-        : null
-  }
+  return headerContent(groups, options, sayBackgroundTaskTranslated)
 }
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 71ec84106e53..434dbdb314d5 100644
--- a/src/renderer/src/components/native-chat/background-task-roster.ts
+++ b/src/renderer/src/components/native-chat/background-task-roster.ts
@@ -1,250 +1,47 @@
-// Grouping, naming, and header derivation for the background-tasks strip.
-// Pure functions over the wire roster so every header variant is unit-testable
-// without mounting the strip.
+// Desktop words for the background-tasks roster: the shared grouping and state words
+// (`shared/background-task-roster.ts`) said in the reader's language.
 
 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'
+  backgroundTaskCountedState as countedState,
+  backgroundTaskGroupLabel as groupLabel,
+  backgroundTaskStateReason as stateReason,
+  backgroundTaskStateWord as stateWord,
+  buildBackgroundTaskGroups as buildGroups,
+  resolveBackgroundTaskName as resolveName,
+  type BackgroundTaskGroup
+} from '../../../../shared/background-task-roster'
+import { sayBackgroundTaskTranslated as say } from './background-task-words-text'
 
 type TaskKind = AgentSessionBackgroundTask['kind']
 type RunState = AgentSessionBackgroundTaskRunState
 
-export type BackgroundRosterTask = {
-  /** 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
-}
-
-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']
-
-export function backgroundTaskKindLabel(kind: TaskKind): string {
-  switch (kind) {
-    case 'agent':
-      return translate('components.native-chat.backgroundTasks.agent', 'Background agent')
-    case 'workflow':
-      return translate('components.native-chat.backgroundTasks.workflow', 'Background workflow')
-    case 'command':
-      return translate('components.native-chat.backgroundTasks.command', 'Background command')
-    case 'monitor':
-      return translate('components.native-chat.backgroundTasks.monitor', 'Background monitor')
-    case 'unknown':
-      return translate('components.native-chat.backgroundTasks.task', 'Background task')
-  }
-}
-
-/** 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 (
-    usableAgentChildLabel(task.description) ??
-    usableAgentChildLabel(task.name) ??
-    backgroundTaskKindLabel(task.kind)
-  )
+  return resolveName(task, say)
 }
 
-/** 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)
-}
-
-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[] {
-  // 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))
+  return buildGroups(tasks, settledTasks, say)
 }
 
 export function backgroundTaskStateWord(state: RunState): string {
-  switch (state) {
-    case 'working':
-      return translate('components.native-chat.backgroundTasks.stateWorking', 'working')
-    case 'monitoring':
-      return translate('components.native-chat.backgroundTasks.stateMonitoring', 'monitoring')
-    case 'waiting':
-      return translate('components.native-chat.backgroundTasks.stateWaiting', 'waiting')
-    case 'blocked':
-      return translate('components.native-chat.backgroundTasks.stateBlocked', 'blocked')
-    case 'done':
-      return translate('components.native-chat.backgroundTasks.stateDone', 'done')
-    case 'idle':
-      return translate('components.native-chat.backgroundTasks.stateIdle', 'stopped')
-    case 'unverifiable':
-      // Settled unknown or out of contact: claims neither an exit nor a coming update.
-      return translate(
-        'components.native-chat.backgroundTasks.stateUnverifiable',
-        'status unavailable'
-      )
-  }
+  return stateWord(state, say)
 }
 
-/** The reason line for an attention state, per the signed-off mock. */
 export function backgroundTaskStateReason(state: RunState): string | null {
-  switch (state) {
-    case 'waiting':
-      return translate('components.native-chat.backgroundTasks.reasonWaiting', 'needs approval')
-    case 'blocked':
-      return translate('components.native-chat.backgroundTasks.reasonBlocked', 'failed')
-    case 'working':
-    case 'monitoring':
-    case 'done':
-    case 'idle':
-    case 'unverifiable':
-      // `unverifiable`'s state word already says it.
-      return null
-  }
+  return stateReason(state, say)
 }
 
-/** A count and its state ("2 agents waiting"), one whole sentence per state so a language can
- *  agree the state with the count. */
 export function backgroundTaskCountedState(counted: string | number, state: RunState): string {
-  switch (state) {
-    case 'working':
-      return translate(
-        'components.native-chat.backgroundTasks.stateWorkingCount',
-        '{{value0}} working',
-        { value0: counted }
-      )
-    case 'monitoring':
-      return translate(
-        'components.native-chat.backgroundTasks.stateMonitoringCount',
-        '{{value0}} monitoring',
-        { value0: counted }
-      )
-    case 'waiting':
-      return translate(
-        'components.native-chat.backgroundTasks.stateWaitingCount',
-        '{{value0}} waiting',
-        { value0: counted }
-      )
-    case 'blocked':
-      return translate(
-        'components.native-chat.backgroundTasks.stateBlockedCount',
-        '{{value0}} blocked',
-        { value0: counted }
-      )
-    case 'done':
-      return translate('components.native-chat.backgroundTasks.stateDoneCount', '{{value0}} done', {
-        value0: counted
-      })
-    case 'idle':
-      return translate(
-        'components.native-chat.backgroundTasks.stateIdleCount',
-        '{{value0}} stopped',
-        { value0: counted }
-      )
-    case 'unverifiable':
-      // After a count, "status unavailable" needs a "with".
-      return translate(
-        'components.native-chat.backgroundTasks.stateUnverifiableCount',
-        '{{value0}} with status unavailable',
-        { value0: counted }
-      )
-  }
-}
-
-function tokenScaleText(value: number): string {
-  return Number.isInteger(value) ? value.toFixed(0) : value.toFixed(1)
-}
-
-/** Compact token meta per the mock ("18.2k"). Locale-neutral on purpose:
- *  it sits in a mono meta slot beside elapsed, like other technical literals. */
-export function formatBackgroundTaskTokens(totalTokens: number): string {
-  if (totalTokens < 1_000) {
-    return String(totalTokens)
-  }
-  // Round before picking the unit, or 999_950 renders as "1000k" instead of "1m".
-  const thousands = Math.round(totalTokens / 100) / 10
-  return thousands < 1_000
-    ? `${tokenScaleText(thousands)}k`
-    : `${tokenScaleText(Math.round(totalTokens / 100_000) / 10)}m`
-}
-
-export function backgroundTaskElapsedLabel(startedAt: number, now: number): string | null {
-  if (startedAt <= 0) {
-    return null
-  }
-  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
+  return countedState(counted, state, say)
 }
 
 export function backgroundTaskGroupLabel(kind: TaskKind): string {
-  switch (kind) {
-    case 'agent':
-      return translate('components.native-chat.backgroundTasks.groupAgents', 'Agents')
-    case 'command':
-      return translate('components.native-chat.backgroundTasks.groupShell', 'Shell')
-    case 'monitor':
-      return translate('components.native-chat.backgroundTasks.groupMonitors', 'Monitors')
-    case 'workflow':
-      return translate('components.native-chat.backgroundTasks.groupWorkflows', 'Workflows')
-    case 'unknown':
-      return translate('components.native-chat.backgroundTasks.groupTasks', 'Tasks')
-  }
+  return groupLabel(kind, say)
 }
diff --git a/src/renderer/src/components/native-chat/background-task-words-text.test.ts b/src/renderer/src/components/native-chat/background-task-words-text.test.ts
new file mode 100644
index 000000000000..c8210fadbb4e
--- /dev/null
+++ b/src/renderer/src/components/native-chat/background-task-words-text.test.ts
@@ -0,0 +1,49 @@
+import { describe, expect, it, vi } from 'vitest'
+import { translate } from '@/i18n/i18n'
+import type * as I18nModule from '@/i18n/i18n'
+import en from '@/i18n/locales/en.json'
+import {
+  BACKGROUND_TASK_COPY,
+  sayBackgroundTaskEnglish,
+  type BackgroundTaskCopyId
+} from '../../../../shared/background-task-copy'
+import { sayBackgroundTaskTranslated } from './background-task-words-text'
+
+vi.mock('@/i18n/i18n', async (importOriginal) => {
+  const actual = await importOriginal<typeof I18nModule>()
+  return { ...actual, translate: vi.fn(actual.translate) }
+})
+
+const IDS = Object.keys(BACKGROUND_TASK_COPY).filter(
+  (id): id is BackgroundTaskCopyId => id in BACKGROUND_TASK_COPY
+)
+const VALUES = { value0: '2 agents' }
+
+describe('desktop words for the background-tasks strip', () => {
+  it('says every piece as the phone does, in English', () => {
+    for (const id of IDS) {
+      expect([id, sayBackgroundTaskTranslated(id, VALUES)]).toEqual([
+        id,
+        sayBackgroundTaskEnglish(id, VALUES)
+      ])
+    }
+  })
+
+  // The catalog answers first in English, so read the default each key is given directly.
+  it('keeps each existing key, with the shared piece as its English default', () => {
+    for (const id of IDS) {
+      vi.mocked(translate).mockClear()
+      sayBackgroundTaskTranslated(id, VALUES)
+      expect(vi.mocked(translate).mock.calls.map(([key, fallback]) => [key, fallback])).toEqual([
+        [`components.native-chat.backgroundTasks.${id}`, BACKGROUND_TASK_COPY[id]]
+      ])
+    }
+  })
+
+  it('keeps the English catalog in step with the shared copy', () => {
+    const catalog: Record<string, string> = en.components['native-chat'].backgroundTasks
+    for (const id of IDS) {
+      expect([id, catalog[id]]).toEqual([id, BACKGROUND_TASK_COPY[id]])
+    }
+  })
+})
diff --git a/src/renderer/src/components/native-chat/background-task-words-text.ts b/src/renderer/src/components/native-chat/background-task-words-text.ts
new file mode 100644
index 000000000000..69e73aa0b367
--- /dev/null
+++ b/src/renderer/src/components/native-chat/background-task-words-text.ts
@@ -0,0 +1,124 @@
+// Desktop words for the background-tasks strip: each shared piece translated whole, with the
+// shared English as its fallback, so desktop and the phone never word one roster differently.
+
+import { translate } from '@/i18n/i18n'
+import {
+  BACKGROUND_TASK_COPY as COPY,
+  type BackgroundTaskCopyId,
+  type BackgroundTaskCopyValues,
+  type BackgroundTaskSay
+} from '../../../../shared/background-task-copy'
+
+const PIECES: Record<BackgroundTaskCopyId, (values?: BackgroundTaskCopyValues) => string> = {
+  monitoring: () => translate('components.native-chat.backgroundTasks.monitoring', COPY.monitoring),
+  stop: () => translate('components.native-chat.backgroundTasks.stop', COPY.stop),
+  stopTask: (values) =>
+    translate('components.native-chat.backgroundTasks.stopTask', COPY.stopTask, values),
+  stopAll: () => translate('components.native-chat.backgroundTasks.stopAll', COPY.stopAll),
+  agent: () => translate('components.native-chat.backgroundTasks.agent', COPY.agent),
+  workflow: () => translate('components.native-chat.backgroundTasks.workflow', COPY.workflow),
+  command: () => translate('components.native-chat.backgroundTasks.command', COPY.command),
+  monitor: () => translate('components.native-chat.backgroundTasks.monitor', COPY.monitor),
+  task: () => translate('components.native-chat.backgroundTasks.task', COPY.task),
+  detailsUnavailable: () =>
+    translate('components.native-chat.backgroundTasks.detailsUnavailable', COPY.detailsUnavailable),
+  countAgentsOne: () =>
+    translate('components.native-chat.backgroundTasks.countAgentsOne', COPY.countAgentsOne),
+  countAgentsMany: (values) =>
+    translate(
+      'components.native-chat.backgroundTasks.countAgentsMany',
+      COPY.countAgentsMany,
+      values
+    ),
+  countShellOne: () =>
+    translate('components.native-chat.backgroundTasks.countShellOne', COPY.countShellOne),
+  countShellMany: (values) =>
+    translate('components.native-chat.backgroundTasks.countShellMany', COPY.countShellMany, values),
+  countShellCommandOne: () =>
+    translate(
+      'components.native-chat.backgroundTasks.countShellCommandOne',
+      COPY.countShellCommandOne
+    ),
+  countMonitorsOne: () =>
+    translate('components.native-chat.backgroundTasks.countMonitorsOne', COPY.countMonitorsOne),
+  countMonitorsMany: (values) =>
+    translate(
+      'components.native-chat.backgroundTasks.countMonitorsMany',
+      COPY.countMonitorsMany,
+      values
+    ),
+  countWorkflowsOne: () =>
+    translate('components.native-chat.backgroundTasks.countWorkflowsOne', COPY.countWorkflowsOne),
+  countWorkflowsMany: (values) =>
+    translate(
+      'components.native-chat.backgroundTasks.countWorkflowsMany',
+      COPY.countWorkflowsMany,
+      values
+    ),
+  countTasksOne: () =>
+    translate('components.native-chat.backgroundTasks.countTasksOne', COPY.countTasksOne),
+  countTasksMany: (values) =>
+    translate('components.native-chat.backgroundTasks.countTasksMany', COPY.countTasksMany, values),
+  headerTotal: (values) =>
+    translate('components.native-chat.backgroundTasks.headerTotal', COPY.headerTotal, values),
+  stateWorking: () =>
+    translate('components.native-chat.backgroundTasks.stateWorking', COPY.stateWorking),
+  stateWorkingCount: (values) =>
+    translate(
+      'components.native-chat.backgroundTasks.stateWorkingCount',
+      COPY.stateWorkingCount,
+      values
+    ),
+  stateMonitoring: () =>
+    translate('components.native-chat.backgroundTasks.stateMonitoring', COPY.stateMonitoring),
+  stateMonitoringCount: (values) =>
+    translate(
+      'components.native-chat.backgroundTasks.stateMonitoringCount',
+      COPY.stateMonitoringCount,
+      values
+    ),
+  stateWaiting: () =>
+    translate('components.native-chat.backgroundTasks.stateWaiting', COPY.stateWaiting),
+  stateWaitingCount: (values) =>
+    translate(
+      'components.native-chat.backgroundTasks.stateWaitingCount',
+      COPY.stateWaitingCount,
+      values
+    ),
+  stateBlocked: () =>
+    translate('components.native-chat.backgroundTasks.stateBlocked', COPY.stateBlocked),
+  stateBlockedCount: (values) =>
+    translate(
+      'components.native-chat.backgroundTasks.stateBlockedCount',
+      COPY.stateBlockedCount,
+      values
+    ),
+  stateDone: () => translate('components.native-chat.backgroundTasks.stateDone', COPY.stateDone),
+  stateDoneCount: (values) =>
+    translate('components.native-chat.backgroundTasks.stateDoneCount', COPY.stateDoneCount, values),
+  stateIdle: () => translate('components.native-chat.backgroundTasks.stateIdle', COPY.stateIdle),
+  stateIdleCount: (values) =>
+    translate('components.native-chat.backgroundTasks.stateIdleCount', COPY.stateIdleCount, values),
+  stateUnverifiable: () =>
+    translate('components.native-chat.backgroundTasks.stateUnverifiable', COPY.stateUnverifiable),
+  stateUnverifiableCount: (values) =>
+    translate(
+      'components.native-chat.backgroundTasks.stateUnverifiableCount',
+      COPY.stateUnverifiableCount,
+      values
+    ),
+  reasonWaiting: () =>
+    translate('components.native-chat.backgroundTasks.reasonWaiting', COPY.reasonWaiting),
+  reasonBlocked: () =>
+    translate('components.native-chat.backgroundTasks.reasonBlocked', COPY.reasonBlocked),
+  groupAgents: () =>
+    translate('components.native-chat.backgroundTasks.groupAgents', COPY.groupAgents),
+  groupShell: () => translate('components.native-chat.backgroundTasks.groupShell', COPY.groupShell),
+  groupMonitors: () =>
+    translate('components.native-chat.backgroundTasks.groupMonitors', COPY.groupMonitors),
+  groupWorkflows: () =>
+    translate('components.native-chat.backgroundTasks.groupWorkflows', COPY.groupWorkflows),
+  groupTasks: () => translate('components.native-chat.backgroundTasks.groupTasks', COPY.groupTasks)
+}
+
+export const sayBackgroundTaskTranslated: BackgroundTaskSay = (id, values) => PIECES[id](values)
diff --git a/src/renderer/src/components/native-chat/native-chat-active-rail-item.test.ts b/src/renderer/src/components/native-chat/native-chat-active-rail-item.test.ts
index 72e4898ce04c..03bd1d307d58 100644
--- a/src/renderer/src/components/native-chat/native-chat-active-rail-item.test.ts
+++ b/src/renderer/src/components/native-chat/native-chat-active-rail-item.test.ts
@@ -82,6 +82,22 @@ describe('active rail item', () => {
     ).toBe('u2')
   })
 
+  // A message jumped to near the end sits at the top edge a few pixels short of
+  // the bottom: it is what is being read, not the newest turn.
+  it('lights the turn at the fold when parked just above the bottom', () => {
+    expect(
+      findActiveNativeChatRailItem({
+        slots: [{ turnKey: 'u1' }, { turnKey: 'u1' }, { turnKey: 'u2' }, { turnKey: 'u2' }],
+        virtualItems: rows(4),
+        // 30px short of the end, with a `u1` row at the top edge.
+        scrollTop: 100,
+        clientHeight: VIEWPORT,
+        scrollHeight: 430,
+        previousActiveId: null
+      })
+    ).toBe('u1')
+  })
+
   it('lights nothing above the first prompt', () => {
     expect(
       findActiveNativeChatRailItem({
diff --git a/src/renderer/src/components/native-chat/native-chat-active-rail-item.ts b/src/renderer/src/components/native-chat/native-chat-active-rail-item.ts
index dc780334df44..95298cf2f74d 100644
--- a/src/renderer/src/components/native-chat/native-chat-active-rail-item.ts
+++ b/src/renderer/src/components/native-chat/native-chat-active-rail-item.ts
@@ -14,7 +14,7 @@
 // `item.start - scrollMargin` inside a sizer sitting `scrollMargin` down), which is
 // the same coordinate space as `scrollTop`.
 
-import { NATIVE_CHAT_BOTTOM_THRESHOLD_PX } from './native-chat-autoscroll'
+import { NATIVE_CHAT_FOLLOW_REARM_PX } from './native-chat-autoscroll'
 
 /** The virtualizer's item, restated so this module needs nothing from the lib. */
 export type NativeChatRailVirtualItem = {
@@ -55,7 +55,9 @@ export function findActiveNativeChatRailItem({
 
   // Pinned to the bottom the newest turn is what is being read, whatever happens
   // to sit at the top edge — a short last turn would otherwise light its predecessor.
-  const atBottom = scrollHeight - clientHeight - scrollTop <= NATIVE_CHAT_BOTTOM_THRESHOLD_PX
+  // The follow band, not the wider jump-affordance one: a message jumped to near
+  // the end sits at the top edge a few pixels short of it, and is what is being read.
+  const atBottom = scrollHeight - clientHeight - scrollTop <= NATIVE_CHAT_FOLLOW_REARM_PX
   if (atBottom) {
     const last = virtualItems.at(-1)
     return last === undefined ? previousActiveId : railTickOf(slots[last.index])
diff --git a/src/renderer/src/components/native-chat/native-chat-appearance.css b/src/renderer/src/components/native-chat/native-chat-appearance.css
index 76b7479f188d..c7af90239c2d 100644
--- a/src/renderer/src/components/native-chat/native-chat-appearance.css
+++ b/src/renderer/src/components/native-chat/native-chat-appearance.css
@@ -19,3 +19,10 @@
 .native-chat-appearance :is(.font-mono, code, pre) {
   font-family: var(--chat-code-font-family, var(--font-mono));
 }
+
+/* Not inherited: the run box alone reads it, and an inherited one would restyle every member. */
+@property --native-chat-opened-detail {
+  syntax: '<length>';
+  inherits: false;
+  initial-value: 0px;
+}
diff --git a/src/renderer/src/components/native-chat/native-chat-attachment-upload.test.ts b/src/renderer/src/components/native-chat/native-chat-attachment-upload.test.ts
index c477f343ca20..e3c6892f4585 100644
--- a/src/renderer/src/components/native-chat/native-chat-attachment-upload.test.ts
+++ b/src/renderer/src/components/native-chat/native-chat-attachment-upload.test.ts
@@ -1,4 +1,5 @@
 import { beforeEach, describe, expect, it, vi } from 'vitest'
+import { getRepoExecutionHostId } from '../../../../shared/execution-host'
 import type { AppState } from '@/store/types'
 import type { TerminalTab } from '../../../../shared/terminal-tab-types'
 
@@ -7,9 +8,12 @@ const mocks = vi.hoisted(() => ({
   toastDismiss: vi.fn(),
   toastError: vi.fn(),
   toastMessage: vi.fn(),
-  resolveDroppedPathsForAgent: vi.fn()
+  resolveDroppedPathsForAgent: vi.fn(),
+  callRuntimeRpc: vi.fn()
 }))
 
+vi.mock('@/runtime/runtime-rpc-client', () => ({ callRuntimeRpc: mocks.callRuntimeRpc }))
+
 vi.mock('sonner', () => ({
   toast: {
     loading: mocks.toastLoading,
@@ -20,14 +24,20 @@ vi.mock('sonner', () => ({
 }))
 
 vi.mock('@/i18n/i18n', () => ({
-  translate: (_key: string, fallback: string) => fallback
+  translate: (_key: string, fallback: string, values?: Record<string, unknown>) =>
+    fallback.replace(/\{\{(\w+)\}\}/g, (_match, name: string) => String(values?.[name]))
 }))
 
 import {
+  nativeChatAttachFailedNotice,
+  prepareNativeChatSessionAttachmentUpload,
   resolveNativeChatAttachmentOwner,
   resolveNativeChatAttachmentOwnerForWorktree,
+  resolveNativeChatRuntimeSessionAttachmentOwner,
   uploadNativeChatAttachmentPaths
 } from './native-chat-attachment-upload'
+import { replaceRuntimeEnvironmentRevisions } from '@/runtime/runtime-environment-revision'
+import { AGENT_SESSION_ATTACHMENTS_RUNTIME_CAPABILITY } from '../../../../shared/protocol-version'
 
 function terminalTab(overrides: Partial<TerminalTab> = {}): TerminalTab {
   return {
@@ -44,10 +54,10 @@ function terminalTab(overrides: Partial<TerminalTab> = {}): TerminalTab {
 }
 
 function state(overrides: Partial<AppState> = {}): AppState {
+  // oxlint-disable-next-line typescript/consistent-type-assertions -- SAFETY: This fixture supplies every store slice read by the attachment owner resolver.
   return {
+    detectedWorktreesByRepo: {},
     folderWorkspaces: [],
-    getKnownWorktreeById: (worktreeId: string) =>
-      worktreeId === 'wt-1' ? ({ id: 'wt-1', path: '/repo/worktree' } as never) : undefined,
     projectGroups: [],
     repos: [{ id: 'repo', connectionId: null }],
     settings: { activeRuntimeEnvironmentId: null },
@@ -56,7 +66,18 @@ function state(overrides: Partial<AppState> = {}): AppState {
       'wt-1': [terminalTab()]
     },
     worktreesByRepo: {
-      repo: [{ id: 'wt-1', repoId: 'repo', path: '/repo/worktree' } as never]
+      repo: [
+        // oxlint-disable-next-line typescript/consistent-type-assertions -- SAFETY: The owner resolver reads only the catalog identity, path and host fields supplied here.
+        {
+          id: 'wt-1',
+          repoId: 'repo',
+          path: '/repo/worktree',
+          hostId:
+            overrides.repos?.length === 0
+              ? undefined
+              : getRepoExecutionHostId(overrides.repos?.[0] ?? { connectionId: null })
+        } as never
+      ]
     },
     ...overrides
   } as AppState
@@ -119,13 +140,13 @@ describe('resolveNativeChatAttachmentOwner', () => {
     ).toEqual({ kind: 'runtime' })
   })
 
-  it('routes unowned repos to the focused runtime host, matching terminal drops', () => {
+  it('keeps a recorded local workspace local when a runtime is focused', () => {
     expect(
       resolveNativeChatAttachmentOwner(
         state({ settings: { activeRuntimeEnvironmentId: 'env-9' } as AppState['settings'] }),
         'tab-1'
       )
-    ).toEqual({ kind: 'runtime' })
+    ).toEqual({ kind: 'local' })
   })
 
   it('reports not-ready when the tab has no worktree owner', () => {
@@ -225,3 +246,78 @@ describe('uploadNativeChatAttachmentPaths', () => {
     expect(mocks.toastDismiss).toHaveBeenCalledWith('toast-1')
   })
 })
+
+describe('a structured chat on a paired server', () => {
+  const owner = {
+    kind: 'runtime-session' as const,
+    environmentId: 'env-1',
+    pairingRevision: 7,
+    sessionId: 'session-1'
+  }
+
+  beforeEach(() => {
+    replaceRuntimeEnvironmentRevisions([{ id: 'env-1', createdAt: 1, pairingRevision: 7 }])
+    mocks.callRuntimeRpc.mockReset()
+  })
+
+  it('owns its attachments by the server it runs on and that pairing', () => {
+    expect(
+      resolveNativeChatRuntimeSessionAttachmentOwner({
+        sessionId: 'session-1',
+        runtimeEnvironmentId: 'env-1'
+      })
+    ).toEqual(owner)
+    expect(
+      resolveNativeChatRuntimeSessionAttachmentOwner({
+        sessionId: 'session-1',
+        runtimeEnvironmentId: 'env-gone'
+      })
+    ).toEqual({ kind: 'not-ready' })
+  })
+
+  it('asks the server, pinned to the pairing, and uploads only where it keeps a store', async () => {
+    mocks.callRuntimeRpc.mockResolvedValue({
+      runtimeId: 'runtime-a',
+      capabilities: [AGENT_SESSION_ATTACHMENTS_RUNTIME_CAPABILITY]
+    })
+    await expect(prepareNativeChatSessionAttachmentUpload(owner)).resolves.toEqual({
+      ok: true,
+      target: {
+        environmentId: 'env-1',
+        sessionId: 'session-1',
+        expectedEnvironmentPairingRevision: 7,
+        expectedEnvironmentRuntimeId: 'runtime-a'
+      }
+    })
+    expect(mocks.callRuntimeRpc).toHaveBeenCalledWith(
+      { kind: 'environment', environmentId: 'env-1' },
+      'status.get',
+      undefined,
+      expect.objectContaining({ expectedEnvironmentPairingRevision: 7 })
+    )
+  })
+
+  it('tells the user to update an older server instead of uploading', async () => {
+    mocks.callRuntimeRpc.mockResolvedValue({ runtimeId: 'runtime-a', capabilities: [] })
+    await expect(prepareNativeChatSessionAttachmentUpload(owner)).resolves.toEqual({
+      ok: false,
+      notice:
+        'This needs a newer Orca on the computer running this chat. Update Orca there, then try again.'
+    })
+  })
+})
+
+describe('nativeChatAttachFailedNotice', () => {
+  it('ends the shared cause with one full stop, whatever script it is written in', () => {
+    expect(nativeChatAttachFailedNotice(['a.mov'], 'over the 50 MB limit')).toBe(
+      "Couldn't attach a.mov. over the 50 MB limit."
+    )
+    expect(nativeChatAttachFailedNotice(['a'], 'サポートされていないファイル形式です。')).toBe(
+      "Couldn't attach a. サポートされていないファイル形式です。"
+    )
+    expect(nativeChatAttachFailedNotice(['a'], '不支持的文件类型！')).toBe(
+      "Couldn't attach a. 不支持的文件类型！"
+    )
+    expect(nativeChatAttachFailedNotice(['a', 'b'])).toBe("Couldn't attach a, b.")
+  })
+})
diff --git a/src/renderer/src/components/native-chat/native-chat-attachment-upload.ts b/src/renderer/src/components/native-chat/native-chat-attachment-upload.ts
index ad09b01ead41..928a2c57dde9 100644
--- a/src/renderer/src/components/native-chat/native-chat-attachment-upload.ts
+++ b/src/renderer/src/components/native-chat/native-chat-attachment-upload.ts
@@ -1,20 +1,38 @@
-// SSH-aware resolution for composer attachments (STA-1465). The composer's
+// Host-aware resolution for composer attachments (STA-1465). The composer's
 // attach surfaces (file drop, file picker, image paste) receive client-local
 // paths, but an SSH worktree's agent runs on the remote host — local paths must
-// be uploaded first, exactly like terminal drops (docs/terminal-drop-ssh.md).
+// be uploaded first, exactly like terminal drops (docs/terminal-drop-ssh.md). A
+// structured chat on a paired server uploads into that server's attachment store.
 
 import { toast } from 'sonner'
 import { translate } from '@/i18n/i18n'
 import { extractIpcErrorMessage } from '@/lib/ipc-error'
+import { findKnownWorktreeById } from '@/store/slices/worktrees/listing/detected-worktree-meta'
+import {
+  parseExecutionHostId,
+  toRuntimeExecutionHostId,
+  toSshExecutionHostId,
+  type ExecutionHostId
+} from '../../../../shared/execution-host'
 import { getConnectionIdFromState } from '@/lib/connection-context'
-import { getRuntimeEnvironmentIdForWorktree } from '@/lib/worktree-runtime-owner'
+import {
+  getExplicitRuntimeEnvironmentIdForWorktree,
+  getKnownExecutionHostIdForWorktree
+} from '@/lib/worktree-runtime-owner'
+import { FLOATING_TERMINAL_WORKTREE_ID } from '../../../../shared/constants'
+import { getRuntimeEnvironmentRevision } from '@/runtime/runtime-environment-revision'
+import { callRuntimeRpc } from '@/runtime/runtime-rpc-client'
+import type { RuntimeStatus } from '../../../../shared/runtime-types'
+import { AGENT_SESSION_ATTACHMENTS_RUNTIME_CAPABILITY } from '../../../../shared/protocol-version'
+import { AGENT_SESSION_WRITE_NOTICE_COPY } from '../../../../shared/agent-session-write-notice-copy'
+import type {
+  AgentSessionAttachmentPathUploadResult,
+  AgentSessionAttachmentUploadTarget
+} from '../../../../shared/agent-session-attachments'
 import type { AppState } from '@/store/types'
 import { reportTerminalDropUploadSkipsAndFailures } from '../terminal-pane/terminal-drop-upload-report'
 import { NATIVE_FILE_DROP_MAX_PATHS } from '../../../../shared/native-file-drop'
-import {
-  findTerminalTabWorktreeId,
-  resolveNativeChatFileLinkContext
-} from './native-chat-file-link'
+import { findTerminalTabWorktreeId } from './native-chat-file-link'
 import {
   captureDirectSshMutationExpectation,
   type DirectSshMutationExpectation
@@ -26,11 +44,21 @@ export type NativeChatSshAttachmentOwner = DirectSshMutationExpectation & {
   worktreePath: string
 }
 
+/** A structured chat on a paired server: files upload into that server's attachment store, which
+ *  checks every stored path a message names when it admits the message. */
+export type NativeChatRuntimeSessionAttachmentOwner = {
+  kind: 'runtime-session'
+  environmentId: string
+  pairingRevision: number
+  sessionId: string
+}
+
 export type NativeChatAttachmentOwner =
   | { kind: 'local' }
   | NativeChatSshAttachmentOwner
-  /** Runtime-owned (`remote:`) panes keep the composer's existing
-   *  local-attachment block; runtime upload support is a separate seam. */
+  | NativeChatRuntimeSessionAttachmentOwner
+  /** A terminal-backed chat on a paired server: its agent may run on that server's SSH or WSL
+   *  host, which the server's store cannot reach, so it keeps refusing client files. */
   | { kind: 'runtime' }
   /** Store not hydrated / worktree unknown. Callers must not attach local
    *  paths in this window — the worktree may turn out to be remote, and the
@@ -39,15 +67,16 @@ export type NativeChatAttachmentOwner =
 
 type NativeChatAttachmentOwnerState = Pick<
   AppState,
+  | 'detectedWorktreesByRepo'
+  | 'floatingWorkspacePath'
   | 'folderWorkspaces'
-  | 'getKnownWorktreeById'
   | 'projectGroups'
   | 'repos'
   | 'settings'
   | 'sshConnectionStates'
   | 'tabsByWorktree'
   | 'worktreesByRepo'
-> & { floatingWorkspacePath?: AppState['floatingWorkspacePath'] }
+>
 
 /** Resolve who owns the composer's backing worktree at attach time. Mirrors the
  *  terminal drop resolver's order: runtime owner first, then SSH vs local. */
@@ -59,27 +88,51 @@ export function resolveNativeChatAttachmentOwner(
   if (!worktreeId) {
     return { kind: 'not-ready' }
   }
-  return resolveNativeChatAttachmentOwnerForWorktree(state, worktreeId, terminalTabId)
+  return resolveNativeChatAttachmentOwnerForWorktree(state, worktreeId)
+}
+
+export function resolveNativeChatAttachmentHost(
+  state: NativeChatAttachmentOwnerState,
+  worktreeId: string
+): ExecutionHostId | null {
+  if (worktreeId === FLOATING_TERMINAL_WORKTREE_ID) {
+    return getKnownExecutionHostIdForWorktree(state, worktreeId)
+  }
+  const runtimeId = getExplicitRuntimeEnvironmentIdForWorktree(state, worktreeId)
+  const connectionId = getConnectionIdFromState(state, worktreeId)
+  if (!runtimeId && connectionId === undefined) {
+    return null
+  }
+  const hostId = runtimeId
+    ? toRuntimeExecutionHostId(runtimeId)
+    : connectionId
+      ? toSshExecutionHostId(connectionId)
+      : 'local'
+  return findKnownWorktreeById(state, worktreeId, hostId) ? hostId : null
 }
 
 export function resolveNativeChatAttachmentOwnerForWorktree(
   state: NativeChatAttachmentOwnerState,
-  worktreeId: string,
-  terminalTabId?: string
+  worktreeId: string
 ): NativeChatAttachmentOwner {
-  if (getRuntimeEnvironmentIdForWorktree(state, worktreeId)) {
+  const hostId = resolveNativeChatAttachmentHost(state, worktreeId)
+  if (!hostId) {
+    return { kind: 'not-ready' }
+  }
+  if (parseExecutionHostId(hostId)?.kind === 'runtime') {
     return { kind: 'runtime' }
   }
+  if (hostId === 'local') {
+    return { kind: 'local' }
+  }
   const connectionId = getConnectionIdFromState(state, worktreeId)
   if (connectionId === undefined) {
     return { kind: 'not-ready' }
   }
   if (connectionId === null) {
-    return { kind: 'local' }
+    return { kind: 'not-ready' }
   }
-  const worktreePath = terminalTabId
-    ? resolveNativeChatFileLinkContext(state, terminalTabId)?.worktreePath
-    : state.getKnownWorktreeById(worktreeId)?.path
+  const worktreePath = findKnownWorktreeById(state, worktreeId, hostId)?.path
   if (!worktreePath) {
     return { kind: 'not-ready' }
   }
@@ -97,6 +150,30 @@ export function resolveNativeChatAttachmentOwnerForWorktree(
   }
 }
 
+/** The chat behind a structured composer, as the attachment owner needs it. */
+export type NativeChatStructuredAttachmentSession = {
+  sessionId: string
+  /** Null: the chat runs on this machine. */
+  runtimeEnvironmentId: string | null
+}
+
+/** A structured chat on a paired server owns its attachments by where it runs, not by worktree. */
+export function resolveNativeChatRuntimeSessionAttachmentOwner(session: {
+  sessionId: string
+  runtimeEnvironmentId: string
+}): NativeChatAttachmentOwner {
+  const pairingRevision = getRuntimeEnvironmentRevision(session.runtimeEnvironmentId)
+  if (pairingRevision === undefined) {
+    return { kind: 'not-ready' }
+  }
+  return {
+    kind: 'runtime-session',
+    environmentId: session.runtimeEnvironmentId,
+    pairingRevision,
+    sessionId: session.sessionId
+  }
+}
+
 export function nativeChatWorktreeNotReadyNotice(): string {
   return translate(
     'components.native-chat.composer.worktreeNotReady',
@@ -118,6 +195,22 @@ export function nativeChatAttachmentUnreadableNotice(): string {
   )
 }
 
+/** One notice for every file of a drop or pick that did not attach, by name, with the cause they
+ *  share when there is one. */
+export function nativeChatAttachFailedNotice(names: readonly string[], cause = ''): string {
+  const files = names.join(', ')
+  const reason = cause.trim().replace(/[^.!?。！？]$/u, '$&.')
+  return reason
+    ? translate(
+        'components.native-chat.composer.attachFailedBecause',
+        "Couldn't attach {{files}}. {{reason}}",
+        { files, reason }
+      )
+    : translate('components.native-chat.composer.attachFailed', "Couldn't attach {{files}}.", {
+        files
+      })
+}
+
 export function nativeChatTooManyAttachmentsNotice(): string {
   return translate(
     'components.native-chat.composer.tooManyAttachments',
@@ -126,12 +219,7 @@ export function nativeChatTooManyAttachmentsNotice(): string {
   )
 }
 
-export function nativeChatLocalAttachmentUnsupportedNotice(): string {
-  return translate(
-    'components.native-chat.composer.localAttachmentUnsupported',
-    'Local attachments are not available for remote sessions.'
-  )
-}
+export { nativeChatLocalAttachmentUnsupportedNotice } from './native-chat-composer-target'
 
 /**
  * Upload client-local paths into `${worktreePath}/.orca/drops` on the SSH
@@ -168,3 +256,51 @@ export async function uploadNativeChatAttachmentPaths(
     toast.dismiss(pending)
   }
 }
+
+/**
+ * Ask the chat's server, right before uploading, whether it keeps chat attachments, and which
+ * server process will receive the bytes. An older server gets the update notice instead of an
+ * upload: a path from this machine would mean nothing to its agent.
+ */
+export async function prepareNativeChatSessionAttachmentUpload(
+  owner: NativeChatRuntimeSessionAttachmentOwner
+): Promise<
+  { ok: true; target: AgentSessionAttachmentUploadTarget } | { ok: false; notice: string }
+> {
+  const status = await callRuntimeRpc<RuntimeStatus>(
+    { kind: 'environment', environmentId: owner.environmentId },
+    'status.get',
+    undefined,
+    { timeoutMs: 15_000, expectedEnvironmentPairingRevision: owner.pairingRevision }
+  )
+  if (!status.capabilities?.includes(AGENT_SESSION_ATTACHMENTS_RUNTIME_CAPABILITY)) {
+    // The same words as any write a server too old for it refuses.
+    return {
+      ok: false,
+      notice: translate(
+        'components.native-chat.writeNotice.unsupported',
+        AGENT_SESSION_WRITE_NOTICE_COPY.unsupported
+      )
+    }
+  }
+  return {
+    ok: true,
+    target: {
+      environmentId: owner.environmentId,
+      sessionId: owner.sessionId,
+      expectedEnvironmentPairingRevision: owner.pairingRevision,
+      expectedEnvironmentRuntimeId: status.runtimeId
+    }
+  }
+}
+
+/**
+ * Upload client-local files into the chat's store on its paired server. The chips show progress,
+ * so nothing else does; the caller reports what did not attach.
+ */
+export function uploadNativeChatSessionAttachmentPaths(
+  paths: string[],
+  target: AgentSessionAttachmentUploadTarget
+): Promise<AgentSessionAttachmentPathUploadResult> {
+  return window.api.fs.uploadPathsToAgentSessionAttachments({ ...target, paths })
+}
diff --git a/src/renderer/src/components/native-chat/native-chat-autoscroll.test.ts b/src/renderer/src/components/native-chat/native-chat-autoscroll.test.ts
index 6741369acfde..09c1b3b63481 100644
--- a/src/renderer/src/components/native-chat/native-chat-autoscroll.test.ts
+++ b/src/renderer/src/components/native-chat/native-chat-autoscroll.test.ts
@@ -63,7 +63,8 @@ describe('nextFollowingEnd', () => {
     following: true,
     programmatic: false,
     geometry: parkedAbove(0),
-    previousDistanceFromEnd: 400
+    previousDistanceFromEnd: 400,
+    settling: false
   }
 
   it('follows when the reader reaches the end', () => {
@@ -89,7 +90,8 @@ describe('nextFollowingEnd', () => {
           following: false,
           programmatic: true,
           geometry: parkedAbove(distance),
-          previousDistanceFromEnd: 400
+          previousDistanceFromEnd: 400,
+          settling: false
         })
       ).toBe(false)
     }
@@ -108,7 +110,8 @@ describe('nextFollowingEnd', () => {
     const detached = {
       following: false,
       programmatic: false,
-      previousDistanceFromEnd: 400
+      previousDistanceFromEnd: 400,
+      settling: false
     }
     expect(
       nextFollowingEnd({ ...detached, geometry: parkedAbove(NATIVE_CHAT_FOLLOW_REARM_PX) })
@@ -122,7 +125,12 @@ describe('nextFollowingEnd', () => {
   // move a pixel or two and are unmarked: read as the reader arriving, they
   // re-armed follow and the next frame rebased the view, cancelling the scroll.
   it('does not reattach a detached reader who is moving away from the end', () => {
-    const leaving = { following: false, programmatic: false, previousDistanceFromEnd: 0 }
+    const leaving = {
+      following: false,
+      programmatic: false,
+      previousDistanceFromEnd: 0,
+      settling: false
+    }
     expect(nextFollowingEnd({ ...leaving, geometry: parkedAbove(0.3) })).toBe(false)
     expect(nextFollowingEnd({ ...leaving, geometry: parkedAbove(2) })).toBe(false)
     // Arriving from above still reattaches, and standing still at the end does too.
@@ -132,6 +140,18 @@ describe('nextFollowingEnd', () => {
     expect(nextFollowingEnd({ ...leaving, geometry: parkedAbove(0) })).toBe(true)
   })
 
+  it('does not reattach a jump still travelling when shrinking content clamps it onto the end', () => {
+    const clamped = {
+      following: false,
+      programmatic: false,
+      previousDistanceFromEnd: 35,
+      geometry: parkedAbove(0)
+    }
+    expect(nextFollowingEnd({ ...clamped, settling: true })).toBe(false)
+    // Anti-vacuous: the same offset reattaches a reader with no jump under way.
+    expect(nextFollowingEnd({ ...clamped, settling: false })).toBe(true)
+  })
+
   it('keeps a following reader through a small move up inside the band', () => {
     expect(
       nextFollowingEnd({ ...following, previousDistanceFromEnd: 0, geometry: parkedAbove(2) })
diff --git a/src/renderer/src/components/native-chat/native-chat-autoscroll.ts b/src/renderer/src/components/native-chat/native-chat-autoscroll.ts
index ab07cc590a7f..e555585a816b 100644
--- a/src/renderer/src/components/native-chat/native-chat-autoscroll.ts
+++ b/src/renderer/src/components/native-chat/native-chat-autoscroll.ts
@@ -50,11 +50,15 @@ export type FollowIntent = {
   geometry: ScrollGeometry
   /** Distance from the end at the previous scroll event. */
   previousDistanceFromEnd: number
+  /** Whether a jump to a row is still travelling there. Rows it passes measure
+   *  shorter than estimated, the content shrinks, and the browser clamps the view
+   *  onto the end: that is the end arriving, not the reader. */
+  settling: boolean
 }
 
 /** Passive offsets preserve following; detached views rearm only while closing on the actual tail. */
 export function nextFollowingEnd(intent: FollowIntent): boolean {
-  if (intent.following || intent.programmatic) {
+  if (intent.following || intent.programmatic || intent.settling) {
     return intent.following
   }
   if (distanceFromBottom(intent.geometry) > intent.previousDistanceFromEnd) {
diff --git a/src/renderer/src/components/native-chat/native-chat-claude-sign-in.test.tsx b/src/renderer/src/components/native-chat/native-chat-claude-sign-in.test.tsx
new file mode 100644
index 000000000000..350663015303
--- /dev/null
+++ b/src/renderer/src/components/native-chat/native-chat-claude-sign-in.test.tsx
@@ -0,0 +1,116 @@
+// @vitest-environment happy-dom
+import '@testing-library/jest-dom/vitest'
+import { act, cleanup, fireEvent, render, renderHook, screen } from '@testing-library/react'
+import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest'
+import { getDefaultSettings } from '../../../../shared/constants'
+import { projectStructuredItemsToNativeChat } from '../../../../shared/structured-agent-session-projection'
+import type { AgentJournalStatusItem } from '../../../../shared/agent-session-journal-types'
+import { agentSessionFailureWords } from '../../../../shared/agent-session-failure-words'
+import type { AgentSessionRefusalReason } from '../../../../shared/agent-session-refusal-details'
+import { useAppStore } from '@/store'
+import { MessageRow } from './NativeChatMessageRow'
+import {
+  NativeChatClaudeSignInContext,
+  useNativeChatClaudeSignIn,
+  type NativeChatClaudeSignIn
+} from './native-chat-claude-sign-in'
+import { structuredSessionNotices } from './native-chat-structured-session-notices'
+
+vi.mock('sonner', () => ({ toast: { error: vi.fn() } }))
+
+const reauthenticate = vi.fn(() => Promise.resolve({ accounts: [], activeAccountId: 'a' }))
+const LOCAL = { kind: 'local' } as const
+const ROW_SIGN_IN = { signingIn: false, signIn: vi.fn() }
+
+beforeEach(() => {
+  vi.clearAllMocks()
+  useAppStore.setState({
+    settings: { ...getDefaultSettings('/home/me'), activeClaudeManagedAccountId: 'a' },
+    fetchSettings: vi.fn(() => Promise.resolve())
+  })
+  Object.defineProperty(window, 'api', {
+    configurable: true,
+    value: { claudeAccounts: { reauthenticate } }
+  })
+})
+afterEach(cleanup)
+
+function launchNotice(
+  reason: AgentSessionRefusalReason<'agent_session_operation_invalid'>,
+  claudeSignIn: NativeChatClaudeSignIn | null
+) {
+  return structuredSessionNotices({
+    launch: {
+      lifecycle: 'failed',
+      failure: { kind: 'refused', code: 'agent_session_operation_invalid', details: { reason } },
+      retry: vi.fn()
+    },
+    agentLabel: 'Claude',
+    sessionError: null,
+    composerError: null,
+    claudeSignIn
+  })[0]
+}
+
+describe('a Claude chat that failed for want of a sign-in', () => {
+  it('offers Sign in on the start failure, then Retry once signed in', async () => {
+    const failure = {}
+    const { result, rerender } = renderHook(
+      (rows: number) =>
+        useNativeChatClaudeSignIn({ agent: 'claude', target: LOCAL, failure, failureRows: rows }),
+      { initialProps: 0 }
+    )
+    const notice = launchNotice('notSignedIn', result.current)
+    expect(notice?.text).toContain('Claude is not signed in for the selected account.')
+    expect(notice?.action?.label).toBe('Sign in')
+    await act(async () => notice?.action?.onClick())
+    expect(reauthenticate).toHaveBeenCalledWith({ accountId: 'a' })
+    expect(result.current).toBeNull()
+    expect(launchNotice('notSignedIn', result.current)?.action?.label).toBe('Retry')
+    // A new failure after the sign-in offers it again.
+    rerender(1)
+    expect(result.current).not.toBeNull()
+  })
+
+  it('offers Sign in for a missing account folder, and Retry for any other failure', () => {
+    const signIn = { signingIn: false, signIn: vi.fn() }
+    expect(launchNotice('claudeAccountFolderMissing', signIn)?.action?.label).toBe('Sign in')
+    expect(launchNotice('claudeAccountSetupFailed', signIn)?.action?.label).toBe('Retry')
+  })
+
+  it('offers nothing for Codex, a remote chat, or System default', () => {
+    const args = { target: LOCAL, failure: null, failureRows: 0 }
+    expect(
+      renderHook(() => useNativeChatClaudeSignIn({ ...args, agent: 'codex' })).result.current
+    ).toBeNull()
+    const remote = { kind: 'environment', environmentId: 'env-1' } as const
+    expect(
+      renderHook(() => useNativeChatClaudeSignIn({ ...args, agent: 'claude', target: remote }))
+        .result.current
+    ).toBeNull()
+    useAppStore.setState({
+      settings: { ...getDefaultSettings('/home/me'), activeClaudeManagedAccountId: null }
+    })
+    expect(
+      renderHook(() => useNativeChatClaudeSignIn({ ...args, agent: 'claude' })).result.current
+    ).toBeNull()
+  })
+
+  it('puts Sign in on the transcript row that says so', () => {
+    const body: AgentJournalStatusItem = {
+      kind: 'status',
+      tone: 'error',
+      ...agentSessionFailureWords({ kind: 'notSignedIn' }, { surface: 'row', provider: 'claude' })
+    }
+    const [message] = projectStructuredItemsToNativeChat([
+      { itemId: 'start-failure', sequence: 1, revision: 1, observedAt: 1, body }
+    ])
+    render(
+      <NativeChatClaudeSignInContext.Provider value={ROW_SIGN_IN}>
+        <MessageRow message={message!} expandSignal={false} onScrollMessageToTop={vi.fn()} />
+      </NativeChatClaudeSignInContext.Provider>
+    )
+    fireEvent.click(screen.getByRole('button', { name: 'Sign in' }))
+    expect(ROW_SIGN_IN.signIn).toHaveBeenCalled()
+  })
+})
diff --git a/src/renderer/src/components/native-chat/native-chat-claude-sign-in.ts b/src/renderer/src/components/native-chat/native-chat-claude-sign-in.ts
new file mode 100644
index 000000000000..64fbc7aa3b4a
--- /dev/null
+++ b/src/renderer/src/components/native-chat/native-chat-claude-sign-in.ts
@@ -0,0 +1,77 @@
+import { createContext, useCallback, useContext, useMemo, useRef, useState } from 'react'
+import { translate } from '@/i18n/i18n'
+import { useAppStore } from '@/store'
+import { signInToClaudeAccount } from '@/lib/claude-account-sign-in'
+import type { RuntimeClientTarget } from '@/runtime/runtime-rpc-client'
+
+/** The chat failures a sign-in to the selected Claude account fixes. */
+const SIGN_IN_FAILURE_KINDS: ReadonlySet<string> = new Set([
+  'notSignedIn',
+  'claudeAccountFolderMissing'
+])
+
+export function isClaudeSignInFailureKind(kind: string | undefined): boolean {
+  return kind !== undefined && SIGN_IN_FAILURE_KINDS.has(kind)
+}
+
+/** Settings' Sign in again for the selected account, offered where a chat failed for want of it. */
+export type NativeChatClaudeSignIn = { signingIn: boolean; signIn: () => void }
+
+export const NativeChatClaudeSignInContext = createContext<NativeChatClaudeSignIn | null>(null)
+
+export function useNativeChatClaudeSignInView(): NativeChatClaudeSignIn | null {
+  return useContext(NativeChatClaudeSignInContext)
+}
+
+export function nativeChatClaudeSignInLabel(signIn: NativeChatClaudeSignIn): string {
+  return signIn.signingIn
+    ? translate('components.native-chat.claudeSignIn.signingIn', 'Signing in…')
+    : translate('accounts.claude.signIn', 'Sign in')
+}
+
+/** Null unless a local Claude chat runs under a selected account, and after a sign-in until a new
+ *  failure (a different `failure`, or another `failureRows`), so a resend is what follows it. */
+export function useNativeChatClaudeSignIn(input: {
+  agent: string
+  target: RuntimeClientTarget
+  failure: unknown
+  failureRows: number
+}): NativeChatClaudeSignIn | null {
+  // Why local only: the hidden sign-in runs on this device, and Claude chats run on its host.
+  const accountId = useAppStore((s) =>
+    input.agent === 'claude' && input.target.kind === 'local'
+      ? (s.settings?.activeClaudeManagedAccountIdsByRuntime?.host ??
+        s.settings?.activeClaudeManagedAccountId ??
+        null)
+      : null
+  )
+  const [signingIn, setSigningIn] = useState(false)
+  // Why a ref: the notice and a transcript row both sign in, and state lags a double press.
+  const signingInRef = useRef(false)
+  const [signedInFor, setSignedInFor] = useState<{ failure: unknown; rows: number } | null>(null)
+  const { failure, failureRows } = input
+  const signIn = useCallback(() => {
+    if (!accountId || signingInRef.current) {
+      return
+    }
+    signingInRef.current = true
+    setSigningIn(true)
+    void signInToClaudeAccount(accountId)
+      .then((signedIn) => {
+        if (signedIn) {
+          setSignedInFor({ failure, rows: failureRows })
+        }
+      })
+      .finally(() => {
+        signingInRef.current = false
+        setSigningIn(false)
+      })
+  }, [accountId, failure, failureRows])
+  const signedInSinceFailure =
+    signedInFor !== null && signedInFor.failure === failure && signedInFor.rows === failureRows
+  // Why memoized: rows read it through context, and a chat re-renders on every streamed token.
+  return useMemo(
+    () => (accountId && !signedInSinceFailure ? { signingIn, signIn } : null),
+    [accountId, signedInSinceFailure, signingIn, signIn]
+  )
+}
diff --git a/src/renderer/src/components/native-chat/native-chat-clipboard-image-save.ts b/src/renderer/src/components/native-chat/native-chat-clipboard-image-save.ts
new file mode 100644
index 000000000000..d0fd3b9268de
--- /dev/null
+++ b/src/renderer/src/components/native-chat/native-chat-clipboard-image-save.ts
@@ -0,0 +1,89 @@
+import { translate } from '@/i18n/i18n'
+import { setNativeChatPasteFailure } from './native-chat-composer-notice'
+import {
+  nativeChatLocalAttachmentUnsupportedNotice,
+  prepareNativeChatSessionAttachmentUpload,
+  type NativeChatAttachmentOwner
+} from './native-chat-attachment-upload'
+
+type ClipboardImageOwner = Extract<
+  NativeChatAttachmentOwner,
+  { kind: 'local' | 'ssh' | 'runtime-session' }
+>
+
+/** Owners whose attachment path is a file this client can write right now. */
+export function ownerAcceptsClipboardImage(
+  owner: NativeChatAttachmentOwner
+): owner is ClipboardImageOwner {
+  return owner.kind === 'local' || owner.kind === 'ssh' || owner.kind === 'runtime-session'
+}
+
+/** Where the clipboard image is saved: this machine, the SSH host, or the chat's store on its
+ *  paired server, after asking that server whether it keeps one. */
+async function clipboardImageSaveArgs(
+  owner: ClipboardImageOwner
+): Promise<
+  | { ok: true; args: Parameters<typeof window.api.ui.saveClipboardImageAsTempFile>[0] }
+  | { ok: false; notice: string; cause: NativeChatClipboardImageFailureCause }
+> {
+  if (owner.kind === 'local') {
+    return { ok: true, args: { forNativeChatDraft: true } }
+  }
+  if (owner.kind === 'ssh') {
+    return { ok: true, args: { connectionId: owner.connectionId } }
+  }
+  const prepared = await prepareNativeChatSessionAttachmentUpload(owner)
+  if (!prepared.ok) {
+    return { ...prepared, cause: 'serverTooOld' }
+  }
+  const { environmentId, ...agentSessionAttachment } = prepared.target
+  return { ok: true, args: { runtimeEnvironmentId: environmentId, agentSessionAttachment } }
+}
+
+/** `serverTooOld`: the chat's paired server keeps no attachments, so it could never take one. */
+export type NativeChatClipboardImageFailureCause = 'serverTooOld' | 'failed'
+
+/** Save the clipboard image where the owner's agent can read it. Every failure is reported. */
+export async function saveNativeChatClipboardImage(
+  owner: NativeChatAttachmentOwner,
+  report: {
+    /** `errorText`: the failure's own words, kept apart from Orca's notice. */
+    setNotice: (
+      notice: string,
+      cause: NativeChatClipboardImageFailureCause,
+      errorText?: string
+    ) => void
+    /** The image has somewhere to go, now that any server it goes to has said it takes one. */
+    ready?: () => void
+  }
+): Promise<{ status: 'saved'; tempPath: string } | { status: 'empty' | 'failed' }> {
+  if (!ownerAcceptsClipboardImage(owner)) {
+    report.setNotice(nativeChatLocalAttachmentUnsupportedNotice(), 'failed')
+    return { status: 'failed' }
+  }
+  try {
+    // SSH panes save the image on the remote host (SFTP) so the attached
+    // path is readable by the remote agent, matching terminal image paste.
+    const target = await clipboardImageSaveArgs(owner)
+    if (!target.ok) {
+      report.setNotice(target.notice, target.cause)
+      return { status: 'failed' }
+    }
+    report.ready?.()
+    const tempPath = await window.api.ui.saveClipboardImageAsTempFile(target.args)
+    return tempPath ? { status: 'saved', tempPath } : { status: 'empty' }
+  } catch (error) {
+    // A failed save must be visible: over SSH it fails whenever the
+    // connection drops, and a silent no-op reads as a broken paste.
+    setNativeChatPasteFailure(
+      (notice, errorText) => {
+        if (notice !== null) {
+          report.setNotice(notice, 'failed', errorText)
+        }
+      },
+      error,
+      translate('components.native-chat.composer.imagePasteFailed', 'Image paste failed.')
+    )
+    return { status: 'failed' }
+  }
+}
diff --git a/src/renderer/src/components/native-chat/native-chat-composer-autogrow.test.tsx b/src/renderer/src/components/native-chat/native-chat-composer-autogrow.test.tsx
index 2cd8c431982e..c55810547733 100644
--- a/src/renderer/src/components/native-chat/native-chat-composer-autogrow.test.tsx
+++ b/src/renderer/src/components/native-chat/native-chat-composer-autogrow.test.tsx
@@ -46,7 +46,6 @@ function TestField({
   const imeEnterGesture = useImeEnterGestureOwnership()
   return (
     <NativeChatComposerField
-      dropScopeKey="pane-test"
       draftScopeKey="pane-test"
       textareaRef={createRef<HTMLTextAreaElement>()}
       draft={draft}
diff --git a/src/renderer/src/components/native-chat/native-chat-composer-composition.test.tsx b/src/renderer/src/components/native-chat/native-chat-composer-composition.test.tsx
index ff44d3ef5724..4b4ce0ffa610 100644
--- a/src/renderer/src/components/native-chat/native-chat-composer-composition.test.tsx
+++ b/src/renderer/src/components/native-chat/native-chat-composer-composition.test.tsx
@@ -35,7 +35,6 @@ function TestField(props: TestFieldProps): React.JSX.Element {
 
 function fieldProps(overrides: Partial<TestFieldProps> = {}): TestFieldProps {
   return {
-    dropScopeKey: 'pane-test',
     draftScopeKey: 'pane-test',
     textareaRef: createRef<HTMLTextAreaElement>(),
     draft: '',
@@ -78,19 +77,11 @@ function textarea(): HTMLTextAreaElement {
   return screen.getByRole('textbox') as HTMLTextAreaElement
 }
 
-describe('native chat composer drop-scope marker', () => {
-  // The drop pipeline stops walking at the drop-target marker, so a scope key on
-  // any other element would never reach the payload.
-  it('publishes the pane key, not the draft key, on the same element as the drop-target marker', () => {
-    const view = render(
-      <TestField
-        {...fieldProps({ dropScopeKey: 'tab-7:pane-9', draftScopeKey: 'agent-session:session-9' })}
-      />
-    )
-    const marker = view.container.querySelector('[data-native-file-drop-target="composer"]')
-    expect(marker).not.toBeNull()
-    expect(marker?.getAttribute('data-composer-scope-key')).toBe('tab-7:pane-9')
-    expect(view.container.querySelectorAll('[data-composer-scope-key]')).toHaveLength(1)
+describe('native chat composer drop ownership', () => {
+  it('keeps the conversation editor key without publishing drop routing markers', () => {
+    const view = render(<TestField {...fieldProps({ draftScopeKey: 'agent-session:session-9' })} />)
+    expect(view.container.querySelector('[data-composer-scope-key]')).toBeNull()
+    expect(view.container.querySelector('.ProseMirror')).not.toBeNull()
   })
 })
 
diff --git a/src/renderer/src/components/native-chat/native-chat-composer-draft-image-check.ts b/src/renderer/src/components/native-chat/native-chat-composer-draft-image-check.ts
index 37c7d0124f84..efa65db9abf3 100644
--- a/src/renderer/src/components/native-chat/native-chat-composer-draft-image-check.ts
+++ b/src/renderer/src/components/native-chat/native-chat-composer-draft-image-check.ts
@@ -1,8 +1,11 @@
 // Which restored draft images are known to be gone. A paste in Orca's paste folder asks main
-// whether it is still kept, which holds only for a file really inside that folder; any other image
-// goes through the existing existence check (the workspace's read rules locally, the host over SSH).
+// whether it is still kept, which holds only for a file really inside that folder; a file a paired
+// server stored for the chat is that server's to check, which its claim at send does; any other
+// image goes through the existing existence check (the workspace's read rules locally, the host
+// over SSH).
 
 import { useEffect, useSyncExternalStore } from 'react'
+import { isAgentSessionAttachmentStorePath } from '../../../../shared/agent-session-attachments'
 import type { NativeChatComposerDraftImage } from './native-chat-composer-draft-storage'
 import {
   isKeptLocalPaste,
@@ -37,7 +40,7 @@ export async function findMissingNativeChatComposerDraftImages(
   }
   await Promise.all(
     checkable
-      .filter((image) => !isKeptLocalPaste(image))
+      .filter((image) => !isKeptLocalPaste(image) && !isAgentSessionAttachmentStorePath(image.path))
       .map(async (image) => {
         try {
           const exists = await pathExists({
diff --git a/src/renderer/src/components/native-chat/native-chat-composer-draft-journal.ts b/src/renderer/src/components/native-chat/native-chat-composer-draft-journal.ts
index 7dde1cb4fcad..c1b979e36456 100644
--- a/src/renderer/src/components/native-chat/native-chat-composer-draft-journal.ts
+++ b/src/renderer/src/components/native-chat/native-chat-composer-draft-journal.ts
@@ -17,11 +17,10 @@ import {
 } from './native-chat-composer-draft-storage'
 
 const JOURNAL_KEY = 'orca:nativeChatComposerDraftJournal:v1'
-// Why: localStorage also holds the send outbox, and a send is refused when its entry can't be
-// saved, so the journal stays small: whole drafts together stop at the first cap, and additions,
-// at most one message each with their source deleted right after, at the second, which fits the
-// largest. A removal is never capped: it is tiny, and it is what keeps a sent draft from coming
-// back.
+// Why: localStorage is shared with every other saved setting, so the journal stays small: whole
+// drafts together stop at the first cap, and additions, at most one message each with their source
+// deleted right after, at the second, which fits the largest. A removal is never capped: it is
+// tiny, and it is what keeps a sent draft from coming back.
 export const MAX_JOURNAL_CHARS = 256_000
 export const MAX_JOURNAL_ADDITIONS_CHARS = 800_000
 
diff --git a/src/renderer/src/components/native-chat/native-chat-composer-draft-lifecycle.test.tsx b/src/renderer/src/components/native-chat/native-chat-composer-draft-lifecycle.test.tsx
index adedcc4d856c..5c6ac2d12c2c 100644
--- a/src/renderer/src/components/native-chat/native-chat-composer-draft-lifecycle.test.tsx
+++ b/src/renderer/src/components/native-chat/native-chat-composer-draft-lifecycle.test.tsx
@@ -158,7 +158,6 @@ function composer(
       structuredTransport: transport,
       isComposing: () => false,
       clearSkillOrigin: () => {},
-      setHistory: () => {},
       setDraft,
       setCaret
     })
@@ -444,8 +443,12 @@ describe('native-chat composer draft lifecycle', () => {
         { scopeKey: 'tab-1:pane' }
       )
     )
-    expect(second.api?.attachments.imageAttachments.map(({ path }) => path)).toEqual([
-      '/repo/x.png'
+    // The paste still on its way comes back pending, so Send waits for it.
+    expect(
+      second.api?.attachments.imageAttachments.map(({ path, pending }) => ({ path, pending }))
+    ).toEqual([
+      { path: '/repo/x.png', pending: undefined },
+      { path: '', pending: true }
     ])
     await act(async () => second.api?.attachments.clearImageAttachments())
     await unmount()
@@ -560,6 +563,30 @@ describe('native-chat composer draft lifecycle', () => {
     ])
   })
 
+  it('leaves a restored image a paired server stored to that server to check', async () => {
+    // Not on this machine's disk, so a local check could only call it gone.
+    const pathExists = vi.fn(async () => false)
+    vi.stubGlobal('api', { fs: { pathExists } })
+    const stored = { id: 'a', path: '/srv/orca/agent-session-attachments/0f6c/shot.png' }
+    storage.drafts.set('agent-session:s1', { text: 'see this', images: [stored], savedAt: 1 })
+    const hooks = await loadHooks()
+    const seen: { api?: ComposerApi } = {}
+    try {
+      await mount(
+        createElement(
+          composer(hooks, (next) => (seen.api = next)),
+          { scopeKey: 'agent-session:s1' }
+        )
+      )
+      await act(async () => {})
+    } finally {
+      vi.unstubAllGlobals()
+    }
+
+    expect(pathExists).not.toHaveBeenCalled()
+    expect(seen.api?.attachments.imageAttachments).toEqual([stored])
+  })
+
   it('shows a restored paste from Orca’s paste folder once main confirms it is kept, and marks the rest', async () => {
     const folder = '/Users/me/Library/Application Support/orca/native-chat-pastes'
     let answer: () => void = () => {}
diff --git a/src/renderer/src/components/native-chat/native-chat-composer-draft-persistence.ts b/src/renderer/src/components/native-chat/native-chat-composer-draft-persistence.ts
index cd4a11faf776..dc9e0a3d139e 100644
--- a/src/renderer/src/components/native-chat/native-chat-composer-draft-persistence.ts
+++ b/src/renderer/src/components/native-chat/native-chat-composer-draft-persistence.ts
@@ -3,6 +3,7 @@
 
 import { basename } from '@/lib/path'
 import { isNativeChatKeptPastePath, isNativeChatPastedImagePath } from './native-chat-image-paste'
+import { isAgentSessionAttachmentStorePath } from '../../../../shared/agent-session-attachments'
 import {
   dirtyScopes,
   hasLocalChange,
@@ -54,11 +55,15 @@ export function isKeptLocalPaste(image: NativeChatComposerDraftImage): boolean {
 }
 
 /** What storage keeps: not an unsaved launch-seed copy, and a paste outside Orca's paste folder
- *  (over SSH, or from before it) only by name. Null when nothing is left. */
+ *  (over SSH, or from before it) only by name. A paste a paired server stored for the chat stays
+ *  whole: the server keeps it, and its claim at send refuses one it no longer has. Null when
+ *  nothing is left. */
 function savedForm(record: DraftRecord): StoredNativeChatComposerDraft | null {
   const { unsavedText, ...saved } = record
   const images = saved.images.map((image) =>
-    isNativeChatPastedImagePath(image.path) && !isKeptLocalPaste(image)
+    isNativeChatPastedImagePath(image.path) &&
+    !isKeptLocalPaste(image) &&
+    !isAgentSessionAttachmentStorePath(image.path)
       ? unavailableNativeChatComposerDraftImage(image)
       : image
   )
diff --git a/src/renderer/src/components/native-chat/native-chat-composer-draft-storage.ts b/src/renderer/src/components/native-chat/native-chat-composer-draft-storage.ts
index 83323315c838..bc38203f2154 100644
--- a/src/renderer/src/components/native-chat/native-chat-composer-draft-storage.ts
+++ b/src/renderer/src/components/native-chat/native-chat-composer-draft-storage.ts
@@ -1,5 +1,5 @@
 // The stored form of composer drafts and the storage they live in. Drafts are kept in their own
-// store (IndexedDB), not localStorage, so they never compete with the send outbox for its quota
+// store (IndexedDB), not localStorage, so they never compete with other saved state for its quota
 // and need no budget: every draft comes back.
 
 import type { JSONContent } from '@tiptap/react'
diff --git a/src/renderer/src/components/native-chat/native-chat-composer-draft-store.test.ts b/src/renderer/src/components/native-chat/native-chat-composer-draft-store.test.ts
index aac5ae37e055..c25c67cd0343 100644
--- a/src/renderer/src/components/native-chat/native-chat-composer-draft-store.test.ts
+++ b/src/renderer/src/components/native-chat/native-chat-composer-draft-store.test.ts
@@ -376,6 +376,17 @@ describe('native-chat composer draft store', () => {
     ])
   })
 
+  it('saves a paste a paired server stored for the chat as the real image', async () => {
+    const stored = {
+      id: 'p-1',
+      path: '/srv/orca/agent-session-attachments/0f6c/orca-paste-1-0f.png'
+    }
+    modules.attachments.appendNativeChatAttachmentCache('agent-session:s1', [stored])
+
+    const reloaded = await reload()
+    expect(reloaded.attachments.readNativeChatAttachmentCache('agent-session:s1')).toEqual([stored])
+  })
+
   it('puts a re-attached image in the place of the one to attach again', async () => {
     storage.drafts.set('tab-1:pane', {
       text: 'see',
@@ -608,10 +619,11 @@ describe('native-chat composer draft store', () => {
         failures-- > 0 ? Promise.reject(new Error('backing store')) : storage.loadAll()
     }
     const reloaded = await reload({ using: flaky, hydrate: false })
+    vi.useFakeTimers({ toFake: ['setTimeout', 'clearTimeout'] })
     await reloaded.store.waitForNativeChatComposerDrafts(1)
     reloaded.drafts.appendNativeChatDraftCache('agent-session:s1', 'given back')
     await reloaded.store.nativeChatComposerDraftWritesSettled()
-    await new Promise((resolve) => setTimeout(resolve, 1_200))
+    await vi.advanceTimersByTimeAsync(1_200)
     await reloaded.store.hydrateNativeChatComposerDrafts()
     await reloaded.store.nativeChatComposerDraftWritesSettled()
 
@@ -639,10 +651,11 @@ describe('native-chat composer draft store', () => {
       }
     }
     const reloaded = await reload({ using: flaky, hydrate: false })
+    vi.useFakeTimers({ toFake: ['setTimeout', 'clearTimeout'] })
     await reloaded.store.waitForNativeChatComposerDrafts(1)
     reloaded.drafts.appendNativeChatDraftCache('agent-session:s1', 'first')
     await reloaded.store.nativeChatComposerDraftWritesSettled()
-    await new Promise((resolve) => setTimeout(resolve, 1_200))
+    await vi.advanceTimersByTimeAsync(1_200)
     reloaded.drafts.appendNativeChatDraftCache('agent-session:s1', 'second')
     await reloaded.store.nativeChatComposerDraftWritesSettled()
 
diff --git a/src/renderer/src/components/native-chat/native-chat-composer-draft-store.ts b/src/renderer/src/components/native-chat/native-chat-composer-draft-store.ts
index b8ca9d888b00..60dddf06d2f7 100644
--- a/src/renderer/src/components/native-chat/native-chat-composer-draft-store.ts
+++ b/src/renderer/src/components/native-chat/native-chat-composer-draft-store.ts
@@ -69,6 +69,8 @@ export type NativeChatComposerDraftChange = {
   images?: readonly NativeChatComposerDraftImage[]
   /** Text shown but never saved while the draft still holds exactly it. */
   unsavedText?: string
+  /** A new draft's owner when its chat may no longer be open to name it: the one it was begun in. */
+  owner?: NativeChatComposerDraftOwner
 }
 
 const EMPTY_DRAFT: DraftRecord = { text: '', images: [], savedAt: 0 }
@@ -82,6 +84,13 @@ export function setNativeChatComposerDraftOwnerResolver(
   resolveOwner = resolver
 }
 
+/** The owner a new draft in this scope would record now. */
+export function resolveNativeChatComposerDraftOwner(
+  scopeKey: string
+): NativeChatComposerDraftOwner | undefined {
+  return resolveOwner?.(scopeKey)
+}
+
 /** Composers render from the store; this tells one that its pane's draft changed. */
 export function subscribeToNativeChatComposerDraft(
   scopeKey: string,
@@ -156,7 +165,7 @@ export function updateNativeChatComposerDraft(
     return
   }
   // Why stamped once: a conversation never moves to another workspace, so its owner stays true.
-  const owner = current.owner ?? resolveOwner?.(scopeKey)
+  const owner = current.owner ?? change.owner ?? resolveOwner?.(scopeKey)
   const record: DraftRecord = {
     text,
     ...(document ? { document } : {}),
@@ -192,14 +201,20 @@ function withAddition<T extends NativeChatComposerDraft>(
  */
 export function appendToNativeChatComposerDraft(
   scopeKey: string,
-  addition: NativeChatComposerDraftAddition
+  addition: NativeChatComposerDraftAddition,
+  owner?: NativeChatComposerDraftOwner
 ): boolean {
   const before = records.get(scopeKey)
   const current = readNativeChatComposerDraft(scopeKey)
   const { text, images } = withAddition(current, addition)
   updateNativeChatComposerDraft(
     scopeKey,
-    { text, images, ...(text === current.text ? {} : { document: undefined }) },
+    {
+      text,
+      images,
+      ...(text === current.text ? {} : { document: undefined }),
+      ...(owner ? { owner } : {})
+    },
     'immediate',
     (loaded) => withAddition(loaded, addition, { once: true })
   )
diff --git a/src/renderer/src/components/native-chat/native-chat-composer-drop-scope.test.tsx b/src/renderer/src/components/native-chat/native-chat-composer-drop-scope.test.tsx
index 73953f509a9e..945f776cc6d9 100644
--- a/src/renderer/src/components/native-chat/native-chat-composer-drop-scope.test.tsx
+++ b/src/renderer/src/components/native-chat/native-chat-composer-drop-scope.test.tsx
@@ -1,18 +1,17 @@
 // @vitest-environment happy-dom
 
-import { EventEmitter } from 'node:events'
 import { afterEach, beforeAll, beforeEach, describe, expect, it, vi } from 'vitest'
 import { act, cleanup, render, screen } from '@testing-library/react'
 import { useRef, useState } from 'react'
 import type * as AttachmentUploadModule from './native-chat-attachment-upload'
 import type { NativeChatComposerInput } from './native-chat-composer-input'
 import { NativeChatPromptEditor } from './NativeChatPromptEditor'
-import { useNativeChatExternalAttachments } from './use-native-chat-external-attachments'
+import { useNativeChatFileDrops } from './use-native-chat-file-drops'
+import { NativeChatPaneFileDropSurface } from './NativeChatPaneFileDropSurface'
+import { useNewWorkspaceComposerFileDrop } from '../new-workspace/use-new-workspace-composer-file-drop'
 import { NativeChatImageAttachmentPreview } from './NativeChatImageAttachmentPreview'
+import { toast } from 'sonner'
 import { resetLocalImageSrcStateForTests } from '../editor/useLocalImageSrc'
-import { useComposerDropListener } from '../../hooks/composer-state/composer-drop-listener'
-import type { NativeFileDropPayload } from '../../../../shared/native-file-drop'
-import { useNativeChatFileAttachmentActions } from './use-native-chat-file-attachment-actions'
 import {
   clearNativeChatAttachmentCacheForTests,
   readNativeChatAttachmentCache,
@@ -30,7 +29,9 @@ const intake = vi.hoisted(() => ({
   owner: { kind: 'local' } as { kind: string; connectionId?: string },
   stat: vi.fn(),
   readFile: vi.fn(),
-  upload: vi.fn()
+  upload: vi.fn(),
+  prepare: vi.fn(async ({ paths }: { paths: string[] }) => ({ paths, failures: [] })),
+  pick: vi.fn()
 }))
 vi.mock('@/store', () => ({ useAppStore: { getState: () => ({ tabsByWorktree: {} }) } }))
 // Keeps the real notice strings so the silent-failure guards assert what users see.
@@ -44,24 +45,24 @@ vi.mock('electron', () => ({
   ipcRenderer: electron,
   webUtils: { getPathForFile: electron.getPathForFile }
 }))
+vi.mock('sonner', () => ({ toast: { error: vi.fn(), loading: vi.fn(), dismiss: vi.fn() } }))
 vi.mock('@/i18n/i18n', () => ({ translate: (_key: string, fallback: string) => fallback }))
 vi.mock('@/runtime/runtime-terminal-inspection', () => ({ isRemoteRuntimePtyId: () => false }))
 
-import {
-  installNativeFileDropHandlers,
-  subscribeNativeFileDrop
-} from '../../../../preload/preload-runtime-support'
+import { installOsFileDropCancellationGuard } from '@/lib/os-file-drop-cancellation-guard'
 
-// Uses the production drop listener, subscriber fan-out, attachment hook, and scope cache.
-function ComposerProbe({
+// Exercises real element delivery, path authorization and the draft attachment cache.
+function ComposerBody({
   pane,
   draft = pane,
-  hidden = false
+  hidden = false,
+  disabled = false
 }: {
   pane: string
   /** The draft's owner; a structured chat's composers share their conversation's. */
   draft?: string
   hidden?: boolean
+  disabled?: boolean
 }) {
   const textareaRef = useRef<NativeChatComposerInput>(null)
   const [notice, setNotice] = useState<string | null>(null)
@@ -69,7 +70,7 @@ function ComposerProbe({
     attachmentScopeKey: draft,
     allowWithoutTarget: true,
     caret: 0,
-    disabled: false,
+    disabled,
     isComposing: () => false,
     resolveTarget: () => null,
     textareaRef,
@@ -77,16 +78,19 @@ function ComposerProbe({
     setDraft: () => {},
     setNotice
   })
-  const { attachExternalPaths } = useNativeChatExternalAttachments({
+  const { pickAttachments } = useNativeChatFileDrops({
+    paneKey: pane,
+    draftScopeKey: draft,
+    targetPtyId: null,
     terminalTabId: pane,
-    disabled: false,
+    disabled,
     attachResolvedPaths: attachments.attachResolvedPaths,
+    pendingChips: attachments.pendingChips,
     setNotice
   })
-  useNativeChatFileAttachmentActions(pane, attachExternalPaths)
   return (
     <div data-pane={pane} style={{ display: hidden ? 'none' : 'block' }}>
-      <div data-native-file-drop-target="composer" data-composer-scope-key={pane}>
+      <div>
         <NativeChatPromptEditor
           scopeKey={draft}
           inputRef={textareaRef}
@@ -105,11 +109,20 @@ function ComposerProbe({
         />
       ))}
       <output>{JSON.stringify(attachments.imageAttachments.map(({ path }) => path))}</output>
+      <button onClick={pickAttachments}>Attach to {pane}</button>
       <output data-notice={pane}>{notice}</output>
     </div>
   )
 }
 
+function ComposerProbe(props: React.ComponentProps<typeof ComposerBody>) {
+  return (
+    <NativeChatPaneFileDropSurface className="chat-pane">
+      <ComposerBody {...props} />
+    </NativeChatPaneFileDropSurface>
+  )
+}
+
 /** The external-attach loop awaits once per path; drain those before asserting. */
 async function settleAttachments(): Promise<void> {
   await act(async () => {
@@ -121,6 +134,7 @@ async function settleAttachments(): Promise<void> {
 
 async function dropTwoImages(target: Element): Promise<void> {
   const event = new Event('drop', { bubbles: true, cancelable: true })
+  Object.defineProperty(event, 'isTrusted', { value: true })
   Object.defineProperty(event, 'dataTransfer', {
     value: {
       types: ['Files'],
@@ -132,48 +146,108 @@ async function dropTwoImages(target: Element): Promise<void> {
   })
 }
 
-function WorkspaceComposerProbe({ onDrop }: { onDrop: (paths: string[]) => void }) {
-  useComposerDropListener(onDrop)
-  return <div data-native-file-drop-target="composer" data-workspace-composer="true" />
+function WorkspaceComposerProbe({
+  onDrop
+}: {
+  onDrop: (paths: string[], current: () => boolean) => void
+}) {
+  const owner = useNewWorkspaceComposerFileDrop({
+    projectPath: '/repo',
+    hostId: 'local',
+    connectionId: null,
+    applyDrop: async (paths, current) => onDrop(paths, current)
+  })
+  return <div ref={owner} data-workspace-composer="true" />
 }
 
 describe('native chat composer drop scoping', () => {
   beforeAll(() => {
-    const ipc = new EventEmitter()
-    electron.on.mockImplementation((channel, listener) => ipc.on(channel, listener))
-    electron.removeListener.mockImplementation((channel, listener) =>
-      ipc.removeListener(channel, listener)
-    )
-    // Mirror registerFileDropRelay: one window-wide notification per valid drop.
-    electron.send.mockImplementation((channel: string, payload: NativeFileDropPayload) => {
-      if (channel === 'terminal:file-dropped-from-preload') {
-        ipc.emit('terminal:file-drop', {}, payload)
-      }
-    })
     Object.defineProperty(window, 'api', {
       configurable: true,
-      value: { ui: { onFileDrop: subscribeNativeFileDrop }, fs: intake }
+      value: {
+        shell: { pickAttachments: intake.pick },
+        fs: {
+          ...intake,
+          getPathForFile: electron.getPathForFile,
+          prepareDroppedPaths: intake.prepare
+        }
+      }
     })
-    installNativeFileDropHandlers()
-    // Repeated preload setup must stay singleton or every OS drop is processed once per install.
-    installNativeFileDropHandlers()
   })
 
+  let disposeGuard: (() => void) | undefined
   beforeEach(() => {
+    disposeGuard = installOsFileDropCancellationGuard()
     intake.owner = { kind: 'local' }
     electron.getPathForFile.mockReset().mockImplementation((file: File) => `/repro/${file.name}`)
     intake.stat.mockReset().mockResolvedValue(undefined)
     intake.readFile.mockReset().mockResolvedValue({ content: '', isBinary: false })
     intake.upload.mockReset()
+    intake.prepare.mockReset().mockImplementation(async ({ paths }) => ({ paths, failures: [] }))
+    intake.pick.mockReset()
     vi.stubGlobal('IntersectionObserver', undefined)
   })
 
   afterEach(() => {
+    disposeGuard?.()
     cleanup()
     resetLocalImageSrcStateForTests()
     vi.unstubAllGlobals()
     clearNativeChatAttachmentCacheForTests()
     electron.send.mockClear()
+    vi.clearAllMocks()
+  })
+
+  it('keeps the paperclip picker attached to its own chat', async () => {
+    intake.pick.mockResolvedValue(['/picked/image.png'])
+    const view = render(
+      <>
+        <ComposerProbe pane="chat-a" />
+        <ComposerProbe pane="chat-b" hidden />
+      </>
+    )
+    await act(async () => screen.getByText('Attach to chat-a').click())
+    await settleAttachments()
+    expect(intake.pick).toHaveBeenCalledOnce()
+    expect(intake.stat).toHaveBeenCalledExactlyOnceWith({
+      filePath: '/picked/image.png',
+      access: { kind: 'user-file' }
+    })
+    expect(readNativeChatAttachmentCache('chat-a').map(({ path }) => path)).toEqual([
+      '/picked/image.png'
+    ])
+    expect(readNativeChatAttachmentCache('chat-b')).toEqual([])
+    expect(view.container.querySelector('[data-notice="chat-a"]')?.textContent).toBe('')
+  })
+  it('keeps a cancelled paperclip picker quiet', async () => {
+    intake.pick.mockResolvedValue([])
+    render(<ComposerProbe pane="chat-a" />)
+    await act(async () => screen.getByText('Attach to chat-a').click())
+    expect(intake.stat).not.toHaveBeenCalled()
+    expect(readNativeChatAttachmentCache('chat-a')).toEqual([])
+    expect(toast.error).not.toHaveBeenCalled()
+  })
+  it('captures the host before preparation and refuses a changed host before upload', async () => {
+    const gate = Promise.withResolvers<{ paths: string[]; failures: never[] }>()
+    intake.prepare.mockImplementationOnce(() => gate.promise)
+    const view = render(<ComposerProbe pane="chat-a" />)
+    await dropTwoImages(view.container.querySelector('.ProseMirror')!)
+    intake.owner = { kind: 'ssh', connectionId: 'other-host' }
+    await act(async () => gate.resolve({ paths: ['/prepared/a.png'], failures: [] }))
+    expect(intake.stat).not.toHaveBeenCalled()
+    expect(intake.upload).not.toHaveBeenCalled()
+    expect(readNativeChatAttachmentCache('chat-a')).toEqual([])
+  })
+  it('refuses preparation captured for a draft that changed in the same pane', async () => {
+    const gate = Promise.withResolvers<{ paths: string[]; failures: never[] }>()
+    intake.prepare.mockImplementationOnce(() => gate.promise)
+    const view = render(<ComposerProbe pane="chat-a" draft="session-a" />)
+    await dropTwoImages(view.container.querySelector('.ProseMirror')!)
+    view.rerender(<ComposerProbe pane="chat-a" draft="session-b" />)
+    await act(async () => gate.resolve({ paths: ['/prepared/a.png'], failures: [] }))
+    expect(readNativeChatAttachmentCache('session-a')).toEqual([])
+    expect(readNativeChatAttachmentCache('session-b')).toEqual([])
+    expect(intake.stat).not.toHaveBeenCalled()
   })
 
   // #15782: an OS drop that produces nothing must say so. Every assertion here
@@ -184,12 +258,11 @@ describe('native chat composer drop scoping', () => {
 
     await dropTwoImages(view.container.querySelector('[data-pane="chat-a"] .ProseMirror')!)
 
-    expect(electron.send).toHaveBeenCalledExactlyOnceWith('terminal:file-dropped-from-preload', {
-      byteLength: 0,
-      pathCount: 2,
-      reason: 'unresolved-paths',
-      target: 'rejected'
-    })
+    expect(toast.error).toHaveBeenCalledWith(
+      "Orca couldn't read a path for the dropped files.",
+      expect.any(Object)
+    )
+    expect(electron.send).not.toHaveBeenCalled()
     expect(readNativeChatAttachmentCache('chat-a')).toEqual([])
   })
 
@@ -234,11 +307,8 @@ describe('native chat composer drop scoping', () => {
     const target = view.container.querySelector('[data-pane="chat-a"] .ProseMirror')!
     await dropTwoImages(target)
 
-    expect(electron.send).toHaveBeenCalledExactlyOnceWith('terminal:file-dropped-from-preload', {
-      target: 'composer',
-      scopeKey: 'chat-a',
-      paths: ['/repro/first.png', '/repro/second.png']
-    })
+    expect(electron.send).not.toHaveBeenCalled()
+    expect(view.container.querySelector('[data-composer-scope-key]')).toBeNull()
     expect(readNativeChatAttachmentCache('chat-a').map(({ path }) => path)).toEqual([
       '/repro/first.png',
       '/repro/second.png'
@@ -262,11 +332,8 @@ describe('native chat composer drop scoping', () => {
     await dropTwoImages(view.container.querySelector('[data-pane="chat-a"] .ProseMirror')!)
     await settleAttachments()
 
-    expect(electron.send).toHaveBeenCalledExactlyOnceWith('terminal:file-dropped-from-preload', {
-      target: 'composer',
-      scopeKey: 'chat-a',
-      paths: ['/repro/first.png', '/repro/second.png']
-    })
+    expect(electron.send).not.toHaveBeenCalled()
+    expect(view.container.querySelector('[data-composer-scope-key]')).toBeNull()
     expect(readNativeChatAttachmentCache('agent-session:s1').map(({ path }) => path)).toEqual([
       '/repro/first.png',
       '/repro/second.png'
@@ -281,19 +348,16 @@ describe('native chat composer drop scoping', () => {
     ])
   })
 
-  it('keeps a drop into an unscoped composer out of every chat pane', async () => {
+  it('keeps a drop into an unowned composer out of every chat pane', async () => {
     const view = render(
       <>
         <ComposerProbe pane="chat-a" />
         <ComposerProbe pane="chat-b" hidden />
-        <div data-native-file-drop-target="composer" data-unscoped-composer="true" />
+        <div data-unscoped-composer="true" />
       </>
     )
     await dropTwoImages(view.container.querySelector('[data-unscoped-composer="true"]')!)
-    expect(electron.send).toHaveBeenCalledExactlyOnceWith('terminal:file-dropped-from-preload', {
-      target: 'composer',
-      paths: ['/repro/first.png', '/repro/second.png']
-    })
+    expect(electron.send).not.toHaveBeenCalled()
     expect(readNativeChatAttachmentCache('chat-a')).toEqual([])
     expect(readNativeChatAttachmentCache('chat-b')).toEqual([])
   })
@@ -343,11 +407,7 @@ describe('native chat composer drop scoping', () => {
         <ComposerProbe pane="chat-b" hidden />
       </>
     )
-    await dropTwoImages(
-      view.container.querySelector(
-        '[data-pane="chat-a"] [data-native-file-drop-target="composer"]'
-      )!
-    )
+    await dropTwoImages(view.container.querySelector('[data-pane="chat-a"] .ProseMirror')!)
     expect(await screen.findByRole('img', { name: 'first.png' })).toBeTruthy()
     expect(await screen.findByRole('img', { name: 'second.png' })).toBeTruthy()
     expect(intake.stat.mock.calls).toEqual([
@@ -385,36 +445,16 @@ describe('native chat composer drop scoping', () => {
     expect(readNativeChatAttachmentCache('chat-b')).toEqual([])
   })
 
-  // Mirrors the terminal target, whose leaf id sits inside its drop-target marker.
-  it('reads a scope key published inside the drop-target marker', async () => {
-    const view = render(
-      <div data-native-file-drop-target="composer">
-        <div data-composer-scope-key="chat-a">
-          <span data-inner-drop-point="true" />
-        </div>
-      </div>
-    )
-    await dropTwoImages(view.container.querySelector('[data-inner-drop-point="true"]')!)
-    expect(electron.send).toHaveBeenCalledExactlyOnceWith('terminal:file-dropped-from-preload', {
-      target: 'composer',
-      scopeKey: 'chat-a',
-      paths: ['/repro/first.png', '/repro/second.png']
-    })
-  })
-
-  it('control: an editor-targeted drop does not attach images to either chat', async () => {
+  it('control: an unowned control drop does not attach images to either chat', async () => {
     const view = render(
       <>
         <ComposerProbe pane="chat-a" />
         <ComposerProbe pane="chat-b" hidden />
-        <div data-native-file-drop-target="editor" />
+        <div data-testid="unowned-editor" />
       </>
     )
-    await dropTwoImages(view.container.querySelector('[data-native-file-drop-target="editor"]')!)
-    expect(electron.send).toHaveBeenCalledExactlyOnceWith('terminal:file-dropped-from-preload', {
-      target: 'editor',
-      paths: ['/repro/first.png', '/repro/second.png']
-    })
+    await dropTwoImages(view.container.querySelector('[data-testid="unowned-editor"]')!)
+    expect(electron.send).not.toHaveBeenCalled()
     expect(readNativeChatAttachmentCache('chat-a')).toEqual([])
     expect(readNativeChatAttachmentCache('chat-b')).toEqual([])
   })
diff --git a/src/renderer/src/components/native-chat/native-chat-composer-field-resume.test.tsx b/src/renderer/src/components/native-chat/native-chat-composer-field-resume.test.tsx
index 1f878175754d..d0889a1a542c 100644
--- a/src/renderer/src/components/native-chat/native-chat-composer-field-resume.test.tsx
+++ b/src/renderer/src/components/native-chat/native-chat-composer-field-resume.test.tsx
@@ -71,7 +71,6 @@ function TestField({
   const textareaRef = useRef<HTMLTextAreaElement>(null)
   return (
     <NativeChatComposerField
-      dropScopeKey="pane-test"
       draftScopeKey="pane-test"
       textareaRef={textareaRef}
       draft={draft}
diff --git a/src/renderer/src/components/native-chat/native-chat-composer-ime-file-drop.test.tsx b/src/renderer/src/components/native-chat/native-chat-composer-ime-file-drop.test.tsx
new file mode 100644
index 000000000000..3687e99afb93
--- /dev/null
+++ b/src/renderer/src/components/native-chat/native-chat-composer-ime-file-drop.test.tsx
@@ -0,0 +1,261 @@
+// @vitest-environment happy-dom
+
+import { act, cleanup, fireEvent, render, screen } from '@testing-library/react'
+import { useRef, useState } from 'react'
+import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest'
+import type { ExecutionHostId } from '../../../../shared/execution-host'
+import type * as AttachmentUploadModule from './native-chat-attachment-upload'
+import type { NativeChatComposerInput } from './native-chat-composer-input'
+import { NativeChatComposerField } from './NativeChatComposerField'
+import { useNativeChatComposerAttachments } from './use-native-chat-composer-attachments'
+import { useNativeChatComposerNotice } from './use-native-chat-composer-notice'
+import { useNativeChatFileDrops } from './use-native-chat-file-drops'
+import { NativeChatPaneFileDropSurface } from './NativeChatPaneFileDropSurface'
+import { useNativeChatDraft } from './use-native-chat-draft'
+import { clearNativeChatDraftCacheForTests } from './native-chat-draft-cache'
+import { changePrompt, promptValue } from './native-chat-prompt-editor.test-support'
+import { useImeEnterGestureOwnership } from '@/lib/ime-composition-keyboard-event'
+
+const testState: {
+  executionHostId: ExecutionHostId
+  ownerConnectionId: string
+  ownerKind: 'local' | 'not-ready' | 'runtime' | 'ssh'
+  ownerSshGeneration: number
+  ownerWorktreePath: string
+  targetIsRemoteRuntime: boolean
+  store: { tabsByWorktree: Record<string, { id: string }[]> }
+} = vi.hoisted(() => ({
+  executionHostId: 'local',
+  ownerConnectionId: 'ssh-1',
+  ownerKind: 'local',
+  ownerSshGeneration: 4,
+  ownerWorktreePath: '/remote/repo',
+  targetIsRemoteRuntime: false,
+  store: {
+    tabsByWorktree: {
+      'worktree-1': [{ id: 'terminal-tab-1' }]
+    }
+  }
+}))
+
+vi.mock('@/store', () => {
+  const useAppStore = (selector: (state: typeof testState.store) => unknown) =>
+    selector(testState.store)
+  useAppStore.getState = () => testState.store
+  return { useAppStore }
+})
+vi.mock('@/lib/worktree-runtime-owner', () => ({
+  getExecutionHostIdForWorktree: () => testState.executionHostId
+}))
+// Real notice strings, so a copy of the wording here cannot outlive the string
+// users actually read, and a newly added export cannot go missing from the mock.
+vi.mock('./native-chat-attachment-upload', async (importOriginal) => ({
+  ...(await importOriginal<typeof AttachmentUploadModule>()),
+  resolveNativeChatAttachmentHost: () => testState.executionHostId,
+  resolveNativeChatAttachmentOwnerForWorktree: () =>
+    testState.ownerKind === 'ssh'
+      ? {
+          kind: 'ssh',
+          connectionId: testState.ownerConnectionId,
+          worktreePath: testState.ownerWorktreePath,
+          expectedExecutionHostId: `ssh:${testState.ownerConnectionId}`,
+          expectedSshTargetId: testState.ownerConnectionId,
+          expectedSshConnectionGeneration: testState.ownerSshGeneration
+        }
+      : { kind: testState.ownerKind }
+}))
+vi.mock('@/i18n/i18n', () => ({
+  translate: (_key: string, fallback: string) => fallback
+}))
+vi.mock('@/runtime/runtime-terminal-inspection', () => ({
+  isRemoteRuntimePtyId: () => testState.targetIsRemoteRuntime
+}))
+vi.mock('./NativeChatComposerActions', () => ({
+  NativeChatComposerActions: () => <div data-testid="composer-actions" />
+}))
+vi.mock('./NativeChatAutocompleteMenus', () => ({
+  NativeChatMentionMenu: () => null,
+  NativeChatPickerMenu: () => null
+}))
+vi.mock('./NativeChatImageAttachmentPreview', () => ({
+  NativeChatImageAttachmentPreview: ({
+    attachment
+  }: {
+    attachment: { connectionId?: string; path: string }
+  }) => (
+    <output data-image-attachment data-connection-id={attachment.connectionId}>
+      {attachment.path}
+    </output>
+  )
+}))
+
+type ProbeProps = {
+  disabled?: boolean
+  initialDraft?: string
+  structured?: boolean
+  /** Overrides only the structured target, leaving the pane's scope key alone. */
+  structuredWorkspaceId?: string
+  workspaceId?: string
+}
+
+const bubbledDrop = vi.fn()
+
+function ComposerProbe({
+  disabled = false,
+  initialDraft = '',
+  structured = true,
+  structuredWorkspaceId,
+  workspaceId = 'worktree-1'
+}: ProbeProps): React.JSX.Element {
+  const [caret, setCaret] = useState(initialDraft.length)
+  const { notices, setNotice } = useNativeChatComposerNotice()
+  const inputRef = useRef<NativeChatComposerInput>(null)
+  const imeEnterGesture = useImeEnterGestureOwnership()
+  const { draft, setDraft, flushDraftAppends } = useNativeChatDraft(
+    `pane:${workspaceId}`,
+    imeEnterGesture.isComposing
+  )
+  const attachments = useNativeChatComposerAttachments({
+    attachmentScopeKey: `pane:${workspaceId}`,
+    allowWithoutTarget: structured,
+    caret,
+    disabled,
+    isComposing: imeEnterGesture.isComposing,
+    resolveTarget: () =>
+      structured ? null : { ptyId: 'pty-1', settings: { activeRuntimeEnvironmentId: null } },
+    textareaRef: inputRef,
+    setCaret,
+    setDraft,
+    setNotice
+  })
+  useNativeChatFileDrops({
+    paneKey: `pane:${workspaceId}`,
+    draftScopeKey: `pane:${workspaceId}`,
+    targetPtyId: 'pty-1',
+    terminalTabId: 'terminal-tab-1',
+    structuredWorktreeId: structured ? (structuredWorkspaceId ?? workspaceId) : undefined,
+    disabled,
+    attachResolvedPaths: attachments.attachResolvedPaths,
+    pendingChips: attachments.pendingChips,
+    setNotice
+  })
+
+  return (
+    <div onDrop={bubbledDrop}>
+      <div>
+        <NativeChatComposerField
+          draftScopeKey={`pane:${workspaceId}`}
+          textareaRef={inputRef}
+          draft={draft}
+          disabled={disabled}
+          hasPty
+          canSend={!disabled}
+          autocomplete={{ mode: 'none' }}
+          activeSuggestion={0}
+          notices={notices}
+          imageAttachments={attachments.imageAttachments}
+          sendButtonDisabled={false}
+          isWorking={false}
+          attachDisabled={disabled}
+          dictationDisabled
+          isDictating={false}
+          isDictationHoldMode={false}
+          imeEnterGesture={imeEnterGesture}
+          onDraftChange={(value, input) => {
+            setDraft(value)
+            setCaret(input.selectionStart ?? value.length)
+          }}
+          onTextareaSelect={(input) => setCaret(input.selectionStart ?? input.value.length)}
+          onKeyDown={() => {}}
+          onImeSettled={(input) => {
+            setDraft(input.value)
+            flushDraftAppends()
+            attachments.flushPendingAttachments()
+          }}
+          onPaste={() => {}}
+          pickerListboxId="picker"
+          onChoosePickerItem={() => {}}
+          onRetrySkills={() => {}}
+          onChooseMentionFile={() => {}}
+          mentionFiles={{ files: [], loading: false, failed: false }}
+          onRemoveImageAttachment={attachments.removeImageAttachment}
+          onAttach={() => {}}
+          onDictationToggle={() => {}}
+          onDictationHoldStart={() => {}}
+          onDictationHoldEnd={() => {}}
+          onSend={() => {}}
+          sessionOptionsSurface={null}
+          sessionOptionsSnapshot={[]}
+        />
+      </div>
+      <output data-testid="draft">{draft}</output>
+    </div>
+  )
+}
+
+const prepare = vi.fn(async ({ paths }: { paths: string[] }) => ({ paths, failures: [] }))
+beforeEach(() => {
+  vi.clearAllMocks()
+  clearNativeChatDraftCacheForTests()
+  vi.stubGlobal('api', {
+    fs: {
+      getPathForFile: (file: File) => `/drop/${file.name}`,
+      prepareDroppedPaths: prepare,
+      stat: vi.fn(async () => ({ isDirectory: false }))
+    }
+  })
+})
+afterEach(() => {
+  cleanup()
+  clearNativeChatDraftCacheForTests()
+  vi.unstubAllGlobals()
+})
+
+async function osDrop(target: HTMLElement) {
+  const event = new Event('drop', { bubbles: true, cancelable: true, composed: true })
+  Object.defineProperty(event, 'isTrusted', { value: true })
+  Object.defineProperty(event, 'dataTransfer', {
+    value: {
+      types: ['Files'],
+      files: [new File(['notes'], 'notes.txt')]
+    }
+  })
+  await act(async () => target.dispatchEvent(event))
+}
+
+describe('OS file drops through the real composing chat field', () => {
+  it.each(['commit', 'double commit', 'cancel', 'blur', 'blur then commit', 'restart'])(
+    'settles one drop exactly once on %s and never replays it in a later composition',
+    async (ending) => {
+      render(
+        <NativeChatPaneFileDropSurface className="chat">
+          <ComposerProbe />
+        </NativeChatPaneFileDropSurface>
+      )
+      const editor = screen.getByRole('textbox')
+      fireEvent.compositionStart(editor)
+      changePrompt(editor, 'ni')
+      await osDrop(editor)
+      expect(promptValue(editor)).toBe('ni')
+      if (ending === 'cancel') {
+        changePrompt(editor, '')
+      }
+      if (ending === 'blur' || ending === 'blur then commit') {
+        fireEvent.blur(editor)
+      }
+      if (ending === 'restart') {
+        fireEvent.compositionStart(editor)
+      } else if (ending !== 'blur') {
+        fireEvent.compositionEnd(editor, { data: ending === 'cancel' ? '' : 'ni' })
+      }
+      if (ending === 'double commit') {
+        fireEvent.compositionEnd(editor, { data: 'ni' })
+      }
+      expect(promptValue(editor).match(/@\/drop\/notes.txt/g)).toHaveLength(1)
+      expect(prepare).toHaveBeenCalledOnce()
+      fireEvent.compositionStart(editor)
+      fireEvent.compositionEnd(editor, { data: 'later' })
+      expect(promptValue(editor).match(/@\/drop\/notes.txt/g)).toHaveLength(1)
+    }
+  )
+})
diff --git a/src/renderer/src/components/native-chat/native-chat-composer-input.ts b/src/renderer/src/components/native-chat/native-chat-composer-input.ts
index 91d9be943d7d..f4483d7575b0 100644
--- a/src/renderer/src/components/native-chat/native-chat-composer-input.ts
+++ b/src/renderer/src/components/native-chat/native-chat-composer-input.ts
@@ -12,6 +12,9 @@ export type NativeChatComposerInput = Pick<
   contains?: (node: Node | null) => boolean
   insertText?: (text: string) => void
   insertSkill?: (from: number, to: number, token: string) => void
+  /** Whether a collapsed caret sits on the first (`start`) or last (`end`) visual line,
+   *  counting wrapped lines, so an arrow key there has nowhere left to move it. */
+  isCaretOnVisualEdge?: (edge: 'start' | 'end') => boolean
 }
 
 export function insertNativeChatPastedText(
diff --git a/src/renderer/src/components/native-chat/native-chat-composer-notice.ts b/src/renderer/src/components/native-chat/native-chat-composer-notice.ts
index 4d694003cda2..b8ea7051b1ee 100644
--- a/src/renderer/src/components/native-chat/native-chat-composer-notice.ts
+++ b/src/renderer/src/components/native-chat/native-chat-composer-notice.ts
@@ -13,11 +13,9 @@ export type NativeChatComposerNoticeContent = {
 
 export type NativeChatComposerNotice = NativeChatComposerNoticeContent & {
   key: string
-  /** `attachment` is the composer's own paste and attachment notice. */
-  kind: 'error' | 'attachment'
-  action?: { label: string; onClick: () => void }
+  action?: { label: string; onClick: () => void; disabled?: boolean }
   onDismiss?: () => void
-}
+} & ({ kind: 'error' | 'attachment' } | { kind: 'host'; tone: 'warning' | 'muted' })
 
 /** `headline` in Orca's words, with the error as written beside it. `localErrorIsOrcaWords`: an
  *  error raised in this window (not wrapped by main-process IPC) is already Orca's sentence. */
diff --git a/src/renderer/src/components/native-chat/native-chat-composer-prompt-recall.test.tsx b/src/renderer/src/components/native-chat/native-chat-composer-prompt-recall.test.tsx
new file mode 100644
index 000000000000..33a6d6a60950
--- /dev/null
+++ b/src/renderer/src/components/native-chat/native-chat-composer-prompt-recall.test.tsx
@@ -0,0 +1,150 @@
+import { changePrompt, promptValue } from './native-chat-prompt-editor.test-support'
+// @vitest-environment happy-dom
+
+import { cleanup, fireEvent, render, screen } from '@testing-library/react'
+import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest'
+import type { NativeChatMessage } from '../../../../shared/native-chat-types'
+import type * as nativeChatAgentProfiles from '../../../../shared/native-chat-agent-profiles'
+
+vi.mock('@/i18n/i18n', () => ({
+  translate: (_key: string, fallback: string) => fallback
+}))
+vi.mock('./NativeChatComposerActions', () => ({
+  NativeChatComposerActions: () => <div data-testid="composer-actions" />
+}))
+vi.mock('./NativeChatAutocompleteMenus', () => ({
+  NativeChatMentionHint: () => null,
+  NativeChatPickerMenu: () => null
+}))
+vi.mock('../../store', () => {
+  const state = {
+    dictationState: 'idle',
+    settings: { voice: { enabled: false }, nativeChatSessionOptions: {} },
+    agentStatusByPaneKey: {},
+    updateSettings: vi.fn(),
+    clearNativeChatLaunchDraft: vi.fn(),
+    markNativeChatLaunchDraftAdopted: vi.fn()
+  }
+  const useAppStore = (selector: (value: typeof state) => unknown): unknown => selector(state)
+  useAppStore.getState = () => state
+  return { useAppStore }
+})
+vi.mock('@/runtime/runtime-terminal-inspection', () => ({
+  isRemoteRuntimePtyId: () => false,
+  sendRuntimePtyInput: vi.fn()
+}))
+vi.mock('@/lib/agent-paste-draft', () => ({
+  getSettingsForAgentTabRuntimeOwner: () => ({})
+}))
+vi.mock('./native-chat-runtime-send', () => ({
+  sendNativeChatMessage: vi.fn(),
+  sendNativeChatTypedCommand: vi.fn(),
+  sendNativeChatMessageVerified: vi.fn(),
+  typeNativeChatCommand: vi.fn(),
+  submitNativeChatPrompt: vi.fn()
+}))
+vi.mock('./native-chat-runtime-image-send', () => ({
+  sendNativeChatMessageWithImageAttachments: vi.fn()
+}))
+vi.mock('./claude-model-switch-confirmation', () => ({
+  createClaudeModelSwitchConfirmationObserver: vi.fn()
+}))
+vi.mock('../../../../shared/native-chat-agent-profiles', async (importOriginal) => ({
+  ...(await importOriginal<typeof nativeChatAgentProfiles>()),
+  getVerifiedNativeChatCommands: () => []
+}))
+vi.mock('@/lib/native-chat-telemetry', () => ({
+  emitNativeChatMessageSent: vi.fn(),
+  emitNativeChatPickerItemAccepted: vi.fn(),
+  emitNativeChatPickerOpened: vi.fn(),
+  emitNativeChatSendClassified: vi.fn()
+}))
+vi.mock('./use-native-chat-skills', () => ({
+  useNativeChatSkills: () => ({ status: 'ready', skills: [], error: null, retry: () => {} })
+}))
+vi.mock('../dictation/dictation-control-events', () => ({
+  dispatchDictationControl: vi.fn()
+}))
+
+import { NativeChatComposer } from './NativeChatComposer'
+
+const sent = (id: string, text: string): NativeChatMessage => ({
+  id,
+  role: 'user',
+  blocks: [{ type: 'text', text }],
+  timestamp: null,
+  source: 'transcript'
+})
+
+let paneCounter = 0
+
+/** The real composer, editor and draft store over a chat that already holds `prompts`. */
+function renderComposer(prompts: string[]): HTMLElement {
+  paneCounter += 1
+  render(
+    <NativeChatComposer
+      terminalTabId={`tab-${paneCounter}`}
+      paneKey={`tab-${paneCounter}:recall`}
+      targetPtyId={null}
+      agent="codex"
+      structuredTransport={{
+        send: vi.fn(() => true),
+        dispatchCommand: vi.fn(async () => ({ handled: false, accepted: false, error: null })),
+        optionsSurface: {
+          getSnapshot: () => [],
+          setOption: vi.fn(),
+          invokeAction: vi.fn(),
+          subscribe: () => () => {}
+        },
+        optionSnapshot: [],
+        onError: vi.fn(),
+        runtime: 'local',
+        sessionId: `session-${paneCounter}`,
+        runtimeEnvironmentId: null
+      }}
+      recallSource={{ messages: prompts.map((text, index) => sent(`sent-${index}`, text)) }}
+    />
+  )
+  return screen.getByRole('textbox')
+}
+
+function press(input: HTMLElement, key: 'ArrowUp' | 'ArrowDown'): string {
+  fireEvent.keyDown(input, { key })
+  return promptValue(input)
+}
+
+beforeEach(() => {
+  Object.defineProperty(window, 'api', {
+    configurable: true,
+    value: {
+      git: { discoverCommitMessageModels: vi.fn().mockResolvedValue({ success: false }) },
+      pty: { getMainBufferSnapshot: vi.fn().mockResolvedValue(null) }
+    }
+  })
+})
+
+afterEach(() => cleanup())
+
+describe('composer prompt recall', () => {
+  it('walks prompts sent before this composer existed, and back to an empty draft', () => {
+    const input = renderComposer(['one', 'two'])
+    expect(press(input, 'ArrowUp')).toBe('two')
+    expect(press(input, 'ArrowUp')).toBe('one')
+    expect(press(input, 'ArrowDown')).toBe('two')
+    expect(press(input, 'ArrowDown')).toBe('')
+  })
+
+  // `/model` opens the command picker when typed; recalled, it must not take the arrows.
+  it('keeps walking past a recalled command instead of handing the arrows to its picker', () => {
+    const input = renderComposer(['one', '/model'])
+    expect(press(input, 'ArrowUp')).toBe('/model')
+    expect(press(input, 'ArrowUp')).toBe('one')
+  })
+
+  it('leaves the arrows alone once a recalled prompt is edited', () => {
+    const input = renderComposer(['one', 'two'])
+    press(input, 'ArrowUp')
+    changePrompt(input, 'two, edited')
+    expect(press(input, 'ArrowUp')).toBe('two, edited')
+  })
+})
diff --git a/src/renderer/src/components/native-chat/native-chat-composer-reveal-focus.test.tsx b/src/renderer/src/components/native-chat/native-chat-composer-reveal-focus.test.tsx
index c52bf701ab0a..466082fe0c76 100644
--- a/src/renderer/src/components/native-chat/native-chat-composer-reveal-focus.test.tsx
+++ b/src/renderer/src/components/native-chat/native-chat-composer-reveal-focus.test.tsx
@@ -51,6 +51,8 @@ function Harness(props: HarnessProps): React.JSX.Element {
       return true
     },
     insertTypedText: () => true,
+    appendText: () => {},
+    acceptsText: () => true,
     handlePasteEvent: () => {},
     pasteFromClipboard: () => {},
     contains: () => false
diff --git a/src/renderer/src/components/native-chat/native-chat-composer-state.test.ts b/src/renderer/src/components/native-chat/native-chat-composer-state.test.ts
index 57d7b876b9ae..524ffe12256d 100644
--- a/src/renderer/src/components/native-chat/native-chat-composer-state.test.ts
+++ b/src/renderer/src/components/native-chat/native-chat-composer-state.test.ts
@@ -7,13 +7,9 @@ import {
   classifyNativeChatSend,
   deriveComposerAutocomplete,
   editReplacesTriggerToken,
-  EMPTY_HISTORY,
   filterSlashCommands,
   isSkillPickerTriggered,
   isSlashCommandDraft,
-  pushHistory,
-  recallNext,
-  recallPrevious,
   slashCommandDispatchText,
   type SlashCommandSuggestion
 } from './native-chat-composer-state'
@@ -145,50 +141,6 @@ describe('isSlashCommandDraft', () => {
   })
 })
 
-describe('history recall', () => {
-  it('up-arrow on empty composer recalls the last sent input', () => {
-    const history = pushHistory(EMPTY_HISTORY, 'first')
-    const recall = recallPrevious(history)
-    expect(recall.draft).toBe('first')
-    expect(recall.history.index).toBe(0)
-  })
-
-  it('walks backward and clamps at the oldest entry', () => {
-    let history = pushHistory(EMPTY_HISTORY, 'a')
-    history = pushHistory(history, 'b')
-    const first = recallPrevious(history)
-    expect(first.draft).toBe('b')
-    const second = recallPrevious(first.history)
-    expect(second.draft).toBe('a')
-    const third = recallPrevious(second.history)
-    expect(third.draft).toBe('a') // clamped
-  })
-
-  it('down-arrow walks forward and returns to a live empty draft', () => {
-    let history = pushHistory(EMPTY_HISTORY, 'a')
-    history = pushHistory(history, 'b')
-    const up1 = recallPrevious(history) // 'b'
-    const up2 = recallPrevious(up1.history) // 'a'
-    const down = recallNext(up2.history) // 'b'
-    expect(down.draft).toBe('b')
-    const back = recallNext(down.history) // live
-    expect(back.draft).toBe('')
-    expect(back.history.index).toBeNull()
-  })
-
-  it('does not record blank sends or immediate duplicates', () => {
-    let history = pushHistory(EMPTY_HISTORY, '   ')
-    expect(history.entries).toHaveLength(0)
-    history = pushHistory(history, 'x')
-    history = pushHistory(history, 'x')
-    expect(history.entries).toHaveLength(1)
-  })
-
-  it('recall on empty history is a no-op', () => {
-    expect(recallPrevious(EMPTY_HISTORY).draft).toBeNull()
-  })
-})
-
 describe('apply suggestions', () => {
   it('applySlashSuggestion replaces the token with a trailing space', () => {
     expect(applySlashSuggestion({ name: 'clear' })).toBe('/clear ')
diff --git a/src/renderer/src/components/native-chat/native-chat-composer-state.ts b/src/renderer/src/components/native-chat/native-chat-composer-state.ts
index 59fbcf45d099..abee40a1f010 100644
--- a/src/renderer/src/components/native-chat/native-chat-composer-state.ts
+++ b/src/renderer/src/components/native-chat/native-chat-composer-state.ts
@@ -203,34 +203,3 @@ export function applyMentionSuggestion(
   const nextBefore = `${before.slice(0, tokenStart)}${formatNativeChatFileReference(path)} `
   return { draft: nextBefore + after.replace(/^ /, ''), caret: nextBefore.length }
 }
-
-export type HistoryState = { entries: readonly string[]; index: number | null }
-export const EMPTY_HISTORY: HistoryState = { entries: [], index: null }
-
-export function pushHistory(history: HistoryState, sent: string): HistoryState {
-  if (sent.trim() === '' || history.entries.at(-1) === sent) {
-    return { entries: history.entries, index: null }
-  }
-  return { entries: [...history.entries, sent], index: null }
-}
-
-export type HistoryRecall = { history: HistoryState; draft: string | null }
-
-export function recallPrevious(history: HistoryState): HistoryRecall {
-  if (history.entries.length === 0) {
-    return { history, draft: null }
-  }
-  const index = history.index === null ? history.entries.length - 1 : Math.max(0, history.index - 1)
-  return { history: { entries: history.entries, index }, draft: history.entries[index] }
-}
-
-export function recallNext(history: HistoryState): HistoryRecall {
-  if (history.index === null) {
-    return { history, draft: null }
-  }
-  const index = history.index + 1
-  if (index >= history.entries.length) {
-    return { history: { entries: history.entries, index: null }, draft: '' }
-  }
-  return { history: { entries: history.entries, index }, draft: history.entries[index] }
-}
diff --git a/src/renderer/src/components/native-chat/native-chat-composer-target.ts b/src/renderer/src/components/native-chat/native-chat-composer-target.ts
index 08d31a4b11a6..efa532c88a14 100644
--- a/src/renderer/src/components/native-chat/native-chat-composer-target.ts
+++ b/src/renderer/src/components/native-chat/native-chat-composer-target.ts
@@ -52,4 +52,11 @@ export function nativeChatComposerTargetIsRemote(ptyId: string | null): boolean
   return ptyId !== null && isRemoteRuntimePtyId(ptyId)
 }
 
+export function nativeChatLocalAttachmentUnsupportedNotice(): string {
+  return translate(
+    'components.native-chat.composer.localAttachmentUnsupported',
+    'Local attachments are not available for remote sessions.'
+  )
+}
+
 export { formatNativeChatFileReference } from '../../../../shared/agent-image-paste'
diff --git a/src/renderer/src/components/native-chat/native-chat-composer-types.ts b/src/renderer/src/components/native-chat/native-chat-composer-types.ts
index 03bdc73a7109..1841e6915105 100644
--- a/src/renderer/src/components/native-chat/native-chat-composer-types.ts
+++ b/src/renderer/src/components/native-chat/native-chat-composer-types.ts
@@ -13,6 +13,7 @@ import type { NativeChatLaunchDraft } from '@/lib/native-chat-launch-prompt'
 import type { NativeChatComposerImageAttachment } from './NativeChatComposerField'
 import type { NativeChatAfterStopSend } from './native-chat-composer-target'
 import type { NativeChatLocalCommandAnswer } from './use-native-chat-local-command-answer'
+import type { NativeChatRecallSource } from './native-chat-sent-prompt-history'
 
 export type NativeChatOptionPickerRequest = {
   id: string
@@ -33,6 +34,8 @@ export type NativeChatStructuredComposerTransport = {
     text: string,
     attachments: readonly NativeChatComposerImageAttachment[]
   ) => boolean | 'queued'
+  /** A send is out: Send stays disabled, and a send returns false, until it settles. */
+  sendOut?: boolean
   dispatchCommand: (text: string) => Promise<StructuredAgentSessionCommandOutcome>
   optionsSurface: SessionOptionsSurface
   optionSnapshot: SessionOptionDescriptor[]
@@ -120,6 +123,8 @@ export type NativeChatComposerProps = {
   steerQueued?: () => boolean
   /** The chat's own notices, shown in the composer's notice card above its input. */
   notices?: readonly NativeChatComposerNotice[]
+  /** The conversation Up/Down recalls prompts from. */
+  recallSource?: NativeChatRecallSource
 }
 
 /** Launch context prefilled into the TUI input as an unsent draft, plus the two
@@ -135,6 +140,11 @@ export type NativeChatLaunchSeed = {
 export type NativeChatComposerHandle = {
   focus: () => boolean
   insertTypedText: (text: string) => boolean
+  /** Whether the input is there and enabled, so text given to it lands. */
+  acceptsText: () => boolean
+  /** Adds text after the draft, a blank line apart, and leaves the caret at its end. Text the
+   *  draft already ends with is not added again. */
+  appendText: (text: string) => void
   /** Routes pane-level paste events back to the composer field. */
   handlePasteEvent: (event: {
     clipboardData: DataTransfer | null
diff --git a/src/renderer/src/components/native-chat/native-chat-composer-workspace-file-drop.test.tsx b/src/renderer/src/components/native-chat/native-chat-composer-workspace-file-drop.test.tsx
index 70eb93599874..ac039ffb7c16 100644
--- a/src/renderer/src/components/native-chat/native-chat-composer-workspace-file-drop.test.tsx
+++ b/src/renderer/src/components/native-chat/native-chat-composer-workspace-file-drop.test.tsx
@@ -52,6 +52,7 @@ vi.mock('@/lib/worktree-runtime-owner', () => ({
 // users actually read, and a newly added export cannot go missing from the mock.
 vi.mock('./native-chat-attachment-upload', async (importOriginal) => ({
   ...(await importOriginal<typeof AttachmentUploadModule>()),
+  resolveNativeChatAttachmentHost: () => testState.executionHostId,
   resolveNativeChatAttachmentOwnerForWorktree: () =>
     testState.ownerKind === 'ssh'
       ? {
@@ -151,7 +152,6 @@ function ComposerProbe({
     terminalTabId: 'terminal-tab-1',
     structuredWorktreeId: structured ? (structuredWorkspaceId ?? workspaceId) : undefined,
     disabled,
-    paneKey: `pane:${workspaceId}`,
     attachResolvedPaths: attachments.attachResolvedPaths,
     setNotice
   })
@@ -165,7 +165,6 @@ function ComposerProbe({
           on a bare wrapper so the drop logic is exercised on its own. */}
       <div {...workspaceFileDropHandlers}>
         <NativeChatComposerField
-          dropScopeKey={`pane:${workspaceId}`}
           draftScopeKey={`pane:${workspaceId}`}
           textareaRef={inputRef}
           draft={draft}
diff --git a/src/renderer/src/components/native-chat/native-chat-context-command.test.tsx b/src/renderer/src/components/native-chat/native-chat-context-command.test.tsx
index 3630860d0a77..0888be316d27 100644
--- a/src/renderer/src/components/native-chat/native-chat-context-command.test.tsx
+++ b/src/renderer/src/components/native-chat/native-chat-context-command.test.tsx
@@ -195,7 +195,6 @@ describe('host-answered /context in the composer', () => {
       answerCommandLocally,
       sessionOptionsSurface: liveSurface(DISCOVERED),
       trackPendingSend: vi.fn(),
-      setHistory: vi.fn(),
       setDraft: vi.fn(),
       setCaret: vi.fn(),
       clearSkillOrigin: vi.fn(),
@@ -256,6 +255,5 @@ describe('host-answered /context in the composer', () => {
     expect(args.onSlashCommand).toHaveBeenCalledWith('/context', 'Context: 450k / 1M tokens (45%)')
     expect(mocks.sendNativeChatMessage).not.toHaveBeenCalled()
     expect(args.clearImageAttachments).not.toHaveBeenCalled()
-    expect(args.setHistory).toHaveBeenCalled()
   })
 })
diff --git a/src/renderer/src/components/native-chat/native-chat-disclosure-store.ts b/src/renderer/src/components/native-chat/native-chat-disclosure-store.ts
index 956ae3b0ca1a..f4fae6c2b4b3 100644
--- a/src/renderer/src/components/native-chat/native-chat-disclosure-store.ts
+++ b/src/renderer/src/components/native-chat/native-chat-disclosure-store.ts
@@ -9,9 +9,15 @@
 
 import { createContext, useCallback, useContext, useMemo, useState } from 'react'
 
+/** Where the reader left an opened run's own scroll box. */
+export type NativeChatRunScroll = { top: number; followsEnd: boolean }
+
 export type NativeChatDisclosureStore = {
   read: (key: string) => boolean | undefined
   write: (key: string, open: boolean) => void
+  /** By the run's disclosure key, and forgotten when that disclosure closes. A plain map, not
+   *  state: scrolling a run must not re-render the transcript. */
+  runScroll: Map<string, NativeChatRunScroll>
 }
 
 export const NativeChatDisclosureContext = createContext<NativeChatDisclosureStore | null>(null)
@@ -22,23 +28,33 @@ export const MAX_NATIVE_CHAT_DISCLOSURES = 512
 
 export function useNativeChatDisclosures(): NativeChatDisclosureStore {
   const [open, setOpen] = useState<ReadonlyMap<string, boolean>>(() => new Map())
-  const write = useCallback((key: string, next: boolean) => {
-    setOpen((current) => {
-      if (current.get(key) === next) {
-        return current
+  const [runScroll] = useState(() => new Map<string, NativeChatRunScroll>())
+  const write = useCallback(
+    (key: string, next: boolean) => {
+      if (!next) {
+        runScroll.delete(key)
       }
-      const updated = new Map(current)
-      updated.set(key, next)
-      if (updated.size > MAX_NATIVE_CHAT_DISCLOSURES) {
-        const oldest = updated.keys().next().value
-        if (oldest !== undefined && oldest !== key) {
-          updated.delete(oldest)
+      setOpen((current) => {
+        if (current.get(key) === next) {
+          return current
         }
-      }
-      return updated
-    })
-  }, [])
-  return useMemo(() => ({ read: (key: string) => open.get(key), write }), [open, write])
+        const updated = new Map(current)
+        updated.set(key, next)
+        if (updated.size > MAX_NATIVE_CHAT_DISCLOSURES) {
+          const oldest = updated.keys().next().value
+          if (oldest !== undefined && oldest !== key) {
+            updated.delete(oldest)
+          }
+        }
+        return updated
+      })
+    },
+    [runScroll]
+  )
+  return useMemo(
+    () => ({ read: (key: string) => open.get(key), write, runScroll }),
+    [open, write, runScroll]
+  )
 }
 
 export type NativeChatDisclosure = {
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 5d24fc155cc6..8d086d5ac35f 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
@@ -12,6 +12,7 @@ import {
   readNativeChatComposerDraft,
   updateNativeChatComposerDraft
 } from './native-chat-composer-draft-store'
+import { clearNativeChatPendingAttachmentsForTests } from './native-chat-pending-attachment-cache'
 
 export function readNativeChatDraftCache(scopeKey: string): string {
   return readNativeChatComposerDraft(scopeKey).text
@@ -44,7 +45,7 @@ export function appendNativeChatDraftCache(scopeKey: string, text: string): bool
     return true
   }
   const previous = readNativeChatDraftCache(scopeKey)
-  // Durable now: the copy it came from (an outbox entry, a queued card) goes right after this.
+  // Durable now: the copy it came from (a send handed back, a queued card) goes right after this.
   const durable = appendToNativeChatComposerDraft(scopeKey, { text })
   appendListeners.get(scopeKey)?.forEach((listener) => listener(text, previous))
   return durable
@@ -119,4 +120,5 @@ export function appendNativeChatAttachmentCache(
 
 export function clearNativeChatAttachmentCacheForTests(): void {
   clearNativeChatComposerDraftsForTests()
+  clearNativeChatPendingAttachmentsForTests()
 }
diff --git a/src/renderer/src/components/native-chat/native-chat-edit-cards.ts b/src/renderer/src/components/native-chat/native-chat-edit-cards.ts
index f907dc89ce32..f92981100749 100644
--- a/src/renderer/src/components/native-chat/native-chat-edit-cards.ts
+++ b/src/renderer/src/components/native-chat/native-chat-edit-cards.ts
@@ -38,8 +38,6 @@ export type EditCardModel = {
   consumedResults: Set<NativeChatBlock>
 }
 
-export const NO_EDIT_CARDS: EditCardModel = { editCards: new Map(), consumedResults: new Set() }
-
 /** An edit renders as one card, so its result block is folded into the call. The
  *  model decides which calls have landed; a call that has not keeps the generic
  *  tool view, its result still visible as the provider's own error. */
diff --git a/src/renderer/src/components/native-chat/native-chat-element-file-drop.test.tsx b/src/renderer/src/components/native-chat/native-chat-element-file-drop.test.tsx
new file mode 100644
index 000000000000..d8079d8c2d57
--- /dev/null
+++ b/src/renderer/src/components/native-chat/native-chat-element-file-drop.test.tsx
@@ -0,0 +1,260 @@
+// @vitest-environment happy-dom
+import { act, cleanup, fireEvent, render } from '@testing-library/react'
+import { useRef, useState } from 'react'
+import { createPortal } from 'react-dom'
+import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest'
+import { toast } from 'sonner'
+import type { NativeChatComposerInput } from './native-chat-composer-input'
+import {
+  NativeChatPaneFileDropSurface,
+  useNativeChatPaneFileDropClaim
+} from './NativeChatPaneFileDropSurface'
+import { NativeChatPromptEditor } from './NativeChatPromptEditor'
+import { useNewWorkspaceComposerFileDrop } from '../new-workspace/use-new-workspace-composer-file-drop'
+
+const electron = vi.hoisted(() => ({
+  on: vi.fn(),
+  removeListener: vi.fn(),
+  send: vi.fn(),
+  getPathForFile: vi.fn((file: File) => `/drop/${file.name}`)
+}))
+vi.mock('electron', () => ({
+  ipcRenderer: electron,
+  webUtils: { getPathForFile: electron.getPathForFile }
+}))
+vi.mock('sonner', () => ({ toast: { error: vi.fn() } }))
+vi.mock('@/i18n/i18n', () => ({ translate: (_key: string, fallback: string) => fallback }))
+
+const prepare = vi.fn(async ({ paths }: { paths: string[] }) => ({ paths, failures: [] }))
+function Composer({
+  attach,
+  disabled = false
+}: {
+  attach: (paths: string[]) => void
+  disabled?: boolean
+}) {
+  const input = useRef<NativeChatComposerInput>(null)
+  useNativeChatPaneFileDropClaim({
+    destinationKey: 'draft',
+    disabled,
+    onDragOverCapture: () => {},
+    onDropCapture: () => {},
+    captureExternalDrop: () => async (paths) => attach(paths)
+  })
+  return (
+    <NativeChatPromptEditor
+      scopeKey="draft"
+      inputRef={input}
+      initialValue="Original"
+      disabled={disabled}
+      placeholder="Message"
+      onChange={() => {}}
+      onSelect={() => {}}
+    />
+  )
+}
+function Chat({
+  attach,
+  hidden = false,
+  disabled = false
+}: {
+  attach: (paths: string[]) => void
+  hidden?: boolean
+  disabled?: boolean
+}) {
+  return (
+    <div style={{ display: hidden ? 'none' : 'block' }}>
+      <NativeChatPaneFileDropSurface className="chat">
+        <Composer attach={attach} disabled={disabled} />
+      </NativeChatPaneFileDropSurface>
+    </div>
+  )
+}
+async function drop(target: Element, types = ['Files']) {
+  const event = new Event('drop', { bubbles: true, cancelable: true, composed: true })
+  Object.defineProperty(event, 'isTrusted', { value: true })
+  Object.defineProperty(event, 'dataTransfer', {
+    value: {
+      types,
+      files: [new File(['x'], 'a.png')],
+      getData: (type: string) => (type === 'text/html' ? '<b>Injected</b>' : '')
+    }
+  })
+  await act(async () => {
+    target.dispatchEvent(event)
+  })
+  return event
+}
+function dragEvent(target: Element, type: string, transfer: { dropEffect: string }): Event {
+  const event = new Event(type, { bubbles: true, cancelable: true, composed: true })
+  Object.defineProperty(event, 'isTrusted', { value: true })
+  Object.defineProperty(event, 'dataTransfer', { value: transfer })
+  target.dispatchEvent(event)
+  return event
+}
+function negotiateAndRelease(target: Element) {
+  const transfer = { types: ['Files'], files: [new File(['x'], 'a.png')], dropEffect: 'move' }
+  const hover = dragEvent(target, 'dragover', transfer)
+  const release = dragEvent(target, transfer.dropEffect === 'none' ? 'dragleave' : 'drop', transfer)
+  return { hover, release, transfer }
+}
+function AvailabilityComposer({ attach }: { attach: (paths: string[]) => void }) {
+  const [disabled, setDisabled] = useState(true)
+  return (
+    <>
+      <button onClick={() => setDisabled((value) => !value)}>Toggle availability</button>
+      <Composer attach={attach} disabled={disabled} />
+    </>
+  )
+}
+function WorkspaceWithoutPath({ attach }: { attach: () => Promise<void> }) {
+  const owner = useNewWorkspaceComposerFileDrop({
+    projectPath: null,
+    hostId: 'local',
+    connectionId: null,
+    applyDrop: attach
+  })
+  return <div ref={owner} className="workspace-card" />
+}
+beforeEach(() => {
+  vi.clearAllMocks()
+  vi.stubGlobal('api', {
+    fs: { getPathForFile: electron.getPathForFile, prepareDroppedPaths: prepare }
+  })
+})
+afterEach(() => {
+  cleanup()
+  vi.unstubAllGlobals()
+})
+
+describe('element-owned native chat drops', () => {
+  it('attaches to visible chat A while mounted chat B is hidden, without scope markers', async () => {
+    const a = vi.fn()
+    const b = vi.fn()
+    const view = render(
+      <>
+        <Chat attach={a} />
+        <Chat attach={b} hidden />
+      </>
+    )
+    const target = view.container.querySelector('.ProseMirror')!
+    await drop(target)
+    expect(a).toHaveBeenCalledExactlyOnceWith(['/drop/a.png'])
+    expect(b).not.toHaveBeenCalled()
+    expect(view.container.querySelector('[data-composer-scope-key]')).toBeNull()
+    expect(electron.send).not.toHaveBeenCalled()
+  })
+  it('shows the attachment overlay on dragover while the chat can accept files', async () => {
+    const attach = vi.fn()
+    const view = render(<Chat attach={attach} />)
+    const target = view.container.querySelector('.ProseMirror')!
+    const transfer = { types: ['Files'], dropEffect: 'move' }
+    await act(async () => dragEvent(target, 'dragover', transfer))
+    expect(transfer.dropEffect).toBe('copy')
+    expect(view.getByText('Drop to attach to this chat')).toBeTruthy()
+    await drop(target)
+    expect(view.queryByText('Drop to attach to this chat')).toBeNull()
+    expect(attach).toHaveBeenCalledExactlyOnceWith(['/drop/a.png'])
+  })
+  it('claims a portaled chat while refusing the unowned container around it', async () => {
+    const attach = vi.fn()
+    const terminal = document.createElement('div')
+    document.body.append(terminal)
+    const terminalDrop = vi.fn()
+    terminal.addEventListener('drop', terminalDrop)
+    try {
+      render(createPortal(<Chat attach={attach} />, terminal))
+      await drop(terminal.querySelector('.ProseMirror')!)
+      expect(attach).toHaveBeenCalledExactlyOnceWith(['/drop/a.png'])
+      expect(terminalDrop).not.toHaveBeenCalled()
+      expect(electron.send).not.toHaveBeenCalled()
+      await drop(terminal)
+      expect(electron.send).not.toHaveBeenCalled()
+      expect(attach).toHaveBeenCalledOnce()
+    } finally {
+      terminal.remove()
+    }
+  })
+  it.each([false, true])(
+    'refuses by cursor only through dragover and release when composer disabled is %s',
+    async (disabled) => {
+      const attach = vi.fn()
+      const view = render(
+        <div>
+          <NativeChatPaneFileDropSurface className="chat">
+            {disabled ? <Composer attach={attach} disabled /> : <span>Question</span>}
+          </NativeChatPaneFileDropSurface>
+        </div>
+      )
+      const target = view.container.querySelector('.chat')!
+      let gesture: ReturnType<typeof negotiateAndRelease> | undefined
+      await act(async () => {
+        gesture = negotiateAndRelease(target)
+      })
+      expect(gesture?.hover.defaultPrevented).toBe(true)
+      expect(gesture?.transfer.dropEffect).toBe('none')
+      expect(gesture?.release.type).toBe('dragleave')
+      // A late delivered drop must preserve the same silent refusal barrier.
+      await drop(target)
+      expect(toast.error).not.toHaveBeenCalled()
+      expect(attach).not.toHaveBeenCalled()
+      expect(prepare).not.toHaveBeenCalled()
+      expect(electron.send).not.toHaveBeenCalled()
+    }
+  )
+  it('keeps a workspace card without a path silent', async () => {
+    const attach = vi.fn(async () => {})
+    const view = render(
+      <div>
+        <WorkspaceWithoutPath attach={attach} />
+      </div>
+    )
+    const target = view.container.querySelector('.workspace-card')!
+    let gesture: ReturnType<typeof negotiateAndRelease> | undefined
+    await act(async () => {
+      gesture = negotiateAndRelease(target)
+    })
+    expect(gesture?.hover.defaultPrevented).toBe(true)
+    expect(gesture?.transfer.dropEffect).toBe('none')
+    expect(gesture?.release.type).toBe('dragleave')
+    await drop(target)
+    expect(attach).not.toHaveBeenCalled()
+    expect(prepare).not.toHaveBeenCalled()
+    expect(toast.error).not.toHaveBeenCalled()
+    expect(electron.send).not.toHaveBeenCalled()
+  })
+  it('reads child-only availability changes on the immediate dragover and drop', async () => {
+    const attach = vi.fn()
+    const view = render(
+      <NativeChatPaneFileDropSurface className="chat">
+        <AvailabilityComposer attach={attach} />
+      </NativeChatPaneFileDropSurface>
+    )
+    const target = view.container.querySelector('.ProseMirror')!
+    const refused = negotiateAndRelease(target)
+    expect(refused.transfer.dropEffect).toBe('none')
+    expect(prepare).not.toHaveBeenCalled()
+    fireEvent.click(view.getByText('Toggle availability'))
+    let accepted: ReturnType<typeof negotiateAndRelease> | undefined
+    await act(async () => {
+      accepted = negotiateAndRelease(target)
+    })
+    expect(accepted?.transfer.dropEffect).toBe('copy')
+    expect(accepted?.release.type).toBe('drop')
+    expect(attach).toHaveBeenCalledExactlyOnceWith(['/drop/a.png'])
+    fireEvent.click(view.getByText('Toggle availability'))
+    await drop(target)
+    expect(attach).toHaveBeenCalledOnce()
+    expect(prepare).toHaveBeenCalledOnce()
+    expect(electron.send).not.toHaveBeenCalled()
+  })
+  it('attaches hybrid Files and HTML without inserting HTML into the real editor', async () => {
+    const attach = vi.fn()
+    const view = render(<Chat attach={attach} />)
+    const editor = view.container.querySelector('.ProseMirror')!
+    await drop(editor, ['Files', 'text/html'])
+    expect(attach).toHaveBeenCalledExactlyOnceWith(['/drop/a.png'])
+    expect(editor.textContent).toBe('Original')
+    expect(editor.querySelector('b')).toBeNull()
+  })
+})
diff --git a/src/renderer/src/components/native-chat/native-chat-external-attachments-destination.test.tsx b/src/renderer/src/components/native-chat/native-chat-external-attachments-destination.test.tsx
index 2b0fe6351877..a1e675872ce9 100644
--- a/src/renderer/src/components/native-chat/native-chat-external-attachments-destination.test.tsx
+++ b/src/renderer/src/components/native-chat/native-chat-external-attachments-destination.test.tsx
@@ -68,6 +68,7 @@ function Probe({ worktreeId }: { worktreeId?: string }): React.JSX.Element {
     structuredWorktreeId: worktreeId,
     disabled: false,
     attachResolvedPaths: attachments.attachResolvedPaths,
+    pendingChips: attachments.pendingChips,
     setNotice
   })
   api = { ...attachments, ...external }
diff --git a/src/renderer/src/components/native-chat/native-chat-file-link.ts b/src/renderer/src/components/native-chat/native-chat-file-link.ts
index 043bb9b78c69..e1b4f8c6b0f1 100644
--- a/src/renderer/src/components/native-chat/native-chat-file-link.ts
+++ b/src/renderer/src/components/native-chat/native-chat-file-link.ts
@@ -71,11 +71,43 @@ export function findNativeChatTabOwnerWorktreeId(
   )
 }
 
+export function createNativeChatTabOwnerSelector(tabId: string) {
+  let terminalTabs: NativeChatFileLinkState['tabsByWorktree'] | null = null
+  let unifiedTabs: NativeChatFileLinkState['unifiedTabsByWorktree']
+  let owner: string | null = null
+  return (state: Pick<NativeChatFileLinkState, 'tabsByWorktree' | 'unifiedTabsByWorktree'>) => {
+    // Hidden chats still subscribe; ownership changes only with the immutable tab maps.
+    if (terminalTabs !== state.tabsByWorktree || unifiedTabs !== state.unifiedTabsByWorktree) {
+      owner = findNativeChatTabOwnerWorktreeId(state, tabId)
+      terminalTabs = state.tabsByWorktree
+      unifiedTabs = state.unifiedTabsByWorktree
+    }
+    return owner
+  }
+}
+
 export function resolveNativeChatFileLinkContext(
   state: NativeChatFileLinkState,
   terminalTabId: string
 ): NativeChatFileLinkContext | null {
-  const worktreeId = findNativeChatTabOwnerWorktreeId(state, terminalTabId)
+  return resolveNativeChatFileLinkContextForOwner(
+    state,
+    terminalTabId,
+    findNativeChatTabOwnerWorktreeId(state, terminalTabId)
+  )
+}
+
+export function createNativeChatFileLinkContextSelector(tabId: string) {
+  const selectOwner = createNativeChatTabOwnerSelector(tabId)
+  return (state: NativeChatFileLinkState) =>
+    resolveNativeChatFileLinkContextForOwner(state, tabId, selectOwner(state))
+}
+
+function resolveNativeChatFileLinkContextForOwner(
+  state: NativeChatFileLinkState,
+  terminalTabId: string,
+  worktreeId: string | null
+): NativeChatFileLinkContext | null {
   if (!worktreeId) {
     return null
   }
diff --git a/src/renderer/src/components/native-chat/native-chat-floating-file-drop.test.tsx b/src/renderer/src/components/native-chat/native-chat-floating-file-drop.test.tsx
new file mode 100644
index 000000000000..6914b12cb0db
--- /dev/null
+++ b/src/renderer/src/components/native-chat/native-chat-floating-file-drop.test.tsx
@@ -0,0 +1,127 @@
+// @vitest-environment happy-dom
+import { act, cleanup, fireEvent, render } from '@testing-library/react'
+import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest'
+import { FLOATING_TERMINAL_WORKTREE_ID } from '../../../../shared/constants'
+import type { TerminalTab } from '../../../../shared/terminal-tab-types'
+import { NativeChatPaneFileDropSurface } from './NativeChatPaneFileDropSurface'
+import { useNativeChatFileDrops } from './use-native-chat-file-drops'
+
+const state = vi.hoisted(() => {
+  const tabsByWorktree: Record<string, TerminalTab[]> = {}
+  return {
+    repos: [],
+    worktreesByRepo: {},
+    detectedWorktreesByRepo: {},
+    folderWorkspaces: [],
+    projectGroups: [],
+    sshConnectionStates: new Map(),
+    settings: { activeRuntimeEnvironmentId: 'other-remote-runtime' },
+    activeWorktreeId: 'other-workspace',
+    activeWorkspaceExecutionHostId: 'runtime:other-remote-runtime',
+    tabsByWorktree
+  }
+})
+vi.mock('@/store', () => ({ useAppStore: { getState: () => state } }))
+vi.mock('sonner', () => ({ toast: { error: vi.fn() } }))
+vi.mock('@/i18n/i18n', () => ({ translate: (_key: string, fallback: string) => fallback }))
+
+const stat = vi.fn(async () => ({ isDirectory: false }))
+const prepare = vi.fn(async ({ paths }: { paths: string[] }) => ({ paths, failures: [] }))
+const pick = vi.fn(async () => ['/picked/file.txt'])
+const upload = vi.fn()
+
+function Composer({ attach, notice }: { attach: () => void; notice: () => void }) {
+  const { pickAttachments } = useNativeChatFileDrops({
+    paneKey: 'floating-pane',
+    draftScopeKey: 'floating-draft',
+    terminalTabId: 'floating-tab',
+    targetPtyId: 'local-pty',
+    disabled: false,
+    attachResolvedPaths: attach,
+    pendingChips: {
+      begin: () => null,
+      resolve: () => {},
+      drop: () => false,
+      attachReferences: () => {}
+    },
+    setNotice: notice
+  })
+  return <button onClick={pickAttachments}>Attach file</button>
+}
+
+beforeEach(() => {
+  vi.clearAllMocks()
+  state.tabsByWorktree = {
+    [FLOATING_TERMINAL_WORKTREE_ID]: [
+      {
+        id: 'floating-tab',
+        ptyId: 'local-pty',
+        worktreeId: FLOATING_TERMINAL_WORKTREE_ID,
+        title: 'Floating',
+        customTitle: null,
+        color: null,
+        sortOrder: 0,
+        createdAt: 0
+      }
+    ]
+  }
+  vi.stubGlobal('api', {
+    fs: {
+      getPathForFile: (file: File) => `/drop/${file.name}`,
+      stat,
+      prepareDroppedPaths: prepare,
+      resolveDroppedPathsForAgent: upload
+    },
+    shell: { pickAttachments: pick }
+  })
+})
+afterEach(() => {
+  cleanup()
+  vi.unstubAllGlobals()
+})
+
+describe('floating chat attachments with a different remote runtime focused', () => {
+  it.each(['drop', 'paperclip'] as const)(
+    'attaches a local file through %s without catalog rows',
+    async (lane) => {
+      const attach = vi.fn()
+      const notice = vi.fn()
+      const view = render(
+        <NativeChatPaneFileDropSurface className="chat">
+          <Composer attach={attach} notice={notice} />
+        </NativeChatPaneFileDropSurface>
+      )
+      if (lane === 'paperclip') {
+        await act(async () => fireEvent.click(view.getByText('Attach file')))
+      } else {
+        const transfer = {
+          types: ['Files'],
+          files: [new File(['x'], 'file.txt')],
+          dropEffect: 'none'
+        }
+        await act(async () => {
+          for (const type of ['dragover', 'drop']) {
+            const event = new Event(type, { bubbles: true, cancelable: true, composed: true })
+            Object.defineProperty(event, 'isTrusted', { value: true })
+            Object.defineProperty(event, 'dataTransfer', { value: transfer })
+            view.getByText('Attach file').dispatchEvent(event)
+            if (type === 'dragover') {
+              expect(transfer.dropEffect).toBe('copy')
+            }
+          }
+        })
+      }
+      const path = lane === 'drop' ? '/drop/file.txt' : '/picked/file.txt'
+      expect(stat).toHaveBeenCalledExactlyOnceWith({
+        filePath: path,
+        access: { kind: 'user-file' }
+      })
+      expect(attach).toHaveBeenCalledExactlyOnceWith([path], undefined, {
+        destinationIsCurrent: expect.any(Function)
+      })
+      expect(attach.mock.calls[0][2].destinationIsCurrent()).toBe(true)
+      expect(upload).not.toHaveBeenCalled()
+      expect(notice).not.toHaveBeenCalled()
+    }
+  )
+})
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 a541c6019668..0ed652d3a805 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
@@ -6,8 +6,10 @@ import { buildNativeChatTranscriptSlots } from './native-chat-transcript-slots'
 import {
   buildNativeChatRailItems,
   mergeNativeChatRailOutline,
+  nativeChatRailReplyPreview,
+  nativeChatRailTickCapacity,
   selectNativeChatRailTicks,
-  NATIVE_CHAT_RAIL_MAX_TICKS,
+  NATIVE_CHAT_RAIL_ROOMY_TICKS,
   type NativeChatRailItem
 } from './native-chat-message-rail-items'
 
@@ -110,40 +112,118 @@ describe('rail items', () => {
   })
 })
 
+describe('rail reply preview', () => {
+  const outline = [
+    { id: 'old-1', text: 'first', hasImages: false, reply: 'Host reply 1' },
+    { id: 'old-2', text: 'second', hasImages: false, reply: 'Host reply 2, cut off early' }
+  ]
+  const rowsOf = (messages: NativeChatMessage[], turnKeys: (string | undefined)[]) => ({
+    messages,
+    turnKeys
+  })
+
+  it("reads a loaded message its turn's reply, past a steer into the same turn", () => {
+    const rows = rowsOf(
+      [
+        text('u1', 'ask', 'user'),
+        text('a1', 'Looking.'),
+        text('s1', 'also', 'user'),
+        text('a2', 'Done.')
+      ],
+      ['u1', 'u1', 'u1', 'u1']
+    )
+    expect(nativeChatRailReplyPreview(rows, [], 'u1')).toBe('Done.')
+    expect(nativeChatRailReplyPreview(rows, [], 's1')).toBe('Done.')
+    expect(nativeChatRailReplyPreview(rows, [], 'gone')).toBe('')
+  })
+
+  it('reads unloaded history its reply from the host', () => {
+    const rows = rowsOf([text('u1', 'ask', 'user'), text('a1', 'Done.')], ['u1', 'u1'])
+    const items = mergeNativeChatRailOutline(outline, [])
+    expect(nativeChatRailReplyPreview(rows, items, 'old-1')).toBe('Host reply 1')
+    expect(nativeChatRailReplyPreview(rows, items, 'old-2')).toBe('Host reply 2, cut off early')
+  })
+
+  // A long live turn scrolls its own prompt out of the loaded window; the host's
+  // reply for it was cut when the outline was read, the loaded rows are current.
+  it('prefers the loaded end of a turn whose prompt is no longer loaded', () => {
+    const rows = rowsOf(
+      [text('a0', 'Still going, latest words.'), text('u1', 'ask', 'user')],
+      ['old-2', 'u1']
+    )
+    const items = mergeNativeChatRailOutline(outline, [])
+    expect(nativeChatRailReplyPreview(rows, items, 'old-2')).toBe('Still going, latest words.')
+    expect(nativeChatRailReplyPreview(rows, items, 'old-1')).toBe('Host reply 1')
+  })
+
+  // A steer is in the turn it was sent into, under another message's key: without
+  // the host naming that turn it would keep the host's reply while its turn's own
+  // prompt, beside it on the rail, showed the loaded one.
+  it("reads an unloaded steer the loaded end of its turn, as its turn's prompt", () => {
+    const rows = rowsOf([text('a0', 'Still going, latest words.')], ['old-2'])
+    const items = mergeNativeChatRailOutline(
+      [
+        ...outline,
+        { id: 'steer', text: 'also this', hasImages: false, reply: 'Stale.', turnKey: 'old-2' }
+      ],
+      []
+    )
+    expect(nativeChatRailReplyPreview(rows, items, 'steer')).toBe('Still going, latest words.')
+    expect(nativeChatRailReplyPreview(rows, items, 'old-2')).toBe('Still going, latest words.')
+  })
+})
+
 describe('rail tick sampling', () => {
   it('keeps every tick while the thread fits', () => {
-    const items = railItems(NATIVE_CHAT_RAIL_MAX_TICKS)
-    expect(selectNativeChatRailTicks({ items, activeId: null })).toBe(items)
+    const items = railItems(NATIVE_CHAT_RAIL_ROOMY_TICKS)
+    expect(selectNativeChatRailTicks({ items, keepIds: [] })).toBe(items)
+  })
+
+  // A tick is the only way to its message, so a tall transcript draws more of them.
+  it('fits more ticks into a taller viewport, never fewer than the roomy count', () => {
+    const items = railItems(60)
+    expect(nativeChatRailTickCapacity(0)).toBe(NATIVE_CHAT_RAIL_ROOMY_TICKS)
+    const maxTicks = nativeChatRailTickCapacity(800)
+    expect(maxTicks).toBeGreaterThanOrEqual(60)
+    expect(selectNativeChatRailTicks({ items, keepIds: [], maxTicks })).toBe(items)
+    expect(selectNativeChatRailTicks({ items, keepIds: [], maxTicks: 30 })).toHaveLength(30)
   })
 
   it('caps a long thread and keeps both ends', () => {
     const items = railItems(120)
-    const ticks = selectNativeChatRailTicks({ items, activeId: null })
-    expect(ticks).toHaveLength(NATIVE_CHAT_RAIL_MAX_TICKS)
+    const ticks = selectNativeChatRailTicks({ items, keepIds: [] })
+    expect(ticks).toHaveLength(NATIVE_CHAT_RAIL_ROOMY_TICKS)
     expect(ticks[0]?.id).toBe('m0')
     expect(ticks.at(-1)?.id).toBe('m119')
   })
 
   it('always includes the active tick', () => {
     const items = railItems(120)
-    const ticks = selectNativeChatRailTicks({ items, activeId: 'm7' })
+    const ticks = selectNativeChatRailTicks({ items, keepIds: ['m7'] })
     expect(ticks.map((tick) => tick.id)).toContain('m7')
-    expect(ticks).toHaveLength(NATIVE_CHAT_RAIL_MAX_TICKS)
+    expect(ticks).toHaveLength(NATIVE_CHAT_RAIL_ROOMY_TICKS)
   })
 
   // Losing an end would make the rail claim the conversation starts or stops
   // somewhere it doesn't, so the eviction has to fall on a neighbour instead.
   it('evicts a neighbour rather than an end when the active tick is near one', () => {
     const items = railItems(120)
-    const ticks = selectNativeChatRailTicks({ items, activeId: 'm1' })
+    const ticks = selectNativeChatRailTicks({ items, keepIds: ['m1'] })
     const ids = ticks.map((tick) => tick.id)
     expect(ids).toContain('m0')
     expect(ids).toContain('m1')
     expect(ids).toContain('m119')
   })
 
+  // A previewed or focused tick must not be resampled away as the reader scrolls.
+  it('keeps every named tick at once, within the cap', () => {
+    const ticks = selectNativeChatRailTicks({ items: railItems(120), keepIds: ['m7', 'm8', null] })
+    expect(ticks).toHaveLength(NATIVE_CHAT_RAIL_ROOMY_TICKS)
+    expect(ticks.map((tick) => tick.id)).toEqual(expect.arrayContaining(['m0', 'm7', 'm8', 'm119']))
+  })
+
   it('returns ticks in thread order', () => {
-    const ticks = selectNativeChatRailTicks({ items: railItems(120), activeId: 'm63' })
+    const ticks = selectNativeChatRailTicks({ items: railItems(120), keepIds: ['m63'] })
     const indexes = ticks.map((tick) => tick.slotIndex ?? -1)
     expect(indexes).toEqual([...indexes].sort((left, right) => left - right))
   })
diff --git a/src/renderer/src/components/native-chat/native-chat-message-rail-items.ts b/src/renderer/src/components/native-chat/native-chat-message-rail-items.ts
index a35eaa33ab93..f54858122ac3 100644
--- a/src/renderer/src/components/native-chat/native-chat-message-rail-items.ts
+++ b/src/renderer/src/components/native-chat/native-chat-message-rail-items.ts
@@ -6,12 +6,28 @@
 // compared against a virtual item without a second lookup table. Messages older
 // than the loaded window come from the host's outline and have no slot yet.
 
-import { nativeChatUserMessagePreview } from '../../../../shared/agent-session-conversation-outline'
+import {
+  nativeChatTurnReplyPreviews,
+  nativeChatUserMessagePreview
+} from '../../../../shared/agent-session-conversation-outline'
+import type { NativeChatMessage } from '../../../../shared/native-chat-types'
 import type { NativeChatTranscriptSlot } from './native-chat-transcript-slots'
 
-/** Ticks past this are sampled away: a taller rail than the viewport cannot be
- *  read at a glance, which is the only thing the rail is for. */
-export const NATIVE_CHAT_RAIL_MAX_TICKS = 20
+/** Ticks up to this count sit at the roomy pitch; past it they pack tight. */
+export const NATIVE_CHAT_RAIL_ROOMY_TICKS = 20
+/** The tight pitch as the rail draws it: a 3px tick inside `py-0.5`. */
+const RAIL_TIGHT_PITCH_PX = 7
+const RAIL_VIEWPORT_SHARE = 0.7
+
+/** How many ticks the rail may draw. A tick is the only way to its message, so
+ *  the rail packs as many as a share of the viewport holds before sampling any
+ *  away: a rail taller than that cannot be read at a glance. */
+export function nativeChatRailTickCapacity(viewportHeight: number): number {
+  return Math.max(
+    NATIVE_CHAT_RAIL_ROOMY_TICKS,
+    Math.floor((viewportHeight * RAIL_VIEWPORT_SHARE) / RAIL_TIGHT_PITCH_PX)
+  )
+}
 
 export type NativeChatRailItem = {
   id: string
@@ -21,6 +37,10 @@ export type NativeChatRailItem = {
   /** Preview prose, whitespace collapsed. Empty when the message is images only. */
   text: string
   hasImages: boolean
+  /** The host's preview of the agent's reply, on an outline item only. */
+  reply?: string
+  /** On an outline item that did not open its turn: the message that did. */
+  turnKey?: string
 }
 
 /** A user message older than the loaded window, oldest first. */
@@ -28,6 +48,36 @@ export type NativeChatRailOutlineEntry = {
   id: string
   text: string
   hasImages: boolean
+  reply?: string
+  turnKey?: string
+}
+
+/** The transcript's rows and each one's turn, as the slots are built from them:
+ *  before folding, so a folded turn still has its reply to read. */
+export type NativeChatRailTurnRows = {
+  messages: readonly NativeChatMessage[]
+  turnKeys: readonly (string | undefined)[]
+}
+
+/** What the agent answered a rail item's turn with, read when its preview opens:
+ *  carried on every item, a streaming reply would rebuild the rail on each frame.
+ *  Loaded rows are authoritative for the turns they hold, including the tail of a
+ *  turn whose prompt is no longer loaded; the host's reply covers the rest. */
+export function nativeChatRailReplyPreview(
+  { messages, turnKeys }: NativeChatRailTurnRows,
+  items: readonly NativeChatRailItem[],
+  id: string
+): string {
+  const row = messages.findIndex((message) => message.id === id)
+  const item = items.find((candidate) => candidate.id === id)
+  // An unloaded prompt is its turn's key unless the host names another: a steer's
+  // turn is the one it was sent into.
+  const turnKey = row === -1 ? (item?.turnKey ?? id) : turnKeys[row]
+  const loaded =
+    turnKey === undefined
+      ? undefined
+      : nativeChatTurnReplyPreviews(messages, turnKeys, turnKey).get(turnKey)
+  return loaded ?? item?.reply ?? ''
 }
 
 export function buildNativeChatRailItems(
@@ -36,9 +86,12 @@ export function buildNativeChatRailItems(
 ): readonly NativeChatRailItem[] {
   const items: NativeChatRailItem[] = []
   for (const [slotIndex, slot] of slots.entries()) {
-    // A send a Stop took back is no tick, as the host's outline of older history leaves it out.
+    // A send a Stop took back is no tick, as the host's outline of older history leaves it
+    // out. Nor is a subagent's prompt, drawn while its section is open: the rail maps
+    // the conversation, and must not change with what the reader has expanded.
     if (
       slot.kind !== 'message' ||
+      slot.depth !== 0 ||
       slot.message.role !== 'user' ||
       slot.message.stoppedBeforeStart === true
     ) {
@@ -81,38 +134,47 @@ export function mergeNativeChatRailOutline(
 }
 
 /** Evenly spaced ticks across the whole thread, always including both ends and
- *  the active one. Keeping the ends fixed is what makes the rail read as a map
- *  of the conversation rather than a window onto part of it. */
+ *  the kept ones: the tick the reader is on, and any they are previewing or have
+ *  focused. Keeping the ends fixed is what makes the rail read as a map of the
+ *  conversation rather than a window onto part of it. */
 export function selectNativeChatRailTicks({
   items,
-  activeId
+  keepIds = [],
+  maxTicks = NATIVE_CHAT_RAIL_ROOMY_TICKS
 }: {
   items: readonly NativeChatRailItem[]
-  activeId: string | null
+  keepIds?: readonly (string | null)[]
+  maxTicks?: number
 }): readonly NativeChatRailItem[] {
-  if (items.length <= NATIVE_CHAT_RAIL_MAX_TICKS) {
+  if (items.length <= maxTicks) {
     return items
   }
 
   const maxIndex = items.length - 1
   const sampled = new Set<number>()
-  for (let slot = 0; slot < NATIVE_CHAT_RAIL_MAX_TICKS; slot += 1) {
-    sampled.add(Math.round((slot * maxIndex) / (NATIVE_CHAT_RAIL_MAX_TICKS - 1)))
+  for (let slot = 0; slot < maxTicks; slot += 1) {
+    sampled.add(Math.round((slot * maxIndex) / (maxTicks - 1)))
   }
 
-  const activeIndex = activeId === null ? -1 : items.findIndex((item) => item.id === activeId)
-  if (activeIndex >= 0 && !sampled.has(activeIndex)) {
-    sampled.add(activeIndex)
-    // Drop the neighbour nearest the active tick, never an end: losing an end
+  const kept = new Set<number>([0, maxIndex])
+  for (const id of keepIds) {
+    const index = id === null ? -1 : items.findIndex((item) => item.id === id)
+    if (index >= 0) {
+      kept.add(index)
+    }
+  }
+  for (const keep of kept) {
+    if (sampled.has(keep)) {
+      continue
+    }
+    sampled.add(keep)
+    // Drop the nearest neighbour that is not itself kept, never an end: losing one
     // would make the rail claim the thread starts or stops somewhere it doesn't.
     let evict: number | null = null
     let evictDistance = Number.POSITIVE_INFINITY
     for (const index of sampled) {
-      if (index === activeIndex || index === 0 || index === maxIndex) {
-        continue
-      }
-      const distance = Math.abs(index - activeIndex)
-      if (distance < evictDistance) {
+      const distance = Math.abs(index - keep)
+      if (!kept.has(index) && distance < evictDistance) {
         evict = index
         evictDistance = distance
       }
diff --git a/src/renderer/src/components/native-chat/native-chat-orca-stop-context.ts b/src/renderer/src/components/native-chat/native-chat-orca-stop-context.ts
new file mode 100644
index 000000000000..216face98546
--- /dev/null
+++ b/src/renderer/src/components/native-chat/native-chat-orca-stop-context.ts
@@ -0,0 +1,18 @@
+import { createContext, useContext } from 'react'
+
+/** What a structured chat tells its rows about an Orca stop: the name of the machine whose Orca runs
+ *  it, as Orca shows that host everywhere (null when it has none to show), and whether its host can
+ *  continue a cut, which only a host known not to has no Continue for. */
+export type NativeChatOrcaStopView = {
+  hostLabel: string | null
+  continueAvailable: boolean
+}
+
+export const NativeChatOrcaStopContext = createContext<NativeChatOrcaStopView>({
+  hostLabel: null,
+  continueAvailable: false
+})
+
+export function useNativeChatOrcaStopView(): NativeChatOrcaStopView {
+  return useContext(NativeChatOrcaStopContext)
+}
diff --git a/src/renderer/src/components/native-chat/native-chat-orca-stop-words.ts b/src/renderer/src/components/native-chat/native-chat-orca-stop-words.ts
new file mode 100644
index 000000000000..46e43e964ba5
--- /dev/null
+++ b/src/renderer/src/components/native-chat/native-chat-orca-stop-words.ts
@@ -0,0 +1,45 @@
+// The words for a reply Orca's own stop cut off, by cause and machine. One function, so the chat's
+// row wording can change in one place.
+
+import { translate } from '@/i18n/i18n'
+import type { AgentSessionOrcaStopCause } from '../../../../shared/agent-session-orca-stop'
+import { joinSentences } from '../../../../shared/sentence-joining'
+
+const STOPPED: Record<AgentSessionOrcaStopCause, (machine: string) => string> = {
+  update: (machine) =>
+    translate(
+      'components.native-chat.notices.orcaStopUpdate',
+      'Orca on {{machine}} restarted for an update while this response was in progress.',
+      { machine }
+    ),
+  quit: (machine) =>
+    translate(
+      'components.native-chat.notices.orcaStopQuit',
+      'Orca on {{machine}} was closed while this response was in progress.',
+      { machine }
+    ),
+  crash: (machine) =>
+    translate(
+      'components.native-chat.notices.orcaStopCrash',
+      'Orca on {{machine}} stopped unexpectedly while this response was in progress.',
+      { machine }
+    )
+}
+
+/** The row's sentence. Where the host can continue a cut, Continue is the way on, so the row does
+ *  not say it again; decided by the host, not the button, so the words never change on screen. */
+export function nativeChatOrcaStopRowText(
+  cause: AgentSessionOrcaStopCause,
+  machine: string,
+  options: { continueAvailable: boolean }
+): string {
+  return options.continueAvailable
+    ? STOPPED[cause](machine)
+    : joinSentences([
+        STOPPED[cause](machine),
+        translate(
+          'components.native-chat.notices.orcaStopCanContinue',
+          'You can continue in this conversation.'
+        )
+      ])
+}
diff --git a/src/renderer/src/components/native-chat/native-chat-owner-selectors.test.tsx b/src/renderer/src/components/native-chat/native-chat-owner-selectors.test.tsx
new file mode 100644
index 000000000000..2bee35ac5487
--- /dev/null
+++ b/src/renderer/src/components/native-chat/native-chat-owner-selectors.test.tsx
@@ -0,0 +1,232 @@
+// @vitest-environment happy-dom
+import { act, cleanup, renderHook } from '@testing-library/react'
+import { afterEach, describe, expect, it, vi } from 'vitest'
+import { FLOATING_TERMINAL_WORKTREE_ID, getDefaultSettings } from '../../../../shared/constants'
+import type { Tab } from '../../../../shared/tab-types'
+import type { TerminalTab } from '../../../../shared/terminal-tab-types'
+import type { Worktree } from '../../../../shared/worktree/types'
+import {
+  createNativeChatFileLinkContextSelector,
+  createNativeChatTabOwnerSelector,
+  findNativeChatTabOwnerWorktreeId,
+  resolveNativeChatFileLinkContext
+} from './native-chat-file-link'
+import { useNativeChatTabOwnerWorktreeId } from './use-native-chat-tab-owner'
+import { useNativeChatFileLinkContext } from './use-native-chat-file-link-context'
+import { useAppStore } from '@/store'
+
+type ContextState = Parameters<typeof resolveNativeChatFileLinkContext>[0]
+
+vi.mock('@/store', async () => {
+  const { create } = await import('zustand')
+  const { getDefaultSettings } = await import('../../../../shared/constants')
+  return {
+    useAppStore: create<ContextState>(() => ({
+      settings: getDefaultSettings('/home/test'),
+      repos: [],
+      projectGroups: [],
+      folderWorkspaces: [],
+      worktreesByRepo: {},
+      tabsByWorktree: {},
+      unifiedTabsByWorktree: {},
+      getKnownWorktreeById: () => undefined
+    }))
+  }
+})
+
+afterEach(cleanup)
+
+function terminal(id: string): TerminalTab {
+  return {
+    id,
+    ptyId: null,
+    worktreeId: 'terminal-owner',
+    title: 'Terminal',
+    customTitle: null,
+    color: null,
+    sortOrder: 0,
+    createdAt: 0
+  }
+}
+
+function structured(id: string, contentType: Tab['contentType'] = 'agent-session'): Tab {
+  return {
+    id,
+    entityId: `session-${id}`,
+    worktreeId: 'chat-owner',
+    groupId: 'group',
+    contentType,
+    agentSessionAgent: 'codex',
+    label: 'Chat',
+    customLabel: null,
+    color: null,
+    sortOrder: 0,
+    createdAt: 0
+  }
+}
+
+function worktree(id: string, path = '/repo'): Worktree {
+  return {
+    id,
+    repoId: 'repo',
+    path,
+    displayName: id,
+    comment: '',
+    linkedIssue: null,
+    linkedPR: null,
+    linkedLinearIssue: null,
+    isArchived: false,
+    isUnread: false,
+    isPinned: false,
+    sortOrder: 0,
+    lastActivityAt: 0,
+    head: '',
+    branch: 'main',
+    isBare: false,
+    isMainWorktree: false
+  }
+}
+
+function contextState(overrides: Partial<ContextState> = {}): ContextState {
+  return {
+    settings: getDefaultSettings('/home/test'),
+    repos: [],
+    projectGroups: [],
+    folderWorkspaces: [],
+    worktreesByRepo: {},
+    tabsByWorktree: {},
+    unifiedTabsByWorktree: {},
+    getKnownWorktreeById: () => undefined,
+    ...overrides
+  }
+}
+
+describe('native chat ownership selectors', () => {
+  it.each(['chat', 'missing'])('does no ownership scans on unrelated hook updates for %s', (id) => {
+    let reads = 0
+    const counted = <T extends { id: string }>(tab: T): T => {
+      const tabId = tab.id
+      Object.defineProperty(tab, 'id', { enumerable: true, get: () => (reads++, tabId) })
+      return tab
+    }
+    const state = contextState({
+      tabsByWorktree: Object.fromEntries(
+        Array.from({ length: 100 }, (_, index) => [
+          `terminal-owner-${index}`,
+          [counted(terminal(`terminal-${index}`))]
+        ])
+      ),
+      unifiedTabsByWorktree: { 'chat-owner': [counted(structured('chat'))] },
+      getKnownWorktreeById: (owner) => worktree(owner)
+    })
+    useAppStore.setState(state)
+    const { result } = renderHook(() => ({
+      owner: useNativeChatTabOwnerWorktreeId(id),
+      context: useNativeChatFileLinkContext(id)
+    }))
+    expect(result.current.owner).toBe(id === 'chat' ? 'chat-owner' : null)
+    expect(reads).toBeGreaterThan(0)
+    reads = 0
+    act(() => {
+      for (let index = 0; index < 100; index++) {
+        useAppStore.setState({ lastTerminalInputAtByPaneKey: { pane: index } })
+      }
+    })
+    expect(reads).toBe(0)
+    expect(result.current.context?.worktreePath ?? null).toBe(id === 'chat' ? '/repo' : null)
+  })
+
+  it('refreshes both hooks when the queried tab changes, moves, closes, or returns', () => {
+    const state = contextState({
+      unifiedTabsByWorktree: { first: [structured('one')], second: [structured('two')] },
+      getKnownWorktreeById: (owner) => worktree(owner, `/${owner}`)
+    })
+    useAppStore.setState(state)
+    const { result, rerender, unmount } = renderHook(
+      ({ id }) => ({
+        owner: useNativeChatTabOwnerWorktreeId(id),
+        context: useNativeChatFileLinkContext(id)
+      }),
+      { initialProps: { id: 'one' } }
+    )
+    expect(result.current.context?.worktreePath).toBe('/first')
+    rerender({ id: 'two' })
+    expect(result.current.context?.worktreePath).toBe('/second')
+    act(() => useAppStore.setState({ unifiedTabsByWorktree: { first: [structured('two')] } }))
+    expect(result.current.owner).toBe('first')
+    act(() => useAppStore.setState({ unifiedTabsByWorktree: {} }))
+    expect(result.current).toEqual({ owner: null, context: null })
+    act(() => useAppStore.setState({ tabsByWorktree: { returned: [terminal('two')] } }))
+    expect(result.current.context?.worktreePath).toBe('/returned')
+    unmount()
+    const reopened = renderHook(() => useNativeChatTabOwnerWorktreeId('two'))
+    expect(reopened.result.current).toBe('returned')
+  })
+
+  it('keeps first-owner collisions, terminal precedence, and the structured content gate', () => {
+    const select = createNativeChatTabOwnerSelector('same')
+    const states = [
+      contextState({
+        tabsByWorktree: { first: [terminal('same')], second: [terminal('same')] },
+        unifiedTabsByWorktree: { structured: [structured('same')] }
+      }),
+      contextState({
+        unifiedTabsByWorktree: {
+          editor: [structured('same', 'editor')],
+          first: [structured('same')],
+          second: [structured('same')]
+        }
+      }),
+      contextState({ unifiedTabsByWorktree: { editor: [structured('same', 'editor')] } }),
+      contextState()
+    ]
+    expect(states.map((state) => select(state))).toEqual(['first', 'first', null, null])
+    for (const state of states) {
+      expect(select(state)).toBe(findNativeChatTabOwnerWorktreeId(state, 'same'))
+    }
+  })
+
+  it('updates directory and runtime projections without replacing the ownership maps', () => {
+    let path = '/before'
+    const initial = contextState({
+      unifiedTabsByWorktree: { 'chat-owner': [structured('chat')] },
+      getKnownWorktreeById: (owner) => worktree(owner, path),
+      worktreesByRepo: { repo: [worktree('chat-owner')] }
+    })
+    const select = createNativeChatFileLinkContextSelector('chat')
+    expect(select(initial)?.worktreePath).toBe('/before')
+    path = '/after'
+    const current = {
+      ...initial,
+      settings: { ...getDefaultSettings('/home/test'), activeRuntimeEnvironmentId: 'focused' },
+      worktreesByRepo: {
+        repo: [{ ...worktree('chat-owner'), runtimeOwnerEnvironmentId: 'owning-runtime' }]
+      }
+    }
+    expect(select(current)).toEqual(resolveNativeChatFileLinkContext(current, 'chat'))
+    expect(select(current)).toEqual({
+      worktreeId: 'chat-owner',
+      worktreePath: '/after',
+      runtimeEnvironmentId: 'owning-runtime'
+    })
+  })
+
+  it('waits for a floating chat pin and follows pin changes without an ownership change', () => {
+    const initial = contextState({
+      floatingWorkspacePath: '/setting',
+      unifiedTabsByWorktree: { [FLOATING_TERMINAL_WORKTREE_ID]: [structured('chat')] }
+    })
+    const select = createNativeChatFileLinkContextSelector('chat')
+    expect(select(initial)).toBeNull()
+    for (const launchDirectory of ['/pinned', '/updated']) {
+      const current = {
+        ...initial,
+        structuredSessionLaunchDirectoryByTabId: {
+          chat: { sessionId: 'session-chat', launchDirectory }
+        }
+      }
+      expect(select(current)?.worktreePath).toBe(launchDirectory)
+      expect(select(current)).toEqual(resolveNativeChatFileLinkContext(current, 'chat'))
+    }
+  })
+})
diff --git a/src/renderer/src/components/native-chat/native-chat-pane-file-drop.test.tsx b/src/renderer/src/components/native-chat/native-chat-pane-file-drop.test.tsx
index 733215d4efd2..cef8d6e7f305 100644
--- a/src/renderer/src/components/native-chat/native-chat-pane-file-drop.test.tsx
+++ b/src/renderer/src/components/native-chat/native-chat-pane-file-drop.test.tsx
@@ -52,7 +52,8 @@ function ClaimingComposer({
   onDropCapture?: (event: React.DragEvent<HTMLDivElement>) => void
 }) {
   useNativeChatPaneFileDropClaim({
-    scopeKey: 'pane:1',
+    destinationKey: 'pane:1',
+    captureExternalDrop: () => async () => {},
     disabled,
     onDragOverCapture,
     onDropCapture
@@ -115,20 +116,18 @@ describe('NativeChatPaneFileDropSurface', () => {
     expect(container.querySelector(OVERLAY)).toBeNull()
   })
 
-  it('publishes the claiming composer as the OS drop route target', () => {
+  it('owns OS drops without publishing a scope marker', () => {
     const { container } = renderPane(<ClaimingComposer />)
     const surface = container.querySelector('.pane')
-    expect(surface?.getAttribute('data-native-file-drop-target')).toBe('composer')
-    expect(surface?.getAttribute('data-composer-scope-key')).toBe('pane:1')
+    expect(surface?.hasAttribute('data-os-file-drop-owner')).toBe(true)
+    expect(surface?.hasAttribute('data-composer-scope-key')).toBe(false)
   })
 
-  it('leaves the pane to the terminal behind it while no composer is mounted', () => {
+  it('keeps an OS owner even while no composer is mounted', () => {
     const { transcript, container } = renderPane(null)
     fireDrag(transcript, 'dragover', workspaceDrag())
     expect(container.querySelector(OVERLAY)).toBeNull()
-    expect(container.querySelector('.pane')?.hasAttribute('data-native-file-drop-target')).toBe(
-      false
-    )
+    expect(container.querySelector('.pane')?.hasAttribute('data-os-file-drop-owner')).toBe(true)
   })
 
   it('does not invite a drop the guarded composer will refuse', () => {
@@ -143,7 +142,7 @@ describe('NativeChatPaneFileDropSurface', () => {
     expect(onDragOverCapture).toHaveBeenCalledTimes(1)
   })
 
-  it('shows the overlay for an OS drag without claiming its drop', () => {
+  it('shows the overlay for OS drags while keeping workspace handlers separate', () => {
     const onDropCapture = vi.fn()
     const { transcript, container } = renderPane(<ClaimingComposer onDropCapture={onDropCapture} />)
     fireDrag(transcript, 'dragover', osDrag())
@@ -164,7 +163,7 @@ describe('NativeChatPaneFileDropSurface', () => {
 
     rerender(pane(true))
     expect(container.querySelector(OVERLAY)).toBeNull()
-    expect(container.querySelector('.pane')?.getAttribute('data-composer-scope-key')).toBe('pane:1')
+    expect(container.querySelector('.pane')?.hasAttribute('data-os-file-drop-owner')).toBe(true)
 
     rerender(pane(false))
     expect(container.querySelector(OVERLAY)).toBeNull()
@@ -183,13 +182,12 @@ describe('NativeChatPaneFileDropSurface', () => {
     expect(container.querySelector(OVERLAY)).toBeNull()
   })
 
-  it('clears an OS drag overlay from the document drop the preload route consumes', () => {
+  it('clears an OS drag overlay when a drop ends outside the pane', () => {
     const { transcript, container } = renderPane(<ClaimingComposer />)
     fireDrag(transcript, 'dragover', osDrag())
     expect(container.querySelector(OVERLAY)).not.toBeNull()
 
-    // The preload listener stops this event at `document`, so the surface never
-    // sees it as a React drop.
+    // A drop outside the pane still ends its hover state.
     act(() => {
       document.dispatchEvent(new Event('drop', { bubbles: false }))
     })
diff --git a/src/renderer/src/components/native-chat/native-chat-pane-file-drop.ts b/src/renderer/src/components/native-chat/native-chat-pane-file-drop.ts
index e0ebfe4243f1..f04793af30de 100644
--- a/src/renderer/src/components/native-chat/native-chat-pane-file-drop.ts
+++ b/src/renderer/src/components/native-chat/native-chat-pane-file-drop.ts
@@ -3,7 +3,7 @@ import { hasNativeFileDragTypes } from '../../../../shared/native-file-drop'
 
 /** What a drag hovering the chat pane is carrying.
  *  `workspace`: an in-app file drag, attached by the composer's own handlers.
- *  `os`: a Finder/Explorer drag, delivered by the preload drop route instead. */
+ *  `os`: a Finder/Explorer drag, handled by the pane's OS file owner. */
 export type NativeChatPaneDragKind = 'os' | 'workspace'
 
 export type NativeChatPaneDragEvent = {
@@ -14,8 +14,8 @@ export type NativeChatPaneDragEvent = {
 
 /** The composer's drop claim, published while a composer is mounted in the pane. */
 export type NativeChatPaneDropClaim = {
-  /** Composer identity the preload drop route addresses (`data-composer-scope-key`). */
-  scopeKey: string
+  destinationKey: string
+  captureExternalDrop: () => (paths: string[]) => Promise<void>
   /** A guarded composer refuses the drop, so the pane must not invite one. */
   disabled: boolean
   onDragOverCapture: (event: React.DragEvent<HTMLDivElement>) => void
@@ -41,12 +41,7 @@ export function movedWithinDropSurface(event: NativeChatPaneDragEvent): boolean
   return enteredNode instanceof Node && event.currentTarget.contains(enteredNode)
 }
 
-/**
- * Decides what the pane does with a drag, given what the mounted composer will
- * accept. Only a workspace drag is claimed here: an OS drag reaches the composer
- * through the preload route, which already consumed the drop event by the time
- * React would see it, so the pane's part of that route is the overlay alone.
- */
+/** Workspace files keep their provenance-checked lane; OS files use the native owner. */
 export function makeNativeChatPaneFileDropHandlers(host: {
   getClaim: () => NativeChatPaneDropClaim | null
   setDragActive: (active: boolean) => void
@@ -62,8 +57,6 @@ export function makeNativeChatPaneFileDropHandlers(host: {
       return false
     }
     const claim = host.getClaim()
-    // No composer (a question card owns the input region) means no attachment
-    // target, so the drag stays the terminal's the way it is today.
     return claim !== null && !claim.disabled
   }
 
diff --git a/src/renderer/src/components/native-chat/native-chat-paste-routing.test.tsx b/src/renderer/src/components/native-chat/native-chat-paste-routing.test.tsx
index 67276c32d33d..1f41eb3577f3 100644
--- a/src/renderer/src/components/native-chat/native-chat-paste-routing.test.tsx
+++ b/src/renderer/src/components/native-chat/native-chat-paste-routing.test.tsx
@@ -82,6 +82,8 @@ function composerHandle(): NativeChatComposerHandle & { element: HTMLElement } {
       return true
     }),
     insertTypedText: vi.fn(() => true),
+    appendText: vi.fn(),
+    acceptsText: () => true,
     handlePasteEvent: vi.fn(),
     pasteFromClipboard: vi.fn(),
     contains: (node) => element.contains(node)
@@ -106,7 +108,7 @@ function ChatRoot({
   useNativeChatPasteBridge({ rootRef, composerRef, questionAnswerInputRef: answerRef })
   return (
     // Mirrors NativeChatPaneFileDropSurface, which publishes the composer scope pane-wide.
-    <div data-composer-scope-key="pane" data-native-file-drop-target="composer">
+    <div data-composer-scope-key="pane">
       <div
         ref={(node) => {
           rootRef.current = node
diff --git a/src/renderer/src/components/native-chat/native-chat-pending-attachment-cache.test.ts b/src/renderer/src/components/native-chat/native-chat-pending-attachment-cache.test.ts
new file mode 100644
index 000000000000..3dccd946f89b
--- /dev/null
+++ b/src/renderer/src/components/native-chat/native-chat-pending-attachment-cache.test.ts
@@ -0,0 +1,131 @@
+import { afterEach, describe, expect, it, vi } from 'vitest'
+import {
+  addNativeChatPendingAttachment,
+  clearNativeChatPendingAttachmentsForTests,
+  dropNativeChatPendingAttachmentsForTab,
+  dropNativeChatPendingAttachmentsOwnedBy,
+  nativeChatPendingAttachmentSnapshot,
+  revealNativeChatPendingAttachment,
+  settleNativeChatPendingAttachment,
+  subscribeToNativeChatPendingAttachments,
+  takeNativeChatPendingAttachment
+} from './native-chat-pending-attachment-cache'
+import {
+  clearNativeChatComposerDraftsForTests,
+  deleteNativeChatComposerDraftsOwnedBy,
+  readNativeChatComposerDraft,
+  setNativeChatComposerDraftOwnerResolver,
+  structuredAgentSessionDraftScopeKey
+} from './native-chat-composer-draft-store'
+import type { NativeChatComposerDraftOwner } from './native-chat-composer-draft-storage'
+
+afterEach(() => {
+  clearNativeChatPendingAttachmentsForTests()
+  clearNativeChatComposerDraftsForTests()
+})
+
+const OWNER: NativeChatComposerDraftOwner = { workspaceId: 'wt-1', executionHostId: 'local' }
+
+function addPending(scopeKey: string, id = scopeKey): void {
+  addNativeChatPendingAttachment(scopeKey, { id, path: '', pending: true })
+}
+
+describe('the pane pending attachment cache', () => {
+  it('keeps a chip with no composer subscribed, so one a prompt unmounted can still settle', () => {
+    addNativeChatPendingAttachment('pane-a', {
+      id: 'a1',
+      path: '',
+      pending: true,
+      previewUrl: 'blob:preview'
+    })
+
+    // The composer keeps its own preview; the cache never holds one.
+    expect(nativeChatPendingAttachmentSnapshot('pane-a')).toEqual([
+      { id: 'a1', path: '', pending: true }
+    ])
+    expect(takeNativeChatPendingAttachment('pane-a', 'a1')).toEqual({
+      id: 'a1',
+      path: '',
+      pending: true
+    })
+    expect(nativeChatPendingAttachmentSnapshot('pane-a')).toEqual([])
+  })
+
+  it('answers undefined for a chip the user already removed, so its file never attaches', () => {
+    addNativeChatPendingAttachment('pane-b', { id: 'b1', path: '', pending: true })
+    takeNativeChatPendingAttachment('pane-b', 'b1')
+
+    expect(takeNativeChatPendingAttachment('pane-b', 'b1')).toBeUndefined()
+  })
+
+  it('shows a hidden chip and tells every subscriber, with a new snapshot only on change', () => {
+    const listener = vi.fn()
+    const unsubscribe = subscribeToNativeChatPendingAttachments('pane-c', listener)
+    addNativeChatPendingAttachment('pane-c', { id: 'c1', path: '', pending: true, hidden: true })
+    const hidden = nativeChatPendingAttachmentSnapshot('pane-c')
+
+    expect(nativeChatPendingAttachmentSnapshot('pane-c')).toBe(hidden)
+    revealNativeChatPendingAttachment('pane-c', 'c1')
+
+    expect(nativeChatPendingAttachmentSnapshot('pane-c')).toEqual([
+      { id: 'c1', path: '', pending: true }
+    ])
+    expect(listener).toHaveBeenCalledTimes(2)
+    unsubscribe()
+  })
+
+  it('settles into a draft owned by the workspace it began in, after its chat stopped naming one', () => {
+    const conversation = structuredAgentSessionDraftScopeKey('session-1')
+    let open = true
+    setNativeChatComposerDraftOwnerResolver((scopeKey) =>
+      open && scopeKey === conversation ? OWNER : undefined
+    )
+    addPending(conversation)
+    open = false
+
+    expect(settleNativeChatPendingAttachment(conversation, conversation, '/store/a.png')).toBe(true)
+    expect(readNativeChatComposerDraft(conversation).images).toHaveLength(1)
+    deleteNativeChatComposerDraftsOwnedBy(OWNER)
+    expect(readNativeChatComposerDraft(conversation).images).toEqual([])
+  })
+
+  it('drops the chips begun in a removed workspace on that host only', () => {
+    const resolved = new Map<string, NativeChatComposerDraftOwner>([
+      ['tab-1:leaf', OWNER],
+      ['tab-2:leaf', { ...OWNER, executionHostId: 'ssh:box' }],
+      ['tab-3:leaf', { ...OWNER, workspaceId: 'wt-2' }]
+    ])
+    setNativeChatComposerDraftOwnerResolver((scopeKey) => resolved.get(scopeKey))
+    for (const scopeKey of [...resolved.keys(), 'tab-4:leaf']) {
+      addPending(scopeKey)
+    }
+
+    dropNativeChatPendingAttachmentsOwnedBy(OWNER)
+
+    expect(
+      ['tab-1:leaf', 'tab-2:leaf', 'tab-3:leaf', 'tab-4:leaf'].map(
+        (scopeKey) => nativeChatPendingAttachmentSnapshot(scopeKey).length
+      )
+    ).toEqual([0, 1, 1, 1])
+    expect(settleNativeChatPendingAttachment('tab-1:leaf', 'tab-1:leaf', '/store/a.png')).toBe(
+      false
+    )
+    expect(readNativeChatComposerDraft('tab-1:leaf').images).toEqual([])
+  })
+
+  it('drops the chips of every pane in a closed tab, never a conversation’s', () => {
+    const conversation = structuredAgentSessionDraftScopeKey('session-1')
+    for (const scopeKey of ['tab:1:leaf-a', 'tab:1:leaf-b', 'tab:10:leaf-a', conversation]) {
+      addPending(scopeKey)
+    }
+
+    dropNativeChatPendingAttachmentsForTab('agent-session')
+    dropNativeChatPendingAttachmentsForTab('tab:1')
+
+    expect(
+      ['tab:1:leaf-a', 'tab:1:leaf-b', 'tab:10:leaf-a', conversation].map(
+        (scopeKey) => nativeChatPendingAttachmentSnapshot(scopeKey).length
+      )
+    ).toEqual([0, 0, 1, 1])
+  })
+})
diff --git a/src/renderer/src/components/native-chat/native-chat-pending-attachment-cache.ts b/src/renderer/src/components/native-chat/native-chat-pending-attachment-cache.ts
new file mode 100644
index 000000000000..3d4e477d0cee
--- /dev/null
+++ b/src/renderer/src/components/native-chat/native-chat-pending-attachment-cache.ts
@@ -0,0 +1,169 @@
+// A composer's chips still on their way (a save, an upload, a server's answer), per pane scope,
+// owned here rather than by the composer. A prompt card unmounts the composer, so anything owed to
+// the message must outlive it: the composer that comes back shows the same chips, Send waits for
+// them, and each settles into the scope's draft whichever composer, if any, is showing. They are
+// never saved with the draft, so a restored draft cannot bring back an upload as if it were
+// attached. Every chip dies with its operation: settled or dropped when the save or upload settles
+// (each bounded by its call timeout), removed by the user, or dropped with the drafts of a tab or
+// workspace the user closed or removed, so none settles into a draft nothing could find or delete.
+
+import { useCallback, useSyncExternalStore } from 'react'
+import type { NativeChatComposerImageAttachment } from './NativeChatComposerField'
+import type { NativeChatComposerDraftOwner } from './native-chat-composer-draft-storage'
+import {
+  appendToNativeChatComposerDraft,
+  nativeChatDraftScopeTabId,
+  resolveNativeChatComposerDraftOwner,
+  structuredAgentSessionIdOfDraftScope
+} from './native-chat-composer-draft-store'
+
+const EMPTY: readonly NativeChatComposerImageAttachment[] = Object.freeze([])
+const pendingCache = new Map<string, readonly NativeChatComposerImageAttachment[]>()
+// Why: a chip can outlive its tab, which is what names the draft's owner, so it is named at once.
+const pendingOwners = new Map<string, NativeChatComposerDraftOwner>()
+const listeners = new Map<string, Set<() => void>>()
+
+/** The scope's pending chips; the same array until they change, so a reader can subscribe to it. */
+export function nativeChatPendingAttachmentSnapshot(
+  scopeKey: string
+): readonly NativeChatComposerImageAttachment[] {
+  return pendingCache.get(scopeKey) ?? EMPTY
+}
+
+function writePending(scopeKey: string, next: readonly NativeChatComposerImageAttachment[]): void {
+  if (next.length === 0) {
+    pendingCache.delete(scopeKey)
+    pendingOwners.delete(scopeKey)
+  } else {
+    pendingCache.set(scopeKey, next)
+  }
+  listeners.get(scopeKey)?.forEach((listener) => listener())
+}
+
+export function subscribeToNativeChatPendingAttachments(
+  scopeKey: string,
+  listener: () => void
+): () => void {
+  const scoped = listeners.get(scopeKey) ?? new Set()
+  listeners.set(scopeKey, scoped)
+  scoped.add(listener)
+  return () => {
+    scoped.delete(listener)
+    if (scoped.size === 0 && listeners.get(scopeKey) === scoped) {
+      listeners.delete(scopeKey)
+    }
+  }
+}
+
+/** The scope's pending chips, re-rendering when they change. */
+export function useNativeChatPendingAttachments(
+  scopeKey: string
+): readonly NativeChatComposerImageAttachment[] {
+  const subscribe = useCallback(
+    (listener: () => void) => subscribeToNativeChatPendingAttachments(scopeKey, listener),
+    [scopeKey]
+  )
+  return useSyncExternalStore(subscribe, () => nativeChatPendingAttachmentSnapshot(scopeKey))
+}
+
+/** Adds a chip still on its way. Preview URLs stay with the composer that minted them. */
+export function addNativeChatPendingAttachment(
+  scopeKey: string,
+  chip: NativeChatComposerImageAttachment
+): void {
+  const { previewUrl: _previewUrl, ...pending } = chip
+  const owner = resolveNativeChatComposerDraftOwner(scopeKey) ?? pendingOwners.get(scopeKey)
+  if (owner) {
+    pendingOwners.set(scopeKey, owner)
+  }
+  writePending(scopeKey, [...nativeChatPendingAttachmentSnapshot(scopeKey), pending])
+}
+
+/** Removes a pending chip and returns it; undefined when the user already removed it. */
+export function takeNativeChatPendingAttachment(
+  scopeKey: string,
+  id: string
+): NativeChatComposerImageAttachment | undefined {
+  const current = nativeChatPendingAttachmentSnapshot(scopeKey)
+  const taken = current.find((attachment) => attachment.id === id)
+  if (taken) {
+    writePending(
+      scopeKey,
+      current.filter((attachment) => attachment !== taken)
+    )
+  }
+  return taken
+}
+
+/** Settles a pending chip into the scope's draft, as an image the user attached. False when the
+ *  user already removed it. */
+export function settleNativeChatPendingAttachment(
+  scopeKey: string,
+  id: string,
+  path: string,
+  connectionId?: string | null
+): boolean {
+  const owner = pendingOwners.get(scopeKey)
+  if (!takeNativeChatPendingAttachment(scopeKey, id)) {
+    return false
+  }
+  appendToNativeChatComposerDraft(
+    scopeKey,
+    { images: [{ id, path, ...(connectionId ? { connectionId } : {}) }], fromUser: true },
+    owner
+  )
+  return true
+}
+
+/** Shows a pending chip that was held out of sight, such as while a server was asked first. */
+export function revealNativeChatPendingAttachment(scopeKey: string, id: string): void {
+  const current = nativeChatPendingAttachmentSnapshot(scopeKey)
+  if (current.some((attachment) => attachment.id === id && attachment.hidden)) {
+    writePending(
+      scopeKey,
+      current.map((attachment) => {
+        const { hidden: _hidden, ...shown } = attachment
+        return attachment.id === id ? shown : attachment
+      })
+    )
+  }
+}
+
+export function clearNativeChatPendingAttachments(scopeKey: string): void {
+  if (pendingCache.has(scopeKey)) {
+    writePending(scopeKey, [])
+  }
+}
+
+function dropPendingWhere(
+  matches: (scopeKey: string, owner: NativeChatComposerDraftOwner | undefined) => boolean
+): void {
+  for (const scopeKey of pendingCache.keys()) {
+    if (matches(scopeKey, pendingOwners.get(scopeKey))) {
+      writePending(scopeKey, [])
+    }
+  }
+}
+
+/** The chips of every pane in a closed tab, matched as its drafts are; never a conversation's. */
+export function dropNativeChatPendingAttachmentsForTab(tabId: string): void {
+  dropPendingWhere(
+    (scopeKey) =>
+      structuredAgentSessionIdOfDraftScope(scopeKey) === null &&
+      nativeChatDraftScopeTabId(scopeKey) === tabId
+  )
+}
+
+/** The chips begun in a removed workspace, open and closed chats alike. */
+export function dropNativeChatPendingAttachmentsOwnedBy(owner: NativeChatComposerDraftOwner): void {
+  dropPendingWhere(
+    (_scopeKey, pendingOwner) =>
+      pendingOwner?.workspaceId === owner.workspaceId &&
+      pendingOwner.executionHostId === owner.executionHostId
+  )
+}
+
+export function clearNativeChatPendingAttachmentsForTests(): void {
+  pendingCache.clear()
+  pendingOwners.clear()
+}
diff --git a/src/renderer/src/components/native-chat/native-chat-queue-send-confirm.test.tsx b/src/renderer/src/components/native-chat/native-chat-queue-send-confirm.test.tsx
index faa8915f648d..fa1d52d4e01f 100644
--- a/src/renderer/src/components/native-chat/native-chat-queue-send-confirm.test.tsx
+++ b/src/renderer/src/components/native-chat/native-chat-queue-send-confirm.test.tsx
@@ -139,8 +139,7 @@ beforeEach(() => {
     configurable: true,
     value: {
       git: { discoverCommitMessageModels: vi.fn().mockResolvedValue({ success: false }) },
-      pty: { getMainBufferSnapshot: vi.fn().mockResolvedValue(null) },
-      ui: { onFileDrop: () => vi.fn() }
+      pty: { getMainBufferSnapshot: vi.fn().mockResolvedValue(null) }
     }
   })
 })
@@ -392,3 +391,40 @@ describe('sending while the queue is held', () => {
     expect(held.send).toHaveBeenCalledTimes(1)
   })
 })
+
+// The chat takes one send at a time: while ours is out the question would only lead to a refused send.
+describe('sending while the queue is held and a send is out', () => {
+  it('asks nothing and sends nothing on Enter; the text stays', async () => {
+    const hold = heldQueue(2)
+    const input = renderComposer({ ...transport(hold), sendOut: true })
+    changePrompt(input, 'not yet')
+    await act(async () => pressEnter(input))
+    expect(screen.queryByRole('dialog')).toBeNull()
+    expect(hold.clear).not.toHaveBeenCalled()
+    expect(promptValue(input)).toBe('not yet')
+  })
+
+  it('Clear queue deletes nothing when a send went out after the question opened', async () => {
+    const hold = heldQueue(2)
+    const structured = transport(hold)
+    paneCounter += 1
+    const view = (sendOut: boolean) => (
+      <NativeChatComposer
+        terminalTabId={`tab-${paneCounter}`}
+        paneKey={`tab-${paneCounter}:structured`}
+        targetPtyId={null}
+        agent="codex"
+        structuredTransport={{ ...structured, sendOut }}
+      />
+    )
+    const { rerender } = render(view(false))
+    const input = screen.getByRole('textbox')
+    changePrompt(input, 'start over')
+    await act(async () => pressEnter(input))
+    const clear = await screen.findByRole('button', { name: 'Clear queue' })
+    rerender(view(true))
+    await act(async () => fireEvent.click(clear))
+    expect(hold.clear).not.toHaveBeenCalled()
+    expect(structured.send).not.toHaveBeenCalled()
+  })
+})
diff --git a/src/renderer/src/components/native-chat/native-chat-quote-selection.ts b/src/renderer/src/components/native-chat/native-chat-quote-selection.ts
new file mode 100644
index 000000000000..c5e3b44b4084
--- /dev/null
+++ b/src/renderer/src/components/native-chat/native-chat-quote-selection.ts
@@ -0,0 +1,60 @@
+/** Marks the prose of an agent reply; only a selection inside one of these can be quoted. */
+export const NATIVE_CHAT_QUOTE_SOURCE_PROPS = { 'data-native-chat-quote-source': '' } as const
+
+const QUOTE_SOURCE_SELECTOR = '[data-native-chat-quote-source]'
+
+/** The selection when all of it sits inside one agent reply of this chat, else null. */
+export function readNativeChatQuotableSelection(
+  root: HTMLElement
+): { text: string; range: Range } | null {
+  const selection = window.getSelection()
+  if (!selection || selection.isCollapsed || selection.rangeCount !== 1) {
+    return null
+  }
+  const range = selection.getRangeAt(0)
+  if (!root.contains(range.commonAncestorContainer)) {
+    return null
+  }
+  const edges = selectedTextEdges(range)
+  const source = edges?.first.parentElement?.closest(QUOTE_SOURCE_SELECTOR)
+  const text = selection.toString().trim()
+  if (!edges || !source || !source.contains(edges.last) || text === '') {
+    return null
+  }
+  return { text, range }
+}
+
+// Why: a triple-click ends its range at the start of the next block, often outside the reply, so
+// the reply is judged by the text actually selected and not by the range's endpoints.
+function selectedTextEdges(range: Range): { first: Text; last: Text } | null {
+  const container = range.commonAncestorContainer
+  if (container instanceof Text) {
+    return { first: container, last: container }
+  }
+  const walker = document.createTreeWalker(container, NodeFilter.SHOW_TEXT)
+  const covered: Text[] = []
+  for (let node = walker.nextNode(); node; node = walker.nextNode()) {
+    if (!(node instanceof Text) || !range.intersectsNode(node)) {
+      continue
+    }
+    const start = node === range.startContainer ? range.startOffset : 0
+    const end = node === range.endContainer ? range.endOffset : node.length
+    if (start < end) {
+      covered.push(node)
+    }
+  }
+  const first = covered.find(isSelectableText)
+  const last = covered.findLast(isSelectableText)
+  return first && last ? { first, last } : null
+}
+
+// Why: text that cannot be selected (a reply's timestamp) is in the range but not in the selection.
+function isSelectableText(node: Text): boolean {
+  return node.parentElement !== null && getComputedStyle(node.parentElement).userSelect !== 'none'
+}
+
+/** The text as a markdown blockquote, then the blank line that ends it so a reply can follow. */
+export function formatNativeChatQuote(text: string): string {
+  const lines = text.trim().split(/\r?\n/)
+  return `${lines.map((line) => (line.trim() ? `> ${line}` : '>')).join('\n')}\n\n`
+}
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 4d8232303e99..f80e9977af65 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
@@ -1,5 +1,7 @@
 import { describe, expect, it } from 'vitest'
 import {
+  AGENT_SESSION_OUTLINE_PREVIEW_MAX_CHARS,
+  nativeChatTurnReplyPreviews,
   projectAgentSessionConversationOutline,
   truncateOutlinePreview
 } from '../../../../shared/agent-session-conversation-outline'
@@ -11,9 +13,15 @@ import type {
 import { agentJournalSubmissionKey } from '../../../../shared/agent-session-journal-item-key'
 import { DISPATCH_REJECTED_CANCELLED } from '../../../../shared/structured-agent-session-dispatch-rejection'
 import type { NativeChatMessage } from '../../../../shared/native-chat-types'
-import { buildNativeChatRailItems } from './native-chat-message-rail-items'
+import { nativeChatRowsInDrawOrder } from '../../../../shared/native-chat-turn-grouping'
+import { nativeChatTurnMembership } from '../../../../shared/native-chat-turn-membership'
+import {
+  buildNativeChatRailItems,
+  nativeChatRailReplyPreview
+} from './native-chat-message-rail-items'
 import { createNativeChatMessageListProjection } from './native-chat-message-list-projection'
 import type { NativeChatResolvedPrompt } from './native-chat-resolution-receipt'
+import { nativeChatSubagentSections } from './native-chat-subagent-sections'
 import { projectNativeChatTaskListFrames } from './native-chat-task-list-frames'
 import { omitNativeChatThreadGoalRows } from './native-chat-thread-goal-rows'
 import { buildNativeChatTranscriptSlots } from './native-chat-transcript-slots'
@@ -66,31 +74,53 @@ const JOURNAL: AgentJournalRenderItem[] = [
   { ...user(12, [{ type: 'text', text: 'Observed earlier' }]), observedAt: 1_009.5 }
 ]
 
-/** The renderer's own path from journal items to rail items, as the list runs it. */
-function loadedRailItems(items: AgentJournalRenderItem[], submissions: AgentJournalSubmission[]) {
-  const projected = createNativeChatMessageListProjection()(
+/** The renderer's own path from journal items to slots, as the list runs it.
+ *  `openSections`: the subagent sections the reader has expanded. */
+function loadedSlots(
+  items: AgentJournalRenderItem[],
+  submissions: AgentJournalSubmission[],
+  openSections: readonly string[] = []
+) {
+  const projection = createNativeChatMessageListProjection()(
     projectStructuredAgentSessionMessages(items, [], submissions)
-  ).conversation
-  const messages = omitNativeChatThreadGoalRows(projectNativeChatTaskListFrames(projected))
-  let turn: string | undefined
-  const turnKeys = messages.map((message) => {
-    if (message.role === 'user') {
-      turn = message.id
-    }
-    return turn
-  })
+  )
+  const messages = omitNativeChatThreadGoalRows(
+    projectNativeChatTaskListFrames(projection.conversation)
+  )
+  const membership = nativeChatTurnMembership(messages, { items, submissions })
+  const rows = {
+    messages: nativeChatRowsInDrawOrder(messages, membership.drawOrder),
+    turnKeys: nativeChatRowsInDrawOrder(membership.turnKeys, membership.drawOrder)
+  }
   const slots = buildNativeChatTranscriptSlots({
-    messages,
-    turnKeys,
-    liveTurnKey: turn,
+    ...rows,
+    liveTurnKey: membership.liveTurnKey,
     receipts: new Map<string, NativeChatResolvedPrompt>(),
     turnStatuses: { active: null, completedByTurn: {} },
     turnDiffs: new Map<string, NativeChatTurnDiff>(),
     expandedTurnKeys: new Set<string>(),
     isWorking: false,
-    lifecycleWorking: false
+    lifecycleWorking: false,
+    subagentSections: nativeChatSubagentSections(messages, projection.subagentRows),
+    subagentChoices: {
+      sections: new Map(openSections.map((agentId) => [agentId, true])),
+      rosters: new Map()
+    }
   })
-  return buildNativeChatRailItems(slots)
+  return { rows, slots }
+}
+
+function loadedRailItems(
+  items: AgentJournalRenderItem[],
+  submissions: AgentJournalSubmission[],
+  openSections?: readonly string[]
+) {
+  const { rows, slots } = loadedSlots(items, submissions, openSections)
+  const railItems = buildNativeChatRailItems(slots)
+  return railItems.map((item) => ({
+    ...item,
+    reply: nativeChatRailReplyPreview(rows, railItems, item.id)
+  }))
 }
 
 describe('conversation outline parity with the loaded rail', () => {
@@ -108,9 +138,10 @@ describe('conversation outline parity with the loaded rail', () => {
       outline.map((entry) => ({
         id: entry.itemId,
         text: entry.preview,
-        hasImages: entry.imageCount > 0
+        hasImages: entry.imageCount > 0,
+        reply: entry.reply ?? ''
       }))
-    ).toEqual(loaded.map(({ id, text, hasImages }) => ({ id, text, hasImages })))
+    ).toEqual(loaded.map(({ id, text, hasImages, reply }) => ({ id, text, hasImages, reply })))
     // Anti-vacuous: the folded tool result, the refused send, the harness turn and the empty
     // prompt were all dropped, and the recovered row sits where it was journalled.
     expect(outline.map((entry) => entry.itemId)).toEqual([
@@ -151,18 +182,153 @@ describe('conversation outline parity with the loaded rail', () => {
     ).toContain(agentJournalSubmissionKey('client-stopped'))
   })
 
-  it('carries each entry its creation sequence and image count', () => {
+  // An imported tool result rides a user row mid-turn; it must not end the turn's reply.
+  it('reads a reply past a tool result folded into the turn, loaded or outlined', () => {
+    const journal = [
+      user(1, [{ type: 'text', text: 'Fix it' }]),
+      row(2, { kind: 'message', role: 'assistant', blocks: [{ type: 'text', text: 'Looking.' }] }),
+      row(3, { kind: 'tool-call', name: 'Read', state: 'completed', input: { file_path: 'a.ts' } }),
+      user(4, [{ type: 'tool-result', output: 'file body' }]),
+      row(5, { kind: 'message', role: 'assistant', blocks: [{ type: 'text', text: 'Fixed.' }] })
+    ]
+    expect(projectAgentSessionConversationOutline(journal, []).map((entry) => entry.reply)).toEqual(
+      ['Fixed.']
+    )
+    expect(loadedRailItems(journal, []).map((item) => item.reply)).toEqual(['Fixed.'])
+  })
+
+  // A subagent's rows are its own, not the conversation's: its prompt is no tick and
+  // its prose is no reply, whether or not its section is open.
+  it('never reads a subagent into the rail, as a tick or as a reply', () => {
+    const journal = [
+      user(1, [{ type: 'text', text: 'Fix it' }]),
+      row(2, { kind: 'message', role: 'assistant', blocks: [{ type: 'text', text: 'Fixed.' }] }),
+      { ...user(3, [{ type: 'text', text: 'Child task' }]), agentId: 'sub-1' },
+      {
+        ...row(4, {
+          kind: 'message',
+          role: 'assistant',
+          blocks: [{ type: 'text', text: 'Child done.' }]
+        }),
+        agentId: 'sub-1'
+      }
+    ]
+    const outline = projectAgentSessionConversationOutline(journal, [])
+    expect(outline.map(({ itemId, reply }) => ({ id: itemId, reply }))).toEqual([
+      { id: 'item-1', reply: 'Fixed.' }
+    ])
+    // Anti-vacuous: with its section open, the child's prompt is a drawn row.
+    const open = loadedSlots(journal, [], ['sub-1']).slots
+    expect(open.some((slot) => slot.kind === 'message' && slot.message.id === 'item-3')).toBe(true)
+    for (const sections of [[], ['sub-1']]) {
+      expect(
+        loadedRailItems(journal, [], sections).map(({ id, reply }) => ({ id, reply }))
+      ).toEqual([{ id: 'item-1', reply: 'Fixed.' }])
+    }
+  })
+
+  // A steer joins the running turn, so the host names that turn for it: a client
+  // that has not loaded the steer cannot otherwise tell whose reply it shares.
+  it("names the turn of a steer, and gives it that turn's reply", () => {
+    const inTurn = { turnScope: { kind: 'turn' as const, turnItemId: 'turn-1' } }
+    const journal: AgentJournalRenderItem[] = [
+      { ...user(1, [{ type: 'text', text: 'Fix it' }]), ...inTurn },
+      row(
+        2,
+        { kind: 'turn', turnId: 'turn-1', state: 'completed', userItemId: 'item-1', startedAt: 0 },
+        'turn-1'
+      ),
+      {
+        ...row(3, {
+          kind: 'message',
+          role: 'assistant',
+          blocks: [{ type: 'text', text: 'Looking.' }]
+        }),
+        ...inTurn
+      },
+      { ...user(4, [{ type: 'text', text: 'Also the tests' }]), ...inTurn },
+      {
+        ...row(5, {
+          kind: 'message',
+          role: 'assistant',
+          blocks: [{ type: 'text', text: 'Done.' }]
+        }),
+        ...inTurn
+      }
+    ]
+    expect(
+      projectAgentSessionConversationOutline(journal, []).map(({ itemId, turnKey, reply }) => ({
+        itemId,
+        turnKey,
+        reply
+      }))
+    ).toEqual([
+      { itemId: 'item-1', turnKey: undefined, reply: 'Done.' },
+      { itemId: 'item-4', turnKey: 'item-1', reply: 'Done.' }
+    ])
+  })
+
+  it('carries each entry its creation sequence, image count and the reply to it', () => {
     const outline = projectAgentSessionConversationOutline(JOURNAL, [REJECTED])
     expect(outline).toEqual([
-      { itemId: 'item-1', sequence: 1, preview: 'Fix the parser', imageCount: 0 },
+      { itemId: 'item-1', sequence: 1, preview: 'Fix the parser', imageCount: 0, reply: 'On it.' },
       { itemId: 'item-5', sequence: 5, preview: '', imageCount: 1 },
-      { itemId: 'item-9', sequence: 9, preview: 'Compare these', imageCount: 2 },
+      {
+        itemId: 'item-9',
+        sequence: 9,
+        preview: 'Compare these',
+        imageCount: 2,
+        reply: 'Done.'
+      },
       { itemId: 'item-11', sequence: 11, preview: 'Thanks', imageCount: 0 },
       { itemId: 'item-12', sequence: 12, preview: 'Observed earlier', imageCount: 0 }
     ])
   })
 })
 
+describe('reply preview', () => {
+  const says = (text: string): Pick<NativeChatMessage, 'role' | 'blocks'> => ({
+    role: 'assistant',
+    blocks: [{ type: 'text', text }]
+  })
+  const asks: Pick<NativeChatMessage, 'role' | 'blocks'> = {
+    role: 'user',
+    blocks: [{ type: 'text', text: 'prompt' }]
+  }
+
+  it("is the turn's last assistant prose, as plain text, whatever sits between", () => {
+    const fixed =
+      '## Fixed\n\n```ts\nconst hidden = 1\n```\n\n- The **parser** now reads `a.ts`.\n---'
+    expect(
+      nativeChatTurnReplyPreviews(
+        // A steer and a prompt queued for the next turn both land mid-turn.
+        [asks, says('Let me look.'), asks, asks, says(fixed), says('A later turn.')],
+        ['t1', 't1', 't1', 't2', 't1', 't2']
+      )
+    ).toEqual(
+      new Map([
+        ['t1', 'Fixed The parser now reads a.ts.'],
+        ['t2', 'A later turn.']
+      ])
+    )
+  })
+
+  it('keeps earlier prose when the last message is only code, and skips a turn with none', () => {
+    expect(
+      nativeChatTurnReplyPreviews(
+        [says('Here it is:'), says('```\ncode\n```'), asks],
+        ['t1', 't1', 't2']
+      )
+    ).toEqual(new Map([['t1', 'Here it is:']]))
+  })
+
+  it('is cut to the preview cap', () => {
+    expect(nativeChatTurnReplyPreviews([says('word '.repeat(200))], ['t1']).get('t1')).toHaveLength(
+      AGENT_SESSION_OUTLINE_PREVIEW_MAX_CHARS - 1
+    )
+  })
+})
+
 describe('outline preview truncation', () => {
   it('cuts to the cap without splitting a surrogate pair', () => {
     expect(truncateOutlinePreview('short', 10)).toBe('short')
diff --git a/src/renderer/src/components/native-chat/native-chat-reader-scroll-input.ts b/src/renderer/src/components/native-chat/native-chat-reader-scroll-input.ts
index a1f5fe3ee65b..4f1ea0dbe144 100644
--- a/src/renderer/src/components/native-chat/native-chat-reader-scroll-input.ts
+++ b/src/renderer/src/components/native-chat/native-chat-reader-scroll-input.ts
@@ -67,6 +67,8 @@ function gestureLeavesEnd(gesture: ReaderGesture, transcript: HTMLElement): bool
 
 type ReaderScrollCallbacks = {
   onReaderScroll: () => void
+  /** The same gesture, for whatever was still moving the transcript to yield to it. */
+  onTakeScroll?: () => void
   onLeaveEnd: () => void
 }
 
@@ -135,8 +137,12 @@ export function nativeChatReaderScrollInputHandlers({
 /** The transcript scroller's input props, and the wheel the rail overlaying it forwards. */
 export function useNativeChatReaderScrollInput(
   scrollRef: React.RefObject<HTMLElement | null>,
-  { onReaderScroll, onLeaveEnd }: ReaderScrollCallbacks
+  { onReaderScroll: onScrollInput, onTakeScroll, onLeaveEnd }: ReaderScrollCallbacks
 ): { scrollerProps: NativeChatReaderScrollInputHandlers; railWheel: (deltaY: number) => void } {
+  const onReaderScroll = useCallback(() => {
+    onScrollInput()
+    onTakeScroll?.()
+  }, [onScrollInput, onTakeScroll])
   const scrollerProps = useMemo(
     () => nativeChatReaderScrollInputHandlers({ onReaderScroll, onLeaveEnd }),
     [onLeaveEnd, onReaderScroll]
diff --git a/src/renderer/src/components/native-chat/native-chat-resolution-receipt.ts b/src/renderer/src/components/native-chat/native-chat-resolution-receipt.ts
index 475966a1b03a..f4cd563be04e 100644
--- a/src/renderer/src/components/native-chat/native-chat-resolution-receipt.ts
+++ b/src/renderer/src/components/native-chat/native-chat-resolution-receipt.ts
@@ -8,6 +8,7 @@ import {
 } from '../../../../shared/agent-session-question-answer'
 
 export type NativeChatResolvedPrompt = AgentJournalApprovalItem | AgentJournalQuestionItem
+/** `answer` is '' for an explicitly empty text answer and null when the answer cannot be read. */
 export type NativeChatReceiptAnswer = { question: string | null; answer: string | null }
 
 export function nativeChatReceiptAnswers(
@@ -28,11 +29,16 @@ export function nativeChatReceiptAnswers(
         (id) => question.options.find((option) => option.id === id)?.label
       )
       const valid = labels?.every((label) => label !== undefined)
+      const parts = [...(labels ?? []), ...(answer?.other?.trim() ? [answer.other] : [])]
       return {
         question: body.questions ? question.question : null,
-        answer: valid
-          ? [...(labels ?? []), ...(answer?.other ? [answer.other] : [])].join(' · ') || null
-          : null
+        answer: !valid
+          ? null
+          : parts.length > 0
+            ? parts.join(' · ')
+            : answer?.other !== undefined
+              ? ''
+              : null
       }
     })
   }
diff --git a/src/renderer/src/components/native-chat/native-chat-row-height-estimate.test.ts b/src/renderer/src/components/native-chat/native-chat-row-height-estimate.test.ts
index e9977790eee2..3939202351e1 100644
--- a/src/renderer/src/components/native-chat/native-chat-row-height-estimate.test.ts
+++ b/src/renderer/src/components/native-chat/native-chat-row-height-estimate.test.ts
@@ -21,6 +21,18 @@ function message(text: string, role: NativeChatMessage['role'] = 'assistant'): N
 }
 
 describe('transcript row height estimate', () => {
+  it('estimates a long prompt at its folded height, however long it runs', () => {
+    const height = (lines: number, role: NativeChatMessage['role']): number =>
+      estimateNativeChatRowHeight(
+        nativeChatRowContentMetrics(message(Array(lines).fill('line').join('\n'), role)),
+        NO_CHROME
+      )
+    expect(height(40, 'user')).toBe(height(400, 'user'))
+    expect(height(40, 'user')).toBeLessThan(height(40, 'assistant'))
+    expect(height(8, 'user')).toBeGreaterThan(height(7, 'user'))
+    expect(height(400, 'user')).toBe(height(9, 'user'))
+  })
+
   it('reuses row metrics across a one-pixel resize and refreshes after a substantial resize', () => {
     const prose = message('x'.repeat(900))
     const metricsAtWidth = (width: number) => {
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 adf02f0ab732..1f15fbefcd5a 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
@@ -10,12 +10,18 @@
 
 import type { NativeChatMessage } from '../../../../shared/native-chat-types'
 import { deriveNativeChatRowContent } from '../../../../shared/native-chat-row-content'
+import {
+  NATIVE_CHAT_USER_MESSAGE_FOLDED_PX,
+  nativeChatUserMessageFolds
+} from './native-chat-user-message-fold'
 
 /** What a row contains, reduced to the few numbers that drive its height. */
 export type NativeChatRowContentMetrics = {
   role: NativeChatMessage['role']
   /** Wrapped display lines of prose, not source lines. */
   textLines: number
+  /** A user prompt long enough to mount folded behind "Show full message". */
+  userFolds: boolean
   imageCount: number
   toolCount: number
   subagentGroupCount: number
@@ -40,6 +46,7 @@ export type NativeChatRowTypography = {
 const DEFAULT_ROW_TYPOGRAPHY: NativeChatRowTypography = { lineHeightPx: 22, charsPerLine: 96 }
 const PROSE_MIN_LINES = 1
 const USER_BUBBLE_CHROME_PX = 32
+const USER_FOLD_TOGGLE_PX = 24
 const IMAGE_STRIP_PX = 88
 /** Header margin and vertical padding; its summary can occupy two text lines. */
 const TOOL_RUN_CHROME_PX = 16
@@ -103,6 +110,7 @@ export function nativeChatRowContentMetrics(
   const metrics: NativeChatRowContentMetrics = {
     role: message.role,
     textLines: estimateNativeChatTextLines(content.markdown, typography.charsPerLine),
+    userFolds: message.role === 'user' && nativeChatUserMessageFolds(content.markdown),
     imageCount: content.prose.filter((block) => block.type === 'image-ref').length,
     toolCount: content.tools.length,
     subagentGroupCount: content.subagentGroups.length
@@ -120,6 +128,7 @@ export function nativeChatWorkRunContentMetrics(
   return {
     role: 'assistant',
     textLines: headIsLead ? head.textLines : 0,
+    userFolds: false,
     imageCount: headIsLead ? head.imageCount : 0,
     toolCount: 1,
     subagentGroupCount: 0
@@ -153,7 +162,9 @@ export function estimateNativeChatRowHeight(
         ? content.textLines > 0
           ? collapsedReasoningHeight(typography)
           : 0
-        : content.textLines * typography.lineHeightPx
+        : content.userFolds
+          ? NATIVE_CHAT_USER_MESSAGE_FOLDED_PX + USER_FOLD_TOGGLE_PX
+          : content.textLines * typography.lineHeightPx
     if (content.role === 'user' && content.textLines > 0) {
       height += USER_BUBBLE_CHROME_PX
     }
diff --git a/src/renderer/src/components/native-chat/native-chat-runtime-owner-selector.test.ts b/src/renderer/src/components/native-chat/native-chat-runtime-owner-selector.test.ts
new file mode 100644
index 000000000000..8e476421bba0
--- /dev/null
+++ b/src/renderer/src/components/native-chat/native-chat-runtime-owner-selector.test.ts
@@ -0,0 +1,122 @@
+import { describe, expect, it } from 'vitest'
+import type { TerminalTab } from '../../../../shared/terminal-tab-types'
+import {
+  createNativeChatRuntimeSelector,
+  selectNativeChatRuntimeEnvironmentId,
+  type NativeChatRuntimeOwnerState
+} from './native-chat-runtime-owner'
+
+function tab(id: string): TerminalTab {
+  return {
+    id,
+    ptyId: null,
+    worktreeId: 'owner',
+    title: id,
+    customTitle: null,
+    color: null,
+    sortOrder: 0,
+    createdAt: 0
+  }
+}
+
+function state(): NativeChatRuntimeOwnerState {
+  return {
+    tabsByWorktree: { owner: [tab('target')] },
+    worktreesByRepo: { repo: [{ id: 'owner', repoId: 'repo', hostId: 'runtime:first' }] }
+  }
+}
+
+describe('createNativeChatRuntimeSelector', () => {
+  it('does not inspect terminal rows during unrelated publications and keeps runtime routing fresh', () => {
+    const initial = state()
+    const target = initial.tabsByWorktree.owner?.[0]
+    if (!target) {
+      throw new Error('Expected the target tab fixture')
+    }
+    let reads = 0
+    Object.defineProperty(target, 'id', {
+      get: () => {
+        reads++
+        return 'target'
+      }
+    })
+    const select = createNativeChatRuntimeSelector('target')
+    expect(select(initial)).toBe('first')
+    expect(reads).toBe(1)
+    for (let i = 0; i < 100; i++) {
+      const next: NativeChatRuntimeOwnerState = {
+        ...initial,
+        worktreesByRepo: { repo: [{ id: 'owner', repoId: 'repo', hostId: `runtime:next-${i}` }] }
+      }
+      expect(select(next)).toBe(`next-${i}`)
+    }
+    expect(reads).toBe(1)
+    expect(select({ ...initial, tabsByWorktree: { ...initial.tabsByWorktree } })).toBe('first')
+    expect(reads).toBe(2)
+  })
+
+  it('preserves first terminal owner, move, close, and independent tab identities', () => {
+    const initial = state()
+    const withCollision: NativeChatRuntimeOwnerState = {
+      ...initial,
+      tabsByWorktree: { ...initial.tabsByWorktree, later: [tab('target'), tab('second')] },
+      worktreesByRepo: {
+        repo: [
+          ...(initial.worktreesByRepo?.repo ?? []),
+          { id: 'later', repoId: 'repo', hostId: 'runtime:later' }
+        ]
+      }
+    }
+    const select = createNativeChatRuntimeSelector('target')
+    const selectSecond = createNativeChatRuntimeSelector('second')
+    for (const next of [
+      initial,
+      withCollision,
+      { ...withCollision, tabsByWorktree: { later: [tab('target'), tab('second')] } },
+      { ...withCollision, tabsByWorktree: {} }
+    ]) {
+      expect(select(next)).toBe(selectNativeChatRuntimeEnvironmentId(next, 'target'))
+      expect(selectSecond(next)).toBe(selectNativeChatRuntimeEnvironmentId(next, 'second'))
+    }
+  })
+
+  it('ignores structured-only tabs and refreshes active, detected, folder, and repo host projections', () => {
+    const select = createNativeChatRuntimeSelector('target')
+    const initial = state()
+    const missing = {
+      ...initial,
+      tabsByWorktree: {},
+      unifiedTabsByWorktree: { owner: [{ id: 'target', contentType: 'agent-session' }] }
+    }
+    expect(select(missing)).toBeNull()
+    const projections: NativeChatRuntimeOwnerState[] = [
+      initial,
+      {
+        ...initial,
+        activeWorktreeId: 'owner',
+        activeWorkspaceExecutionHostId: 'runtime:active' as const
+      },
+      {
+        ...initial,
+        detectedWorktreesByRepo: {
+          repo: { worktrees: [{ id: 'owner', repoId: 'repo', hostId: 'runtime:detected' }] }
+        }
+      },
+      {
+        ...initial,
+        worktreesByRepo: { repo: [{ id: 'owner', repoId: 'repo' }] },
+        repos: [{ id: 'repo', executionHostId: 'ssh:remote' as const }]
+      },
+      {
+        ...initial,
+        tabsByWorktree: { 'folder:scope': [tab('target')] },
+        folderWorkspaces: [
+          { id: 'scope', projectGroupId: 'group', executionHostId: 'runtime:folder' as const }
+        ]
+      }
+    ]
+    for (const next of projections) {
+      expect(select(next)).toBe(selectNativeChatRuntimeEnvironmentId(next, 'target'))
+    }
+  })
+})
diff --git a/src/renderer/src/components/native-chat/native-chat-runtime-owner.ts b/src/renderer/src/components/native-chat/native-chat-runtime-owner.ts
index 02aaae1a6f3a..a85739ae36c2 100644
--- a/src/renderer/src/components/native-chat/native-chat-runtime-owner.ts
+++ b/src/renderer/src/components/native-chat/native-chat-runtime-owner.ts
@@ -3,7 +3,10 @@ import {
   type WorktreeRuntimeOwnerState
 } from '@/lib/worktree-runtime-owner'
 import type { AppState } from '@/store/types'
-import { findTerminalTabWorktreeId } from './native-chat-file-link'
+import {
+  createNativeChatTabOwnerSelector,
+  findTerminalTabWorktreeId
+} from './native-chat-file-link'
 
 export type NativeChatRuntimeOwnerState = Pick<AppState, 'tabsByWorktree'> &
   WorktreeRuntimeOwnerState
@@ -28,3 +31,11 @@ export function selectNativeChatRuntimeEnvironmentId(
   const worktreeId = findTerminalTabWorktreeId(state.tabsByWorktree, terminalTabId)
   return worktreeId ? getRuntimeEnvironmentIdForWorktree(state, worktreeId) : null
 }
+
+export function createNativeChatRuntimeSelector(terminalTabId: string) {
+  const selectOwner = createNativeChatTabOwnerSelector(terminalTabId)
+  return (state: NativeChatRuntimeOwnerState): string | null => {
+    const worktreeId = selectOwner({ tabsByWorktree: state.tabsByWorktree })
+    return worktreeId ? getRuntimeEnvironmentIdForWorktree(state, worktreeId) : null
+  }
+}
diff --git a/src/renderer/src/components/native-chat/native-chat-sent-prompt-history.test.ts b/src/renderer/src/components/native-chat/native-chat-sent-prompt-history.test.ts
new file mode 100644
index 000000000000..9115732fd2da
--- /dev/null
+++ b/src/renderer/src/components/native-chat/native-chat-sent-prompt-history.test.ts
@@ -0,0 +1,101 @@
+import { describe, expect, it } from 'vitest'
+import type { NativeChatMessage } from '../../../../shared/native-chat-types'
+import {
+  nativeChatSentPrompts,
+  stepNativeChatPromptRecall
+} from './native-chat-sent-prompt-history'
+
+function message(
+  id: string,
+  role: NativeChatMessage['role'],
+  text: string,
+  extra: Partial<NativeChatMessage> = {}
+): NativeChatMessage {
+  return {
+    id,
+    role,
+    blocks: text ? [{ type: 'text', text }] : [],
+    timestamp: null,
+    source: 'transcript',
+    ...extra
+  }
+}
+
+describe('nativeChatSentPrompts', () => {
+  it('lists only prompts the user typed, oldest first', () => {
+    const prompts = nativeChatSentPrompts({
+      messages: [
+        message('1', 'user', 'first'),
+        message('2', 'assistant', 'reply'),
+        message('3', 'user', 'from a peer', {
+          from: { kind: 'agent', senders: [], orchestration: null }
+        }),
+        message('4', 'user', ''),
+        message('6', 'user', '<task-notification>done</task-notification>'),
+        message('7', 'user', 'prompt a parent agent gave its subagent', { agentId: 'sub-1' }),
+        message('5', 'user', 'second\n\nwith a paragraph ')
+      ]
+    })
+    expect(prompts).toEqual([
+      { id: '1', prompt: 'first' },
+      { id: '5', prompt: 'second\n\nwith a paragraph' }
+    ])
+  })
+
+  it('collapses a prompt sent back to back into its newest copy', () => {
+    const prompts = nativeChatSentPrompts({
+      messages: [
+        message('1', 'user', 'continue'),
+        message('2', 'assistant', 'ok'),
+        message('3', 'user', 'continue')
+      ]
+    })
+    expect(prompts).toEqual([{ id: '3', prompt: 'continue' }])
+  })
+
+  it('places a command the transcript holds no turn for by when it was sent', () => {
+    const prompts = nativeChatSentPrompts({
+      messages: [
+        message('1', 'user', 'before', { timestamp: 100 }),
+        message('2', 'user', 'after', { timestamp: 300 })
+      ],
+      commands: [
+        { id: 'a', command: '/model opus', sentAt: 200 },
+        { id: 'b', command: '/compact', sentAt: 400 }
+      ]
+    })
+    expect(prompts.map((entry) => entry.prompt)).toEqual([
+      'before',
+      '/model opus',
+      'after',
+      '/compact'
+    ])
+  })
+})
+
+describe('stepNativeChatPromptRecall', () => {
+  const prompts = [
+    { id: '1', prompt: 'one' },
+    { id: '2', prompt: 'two' }
+  ]
+
+  it('keeps its place when the recalled echo is replaced by its transcript turn', () => {
+    const step = stepNativeChatPromptRecall({
+      direction: 'back',
+      prompts,
+      position: { id: 'pending:9', recalled: 'two' },
+      draft: 'two'
+    })
+    expect(step?.draft).toBe('one')
+  })
+
+  it('keeps its place when a new prompt lands mid-recall', () => {
+    const step = stepNativeChatPromptRecall({
+      direction: 'back',
+      prompts: [...prompts, { id: '3', prompt: 'from another client' }],
+      position: { id: '2', recalled: 'two' },
+      draft: 'two'
+    })
+    expect(step?.draft).toBe('one')
+  })
+})
diff --git a/src/renderer/src/components/native-chat/native-chat-sent-prompt-history.ts b/src/renderer/src/components/native-chat/native-chat-sent-prompt-history.ts
new file mode 100644
index 000000000000..facbc7557545
--- /dev/null
+++ b/src/renderer/src/components/native-chat/native-chat-sent-prompt-history.ts
@@ -0,0 +1,114 @@
+// Terminal-style prompt recall: Up/Down in the composer walk what the chat shows the
+// user sent. Derived from the shown conversation at the keypress, so there is no
+// history to store, and recall survives a remount, a reload, and another client's sends.
+
+import { deriveNativeChatRowContent } from '../../../../shared/native-chat-row-content'
+import { projectNativeChatTranscriptMessages } from '../../../../shared/native-chat-transcript-projection'
+import type { NativeChatMessage } from '../../../../shared/native-chat-types'
+import type { NativeChatCommandMarker } from './native-chat-command-marker'
+import { compareMessages } from './native-chat-session-assembler'
+
+/** The conversation a composer recalls from. */
+export type NativeChatRecallSource = {
+  messages: readonly NativeChatMessage[]
+  /** Commands sent from this pane that the transcript holds no user turn for. */
+  commands?: readonly NativeChatCommandMarker[]
+}
+
+export type NativeChatSentPrompt = { id: string; prompt: string }
+
+/** Everything the composer's keydown needs to recall; absent leaves the arrows to the caret. */
+export type NativeChatComposerRecall = {
+  source: NativeChatRecallSource
+  position: NativeChatRecallPosition | null
+  setPosition: (position: NativeChatRecallPosition | null) => void
+  /** False keeps an arrow key moving the caret inside a recalled multi-line prompt. */
+  isCaretOnVisualEdge: (edge: 'start' | 'end') => boolean
+  /** Puts a recalled prompt in the editor with the caret at its end, as a shell does. Done at
+   *  the keypress: left to the draft sync, the caret stays wherever the last prompt had it. */
+  show: (prompt: string) => void
+}
+
+/** `id` survives new messages landing mid-recall; `recalled` is the text put in the
+ *  composer, and recall is over once the composer no longer holds it. */
+export type NativeChatRecallPosition = { id: string; recalled: string }
+
+/** Recall is live only while the composer still holds the recalled text untouched. */
+export function isNativeChatRecallActive(
+  position: NativeChatRecallPosition | null,
+  draft: string
+): position is NativeChatRecallPosition {
+  return position !== null && position.recalled === draft
+}
+
+/** Oldest first. Text only: an images-only send has nothing to recall. */
+export function nativeChatSentPrompts(source: NativeChatRecallSource): NativeChatSentPrompt[] {
+  const prompts: NativeChatSentPrompt[] = []
+  const push = (id: string, text: string): void => {
+    const prompt = text.trim()
+    if (prompt === '') {
+      return
+    }
+    // A prompt repeated back to back is one stop, as in a shell's history.
+    if (prompts.at(-1)?.prompt === prompt) {
+      prompts.pop()
+    }
+    prompts.push({ id, prompt })
+  }
+  const commands = source.commands ?? []
+  let nextCommand = 0
+  // Why projected: the raw list also holds harness-injected user turns and subagent prompts,
+  // which the chat never draws as the user's own.
+  for (const message of projectNativeChatTranscriptMessages(source.messages, compareMessages)) {
+    // `from` marks a prompt another agent sent; it was never typed here.
+    if (message.role !== 'user' || message.from) {
+      continue
+    }
+    while (
+      message.timestamp !== null &&
+      nextCommand < commands.length &&
+      commands[nextCommand].sentAt < message.timestamp
+    ) {
+      const command = commands[nextCommand++]
+      push(`command:${command.id}`, command.command)
+    }
+    push(message.id, deriveNativeChatRowContent(message.blocks).markdown)
+  }
+  for (const command of commands.slice(nextCommand)) {
+    push(`command:${command.id}`, command.command)
+  }
+  return prompts
+}
+
+/**
+ * One Up (`back`) or Down (`forward`) press. Null leaves the key to the caret. Back starts
+ * only from an empty composer and stops at the oldest prompt; forward past the newest
+ * empties the composer and ends recall.
+ */
+export function stepNativeChatPromptRecall(input: {
+  direction: 'back' | 'forward'
+  prompts: readonly NativeChatSentPrompt[]
+  position: NativeChatRecallPosition | null
+  draft: string
+}): { position: NativeChatRecallPosition | null; draft: string } | null {
+  const { prompts, position, draft } = input
+  let active = -1
+  if (isNativeChatRecallActive(position, draft)) {
+    active = prompts.findIndex((prompt) => prompt.id === position.id)
+    // An echo replaced by its transcript turn changes id but not text.
+    if (active < 0) {
+      active = prompts.findLastIndex((prompt) => prompt.prompt === position.recalled)
+    }
+  }
+  if (active < 0 && (input.direction === 'forward' || draft !== '')) {
+    return null
+  }
+  const next =
+    input.direction === 'forward'
+      ? prompts[active + 1]
+      : prompts[active < 0 ? prompts.length - 1 : active - 1]
+  if (next) {
+    return { position: { id: next.id, recalled: next.prompt }, draft: next.prompt }
+  }
+  return input.direction === 'forward' ? { position: null, draft: '' } : null
+}
diff --git a/src/renderer/src/components/native-chat/native-chat-session-attachment-drop.ts b/src/renderer/src/components/native-chat/native-chat-session-attachment-drop.ts
new file mode 100644
index 000000000000..0d655d8de8a3
--- /dev/null
+++ b/src/renderer/src/components/native-chat/native-chat-session-attachment-drop.ts
@@ -0,0 +1,122 @@
+import { basename } from '@/lib/path'
+import { extractIpcErrorMessage } from '@/lib/ipc-error'
+import { describeDropSkipReason } from '@/lib/drop-skip-reason-copy'
+import { isNativeChatImageAttachmentPath } from './native-chat-image-paste'
+import {
+  nativeChatAttachFailedNotice,
+  nativeChatAttachmentOwnerChangedNotice,
+  prepareNativeChatSessionAttachmentUpload,
+  uploadNativeChatSessionAttachmentPaths,
+  type NativeChatRuntimeSessionAttachmentOwner
+} from './native-chat-attachment-upload'
+
+/** The composer's pending-chip controls, as an upload drives them. */
+export type NativeChatPendingAttachmentChips = {
+  begin: (previewUrl?: string, pendingName?: string) => string | null
+  resolve: (id: string, path: string, connectionId?: string | null) => void
+  /** Removes the chip; false when the user already removed it, so its file must not attach. */
+  drop: (id: string) => boolean
+  /** Adds stored files as `@path` references to the scope's draft, which keeps them through an
+   *  input-method composition or a remount. */
+  attachReferences: (paths: string[]) => void
+}
+
+/**
+ * Drop or pick files into a structured chat on a paired server: upload them into the chat's store
+ * there, then attach the stored paths. Each file shows as a pending chip with its name at once, and
+ * Send waits for pending chips, so a message never leaves without a file the user attached. A chip
+ * the user removes meanwhile attaches nothing.
+ */
+export async function attachNativeChatSessionAttachmentPaths(args: {
+  paths: string[]
+  owner: NativeChatRuntimeSessionAttachmentOwner
+  chips: NativeChatPendingAttachmentChips
+  /** The composer was disabled or torn down meanwhile. */
+  isAbandoned: () => boolean
+  ownerStillCurrent: () => boolean
+  setNotice: (notice: string | null) => void
+}): Promise<void> {
+  const pending = args.paths.flatMap((path) => {
+    const chipId = args.chips.begin(undefined, basename(path))
+    // No chip: the composer refused the attach and already said why.
+    return chipId ? [{ path, chipId }] : []
+  })
+  if (pending.length === 0) {
+    return
+  }
+  const dropAll = (): void => {
+    for (const { chipId } of pending) {
+      args.chips.drop(chipId)
+    }
+  }
+  let stored: Map<string, string>
+  let reasons: Map<string, string>
+  try {
+    const prepared = await prepareNativeChatSessionAttachmentUpload(args.owner)
+    if (!prepared.ok) {
+      dropAll()
+      args.setNotice(prepared.notice)
+      return
+    }
+    const result = await uploadNativeChatSessionAttachmentPaths(
+      pending.map(({ path }) => path),
+      prepared.target
+    )
+    stored = new Map(result.uploaded.map(({ sourcePath, path }) => [sourcePath, path]))
+    reasons = new Map([
+      ...result.skipped.map(({ sourcePath, reason }): [string, string] => [
+        sourcePath,
+        describeDropSkipReason(reason) ?? reason
+      ]),
+      ...result.failed.map(({ sourcePath, reason }): [string, string] => [sourcePath, reason])
+    ])
+  } catch (error) {
+    // Every file failed for the same cause.
+    stored = new Map()
+    const cause = extractIpcErrorMessage(error, '')
+    reasons = new Map(pending.map(({ path }) => [path, cause]))
+  }
+  if (args.isAbandoned()) {
+    dropAll()
+    return
+  }
+  if (!args.ownerStillCurrent()) {
+    dropAll()
+    args.setNotice(nativeChatAttachmentOwnerChangedNotice())
+    return
+  }
+  const notAttached: { name: string; reason: string }[] = []
+  const references: string[] = []
+  for (const { path, chipId } of pending) {
+    const storedPath = stored.get(path)
+    if (!storedPath) {
+      if (args.chips.drop(chipId)) {
+        notAttached.push({ name: basename(path), reason: reasons.get(path) ?? '' })
+      }
+      continue
+    }
+    if (isNativeChatImageAttachmentPath(storedPath)) {
+      args.chips.resolve(chipId, storedPath, null)
+      continue
+    }
+    // Other files become `@path` references, as every attach does, unless their chip was removed.
+    if (args.chips.drop(chipId)) {
+      references.push(storedPath)
+    }
+  }
+  // Inserting at the caret clears the notice, so what failed is said after.
+  if (references.length > 0) {
+    args.chips.attachReferences(references)
+  }
+  if (notAttached.length > 0) {
+    // A cause every file shares is said once, after their names.
+    const [first] = notAttached
+    const shared = notAttached.every(({ reason }) => reason === first?.reason) ? first?.reason : ''
+    args.setNotice(
+      nativeChatAttachFailedNotice(
+        notAttached.map(({ name }) => name),
+        shared
+      )
+    )
+  }
+}
diff --git a/src/renderer/src/components/native-chat/native-chat-stopped-before-start-row.ts b/src/renderer/src/components/native-chat/native-chat-stopped-before-start-row.ts
index 4a3fb9daf38e..0f41e8c256bd 100644
--- a/src/renderer/src/components/native-chat/native-chat-stopped-before-start-row.ts
+++ b/src/renderer/src/components/native-chat/native-chat-stopped-before-start-row.ts
@@ -11,7 +11,7 @@ export function nativeChatBlocksInOwnWords(blocks: NativeChatBlock[]): NativeCha
               type: 'text',
               text: translate(
                 'components.native-chat.notices.stoppedBeforeStart',
-                'Stopped before the agent started'
+                'Stopped manually'
               )
             }
           : block
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 6206cb013cec..f40d12d87cfd 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
@@ -9,8 +9,13 @@ import type { NativeChatStructuredComposerTransport } from './native-chat-compos
 vi.mock('@/i18n/i18n', () => ({
   translate: (_key: string, fallback: string) => fallback
 }))
+const actions = vi.hoisted((): { sendDisabled: boolean | null } => ({ sendDisabled: null }))
+
 vi.mock('./NativeChatComposerActions', () => ({
-  NativeChatComposerActions: () => <div data-testid="composer-actions" />
+  NativeChatComposerActions: (props: { sendDisabled: boolean }) => {
+    actions.sendDisabled = props.sendDisabled
+    return <div data-testid="composer-actions" />
+  }
 }))
 vi.mock('./NativeChatAutocompleteMenus', () => ({
   NativeChatMentionMenu: () => null,
@@ -112,9 +117,9 @@ function pressEnter(input: HTMLTextAreaElement): void {
 
 let paneCounter = 0
 
-function renderComposer(structuredTransport: NativeChatStructuredComposerTransport): void {
+function renderComposer(structuredTransport: NativeChatStructuredComposerTransport) {
   paneCounter += 1
-  render(
+  return render(
     <NativeChatComposer
       terminalTabId={`tab-${paneCounter}`}
       paneKey={`tab-${paneCounter}:structured`}
@@ -130,8 +135,7 @@ beforeEach(() => {
     configurable: true,
     value: {
       git: { discoverCommitMessageModels: vi.fn().mockResolvedValue({ success: false }) },
-      pty: { getMainBufferSnapshot: vi.fn().mockResolvedValue(null) },
-      ui: { onFileDrop: () => vi.fn() }
+      pty: { getMainBufferSnapshot: vi.fn().mockResolvedValue(null) }
     }
   })
 })
@@ -304,3 +308,29 @@ describe('a withdrawn message put back during an IME composition', () => {
     expect(readNativeChatDraftCache(pane)).toBe('하\n\nwithdrawn')
   })
 })
+
+// One send per chat, as the common pattern: while it is out, Send is off and Enter keeps the text.
+describe('a structured send while the chat has one out', () => {
+  it('keeps the text in the box and Send disabled until the send settles', async () => {
+    const structured = transport({ send: vi.fn(() => false), sendOut: true })
+    const view = renderComposer(structured)
+    const input = textarea()
+    changePrompt(input, 'next one')
+    expect(actions.sendDisabled).toBe(true)
+
+    await act(async () => pressEnter(input))
+    expect(structured.send).toHaveBeenCalledWith('next one', [])
+    expect(promptValue(input)).toBe('next one')
+
+    view.rerender(
+      <NativeChatComposer
+        terminalTabId={`tab-${paneCounter}`}
+        paneKey={`tab-${paneCounter}:structured`}
+        targetPtyId={null}
+        agent="codex"
+        structuredTransport={{ ...structured, sendOut: false }}
+      />
+    )
+    expect(actions.sendDisabled).toBe(false)
+  })
+})
diff --git a/src/renderer/src/components/native-chat/native-chat-structured-session-notices.ts b/src/renderer/src/components/native-chat/native-chat-structured-session-notices.ts
index 4b2ca70a4f1b..789623329cd0 100644
--- a/src/renderer/src/components/native-chat/native-chat-structured-session-notices.ts
+++ b/src/renderer/src/components/native-chat/native-chat-structured-session-notices.ts
@@ -4,6 +4,11 @@ import { agentSessionRefusalCauseParts } from '../../../../shared/agent-session-
 import type { AgentSessionWriteRefusal } from '../../../../shared/agent-session-write-failure'
 import { joinSentences } from '../../../../shared/sentence-joining'
 import { agentSessionWriteNoticeText } from './agent-session-write-notice-text'
+import {
+  isClaudeSignInFailureKind,
+  nativeChatClaudeSignInLabel,
+  type NativeChatClaudeSignIn
+} from './native-chat-claude-sign-in'
 import type {
   NativeChatComposerNotice,
   NativeChatComposerNoticeContent
@@ -14,7 +19,8 @@ function nativeChatLaunchNotice({
   lifecycle,
   failure = null,
   agentLabel,
-  onRetry
+  onRetry,
+  claudeSignIn = null
 }: {
   lifecycle: StructuredAgentSessionLaunchLifecycle | null
   /** The host's refusal behind the failed start; its message is never shown. */
@@ -22,6 +28,8 @@ function nativeChatLaunchNotice({
   /** Names the agent in a start failure's words. */
   agentLabel?: string
   onRetry: () => void
+  /** Offered instead of Retry until it signs in, when the start failed for want of a sign-in. */
+  claudeSignIn?: NativeChatClaudeSignIn | null
 }): NativeChatComposerNotice | null {
   if (lifecycle !== 'failed' && lifecycle !== 'visibility-unknown') {
     return null
@@ -49,10 +57,17 @@ function nativeChatLaunchNotice({
     key: 'launch',
     kind: 'error',
     text: cause ? (saysStartFailure ? cause : joinSentences([message, cause])) : message,
-    action: {
-      label: translate('auto.components.native.chat.NativeChatLaunchRetry.retry', 'Retry'),
-      onClick: onRetry
-    }
+    action:
+      claudeSignIn && isClaudeSignInFailureKind(failure?.details?.reason)
+        ? {
+            label: nativeChatClaudeSignInLabel(claudeSignIn),
+            onClick: claudeSignIn.signIn,
+            disabled: claudeSignIn.signingIn
+          }
+        : {
+            label: translate('auto.components.native.chat.NativeChatLaunchRetry.retry', 'Retry'),
+            onClick: onRetry
+          }
   }
 }
 
@@ -61,7 +76,8 @@ export function structuredSessionNotices({
   launch,
   agentLabel,
   sessionError,
-  composerError
+  composerError,
+  claudeSignIn = null
 }: {
   launch: {
     lifecycle: StructuredAgentSessionLaunchLifecycle | null
@@ -71,12 +87,14 @@ export function structuredSessionNotices({
   agentLabel: string
   sessionError: string | null
   composerError: (NativeChatComposerNoticeContent & { onDismiss: () => void }) | null
+  claudeSignIn?: NativeChatClaudeSignIn | null
 }): NativeChatComposerNotice[] {
   const launchNotice = nativeChatLaunchNotice({
     lifecycle: launch.lifecycle,
     failure: launch.failure,
     agentLabel,
-    onRetry: launch.retry
+    onRetry: launch.retry,
+    claudeSignIn
   })
   return [
     ...(launchNotice ? [launchNotice] : []),
diff --git a/src/renderer/src/components/native-chat/native-chat-subagent-group-words-text.test.ts b/src/renderer/src/components/native-chat/native-chat-subagent-group-words-text.test.ts
new file mode 100644
index 000000000000..216c01594033
--- /dev/null
+++ b/src/renderer/src/components/native-chat/native-chat-subagent-group-words-text.test.ts
@@ -0,0 +1,54 @@
+import { describe, expect, it, vi } from 'vitest'
+import { translate } from '@/i18n/i18n'
+import type * as I18nModule from '@/i18n/i18n'
+import en from '@/i18n/locales/en.json'
+import {
+  NATIVE_CHAT_SUBAGENT_GROUP_COPY,
+  sayNativeChatSubagentGroupEnglish,
+  type NativeChatSubagentGroupCopyId
+} from '../../../../shared/native-chat-subagent-group-header'
+import { sayNativeChatSubagentGroupTranslated } from './native-chat-subagent-group-words-text'
+
+vi.mock('@/i18n/i18n', async (importOriginal) => {
+  const actual = await importOriginal<typeof I18nModule>()
+  return { ...actual, translate: vi.fn(actual.translate) }
+})
+
+const IDS = Object.keys(NATIVE_CHAT_SUBAGENT_GROUP_COPY).filter(
+  (id): id is NativeChatSubagentGroupCopyId => id in NATIVE_CHAT_SUBAGENT_GROUP_COPY
+)
+const VALUES = { value0: 3 }
+
+function isCatalogObject(value: unknown): value is Record<string, unknown> {
+  return typeof value === 'object' && value !== null && !Array.isArray(value)
+}
+
+function catalogEntry(key: string): unknown {
+  return key
+    .split('.')
+    .reduce<unknown>((node, part) => (isCatalogObject(node) ? node[part] : undefined), en)
+}
+
+describe('desktop words for a transcript roster row', () => {
+  it('says every piece as the phone does, in English', () => {
+    for (const id of IDS) {
+      expect([id, sayNativeChatSubagentGroupTranslated(id, VALUES)]).toEqual([
+        id,
+        sayNativeChatSubagentGroupEnglish(id, VALUES)
+      ])
+    }
+  })
+
+  it('gives each key the shared piece as its English default, and the catalog agrees', () => {
+    for (const id of IDS) {
+      vi.mocked(translate).mockClear()
+      sayNativeChatSubagentGroupTranslated(id, VALUES)
+      const calls = vi.mocked(translate).mock.calls
+      expect(calls).toHaveLength(1)
+      const [key, fallback] = calls[0]!
+      expect([id, fallback]).toEqual([id, NATIVE_CHAT_SUBAGENT_GROUP_COPY[id]])
+      expect(key.startsWith('components.native-chat.subagents.')).toBe(true)
+      expect([key, catalogEntry(key)]).toEqual([key, NATIVE_CHAT_SUBAGENT_GROUP_COPY[id]])
+    }
+  })
+})
diff --git a/src/renderer/src/components/native-chat/native-chat-subagent-group-words-text.ts b/src/renderer/src/components/native-chat/native-chat-subagent-group-words-text.ts
new file mode 100644
index 000000000000..d7161ae77728
--- /dev/null
+++ b/src/renderer/src/components/native-chat/native-chat-subagent-group-words-text.ts
@@ -0,0 +1,56 @@
+// Desktop words for a transcript roster row: each shared piece translated whole, with the shared
+// English as its fallback, so desktop and the phone never word one spawn group differently.
+
+import { translate } from '@/i18n/i18n'
+import {
+  NATIVE_CHAT_SUBAGENT_GROUP_COPY as COPY,
+  type NativeChatSubagentGroupCopyId,
+  type NativeChatSubagentGroupSay
+} from '../../../../shared/native-chat-subagent-group-header'
+
+const PIECES: Record<
+  NativeChatSubagentGroupCopyId,
+  (values?: { value0: string | number }) => string
+> = {
+  stateCompleted: () =>
+    translate('components.native-chat.subagents.state.completed', COPY.stateCompleted),
+  stateWorking: () =>
+    translate('components.native-chat.subagents.state.working', COPY.stateWorking),
+  stateIdle: () => translate('components.native-chat.subagents.state.idle', COPY.stateIdle),
+  stateFailed: () => translate('components.native-chat.subagents.state.failed', COPY.stateFailed),
+  stateStopped: () =>
+    translate('components.native-chat.subagents.state.stopped', COPY.stateStopped),
+  stateUnverifiable: () =>
+    translate('components.native-chat.subagents.state.unverifiable', COPY.stateUnverifiable),
+  stateWorkingCount: (values) =>
+    translate(
+      'components.native-chat.subagents.state.workingCount',
+      COPY.stateWorkingCount,
+      values
+    ),
+  stateIdleCount: (values) =>
+    translate('components.native-chat.subagents.state.idleCount', COPY.stateIdleCount, values),
+  stateFailedCount: (values) =>
+    translate('components.native-chat.subagents.state.failedCount', COPY.stateFailedCount, values),
+  stateStoppedCount: (values) =>
+    translate(
+      'components.native-chat.subagents.state.stoppedCount',
+      COPY.stateStoppedCount,
+      values
+    ),
+  stateUnverifiableCount: (values) =>
+    translate(
+      'components.native-chat.subagents.state.unverifiableCount',
+      COPY.stateUnverifiableCount,
+      values
+    ),
+  startedOne: () => translate('components.native-chat.subagents.startedOne', COPY.startedOne),
+  startedN: (values) =>
+    translate('components.native-chat.subagents.startedN', COPY.startedN, values),
+  ranOne: () => translate('components.native-chat.subagents.ranOne', COPY.ranOne),
+  ranN: (values) => translate('components.native-chat.subagents.ranN', COPY.ranN, values),
+  tokens: (values) => translate('components.native-chat.subagents.tokens', COPY.tokens, values)
+}
+
+export const sayNativeChatSubagentGroupTranslated: NativeChatSubagentGroupSay = (id, values) =>
+  PIECES[id](values)
diff --git a/src/renderer/src/components/native-chat/native-chat-submission-navigation.test.tsx b/src/renderer/src/components/native-chat/native-chat-submission-navigation.test.tsx
index a93b7b3671c2..15f16c1be603 100644
--- a/src/renderer/src/components/native-chat/native-chat-submission-navigation.test.tsx
+++ b/src/renderer/src/components/native-chat/native-chat-submission-navigation.test.tsx
@@ -123,6 +123,7 @@ function useReviewTranscript() {
     showsTailRow: true,
     isVisible: true,
     alignToViewportTop: vi.fn(),
+    isAlignPending: () => false,
     scrollToEnd,
     restoreScrollOffset: vi.fn(),
     consumeProgrammaticScroll: () => false,
@@ -155,7 +156,6 @@ it('reveals a structured command at the press, before the host answers it', asyn
       structuredTransport: t,
       isComposing: () => false,
       clearSkillOrigin: vi.fn(),
-      setHistory: vi.fn(),
       setDraft: vi.fn(),
       setCaret: vi.fn()
     })
@@ -193,7 +193,6 @@ it('reveals a goal at the press, before the host sets it', async () => {
         disabled: false,
         sendPty: vi.fn(),
         sendStructured: vi.fn(),
-        setHistory: vi.fn(),
         setDraft: vi.fn(),
         setCaret: vi.fn()
       })
@@ -229,7 +228,6 @@ it.each(['/model', '/effort'])(
         structuredTransport: t,
         isComposing: () => false,
         clearSkillOrigin: vi.fn(),
-        setHistory: vi.fn(),
         setDraft: vi.fn(),
         setCaret: vi.fn()
       })
@@ -251,7 +249,6 @@ function localAnswerArgs() {
     answerCommandLocally: () => 'Context: 20k / 272k tokens',
     sessionOptionsSurface: null,
     trackPendingSend: vi.fn(),
-    setHistory: vi.fn(),
     setDraft: vi.fn(),
     setCaret: vi.fn(),
     clearSkillOrigin: vi.fn(),
@@ -306,8 +303,7 @@ it('reveals only the pane whose option send it was, at the press', async () => {
         agent: 'codex',
         disabled: false,
         resolveTarget: () => ({ ptyId, settings: null }),
-        onSubmitted: reveal.revealLatest,
-        setHistory: vi.fn()
+        onSubmitted: reveal.revealLatest
       })
     },
     { initialProps: { ptyId: 'pty-a' } }
@@ -336,8 +332,7 @@ it('reveals a PTY option send at the press, before the terminal confirms it', as
       agent: 'codex',
       disabled: false,
       resolveTarget: () => ({ ptyId: 'pty-a', settings: null }),
-      onSubmitted: transcript.revealLatest,
-      setHistory: vi.fn()
+      onSubmitted: transcript.revealLatest
     })
     return { ...transcript, command }
   })
@@ -370,7 +365,6 @@ it('control: a refused structured message does not reveal', async () => {
       structuredTransport: t,
       isComposing: () => false,
       clearSkillOrigin: vi.fn(),
-      setHistory: vi.fn(),
       setDraft: vi.fn(),
       setCaret: vi.fn()
     })
@@ -401,7 +395,6 @@ it('reveals a structured prompt answer at the press, before the host accepts it'
     const submits = useStructuredNativeChatSubmitReveal(
       {
         respond: async () => host.promise,
-        retry: vi.fn(),
         queuedMessages: {
           queueCapable: true,
           cards: [],
@@ -449,7 +442,6 @@ it('keeps an accepted queued draft out of transcript navigation', async () => {
       structuredTransport: t,
       isComposing: () => false,
       clearSkillOrigin: vi.fn(),
-      setHistory: vi.fn(),
       setDraft: vi.fn(),
       setCaret: vi.fn()
     })
diff --git a/src/renderer/src/components/native-chat/native-chat-tool-line-label.ts b/src/renderer/src/components/native-chat/native-chat-tool-line-label.ts
index 9a32e107f7e4..c2d2179092c5 100644
--- a/src/renderer/src/components/native-chat/native-chat-tool-line-label.ts
+++ b/src/renderer/src/components/native-chat/native-chat-tool-line-label.ts
@@ -23,7 +23,8 @@ export function nativeChatToolLineLabel(
   title: string
   command: boolean
   filePath: string | null
-  commandDetail?: string | null
+  /** The whole command, when the row had to shorten it. */
+  commandDetail: string | null
 } {
   const display = createToolInputDisplay(call.input)
   const category = nativeChatToolCategory(call.name, call.mcpIdentity)
@@ -34,7 +35,7 @@ export function nativeChatToolLineLabel(
     !result?.isError &&
     (call.state === 'completed' || result !== undefined)
   const failed = call.state === 'failed' || result?.isError === true
-  let commandDetail: string | null | undefined
+  let commandDetail: string | null = null
   let verb: string | null = null
   let target = display.label
   let title = display.filePath ?? target
diff --git a/src/renderer/src/components/native-chat/native-chat-tool-run-members-test-support.ts b/src/renderer/src/components/native-chat/native-chat-tool-run-members-test-support.ts
new file mode 100644
index 000000000000..46e80e0efa6f
--- /dev/null
+++ b/src/renderer/src/components/native-chat/native-chat-tool-run-members-test-support.ts
@@ -0,0 +1,11 @@
+import { fireEvent } from '@testing-library/react'
+
+/** Open every member of every opened run, as a reader clicking each line would. */
+export function openToolRunMembers(): void {
+  const closed = document.body.querySelectorAll<HTMLElement>(
+    '[data-native-chat-tool-run-members] button[aria-expanded="false"]'
+  )
+  for (const member of closed) {
+    fireEvent.click(member)
+  }
+}
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 63637a4146a5..ff82e898fea5 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
@@ -115,6 +115,24 @@ describe('transcript slots', () => {
     expect(slots.map((slot) => slot.message.id)).toEqual(['a', 'b'])
   })
 
+  it("marks a row as continuing its turn only when the agent's next step follows", () => {
+    const continuing = (messages: NativeChatMessage[]) =>
+      build(messages)
+        .filter((slot) => slot.continuesTurn)
+        .map((slot) => slot.message.id)
+
+    expect(continuing([text('u', 'go', 'user'), text('a', 'looking'), toolRun('b')])).toEqual([
+      'u',
+      'a'
+    ])
+    expect(
+      continuing([text('u', 'go', 'user'), text('answer', 'done'), text('n', 'notice', 'system')])
+    ).toEqual(['u'])
+    expect(
+      continuing([text('u', 'go', 'user'), text('answer', 'done'), text('u2', 'next', 'user')])
+    ).toEqual(['u'])
+  })
+
   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')], {
@@ -265,6 +283,47 @@ describe('a turn no message opened', () => {
     ])
   })
 
+  // Stored red for clients that predate it, but Orca stopped, not the agent: no failure, never folded.
+  it("keeps the row about Orca's stop on screen beside the reply it cut, which stays the answer", () => {
+    const orcaStop: NativeChatMessage = {
+      ...failure('orca-stop'),
+      blocks: [
+        {
+          type: 'text' as const,
+          text: 'Codex stopped while this response was in progress.',
+          tone: 'error',
+          presentation: 'orca-stop',
+          orcaStop: { cause: 'update' }
+        }
+      ]
+    }
+    const messages = [text('u1', 'go', 'user'), text('a1', 'Looking.'), toolRun('work'), orcaStop]
+    const slots = build(messages, {
+      turnStatuses: { active: settled(3), completedByTurn: { u1: settled(3) } }
+    })
+    expect(slots.map((slot) => [slot.message.id, slot.folded])).toEqual([
+      ['u1', false],
+      ['a1', false],
+      ['orca-stop', false]
+    ])
+    // The same, once a reader re-presented it neutral.
+    const neutral: NativeChatMessage = {
+      ...orcaStop,
+      blocks: orcaStop.blocks.map((block) =>
+        block.type === 'text' ? { ...block, tone: 'notice' } : block
+      )
+    }
+    expect(
+      build([...messages.slice(0, 3), neutral], {
+        turnStatuses: { active: settled(3), completedByTurn: { u1: settled(3) } }
+      }).map((slot) => [slot.message.id, slot.folded])
+    ).toEqual([
+      ['u1', false],
+      ['a1', false],
+      ['orca-stop', false]
+    ])
+  })
+
   it('folds an error the agent recovered from behind the answer that followed it', () => {
     const messages = [text('u1', 'go', 'user'), failure('retry'), text('a1', 'Done.')]
     const slots = build(messages, {
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 287d0da12926..ebae5d79e213 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
@@ -11,6 +11,7 @@ import type {
   AgentJournalRenderItem,
   AgentJournalSubmission
 } from '../../../../shared/agent-session-journal-types'
+import { AGENT_SESSION_ORCA_STOP_PRESENTATION } from '../../../../shared/agent-session-orca-stop'
 import {
   isBackgroundTaskBlock,
   isSubagentGroupBlock,
@@ -79,6 +80,8 @@ export type NativeChatMessageSlot = {
   drawsMessage: boolean
   /** Whether this row's turn hides anything, so its status row offers a caret. */
   turnFolds: boolean
+  /** The agent's next row in the same turn follows directly, so the two sit close. */
+  continuesTurn?: boolean
   turnDiff: NativeChatTurnDiff | undefined
   /** On a roster row: whether its list is open, and the subagents whose sections open
    *  under their entries, each with whether it is open. A closed list draws none of them. */
@@ -149,9 +152,18 @@ export function buildNativeChatTranscriptSlots(
         isBackgroundTaskBlock(block) ||
         isStoppedBeforeStartBlock(block)
     ),
-    reportsFailure: message.blocks.some((block) => block.type === 'text' && block.tone === 'error'),
-    reportsCompaction: message.blocks.some(
-      (block) => block.type === 'text' && block.presentation === 'compaction'
+    // A row about Orca's own stop is stored red for clients that predate it; it reports no failure.
+    reportsFailure: message.blocks.some(
+      (block) =>
+        block.type === 'text' &&
+        block.tone === 'error' &&
+        block.presentation !== AGENT_SESSION_ORCA_STOP_PRESENTATION
+    ),
+    explainsTurn: message.blocks.some(
+      (block) =>
+        block.type === 'text' &&
+        (block.presentation === 'compaction' ||
+          block.presentation === AGENT_SESSION_ORCA_STOP_PRESENTATION)
     )
   }))
   // Liveness is the turn's, not any one call's: the run at the frontier stays
@@ -250,7 +262,26 @@ export function buildNativeChatTranscriptSlots(
     sectionSlots.openAnchoredAt(message, roster, turnKey)
   }
   sectionSlots.openBefore(pending, undefined, 0)
-  return nativeChatTranscriptWorkRuns(slots, typography)
+  const drawn = nativeChatTranscriptWorkRuns(slots, typography)
+  for (let index = 0; index < drawn.length - 1; index += 1) {
+    const slot = drawn[index]!
+    const next = drawn[index + 1]!
+    if (
+      slot.kind === 'message' &&
+      next.kind === 'message' &&
+      // A subagent's section keeps the transcript's gap as part of its frame.
+      slot.depth === 0 &&
+      next.depth === 0 &&
+      slot.turnKey !== undefined &&
+      next.turnKey === slot.turnKey &&
+      // The agent's own next step, not a notice or task row that trails its answer.
+      (next.message.role === 'assistant' || next.message.role === 'reasoning') &&
+      next.drawsMessage
+    ) {
+      slot.continuesTurn = true
+    }
+  }
+  return drawn
 }
 
 /** Stable key for a slot: its message id, the agent whose section it heads, or its
diff --git a/src/renderer/src/components/native-chat/native-chat-user-message-fold.ts b/src/renderer/src/components/native-chat/native-chat-user-message-fold.ts
new file mode 100644
index 000000000000..10a53aada62b
--- /dev/null
+++ b/src/renderer/src/components/native-chat/native-chat-user-message-fold.ts
@@ -0,0 +1,9 @@
+const MAX_UNFOLDED_LINES = 8
+const MAX_UNFOLDED_LENGTH = 600
+/** Tailwind's `max-h-44`, which the folded bubble is clipped to. */
+export const NATIVE_CHAT_USER_MESSAGE_FOLDED_PX = 176
+
+// Decided from the text alone, so the row's first layout is already its folded one.
+export function nativeChatUserMessageFolds(text: string): boolean {
+  return text.length > MAX_UNFOLDED_LENGTH || text.split('\n').length > MAX_UNFOLDED_LINES
+}
diff --git a/src/renderer/src/components/native-chat/native-chat-view-file-drop.test.tsx b/src/renderer/src/components/native-chat/native-chat-view-file-drop.test.tsx
index d3f10a4dcded..96b4ee6c129c 100644
--- a/src/renderer/src/components/native-chat/native-chat-view-file-drop.test.tsx
+++ b/src/renderer/src/components/native-chat/native-chat-view-file-drop.test.tsx
@@ -15,7 +15,8 @@ vi.mock('./use-native-chat-status-entry', () => ({ useNativeChatStatusEntry: vi.
 vi.mock('./NativeChatStructuredSession', () => ({
   NativeChatStructuredSession: () => {
     useNativeChatPaneFileDropClaim({
-      scopeKey: 'structured:session',
+      destinationKey: 'structured:session',
+      captureExternalDrop: () => async () => {},
       disabled: false,
       onDragOverCapture: (event) => event.preventDefault(),
       onDropCapture: drop.onDrop
@@ -43,11 +44,7 @@ it('owns pane drops for standalone structured sessions without a terminal portal
 
   fireEvent.dragOver(transcript, { dataTransfer })
   expect(container.querySelector('[data-native-chat-drop-overlay]')).not.toBeNull()
-  expect(
-    transcript
-      .closest('[data-native-file-drop-target="composer"]')
-      ?.getAttribute('data-composer-scope-key')
-  ).toBe('structured:session')
+  expect(transcript.closest('[data-os-file-drop-owner]')).not.toBeNull()
 
   fireEvent.drop(transcript, { dataTransfer })
   expect(drop.onDrop).toHaveBeenCalledTimes(1)
diff --git a/src/renderer/src/components/native-chat/native-chat-visual-markdown-extension.tsx b/src/renderer/src/components/native-chat/native-chat-visual-markdown-extension.tsx
new file mode 100644
index 000000000000..592f22e591ed
--- /dev/null
+++ b/src/renderer/src/components/native-chat/native-chat-visual-markdown-extension.tsx
@@ -0,0 +1,79 @@
+import { useMemo, useState, type ComponentPropsWithoutRef } from 'react'
+import type { ExtraProps } from 'react-markdown'
+import type { CommentMarkdownExtension } from '@/components/sidebar/CommentMarkdown'
+import {
+  NATIVE_CHAT_VISUAL_TITLE_MAX_LENGTH,
+  isNativeChatVisualFileName
+} from '../../../../shared/native-chat-visual-directive'
+import { NativeChatInlineVisual } from './NativeChatInlineVisual'
+import type { NativeChatVisualOwner } from './native-chat-visual-owner'
+import { useNativeChatVisualOwner } from './native-chat-visual-owner'
+import {
+  NATIVE_CHAT_VISUAL_PLACEHOLDER_PROPERTIES,
+  remarkNativeChatVisuals
+} from './native-chat-visual-markdown-syntax'
+
+type DivProps = ComponentPropsWithoutRef<'div'> & ExtraProps
+
+/** The placeholder's attributes, as react-markdown passed them (absent on an ordinary div). */
+function placeholderAttributes(props: DivProps): { nonce: unknown; file: unknown; title: unknown } {
+  return {
+    nonce: 'data-orca-visual' in props ? props['data-orca-visual'] : undefined,
+    file: 'data-orca-visual-file' in props ? props['data-orca-visual-file'] : undefined,
+    title: 'data-orca-visual-title' in props ? props['data-orca-visual-title'] : undefined
+  }
+}
+
+function newNonce(): string {
+  const bytes = new Uint8Array(16)
+  crypto.getRandomValues(bytes)
+  return Array.from(bytes, (byte) => byte.toString(16).padStart(2, '0')).join('')
+}
+
+function createVisualExtension(
+  owner: NativeChatVisualOwner,
+  messageId: string,
+  nonce: string
+): CommentMarkdownExtension {
+  function VisualPlaceholder({ node: _node, ...props }: DivProps): React.JSX.Element {
+    const { nonce: placeholderNonce, file, title } = placeholderAttributes(props)
+    // Only the parser's own placeholders carry this message's nonce; the fields are re-checked anyway.
+    if (
+      placeholderNonce !== nonce ||
+      typeof file !== 'string' ||
+      !isNativeChatVisualFileName(file) ||
+      (title !== undefined &&
+        (typeof title !== 'string' || title.length > NATIVE_CHAT_VISUAL_TITLE_MAX_LENGTH))
+    ) {
+      return <div {...props} />
+    }
+    return (
+      <NativeChatInlineVisual
+        owner={owner}
+        messageId={messageId}
+        file={file}
+        title={typeof title === 'string' && title.length > 0 ? title : null}
+      />
+    )
+  }
+  return {
+    remarkPlugins: [[remarkNativeChatVisuals, nonce]],
+    sanitizeAttributes: { div: [...NATIVE_CHAT_VISUAL_PLACEHOLDER_PROPERTIES] },
+    components: { div: VisualPlaceholder }
+  }
+}
+
+/**
+ * The visual extension for one assistant message, or undefined outside a structured chat. Stable
+ * for the message's lifetime, so a mounted visual keeps its frame while the reply streams.
+ */
+export function useNativeChatVisualMarkdownExtension(
+  messageId: string | undefined
+): CommentMarkdownExtension | undefined {
+  const owner = useNativeChatVisualOwner()
+  const [nonce] = useState(newNonce)
+  return useMemo(
+    () => (owner && messageId ? createVisualExtension(owner, messageId, nonce) : undefined),
+    [messageId, nonce, owner]
+  )
+}
diff --git a/src/renderer/src/components/native-chat/native-chat-visual-markdown-syntax.test.tsx b/src/renderer/src/components/native-chat/native-chat-visual-markdown-syntax.test.tsx
new file mode 100644
index 000000000000..645999795757
--- /dev/null
+++ b/src/renderer/src/components/native-chat/native-chat-visual-markdown-syntax.test.tsx
@@ -0,0 +1,135 @@
+import type { ComponentProps } from 'react'
+import type { ExtraProps } from 'react-markdown'
+import { renderToStaticMarkup } from 'react-dom/server'
+import { describe, expect, it } from 'vitest'
+import CommentMarkdown, {
+  type CommentMarkdownExtension
+} from '@/components/sidebar/CommentMarkdown'
+import {
+  NATIVE_CHAT_VISUAL_PLACEHOLDER_PROPERTIES,
+  remarkNativeChatVisuals
+} from './native-chat-visual-markdown-syntax'
+
+const NONCE = 'nonce-123'
+
+function Probe(props: ComponentProps<'div'> & ExtraProps): React.JSX.Element {
+  const nonce = 'data-orca-visual' in props ? props['data-orca-visual'] : undefined
+  if (nonce !== NONCE) {
+    return <div className={props.className}>{props.children}</div>
+  }
+  const title = 'data-orca-visual-title' in props ? props['data-orca-visual-title'] : undefined
+  const file = 'data-orca-visual-file' in props ? props['data-orca-visual-file'] : undefined
+  return (
+    <span data-visual={String(file)}>
+      {typeof title === 'string' ? `[${title}]` : '[untitled]'}
+    </span>
+  )
+}
+
+const extension: CommentMarkdownExtension = {
+  remarkPlugins: [[remarkNativeChatVisuals, NONCE]],
+  sanitizeAttributes: { div: [...NATIVE_CHAT_VISUAL_PLACEHOLDER_PROPERTIES] },
+  components: { div: Probe }
+}
+
+function render(content: string): string {
+  return renderToStaticMarkup(
+    <CommentMarkdown content={content} variant="document" extension={extension} />
+  )
+}
+
+function mountedFiles(markup: string): string[] {
+  return [...markup.matchAll(/data-visual="([^"]+)"/g)].map((match) => match[1])
+}
+
+const LINE = '::orca-visual{file="usage.html" title="Usage by day"}'
+
+describe('remarkNativeChatVisuals', () => {
+  it('mounts a directive on its own line with its title', () => {
+    const markup = render(`Here it is:\n\n${LINE}\n\nThat is the trend.`)
+    expect(mountedFiles(markup)).toEqual(['usage.html'])
+    expect(markup).toContain('[Usage by day]')
+    expect(markup).not.toContain('::orca-visual')
+    expect(markup).toContain('That is the trend.')
+  })
+
+  it('splits a paragraph that runs straight into and out of the directive', () => {
+    const markup = render(`Here it is:\n${LINE}\nThat is the trend.`)
+    expect(mountedFiles(markup)).toEqual(['usage.html'])
+    expect(markup).toContain('Here it is:')
+    expect(markup).toContain('That is the trend.')
+  })
+
+  it('mounts at the very end of the reply without a trailing newline', () => {
+    expect(mountedFiles(render(`Intro\n\n${LINE}`))).toEqual(['usage.html'])
+  })
+
+  it('accepts CRLF line endings and up to three spaces of indent', () => {
+    expect(mountedFiles(render(`Intro\r\n\r\n   ${LINE}\r\n\r\nAfter`))).toEqual(['usage.html'])
+  })
+
+  it.each([
+    ['fenced code', `\`\`\`\n${LINE}\n\`\`\``],
+    ['tilde fenced code', `~~~md\n${LINE}\n~~~`],
+    ['indented code', `Intro\n\n    ${LINE}`],
+    ['inline code', `Use \`${LINE}\` to show a chart.`],
+    ['a block quote', `> ${LINE}`],
+    ['a list item', `- ${LINE}`],
+    ['an ordered list item', `1. ${LINE}`],
+    ['mid-sentence', `See ${LINE} here`],
+    ['a malformed directive', '::orca-visual{file="../usage.html"}'],
+    ['an unclosed directive', '::orca-visual{file="usage.html"'],
+    ['trailing prose on the line', `${LINE} done`]
+  ])('leaves it as text inside %s', (_name, content) => {
+    const markup = render(content)
+    expect(mountedFiles(markup)).toEqual([])
+    expect(markup).toContain('::orca-visual')
+  })
+
+  it('does not mount a raw HTML placeholder forged without the nonce', () => {
+    const markup = render(
+      '<div data-orca-visual="guess" data-orca-visual-file="usage.html">x</div>\n\nafter'
+    )
+    expect(mountedFiles(markup)).toEqual([])
+  })
+
+  it('mounts a raw HTML placeholder only if it knew the nonce, which the reply cannot', () => {
+    // The nonce is per rendered message and never part of the reply, so this cannot be authored.
+    const markup = render(
+      `<div data-orca-visual="${NONCE}" data-orca-visual-file="usage.html">x</div>`
+    )
+    expect(mountedFiles(markup)).toEqual(['usage.html'])
+  })
+
+  it('caps how many visuals one reply mounts and shows the rest as text', () => {
+    const lines = Array.from(
+      { length: 10 },
+      (_, index) => `::orca-visual{file="chart-${index}.html"}`
+    )
+    const markup = render(lines.join('\n\n'))
+    expect(mountedFiles(markup)).toEqual(
+      Array.from({ length: 8 }, (_, index) => `chart-${index}.html`)
+    )
+    expect(markup).toContain('chart-8.html')
+    expect(markup).toContain('chart-9.html')
+  })
+
+  it('keeps reference links defined after the directive working', () => {
+    const markup = render(`See [the docs][d].\n\n${LINE}\n\n[d]: https://example.com/docs`)
+    expect(mountedFiles(markup)).toEqual(['usage.html'])
+    expect(markup).toContain('href="https://example.com/docs"')
+  })
+
+  it('renders other markdown unchanged around it', () => {
+    const markup = render(`# Title\n\n${LINE}\n\n| a | b |\n| - | - |\n| 1 | 2 |`)
+    expect(mountedFiles(markup)).toEqual(['usage.html'])
+    expect(markup).toContain('<table')
+  })
+})
+
+describe('CommentMarkdown without the extension', () => {
+  it('shows the directive as text', () => {
+    const markup = renderToStaticMarkup(<CommentMarkdown content={LINE} variant="document" />)
+    expect(markup).toContain('::orca-visual')
+  })
+})
diff --git a/src/renderer/src/components/native-chat/native-chat-visual-markdown-syntax.ts b/src/renderer/src/components/native-chat/native-chat-visual-markdown-syntax.ts
new file mode 100644
index 000000000000..44b0717ecd87
--- /dev/null
+++ b/src/renderer/src/components/native-chat/native-chat-visual-markdown-syntax.ts
@@ -0,0 +1,160 @@
+// The visual directive as a markdown block, for native-chat assistant prose only. The parser sees it
+// like any other block (so code fences, indented code, quotes and lists keep their meaning), and the
+// line itself is judged by the one shared grammar.
+
+import type { Paragraph, Root, RootContent } from 'mdast'
+import type { Extension as FromMarkdownExtension } from 'mdast-util-from-markdown'
+import type {
+  Code,
+  Construct,
+  Effects,
+  Extension as MicromarkExtension,
+  State,
+  TokenizeContext
+} from 'micromark-util-types'
+import type { Processor } from 'unified'
+import {
+  NATIVE_CHAT_VISUAL_DIRECTIVE_MAX_LINE_LENGTH,
+  NATIVE_CHAT_VISUAL_MAX_PER_MESSAGE,
+  parseNativeChatVisualDirectiveLine
+} from '../../../../shared/native-chat-visual-directive'
+
+const TOKEN_TYPE = 'nativeChatVisual'
+const COLON = 58
+const HORIZONTAL_TAB = -2
+const VIRTUAL_SPACE = -1
+
+// Hast properties the placeholder carries through sanitize to the React component.
+const NONCE_PROPERTY = 'dataOrcaVisual'
+const FILE_PROPERTY = 'dataOrcaVisualFile'
+const TITLE_PROPERTY = 'dataOrcaVisualTitle'
+export const NATIVE_CHAT_VISUAL_PLACEHOLDER_PROPERTIES = [
+  NONCE_PROPERTY,
+  FILE_PROPERTY,
+  TITLE_PROPERTY
+] as const
+
+export type NativeChatVisualNode = {
+  type: 'nativeChatVisual'
+  file: string
+  title: string | null
+  /** The line as written, for a directive shown as text instead. */
+  source: string
+  data?: { hName?: string; hProperties?: Record<string, string> }
+}
+
+declare module 'mdast' {
+  // oxlint-disable-next-line typescript/consistent-type-definitions -- declaration merging needs an interface.
+  interface RootContentMap {
+    nativeChatVisual: NativeChatVisualNode
+  }
+}
+
+declare module 'micromark-util-types' {
+  // oxlint-disable-next-line typescript/consistent-type-definitions -- declaration merging needs an interface.
+  interface TokenTypeMap {
+    nativeChatVisual: 'nativeChatVisual'
+  }
+}
+
+function tokenizeVisualLine(this: TokenizeContext, effects: Effects, ok: State, nok: State): State {
+  let line = ''
+  const inside: State = (code: Code) => {
+    // EOF, or a line ending (the negative codes below the tab/virtual-space codes).
+    if (code === null || code < HORIZONTAL_TAB) {
+      effects.exit(TOKEN_TYPE)
+      return parseNativeChatVisualDirectiveLine(line) ? ok(code) : nok(code)
+    }
+    if (line.length >= NATIVE_CHAT_VISUAL_DIRECTIVE_MAX_LINE_LENGTH) {
+      return nok(code)
+    }
+    if (code !== VIRTUAL_SPACE) {
+      line += code === HORIZONTAL_TAB ? '\t' : String.fromCharCode(code)
+    }
+    effects.consume(code)
+    return inside
+  }
+  return (code) => {
+    effects.enter(TOKEN_TYPE)
+    return inside(code)
+  }
+}
+
+const visualLineConstruct: Construct = { name: TOKEN_TYPE, tokenize: tokenizeVisualLine }
+
+const visualMicromarkExtension: MicromarkExtension = { flow: { [COLON]: visualLineConstruct } }
+
+const visualFromMarkdown: FromMarkdownExtension = {
+  enter: {
+    [TOKEN_TYPE](token) {
+      this.enter({ type: 'nativeChatVisual', file: '', title: null, source: '' }, token)
+    }
+  },
+  exit: {
+    [TOKEN_TYPE](token) {
+      const node = this.stack.at(-1)
+      const source = this.sliceSerialize(token)
+      const directive = parseNativeChatVisualDirectiveLine(source)
+      if (node?.type === 'nativeChatVisual' && directive) {
+        node.file = directive.file
+        node.title = directive.title
+        node.source = source
+      }
+      this.exit(token)
+    }
+  }
+}
+
+function literalParagraph(node: NativeChatVisualNode): Paragraph {
+  return { type: 'paragraph', children: [{ type: 'text', value: node.source }] }
+}
+
+type ChildList = { children: RootContent[] }
+
+function hasChildren(node: RootContent): node is RootContent & ChildList {
+  return 'children' in node && Array.isArray(node.children)
+}
+
+/**
+ * Mounts only directives that stand alone at the top of the reply, up to the per-message cap. One
+ * nested in a quote or list, or past the cap, reads as the text the agent wrote.
+ */
+function placeVisuals(
+  parent: ChildList,
+  isRoot: boolean,
+  nonce: string,
+  mounted: { count: number }
+): void {
+  parent.children = parent.children.map((child) => {
+    if (child.type === 'nativeChatVisual') {
+      if (!isRoot || mounted.count >= NATIVE_CHAT_VISUAL_MAX_PER_MESSAGE) {
+        return literalParagraph(child)
+      }
+      mounted.count += 1
+      child.data = {
+        hName: 'div',
+        hProperties: {
+          [NONCE_PROPERTY]: nonce,
+          [FILE_PROPERTY]: child.file,
+          ...(child.title ? { [TITLE_PROPERTY]: child.title } : {})
+        }
+      }
+      return child
+    }
+    if (hasChildren(child)) {
+      placeVisuals(child, false, nonce, mounted)
+    }
+    return child
+  })
+}
+
+/**
+ * The remark plugin. `nonce` is unguessable per rendered message, so raw HTML in the reply cannot
+ * forge a placeholder the component would mount.
+ */
+export function remarkNativeChatVisuals(this: Processor, nonce: string): (tree: Root) => void {
+  const data = this.data()
+  data.micromarkExtensions = [...(data.micromarkExtensions ?? []), visualMicromarkExtension]
+  data.fromMarkdownExtensions = [...(data.fromMarkdownExtensions ?? []), visualFromMarkdown]
+  return (tree) => placeVisuals(tree, true, nonce, { count: 0 })
+}
diff --git a/src/renderer/src/components/native-chat/native-chat-visual-owner.tsx b/src/renderer/src/components/native-chat/native-chat-visual-owner.tsx
new file mode 100644
index 000000000000..51d84a119a01
--- /dev/null
+++ b/src/renderer/src/components/native-chat/native-chat-visual-owner.tsx
@@ -0,0 +1,53 @@
+import { createContext, useContext, useMemo, type ReactNode } from 'react'
+import type { RuntimeClientTarget } from '@/runtime/runtime-client-target'
+import { useNativeChatTabOwnerWorktreeId } from './use-native-chat-tab-owner'
+
+/** The structured chat a transcript belongs to: where its visuals are read and what owns them. */
+export type NativeChatVisualOwner = {
+  target: RuntimeClientTarget
+  sessionId: string
+  tabId: string
+  worktreeId: string
+}
+
+export const NativeChatVisualOwnerContext = createContext<NativeChatVisualOwner | null>(null)
+
+/** Null outside a structured chat's transcript, where no visual can be read. */
+export function useNativeChatVisualOwner(): NativeChatVisualOwner | null {
+  return useContext(NativeChatVisualOwnerContext)
+}
+
+/** Names the structured chat below it as the owner of the visuals its replies show. */
+export function NativeChatVisualOwnerProvider({
+  target,
+  sessionId,
+  tabId,
+  children
+}: {
+  target: RuntimeClientTarget
+  sessionId: string
+  tabId: string
+  children: ReactNode
+}): React.JSX.Element {
+  // Until the tab's workspace is known there is nothing to scope a sidebar visual to.
+  const worktreeId = useNativeChatTabOwnerWorktreeId(tabId)
+  const environmentId = target.kind === 'environment' ? target.environmentId : null
+  const owner = useMemo<NativeChatVisualOwner | null>(
+    () =>
+      worktreeId
+        ? {
+            target:
+              environmentId === null ? { kind: 'local' } : { kind: 'environment', environmentId },
+            sessionId,
+            tabId,
+            worktreeId
+          }
+        : null,
+    [environmentId, sessionId, tabId, worktreeId]
+  )
+  return (
+    <NativeChatVisualOwnerContext.Provider value={owner}>
+      {children}
+    </NativeChatVisualOwnerContext.Provider>
+  )
+}
diff --git a/src/renderer/src/components/native-chat/native-chat-visual-read-client.test.ts b/src/renderer/src/components/native-chat/native-chat-visual-read-client.test.ts
new file mode 100644
index 000000000000..1c56e1f69ab0
--- /dev/null
+++ b/src/renderer/src/components/native-chat/native-chat-visual-read-client.test.ts
@@ -0,0 +1,151 @@
+import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest'
+
+const callRuntimeRpc = vi.fn()
+vi.mock('@/runtime/runtime-rpc-client', () => ({
+  callRuntimeRpc: (...args: unknown[]) => callRuntimeRpc(...args)
+}))
+
+import {
+  clearNativeChatVisualCacheForTests,
+  isRetryableNativeChatVisualFailure,
+  peekCachedNativeChatVisual,
+  readNativeChatVisual
+} from './native-chat-visual-read-client'
+
+const local = { target: { kind: 'local' as const }, sessionId: 'session-alpha', file: 'a.html' }
+const remote = {
+  target: { kind: 'environment' as const, environmentId: 'env-1' },
+  sessionId: 'session-alpha',
+  file: 'a.html'
+}
+
+beforeEach(() => {
+  clearNativeChatVisualCacheForTests()
+  callRuntimeRpc.mockReset()
+})
+
+afterEach(() => {
+  clearNativeChatVisualCacheForTests()
+})
+
+describe('readNativeChatVisual', () => {
+  it("reads through the chat's own runtime with only the session and file name", async () => {
+    callRuntimeRpc.mockResolvedValueOnce({ ok: true, revision: 'r1', sizeBytes: 3, html: '<p>' })
+    expect(await readNativeChatVisual(remote)).toEqual({
+      ok: true,
+      document: { revision: 'r1', html: '<p>' }
+    })
+    expect(callRuntimeRpc).toHaveBeenCalledWith(
+      remote.target,
+      'agentSession.readVisual',
+      { sessionId: 'session-alpha', file: 'a.html' },
+      expect.any(Object)
+    )
+  })
+
+  it('revalidates with the held revision and keeps the cached bytes when unchanged', async () => {
+    callRuntimeRpc.mockResolvedValueOnce({ ok: true, revision: 'r1', sizeBytes: 3, html: '<p>' })
+    await readNativeChatVisual(local)
+    callRuntimeRpc.mockResolvedValueOnce({
+      ok: true,
+      revision: 'r1',
+      sizeBytes: 3,
+      unchanged: true
+    })
+    expect(await readNativeChatVisual(local)).toEqual({
+      ok: true,
+      document: { revision: 'r1', html: '<p>' }
+    })
+    expect(callRuntimeRpc.mock.calls[1][2]).toEqual({
+      sessionId: 'session-alpha',
+      file: 'a.html',
+      knownRevision: 'r1'
+    })
+  })
+
+  it('shows a rewritten file as its new revision', async () => {
+    callRuntimeRpc.mockResolvedValueOnce({ ok: true, revision: 'r1', sizeBytes: 3, html: '<p>' })
+    await readNativeChatVisual(local)
+    callRuntimeRpc.mockResolvedValueOnce({ ok: true, revision: 'r2', sizeBytes: 4, html: '<hr>' })
+    expect(await readNativeChatVisual(local)).toEqual({
+      ok: true,
+      document: { revision: 'r2', html: '<hr>' }
+    })
+    expect(peekCachedNativeChatVisual(local)?.revision).toBe('r2')
+  })
+
+  it('keeps one runtime from answering for another', async () => {
+    callRuntimeRpc.mockResolvedValueOnce({ ok: true, revision: 'r1', sizeBytes: 3, html: '<p>' })
+    await readNativeChatVisual(local)
+    expect(peekCachedNativeChatVisual(remote)).toBeNull()
+  })
+
+  it('shares one in-flight read between concurrent mounts', async () => {
+    let resolve: (value: unknown) => void = () => {}
+    callRuntimeRpc.mockReturnValueOnce(new Promise((next) => (resolve = next)))
+    const first = readNativeChatVisual(local)
+    const second = readNativeChatVisual(local)
+    resolve({ ok: true, revision: 'r1', sizeBytes: 3, html: '<p>' })
+    expect(await first).toEqual(await second)
+    expect(callRuntimeRpc).toHaveBeenCalledTimes(1)
+  })
+
+  it('reads a lost connection or an older host as unavailable, never as a verdict', async () => {
+    callRuntimeRpc.mockRejectedValueOnce(new Error('method_not_found'))
+    expect(await readNativeChatVisual(local)).toEqual({ ok: false, reason: 'unavailable' })
+    callRuntimeRpc.mockRejectedValueOnce(new Error('socket closed'))
+    expect(await readNativeChatVisual(local)).toEqual({ ok: false, reason: 'unavailable' })
+  })
+
+  it('passes host refusals through, degrades an unknown one, and forgets a refused file', async () => {
+    callRuntimeRpc.mockResolvedValueOnce({ ok: true, revision: 'r1', sizeBytes: 3, html: '<p>' })
+    await readNativeChatVisual(local)
+    callRuntimeRpc.mockResolvedValueOnce({ ok: false, error: 'not_found' })
+    expect(await readNativeChatVisual(local)).toEqual({ ok: false, reason: 'not_found' })
+    expect(peekCachedNativeChatVisual(local)).toBeNull()
+    callRuntimeRpc.mockResolvedValueOnce({ ok: true, revision: 'r2', sizeBytes: 3, html: '<p>' })
+    await readNativeChatVisual(local)
+    callRuntimeRpc.mockResolvedValueOnce({ ok: false, error: 'too_large' })
+    expect(await readNativeChatVisual(local)).toEqual({ ok: false, reason: 'too_large' })
+    // A rewrite the host now refuses must not keep showing the old bytes on the next mount.
+    expect(peekCachedNativeChatVisual(local)).toBeNull()
+    callRuntimeRpc.mockResolvedValueOnce({ ok: false, error: 'some_future_reason' })
+    expect(await readNativeChatVisual(local)).toEqual({ ok: false, reason: 'unavailable' })
+  })
+
+  it('asks again for the bytes when an unchanged answer finds nothing cached', async () => {
+    callRuntimeRpc.mockResolvedValueOnce({ ok: true, revision: 'r1', sizeBytes: 3, html: '<p>' })
+    await readNativeChatVisual(local)
+    clearNativeChatVisualCacheForTests()
+    callRuntimeRpc
+      .mockResolvedValueOnce({ ok: true, revision: 'r1', sizeBytes: 3, unchanged: true })
+      .mockResolvedValueOnce({ ok: true, revision: 'r1', sizeBytes: 3, html: '<p>' })
+    expect(await readNativeChatVisual(local)).toEqual({
+      ok: true,
+      document: { revision: 'r1', html: '<p>' }
+    })
+  })
+
+  it('bounds the cache by entry count', async () => {
+    for (let index = 0; index < 30; index += 1) {
+      callRuntimeRpc.mockResolvedValueOnce({
+        ok: true,
+        revision: `r${index}`,
+        sizeBytes: 1,
+        html: 'x'
+      })
+      await readNativeChatVisual({ ...local, file: `f${index}.html` })
+    }
+    expect(peekCachedNativeChatVisual({ ...local, file: 'f0.html' })).toBeNull()
+    expect(peekCachedNativeChatVisual({ ...local, file: 'f29.html' })?.revision).toBe('r29')
+  })
+})
+
+describe('isRetryableNativeChatVisualFailure', () => {
+  it('retries only what may change on its own', () => {
+    expect(isRetryableNativeChatVisualFailure('unavailable')).toBe(true)
+    expect(isRetryableNativeChatVisualFailure('not_found')).toBe(true)
+    expect(isRetryableNativeChatVisualFailure('outside_folder')).toBe(false)
+    expect(isRetryableNativeChatVisualFailure('too_large')).toBe(false)
+  })
+})
diff --git a/src/renderer/src/components/native-chat/native-chat-visual-read-client.ts b/src/renderer/src/components/native-chat/native-chat-visual-read-client.ts
new file mode 100644
index 000000000000..ea526211297b
--- /dev/null
+++ b/src/renderer/src/components/native-chat/native-chat-visual-read-client.ts
@@ -0,0 +1,158 @@
+// Reading a chat visual from the host that owns the chat, through a small revision cache.
+//
+// The cache only spares bytes: every mount still asks the host, passing the revision it holds, so a
+// file the agent rewrote shows its new content and a deleted one stops showing. Failures are never
+// cached; the next mount or retry asks again.
+
+import { callRuntimeRpc } from '@/runtime/runtime-rpc-client'
+import type { RuntimeClientTarget } from '@/runtime/runtime-client-target'
+import {
+  AGENT_SESSION_VISUAL_READ_ERRORS,
+  type AgentSessionReadVisualResult,
+  type AgentSessionVisualReadError
+} from '../../../../shared/rpc-contract/agent-session-visual-params'
+
+export type NativeChatVisualIdentity = {
+  target: RuntimeClientTarget
+  sessionId: string
+  file: string
+}
+
+export type NativeChatVisualDocument = { revision: string; html: string }
+
+/** `unavailable`: the host could not answer (contact lost, older host); never a verdict on the file. */
+export type NativeChatVisualReadOutcome =
+  | { ok: true; document: NativeChatVisualDocument }
+  | { ok: false; reason: AgentSessionVisualReadError | 'unavailable' }
+
+const MAX_CACHED_DOCUMENTS = 24
+const MAX_CACHED_CHARS = 6 * 1024 * 1024
+const READ_TIMEOUT_MS = 15_000
+
+const cache = new Map<string, NativeChatVisualDocument>()
+const inFlight = new Map<string, Promise<NativeChatVisualReadOutcome>>()
+
+export function nativeChatVisualKey(identity: NativeChatVisualIdentity): string {
+  const runtime =
+    identity.target.kind === 'local' ? 'local' : `environment:${identity.target.environmentId}`
+  return JSON.stringify([runtime, identity.sessionId, identity.file])
+}
+
+export function peekCachedNativeChatVisual(
+  identity: NativeChatVisualIdentity
+): NativeChatVisualDocument | null {
+  return cache.get(nativeChatVisualKey(identity)) ?? null
+}
+
+function remember(key: string, document: NativeChatVisualDocument): void {
+  cache.delete(key)
+  cache.set(key, document)
+  let chars = 0
+  for (const entry of cache.values()) {
+    chars += entry.html.length
+  }
+  for (const [oldestKey, oldest] of cache) {
+    if (cache.size <= MAX_CACHED_DOCUMENTS && chars <= MAX_CACHED_CHARS) {
+      break
+    }
+    cache.delete(oldestKey)
+    chars -= oldest.html.length
+  }
+}
+
+function isKnownReadError(value: unknown): value is AgentSessionVisualReadError {
+  return AGENT_SESSION_VISUAL_READ_ERRORS.some((known) => known === value)
+}
+
+function interpret(
+  key: string,
+  result: AgentSessionReadVisualResult | null | undefined
+): NativeChatVisualReadOutcome {
+  if (!result || typeof result !== 'object') {
+    return { ok: false, reason: 'unavailable' }
+  }
+  if (result.ok) {
+    if ('unchanged' in result) {
+      const cached = cache.get(key)
+      if (cached?.revision === result.revision) {
+        remember(key, cached)
+        return { ok: true, document: cached }
+      }
+      return { ok: false, reason: 'unavailable' }
+    }
+    if (typeof result.html !== 'string' || typeof result.revision !== 'string') {
+      return { ok: false, reason: 'unavailable' }
+    }
+    const document = { revision: result.revision, html: result.html }
+    remember(key, document)
+    return { ok: true, document }
+  }
+  // Any refusal means the cached revision no longer stands for the file.
+  cache.delete(key)
+  // Why: a newer host may name a refusal this build does not know; it still reads as "can't show".
+  return { ok: false, reason: isKnownReadError(result.error) ? result.error : 'unavailable' }
+}
+
+async function readOnce(
+  key: string,
+  identity: NativeChatVisualIdentity
+): Promise<NativeChatVisualReadOutcome> {
+  const known = cache.get(key)?.revision
+  try {
+    const result = await callRuntimeRpc<AgentSessionReadVisualResult>(
+      identity.target,
+      'agentSession.readVisual',
+      {
+        sessionId: identity.sessionId,
+        file: identity.file,
+        ...(known ? { knownRevision: known } : {})
+      },
+      { timeoutMs: READ_TIMEOUT_MS }
+    )
+    const outcome = interpret(key, result)
+    // An `unchanged` answer for an entry evicted meanwhile: ask once more for the bytes.
+    if (!outcome.ok && outcome.reason === 'unavailable' && result?.ok && 'unchanged' in result) {
+      cache.delete(key)
+      return interpret(
+        key,
+        await callRuntimeRpc<AgentSessionReadVisualResult>(
+          identity.target,
+          'agentSession.readVisual',
+          { sessionId: identity.sessionId, file: identity.file },
+          { timeoutMs: READ_TIMEOUT_MS }
+        )
+      )
+    }
+    return outcome
+  } catch {
+    return { ok: false, reason: 'unavailable' }
+  }
+}
+
+/** One read per visual at a time; concurrent mounts of the same visual share it. */
+export function readNativeChatVisual(
+  identity: NativeChatVisualIdentity
+): Promise<NativeChatVisualReadOutcome> {
+  const key = nativeChatVisualKey(identity)
+  const pending = inFlight.get(key)
+  if (pending) {
+    return pending
+  }
+  const read = readOnce(key, identity).finally(() => {
+    inFlight.delete(key)
+  })
+  inFlight.set(key, read)
+  return read
+}
+
+/** Whether a failed read may succeed if asked again shortly: contact restored, or the file landing. */
+export function isRetryableNativeChatVisualFailure(
+  reason: AgentSessionVisualReadError | 'unavailable'
+): boolean {
+  return reason === 'unavailable' || reason === 'not_found'
+}
+
+export function clearNativeChatVisualCacheForTests(): void {
+  cache.clear()
+  inFlight.clear()
+}
diff --git a/src/renderer/src/components/native-chat/structured-agent-session-delivery-notices.kept-card.test.ts b/src/renderer/src/components/native-chat/structured-agent-session-delivery-notices.kept-card.test.ts
index 3e636a0e558a..144ba4825e94 100644
--- a/src/renderer/src/components/native-chat/structured-agent-session-delivery-notices.kept-card.test.ts
+++ b/src/renderer/src/components/native-chat/structured-agent-session-delivery-notices.kept-card.test.ts
@@ -1,28 +1,26 @@
 // A send the host kept as a queued card is the card's from then on: its own row says nothing,
-// neither "Sending…" nor not sent, whatever state the desktop's saved copy was left in.
+// neither "Sending…" nor not sent, whatever phase the desktop's send is still in.
 
 import { expect, it } from 'vitest'
 import type { AgentJournalSubmission } from '../../../../shared/agent-session-journal-types'
 import { agentJournalSubmissionKey } from '../../../../shared/agent-session-journal-item-key'
-import {
-  createStructuredAgentSessionOutboxEntry,
-  type StructuredAgentSessionOutboxEntry
-} from '../../../../shared/structured-agent-session-outbox'
+import { structuredAgentSessionSendBody } from '../../../../shared/structured-agent-session-send-mutation'
 import { structuredAgentSessionDeliveryNotices } from './structured-agent-session-delivery-notices'
+import type { StructuredAgentSessionPendingSend } from './structured-agent-session-pending-sends'
 
 const KEPT_ID = 'client-kept'
 
-function savedCopy(
-  patch: Partial<StructuredAgentSessionOutboxEntry> = {}
-): StructuredAgentSessionOutboxEntry {
+function pendingSend(
+  patch: Partial<StructuredAgentSessionPendingSend> = {}
+): StructuredAgentSessionPendingSend {
   return {
-    ...createStructuredAgentSessionOutboxEntry({
-      clientMessageId: KEPT_ID,
-      sessionId: 'session-1',
-      text: 'the kept words',
-      attachments: [],
-      queuedAt: 1
-    }),
+    clientMessageId: KEPT_ID,
+    sessionId: 'session-1',
+    body: structuredAgentSessionSendBody('the kept words', []),
+    previewUris: [],
+    queuedAt: 1,
+    phase: 'sending',
+    issued: false,
     ...patch
   }
 }
@@ -43,37 +41,33 @@ const restartRejected: AgentJournalSubmission = {
 const kept: AgentJournalSubmission = { ...restartRejected, keptAsQueuedMessageId: KEPT_ID }
 
 function notices(
-  copy: StructuredAgentSessionOutboxEntry,
+  send: StructuredAgentSessionPendingSend,
   submissions: readonly AgentJournalSubmission[]
 ) {
-  return structuredAgentSessionDeliveryNotices(
-    [copy],
-    'Claude',
-    () => {},
+  return structuredAgentSessionDeliveryNotices({
+    pending: [send],
     submissions,
-    [],
-    new Set()
-  )
+    agentName: 'Claude',
+    startFailures: []
+  })
 }
 
-// The saved copy's states after a quit: still going out, resent on its own after a lost answer,
-// or already marked not sent.
-const COPIES = [
-  savedCopy(),
-  savedCopy({ state: 'dispatching' }),
-  savedCopy({ state: 'unconfirmed', retryAfterUnknownSubmittedAt: null }),
-  savedCopy({ state: 'rejected', lastFailure: { kind: 'rejected', reason: 'not sent' } })
+// Still being readied, on its way, or resent under its id after a lost answer.
+const SENDS = [
+  pendingSend(),
+  pendingSend({ issued: true }),
+  pendingSend({ phase: 'recorded', issued: true })
 ]
 
-it('gives a kept send no notice, so its saved copy never reads "Sending…" or not sent', () => {
-  for (const copy of COPIES) {
-    expect([...notices(copy, [kept])]).toEqual([])
+it('gives a kept send no notice, so it never reads "Sending…" or not sent', () => {
+  for (const send of SENDS) {
+    expect([...notices(send, [kept])]).toEqual([])
   }
 })
 
 it('still says not sent, never "Sending…", for a send rejected without being kept', () => {
-  for (const copy of COPIES) {
-    const notice = notices(copy, [restartRejected]).get(agentJournalSubmissionKey(KEPT_ID))
+  for (const send of SENDS) {
+    const notice = notices(send, [restartRejected]).get(agentJournalSubmissionKey(KEPT_ID))
     expect(notice).toMatchObject({ text: expect.any(String) })
     expect(notice).not.toHaveProperty('sending')
   }
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
index 3ed26650ed42..3aacca132633 100644
--- 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
@@ -1,14 +1,10 @@
-import { describe, expect, it, vi } from 'vitest'
+import { describe, expect, it } from 'vitest'
 import type { AgentSessionFailureFact } from '../../../../shared/agent-session-failure'
 import type {
+  AgentJournalMessageItem,
   AgentJournalRenderItem,
   AgentJournalSubmission
 } from '../../../../shared/agent-session-journal-types'
-import {
-  createStructuredAgentSessionOutboxEntry,
-  structuredAgentSessionRejectedFailure,
-  type StructuredAgentSessionOutboxEntry
-} from '../../../../shared/structured-agent-session-outbox'
 import { agentSessionFailureWords } from '../../../../shared/agent-session-failure-words'
 import {
   agentJournalItemKey,
@@ -19,724 +15,105 @@ import {
   structuredAgentSessionDeliveryNotices,
   structuredAgentSessionStartFailureFacts
 } from './structured-agent-session-delivery-notices'
+import type { StructuredAgentSessionPendingSend } from './structured-agent-session-pending-sends'
+
+const SENDING = 'Sending…'
+
+function body(text: string): AgentJournalMessageItem {
+  return { kind: 'message', role: 'user', blocks: [{ type: 'text', text }] }
+}
 
-function entry(
+function pending(
   clientMessageId: string,
-  patch: Partial<StructuredAgentSessionOutboxEntry> = {}
-): StructuredAgentSessionOutboxEntry {
+  phase: StructuredAgentSessionPendingSend['phase']
+): StructuredAgentSessionPendingSend {
   return {
-    ...createStructuredAgentSessionOutboxEntry({
-      clientMessageId,
-      sessionId: 'session-1',
-      text: clientMessageId,
-      attachments: [],
-      queuedAt: 1
-    }),
+    clientMessageId,
+    sessionId: 'session-1',
+    body: body(clientMessageId),
+    previewUris: [],
+    queuedAt: 1,
+    phase,
+    issued: true
+  }
+}
+
+function row(
+  clientMessageId: string,
+  dispatchState: AgentJournalSubmission['dispatchState'],
+  patch: Partial<AgentJournalSubmission> = {}
+): AgentJournalSubmission {
+  return {
+    clientMessageId,
+    fence: 1,
+    payloadFingerprint: clientMessageId,
+    dispatchState,
+    providerItemId: null,
+    reason: null,
+    submittedAt: 1,
+    resolvedAt: dispatchState === 'pending' ? null : 1,
     ...patch
   }
 }
 
-const NOT_FAILED_HERE: ReadonlySet<string> = new Set()
-// What the row shows, quietly in place of its time, while nothing has confirmed the message.
-const SENDING = 'Sending…'
+function notices(args: {
+  pending?: StructuredAgentSessionPendingSend[]
+  submissions?: AgentJournalSubmission[]
+  startFailures?: AgentSessionFailureFact[]
+}) {
+  return structuredAgentSessionDeliveryNotices({
+    pending: args.pending ?? [],
+    submissions: args.submissions ?? [],
+    agentName: 'Claude',
+    startFailures: args.startFailures ?? []
+  })
+}
 
-function texts(
-  outbox: StructuredAgentSessionOutboxEntry[],
-  submissions: readonly AgentJournalSubmission[] = [],
-  startFailures: readonly AgentSessionFailureFact[] = []
-): Record<string, string> {
-  // Every failure seen while the chat was open, so each words its whole cause.
-  const notices = structuredAgentSessionDeliveryNotices(
-    outbox,
-    'Claude',
-    () => {},
-    submissions,
-    startFailures,
-    new Set(outbox.map((candidate) => candidate.clientMessageId))
-  )
+function texts(map: ReturnType<typeof notices>): Record<string, string> {
   return Object.fromEntries(
-    [...notices].map(([id, notice]) => [id, notice.sending ? SENDING : notice.text])
+    [...map].map(([id, notice]) => [id, notice.sending ? SENDING : notice.text])
   )
 }
 
-describe('the notice on each message that did not go through', () => {
-  // Recorded by the host, so sending one again is a new message: no Retry.
-  it('gives two messages the host rejected each their own reason and no 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' }
-          }
-        })
-      ],
-      'Claude',
-      retry,
-      [],
-      [],
-      new Set(['first', 'second'])
-    )
-
-    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.'
-    )
-    expect(notices.get(agentJournalSubmissionKey('first'))?.onRetry).toBeUndefined()
-    expect(notices.get(agentJournalSubmissionKey('second'))?.onRetry).toBeUndefined()
-  })
-
-  // However this chat learned of it: the host recorded it, so it has no control at all.
-  it('gives a message the host rejected before this chat opened no Retry and no Dismiss', () => {
-    const retry = vi.fn()
-    const notice = structuredAgentSessionDeliveryNotices(
-      [
-        entry('earlier', {
-          state: 'rejected',
-          lastFailure: { kind: 'rejected', reason: 'Claude messages support at most 20 images' }
-        })
-      ],
-      'Claude',
-      retry,
-      [],
-      [],
-      NOT_FAILED_HERE
-    ).get(agentJournalSubmissionKey('earlier'))
-    expect(notice).toEqual({ text: 'Claude messages support at most 20 images' })
-    expect(retry).not.toHaveBeenCalled()
-  })
-
-  // Refused before the host recorded it: only its Retry sends it, so it keeps one.
-  it('keeps the Retry on a message refused before the host recorded it', () => {
-    const notice = structuredAgentSessionDeliveryNotices(
-      [
-        entry('refused', {
-          state: 'rejected',
-          lastFailure: { kind: 'refused', code: 'agent_session_owner_restart_failed' }
-        })
-      ],
-      'Claude',
-      () => {},
-      [],
-      [],
-      NOT_FAILED_HERE
-    ).get(agentJournalSubmissionKey('refused'))
-    expect(notice?.onRetry).toBeDefined()
-    expect(notice?.onDismiss).toBeUndefined()
-  })
-
-  it('chooses the words from the saved refusal on a refused message', () => {
-    expect(
-      texts([
-        entry('held', {
-          lastFailure: { kind: 'refused', code: 'agent_session_owner_restart_failed' }
-        })
-      ])
-    ).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 a refused message', () => {
-    const held = (lastFailure: StructuredAgentSessionOutboxEntry['lastFailure']) =>
-      texts([entry('held', { lastFailure })])
-    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', retryAfterUnknownSubmittedAt: -1 })])
-    ).toEqual({
-      [agentJournalSubmissionKey('doubt')]: 'Message delivery is unconfirmed.'
-    })
-    expect(texts([entry('bare', { state: 'rejected' })])).toEqual({
-      [agentJournalSubmissionKey('bare')]: 'Message was not sent.'
-    })
-  })
-
-  it('never says a send attempted before a Stop was not sent: the host may hold it', () => {
-    const interrupted = entry('stopped', { state: 'queued', lastAttemptAt: 5, outlivedStop: true })
-    expect(texts([interrupted])).toEqual({
-      [agentJournalSubmissionKey('stopped')]: 'Message delivery is unconfirmed.'
-    })
-    const neverSent = entry('unsent', { state: 'queued', outlivedStop: true })
-    expect(texts([neverSent])).toEqual({
-      [agentJournalSubmissionKey('unsent')]: 'Message was not sent.'
-    })
-  })
-
-  // The drain's own rule: a message behind the one the queue stopped on is only waiting, so it says
-  // only that it is still sending. A rejected or refused message holds nothing up and keeps its words.
-  it('says why on the message the queue stopped on and on every rejected or refused one', () => {
-    expect(
-      texts([
-        entry('sent', { state: 'dispatching' }),
-        entry('rejected', { state: 'rejected' }),
-        entry('failed', { lastFailure: { kind: 'failed' } }),
-        entry('stuck', { state: 'unconfirmed', retryAfterUnknownSubmittedAt: -1 }),
-        entry('behind', { state: 'unconfirmed' }),
-        entry('queued')
-      ])
-    ).toEqual({
-      [agentJournalSubmissionKey('sent')]: SENDING,
-      [agentJournalSubmissionKey('rejected')]: 'Message was not sent.',
-      [agentJournalSubmissionKey('failed')]: 'Your message was not sent.',
-      [agentJournalSubmissionKey('stuck')]: 'Message delivery is unconfirmed.',
-      [agentJournalSubmissionKey('behind')]: SENDING,
-      [agentJournalSubmissionKey('queued')]: SENDING
+describe('the line under each of the chat own messages', () => {
+  it('says only that a message on its way is sending', () => {
+    expect(texts(notices({ pending: [pending('a', 'sending')] }))).toEqual({
+      [agentJournalSubmissionKey('a')]: SENDING
     })
+    // The host's row draws a recorded one.
+    expect(texts(notices({ pending: [pending('c', 'recorded')] }))).toEqual({})
   })
 
-  // Its Retry would put it back in the queue to wait unseen behind the stopped message.
-  it('keeps a rejected message behind the stopped one its words but not its Retry', () => {
-    const retry = vi.fn()
-    for (const outbox of [
-      [
-        entry('stuck', { state: 'unconfirmed', retryAfterUnknownSubmittedAt: -1 }),
-        entry('rejected', { state: 'rejected' })
-      ],
-      [entry('held', { outlivedStop: true }), entry('rejected', { state: 'rejected' })]
-    ]) {
-      const notices = structuredAgentSessionDeliveryNotices(
-        outbox,
-        'Claude',
-        retry,
-        [],
-        [],
-        NOT_FAILED_HERE
-      )
-      expect(notices.get(agentJournalSubmissionKey('rejected'))).toEqual({
-        text: 'Message was not sent.'
-      })
-    }
-  })
-
-  // Ahead of the stopped message, its Retry sends it at once, so the row offers it.
-  it.each([
-    ['in doubt', { state: 'unconfirmed' as const, retryAfterUnknownSubmittedAt: -1 }],
-    ['outlived by a Stop', { outlivedStop: true as const }]
-  ])('gives a failed message ahead of one %s its Retry', (_label, patch) => {
-    const retry = vi.fn()
-    const notices = structuredAgentSessionDeliveryNotices(
-      [
-        entry('refused', {
-          lastAttemptAt: 1,
-          lastFailure: {
-            kind: 'refused',
-            code: 'agent_session_journal_unreadable',
-            details: { reason: 'journalWrittenByNewerOrca' }
-          }
-        }),
-        entry('rejected', { state: 'rejected' }),
-        entry('stuck', { lastAttemptAt: 2, ...patch })
-      ],
-      'Claude',
-      retry,
-      [],
-      [],
-      NOT_FAILED_HERE
-    )
-    for (const id of ['refused', 'rejected', 'stuck']) {
-      notices.get(agentJournalSubmissionKey(id))?.onRetry?.()
-    }
-    expect(retry.mock.calls).toEqual([['refused'], ['rejected'], ['stuck']])
-  })
-
-  // With no Retry beside it, the words keep the resend step.
-  it.each([
-    [
-      'providerStartFailed',
-      'Claude stopped before it finished starting. Send your message to try again.'
-    ],
-    ['notDelivered', 'This message was not delivered. Send it again to continue.'],
-    ['hostFault', "Orca ran into a problem, so this didn't go through. Try again."]
-  ] as const)('keeps the step in the words of a %s message the host rejected', (kind, reason) => {
-    expect(
-      texts([
-        entry('rejected', {
-          state: 'rejected',
-          lastFailure: { kind: 'rejected', reason, rejection: { kind } }
-        })
-      ])
-    ).toEqual({ [agentJournalSubmissionKey('rejected')]: reason })
-  })
-
-  // 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: id,
-      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' } },
-        // No Retry beside it, so the words keep the step.
-        "Claude couldn't start. Send your message to try again."
-      ],
-      [
-        '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.'
-      ]
-    ]
+  it("says nothing on a message the host recorded but couldn't confirm, as the common pattern", () => {
     expect(
       texts(
-        facts.map(([id]) => rejected(id)),
-        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' }
-          }
+        notices({
+          submissions: [row('a', 'unknown', { recovered: true }), row('b', 'accepted')]
         })
-      ])
-    ).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("shows the host's sentence when this build cannot read all of a rejection's fact", () => {
-    const reason = "Claude couldn't start. Start a new chat to continue."
-    const copiedReason = 'An image on this message uses a newer check.'
-    // As a newer host sends them: a known code with a new reason, and a new attachment reason.
-    const newerStart = JSON.parse(
-      '{ "kind": "startFailed", "refusal": { "code": "agent_session_conflict", "details": { "reason": "newerReason" } } }'
-    )
-    const newerAttachment = JSON.parse(
-      '{ "kind": "attachmentInvalid", "attachment": { "reason": "newerReason" } }'
-    )
-    expect(
-      texts(
-        [
-          entry('recorded', {
-            state: 'rejected',
-            lastFailure: structuredAgentSessionRejectedFailure({ reason, rejection: newerStart })
-          }),
-          entry('copied', {
-            state: 'rejected',
-            lastFailure: structuredAgentSessionRejectedFailure({
-              reason: copiedReason,
-              rejection: newerAttachment
-            })
-          })
-        ],
-        [
-          {
-            clientMessageId: 'recorded',
-            fence: 1,
-            payloadFingerprint: 'recorded',
-            dispatchState: 'rejected',
-            providerItemId: null,
-            reason,
-            rejection: newerStart,
-            submittedAt: 1,
-            resolvedAt: 1
-          }
-        ]
-      )
-    ).toEqual({
-      [agentJournalSubmissionKey('recorded')]: reason,
-      [agentJournalSubmissionKey('copied')]: copiedReason
-    })
-  })
-
-  // An earlier attempt under the id may have landed, so the row never says it was not sent.
-  it('words a kept message whose id expired as an outcome Orca cannot confirm', () => {
-    const notices = structuredAgentSessionDeliveryNotices(
-      [
-        entry('expired', {
-          lastAttemptAt: 1,
-          lastFailure: { kind: 'refused', code: 'agent_session_operation_expired' }
-        }),
-        entry('fresh', {
-          state: 'rejected',
-          lastFailure: { kind: 'refused', code: 'agent_session_operation_expired' }
-        })
-      ],
-      'Claude',
-      vi.fn(),
-      [],
-      [],
-      NOT_FAILED_HERE
-    )
-    expect(notices.get(agentJournalSubmissionKey('expired'))).toMatchObject({
-      text: "Orca couldn't confirm what happened. Check the chat."
-    })
-    expect(notices.get(agentJournalSubmissionKey('expired'))?.onRetry).toBeDefined()
-    // A first attempt's id was replaced when it was refused, so nothing can have landed.
-    expect(notices.get(agentJournalSubmissionKey('fresh'))?.text).toBe('Your message was not sent.')
-  })
-
-  // A cause read back from storage may have cleared; a Retry it still stops brings it back.
-  it('words a held cause only where its failure was seen while the chat was open', () => {
-    const held = entry('held', {
-      lastAttemptAt: 1,
-      lastFailure: {
-        kind: 'refused',
-        code: 'agent_session_journal_unreadable',
-        details: { reason: 'journalWrittenByNewerOrca' }
-      }
-    })
-    const words = (failedHere: ReadonlySet<string>) =>
-      structuredAgentSessionDeliveryNotices([held], 'Claude', vi.fn(), [], [], failedHere).get(
-        agentJournalSubmissionKey('held')
       )
-    expect(words(NOT_FAILED_HERE)).toMatchObject({ text: 'Your message was not sent.' })
-    expect(words(NOT_FAILED_HERE)?.onRetry).toBeDefined()
-    expect(words(new Set(['held']))?.text).toBe(
-      'Chats were saved by a newer Orca. Your message was not sent. Update Orca to keep using them.'
-    )
+    ).toEqual({})
   })
 
-  it('says only that a message waiting its turn or on its way is still sending', () => {
-    const notices = structuredAgentSessionDeliveryNotices(
-      [entry('queued'), entry('sending', { state: 'dispatching' })],
-      'Claude',
-      vi.fn(),
-      [],
-      [],
-      NOT_FAILED_HERE
-    )
-    expect([...notices.values()]).toEqual([{ sending: true }, { sending: true }])
-  })
-
-  // Any row the host holds for it is the answer, whatever its state; the row itself then shows it.
-  it.each(['pending', 'accepted'] as const)(
-    'stops saying a message is sending once the journal holds a %s row for it',
-    (dispatchState) => {
-      const answer = (clientMessageId: string): AgentJournalSubmission => ({
-        clientMessageId,
-        fence: 1,
-        payloadFingerprint: 'fp',
-        dispatchState,
-        providerItemId: null,
-        reason: null,
-        submittedAt: 1,
-        resolvedAt: null
-      })
-      const resent = entry('resent', { state: 'unconfirmed', lastAttemptAt: 1 })
-      const outbox = [entry('queued'), entry('sending', { state: 'dispatching' }), resent]
-      expect(texts(outbox)).toEqual({
-        [agentJournalSubmissionKey('queued')]: SENDING,
-        [agentJournalSubmissionKey('sending')]: SENDING,
-        [agentJournalSubmissionKey('resent')]: SENDING
-      })
-      expect(texts(outbox, [answer('queued'), answer('sending'), answer('resent')])).toEqual({})
-      // Read as the outbox will commit it, so the resent one never says it failed on the way.
-      expect(texts([resent], [answer('resent')])).toEqual({})
-    }
-  )
-
-  // Only a row that has the message ends it; one in doubt leaves it looking sent.
-  describe('a message whose journal row does not have it yet', () => {
-    const row = (
-      clientMessageId: string,
-      dispatchState: AgentJournalSubmission['dispatchState'],
-      patch: Partial<AgentJournalSubmission> = {}
-    ): AgentJournalSubmission => ({
-      clientMessageId,
-      fence: 1,
-      payloadFingerprint: 'fp',
-      dispatchState,
-      providerItemId: null,
-      reason: null,
-      submittedAt: 7,
-      resolvedAt: null,
-      ...patch
+  it("words a message the host rejected from the host's fact, with no control", () => {
+    const map = notices({
+      submissions: [row('a', 'rejected', { reason: 'Claude does not support the image type .bmp' })]
     })
-    const stuck = entry('stuck', { state: 'unconfirmed', retryAfterUnknownSubmittedAt: -1 })
-
-    it.each([
-      ['queued', { state: 'queued' as const }, {}],
-      ['in flight', { state: 'dispatching' as const, lastAttemptAt: 2 }, {}],
-      [
-        'in flight, after a host restart',
-        { state: 'dispatching' as const, lastAttemptAt: 2 },
-        { recovered: true as const }
-      ]
-    ])('says it is sending while your Retry is %s', (_label, patch, rowPatch) => {
-      const doubt = row('m', 'unknown', rowPatch)
-      expect(texts([entry('m', { state: 'unconfirmed', lastAttemptAt: 1 })], [doubt])).toEqual({
-        [agentJournalSubmissionKey('m')]: 'Message delivery is unconfirmed.'
-      })
-      const retried = entry('m', { lastAttemptAt: 1, retryAfterUnknownSubmittedAt: 7, ...patch })
-      expect(texts([retried], [doubt])).toEqual({ [agentJournalSubmissionKey('m')]: SENDING })
-    })
-
-    it.each([
-      ['a live unknown', {}],
-      ['a recovered unknown', { recovered: true as const }]
-    ])('says the second of two in doubt is sending when each row holds %s', (_label, patch) => {
-      const a = entry('a', { state: 'unconfirmed' })
-      const b = entry('b', { state: 'unconfirmed' })
-      expect(texts([a, b], [row('a', 'unknown', patch), row('b', 'unknown', patch)])).toEqual({
-        [agentJournalSubmissionKey('a')]: 'Message delivery is unconfirmed.',
-        [agentJournalSubmissionKey('b')]: SENDING
-      })
-    })
-
-    // The rejection makes it the host's: not sent, in the host's words, whether its outbox copy or
-    // its loaded row draws it.
-    it('says a requeued message whose row was rejected was not sent, never sending', () => {
-      const requeued = entry('q', { state: 'queued', lastAttemptAt: 1 })
-      const rejected = row('q', 'rejected', { reason: 'provider said no', resolvedAt: 8 })
-      const notSent = { [agentJournalSubmissionKey('q')]: 'provider said no' }
-      expect(texts([requeued], [rejected])).toEqual(notSent)
-      expect(texts([stuck, requeued], [rejected])).toEqual({
-        [agentJournalSubmissionKey('stuck')]: 'Message delivery is unconfirmed.',
-        ...notSent
-      })
-      const loadedRow: AgentJournalRenderItem = {
-        itemId: agentJournalSubmissionKey('q'),
-        revision: 1,
-        sequence: 1,
-        observedAt: 8,
-        body: { kind: 'message', role: 'user', blocks: [{ type: 'text', text: 'q' }] }
-      }
-      const loaded = structuredAgentSessionDeliveryNotices(
-        [requeued],
-        'Claude',
-        vi.fn(),
-        [rejected],
-        [],
-        NOT_FAILED_HERE,
-        new Set(),
-        [loadedRow]
-      )
-      expect([...loaded]).toEqual([[agentJournalSubmissionKey('q'), { text: 'provider said no' }]])
-    })
-  })
-
-  // One state, one surface: a row that says it did not go through never also says it is sending.
-  it.each([
-    ['rejected', entry('m', { state: 'rejected' }), []],
-    ['held for its Retry', entry('m', { lastFailure: { kind: 'failed' } }), []],
-    [
-      'in doubt with a row the host holds',
-      entry('m', { state: 'unconfirmed', lastAttemptAt: 1 }),
-      [
-        {
-          clientMessageId: 'm',
-          fence: 1,
-          payloadFingerprint: 'fp',
-          dispatchState: 'unknown',
-          providerItemId: null,
-          reason: null,
-          submittedAt: 1,
-          resolvedAt: null
-        } satisfies AgentJournalSubmission
-      ]
-    ],
-    [
-      'retried by the user',
-      entry('m', { state: 'unconfirmed', retryAfterUnknownSubmittedAt: 1 }),
-      []
-    ],
-    ['outlived by a Stop', entry('m', { state: 'unconfirmed', outlivedStop: true }), []]
-  ])('says only why on a message %s, never that it is sending', (_label, failed, rows) => {
-    const notice = structuredAgentSessionDeliveryNotices(
-      [failed],
-      'Claude',
-      vi.fn(),
-      rows,
-      [],
-      NOT_FAILED_HERE
-    ).get(agentJournalSubmissionKey('m'))
-    expect(notice?.sending).toBeUndefined()
-    expect(notice?.text).toMatch(/not sent|unconfirmed/)
-    expect(notice?.onRetry).toBeDefined()
+    const notice = map.get(agentJournalSubmissionKey('a'))
+    expect(notice?.text).toBe('Claude does not support the image type .bmp')
+    expect(notice?.onDismiss).toBeUndefined()
   })
 
-  // The unconfirmed probe resends it under its own id until the journal answers, so the row says
-  // it is still sending, with no Retry, until a row lands.
-  describe('a message in doubt that Orca resends on its own', () => {
-    const doubt = (patch: Partial<StructuredAgentSessionOutboxEntry> = {}) =>
-      entry('doubt', { state: 'unconfirmed', lastAttemptAt: 1, ...patch })
-    const row = (patch: Partial<AgentJournalSubmission>): AgentJournalSubmission => ({
-      clientMessageId: 'doubt',
-      fence: 1,
-      payloadFingerprint: 'fp',
-      dispatchState: 'unknown',
-      providerItemId: null,
-      reason: null,
-      submittedAt: 1,
-      resolvedAt: null,
-      ...patch
-    })
-    const UNCONFIRMED = { [agentJournalSubmissionKey('doubt')]: 'Message delivery is unconfirmed.' }
-
-    it('says only that it is still sending while the journal holds no row for it', () => {
-      const notices = structuredAgentSessionDeliveryNotices(
-        [doubt(), entry('behind')],
-        'Claude',
-        vi.fn(),
-        [],
-        [],
-        NOT_FAILED_HERE
-      )
-      expect(notices.get(agentJournalSubmissionKey('doubt'))).toEqual({ sending: true })
-      expect(notices.get(agentJournalSubmissionKey('behind'))).toEqual({ sending: true })
-      // Another message's row is not its answer.
-      expect(
-        texts([doubt()], [row({ clientMessageId: 'other', dispatchState: 'accepted' })])
-      ).toEqual({ [agentJournalSubmissionKey('doubt')]: SENDING })
-    })
-
-    it.each([
-      ['a live unknown', row({})],
-      ['a recovered unknown', row({ recovered: true })],
-      [
-        "an older host's recovered unknown",
-        row({ reason: 'host_restarted_before_acknowledgement' })
-      ]
-    ])('says it is unconfirmed, with its Retry, once the journal holds %s', (_label, answer) => {
-      const retry = vi.fn()
-      const notices = structuredAgentSessionDeliveryNotices(
-        [doubt()],
-        'Claude',
-        retry,
-        [answer],
-        [],
-        NOT_FAILED_HERE
-      )
-      expect(Object.fromEntries([...notices].map(([id, notice]) => [id, notice.text]))).toEqual(
-        UNCONFIRMED
-      )
-      notices.get(agentJournalSubmissionKey('doubt'))?.onRetry?.()
-      expect(retry).toHaveBeenCalledExactlyOnceWith('doubt')
-    })
-
-    it.each([
-      ['the user already retried', { retryAfterUnknownSubmittedAt: 1 }],
-      ['a Stop outlived', { outlivedStop: true as const }]
-    ])('says it is unconfirmed when %s it, as nothing resends it', (_label, patch) => {
-      expect(texts([doubt(patch)])).toEqual(UNCONFIRMED)
-    })
+  it('says nothing for a message a Stop withdrew: it went back to the composer', () => {
+    expect(
+      texts(notices({ submissions: [row('a', 'rejected', { rejection: { kind: 'cancelled' } })] }))
+    ).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,
@@ -759,42 +136,16 @@ describe('the notice on each message that did not go through', () => {
       ).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' } }
-      }
+    it('says only that it was not sent, and words a rejection no row states in full', () => {
       const facts = structuredAgentSessionStartFailureFacts([statusRow(startRowKey, startFailed)])
-      expect(
-        texts(
-          [
-            rejected('first', startFailed),
-            rejected('second', startFailed),
-            rejected('other', otherRefusal)
-          ],
-          [
-            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."
+      const recorded = (id: string) =>
+        row(id, 'rejected', { reason: 'Written by the host.', rejection: startFailed })
+      expect(texts(notices({ submissions: [recorded('first')], startFailures: facts }))).toEqual({
+        [agentJournalSubmissionKey('first')]: 'Your message was not sent.'
       })
-    })
-
-    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)], [], [startFailed])).toEqual({
-        [agentJournalSubmissionKey('first')]: 'Written by the host.'
+      expect(texts(notices({ submissions: [recorded('first')] }))).toEqual({
+        [agentJournalSubmissionKey('first')]: "Claude couldn't start. Start a new chat to continue."
       })
-      expect(texts([rejected('first', startFailed)], [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
index ef91f8c1920f..64cf71eadfb3 100644
--- 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
@@ -1,20 +1,5 @@
-// Which of the structured chat's own messages say, on their row, that they did not go through, and
-// which say quietly that they are still sending: every other one, until the host holds a row that
-// has it (pending or accepted). A row in doubt does not, so a message resent over one still reads
-// as sending; a rejected row makes it the host's, shown as not sent.
-//
-// 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, the message it stopped on and any failed one ahead of it have a Retry, as
-// each would go out at once; one behind it would wait unseen. One waiting behind has no failure of
-// its own, so it reads as sending; a rejected or refused 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 drawn from the host's history, worded from the
-// journal's own fact, with no Retry: sending it again is a new message. 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. Until its row loads, the outbox draws it from its smaller copy, which leaves on the batch
-// or page that loads the row.
+// What each of the structured chat's own messages says under it about its delivery. Derived from
+// the sender's in-memory sends and the host's rows on every render, never stored.
 
 import {
   readAgentSessionFailureFact,
@@ -28,31 +13,15 @@ import type {
 } 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 {
-  structuredAgentSessionEntryIdExpired,
-  structuredAgentSessionEntryRejectedByHost,
-  type StructuredAgentSessionOutboxEntry
-} from '../../../../shared/structured-agent-session-outbox'
-import {
-  admitStructuredAgentSessionOutboxEntry,
-  structuredAgentSessionEntryHeldForRetry
-} from '../../../../shared/structured-agent-session-outbox-admission'
-import { reconcileStructuredAgentSessionOutboxWithQueue } from '../../../../shared/structured-agent-session-draft-hand-off'
-import { structuredAgentSessionEntryResendsUnconfirmed } from '../../../../shared/structured-agent-session-outbox-unconfirmed-resend'
-import type { AgentSessionFailureWordsContext } from '../../../../shared/agent-session-failure-words'
-import {
-  structuredAgentSessionAttemptFailureParts,
-  structuredAgentSessionRejectionParts
-} from '../../../../shared/structured-agent-session-send-disposition'
+import { structuredAgentSessionRejectionParts } from '../../../../shared/structured-agent-session-rejection-words'
 import { structuredAgentSessionRejectedShownInPlace } from '../../../../shared/structured-agent-session-message-projection'
-import { translate } from '@/i18n/i18n'
 import { agentSessionWriteNoticeText } from './agent-session-write-notice-text'
 import type { NativeChatDeliveryNotice } from './NativeChatMessageRow'
+import type { StructuredAgentSessionPendingSend } from './structured-agent-session-pending-sends'
 
 /** One shared value, so a rebuilt map re-renders no row still sending. */
 const STRUCTURED_AGENT_SESSION_DELIVERY_SENDING: NativeChatDeliveryNotice = { sending: true }
 const NO_COMMANDS: ReadonlySet<string> = new Set()
-const NO_ITEMS: readonly AgentJournalRenderItem[] = []
 
 /** The facts the chat's loaded start-failure rows state. */
 export function structuredAgentSessionStartFailureFacts(
@@ -100,39 +69,6 @@ export function agentSessionFailureStatedByStartRow(
   )
 }
 
-function deliveryNoticeText(
-  entry: StructuredAgentSessionOutboxEntry,
-  context: AgentSessionFailureWordsContext,
-  failedHere: ReadonlySet<string>
-): string {
-  // A send attempted before a Stop and then interrupted may already be with the host.
-  const attemptedAcrossStop =
-    entry.outlivedStop === true && entry.lastAttemptAt !== null && !entry.lastFailure
-  if (entry.state === 'unconfirmed' || attemptedAcrossStop) {
-    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.'
-    )
-  }
-  // An earlier attempt under the id the host forgot may already be in the chat.
-  if (structuredAgentSessionEntryIdExpired(entry)) {
-    return agentSessionWriteNoticeText(['outcomeUnknown'])
-  }
-  // Its cause may have cleared since it was saved; a Retry it still stops brings the cause back.
-  if (structuredAgentSessionEntryHeldForRetry(entry) && !failedHere.has(entry.clientMessageId)) {
-    return agentSessionWriteNoticeText(agentSessionWriteNotDoneParts('send'))
-  }
-  return agentSessionWriteNoticeText(
-    structuredAgentSessionAttemptFailureParts(entry.lastFailure, context)
-  )
-}
-
 function hostRejectionNoticeText(
   submission: AgentJournalSubmission,
   agentName: string,
@@ -151,72 +87,43 @@ function hostRejectionNoticeText(
   )
 }
 
-/** Keyed by the message id the transcript renders each entry under; `agentName` is the chat's
- *  agent, for the words. */
-export function structuredAgentSessionDeliveryNotices(
-  outbox: readonly StructuredAgentSessionOutboxEntry[],
-  agentName: string,
-  retry: (clientMessageId: string) => void,
-  /** The journal's rows: rejected ones carry more of a rejection than the message keeps, and a
-   *  message with no pending or accepted one is still sending. */
-  submissions: readonly AgentJournalSubmission[],
+/**
+ * Keyed by the message id the transcript renders each message under; `agentName` is the chat's
+ * agent, for the words. A message on its way says so quietly, and one the host rejected is worded
+ * from the host's fact. A message whose delivery nobody can confirm says nothing on its row, as in
+ * the common pattern: one this window could not confirm went back to its composer with the reason.
+ */
+export function structuredAgentSessionDeliveryNotices(args: {
+  pending: readonly StructuredAgentSessionPendingSend[]
+  submissions: readonly AgentJournalSubmission[]
+  agentName: string
   /** What the loaded start-failure rows state, from `structuredAgentSessionStartFailureFacts`. */
-  startFailures: readonly AgentSessionFailureFact[],
-  /** Ids whose send failed or was refused while this chat was open: only they word their cause. */
-  failedHere: ReadonlySet<string>,
+  startFailures: readonly AgentSessionFailureFact[]
   /** The loaded commands, from `structuredAgentSessionCommandItemIds`: they report their own. */
-  commandItemIds: ReadonlySet<string> = NO_COMMANDS,
-  /** The loaded rows: a rejected message's outbox copy leaves once its row is here. */
-  journalItems: readonly AgentJournalRenderItem[] = NO_ITEMS
-): ReadonlyMap<string, NativeChatDeliveryNotice> {
-  // As the transcript reads it, so a row that lands is answered here before the outbox commits it.
-  const entries = reconcileStructuredAgentSessionOutboxWithQueue(outbox, submissions, journalItems)
-  const admission = admitStructuredAgentSessionOutboxEntry(entries)
-  const held = admission.state === 'blocked' ? admission.entry.clientMessageId : null
-  const stalledFrom = admission.state === 'blocked' ? entries.indexOf(admission.entry) : -1
-  const rejected = new Map(
-    submissions
-      .filter((submission) => submission.dispatchState === 'rejected')
-      .map((submission) => [submission.clientMessageId, submission])
-  )
+  commandItemIds?: ReadonlySet<string>
+}): ReadonlyMap<string, NativeChatDeliveryNotice> {
+  const { agentName, submissions } = args
   const notices = new Map<string, NativeChatDeliveryNotice>()
-  for (const [index, entry] of entries.entries()) {
-    // Resent under its own id until the journal answers, so still sending, not failed.
-    if (
-      !structuredAgentSessionEntryResendsUnconfirmed(entry, submissions) &&
-      (entry.state === 'rejected' ||
-        structuredAgentSessionEntryHeldForRetry(entry) ||
-        entry.clientMessageId === held)
-    ) {
-      // Its own Retry is the step, so the words leave out sending again. One the host recorded is
-      // the host's: sending it again is a new message, so it has no Retry.
-      const retryControl =
-        (stalledFrom === -1 || index <= stalledFrom) &&
-        !structuredAgentSessionEntryRejectedByHost(entry)
-      const text = deliveryNoticeText(entry, { agentName, retryControl }, failedHere)
-      notices.set(
-        agentJournalSubmissionKey(entry.clientMessageId),
-        retryControl ? { text, onRetry: () => retry(entry.clientMessageId) } : { text }
-      )
-    } else if (
-      !submissions.some(
-        (submission) =>
-          submission.clientMessageId === entry.clientMessageId &&
-          (submission.dispatchState === 'pending' || submission.dispatchState === 'accepted')
-      )
-    ) {
+  // A row under the id is the host's to describe, before the sender settles from it.
+  const recorded = new Set(submissions.map((submission) => submission.clientMessageId))
+  for (const entry of args.pending) {
+    if (entry.phase === 'sending' && !recorded.has(entry.clientMessageId)) {
       notices.set(
         agentJournalSubmissionKey(entry.clientMessageId),
         STRUCTURED_AGENT_SESSION_DELIVERY_SENDING
       )
     }
   }
-  // After the outbox's: in the host's words, whether its row or the outbox's copy draws it.
-  const shown = structuredAgentSessionRejectedShownInPlace(submissions, commandItemIds)
-  for (const submission of rejected.values()) {
+  const shown = structuredAgentSessionRejectedShownInPlace(
+    submissions,
+    args.commandItemIds ?? NO_COMMANDS
+  )
+  for (const submission of submissions) {
     const id = agentJournalSubmissionKey(submission.clientMessageId)
-    if (shown.has(id)) {
-      notices.set(id, { text: hostRejectionNoticeText(submission, agentName, startFailures) })
+    if (submission.dispatchState === 'rejected' && shown.has(id)) {
+      notices.set(id, {
+        text: hostRejectionNoticeText(submission, agentName, args.startFailures)
+      })
     }
   }
   return notices
diff --git a/src/renderer/src/components/native-chat/structured-agent-session-legacy-outbox.test.ts b/src/renderer/src/components/native-chat/structured-agent-session-legacy-outbox.test.ts
new file mode 100644
index 000000000000..b352da357adf
--- /dev/null
+++ b/src/renderer/src/components/native-chat/structured-agent-session-legacy-outbox.test.ts
@@ -0,0 +1,182 @@
+// @vitest-environment happy-dom
+
+import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest'
+import type { AgentJournalSubmission } from '../../../../shared/agent-session-journal-types'
+import { agentJournalSubmissionKey } from '../../../../shared/agent-session-journal-item-key'
+
+const mocks = vi.hoisted(() => ({
+  outline: vi.fn(),
+  handBack: vi.fn((_sessionId: string, _clientMessageId: string, _body: unknown): boolean => true),
+  notice: vi.fn()
+}))
+
+vi.mock('@/runtime/structured-agent-session-client', () => ({
+  readStructuredAgentSessionConversationOutline: mocks.outline
+}))
+vi.mock('./structured-agent-session-message-hand-back', () => ({
+  handBackStructuredAgentSessionMessage: mocks.handBack
+}))
+vi.mock('./structured-agent-session-pending-sends', () => ({
+  setStructuredAgentSessionSendNotice: mocks.notice
+}))
+
+import { recoverLegacyStructuredAgentSessionOutbox } from './structured-agent-session-legacy-outbox'
+
+const SESSION = 'session-1'
+const KEY = `orca:desktopStructuredAgentSessionOutbox:v1:${SESSION}`
+const target = { kind: 'local' } as const
+
+function saved(clientMessageId: string, text: string) {
+  return {
+    clientMessageId,
+    sessionId: SESSION,
+    body: { kind: 'message', role: 'user', blocks: [{ type: 'text', text }] },
+    previewUris: [],
+    state: 'unconfirmed',
+    queuedAt: 1,
+    lastAttemptAt: 1,
+    retryAfterUnknownSubmittedAt: null
+  }
+}
+
+function outline(ids: string[], omittedEntries = 0) {
+  return {
+    sessionId: SESSION,
+    cursor: { epoch: 'e', sequence: 9 },
+    entries: ids.map((id, index) => ({
+      itemId: agentJournalSubmissionKey(id),
+      sequence: index,
+      preview: id,
+      imageCount: 0
+    })),
+    omittedEntries
+  }
+}
+
+function recover(args: {
+  submissions?: AgentJournalSubmission[]
+  queuedMessageIds?: string[]
+}): Promise<void> {
+  return recoverLegacyStructuredAgentSessionOutbox({
+    sessionId: SESSION,
+    target,
+    submissions: args.submissions ?? [],
+    queuedMessageIds: args.queuedMessageIds ?? []
+  })
+}
+
+describe('a chat an older build left messages for', () => {
+  beforeEach(() => {
+    localStorage.clear()
+    mocks.outline.mockReset()
+    mocks.handBack.mockClear()
+    mocks.handBack.mockReturnValue(true)
+    mocks.notice.mockClear()
+  })
+  afterEach(() => localStorage.clear())
+
+  it('gives back only what the host holds nowhere, never sends, and deletes the copy', async () => {
+    localStorage.setItem(
+      KEY,
+      JSON.stringify([
+        saved('drawn', 'in the chat'),
+        saved('card', 'a card'),
+        saved('lost', 'gone')
+      ])
+    )
+    mocks.outline.mockResolvedValue(outline(['drawn']))
+    await recover({ queuedMessageIds: ['card'] })
+    expect(mocks.handBack).toHaveBeenCalledExactlyOnceWith(SESSION, 'lost', {
+      kind: 'message',
+      role: 'user',
+      blocks: [{ type: 'text', text: 'gone' }]
+    })
+    expect(mocks.notice).toHaveBeenCalledWith(SESSION, 'Your message was not sent. Send it again.')
+    expect(localStorage.getItem(KEY)).toBeNull()
+  })
+
+  // The older build kept the list in send order only by sorting it when read.
+  it('hands back in the order they were sent, whatever order the copy holds them in', async () => {
+    localStorage.setItem(
+      KEY,
+      JSON.stringify([
+        { ...saved('third', 'three'), queuedAt: 30 },
+        { ...saved('first', 'one'), queuedAt: 10 },
+        { ...saved('second', 'two'), queuedAt: 20 }
+      ])
+    )
+    mocks.outline.mockResolvedValue(outline([]))
+    await recover({})
+    expect(mocks.handBack.mock.calls.map(([, clientMessageId]) => clientMessageId)).toEqual([
+      'first',
+      'second',
+      'third'
+    ])
+  })
+
+  it('never hands back one the host recorded and then rejected: its row shows it', async () => {
+    localStorage.setItem(
+      KEY,
+      JSON.stringify([
+        {
+          ...saved('rejected', 'host said no'),
+          state: 'rejected',
+          lastFailure: { kind: 'rejected', reason: null }
+        }
+      ])
+    )
+    mocks.outline.mockResolvedValue(outline([]))
+    await recover({})
+    expect(mocks.handBack).not.toHaveBeenCalled()
+    expect(localStorage.getItem(KEY)).toBeNull()
+  })
+
+  it('hands back a refused, held or outlived-Stop copy once, and never again', async () => {
+    localStorage.setItem(
+      KEY,
+      JSON.stringify([
+        {
+          ...saved('refused', 'refused'),
+          state: 'rejected',
+          lastFailure: { kind: 'refused', code: 'agent_session_conflict' }
+        },
+        { ...saved('held', 'held for Retry'), state: 'queued', lastFailure: { kind: 'failed' } },
+        { ...saved('stopped', 'outlived a Stop'), outlivedStop: true }
+      ])
+    )
+    mocks.outline.mockResolvedValue(outline([]))
+    await recover({})
+    expect(mocks.handBack.mock.calls.map((call) => call[1])).toEqual(['refused', 'held', 'stopped'])
+    expect(localStorage.getItem(KEY)).toBeNull()
+    await recover({})
+    expect(mocks.handBack).toHaveBeenCalledTimes(3)
+  })
+
+  it('says it could not confirm when the host cannot list the whole chat', async () => {
+    localStorage.setItem(KEY, JSON.stringify([saved('maybe', 'maybe sent')]))
+    mocks.outline.mockResolvedValue(outline([], 3))
+    await recover({})
+    expect(mocks.handBack).toHaveBeenCalledOnce()
+    expect(mocks.notice).toHaveBeenCalledWith(
+      SESSION,
+      expect.stringContaining("couldn't confirm your message reached the agent")
+    )
+  })
+
+  it('keeps the copy for the next open when the text could not be saved back', async () => {
+    localStorage.setItem(KEY, JSON.stringify([saved('lost', 'gone')]))
+    mocks.outline.mockResolvedValue(null)
+    mocks.handBack.mockReturnValue(false)
+    await recover({})
+    expect(localStorage.getItem(KEY)).not.toBeNull()
+  })
+
+  it('drops a message the host already has a row for', async () => {
+    localStorage.setItem(KEY, JSON.stringify([saved('row', 'recorded')]))
+    mocks.outline.mockRejectedValue(new Error('offline'))
+    // oxlint-disable-next-line typescript/consistent-type-assertions -- SAFETY: only the id is read.
+    await recover({ submissions: [{ clientMessageId: 'row' } as AgentJournalSubmission] })
+    expect(mocks.handBack).not.toHaveBeenCalled()
+    expect(localStorage.getItem(KEY)).toBeNull()
+  })
+})
diff --git a/src/renderer/src/components/native-chat/structured-agent-session-legacy-outbox.ts b/src/renderer/src/components/native-chat/structured-agent-session-legacy-outbox.ts
new file mode 100644
index 000000000000..79b626f05708
--- /dev/null
+++ b/src/renderer/src/components/native-chat/structured-agent-session-legacy-outbox.ts
@@ -0,0 +1,151 @@
+// Older builds kept each chat's unsent messages in localStorage and sent them on their own. Nothing
+// sends from that copy any more: the first time a chat opens, each message there that its host does
+// not hold goes back to the chat's composer, and the copy is deleted once that is saved.
+// Temporary: builds before this change wrote the copy. In the first release on or after 2027-04-01,
+// replace this read with a one-time removal of every key under the prefix.
+
+import { agentJournalSubmissionKey } from '../../../../shared/agent-session-journal-item-key'
+import type {
+  AgentJournalMessageItem,
+  AgentJournalSubmission
+} from '../../../../shared/agent-session-journal-types'
+import type { AgentSessionWriteNoticePart } from '../../../../shared/agent-session-write-notice-copy'
+import { agentSessionWriteNotDoneParts } from '../../../../shared/agent-session-refusal-notice'
+import type { RuntimeClientTarget } from '@/runtime/runtime-rpc-client'
+import { readStructuredAgentSessionConversationOutline } from '@/runtime/structured-agent-session-client'
+import { agentSessionWriteNoticeText } from './agent-session-write-notice-text'
+import { handBackStructuredAgentSessionMessage } from './structured-agent-session-message-hand-back'
+import { setStructuredAgentSessionSendNotice } from './structured-agent-session-pending-sends'
+
+const LEGACY_OUTBOX_PREFIX = 'orca:desktopStructuredAgentSessionOutbox:v1:'
+
+type LegacyOutboxMessage = { clientMessageId: string; body: AgentJournalMessageItem }
+
+function legacyKey(sessionId: string): string {
+  return `${LEGACY_OUTBOX_PREFIX}${encodeURIComponent(sessionId)}`
+}
+
+function isRecord(value: unknown): value is Record<string, unknown> {
+  return typeof value === 'object' && value !== null
+}
+
+function readLegacyBody(value: unknown): AgentJournalMessageItem | null {
+  if (!isRecord(value) || value.kind !== 'message' || value.role !== 'user') {
+    return null
+  }
+  const blocks: AgentJournalMessageItem['blocks'] = []
+  const stored: unknown[] = Array.isArray(value.blocks) ? value.blocks : []
+  for (const block of stored) {
+    if (isRecord(block) && block.type === 'text' && typeof block.text === 'string') {
+      blocks.push({ type: 'text', text: block.text })
+    } else if (isRecord(block) && block.type === 'image-ref' && typeof block.path === 'string') {
+      blocks.push({ type: 'image-ref', path: block.path })
+    }
+  }
+  return blocks.length > 0 ? { kind: 'message', role: 'user', blocks } : null
+}
+
+/** When the person sent it; an entry with none keeps its place after the dated ones. */
+function legacyQueuedAt(entry: unknown): number {
+  return isRecord(entry) && typeof entry.queuedAt === 'number' ? entry.queuedAt : Infinity
+}
+
+/** In the order they were sent, as the older build read them. */
+export function readLegacyStructuredAgentSessionOutbox(sessionId: string): LegacyOutboxMessage[] {
+  try {
+    const value: unknown = JSON.parse(localStorage.getItem(legacyKey(sessionId)) ?? '[]')
+    return Array.isArray(value)
+      ? [...value]
+          .sort((left: unknown, right: unknown) => legacyQueuedAt(left) - legacyQueuedAt(right))
+          .flatMap((entry: unknown) => {
+            const body = isRecord(entry) ? readLegacyBody(entry.body) : null
+            // One the host recorded and then rejected is drawn by its own row as not sent.
+            const hostRejected =
+              isRecord(entry) &&
+              entry.state === 'rejected' &&
+              isRecord(entry.lastFailure) &&
+              entry.lastFailure.kind === 'rejected'
+            return body &&
+              !hostRejected &&
+              isRecord(entry) &&
+              typeof entry.clientMessageId === 'string'
+              ? [{ clientMessageId: entry.clientMessageId, body }]
+              : []
+          })
+      : []
+  } catch {
+    return []
+  }
+}
+
+const recovering = new Set<string>()
+
+/**
+ * Hands back what a chat's legacy copy holds that its host does not, asking the host rather than
+ * reading the loaded page: the conversation outline lists every message the chat draws, and the
+ * queue every card. A message neither shows comes back worded as not sent when the outline is
+ * whole, and as unconfirmed when it is not or the host can't say. Never sends anything.
+ */
+export async function recoverLegacyStructuredAgentSessionOutbox(args: {
+  sessionId: string
+  target: RuntimeClientTarget
+  submissions: readonly AgentJournalSubmission[]
+  queuedMessageIds: readonly string[]
+}): Promise<void> {
+  const { sessionId } = args
+  const messages = readLegacyStructuredAgentSessionOutbox(sessionId)
+  if (messages.length === 0) {
+    try {
+      localStorage.removeItem(legacyKey(sessionId))
+    } catch {
+      // Nothing to recover; a key storage refuses to drop is read as empty again next time.
+    }
+    return
+  }
+  if (recovering.has(sessionId)) {
+    return
+  }
+  recovering.add(sessionId)
+  try {
+    const outline = await readStructuredAgentSessionConversationOutline(
+      args.target,
+      sessionId
+    ).catch(() => null)
+    const held = new Set<string>(args.queuedMessageIds)
+    for (const submission of args.submissions) {
+      held.add(submission.clientMessageId)
+      if (submission.queuedMessageId !== undefined) {
+        held.add(submission.queuedMessageId)
+      }
+    }
+    const drawn = new Set(outline?.entries.map((entry) => entry.itemId) ?? [])
+    const whole = outline !== null && outline.omittedEntries === 0
+    let durable = true
+    let notice: AgentSessionWriteNoticePart[] | null = null
+    for (const message of messages) {
+      if (
+        held.has(message.clientMessageId) ||
+        drawn.has(agentJournalSubmissionKey(message.clientMessageId))
+      ) {
+        continue
+      }
+      durable =
+        handBackStructuredAgentSessionMessage(sessionId, message.clientMessageId, message.body) &&
+        durable
+      notice =
+        notice?.[0] === 'sendOutcomeLost' || !whole
+          ? ['sendOutcomeLost']
+          : agentSessionWriteNotDoneParts('composer-send')
+    }
+    if (notice) {
+      setStructuredAgentSessionSendNotice(sessionId, agentSessionWriteNoticeText(notice))
+    }
+    if (durable) {
+      localStorage.removeItem(legacyKey(sessionId))
+    }
+  } catch {
+    // Storage refused: the copy stays for the next open, and nothing waits on it.
+  } finally {
+    recovering.delete(sessionId)
+  }
+}
diff --git a/src/renderer/src/components/native-chat/structured-agent-session-message-hand-back.test.ts b/src/renderer/src/components/native-chat/structured-agent-session-message-hand-back.test.ts
new file mode 100644
index 000000000000..83d4cf1191c0
--- /dev/null
+++ b/src/renderer/src/components/native-chat/structured-agent-session-message-hand-back.test.ts
@@ -0,0 +1,26 @@
+// @vitest-environment happy-dom
+
+import { afterEach, expect, it } from 'vitest'
+import { structuredAgentSessionSendBody } from '../../../../shared/structured-agent-session-send-mutation'
+import {
+  clearNativeChatComposerDraftsForTests,
+  readNativeChatComposerDraft,
+  structuredAgentSessionDraftScopeKey
+} from './native-chat-composer-draft-store'
+import { handBackStructuredAgentSessionMessage } from './structured-agent-session-message-hand-back'
+
+afterEach(() => clearNativeChatComposerDraftsForTests())
+
+it('gives a message back to its conversation draft, each image on the host it lives on', () => {
+  const body = structuredAgentSessionSendBody('look at these', [
+    { path: '/remote/a.png', previewUri: '/remote/a.png', connectionId: 'ssh-1' },
+    { path: '/local/b.png', previewUri: '/local/b.png' }
+  ])
+  expect(handBackStructuredAgentSessionMessage('session-1', 'm1', body, ['ssh-1', null])).toBe(true)
+  const draft = readNativeChatComposerDraft(structuredAgentSessionDraftScopeKey('session-1'))
+  expect(draft.text).toBe('look at these')
+  expect(draft.images).toEqual([
+    { id: 'returned-m1-1', path: '/remote/a.png', connectionId: 'ssh-1' },
+    { id: 'returned-m1-2', path: '/local/b.png' }
+  ])
+})
diff --git a/src/renderer/src/components/native-chat/structured-agent-session-message-hand-back.ts b/src/renderer/src/components/native-chat/structured-agent-session-message-hand-back.ts
new file mode 100644
index 000000000000..05966b4c6bd2
--- /dev/null
+++ b/src/renderer/src/components/native-chat/structured-agent-session-message-hand-back.ts
@@ -0,0 +1,67 @@
+import type { AgentJournalMessageItem } from '../../../../shared/agent-session-journal-types'
+import {
+  appendToNativeChatComposerDraft,
+  structuredAgentSessionDraftScopeKey
+} from './native-chat-composer-draft-store'
+import { appendNativeChatDraftCache } from './native-chat-draft-cache'
+
+/** The text a message body carries, as the composer shows it. */
+export function structuredAgentSessionMessageText(body: AgentJournalMessageItem): string {
+  return body.blocks.flatMap((block) => (block.type === 'text' ? [block.text] : [])).join('\n')
+}
+
+/** Puts a message's text and images into a composer, after whatever is there. True once the text
+ *  is durable. */
+export function returnMessageToComposer(
+  composerScopeKey: string,
+  /** Unique to this message, so its images never collide with ones already attached. */
+  attachmentIdPrefix: string,
+  blocks: AgentJournalMessageItem['blocks'],
+  /** Each image's SSH connection, in block order. */
+  imageConnectionIds?: readonly (string | null)[]
+): boolean {
+  const durable = appendNativeChatDraftCache(
+    composerScopeKey,
+    structuredAgentSessionMessageText({ kind: 'message', role: 'user', blocks })
+  )
+  let image = 0
+  // Not the attachment hook's helper: its imports reach the store, whose teardown imports this.
+  const images = blocks.flatMap((block, index) => {
+    if (block.type !== 'image-ref') {
+      return []
+    }
+    const connectionId = imageConnectionIds?.[image++]
+    return block.path
+      ? [
+          {
+            id: `${attachmentIdPrefix}-${index}`,
+            path: block.path,
+            ...(connectionId ? { connectionId } : {})
+          }
+        ]
+      : []
+  })
+  if (images.length > 0) {
+    appendToNativeChatComposerDraft(composerScopeKey, { images })
+  }
+  return durable
+}
+
+/**
+ * Puts a message that did not reach the host back in its chat's composer, after whatever is
+ * there: the chat's draft is keyed by its conversation, so this works with or without its view
+ * mounted. True once the text is durable.
+ */
+export function handBackStructuredAgentSessionMessage(
+  sessionId: string,
+  clientMessageId: string,
+  body: AgentJournalMessageItem,
+  imageConnectionIds?: readonly (string | null)[]
+): boolean {
+  return returnMessageToComposer(
+    structuredAgentSessionDraftScopeKey(sessionId),
+    `returned-${clientMessageId}`,
+    body.blocks,
+    imageConnectionIds
+  )
+}
diff --git a/src/renderer/src/components/native-chat/structured-agent-session-message-projection.older-host.test.ts b/src/renderer/src/components/native-chat/structured-agent-session-message-projection.older-host.test.ts
deleted file mode 100644
index 0c5d273bc54b..000000000000
--- a/src/renderer/src/components/native-chat/structured-agent-session-message-projection.older-host.test.ts
+++ /dev/null
@@ -1,160 +0,0 @@
-// An older host leaves a rejected message where it was sent. When that is older than the loaded
-// window, the chat holds its rejected submission but not its row: the outbox copy keeps drawing it,
-// with no control, until the page holding the row loads, and then the host's row draws it instead.
-
-import { expect, it } from 'vitest'
-import { agentJournalSubmissionKey } from '../../../../shared/agent-session-journal-item-key'
-import type {
-  AgentJournalRenderItem,
-  AgentJournalSubmission
-} from '../../../../shared/agent-session-journal-types'
-import type { AgentSessionHistoryPage } from '../../../../shared/agent-session-wire'
-import { DISPATCH_REJECTED_HOST_RESTARTED } from '../../../../shared/structured-agent-session-dispatch-rejection'
-import { reconcileStructuredAgentSessionOutboxWithQueue } from '../../../../shared/structured-agent-session-draft-hand-off'
-import { createStructuredAgentSessionOutboxEntry } from '../../../../shared/structured-agent-session-outbox'
-import {
-  EMPTY_STRUCTURED_AGENT_SESSION,
-  reduceStructuredAgentSession
-} from '../../../../shared/structured-agent-session-reducer'
-import { structuredAgentSessionDeliveryNotices } from './structured-agent-session-delivery-notices'
-import { projectStructuredAgentSessionMessages } from './structured-agent-session-message-projection'
-
-const MESSAGE_ID = agentJournalSubmissionKey('m')
-
-function answer(sequence: number): AgentJournalRenderItem {
-  return {
-    itemId: `a-${sequence}`,
-    revision: 1,
-    sequence,
-    observedAt: sequence,
-    body: { kind: 'message', role: 'assistant', blocks: [{ type: 'text', text: 'ok' }] }
-  }
-}
-
-/** Where the older host left it: at its submission, far behind the loaded window. */
-const SENT: AgentJournalRenderItem = {
-  itemId: MESSAGE_ID,
-  revision: 1,
-  sequence: 10,
-  observedAt: 10,
-  body: { kind: 'message', role: 'user', blocks: [{ type: 'text', text: 'queued msg' }] }
-}
-
-const REJECTED: AgentJournalSubmission = {
-  clientMessageId: 'm',
-  fence: 1,
-  payloadFingerprint: 'x',
-  dispatchState: 'rejected',
-  providerItemId: null,
-  reason: DISPATCH_REJECTED_HOST_RESTARTED,
-  rejection: { kind: 'hostRestarted' },
-  submittedAt: 10,
-  resolvedAt: 2000
-}
-
-function page(
-  items: AgentJournalRenderItem[],
-  submissions: AgentJournalSubmission[],
-  hasOlder: boolean
-): AgentSessionHistoryPage {
-  const oldest = items[0]?.sequence ?? 0
-  const newest = items.at(-1)?.sequence ?? 0
-  return {
-    sessionId: 's',
-    epoch: 'e',
-    direction: 'tail',
-    items,
-    removedItemIds: [],
-    submissions,
-    window: {
-      oldest: { epoch: 'e', sequence: oldest },
-      newest: { epoch: 'e', sequence: newest },
-      nextCursor: { epoch: 'e', sequence: oldest }
-    },
-    liveCursor: { epoch: 'e', sequence: 1099 },
-    hasOlder,
-    hasNewer: false
-  }
-}
-
-it("keeps the outbox copy of a rejected message whose row is outside the window, then the host's row takes over", () => {
-  let state = reduceStructuredAgentSession(EMPTY_STRUCTURED_AGENT_SESSION, {
-    type: 'event',
-    event: {
-      type: 'snapshot',
-      sessionId: 's',
-      fence: 1,
-      page: page(
-        Array.from({ length: 100 }, (_, index) => answer(1000 + index)),
-        [],
-        true
-      )
-    }
-  })
-  // The rejection touches the row, which the older host left at its submission.
-  state = reduceStructuredAgentSession(state, {
-    type: 'event',
-    event: {
-      type: 'batch',
-      sessionId: 's',
-      batch: {
-        cursor: { epoch: 'e', sequence: 1100 },
-        items: [SENT],
-        removedItemIds: [],
-        submissions: [REJECTED]
-      }
-    }
-  })
-  expect(state.items.some((item) => item.itemId === MESSAGE_ID)).toBe(false)
-  expect(state.submissions.map((submission) => submission.clientMessageId)).toEqual(['m'])
-
-  const sent = {
-    ...createStructuredAgentSessionOutboxEntry({
-      clientMessageId: 'm',
-      sessionId: 's',
-      text: 'queued msg',
-      attachments: [],
-      queuedAt: 10
-    }),
-    state: 'dispatching' as const
-  }
-  const kept = reconcileStructuredAgentSessionOutboxWithQueue(
-    [sent],
-    state.submissions,
-    state.items
-  )
-  expect(kept).toMatchObject([{ clientMessageId: 'm', state: 'rejected' }])
-  const drawn = (outbox: typeof kept) =>
-    projectStructuredAgentSessionMessages(state.items, outbox, state.submissions)
-      .filter((message) => message.role === 'user')
-      .map(({ id, unsent }) => ({ id, unsent }))
-  expect(drawn(kept)).toEqual([{ id: MESSAGE_ID, unsent: true }])
-  const notice = structuredAgentSessionDeliveryNotices(
-    kept,
-    'Claude',
-    () => {},
-    state.submissions,
-    [],
-    new Set()
-  ).get(MESSAGE_ID)
-  expect(notice).toEqual({ text: 'Orca restarted before this message was sent.' })
-
-  // Paging back loads the row: the outbox lets go, and the host's row is the one drawn.
-  state = reduceStructuredAgentSession(state, {
-    type: 'older-page',
-    requestedCursor: { epoch: 'e', sequence: 1000 },
-    page: page(
-      [SENT, ...Array.from({ length: 10 }, (_, index) => answer(990 + index))],
-      [REJECTED],
-      false
-    )
-  })
-  expect(state.items.some((item) => item.itemId === MESSAGE_ID)).toBe(true)
-  const released = reconcileStructuredAgentSessionOutboxWithQueue(
-    kept,
-    state.submissions,
-    state.items
-  )
-  expect(released).toEqual([])
-  expect(drawn(released)).toEqual([{ id: MESSAGE_ID, unsent: true }])
-})
diff --git a/src/renderer/src/components/native-chat/structured-agent-session-message-projection.recorded-copy.test.ts b/src/renderer/src/components/native-chat/structured-agent-session-message-projection.recorded-copy.test.ts
deleted file mode 100644
index c27204b91f53..000000000000
--- a/src/renderer/src/components/native-chat/structured-agent-session-message-projection.recorded-copy.test.ts
+++ /dev/null
@@ -1,217 +0,0 @@
-// An outbox copy of a message the host recorded and then rejected draws it only while the host's row
-// is not loaded, and leaves, with no user action, on the batch or page that loads that row. It never
-// offers a control: sending it again is a new message.
-
-import { expect, it } from 'vitest'
-import { agentJournalSubmissionKey } from '../../../../shared/agent-session-journal-item-key'
-import type {
-  AgentJournalRenderItem,
-  AgentJournalSubmission
-} from '../../../../shared/agent-session-journal-types'
-import type { AgentSessionHistoryPage } from '../../../../shared/agent-session-wire'
-import { DISPATCH_REJECTED_HOST_RESTARTED } from '../../../../shared/structured-agent-session-dispatch-rejection'
-import { reconcileStructuredAgentSessionOutboxWithQueue } from '../../../../shared/structured-agent-session-draft-hand-off'
-import {
-  createStructuredAgentSessionOutboxEntry,
-  structuredAgentSessionRejectedFailure,
-  type StructuredAgentSessionOutboxEntry
-} from '../../../../shared/structured-agent-session-outbox'
-import { admitStructuredAgentSessionOutboxEntry } from '../../../../shared/structured-agent-session-outbox-admission'
-import {
-  EMPTY_STRUCTURED_AGENT_SESSION,
-  reduceStructuredAgentSession,
-  type StructuredAgentSessionState
-} from '../../../../shared/structured-agent-session-reducer'
-import { structuredAgentSessionDeliveryNotices } from './structured-agent-session-delivery-notices'
-import { projectStructuredAgentSessionMessages } from './structured-agent-session-message-projection'
-
-const MESSAGE_ID = agentJournalSubmissionKey('m')
-const WORDS = 'Orca restarted before this message was sent.'
-
-function answer(sequence: number): AgentJournalRenderItem {
-  return {
-    itemId: `a-${sequence}`,
-    revision: 1,
-    sequence,
-    observedAt: sequence,
-    body: { kind: 'message', role: 'assistant', blocks: [{ type: 'text', text: 'ok' }] }
-  }
-}
-
-function hostRow(sequence: number): AgentJournalRenderItem {
-  return {
-    itemId: MESSAGE_ID,
-    revision: 1,
-    sequence,
-    observedAt: sequence,
-    body: { kind: 'message', role: 'user', blocks: [{ type: 'text', text: 'sent text' }] }
-  }
-}
-
-const REJECTED: AgentJournalSubmission = {
-  clientMessageId: 'm',
-  fence: 1,
-  payloadFingerprint: 'm',
-  dispatchState: 'rejected',
-  providerItemId: null,
-  reason: DISPATCH_REJECTED_HOST_RESTARTED,
-  rejection: { kind: 'hostRestarted' },
-  submittedAt: 10,
-  resolvedAt: 1100
-}
-
-function copy(patch: Partial<StructuredAgentSessionOutboxEntry> = {}) {
-  return {
-    ...createStructuredAgentSessionOutboxEntry({
-      clientMessageId: 'm',
-      sessionId: 's',
-      text: 'sent text',
-      attachments: [],
-      queuedAt: 10
-    }),
-    ...patch
-  }
-}
-
-/** A copy the host's own reply already marked rejected, as the outbox stores it. */
-const RECORDED_COPY = copy({
-  state: 'rejected',
-  lastFailure: structuredAgentSessionRejectedFailure(REJECTED)
-})
-
-function page(
-  items: AgentJournalRenderItem[],
-  submissions: AgentJournalSubmission[]
-): AgentSessionHistoryPage {
-  const oldest = items[0]?.sequence ?? 0
-  return {
-    sessionId: 's',
-    epoch: 'e',
-    direction: 'tail',
-    items,
-    removedItemIds: [],
-    submissions,
-    window: {
-      oldest: { epoch: 'e', sequence: oldest },
-      newest: { epoch: 'e', sequence: items.at(-1)?.sequence ?? 0 },
-      nextCursor: { epoch: 'e', sequence: oldest }
-    },
-    liveCursor: { epoch: 'e', sequence: items.at(-1)?.sequence ?? 0 },
-    hasOlder: true,
-    hasNewer: false
-  }
-}
-
-function opened(items: AgentJournalRenderItem[], submissions: AgentJournalSubmission[]) {
-  return reduceStructuredAgentSession(EMPTY_STRUCTURED_AGENT_SESSION, {
-    type: 'event',
-    event: { type: 'snapshot', sessionId: 's', fence: 1, page: page(items, submissions) }
-  })
-}
-
-const WINDOW = Array.from({ length: 100 }, (_, index) => answer(1000 + index))
-
-/** What the chat draws for this message, and the notice its row carries. */
-function shown(
-  state: StructuredAgentSessionState,
-  outbox: readonly StructuredAgentSessionOutboxEntry[]
-) {
-  const kept = reconcileStructuredAgentSessionOutboxWithQueue(
-    outbox,
-    state.submissions,
-    state.items
-  )
-  const rows = projectStructuredAgentSessionMessages(state.items, kept, state.submissions)
-    .filter((message) => message.role === 'user')
-    .map(({ id, unsent }) => ({ id, unsent }))
-  const notice = structuredAgentSessionDeliveryNotices(
-    kept,
-    'Claude',
-    () => {},
-    state.submissions,
-    [],
-    new Set()
-  ).get(MESSAGE_ID)
-  return { kept, rows, notice }
-}
-
-it('leaves on the live batch that rejects it on a host that places the row at the rejection', () => {
-  let state = opened(WINDOW, [])
-  const sent = copy({ state: 'dispatching', lastAttemptAt: 9 })
-  state = reduceStructuredAgentSession(state, {
-    type: 'event',
-    event: {
-      type: 'batch',
-      sessionId: 's',
-      batch: {
-        cursor: { epoch: 'e', sequence: 1100 },
-        items: [hostRow(1100)],
-        removedItemIds: [],
-        submissions: [REJECTED]
-      }
-    }
-  })
-
-  expect(shown(state, [sent])).toEqual({
-    kept: [],
-    rows: [{ id: MESSAGE_ID, unsent: true }],
-    notice: { text: WORDS }
-  })
-})
-
-it('leaves on the page that opens the chat when that page holds the row', () => {
-  const state = opened([...WINDOW, hostRow(1100)], [REJECTED])
-
-  expect(shown(state, [RECORDED_COPY])).toEqual({
-    kept: [],
-    rows: [{ id: MESSAGE_ID, unsent: true }],
-    notice: { text: WORDS }
-  })
-})
-
-it('draws once, with no control, while its row is outside the window, and leaves when that page loads', () => {
-  // An older host leaves the row where it was sent; the live batch brings only its record.
-  let state = reduceStructuredAgentSession(opened(WINDOW, []), {
-    type: 'event',
-    event: {
-      type: 'batch',
-      sessionId: 's',
-      batch: {
-        cursor: { epoch: 'e', sequence: 1100 },
-        items: [hostRow(10)],
-        removedItemIds: [],
-        submissions: [REJECTED]
-      }
-    }
-  })
-  const before = shown(state, [copy({ state: 'dispatching', lastAttemptAt: 9 })])
-  expect(before.kept).toMatchObject([{ clientMessageId: 'm', state: 'rejected' }])
-  expect(before.rows).toEqual([{ id: MESSAGE_ID, unsent: true }])
-  expect(before.notice).toEqual({ text: WORDS })
-
-  // Scrolling back loads the page; no control on the copy is involved.
-  state = reduceStructuredAgentSession(state, {
-    type: 'older-page',
-    requestedCursor: { epoch: 'e', sequence: 1000 },
-    page: page(
-      [hostRow(10), ...Array.from({ length: 5 }, (_, index) => answer(995 + index))],
-      [REJECTED]
-    )
-  })
-  expect(shown(state, before.kept)).toEqual({
-    kept: [],
-    rows: [{ id: MESSAGE_ID, unsent: true }],
-    notice: { text: WORDS }
-  })
-})
-
-it('keeps a stored copy whose record is not held drawn, with no control, and never sends it', () => {
-  const state = opened(WINDOW, [])
-  const after = shown(state, [RECORDED_COPY])
-
-  expect(after.kept).toEqual([RECORDED_COPY])
-  expect(after.rows).toEqual([{ id: MESSAGE_ID, unsent: true }])
-  expect(after.notice).toEqual({ text: WORDS })
-  // The drain passes over it: nothing it holds is ever on its way.
-  expect(admitStructuredAgentSessionOutboxEntry(after.kept)).toEqual({ state: 'idle', entry: null })
-})
diff --git a/src/renderer/src/components/native-chat/structured-agent-session-message-projection.rejected-in-place.test.ts b/src/renderer/src/components/native-chat/structured-agent-session-message-projection.rejected-in-place.test.ts
index b12229143019..6381611738cd 100644
--- a/src/renderer/src/components/native-chat/structured-agent-session-message-projection.rejected-in-place.test.ts
+++ b/src/renderer/src/components/native-chat/structured-agent-session-message-projection.rejected-in-place.test.ts
@@ -15,14 +15,38 @@ import {
   projectStructuredAgentSessionMessages as projectShared,
   structuredAgentSessionCommandItemIds
 } from '../../../../shared/structured-agent-session-message-projection'
-import {
-  createStructuredAgentSessionOutboxEntry,
-  type StructuredAgentSessionOutboxEntry
-} from '../../../../shared/structured-agent-session-outbox'
+import type { StructuredAgentSessionOptimisticMessage } from '../../../../shared/structured-agent-session-message-projection'
+import { structuredAgentSessionSendBody } from '../../../../shared/structured-agent-session-send-mutation'
 import { structuredAgentSessionDeliveryNotices } from './structured-agent-session-delivery-notices'
 import { projectStructuredAgentSessionMessages } from './structured-agent-session-message-projection'
 
-const SESSION = 'session-1'
+function optimisticMessage(args: {
+  clientMessageId: string
+  sessionId?: string
+  text: string
+  attachments: readonly { path: string; previewUri: string }[]
+  queuedAt: number
+}): StructuredAgentSessionOptimisticMessage {
+  return {
+    clientMessageId: args.clientMessageId,
+    body: structuredAgentSessionSendBody(args.text, args.attachments),
+    queuedAt: args.queuedAt
+  }
+}
+
+function deliveryNotices(
+  submissions: readonly AgentJournalSubmission[],
+  startFailures: { kind: 'notSignedIn' }[] = [],
+  commandItemIds?: ReadonlySet<string>
+) {
+  return structuredAgentSessionDeliveryNotices({
+    pending: [],
+    submissions,
+    agentName: 'Claude',
+    startFailures,
+    ...(commandItemIds ? { commandItemIds } : {})
+  })
+}
 
 function body(text: string) {
   return {
@@ -95,23 +119,6 @@ function withdrawn(id: string, text: string, submittedAt: number): AgentJournalS
   })
 }
 
-function outboxEntry(
-  id: string,
-  text: string,
-  patch: Partial<StructuredAgentSessionOutboxEntry> = {}
-): StructuredAgentSessionOutboxEntry {
-  return {
-    ...createStructuredAgentSessionOutboxEntry({
-      clientMessageId: id,
-      sessionId: SESSION,
-      text,
-      attachments: [],
-      queuedAt: 50
-    }),
-    ...patch
-  }
-}
-
 function rows(messages: ReturnType<typeof projectStructuredAgentSessionMessages>) {
   return messages
     .filter((message) => message.role === 'user')
@@ -171,18 +178,11 @@ describe('a message the host accepted and then rejected, on the desktop', () =>
   })
 
   it('says why from the host fact, with no Retry', () => {
-    const notices = structuredAgentSessionDeliveryNotices(
-      [],
-      'Claude',
-      () => {},
-      [SEED, restartRejected('lost', 'fix the parser', 3)],
-      [],
-      new Set()
-    )
+    const notices = deliveryNotices([SEED, restartRejected('lost', 'fix the parser', 3)])
 
     const notice = notices.get(agentJournalSubmissionKey('lost'))
     expect(notice?.text).toBe('Orca restarted before this message was sent.')
-    expect(notice?.onRetry).toBeUndefined()
+    expect(notice?.onDismiss).toBeUndefined()
     expect([...notices.keys()]).toEqual([agentJournalSubmissionKey('lost')])
   })
 
@@ -193,14 +193,7 @@ describe('a message the host accepted and then rejected, on the desktop', () =>
       reason: 'Claude is not signed in.',
       rejection: { kind: 'notSignedIn' }
     })
-    const notices = structuredAgentSessionDeliveryNotices(
-      [],
-      'Claude',
-      () => {},
-      [failedStart],
-      [{ kind: 'notSignedIn' }],
-      new Set()
-    )
+    const notices = deliveryNotices([failedStart], [{ kind: 'notSignedIn' }])
 
     expect(notices.get(agentJournalSubmissionKey('first'))).toEqual({
       text: 'Your message was not sent.'
@@ -291,13 +284,9 @@ describe('a message the host accepted and then rejected, on the desktop', () =>
     ).toEqual([{ id: agentJournalSubmissionKey('seed'), text: 'seed', unsent: false }])
     // One rule decides for the rows and the notices.
     expect(
-      structuredAgentSessionDeliveryNotices(
-        [],
-        'Claude',
-        () => {},
+      deliveryNotices(
         submissions,
         [],
-        new Set(),
         structuredAgentSessionCommandItemIds([...SEED_ROWS, compact])
       ).size
     ).toBe(0)
@@ -313,97 +302,27 @@ describe('a message the host accepted and then rejected, on the desktop', () =>
       { id: agentJournalSubmissionKey('stopped'), text: 'never mind', unsent: false }
     ])
     expectStopRowRightAfterStopped(messages)
-    expect(
-      structuredAgentSessionDeliveryNotices([], 'Claude', () => {}, submissions, [], new Set()).size
-    ).toBe(0)
+    expect(deliveryNotices(submissions).size).toBe(0)
   })
 })
 
-describe("one row per rejected message, the host's once it records the rejection", () => {
-  const items = [...SEED_ROWS, userItem('held', 3, 'host copy')]
-  // Fingerprinted from the host's own copy, so only the shared id ties the two rows together.
-  const rejected = restartRejected('held', 'host copy', 3)
-  const held = outboxEntry('held', 'outbox copy', {
-    state: 'rejected',
-    lastFailure: {
-      kind: 'rejected',
-      reason: DISPATCH_REJECTED_HOST_RESTARTED,
-      rejection: { kind: 'hostRestarted' }
-    }
-  })
-  const heldRow = { id: agentJournalSubmissionKey('held'), text: 'outbox copy', unsent: true }
-  const hostRow = { id: agentJournalSubmissionKey('held'), text: 'host copy', unsent: true }
-  const seedRow = { id: agentJournalSubmissionKey('seed'), text: 'seed', unsent: false }
-
-  it('the reply first: the outbox draws it, saying why, with no Retry', () => {
-    const messages = projectStructuredAgentSessionMessages(SEED_ROWS, [held], [SEED])
-    expect(rows(messages)).toEqual([seedRow, heldRow])
-    const notice = structuredAgentSessionDeliveryNotices(
-      [held],
-      'Claude',
-      () => {},
-      [SEED],
-      [],
-      new Set(['held'])
-    ).get(heldRow.id)
-    expect(notice?.text).toBe('Orca restarted before this message was sent.')
-    expect(notice?.onRetry).toBeUndefined()
-  })
-
-  it("the journal first, or next: the host's row replaces the outbox copy at once", () => {
-    const dispatching = { ...held, state: 'dispatching' as const, lastFailure: undefined }
-    expect(rows(projectStructuredAgentSessionMessages(SEED_ROWS, [dispatching], [SEED]))).toEqual([
-      seedRow,
-      { ...heldRow, unsent: false }
-    ])
-    for (const entry of [dispatching, held]) {
-      // Before the reconcile drops the entry, the host's row is already the one row.
-      const messages = projectStructuredAgentSessionMessages(items, [entry], [SEED, rejected])
-      expect(rows(messages)).toEqual([seedRow, hostRow])
-      expect(messages.at(-1)?.journalPosition).toEqual({ sequence: 3, index: 0 })
-      const notices = structuredAgentSessionDeliveryNotices(
-        [entry],
-        'Claude',
-        () => {},
-        [SEED, rejected],
-        [],
-        new Set()
-      )
-      // In the host's words, with no control.
-      expect([...notices]).toEqual([
-        [hostRow.id, { text: 'Orca restarted before this message was sent.' }]
-      ])
-    }
-  })
-
-  it("keeps the old row beside an earlier build's resend until the host records the resend", () => {
-    const hostItems = [...SEED_ROWS, userItem('held', 3, 'outbox copy')]
-    const resent = restartRejected('held', 'outbox copy', 3)
-    const resend = outboxEntry('resend', 'outbox copy')
-    expect(
-      rows(projectStructuredAgentSessionMessages(hostItems, [resend], [SEED, resent]))
-    ).toEqual([
-      seedRow,
-      { id: agentJournalSubmissionKey('held'), text: 'outbox copy', unsent: true },
-      { id: agentJournalSubmissionKey('resend'), text: 'outbox copy', unsent: false }
-    ])
-
-    const recorded = submission('resend', 'outbox copy', 60, {
-      dispatchState: 'pending',
-      providerItemId: null,
-      resolvedAt: null
+describe("one row per rejected message, the host's", () => {
+  it('drops the bubble of a send the host has rejected, for its own row', () => {
+    const items = [...SEED_ROWS, userItem('held', 3, 'host copy')]
+    const sent = optimisticMessage({
+      clientMessageId: 'held',
+      text: 'sent copy',
+      attachments: [],
+      queuedAt: 50
     })
-    expect(
-      rows(
-        projectStructuredAgentSessionMessages(
-          [...hostItems, userItem('resend', 4, 'outbox copy')],
-          [resend],
-          [SEED, resent, recorded]
-        )
-      )
-    ).toEqual([
-      seedRow,
-      { id: agentJournalSubmissionKey('resend'), text: 'outbox copy', unsent: false }
+    const messages = projectStructuredAgentSessionMessages(
+      items,
+      [sent],
+      [SEED, restartRejected('held', 'host copy', 3)]
+    )
+    expect(rows(messages)).toEqual([
+      { id: agentJournalSubmissionKey('seed'), text: 'seed', unsent: false },
+      { id: agentJournalSubmissionKey('held'), text: 'host copy', unsent: true }
     ])
   })
 })
@@ -420,9 +339,7 @@ describe('a rejected message the queue holds', () => {
     ]
 
     expect(rows(projectStructuredAgentSessionMessages(items, [], submissions))).toEqual([seedRow])
-    expect(
-      structuredAgentSessionDeliveryNotices([], 'Claude', () => {}, submissions, [], new Set()).size
-    ).toBe(0)
+    expect(deliveryNotices(submissions).size).toBe(0)
   })
 
   // A send kept across a restart comes back as a paused card; the send itself records that card.
@@ -434,9 +351,7 @@ describe('a rejected message the queue holds', () => {
 
     // The card is there, or Delete took it: the transcript reads only the send.
     expect(rows(projectStructuredAgentSessionMessages(items, [], submissions))).toEqual([seedRow])
-    expect(
-      structuredAgentSessionDeliveryNotices([], 'Claude', () => {}, submissions, [], new Set()).size
-    ).toBe(0)
+    expect(deliveryNotices(submissions).size).toBe(0)
     // Edit put the text in the composer and the person sent it as a new message.
     const edited = submission('edited', 'kept text, edited', 5)
     expect(
diff --git a/src/renderer/src/components/native-chat/structured-agent-session-message-projection.test.ts b/src/renderer/src/components/native-chat/structured-agent-session-message-projection.test.ts
index 1108d468739b..f9eba7f9e3a1 100644
--- a/src/renderer/src/components/native-chat/structured-agent-session-message-projection.test.ts
+++ b/src/renderer/src/components/native-chat/structured-agent-session-message-projection.test.ts
@@ -4,9 +4,24 @@ import type {
   AgentJournalSubmission
 } from '../../../../shared/agent-session-journal-types'
 import { agentJournalSubmissionKey } from '../../../../shared/agent-session-journal-item-key'
-import { createStructuredAgentSessionOutboxEntry } from '../../../../shared/structured-agent-session-outbox'
+import type { StructuredAgentSessionOptimisticMessage } from '../../../../shared/structured-agent-session-message-projection'
+import { structuredAgentSessionSendBody } from '../../../../shared/structured-agent-session-send-mutation'
 import { projectStructuredAgentSessionMessages } from './structured-agent-session-message-projection'
 
+function optimisticMessage(args: {
+  clientMessageId: string
+  sessionId?: string
+  text: string
+  attachments: readonly { path: string; previewUri: string }[]
+  queuedAt: number
+}): StructuredAgentSessionOptimisticMessage {
+  return {
+    clientMessageId: args.clientMessageId,
+    body: structuredAgentSessionSendBody(args.text, args.attachments),
+    queuedAt: args.queuedAt
+  }
+}
+
 function submission(index: number): AgentJournalSubmission {
   return {
     clientMessageId: `client-${index}`,
@@ -35,7 +50,7 @@ describe('structured agent session message projection', () => {
   it("draws a send the host rejected from the host's row, not the outbox copy", () => {
     const rejected = { ...submission(0), dispatchState: 'rejected' as const, providerItemId: null }
     const refusedItem = { ...item(0), itemId: agentJournalSubmissionKey(rejected.clientMessageId) }
-    const draft = createStructuredAgentSessionOutboxEntry({
+    const draft = optimisticMessage({
       clientMessageId: rejected.clientMessageId,
       sessionId: 'session-1',
       text: 'An unsent draft',
@@ -53,7 +68,7 @@ describe('structured agent session message projection', () => {
 
   it.each([5, 10])('renders %i rapid accepted desktop sends exactly once', (sendCount) => {
     const outbox = Array.from({ length: sendCount }, (_, index) =>
-      createStructuredAgentSessionOutboxEntry({
+      optimisticMessage({
         clientMessageId: `client-${index}`,
         sessionId: 'session-1',
         text: `send ${index}`,
@@ -75,7 +90,7 @@ describe('structured agent session message projection', () => {
 
   it('renders one bubble while the submission is still dispatching', () => {
     const outbox = [
-      createStructuredAgentSessionOutboxEntry({
+      optimisticMessage({
         clientMessageId: 'client-pending',
         sessionId: 'session-1',
         text: 'Ok thanks',
@@ -109,7 +124,7 @@ describe('structured agent session message projection', () => {
 
   it('keeps an optimistic send until its acceptance arrives', () => {
     const outbox = [
-      createStructuredAgentSessionOutboxEntry({
+      optimisticMessage({
         clientMessageId: 'client-pending',
         sessionId: 'session-1',
         text: 'pending',
diff --git a/src/renderer/src/components/native-chat/structured-agent-session-message-projection.ts b/src/renderer/src/components/native-chat/structured-agent-session-message-projection.ts
index cb620ed72d89..e4814640de47 100644
--- a/src/renderer/src/components/native-chat/structured-agent-session-message-projection.ts
+++ b/src/renderer/src/components/native-chat/structured-agent-session-message-projection.ts
@@ -2,7 +2,7 @@ import type {
   AgentJournalRenderItem,
   AgentJournalSubmission
 } from '../../../../shared/agent-session-journal-types'
-import type { StructuredAgentSessionOutboxEntry } from '../../../../shared/structured-agent-session-outbox'
+import type { StructuredAgentSessionOptimisticMessage } from '../../../../shared/structured-agent-session-message-projection'
 import { projectStructuredAgentSessionMessages as projectMessages } from '../../../../shared/structured-agent-session-message-projection'
 import { projectStructuredQuestionMessages } from './structured-agent-question-projection'
 
@@ -10,12 +10,12 @@ import { projectStructuredQuestionMessages } from './structured-agent-question-p
  *  sent, as not sent, unless the queue holds it as a card. */
 export function projectStructuredAgentSessionMessages(
   items: readonly AgentJournalRenderItem[],
-  outbox: readonly StructuredAgentSessionOutboxEntry[],
+  optimistic: readonly StructuredAgentSessionOptimisticMessage[],
   submissions: readonly AgentJournalSubmission[]
 ) {
   return projectMessages(
     items,
-    outbox,
+    optimistic,
     submissions,
     { rejectedInPlace: true },
     projectStructuredQuestionMessages
diff --git a/src/renderer/src/components/native-chat/structured-agent-session-message-sender.test.ts b/src/renderer/src/components/native-chat/structured-agent-session-message-sender.test.ts
new file mode 100644
index 000000000000..156a4d02dd54
--- /dev/null
+++ b/src/renderer/src/components/native-chat/structured-agent-session-message-sender.test.ts
@@ -0,0 +1,822 @@
+import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest'
+import type { AgentJournalSubmission } from '../../../../shared/agent-session-journal-types'
+
+const mocks = vi.hoisted(() => ({
+  call: vi.fn(),
+  compatible: vi.fn(async (): Promise<void> => undefined),
+  handBack: vi.fn((): boolean => true)
+}))
+
+vi.mock('@/runtime/structured-agent-session-client', () => ({
+  callStructuredAgentSession: mocks.call
+}))
+vi.mock('@/runtime/runtime-rpc-client', () => ({
+  ensureRuntimeEnvironmentCompatible: mocks.compatible
+}))
+vi.mock('./structured-agent-session-message-hand-back', () => ({
+  handBackStructuredAgentSessionMessage: mocks.handBack
+}))
+
+import {
+  STRUCTURED_AGENT_SESSION_SEND_BUDGET_MS,
+  dropStructuredAgentSessionSends,
+  resetStructuredAgentSessionSendsForTests,
+  sendStructuredAgentSessionMessage,
+  settleStructuredAgentSessionSendsFromJournal,
+  stopStructuredAgentSessionSends
+} from './structured-agent-session-message-sender'
+import {
+  getStructuredAgentSessionPendingSends,
+  getStructuredAgentSessionSendNotice,
+  structuredAgentSessionSendOut,
+  subscribeToStructuredAgentSessionPendingSends
+} from './structured-agent-session-pending-sends'
+import { noteStructuredAgentSessionFence } from './structured-agent-session-send-attempt'
+import { RuntimeRpcCallError } from '@/runtime/runtime-rpc-result'
+
+const SESSION = 'session-1'
+const target = { kind: 'local' } as const
+
+type Deferred = { resolve: (value: unknown) => void; reject: (error: unknown) => void }
+
+function deferredCalls(): Deferred[] {
+  const calls: Deferred[] = []
+  mocks.call.mockImplementation(
+    () =>
+      new Promise((resolve, reject) => {
+        calls.push({ resolve, reject })
+      })
+  )
+  return calls
+}
+
+function submission(
+  clientMessageId: string,
+  dispatchState: AgentJournalSubmission['dispatchState'],
+  extra: Partial<AgentJournalSubmission> = {}
+): AgentJournalSubmission {
+  // oxlint-disable-next-line typescript/consistent-type-assertions -- SAFETY: only the fields the sender reads.
+  return { clientMessageId, dispatchState, submittedAt: 1, ...extra } as AgentJournalSubmission
+}
+
+function okSubmission(clientMessageId: string, dispatchState: 'pending' | 'accepted') {
+  return {
+    ok: true,
+    replayed: false,
+    fence: 1,
+    cursor: { epoch: 'e', sequence: 1 },
+    value: { clientMessageId, submission: submission(clientMessageId, dispatchState) }
+  }
+}
+
+const refusedSend = {
+  ok: false,
+  refusal: { code: 'agent_session_conflict', message: 'busy', details: { reason: 'chatStarting' } }
+}
+
+async function flush(): Promise<void> {
+  for (let index = 0; index < 5; index += 1) {
+    await Promise.resolve()
+  }
+}
+
+/** Sends one message in SESSION; fails the test if the sender refuses it. */
+function send(
+  text: string,
+  extra: Partial<Parameters<typeof sendStructuredAgentSessionMessage>[0]> = {}
+) {
+  const sent = sendStructuredAgentSessionMessage({ sessionId: SESSION, target, text, ...extra })
+  if (!sent) {
+    throw new Error(`refused: ${text}`)
+  }
+  return sent
+}
+
+function sendCalls(): number {
+  return mocks.call.mock.calls.filter((call) => call[1] === 'agentSession.send').length
+}
+
+function phases(): string[] {
+  return getStructuredAgentSessionPendingSends(SESSION).map(
+    (entry) =>
+      `${entry.body.blocks[0]?.type === 'text' ? entry.body.blocks[0].text : ''}:${entry.phase}`
+  )
+}
+
+describe('structured agent session message sender', () => {
+  beforeEach(() => {
+    vi.useFakeTimers()
+    mocks.call.mockReset()
+    mocks.handBack.mockClear()
+    mocks.compatible.mockReset()
+    mocks.compatible.mockResolvedValue(undefined)
+    noteStructuredAgentSessionFence(SESSION, 4)
+  })
+  afterEach(() => {
+    resetStructuredAgentSessionSendsForTests()
+    vi.useRealTimers()
+  })
+
+  it('refuses a second send while one is out, and takes the next once it settles', async () => {
+    const calls = deferredCalls()
+    const a = send('a')
+    expect(sendStructuredAgentSessionMessage({ sessionId: SESSION, target, text: 'b' })).toBeNull()
+    await flush()
+    expect(phases()).toEqual(['a:sending'])
+    expect(calls).toHaveLength(1)
+    calls[0].resolve(okSubmission(a.clientMessageId, 'accepted'))
+    expect(await a.outcome).toBe('recorded')
+    send('b')
+    await flush()
+    expect(phases()).toEqual(['b:sending'])
+    expect(mocks.call.mock.calls[1][2]).toMatchObject({
+      envelope: { sessionId: SESSION, expectedRuntimeFence: 4 },
+      body: { blocks: [{ type: 'text', text: 'b' }] }
+    })
+  })
+
+  it.each([
+    ['recorded', (calls: Deferred[], id: string) => calls[0].resolve(okSubmission(id, 'accepted'))],
+    ['refused', (calls: Deferred[]) => calls[0].resolve(refusedSend)],
+    [
+      'past its deadline',
+      () => vi.advanceTimersByTimeAsync(STRUCTURED_AGENT_SESSION_SEND_BUDGET_MS)
+    ],
+    ['dropped', () => dropStructuredAgentSessionSends(SESSION)],
+    [
+      'stopped, then unanswered',
+      (calls: Deferred[]) => {
+        stopStructuredAgentSessionSends(SESSION)
+        calls[0].reject(new Error('timeout'))
+      }
+    ]
+  ] as const)('frees the chat for the next send once its send is %s', async (_how, end) => {
+    const calls = deferredCalls()
+    const a = send('a')
+    await flush()
+    expect(structuredAgentSessionSendOut(SESSION)).toBe(true)
+    await end(calls, a.clientMessageId)
+    await a.outcome
+    expect(structuredAgentSessionSendOut(SESSION)).toBe(false)
+    noteStructuredAgentSessionFence(SESSION, 4)
+    send('b')
+    await flush()
+    expect(sendCalls()).toBe(2)
+  })
+
+  it('gives back at once, as not sent, a send whose checks fail before its request goes out', async () => {
+    mocks.compatible.mockRejectedValue(new Error('connection refused'))
+    const a = send('a', { target: { kind: 'environment', environmentId: 'env-1' } })
+    expect(await a.outcome).toBe('returned')
+    expect(getStructuredAgentSessionSendNotice(SESSION)).toContain('was not sent')
+    expect(mocks.compatible).toHaveBeenCalledOnce()
+    await vi.advanceTimersByTimeAsync(STRUCTURED_AGENT_SESSION_SEND_BUDGET_MS)
+    expect(mocks.compatible).toHaveBeenCalledOnce()
+    expect(sendCalls()).toBe(0)
+  })
+
+  // A failure before any request went out that trying again won't clear: not sent, at once.
+  it('gives back at once, with its own words, a send this client and the server cannot talk on', async () => {
+    const blocked = Object.assign(
+      new Error('The selected Orca server is too old for this client. Update Orca on the server.'),
+      { code: 'runtime_compat_block' }
+    )
+    mocks.compatible.mockRejectedValue(blocked)
+    const a = send('a', { target: { kind: 'environment', environmentId: 'env-1' } })
+    expect(await a.outcome).toBe('returned')
+    const notice = getStructuredAgentSessionSendNotice(SESSION) ?? ''
+    expect(notice).toContain('The selected Orca server is too old for this client.')
+    expect(notice).toContain('was not sent')
+    expect(notice).not.toContain("couldn't reach")
+    expect(mocks.compatible).toHaveBeenCalledOnce()
+    expect(sendCalls()).toBe(0)
+  })
+
+  it("gives back at once, in the host's words, a send whose history read the host refused", async () => {
+    resetStructuredAgentSessionSendsForTests()
+    mocks.call.mockRejectedValue(
+      Object.assign(new Error('refused'), {
+        response: {
+          error: {
+            data: {
+              refusal: {
+                code: 'structured_agent_session_unsupported',
+                message: 'off',
+                details: { reason: 'hostDisabled' }
+              }
+            }
+          }
+        }
+      })
+    )
+    const a = send('a')
+    expect(await a.outcome).toBe('returned')
+    expect(mocks.call.mock.calls.map((call) => call[1])).toEqual(['agentSession.history'])
+    expect(getStructuredAgentSessionSendNotice(SESSION)).not.toContain("couldn't reach")
+  })
+
+  // Nothing resends, so even a refusal that may clear comes back at once, in the host's words.
+  it('gives back at once a history refusal the host says may clear, and never reads again', async () => {
+    resetStructuredAgentSessionSendsForTests()
+    mocks.call.mockRejectedValue(
+      Object.assign(new Error('refused'), {
+        response: {
+          error: {
+            data: {
+              refusal: {
+                code: 'agent_session_journal_unreadable',
+                message: 'busy',
+                details: { reason: 'journalUnavailable' }
+              }
+            }
+          }
+        }
+      })
+    )
+    const a = send('a')
+    expect(await a.outcome).toBe('returned')
+    expect(getStructuredAgentSessionSendNotice(SESSION)).toContain(
+      "Orca couldn't open this chat's history right now."
+    )
+    await vi.advanceTimersByTimeAsync(STRUCTURED_AGENT_SESSION_SEND_BUDGET_MS)
+    expect(mocks.call.mock.calls.map((call) => call[1])).toEqual(['agentSession.history'])
+  })
+
+  it("keeps the host's reason when its answer is a thrown refusal, without saying not sent", async () => {
+    const thrown = Object.assign(new Error('refused'), {
+      response: {
+        error: {
+          data: {
+            refusal: {
+              code: 'structured_agent_session_unsupported',
+              message: 'off',
+              details: { reason: 'hostDisabled' }
+            }
+          }
+        }
+      }
+    })
+    mocks.call.mockRejectedValue(thrown)
+    const a = send('a')
+    expect(await a.outcome).toBe('unconfirmed')
+    const notice = getStructuredAgentSessionSendNotice(SESSION) ?? ''
+    expect(notice).toContain("Orca couldn't confirm your message reached the agent")
+    expect(notice.length).toBeGreaterThan(
+      "Orca couldn't confirm your message reached the agent. Check the chat, then send it again if needed."
+        .length
+    )
+    expect(notice).not.toContain('was not sent')
+    expect(sendCalls()).toBe(1)
+  })
+
+  it('keeps an open chat drawing a recorded send until its row arrives', async () => {
+    const stop = subscribeToStructuredAgentSessionPendingSends(SESSION, () => {})
+    const calls = deferredCalls()
+    const a = send('a')
+    await flush()
+    calls[0].resolve(okSubmission(a.clientMessageId, 'accepted'))
+    expect(await a.outcome).toBe('recorded')
+    // The reply beat the history: the bubble stays, without blocking the next send.
+    expect(phases()).toEqual(['a:recorded'])
+    expect(structuredAgentSessionSendOut(SESSION)).toBe(false)
+    settleStructuredAgentSessionSendsFromJournal(
+      SESSION,
+      [submission(a.clientMessageId, 'accepted')],
+      []
+    )
+    expect(phases()).toEqual([])
+    stop()
+  })
+
+  it('keeps nothing for a chat nobody is watching once its send is recorded', async () => {
+    const calls = deferredCalls()
+    const a = send('a')
+    await flush()
+    calls[0].resolve(okSubmission(a.clientMessageId, 'accepted'))
+    expect(await a.outcome).toBe('recorded')
+    expect(phases()).toEqual([])
+  })
+
+  // The host's row draws it, with its stop row; the composer is left alone.
+  it('leaves a message the host recorded and a Stop then withdrew in the chat', async () => {
+    const calls = deferredCalls()
+    const a = send('a')
+    await flush()
+    calls[0].resolve(okSubmission(a.clientMessageId, 'pending'))
+    expect(await a.outcome).toBe('recorded')
+    settleStructuredAgentSessionSendsFromJournal(
+      SESSION,
+      [submission(a.clientMessageId, 'rejected', { rejection: { kind: 'cancelled' } })],
+      []
+    )
+    expect(mocks.handBack).not.toHaveBeenCalled()
+    expect(phases()).toEqual([])
+  })
+
+  // Its sender cleared the notes at `recorded`; the chat still shows the message, so nothing is lost.
+  it('keeps a note a Stop withdrew visible in the chat, never in a draft', async () => {
+    const calls = deferredCalls()
+    const note = send('notes', { callerKeepsText: true })
+    await flush()
+    calls[0].resolve(okSubmission(note.clientMessageId, 'pending'))
+    expect(await note.outcome).toBe('recorded')
+    settleStructuredAgentSessionSendsFromJournal(
+      SESSION,
+      [submission(note.clientMessageId, 'rejected', { rejection: { kind: 'cancelled' } })],
+      []
+    )
+    expect(mocks.handBack).not.toHaveBeenCalled()
+  })
+
+  // A paired server checks every stored file a message names; one it no longer holds can never be
+  // sent again as is, so the message comes back, with or without a view, to remove and reattach it.
+  it('gives back a message refused for an expired attachment, with its file and why', async () => {
+    const STORED = '/srv/agent-session-attachments/0b6f8a52-4a3e-4c4e-9a59-1d5d1f2b8c01/shot.png'
+    mocks.call.mockResolvedValue({
+      ok: false,
+      refusal: {
+        code: 'agent_session_operation_invalid',
+        message: 'not stored',
+        details: { reason: 'attachmentExpired' }
+      }
+    })
+    const a = send('look at this', { attachments: [{ path: STORED, previewUri: STORED }] })
+    expect(await a.outcome).toBe('returned')
+    expect(mocks.handBack).toHaveBeenCalledExactlyOnceWith(
+      SESSION,
+      a.clientMessageId,
+      {
+        kind: 'message',
+        role: 'user',
+        blocks: [
+          { type: 'text', text: 'look at this' },
+          { type: 'image-ref', path: STORED }
+        ]
+      },
+      undefined
+    )
+    expect(getStructuredAgentSessionSendNotice(SESSION)).toBe(
+      'This attachment expired. Your message was not sent. Remove it and attach it again.'
+    )
+    expect(sendCalls()).toBe(1)
+  })
+
+  it('leaves a note its sender still holds with the sender when it comes back', async () => {
+    mocks.call.mockResolvedValue(refusedSend)
+    const note = send('notes', { callerKeepsText: true })
+    expect(await note.outcome).toBe('returned')
+    expect(mocks.handBack).not.toHaveBeenCalled()
+    expect(getStructuredAgentSessionSendNotice(SESSION)).toBeNull()
+  })
+
+  it('never hands back a message the host recorded and then rejected: its row says not sent', async () => {
+    const calls = deferredCalls()
+    const a = send('a')
+    await flush()
+    calls[0].resolve(okSubmission(a.clientMessageId, 'pending'))
+    await flush()
+    settleStructuredAgentSessionSendsFromJournal(
+      SESSION,
+      [submission(a.clientMessageId, 'rejected', { rejection: { kind: 'notSignedIn' } })],
+      []
+    )
+    expect(mocks.handBack).not.toHaveBeenCalled()
+    expect(phases()).toEqual([])
+  })
+
+  it('settles from the journal before the reply, and ignores the late reply', async () => {
+    const calls = deferredCalls()
+    const a = send('a')
+    await flush()
+    settleStructuredAgentSessionSendsFromJournal(SESSION, [], [a.clientMessageId])
+    expect(await a.outcome).toBe('recorded')
+    send('b')
+    await flush()
+    calls[0].reject(new Error('timeout'))
+    await flush()
+    expect(phases()).toEqual(['b:sending'])
+    expect(calls).toHaveLength(2)
+  })
+
+  it('never probes a host-recorded unknown, and sends what follows it', async () => {
+    const calls = deferredCalls()
+    const a = send('a')
+    await flush()
+    // The agent died with the message on its way: the host recorded it and can't tell.
+    settleStructuredAgentSessionSendsFromJournal(
+      SESSION,
+      [submission(a.clientMessageId, 'unknown', { recovered: true })],
+      []
+    )
+    expect(await a.outcome).toBe('recorded')
+    send('b')
+    await flush()
+    expect(phases()).toEqual(['b:sending'])
+    expect(calls).toHaveLength(2)
+    expect(mocks.handBack).not.toHaveBeenCalled()
+  })
+
+  it("gives a refused send back to the composer with the reason, until the composer's next send", async () => {
+    mocks.call.mockResolvedValue(refusedSend)
+    const a = send('a')
+    expect(await a.outcome).toBe('returned')
+    expect(mocks.handBack).toHaveBeenCalledTimes(1)
+    expect(getStructuredAgentSessionSendNotice(SESSION)).toBeTruthy()
+    send('b')
+    expect(getStructuredAgentSessionSendNotice(SESSION)).toBeNull()
+  })
+
+  // The line explains text in the composer; notes sent from outside the chat keep their own text.
+  it("keeps the chat's line when notes are sent from outside it", async () => {
+    mocks.call.mockRejectedValueOnce(new Error('connection closed'))
+    expect(await send('a').outcome).toBe('unconfirmed')
+    const line = getStructuredAgentSessionSendNotice(SESSION)
+    expect(line).toContain("Orca couldn't confirm your message reached the agent")
+    mocks.call.mockResolvedValue(refusedSend)
+    expect(await send('notes', { callerKeepsText: true }).outcome).toBe('returned')
+    expect(getStructuredAgentSessionSendNotice(SESSION)).toBe(line)
+  })
+
+  it('says a send turned away behind a rewind nobody confirmed was not sent, and why', async () => {
+    mocks.call.mockResolvedValue({
+      ok: false,
+      refusal: {
+        code: 'agent_session_operation_unknown',
+        message: 'agent_session_rewind:outcome-unknown',
+        details: { reason: 'rewindUnconfirmed', rewindReason: 'outcome-unknown' }
+      }
+    })
+    expect(await send('a').outcome).toBe('returned')
+    const notice = getStructuredAgentSessionSendNotice(SESSION) ?? ''
+    expect(notice).toContain(
+      "Orca couldn't confirm whether the conversation went back to an earlier message."
+    )
+    expect(notice).toContain('Your message was not sent.')
+    expect(notice).not.toContain('Check the chat')
+    expect(sendCalls()).toBe(1)
+  })
+
+  it('gives back a remote image with the connection it lives on, which never goes to the host', async () => {
+    mocks.call.mockResolvedValue(refusedSend)
+    const a = send('look', {
+      attachments: [{ path: '/remote/shot.png', previewUri: 'x', connectionId: 'ssh-1' }]
+    })
+    expect(await a.outcome).toBe('returned')
+    expect(mocks.handBack).toHaveBeenCalledWith(
+      SESSION,
+      a.clientMessageId,
+      expect.objectContaining({ blocks: expect.any(Array) }),
+      ['ssh-1']
+    )
+    expect(JSON.stringify(mocks.call.mock.calls[0][2])).not.toContain('ssh-1')
+  })
+
+  // A send makes one request: a dropped or unanswered one comes back at once, never sent again.
+  it('gives back at once, as unconfirmed, a send whose request threw, and never sends it again', async () => {
+    mocks.call.mockRejectedValue(new Error('connection closed'))
+    const a = send('a')
+    expect(await a.outcome).toBe('unconfirmed')
+    expect(phases()).toEqual([])
+    expect(mocks.handBack).toHaveBeenCalledTimes(1)
+    expect(getStructuredAgentSessionSendNotice(SESSION)).toContain(
+      "Orca couldn't confirm your message reached the agent"
+    )
+    await vi.advanceTimersByTimeAsync(STRUCTURED_AGENT_SESSION_SEND_BUDGET_MS * 2)
+    expect(sendCalls()).toBe(1)
+  })
+
+  // This window answers a re-paired server's call itself, before forwarding it: nothing went out.
+  it('gives back as not sent a send this window turned away because the server was re-paired', async () => {
+    mocks.call.mockRejectedValueOnce(
+      new RuntimeRpcCallError({
+        id: 'agentSession.send',
+        ok: false,
+        error: {
+          code: 'runtime_environment_changed',
+          message: 'Runtime environment pairing changed; refresh and try again'
+        },
+        _meta: { runtimeId: 'runtime-1' }
+      })
+    )
+    const a = send('a')
+    expect(await a.outcome).toBe('returned')
+    expect(getStructuredAgentSessionSendNotice(SESSION)).toContain('Your message was not sent.')
+    expect(getStructuredAgentSessionSendNotice(SESSION)).not.toContain("couldn't confirm")
+    expect(sendCalls()).toBe(1)
+  })
+
+  // A link that drops once the request is out proves nothing, whatever code the transport names.
+  it.each(['runtime_timeout', 'remote_runtime_unavailable'])(
+    'gives back as unconfirmed a send whose link failed with %s',
+    async (code) => {
+      mocks.call.mockRejectedValueOnce(
+        new RuntimeRpcCallError({
+          id: 'agentSession.send',
+          ok: false,
+          error: { code, message: 'lost' },
+          _meta: { runtimeId: 'runtime-1' }
+        })
+      )
+      const a = send('a')
+      expect(await a.outcome).toBe('unconfirmed')
+      expect(getStructuredAgentSessionSendNotice(SESSION)).toContain(
+        "Orca couldn't confirm your message reached the agent"
+      )
+    }
+  )
+
+  // Bookkeeping never gates a send: a hand-back that throws still frees the chat, and says so.
+  it('frees the chat and answers the caller when putting the text back throws', async () => {
+    const report = vi.spyOn(console, 'error').mockImplementation(() => {})
+    mocks.handBack.mockImplementationOnce(() => {
+      throw new Error('draft write failed')
+    })
+    mocks.call.mockRejectedValueOnce(new Error('connection closed'))
+    const a = send('a')
+    expect(await a.outcome).toBe('unconfirmed')
+    expect(structuredAgentSessionSendOut(SESSION)).toBe(false)
+    expect(phases()).toEqual([])
+    expect(getStructuredAgentSessionSendNotice(SESSION)).toContain("Couldn't save your message.")
+    expect(report).toHaveBeenCalledTimes(1)
+    report.mockRestore()
+    deferredCalls()
+    send('b')
+    expect(phases()).toEqual(['b:sending'])
+  })
+
+  it('never holds a later send behind one nobody answered', async () => {
+    mocks.call.mockRejectedValueOnce(new Error('timeout')).mockRejectedValue(new Error('timeout'))
+    send('a')
+    await vi.advanceTimersByTimeAsync(STRUCTURED_AGENT_SESSION_SEND_BUDGET_MS)
+    mocks.call.mockReset()
+    const calls = deferredCalls()
+    send('b')
+    await flush()
+    expect(phases()).toEqual(['b:sending'])
+    expect(calls).toHaveLength(1)
+  })
+
+  it('gives back a message that never went out by the deadline, without sending it', async () => {
+    const hang = new Promise(() => {})
+    // Reading the fence hangs (an unreachable host): nothing was ever sent.
+    mocks.call.mockImplementation((_target, method: string) =>
+      method === 'agentSession.history' ? hang : Promise.resolve(refusedSend)
+    )
+    const { resetStructuredAgentSessionSendsForTests: reset } =
+      await import('./structured-agent-session-message-sender')
+    reset()
+    const a = send('a')
+    await vi.advanceTimersByTimeAsync(STRUCTURED_AGENT_SESSION_SEND_BUDGET_MS)
+    expect(await a.outcome).toBe('returned')
+    expect(mocks.handBack).toHaveBeenCalledTimes(1)
+    expect(mocks.call.mock.calls.some((call) => call[1] === 'agentSession.send')).toBe(false)
+  })
+
+  // A Stop, or the chat's tab closing, which stops its sends the same way.
+  it('gives back silently, and never sends, one a Stop finds still being readied', async () => {
+    deferredCalls()
+    mocks.compatible.mockImplementationOnce(() => new Promise<void>(() => {}))
+    const a = send('a', { target: { kind: 'environment', environmentId: 'env-1' } })
+    await flush()
+    stopStructuredAgentSessionSends(SESSION)
+    expect(await a.outcome).toBe('returned')
+    expect(mocks.handBack).toHaveBeenCalledTimes(1)
+    expect(getStructuredAgentSessionSendNotice(SESSION)).toBeNull()
+    await vi.advanceTimersByTimeAsync(STRUCTURED_AGENT_SESSION_SEND_BUDGET_MS)
+    expect(sendCalls()).toBe(0)
+  })
+
+  // Nothing resends, so a Stop is never followed by a send of that id, whatever its answer.
+  it('lets a send on its way when Stop was pressed settle from its answer, never a resend', async () => {
+    const calls = deferredCalls()
+    const a = send('a')
+    await flush()
+    stopStructuredAgentSessionSends(SESSION)
+    expect(structuredAgentSessionSendOut(SESSION)).toBe(true)
+    calls[0].reject(new Error('timeout'))
+    expect(await a.outcome).toBe('unconfirmed')
+    expect(getStructuredAgentSessionSendNotice(SESSION)).toContain(
+      "Orca couldn't confirm your message reached the agent. Check the chat"
+    )
+    await vi.advanceTimersByTimeAsync(STRUCTURED_AGENT_SESSION_SEND_BUDGET_MS * 2)
+    expect(sendCalls()).toBe(1)
+  })
+
+  it('settles a send on its way at a Stop from its answer: recorded, or the host held it as a card', async () => {
+    const calls = deferredCalls()
+    const a = send('a')
+    await flush()
+    stopStructuredAgentSessionSends(SESSION)
+    // The journal shows its row, whatever the Stop did.
+    settleStructuredAgentSessionSendsFromJournal(
+      SESSION,
+      [submission(a.clientMessageId, 'accepted')],
+      []
+    )
+    expect(await a.outcome).toBe('recorded')
+    const b = send('b', {
+      delivery: 'queue-if-active'
+    })
+    await flush()
+    stopStructuredAgentSessionSends(SESSION)
+    calls[1].resolve({
+      ok: true,
+      replayed: false,
+      fence: 1,
+      cursor: { epoch: 'e', sequence: 1 },
+      value: {
+        clientMessageId: b.clientMessageId,
+        queued: { messageId: b.clientMessageId, position: 0, state: 'waiting' }
+      }
+    })
+    expect(await b.outcome).toBe('recorded')
+    expect(mocks.handBack).not.toHaveBeenCalled()
+  })
+
+  it("lets a send kept as a card be the card's, from its reply or the journal", async () => {
+    const kept = (id: string) =>
+      submission(id, 'rejected', {
+        rejection: { kind: 'hostRestarted' },
+        keptAsQueuedMessageId: id
+      })
+    mocks.call.mockImplementation(async (_target, _method, params) => ({
+      ok: true,
+      replayed: true,
+      fence: 1,
+      cursor: { epoch: 'e', sequence: 1 },
+      value: {
+        clientMessageId: params.envelope.clientOperationId,
+        submission: kept(params.envelope.clientOperationId)
+      }
+    }))
+    const a = send('a')
+    expect(await a.outcome).toBe('recorded')
+    const calls = deferredCalls()
+    const b = send('b')
+    await flush()
+    settleStructuredAgentSessionSendsFromJournal(SESSION, [kept(b.clientMessageId)], [])
+    expect(await b.outcome).toBe('recorded')
+    calls[0].reject(new Error('timeout'))
+    await vi.advanceTimersByTimeAsync(STRUCTURED_AGENT_SESSION_SEND_BUDGET_MS)
+    expect(mocks.handBack).not.toHaveBeenCalled()
+    expect(sendCalls()).toBe(2)
+  })
+
+  it('leaves in the chat a send whose own reply says a Stop withdrew it', async () => {
+    mocks.call.mockImplementation(async (_target, _method, params) => ({
+      ok: true,
+      replayed: false,
+      fence: 1,
+      cursor: { epoch: 'e', sequence: 1 },
+      value: {
+        clientMessageId: params.envelope.clientOperationId,
+        submission: submission(params.envelope.clientOperationId, 'rejected', {
+          rejection: { kind: 'cancelled' }
+        })
+      }
+    }))
+    const a = send('a')
+    expect(await a.outcome).toBe('recorded')
+    expect(mocks.handBack).not.toHaveBeenCalled()
+    expect(getStructuredAgentSessionSendNotice(SESSION)).toBeNull()
+  })
+
+  it('leaves a send to its own answer while the journal has no row for it', async () => {
+    const calls = deferredCalls()
+    const a = send('a')
+    await flush()
+    settleStructuredAgentSessionSendsFromJournal(SESSION, [submission('other', 'accepted')], [])
+    expect(phases()).toEqual(['a:sending'])
+    calls[0].resolve(okSubmission(a.clientMessageId, 'accepted'))
+    expect(await a.outcome).toBe('recorded')
+  })
+
+  it('reads a pending row in the journal as the host holding it, drawn from then on by that row', async () => {
+    deferredCalls()
+    const a = send('a')
+    await flush()
+    settleStructuredAgentSessionSendsFromJournal(
+      SESSION,
+      [submission(a.clientMessageId, 'pending')],
+      []
+    )
+    expect(await a.outcome).toBe('recorded')
+    send('b')
+    await flush()
+    expect(phases()).toEqual(['b:sending'])
+  })
+
+  it('reads a send the host left in doubt at a Stop as its record, and sends the next', async () => {
+    deferredCalls()
+    const a = send('a')
+    await flush()
+    settleStructuredAgentSessionSendsFromJournal(
+      SESSION,
+      [
+        submission(a.clientMessageId, 'unknown', {
+          recovered: true,
+          reason: 'provider_closed_before_acknowledgement'
+        })
+      ],
+      []
+    )
+    expect(await a.outcome).toBe('recorded')
+    send('b')
+    await flush()
+    expect(phases()).toEqual(['b:sending'])
+    expect(mocks.handBack).not.toHaveBeenCalled()
+  })
+
+  // A card owns the text from the moment the host holds it, whatever happens to the card after.
+  it.each([
+    ['refused', { rejection: { kind: 'notSignedIn' } }],
+    ['withdrawn by a Stop', { rejection: { kind: 'cancelled' } }]
+  ] as const)(
+    'never hands back a queue send whose card was handed off and then %s',
+    async (_how, fate) => {
+      const calls = deferredCalls()
+      const a = send('a', { delivery: 'queue-if-active' })
+      await flush()
+      settleStructuredAgentSessionSendsFromJournal(
+        SESSION,
+        [submission('hand-off', 'rejected', { queuedMessageId: a.clientMessageId, ...fate })],
+        []
+      )
+      expect(await a.outcome).toBe('recorded')
+      calls[0].reject(new Error('timeout'))
+      await vi.advanceTimersByTimeAsync(STRUCTURED_AGENT_SESSION_SEND_BUDGET_MS)
+      expect(mocks.handBack).not.toHaveBeenCalled()
+      expect(sendCalls()).toBe(1)
+    }
+  )
+
+  it('reads a replay naming a card the host withdrew as recorded, never handed back', async () => {
+    mocks.call.mockImplementation(async (_target, _method, params) => ({
+      ok: true,
+      replayed: true,
+      fence: 1,
+      cursor: { epoch: 'e', sequence: 1 },
+      value: {
+        clientMessageId: params.envelope.clientOperationId,
+        queued: { messageId: params.envelope.clientOperationId, position: 0, state: 'withdrawn' }
+      }
+    }))
+    const a = send('a', { delivery: 'queue-if-active' })
+    expect(await a.outcome).toBe('recorded')
+    expect(mocks.handBack).not.toHaveBeenCalled()
+  })
+})
+
+// An earlier build kept a message whose fate was unknown and sent nothing behind it until someone
+// decided it, which froze the chat. Nothing here waits on one past its own deadline.
+describe('a send whose fate is unknown never freezes the chat', () => {
+  beforeEach(() => {
+    vi.useFakeTimers()
+    mocks.call.mockReset()
+    mocks.handBack.mockClear()
+    mocks.compatible.mockReset()
+    mocks.compatible.mockResolvedValue(undefined)
+    noteStructuredAgentSessionFence(SESSION, 4)
+  })
+  afterEach(() => {
+    resetStructuredAgentSessionSendsForTests()
+    vi.useRealTimers()
+  })
+
+  it('holds the chat no longer than the deadline of a send nobody answers', async () => {
+    deferredCalls()
+    const a = send('a')
+    await vi.advanceTimersByTimeAsync(STRUCTURED_AGENT_SESSION_SEND_BUDGET_MS - 1)
+    expect(phases()).toEqual(['a:sending'])
+    expect(structuredAgentSessionSendOut(SESSION)).toBe(true)
+    await vi.advanceTimersByTimeAsync(1)
+    expect(await a.outcome).toBe('unconfirmed')
+    expect(structuredAgentSessionSendOut(SESSION)).toBe(false)
+    // The next message goes out at once, and the first is never sent again.
+    send('b')
+    await flush()
+    expect(phases()).toEqual(['b:sending'])
+    expect(sendCalls()).toBe(2)
+  })
+
+  it('sends the next at once when the host can neither confirm nor deny the one ahead', async () => {
+    mocks.call.mockResolvedValueOnce({
+      ok: false,
+      refusal: {
+        code: 'agent_session_operation_unknown',
+        message: 'unknown',
+        details: { reason: 'outcomeUnknown' }
+      }
+    })
+    const a = send('a')
+    expect(await a.outcome).toBe('unconfirmed')
+    expect(getStructuredAgentSessionSendNotice(SESSION)).toContain(
+      "Orca couldn't confirm your message reached the agent. Check the chat"
+    )
+    const calls = deferredCalls()
+    send('b')
+    await flush()
+    expect(phases()).toEqual(['b:sending'])
+    expect(calls).toHaveLength(1)
+  })
+})
diff --git a/src/renderer/src/components/native-chat/structured-agent-session-message-sender.ts b/src/renderer/src/components/native-chat/structured-agent-session-message-sender.ts
new file mode 100644
index 000000000000..87d96fd97df1
--- /dev/null
+++ b/src/renderer/src/components/native-chat/structured-agent-session-message-sender.ts
@@ -0,0 +1,327 @@
+// The one way a structured chat message reaches its host: composer, launch prompt and a message sent
+// from outside the chat all call `sendStructuredAgentSessionMessage`, with or without the chat's view
+// mounted. The host's journal and queue own every message they hold. This module keeps, in memory
+// only, the one send per chat the host has not answered yet: for its "Sending…" bubble, and to put
+// the message back in the composer when the host did not take it, or nobody can say. While it is
+// out the chat takes no other send, which keeps the host's arrival order without a client line.
+//
+// Nothing here is saved, nothing outlives one deadline, and nothing is ever sent twice: a send makes
+// one request, and whatever its answer, nothing sends it again.
+
+import type { AgentJournalSubmission } from '../../../../shared/agent-session-journal-types'
+import {
+  agentSessionUnconfirmedSendParts,
+  agentSessionWriteNoticeParts,
+  agentSessionWriteNotDoneParts
+} from '../../../../shared/agent-session-refusal-notice'
+import type { AgentSessionWriteNoticePart } from '../../../../shared/agent-session-write-notice-copy'
+import type { AgentSessionWriteFailure } from '../../../../shared/agent-session-write-failure'
+import { dispatchWasWithdrawn } from '../../../../shared/structured-agent-session-dispatch-rejection'
+import type { RuntimeClientTarget } from '@/runtime/runtime-rpc-client'
+import {
+  attemptStructuredAgentSessionSend,
+  forgetStructuredAgentSessionFence,
+  resetStructuredAgentSessionFencesForTests
+} from './structured-agent-session-send-attempt'
+import { agentSessionWriteNoticeText } from './agent-session-write-notice-text'
+import { nativeChatRewindReasonCopy } from './native-chat-rewind-copy'
+import { handBackStructuredAgentSessionMessage } from './structured-agent-session-message-hand-back'
+import {
+  takeStructuredAgentSessionSendSlot,
+  type StructuredAgentSessionSendInput
+} from './structured-agent-session-send-slot'
+import {
+  clearStructuredAgentSessionPendingSends,
+  findStructuredAgentSessionPendingSend,
+  getStructuredAgentSessionPendingSends,
+  publishStructuredAgentSessionSends,
+  structuredAgentSessionSendsWatched,
+  structuredAgentSessionsWithPendingSends,
+  updateStructuredAgentSessionPendingSend,
+  type StructuredAgentSessionPendingSend
+} from './structured-agent-session-pending-sends'
+
+/** From the moment a message is sent: past it, the message goes back to the composer, saying it
+ *  was not sent if it never went out, and that nobody could confirm it if it did. */
+export const STRUCTURED_AGENT_SESSION_SEND_BUDGET_MS = 30_000
+
+/** `returned`: back in the composer, not sent. `unconfirmed`: back in the composer, though the host
+ *  may hold it. */
+export type StructuredAgentSessionSendOutcome = 'recorded' | 'returned' | 'unconfirmed' | 'dropped'
+
+type SendRuntime = {
+  target: RuntimeClientTarget
+  abort: AbortController
+  deadline: ReturnType<typeof setTimeout>
+  resolve: (outcome: StructuredAgentSessionSendOutcome) => void
+}
+
+const runtimes = new Map<string, SendRuntime>()
+
+/** Ends a send for good: the entry leaves (or stays as `recorded`) and its caller is answered. */
+function finish(
+  entry: StructuredAgentSessionPendingSend,
+  outcome: StructuredAgentSessionSendOutcome,
+  keep?: Partial<StructuredAgentSessionPendingSend>
+): void {
+  const runtime = runtimes.get(entry.clientMessageId)
+  if (runtime) {
+    clearTimeout(runtime.deadline)
+    runtimes.delete(entry.clientMessageId)
+    runtime.resolve(outcome)
+  }
+  updateStructuredAgentSessionPendingSend(entry.sessionId, entry.clientMessageId, keep ?? null)
+}
+
+/** Puts the text back in the chat's composer; false, reported, when the draft write threw. */
+function returnToComposer(entry: StructuredAgentSessionPendingSend): boolean {
+  try {
+    handBackStructuredAgentSessionMessage(
+      entry.sessionId,
+      entry.clientMessageId,
+      entry.body,
+      entry.imageConnectionIds
+    )
+    return true
+  } catch (error) {
+    console.error('[native-chat-send] a message could not be put back in the composer', error)
+    return false
+  }
+}
+
+function handBack(
+  entry: StructuredAgentSessionPendingSend,
+  notice: readonly AgentSessionWriteNoticePart[] | null
+): void {
+  try {
+    if (entry.callerKeepsText) {
+      return
+    }
+    const parts: readonly AgentSessionWriteNoticePart[] | null = returnToComposer(entry)
+      ? notice
+      : [...(notice ?? []), 'messageNotSaved']
+    if (parts) {
+      publishStructuredAgentSessionSends(entry.sessionId, {
+        notice: agentSessionWriteNoticeText([...parts])
+      })
+    }
+  } finally {
+    // Bookkeeping never holds the chat: whatever the hand-back met, the send ends.
+    finish(entry, notice?.includes('sendOutcomeLost') ? 'unconfirmed' : 'returned')
+  }
+}
+
+/** Settled by the host's answer, from the send's own reply or the journal, whichever comes first. */
+function settleRecorded(
+  entry: StructuredAgentSessionPendingSend,
+  submission: AgentJournalSubmission | null,
+  from: 'reply' | 'journal'
+): void {
+  // A message a Stop took back stays in the chat with its stop row, drawn by the host's row; the
+  // composer is left alone. An open chat draws a recorded one until its row arrives, which can
+  // trail the reply.
+  const keep =
+    from === 'reply' &&
+    !(submission && dispatchWasWithdrawn(submission)) &&
+    structuredAgentSessionSendsWatched(entry.sessionId)
+  finish(entry, 'recorded', keep ? { phase: 'recorded', issued: true } : undefined)
+}
+
+/** Why the host turned the send away. Behind a rewind whose outcome is unknown it was not sent: the
+ *  rewind's words say why, and the next send has the host check it first. */
+function refusedSendParts(failure: AgentSessionWriteFailure): AgentSessionWriteNoticePart[] {
+  return failure.kind === 'refused' && failure.details?.reason === 'rewindUnconfirmed'
+    ? [
+        { text: nativeChatRewindReasonCopy('outcome-unknown') },
+        ...agentSessionWriteNotDoneParts('composer-send')
+      ]
+    : agentSessionWriteNoticeParts(failure, 'composer-send')
+}
+
+/** The send's one request, and what its answer settles. Nothing is ever sent again. */
+async function attempt(entry: StructuredAgentSessionPendingSend): Promise<void> {
+  const runtime = runtimes.get(entry.clientMessageId)
+  if (!runtime) {
+    return
+  }
+  const outcome = await attemptStructuredAgentSessionSend({
+    entry,
+    target: runtime.target,
+    beforeIssue: () =>
+      updateStructuredAgentSessionPendingSend(entry.sessionId, entry.clientMessageId, {
+        issued: true
+      }),
+    abandoned: () => runtime.abort.signal.aborted || runtimes.get(entry.clientMessageId) !== runtime
+  })
+  const current = findStructuredAgentSessionPendingSend(entry.sessionId, entry.clientMessageId)
+  if (!outcome || !current) {
+    return
+  }
+  if (outcome.kind === 'not-sent') {
+    handBack(current, outcome.parts)
+  } else if (outcome.evidence.kind === 'recorded') {
+    settleRecorded(current, outcome.submission, 'reply')
+  } else if (outcome.evidence.kind === 'not-recorded') {
+    handBack(current, refusedSendParts(outcome.evidence.failure))
+  } else {
+    // Dropped, unanswered, or an answer that proves nothing: it may have landed, so check first.
+    handBack(current, agentSessionUnconfirmedSendParts(outcome.thrownRefusal))
+  }
+}
+
+function onDeadline(sessionId: string, clientMessageId: string): void {
+  const entry = findStructuredAgentSessionPendingSend(sessionId, clientMessageId)
+  if (!entry || entry.phase === 'recorded') {
+    return
+  }
+  runtimes.get(clientMessageId)?.abort.abort()
+  // One that went out may still land: its row then shows it beside the text given back.
+  handBack(
+    entry,
+    entry.issued
+      ? ['sendOutcomeLost']
+      : ['unreachable', ...agentSessionWriteNotDoneParts('composer-send')]
+  )
+}
+
+export type StructuredAgentSessionSent = {
+  clientMessageId: string
+  outcome: Promise<StructuredAgentSessionSendOutcome>
+}
+
+/** Sends a message holding its chat's slot; its 30 s start now. */
+function dispatch(
+  entry: StructuredAgentSessionPendingSend,
+  target: RuntimeClientTarget
+): StructuredAgentSessionSent {
+  const { clientMessageId, sessionId } = entry
+  const outcome = new Promise<StructuredAgentSessionSendOutcome>((resolve) => {
+    runtimes.set(clientMessageId, {
+      target,
+      abort: new AbortController(),
+      deadline: setTimeout(
+        () => onDeadline(sessionId, clientMessageId),
+        STRUCTURED_AGENT_SESSION_SEND_BUDGET_MS
+      ),
+      resolve
+    })
+  })
+  void attempt(entry)
+  return { clientMessageId, outcome }
+}
+
+/**
+ * Sends one message, or returns null while another send of its chat is out. Resolves once its fate
+ * is known here: `recorded` (the host holds it), `returned` or `unconfirmed` (it went back to the
+ * composer, with the reason on the chat's line), or `dropped` (its launch was cancelled or its
+ * worktree purged).
+ */
+export function sendStructuredAgentSessionMessage(
+  input: StructuredAgentSessionSendInput & { target: RuntimeClientTarget }
+): StructuredAgentSessionSent | null {
+  const entry = takeStructuredAgentSessionSendSlot(input)
+  return entry ? dispatch(entry, input.target) : null
+}
+
+export type StructuredAgentSessionReservedSend = {
+  /** Sends it once the chat exists; null when the reservation was released or dropped meanwhile. */
+  send: (target: RuntimeClientTarget) => StructuredAgentSessionSent | null
+  /** Gives the slot back unsent. */
+  release: () => void
+}
+
+/**
+ * A launch's prompt holds its chat's one send from the click: drawn as sending, so nothing typed
+ * meanwhile overtakes it, and sent once the chat exists. Null while the chat already has a send out.
+ */
+export function reserveStructuredAgentSessionSend(
+  input: StructuredAgentSessionSendInput
+): StructuredAgentSessionReservedSend | null {
+  const entry = takeStructuredAgentSessionSendSlot(input)
+  if (!entry) {
+    return null
+  }
+  // Once sent, the entry is the send's: what it keeps after settling is not the reservation's.
+  let sent = false
+  const held = (): StructuredAgentSessionPendingSend | undefined =>
+    sent ? undefined : findStructuredAgentSessionPendingSend(entry.sessionId, entry.clientMessageId)
+  return {
+    send: (target) => {
+      const current = held()
+      sent = true
+      return current ? dispatch(current, target) : null
+    },
+    release: () => {
+      if (held()) {
+        updateStructuredAgentSessionPendingSend(entry.sessionId, entry.clientMessageId, null)
+      }
+    }
+  }
+}
+
+/**
+ * Settles sends from the host's published state: a row under the message's id, a hand-off of a card
+ * under it, or a card under it. Whichever of this and the send's own reply comes first decides.
+ */
+export function settleStructuredAgentSessionSendsFromJournal(
+  sessionId: string,
+  submissions: readonly AgentJournalSubmission[],
+  queuedMessageIds: readonly string[]
+): void {
+  const entries = getStructuredAgentSessionPendingSends(sessionId)
+  if (entries.length === 0) {
+    return
+  }
+  const cards = new Set(queuedMessageIds)
+  for (const submission of submissions) {
+    if (submission.queuedMessageId !== undefined) {
+      cards.add(submission.queuedMessageId)
+    }
+  }
+  const rows = new Map(submissions.map((submission) => [submission.clientMessageId, submission]))
+  for (const entry of entries) {
+    const submission = rows.get(entry.clientMessageId)
+    if (cards.has(entry.clientMessageId)) {
+      finish(entry, 'recorded')
+    } else if (submission) {
+      settleRecorded(entry, submission, 'journal')
+    }
+  }
+}
+
+/**
+ * A Stop, or the chat's tab closing: a send still being readied never went out, so it goes back
+ * silently and nothing is sent; one whose request is out settles from its answer.
+ */
+export function stopStructuredAgentSessionSends(sessionId: string): void {
+  for (const entry of getStructuredAgentSessionPendingSends(sessionId)) {
+    const runtime = runtimes.get(entry.clientMessageId)
+    if (runtime && !entry.issued) {
+      runtime.abort.abort()
+      handBack(entry, null)
+    }
+  }
+}
+
+/** A cancelled launch or a purged worktree: its sends are dropped, and their callers told so. */
+export function dropStructuredAgentSessionSends(sessionId: string): void {
+  for (const entry of getStructuredAgentSessionPendingSends(sessionId)) {
+    const runtime = runtimes.get(entry.clientMessageId)
+    runtime?.abort.abort()
+    if (runtime) {
+      clearTimeout(runtime.deadline)
+      runtimes.delete(entry.clientMessageId)
+      runtime.resolve('dropped')
+    }
+  }
+  forgetStructuredAgentSessionFence(sessionId)
+  clearStructuredAgentSessionPendingSends(sessionId)
+}
+
+export function resetStructuredAgentSessionSendsForTests(): void {
+  for (const sessionId of structuredAgentSessionsWithPendingSends()) {
+    publishStructuredAgentSessionSends(sessionId, { holds: 0 })
+    dropStructuredAgentSessionSends(sessionId)
+  }
+  resetStructuredAgentSessionFencesForTests()
+}
diff --git a/src/renderer/src/components/native-chat/structured-agent-session-operation-id.ts b/src/renderer/src/components/native-chat/structured-agent-session-operation-id.ts
new file mode 100644
index 000000000000..20a02c8ee023
--- /dev/null
+++ b/src/renderer/src/components/native-chat/structured-agent-session-operation-id.ts
@@ -0,0 +1,7 @@
+import { createStructuredAgentSessionOperationId } from '../../../../shared/structured-agent-session-mutation'
+import { createBrowserUuid } from '@/lib/browser-uuid'
+
+/** A fresh operation id for one structured chat write. */
+export function structuredSessionOperationId(): string {
+  return createStructuredAgentSessionOperationId(createBrowserUuid)
+}
diff --git a/src/renderer/src/components/native-chat/structured-agent-session-outbox-dispatch.owner-change.test.ts b/src/renderer/src/components/native-chat/structured-agent-session-outbox-dispatch.owner-change.test.ts
deleted file mode 100644
index d74910154188..000000000000
--- a/src/renderer/src/components/native-chat/structured-agent-session-outbox-dispatch.owner-change.test.ts
+++ /dev/null
@@ -1,40 +0,0 @@
-// An owner change sends a send left dispatching again under its id. One a Stop outlived is put
-// back the same way, and its mark alone holds it: the drain never admits it.
-
-import { describe, expect, it } from 'vitest'
-import {
-  createStructuredAgentSessionOutboxEntry,
-  type StructuredAgentSessionOutboxEntry
-} from '../../../../shared/structured-agent-session-outbox'
-import { admitStructuredAgentSessionOutboxEntry } from '../../../../shared/structured-agent-session-outbox-admission'
-import { requeueInterruptedStructuredAgentSessionDispatches } from './structured-agent-session-outbox-dispatch'
-
-function dispatching(
-  clientMessageId: string,
-  overrides: Partial<StructuredAgentSessionOutboxEntry> = {}
-): StructuredAgentSessionOutboxEntry {
-  return {
-    ...createStructuredAgentSessionOutboxEntry({
-      clientMessageId,
-      sessionId: 'session-1',
-      text: clientMessageId,
-      attachments: [],
-      queuedAt: 1
-    }),
-    state: 'dispatching',
-    lastAttemptAt: 2,
-    ...overrides
-  }
-}
-
-describe('requeue after an owner change', () => {
-  it('resends an interrupted send, but never one a Stop outlived', () => {
-    const [stopped] = requeueInterruptedStructuredAgentSessionDispatches(
-      [dispatching('stopped', { outlivedStop: true })],
-      1
-    )
-    expect(admitStructuredAgentSessionOutboxEntry([stopped]).state).toBe('blocked')
-    const [plain] = requeueInterruptedStructuredAgentSessionDispatches([dispatching('plain')], 1)
-    expect(admitStructuredAgentSessionOutboxEntry([plain]).state).toBe('dispatch')
-  })
-})
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
deleted file mode 100644
index 5e36f07a8259..000000000000
--- a/src/renderer/src/components/native-chat/structured-agent-session-outbox-dispatch.ts
+++ /dev/null
@@ -1,178 +0,0 @@
-import type {
-  AgentSessionMutationResult,
-  AgentSessionSendResult
-} from '../../../../shared/agent-session-wire'
-import {
-  agentSessionRefusalFailure,
-  readAgentSessionErrorRefusal
-} from '../../../../shared/agent-session-write-failure'
-import {
-  disposeStructuredAgentSessionSendFailure,
-  disposeStructuredAgentSessionSendRefusal,
-  disposeStructuredAgentSessionSendResult,
-  STRUCTURED_AGENT_SESSION_OUTBOX_NOT_SAVED,
-  type StructuredAgentSessionSendDisposition
-} from '../../../../shared/structured-agent-session-send-disposition'
-import type { RuntimeClientTarget } from '@/runtime/runtime-rpc-client'
-import { callStructuredAgentSession } from '@/runtime/structured-agent-session-client'
-import {
-  stageStructuredAgentSessionOutboxEntryForSend,
-  structuredAgentSessionSendRequest,
-  updateStructuredAgentSessionOutboxEntry,
-  type StructuredAgentSessionOutboxEntry
-} from '../../../../shared/structured-agent-session-outbox'
-import {
-  commitStructuredAgentSessionOutbox,
-  getStructuredAgentSessionOutbox
-} from './structured-agent-session-outbox-storage'
-import { agentSessionWriteNoticeText } from './agent-session-write-notice-text'
-import {
-  getStructuredAgentLaunchPromptDispatch,
-  shareStructuredAgentLaunchPromptDispatch
-} from '@/lib/structured-agent-session-launch-prompt'
-
-type MutableRef<T> = { current: T }
-
-function isDesktopDeliveryUnknown(error: unknown): boolean {
-  const text = error instanceof Error ? `${error.name}:${error.message}` : String(error)
-  return /timeout|disconnect|connection|closed|unavailable|cutover/i.test(text)
-}
-
-export function hasInFlightLaunchDispatch(
-  entry: StructuredAgentSessionOutboxEntry,
-  fence: number | null
-): boolean {
-  return Boolean(
-    entry.source === 'launch' &&
-    getStructuredAgentLaunchPromptDispatch(
-      entry.sessionId,
-      entry.clientMessageId,
-      fence ?? undefined
-    )
-  )
-}
-
-export function readMountedStructuredAgentSessionOutbox(
-  sessionId: string,
-  fence: number | null,
-  read: (
-    sessionId: string,
-    options: { recoverDispatching: boolean }
-  ) => StructuredAgentSessionOutboxEntry[]
-): StructuredAgentSessionOutboxEntry[] {
-  return read(sessionId, { recoverDispatching: false }).map((entry) =>
-    entry.state === 'dispatching' && !hasInFlightLaunchDispatch(entry, fence)
-      ? { ...entry, state: 'unconfirmed' as const }
-      : entry
-  )
-}
-
-/** A send left dispatching when its owner changed goes out again, under the same id; one a Stop
- *  outlived is held from there by its mark, until the user's Retry. */
-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
-  /** The outbox to stage `next` in: the latest, so a hold only memory keeps survives it. */
-  entries: readonly StructuredAgentSessionOutboxEntry[]
-  sessionId: string
-  target: RuntimeClientTarget
-  fence: number
-  dispatchGeneration: number
-  dispatchGenerationRef: MutableRef<number>
-  inFlightIdRef: MutableRef<string | null>
-  setError: (error: string | null) => void
-  applyDisposition: (disposition: StructuredAgentSessionSendDisposition) => void
-  createOperationId: () => string
-}): { promise: Promise<boolean>; started: boolean } {
-  const start = async (): Promise<boolean> => {
-    args.inFlightIdRef.current = args.next.clientMessageId
-    const staged = updateStructuredAgentSessionOutboxEntry(
-      args.entries,
-      args.next.clientMessageId,
-      (entry) => stageStructuredAgentSessionOutboxEntryForSend(entry, Date.now())
-    )
-    if (!commitStructuredAgentSessionOutbox(args.sessionId, staged, { onlyIfSaved: true })) {
-      args.inFlightIdRef.current = null
-      // Held for Retry. Saved if storage takes this one write; otherwise only the open chat's
-      // outbox holds it.
-      commitStructuredAgentSessionOutbox(
-        args.sessionId,
-        updateStructuredAgentSessionOutboxEntry(
-          getStructuredAgentSessionOutbox(args.sessionId),
-          args.next.clientMessageId,
-          (entry) => ({ ...entry, lastFailure: { kind: 'failed' } })
-        )
-      )
-      args.setError(agentSessionWriteNoticeText(STRUCTURED_AGENT_SESSION_OUTBOX_NOT_SAVED))
-      return false
-    }
-    // No `finally` release below: `applyDisposition` frees single-flight as part of the state
-    // write that re-runs the drain, and a microtask later would leave the queue no trigger.
-    try {
-      const result = await callStructuredAgentSession<
-        AgentSessionMutationResult<AgentSessionSendResult>
-      >(args.target, 'agentSession.send', structuredAgentSessionSendRequest(args.next, args.fence))
-      if (args.dispatchGenerationRef.current !== args.dispatchGeneration) {
-        return false
-      }
-      args.applyDisposition(
-        disposeStructuredAgentSessionSendResult({
-          entries: getStructuredAgentSessionOutbox(args.sessionId),
-          entry: args.next,
-          result,
-          createOperationId: args.createOperationId
-        })
-      )
-      if (!result.ok) {
-        return false
-      }
-      // A queued answer retired the entry; the queue keeps moving.
-      if ('queued' in result.value) {
-        return true
-      }
-      return (
-        result.value.submission.dispatchState === 'accepted' ||
-        result.value.submission.dispatchState === 'pending'
-      )
-    } catch (caught) {
-      if (args.dispatchGenerationRef.current !== args.dispatchGeneration) {
-        return false
-      }
-      const input = { entries: getStructuredAgentSessionOutbox(args.sessionId), entry: args.next }
-      const thrown = readAgentSessionErrorRefusal(caught)
-      const refusal = thrown ? agentSessionRefusalFailure(thrown) : undefined
-      args.applyDisposition(
-        refusal
-          ? disposeStructuredAgentSessionSendRefusal({
-              ...input,
-              refusal,
-              createOperationId: args.createOperationId
-            })
-          : disposeStructuredAgentSessionSendFailure({
-              ...input,
-              cause: caught,
-              isDeliveryUnknown: isDesktopDeliveryUnknown
-            })
-      )
-      return false
-    }
-  }
-  return args.next.source === 'launch'
-    ? shareStructuredAgentLaunchPromptDispatch(
-        args.next.sessionId,
-        args.next.clientMessageId,
-        args.fence,
-        start
-      )
-    : { promise: start(), started: true }
-}
diff --git a/src/renderer/src/components/native-chat/structured-agent-session-outbox-entry-watch.ts b/src/renderer/src/components/native-chat/structured-agent-session-outbox-entry-watch.ts
deleted file mode 100644
index 71644f313407..000000000000
--- a/src/renderer/src/components/native-chat/structured-agent-session-outbox-entry-watch.ts
+++ /dev/null
@@ -1,63 +0,0 @@
-import type { StructuredAgentSessionOutboxEntry } from '../../../../shared/structured-agent-session-outbox'
-
-/** How a watched message left its chat's outbox: sent on (accepted, or handed to the host or the
- *  composer), or thrown away with the chat. */
-export type StructuredAgentSessionOutboxEntryRemoval = 'spent' | 'discarded'
-
-type EntryWatch = {
-  entry: StructuredAgentSessionOutboxEntry
-  onGone: (removal: StructuredAgentSessionOutboxEntryRemoval) => void
-}
-
-const watchesBySession = new Map<string, Set<EntryWatch>>()
-
-// A user's Retry of a refused message gives it a new id; its text and queue time stay.
-function stillQueued(
-  watched: StructuredAgentSessionOutboxEntry,
-  entries: readonly StructuredAgentSessionOutboxEntry[]
-): boolean {
-  const body = JSON.stringify(watched.body)
-  return entries.some(
-    (entry) =>
-      entry.clientMessageId === watched.clientMessageId ||
-      (entry.queuedAt === watched.queuedAt && JSON.stringify(entry.body) === body)
-  )
-}
-
-/** Calls `onGone` once, when `entry` leaves its session's outbox. */
-export function watchStructuredAgentSessionOutboxEntry(
-  entry: StructuredAgentSessionOutboxEntry,
-  onGone: (removal: StructuredAgentSessionOutboxEntryRemoval) => void
-): () => void {
-  const watches = watchesBySession.get(entry.sessionId) ?? new Set()
-  watchesBySession.set(entry.sessionId, watches)
-  const watch: EntryWatch = { entry, onGone }
-  watches.add(watch)
-  return () => {
-    watches.delete(watch)
-    if (watches.size === 0 && watchesBySession.get(entry.sessionId) === watches) {
-      watchesBySession.delete(entry.sessionId)
-    }
-  }
-}
-
-/** Run by the outbox's one write funnel after a change takes effect. */
-export function settleStructuredAgentSessionOutboxEntryWatches(
-  sessionId: string,
-  entries: readonly StructuredAgentSessionOutboxEntry[],
-  removal: StructuredAgentSessionOutboxEntryRemoval
-): void {
-  const watches = watchesBySession.get(sessionId)
-  if (!watches) {
-    return
-  }
-  for (const watch of watches) {
-    if (!stillQueued(watch.entry, entries)) {
-      watches.delete(watch)
-      watch.onGone(removal)
-    }
-  }
-  if (watches.size === 0) {
-    watchesBySession.delete(sessionId)
-  }
-}
diff --git a/src/renderer/src/components/native-chat/structured-agent-session-outbox-retry.test.ts b/src/renderer/src/components/native-chat/structured-agent-session-outbox-retry.test.ts
deleted file mode 100644
index 08bb1fa0c751..000000000000
--- a/src/renderer/src/components/native-chat/structured-agent-session-outbox-retry.test.ts
+++ /dev/null
@@ -1,80 +0,0 @@
-// @vitest-environment happy-dom
-
-// A send made while a Stop was ending a turn waits behind that turn. Retrying it later is a new
-// send: it must not wait behind some later, unrelated turn a Stop is ending.
-
-import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest'
-import type { AgentJournalSubmission } from '../../../../shared/agent-session-journal-types'
-import { DISPATCH_REJECTED_WRITE_FAILED } from '../../../../shared/structured-agent-session-dispatch-rejection'
-import { createStructuredAgentSessionOutboxEntry } from '../../../../shared/structured-agent-session-outbox'
-import { retryStructuredAgentSessionOutboxEntry } from './structured-agent-session-outbox-retry'
-import { readOutbox, writeOutbox } from './structured-agent-session-outbox-storage'
-
-const SESSION = 'session-1'
-
-beforeEach(() => localStorage.clear())
-afterEach(() => localStorage.clear())
-
-function sentWhileStopping(state: 'unconfirmed' | 'rejected') {
-  writeOutbox(SESSION, [
-    {
-      ...createStructuredAgentSessionOutboxEntry({
-        clientMessageId: 'held',
-        sessionId: SESSION,
-        text: 'follow-up',
-        attachments: [],
-        queuedAt: 1
-      }),
-      lastAttemptAt: 5,
-      outlivedStop: true,
-      sentWhileStopping: true,
-      state
-    }
-  ])
-}
-
-function retry(submissions: AgentJournalSubmission[] = []): void {
-  retryStructuredAgentSessionOutboxEntry({
-    clientMessageId: 'held',
-    sessionId: SESSION,
-    submissions,
-    setError: vi.fn(),
-    createOperationId: () => 'retried'
-  })
-}
-
-describe('Retry on a send made while a Stop was ending a turn', () => {
-  it('sends it as a new send, no longer waiting behind a Stop', () => {
-    sentWhileStopping('unconfirmed')
-
-    retry()
-
-    expect(readOutbox(SESSION)).toEqual([
-      expect.objectContaining({ clientMessageId: 'held', state: 'queued' })
-    ])
-    expect(readOutbox(SESSION)[0]).not.toHaveProperty('sentWhileStopping')
-    expect(readOutbox(SESSION)[0]).not.toHaveProperty('outlivedStop')
-  })
-
-  it('does the same when the Retry rotates the id of a send the host refused', () => {
-    sentWhileStopping('rejected')
-
-    retry([
-      {
-        clientMessageId: 'held',
-        fence: 1,
-        payloadFingerprint: 'held',
-        dispatchState: 'rejected',
-        providerItemId: null,
-        reason: DISPATCH_REJECTED_WRITE_FAILED,
-        submittedAt: 1,
-        resolvedAt: 2
-      }
-    ])
-
-    expect(readOutbox(SESSION)).toEqual([
-      expect.objectContaining({ clientMessageId: 'retried', state: 'queued' })
-    ])
-    expect(readOutbox(SESSION)[0]).not.toHaveProperty('sentWhileStopping')
-  })
-})
diff --git a/src/renderer/src/components/native-chat/structured-agent-session-outbox-retry.ts b/src/renderer/src/components/native-chat/structured-agent-session-outbox-retry.ts
deleted file mode 100644
index b61f17dfe9ba..000000000000
--- a/src/renderer/src/components/native-chat/structured-agent-session-outbox-retry.ts
+++ /dev/null
@@ -1,86 +0,0 @@
-// The user's Retry on a stuck outbox entry: requeue it, rotating the operation
-// id when the recorded one can only ever replay a settled rejection.
-
-import type { AgentJournalSubmission } from '../../../../shared/agent-session-journal-types'
-import {
-  structuredAgentSessionEntryIdExpired,
-  structuredAgentSessionEntryRejectedByHost,
-  type StructuredAgentSessionOutboxEntry
-} from '../../../../shared/structured-agent-session-outbox'
-import {
-  commitStructuredAgentSessionOutbox,
-  getStructuredAgentSessionOutbox
-} from './structured-agent-session-outbox-storage'
-import { STRUCTURED_AGENT_SESSION_OUTBOX_NOT_SAVED } from '../../../../shared/structured-agent-session-send-disposition'
-import { agentSessionWriteNoticeText } from './agent-session-write-notice-text'
-
-export function retryStructuredAgentSessionOutboxEntry(args: {
-  clientMessageId: string
-  sessionId: string
-  submissions: readonly AgentJournalSubmission[]
-  setError: (error: string | null) => void
-  createOperationId: () => string
-}): void {
-  const { clientMessageId, sessionId, setError, submissions } = args
-  const submission = submissions.find((candidate) => candidate.clientMessageId === clientMessageId)
-  const outbox = getStructuredAgentSessionOutbox(sessionId)
-  const current = outbox.find((entry) => entry.clientMessageId === clientMessageId)
-  // 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. An expired id is refused for good; its row told the
-  // user to check the chat first.
-  const recordedRejection =
-    current !== undefined && structuredAgentSessionEntryRejectedByHost(current)
-  if (
-    current &&
-    (recordedRejection ||
-      submission?.dispatchState === 'rejected' ||
-      structuredAgentSessionEntryIdExpired(current))
-  ) {
-    const rotated = outbox.map((entry) =>
-      entry.clientMessageId === clientMessageId
-        ? {
-            ...retriedByUser(entry),
-            clientMessageId: args.createOperationId(),
-            state: 'queued' as const,
-            lastAttemptAt: null,
-            retryAfterUnknownSubmittedAt: null
-          }
-        : entry
-    )
-    if (!commitStructuredAgentSessionOutbox(sessionId, rotated, { onlyIfSaved: true })) {
-      setError(agentSessionWriteNoticeText(STRUCTURED_AGENT_SESSION_OUTBOX_NOT_SAVED))
-    }
-    return
-  }
-  const retryAfterUnknownSubmittedAt =
-    submission?.dispatchState === 'unknown'
-      ? submission.submittedAt
-      : current?.state === 'unconfirmed'
-        ? -1
-        : null
-  const next = outbox.map((entry) =>
-    entry.clientMessageId === clientMessageId
-      ? {
-          ...retriedByUser(entry),
-          state: 'queued' as const,
-          retryAfterUnknownSubmittedAt
-        }
-      : entry
-  )
-  if (!commitStructuredAgentSessionOutbox(sessionId, next, { onlyIfSaved: true })) {
-    setError(agentSessionWriteNoticeText(STRUCTURED_AGENT_SESSION_OUTBOX_NOT_SAVED))
-  }
-}
-
-/** The user's own Retry is what a Stop, or a failure saved on the message, left it waiting for. It
- *  is a new send, so it no longer waits behind the turn a Stop was ending when it was first sent. */
-function retriedByUser({
-  outlivedStop: _retried,
-  lastFailure: _sentAgain,
-  sentWhileStopping: _sentNow,
-  ...entry
-}: StructuredAgentSessionOutboxEntry): StructuredAgentSessionOutboxEntry {
-  return entry
-}
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
deleted file mode 100644
index fa42aefa2fb1..000000000000
--- a/src/renderer/src/components/native-chat/structured-agent-session-outbox-storage.test.ts
+++ /dev/null
@@ -1,287 +0,0 @@
-// @vitest-environment happy-dom
-
-import { beforeEach, describe, expect, it, vi } from 'vitest'
-import {
-  createStructuredAgentSessionOutboxEntry,
-  type StructuredAgentSessionAttemptFailure
-} from '../../../../shared/structured-agent-session-outbox'
-import {
-  hasUndeliveredStructuredAgentSessionOutbox,
-  appendStructuredAgentSessionOutboxMessage,
-  commitStructuredAgentSessionOutbox,
-  getStructuredAgentSessionOutbox,
-  mutateStructuredAgentSessionLaunchPrompt,
-  readOutbox,
-  resetUndeliveredStructuredAgentSessionOutboxForTests,
-  subscribeToStructuredAgentSessionOutbox,
-  subscribeToUndeliveredStructuredAgentSessionOutbox,
-  writeOutbox
-} from './structured-agent-session-outbox-storage'
-
-function entry(sessionId: string, clientMessageId: string) {
-  return createStructuredAgentSessionOutboxEntry({
-    clientMessageId,
-    sessionId,
-    text: clientMessageId,
-    attachments: [],
-    queuedAt: 1
-  })
-}
-
-describe('undelivered structured agent session outbox projection', () => {
-  beforeEach(() => {
-    localStorage.clear()
-    resetUndeliveredStructuredAgentSessionOutboxForTests()
-  })
-
-  it('reports a session whose outbox was persisted before this renderer read it', () => {
-    writeOutbox('session-a', [entry('session-a', 'client-1')])
-    resetUndeliveredStructuredAgentSessionOutboxForTests()
-
-    expect(hasUndeliveredStructuredAgentSessionOutbox('session-a')).toBe(true)
-    expect(hasUndeliveredStructuredAgentSessionOutbox('session-b')).toBe(false)
-  })
-
-  it('notifies when the first entry lands and when the last one leaves', () => {
-    const listener = vi.fn()
-    const unsubscribe = subscribeToUndeliveredStructuredAgentSessionOutbox('session-a', listener)
-
-    writeOutbox('session-a', [entry('session-a', 'client-1')])
-    expect(listener).toHaveBeenCalledTimes(1)
-    expect(hasUndeliveredStructuredAgentSessionOutbox('session-a')).toBe(true)
-
-    writeOutbox('session-a', [])
-    expect(listener).toHaveBeenCalledTimes(2)
-    expect(hasUndeliveredStructuredAgentSessionOutbox('session-a')).toBe(false)
-
-    unsubscribe()
-    writeOutbox('session-a', [entry('session-a', 'client-2')])
-    expect(listener).toHaveBeenCalledTimes(2)
-  })
-
-  it('stays quiet for a write that leaves the session undelivered either way', () => {
-    const listener = vi.fn()
-    const unsubscribe = subscribeToUndeliveredStructuredAgentSessionOutbox('session-a', listener)
-
-    writeOutbox('session-a', [entry('session-a', 'client-1'), entry('session-a', 'client-2')])
-    expect(listener).toHaveBeenCalledTimes(1)
-
-    writeOutbox('session-a', [entry('session-a', 'client-2')])
-    expect(listener).toHaveBeenCalledTimes(1)
-    unsubscribe()
-  })
-  it('does not notify a session subscriber for another session', () => {
-    const listener = vi.fn()
-    const unsubscribe = subscribeToUndeliveredStructuredAgentSessionOutbox('session-a', listener)
-    expect(hasUndeliveredStructuredAgentSessionOutbox('session-a')).toBe(false)
-    writeOutbox('session-b', [entry('session-b', 'client-1')])
-    expect(listener).not.toHaveBeenCalled()
-    unsubscribe()
-  })
-
-  it('releases the cached snapshot when the last subscriber leaves', () => {
-    writeOutbox('session-a', [entry('session-a', 'client-1')])
-    const unsubscribe = subscribeToUndeliveredStructuredAgentSessionOutbox('session-a', vi.fn())
-    const getItem = vi.spyOn(localStorage, 'getItem')
-    for (let index = 0; index < 10; index += 1) {
-      expect(hasUndeliveredStructuredAgentSessionOutbox('session-a')).toBe(true)
-    }
-    expect(getItem).not.toHaveBeenCalled()
-    unsubscribe()
-    localStorage.clear()
-    expect(hasUndeliveredStructuredAgentSessionOutbox('session-a')).toBe(false)
-    getItem.mockRestore()
-  })
-
-  it('keeps a snapshot until both subscribers leave and reloads it on remount', () => {
-    const first = vi.fn()
-    const second = vi.fn()
-    const releaseFirst = subscribeToUndeliveredStructuredAgentSessionOutbox('session-a', first)
-    const releaseSecond = subscribeToUndeliveredStructuredAgentSessionOutbox('session-a', second)
-    releaseFirst()
-    writeOutbox('session-a', [entry('session-a', 'client-1')])
-    expect(first).not.toHaveBeenCalled()
-    expect(second).toHaveBeenCalledTimes(1)
-    releaseSecond()
-    localStorage.clear()
-    const releaseRemount = subscribeToUndeliveredStructuredAgentSessionOutbox('session-a', first)
-    expect(hasUndeliveredStructuredAgentSessionOutbox('session-a')).toBe(false)
-    writeOutbox('session-a', [entry('session-a', 'client-2')])
-    expect(first).toHaveBeenCalledTimes(1)
-    expect(second).toHaveBeenCalledTimes(1)
-    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.' }
-    ])
-  })
-})
-
-describe('the session outbox store', () => {
-  beforeEach(() => {
-    localStorage.clear()
-  })
-
-  it('shows an open chat a message queued from elsewhere', () => {
-    const listener = vi.fn()
-    const release = subscribeToStructuredAgentSessionOutbox('session-1', () => [], listener)
-
-    const queued = appendStructuredAgentSessionOutboxMessage('session-1', 'review notes')
-
-    expect(listener).toHaveBeenCalledOnce()
-    expect(getStructuredAgentSessionOutbox('session-1')).toEqual([queued])
-    expect(readOutbox('session-1')).toEqual([queued])
-    release()
-  })
-
-  it('queues behind an in-flight send without disturbing it', () => {
-    writeOutbox('session-1', [{ ...entry('session-1', 'in-flight'), state: 'dispatching' }])
-
-    appendStructuredAgentSessionOutboxMessage('session-1', 'review notes')
-
-    expect(readOutbox('session-1', { recoverDispatching: false }).map((e) => e.state)).toEqual([
-      'dispatching',
-      'queued'
-    ])
-  })
-
-  it('keeps the open outbox when a required save fails', () => {
-    const release = subscribeToStructuredAgentSessionOutbox('session-1', () => [], vi.fn())
-    const setItem = vi.spyOn(localStorage, 'setItem').mockImplementation(() => {
-      throw new Error('quota')
-    })
-
-    expect(appendStructuredAgentSessionOutboxMessage('session-1', 'review notes')).toBeNull()
-    expect(getStructuredAgentSessionOutbox('session-1')).toEqual([])
-    setItem.mockRestore()
-    release()
-  })
-
-  it('releases the held copy with its last subscriber', () => {
-    const release = subscribeToStructuredAgentSessionOutbox(
-      'session-1',
-      () => [{ ...entry('session-1', 'loaded'), state: 'unconfirmed' }],
-      vi.fn()
-    )
-    expect(getStructuredAgentSessionOutbox('session-1')[0]?.state).toBe('unconfirmed')
-
-    release()
-
-    expect(getStructuredAgentSessionOutbox('session-1')).toEqual([])
-  })
-
-  it('lets a launch settlement read its own send as unconfirmed and leaves other sends alone', () => {
-    const release = subscribeToStructuredAgentSessionOutbox('session-1', () => [], vi.fn())
-    commitStructuredAgentSessionOutbox('session-1', [
-      { ...entry('session-1', 'launch'), state: 'dispatching' },
-      { ...entry('session-1', 'composer'), state: 'dispatching' }
-    ])
-    const seen: string[] = []
-
-    mutateStructuredAgentSessionLaunchPrompt('session-1', 'launch', (current) => {
-      seen.push(current.state)
-      return null
-    })
-
-    expect(seen).toEqual(['unconfirmed'])
-    expect(getStructuredAgentSessionOutbox('session-1')).toMatchObject([
-      { clientMessageId: 'composer', state: 'dispatching' }
-    ])
-    release()
-  })
-})
diff --git a/src/renderer/src/components/native-chat/structured-agent-session-outbox-storage.ts b/src/renderer/src/components/native-chat/structured-agent-session-outbox-storage.ts
deleted file mode 100644
index 343923e7e058..000000000000
--- a/src/renderer/src/components/native-chat/structured-agent-session-outbox-storage.ts
+++ /dev/null
@@ -1,260 +0,0 @@
-import {
-  createStructuredAgentSessionOutboxEntry,
-  parseStructuredAgentSessionOutboxEntry,
-  structuredAgentSessionEntryRejectedByHost,
-  type StructuredAgentSessionAttachment,
-  type StructuredAgentSessionOutboxEntry
-} from '../../../../shared/structured-agent-session-outbox'
-import { createStructuredAgentSessionOperationId } from '../../../../shared/structured-agent-session-mutation'
-import { createBrowserUuid } from '@/lib/browser-uuid'
-import {
-  settleStructuredAgentSessionOutboxEntryWatches,
-  type StructuredAgentSessionOutboxEntryRemoval
-} from './structured-agent-session-outbox-entry-watch'
-
-const OUTBOX_PREFIX = 'orca:desktopStructuredAgentSessionOutbox:v1:'
-
-function storageKey(sessionId: string): string {
-  return `${OUTBOX_PREFIX}${encodeURIComponent(sessionId)}`
-}
-
-export function readOutbox(
-  sessionId: string,
-  options: { recoverDispatching?: boolean } = {}
-): StructuredAgentSessionOutboxEntry[] {
-  const recoverDispatching = options.recoverDispatching !== false
-  try {
-    const value = JSON.parse(localStorage.getItem(storageKey(sessionId)) ?? '[]')
-    return Array.isArray(value)
-      ? value
-          .map((entry) => parseStructuredAgentSessionOutboxEntry(entry, sessionId))
-          .filter((entry): entry is StructuredAgentSessionOutboxEntry => entry !== null)
-          .map((entry) =>
-            recoverDispatching && entry.state === 'dispatching'
-              ? { ...entry, state: 'unconfirmed' as const }
-              : entry
-          )
-          .sort((left, right) => left.queuedAt - right.queuedAt)
-      : []
-  } catch {
-    return []
-  }
-}
-
-type UndeliveredSessionSubscription = {
-  undelivered: boolean
-  listeners: Set<() => void>
-}
-
-const undeliveredSessions = new Map<string, UndeliveredSessionSubscription>()
-
-function publishUndelivered(sessionId: string, undelivered: boolean): void {
-  const subscription = undeliveredSessions.get(sessionId)
-  if (!subscription || subscription.undelivered === undelivered) {
-    return
-  }
-  subscription.undelivered = undelivered
-  for (const listener of subscription.listeners) {
-    listener()
-  }
-}
-
-/** Whether any entry still owes a delivery: a copy the host recorded and rejected owes none. */
-function owesDelivery(entries: readonly StructuredAgentSessionOutboxEntry[]): boolean {
-  return entries.some((entry) => !structuredAgentSessionEntryRejectedByHost(entry))
-}
-
-/** Keep the journal subscription alive while this session still owes delivery. */
-export function hasUndeliveredStructuredAgentSessionOutbox(sessionId: string): boolean {
-  return undeliveredSessions.get(sessionId)?.undelivered ?? owesDelivery(readOutbox(sessionId))
-}
-
-export function subscribeToUndeliveredStructuredAgentSessionOutbox(
-  sessionId: string,
-  listener: () => void
-): () => void {
-  let subscription = undeliveredSessions.get(sessionId)
-  if (!subscription) {
-    subscription = { undelivered: owesDelivery(readOutbox(sessionId)), listeners: new Set() }
-    undeliveredSessions.set(sessionId, subscription)
-  }
-  const owned = subscription
-  owned.listeners.add(listener)
-  return () => {
-    owned.listeners.delete(listener)
-    if (owned.listeners.size === 0 && undeliveredSessions.get(sessionId) === owned) {
-      undeliveredSessions.delete(sessionId)
-    }
-  }
-}
-
-export function resetUndeliveredStructuredAgentSessionOutboxForTests(): void {
-  undeliveredSessions.clear()
-}
-
-export function writeOutbox(
-  sessionId: string,
-  entries: readonly StructuredAgentSessionOutboxEntry[]
-): boolean {
-  try {
-    if (entries.length === 0) {
-      localStorage.removeItem(storageKey(sessionId))
-    } else {
-      localStorage.setItem(storageKey(sessionId), JSON.stringify(entries))
-    }
-    publishUndelivered(sessionId, owesDelivery(entries))
-    return true
-  } catch {
-    return false
-  }
-}
-
-type HeldOutbox = {
-  entries: StructuredAgentSessionOutboxEntry[]
-  listeners: Set<() => void>
-}
-
-// Why: while a chat is open its outbox lives here, not in the view, so every writer — the
-// composer, a launch settlement, a message sent from elsewhere — changes the one copy it shows.
-const heldOutboxes = new Map<string, HeldOutbox>()
-
-/** The session's outbox: the held copy while a chat has it open, otherwise storage as written. */
-export function getStructuredAgentSessionOutbox(
-  sessionId: string
-): StructuredAgentSessionOutboxEntry[] {
-  return (
-    heldOutboxes.get(sessionId)?.entries ?? readOutbox(sessionId, { recoverDispatching: false })
-  )
-}
-
-function holdOutbox(
-  sessionId: string,
-  load: () => StructuredAgentSessionOutboxEntry[]
-): HeldOutbox {
-  let held = heldOutboxes.get(sessionId)
-  if (!held) {
-    held = { entries: load(), listeners: new Set() }
-    heldOutboxes.set(sessionId, held)
-  }
-  return held
-}
-
-/** Loads the session's outbox for a chat that is opening it; `load` runs once per hold. */
-export function loadStructuredAgentSessionOutbox(
-  sessionId: string,
-  load: () => StructuredAgentSessionOutboxEntry[]
-): StructuredAgentSessionOutboxEntry[] {
-  return holdOutbox(sessionId, load).entries
-}
-
-/** Holds the session's outbox in memory until the last subscriber leaves. */
-export function subscribeToStructuredAgentSessionOutbox(
-  sessionId: string,
-  load: () => StructuredAgentSessionOutboxEntry[],
-  listener: () => void
-): () => void {
-  const held = holdOutbox(sessionId, load)
-  held.listeners.add(listener)
-  return () => {
-    held.listeners.delete(listener)
-    if (held.listeners.size === 0 && heldOutboxes.get(sessionId) === held) {
-      heldOutboxes.delete(sessionId)
-    }
-  }
-}
-
-/** Makes `entries` the session's outbox and saves it. With `onlyIfSaved`, a failed save leaves
- *  the outbox as it was; otherwise the open chat still shows the change. */
-export function commitStructuredAgentSessionOutbox(
-  sessionId: string,
-  entries: StructuredAgentSessionOutboxEntry[],
-  options: { onlyIfSaved?: boolean } = {}
-): boolean {
-  return commitOutbox(sessionId, entries, options, 'spent')
-}
-
-function commitOutbox(
-  sessionId: string,
-  entries: StructuredAgentSessionOutboxEntry[],
-  options: { onlyIfSaved?: boolean },
-  removal: StructuredAgentSessionOutboxEntryRemoval
-): boolean {
-  const saved = writeOutbox(sessionId, entries)
-  if (!saved && options.onlyIfSaved) {
-    return false
-  }
-  const held = heldOutboxes.get(sessionId)
-  if (held && held.entries !== entries) {
-    held.entries = entries
-    for (const listener of held.listeners) {
-      listener()
-    }
-  }
-  settleStructuredAgentSessionOutboxEntryWatches(sessionId, entries, removal)
-  return saved
-}
-
-/** Queues a user message on the session's outbox: the one enqueue the composer, a launch prompt,
- *  and a message sent from outside the chat all share. */
-export function appendStructuredAgentSessionOutboxMessage(
-  sessionId: string,
-  text: string,
-  attachments: readonly StructuredAgentSessionAttachment[] = [],
-  source?: 'launch',
-  sentWhileStopping = false
-): StructuredAgentSessionOutboxEntry | null {
-  const entry = {
-    ...createStructuredAgentSessionOutboxEntry({
-      clientMessageId: createStructuredAgentSessionOperationId(createBrowserUuid),
-      sessionId,
-      text,
-      attachments,
-      queuedAt: Date.now()
-    }),
-    ...(source ? { source } : {}),
-    ...(sentWhileStopping ? { sentWhileStopping: true as const } : {})
-  }
-  return commitStructuredAgentSessionOutbox(
-    sessionId,
-    [...getStructuredAgentSessionOutbox(sessionId), entry],
-    { onlyIfSaved: true }
-  )
-    ? entry
-    : null
-}
-
-export function enqueueStructuredAgentSessionLaunchPrompt(
-  sessionId: string,
-  text: string
-): StructuredAgentSessionOutboxEntry | null {
-  return appendStructuredAgentSessionOutboxMessage(sessionId, text, [], 'launch')
-}
-
-export function discardStructuredAgentSessionLaunchOutbox(sessionId: string): void {
-  commitOutbox(sessionId, [], {}, 'discarded')
-}
-
-export function mutateStructuredAgentSessionLaunchPrompt(
-  sessionId: string,
-  clientMessageId: string,
-  update: StructuredAgentSessionLaunchPromptMutation,
-  options: { onlyIfSaved?: boolean } = {}
-): boolean {
-  let matched = false
-  const next = getStructuredAgentSessionOutbox(sessionId).flatMap((entry) => {
-    if (entry.clientMessageId !== clientMessageId) {
-      return [entry]
-    }
-    matched = true
-    // The settlement reads its own in-flight send as storage recovery would: unconfirmed.
-    const replacement = update(
-      entry.state === 'dispatching' ? { ...entry, state: 'unconfirmed' } : entry
-    )
-    return replacement ? [replacement] : []
-  })
-  return matched && commitStructuredAgentSessionOutbox(sessionId, next, options)
-}
-
-export type StructuredAgentSessionLaunchPromptMutation = (
-  entry: StructuredAgentSessionOutboxEntry
-) => StructuredAgentSessionOutboxEntry | null
diff --git a/src/renderer/src/components/native-chat/structured-agent-session-pending-sends.ts b/src/renderer/src/components/native-chat/structured-agent-session-pending-sends.ts
new file mode 100644
index 000000000000..cf9e66a0db8c
--- /dev/null
+++ b/src/renderer/src/components/native-chat/structured-agent-session-pending-sends.ts
@@ -0,0 +1,159 @@
+// Each chat's sends the host has not answered yet, in memory only: what the sender keeps and the
+// chat's view reads.
+
+import type { AgentJournalMessageItem } from '../../../../shared/agent-session-journal-types'
+
+export type StructuredAgentSessionPendingSend = {
+  clientMessageId: string
+  sessionId: string
+  body: AgentJournalMessageItem
+  previewUris: readonly string[]
+  queuedAt: number
+  delivery?: 'queue-if-active'
+  /**
+   * `sending`: on its way, its one request out or about to be; the chat takes no other send meanwhile.
+   * `recorded`: the host holds it; an open chat draws it until the host's row or card arrives.
+   */
+  phase: 'sending' | 'recorded'
+  /** Its request went out, so it may have reached the host. */
+  issued: boolean
+  /** A sender outside the chat keeps its own copy, so nothing goes to the chat's composer. */
+  callerKeepsText?: true
+  /** Made while the chat read Stopping: drawn after that turn until the host records it. */
+  sentWhileStopping?: true
+  /** Each image's SSH connection, in body order, so a returned image still opens remotely. */
+  imageConnectionIds?: readonly (string | null)[]
+}
+
+type SessionSends = {
+  entries: readonly StructuredAgentSessionPendingSend[]
+  /** Why the last message went back to the composer; cleared by the next send. */
+  notice: string | null
+  /** Writes that keep every send out meanwhile: a /clear, whose host refuses them. */
+  holds: number
+  listeners: Set<() => void>
+}
+
+export const EMPTY_STRUCTURED_AGENT_SESSION_SENDS: readonly StructuredAgentSessionPendingSend[] = []
+const sessions = new Map<string, SessionSends>()
+
+function sessionSends(sessionId: string): SessionSends {
+  let state = sessions.get(sessionId)
+  if (!state) {
+    state = {
+      entries: EMPTY_STRUCTURED_AGENT_SESSION_SENDS,
+      notice: null,
+      holds: 0,
+      listeners: new Set()
+    }
+    sessions.set(sessionId, state)
+  }
+  return state
+}
+
+export function publishStructuredAgentSessionSends(
+  sessionId: string,
+  change: Partial<Omit<SessionSends, 'listeners'>>
+): void {
+  const state = sessionSends(sessionId)
+  Object.assign(state, change)
+  for (const listener of state.listeners) {
+    listener()
+  }
+}
+
+export function updateStructuredAgentSessionPendingSend(
+  sessionId: string,
+  clientMessageId: string,
+  change: Partial<StructuredAgentSessionPendingSend> | null
+): void {
+  const state = sessionSends(sessionId)
+  publishStructuredAgentSessionSends(sessionId, {
+    entries: state.entries.flatMap((entry) =>
+      entry.clientMessageId !== clientMessageId ? [entry] : change ? [{ ...entry, ...change }] : []
+    )
+  })
+}
+
+export function findStructuredAgentSessionPendingSend(
+  sessionId: string,
+  clientMessageId: string
+): StructuredAgentSessionPendingSend | undefined {
+  return sessions.get(sessionId)?.entries.find((entry) => entry.clientMessageId === clientMessageId)
+}
+
+/** What the chat's view reads: its pending sends and the line saying why one came back. */
+export function getStructuredAgentSessionPendingSends(
+  sessionId: string
+): readonly StructuredAgentSessionPendingSend[] {
+  return sessions.get(sessionId)?.entries ?? EMPTY_STRUCTURED_AGENT_SESSION_SENDS
+}
+
+/** A view of this chat is mounted, so something draws its sends. */
+export function structuredAgentSessionSendsWatched(sessionId: string): boolean {
+  return (sessions.get(sessionId)?.listeners.size ?? 0) > 0
+}
+
+/** A send of this chat is out and not yet settled, or a write holds sends: the chat takes none. */
+export function structuredAgentSessionSendOut(sessionId: string): boolean {
+  return (
+    structuredAgentSessionSendsHeld(sessionId) ||
+    getStructuredAgentSessionPendingSends(sessionId).some((entry) => entry.phase === 'sending')
+  )
+}
+
+export function structuredAgentSessionSendsHeld(sessionId: string): boolean {
+  return (sessions.get(sessionId)?.holds ?? 0) > 0
+}
+
+/** Keeps every send of the chat out until the returned release runs (once). */
+export function holdStructuredAgentSessionSends(sessionId: string): () => void {
+  publishStructuredAgentSessionSends(sessionId, { holds: sessionSends(sessionId).holds + 1 })
+  let held = true
+  return () => {
+    if (held) {
+      held = false
+      publishStructuredAgentSessionSends(sessionId, {
+        holds: Math.max(0, sessionSends(sessionId).holds - 1)
+      })
+    }
+  }
+}
+
+export function getStructuredAgentSessionSendNotice(sessionId: string): string | null {
+  return sessions.get(sessionId)?.notice ?? null
+}
+
+/** Says once, on the chat's line, why text came back to its composer. */
+export function setStructuredAgentSessionSendNotice(sessionId: string, notice: string): void {
+  publishStructuredAgentSessionSends(sessionId, { notice })
+}
+
+export function subscribeToStructuredAgentSessionPendingSends(
+  sessionId: string,
+  listener: () => void
+): () => void {
+  const state = sessionSends(sessionId)
+  state.listeners.add(listener)
+  return () => {
+    state.listeners.delete(listener)
+  }
+}
+
+/** Forgets a chat's sends, keeping its listeners. */
+export function clearStructuredAgentSessionPendingSends(sessionId: string): void {
+  const state = sessions.get(sessionId)
+  if (state) {
+    publishStructuredAgentSessionSends(sessionId, {
+      entries: EMPTY_STRUCTURED_AGENT_SESSION_SENDS,
+      notice: null
+    })
+    if (state.listeners.size === 0 && state.holds === 0) {
+      sessions.delete(sessionId)
+    }
+  }
+}
+
+export function structuredAgentSessionsWithPendingSends(): string[] {
+  return [...sessions.keys()]
+}
diff --git a/src/renderer/src/components/native-chat/structured-agent-session-queue-request.test.ts b/src/renderer/src/components/native-chat/structured-agent-session-queue-request.test.ts
new file mode 100644
index 000000000000..f20ff3be05fd
--- /dev/null
+++ b/src/renderer/src/components/native-chat/structured-agent-session-queue-request.test.ts
@@ -0,0 +1,27 @@
+import { expect, it } from 'vitest'
+import {
+  structuredAgentSessionNewSendsQueue,
+  structuredAgentSessionQueueRequest
+} from './structured-agent-session-queue-request'
+
+const image = [{ path: '/tmp/a.png', previewUri: '/tmp/a.png' }]
+
+it('asks the host to queue only a text send, to a host that queues, with queueing on', () => {
+  expect(structuredAgentSessionQueueRequest({ capability: 'supported', enabled: true }, [])).toBe(
+    'queue-if-active'
+  )
+  // Its queue takes only text: an image goes out at once.
+  expect(
+    structuredAgentSessionQueueRequest({ capability: 'supported', enabled: true }, image)
+  ).toBeUndefined()
+  // Queueing off, or a host that does not queue or has not said yet: a plain send.
+  for (const queue of [
+    { capability: 'supported' as const, enabled: false },
+    { capability: 'unsupported' as const, enabled: true },
+    { capability: 'unknown' as const, enabled: true }
+  ]) {
+    expect(structuredAgentSessionQueueRequest(queue, [])).toBeUndefined()
+    expect(structuredAgentSessionNewSendsQueue(queue)).toBe(false)
+  }
+  expect(structuredAgentSessionNewSendsQueue({ capability: 'supported', enabled: true })).toBe(true)
+})
diff --git a/src/renderer/src/components/native-chat/structured-agent-session-queue-request.ts b/src/renderer/src/components/native-chat/structured-agent-session-queue-request.ts
new file mode 100644
index 000000000000..10f433449f20
--- /dev/null
+++ b/src/renderer/src/components/native-chat/structured-agent-session-queue-request.ts
@@ -0,0 +1,25 @@
+import type { StructuredAgentSessionAttachment } from '../../../../shared/structured-agent-session-send-mutation'
+import type { StructuredAgentSessionHostCapabilityState } from '@/runtime/structured-agent-session-host-capability'
+
+export type StructuredAgentSessionQueueDelivery = {
+  capability: StructuredAgentSessionHostCapabilityState
+  enabled: boolean
+}
+
+/** Whether a send made now asks to be queued: a host known to queue, with queueing enabled. */
+export function structuredAgentSessionNewSendsQueue(
+  queue: StructuredAgentSessionQueueDelivery
+): boolean {
+  return queue.capability === 'supported' && queue.enabled
+}
+
+/** Whether the host holds a send as a card while the agent works: only text, which is all its
+ *  queue takes. */
+export function structuredAgentSessionQueueRequest(
+  queue: StructuredAgentSessionQueueDelivery,
+  attachments: readonly StructuredAgentSessionAttachment[]
+): 'queue-if-active' | undefined {
+  return structuredAgentSessionNewSendsQueue(queue) && attachments.length === 0
+    ? 'queue-if-active'
+    : undefined
+}
diff --git a/src/renderer/src/components/native-chat/structured-agent-session-queued-cards.test.ts b/src/renderer/src/components/native-chat/structured-agent-session-queued-cards.test.ts
index 28df16cb67b0..c7efd15b5087 100644
--- a/src/renderer/src/components/native-chat/structured-agent-session-queued-cards.test.ts
+++ b/src/renderer/src/components/native-chat/structured-agent-session-queued-cards.test.ts
@@ -5,10 +5,10 @@
 import { describe, expect, it } from 'vitest'
 import type { AgentJournalSubmission } from '../../../../shared/agent-session-journal-types'
 import type { AgentSessionQueuedMessage } from '../../../../shared/agent-session-wire'
-import type { StructuredAgentSessionOutboxEntry } from '../../../../shared/structured-agent-session-outbox'
+import type { StructuredAgentSessionPendingSend } from './structured-agent-session-pending-sends'
 import {
   newestSteerableQueuedMessageCard,
-  outboxOutsideQueuedCards,
+  pendingSendsOutsideQueuedCards,
   projectQueuedMessageCards,
   queuedMessageCardSteers,
   queuedMessagesQueuePause
@@ -56,7 +56,6 @@ function handOff(
 }
 
 const IDLE = { hasPendingPrompt: false }
-const QUEUEING = { capability: 'supported', enabled: true } as const
 
 describe('queued message cards', () => {
   it('orders by host position whatever order the list arrives in', () => {
@@ -176,14 +175,10 @@ describe('queued message cards', () => {
     const project = (messages: AgentSessionQueuedMessage[], queuePaused = true) =>
       projectQueuedMessageCards(messages, [], { hasPendingPrompt: false, queuePaused })
     expect(queuedMessagesQueuePause(project([draft('held', 1)]), stopped)).toEqual(stopped)
-    expect(queuedMessagesQueuePause(project([draft('held', 1)]), { reason: 'cleared' })).toEqual({
-      reason: 'cleared'
-    })
     const unsendable = [
       draft('returned', 1, { state: 'returned', returnedReason: null }),
       draft('behind', 2),
-      draft('failed', 3, { paused: true, pausedReason: 'send_failed' }),
-      draft('kept', 4, { paused: true, pausedReason: 'kept' })
+      draft('failed', 3, { paused: true, pausedReason: 'send_failed' })
     ]
     expect(queuedMessagesQueuePause(project(unsendable), stopped)).toBeNull()
     // No published pause (an idle chat after a restart): plain cards, no header.
@@ -192,13 +187,13 @@ describe('queued message cards', () => {
     expect(queuedMessagesQueuePause(unpaused, null)).toBeNull()
   })
 
-  // A kept card is held on its own, like a failed one: the host sends the cards behind it.
-  it('a card behind a kept or a send_failed card is not held by it', () => {
+  // A card held on its own (a failed send, or a newer host's hold) holds nothing behind it.
+  it('a card behind a card held on its own is not held by it', () => {
     const cards = projectQueuedMessageCards(
       [
         draft('failed', 1, { paused: true, pausedReason: 'send_failed' }),
         draft('after-failed', 2),
-        draft('kept', 3, { paused: true, pausedReason: 'kept' }),
+        draft('newer-hold', 3, { paused: true }),
         draft('behind', 4)
       ],
       [],
@@ -213,70 +208,40 @@ describe('queued message cards', () => {
     expect(newestSteerableQueuedMessageCard([])).toBeNull()
   })
 
-  it('a mid-turn queue send on its way is no bubble; one that stalled stays visible', () => {
+  it('a mid-turn queue send on its way is no bubble; a plain or recorded one is, until its row', () => {
     const entry = (
       clientMessageId: string,
-      overrides: Partial<StructuredAgentSessionOutboxEntry> = {}
-    ): StructuredAgentSessionOutboxEntry => ({
+      overrides: Partial<StructuredAgentSessionPendingSend> = {}
+    ): StructuredAgentSessionPendingSend => ({
       clientMessageId,
       sessionId: 'session-1',
       body: { kind: 'message', role: 'user', blocks: [{ type: 'text', text: clientMessageId }] },
       previewUris: [],
-      state: 'queued',
       queuedAt: 1,
-      lastAttemptAt: null,
-      retryAfterUnknownSubmittedAt: null,
+      phase: 'sending',
+      issued: true,
       ...overrides
     })
-    const ids = (entries: readonly StructuredAgentSessionOutboxEntry[]): string[] =>
+    const ids = (entries: readonly StructuredAgentSessionPendingSend[]): string[] =>
       entries.map((candidate) => candidate.clientMessageId)
-    const inFlight = [
-      entry('a', { state: 'dispatching', lastAttemptAt: 2, sentDelivery: 'queue-if-active' }),
-      entry('b')
-    ]
-    expect(ids(outboxOutsideQueuedCards(inFlight, [], true, QUEUEING))).toEqual([])
-    expect(ids(outboxOutsideQueuedCards(inFlight, [], false, QUEUEING))).toEqual(['a', 'b'])
-    // Refused and held for Retry: its text stays in view, and what follows it is on its way.
-    const refused = [entry('a', { lastFailure: { kind: 'failed' } }), entry('b')]
-    expect(ids(outboxOutsideQueuedCards(refused, [], true, QUEUEING))).toEqual(['a'])
-    // A rejected send holds nothing up: what follows it is still on its way to a card.
-    const rejected = [
-      entry('a', { state: 'rejected', lastFailure: { kind: 'rejected', reason: null } }),
-      entry('b')
+    const sends = [
+      entry('queued', { delivery: 'queue-if-active' }),
+      entry('plain'),
+      entry('recorded', { phase: 'recorded' })
     ]
-    expect(ids(outboxOutsideQueuedCards(rejected, [], true, QUEUEING))).toEqual(['a'])
-    const unconfirmed = [entry('a', { state: 'unconfirmed' }), entry('b')]
-    expect(ids(outboxOutsideQueuedCards(unconfirmed, [], true, QUEUEING))).toEqual(['a', 'b'])
-    // Once the host visibly holds it, it is a card whatever this queue last heard.
-    expect(ids(outboxOutsideQueuedCards(unconfirmed, ['a'], true, QUEUEING))).toEqual(['b'])
-  })
-
-  it('hides a send only by what its request carries: a plain one is always a bubble', () => {
-    const entry = (
-      clientMessageId: string,
-      overrides: Partial<StructuredAgentSessionOutboxEntry> = {}
-    ): StructuredAgentSessionOutboxEntry => ({
-      clientMessageId,
-      sessionId: 'session-1',
-      body: { kind: 'message', role: 'user', blocks: [{ type: 'text', text: clientMessageId }] },
-      previewUris: [],
-      state: 'queued',
-      queuedAt: 1,
-      lastAttemptAt: null,
-      retryAfterUnknownSubmittedAt: null,
-      ...overrides
-    })
-    const ids = (entries: readonly StructuredAgentSessionOutboxEntry[]): string[] =>
-      entries.map((candidate) => candidate.clientMessageId)
-    // The capability is unknown: a new send goes out plain, so it stays in view.
-    const unknown = { capability: 'unknown', enabled: true } as const
-    expect(ids(outboxOutsideQueuedCards([entry('new')], [], true, unknown))).toEqual(['new'])
-    // A send that went out plain stays a bubble; one that went out queued replays queued.
-    const sent = [
-      entry('plain', { state: 'dispatching', lastAttemptAt: 2, sentDelivery: null }),
-      entry('queued', { state: 'dispatching', lastAttemptAt: 2, sentDelivery: 'queue-if-active' })
-    ]
-    expect(ids(outboxOutsideQueuedCards(sent, [], true, unknown))).toEqual(['plain'])
+    // Its card draws a queue send while the agent works; a plain send stays in view, and so does a
+    // recorded one until its row arrives (the transcript drops it then).
+    expect(ids(pendingSendsOutsideQueuedCards(sends, [], true))).toEqual(['plain', 'recorded'])
+    expect(ids(pendingSendsOutsideQueuedCards(sends, [], false))).toEqual([
+      'queued',
+      'plain',
+      'recorded'
+    ])
+    // Once the host visibly holds it, it is a card.
+    expect(ids(pendingSendsOutsideQueuedCards(sends, ['plain'], false))).toEqual([
+      'queued',
+      'recorded'
+    ])
   })
 })
 
diff --git a/src/renderer/src/components/native-chat/structured-agent-session-queued-cards.ts b/src/renderer/src/components/native-chat/structured-agent-session-queued-cards.ts
index 4720d9eefbc3..e26197360702 100644
--- a/src/renderer/src/components/native-chat/structured-agent-session-queued-cards.ts
+++ b/src/renderer/src/components/native-chat/structured-agent-session-queued-cards.ts
@@ -12,15 +12,6 @@ import {
   type AgentMessageSource
 } from '../../../../shared/agent-session-message-source'
 import { handedOffQueuedMessageIds } from '../../../../shared/structured-agent-session-draft-hand-off'
-import {
-  structuredAgentSessionEntryAsksToQueue,
-  type StructuredAgentSessionQueueDelivery
-} from '../../../../shared/structured-agent-session-outbox-delivery'
-import type { StructuredAgentSessionOutboxEntry } from '../../../../shared/structured-agent-session-outbox'
-import {
-  admitStructuredAgentSessionOutboxEntry,
-  structuredAgentSessionEntryHeldForRetry
-} from '../../../../shared/structured-agent-session-outbox-admission'
 
 /** Why a card is not on its way right now; decides the caption under the text. */
 export type QueuedMessageCardHold =
@@ -125,31 +116,17 @@ export function newestSteerableQueuedMessageCard(
 }
 
 /**
- * The outbox entries the transcript may show as pending bubbles. A send the host holds
- * as a draft (same id) is a card, and so is a send on its way out asking to be queued —
- * read from what its request carries — otherwise it paints
- * in the transcript until the queued answer retires it. A plain send stays a bubble. From
- * the entry the drain is stopped on (read through the drain's own rule), nothing is on its
- * way, nor is one held for its Retry: those stay bubbles so their text is visible beside the
- * Retry row.
+ * The sends the transcript draws as pending bubbles. One the host holds as a card (same id) is a
+ * card, and so is one asking to be queued while the agent works, which would otherwise paint in the
+ * transcript until its card appears. A recorded one stays drawn until its row arrives.
  */
-export function outboxOutsideQueuedCards(
-  outbox: readonly StructuredAgentSessionOutboxEntry[],
-  heldIds: readonly string[],
-  isWorking: boolean,
-  host: StructuredAgentSessionQueueDelivery
-): readonly StructuredAgentSessionOutboxEntry[] {
+export function pendingSendsOutsideQueuedCards<
+  Send extends { clientMessageId: string; delivery?: 'queue-if-active' }
+>(pending: readonly Send[], heldIds: readonly string[], isWorking: boolean): readonly Send[] {
   const held = new Set(heldIds)
-  const admission = admitStructuredAgentSessionOutboxEntry(outbox)
-  const stalledFrom = admission.state === 'blocked' ? outbox.indexOf(admission.entry) : -1
-  const next = outbox.filter((entry, index) => {
-    const onItsWay =
-      isWorking &&
-      (stalledFrom === -1 || index < stalledFrom) &&
-      (entry.state === 'queued' || entry.state === 'dispatching') &&
-      !structuredAgentSessionEntryHeldForRetry(entry) &&
-      structuredAgentSessionEntryAsksToQueue(entry, host)
-    return !held.has(entry.clientMessageId) && !onItsWay
-  })
-  return next.length === outbox.length ? outbox : next
+  const next = pending.filter(
+    (entry) =>
+      !held.has(entry.clientMessageId) && !(isWorking && entry.delivery === 'queue-if-active')
+  )
+  return next.length === pending.length ? pending : next
 }
diff --git a/src/renderer/src/components/native-chat/structured-agent-session-rail-outline.ts b/src/renderer/src/components/native-chat/structured-agent-session-rail-outline.ts
index fd64b0a4ca65..1b445fa1b91b 100644
--- a/src/renderer/src/components/native-chat/structured-agent-session-rail-outline.ts
+++ b/src/renderer/src/components/native-chat/structured-agent-session-rail-outline.ts
@@ -69,7 +69,9 @@ export function selectStructuredRailOutline(
             .map((entry) => ({
               id: entry.itemId,
               text: entry.preview,
-              hasImages: entry.imageCount > 0
+              hasImages: entry.imageCount > 0,
+              reply: entry.reply,
+              turnKey: entry.turnKey
             }))
         }
   views.set(outline, { edge: oldestLoadedSequence, count, view })
diff --git a/src/renderer/src/components/native-chat/structured-agent-session-send-attempt.ts b/src/renderer/src/components/native-chat/structured-agent-session-send-attempt.ts
new file mode 100644
index 000000000000..1a74b96786e3
--- /dev/null
+++ b/src/renderer/src/components/native-chat/structured-agent-session-send-attempt.ts
@@ -0,0 +1,168 @@
+// One `agentSession.send` request and what its answer proves. Everything before the request is
+// local or read-only, so a send stopped there never went out.
+
+import type { AgentJournalSubmission } from '../../../../shared/agent-session-journal-types'
+import type {
+  AgentSessionHistoryResult,
+  AgentSessionMutationResult,
+  AgentSessionSendResult
+} from '../../../../shared/agent-session-wire'
+import {
+  agentSessionWriteNoticeParts,
+  agentSessionWriteNotDoneParts
+} from '../../../../shared/agent-session-refusal-notice'
+import type { AgentSessionWriteNoticePart } from '../../../../shared/agent-session-write-notice-copy'
+import { structuredAgentSessionMessageSendMutation } from '../../../../shared/structured-agent-session-send-mutation'
+import {
+  structuredAgentSessionSendEvidence,
+  type StructuredAgentSessionSendAnswer,
+  type StructuredAgentSessionSendEvidence
+} from '../../../../shared/structured-agent-session-send-evidence'
+import {
+  ensureRuntimeEnvironmentCompatible,
+  type RuntimeClientTarget
+} from '@/runtime/runtime-rpc-client'
+import { RuntimeRpcCallError } from '@/runtime/runtime-rpc-result'
+import { isRuntimeCompatBlockError } from '@/runtime/runtime-protocol-compat'
+import {
+  agentSessionThrownFailure,
+  readAgentSessionErrorRefusal,
+  type AgentSessionWriteFailure
+} from '../../../../shared/agent-session-write-failure'
+import { callStructuredAgentSession } from '@/runtime/structured-agent-session-client'
+import type { StructuredAgentSessionPendingSend } from './structured-agent-session-pending-sends'
+
+const fences = new Map<string, number>()
+
+/** The fence the session's host serves, as its subscription or launch receipt last reported. */
+export function noteStructuredAgentSessionFence(sessionId: string, fence: number | null): void {
+  if (fence !== null) {
+    fences.set(sessionId, fence)
+  }
+}
+
+export function forgetStructuredAgentSessionFence(sessionId: string): void {
+  fences.delete(sessionId)
+}
+
+export function resetStructuredAgentSessionFencesForTests(): void {
+  fences.clear()
+}
+
+async function knownFence(target: RuntimeClientTarget, sessionId: string): Promise<number | null> {
+  const known = fences.get(sessionId)
+  if (known !== undefined) {
+    return known
+  }
+  // Current hosts ignore it; an older host checks it, so read the one it serves now.
+  const history = await callStructuredAgentSession<AgentSessionHistoryResult>(
+    target,
+    'agentSession.history',
+    { sessionId, direction: 'tail', limit: 1 }
+  )
+  const fence = history.page.fence ?? (!history.ok ? history.fence : undefined)
+  if (typeof fence !== 'number') {
+    return null
+  }
+  fences.set(sessionId, fence)
+  return fence
+}
+
+export type StructuredAgentSessionSendAttempt =
+  | {
+      kind: 'answered'
+      evidence: StructuredAgentSessionSendEvidence
+      /** The host's row, when its answer carried one. */
+      submission: AgentJournalSubmission | null
+      /** The refusal a thrown answer carried: what the host said, though it proves nothing. */
+      thrownRefusal: AgentSessionWriteFailure | null
+    }
+  /** It failed before its request went out, so nothing was sent: why, in the composer's words. */
+  | { kind: 'not-sent'; parts: AgentSessionWriteNoticePart[] }
+
+const NOT_SENT = agentSessionWriteNotDoneParts('composer-send')
+
+/** The code a remote call gets when its environment's pairing or identity changed under it. */
+const RUNTIME_ENVIRONMENT_CHANGED = 'runtime_environment_changed'
+
+/** What a failure before the request says: this client and the server can't talk, what the host
+ *  refused, that Orca couldn't reach it, or only that nothing was sent. */
+function notSentParts(error: unknown): AgentSessionWriteNoticePart[] {
+  if (isRuntimeCompatBlockError(error) && error instanceof Error) {
+    return [{ text: error.message }, 'notDoneSend']
+  }
+  const rpcCode = error instanceof RuntimeRpcCallError ? error.code : undefined
+  return readAgentSessionErrorRefusal(error)
+    ? agentSessionWriteNoticeParts(agentSessionThrownFailure(error, rpcCode), 'composer-send')
+    : ['unreachable', ...NOT_SENT]
+}
+
+/** Null when the send was abandoned (a Stop, its deadline, the journal settling it) meanwhile. */
+export async function attemptStructuredAgentSessionSend(args: {
+  entry: StructuredAgentSessionPendingSend
+  target: RuntimeClientTarget
+  /** Right before the request goes out. */
+  beforeIssue: () => void
+  abandoned: () => boolean
+}): Promise<StructuredAgentSessionSendAttempt | null> {
+  const { entry, target } = args
+  let fence: number | null
+  try {
+    if (target.kind === 'environment') {
+      await ensureRuntimeEnvironmentCompatible(target.environmentId)
+    }
+    fence = await knownFence(target, entry.sessionId)
+  } catch (error) {
+    return args.abandoned() ? null : { kind: 'not-sent', parts: notSentParts(error) }
+  }
+  if (args.abandoned()) {
+    return null
+  }
+  if (fence === null) {
+    return { kind: 'not-sent', parts: NOT_SENT }
+  }
+  args.beforeIssue()
+  const params = structuredAgentSessionMessageSendMutation({
+    sessionId: entry.sessionId,
+    clientOperationId: entry.clientMessageId,
+    expectedRuntimeFence: fence,
+    body: entry.body,
+    ...(entry.delivery ? { delivery: entry.delivery } : {})
+  })
+  type SendAnswer = AgentSessionMutationResult<AgentSessionSendResult>
+  let answer: StructuredAgentSessionSendAnswer
+  try {
+    // Checked above, so the request goes out now or not at all.
+    const result =
+      target.kind === 'environment'
+        ? await callStructuredAgentSession<SendAnswer>(target, 'agentSession.send', params, {
+            skipCompatibilityCheck: true
+          })
+        : await callStructuredAgentSession<SendAnswer>(target, 'agentSession.send', params)
+    answer = { kind: 'result', result }
+  } catch (error) {
+    // This window answers it before forwarding anything (the server was re-paired, as a managed
+    // server's update does), so the request never went out.
+    if (error instanceof RuntimeRpcCallError && error.code === RUNTIME_ENVIRONMENT_CHANGED) {
+      return args.abandoned() ? null : { kind: 'not-sent', parts: notSentParts(error) }
+    }
+    answer = {
+      kind: 'thrown',
+      error,
+      rpcCode: error instanceof RuntimeRpcCallError ? error.code : undefined
+    }
+  }
+  if (args.abandoned()) {
+    return null
+  }
+  const value = answer.kind === 'result' && answer.result.ok ? answer.result.value : null
+  return {
+    kind: 'answered',
+    evidence: structuredAgentSessionSendEvidence(answer),
+    submission: value && 'submission' in value ? value.submission : null,
+    thrownRefusal:
+      answer.kind === 'thrown' && readAgentSessionErrorRefusal(answer.error)
+        ? agentSessionThrownFailure(answer.error, answer.rpcCode)
+        : null
+  }
+}
diff --git a/src/renderer/src/components/native-chat/structured-agent-session-send-slot.ts b/src/renderer/src/components/native-chat/structured-agent-session-send-slot.ts
new file mode 100644
index 000000000000..e54850bdecda
--- /dev/null
+++ b/src/renderer/src/components/native-chat/structured-agent-session-send-slot.ts
@@ -0,0 +1,59 @@
+// A chat's one send slot: the pending entry that draws a message as sending and keeps any other send
+// of that chat out until it settles.
+
+import { createStructuredAgentSessionOperationId } from '../../../../shared/structured-agent-session-mutation'
+import {
+  structuredAgentSessionSendBody,
+  type StructuredAgentSessionAttachment
+} from '../../../../shared/structured-agent-session-send-mutation'
+import { createBrowserUuid } from '@/lib/browser-uuid'
+import {
+  getStructuredAgentSessionPendingSends,
+  publishStructuredAgentSessionSends,
+  structuredAgentSessionSendOut,
+  type StructuredAgentSessionPendingSend
+} from './structured-agent-session-pending-sends'
+
+export type StructuredAgentSessionSendInput = {
+  sessionId: string
+  text: string
+  attachments?: readonly StructuredAgentSessionAttachment[]
+  /** Asks the host to hold it as a card while the agent works; decided once, at the send. */
+  delivery?: 'queue-if-active'
+  /** The caller keeps the text if it comes back, instead of the chat's composer. */
+  callerKeepsText?: true
+  /** Made while the chat read Stopping: drawn after that turn until the host records it. */
+  sentWhileStopping?: true
+  now?: number
+}
+
+/** Takes the chat's one send slot, drawn as sending; null while another send of the chat is out. */
+export function takeStructuredAgentSessionSendSlot(
+  input: StructuredAgentSessionSendInput
+): StructuredAgentSessionPendingSend | null {
+  if (structuredAgentSessionSendOut(input.sessionId)) {
+    return null
+  }
+  const attachments = input.attachments ?? []
+  const entry: StructuredAgentSessionPendingSend = {
+    clientMessageId: createStructuredAgentSessionOperationId(createBrowserUuid),
+    sessionId: input.sessionId,
+    body: structuredAgentSessionSendBody(input.text, attachments),
+    previewUris: attachments.map((attachment) => attachment.previewUri),
+    queuedAt: input.now ?? Date.now(),
+    ...(input.delivery ? { delivery: input.delivery } : {}),
+    ...(input.callerKeepsText ? { callerKeepsText: true as const } : {}),
+    ...(input.sentWhileStopping ? { sentWhileStopping: true as const } : {}),
+    ...(attachments.some((attachment) => attachment.connectionId)
+      ? { imageConnectionIds: attachments.map((attachment) => attachment.connectionId ?? null) }
+      : {}),
+    phase: 'sending',
+    issued: false
+  }
+  publishStructuredAgentSessionSends(input.sessionId, {
+    entries: [...getStructuredAgentSessionPendingSends(input.sessionId), entry],
+    // The notice explains text given back to this chat's composer; only its own sends replace it.
+    ...(input.callerKeepsText ? {} : { notice: null })
+  })
+  return entry
+}
diff --git a/src/renderer/src/components/native-chat/structured-agent-session-stop-control.ts b/src/renderer/src/components/native-chat/structured-agent-session-stop-control.ts
index 63ecacd33bdb..4babd5ab7ec3 100644
--- a/src/renderer/src/components/native-chat/structured-agent-session-stop-control.ts
+++ b/src/renderer/src/components/native-chat/structured-agent-session-stop-control.ts
@@ -1,7 +1,4 @@
 // Whether a structured chat offers Stop, and what Stop does, from what this view knows of the chat.
-import type { AgentJournalSubmission } from '../../../../shared/agent-session-journal-types'
-import type { StructuredAgentSessionOutboxEntry } from '../../../../shared/structured-agent-session-outbox'
-import { hasUnsentStructuredAgentSessionOutboxEntry } from '../../../../shared/structured-agent-session-outbox-stop-withdrawal'
 
 export function structuredAgentSessionStopControl(input: {
   /** The host has published this chat to this view. */
@@ -10,33 +7,35 @@ export function structuredAgentSessionStopControl(input: {
   host: {
     /** The host takes a Stop naming no turn (and this view holds its fence). */
     stopsConversation: boolean
-    stop: (turnId: string | null, withdrawUnsent: () => void) => Promise<unknown>
+    stop: (turnId: string | null, stopSends: () => void) => Promise<unknown>
   }
-  transportState: {
-    turnId: string | null
-    isWorking: boolean
-    submissions: readonly AgentJournalSubmission[]
+  transportState: { turnId: string | null; isWorking: boolean }
+  sends: {
+    /** The chat's one send is out and unsettled. */
+    sending: boolean
+    /** A Stop's part of that send: what has not gone out goes no further. */
+    stopSends: () => void
+    /** Before the host publishes the chat: the launch's unsent text goes back to the composer. */
+    takeBackLaunchText: () => void
   }
-  /** This client's sends the host may not have taken yet. */
-  outbox: { outbox: readonly StructuredAgentSessionOutboxEntry[]; withdrawUnsent: () => void }
 }): { canStop: boolean; stop: () => Promise<unknown> } {
   const { published, host } = input
-  const { turnId, isWorking, submissions } = input.transportState
-  const { withdrawUnsent } = input.outbox
-  const holdsUnsent = hasUnsentStructuredAgentSessionOutboxEntry(input.outbox.outbox, submissions)
+  const { turnId, isWorking } = input.transportState
+  const { sending, stopSends, takeBackLaunchText } = input.sends
   return {
     // Before the host publishes this chat to this view, nothing sent has reached it: a Stop takes
     // back what this client holds, so a start that never answers cannot hold the message hostage.
     canStop:
       turnId !== null ||
-      (!published && holdsUnsent) ||
-      (host.stopsConversation && (isWorking || holdsUnsent)),
+      (!published && sending) ||
+      (host.stopsConversation && (isWorking || sending)),
     stop: () => {
       if (!published) {
-        withdrawUnsent()
+        takeBackLaunchText()
+        stopSends()
         return Promise.resolve(null)
       }
-      return host.stop(turnId, withdrawUnsent)
+      return host.stop(turnId, stopSends)
     }
   }
 }
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
index aa774f7fbf3d..bb44c1adae5e 100644
--- 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
@@ -6,13 +6,25 @@ import type {
 } 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 type { StructuredAgentSessionOptimisticMessage } from '../../../../shared/structured-agent-session-message-projection'
+import { structuredAgentSessionSendBody } from '../../../../shared/structured-agent-session-send-mutation'
 import { createNativeChatMessageListProjection } from './native-chat-message-list-projection'
 import { projectStructuredAgentSessionMessages } from './structured-agent-session-message-projection'
 
+function optimisticMessage(args: {
+  clientMessageId: string
+  sessionId?: string
+  text: string
+  attachments: readonly { path: string; previewUri: string }[]
+  queuedAt: number
+}): StructuredAgentSessionOptimisticMessage {
+  return {
+    clientMessageId: args.clientMessageId,
+    body: structuredAgentSessionSendBody(args.text, args.attachments),
+    queuedAt: args.queuedAt
+  }
+}
+
 function journalItem(
   itemId: string,
   sequence: number,
@@ -39,7 +51,7 @@ function answered(question: string): AgentJournalItemBody {
 /** The ids the desktop transcript list draws, top to bottom. */
 function drawn(
   items: AgentJournalRenderItem[],
-  outbox: StructuredAgentSessionOutboxEntry[] = [],
+  outbox: StructuredAgentSessionOptimisticMessage[] = [],
   submissions: AgentJournalSubmission[] = []
 ): string[] {
   return createNativeChatMessageListProjection()(
@@ -48,7 +60,7 @@ function drawn(
 }
 
 function queued(clientMessageId: string, text: string, queuedAt: number) {
-  return createStructuredAgentSessionOutboxEntry({
+  return optimisticMessage({
     clientMessageId,
     sessionId: 'session',
     text,
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
deleted file mode 100644
index 6523ff17fa63..000000000000
--- a/src/renderer/src/components/native-chat/structured-agent-session-withdrawn-message-restore.test.tsx
+++ /dev/null
@@ -1,532 +0,0 @@
-// A message a Stop withdrew never ran, and nothing sends it again. One the host held stays in the
-// transcript, so the composer keeps what is typed there. One this client's own Stop took before
-// the host held it comes back to the composer, and only to an empty one.
-
-// @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,
-  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'
-
-/** What these hooks render with: the journal's submissions, and the rows loaded so far. */
-type OutboxProps = { submissions: AgentJournalSubmission[]; rows?: AgentJournalRenderItem[] }
-
-function outboxProps(submissions: AgentJournalSubmission[]): OutboxProps {
-  return { submissions }
-}
-
-const NO_JOURNAL_ITEMS: readonly AgentJournalRenderItem[] = []
-
-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: OutboxProps) =>
-      useStructuredAgentSessionOutbox({
-        journalItems: props.rows ?? NO_JOURNAL_ITEMS,
-        sessionId: SESSION,
-        target,
-        fence: 1,
-        submissions: props.submissions,
-        ...(composerScopeKey ? { composerScopeKey } : {})
-      }),
-    { initialProps: outboxProps(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
-}
-
-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 }]
-  ])('leaves the outbox and leaves the composer as it is, 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')
-    expect(readNativeChatAttachmentCache(PANE)).toEqual([{ id: 'typed', path: '/tmp/typed.png' }])
-  })
-
-  it('leaves an empty composer empty when the host wrote the withdrawal as a typed fact', 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('')
-  })
-
-  it('is never put back by a replay or a second view of the chat', 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(restored).toBe('')
-  })
-
-  it("leaves a message rejected for any other reason to the host's row, 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 })
-      ],
-      rows: [
-        {
-          itemId: `orca:${id}`,
-          revision: 1,
-          sequence: 1,
-          observedAt: 1,
-          body: { kind: 'message', role: 'user', blocks: [{ type: 'text', text: 'hello' }] }
-        }
-      ]
-    })
-
-    await waitFor(() => expect(result.current.outbox).toEqual([]))
-    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 an empty 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('never gives back a send already on its way, even 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('')
-  })
-
-  it.each([
-    ['text', () => writeNativeChatDraftCache(PANE, 'typed since')],
-    [
-      'an image',
-      () => appendNativeChatAttachmentCache(PANE, [{ id: 'typed', path: '/tmp/typed.png' }])
-    ]
-  ])(
-    'leaves a composer holding %s as it is, and keeps the message as not sent',
-    async (_holding, fill) => {
-      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', [{ path: '/tmp/shot.png', previewUri: '/tmp/shot.png' }])
-        ).toBe(true)
-      )
-      const before = {
-        draft: readNativeChatDraftCache(PANE),
-        images: readNativeChatAttachmentCache(PANE)
-      }
-      fill()
-      const filled = {
-        draft: readNativeChatDraftCache(PANE),
-        images: readNativeChatAttachmentCache(PANE)
-      }
-      expect(filled).not.toEqual(before)
-
-      act(() => result.current.withdrawUnsent())
-
-      expect({
-        draft: readNativeChatDraftCache(PANE),
-        images: readNativeChatAttachmentCache(PANE)
-      }).toEqual(filled)
-      // Its only copy, so it stays as not sent, text and image, on its Retry.
-      expect(
-        readOutbox(SESSION, { recoverDispatching: false }).map((entry) => ({
-          state: entry.state,
-          blocks: entry.body.blocks
-        }))
-      ).toEqual([
-        { state: 'dispatching', blocks: [{ type: 'text', text: 'first' }] },
-        {
-          state: 'rejected',
-          blocks: [
-            { type: 'text', text: 'second' },
-            { type: 'image-ref', path: '/tmp/shot.png' }
-          ]
-        }
-      ])
-    }
-  )
-
-  it('keeps the message as not sent where no composer shows the chat', async () => {
-    mocks.call.mockImplementation(() => new Promise<never>(() => {}))
-    const { result } = renderOutbox(null)
-    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.state, entry.body.blocks])).toEqual([
-      ['dispatching', [{ type: 'text', text: 'first' }]],
-      ['rejected', [{ type: 'text', text: 'second' }]]
-    ])
-  })
-
-  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('keeps what the host withdrew out of the composer of 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('')
-  })
-
-  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
deleted file mode 100644
index 2bfa6a087373..000000000000
--- a/src/renderer/src/components/native-chat/structured-agent-session-withdrawn-message-restore.ts
+++ /dev/null
@@ -1,70 +0,0 @@
-import { useMemo } from 'react'
-import type { AgentJournalMessageItem } from '../../../../shared/agent-session-journal-types'
-import type { StructuredAgentSessionOutboxEntry } from '../../../../shared/structured-agent-session-outbox'
-import { appendNativeChatDraftCache, readNativeChatDraftCache } from './native-chat-draft-cache'
-import {
-  appendNativeChatAttachmentCache,
-  readNativeChatAttachmentCache
-} from './use-native-chat-composer-attachments'
-
-/** Puts a message's text and images into a composer, after whatever is there. */
-export function returnMessageToComposer(
-  composerScopeKey: string,
-  /** Unique to this message, so its images never collide with ones already attached. */
-  attachmentIdPrefix: string,
-  blocks: AgentJournalMessageItem['blocks']
-): void {
-  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: `${attachmentIdPrefix}-${index}`, path: block.path }]
-        : []
-    )
-  )
-}
-
-/**
- * Gives the sender back what its own Stop took out of the outbox before the host held it, into
- * an empty composer only: the host never had it, so the transcript cannot show it. Returns whether
- * they went in; a composer holding text or images keeps what is there, and the caller keeps the
- * entries. What the host withdrew stays in the transcript.
- */
-function restoreUnsentMessages(
-  composerScopeKey: string | undefined,
-  withdrawn: readonly StructuredAgentSessionOutboxEntry[]
-): boolean {
-  if (
-    !composerScopeKey ||
-    readNativeChatDraftCache(composerScopeKey) !== '' ||
-    readNativeChatAttachmentCache(composerScopeKey).length > 0
-  ) {
-    return false
-  }
-  for (const entry of withdrawn) {
-    returnMessageToComposer(
-      composerScopeKey,
-      `withdrawn-${entry.clientMessageId}`,
-      entry.body.blocks
-    )
-  }
-  return true
-}
-
-export function useStructuredAgentSessionWithdrawnRestore(
-  /** Absent where no composer shows this session; the caller then keeps the entries. */
-  composerScopeKey: string | undefined
-): {
-  /** Entries a Stop took out of the outbox here, before the host held them; false when the
-   *  composer could not take them. */
-  byStop: (entries: readonly StructuredAgentSessionOutboxEntry[]) => boolean
-} {
-  return useMemo(
-    () => ({ byStop: (entries) => restoreUnsentMessages(composerScopeKey, entries) }),
-    [composerScopeKey]
-  )
-}
diff --git a/src/renderer/src/components/native-chat/structured-child-records-switch.test.tsx b/src/renderer/src/components/native-chat/structured-child-records-switch.test.tsx
index dbc50b97d356..b262e2a9ecfb 100644
--- a/src/renderer/src/components/native-chat/structured-child-records-switch.test.tsx
+++ b/src/renderer/src/components/native-chat/structured-child-records-switch.test.tsx
@@ -76,7 +76,7 @@ vi.mock('@/components/sidebar/CacheTimer', () => ({
 
 import { StructuredAgentSessionStatusBridge } from './StructuredAgentSessionStatusBridge'
 import { NativeChatStructuredSessionStatus } from './NativeChatStructuredSessionStatus'
-import { structuredSessionBackgroundTasksView } from './structured-session-background-tasks-view'
+import { structuredSessionBackgroundTasksView } from '../../../../shared/structured-session-background-tasks-view'
 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'
diff --git a/src/renderer/src/components/native-chat/structured-session-takeover-report.test.tsx b/src/renderer/src/components/native-chat/structured-session-takeover-report.test.tsx
index e684899737d0..6a1ba6d6e29d 100644
--- a/src/renderer/src/components/native-chat/structured-session-takeover-report.test.tsx
+++ b/src/renderer/src/components/native-chat/structured-session-takeover-report.test.tsx
@@ -55,7 +55,6 @@ function send(structuredTransport: NativeChatStructuredComposerTransport): (text
       structuredTransport,
       isComposing: () => false,
       clearSkillOrigin: vi.fn(),
-      setHistory: vi.fn(),
       setDraft: vi.fn(),
       setCaret: vi.fn()
     })
diff --git a/src/renderer/src/components/native-chat/use-native-chat-composer-attachment-previews.test.tsx b/src/renderer/src/components/native-chat/use-native-chat-composer-attachment-previews.test.tsx
new file mode 100644
index 000000000000..03e6d4c6f862
--- /dev/null
+++ b/src/renderer/src/components/native-chat/use-native-chat-composer-attachment-previews.test.tsx
@@ -0,0 +1,124 @@
+// @vitest-environment happy-dom
+import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest'
+import { act, createElement, StrictMode } from 'react'
+import { createRoot, type Root } from 'react-dom/client'
+import { useNativeChatComposerAttachmentPreviews } from './use-native-chat-composer-attachment-previews'
+import type { NativeChatComposerImageAttachment } from './NativeChatComposerField'
+
+type PreviewApi = ReturnType<typeof useNativeChatComposerAttachmentPreviews>
+const roots = new Set<Root>()
+
+beforeEach(() => vi.stubGlobal('IS_REACT_ACT_ENVIRONMENT', true))
+
+async function mount(
+  settled: readonly NativeChatComposerImageAttachment[] = [],
+  pending: readonly NativeChatComposerImageAttachment[] = []
+) {
+  let latest: PreviewApi | null = null
+  function Probe(): null {
+    latest = useNativeChatComposerAttachmentPreviews(settled, pending)
+    return null
+  }
+  const container = document.createElement('div')
+  document.body.append(container)
+  const root = createRoot(container)
+  roots.add(root)
+  await act(async () => root.render(createElement(StrictMode, null, createElement(Probe))))
+  return {
+    api: (): PreviewApi => {
+      if (!latest) {
+        throw new Error('Preview owner did not mount')
+      }
+      return latest
+    },
+    unmount: () => {
+      act(() => root.unmount())
+      roots.delete(root)
+      container.remove()
+    }
+  }
+}
+
+afterEach(() => {
+  act(() => {
+    for (const root of roots) {
+      root.unmount()
+    }
+  })
+  roots.clear()
+  vi.restoreAllMocks()
+  vi.unstubAllGlobals()
+  document.body.replaceChildren()
+})
+
+describe('composer preview ownership', () => {
+  it('releases pending and settled local previews without changing their attachments', async () => {
+    const revoke = vi.spyOn(URL, 'revokeObjectURL')
+    const settled = [{ id: 'settled', path: '/workspace/image.png', connectionId: 'ssh' }]
+    const pending = [{ id: 'pending', path: '', pending: true }]
+    const owner = await mount(settled, pending)
+    act(() => {
+      owner.api().setPreview('settled', 'blob:settled')
+      owner.api().setPreview('pending', 'blob:pending')
+    })
+    expect(owner.api().previews.size).toBe(2)
+    expect(revoke).not.toHaveBeenCalled()
+    owner.unmount()
+    expect(revoke.mock.calls).toEqual([['blob:settled'], ['blob:pending']])
+    expect(settled).toEqual([{ id: 'settled', path: '/workspace/image.png', connectionId: 'ssh' }])
+    expect(pending).toEqual([{ id: 'pending', path: '', pending: true }])
+    const restored = await mount(settled, pending)
+    expect(restored.api().previews.size).toBe(0)
+    restored.unmount()
+    expect(revoke).toHaveBeenCalledTimes(2)
+  })
+
+  it('keeps simultaneous composers independent', async () => {
+    const revoke = vi.spyOn(URL, 'revokeObjectURL')
+    const pending = [{ id: 'pending', path: '', pending: true }]
+    const first = await mount([], pending)
+    const second = await mount([], pending)
+    act(() => {
+      first.api().setPreview('pending', 'blob:first')
+      second.api().setPreview('pending', 'blob:second')
+    })
+    first.unmount()
+    expect(revoke).toHaveBeenCalledExactlyOnceWith('blob:first')
+    expect(second.api().previews.get('pending')).toBe('blob:second')
+    second.unmount()
+    expect(revoke.mock.calls).toEqual([['blob:first'], ['blob:second']])
+  })
+
+  it('releases a preview arriving after its composer retired', async () => {
+    const revoke = vi.spyOn(URL, 'revokeObjectURL')
+    const owner = await mount()
+    const retiredApi = owner.api()
+    owner.unmount()
+    retiredApi.setPreview('late', 'blob:late')
+    expect(revoke).toHaveBeenCalledExactlyOnceWith('blob:late')
+    retiredApi.releasePreview('late')
+    expect(revoke).toHaveBeenCalledExactlyOnceWith('blob:late')
+  })
+
+  it('does not revoke data URLs or already released previews', async () => {
+    const revoke = vi.spyOn(URL, 'revokeObjectURL')
+    const pending = [
+      { id: 'removed', path: '', pending: true },
+      { id: 'cleared', path: '', pending: true },
+      { id: 'data', path: '', pending: true }
+    ]
+    const owner = await mount([], pending)
+    act(() => {
+      owner.api().setPreview('removed', 'blob:removed')
+      owner.api().setPreview('cleared', 'blob:cleared')
+      owner.api().setPreview('data', 'data:image/png;base64,AAAA')
+      owner.api().releasePreview('removed')
+      owner.api().releaseAllPreviews()
+    })
+    expect(revoke.mock.calls).toEqual([['blob:removed'], ['blob:cleared']])
+    owner.unmount()
+    expect(revoke).toHaveBeenCalledTimes(2)
+    owner.api().setPreview('data', 'data:image/png;base64,AAAA')
+    expect(revoke).toHaveBeenCalledTimes(2)
+  })
+})
diff --git a/src/renderer/src/components/native-chat/use-native-chat-composer-attachment-previews.ts b/src/renderer/src/components/native-chat/use-native-chat-composer-attachment-previews.ts
new file mode 100644
index 000000000000..ffc399f4e96a
--- /dev/null
+++ b/src/renderer/src/components/native-chat/use-native-chat-composer-attachment-previews.ts
@@ -0,0 +1,90 @@
+import { useCallback, useEffect, useRef, useState } from 'react'
+import type { NativeChatComposerImageAttachment } from './NativeChatComposerField'
+
+const NO_PREVIEWS: ReadonlyMap<string, string> = new Map()
+
+/** Object URLs minted from a clipboard blob leak until revoked; data URLs don't. */
+function releasePreviewUrl(previewUrl: string | undefined): void {
+  if (previewUrl?.startsWith('blob:')) {
+    URL.revokeObjectURL(previewUrl)
+  }
+}
+
+/** The clipboard previews a composer minted, by chip id: its own, since no store holds them. A
+ *  preview whose chip left both the draft and the pending chips (sent, or removed elsewhere) is
+ *  released. */
+export function useNativeChatComposerAttachmentPreviews(
+  settled: readonly NativeChatComposerImageAttachment[],
+  pending: readonly NativeChatComposerImageAttachment[]
+): {
+  previews: ReadonlyMap<string, string>
+  setPreview: (id: string, previewUrl: string | undefined) => void
+  releasePreview: (id: string) => void
+  releaseAllPreviews: () => void
+} {
+  const [previews, setPreviews] = useState<ReadonlyMap<string, string>>(NO_PREVIEWS)
+  // Read by callbacks between renders; only they change it, always together with the state.
+  const previewsRef = useRef(previews)
+  const mountedRef = useRef(true)
+  useEffect(() => {
+    mountedRef.current = true
+    return () => {
+      mountedRef.current = false
+      previewsRef.current.forEach(releasePreviewUrl)
+      previewsRef.current = NO_PREVIEWS
+    }
+  }, [])
+  const updatePreviews = useCallback((next: ReadonlyMap<string, string>) => {
+    previewsRef.current = next
+    setPreviews(next)
+  }, [])
+  useEffect(() => {
+    const current = previewsRef.current
+    const gone = [...current.keys()].filter(
+      (id) => !settled.some((image) => image.id === id) && !pending.some((chip) => chip.id === id)
+    )
+    if (gone.length === 0) {
+      return
+    }
+    const next = new Map(current)
+    for (const id of gone) {
+      releasePreviewUrl(next.get(id))
+      next.delete(id)
+    }
+    updatePreviews(next)
+  }, [pending, settled, updatePreviews])
+
+  const setPreview = useCallback(
+    (id: string, previewUrl: string | undefined) => {
+      if (!mountedRef.current) {
+        releasePreviewUrl(previewUrl)
+        return
+      }
+      if (previewUrl) {
+        updatePreviews(new Map(previewsRef.current).set(id, previewUrl))
+      }
+    },
+    [updatePreviews]
+  )
+
+  const releasePreview = useCallback(
+    (id: string) => {
+      const current = previewsRef.current
+      if (!current.has(id)) {
+        return
+      }
+      releasePreviewUrl(current.get(id))
+      const next = new Map(current)
+      next.delete(id)
+      updatePreviews(next)
+    },
+    [updatePreviews]
+  )
+
+  const releaseAllPreviews = useCallback(() => {
+    previewsRef.current.forEach(releasePreviewUrl)
+    updatePreviews(NO_PREVIEWS)
+  }, [updatePreviews])
+
+  return { previews, setPreview, releasePreview, releaseAllPreviews }
+}
diff --git a/src/renderer/src/components/native-chat/use-native-chat-composer-attachments.test.tsx b/src/renderer/src/components/native-chat/use-native-chat-composer-attachments.test.tsx
index ecb90b5d0568..5208dfe6e8ac 100644
--- a/src/renderer/src/components/native-chat/use-native-chat-composer-attachments.test.tsx
+++ b/src/renderer/src/components/native-chat/use-native-chat-composer-attachments.test.tsx
@@ -10,6 +10,8 @@ import {
 } from './use-native-chat-composer-attachments'
 import * as draftCache from './native-chat-draft-cache'
 import type { NativeChatResolvedTarget } from './native-chat-composer-target'
+import { nativeChatPendingAttachmentSnapshot } from './native-chat-pending-attachment-cache'
+import { readNativeChatDraftCache } from './native-chat-draft-cache'
 import { NATIVE_FILE_DROP_MAX_PATHS } from '../../../../shared/native-file-drop'
 
 vi.mock('@/i18n/i18n', () => ({
@@ -450,7 +452,122 @@ describe('useNativeChatComposerAttachments', () => {
     act(() => probe.root.unmount())
   })
 
-  it('excludes a pending chip from the scope cache while a settled chip persists', async () => {
+  it('tells a finishing upload that the user removed its chip', async () => {
+    const probe = await renderProbe('pty-1')
+    const begun: { removed?: string | null; kept?: string | null } = {}
+    act(() => {
+      begun.removed = probe.latest().pendingChips.begin(undefined, 'report.pdf')
+      begun.kept = probe.latest().pendingChips.begin(undefined, 'notes.md')
+    })
+    const { removed, kept } = begun
+    if (!removed || !kept) {
+      throw new Error('expected pending chips')
+    }
+    act(() => probe.latest().removeImageAttachment(removed))
+
+    const live: boolean[] = []
+    act(() => {
+      live.push(probe.latest().pendingChips.drop(removed), probe.latest().pendingChips.drop(kept))
+    })
+    expect(live).toEqual([false, true])
+    expect(probe.latest().imageAttachments).toEqual([])
+    act(() => probe.root.unmount())
+  })
+
+  it('keeps an upload that finishes while the composer is unmounted, for when it returns', async () => {
+    const probe = await renderProbe('pty-gone')
+    const chips = probe.latest().pendingChips
+    const begun: { image?: string | null; removed?: string | null } = {}
+    act(() => {
+      begun.image = chips.begin(undefined, 'shot.png')
+      begun.removed = chips.begin(undefined, 'old.png')
+    })
+    const { image, removed } = begun
+    if (!image || !removed) {
+      throw new Error('expected pending chips')
+    }
+    act(() => probe.latest().removeImageAttachment(removed))
+    // A prompt card took the composer's place while the files uploaded.
+    act(() => probe.root.unmount())
+
+    chips.resolve(image, '/srv/agent-session-attachments/u1/shot.png')
+    chips.resolve(removed, '/srv/agent-session-attachments/u2/old.png')
+    chips.attachReferences(['/srv/agent-session-attachments/u3/notes.pdf'])
+
+    expect(readNativeChatAttachmentCache('pty-gone')).toEqual([
+      { id: image, path: '/srv/agent-session-attachments/u1/shot.png' }
+    ])
+    expect(readNativeChatDraftCache('pty-gone')).toBe(
+      '@/srv/agent-session-attachments/u3/notes.pdf'
+    )
+    const back = await renderProbe('pty-gone')
+    expect(back.latest().imageAttachments).toMatchObject([
+      { path: '/srv/agent-session-attachments/u1/shot.png' }
+    ])
+    act(() => back.root.unmount())
+  })
+
+  it('shows a dropped file still uploading as pending to a composer that comes back, then settles it there', async () => {
+    const first = await renderProbe('pty-drop')
+    const chips = first.latest().pendingChips
+    let chipId: string | null = null
+    act(() => {
+      chipId = chips.begin(undefined, 'shot.png')
+    })
+    if (!chipId) {
+      throw new Error('expected a pending chip')
+    }
+    const id: string = chipId
+    act(() => first.root.unmount())
+
+    const back = await renderProbe('pty-drop')
+    expect(back.latest().imageAttachments).toMatchObject([
+      { id, pending: true, pendingName: 'shot.png' }
+    ])
+    act(() => chips.resolve(id, '/srv/agent-session-attachments/u5/shot.png'))
+    expect(back.latest().imageAttachments).toEqual([
+      { id, path: '/srv/agent-session-attachments/u5/shot.png' }
+    ])
+    act(() => back.root.unmount())
+  })
+
+  it('inserts a stored file at the caret while the composer is showing and not composing', async () => {
+    const probe = await renderProbe('pty-caret', true)
+    act(() =>
+      probe.latest().pendingChips.attachReferences(['/srv/agent-session-attachments/u6/a.pdf'])
+    )
+    expect(probe.draft()).toBe('@/srv/agent-session-attachments/u6/a.pdf ')
+    expect(readNativeChatDraftCache('pty-caret')).toBe('')
+    act(() => probe.root.unmount())
+  })
+
+  it('keeps a stored file whose reference is held for an input-method composition across a remount', async () => {
+    let composing = true
+    const probe = await renderProbe('pty-ime', true, { isComposing: () => composing })
+    const chips = probe.latest().pendingChips
+    let chipId: string | null = null
+    act(() => {
+      chipId = chips.begin(undefined, 'notes.pdf')
+    })
+    if (!chipId) {
+      throw new Error('expected a pending chip')
+    }
+    const id: string = chipId
+    // The upload finishes mid-composition: the reference waits for the composition to settle.
+    act(() => {
+      expect(chips.drop(id)).toBe(true)
+      chips.attachReferences(['/srv/agent-session-attachments/u4/notes.pdf'])
+    })
+    // A prompt card takes the composer's place before the composition settles.
+    act(() => probe.root.unmount())
+    composing = false
+
+    expect(readNativeChatDraftCache('pty-ime')).toContain(
+      '@/srv/agent-session-attachments/u4/notes.pdf'
+    )
+  })
+
+  it('keeps a pending chip in the pending cache, without its preview, and the settled one in the draft', async () => {
     const probe = await renderProbe('pty-1')
     let pendingId: string | null = null
     act(() => {
@@ -460,10 +577,14 @@ describe('useNativeChatComposerAttachments', () => {
       probe.latest().attachResolvedPaths(['/tmp/settled.png'])
     })
 
-    const cached = readNativeChatAttachmentCache('pty-1')
-    expect(cached.some((attachment) => attachment.id === pendingId)).toBe(false)
-    expect(cached).toMatchObject([{ path: '/tmp/settled.png' }])
-    expect(cached[0]?.previewUrl).toBeUndefined()
+    // A composer that comes back must still wait for the pending one, which no draft saves.
+    expect(nativeChatPendingAttachmentSnapshot('pty-1')).toEqual([
+      { id: pendingId, path: '', pending: true }
+    ])
+    expect(readNativeChatAttachmentCache('pty-1')).toMatchObject([{ path: '/tmp/settled.png' }])
+    expect(
+      probe.latest().imageAttachments.find((attachment) => attachment.id === pendingId)?.previewUrl
+    ).toBe('blob:preview-1')
     act(() => probe.root.unmount())
   })
 
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 caec3b8118f8..b360492493ff 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
@@ -1,17 +1,15 @@
 import type { NativeChatComposerInput } from './native-chat-composer-input'
-import { appendNativeChatAttachmentCache } from './native-chat-draft-cache'
 import {
   useCallback,
   useEffect,
   useMemo,
   useRef,
-  useState,
   useSyncExternalStore,
   type RefObject
 } from 'react'
-import { translate } from '@/i18n/i18n'
 import {
   nativeChatComposerTargetIsRemote,
+  nativeChatLocalAttachmentUnsupportedNotice,
   type NativeChatResolvedTarget
 } from './native-chat-composer-target'
 import type { NativeChatComposerImageAttachment } from './NativeChatComposerField'
@@ -24,6 +22,21 @@ import {
 import { useRestoredNativeChatComposerDraftImageCheck } from './native-chat-composer-draft-image-check'
 import type { NativeChatResolvedPathOptions } from './native-chat-resolved-path-ownership'
 import { useNativeChatResolvedPathAttachments } from './use-native-chat-resolved-path-attachments'
+import type { NativeChatPendingAttachmentChips } from './native-chat-session-attachment-drop'
+import {
+  addNativeChatPendingAttachment,
+  clearNativeChatPendingAttachments,
+  revealNativeChatPendingAttachment,
+  settleNativeChatPendingAttachment,
+  takeNativeChatPendingAttachment,
+  useNativeChatPendingAttachments
+} from './native-chat-pending-attachment-cache'
+import {
+  appendNativeChatAttachmentCache,
+  appendNativeChatDraftCache
+} from './native-chat-draft-cache'
+import { useNativeChatComposerAttachmentPreviews } from './use-native-chat-composer-attachment-previews'
+import { formatNativeChatFileReference } from '../../../../shared/agent-image-paste'
 
 export type UseNativeChatComposerAttachmentsArgs = {
   attachmentScopeKey: string
@@ -62,9 +75,15 @@ export function useNativeChatComposerAttachments({
   clearImageAttachments: () => void
   flushPendingAttachments: () => void
   removeImageAttachment: (id: string) => void
-  beginPendingImageAttachment: (previewUrl?: string) => string | null
+  beginPendingImageAttachment: (
+    previewUrl?: string,
+    pendingName?: string,
+    options?: { hidden?: true }
+  ) => string | null
   resolvePendingImageAttachment: (id: string, path: string, connectionId?: string | null) => void
-  dropPendingImageAttachment: (id: string) => void
+  revealPendingImageAttachment: (id: string, previewUrl?: string) => void
+  dropPendingImageAttachment: (id: string) => boolean
+  pendingChips: NativeChatPendingAttachmentChips
 } {
   const subscribe = useCallback(
     (listener: () => void) => subscribeToNativeChatComposerDraft(attachmentScopeKey, listener),
@@ -77,44 +96,35 @@ export function useNativeChatComposerAttachments({
   // Why: a restored paste shows only once main confirms it is still kept, so until the restore
   // check is done it waits like a chip still saving, instead of flashing before a placeholder.
   const restoring = useRestoredNativeChatComposerDraftImageCheck(attachmentScopeKey, subscribe)
-  // Chips still being written, and the clipboard previews this composer minted, are its own.
-  const [local, setLocal] = useState<LocalAttachments>(NO_LOCAL_ATTACHMENTS)
-  // Read by callbacks between renders; only they change it, always together with the state.
-  const localRef = useRef(local)
-  const updateLocal = useCallback((next: LocalAttachments) => {
-    localRef.current = next
-    setLocal(next)
-  }, [])
+  // Chips still on their way live outside the composer, so one a prompt card unmounted comes back
+  // still pending and settles into the draft whichever composer is showing.
+  const pending = useNativeChatPendingAttachments(attachmentScopeKey)
+  const { previews, setPreview, releasePreview, releaseAllPreviews } =
+    useNativeChatComposerAttachmentPreviews(settled, pending)
   const imageAttachments = useMemo(
     () => [
       ...settled.map((image) => {
-        const previewUrl = local.previews.get(image.id)
+        const previewUrl = previews.get(image.id)
         if (restoring && isKeptLocalPaste(image)) {
           return { ...image, pending: true }
         }
         return previewUrl ? { ...image, previewUrl } : image
       }),
-      ...local.pending
+      ...pending.map((chip) => {
+        const previewUrl = previews.get(chip.id)
+        return previewUrl ? { ...chip, previewUrl } : chip
+      })
     ],
-    [local, restoring, settled]
+    [pending, previews, restoring, settled]
   )
-  // A preview whose image left the draft (sent, or removed elsewhere) is released.
+  const imageAttachmentCounter = useRef(0)
+  const mountedRef = useRef(true)
   useEffect(() => {
-    const current = localRef.current
-    const gone = [...current.previews.keys()].filter(
-      (id) => !settled.some((image) => image.id === id)
-    )
-    if (gone.length === 0) {
-      return
-    }
-    const previews = new Map(current.previews)
-    for (const id of gone) {
-      releasePreviewUrl(previews.get(id))
-      previews.delete(id)
+    mountedRef.current = true
+    return () => {
+      mountedRef.current = false
     }
-    updateLocal({ ...current, previews })
-  }, [settled, updateLocal])
-  const imageAttachmentCounter = useRef(0)
+  }, [])
 
   const nextAttachmentId = useCallback((): string => {
     imageAttachmentCounter.current += 1
@@ -135,12 +145,7 @@ export function useNativeChatComposerAttachments({
   )
 
   const noteAttachmentTargetBlocked = useCallback(() => {
-    setNotice(
-      translate(
-        'components.native-chat.composer.localAttachmentUnsupported',
-        'Local attachments are not available for remote sessions.'
-      )
-    )
+    setNotice(nativeChatLocalAttachmentUnsupportedNotice())
   }, [setNotice])
 
   const appendImageAttachments = useCallback(
@@ -176,9 +181,10 @@ export function useNativeChatComposerAttachments({
   // Placeholder chip shown the instant a paste starts, so a clipboard image that
   // takes a beat to save (or upload over SSH) never reads as a dropped paste.
   const beginPendingImageAttachment = useCallback(
-    (previewUrl?: string): string | null => {
-      // Without image input the saved paste is attached by path once it lands, so no image chip.
-      if (disabledRef.current || !acceptsImages) {
+    (previewUrl?: string, pendingName?: string, options?: { hidden?: true }): string | null => {
+      // Without image input the saved paste is attached by path once it lands, so no image chip;
+      // a named upload chip is a file, not an image, and still shows.
+      if (disabledRef.current || (!acceptsImages && pendingName === undefined)) {
         return null
       }
       if (attachmentTargetBlocked()) {
@@ -186,83 +192,94 @@ export function useNativeChatComposerAttachments({
         return null
       }
       const id = nextAttachmentId()
-      const current = localRef.current
-      updateLocal({
-        ...current,
-        pending: [...current.pending, { id, path: '', previewUrl, pending: true }]
+      addNativeChatPendingAttachment(attachmentScopeKey, {
+        id,
+        path: '',
+        pending: true,
+        ...(pendingName ? { pendingName } : {}),
+        ...(options?.hidden ? { hidden: true } : {})
       })
+      setPreview(id, previewUrl)
       return id
     },
     [
       acceptsImages,
+      attachmentScopeKey,
       attachmentTargetBlocked,
       disabledRef,
       nextAttachmentId,
       noteAttachmentTargetBlocked,
-      updateLocal
+      setPreview
     ]
   )
 
-  /** Drops this composer's own copy of a chip; the store is not touched. */
-  const forgetLocalAttachment = useCallback(
-    (id: string, keepPreview = false): NativeChatComposerImageAttachment | undefined => {
-      const current = localRef.current
-      const pending = current.pending.find((attachment) => attachment.id === id)
-      const previewUrl = pending?.previewUrl ?? current.previews.get(id)
-      if (!pending && previewUrl === undefined) {
-        return undefined
-      }
-      const previews = new Map(current.previews)
-      previews.delete(id)
-      if (keepPreview && previewUrl) {
-        previews.set(id, previewUrl)
-      } else {
-        releasePreviewUrl(previewUrl)
-      }
-      updateLocal({
-        pending: current.pending.filter((attachment) => attachment.id !== id),
-        previews
-      })
-      return pending
+  const resolvePendingImageAttachment = useCallback(
+    (id: string, path: string, connectionId?: string | null) => {
+      settleNativeChatPendingAttachment(attachmentScopeKey, id, path, connectionId)
     },
-    [updateLocal]
+    [attachmentScopeKey]
   )
 
-  const resolvePendingImageAttachment = useCallback(
-    (id: string, path: string, connectionId?: string | null) => {
-      if (forgetLocalAttachment(id, true)) {
-        appendNativeChatAttachmentCache(
-          attachmentScopeKey,
-          [{ id, path, ...(connectionId ? { connectionId } : {}) }],
-          { fromUser: true }
-        )
-      }
+  const revealPendingImageAttachment = useCallback(
+    (id: string, previewUrl?: string) => {
+      setPreview(id, previewUrl)
+      revealNativeChatPendingAttachment(attachmentScopeKey, id)
     },
-    [attachmentScopeKey, forgetLocalAttachment]
+    [attachmentScopeKey, setPreview]
   )
 
   // A pending chip was never saved, so dropping one, even late from a replaced composer, leaves
-  // the store alone.
+  // the draft alone.
   const dropPendingImageAttachment = useCallback(
-    (id: string) => {
-      forgetLocalAttachment(id)
+    (id: string): boolean => {
+      releasePreview(id)
+      return takeNativeChatPendingAttachment(attachmentScopeKey, id) !== undefined
     },
-    [forgetLocalAttachment]
+    [attachmentScopeKey, releasePreview]
+  )
+
+  const pendingChips = useMemo(
+    (): NativeChatPendingAttachmentChips => ({
+      begin: beginPendingImageAttachment,
+      resolve: resolvePendingImageAttachment,
+      drop: dropPendingImageAttachment,
+      // At the caret, as every attach does; mid-composition or once the composer is gone, into the
+      // scope's draft, which keeps it until the composition settles or the composer comes back.
+      attachReferences: (paths) => {
+        if (mountedRef.current && !isComposing()) {
+          attachResolvedPaths(paths, null)
+          return
+        }
+        appendNativeChatDraftCache(
+          attachmentScopeKey,
+          paths.map(formatNativeChatFileReference).join(' ')
+        )
+      }
+    }),
+    [
+      attachResolvedPaths,
+      attachmentScopeKey,
+      beginPendingImageAttachment,
+      dropPendingImageAttachment,
+      isComposing,
+      resolvePendingImageAttachment
+    ]
   )
 
   return {
+    pendingChips,
     imageAttachments,
     attachResolvedPaths,
     clearImageAttachments: () => {
-      const current = localRef.current
-      current.pending.forEach((attachment) => releasePreviewUrl(attachment.previewUrl))
-      current.previews.forEach(releasePreviewUrl)
-      updateLocal(NO_LOCAL_ATTACHMENTS)
+      releaseAllPreviews()
+      clearNativeChatPendingAttachments(attachmentScopeKey)
       updateNativeChatComposerDraft(attachmentScopeKey, { images: [] }, 'immediate')
     },
     flushPendingAttachments,
     removeImageAttachment: (id) => {
-      if (forgetLocalAttachment(id)) {
+      releasePreview(id)
+      // A chip still on its way is removed before it settles, so its file never joins the message.
+      if (takeNativeChatPendingAttachment(attachmentScopeKey, id)) {
         return
       }
       const images = readNativeChatComposerDraft(attachmentScopeKey).images
@@ -274,24 +291,11 @@ export function useNativeChatComposerAttachments({
     },
     beginPendingImageAttachment,
     resolvePendingImageAttachment,
+    revealPendingImageAttachment,
     dropPendingImageAttachment
   }
 }
 
-type LocalAttachments = {
-  pending: NativeChatComposerImageAttachment[]
-  previews: ReadonlyMap<string, string>
-}
-
-const NO_LOCAL_ATTACHMENTS: LocalAttachments = { pending: [], previews: new Map() }
-
-/** Object URLs minted from a clipboard blob leak until revoked; data URLs don't. */
-function releasePreviewUrl(previewUrl: string | undefined): void {
-  if (previewUrl?.startsWith('blob:')) {
-    URL.revokeObjectURL(previewUrl)
-  }
-}
-
 export {
   readNativeChatAttachmentCache,
   appendNativeChatAttachmentCache,
diff --git a/src/renderer/src/components/native-chat/use-native-chat-composer-catalog.test.tsx b/src/renderer/src/components/native-chat/use-native-chat-composer-catalog.test.tsx
index 707a800f343a..1b89fb06bbed 100644
--- a/src/renderer/src/components/native-chat/use-native-chat-composer-catalog.test.tsx
+++ b/src/renderer/src/components/native-chat/use-native-chat-composer-catalog.test.tsx
@@ -3,7 +3,6 @@ import { renderHook } from '@testing-library/react'
 import { describe, expect, it, vi } from 'vitest'
 import { buildNativeChatPickerItems } from './native-chat-picker-items'
 import { useNativeChatComposerKeyDown } from './use-native-chat-composer-keydown'
-import { EMPTY_HISTORY } from './native-chat-composer-state'
 import { useNativeChatComposerCatalog } from './use-native-chat-composer-catalog'
 import type { NativeChatStructuredComposerTransport } from './native-chat-composer-types'
 import { getVerifiedNativeChatCommands } from '../../../../shared/native-chat-agent-profiles'
@@ -133,7 +132,6 @@ it('Enter completes a known pre-init skill while still dispatching a built-in co
         completeMention: vi.fn(),
         activeSuggestion,
         draft: '/',
-        history: EMPTY_HISTORY,
         isComposing: () => false,
         completePickerItem: complete,
         dispatchPickerCommand: dispatch,
@@ -142,8 +140,7 @@ it('Enter completes a known pre-init skill while still dispatching a built-in co
         send: vi.fn(),
         setActiveSuggestion: vi.fn(),
         setDraft: vi.fn(),
-        setCaret: vi.fn(),
-        setHistory: vi.fn()
+        setCaret: vi.fn()
       })
     },
     { initialProps: { activeSuggestion: 1 } }
diff --git a/src/renderer/src/components/native-chat/use-native-chat-composer-handle.ts b/src/renderer/src/components/native-chat/use-native-chat-composer-handle.ts
index fb7a704d6556..ca6d66cef9bc 100644
--- a/src/renderer/src/components/native-chat/use-native-chat-composer-handle.ts
+++ b/src/renderer/src/components/native-chat/use-native-chat-composer-handle.ts
@@ -16,16 +16,16 @@ export function useNativeChatComposerHandle(
   ref: ForwardedRef<NativeChatComposerHandle>,
   args: UseNativeChatComposerHandleArgs
 ): (event: ClipboardEventLike) => void {
-  const { textareaRef, draft, setDraft, setHistory, setActiveSuggestion, ...pasteArgs } = args
-  const { insertTypedText, insertPastedText, focus, contains } = useNativeChatTypedInsertion({
-    textareaRef,
-    caret: args.caret,
-    draft,
-    setDraft,
-    setCaret: args.setCaret,
-    setHistory,
-    setActiveSuggestion
-  })
+  const { textareaRef, draft, setDraft, setActiveSuggestion, ...pasteArgs } = args
+  const { insertTypedText, appendText, acceptsText, insertPastedText, focus, contains } =
+    useNativeChatTypedInsertion({
+      textareaRef,
+      caret: args.caret,
+      draft,
+      setDraft,
+      setCaret: args.setCaret,
+      setActiveSuggestion
+    })
 
   const { handlePaste: handlePasteEvent, pasteFromClipboard } = useNativeChatComposerPaste({
     ...pasteArgs,
@@ -34,8 +34,24 @@ export function useNativeChatComposerHandle(
 
   useImperativeHandle(
     ref,
-    () => ({ focus, insertTypedText, handlePasteEvent, pasteFromClipboard, contains }),
-    [focus, insertTypedText, handlePasteEvent, pasteFromClipboard, contains]
+    () => ({
+      focus,
+      insertTypedText,
+      acceptsText,
+      appendText,
+      handlePasteEvent,
+      pasteFromClipboard,
+      contains
+    }),
+    [
+      focus,
+      insertTypedText,
+      acceptsText,
+      appendText,
+      handlePasteEvent,
+      pasteFromClipboard,
+      contains
+    ]
   )
   return handlePasteEvent
 }
diff --git a/src/renderer/src/components/native-chat/use-native-chat-composer-image-input.test.tsx b/src/renderer/src/components/native-chat/use-native-chat-composer-image-input.test.tsx
index 661669ab6775..93e289e44625 100644
--- a/src/renderer/src/components/native-chat/use-native-chat-composer-image-input.test.tsx
+++ b/src/renderer/src/components/native-chat/use-native-chat-composer-image-input.test.tsx
@@ -93,4 +93,29 @@ describe('structured composer image input', () => {
     expect(result.pendingChip).toBeNull()
     expect(result.draft).toContain('/tmp/shot.png')
   })
+
+  it('still shows a named upload chip when the agent takes no images', async () => {
+    const container = document.createElement('div')
+    document.body.append(container)
+    let api: AttachmentApi | null = null
+    const root = createRoot(container)
+    await act(async () => {
+      root.render(
+        createElement(Probe, {
+          acceptsImages: false,
+          onReady: (next) => {
+            api = next
+          }
+        })
+      )
+    })
+    const latest = (): AttachmentApi => {
+      if (!api) {
+        throw new Error('Probe did not render')
+      }
+      return api
+    }
+    expect(latest().beginPendingImageAttachment(undefined, 'notes.txt')).not.toBeNull()
+    act(() => root.unmount())
+  })
 })
diff --git a/src/renderer/src/components/native-chat/use-native-chat-composer-keydown.steer.test.tsx b/src/renderer/src/components/native-chat/use-native-chat-composer-keydown.steer.test.tsx
index 0f15584e92c4..29ce20486af6 100644
--- a/src/renderer/src/components/native-chat/use-native-chat-composer-keydown.steer.test.tsx
+++ b/src/renderer/src/components/native-chat/use-native-chat-composer-keydown.steer.test.tsx
@@ -7,7 +7,6 @@
 
 import { renderHook } from '@testing-library/react'
 import { describe, expect, it, vi } from 'vitest'
-import { EMPTY_HISTORY } from './native-chat-composer-state'
 
 const platform = vi.hoisted(() => ({ isMac: true }))
 vi.mock('./native-chat-shortcut', () => ({
@@ -28,8 +27,7 @@ function setup(
     send: vi.fn(),
     setActiveSuggestion: vi.fn(),
     setDraft: vi.fn(),
-    setCaret: vi.fn(),
-    setHistory: vi.fn()
+    setCaret: vi.fn()
   }
   const hook = renderHook(() =>
     useNativeChatComposerKeyDown({
@@ -39,7 +37,6 @@ function setup(
       activeSuggestion: 0,
       draft: composer.draft ?? '',
       hasAttachments: composer.hasAttachments ?? false,
-      history: EMPTY_HISTORY,
       isComposing: () => false,
       ...(steerQueued ? { steerQueued } : {}),
       ...callbacks
diff --git a/src/renderer/src/components/native-chat/use-native-chat-composer-keydown.test.tsx b/src/renderer/src/components/native-chat/use-native-chat-composer-keydown.test.tsx
index 42a4be495e01..8c9f6aa1531b 100644
--- a/src/renderer/src/components/native-chat/use-native-chat-composer-keydown.test.tsx
+++ b/src/renderer/src/components/native-chat/use-native-chat-composer-keydown.test.tsx
@@ -1,15 +1,16 @@
 // @vitest-environment happy-dom
 
 import { cleanup, fireEvent, render, renderHook, screen } from '@testing-library/react'
-import type { KeyboardEventHandler } from 'react'
+import { useState, type KeyboardEventHandler } from 'react'
 import { describe, expect, it, vi } from 'vitest'
 import {
   applyPickerSuggestion,
   deriveComposerAutocomplete,
-  EMPTY_HISTORY,
   type ComposerAutocomplete
 } from './native-chat-composer-state'
 import { getNativeChatAgentProfile } from '../../../../shared/native-chat-agent-profiles'
+import { useNativeChatRecallPosition } from './use-native-chat-composer-recall'
+import type { NativeChatMessage } from '../../../../shared/native-chat-types'
 import { useNativeChatComposerKeyDown } from './use-native-chat-composer-keydown'
 
 const COMMAND = {
@@ -55,8 +56,7 @@ function setup(
     send: vi.fn(),
     setActiveSuggestion: vi.fn(),
     setDraft: vi.fn(),
-    setCaret: vi.fn(),
-    setHistory: vi.fn()
+    setCaret: vi.fn()
   }
   const hook = renderHook(() =>
     useNativeChatComposerKeyDown({
@@ -64,7 +64,6 @@ function setup(
       mentionFiles: { files, loading, failed: false },
       activeSuggestion,
       draft,
-      history: EMPTY_HISTORY,
       isComposing: () => composing,
       ...callbacks
     })
@@ -199,4 +198,123 @@ describe('useNativeChatComposerKeyDown', () => {
     expect(callbacks.dispatchPickerCommand).not.toHaveBeenCalled()
     expect(callbacks.send).not.toHaveBeenCalled()
   })
+
+  describe('prompt recall', () => {
+    const userMessage = (id: string, text: string): NativeChatMessage => ({
+      id,
+      role: 'user',
+      blocks: [{ type: 'text', text }],
+      timestamp: null,
+      source: 'transcript'
+    })
+
+    const onEveryEdge = (): boolean => true
+
+    function Composer({
+      prompts,
+      initialDraft = '',
+      hasAttachments,
+      isCaretOnVisualEdge = onEveryEdge
+    }: {
+      prompts: string[]
+      initialDraft?: string
+      hasAttachments?: boolean
+      isCaretOnVisualEdge?: (edge: 'start' | 'end') => boolean
+    }): React.JSX.Element {
+      const [draft, setDraft] = useState(initialDraft)
+      const [recallPosition, setRecallPosition] = useNativeChatRecallPosition(draft)
+      const onKeyDown = useNativeChatComposerKeyDown({
+        autocomplete: { mode: 'none' },
+        activeSuggestion: 0,
+        draft,
+        mentionFiles: { files: [], loading: false, failed: false },
+        completeMention: vi.fn(),
+        recall: {
+          source: { messages: prompts.map((text, index) => userMessage(String(index), text)) },
+          position: recallPosition,
+          setPosition: setRecallPosition,
+          isCaretOnVisualEdge,
+          show: vi.fn()
+        },
+        isComposing: () => false,
+        completePickerItem: vi.fn(),
+        dispatchPickerCommand: vi.fn(),
+        dismissPicker: vi.fn(),
+        interrupt: vi.fn(),
+        send: vi.fn(),
+        setActiveSuggestion: vi.fn(),
+        setDraft,
+        setCaret: vi.fn(),
+        ...(hasAttachments === undefined ? {} : { hasAttachments })
+      })
+      return (
+        <textarea
+          aria-label="composer"
+          value={draft}
+          onChange={(event) => setDraft(event.target.value)}
+          onKeyDown={onKeyDown}
+        />
+      )
+    }
+
+    function setup(props: Parameters<typeof Composer>[0]) {
+      const field = render(<Composer {...props} />).container.querySelector('textarea')!
+      return {
+        field,
+        // The draft after the press, and whether the handler claimed the key.
+        press: (key: string, init: KeyboardEventInit = {}) => {
+          const claimed = !fireEvent.keyDown(field, { key, ...init })
+          return { draft: field.value, claimed }
+        }
+      }
+    }
+
+    it('walks every prompt in the chat, back to the oldest and forward to an empty draft', () => {
+      const { press } = setup({ prompts: ['one', 'two', 'three'] })
+      expect(press('ArrowUp')).toEqual({ draft: 'three', claimed: true })
+      expect(press('ArrowUp').draft).toBe('two')
+      expect(press('ArrowUp').draft).toBe('one')
+      expect(press('ArrowUp')).toEqual({ draft: 'one', claimed: false })
+      expect(press('ArrowDown').draft).toBe('two')
+      expect(press('ArrowDown').draft).toBe('three')
+      expect(press('ArrowDown')).toEqual({ draft: '', claimed: true })
+      expect(press('ArrowDown')).toEqual({ draft: '', claimed: false })
+    })
+
+    it('leaves the arrows to the caret while a typed draft is live', () => {
+      const { press } = setup({ prompts: ['one'], initialDraft: 'typing' })
+      expect(press('ArrowUp')).toEqual({ draft: 'typing', claimed: false })
+    })
+
+    it('treats an edited recall as a typed draft', () => {
+      const { field, press } = setup({ prompts: ['one', 'two'] })
+      press('ArrowUp')
+      fireEvent.change(field, { target: { value: 'two, edited' } })
+      expect(press('ArrowUp')).toEqual({ draft: 'two, edited', claimed: false })
+      // Edited back to the recalled text, it is still a typed draft.
+      fireEvent.change(field, { target: { value: 'two' } })
+      expect(press('ArrowUp')).toEqual({ draft: 'two', claimed: false })
+    })
+
+    it('moves the caret inside a recalled prompt until it reaches the edge', () => {
+      const isCaretOnVisualEdge = vi.fn((edge: 'start' | 'end') => edge === 'end')
+      const { press } = setup({ prompts: ['one', 'two\nlines'], isCaretOnVisualEdge })
+      isCaretOnVisualEdge.mockReturnValueOnce(true)
+      press('ArrowUp')
+      expect(press('ArrowUp')).toEqual({ draft: 'two\nlines', claimed: false })
+      expect(press('ArrowDown')).toEqual({ draft: '', claimed: true })
+    })
+
+    it('does not recall on a modified arrow or into a composer holding attachments', () => {
+      const selecting = setup({ prompts: ['one', 'two'] })
+      selecting.press('ArrowUp')
+      expect(selecting.press('ArrowUp', { shiftKey: true })).toEqual({
+        draft: 'two',
+        claimed: false
+      })
+
+      const attached = setup({ prompts: ['one'], hasAttachments: true })
+      expect(attached.press('ArrowUp')).toEqual({ draft: '', claimed: false })
+    })
+  })
 })
diff --git a/src/renderer/src/components/native-chat/use-native-chat-composer-keydown.ts b/src/renderer/src/components/native-chat/use-native-chat-composer-keydown.ts
index 73128a54c8c9..f8f36964541f 100644
--- a/src/renderer/src/components/native-chat/use-native-chat-composer-keydown.ts
+++ b/src/renderer/src/components/native-chat/use-native-chat-composer-keydown.ts
@@ -1,13 +1,19 @@
-import { useCallback, type Dispatch, type KeyboardEventHandler, type SetStateAction } from 'react'
 import {
-  recallNext,
-  recallPrevious,
-  type ComposerAutocomplete,
-  type HistoryState,
-  type NativeChatPickerItem
-} from './native-chat-composer-state'
+  useCallback,
+  useRef,
+  type Dispatch,
+  type KeyboardEventHandler,
+  type SetStateAction
+} from 'react'
+import type { ComposerAutocomplete, NativeChatPickerItem } from './native-chat-composer-state'
 import { isMacPlatform } from './native-chat-shortcut'
 import type { NativeChatMentionFiles } from './use-native-chat-mention-files'
+import {
+  isNativeChatRecallActive,
+  nativeChatSentPrompts,
+  stepNativeChatPromptRecall,
+  type NativeChatComposerRecall
+} from './native-chat-sent-prompt-history'
 
 export type UseNativeChatComposerKeyDownArgs = {
   autocomplete: ComposerAutocomplete
@@ -17,7 +23,7 @@ export type UseNativeChatComposerKeyDownArgs = {
   draft: string
   /** Image chips count as composer content, like typed text. */
   hasAttachments?: boolean
-  history: HistoryState
+  recall?: NativeChatComposerRecall | undefined
   isComposing: () => boolean
   completePickerItem: (item: NativeChatPickerItem) => void
   dispatchPickerCommand: (item: Extract<NativeChatPickerItem, { kind: 'command' }>) => void
@@ -30,7 +36,6 @@ export type UseNativeChatComposerKeyDownArgs = {
   setActiveSuggestion: Dispatch<SetStateAction<number>>
   setDraft: Dispatch<SetStateAction<string>>
   setCaret: Dispatch<SetStateAction<number>>
-  setHistory: Dispatch<SetStateAction<HistoryState>>
 }
 
 export function useNativeChatComposerKeyDown({
@@ -40,7 +45,7 @@ export function useNativeChatComposerKeyDown({
   activeSuggestion,
   draft,
   hasAttachments = false,
-  history,
+  recall,
   isComposing,
   completePickerItem,
   dispatchPickerCommand,
@@ -50,9 +55,12 @@ export function useNativeChatComposerKeyDown({
   steerQueued,
   setActiveSuggestion,
   setDraft,
-  setCaret,
-  setHistory
+  setCaret
 }: UseNativeChatComposerKeyDownArgs): KeyboardEventHandler<HTMLElement> {
+  // Read through a ref: the transcript changes on every streamed frame.
+  const recallRef = useRef(recall)
+  // react-doctor-disable-next-line react-doctor/no-ref-current-in-render
+  recallRef.current = recall
   return useCallback(
     (event) => {
       if (isComposing() || event.nativeEvent.isComposing || event.keyCode === 229) {
@@ -129,24 +137,33 @@ export function useNativeChatComposerKeyDown({
         send()
         return
       }
-      if (event.key === 'ArrowUp' && (draft === '' || history.index !== null)) {
-        const recall = recallPrevious(history)
-        if (recall.draft !== null) {
-          event.preventDefault()
-          setHistory(recall.history)
-          setDraft(recall.draft)
-          setCaret(recall.draft.length)
-        }
+      const arrow = event.key === 'ArrowUp' || event.key === 'ArrowDown'
+      // A modified arrow selects or jumps; attachments make the composer non-empty.
+      const plain = !event.shiftKey && !event.altKey && !event.metaKey && !event.ctrlKey
+      const recall = recallRef.current
+      if (!arrow || !plain || hasAttachments || !recall) {
         return
       }
-      if (event.key === 'ArrowDown' && history.index !== null) {
-        const recall = recallNext(history)
-        if (recall.draft !== null) {
-          event.preventDefault()
-          setHistory(recall.history)
-          setDraft(recall.draft)
-          setCaret(recall.draft.length)
-        }
+      const recalling = isNativeChatRecallActive(recall.position, draft)
+      // Checked before the layout read and the prompt scan: a typed draft never recalls.
+      if (!recalling && (event.key === 'ArrowDown' || draft !== '')) {
+        return
+      }
+      if (!recall.isCaretOnVisualEdge(event.key === 'ArrowUp' ? 'start' : 'end')) {
+        return
+      }
+      const step = stepNativeChatPromptRecall({
+        direction: event.key === 'ArrowUp' ? 'back' : 'forward',
+        prompts: nativeChatSentPrompts(recall.source),
+        position: recall.position,
+        draft
+      })
+      if (step) {
+        event.preventDefault()
+        recall.setPosition(step.position)
+        setDraft(step.draft)
+        setCaret(step.draft.length)
+        recall.show(step.draft)
       }
     },
     [
@@ -158,7 +175,6 @@ export function useNativeChatComposerKeyDown({
       dispatchPickerCommand,
       draft,
       hasAttachments,
-      history,
       interrupt,
       isComposing,
       mentionFiles,
@@ -166,8 +182,7 @@ export function useNativeChatComposerKeyDown({
       steerQueued,
       setActiveSuggestion,
       setCaret,
-      setDraft,
-      setHistory
+      setDraft
     ]
   )
 }
diff --git a/src/renderer/src/components/native-chat/use-native-chat-composer-paste-session-attachments.test.tsx b/src/renderer/src/components/native-chat/use-native-chat-composer-paste-session-attachments.test.tsx
new file mode 100644
index 000000000000..421462ae1447
--- /dev/null
+++ b/src/renderer/src/components/native-chat/use-native-chat-composer-paste-session-attachments.test.tsx
@@ -0,0 +1,303 @@
+// @vitest-environment happy-dom
+// Pastes into a structured chat on a paired server land in that server's attachment store, on
+// every paste path; the server checks each stored path again when it admits the message.
+import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest'
+import { act, createElement } from 'react'
+import { createRoot, type Root } from 'react-dom/client'
+import type { NativeChatAttachmentOwner } from './native-chat-attachment-upload'
+
+const mocks = vi.hoisted(() => ({
+  saveClipboardImageAsTempFile: vi.fn(),
+  readClipboardText: vi.fn(),
+  readClipboardImageThumbnail: vi.fn(),
+  clipboardHasImage: vi.fn(),
+  readClipboardFilePaths: vi.fn(),
+  prepareNativeChatSessionAttachmentUpload: vi.fn()
+}))
+
+vi.mock('@/i18n/i18n', () => ({
+  translate: (_key: string, fallback: string) => fallback
+}))
+
+vi.mock('./native-chat-composer-target', () => ({
+  NATIVE_CHAT_CONTEXT_PASTE_MAX_BYTES: 1024
+}))
+
+vi.mock('./native-chat-attachment-upload', () => ({
+  nativeChatLocalAttachmentUnsupportedNotice: () =>
+    'Local attachments are not available for remote sessions.',
+  nativeChatWorktreeNotReadyNotice: () => 'Worktree not ready — try again in a moment.',
+  prepareNativeChatSessionAttachmentUpload: mocks.prepareNativeChatSessionAttachmentUpload
+}))
+
+vi.stubGlobal('window', {
+  api: {
+    ui: {
+      saveClipboardImageAsTempFile: mocks.saveClipboardImageAsTempFile,
+      readClipboardText: mocks.readClipboardText,
+      readClipboardImageThumbnail: mocks.readClipboardImageThumbnail,
+      clipboardHasImage: mocks.clipboardHasImage,
+      readClipboardFilePaths: mocks.readClipboardFilePaths
+    }
+  }
+})
+vi.stubGlobal('URL', {
+  createObjectURL: () => 'blob:clipboard-image',
+  revokeObjectURL: () => {}
+})
+
+import { useNativeChatComposerPaste } from './use-native-chat-composer-paste'
+
+type HookApi = ReturnType<typeof useNativeChatComposerPaste>
+type Chip = { id: string; path: string; pending: boolean; hidden?: true }
+
+const sessionOwner: NativeChatAttachmentOwner = {
+  kind: 'runtime-session',
+  environmentId: 'env-1',
+  pairingRevision: 7,
+  sessionId: 'session-1'
+}
+const storeArgs = {
+  runtimeEnvironmentId: 'env-1',
+  agentSessionAttachment: {
+    sessionId: 'session-1',
+    expectedEnvironmentPairingRevision: 7,
+    expectedEnvironmentRuntimeId: 'runtime-a'
+  }
+}
+const storedPath = '/srv/agent-session-attachments/u1/orca-paste-1.png'
+
+let root: Root | null = null
+
+async function renderPaste(args: {
+  attachResolvedPaths?: (...args: unknown[]) => void
+  insertTypedText?: (text: string) => boolean
+  setNotice?: (notice: string | null) => void
+}): Promise<{ api: () => HookApi; chips: Chip[]; begun: () => number; revealed: () => number }> {
+  const chips: Chip[] = []
+  let counter = 0
+  let revealed = 0
+  let api: HookApi | null = null
+  function Probe(): null {
+    api = useNativeChatComposerPaste({
+      targetKey: 'session-1',
+      agent: 'claude',
+      disabled: false,
+      caret: 0,
+      setCaret: () => {},
+      resolveAttachmentOwner: () => sessionOwner,
+      attachResolvedPaths: args.attachResolvedPaths ?? (() => {}),
+      beginPendingImageAttachment: (_preview, _name, options) => {
+        counter += 1
+        chips.push({
+          id: `chip-${counter}`,
+          path: '',
+          pending: true,
+          ...(options?.hidden ? { hidden: true } : {})
+        })
+        return `chip-${counter}`
+      },
+      revealPendingImageAttachment: (id) => {
+        const chip = chips.find((candidate) => candidate.id === id)
+        if (chip) {
+          delete chip.hidden
+          revealed += 1
+        }
+      },
+      resolvePendingImageAttachment: (id, path) => {
+        const chip = chips.find((candidate) => candidate.id === id)
+        if (chip) {
+          Object.assign(chip, { path, pending: false })
+        }
+      },
+      dropPendingImageAttachment: (id) => {
+        chips.splice(
+          chips.findIndex((candidate) => candidate.id === id),
+          1
+        )
+      },
+      insertTypedText: args.insertTypedText ?? (() => true),
+      setNotice: args.setNotice ?? (() => {})
+    })
+    return null
+  }
+  const container = document.createElement('div')
+  document.body.append(container)
+  root = createRoot(container)
+  await act(async () => root?.render(createElement(Probe)))
+  return {
+    api: () => {
+      if (!api) {
+        throw new Error('Probe did not render')
+      }
+      return api
+    },
+    chips,
+    begun: () => counter,
+    revealed: () => revealed
+  }
+}
+
+function imagePasteEvent(text = ''): ClipboardEvent {
+  const data = new DataTransfer()
+  data.items.add(new File(['image'], 'image.png', { type: 'image/png' }))
+  if (text) {
+    data.setData('text/plain', text)
+  }
+  return new ClipboardEvent('paste', { clipboardData: data, cancelable: true })
+}
+
+beforeEach(() => {
+  vi.resetAllMocks()
+  mocks.readClipboardText.mockResolvedValue('')
+  mocks.readClipboardImageThumbnail.mockResolvedValue(null)
+  mocks.clipboardHasImage.mockResolvedValue(false)
+  mocks.readClipboardFilePaths.mockResolvedValue([])
+  mocks.prepareNativeChatSessionAttachmentUpload.mockResolvedValue({
+    ok: true,
+    target: {
+      environmentId: 'env-1',
+      sessionId: 'session-1',
+      expectedEnvironmentPairingRevision: 7,
+      expectedEnvironmentRuntimeId: 'runtime-a'
+    }
+  })
+  mocks.saveClipboardImageAsTempFile.mockResolvedValue(storedPath)
+})
+
+afterEach(() => {
+  root?.unmount()
+  root = null
+})
+
+describe('pasting into a structured chat on a paired server', () => {
+  it('saves a pasted image into the chat store and settles the chip with its server path', async () => {
+    const probe = await renderPaste({})
+    await act(async () => probe.api().handlePaste(imagePasteEvent()))
+    expect(mocks.saveClipboardImageAsTempFile).toHaveBeenCalledExactlyOnceWith(storeArgs)
+    expect(probe.chips).toEqual([{ id: 'chip-1', path: storedPath, pending: false }])
+  })
+
+  it('keeps the image of a paste that also carries text, its chip shown once the server takes it', async () => {
+    const insertTypedText = vi.fn(() => true)
+    const probe = await renderPaste({ insertTypedText })
+    await act(async () => probe.api().handlePaste(imagePasteEvent('caption')))
+    expect(insertTypedText).toHaveBeenCalledWith('caption')
+    expect(mocks.saveClipboardImageAsTempFile).toHaveBeenCalledExactlyOnceWith(storeArgs)
+    expect(probe.chips).toMatchObject([{ path: storedPath, pending: false }])
+  })
+
+  it('pastes from the button into the chat store', async () => {
+    mocks.readClipboardImageThumbnail.mockResolvedValue({ dataUrl: 'data:image/png;base64,AA' })
+    const probe = await renderPaste({})
+    await act(async () => probe.api().pasteFromClipboard())
+    expect(mocks.saveClipboardImageAsTempFile).toHaveBeenCalledExactlyOnceWith(storeArgs)
+    expect(probe.chips).toEqual([{ id: 'chip-1', path: storedPath, pending: false }])
+  })
+
+  it('attaches the server path when no placeholder chip was shown', async () => {
+    const attachResolvedPaths = vi.fn()
+    const probe = await renderPaste({ attachResolvedPaths })
+    await act(async () => probe.api().pasteFromClipboard())
+    expect(attachResolvedPaths).toHaveBeenCalledExactlyOnceWith([storedPath], null)
+  })
+
+  it('refuses on a server without the attachment store and saves nothing', async () => {
+    mocks.prepareNativeChatSessionAttachmentUpload.mockResolvedValue({
+      ok: false,
+      notice: 'needs newer server'
+    })
+    const setNotice = vi.fn()
+    const probe = await renderPaste({ setNotice })
+    await act(async () => probe.api().handlePaste(imagePasteEvent()))
+    expect(mocks.saveClipboardImageAsTempFile).not.toHaveBeenCalled()
+    expect(setNotice).toHaveBeenLastCalledWith('needs newer server')
+    expect(probe.chips).toHaveLength(0)
+  })
+
+  it('keeps the save error apart from the image-paste notice', async () => {
+    mocks.saveClipboardImageAsTempFile.mockRejectedValue(
+      new Error("Error invoking remote method 'ui:saveClipboardImageAsTempFile': Error: disk full")
+    )
+    const setNotice = vi.fn()
+    const probe = await renderPaste({ setNotice })
+    await act(async () => probe.api().handlePaste(imagePasteEvent()))
+    expect(setNotice).toHaveBeenLastCalledWith('Image paste failed.', 'disk full')
+  })
+
+  it('pastes rich text into a chat on an older server without a refusal beside the text', async () => {
+    mocks.prepareNativeChatSessionAttachmentUpload.mockResolvedValue({
+      ok: false,
+      notice: 'needs newer server'
+    })
+    const insertTypedText = vi.fn(() => true)
+    const setNotice = vi.fn()
+    const probe = await renderPaste({ insertTypedText, setNotice })
+    await act(async () => probe.api().handlePaste(imagePasteEvent('caption')))
+    expect(insertTypedText).toHaveBeenCalledWith('caption')
+    expect(setNotice).not.toHaveBeenCalledWith('needs newer server')
+    // The image was owed to the message only out of sight: no chip showed, so none flashed.
+    expect(probe.begun()).toBe(1)
+    expect(probe.revealed()).toBe(0)
+    expect(probe.chips).toEqual([])
+  })
+
+  it('pastes rich text from the button into a chat on an older server without a refusal', async () => {
+    mocks.prepareNativeChatSessionAttachmentUpload.mockResolvedValue({
+      ok: false,
+      notice: 'needs newer server'
+    })
+    mocks.readClipboardText.mockResolvedValue('caption')
+    const insertTypedText = vi.fn(() => true)
+    const setNotice = vi.fn()
+    const probe = await renderPaste({ insertTypedText, setNotice })
+    await act(async () => probe.api().pasteFromClipboard())
+    expect(insertTypedText).toHaveBeenCalledWith('caption')
+    expect(setNotice).not.toHaveBeenCalledWith('needs newer server')
+  })
+
+  it('files a paste whose upload lands after a prompt card unmounted the composer', async () => {
+    let finishUpload: (path: string) => void = () => {}
+    mocks.saveClipboardImageAsTempFile.mockReturnValue(
+      new Promise<string>((resolve) => {
+        finishUpload = resolve
+      })
+    )
+    const resolved: string[] = []
+    const dropped: string[] = []
+    let api: HookApi | null = null
+    function Probe(): null {
+      api = useNativeChatComposerPaste({
+        targetKey: 'session-1',
+        agent: 'claude',
+        disabled: false,
+        caret: 0,
+        setCaret: () => {},
+        resolveAttachmentOwner: () => sessionOwner,
+        attachResolvedPaths: () => {},
+        beginPendingImageAttachment: () => 'chip-1',
+        // The composer's chips file a result that lands after it unmounted into its scope cache.
+        resolvePendingImageAttachment: (id, path) => resolved.push(`${id} ${path}`),
+        dropPendingImageAttachment: (id) => {
+          dropped.push(id)
+        },
+        insertTypedText: () => true,
+        setNotice: () => {}
+      })
+      return null
+    }
+    const container = document.createElement('div')
+    document.body.append(container)
+    root = createRoot(container)
+    await act(async () => root?.render(createElement(Probe)))
+    await act(async () => api?.handlePaste(imagePasteEvent()))
+    expect(mocks.saveClipboardImageAsTempFile).toHaveBeenCalledTimes(1)
+
+    act(() => root?.unmount())
+    root = null
+    await act(async () => finishUpload(storedPath))
+
+    expect(dropped).toEqual([])
+    expect(resolved).toEqual([`chip-1 ${storedPath}`])
+  })
+})
diff --git a/src/renderer/src/components/native-chat/use-native-chat-composer-paste.ts b/src/renderer/src/components/native-chat/use-native-chat-composer-paste.ts
index 636ba4017f85..1701c069b342 100644
--- a/src/renderer/src/components/native-chat/use-native-chat-composer-paste.ts
+++ b/src/renderer/src/components/native-chat/use-native-chat-composer-paste.ts
@@ -1,7 +1,7 @@
-import { useCallback, useLayoutEffect, useMemo, useRef } from 'react'
+import { useCallback, useLayoutEffect, useRef } from 'react'
+import { useNativeChatPasteLifetime } from './use-native-chat-paste-lifetime'
 import { nativeChatAttachmentOwnerUnchanged } from './native-chat-resolved-path-ownership'
 import { assertClipboardTextWithinLimit } from '../../../../shared/clipboard-text'
-import { translate } from '@/i18n/i18n'
 import { setNativeChatPasteFailure } from './native-chat-composer-notice'
 import type { AgentType } from '../../../../shared/agent-status-types'
 import { NATIVE_CHAT_CONTEXT_PASTE_MAX_BYTES } from './native-chat-composer-target'
@@ -17,6 +17,10 @@ import {
   nativeChatWorktreeNotReadyNotice,
   type NativeChatAttachmentOwner
 } from './native-chat-attachment-upload'
+import {
+  ownerAcceptsClipboardImage,
+  saveNativeChatClipboardImage
+} from './native-chat-clipboard-image-save'
 
 export type UseNativeChatComposerPasteArgs = {
   targetKey?: string
@@ -29,21 +33,20 @@ export type UseNativeChatComposerPasteArgs = {
    *  remote host, or the attached path names a file the agent cannot read. */
   resolveAttachmentOwner: () => NativeChatAttachmentOwner
   attachResolvedPaths: (paths: string[], connectionId?: string | null) => void
-  beginPendingImageAttachment: (previewUrl?: string) => string | null
+  beginPendingImageAttachment: (
+    previewUrl?: string,
+    pendingName?: string,
+    options?: { hidden?: true }
+  ) => string | null
   resolvePendingImageAttachment: (id: string, path: string, connectionId?: string | null) => void
+  /** Shows a chip begun hidden, with its thumbnail. */
+  revealPendingImageAttachment?: (id: string, previewUrl?: string) => void
   dropPendingImageAttachment: (id: string) => void
   insertTypedText: (text: string) => boolean
   setCaret: (caret: number) => void
   setNotice: (notice: string | null, errorText?: string) => void
 }
 
-/** Owners whose attachment path is a file this client can write right now. */
-function ownerAcceptsClipboardImage(
-  owner: NativeChatAttachmentOwner
-): owner is Extract<NativeChatAttachmentOwner, { kind: 'local' | 'ssh' }> {
-  return owner.kind === 'local' || owner.kind === 'ssh'
-}
-
 export function useNativeChatComposerPaste({
   targetKey,
   disabled,
@@ -52,6 +55,7 @@ export function useNativeChatComposerPaste({
   attachResolvedPaths,
   beginPendingImageAttachment,
   resolvePendingImageAttachment,
+  revealPendingImageAttachment,
   dropPendingImageAttachment,
   insertTypedText,
   setCaret,
@@ -61,28 +65,17 @@ export function useNativeChatComposerPaste({
   pasteFromClipboard: () => void
 } {
   const disabledRef = useRef(disabled)
-  const dropPendingRef = useRef(dropPendingImageAttachment)
   useLayoutEffect(() => {
     disabledRef.current = disabled
-    dropPendingRef.current = dropPendingImageAttachment
-  }, [disabled, dropPendingImageAttachment])
-  const lifetime = useMemo(
-    () => ({ targetKey, active: false, pending: new Map<string, string>() }),
-    [targetKey]
-  )
-  useLayoutEffect(() => {
-    lifetime.active = true
-    return () => {
-      lifetime.active = false
-      for (const [id, preview] of lifetime.pending) {
-        if (preview.startsWith('blob:')) {
-          URL.revokeObjectURL(preview)
-        }
-        dropPendingRef.current(id)
-      }
-      lifetime.pending.clear()
-    }
-  }, [lifetime])
+  }, [disabled])
+  const { lifetime, track, startImageChip, keepStoreUploadAfterUnmount } =
+    useNativeChatPasteLifetime({
+      targetKey,
+      beginPendingImageAttachment,
+      resolvePendingImageAttachment,
+      revealPendingImageAttachment,
+      dropPendingImageAttachment
+    })
   const canPaste = useCallback(() => lifetime.active && !disabledRef.current, [lifetime])
   // A disabled composer still answers a paste, so it never vanishes silently.
   const showPasteUnavailable = useCallback(() => {
@@ -91,35 +84,31 @@ export function useNativeChatComposerPaste({
     }
   }, [lifetime, setNotice])
 
-  // Image failures do not decide whether text can be inserted.
+  // Image failures do not decide whether text can be inserted. Beside pasted text, a server too old
+  // to store the image drops only the image rendition, as an owner that takes no images does.
   const saveClipboardImageForOwner = useCallback(
-    async (
-      owner: NativeChatAttachmentOwner
-    ): Promise<{ status: 'saved'; tempPath: string } | { status: 'empty' | 'failed' }> => {
-      if (owner.kind === 'runtime') {
-        setNotice(nativeChatLocalAttachmentUnsupportedNotice())
-        return { status: 'failed' }
-      }
-      try {
-        // SSH panes save the image on the remote host (SFTP) so the attached
-        // path is readable by the remote agent, matching terminal image paste.
-        const tempPath = await window.api.ui.saveClipboardImageAsTempFile(
-          owner.kind === 'ssh' ? { connectionId: owner.connectionId } : { forNativeChatDraft: true }
-        )
-        return tempPath ? { status: 'saved', tempPath } : { status: 'empty' }
-      } catch (error) {
-        // A failed save must be visible: over SSH it fails whenever the
-        // connection drops, and a silent no-op reads as a broken paste.
-        if (canPaste()) {
-          setNativeChatPasteFailure(
-            setNotice,
-            error,
-            translate('components.native-chat.composer.imagePasteFailed', 'Image paste failed.')
+    (
+      owner: NativeChatAttachmentOwner,
+      besidePastedText: () => Promise<boolean>,
+      ready?: () => void
+    ) =>
+      saveNativeChatClipboardImage(owner, {
+        ready,
+        setNotice: (notice, cause, errorText) => {
+          void (cause === 'serverTooOld' ? besidePastedText() : Promise.resolve(false)).then(
+            (quiet) => {
+              if (quiet || !canPaste()) {
+                return
+              }
+              if (errorText) {
+                setNotice(notice, errorText)
+              } else {
+                setNotice(notice)
+              }
+            }
           )
         }
-        return { status: 'failed' }
-      }
-    },
+      }),
     [canPaste, setNotice]
   )
 
@@ -196,20 +185,23 @@ export function useNativeChatComposerPaste({
       // Why: snapshot the caret before the async temp-file round-trip — `caret`
       // state can move (further typing/selection) while the await is in flight.
       const caretAtPaste = caret
-      // The clipboard blob is already in this process, so the chip can show the
-      // real image on the same tick the paste happens — no round-trip at all.
-      const previewUrl = ownerAcceptsClipboardImage(owner)
-        ? URL.createObjectURL(imageFile)
-        : undefined
-      const pendingId = previewUrl ? beginPendingImageAttachment(previewUrl) : null
-      if (previewUrl && !pendingId) {
-        URL.revokeObjectURL(previewUrl)
-      }
-      if (pendingId) {
-        lifetime.pending.set(pendingId, previewUrl ?? '')
-      }
+      // Beside pasted text, a server too old to store the image drops it quietly, so its chip stays
+      // out of sight until the server answers; Send waits for it from the start all the same.
+      const awaitServer = Boolean(text) && owner.kind === 'runtime-session'
+      const chip = startImageChip(owner, imageFile, {
+        hidden: awaitServer,
+        canShow: () => ownerAcceptsClipboardImage(owner) && canPaste()
+      })
+      const pendingId = chip.id
       void (async () => {
-        const saved = await saveClipboardImageForOwner(owner)
+        const saved = await saveClipboardImageForOwner(
+          owner,
+          async () => Boolean(text),
+          awaitServer ? chip.reveal : undefined
+        )
+        if (keepStoreUploadAfterUnmount(pendingId, saved)) {
+          return
+        }
         if (saved.status !== 'saved' || !canPaste()) {
           if (pendingId) {
             lifetime.pending.delete(pendingId)
@@ -224,7 +216,6 @@ export function useNativeChatComposerPaste({
       })()
     },
     [
-      beginPendingImageAttachment,
       canPaste,
       lifetime,
       caret,
@@ -232,6 +223,8 @@ export function useNativeChatComposerPaste({
       insertTypedText,
       showPasteUnavailable,
       resolveAttachmentOwner,
+      keepStoreUploadAfterUnmount,
+      startImageChip,
       saveClipboardImageForOwner,
       setCaret,
       setNotice,
@@ -286,14 +279,20 @@ export function useNativeChatComposerPaste({
         return
       }
       const thumbnailPromise = window.api.ui.readClipboardImageThumbnail().catch(() => null)
-      const savePromise = saveClipboardImageForOwner(owner)
+      const savePromise = saveClipboardImageForOwner(owner, async () => {
+        const read = await textRead
+        return Boolean(read?.text) && read?.labelsFiles !== true
+      })
       const thumbnail = await thumbnailPromise
       const pendingId =
         thumbnail && canPaste() ? beginPendingImageAttachment(thumbnail.dataUrl) : null
       if (pendingId) {
-        lifetime.pending.set(pendingId, thumbnail?.dataUrl ?? '')
+        track(pendingId, thumbnail?.dataUrl ?? '', owner)
       }
       const saved = await savePromise
+      if (keepStoreUploadAfterUnmount(pendingId, saved)) {
+        return
+      }
       if (!canPaste() || saved.status !== 'saved') {
         if (pendingId) {
           lifetime.pending.delete(pendingId)
@@ -314,6 +313,8 @@ export function useNativeChatComposerPaste({
     lifetime,
     dropPendingImageAttachment,
     insertTypedText,
+    keepStoreUploadAfterUnmount,
+    track,
     showPasteUnavailable,
     resolveAttachmentOwner,
     saveClipboardImageForOwner,
diff --git a/src/renderer/src/components/native-chat/use-native-chat-composer-preview-lifetime.test.tsx b/src/renderer/src/components/native-chat/use-native-chat-composer-preview-lifetime.test.tsx
new file mode 100644
index 000000000000..bc8c919c5887
--- /dev/null
+++ b/src/renderer/src/components/native-chat/use-native-chat-composer-preview-lifetime.test.tsx
@@ -0,0 +1,143 @@
+// @vitest-environment happy-dom
+import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest'
+import { act, createElement, StrictMode, useRef } from 'react'
+import { createRoot, type Root } from 'react-dom/client'
+import {
+  clearNativeChatAttachmentCacheForTests,
+  readNativeChatAttachmentCache,
+  useNativeChatComposerAttachments
+} from './use-native-chat-composer-attachments'
+
+vi.mock('@/i18n/i18n', () => ({
+  translate: (_key: string, fallback: string) => fallback
+}))
+
+type AttachmentApi = ReturnType<typeof useNativeChatComposerAttachments>
+const roots = new Set<Root>()
+
+beforeEach(() => vi.stubGlobal('IS_REACT_ACT_ENVIRONMENT', true))
+
+async function mount(scopeKey: string) {
+  let latest: AttachmentApi | null = null
+  function Probe(): null {
+    const textareaRef = useRef<HTMLTextAreaElement>(null)
+    latest = useNativeChatComposerAttachments({
+      attachmentScopeKey: scopeKey,
+      allowWithoutTarget: true,
+      caret: 0,
+      disabled: false,
+      isComposing: () => false,
+      resolveTarget: () => null,
+      textareaRef,
+      setCaret: () => {},
+      setDraft: () => {},
+      setNotice: () => {}
+    })
+    return null
+  }
+  const container = document.createElement('div')
+  document.body.append(container)
+  const root = createRoot(container)
+  roots.add(root)
+  await act(async () => root.render(createElement(StrictMode, null, createElement(Probe))))
+  return {
+    api: (): AttachmentApi => {
+      if (!latest) {
+        throw new Error('Composer did not mount')
+      }
+      return latest
+    },
+    unmount: () => {
+      act(() => root.unmount())
+      roots.delete(root)
+      container.remove()
+    }
+  }
+}
+
+function begin(api: AttachmentApi, previewUrl: string): string {
+  const id = api.beginPendingImageAttachment(previewUrl)
+  if (!id) {
+    throw new Error('Attachment was refused')
+  }
+  return id
+}
+
+afterEach(() => {
+  act(() => {
+    for (const root of roots) {
+      root.unmount()
+    }
+  })
+  roots.clear()
+  clearNativeChatAttachmentCacheForTests()
+  vi.restoreAllMocks()
+  vi.unstubAllGlobals()
+  document.body.replaceChildren()
+})
+
+describe('composer preview lifetime', () => {
+  it.each([null, 'ssh-connection'])(
+    'releases settled previews while retaining saved paths (%s)',
+    async (connectionId) => {
+      const revoke = vi.spyOn(URL, 'revokeObjectURL')
+      const first = await mount('preview-scope')
+      act(() => {
+        const id = begin(first.api(), 'blob:clipboard-preview')
+        first.api().resolvePendingImageAttachment(id, '/workspace/image.png', connectionId)
+      })
+      expect(first.api().imageAttachments).toMatchObject([
+        { path: '/workspace/image.png', previewUrl: 'blob:clipboard-preview' }
+      ])
+      expect(revoke).not.toHaveBeenCalled()
+      const saved = readNativeChatAttachmentCache('preview-scope')
+
+      first.unmount()
+      expect(revoke).toHaveBeenCalledExactlyOnceWith('blob:clipboard-preview')
+      expect(readNativeChatAttachmentCache('preview-scope')).toEqual(saved)
+      const restored = await mount('preview-scope')
+      expect(restored.api().imageAttachments).toEqual(saved)
+      expect(saved[0]?.connectionId).toBe(connectionId ?? undefined)
+      restored.unmount()
+      expect(revoke).toHaveBeenCalledTimes(1)
+    }
+  )
+
+  it('releases pending previews without turning them into saved attachments', async () => {
+    const revoke = vi.spyOn(URL, 'revokeObjectURL')
+    const composer = await mount('pending-scope')
+    act(() => begin(composer.api(), 'blob:pending-preview'))
+    composer.unmount()
+    expect(revoke).toHaveBeenCalledExactlyOnceWith('blob:pending-preview')
+    expect(readNativeChatAttachmentCache('pending-scope')).toEqual([])
+  })
+
+  it('does not revoke data previews or saved paths', async () => {
+    const revoke = vi.spyOn(URL, 'revokeObjectURL')
+    const composer = await mount('data-scope')
+    act(() => {
+      const id = begin(composer.api(), 'data:image/png;base64,AAAA')
+      composer.api().resolvePendingImageAttachment(id, '/workspace/image.png')
+    })
+    composer.unmount()
+    expect(revoke).not.toHaveBeenCalled()
+    expect(readNativeChatAttachmentCache('data-scope')).toMatchObject([
+      { path: '/workspace/image.png' }
+    ])
+  })
+
+  it('does not retain previews that were already removed or cleared', async () => {
+    const revoke = vi.spyOn(URL, 'revokeObjectURL')
+    const composer = await mount('cleared-scope')
+    act(() => {
+      const id = begin(composer.api(), 'blob:removed')
+      composer.api().dropPendingImageAttachment(id)
+      const keptId = begin(composer.api(), 'blob:cleared')
+      composer.api().resolvePendingImageAttachment(keptId, '/workspace/image.png')
+    })
+    act(() => composer.api().clearImageAttachments())
+    expect(revoke).toHaveBeenCalledTimes(2)
+    composer.unmount()
+    expect(revoke).toHaveBeenCalledTimes(2)
+  })
+})
diff --git a/src/renderer/src/components/native-chat/use-native-chat-composer-recall.test.tsx b/src/renderer/src/components/native-chat/use-native-chat-composer-recall.test.tsx
new file mode 100644
index 000000000000..06376a5af068
--- /dev/null
+++ b/src/renderer/src/components/native-chat/use-native-chat-composer-recall.test.tsx
@@ -0,0 +1,25 @@
+// @vitest-environment happy-dom
+import { act, renderHook } from '@testing-library/react'
+import { describe, expect, it } from 'vitest'
+import { useNativeChatRecallPosition } from './use-native-chat-composer-recall'
+
+describe('useNativeChatRecallPosition', () => {
+  it('ends recall once the composer stops holding the recalled prompt', () => {
+    const { result, rerender } = renderHook(({ draft }) => useNativeChatRecallPosition(draft), {
+      initialProps: { draft: '' }
+    })
+    const recalled = { id: 'sent-1', recalled: 'fix it' }
+
+    // The position can commit a render ahead of its draft; that is not a mismatch.
+    act(() => result.current[1](recalled))
+    expect(result.current[0]).toBe(recalled)
+    rerender({ draft: 'fix it' })
+    expect(result.current[0]).toBe(recalled)
+
+    // Sent: the composer empties, so the same text arriving later is not a recall.
+    rerender({ draft: '' })
+    expect(result.current[0]).toBeNull()
+    rerender({ draft: 'fix it' })
+    expect(result.current[0]).toBeNull()
+  })
+})
diff --git a/src/renderer/src/components/native-chat/use-native-chat-composer-recall.ts b/src/renderer/src/components/native-chat/use-native-chat-composer-recall.ts
new file mode 100644
index 000000000000..7423553cf0ca
--- /dev/null
+++ b/src/renderer/src/components/native-chat/use-native-chat-composer-recall.ts
@@ -0,0 +1,59 @@
+import { useState, type RefObject } from 'react'
+import type { NativeChatComposerInput } from './native-chat-composer-input'
+import {
+  isNativeChatRecallActive,
+  type NativeChatComposerRecall,
+  type NativeChatRecallPosition,
+  type NativeChatRecallSource
+} from './native-chat-sent-prompt-history'
+
+/**
+ * Where prompt recall stands. Ends itself once the composer stops holding the recalled
+ * text, whoever changed it: an edit, a send, a returned message, another window's draft.
+ */
+export function useNativeChatRecallPosition(
+  draft: string
+): [NativeChatRecallPosition | null, (position: NativeChatRecallPosition | null) => void] {
+  const [position, setPosition] = useState<NativeChatRecallPosition | null>(null)
+  // Why: the position and its draft come from different stores and may not render together,
+  // so only a position already seen in the composer can be ended by a mismatch.
+  const [shown, setShown] = useState<NativeChatRecallPosition | null>(null)
+  if (position !== null) {
+    if (position.recalled === draft) {
+      if (shown !== position) {
+        setShown(position)
+      }
+    } else if (shown === position) {
+      setPosition(null)
+      return [null, setPosition]
+    }
+  }
+  return [position, setPosition]
+}
+
+/** Prompt recall for one composer: what its keydown walks, and whether the draft is a recalled
+ *  prompt still untouched. Without a source there is nothing to recall. */
+export function useNativeChatComposerRecall(args: {
+  draft: string
+  source: NativeChatRecallSource | undefined
+  inputRef: RefObject<NativeChatComposerInput | null>
+}): { recall: NativeChatComposerRecall | undefined; active: boolean } {
+  const { draft, source, inputRef } = args
+  const [position, setPosition] = useNativeChatRecallPosition(draft)
+  return {
+    active: isNativeChatRecallActive(position, draft),
+    recall: source && {
+      source,
+      position,
+      setPosition,
+      isCaretOnVisualEdge: (edge) => inputRef.current?.isCaretOnVisualEdge?.(edge) ?? true,
+      show: (prompt) => {
+        const input = inputRef.current
+        if (input) {
+          input.value = prompt
+          input.setSelectionRange(prompt.length, prompt.length)
+        }
+      }
+    }
+  }
+}
diff --git a/src/renderer/src/components/native-chat/use-native-chat-composer-submit.test.tsx b/src/renderer/src/components/native-chat/use-native-chat-composer-submit.test.tsx
index 29d5dfad7641..62c652a7d18c 100644
--- a/src/renderer/src/components/native-chat/use-native-chat-composer-submit.test.tsx
+++ b/src/renderer/src/components/native-chat/use-native-chat-composer-submit.test.tsx
@@ -51,8 +51,7 @@ function harness(options: {
     sendPty: vi.fn(),
     sendStructured: vi.fn(),
     setDraft: vi.fn(),
-    setCaret: vi.fn(),
-    setHistory: vi.fn()
+    setCaret: vi.fn()
   }
   writeNativeChatDraftCache(SCOPE, options.draft)
   const hook = renderHook(
@@ -214,7 +213,6 @@ describe('composer goal mode', () => {
     await act(async () => settle(true))
 
     expect(setObjective).toHaveBeenCalledWith('Ship the parser')
-    expect(calls.setHistory).toHaveBeenCalledOnce()
     expect(readNativeChatDraftCache(SCOPE)).toBe('Ship the parser and its tests')
     expect(hook.result.current.goalMode.active).toBe(true)
   })
diff --git a/src/renderer/src/components/native-chat/use-native-chat-composer-submit.ts b/src/renderer/src/components/native-chat/use-native-chat-composer-submit.ts
index 6a5fd5460fcd..81def992611d 100644
--- a/src/renderer/src/components/native-chat/use-native-chat-composer-submit.ts
+++ b/src/renderer/src/components/native-chat/use-native-chat-composer-submit.ts
@@ -1,7 +1,6 @@
 import { useCallback, useMemo, useState } from 'react'
 import { translate } from '@/i18n/i18n'
 import { applyPickerSuggestion, type NativeChatPickerItem } from './native-chat-picker-items'
-import { pushHistory, type HistoryState } from './native-chat-composer-state'
 import type { NativeChatStructuredComposerTransport } from './native-chat-composer-types'
 import type { NativeChatComposerImageAttachment } from './NativeChatComposerField'
 import { nativeChatImagesHoldSend } from './native-chat-image-reattach'
@@ -42,10 +41,9 @@ export function useNativeChatComposerSubmit(args: {
   sendStructured: (text: string, attachments: readonly NativeChatComposerImageAttachment[]) => void
   setDraft: (value: string) => void
   setCaret: (caret: number) => void
-  setHistory: (updater: (previous: HistoryState) => HistoryState) => void
 }): { send: () => void; goalMode: NativeChatComposerGoalMode } {
   const { caret, disabled, draft, draftScopeKey, imageAttachments, sendPty, sendStructured } = args
-  const { setCaret, setDraft, setHistory, structuredTransport } = args
+  const { setCaret, setDraft, structuredTransport } = args
   const threadGoal = structuredTransport?.threadGoal
   const [entered, setEntered] = useState(false)
   const active = entered && threadGoal !== undefined
@@ -92,22 +90,13 @@ export function useNativeChatComposerSubmit(args: {
         return
       }
       structuredTransport.onError(null)
-      setHistory((previous) => pushHistory(previous, draft))
       if (!clearNativeChatComposerDraftIfUnchanged(draftScopeKey, submitted)) {
         return
       }
       setCaret(0)
       setEntered(false)
     })
-  }, [
-    draft,
-    draftScopeKey,
-    imageAttachments.length,
-    setCaret,
-    setHistory,
-    structuredTransport,
-    threadGoal
-  ])
+  }, [draft, draftScopeKey, imageAttachments.length, setCaret, structuredTransport, threadGoal])
 
   const send = useCallback(() => {
     if (nativeChatImagesHoldSend(imageAttachments)) {
diff --git a/src/renderer/src/components/native-chat/use-native-chat-context-menu.test.tsx b/src/renderer/src/components/native-chat/use-native-chat-context-menu.test.tsx
index 32dac1b46808..8b7a0a1672f9 100644
--- a/src/renderer/src/components/native-chat/use-native-chat-context-menu.test.tsx
+++ b/src/renderer/src/components/native-chat/use-native-chat-context-menu.test.tsx
@@ -79,6 +79,8 @@ vi.mock('@/lib/image-blob-png', async (importOriginal) => ({
   convertImageBlobToPng: imageCopy.convertImageBlobToPng
 }))
 
+vi.mock('./NativeChatSelectionQuote', () => ({ NativeChatSelectionQuote: () => null }))
+
 vi.mock('@/components/tab-bar/TabWorkspaceLayoutMenuSection', () => ({
   TabWorkspaceLayoutMenuSection: () => 'Move Tab to Split'
 }))
@@ -99,18 +101,16 @@ function childrenText(children: ReactNode): string {
 function Harness({
   onSwitchToTerminal,
   structured = false,
-  enabled = true,
   orcaSessionId
 }: {
   onSwitchToTerminal?: () => void
   structured?: boolean
-  enabled?: boolean
   orcaSessionId?: string
 }) {
   const rootRef = createRef<HTMLDivElement>()
   const { menu } = useNativeChatContextMenu({
     rootRef,
-    enabled,
+    composerRef: createRef(),
     onSwitchToTerminal,
     showTerminalPaneActions: !structured,
     workspaceLayout: structured ? { unifiedTabId: 'chat-tab', groupId: 'group-1' } : undefined,
@@ -131,17 +131,23 @@ function ImageHarness({
   src?: string
 }) {
   const rootRef = createRef<HTMLDivElement>()
-  const { menu, onContextMenuCapture } = useNativeChatContextMenu({
+  const { menu, onContextMenuCapture, onPointerDownCapture } = useNativeChatContextMenu({
     rootRef,
+    composerRef: createRef(),
     enabled,
     actions: { ...emptyNativeChatContextMenuActions, onPaste: vi.fn() }
   })
   return (
-    <div ref={rootRef} onContextMenuCapture={onContextMenuCapture}>
+    <div
+      ref={rootRef}
+      onContextMenuCapture={onContextMenuCapture}
+      onPointerDownCapture={onPointerDownCapture}
+    >
       <button type="button" data-native-chat-copy-image-src={src}>
         <img alt="shot" src="data:thumbnail" />
       </button>
       <p>text</p>
+      <textarea aria-label="composer" />
       {menu}
     </div>
   )
@@ -151,6 +157,16 @@ function copyImageItem(): ItemProps | undefined {
   return items.list.findLast((candidate) => childrenText(candidate.children) === 'Copy image')
 }
 
+function copyTextItem(): ItemProps | undefined {
+  return items.list.findLast((candidate) =>
+    /^Copy(⌘C|Ctrl\+C)$/.test(childrenText(candidate.children))
+  )
+}
+
+function pasteItem(): ItemProps | undefined {
+  return items.list.findLast((candidate) => childrenText(candidate.children) === 'Paste')
+}
+
 function stubClipboardImageWrite(): ReturnType<typeof vi.fn> {
   const writeClipboardImage = vi.fn().mockResolvedValue(undefined)
   vi.stubGlobal('api', { ui: { writeClipboardImage } })
@@ -211,6 +227,50 @@ describe('useNativeChatContextMenu', () => {
     expect(toasts.error).not.toHaveBeenCalled()
   })
 
+  it('offers no Copy when no chat text is selected', () => {
+    render(<ImageHarness />)
+    fireEvent.contextMenu(screen.getByText('text'))
+
+    expect(copyTextItem()).toBeUndefined()
+  })
+
+  it('offers Paste in a text field but not on the transcript', () => {
+    render(<ImageHarness />)
+    fireEvent.contextMenu(screen.getByText('text'))
+    expect(pasteItem()).toBeUndefined()
+
+    fireEvent.contextMenu(screen.getByRole('textbox', { name: 'composer' }))
+    expect(pasteItem()).toBeDefined()
+  })
+
+  it('copies the selected chat text', () => {
+    const writeClipboardText = vi.fn().mockResolvedValue(undefined)
+    vi.stubGlobal('api', { ui: { writeClipboardText } })
+    render(<ImageHarness />)
+    window.getSelection()?.selectAllChildren(screen.getByText('text'))
+    fireEvent.contextMenu(screen.getByText('text'))
+
+    copyTextItem()?.onSelect?.()
+
+    expect(writeClipboardText).toHaveBeenCalledWith('text')
+  })
+
+  it.each([
+    ['a right press', 'Macintosh', { button: 2 }, false],
+    ['a Mac ctrl-click', 'Macintosh', { button: 0, ctrlKey: true }, false],
+    ['a left press', 'Macintosh', { button: 0 }, true],
+    ['a ctrl-click off Mac', 'Windows', { button: 0, ctrlKey: true }, true]
+  ])(
+    'keeps the selection through %s only when it opens the menu',
+    (_press, userAgent, init, defaultRuns) => {
+      vi.spyOn(navigator, 'userAgent', 'get').mockReturnValue(userAgent)
+      render(<ImageHarness />)
+
+      // fireEvent returns false when the handler prevented the default.
+      expect(fireEvent.pointerDown(screen.getByText('text'), init)).toBe(defaultRuns)
+    }
+  )
+
   it('offers no image copy when the right-click is not on an image', () => {
     render(<ImageHarness />)
     fireEvent.contextMenu(screen.getByText('text'))
@@ -361,25 +421,6 @@ describe('useNativeChatContextMenu', () => {
     expect(markup).not.toContain('Fork Agent Session')
   })
 
-  it('subscribes to selection changes only while its retained chat is visible', () => {
-    const getSelection = vi.spyOn(window, 'getSelection').mockReturnValue(null)
-    const view = render(<Harness enabled={false} />)
-
-    getSelection.mockClear()
-    document.dispatchEvent(new Event('selectionchange'))
-    expect(getSelection).not.toHaveBeenCalled()
-
-    view.rerender(<Harness enabled />)
-    getSelection.mockClear()
-    document.dispatchEvent(new Event('selectionchange'))
-    expect(getSelection).toHaveBeenCalledOnce()
-
-    view.rerender(<Harness enabled={false} />)
-    getSelection.mockClear()
-    document.dispatchEvent(new Event('selectionchange'))
-    expect(getSelection).not.toHaveBeenCalled()
-  })
-
   describe('Copy Orca Session ID', () => {
     const orcaSessionId = 'orca_session_id:4a1f6c2e-8b3d-4e7a-9c15-0d2b6e8f1a37'
     const writeClipboardText = vi.fn()
diff --git a/src/renderer/src/components/native-chat/use-native-chat-context-menu.tsx b/src/renderer/src/components/native-chat/use-native-chat-context-menu.tsx
index d40322484681..fcbf30d1436f 100644
--- a/src/renderer/src/components/native-chat/use-native-chat-context-menu.tsx
+++ b/src/renderer/src/components/native-chat/use-native-chat-context-menu.tsx
@@ -4,6 +4,7 @@ import {
   useRef,
   useState,
   type MouseEventHandler,
+  type PointerEventHandler,
   type RefObject
 } from 'react'
 import {
@@ -37,18 +38,25 @@ import {
 } from './native-chat-image-copy'
 import { isMacPlatform, nativeChatToggleShortcutLabel } from './native-chat-shortcut'
 import { TabWorkspaceLayoutMenuSection } from '@/components/tab-bar/TabWorkspaceLayoutMenuSection'
+import { canMoveTabToNewPaneColumn } from '@/components/tab-bar/tab-move-to-pane-column'
+import { isEditableTarget } from '@/lib/editable-target'
 import { NativeChatCopyOrcaSessionIdMenuItem } from './NativeChatCopyOrcaSessionIdMenuItem'
+import { NativeChatSelectionQuote } from './NativeChatSelectionQuote'
+import type { NativeChatComposerHandle } from './native-chat-composer-types'
 import type { TabSplitDirection } from '@/store/slices/tabs'
 
 type NativeChatContextMenuState = {
   open: boolean
   point: { x: number; y: number }
   selectedText: string
+  canPaste: boolean
   image?: NativeChatCopyImage
 }
 
 type UseNativeChatContextMenuArgs = {
   rootRef: RefObject<HTMLElement | null>
+  /** Where a selection from an agent's reply is quoted. */
+  composerRef: RefObject<NativeChatComposerHandle | null>
   enabled?: boolean
   /** Bridge-only escape hatch; structured sessions have no terminal view. */
   onSwitchToTerminal?: () => void
@@ -108,6 +116,7 @@ export const emptyNativeChatContextMenuActions: Omit<NativeChatContextMenuAction
 
 export function useNativeChatContextMenu({
   rootRef,
+  composerRef,
   enabled = true,
   onSwitchToTerminal,
   actions,
@@ -117,33 +126,29 @@ export function useNativeChatContextMenu({
   resolveOrcaSessionId
 }: UseNativeChatContextMenuArgs): {
   onContextMenuCapture: MouseEventHandler<HTMLElement>
-  onSelectionCapture: () => void
+  onPointerDownCapture: PointerEventHandler<HTMLElement>
   menu: React.JSX.Element
 } {
   const menuOpenedAtRef = useRef(0)
-  const lastSelectedTextRef = useRef('')
   const [state, setState] = useState<NativeChatContextMenuState>({
     open: false,
     point: { x: 0, y: 0 },
-    selectedText: ''
+    selectedText: '',
+    canPaste: false
   })
   const shortcutLabel = nativeChatToggleShortcutLabel(isMacPlatform())
   const { image } = state
-
-  const rememberCurrentSelection = useCallback(() => {
-    const selectedText = getNativeChatSelectedText(rootRef.current)
-    if (selectedText.trim().length > 0) {
-      lastSelectedTextRef.current = selectedText
-    }
-  }, [rootRef])
-
-  useEffect(() => {
-    if (!enabled) {
-      return
-    }
-    document.addEventListener('selectionchange', rememberCurrentSelection)
-    return () => document.removeEventListener('selectionchange', rememberCurrentSelection)
-  }, [enabled, rememberCurrentSelection])
+  // Copy, Copy image and Paste each show only when they apply to what was right-clicked.
+  const hasSelection = state.selectedText.trim().length > 0
+  const hasEditItems = image !== undefined || hasSelection || state.canPaste
+  const showWorkspaceLayout =
+    workspaceLayout !== undefined &&
+    canMoveTabToNewPaneColumn(workspaceLayout.unifiedTabId, workspaceLayout.groupId)
+  const hasItems =
+    hasEditItems ||
+    showTerminalPaneActions ||
+    showWorkspaceLayout ||
+    resolveOrcaSessionId !== undefined
 
   useEffect(() => {
     if (!enabled) {
@@ -161,11 +166,11 @@ export function useNativeChatContextMenu({
         return
       }
       menuOpenedAtRef.current = Date.now()
-      const selectedText = getNativeChatSelectedText(rootRef.current) || lastSelectedTextRef.current
       setState({
         open: true,
         point: { x: event.clientX, y: event.clientY },
-        selectedText,
+        selectedText: getNativeChatSelectedText(rootRef.current),
+        canPaste: isEditableTarget(event.target),
         image: readNativeChatCopyImage(event.target)
       })
     },
@@ -181,9 +186,15 @@ export function useNativeChatContextMenu({
 
   return {
     onContextMenuCapture,
-    onSelectionCapture: rememberCurrentSelection,
+    onPointerDownCapture: keepSelectionThroughMenuPress,
     menu: (
-      <DropdownMenu open={enabled && state.open} onOpenChange={setOpen} modal={false}>
+      <DropdownMenu open={enabled && state.open && hasItems} onOpenChange={setOpen} modal={false}>
+        {/* Mounted here as the menu root adds no DOM; it steps aside while the menu is open. */}
+        <NativeChatSelectionQuote
+          rootRef={rootRef}
+          composerRef={composerRef}
+          enabled={enabled && !(state.open && hasItems)}
+        />
         <DropdownMenuTrigger asChild>
           <button
             aria-hidden
@@ -204,26 +215,26 @@ export function useNativeChatContextMenu({
           }}
         >
           {image ? (
-            <>
-              <DropdownMenuItem onSelect={() => void copyNativeChatImage(image)}>
-                <ImageIcon />
-                {translate('components.native-chat.composer.copyImage', 'Copy image')}
-              </DropdownMenuItem>
-              <DropdownMenuSeparator />
-            </>
+            <DropdownMenuItem onSelect={() => void copyNativeChatImage(image)}>
+              <ImageIcon />
+              {translate('components.native-chat.composer.copyImage', 'Copy image')}
+            </DropdownMenuItem>
+          ) : null}
+          {hasSelection ? (
+            <DropdownMenuItem
+              onSelect={() => void window.api.ui.writeClipboardText(state.selectedText)}
+            >
+              <Copy />
+              {translate('auto.components.nativeChat.contextMenu.copy', 'Copy')}
+              <DropdownMenuShortcut>{isMacPlatform() ? '⌘C' : 'Ctrl+C'}</DropdownMenuShortcut>
+            </DropdownMenuItem>
+          ) : null}
+          {state.canPaste ? (
+            <DropdownMenuItem onSelect={actions.onPaste}>
+              <Clipboard />
+              {translate('auto.components.terminal.pane.TerminalContextMenu.0a917b591a', 'Paste')}
+            </DropdownMenuItem>
           ) : null}
-          <DropdownMenuItem
-            disabled={state.selectedText.trim().length === 0}
-            onSelect={() => void window.api.ui.writeClipboardText(state.selectedText)}
-          >
-            <Copy />
-            {translate('auto.components.nativeChat.contextMenu.copy', 'Copy')}
-            <DropdownMenuShortcut>{isMacPlatform() ? '⌘C' : 'Ctrl+C'}</DropdownMenuShortcut>
-          </DropdownMenuItem>
-          <DropdownMenuItem onSelect={actions.onPaste}>
-            <Clipboard />
-            {translate('auto.components.terminal.pane.TerminalContextMenu.0a917b591a', 'Paste')}
-          </DropdownMenuItem>
           {showTerminalPaneActions ? (
             <>
               {onSwitchToTerminal ? (
@@ -258,7 +269,7 @@ export function useNativeChatContextMenu({
             <TabWorkspaceLayoutMenuSection
               unifiedTabId={workspaceLayout.unifiedTabId}
               groupId={workspaceLayout.groupId}
-              leadingSeparator
+              leadingSeparator={hasEditItems}
               shortcutLabels={workspaceLayout.shortcutLabels}
             />
           ) : null}
@@ -354,7 +365,7 @@ export function useNativeChatContextMenu({
             </>
           ) : resolveOrcaSessionId ? (
             <>
-              <DropdownMenuSeparator />
+              {hasEditItems || showWorkspaceLayout ? <DropdownMenuSeparator /> : null}
               <NativeChatCopyOrcaSessionIdMenuItem resolveOrcaSessionId={resolveOrcaSessionId} />
             </>
           ) : null}
@@ -364,6 +375,13 @@ export function useNativeChatContextMenu({
   }
 }
 
+function keepSelectionThroughMenuPress(event: React.PointerEvent<HTMLElement>): void {
+  // Why: left alone, the press that opens the menu collapses the selection before contextmenu fires.
+  if (event.button === 2 || (isMacPlatform() && event.ctrlKey)) {
+    event.preventDefault()
+  }
+}
+
 function getNativeChatSelectedText(root: HTMLElement | null): string {
   const selection = window.getSelection()
   if (!root || !selection || selection.isCollapsed) {
diff --git a/src/renderer/src/components/native-chat/use-native-chat-external-attachments.test.tsx b/src/renderer/src/components/native-chat/use-native-chat-external-attachments.test.tsx
index a5d2abc0b31b..f96005cc955e 100644
--- a/src/renderer/src/components/native-chat/use-native-chat-external-attachments.test.tsx
+++ b/src/renderer/src/components/native-chat/use-native-chat-external-attachments.test.tsx
@@ -9,7 +9,14 @@ const mocks = vi.hoisted(() => ({
   stat: vi.fn(),
   resolveNativeChatAttachmentOwner: vi.fn(),
   resolveNativeChatAttachmentOwnerForWorktree: vi.fn(),
-  uploadNativeChatAttachmentPaths: vi.fn()
+  uploadNativeChatAttachmentPaths: vi.fn(),
+  prepareNativeChatSessionAttachmentUpload: vi.fn(),
+  uploadNativeChatSessionAttachmentPaths: vi.fn(),
+  toastLoading: vi.fn()
+}))
+
+vi.mock('sonner', () => ({
+  toast: { loading: mocks.toastLoading, dismiss: vi.fn(), error: vi.fn(), message: vi.fn() }
 }))
 
 vi.mock('@/store', () => ({
@@ -22,10 +29,15 @@ vi.mock('./native-chat-attachment-upload', async (importOriginal) => ({
   ...(await importOriginal<typeof AttachmentUploadModule>()),
   resolveNativeChatAttachmentOwner: mocks.resolveNativeChatAttachmentOwner,
   resolveNativeChatAttachmentOwnerForWorktree: mocks.resolveNativeChatAttachmentOwnerForWorktree,
-  uploadNativeChatAttachmentPaths: mocks.uploadNativeChatAttachmentPaths
+  uploadNativeChatAttachmentPaths: mocks.uploadNativeChatAttachmentPaths,
+  prepareNativeChatSessionAttachmentUpload: mocks.prepareNativeChatSessionAttachmentUpload,
+  uploadNativeChatSessionAttachmentPaths: mocks.uploadNativeChatSessionAttachmentPaths
 }))
 
 import { useNativeChatExternalAttachments } from './use-native-chat-external-attachments'
+import type { NativeChatPendingAttachmentChips } from './native-chat-session-attachment-drop'
+import type { AgentSessionAttachmentPathUploadResult } from '../../../../shared/agent-session-attachments'
+import { replaceRuntimeEnvironmentRevisions } from '@/runtime/runtime-environment-revision'
 
 type HookApi = ReturnType<typeof useNativeChatExternalAttachments>
 
@@ -37,25 +49,42 @@ function deferred<T>(): { promise: Promise<T>; resolve: (value: T) => void } {
   return { promise, resolve }
 }
 
+function noPendingChips(): NativeChatPendingAttachmentChips {
+  return {
+    begin: vi.fn(() => null),
+    resolve: vi.fn(),
+    drop: vi.fn(() => true),
+    attachReferences: vi.fn()
+  }
+}
+
 function Probe({
   disabled,
   structuredWorktreeId,
+  structuredSession,
   attachResolvedPaths,
+  pendingChips,
   setNotice,
   onReady
 }: {
   disabled: boolean
   structuredWorktreeId?: string
+  structuredSession?: { sessionId: string; runtimeEnvironmentId: string | null }
   attachResolvedPaths: (paths: string[]) => void
+  pendingChips: NativeChatPendingAttachmentChips
   setNotice: (notice: string | null) => void
   onReady: (api: HookApi) => void
 }): null {
+  // Why: the harness hands the latest hook API to the test on every render.
+  // react-doctor-disable-next-line react-doctor/no-prop-callback-in-render
   onReady(
     useNativeChatExternalAttachments({
       terminalTabId: 'tab-1',
       structuredWorktreeId,
+      structuredSession,
       disabled,
       attachResolvedPaths,
+      pendingChips,
       setNotice
     })
   )
@@ -70,7 +99,9 @@ let root: Root | null = null
 async function renderProbe(args: {
   disabled?: boolean
   structuredWorktreeId?: string
+  structuredSession?: { sessionId: string; runtimeEnvironmentId: string | null }
   attachResolvedPaths: (paths: string[]) => void
+  pendingChips?: NativeChatPendingAttachmentChips
   setNotice?: (notice: string | null) => void
 }): Promise<{
   latest: () => HookApi
@@ -89,7 +120,9 @@ async function renderProbe(args: {
         createElement(Probe, {
           disabled,
           structuredWorktreeId,
+          structuredSession: args.structuredSession,
           attachResolvedPaths: args.attachResolvedPaths,
+          pendingChips: args.pendingChips ?? noPendingChips(),
           setNotice: args.setNotice ?? (() => {}),
           onReady: (next) => {
             api = next
@@ -470,4 +503,284 @@ describe('useNativeChatExternalAttachments', () => {
       'This workspace changed hosts while attaching — drop the files again.'
     )
   })
+
+  describe('a structured chat on a paired server', () => {
+    const session = { sessionId: 'session-1', runtimeEnvironmentId: 'env-1' }
+    const target = {
+      environmentId: 'env-1',
+      sessionId: 'session-1',
+      expectedEnvironmentPairingRevision: 7,
+      expectedEnvironmentRuntimeId: 'runtime-a'
+    }
+
+    /** `removed`: chips the user clicked away, which the composer no longer holds. */
+    function trackingChips(): NativeChatPendingAttachmentChips & {
+      begun: string[]
+      removed: Set<string>
+    } {
+      const begun: string[] = []
+      const removed = new Set<string>()
+      return {
+        begun,
+        removed,
+        begin: vi.fn((_preview?: string, name?: string) => {
+          begun.push(name ?? '')
+          return `chip-${begun.length}`
+        }),
+        resolve: vi.fn(),
+        drop: vi.fn((id: string) => !removed.has(id)),
+        attachReferences: vi.fn()
+      }
+    }
+
+    function uploaded(
+      pairs: [sourcePath: string, path: string][],
+      failed: string[] = []
+    ): AgentSessionAttachmentPathUploadResult {
+      return {
+        uploaded: pairs.map(([sourcePath, path]) => ({ sourcePath, path })),
+        skipped: [],
+        failed: failed.map((sourcePath) => ({
+          sourcePath,
+          reason: `'${sourcePath.split('/').at(-1)}' is 60 MB, over the 50 MB chat attachment limit`
+        }))
+      }
+    }
+
+    beforeEach(() => {
+      replaceRuntimeEnvironmentRevisions([{ id: 'env-1', createdAt: 1, pairingRevision: 7 }])
+      mocks.prepareNativeChatSessionAttachmentUpload.mockReset().mockResolvedValue({
+        ok: true,
+        target
+      })
+      mocks.uploadNativeChatSessionAttachmentPaths.mockReset()
+    })
+
+    it('uploads into the chat store and attaches only server paths', async () => {
+      const upload = deferred<AgentSessionAttachmentPathUploadResult>()
+      mocks.uploadNativeChatSessionAttachmentPaths.mockReturnValueOnce(upload.promise)
+      const chips = trackingChips()
+      const attachResolvedPaths = vi.fn()
+      const probe = await renderProbe({
+        structuredWorktreeId: 'worktree-1',
+        structuredSession: session,
+        attachResolvedPaths,
+        pendingChips: chips
+      })
+
+      act(() => probe.latest().attachExternalPaths(['/Users/me/shot.png', '/Users/me/notes.md']))
+      // Pending chips appear before the upload settles, so Send waits for both files.
+      expect(chips.begun).toEqual(['shot.png', 'notes.md'])
+      await act(async () =>
+        upload.resolve(
+          uploaded([
+            ['/Users/me/shot.png', '/srv/agent-session-attachments/u1/shot.png'],
+            ['/Users/me/notes.md', '/srv/agent-session-attachments/u2/notes.md']
+          ])
+        )
+      )
+
+      expect(mocks.uploadNativeChatSessionAttachmentPaths).toHaveBeenCalledWith(
+        ['/Users/me/shot.png', '/Users/me/notes.md'],
+        target
+      )
+      expect(chips.resolve).toHaveBeenCalledExactlyOnceWith(
+        'chip-1',
+        '/srv/agent-session-attachments/u1/shot.png',
+        null
+      )
+      expect(chips.drop).toHaveBeenCalledExactlyOnceWith('chip-2')
+      expect(chips.attachReferences).toHaveBeenCalledExactlyOnceWith([
+        '/srv/agent-session-attachments/u2/notes.md'
+      ])
+      // The client never reads its own disk for these paths: the server stores the bytes.
+      expect(mocks.stat).not.toHaveBeenCalled()
+    })
+
+    it('refuses a captured drop if its destination changed before preparation finished', async () => {
+      const chips = trackingChips()
+      const probe = await renderProbe({
+        structuredWorktreeId: 'worktree-1',
+        structuredSession: session,
+        attachResolvedPaths: vi.fn(),
+        pendingChips: chips
+      })
+      let current = true
+      const deliver = probe.latest().captureExternalDrop(() => current)
+      current = false
+      await act(async () => deliver(['/Users/me/notes.md']))
+      expect(chips.begun).toEqual([])
+      expect(mocks.prepareNativeChatSessionAttachmentUpload).not.toHaveBeenCalled()
+    })
+
+    it('discards uploaded files if the captured drop destination changed during upload', async () => {
+      const upload = deferred<AgentSessionAttachmentPathUploadResult>()
+      mocks.uploadNativeChatSessionAttachmentPaths.mockReturnValueOnce(upload.promise)
+      const chips = trackingChips()
+      const probe = await renderProbe({
+        structuredWorktreeId: 'worktree-1',
+        structuredSession: session,
+        attachResolvedPaths: vi.fn(),
+        pendingChips: chips
+      })
+      let current = true
+      const deliver = probe.latest().captureExternalDrop(() => current)
+      act(() => void deliver(['/Users/me/notes.md']))
+      current = false
+      await act(async () =>
+        upload.resolve(
+          uploaded([['/Users/me/notes.md', '/srv/agent-session-attachments/u1/notes.md']])
+        )
+      )
+      expect(chips.drop).toHaveBeenCalledExactlyOnceWith('chip-1')
+      expect(chips.attachReferences).not.toHaveBeenCalled()
+    })
+
+    it('settles an upload into its captured chips while a prompt card unmounts the composer', async () => {
+      const upload = deferred<AgentSessionAttachmentPathUploadResult>()
+      mocks.uploadNativeChatSessionAttachmentPaths.mockReturnValueOnce(upload.promise)
+      const chips = trackingChips()
+      const probe = await renderProbe({
+        structuredWorktreeId: 'worktree-1',
+        structuredSession: session,
+        attachResolvedPaths: vi.fn(),
+        pendingChips: chips
+      })
+      act(() => void probe.latest().captureExternalDrop(() => true)(['/Users/me/notes.md']))
+      act(() => root?.unmount())
+      root = null
+      await act(async () =>
+        upload.resolve(
+          uploaded([['/Users/me/notes.md', '/srv/agent-session-attachments/u1/notes.md']])
+        )
+      )
+      expect(chips.attachReferences).toHaveBeenCalledExactlyOnceWith([
+        '/srv/agent-session-attachments/u1/notes.md'
+      ])
+    })
+
+    it('does not insert a file whose chip the user removed while it uploaded', async () => {
+      const upload = deferred<AgentSessionAttachmentPathUploadResult>()
+      mocks.uploadNativeChatSessionAttachmentPaths.mockReturnValueOnce(upload.promise)
+      const chips = trackingChips()
+      const attachResolvedPaths = vi.fn()
+      const probe = await renderProbe({
+        structuredWorktreeId: 'worktree-1',
+        structuredSession: session,
+        attachResolvedPaths,
+        pendingChips: chips
+      })
+
+      act(() => probe.latest().attachExternalPaths(['/Users/me/report.pdf', '/Users/me/notes.md']))
+      chips.removed.add('chip-1')
+      await act(async () =>
+        upload.resolve(
+          uploaded([
+            ['/Users/me/report.pdf', '/srv/agent-session-attachments/u1/report.pdf'],
+            ['/Users/me/notes.md', '/srv/agent-session-attachments/u2/notes.md']
+          ])
+        )
+      )
+
+      expect(chips.attachReferences).toHaveBeenCalledExactlyOnceWith([
+        '/srv/agent-session-attachments/u2/notes.md'
+      ])
+    })
+
+    it('names, in one notice, each file that did not attach', async () => {
+      mocks.uploadNativeChatSessionAttachmentPaths.mockResolvedValueOnce(
+        uploaded(
+          [['/Users/me/notes.md', '/srv/agent-session-attachments/u2/notes.md']],
+          ['/Users/me/huge.mov']
+        )
+      )
+      const chips = trackingChips()
+      const attachResolvedPaths = vi.fn()
+      const notices: (string | null)[] = []
+      const probe = await renderProbe({
+        structuredWorktreeId: 'worktree-1',
+        structuredSession: session,
+        attachResolvedPaths,
+        pendingChips: chips,
+        setNotice: (notice) => notices.push(notice)
+      })
+
+      await act(async () =>
+        probe.latest().attachExternalPaths(['/Users/me/huge.mov', '/Users/me/notes.md'])
+      )
+
+      expect(chips.drop).toHaveBeenCalledWith('chip-1')
+      expect(chips.attachReferences).toHaveBeenCalledExactlyOnceWith([
+        '/srv/agent-session-attachments/u2/notes.md'
+      ])
+      // The cause, the size limit here, rides in the same notice.
+      expect(notices).toEqual([
+        "Couldn't attach huge.mov. 'huge.mov' is 60 MB, over the 50 MB chat attachment limit."
+      ])
+      expect(mocks.toastLoading).not.toHaveBeenCalled()
+    })
+
+    it('refuses on a server without the attachment store, uploading nothing', async () => {
+      mocks.prepareNativeChatSessionAttachmentUpload.mockResolvedValueOnce({
+        ok: false,
+        notice: 'needs newer server'
+      })
+      const chips = trackingChips()
+      const attachResolvedPaths = vi.fn()
+      const notices: (string | null)[] = []
+      const probe = await renderProbe({
+        structuredWorktreeId: 'worktree-1',
+        structuredSession: session,
+        attachResolvedPaths,
+        pendingChips: chips,
+        setNotice: (notice) => notices.push(notice)
+      })
+
+      await act(async () => probe.latest().attachExternalPaths(['/Users/me/shot.png']))
+
+      expect(mocks.uploadNativeChatSessionAttachmentPaths).not.toHaveBeenCalled()
+      expect(chips.drop).toHaveBeenCalledExactlyOnceWith('chip-1')
+      expect(chips.attachReferences).not.toHaveBeenCalled()
+      expect(notices.at(-1)).toBe('needs newer server')
+    })
+
+    it('says which file did not attach when the upload itself fails, such as on a re-pair', async () => {
+      // Main refuses every chunk once the pairing changes, so the whole upload call fails.
+      mocks.uploadNativeChatSessionAttachmentPaths.mockRejectedValueOnce(
+        new Error('Runtime environment changed')
+      )
+      const chips = trackingChips()
+      const attachResolvedPaths = vi.fn()
+      const notices: (string | null)[] = []
+      const probe = await renderProbe({
+        structuredWorktreeId: 'worktree-1',
+        structuredSession: session,
+        attachResolvedPaths,
+        pendingChips: chips,
+        setNotice: (notice) => notices.push(notice)
+      })
+
+      await act(async () => probe.latest().attachExternalPaths(['/Users/me/shot.png']))
+
+      expect(chips.resolve).not.toHaveBeenCalled()
+      expect(chips.drop).toHaveBeenCalledExactlyOnceWith('chip-1')
+      expect(chips.attachReferences).not.toHaveBeenCalled()
+      expect(notices).toEqual(["Couldn't attach shot.png. Runtime environment changed."])
+    })
+
+    it('keeps a local structured chat on the worktree owner', async () => {
+      const attachResolvedPaths = vi.fn()
+      const probe = await renderProbe({
+        structuredWorktreeId: 'worktree-1',
+        structuredSession: { sessionId: 'session-1', runtimeEnvironmentId: null },
+        attachResolvedPaths
+      })
+      await act(async () => probe.latest().attachExternalPaths(['/local/a.txt']))
+      expect(mocks.resolveNativeChatAttachmentOwnerForWorktree).toHaveBeenCalled()
+      expect(mocks.prepareNativeChatSessionAttachmentUpload).not.toHaveBeenCalled()
+      expect(attachResolvedPaths).toHaveBeenCalledWith(['/local/a.txt'], undefined, {
+        destinationIsCurrent: expect.any(Function)
+      })
+    })
+  })
 })
diff --git a/src/renderer/src/components/native-chat/use-native-chat-external-attachments.ts b/src/renderer/src/components/native-chat/use-native-chat-external-attachments.ts
index b23318be3141..9620d475f61b 100644
--- a/src/renderer/src/components/native-chat/use-native-chat-external-attachments.ts
+++ b/src/renderer/src/components/native-chat/use-native-chat-external-attachments.ts
@@ -13,15 +13,24 @@ import {
   nativeChatWorktreeNotReadyNotice,
   resolveNativeChatAttachmentOwner,
   resolveNativeChatAttachmentOwnerForWorktree,
+  resolveNativeChatRuntimeSessionAttachmentOwner,
   uploadNativeChatAttachmentPaths,
-  type NativeChatAttachmentOwner
+  type NativeChatAttachmentOwner,
+  type NativeChatStructuredAttachmentSession
 } from './native-chat-attachment-upload'
+import {
+  attachNativeChatSessionAttachmentPaths,
+  type NativeChatPendingAttachmentChips
+} from './native-chat-session-attachment-drop'
 import { userNamedFileAccess } from '@/lib/local-file-access'
+import { useMountedRef } from '@/hooks/useMountedRef'
 import { findTerminalTabWorktreeId } from './native-chat-file-link'
 
 export type UseNativeChatExternalAttachmentsArgs = {
   terminalTabId: string
   structuredWorktreeId?: string
+  /** The structured chat behind this composer; decides where its uploads are stored. */
+  structuredSession?: NativeChatStructuredAttachmentSession
   /** Live composer-disabled state; read at await-resume via a ref so a flip
    *  mid-upload doesn't attach into a guarded composer. */
   disabled: boolean
@@ -30,15 +39,24 @@ export type UseNativeChatExternalAttachmentsArgs = {
     connectionId?: string | null,
     options?: NativeChatResolvedPathOptions
   ) => void
+  /** Chips shown while a file uploads, so Send waits for it. */
+  pendingChips: NativeChatPendingAttachmentChips
   setNotice: (notice: string | null) => void
 }
 
-type ComposerWorkspace = { structuredWorktreeId?: string; terminalTabId: string }
+type ComposerWorkspace = {
+  structuredWorktreeId?: string
+  terminalTabId: string
+  structuredSession?: NativeChatStructuredAttachmentSession
+}
 
 function isSameComposerWorkspace(captured: ComposerWorkspace, current: ComposerWorkspace): boolean {
   return (
     captured.structuredWorktreeId === current.structuredWorktreeId &&
-    captured.terminalTabId === current.terminalTabId
+    captured.terminalTabId === current.terminalTabId &&
+    captured.structuredSession?.sessionId === current.structuredSession?.sessionId &&
+    captured.structuredSession?.runtimeEnvironmentId ===
+      current.structuredSession?.runtimeEnvironmentId
   )
 }
 
@@ -50,13 +68,17 @@ function isSameComposerWorkspace(captured: ComposerWorkspace, current: ComposerW
 export function useNativeChatExternalAttachments({
   terminalTabId,
   structuredWorktreeId,
+  structuredSession,
   disabled,
   attachResolvedPaths,
+  pendingChips,
   setNotice
 }: UseNativeChatExternalAttachmentsArgs): {
   attachExternalPaths: (paths: string[]) => void
   resolveAttachmentOwner: () => NativeChatAttachmentOwner
+  captureExternalDrop: (destinationIsCurrent?: () => boolean) => (paths: string[]) => Promise<void>
 } {
+  const mountedRef = useMountedRef()
   const disabledRef = useRef(disabled)
   useLayoutEffect(() => {
     disabledRef.current = disabled
@@ -65,43 +87,41 @@ export function useNativeChatExternalAttachments({
   // The post-await gate asks which workspace this composer serves now, so it
   // reads the pane through a ref. Resolving through the render closure would
   // re-ask the workspace the upload started in — a comparison with itself.
-  const workspaceRef = useRef<ComposerWorkspace>({ structuredWorktreeId, terminalTabId })
+  const sessionId = structuredSession?.sessionId
+  const runtimeEnvironmentId = structuredSession?.runtimeEnvironmentId ?? null
+  const workspaceRef = useRef<ComposerWorkspace>({
+    structuredWorktreeId,
+    terminalTabId,
+    structuredSession
+  })
+  useLayoutEffect(() => {
+    workspaceRef.current = {
+      structuredWorktreeId,
+      terminalTabId,
+      structuredSession: sessionId ? { sessionId, runtimeEnvironmentId } : undefined
+    }
+  }, [runtimeEnvironmentId, sessionId, structuredWorktreeId, terminalTabId])
+  const pendingChipsRef = useRef(pendingChips)
   useLayoutEffect(() => {
-    workspaceRef.current = { structuredWorktreeId, terminalTabId }
-  }, [structuredWorktreeId, terminalTabId])
+    pendingChipsRef.current = pendingChips
+  }, [pendingChips])
 
   const resolveAttachmentOwner = useCallback(() => {
-    const workspace = workspaceRef.current
-    return workspace.structuredWorktreeId
-      ? resolveNativeChatAttachmentOwnerForWorktree(
-          useAppStore.getState(),
-          workspace.structuredWorktreeId
-        )
-      : resolveNativeChatAttachmentOwner(useAppStore.getState(), workspace.terminalTabId)
+    const { structuredWorktreeId, structuredSession, terminalTabId } = workspaceRef.current
+    if (structuredWorktreeId && structuredSession?.runtimeEnvironmentId) {
+      return resolveNativeChatRuntimeSessionAttachmentOwner({
+        sessionId: structuredSession.sessionId,
+        runtimeEnvironmentId: structuredSession.runtimeEnvironmentId
+      })
+    }
+    return structuredWorktreeId
+      ? resolveNativeChatAttachmentOwnerForWorktree(useAppStore.getState(), structuredWorktreeId)
+      : resolveNativeChatAttachmentOwner(useAppStore.getState(), terminalTabId)
   }, [])
 
-  const attachExternalPaths = useCallback(
-    (paths: string[]) => {
-      if (paths.length === 0 || disabledRef.current) {
-        return
-      }
+  const captureExternalDrop = useCallback(
+    (destinationIsCurrent: () => boolean = () => true) => {
       const owner = resolveAttachmentOwner()
-      if (owner.kind === 'not-ready') {
-        setNotice(nativeChatWorktreeNotReadyNotice())
-        return
-      }
-      if (owner.kind === 'runtime') {
-        setNotice(nativeChatLocalAttachmentUnsupportedNotice())
-        return
-      }
-      // The picker has no native cap, so it gets the same all-or-nothing limit as a drop.
-      if (paths.length > NATIVE_FILE_DROP_MAX_PATHS) {
-        setNotice(nativeChatTooManyAttachmentsNotice())
-        return
-      }
-      // Why every exit reports: a drop that reaches here and produces nothing is
-      // the silent-failure complaint in #15782. Only a disabled composer stays
-      // quiet — it is being torn down or guarded, and has no notice surface.
       const capturedWorkspace = workspaceRef.current
       const currentWorktreeId = (): string | null =>
         workspaceRef.current.structuredWorktreeId ??
@@ -110,67 +130,107 @@ export function useNativeChatExternalAttachments({
           workspaceRef.current.terminalTabId
         )
       const capturedWorktreeId = currentWorktreeId()
-      // Both halves matter: a moved tab can land on a workspace that reports the
-      // same owner kind, and the owner alone would call that unchanged.
       const ownerStillCurrent = (): boolean =>
+        // Server uploads settle into the captured scope even while its composer is unmounted.
+        (owner.kind === 'runtime-session' || mountedRef.current) &&
+        destinationIsCurrent() &&
         isSameComposerWorkspace(capturedWorkspace, workspaceRef.current) &&
         capturedWorktreeId === currentWorktreeId() &&
         nativeChatAttachmentOwnerUnchanged(owner, resolveAttachmentOwner())
-      if (owner.kind !== 'ssh') {
-        void (async () => {
-          const readablePaths: string[] = []
-          for (const targetPath of paths) {
-            if (disabledRef.current) {
-              return
-            }
-            if (!ownerStillCurrent()) {
-              setNotice(nativeChatAttachmentOwnerChangedNotice())
-              return
-            }
-            try {
-              await window.api.fs.stat({ filePath: targetPath, access: userNamedFileAccess() })
-              readablePaths.push(targetPath)
-            } catch {
-              // Skip unreadable paths, matching workspace composer drops.
-            }
-          }
-          if (disabledRef.current) {
+      return async (paths: string[]): Promise<void> => {
+        if (paths.length === 0 || disabledRef.current || !mountedRef.current) {
+          return
+        }
+        if (!destinationIsCurrent()) {
+          setNotice(nativeChatAttachmentOwnerChangedNotice())
+          return
+        }
+        if (owner.kind === 'not-ready') {
+          setNotice(nativeChatWorktreeNotReadyNotice())
+          return
+        }
+        if (owner.kind === 'runtime') {
+          setNotice(nativeChatLocalAttachmentUnsupportedNotice())
+          return
+        }
+        // The picker shares the drop limit without partially attaching a batch.
+        if (paths.length > NATIVE_FILE_DROP_MAX_PATHS) {
+          setNotice(nativeChatTooManyAttachmentsNotice())
+          return
+        }
+        if (!ownerStillCurrent()) {
+          setNotice(nativeChatAttachmentOwnerChangedNotice())
+          return
+        }
+        if (owner.kind === 'runtime-session') {
+          await attachNativeChatSessionAttachmentPaths({
+            paths,
+            owner,
+            chips: pendingChipsRef.current,
+            isAbandoned: () => disabledRef.current,
+            ownerStillCurrent,
+            setNotice
+          })
+          return
+        }
+        if (owner.kind === 'ssh') {
+          const remotePaths = await uploadNativeChatAttachmentPaths(paths, owner)
+          if (disabledRef.current || !mountedRef.current) {
             return
           }
           if (!ownerStillCurrent()) {
             setNotice(nativeChatAttachmentOwnerChangedNotice())
             return
           }
-          if (readablePaths.length === 0) {
+          if (!remotePaths || remotePaths.length === 0) {
             setNotice(nativeChatAttachmentUnreadableNotice())
             return
           }
-          attachResolvedPaths(readablePaths, undefined, { destinationIsCurrent: ownerStillCurrent })
-        })()
-        return
-      }
-      void (async () => {
-        const remotePaths = await uploadNativeChatAttachmentPaths(paths, owner)
-        if (disabledRef.current) {
+          attachResolvedPaths(remotePaths, owner.connectionId, {
+            destinationIsCurrent: ownerStillCurrent
+          })
           return
         }
-        if (!remotePaths || remotePaths.length === 0) {
-          // uploadNativeChatAttachmentPaths already toasted the IPC failure;
-          // an empty result with no failure means nothing was readable.
-          setNotice(nativeChatAttachmentUnreadableNotice())
+        const readablePaths: string[] = []
+        for (const targetPath of paths) {
+          if (disabledRef.current || !mountedRef.current) {
+            return
+          }
+          if (!ownerStillCurrent()) {
+            setNotice(nativeChatAttachmentOwnerChangedNotice())
+            return
+          }
+          try {
+            await window.api.fs.stat({ filePath: targetPath, access: userNamedFileAccess() })
+            readablePaths.push(targetPath)
+          } catch {
+            // Skip unreadable paths, matching workspace composer drops.
+          }
+        }
+        if (disabledRef.current || !mountedRef.current) {
           return
         }
         if (!ownerStillCurrent()) {
           setNotice(nativeChatAttachmentOwnerChangedNotice())
           return
         }
-        attachResolvedPaths(remotePaths, owner.connectionId, {
-          destinationIsCurrent: ownerStillCurrent
-        })
-      })()
+        if (readablePaths.length === 0) {
+          setNotice(nativeChatAttachmentUnreadableNotice())
+          return
+        }
+        attachResolvedPaths(readablePaths, undefined, { destinationIsCurrent: ownerStillCurrent })
+      }
+    },
+    [attachResolvedPaths, mountedRef, resolveAttachmentOwner, setNotice]
+  )
+  const attachExternalPaths = useCallback(
+    (paths: string[]): void => {
+      if (!disabledRef.current && mountedRef.current && paths.length > 0) {
+        void captureExternalDrop()(paths)
+      }
     },
-    [attachResolvedPaths, resolveAttachmentOwner, setNotice]
+    [captureExternalDrop, mountedRef]
   )
 
-  return { attachExternalPaths, resolveAttachmentOwner }
+  return { attachExternalPaths, captureExternalDrop, resolveAttachmentOwner }
 }
diff --git a/src/renderer/src/components/native-chat/use-native-chat-file-attachment-actions.test.tsx b/src/renderer/src/components/native-chat/use-native-chat-file-attachment-actions.test.tsx
index 19e614f65a14..8f1557e349f6 100644
--- a/src/renderer/src/components/native-chat/use-native-chat-file-attachment-actions.test.tsx
+++ b/src/renderer/src/components/native-chat/use-native-chat-file-attachment-actions.test.tsx
@@ -2,43 +2,23 @@
 import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest'
 import { act } from 'react'
 import { cleanup, renderHook } from '@testing-library/react'
-import {
-  NATIVE_FILE_DROP_TARGET,
-  type NativeFileDropPayload
-} from '../../../../shared/native-file-drop'
 import { useNativeChatFileAttachmentActions } from './use-native-chat-file-attachment-actions'
 
-const SCOPE_KEY = 'pane-1'
-
 let pickAttachments: ReturnType<typeof vi.fn>
-type DropListener = (payload: NativeFileDropPayload) => void
-
-let dropListeners: DropListener[] = []
 function renderProbe(
   attachExternalPaths: (paths: string[]) => void
 ): () => { pickAttachments: () => void } {
-  const { result } = renderHook(() =>
-    useNativeChatFileAttachmentActions(SCOPE_KEY, attachExternalPaths)
-  )
+  const { result } = renderHook(() => useNativeChatFileAttachmentActions(attachExternalPaths))
   return () => result.current
 }
 
 describe('useNativeChatFileAttachmentActions', () => {
   beforeEach(() => {
-    dropListeners = []
     pickAttachments = vi.fn()
     Object.defineProperty(window, 'api', {
       configurable: true,
       value: {
-        shell: { pickAttachments },
-        ui: {
-          onFileDrop: (listener: DropListener) => {
-            dropListeners.push(listener)
-            return () => {
-              dropListeners = dropListeners.filter((entry) => entry !== listener)
-            }
-          }
-        }
+        shell: { pickAttachments }
       }
     })
   })
@@ -68,27 +48,4 @@ describe('useNativeChatFileAttachmentActions', () => {
     // Whether the empty batch is forwarded or dropped here, no file may attach.
     expect(attachExternalPaths.mock.calls.flatMap(([paths]) => paths)).toEqual([])
   })
-
-  it('only attaches a drop aimed at this pane', async () => {
-    const attachExternalPaths = vi.fn()
-    renderProbe(attachExternalPaths)
-    await act(async () => {
-      for (const listener of dropListeners) {
-        listener({
-          target: NATIVE_FILE_DROP_TARGET.composer,
-          scopeKey: 'other-pane',
-          paths: ['/dropped/a.png']
-        })
-        listener({
-          target: NATIVE_FILE_DROP_TARGET.composer,
-          scopeKey: SCOPE_KEY,
-          paths: ['/dropped/a.png', '/dropped/b.png']
-        })
-      }
-    })
-    expect(attachExternalPaths).toHaveBeenCalledExactlyOnceWith([
-      '/dropped/a.png',
-      '/dropped/b.png'
-    ])
-  })
 })
diff --git a/src/renderer/src/components/native-chat/use-native-chat-file-attachment-actions.ts b/src/renderer/src/components/native-chat/use-native-chat-file-attachment-actions.ts
index 5165c00cb018..aa819d742a15 100644
--- a/src/renderer/src/components/native-chat/use-native-chat-file-attachment-actions.ts
+++ b/src/renderer/src/components/native-chat/use-native-chat-file-attachment-actions.ts
@@ -1,23 +1,8 @@
-import { useCallback, useEffect } from 'react'
-import { NATIVE_FILE_DROP_TARGET } from '../../../../shared/native-file-drop'
+import { useCallback } from 'react'
 
 export function useNativeChatFileAttachmentActions(
-  /** Pane identity published as `data-composer-scope-key` on the drop target. */
-  scopeKey: string,
   attachExternalPaths: (paths: string[]) => void
 ): { pickAttachments: () => void } {
-  useEffect(
-    () =>
-      window.api.ui.onFileDrop((payload) => {
-        // Why: this event reaches every mounted composer, including hidden
-        // background chat tabs. Only the pane the drop landed on may attach.
-        if (payload.target === NATIVE_FILE_DROP_TARGET.composer && payload.scopeKey === scopeKey) {
-          attachExternalPaths(payload.paths)
-        }
-      }),
-    [attachExternalPaths, scopeKey]
-  )
-
   const pickAttachments = useCallback(() => {
     void (async () => {
       attachExternalPaths(await window.api.shell.pickAttachments())
diff --git a/src/renderer/src/components/native-chat/use-native-chat-file-drops.ts b/src/renderer/src/components/native-chat/use-native-chat-file-drops.ts
new file mode 100644
index 000000000000..e6fd606db6e2
--- /dev/null
+++ b/src/renderer/src/components/native-chat/use-native-chat-file-drops.ts
@@ -0,0 +1,40 @@
+import { useLayoutEffect, useRef } from 'react'
+import type { NativeChatComposerProps } from './native-chat-composer-types'
+import {
+  useNativeChatExternalAttachments,
+  type UseNativeChatExternalAttachmentsArgs
+} from './use-native-chat-external-attachments'
+import { useNativeChatWorkspaceFileDrop } from './use-native-chat-workspace-file-drop'
+import { useNativeChatFileAttachmentActions } from './use-native-chat-file-attachment-actions'
+import { useNativeChatPaneFileDropClaim } from './NativeChatPaneFileDropSurface'
+
+type Args = UseNativeChatExternalAttachmentsArgs &
+  Pick<NativeChatComposerProps, 'paneKey' | 'draftScopeKey' | 'targetPtyId' | 'structuredTransport'>
+
+export function useNativeChatFileDrops(args: Args) {
+  const external = useNativeChatExternalAttachments(args)
+  const workspace = useNativeChatWorkspaceFileDrop(args)
+  const destinationKey = JSON.stringify([
+    args.paneKey,
+    args.draftScopeKey,
+    args.targetPtyId,
+    args.structuredTransport?.sessionId,
+    args.structuredTransport?.worktreeId,
+    args.structuredTransport?.runtimeEnvironmentId
+  ])
+  const destinationRef = useRef(destinationKey)
+  useLayoutEffect(() => {
+    destinationRef.current = destinationKey
+  }, [destinationKey])
+  useNativeChatPaneFileDropClaim({
+    destinationKey,
+    disabled: args.disabled,
+    ...workspace,
+    captureExternalDrop: () =>
+      external.captureExternalDrop(() => destinationRef.current === destinationKey)
+  })
+  return {
+    ...useNativeChatFileAttachmentActions(external.attachExternalPaths),
+    resolveAttachmentOwner: external.resolveAttachmentOwner
+  }
+}
diff --git a/src/renderer/src/components/native-chat/use-native-chat-file-link-context.ts b/src/renderer/src/components/native-chat/use-native-chat-file-link-context.ts
index d3073115b5a8..51ae6382794d 100644
--- a/src/renderer/src/components/native-chat/use-native-chat-file-link-context.ts
+++ b/src/renderer/src/components/native-chat/use-native-chat-file-link-context.ts
@@ -1,7 +1,12 @@
+import { useMemo } from 'react'
 import { useShallow } from 'zustand/react/shallow'
 import { useAppStore } from '../../store'
-import { resolveNativeChatFileLinkContext } from './native-chat-file-link'
+import { createNativeChatFileLinkContextSelector } from './native-chat-file-link'
 
 export function useNativeChatFileLinkContext(terminalTabId: string) {
-  return useAppStore(useShallow((state) => resolveNativeChatFileLinkContext(state, terminalTabId)))
+  const selectContext = useMemo(
+    () => createNativeChatFileLinkContextSelector(terminalTabId),
+    [terminalTabId]
+  )
+  return useAppStore(useShallow(selectContext))
 }
diff --git a/src/renderer/src/components/native-chat/use-native-chat-held-queue-composer-send.ts b/src/renderer/src/components/native-chat/use-native-chat-held-queue-composer-send.ts
index 213ad5794933..a45faf0b1383 100644
--- a/src/renderer/src/components/native-chat/use-native-chat-held-queue-composer-send.ts
+++ b/src/renderer/src/components/native-chat/use-native-chat-held-queue-composer-send.ts
@@ -73,6 +73,12 @@ export function useNativeChatHeldQueueComposerSend(args: UseNativeChatStructured
   // From a Clear queue choice until its message has gone out: the draft still holds that message,
   // and sending it again meanwhile would send it twice.
   const clearingRef = useRef(false)
+  // The chat's send is out (or a /clear runs): no message goes, so nothing asks or clears meanwhile.
+  const sendOut = structuredTransport?.sendOut === true
+  const sendOutRef = useRef(sendOut)
+  useLayoutEffect(() => {
+    sendOutRef.current = sendOut
+  }, [sendOut])
 
   const send = useCallback<StructuredComposerSend>(
     (text, attachments) => {
@@ -84,6 +90,9 @@ export function useNativeChatHeldQueueComposerSend(args: UseNativeChatStructured
         structuredTransport &&
         !isNativeChatStructuredHostCommand(text, agent, structuredTransport)
       ) {
+        if (sendOut) {
+          return
+        }
         const asked = {
           text,
           attachments,
@@ -97,7 +106,7 @@ export function useNativeChatHeldQueueComposerSend(args: UseNativeChatStructured
       }
       void sendNow(text, attachments)
     },
-    [agent, args.draftScopeKey, queueHold, sendNow, structuredTransport]
+    [agent, args.draftScopeKey, queueHold, sendNow, sendOut, structuredTransport]
   )
 
   const sendMessage = useCallback(() => {
@@ -108,7 +117,8 @@ export function useNativeChatHeldQueueComposerSend(args: UseNativeChatStructured
   }, [take])
   const clearQueue = useCallback(() => {
     const taken = take()
-    if (!taken) {
+    // Its message could not go now, so the cards stay; the draft keeps the text.
+    if (!taken || sendOutRef.current) {
       return
     }
     clearingRef.current = true
diff --git a/src/renderer/src/components/native-chat/use-native-chat-host-outage-notice.ts b/src/renderer/src/components/native-chat/use-native-chat-host-outage-notice.ts
new file mode 100644
index 000000000000..694b65d3c180
--- /dev/null
+++ b/src/renderer/src/components/native-chat/use-native-chat-host-outage-notice.ts
@@ -0,0 +1,50 @@
+import { useState } from 'react'
+import { connectRuntimeHostAndReloadProjects } from '@/components/status-bar/runtime-environment-explicit-connect'
+import { useMountedRef } from '@/hooks/useMountedRef'
+import { translate } from '@/i18n/i18n'
+import type { NativeChatComposerNotice } from './native-chat-composer-notice'
+import type { NativeChatHostOutage } from './use-native-chat-host-outage'
+
+export function useNativeChatHostOutageNotice(
+  outage: NativeChatHostOutage | null
+): NativeChatComposerNotice | null {
+  const [connecting, setConnecting] = useState(false)
+  const mountedRef = useMountedRef()
+  const reconnect = (environmentId: string): void => {
+    setConnecting(true)
+    void connectRuntimeHostAndReloadProjects(environmentId).finally(() => {
+      if (mountedRef.current) {
+        setConnecting(false)
+      }
+    })
+  }
+  if (!outage) {
+    return null
+  }
+  const offline = outage.kind === 'offline'
+  return {
+    key: 'host-outage',
+    kind: 'host',
+    tone: offline ? 'warning' : 'muted',
+    text: offline
+      ? translate('components.native-chat.hostOutage.offline', '{{hostName}} is offline', {
+          hostName: outage.hostLabel
+        })
+      : translate(
+          'components.native-chat.hostOutage.reconnecting',
+          '{{hostName}} is reconnecting…',
+          {
+            hostName: outage.hostLabel
+          }
+        ),
+    ...(outage.canReconnect
+      ? {
+          action: {
+            label: translate('components.native-chat.hostOutage.reconnect', 'Reconnect'),
+            onClick: () => reconnect(outage.environmentId),
+            disabled: connecting
+          }
+        }
+      : {})
+  }
+}
diff --git a/src/renderer/src/components/native-chat/use-native-chat-local-command-answer.ts b/src/renderer/src/components/native-chat/use-native-chat-local-command-answer.ts
index f85caf1ead66..4b1ac6f36109 100644
--- a/src/renderer/src/components/native-chat/use-native-chat-local-command-answer.ts
+++ b/src/renderer/src/components/native-chat/use-native-chat-local-command-answer.ts
@@ -4,7 +4,6 @@ import { getNativeChatCommandReply } from '../../../../shared/native-chat-agent-
 import { deriveNativeChatContextUsage } from '../../../../shared/native-chat-context-usage'
 import type { NativeChatMessage } from '../../../../shared/native-chat-types'
 import { ompModelSelector } from '../../../../shared/omp-model-list-probe'
-import { pushHistory, type HistoryState } from './native-chat-composer-state'
 import {
   formatNativeChatContextUsageAnswer,
   formatNativeChatContextUsageUnreported
@@ -80,7 +79,6 @@ export function answerNativeChatCommandInComposer(args: {
   sessionOptionsSurface: NativeChatPtySessionOptionsSurface | null
   onSlashCommand?: (command: string, output?: string) => void
   onSubmitted?: () => void
-  setHistory: Dispatch<SetStateAction<HistoryState>>
   setDraft: (value: string) => void
   setCaret: Dispatch<SetStateAction<number>>
   clearSkillOrigin: () => void
@@ -97,7 +95,6 @@ export function answerNativeChatCommandInComposer(args: {
   }
   args.onSlashCommand?.(command, answer)
   args.onSubmitted?.()
-  args.setHistory((previous) => pushHistory(previous, args.draft))
   args.setDraft('')
   args.setCaret(0)
   args.clearSkillOrigin()
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 796b11f6f2f8..58e48d370ea1 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
@@ -41,6 +41,9 @@ function slotsOf(messages: NativeChatMessage[]) {
   })
 }
 
+/** No test but the preview's reads the rows the slots came from. */
+const NO_ROWS = { messages: [], turnKeys: [] }
+
 const CONVERSATION = [
   message('u1', 'user'),
   message('a1', 'assistant'),
@@ -56,7 +59,8 @@ describe('message rail hook', () => {
     )
     const scrollRef = { current: document.createElement('div') }
     const { result, rerender, unmount } = renderHook(
-      ({ slots }) => useNativeChatMessageRail({ scrollRef, slots, virtualItems: [] }),
+      ({ slots }) =>
+        useNativeChatMessageRail({ scrollRef, slots, turnRows: NO_ROWS, virtualItems: [] }),
       { initialProps: { slots: slotsOf(conversation) } }
     )
     const initial = result.current
@@ -75,6 +79,36 @@ describe('message rail hook', () => {
     derive.mockRestore()
   })
 
+  it('keeps the previewed reply current while its turn streams', () => {
+    const scrollRef = { current: document.createElement('div') }
+    const streamed = (body: string) => {
+      const messages = [
+        ...CONVERSATION,
+        { ...message('a3', 'assistant'), blocks: [{ type: 'text' as const, text: body }] }
+      ]
+      return {
+        slots: slotsOf(messages),
+        turnRows: { messages, turnKeys: ['u1', 'u1', 'u2', 'u2', 'u3', 'u3'] }
+      }
+    }
+    const { result, rerender, unmount } = renderHook(
+      ({ slots, turnRows }) =>
+        useNativeChatMessageRail({ scrollRef, slots, turnRows, virtualItems: [] }),
+      { initialProps: streamed('Thinking') }
+    )
+    expect(result.current.previewReply).toBe('')
+    act(() => result.current.onPreview('u3'))
+    expect(result.current.previewReply).toBe('Thinking')
+    rerender(streamed('Thinking it through'))
+    expect(result.current.previewReply).toBe('Thinking it through')
+    // Closed, the rail's state stops following the stream.
+    act(() => result.current.onPreview(null))
+    const closed = result.current
+    rerender(streamed('Thinking it through, done'))
+    expect(result.current).toBe(closed)
+    unmount()
+  })
+
   it('removes its scroll listener and pending idle read on unmount', () => {
     vi.useFakeTimers()
     const element = document.createElement('div')
@@ -83,6 +117,7 @@ describe('message rail hook', () => {
       useNativeChatMessageRail({
         scrollRef: { current: element },
         slots: slotsOf(CONVERSATION),
+        turnRows: NO_ROWS,
         virtualItems: []
       })
     )
@@ -103,7 +138,8 @@ describe('message rail hook', () => {
     const addListener = vi.spyOn(element, 'addEventListener')
 
     const { rerender } = renderHook(
-      ({ slots }) => useNativeChatMessageRail({ scrollRef, slots, virtualItems: [] }),
+      ({ slots }) =>
+        useNativeChatMessageRail({ scrollRef, slots, turnRows: NO_ROWS, virtualItems: [] }),
       { initialProps: { slots: slotsOf(CONVERSATION) } }
     )
     // Same prompts, new array identity — exactly what a re-render produces.
@@ -119,7 +155,12 @@ describe('message rail hook', () => {
     const scrollRef = { current: element }
 
     const { result } = renderHook(() =>
-      useNativeChatMessageRail({ scrollRef, slots: slotsOf(CONVERSATION), virtualItems: [] })
+      useNativeChatMessageRail({
+        scrollRef,
+        slots: slotsOf(CONVERSATION),
+        turnRows: NO_ROWS,
+        virtualItems: []
+      })
     )
     expect(result.current.items.map((item) => item.id)).toEqual(['u1', 'u2', 'u3'])
     expect(result.current.visible).toBe(true)
@@ -128,13 +169,14 @@ describe('message rail hook', () => {
       useNativeChatMessageRail({
         scrollRef,
         slots: slotsOf([message('u1', 'user'), message('a1', 'assistant')]),
+        turnRows: NO_ROWS,
         virtualItems: []
       })
     )
     expect(single.current.visible).toBe(true)
 
     const { result: empty } = renderHook(() =>
-      useNativeChatMessageRail({ scrollRef, slots: [], virtualItems: [] })
+      useNativeChatMessageRail({ scrollRef, slots: [], turnRows: NO_ROWS, virtualItems: [] })
     )
     expect(empty.current.visible).toBe(false)
   })
@@ -148,7 +190,13 @@ describe('message rail hook', () => {
     }))
     const loaded = [message('u1', 'user'), message('a1', 'assistant')]
     const { result } = renderHook(() =>
-      useNativeChatMessageRail({ scrollRef, slots: slotsOf(loaded), virtualItems: [], outline })
+      useNativeChatMessageRail({
+        scrollRef,
+        slots: slotsOf(loaded),
+        turnRows: NO_ROWS,
+        virtualItems: [],
+        outline
+      })
     )
     expect(result.current.visible).toBe(true)
     expect(result.current.items.map((item) => item.id)).toEqual([
diff --git a/src/renderer/src/components/native-chat/use-native-chat-message-rail.ts b/src/renderer/src/components/native-chat/use-native-chat-message-rail.ts
index b066401b23b4..e5ca4dcc430e 100644
--- a/src/renderer/src/components/native-chat/use-native-chat-message-rail.ts
+++ b/src/renderer/src/components/native-chat/use-native-chat-message-rail.ts
@@ -10,9 +10,13 @@ import { findActiveNativeChatRailItem } from './native-chat-active-rail-item'
 import {
   buildNativeChatRailItems,
   mergeNativeChatRailOutline,
+  NATIVE_CHAT_RAIL_ROOMY_TICKS,
+  nativeChatRailReplyPreview,
+  nativeChatRailTickCapacity,
   selectNativeChatRailTicks,
   type NativeChatRailItem,
-  type NativeChatRailOutlineEntry
+  type NativeChatRailOutlineEntry,
+  type NativeChatRailTurnRows
 } from './native-chat-message-rail-items'
 import type { NativeChatTranscriptSlot } from './native-chat-transcript-slots'
 import type { NativeChatTranscriptWindow } from './use-native-chat-transcript-window'
@@ -20,31 +24,49 @@ import type { NativeChatTranscriptWindow } from './use-native-chat-transcript-wi
 /** Quiet period that counts as "stopped scrolling". */
 export const NATIVE_CHAT_RAIL_IDLE_MS = 120
 
-/** Narrower than this the panel would cover the message it previews, so the whole
- *  rail stands down rather than half-working in a split pane. */
+/** Narrower than this the preview card would cover the transcript it sits beside,
+ *  so the whole rail stands down rather than half-working in a split pane. */
 export const NATIVE_CHAT_RAIL_MIN_WIDTH_PX = 512
 
 export type NativeChatMessageRailState = {
   ticks: readonly NativeChatRailItem[]
   items: readonly NativeChatRailItem[]
   activeId: string | null
+  /** Light a tick now, ahead of the scroll that is taking the reader to it. */
+  onActivate: (id: string) => void
   visible: boolean
+  /** The item whose preview is open, if any. */
+  previewId: string | null
+  /** The item whose tick holds keyboard focus, if any. */
+  focusId: string | null
+  /** The rail names the item it focused, or is about to: an item named here
+   *  always has a tick, so arrow keys can walk every message, sampled or not. */
+  onFocusItem: (id: string | null) => void
+  /** What the agent answered the previewed item with; empty when nothing is
+   *  previewed or it has said nothing. Follows a reply that is still streaming. */
+  previewReply: string
+  /** The rail names the item its preview shows, or null once it closes. */
+  onPreview: (id: string | null) => void
 }
 
 export function useNativeChatMessageRail({
   scrollRef,
   slots,
+  turnRows,
   virtualItems,
   outline = null
 }: {
   scrollRef: React.RefObject<HTMLDivElement | null>
   slots: readonly NativeChatTranscriptSlot[]
+  /** The rows the slots were built from, for the previewed turn's reply. */
+  turnRows: NativeChatRailTurnRows
   virtualItems: NativeChatTranscriptWindow['virtualItems']
   /** User messages older than the loaded window; null when none are known. */
   outline?: readonly NativeChatRailOutlineEntry[] | null
 }): NativeChatMessageRailState {
   const [activeId, setActiveId] = useState<string | null>(null)
   const [wideEnough, setWideEnough] = useState(true)
+  const [maxTicks, setMaxTicks] = useState(NATIVE_CHAT_RAIL_ROOMY_TICKS)
 
   const previousItemsRef = useRef<readonly NativeChatRailItem[]>([])
   const loadedItems = buildNativeChatRailItems(slots, previousItemsRef.current)
@@ -122,20 +144,34 @@ export function useNativeChatMessageRail({
     }
     const observer = new ResizeObserver(() => {
       setWideEnough(element.clientWidth >= NATIVE_CHAT_RAIL_MIN_WIDTH_PX)
+      setMaxTicks(nativeChatRailTickCapacity(element.clientHeight))
     })
     observer.observe(element)
     return () => observer.disconnect()
   }, [scrollRef])
 
-  const ticks = useMemo(() => selectNativeChatRailTicks({ items, activeId }), [items, activeId])
+  const [previewId, setPreviewId] = useState<string | null>(null)
+  const [focusId, setFocusId] = useState<string | null>(null)
+  const ticks = useMemo(
+    () => selectNativeChatRailTicks({ items, keepIds: [activeId, focusId, previewId], maxTicks }),
+    [items, activeId, focusId, previewId, maxTicks]
+  )
+  const previewReply =
+    previewId === null ? '' : nativeChatRailReplyPreview(turnRows, items, previewId)
 
   return useMemo(
     () => ({
       ticks,
       items,
       activeId,
-      visible: wideEnough && items.length > 0
+      onActivate: setActiveId,
+      visible: wideEnough && items.length > 0,
+      previewId,
+      previewReply,
+      onPreview: setPreviewId,
+      focusId,
+      onFocusItem: setFocusId
     }),
-    [ticks, items, activeId, wideEnough]
+    [ticks, items, activeId, wideEnough, previewId, previewReply, focusId]
   )
 }
diff --git a/src/renderer/src/components/native-chat/use-native-chat-paste-lifetime.ts b/src/renderer/src/components/native-chat/use-native-chat-paste-lifetime.ts
new file mode 100644
index 000000000000..f801303dab14
--- /dev/null
+++ b/src/renderer/src/components/native-chat/use-native-chat-paste-lifetime.ts
@@ -0,0 +1,128 @@
+import { useCallback, useLayoutEffect, useMemo, useRef } from 'react'
+import type { NativeChatAttachmentOwner } from './native-chat-attachment-upload'
+
+/**
+ * The pending chips of pastes this composer started, released when it unmounts or changes target.
+ * A paste uploading into a paired server's store outlives the composer, which a prompt card
+ * unmounts: its chip stays pending in the scope's attachment cache, where its result settles for
+ * the composer's return (`native-chat-pending-attachment-cache.ts`).
+ */
+export function useNativeChatPasteLifetime(args: {
+  targetKey?: string
+  beginPendingImageAttachment: (
+    previewUrl?: string,
+    pendingName?: string,
+    options?: { hidden?: true }
+  ) => string | null
+  /** Files the result into the composer's scope even once this instance is unmounted. */
+  resolvePendingImageAttachment: (id: string, path: string, connectionId?: string | null) => void
+  revealPendingImageAttachment?: (id: string, previewUrl?: string) => void
+  dropPendingImageAttachment: (id: string) => void
+}): {
+  lifetime: { active: boolean; pending: Map<string, string> }
+  track: (pendingId: string, preview: string, owner: NativeChatAttachmentOwner) => void
+  /** A paste's chip, shown at once with the clipboard's own thumbnail, or held out of sight
+   *  (`hidden`) until `reveal`; `id` is null when the composer refused it. */
+  startImageChip: (
+    owner: NativeChatAttachmentOwner,
+    imageFile: Blob,
+    options: { hidden: boolean; canShow: () => boolean }
+  ) => { id: string | null; reveal: () => void }
+  keepStoreUploadAfterUnmount: (
+    pendingId: string | null,
+    saved: { status: string; tempPath?: string }
+  ) => boolean
+} {
+  const { targetKey, beginPendingImageAttachment, revealPendingImageAttachment } = args
+  const { resolvePendingImageAttachment, dropPendingImageAttachment } = args
+  const dropPendingRef = useRef(dropPendingImageAttachment)
+  useLayoutEffect(() => {
+    dropPendingRef.current = dropPendingImageAttachment
+  }, [dropPendingImageAttachment])
+  const lifetime = useMemo(
+    () => ({
+      targetKey,
+      active: false,
+      pending: new Map<string, string>(),
+      storeUploads: new Set<string>()
+    }),
+    [targetKey]
+  )
+  useLayoutEffect(() => {
+    lifetime.active = true
+    return () => {
+      lifetime.active = false
+      for (const [id, preview] of lifetime.pending) {
+        if (preview.startsWith('blob:')) {
+          URL.revokeObjectURL(preview)
+        }
+        if (!lifetime.storeUploads.has(id)) {
+          dropPendingRef.current(id)
+        }
+      }
+      lifetime.pending.clear()
+    }
+  }, [lifetime])
+  const track = useCallback(
+    (pendingId: string, preview: string, owner: NativeChatAttachmentOwner) => {
+      lifetime.pending.set(pendingId, preview)
+      if (owner.kind === 'runtime-session') {
+        lifetime.storeUploads.add(pendingId)
+      }
+    },
+    [lifetime]
+  )
+  const startImageChip = useCallback(
+    (
+      owner: NativeChatAttachmentOwner,
+      imageFile: Blob,
+      options: { hidden: boolean; canShow: () => boolean }
+    ): { id: string | null; reveal: () => void } => {
+      if (options.hidden) {
+        const id = beginPendingImageAttachment(undefined, undefined, { hidden: true })
+        if (id) {
+          track(id, '', owner)
+        }
+        // Through the scope's cache, so it shows even in a composer that came back since.
+        const reveal = (): void => {
+          if (!id) {
+            return
+          }
+          const previewUrl = lifetime.active ? URL.createObjectURL(imageFile) : undefined
+          if (previewUrl) {
+            lifetime.pending.set(id, previewUrl)
+          }
+          revealPendingImageAttachment?.(id, previewUrl)
+        }
+        return { id, reveal }
+      }
+      if (!options.canShow()) {
+        return { id: null, reveal: () => {} }
+      }
+      const previewUrl = URL.createObjectURL(imageFile)
+      const id = beginPendingImageAttachment(previewUrl)
+      if (id) {
+        track(id, previewUrl, owner)
+      } else {
+        URL.revokeObjectURL(previewUrl)
+      }
+      return { id, reveal: () => {} }
+    },
+    [beginPendingImageAttachment, lifetime, revealPendingImageAttachment, track]
+  )
+  const keepStoreUploadAfterUnmount = useCallback(
+    (pendingId: string | null, saved: { status: string; tempPath?: string }): boolean => {
+      if (!pendingId || lifetime.active || !lifetime.storeUploads.has(pendingId)) {
+        return false
+      }
+      if (saved.status === 'saved' && saved.tempPath) {
+        resolvePendingImageAttachment(pendingId, saved.tempPath, null)
+      } else {
+        dropPendingImageAttachment(pendingId)
+      }
+      return true
+    },
+    [dropPendingImageAttachment, lifetime, resolvePendingImageAttachment]
+  )
+  return { lifetime, track, startImageChip, keepStoreUploadAfterUnmount }
+}
diff --git a/src/renderer/src/components/native-chat/use-native-chat-picker-command-dispatch.test.tsx b/src/renderer/src/components/native-chat/use-native-chat-picker-command-dispatch.test.tsx
index 05a65b7c0778..53ef9eafd77f 100644
--- a/src/renderer/src/components/native-chat/use-native-chat-picker-command-dispatch.test.tsx
+++ b/src/renderer/src/components/native-chat/use-native-chat-picker-command-dispatch.test.tsx
@@ -2,7 +2,6 @@
 
 import { act, renderHook } from '@testing-library/react'
 import { beforeEach, describe, expect, it, vi } from 'vitest'
-import { EMPTY_HISTORY } from './native-chat-composer-state'
 
 const sendNativeChatMessage = vi.fn()
 const sendNativeChatTypedCommand = vi.fn()
@@ -38,7 +37,6 @@ function renderDispatch(agent: 'codex' | 'claude' | 'openclaude', onSubmitted =
       resolveTarget: () => ({ settings: {}, ptyId: 'pty-1' }),
       sessionOptionsSurface: null,
       trackPendingSend: vi.fn(),
-      setHistory: vi.fn((update) => update(EMPTY_HISTORY)),
       setDraft: vi.fn(),
       setCaret: vi.fn(),
       setActiveSuggestion: vi.fn(),
diff --git a/src/renderer/src/components/native-chat/use-native-chat-picker-command-dispatch.ts b/src/renderer/src/components/native-chat/use-native-chat-picker-command-dispatch.ts
index 658873398138..ec99002783bf 100644
--- a/src/renderer/src/components/native-chat/use-native-chat-picker-command-dispatch.ts
+++ b/src/renderer/src/components/native-chat/use-native-chat-picker-command-dispatch.ts
@@ -10,11 +10,7 @@ import {
   nativeChatComposerTargetIsRemote,
   type NativeChatResolvedTarget
 } from './native-chat-composer-target'
-import {
-  pushHistory,
-  type HistoryState,
-  type NativeChatPickerItem
-} from './native-chat-composer-state'
+import type { NativeChatPickerItem } from './native-chat-composer-state'
 import type { NativeChatSendLifecycle } from './use-native-chat-send-lifecycle'
 import type { NativeChatPtySessionOptionsSurface } from './native-chat-pty-session-options'
 import {
@@ -32,7 +28,6 @@ export function useNativeChatPickerCommandDispatch(args: {
   onSubmitted?: () => void
   sessionOptionsSurface: NativeChatPtySessionOptionsSurface | null
   trackPendingSend: NativeChatSendLifecycle['trackPendingSend']
-  setHistory: Dispatch<SetStateAction<HistoryState>>
   setDraft: (value: string) => void
   setCaret: Dispatch<SetStateAction<number>>
   setActiveSuggestion: Dispatch<SetStateAction<number>>
@@ -50,7 +45,6 @@ export function useNativeChatPickerCommandDispatch(args: {
     onSubmitted,
     sessionOptionsSurface,
     trackPendingSend,
-    setHistory,
     setDraft,
     setCaret,
     setActiveSuggestion,
@@ -72,7 +66,6 @@ export function useNativeChatPickerCommandDispatch(args: {
           sessionOptionsSurface,
           onSlashCommand,
           onSubmitted,
-          setHistory,
           setDraft,
           setCaret,
           clearSkillOrigin,
@@ -101,7 +94,6 @@ export function useNativeChatPickerCommandDispatch(args: {
         runtime: nativeChatComposerTargetIsRemote(target.ptyId) ? 'remote' : 'local'
       })
       onSubmitted?.()
-      setHistory((previous) => pushHistory(previous, text))
       setDraft('')
       setCaret(0)
       setActiveSuggestion(0)
@@ -123,7 +115,6 @@ export function useNativeChatPickerCommandDispatch(args: {
       setActiveSuggestion,
       setCaret,
       setDraft,
-      setHistory,
       setNotice,
       trackPendingSend
     ]
diff --git a/src/renderer/src/components/native-chat/use-native-chat-prompt-card-focus.ts b/src/renderer/src/components/native-chat/use-native-chat-prompt-card-focus.ts
index 3eb01f2cf0af..957c0211a448 100644
--- a/src/renderer/src/components/native-chat/use-native-chat-prompt-card-focus.ts
+++ b/src/renderer/src/components/native-chat/use-native-chat-prompt-card-focus.ts
@@ -1,22 +1,31 @@
 import { useLayoutEffect, type RefObject } from 'react'
+import { NATIVE_CHAT_ROOT_SELECTOR } from '@/lib/native-chat-paste-request'
+
+/** Whether `element` is nothing in particular (the body) or inside the chat pane holding `card`. */
+export function isInNativeChatPaneOf(card: HTMLElement | null, element: Element | null): boolean {
+  return (
+    !element ||
+    element === document.body ||
+    Boolean(card?.closest(NATIVE_CHAT_ROOT_SELECTOR)?.contains(element))
+  )
+}
 
 /**
  * Focus a prompt card when it takes the input region, in the same commit, so keys leave this
- * pane's hidden composer at once. Never takes focus from another surface the user is in.
+ * pane's hidden composer at once. Never takes focus from another surface the user is in, nor
+ * from a control inside the card. `step` re-runs it when the card swaps its content, which
+ * drops focus to the body if the focused control was replaced.
  */
 export function useNativeChatPromptCardFocus(
   cardRef: RefObject<HTMLElement | null>,
-  shouldFocus: boolean
+  shouldFocus: boolean,
+  step?: number
 ): void {
   useLayoutEffect(() => {
     const card = cardRef.current
     const active = document.activeElement
-    const fromThisPane =
-      !active ||
-      active === document.body ||
-      card?.closest('[data-native-chat-root]')?.contains(active)
-    if (shouldFocus && fromThisPane) {
+    if (shouldFocus && isInNativeChatPaneOf(card, active) && !card?.contains(active)) {
       card?.focus()
     }
-  }, [cardRef, shouldFocus])
+  }, [cardRef, shouldFocus, step])
 }
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 41c140e372c5..193037770d4d 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
@@ -7,6 +7,7 @@ import {
   useStructuredAgentSessionLaunchLifecycle,
   useStructuredAgentSessionLaunchSelection
 } from '@/lib/structured-agent-session-launch'
+import { relaunchFailedStructuredAgentSessionWithMessage } from '@/lib/structured-agent-session-launch-message'
 import { toRuntimeWorktreeSelector } from '@/runtime/runtime-worktree-selector'
 
 /** A chat this view launched: a new conversation, or one resumed from history. */
@@ -73,22 +74,32 @@ export function useNativeChatProvisionalLaunch(
       retryStructuredAgentSessionLaunch(worktreeId, sessionId)
     }
   }, [sessionId, worktreeId])
-  const sendThroughRelaunch = useCallback(
-    (send: () => boolean): boolean => {
-      const accepted = send()
-      if (accepted && worktreeId) {
-        relaunchFailedStructuredAgentSessionForMessage(worktreeId, sessionId)
+  // While the chat starts it takes no send, so Send stays off and the text stays in the box.
+  const starting = lifecycle === 'pending' || lifecycle === 'visibility-unknown'
+  const sendThroughLaunch = useCallback(
+    (text: string, withImages: boolean, send: () => boolean | 'queued'): boolean | 'queued' => {
+      if (starting) {
+        return false
       }
-      return accepted
+      if (lifecycle !== 'failed' || !worktreeId) {
+        return send()
+      }
+      // A failed start restarts, and a text message goes as the restart's first message.
+      if (!withImages && text.trim()) {
+        return relaunchFailedStructuredAgentSessionWithMessage(worktreeId, sessionId, text) !== null
+      }
+      relaunchFailedStructuredAgentSessionForMessage(worktreeId, sessionId)
+      return false
     },
-    [sessionId, worktreeId]
+    [lifecycle, sessionId, starting, worktreeId]
   )
   return {
     lifecycle,
     launch,
     failure,
     retry,
-    sendThroughRelaunch,
+    starting,
+    sendThroughLaunch,
     transportEnabled: lifecycle === null || lifecycle === 'published'
   }
 }
diff --git a/src/renderer/src/components/native-chat/use-native-chat-pty-composer-send.test.tsx b/src/renderer/src/components/native-chat/use-native-chat-pty-composer-send.test.tsx
index 1751d59c7853..68565ace5d6c 100644
--- a/src/renderer/src/components/native-chat/use-native-chat-pty-composer-send.test.tsx
+++ b/src/renderer/src/components/native-chat/use-native-chat-pty-composer-send.test.tsx
@@ -44,7 +44,6 @@ function send(
       sessionOptionsSurface: null,
       terminalTabId: 'tab',
       trackPendingSend: vi.fn(),
-      setHistory: vi.fn(),
       setDraft: vi.fn(),
       setCaret: vi.fn(),
       clearSkillOrigin: vi.fn(),
diff --git a/src/renderer/src/components/native-chat/use-native-chat-pty-composer-send.ts b/src/renderer/src/components/native-chat/use-native-chat-pty-composer-send.ts
index eeb15b8c22c6..c1f979d4e840 100644
--- a/src/renderer/src/components/native-chat/use-native-chat-pty-composer-send.ts
+++ b/src/renderer/src/components/native-chat/use-native-chat-pty-composer-send.ts
@@ -13,7 +13,6 @@ import { sendNativeChatMessageWithImageAttachments } from './native-chat-runtime
 import { resolveNativeChatLaunchDraftSend } from './native-chat-launch-draft-send'
 import { nativeChatComposerTargetIsRemote } from './native-chat-composer-target'
 import type { NativeChatResolvedTarget } from './native-chat-composer-target'
-import { pushHistory, type HistoryState } from './native-chat-composer-state'
 import { isSlashCommandDraft } from '../../../../shared/native-chat-slash-commands'
 import type { NativeChatPickerState } from './use-native-chat-picker-state'
 import type { NativeChatSendLifecycle } from './use-native-chat-send-lifecycle'
@@ -43,7 +42,6 @@ export function useNativeChatPtyComposerSend(args: {
   sessionOptionsSurface: NativeChatPtySessionOptionsSurface | null
   terminalTabId: string
   trackPendingSend: NativeChatSendLifecycle['trackPendingSend']
-  setHistory: Dispatch<SetStateAction<HistoryState>>
   setDraft: (value: string) => void
   setCaret: Dispatch<SetStateAction<number>>
   clearSkillOrigin: () => void
@@ -131,7 +129,6 @@ export function useNativeChatPtyComposerSend(args: {
       runtime: nativeChatComposerTargetIsRemote(target.ptyId) ? 'remote' : 'local'
     })
     args.onSubmitted?.()
-    args.setHistory((previous) => pushHistory(previous, text))
     args.setDraft('')
     args.setCaret(0)
     args.clearSkillOrigin()
diff --git a/src/renderer/src/components/native-chat/use-native-chat-question-auto-advance.ts b/src/renderer/src/components/native-chat/use-native-chat-question-auto-advance.ts
new file mode 100644
index 000000000000..cd52c67f43a1
--- /dev/null
+++ b/src/renderer/src/components/native-chat/use-native-chat-question-auto-advance.ts
@@ -0,0 +1,17 @@
+import { useEffect, useRef } from 'react'
+import { NATIVE_CHAT_QUESTION_AUTO_ADVANCE_MS } from '../../../../shared/native-chat-question-auto-advance'
+
+/** One cancellable delayed step: a single-select pick shows as chosen before the card moves on. */
+export function useNativeChatQuestionAutoAdvance(): {
+  schedule: (step: () => void) => void
+  cancel: () => void
+} {
+  const timerRef = useRef<ReturnType<typeof setTimeout>>(undefined)
+  const cancel = (): void => clearTimeout(timerRef.current)
+  const schedule = (step: () => void): void => {
+    cancel()
+    timerRef.current = setTimeout(step, NATIVE_CHAT_QUESTION_AUTO_ADVANCE_MS)
+  }
+  useEffect(() => () => clearTimeout(timerRef.current), [])
+  return { schedule, cancel }
+}
diff --git a/src/renderer/src/components/native-chat/use-native-chat-question-number-keys.ts b/src/renderer/src/components/native-chat/use-native-chat-question-number-keys.ts
new file mode 100644
index 000000000000..ce68bec29326
--- /dev/null
+++ b/src/renderer/src/components/native-chat/use-native-chat-question-number-keys.ts
@@ -0,0 +1,47 @@
+import { useEffect, useEffectEvent, type RefObject } from 'react'
+import { isEditableTarget } from '@/lib/editable-target'
+import { isInNativeChatPaneOf } from './use-native-chat-prompt-card-focus'
+
+/**
+ * Digits 1–9 pick the option with that number while the card owns its pane's keyboard.
+ * Listens on the document because focus falls to the body when a focused row is replaced;
+ * keys aimed at a text field or at another surface are left alone.
+ */
+export function useNativeChatQuestionNumberKeys(
+  cardRef: RefObject<HTMLElement | null>,
+  enabled: boolean,
+  optionCount: number,
+  onPick: (optionIndex: number) => void
+): void {
+  const onKeyDown = useEffectEvent((event: KeyboardEvent): void => {
+    if (
+      event.defaultPrevented ||
+      event.repeat ||
+      event.isComposing ||
+      event.metaKey ||
+      event.ctrlKey ||
+      event.altKey ||
+      !/^[1-9]$/.test(event.key)
+    ) {
+      return
+    }
+    const optionIndex = Number(event.key) - 1
+    const target = event.target instanceof Element ? event.target : null
+    if (
+      optionIndex >= optionCount ||
+      isEditableTarget(target) ||
+      !isInNativeChatPaneOf(cardRef.current, target)
+    ) {
+      return
+    }
+    event.preventDefault()
+    onPick(optionIndex)
+  })
+  useEffect(() => {
+    if (!enabled) {
+      return
+    }
+    document.addEventListener('keydown', onKeyDown)
+    return () => document.removeEventListener('keydown', onKeyDown)
+  }, [enabled])
+}
diff --git a/src/renderer/src/components/native-chat/use-native-chat-rail-jump-landing.ts b/src/renderer/src/components/native-chat/use-native-chat-rail-jump-landing.ts
new file mode 100644
index 000000000000..4f580b9f6b95
--- /dev/null
+++ b/src/renderer/src/components/native-chat/use-native-chat-rail-jump-landing.ts
@@ -0,0 +1,50 @@
+// Carrying out a rail jump to a loaded message: scroll its row to the top, light
+// its tick, release the request.
+//
+// Pinning the target mounts it in the same commit, so the row exists by the time
+// layout runs. Routed through `scrollMessageToTop` rather than the virtualizer
+// because that is what releases the bottom pin — without it the next streamed
+// token snaps the reader straight back down.
+//
+// Serviced once per request, then released. `slots` takes a new identity on
+// every render, so an effect that merely depended on it would re-scroll to this
+// row forever; and a request left standing would keep its pin, which outranks
+// the diff reveal that shares it.
+
+import { useLayoutEffect, useRef } from 'react'
+import {
+  nativeChatSlotIndexOf,
+  type NativeChatTranscriptSlot
+} from './native-chat-transcript-slots'
+
+export function useNativeChatRailJumpLanding({
+  railJump,
+  slots,
+  scrollRef,
+  scrollMessageToTop,
+  onActivate,
+  release
+}: {
+  railJump: { messageId: string; requestId: number } | null
+  slots: readonly NativeChatTranscriptSlot[]
+  scrollRef: React.RefObject<HTMLDivElement | null>
+  scrollMessageToTop: (element: HTMLElement) => void
+  onActivate: (id: string) => void
+  release: (request: null) => void
+}): void {
+  const servicedRef = useRef(0)
+  useLayoutEffect(() => {
+    if (railJump === null || servicedRef.current === railJump.requestId) {
+      return
+    }
+    servicedRef.current = railJump.requestId
+    const index = nativeChatSlotIndexOf(slots, railJump.messageId)
+    const row = scrollRef.current?.querySelector<HTMLElement>(`[data-index="${index}"]`)
+    if (row) {
+      scrollMessageToTop(row)
+    }
+    // Lit now: the scroll's own position report only arrives once it settles.
+    onActivate(railJump.messageId)
+    release(null)
+  }, [onActivate, railJump, release, scrollMessageToTop, scrollRef, slots])
+}
diff --git a/src/renderer/src/components/native-chat/use-native-chat-rewind.ts b/src/renderer/src/components/native-chat/use-native-chat-rewind.ts
index 6a979be407b4..bd71d991fe3e 100644
--- a/src/renderer/src/components/native-chat/use-native-chat-rewind.ts
+++ b/src/renderer/src/components/native-chat/use-native-chat-rewind.ts
@@ -20,7 +20,7 @@ import type {
   StructuredAgentSessionWrite,
   StructuredAgentSessionWriteOutcome
 } from './use-structured-agent-session-mutate'
-import { returnMessageToComposer } from './structured-agent-session-withdrawn-message-restore'
+import { returnMessageToComposer } from './structured-agent-session-message-hand-back'
 import { nativeChatRewindOffered } from './native-chat-rewind-eligibility'
 import type { RuntimeClientTarget } from '@/runtime/runtime-client-target'
 import { useStructuredAgentSessionHostRecoversRewindOnSend } from '@/runtime/structured-agent-session-host-capability'
diff --git a/src/renderer/src/components/native-chat/use-native-chat-session-option-command.test.tsx b/src/renderer/src/components/native-chat/use-native-chat-session-option-command.test.tsx
index 92b32f93b978..f76a78dd7323 100644
--- a/src/renderer/src/components/native-chat/use-native-chat-session-option-command.test.tsx
+++ b/src/renderer/src/components/native-chat/use-native-chat-session-option-command.test.tsx
@@ -24,8 +24,7 @@ function renderDispatch(agent: 'codex' | 'claude' | 'openclaude', onSubmitted =
       agent,
       onSubmitted,
       disabled: false,
-      resolveTarget: () => ({ settings: {}, ptyId: 'pty-1' }),
-      setHistory: vi.fn()
+      resolveTarget: () => ({ settings: {}, ptyId: 'pty-1' })
     })
   )
 }
diff --git a/src/renderer/src/components/native-chat/use-native-chat-session-option-command.ts b/src/renderer/src/components/native-chat/use-native-chat-session-option-command.ts
index e5dae9f1c511..c1b034eaf683 100644
--- a/src/renderer/src/components/native-chat/use-native-chat-session-option-command.ts
+++ b/src/renderer/src/components/native-chat/use-native-chat-session-option-command.ts
@@ -1,11 +1,10 @@
-import { useCallback, useEffect, useRef, useState, type Dispatch, type SetStateAction } from 'react'
+import { useCallback, useEffect, useRef, useState } from 'react'
 import type { AgentType } from '../../../../shared/agent-status-types'
 import { emitNativeChatMessageSent } from '@/lib/native-chat-telemetry'
 import {
   nativeChatComposerTargetIsRemote,
   type NativeChatResolvedTarget
 } from './native-chat-composer-target'
-import { pushHistory, type HistoryState } from './native-chat-composer-state'
 import { sendNativeChatMessageVerified, typeNativeChatCommand } from './native-chat-runtime-send'
 import { cancelNativeChatPtySends, waitForNativeChatPtyIdle } from './native-chat-pty-send-queue'
 import {
@@ -20,9 +19,8 @@ export function useNativeChatSessionOptionCommand(args: {
   onSlashCommand?: (command: string) => void
   onSubmitted?: () => void
   resolveTarget: () => NativeChatResolvedTarget | null
-  setHistory: Dispatch<SetStateAction<HistoryState>>
 }): { dispatch: NativeChatSessionOptionDispatchCommand; isDispatching: boolean } {
-  const { agent, disabled, onSlashCommand, onSubmitted, resolveTarget, setHistory } = args
+  const { agent, disabled, onSlashCommand, onSubmitted, resolveTarget } = args
   const mountedRef = useRef(true)
   const activeObserversRef = useRef(new Set<ClaudeModelSwitchConfirmationObserver>())
   const activeSendsRef = useRef(new Set<AbortController>())
@@ -114,7 +112,6 @@ export function useNativeChatSessionOptionCommand(args: {
           agent,
           runtime: nativeChatComposerTargetIsRemote(target.ptyId) ? 'remote' : 'local'
         })
-        setHistory((previous) => pushHistory(previous, command))
         const outcome = observer ? await observer.result : undefined
         return { outcome }
       } finally {
@@ -126,7 +123,7 @@ export function useNativeChatSessionOptionCommand(args: {
         }
       }
     },
-    [agent, disabled, onSlashCommand, onSubmitted, resolveTarget, setHistory]
+    [agent, disabled, onSlashCommand, onSubmitted, resolveTarget]
   )
 
   return { dispatch, isDispatching }
diff --git a/src/renderer/src/components/native-chat/use-native-chat-structured-composer-send.test.tsx b/src/renderer/src/components/native-chat/use-native-chat-structured-composer-send.test.tsx
index 10e4c781c0fe..18fc826a30a0 100644
--- a/src/renderer/src/components/native-chat/use-native-chat-structured-composer-send.test.tsx
+++ b/src/renderer/src/components/native-chat/use-native-chat-structured-composer-send.test.tsx
@@ -48,7 +48,6 @@ function harness(
       structuredTransport,
       isComposing: () => false,
       clearSkillOrigin: vi.fn(),
-      setHistory: vi.fn(),
       setDraft: vi.fn(),
       setCaret: vi.fn()
     })
@@ -100,6 +99,22 @@ describe('attachment guard follows what the host claims', () => {
   })
 })
 
+describe('an attachment still uploading', () => {
+  it('holds a picked command, as Send is held, rather than send the chip without its path', async () => {
+    const { send, structuredTransport } = harness('claude')
+    const pending: NativeChatComposerImageAttachment = {
+      id: 'p1',
+      path: '',
+      pending: true,
+      pendingName: 'notes.pdf'
+    }
+    send('/review', [pending])
+    await Promise.resolve()
+    expect(structuredTransport.send).not.toHaveBeenCalled()
+    expect(structuredTransport.onError).not.toHaveBeenCalled()
+  })
+})
+
 // The pane brings the latest into view on this: a conversation command at the press, a message
 // once admitted, and neither for a refusal or a command the chat does not run.
 describe('reports the sends that bring the latest into view', () => {
diff --git a/src/renderer/src/components/native-chat/use-native-chat-structured-composer-send.ts b/src/renderer/src/components/native-chat/use-native-chat-structured-composer-send.ts
index 0f4a1298c15f..b52e0483d46b 100644
--- a/src/renderer/src/components/native-chat/use-native-chat-structured-composer-send.ts
+++ b/src/renderer/src/components/native-chat/use-native-chat-structured-composer-send.ts
@@ -8,7 +8,6 @@ import {
 } from '../../../../shared/structured-agent-session-composer'
 import type { AgentType } from '../../../../shared/agent-status-types'
 import { dispatchNativeChatStructuredComposerText } from './native-chat-structured-composer-dispatch'
-import { pushHistory, type HistoryState } from './native-chat-composer-state'
 import type { NativeChatStructuredComposerTransport } from './native-chat-composer-types'
 import type { NativeChatComposerImageAttachment } from './NativeChatComposerField'
 import { nativeChatAttachImagesAgainReason } from './native-chat-image-reattach'
@@ -29,7 +28,6 @@ export type UseNativeChatStructuredComposerSendArgs = {
   structuredTransport?: NativeChatStructuredComposerTransport
   isComposing: () => boolean
   clearSkillOrigin: () => void
-  setHistory: (updater: (previous: HistoryState) => HistoryState) => void
   setDraft: (value: string) => void
   setCaret: (caret: number) => void
 }
@@ -63,13 +61,13 @@ export function useNativeChatStructuredComposerSend({
   structuredTransport,
   isComposing,
   clearSkillOrigin,
-  setHistory,
   setDraft,
   setCaret
 }: UseNativeChatStructuredComposerSendArgs): NativeChatStructuredComposerSend {
   return useCallback<NativeChatStructuredComposerSend>(
     async (text, attachments = imageAttachments, sentFrom): Promise<void> => {
-      if (!structuredTransport) {
+      // A picked command is held like Send: it would carry attachments still uploading, pathless.
+      if (!structuredTransport || attachments.some((attachment) => attachment.pending)) {
         return
       }
       const hostCommand = isNativeChatStructuredHostCommand(text, agent, structuredTransport)
@@ -104,13 +102,12 @@ export function useNativeChatStructuredComposerSend({
             structuredTransport.onSubmitted?.()
           }
           // A real user send is a takeover, exactly as typing into a worker's pane is. Only past
-          // `accepted`, and only from this hook: the outbox dispatcher retries and would re-fire,
-          // and orchestration's own pointer nudges never reach the composer at all.
+          // `accepted`, and only from this hook: orchestration's own pointer nudges never reach
+          // the composer at all.
           reportStructuredSessionUserInput(
             structuredTransport.sessionId,
             structuredTransport.runtimeEnvironmentId
           )
-          setHistory((previous) => pushHistory(previous, text))
           // Why: the send settles after a round trip, while this or another composer of the same
           // conversation may have changed the draft; only what was sent leaves it.
           const left = nativeChatComposerDraftLeftAfterSend(
@@ -143,7 +140,6 @@ export function useNativeChatStructuredComposerSend({
       isComposing,
       setCaret,
       setDraft,
-      setHistory,
       structuredTransport
     ]
   )
diff --git a/src/renderer/src/components/native-chat/use-native-chat-structured-composer-transport.ts b/src/renderer/src/components/native-chat/use-native-chat-structured-composer-transport.ts
index 9eb3095ecf43..8e5defdf4055 100644
--- a/src/renderer/src/components/native-chat/use-native-chat-structured-composer-transport.ts
+++ b/src/renderer/src/components/native-chat/use-native-chat-structured-composer-transport.ts
@@ -13,7 +13,14 @@ import type { StructuredAgentSessionQueuedMessagesController } from './use-struc
 export function useNativeChatStructuredComposerTransport(args: {
   props: Pick<NativeChatStructuredViewProps, 'agent' | 'sessionId' | 'target'>
   controller: ReturnType<typeof useStructuredAgentSession>
-  sendThroughRelaunch: (send: () => boolean) => boolean
+  /** Sends now, restarts a failed start with the message, or refuses while the chat starts. */
+  sendThroughLaunch: (
+    text: string,
+    withImages: boolean,
+    send: () => boolean | 'queued'
+  ) => boolean | 'queued'
+  /** The chat is starting: it takes no send yet. */
+  starting: boolean
   worktreeId: string | undefined
   optionPickerRequest: NativeChatOptionPickerRequest | null
   setOptionPickerRequest: Dispatch<SetStateAction<NativeChatOptionPickerRequest | null>>
@@ -21,7 +28,7 @@ export function useNativeChatStructuredComposerTransport(args: {
   onSubmitted: () => void
   queuedMessages: Pick<StructuredAgentSessionQueuedMessagesController, 'queueHold' | 'queueResume'>
 }): NativeChatStructuredComposerTransport {
-  const { props, controller, sendThroughRelaunch, worktreeId, optionPickerRequest } = args
+  const { props, controller, sendThroughLaunch, starting, worktreeId, optionPickerRequest } = args
   const { setOptionPickerRequest, onError, onSubmitted, queuedMessages } = args
   const acceptsImages = useStructuredAgentAcceptsImages(props.target, props.agent)
   return useMemo((): NativeChatStructuredComposerTransport => {
@@ -30,20 +37,17 @@ export function useNativeChatStructuredComposerTransport(args: {
       ? (objective: string) => threadGoal.change({ kind: 'set', objective })
       : null
     return {
-      send: (text, attachments) => {
-        let admission: boolean | 'queued' = false
-        const accepted = sendThroughRelaunch(() => {
-          admission = controller.send(
+      send: (text, attachments) =>
+        sendThroughLaunch(text, attachments.length > 0, () =>
+          controller.send(
             text,
-            attachments.map((attachment) => ({
-              path: attachment.path,
-              previewUri: attachment.path
+            attachments.map(({ path, connectionId }) => ({
+              path,
+              previewUri: path,
+              ...(connectionId ? { connectionId } : {})
             }))
           )
-          return admission !== false
-        })
-        return accepted ? admission : false
-      },
+        ),
       dispatchCommand: (text: string) =>
         dispatchStructuredAgentSessionComposerCommand(text, {
           agent: props.agent,
@@ -58,6 +62,7 @@ export function useNativeChatStructuredComposerTransport(args: {
           ...(setThreadGoalObjective ? { setThreadGoalObjective } : {})
         }),
       ...(setThreadGoalObjective ? { threadGoal: { setObjective: setThreadGoalObjective } } : {}),
+      sendOut: controller.sendOut || starting,
       optionsSurface: controller.optionSurface,
       conversationCommands: controller.conversationCommands,
       optionSnapshot: controller.optionSnapshot,
@@ -86,7 +91,8 @@ export function useNativeChatStructuredComposerTransport(args: {
     props.sessionId,
     props.target,
     queuedMessages,
-    sendThroughRelaunch,
-    setOptionPickerRequest
+    sendThroughLaunch,
+    setOptionPickerRequest,
+    starting
   ])
 }
diff --git a/src/renderer/src/components/native-chat/use-native-chat-tab-owner.ts b/src/renderer/src/components/native-chat/use-native-chat-tab-owner.ts
index 8ec04deac071..1539547a36ce 100644
--- a/src/renderer/src/components/native-chat/use-native-chat-tab-owner.ts
+++ b/src/renderer/src/components/native-chat/use-native-chat-tab-owner.ts
@@ -1,7 +1,9 @@
+import { useMemo } from 'react'
 import { useAppStore } from '@/store'
-import { findNativeChatTabOwnerWorktreeId } from './native-chat-file-link'
+import { createNativeChatTabOwnerSelector } from './native-chat-file-link'
 
 /** Owning workspace of a chat tab; launch identity must not wait on its directory resolving. */
 export function useNativeChatTabOwnerWorktreeId(tabId: string): string | null {
-  return useAppStore((state) => findNativeChatTabOwnerWorktreeId(state, tabId))
+  const selectOwner = useMemo(() => createNativeChatTabOwnerSelector(tabId), [tabId])
+  return useAppStore(selectOwner)
 }
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 389f9e9373d6..3a1bd8a9238f 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
@@ -29,6 +29,7 @@ function TranscriptHarness({
     showsTailRow: false,
     isVisible,
     alignToViewportTop: vi.fn(),
+    isAlignPending: () => false,
     scrollToEnd,
     restoreScrollOffset,
     consumeProgrammaticScroll: () => false,
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 b2be67a4214a..dda9f9c64f45 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
@@ -59,6 +59,7 @@ export function useNativeChatTranscriptScroll({
   showsTailRow,
   isVisible,
   alignToViewportTop,
+  isAlignPending,
   scrollToEnd,
   restoreScrollOffset,
   consumeProgrammaticScroll,
@@ -72,6 +73,8 @@ export function useNativeChatTranscriptScroll({
   showsTailRow: boolean
   isVisible: boolean
   alignToViewportTop: (element: HTMLElement) => void
+  /** Whether a jump to a row is still travelling there. */
+  isAlignPending: () => boolean
   scrollToEnd: () => void
   restoreScrollOffset: (offset: number) => void
   consumeProgrammaticScroll: (event: Event) => boolean
@@ -117,13 +120,14 @@ export function useNativeChatTranscriptScroll({
         following: followingRef.current,
         programmatic: consumeProgrammaticScroll(event.nativeEvent),
         geometry,
-        previousDistanceFromEnd: previousDistanceFromEndRef.current
+        previousDistanceFromEnd: previousDistanceFromEndRef.current,
+        settling: isAlignPending()
       })
       reconcileReaderScroll(false)
       previousDistanceFromEndRef.current = distanceFromBottom(geometry)
       syncScrollState()
     },
-    [consumeProgrammaticScroll, reconcileReaderScroll, scrollRef, syncScrollState]
+    [consumeProgrammaticScroll, isAlignPending, reconcileReaderScroll, scrollRef, syncScrollState]
   )
 
   const scrollToEndWhenMeasurable = useCallback(() => {
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 257e507c6974..70853c1b2c43 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
@@ -14,10 +14,26 @@ type VirtualizerOptionsCapture = {
     | null
 }
 
+type SizeChangeProbe = {
+  scrollOffset: number
+  scrollDirection: 'forward' | 'backward' | null
+  itemSizeCache: Map<string, number>
+}
+type SizeChangePolicyHolder = {
+  shouldAdjustScrollPositionOnItemSizeChange?: (
+    item: { index: number; key: string; end: number },
+    delta: number,
+    instance: SizeChangeProbe
+  ) => boolean
+}
+
 const virtualizerMock = vi.hoisted(() => {
   const scrollElement: { current: HTMLElement | null } = { current: null }
+  /** The instance the hook last received, where it sets its scroll-adjust policy. */
+  const instance: { current: SizeChangePolicyHolder | null } = { current: null }
   return {
     options: { current: null } as VirtualizerOptionsCapture,
+    instance,
     getTotalSize: vi.fn(() => 0),
     getVirtualItems: vi.fn(() => []),
     measureElement: vi.fn(),
@@ -25,6 +41,11 @@ const virtualizerMock = vi.hoisted(() => {
     resizeItem: vi.fn(),
     scrollElement,
     scrollToEnd: vi.fn(),
+    scrollToIndex: vi.fn(),
+    getOffsetForIndex: vi.fn<(index: number, align: string) => [number, string]>(() => [
+      0,
+      'start'
+    ]),
     scrollToOffset: vi.fn(),
     takeSnapshot: vi.fn<() => VirtualItem[]>(() => [])
   }
@@ -34,7 +55,12 @@ vi.mock('@tanstack/react-virtual', () => ({
   elementScroll: vi.fn(),
   useVirtualizer: (options: VirtualizerOptionsCapture['current']) => {
     virtualizerMock.options.current = options
-    return { ...virtualizerMock, scrollElement: virtualizerMock.scrollElement.current }
+    const instance: SizeChangePolicyHolder & Record<string, unknown> = {
+      ...virtualizerMock,
+      scrollElement: virtualizerMock.scrollElement.current
+    }
+    virtualizerMock.instance.current = instance
+    return instance
   }
 }))
 
@@ -222,6 +248,64 @@ describe('native chat transcript virtualizer contract', () => {
     expect(virtualizerMock.scrollToOffset).not.toHaveBeenCalled()
   })
 
+  // A jump owns the scroll until the view is at its row: layout under it can clamp
+  // the view elsewhere first, and no event in between marks its landing reliably.
+  it('holds a jump to a row pending until the view reaches it, or the reader takes the scroll', () => {
+    const scrollElement = document.createElement('div')
+    Object.defineProperties(scrollElement, {
+      clientHeight: { configurable: true, value: 100 },
+      scrollHeight: { configurable: true, value: 1_000 }
+    })
+    const row = document.createElement('div')
+    row.dataset.index = '3'
+    scrollElement.append(row)
+    virtualizerMock.scrollElement.current = scrollElement
+    virtualizerMock.getOffsetForIndex.mockReturnValue([400, 'start'])
+    const { result } = renderHook(() =>
+      useNativeChatTranscriptWindow({
+        scrollRef: { current: scrollElement },
+        slots: [slot('message-0')],
+        isVisible: true,
+        revealIndex: -1
+      })
+    )
+    expect(result.current.isAlignPending()).toBe(false)
+
+    result.current.alignToViewportTop(row)
+    expect(virtualizerMock.scrollToIndex).toHaveBeenCalledWith(
+      3,
+      expect.objectContaining({ align: 'start' })
+    )
+    scrollElement.scrollTop = 900
+    expect(result.current.isAlignPending()).toBe(true)
+    scrollElement.scrollTop = 401
+    expect(result.current.isAlignPending()).toBe(false)
+
+    // A measured row growing above the view just after an upward scroll: left alone
+    // for a reader scrolling up, compensated under a jump resting where it landed.
+    const compensates = (heard = scrollElement.scrollTop): boolean | undefined =>
+      virtualizerMock.instance.current?.shouldAdjustScrollPositionOnItemSizeChange?.(
+        { index: 1, key: 'row-1', end: 300 },
+        18,
+        {
+          scrollOffset: heard,
+          scrollDirection: 'backward',
+          itemSizeCache: new Map([['row-1', 100]])
+        }
+      )
+    expect(compensates()).toBe(true)
+    // Not from an offset the virtualizer has yet to hear of: an instant jump just
+    // wrote the view elsewhere, and a correction from the old offset would undo it.
+    expect(compensates(scrollElement.scrollTop + 500)).toBe(false)
+
+    result.current.alignToViewportTop(row)
+    scrollElement.scrollTop = 700
+    result.current.cancelAlign()
+    expect(result.current.isAlignPending()).toBe(false)
+    expect(compensates()).toBe(false)
+    expect(virtualizerMock.scrollToOffset).toHaveBeenLastCalledWith(700, { behavior: 'auto' })
+  })
+
   // Rows drawn after the window (a message shown as not sent) still fill the container.
   it('follows the bottom of the container when no row is windowed', () => {
     const container = document.createElement('div')
diff --git a/src/renderer/src/components/native-chat/use-native-chat-transcript-window.ts b/src/renderer/src/components/native-chat/use-native-chat-transcript-window.ts
index ea4cafa28e35..bd7ad5b1587d 100644
--- a/src/renderer/src/components/native-chat/use-native-chat-transcript-window.ts
+++ b/src/renderer/src/components/native-chat/use-native-chat-transcript-window.ts
@@ -9,16 +9,21 @@
 import { useCallback, useEffect, useLayoutEffect, useMemo, useRef, useState } from 'react'
 import { elementScroll, useVirtualizer, type VirtualItem } from '@tanstack/react-virtual'
 import { createProgrammaticScrollMarks } from '@/hooks/programmatic-scroll-marks'
-import { usePrefersReducedMotion } from '@/hooks/usePrefersReducedMotion'
 import { NATIVE_CHAT_ROW_GAP_PX } from './native-chat-row-height-estimate'
 import { nativeChatPinnedRowIndexes, nativeChatTranscriptRange } from './native-chat-pinned-rows'
 import { nativeChatSlotKey, type NativeChatTranscriptSlot } from './native-chat-transcript-slots'
+import {
+  nativeChatScrollOffsetWithin,
+  useNativeChatViewportAlign
+} from './use-native-chat-viewport-align'
 
 /** Rows kept mounted past each edge of the viewport. Chat rows are tall and
  *  arbitrarily expensive, so this buys smoothness by the row, not by the screen. */
 export const NATIVE_CHAT_WINDOW_OVERSCAN = 6
 
 const FALLBACK_ROW_PX = 48
+/** Past this gap the DOM's offset is a write the virtualizer has yet to hear of. */
+const UNSEEN_SCROLL_PX = 1
 /** Retired keys are harmless to layout but otherwise accumulate for the pane's
  *  lifetime as a capped transcript advances. Compact them well before the stale
  *  entries become material compared with the live window. */
@@ -32,6 +37,11 @@ export type NativeChatTranscriptWindow = {
   measureRow: (node: HTMLElement | null) => void
   /** Scroll so this element's top meets the top of the viewport. */
   alignToViewportTop: (element: HTMLElement) => void
+  /** Whether that scroll is still travelling: true until the view reaches its
+   *  target, or another write or the reader takes the scroll from it. */
+  isAlignPending: () => boolean
+  /** A reader gesture that scrolls the transcript ends a scroll still travelling. */
+  cancelAlign: () => void
   /** Pin to the transcript's end. Through the virtualizer for the same reason
    *  the reveal is: it owns the offset, and a write it does not recognise as its
    *  own is a reconcile it will fight. Its last-item `end` target is the
@@ -46,36 +56,6 @@ export type NativeChatTranscriptWindow = {
   reconcileReaderScroll: (isTakingOver: boolean) => void
 }
 
-/** Distance from a container's scroll origin down to a descendant, in the
- *  container's own scroll pixels, or null when there is no chain to walk.
- *  Absolutely positioned windowed rows are placed with `top`, never a transform,
- *  so `offsetTop` stays true through the window as well. */
-export function nativeChatScrollOffsetWithin(
-  element: HTMLElement,
-  container: HTMLElement
-): number | null {
-  let top = 0
-  let node: HTMLElement | null = element
-  while (node !== null && node !== container) {
-    top += node.offsetTop
-    // A DOM without layout has no `offsetParent` at all; that ends the chain
-    // rather than walking into nothing, and the caller reads the null as
-    // "cannot place this yet".
-    const parent = node.offsetParent as HTMLElement | null | undefined
-    node = parent && typeof parent.offsetTop === 'number' ? parent : null
-  }
-  return node === container ? top : null
-}
-
-/** Fallback when layout provides no offset-parent chain. */
-function rectOffsetWithin(element: HTMLElement, container: HTMLElement): number {
-  return (
-    container.scrollTop +
-    element.getBoundingClientRect().top -
-    container.getBoundingClientRect().top
-  )
-}
-
 export function useNativeChatTranscriptWindow({
   scrollRef,
   slots,
@@ -94,7 +74,6 @@ export function useNativeChatTranscriptWindow({
   const readerTakeoverFrameRef = useRef<number | null>(null)
   const previousMeasurementKeysRef = useRef<ReadonlySet<string> | null>(null)
   const retiredMeasurementCountRef = useRef(0)
-  const alignBehavior = usePrefersReducedMotion() ? 'auto' : 'smooth'
   const pinned = useMemo(
     () => nativeChatPinnedRowIndexes({ count: slots.length, revealIndex }),
     [slots.length, revealIndex]
@@ -158,12 +137,6 @@ export function useNativeChatTranscriptWindow({
       }
     }
   })
-  // Preserve rows above the reader, never compensate growth within the visible
-  // row — including its first measurement, which may follow an exact estimate.
-  virtualizer.shouldAdjustScrollPositionOnItemSizeChange = (item, _delta, instance) =>
-    item.end <= (instance.scrollOffset ?? 0) &&
-    (instance.scrollDirection !== 'backward' || !instance.itemSizeCache.has(item.key))
-
   const finishReaderTakeover = useCallback(() => {
     if (readerTakeoverFrameRef.current !== null) {
       window.cancelAnimationFrame(readerTakeoverFrameRef.current)
@@ -246,30 +219,34 @@ export function useNativeChatTranscriptWindow({
     [readScrollMargin]
   )
 
-  const alignToViewportTop = useCallback(
-    (element: HTMLElement) => {
-      const container = scrollRef.current
-      if (!container) {
-        return
-      }
-      const top =
-        nativeChatScrollOffsetWithin(element, container) ?? rectOffsetWithin(element, container)
-      finishReaderTakeover()
-      // Through the virtualizer so a scroll it is still reconciling — the jump
-      // that mounted this row in the first place — is replaced rather than raced.
-      if (virtualizer.scrollElement) {
-        virtualizer.scrollToOffset(top, { align: 'start', behavior: alignBehavior })
-      } else {
-        const max = Math.max(0, container.scrollHeight - container.clientHeight)
-        const landing = Math.max(0, Math.min(top, max))
-        if (container.scrollTop !== landing) {
-          programmaticScrollMarks.mark(landing)
-        }
-        container.scrollTo({ top, behavior: alignBehavior })
-      }
-    },
-    [alignBehavior, finishReaderTakeover, programmaticScrollMarks, scrollRef, virtualizer]
-  )
+  const { alignToViewportTop, isAlignPending, endAlign, isAlignHeld } = useNativeChatViewportAlign({
+    scrollRef,
+    virtualizer,
+    finishReaderTakeover,
+    programmaticScrollMarks
+  })
+
+  // Preserve rows above the reader, never compensate growth within the visible
+  // row — including its first measurement, which may follow an exact estimate.
+  // Nor the first measurement of a jump's target row: at the end its correction is
+  // clamped, and the virtualizer retries it after the jump starts, cancelling it.
+  // Nor while the virtualizer has not seen a scroll just written: it corrects from
+  // the offset it last heard, which would put the view back where the write left.
+  // A row re-measured during a backward scroll is left alone, so rows do not jump
+  // under a reader scrolling up; a jump that landed is not that reader, and a row
+  // growing above it would otherwise push its message down for good.
+  virtualizer.shouldAdjustScrollPositionOnItemSizeChange = (item, _delta, instance) => {
+    const offset = instance.scrollOffset ?? 0
+    const written = scrollRef.current?.scrollTop ?? offset
+    return (
+      Math.abs(written - offset) <= UNSEEN_SCROLL_PX &&
+      !(item.index === revealIndex && !instance.itemSizeCache.has(item.key)) &&
+      item.end <= offset &&
+      (instance.scrollDirection !== 'backward' ||
+        !instance.itemSizeCache.has(item.key) ||
+        isAlignHeld())
+    )
+  }
 
   const scrollToEnd = useCallback(() => {
     const container = scrollRef.current
@@ -277,6 +254,7 @@ export function useNativeChatTranscriptWindow({
       return
     }
     finishReaderTakeover()
+    endAlign()
     // With no windowed row it would resolve the end from its own rows' height, 0, though rows
     // drawn after the window (a message shown as not sent) still fill the container.
     if (virtualizer.scrollElement && slots.length > 0) {
@@ -291,6 +269,7 @@ export function useNativeChatTranscriptWindow({
       programmaticScrollMarks.mark(container.scrollTop)
     }
   }, [
+    endAlign,
     finishReaderTakeover,
     isVisible,
     programmaticScrollMarks,
@@ -306,6 +285,7 @@ export function useNativeChatTranscriptWindow({
         return
       }
       finishReaderTakeover()
+      endAlign()
       if (virtualizer.scrollElement) {
         virtualizer.scrollToOffset(offset, { behavior: 'auto' })
         return
@@ -316,7 +296,7 @@ export function useNativeChatTranscriptWindow({
         programmaticScrollMarks.mark(container.scrollTop)
       }
     },
-    [finishReaderTakeover, isVisible, programmaticScrollMarks, scrollRef, virtualizer]
+    [endAlign, finishReaderTakeover, isVisible, programmaticScrollMarks, scrollRef, virtualizer]
   )
 
   const consumeProgrammaticScroll = useCallback(
@@ -344,6 +324,7 @@ export function useNativeChatTranscriptWindow({
       ) {
         return
       }
+      endAlign()
       virtualizer.scrollToOffset(container.scrollTop, { behavior: 'auto' })
       if (readerTakeoverFrameRef.current !== null) {
         return
@@ -354,9 +335,17 @@ export function useNativeChatTranscriptWindow({
         readerTakeoverFrameRef.current = null
       })
     },
-    [scrollRef, virtualizer]
+    [endAlign, scrollRef, virtualizer]
   )
 
+  // The virtualizer still holds the jump's row as its target, and would write it
+  // again as rows measure: rebase it onto where the reader is.
+  const cancelAlign = useCallback(() => {
+    if (isAlignHeld()) {
+      reconcileReaderScroll(true)
+    }
+  }, [isAlignHeld, reconcileReaderScroll])
+
   return {
     virtualItems: virtualizer.getVirtualItems(),
     totalSize: virtualizer.getTotalSize(),
@@ -364,6 +353,8 @@ export function useNativeChatTranscriptWindow({
     sizerRef,
     measureRow: virtualizer.measureElement,
     alignToViewportTop,
+    isAlignPending,
+    cancelAlign,
     scrollToEnd,
     restoreScrollOffset,
     consumeProgrammaticScroll,
diff --git a/src/renderer/src/components/native-chat/use-native-chat-typed-insertion.ts b/src/renderer/src/components/native-chat/use-native-chat-typed-insertion.ts
index 483ee6f5aa83..b7996e0d2aad 100644
--- a/src/renderer/src/components/native-chat/use-native-chat-typed-insertion.ts
+++ b/src/renderer/src/components/native-chat/use-native-chat-typed-insertion.ts
@@ -3,7 +3,7 @@ import {
   type NativeChatComposerInput
 } from './native-chat-composer-input'
 import { useCallback, type Dispatch, type RefObject, type SetStateAction } from 'react'
-import type { HistoryState } from './native-chat-composer-state'
+import { appendReturnedDraftText } from '../../../../shared/returned-draft-text'
 
 /** Imperative text insertion and focus for the composer textarea, used by the
  *  paste pipeline and the composer's imperative handle. */
@@ -13,37 +13,62 @@ export function useNativeChatTypedInsertion(args: {
   draft: string
   setDraft: (value: string) => void
   setCaret: Dispatch<SetStateAction<number>>
-  setHistory: Dispatch<SetStateAction<HistoryState>>
   setActiveSuggestion: Dispatch<SetStateAction<number>>
 }): {
   insertTypedText: (text: string) => boolean
+  appendText: (text: string) => void
+  acceptsText: () => boolean
   insertPastedText: (text: string) => boolean
   focus: () => boolean
   contains: (node: Node | null) => boolean
 } {
-  const { textareaRef, caret, draft, setDraft, setCaret, setHistory, setActiveSuggestion } = args
+  const { textareaRef, caret, draft, setDraft, setCaret, setActiveSuggestion } = args
 
-  const insertTypedText = useCallback(
-    (text: string): boolean => {
-      const textarea = textareaRef.current
-      if (!textarea || textarea.disabled) {
-        return false
-      }
-      const selectionStart = textarea.selectionStart ?? caret
-      const selectionEnd = textarea.selectionEnd ?? selectionStart
-      const next = `${draft.slice(0, selectionStart)}${text}${draft.slice(selectionEnd)}`
-      const nextCaret = selectionStart + text.length
+  const usableInput = useCallback((): NativeChatComposerInput | null => {
+    const textarea = textareaRef.current
+    return textarea && !textarea.disabled ? textarea : null
+  }, [textareaRef])
+
+  const showDraft = useCallback(
+    (textarea: NativeChatComposerInput, next: string, nextCaret: number): void => {
       textarea.focus()
       setDraft(next)
       setCaret(nextCaret)
-      setHistory((prev) => ({ entries: prev.entries, index: null }))
       setActiveSuggestion(0)
       requestAnimationFrame(() => {
         textarea.setSelectionRange(nextCaret, nextCaret)
       })
+    },
+    [setActiveSuggestion, setCaret, setDraft]
+  )
+
+  const insertTypedText = useCallback(
+    (text: string): boolean => {
+      const textarea = usableInput()
+      if (!textarea) {
+        return false
+      }
+      const selectionStart = textarea.selectionStart ?? caret
+      const selectionEnd = textarea.selectionEnd ?? selectionStart
+      showDraft(
+        textarea,
+        `${draft.slice(0, selectionStart)}${text}${draft.slice(selectionEnd)}`,
+        selectionStart + text.length
+      )
       return true
     },
-    [caret, draft, setActiveSuggestion, setCaret, setDraft, setHistory, textareaRef]
+    [caret, draft, showDraft, usableInput]
+  )
+
+  const appendText = useCallback(
+    (text: string): void => {
+      const textarea = usableInput()
+      if (textarea) {
+        const next = appendReturnedDraftText(draft, text)
+        showDraft(textarea, next, next.length)
+      }
+    },
+    [draft, showDraft, usableInput]
   )
 
   // Reads the live input when a delayed clipboard read settles.
@@ -52,19 +77,18 @@ export function useNativeChatTypedInsertion(args: {
     [textareaRef]
   )
 
+  const acceptsText = useCallback((): boolean => usableInput() !== null, [usableInput])
+
   const focus = useCallback((): boolean => {
-    const textarea = textareaRef.current
-    if (!textarea || textarea.disabled) {
-      return false
-    }
-    textarea.focus()
-    return true
-  }, [textareaRef])
+    const textarea = usableInput()
+    textarea?.focus()
+    return textarea !== null
+  }, [usableInput])
 
   const contains = useCallback(
     (node: Node | null): boolean => textareaRef.current?.contains?.(node) === true,
     [textareaRef]
   )
 
-  return { insertTypedText, insertPastedText, focus, contains }
+  return { insertTypedText, appendText, acceptsText, insertPastedText, focus, contains }
 }
diff --git a/src/renderer/src/components/native-chat/use-native-chat-viewport-align.ts b/src/renderer/src/components/native-chat/use-native-chat-viewport-align.ts
new file mode 100644
index 000000000000..2ec5ae1d2cbe
--- /dev/null
+++ b/src/renderer/src/components/native-chat/use-native-chat-viewport-align.ts
@@ -0,0 +1,130 @@
+// Scrolling a transcript element to the top of the viewport, and knowing while
+// that scroll is still travelling: rows it passes resize under it, so nothing
+// short of the view reaching its target says the jump is over.
+
+import { useCallback, useRef } from 'react'
+import type { Virtualizer } from '@tanstack/react-virtual'
+import type { ProgrammaticScrollMarks } from '@/hooks/programmatic-scroll-marks'
+import { usePrefersReducedMotion } from '@/hooks/usePrefersReducedMotion'
+
+/** How close to its target a jump counts as arrived: sub-pixel and zoom rounding. */
+const ALIGN_ARRIVED_PX = 2
+
+/** Distance from a container's scroll origin down to a descendant, in the
+ *  container's own scroll pixels, or null when there is no chain to walk.
+ *  Absolutely positioned windowed rows are placed with `top`, never a transform,
+ *  so `offsetTop` stays true through the window as well. */
+export function nativeChatScrollOffsetWithin(
+  element: HTMLElement,
+  container: HTMLElement
+): number | null {
+  let top = 0
+  let node: HTMLElement | null = element
+  while (node !== null && node !== container) {
+    top += node.offsetTop
+    // A DOM without layout has no `offsetParent` at all; that ends the chain
+    // rather than walking into nothing, and the caller reads the null as
+    // "cannot place this yet".
+    const parent = node.offsetParent as HTMLElement | null | undefined
+    node = parent && typeof parent.offsetTop === 'number' ? parent : null
+  }
+  return node === container ? top : null
+}
+
+/** Fallback when layout provides no offset-parent chain. */
+function rectOffsetWithin(element: HTMLElement, container: HTMLElement): number {
+  return (
+    container.scrollTop +
+    element.getBoundingClientRect().top -
+    container.getBoundingClientRect().top
+  )
+}
+
+export function useNativeChatViewportAlign({
+  scrollRef,
+  virtualizer,
+  finishReaderTakeover,
+  programmaticScrollMarks
+}: {
+  scrollRef: React.RefObject<HTMLDivElement | null>
+  virtualizer: Virtualizer<HTMLDivElement, Element>
+  finishReaderTakeover: () => void
+  programmaticScrollMarks: ProgrammaticScrollMarks
+}): {
+  alignToViewportTop: (element: HTMLElement) => void
+  isAlignPending: () => boolean
+  /** Another write, or the reader, took the scroll. */
+  endAlign: () => void
+  /** Whether the view is still the jump's: travelling, or resting where it landed. */
+  isAlignHeld: () => boolean
+} {
+  const alignBehavior = usePrefersReducedMotion() ? 'auto' : 'smooth'
+  /** The row or offset `alignToViewportTop` scrolled to, until something else takes the scroll. */
+  const alignRef = useRef<(({ index: number } | { offset: number }) & { arrived: boolean }) | null>(
+    null
+  )
+
+  const alignToViewportTop = useCallback(
+    (element: HTMLElement) => {
+      const container = scrollRef.current
+      if (!container) {
+        return
+      }
+      finishReaderTakeover()
+      const index = Number.parseInt(element.dataset.index ?? '', 10)
+      // Through the virtualizer so a scroll it is still reconciling — the jump
+      // that mounted this row in the first place — is replaced rather than raced.
+      if (virtualizer.scrollElement && !Number.isNaN(index)) {
+        // By index for a row: rows measured on the way move the target, and the
+        // virtualizer re-aims at an index where a fixed offset would land beside it.
+        alignRef.current = { index, arrived: false }
+        virtualizer.scrollToIndex(index, { align: 'start', behavior: alignBehavior })
+        return
+      }
+      const top =
+        nativeChatScrollOffsetWithin(element, container) ?? rectOffsetWithin(element, container)
+      alignRef.current = { offset: top, arrived: false }
+      if (virtualizer.scrollElement) {
+        virtualizer.scrollToOffset(top, { align: 'start', behavior: alignBehavior })
+        return
+      }
+      const max = Math.max(0, container.scrollHeight - container.clientHeight)
+      const landing = Math.max(0, Math.min(top, max))
+      if (container.scrollTop !== landing) {
+        programmaticScrollMarks.mark(landing)
+      }
+      container.scrollTo({ top, behavior: alignBehavior })
+    },
+    [alignBehavior, finishReaderTakeover, programmaticScrollMarks, scrollRef, virtualizer]
+  )
+
+  // Read from where the view is, not from a landing event: a stale mark or a
+  // scroll end left by an earlier write can precede the jump's first frame.
+  const isAlignPending = useCallback(() => {
+    const pending = alignRef.current
+    const container = scrollRef.current
+    if (pending === null || pending.arrived || !container) {
+      return false
+    }
+    const target =
+      'index' in pending
+        ? virtualizer.getOffsetForIndex(pending.index, 'start')?.[0]
+        : pending.offset
+    const max = Math.max(0, container.scrollHeight - container.clientHeight)
+    if (
+      target === undefined ||
+      Math.abs(container.scrollTop - Math.min(target, max)) <= ALIGN_ARRIVED_PX
+    ) {
+      pending.arrived = true
+      return false
+    }
+    return true
+  }, [scrollRef, virtualizer])
+
+  const endAlign = useCallback(() => {
+    alignRef.current = null
+  }, [])
+  const isAlignHeld = useCallback(() => alignRef.current !== null, [])
+
+  return { alignToViewportTop, isAlignPending, endAlign, isAlignHeld }
+}
diff --git a/src/renderer/src/components/native-chat/use-native-chat-visual-document.ts b/src/renderer/src/components/native-chat/use-native-chat-visual-document.ts
new file mode 100644
index 000000000000..de36392f8d83
--- /dev/null
+++ b/src/renderer/src/components/native-chat/use-native-chat-visual-document.ts
@@ -0,0 +1,99 @@
+import { useEffect, useState } from 'react'
+import {
+  isRetryableNativeChatVisualFailure,
+  peekCachedNativeChatVisual,
+  readNativeChatVisual,
+  type NativeChatVisualDocument,
+  type NativeChatVisualIdentity
+} from './native-chat-visual-read-client'
+
+export type NativeChatVisualDocumentState =
+  | { status: 'loading' }
+  | { status: 'ready'; document: NativeChatVisualDocument }
+  | { status: 'unavailable' }
+
+/** Waits before each retry of a read that may yet succeed; bounded, then the failure shows. */
+export const NATIVE_CHAT_VISUAL_RETRY_DELAYS_MS = [1_500, 4_000, 10_000] as const
+
+function waitFor(ms: number, signal: AbortSignal): Promise<boolean> {
+  return new Promise((resolve) => {
+    const timer = setTimeout(() => resolve(!signal.aborted), ms)
+    signal.addEventListener(
+      'abort',
+      () => {
+        clearTimeout(timer)
+        resolve(false)
+      },
+      { once: true }
+    )
+  })
+}
+
+async function loadWithRetries(
+  identity: NativeChatVisualIdentity,
+  signal: AbortSignal,
+  setState: (
+    update: (shown: NativeChatVisualDocumentState) => NativeChatVisualDocumentState
+  ) => void
+): Promise<void> {
+  for (let retry = 0; ; retry += 1) {
+    const outcome = await readNativeChatVisual(identity)
+    if (signal.aborted) {
+      return
+    }
+    if (outcome.ok) {
+      setState((shown) =>
+        shown.status === 'ready' && shown.document.revision === outcome.document.revision
+          ? shown
+          : { status: 'ready', document: outcome.document }
+      )
+      return
+    }
+    const delay = NATIVE_CHAT_VISUAL_RETRY_DELAYS_MS[retry]
+    if (!isRetryableNativeChatVisualFailure(outcome.reason) || delay === undefined) {
+      // Why keep a shown document on `unavailable`: losing contact says nothing about the file.
+      setState((shown) =>
+        shown.status === 'ready' && outcome.reason === 'unavailable'
+          ? shown
+          : { status: 'unavailable' }
+      )
+      return
+    }
+    if (!(await waitFor(delay, signal))) {
+      return
+    }
+  }
+}
+
+/**
+ * The visual's current document. Starts from the cached revision when there is one, then asks the
+ * host (revalidating it) once `enabled`. A later failure keeps a document already shown.
+ */
+export function useNativeChatVisualDocument(
+  identity: NativeChatVisualIdentity,
+  enabled: boolean
+): NativeChatVisualDocumentState {
+  const { sessionId, file } = identity
+  const environmentId =
+    identity.target.kind === 'environment' ? identity.target.environmentId : null
+  const [state, setState] = useState<NativeChatVisualDocumentState>(() => {
+    const cached = peekCachedNativeChatVisual(identity)
+    return cached ? { status: 'ready', document: cached } : { status: 'loading' }
+  })
+
+  useEffect(() => {
+    if (!enabled) {
+      return
+    }
+    const identityNow: NativeChatVisualIdentity = {
+      target: environmentId === null ? { kind: 'local' } : { kind: 'environment', environmentId },
+      sessionId,
+      file
+    }
+    const abort = new AbortController()
+    void loadWithRetries(identityNow, abort.signal, setState)
+    return () => abort.abort()
+  }, [enabled, environmentId, file, sessionId])
+
+  return state
+}
diff --git a/src/renderer/src/components/native-chat/use-native-chat-visual-theme.ts b/src/renderer/src/components/native-chat/use-native-chat-visual-theme.ts
new file mode 100644
index 000000000000..fcc3e6f6a039
--- /dev/null
+++ b/src/renderer/src/components/native-chat/use-native-chat-visual-theme.ts
@@ -0,0 +1,89 @@
+import { useEffect, useState, type RefObject } from 'react'
+import {
+  NATIVE_CHAT_VISUAL_THEME_TOKENS,
+  type NativeChatVisualTheme
+} from '../../../../shared/native-chat-visual-shell'
+
+// The visual blends into the thread: its background and text follow the chat column, which a
+// chat's own appearance can set apart from the app root.
+const SCOPED_SOURCES: Partial<Record<string, readonly string[]>> = {
+  '--background': ['--chat-canvas', '--background'],
+  '--foreground': ['--chat-foreground', '--foreground'],
+  '--font-mono': ['--chat-code-font-family', '--font-mono']
+}
+
+/** The resolved theme at `element`, read from computed styles in its own appearance scope. */
+export function readNativeChatVisualTheme(element: Element | null): NativeChatVisualTheme {
+  const source = element ?? document.documentElement
+  const styles = getComputedStyle(source)
+  const tokens: Record<string, string> = {}
+  for (const token of NATIVE_CHAT_VISUAL_THEME_TOKENS) {
+    if (token === '--font-sans') {
+      tokens[token] = styles.fontFamily
+      continue
+    }
+    for (const name of SCOPED_SOURCES[token] ?? [token]) {
+      const value = styles.getPropertyValue(name).trim()
+      if (value.length > 0) {
+        tokens[token] = value
+        break
+      }
+    }
+  }
+  return { colorScheme: resolvedColorScheme(element), tokens }
+}
+
+/** A chat can pin its own scheme apart from the app's (see the `dark` variant in main.css). */
+function resolvedColorScheme(element: Element | null): 'light' | 'dark' {
+  const pinned = element
+    ?.closest('[data-native-chat-scheme]')
+    ?.getAttribute('data-native-chat-scheme')
+  if (pinned === 'light' || pinned === 'dark') {
+    return pinned
+  }
+  return document.documentElement.classList.contains('dark') ? 'dark' : 'light'
+}
+
+function themeSnapshot(theme: NativeChatVisualTheme): string {
+  return JSON.stringify(theme)
+}
+
+/**
+ * The theme a visual should wear, updated when the app theme or the chat's appearance changes.
+ * Compares resolved values, so unrelated style writes (a sidebar drag) never produce a new theme.
+ */
+export function useNativeChatVisualTheme(
+  elementRef: RefObject<Element | null>
+): NativeChatVisualTheme {
+  const [theme, setTheme] = useState<NativeChatVisualTheme>(() =>
+    readNativeChatVisualTheme(elementRef.current)
+  )
+  useEffect(() => {
+    let snapshot = ''
+    const refresh = (): void => {
+      const next = readNativeChatVisualTheme(elementRef.current)
+      const nextSnapshot = themeSnapshot(next)
+      if (nextSnapshot !== snapshot) {
+        snapshot = nextSnapshot
+        setTheme(next)
+      }
+    }
+    refresh()
+    const observer = new MutationObserver(refresh)
+    const watched = new Set<Element>([document.documentElement])
+    for (const selector of ['.native-chat-appearance', '[data-native-chat-scheme]']) {
+      const scope = elementRef.current?.closest(selector)
+      if (scope) {
+        watched.add(scope)
+      }
+    }
+    for (const element of watched) {
+      observer.observe(element, {
+        attributes: true,
+        attributeFilter: ['class', 'style', 'data-native-chat-scheme']
+      })
+    }
+    return () => observer.disconnect()
+  }, [elementRef])
+  return theme
+}
diff --git a/src/renderer/src/components/native-chat/use-native-chat-workspace-file-drop.ts b/src/renderer/src/components/native-chat/use-native-chat-workspace-file-drop.ts
index cc37d7783a21..cf38fde2a6fc 100644
--- a/src/renderer/src/components/native-chat/use-native-chat-workspace-file-drop.ts
+++ b/src/renderer/src/components/native-chat/use-native-chat-workspace-file-drop.ts
@@ -1,6 +1,5 @@
 import { useCallback, useLayoutEffect, useRef, type DragEventHandler } from 'react'
 import { useAppStore } from '@/store'
-import { getExecutionHostIdForWorktree } from '@/lib/worktree-runtime-owner'
 import {
   getWorkspaceFileDragRejectionMessage,
   hasWorkspaceFileDragType,
@@ -10,6 +9,7 @@ import {
 } from '@/lib/workspace-file-drag'
 import {
   resolveNativeChatAttachmentOwnerForWorktree,
+  resolveNativeChatAttachmentHost,
   nativeChatWorktreeNotReadyNotice
 } from './native-chat-attachment-upload'
 import { findTerminalTabWorktreeId } from './native-chat-file-link'
@@ -18,7 +18,6 @@ import {
   nativeChatWorkspaceAttachmentMismatchNotice,
   type NativeChatResolvedPathOptions
 } from './native-chat-resolved-path-ownership'
-import { useNativeChatPaneFileDropClaim } from './NativeChatPaneFileDropSurface'
 
 type WorkspaceFileDropHandlers = {
   onDragOverCapture: DragEventHandler<HTMLDivElement>
@@ -32,9 +31,6 @@ type Args = {
     options?: NativeChatResolvedPathOptions
   ) => void
   disabled: boolean
-  /** Composer identity the preload drop route addresses; published to the pane
-   *  so an OS drop anywhere in it resolves to this composer. */
-  paneKey: string
   setNotice: (notice: string | null) => void
   structuredWorktreeId?: string
   terminalTabId: string
@@ -67,7 +63,6 @@ function setDropEffect(dataTransfer: DataTransfer, effect: 'copy' | 'none'): voi
 export function useNativeChatWorkspaceFileDrop({
   attachResolvedPaths,
   disabled,
-  paneKey,
   setNotice,
   structuredWorktreeId,
   terminalTabId
@@ -122,17 +117,14 @@ export function useNativeChatWorkspaceFileDrop({
         setNotice(nativeChatWorkspaceAttachmentMismatchNotice())
         return
       }
-      const owner = resolveNativeChatAttachmentOwnerForWorktree(
-        state,
-        workspaceId,
-        structuredWorktreeId ? undefined : terminalTabId
-      )
+      const owner = resolveNativeChatAttachmentOwnerForWorktree(state, workspaceId)
       if (owner.kind === 'not-ready') {
         setNotice(nativeChatWorktreeNotReadyNotice())
         return
       }
-      const targetExecutionHostId = getExecutionHostIdForWorktree(state, workspaceId)
+      const targetExecutionHostId = resolveNativeChatAttachmentHost(state, workspaceId)
       if (
+        !targetExecutionHostId ||
         !isResolvedWorkspaceFileDragExecutionHost(targetExecutionHostId) ||
         source.executionHostId !== targetExecutionHostId
       ) {
@@ -148,13 +140,13 @@ export function useNativeChatWorkspaceFileDrop({
         if (currentWorkspaceId !== source.workspaceId) {
           return false
         }
-        const currentHostId = getExecutionHostIdForWorktree(currentState, currentWorkspaceId)
+        const currentHostId = resolveNativeChatAttachmentHost(currentState, currentWorkspaceId)
         const currentOwner = resolveNativeChatAttachmentOwnerForWorktree(
           currentState,
-          currentWorkspaceId,
-          structuredWorktreeIdRef.current ? undefined : terminalTabId
+          currentWorkspaceId
         )
         return (
+          currentHostId !== null &&
           isResolvedWorkspaceFileDragExecutionHost(currentHostId) &&
           currentHostId === source.executionHostId &&
           nativeChatAttachmentOwnerUnchanged(owner, currentOwner)
@@ -168,14 +160,5 @@ export function useNativeChatWorkspaceFileDrop({
     [attachResolvedPaths, disabled, setNotice, structuredWorktreeId, terminalTabId]
   )
 
-  // The pane around the composer is the drop surface; these handlers run from
-  // there so the whole chat, not just the input box, accepts a file.
-  useNativeChatPaneFileDropClaim({
-    scopeKey: paneKey,
-    disabled,
-    onDragOverCapture,
-    onDropCapture
-  })
-
   return { onDragOverCapture, onDropCapture }
 }
diff --git a/src/renderer/src/components/native-chat/use-structured-agent-session-command-send-gate.test.tsx b/src/renderer/src/components/native-chat/use-structured-agent-session-command-send-gate.test.tsx
index 2a9998a7b9a6..9e504d5ae5b7 100644
--- a/src/renderer/src/components/native-chat/use-structured-agent-session-command-send-gate.test.tsx
+++ b/src/renderer/src/components/native-chat/use-structured-agent-session-command-send-gate.test.tsx
@@ -29,13 +29,15 @@ vi.mock('./use-structured-agent-session-read', () => ({
   })
 }))
 
-vi.mock('./use-structured-agent-session-outbox', () => ({
-  structuredSessionOperationId: () => 'operation-1',
-  useStructuredAgentSessionOutbox: () => ({
-    outbox: [],
+vi.mock('./structured-agent-session-operation-id', () => ({
+  structuredSessionOperationId: () => 'operation-1'
+}))
+vi.mock('./use-structured-agent-session-sends', () => ({
+  useStructuredAgentSessionSends: () => ({
+    pending: [],
     error: null,
     send: mocks.outboxSend,
-    retry: vi.fn()
+    stopSends: vi.fn()
   })
 }))
 
diff --git a/src/renderer/src/components/native-chat/use-structured-agent-session-command-start-failure.test.tsx b/src/renderer/src/components/native-chat/use-structured-agent-session-command-start-failure.test.tsx
index 698d83e61065..d67f8f35d4a1 100644
--- a/src/renderer/src/components/native-chat/use-structured-agent-session-command-start-failure.test.tsx
+++ b/src/renderer/src/components/native-chat/use-structured-agent-session-command-start-failure.test.tsx
@@ -39,13 +39,15 @@ vi.mock('./use-structured-agent-session-read', () => ({
   })
 }))
 
-vi.mock('./use-structured-agent-session-outbox', () => ({
-  structuredSessionOperationId: () => 'operation-1',
-  useStructuredAgentSessionOutbox: () => ({
-    outbox: [],
+vi.mock('./structured-agent-session-operation-id', () => ({
+  structuredSessionOperationId: () => 'operation-1'
+}))
+vi.mock('./use-structured-agent-session-sends', () => ({
+  useStructuredAgentSessionSends: () => ({
+    pending: [],
     error: null,
     send: vi.fn(),
-    retry: vi.fn()
+    stopSends: vi.fn()
   })
 }))
 
diff --git a/src/renderer/src/components/native-chat/use-structured-agent-session-command-write.ts b/src/renderer/src/components/native-chat/use-structured-agent-session-command-write.ts
new file mode 100644
index 000000000000..36d798414a89
--- /dev/null
+++ b/src/renderer/src/components/native-chat/use-structured-agent-session-command-write.ts
@@ -0,0 +1,65 @@
+import { useCallback, useEffect, useRef } from 'react'
+import {
+  AGENT_SESSION_CONVERSATION_COMMAND_TIMEOUT_MS,
+  type AgentSessionConversationCommand,
+  type AgentSessionConversationCommandResult
+} from '../../../../shared/agent-session-conversation-command'
+import type {
+  StructuredAgentSessionWrite,
+  StructuredAgentSessionWriteOutcome
+} from './use-structured-agent-session-mutate'
+import { holdStructuredAgentSessionSends } from './structured-agent-session-pending-sends'
+
+/**
+ * Sends a conversation command. A /clear keeps the chat's sends out while it runs, as its host
+ * refuses them, so text typed meanwhile stays in the box. Once it moves the chat to a new
+ * conversation, the old one, which its host also refuses, takes nothing until this view leaves it.
+ * Either way the hold ends by the command's deadline: the local call has none of its own.
+ */
+export function useStructuredAgentSessionCommandWrite(
+  sessionId: string,
+  write: StructuredAgentSessionWrite
+): (
+  command: AgentSessionConversationCommand
+) => Promise<StructuredAgentSessionWriteOutcome<AgentSessionConversationCommandResult>> {
+  // Null once the view left or unmounted, so a reply that lands later releases its hold.
+  const shown = useRef<string | null>(sessionId)
+  const keptHold = useRef<(() => void) | null>(null)
+  useEffect(() => {
+    shown.current = sessionId
+    return () => {
+      shown.current = null
+      keptHold.current?.()
+      keptHold.current = null
+    }
+  }, [sessionId])
+  return useCallback(
+    async (command) => {
+      const send = () =>
+        write<AgentSessionConversationCommandResult>(
+          'agentSession.conversationCommand',
+          'agentSession.conversationCommand',
+          { command }
+        )
+      if (command !== 'clear') {
+        return send()
+      }
+      const release = holdStructuredAgentSessionSends(sessionId)
+      setTimeout(release, AGENT_SESSION_CONVERSATION_COMMAND_TIMEOUT_MS)
+      let movedOn = false
+      try {
+        const outcome = await send()
+        movedOn = outcome.kind === 'done' && outcome.value.replacementSessionId !== undefined
+        return outcome
+      } finally {
+        if (movedOn && shown.current === sessionId) {
+          keptHold.current?.()
+          keptHold.current = release
+        } else {
+          release()
+        }
+      }
+    },
+    [sessionId, write]
+  )
+}
diff --git a/src/renderer/src/components/native-chat/use-structured-agent-session-context-usage.test.tsx b/src/renderer/src/components/native-chat/use-structured-agent-session-context-usage.test.tsx
index 7b45c6bc9d7a..2485e5dbcb1b 100644
--- a/src/renderer/src/components/native-chat/use-structured-agent-session-context-usage.test.tsx
+++ b/src/renderer/src/components/native-chat/use-structured-agent-session-context-usage.test.tsx
@@ -33,13 +33,15 @@ vi.mock('./use-structured-agent-session-read', () => ({
   })
 }))
 
-vi.mock('./use-structured-agent-session-outbox', () => ({
-  structuredSessionOperationId: vi.fn(),
-  useStructuredAgentSessionOutbox: () => ({
-    outbox: [],
+vi.mock('./structured-agent-session-operation-id', () => ({
+  structuredSessionOperationId: vi.fn()
+}))
+vi.mock('./use-structured-agent-session-sends', () => ({
+  useStructuredAgentSessionSends: () => ({
+    pending: [],
     error: null,
     send: vi.fn(),
-    retry: vi.fn()
+    stopSends: vi.fn()
   })
 }))
 
diff --git a/src/renderer/src/components/native-chat/use-structured-agent-session-delivery-notices.test.tsx b/src/renderer/src/components/native-chat/use-structured-agent-session-delivery-notices.test.tsx
index f1cd44528a7b..23968b9fd5fc 100644
--- a/src/renderer/src/components/native-chat/use-structured-agent-session-delivery-notices.test.tsx
+++ b/src/renderer/src/components/native-chat/use-structured-agent-session-delivery-notices.test.tsx
@@ -8,7 +8,6 @@ import { useStructuredAgentSessionDeliveryNotices } from './use-structured-agent
 
 afterEach(cleanup)
 
-const NONE = new Set<string>()
 const EMPTY: never[] = []
 
 function rejected(
@@ -60,11 +59,9 @@ it('keeps the same notices across batches in a chat whose only rejection a Stop
   const { result, rerender } = renderHook(
     ({ submissions }: { submissions: readonly AgentJournalSubmission[] }) =>
       useStructuredAgentSessionDeliveryNotices({
-        outbox: EMPTY,
+        pending: EMPTY,
         submissions,
         journalItems: EMPTY,
-        failedHere: NONE,
-        retry: () => {},
         agentName: 'Claude'
       }),
     { initialProps: { submissions: [withdrawn('stopped')] } }
@@ -81,11 +78,9 @@ function renderNotices(submissions: readonly AgentJournalSubmission[]) {
   return renderHook(
     ({ submissions: current }: { submissions: readonly AgentJournalSubmission[] }) =>
       useStructuredAgentSessionDeliveryNotices({
-        outbox: EMPTY,
+        pending: EMPTY,
         submissions: current,
         journalItems: EMPTY,
-        failedHere: NONE,
-        retry: () => {},
         agentName: 'Claude'
       }),
     { initialProps: { submissions } }
diff --git a/src/renderer/src/components/native-chat/use-structured-agent-session-delivery-notices.ts b/src/renderer/src/components/native-chat/use-structured-agent-session-delivery-notices.ts
index a7aa5a146a14..ba2803da4671 100644
--- a/src/renderer/src/components/native-chat/use-structured-agent-session-delivery-notices.ts
+++ b/src/renderer/src/components/native-chat/use-structured-agent-session-delivery-notices.ts
@@ -1,62 +1,43 @@
-import { useCallback, useEffect, useMemo, useRef } from 'react'
+import { useEffect, useMemo, useRef } from 'react'
 import type {
   AgentJournalRenderItem,
   AgentJournalSubmission
 } from '../../../../shared/agent-session-journal-types'
 import { dispatchWasWithdrawn } from '../../../../shared/structured-agent-session-dispatch-rejection'
 import { structuredAgentSessionCommandItemIds } from '../../../../shared/structured-agent-session-message-projection'
-import type { StructuredAgentSessionOutboxEntry } from '../../../../shared/structured-agent-session-outbox'
 import { structuredAgentSessionDeliveryNotices } from './structured-agent-session-delivery-notices'
+import type { StructuredAgentSessionPendingSend } from './structured-agent-session-pending-sends'
 import { useStructuredAgentSessionStartFailureFacts } from './use-structured-agent-session-start-failure-facts'
 import type { NativeChatDeliveryNotice } from './NativeChatMessageRow'
 
 const NO_SUBMISSIONS: readonly AgentJournalSubmission[] = []
-const NO_ITEMS: readonly AgentJournalRenderItem[] = []
 
 /** The structured chat's delivery notices, by the message id each row renders under. */
 export function useStructuredAgentSessionDeliveryNotices(args: {
-  outbox: readonly StructuredAgentSessionOutboxEntry[]
+  pending: readonly StructuredAgentSessionPendingSend[]
   submissions: readonly AgentJournalSubmission[]
   journalItems: readonly AgentJournalRenderItem[]
-  failedHere: ReadonlySet<string>
-  retry: (clientMessageId: string) => void
   agentName: string
 }): ReadonlyMap<string, NativeChatDeliveryNotice> {
-  const { agentName, failedHere, outbox, submissions } = args
-  // Read at click time, so the notices stay put while the outbox's Retry is rebuilt each render.
-  const retryRef = useRef(args.retry)
-  useEffect(() => {
-    retryRef.current = args.retry
-  })
-  const retry = useCallback((clientMessageId: string) => {
-    retryRef.current(clientMessageId)
-  }, [])
-  // Only a message shown as not sent (a withdrawn one draws nothing) or still in the outbox reads
-  // the journal's rows, so in a chat with neither a new batch of them re-renders no row.
-  const hasRejected =
-    outbox.some((entry) => entry.state === 'rejected') ||
-    submissions.some(
-      (submission) => submission.dispatchState === 'rejected' && !dispatchWasWithdrawn(submission)
-    )
-  const journalRows = hasRejected || outbox.length > 0 ? submissions : NO_SUBMISSIONS
-  // Only an outbox copy of a rejected message reads the loaded rows, so a streaming turn rebuilds
-  // no notice otherwise.
-  const loadedItems = hasRejected && outbox.length > 0 ? args.journalItems : NO_ITEMS
+  const { agentName, pending, submissions } = args
+  // Only a chat with a message shown as not sent reads the journal's rows and loaded items, so in a
+  // chat with none a streaming turn rebuilds no notice.
+  const hasRejected = submissions.some(
+    (submission) => submission.dispatchState === 'rejected' && !dispatchWasWithdrawn(submission)
+  )
+  const journalRows = hasRejected ? submissions : NO_SUBMISSIONS
   const startFailures = useStructuredAgentSessionStartFailureFacts(args.journalItems, hasRejected)
   const commandItemIds = useCommandItemIds(args.journalItems, hasRejected)
   const notices = useMemo(
     () =>
-      structuredAgentSessionDeliveryNotices(
-        outbox,
+      structuredAgentSessionDeliveryNotices({
+        pending,
+        submissions: journalRows,
         agentName,
-        retry,
-        journalRows,
         startFailures,
-        failedHere,
-        commandItemIds,
-        loadedItems
-      ),
-    [outbox, agentName, retry, journalRows, startFailures, failedHere, commandItemIds, loadedItems]
+        commandItemIds
+      }),
+    [pending, journalRows, agentName, startFailures, commandItemIds]
   )
   // A submission batch rebuilds the map; one that says the same keeps the old, so no row re-renders.
   const previousRef = useRef(notices)
@@ -101,11 +82,9 @@ function sameNoticesKept(
   const kept = new Map<string, NativeChatDeliveryNotice>()
   for (const [id, notice] of next) {
     const before = previous.get(id)
-    // Each Retry calls the stable `retry` with its own id, so one under the same key is the same.
     const same =
       before !== undefined &&
       before.text === notice.text &&
-      (before.onRetry === undefined) === (notice.onRetry === undefined) &&
       (before.onDismiss === undefined) === (notice.onDismiss === undefined)
     allKept &&= same
     kept.set(id, same ? before : notice)
diff --git a/src/renderer/src/components/native-chat/use-structured-agent-session-host-label.ts b/src/renderer/src/components/native-chat/use-structured-agent-session-host-label.ts
new file mode 100644
index 000000000000..39e540d50df7
--- /dev/null
+++ b/src/renderer/src/components/native-chat/use-structured-agent-session-host-label.ts
@@ -0,0 +1,13 @@
+import { selectExecutionHostDisplayLabel } from '@/lib/execution-host-display-label'
+import { executionHostIdForStructuredTarget } from '@/runtime/structured-agent-session-owner'
+import type { RuntimeClientTarget } from '@/runtime/runtime-client-target'
+import { useAppStore } from '../../store'
+
+/** What Orca calls the chat's host; null for a paired server this client has no name for, whose
+ *  raw id is not a name. */
+export function useStructuredAgentSessionHostLabel(target: RuntimeClientTarget): string | null {
+  return useAppStore((state) => {
+    const label = selectExecutionHostDisplayLabel(state, executionHostIdForStructuredTarget(target))
+    return target.kind === 'environment' && label === target.environmentId ? null : label
+  })
+}
diff --git a/src/renderer/src/components/native-chat/use-structured-agent-session-legacy-recovery.test.tsx b/src/renderer/src/components/native-chat/use-structured-agent-session-legacy-recovery.test.tsx
new file mode 100644
index 000000000000..86e506a80282
--- /dev/null
+++ b/src/renderer/src/components/native-chat/use-structured-agent-session-legacy-recovery.test.tsx
@@ -0,0 +1,225 @@
+// @vitest-environment happy-dom
+// Opening a chat an older build left stuck: the host recorded its first message in doubt and later
+// recovered it, while the older build's saved copy still held that message plus two queued behind
+// it. Real chat hook, sends, legacy recovery and draft store; only the history read and RPC are faked.
+
+import { act, cleanup, renderHook, waitFor } from '@testing-library/react'
+import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest'
+
+const mocks = vi.hoisted(() => ({
+  call: vi.fn(),
+  outline: vi.fn()
+}))
+
+vi.mock('sonner', () => ({ toast: { error: vi.fn(), message: vi.fn() } }))
+
+let fence: number | null = 10
+let items: AgentJournalRenderItem[] = []
+let submissions: AgentJournalSubmission[] = []
+
+vi.mock('@/runtime/structured-agent-session-client', () => ({
+  callStructuredAgentSession: mocks.call,
+  readStructuredAgentSessionConversationOutline: mocks.outline,
+  supportsStructuredAgentSessionQuietRepeatedStop: vi.fn(async () => false),
+  supportsStructuredAgentSessionPromptCancel: vi.fn(async () => false),
+  supportsStructuredAgentSessionQuestionAnswers: vi.fn(async () => false)
+}))
+
+vi.mock('./use-structured-agent-session-read', () => ({
+  useStructuredAgentSessionRead: () => ({
+    state: {
+      fence,
+      commands: undefined,
+      items,
+      submissions,
+      status: 'ready',
+      error: null,
+      hasOlder: false,
+      handoff: null
+    },
+    loadingOlder: false,
+    loadOlder: vi.fn()
+  })
+}))
+
+import type {
+  AgentJournalRenderItem,
+  AgentJournalSubmission
+} from '../../../../shared/agent-session-journal-types'
+import { agentJournalSubmissionKey } from '../../../../shared/agent-session-journal-item-key'
+import { useStructuredAgentSession } from './use-structured-agent-session'
+import {
+  readNativeChatComposerDraft,
+  structuredAgentSessionDraftScopeKey
+} from './native-chat-composer-draft-store'
+import { resetStructuredAgentSessionSendsForTests } from './structured-agent-session-message-sender'
+import { clearNativeChatDraftCacheForTests } from './native-chat-draft-cache'
+
+const SESSION = 'session-1'
+const KEY = `orca:desktopStructuredAgentSessionOutbox:v1:${SESSION}`
+const IN_DOUBT = '1000-in-doubt'
+const SECOND = '2000-second'
+const THIRD = '3000-third'
+
+function saved(clientMessageId: string, text: string, state: string, lastAttemptAt: number | null) {
+  return {
+    clientMessageId,
+    sessionId: SESSION,
+    body: { kind: 'message', role: 'user', blocks: [{ type: 'text', text }] },
+    previewUris: [],
+    state,
+    queuedAt: Number(clientMessageId.split('-')[0]),
+    lastAttemptAt,
+    retryAfterUnknownSubmittedAt: null
+  }
+}
+
+function outline(ids: string[], omittedEntries = 0) {
+  return {
+    sessionId: SESSION,
+    cursor: { epoch: 'e', sequence: 50 },
+    entries: ids.map((id, index) => ({
+      itemId: agentJournalSubmissionKey(id),
+      sequence: 40 + index,
+      preview: '',
+      imageCount: 0
+    })),
+    omittedEntries
+  }
+}
+
+/** The host's row for the first message: in doubt when its provider closed, then recovered. */
+const IN_DOUBT_SUBMISSION: AgentJournalSubmission = {
+  clientMessageId: IN_DOUBT,
+  fence: 9,
+  payloadFingerprint: 'fp-1',
+  dispatchState: 'unknown',
+  providerItemId: null,
+  reason: 'provider_closed_before_acknowledgement',
+  submittedAt: 1_100,
+  resolvedAt: 1_200,
+  recovered: true
+}
+
+const IN_DOUBT_ITEM: AgentJournalRenderItem = {
+  itemId: agentJournalSubmissionKey(IN_DOUBT),
+  revision: 1,
+  sequence: 49,
+  observedAt: 1_100,
+  body: { kind: 'message', role: 'user', blocks: [{ type: 'text', text: 'first' }] }
+}
+
+const draft = () => readNativeChatComposerDraft(structuredAgentSessionDraftScopeKey(SESSION)).text
+const sendCalls = () => mocks.call.mock.calls.filter(([, method]) => method === 'agentSession.send')
+
+function renderChat() {
+  return renderHook(() =>
+    useStructuredAgentSession({
+      sessionId: SESSION,
+      target: { kind: 'local' },
+      agent: 'claude',
+      isVisible: true
+    })
+  )
+}
+
+describe('opening a chat an older build left stuck behind a message in doubt', () => {
+  beforeEach(() => {
+    vi.clearAllMocks()
+    localStorage.clear()
+    resetStructuredAgentSessionSendsForTests()
+    clearNativeChatDraftCacheForTests()
+    fence = 10
+    items = [IN_DOUBT_ITEM]
+    submissions = [IN_DOUBT_SUBMISSION]
+    mocks.call.mockResolvedValue(null)
+    localStorage.setItem(
+      KEY,
+      JSON.stringify([
+        saved(IN_DOUBT, 'first', 'unconfirmed', 1_050),
+        saved(SECOND, 'second', 'queued', null),
+        saved(THIRD, 'third', 'queued', null)
+      ])
+    )
+  })
+  afterEach(cleanup)
+
+  it('gives the two queued messages back once, in order, and leaves the chat free to send', async () => {
+    mocks.outline.mockResolvedValue(outline([IN_DOUBT]))
+    const { result } = renderChat()
+
+    await waitFor(() => expect(localStorage.getItem(KEY)).toBeNull())
+    expect(draft()).toBe('second\n\nthird')
+    expect(result.current.error).toBe('Your message was not sent. Send it again.')
+    // The first is the host's own row, drawn plain.
+    const row = result.current.messages.find(
+      (message) => message.id === agentJournalSubmissionKey(IN_DOUBT)
+    )
+    expect(row).toBeDefined()
+    expect(row && 'unsent' in row ? row.unsent : undefined).toBeUndefined()
+    expect(result.current.messages.map((message) => message.id)).not.toContain(
+      agentJournalSubmissionKey(SECOND)
+    )
+    expect(result.current.isWorking).toBe(false)
+    expect(result.current.canStop).toBe(false)
+    expect(result.current.sendOut).toBe(false)
+    expect(result.current.pending).toEqual([])
+    expect(sendCalls()).toEqual([])
+  })
+
+  it("says it couldn't confirm when the host can't list the whole conversation", async () => {
+    mocks.outline.mockResolvedValue(null)
+    const { result } = renderChat()
+
+    await waitFor(() => expect(localStorage.getItem(KEY)).toBeNull())
+    expect(result.current.error).toContain("couldn't confirm your message reached the agent")
+  })
+
+  it("sends the next message under the fence the chat's read reported", async () => {
+    mocks.outline.mockResolvedValue(outline([IN_DOUBT]))
+    const { result } = renderChat()
+    await waitFor(() => expect(localStorage.getItem(KEY)).toBeNull())
+    mocks.call.mockImplementation(async (_target: unknown, method: string) =>
+      method === 'agentSession.send'
+        ? {
+            ok: true,
+            replayed: false,
+            value: {
+              clientMessageId: 'next',
+              submission: {
+                ...IN_DOUBT_SUBMISSION,
+                clientMessageId: 'next',
+                fence: 11,
+                dispatchState: 'pending',
+                recovered: undefined,
+                reason: null
+              }
+            }
+          }
+        : null
+    )
+
+    let sent: unknown
+    act(() => {
+      sent = result.current.send('next')
+    })
+
+    expect(sent).toBe(true)
+    await waitFor(() => expect(sendCalls()).toHaveLength(1))
+    expect(sendCalls()[0]?.[2].envelope.expectedRuntimeFence).toBe(10)
+    // The read's fence is used, with no history read for it.
+    expect(mocks.call.mock.calls.some(([, method]) => method === 'agentSession.history')).toBe(
+      false
+    )
+  })
+
+  it('leaves the copy alone while the chat has no fence on this host', async () => {
+    fence = null
+    mocks.outline.mockResolvedValue(outline([IN_DOUBT]))
+    renderChat()
+
+    await new Promise((resolve) => setTimeout(resolve, 50))
+    expect(mocks.outline).not.toHaveBeenCalled()
+    expect(localStorage.getItem(KEY)).not.toBeNull()
+  })
+})
diff --git a/src/renderer/src/components/native-chat/use-structured-agent-session-messages.test.tsx b/src/renderer/src/components/native-chat/use-structured-agent-session-messages.test.tsx
index 68e388de58c5..670cf9619757 100644
--- a/src/renderer/src/components/native-chat/use-structured-agent-session-messages.test.tsx
+++ b/src/renderer/src/components/native-chat/use-structured-agent-session-messages.test.tsx
@@ -5,10 +5,25 @@ import type {
   AgentJournalRenderItem,
   AgentJournalSubmission
 } from '../../../../shared/agent-session-journal-types'
-import { createStructuredAgentSessionOutboxEntry } from '../../../../shared/structured-agent-session-outbox'
+import type { StructuredAgentSessionOptimisticMessage } from '../../../../shared/structured-agent-session-message-projection'
+import { structuredAgentSessionSendBody } from '../../../../shared/structured-agent-session-send-mutation'
 import { projectStructuredAgentSessionMessages } from './structured-agent-session-message-projection'
 import { useStructuredAgentSessionMessages } from './use-structured-agent-session-messages'
 
+function optimisticMessage(args: {
+  clientMessageId: string
+  sessionId?: string
+  text: string
+  attachments: readonly { path: string; previewUri: string }[]
+  queuedAt: number
+}): StructuredAgentSessionOptimisticMessage {
+  return {
+    clientMessageId: args.clientMessageId,
+    body: structuredAgentSessionSendBody(args.text, args.attachments),
+    queuedAt: args.queuedAt
+  }
+}
+
 afterEach(cleanup)
 const EMPTY: never[] = []
 function tool(id: string, sequence: number): AgentJournalRenderItem {
@@ -67,7 +82,7 @@ it('retains only unchanged item projections across updates, reorder, deletion, a
 })
 
 it('keeps optimistic sends and their settlement identical to uncached projection', () => {
-  const entry = createStructuredAgentSessionOutboxEntry({
+  const entry = optimisticMessage({
     clientMessageId: 'send',
     sessionId: 'session',
     text: 'Send this',
diff --git a/src/renderer/src/components/native-chat/use-structured-agent-session-messages.ts b/src/renderer/src/components/native-chat/use-structured-agent-session-messages.ts
index f965c2d3eaa3..d9592216326f 100644
--- a/src/renderer/src/components/native-chat/use-structured-agent-session-messages.ts
+++ b/src/renderer/src/components/native-chat/use-structured-agent-session-messages.ts
@@ -3,16 +3,16 @@ import type {
   AgentJournalRenderItem,
   AgentJournalSubmission
 } from '../../../../shared/agent-session-journal-types'
-import type { StructuredAgentSessionOutboxEntry } from '../../../../shared/structured-agent-session-outbox'
+import type { StructuredAgentSessionOptimisticMessage } from '../../../../shared/structured-agent-session-message-projection'
 import { projectStructuredAgentSessionMessages } from './structured-agent-session-message-projection'
 
 export function useStructuredAgentSessionMessages(
   items: readonly AgentJournalRenderItem[],
-  outbox: readonly StructuredAgentSessionOutboxEntry[],
+  optimistic: readonly StructuredAgentSessionOptimisticMessage[],
   submissions: readonly AgentJournalSubmission[]
 ) {
   return useMemo(
-    () => projectStructuredAgentSessionMessages(items, outbox, submissions),
-    [items, outbox, submissions]
+    () => projectStructuredAgentSessionMessages(items, optimistic, submissions),
+    [items, optimistic, submissions]
   )
 }
diff --git a/src/renderer/src/components/native-chat/use-structured-agent-session-mutate.test.tsx b/src/renderer/src/components/native-chat/use-structured-agent-session-mutate.test.tsx
index 81f61815dd9a..f3df62da35a1 100644
--- a/src/renderer/src/components/native-chat/use-structured-agent-session-mutate.test.tsx
+++ b/src/renderer/src/components/native-chat/use-structured-agent-session-mutate.test.tsx
@@ -19,7 +19,7 @@ vi.mock('@/runtime/structured-agent-session-client', () => ({
   supportsStructuredAgentSessionQuietRepeatedStop: mocks.hostAnswersRepeatedStops
 }))
 
-vi.mock('./use-structured-agent-session-outbox', () => ({
+vi.mock('./structured-agent-session-operation-id', () => ({
   structuredSessionOperationId: () => `operation-${++mocks.operations}`
 }))
 
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 d33ab9ef79c4..bfccacad0933 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
@@ -18,13 +18,13 @@ import {
   type AgentSessionWriteFailure
 } from '../../../../shared/agent-session-write-failure'
 import { structuredAgentSessionPayloadFingerprint } from '../../../../shared/structured-agent-session-mutation'
+import { structuredSessionOperationId } from './structured-agent-session-operation-id'
 import type { RuntimeClientTarget } from '@/runtime/runtime-rpc-client'
 import { RuntimeRpcCallError } from '@/runtime/runtime-rpc-result'
 import {
   callStructuredAgentSession,
   supportsStructuredAgentSessionQuietRepeatedStop
 } from '@/runtime/structured-agent-session-client'
-import { structuredSessionOperationId } from './use-structured-agent-session-outbox'
 import { agentSessionWriteFailureText } from './agent-session-write-notice-text'
 
 export type StructuredAgentSessionWriteOutcome<T> =
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
deleted file mode 100644
index a810a331a2cd..000000000000
--- a/src/renderer/src/components/native-chat/use-structured-agent-session-outbox-admission.test.tsx
+++ /dev/null
@@ -1,348 +0,0 @@
-// Which entry the queue dispatches next, and which one stops it.
-//
-// A hidden pane receives no journal updates, so `submissions` never moves and an admitted head
-// stays `dispatching` for as long as the turn ahead of it runs. Delivery must not wait on that.
-
-// @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 type { AgentSessionWireRefusalCode } from '../../../../shared/agent-session-wire'
-
-const mocks = vi.hoisted(() => ({
-  call: vi.fn()
-}))
-
-vi.mock('@/runtime/structured-agent-session-client', () => ({
-  callStructuredAgentSession: mocks.call
-}))
-
-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'
-import type { StructuredAgentSessionOutboxEntry } from '../../../../shared/structured-agent-session-outbox'
-import { structuredAgentSessionEntryHeldForRetry } from '../../../../shared/structured-agent-session-outbox-admission'
-
-const NO_JOURNAL_ITEMS: readonly AgentJournalRenderItem[] = []
-
-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 }
-}
-
-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]))
-}
-
-/** The messages that wait for their own Retry. */
-function heldIds(outbox: readonly StructuredAgentSessionOutboxEntry[]): string[] {
-  return outbox
-    .filter(structuredAgentSessionEntryHeldForRetry)
-    .map((entry) => entry.clientMessageId)
-}
-
-function submissionResult(
-  clientMessageId: string,
-  dispatchState: 'pending' | 'accepted',
-  submittedAt: number
-) {
-  return {
-    ok: true,
-    replayed: false,
-    fence: 1,
-    cursor: { epoch: 'epoch-1', sequence: submittedAt },
-    value: {
-      clientMessageId,
-      submission: {
-        clientMessageId,
-        fence: 1,
-        payloadFingerprint: 'fingerprint',
-        dispatchState,
-        providerItemId: null,
-        reason: null,
-        submittedAt,
-        resolvedAt: dispatchState === 'accepted' ? submittedAt : null
-      }
-    }
-  }
-}
-
-function refusedResult(code: AgentSessionWireRefusalCode) {
-  return { ok: false, refusal: { code, message: code } }
-}
-
-function renderOutbox() {
-  return renderHook(() =>
-    useStructuredAgentSessionOutbox({
-      journalItems: NO_JOURNAL_ITEMS,
-      sessionId: 'session-1',
-      target: LOCAL_TARGET,
-      fence: 1,
-      submissions: []
-    })
-  )
-}
-
-async function settleTimers(ms: number): Promise<void> {
-  await act(async () => {
-    await new Promise((resolve) => setTimeout(resolve, ms))
-  })
-}
-
-describe('structured agent session outbox admission', () => {
-  let randomUuidSequence = 0
-
-  // Without this a hook left mounted keeps its probe timers running into the next test.
-  afterEach(cleanup)
-
-  beforeEach(() => {
-    vi.clearAllMocks()
-    localStorage.clear()
-    randomUuidSequence = 0
-    vi.spyOn(globalThis.crypto, 'randomUUID').mockImplementation(() => {
-      randomUuidSequence += 1
-      return `11111111-1111-4111-8111-${randomUuidSequence.toString(16).padStart(12, '0')}`
-    })
-  })
-
-  it('dispatches the queued tail while the head is still pending', async () => {
-    const head = deferred<ReturnType<typeof submissionResult>>()
-    // A persistent implementation, so no queued `...Once` can outlive this test.
-    mocks.call.mockImplementation((_target, _method, params) =>
-      requestText(params) === 'first' ? head.promise : 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))
-    await settleTimers(50)
-    // Single-flight: the tail waits for the head's round trip, never runs beside it.
-    expect(mocks.call).toHaveBeenCalledTimes(1)
-
-    const headId = result.current.outbox[0]?.clientMessageId
-    expect(headId).toBeDefined()
-    await act(async () => head.resolve(submissionResult(String(headId), 'pending', 10)))
-
-    await waitFor(() => expect(sentTexts()).toContain('second'))
-    // The admitted head stays: only the journal's answer retires it, not the tail going out.
-    expect(result.current.outbox).toHaveLength(2)
-    expect(result.current.outbox[0]?.clientMessageId).toBe(headId)
-    expect(result.current.outbox[0]?.state).toBe('dispatching')
-    expect(result.current.error).toBeNull()
-  })
-
-  it('keeps an unconfirmed head blocking the queue', async () => {
-    mocks.call.mockRejectedValue(new Error('socket closed'))
-    const { result } = renderOutbox()
-
-    act(() => expect(result.current.send('first')).toBe(true))
-    await waitFor(() => expect(result.current.outbox[0]?.state).toBe('unconfirmed'))
-    act(() => expect(result.current.send('second')).toBe(true))
-    // Well inside the unknown probe's first delay, which would otherwise requeue the head.
-    await settleTimers(200)
-
-    expect(sentTexts()).not.toContain('second')
-    expect(mocks.call).toHaveBeenCalledTimes(1)
-  })
-
-  // A refused message lands only by its own Retry, so nothing it could be reordered around.
-  it('sends a message past a refused one, which waits for its own Retry', async () => {
-    mocks.call.mockImplementation((_target, _method, params) =>
-      Promise.resolve(
-        requestText(params) === 'first'
-          ? refusedResult('agent_session_ownership_unknown')
-          : submissionResult(requestId(params), 'accepted', 20)
-      )
-    )
-    const { result } = renderOutbox()
-
-    act(() => expect(result.current.send('first')).toBe(true))
-    await waitFor(() => expect(heldIds(result.current.outbox)).toHaveLength(1))
-    const refusedId = heldIds(result.current.outbox)[0]
-    act(() => expect(result.current.send('second')).toBe(true))
-    await waitFor(() => expect(result.current.outbox).toHaveLength(1))
-    await settleTimers(50)
-
-    expect(sentTexts()).toEqual(['first', 'second'])
-    expect(heldIds(result.current.outbox)).toEqual([refusedId])
-  })
-
-  it.each(['accepted', 'pending'] as const)(
-    'holds a queued message until the launch prompt returns %s',
-    async (dispatchState) => {
-      const stagedEntry = enqueueStructuredAgentSessionLaunchPrompt('session-1', 'review this')
-      if (!stagedEntry) {
-        throw new Error('fixture outbox entry was not persisted')
-      }
-      const admission = deferred<ReturnType<typeof submissionResult>>()
-      mocks.call.mockImplementation((_target, _method, params) =>
-        requestText(params) === 'review this' ? admission.promise : new Promise<never>(() => {})
-      )
-      const delivery = settleStructuredAgentLaunchPrompt({
-        launchResult: Promise.resolve({ sessionId: 'session-1', fence: 1 }),
-        target: { kind: 'local' },
-        options: { prompt: 'review this' },
-        stagedEntry
-      })
-      await waitFor(() => expect(mocks.call).toHaveBeenCalledTimes(1))
-
-      const { result } = renderOutbox()
-      act(() => expect(result.current.send('after launch')).toBe(true))
-      await settleTimers(50)
-      // The launch settlement dispatches outside this hook's single-flight, so nothing may race it.
-      expect(sentTexts()).not.toContain('after launch')
-
-      await act(async () =>
-        admission.resolve(submissionResult(stagedEntry.clientMessageId, dispatchState, 1))
-      )
-      await expect(delivery).resolves.toEqual({ delivered: true, failureNotified: false })
-
-      await waitFor(() => expect(sentTexts()).toContain('after launch'))
-      expect(result.current.outbox).toHaveLength(dispatchState === 'pending' ? 2 : 1)
-    }
-  )
-
-  it('advances the tail when the journal admits the head before its RPC resolves', async () => {
-    const admission = deferred<ReturnType<typeof submissionResult>>()
-    mocks.call.mockImplementation((_target, _method, params) =>
-      requestText(params) === 'first' ? admission.promise : new Promise<never>(() => {})
-    )
-    const submissions: readonly AgentJournalSubmission[] = []
-    const { result, rerender } = renderHook(
-      ({ submissions }: { submissions: readonly AgentJournalSubmission[] }) =>
-        useStructuredAgentSessionOutbox({
-          journalItems: NO_JOURNAL_ITEMS,
-          sessionId: 'session-1',
-          target: LOCAL_TARGET,
-          fence: 1,
-          submissions
-        }),
-      { initialProps: { 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 id = result.current.outbox[0]?.clientMessageId
-    expect(id).toBeDefined()
-    rerender({ submissions: [submissionResult(String(id), 'pending', 10).value.submission] })
-    await waitFor(() => expect(sentTexts()).toEqual(['first', 'second']))
-    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(heldIds(result.current.outbox)).toHaveLength(1))
-    const heldId = heldIds(result.current.outbox)[0]
-    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,
-      'Claude',
-      () => {},
-      [],
-      [],
-      result.current.failedHere
-    )
-    expect(notices.get(agentJournalSubmissionKey(c!.clientMessageId))?.onRetry).toBeDefined()
-
-    act(() => result.current.retry(c!.clientMessageId))
-    expect(heldIds(result.current.outbox)).toEqual([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(heldIds(result.current.outbox)).toEqual([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({
-          journalItems: NO_JOURNAL_ITEMS,
-          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(heldIds(result.current.outbox)).toHaveLength(1))
-    const heldId = heldIds(result.current.outbox)[0]
-    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(heldIds(result.current.outbox)).toEqual([heldId])
-  })
-})
diff --git a/src/renderer/src/components/native-chat/use-structured-agent-session-outbox-failed-here.ts b/src/renderer/src/components/native-chat/use-structured-agent-session-outbox-failed-here.ts
deleted file mode 100644
index 7e1858ce4aa7..000000000000
--- a/src/renderer/src/components/native-chat/use-structured-agent-session-outbox-failed-here.ts
+++ /dev/null
@@ -1,63 +0,0 @@
-import { useCallback, useState } from 'react'
-import type { StructuredAgentSessionOutboxEntry } from '../../../../shared/structured-agent-session-outbox'
-
-const NONE: ReadonlySet<string> = new Set()
-
-/**
- * The messages whose send failed or was refused while this chat was open, in memory only. Only
- * they word their saved cause: one read back from storage may have outlived it (Orca was updated
- * since, say), and its Retry, refused again if the cause holds, brings the words back.
- */
-export function useStructuredAgentSessionOutboxFailedHere(sessionId: string): {
-  failedHere: ReadonlySet<string>
-  /** Records the entries a send's answer gave a failure they did not carry before. */
-  recordFailures: (
-    before: readonly StructuredAgentSessionOutboxEntry[],
-    after: readonly StructuredAgentSessionOutboxEntry[]
-  ) => void
-  forget: (clientMessageId: string) => void
-} {
-  const [recorded, setRecorded] = useState({ sessionId, ids: NONE })
-  const recordFailures = useCallback(
-    (
-      before: readonly StructuredAgentSessionOutboxEntry[],
-      after: readonly StructuredAgentSessionOutboxEntry[]
-    ): void => {
-      const previous = new Map(before.map((entry) => [entry.clientMessageId, entry.lastFailure]))
-      const failed = after.filter(
-        (entry) =>
-          entry.lastFailure !== undefined &&
-          previous.get(entry.clientMessageId) !== entry.lastFailure
-      )
-      if (failed.length === 0) {
-        return
-      }
-      setRecorded((current) => ({
-        sessionId,
-        ids: new Set([
-          ...(current.sessionId === sessionId ? current.ids : NONE),
-          ...failed.map((entry) => entry.clientMessageId)
-        ])
-      }))
-    },
-    [sessionId]
-  )
-  const forget = useCallback(
-    (clientMessageId: string): void => {
-      setRecorded((current) => {
-        if (current.sessionId !== sessionId || !current.ids.has(clientMessageId)) {
-          return current
-        }
-        const ids = new Set(current.ids)
-        ids.delete(clientMessageId)
-        return { sessionId, ids }
-      })
-    },
-    [sessionId]
-  )
-  return {
-    failedHere: recorded.sessionId === sessionId ? recorded.ids : NONE,
-    recordFailures,
-    forget
-  }
-}
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
deleted file mode 100644
index 86d1ddf83223..000000000000
--- a/src/renderer/src/components/native-chat/use-structured-agent-session-outbox-fence.test.tsx
+++ /dev/null
@@ -1,180 +0,0 @@
-// @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, cleanup, renderHook, waitFor } from '@testing-library/react'
-import { afterEach, 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 { settleStructuredAgentLaunchPrompt } from '@/lib/structured-agent-session-launch-prompt'
-import { enqueueStructuredAgentSessionLaunchPrompt } from './structured-agent-session-outbox-storage'
-import { useStructuredAgentSessionOutbox } from './use-structured-agent-session-outbox'
-
-import type { AgentJournalRenderItem } from '../../../../shared/agent-session-journal-types'
-
-const NO_JOURNAL_ITEMS: readonly AgentJournalRenderItem[] = []
-
-// Why: every hook here shares the session outbox store; one left mounted would drain the next test's.
-afterEach(cleanup)
-
-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(fence: number | null = 1) {
-  return renderHook(
-    (props) =>
-      useStructuredAgentSessionOutbox({
-        journalItems: NO_JOURNAL_ITEMS,
-        sessionId: 'session-1',
-        target: LOCAL_TARGET,
-        fence: props.fence,
-        submissions: []
-      }),
-    { initialProps: { fence } }
-  )
-}
-
-/** 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 failed send held 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.outbox[0]?.lastFailure).toBeDefined())
-    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))
-  })
-
-  it('leaves a launch prompt whose staging save failed queued, so the chat still sends it', async () => {
-    mocks.call.mockImplementation(async (_target, _method, params) =>
-      pendingResult(params.envelope.clientOperationId)
-    )
-    const staged = enqueueStructuredAgentSessionLaunchPrompt('session-1', 'launch notes')
-    if (!staged) {
-      throw new Error('fixture outbox entry was not persisted')
-    }
-    const { result, rerender } = render(null)
-
-    const setItem = vi.spyOn(localStorage, 'setItem').mockImplementation(() => {
-      throw new Error('quota exceeded')
-    })
-    const delivery = await act(async () =>
-      settleStructuredAgentLaunchPrompt({
-        launchResult: Promise.resolve({ sessionId: 'session-1', fence: 1 }),
-        target: { kind: 'local' },
-        options: { prompt: 'launch notes' },
-        stagedEntry: staged
-      })
-    )
-    setItem.mockRestore()
-    expect(delivery).toEqual({ delivered: false, failureNotified: false })
-    expect(mocks.call).not.toHaveBeenCalled()
-    expect(result.current.outbox).toMatchObject([{ state: 'queued' }])
-
-    rerender({ fence: 1 })
-    await waitFor(() => expect(mocks.call).toHaveBeenCalledTimes(1))
-    expect(sentId(0)).toBe(staged.clientMessageId)
-  })
-})
-
-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-owner-change.test.tsx b/src/renderer/src/components/native-chat/use-structured-agent-session-outbox-owner-change.test.tsx
deleted file mode 100644
index fcc0d2a6c620..000000000000
--- a/src/renderer/src/components/native-chat/use-structured-agent-session-outbox-owner-change.test.tsx
+++ /dev/null
@@ -1,237 +0,0 @@
-// @vitest-environment happy-dom
-
-// A message the chat said was not sent goes out only on its Retry, on every host, however the
-// chat's agent owner moves. A send still in flight when the owner moves, on a host not known to
-// record sends before starting an agent, goes out again under its id.
-
-import { act, cleanup, renderHook } from '@testing-library/react'
-import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest'
-
-const mocks = vi.hoisted(() => {
-  const regained: (() => void)[] = []
-  return { call: vi.fn(), probe: vi.fn(), regained }
-})
-
-vi.mock('@/runtime/structured-agent-session-client', () => ({
-  callStructuredAgentSession: mocks.call
-}))
-vi.mock('@/runtime/runtime-rpc-client', async (importOriginal) => ({
-  ...(await importOriginal<Record<string, unknown>>()),
-  runtimeEnvironmentSupportsCapability: mocks.probe
-}))
-vi.mock('@/runtime/runtime-host-contact-regained', () => ({
-  subscribeRuntimeHostContactRegained: (_environmentId: string, listener: () => void) => {
-    mocks.regained.push(listener)
-    return () => {}
-  }
-}))
-
-import type { AgentSessionWireRefusalCode } from '../../../../shared/agent-session-wire'
-import {
-  createStructuredAgentSessionOutboxEntry,
-  type StructuredAgentSessionOutboxEntry
-} from '../../../../shared/structured-agent-session-outbox'
-import { writeOutbox } from './structured-agent-session-outbox-storage'
-import { useStructuredAgentSessionOutbox } from './use-structured-agent-session-outbox'
-
-import type { AgentJournalRenderItem } from '../../../../shared/agent-session-journal-types'
-
-const NO_JOURNAL_ITEMS: readonly AgentJournalRenderItem[] = []
-
-type SendRequest = { envelope?: { clientOperationId?: string; expectedRuntimeFence?: number } }
-
-// Stable, as the view passes it: a new object each render would re-run the owner-change requeue.
-const TARGET = { kind: 'environment', environmentId: 'env-1' } as const
-
-function requestId(params: SendRequest | undefined): string {
-  return String(params?.envelope?.clientOperationId)
-}
-
-function sentIds(): string[] {
-  return mocks.call.mock.calls.map((call) => requestId(call[2]))
-}
-
-/** Each send as `id@fence`, so a resend on a new owner is told from the first attempt. */
-function sentAttempts(): string[] {
-  return mocks.call.mock.calls.map((call) => {
-    const params: SendRequest | undefined = call[2]
-    return `${requestId(params)}@${String(params?.envelope?.expectedRuntimeFence)}`
-  })
-}
-
-const QUEUED = { ok: true, replayed: false, fence: 2, value: { queued: {} } }
-
-function heldEntry(
-  clientMessageId: string,
-  code: AgentSessionWireRefusalCode
-): StructuredAgentSessionOutboxEntry {
-  return {
-    ...createStructuredAgentSessionOutboxEntry({
-      clientMessageId,
-      sessionId: 'session-1',
-      text: 'held',
-      attachments: [],
-      queuedAt: 1
-    }),
-    lastAttemptAt: 2,
-    lastFailure: { kind: 'refused', code }
-  }
-}
-
-async function settle(): Promise<void> {
-  await act(() => new Promise<void>((resolve) => setTimeout(resolve, 50)))
-}
-
-function mount(fence: number) {
-  return renderHook(
-    ({ fence: current }: { fence: number }) =>
-      useStructuredAgentSessionOutbox({
-        journalItems: NO_JOURNAL_ITEMS,
-        sessionId: 'session-1',
-        target: TARGET,
-        fence: current,
-        submissions: []
-      }),
-    { initialProps: { fence } }
-  )
-}
-
-function refusal(code: string) {
-  return { ok: false, refusal: { code, message: code } }
-}
-
-async function refusedOnce(code: string) {
-  mocks.call.mockResolvedValue(refusal(code))
-  const hook = mount(1)
-  await settle()
-  act(() => void hook.result.current.send('hello'))
-  await settle()
-  expect(sentIds()).toHaveLength(1)
-  expect(hook.result.current.outbox[0]?.lastFailure).toBeDefined()
-  return hook
-}
-
-describe('a refused message when the chat gets a new owner', () => {
-  beforeEach(() => {
-    localStorage.clear()
-    mocks.call.mockReset()
-    mocks.probe.mockReset()
-    mocks.regained.length = 0
-  })
-
-  afterEach(() => cleanup())
-
-  it('is not sent on a current host whose capability probe fails after the owner moved', async () => {
-    mocks.probe.mockResolvedValue(true)
-    const hook = await refusedOnce('agent_session_checkpoint_stale')
-    hook.rerender({ fence: 2 })
-    await settle()
-    mocks.probe.mockRejectedValueOnce(new Error('status timeout'))
-    act(() => mocks.regained.forEach((listener) => listener()))
-    await settle()
-    expect(sentIds()).toHaveLength(1)
-    expect(hook.result.current.outbox[0]?.lastFailure).toBeDefined()
-  })
-
-  it('is not sent while the capability probe has not answered', async () => {
-    mocks.probe.mockReturnValue(new Promise(() => {}))
-    const hook = await refusedOnce('agent_session_checkpoint_stale')
-    hook.rerender({ fence: 2 })
-    await settle()
-    expect(sentIds()).toHaveLength(1)
-  })
-
-  it.each([
-    'agent_session_owner_restart_failed',
-    'agent_session_checkpoint_stale',
-    'agent_session_conflict',
-    'agent_session_ownership_unknown',
-    'execution_owner_reconciling',
-    'agent_session_journal_unreadable',
-    'agent_session_operation_capacity'
-  ] as const)(
-    'waits for its Retry on a host known to be older when the owner moves, after %s',
-    async (code) => {
-      mocks.probe.mockResolvedValue(false)
-      // Held under an id already sent once, so its Retry keeps the id.
-      writeOutbox('session-1', [heldEntry('op-held', code)])
-      mocks.call.mockResolvedValue(QUEUED)
-      const hook = mount(1)
-      await settle()
-      hook.rerender({ fence: 2 })
-      await settle()
-      expect(sentIds()).toEqual([])
-      expect(hook.result.current.outbox[0]?.lastFailure).toBeDefined()
-
-      act(() => hook.result.current.retry('op-held'))
-      await settle()
-      expect(sentIds()).toEqual(['op-held'])
-      expect(hook.result.current.outbox).toEqual([])
-    }
-  )
-
-  it('waits for its Retry on a host known to be older when the send never reached it', async () => {
-    mocks.probe.mockResolvedValue(false)
-    mocks.call.mockRejectedValueOnce(new Error('send failed')).mockResolvedValue(QUEUED)
-    const hook = mount(1)
-    await settle()
-    act(() => void hook.result.current.send('hello'))
-    await settle()
-    expect(hook.result.current.outbox[0]?.lastFailure).toEqual({ kind: 'failed' })
-    hook.rerender({ fence: 2 })
-    await settle()
-    expect(sentIds()).toHaveLength(1)
-
-    act(() => hook.result.current.retry(hook.result.current.outbox[0]!.clientMessageId))
-    await settle()
-    expect(sentIds()).toHaveLength(2)
-    expect(hook.result.current.outbox).toEqual([])
-  })
-
-  // The owner change's requeue lands in the same commit as the drain's next send.
-  it.each([
-    ['a host known to be older', false],
-    ['a host whose capability check has not answered', undefined]
-  ])(
-    'sends again the send in flight when the owner moves on %s, with one queued behind it',
-    async (_label, supports) => {
-      mocks.probe.mockReturnValue(
-        supports === undefined ? new Promise(() => {}) : Promise.resolve(supports)
-      )
-      // The first owner never answers the first send.
-      mocks.call.mockReturnValueOnce(new Promise(() => {})).mockResolvedValue(QUEUED)
-      const hook = mount(1)
-      await settle()
-      act(() => void hook.result.current.send('first'))
-      await settle()
-      act(() => void hook.result.current.send('second'))
-      await settle()
-      const [first, second] = hook.result.current.outbox.map((entry) => entry.clientMessageId)
-      hook.rerender({ fence: 2 })
-      await settle()
-      await settle()
-      expect(sentAttempts()).toEqual([`${first}@1`, `${first}@2`, `${second}@2`])
-      expect(hook.result.current.outbox).toEqual([])
-    }
-  )
-
-  it('sends the send in flight again on a new owner, but not a message it refused', async () => {
-    mocks.probe.mockResolvedValue(false)
-    writeOutbox('session-1', [heldEntry('op-held', 'agent_session_checkpoint_stale')])
-    mocks.call.mockReturnValueOnce(new Promise(() => {})).mockResolvedValue(QUEUED)
-    const hook = mount(1)
-    await settle()
-    act(() => void hook.result.current.send('first'))
-    await settle()
-    act(() => void hook.result.current.send('second'))
-    await settle()
-    const [, first, second] = hook.result.current.outbox.map((entry) => entry.clientMessageId)
-    hook.rerender({ fence: 2 })
-    await settle()
-    await settle()
-    expect(sentAttempts()).toEqual([`${first}@1`, `${first}@2`, `${second}@2`])
-    expect(hook.result.current.outbox).toMatchObject([
-      { clientMessageId: 'op-held', lastFailure: { code: 'agent_session_checkpoint_stale' } }
-    ])
-  })
-})
diff --git a/src/renderer/src/components/native-chat/use-structured-agent-session-outbox-ownership.ts b/src/renderer/src/components/native-chat/use-structured-agent-session-outbox-ownership.ts
deleted file mode 100644
index 7a724b884780..000000000000
--- a/src/renderer/src/components/native-chat/use-structured-agent-session-outbox-ownership.ts
+++ /dev/null
@@ -1,82 +0,0 @@
-// Who owns an outbox entry's text when it leaves this client's queue without a
-// send answer. A Stop hands unsent text back to an empty composer — a local move; no
-// text crosses a wire. Text it cannot hand back stays here as not sent, on its Retry. A host that visibly holds the entry as a queued draft
-// (same id) owns it: those entries retire with no local restore, so the same
-// words can never come back twice.
-
-import { useCallback, useEffect } from 'react'
-import type { AgentJournalSubmission } from '../../../../shared/agent-session-journal-types'
-import { withdrawUnsentStructuredAgentSessionOutboxEntries } from '../../../../shared/structured-agent-session-outbox-stop-withdrawal'
-import {
-  commitStructuredAgentSessionOutbox,
-  getStructuredAgentSessionOutbox
-} from './structured-agent-session-outbox-storage'
-import type { useStructuredAgentSessionWithdrawnRestore } from './structured-agent-session-withdrawn-message-restore'
-
-export function useStructuredAgentSessionOutboxOwnership(args: {
-  sessionId: string
-  submissions: readonly AgentJournalSubmission[]
-  /** Ids of the host's published drafts; an entry with one of these ids is host-owned. */
-  queuedMessageIds: readonly string[] | undefined
-  /** The send in flight and its generation: a host that holds that send answered it. */
-  inFlightIdRef: { current: string | null }
-  dispatchGenerationRef: { current: number }
-  restoreWithdrawn: ReturnType<typeof useStructuredAgentSessionWithdrawnRestore>
-}): {
-  /** Stop's local step, before its RPC, so the drain has nothing left to send after it. */
-  withdrawUnsent: () => void
-} {
-  const { queuedMessageIds, restoreWithdrawn, sessionId } = args
-  const { dispatchGenerationRef, inFlightIdRef, submissions } = args
-
-  const withdrawUnsent = useCallback((): void => {
-    const current = getStructuredAgentSessionOutbox(sessionId)
-    const next = withdrawUnsentStructuredAgentSessionOutboxEntries(
-      current,
-      submissions,
-      inFlightIdRef.current
-    )
-    if (next.length === current.length && next.every((entry, index) => entry === current[index])) {
-      return
-    }
-    // By id: a kept entry comes back marked, as a new object.
-    const kept = new Map(next.map((entry) => [entry.clientMessageId, entry]))
-    const withdrawn = current.filter((entry) => !kept.has(entry.clientMessageId))
-    // The outbox is the only copy of what the host never had, so nothing leaves it unplaced.
-    const restored = restoreWithdrawn.byStop(withdrawn)
-    commitStructuredAgentSessionOutbox(
-      sessionId,
-      restored
-        ? next
-        : current.map(
-            (entry) => kept.get(entry.clientMessageId) ?? { ...entry, state: 'rejected' as const }
-          )
-    )
-  }, [inFlightIdRef, restoreWithdrawn, sessionId, submissions])
-
-  // Drop host-owned entries without a restore: the published card is the text now.
-  const retire = useCallback(
-    (ids: readonly string[]): void => {
-      const owned = new Set(ids)
-      // Like a journal row answering it: free single-flight and void the unsettled send's reply.
-      if (inFlightIdRef.current !== null && owned.has(inFlightIdRef.current)) {
-        dispatchGenerationRef.current += 1
-        inFlightIdRef.current = null
-      }
-      const current = getStructuredAgentSessionOutbox(sessionId)
-      const next = current.filter((entry) => !owned.has(entry.clientMessageId))
-      if (next.length !== current.length) {
-        commitStructuredAgentSessionOutbox(sessionId, next)
-      }
-    },
-    [dispatchGenerationRef, inFlightIdRef, sessionId]
-  )
-
-  useEffect(() => {
-    if (queuedMessageIds && queuedMessageIds.length > 0) {
-      retire(queuedMessageIds)
-    }
-  }, [queuedMessageIds, retire])
-
-  return { withdrawUnsent }
-}
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
deleted file mode 100644
index cad9c99ac002..000000000000
--- a/src/renderer/src/components/native-chat/use-structured-agent-session-outbox-rejection-cause.test.tsx
+++ /dev/null
@@ -1,741 +0,0 @@
-// @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 } from '../../../../shared/structured-agent-session-dispatch-rejection'
-
-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 { RuntimeRpcCallError } from '@/runtime/runtime-rpc-result'
-import { useStructuredAgentSessionOutbox } from './use-structured-agent-session-outbox'
-import { advanceProbeClock, useProbeClock } from './NativeChatStructuredSession.test-harness'
-import { structuredAgentSessionDeliveryNotices } from './structured-agent-session-delivery-notices'
-import { agentJournalSubmissionKey } from '../../../../shared/agent-session-journal-item-key'
-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 {
-  hasUndeliveredStructuredAgentSessionOutbox,
-  readOutbox,
-  writeOutbox
-} from './structured-agent-session-outbox-storage'
-
-/** What these hooks render with: the journal's submissions, and the rows loaded so far. */
-type OutboxProps = { submissions: AgentJournalSubmission[]; rows?: AgentJournalRenderItem[] }
-
-function outboxProps(submissions: AgentJournalSubmission[]): OutboxProps {
-  return { submissions }
-}
-
-const NO_JOURNAL_ITEMS: readonly AgentJournalRenderItem[] = []
-
-// Why: every hook here shares the session outbox store; one left mounted would drain the next test's.
-afterEach(() => {
-  cleanup()
-  vi.useRealTimers()
-})
-
-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,
-    replayed: false,
-    fence: 3,
-    cursor: { epoch: 'epoch-1', sequence: 4 },
-    value: {
-      clientMessageId,
-      submission: {
-        clientMessageId,
-        fence: 3,
-        payloadFingerprint: 'fingerprint',
-        dispatchState: 'rejected',
-        providerItemId: null,
-        reason: REASON,
-        submittedAt: 10,
-        resolvedAt: 11
-      }
-    }
-  }
-}
-
-describe('a send the host rejected because the agent never started', () => {
-  beforeEach(() => {
-    vi.clearAllMocks()
-    localStorage.clear()
-  })
-
-  it('names the cause on the message until the journal row takes it over', async () => {
-    mocks.call.mockImplementationOnce(
-      async (
-        _target: unknown,
-        _method: unknown,
-        params: { envelope: { clientOperationId: string } }
-      ) => rejectedResultFor(params.envelope.clientOperationId)
-    )
-    const { result } = renderHook(() =>
-      useStructuredAgentSessionOutbox({
-        journalItems: NO_JOURNAL_ITEMS,
-        sessionId: 'session-1',
-        target: { kind: 'local' },
-        fence: 1,
-        submissions: []
-      })
-    )
-
-    act(() => expect(result.current.send('hello')).toBe(true))
-
-    await waitFor(() => expect(shownFailure(result.current.outbox[0])).toBe(REASON))
-    // Settled as not delivered: it holds no later message up.
-    expect(result.current.error).toBeNull()
-    expect(result.current.outbox[0]?.state).toBe('rejected')
-  })
-
-  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({
-        journalItems: NO_JOURNAL_ITEMS,
-        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('leaves a message the host accepted and then could not deliver to its journal row', 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: OutboxProps) =>
-        useStructuredAgentSessionOutbox({
-          journalItems: props.rows ?? NO_JOURNAL_ITEMS,
-          sessionId: 'session-1',
-          target,
-          fence: 1,
-          submissions: props.submissions
-        }),
-      { initialProps: outboxProps(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 }
-      ],
-      rows: rowsFor(id)
-    })
-
-    // The host's row shows it as not sent, with no Retry: nothing resends it.
-    await waitFor(() => expect(result.current.outbox).toEqual([]))
-    expect(result.current.error).toBeNull()
-    await act(() => new Promise((resolve) => setTimeout(resolve, 50)))
-    expect(mocks.call).toHaveBeenCalledOnce()
-  })
-
-  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: OutboxProps) =>
-        useStructuredAgentSessionOutbox({
-          journalItems: props.rows ?? NO_JOURNAL_ITEMS,
-          sessionId: 'session-1',
-          target,
-          fence: 1,
-          submissions: props.submissions
-        }),
-      { initialProps: outboxProps(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('leaves a message rejected while the chat was closed to its journal row, 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({
-        journalItems: NO_JOURNAL_ITEMS,
-        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 reopenedRows = rowsFor(id)
-    const { result } = renderHook(() =>
-      useStructuredAgentSessionOutbox({
-        journalItems: reopenedRows,
-        sessionId: 'session-1',
-        target,
-        fence: 1,
-        submissions: rejected
-      })
-    )
-
-    await waitFor(() => expect(result.current.outbox).toEqual([]))
-    act(() => expect(result.current.send('second')).toBe(true))
-    await waitFor(() => expect(mocks.call).toHaveBeenCalledTimes(2))
-  })
-
-  // One stored host fact, one rendering: a message the host recorded and rejected, whose record this
-  // chat does not hold, keeps showing why on every mount, with no control, and is never sent again.
-  it('keeps a message the host rejected, with no control, on every mount, and never resends it', async () => {
-    useProbeClock()
-    writeOutbox('session-1', [
-      {
-        ...rejectedBeforeRestart(),
-        state: 'dispatching',
-        lastFailure: undefined,
-        lastAttemptAt: 5
-      }
-    ])
-    // The host replays its rejection when the reopened chat asks about the send it left in doubt.
-    mocks.call.mockImplementation(async (_target, _method, params) =>
-      rejectedResultFor(String(params.envelope.clientOperationId))
-    )
-    const notice = (
-      outbox: readonly StructuredAgentSessionOutboxEntry[],
-      failedHere: ReadonlySet<string>
-    ) =>
-      structuredAgentSessionDeliveryNotices(
-        outbox,
-        'Claude',
-        () => {},
-        NO_SUBMISSIONS,
-        [],
-        failedHere
-      ).get(agentJournalSubmissionKey('rejected-before-restart'))
-    const mount = () =>
-      renderHook(() =>
-        useStructuredAgentSessionOutbox({
-          journalItems: NO_JOURNAL_ITEMS,
-          sessionId: 'session-1',
-          target: { kind: 'local' },
-          fence: 1,
-          submissions: NO_SUBMISSIONS
-        })
-      )
-
-    const first = mount()
-    await advanceProbeClock(1000)
-    expect(first.result.current.outbox[0]?.state).toBe('rejected')
-    const onFirst = notice(first.result.current.outbox, first.result.current.failedHere)
-    first.unmount()
-    const second = mount()
-    const onSecond = notice(second.result.current.outbox, second.result.current.failedHere)
-
-    for (const shown of [onFirst, onSecond]) {
-      expect(shown).toEqual({ text: REASON })
-    }
-    await advanceProbeClock(1500)
-    // Only the first mount's question about the send it left in doubt; nothing resends it.
-    expect(mocks.call).toHaveBeenCalledOnce()
-    expect(second.result.current.outbox.map((entry) => entry.state)).toEqual(['rejected'])
-    expect(readOutbox('session-1')).toHaveLength(1)
-    expect(hasUndeliveredStructuredAgentSessionOutbox('session-1')).toBe(false)
-  }, 10000)
-
-  // The host's own record is what lets it go, and storage forgets it too: nothing is owed.
-  it('drops a message rejected before a restart once the journal says so, from storage too', async () => {
-    writeOutbox('session-1', [rejectedBeforeRestart()])
-    const { result, rerender } = renderHook(
-      (props: OutboxProps) =>
-        useStructuredAgentSessionOutbox({
-          journalItems: props.rows ?? NO_JOURNAL_ITEMS,
-          sessionId: 'session-1',
-          target: { kind: 'local' },
-          fence: 1,
-          submissions: props.submissions
-        }),
-      { initialProps: outboxProps(NO_SUBMISSIONS) }
-    )
-    expect(result.current.outbox).toHaveLength(1)
-
-    rerender({
-      submissions: [
-        {
-          ...pendingResultFor('rejected-before-restart').value.submission,
-          dispatchState: 'rejected',
-          reason: 'The provider did not accept this message.',
-          resolvedAt: 2
-        }
-      ],
-      rows: rowsFor('rejected-before-restart')
-    })
-
-    await waitFor(() => expect(result.current.outbox).toEqual([]))
-    expect(readOutbox('session-1')).toEqual([])
-    expect(hasUndeliveredStructuredAgentSessionOutbox('session-1')).toBe(false)
-    expect(mocks.call).not.toHaveBeenCalled()
-  })
-
-  // An older host leaves a rejected message where it was sent, which may be outside the loaded
-  // window: the entry draws it, with no control, until the row that draws it loads.
-  it('keeps a rejected message whose row is not loaded, then lets it go once the row loads', async () => {
-    writeOutbox('session-1', [
-      { ...rejectedBeforeRestart(), state: 'dispatching', lastFailure: undefined, lastAttemptAt: 5 }
-    ])
-    const rejected = [
-      {
-        ...pendingResultFor('rejected-before-restart').value.submission,
-        dispatchState: 'rejected' as const,
-        reason: REASON,
-        resolvedAt: 2
-      }
-    ]
-    const { result, rerender } = renderHook(
-      (props: OutboxProps) =>
-        useStructuredAgentSessionOutbox({
-          journalItems: props.rows ?? NO_JOURNAL_ITEMS,
-          sessionId: 'session-1',
-          target: { kind: 'local' },
-          fence: 1,
-          submissions: props.submissions
-        }),
-      { initialProps: outboxProps(rejected) }
-    )
-
-    await waitFor(() => expect(result.current.outbox[0]?.state).toBe('rejected'))
-    expect(shownFailure(result.current.outbox[0])).toBe(REASON)
-    expect(readOutbox('session-1')).toHaveLength(1)
-
-    rerender({ submissions: rejected, rows: rowsFor('rejected-before-restart') })
-    await waitFor(() => expect(result.current.outbox).toEqual([]))
-    expect(readOutbox('session-1')).toEqual([])
-    expect(mocks.call).not.toHaveBeenCalled()
-  })
-
-  it('keeps a send its reply rejected without a Retry until the journal row takes it over', async () => {
-    const writeFailed = (clientMessageId: string): AgentJournalSubmission => ({
-      clientMessageId,
-      fence: 1,
-      payloadFingerprint: 'fingerprint',
-      dispatchState: 'rejected',
-      providerItemId: null,
-      reason: 'provider_write_failed: broken pipe',
-      submittedAt: 10,
-      resolvedAt: 10
-    })
-    mocks.call.mockImplementationOnce(
-      async (
-        _target: unknown,
-        _method: unknown,
-        params: { envelope: { clientOperationId: string } }
-      ) => ({
-        ok: true,
-        replayed: false,
-        fence: 1,
-        cursor: { epoch: 'epoch-1', sequence: 10 },
-        value: {
-          clientMessageId: params.envelope.clientOperationId,
-          submission: writeFailed(params.envelope.clientOperationId)
-        }
-      })
-    )
-    const { result, rerender } = renderHook(
-      (props: OutboxProps) =>
-        useStructuredAgentSessionOutbox({
-          journalItems: props.rows ?? NO_JOURNAL_ITEMS,
-          sessionId: 'session-1',
-          target: LOCAL_TARGET,
-          fence: 1,
-          submissions: props.submissions
-        }),
-      { initialProps: outboxProps(NO_SUBMISSIONS) }
-    )
-
-    act(() => expect(result.current.send('first')).toBe(true))
-    await waitFor(() => expect(mocks.call).toHaveBeenCalledOnce())
-    const firstId = String(mocks.call.mock.calls[0]![2].envelope.clientOperationId)
-
-    // Answered, not doubted: the entry draws the message, saying why, until the journal has it.
-    await waitFor(() => expect(result.current.outbox[0]?.lastFailure?.kind).toBe('rejected'))
-    expect(result.current.outbox[0]?.state).toBe('rejected')
-
-    rerender({ submissions: [writeFailed(firstId)], rows: rowsFor(firstId) })
-    await waitFor(() => expect(result.current.outbox).toHaveLength(0))
-    expect(mocks.call).toHaveBeenCalledOnce()
-  })
-
-  it('lets the journal settle the message when its rejection lands 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: OutboxProps) =>
-        useStructuredAgentSessionOutbox({
-          journalItems: props.rows ?? NO_JOURNAL_ITEMS,
-          sessionId: 'session-1',
-          target,
-          fence: 1,
-          submissions: props.submissions
-        }),
-      { initialProps: outboxProps(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 }
-      ],
-      rows: rowsFor(id)
-    })
-    await waitFor(() => expect(result.current.outbox).toEqual([]))
-    // The late `pending` answer must not bring it back.
-    await act(async () => answer(pendingResultFor(id)))
-
-    expect(result.current.outbox).toEqual([])
-    expect(result.current.error).toBeNull()
-  })
-})
-
-const NO_SUBMISSIONS: AgentJournalSubmission[] = []
-
-/** The host's rows for these messages, loaded. */
-function rowsFor(...ids: string[]): AgentJournalRenderItem[] {
-  return ids.map((id, index) => ({
-    itemId: agentJournalSubmissionKey(id),
-    revision: 1,
-    sequence: index + 1,
-    observedAt: index + 1,
-    body: { kind: 'message', role: 'user', blocks: [{ type: 'text', text: id }] }
-  }))
-}
-
-function rejectedBeforeRestart(): StructuredAgentSessionOutboxEntry {
-  return {
-    ...createStructuredAgentSessionOutboxEntry({
-      clientMessageId: 'rejected-before-restart',
-      sessionId: 'session-1',
-      text: 'first',
-      attachments: [],
-      queuedAt: 1
-    }),
-    state: 'rejected',
-    lastFailure: {
-      kind: 'rejected',
-      reason: 'The provider did not accept this message.',
-      rejection: { kind: 'providerRejected' }
-    }
-  }
-}
-
-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 restarts the agent inside the send. A send it refused was shown as not sent, so it
-// waits for the user's Retry even once the agent has a new owner, as on every host.
-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('waits for its Retry across an agent restart, and leaves no error once that Retry lands', 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({
-          journalItems: NO_JOURNAL_ITEMS,
-          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; the message still waits for its Retry.
-    rerender({ fence: 3, submissions: [] })
-    await act(() => new Promise<void>((resolve) => setTimeout(resolve, 50)))
-    expect(mocks.call).toHaveBeenCalledTimes(1)
-    expect(shownFailure(result.current.outbox[0])).toBe('Your message was not sent.')
-
-    act(() => result.current.retry(result.current.outbox[0]!.clientMessageId))
-    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(mocks.call).toHaveBeenCalledTimes(2)
-  })
-})
-
-describe('a send the host refused by throwing', () => {
-  beforeEach(() => {
-    vi.clearAllMocks()
-    localStorage.clear()
-  })
-
-  it("keeps the refusal on the message, with the refusal's words and not a bare failure", async () => {
-    // As `mapRuntimeError` sends a thrown refusal (pinned in `rpc/errors.test.ts`).
-    mocks.call.mockRejectedValue(
-      new RuntimeRpcCallError({
-        id: 'req-1',
-        ok: false,
-        error: {
-          code: 'runtime_error',
-          message: 'agent_session_journal_unreadable',
-          data: {
-            refusal: {
-              code: 'agent_session_journal_unreadable',
-              details: { reason: 'journalCorrupt' }
-            }
-          }
-        }
-      })
-    )
-    const { result } = renderHook(() =>
-      useStructuredAgentSessionOutbox({
-        journalItems: NO_JOURNAL_ITEMS,
-        sessionId: 'session-1',
-        target: { kind: 'local' },
-        fence: 1,
-        submissions: []
-      })
-    )
-
-    act(() => expect(result.current.send('hello')).toBe(true))
-
-    await waitFor(() =>
-      expect(result.current.outbox[0]?.lastFailure).toEqual({
-        kind: 'refused',
-        code: 'agent_session_journal_unreadable',
-        details: { reason: 'journalCorrupt' }
-      })
-    )
-    expect(shownFailure(result.current.outbox[0])).toBe(
-      'Unable to load this chat. Your message was not sent.'
-    )
-  })
-})
-
-describe('a send refused on a journal a newer Orca wrote', () => {
-  beforeEach(() => {
-    vi.clearAllMocks()
-    localStorage.clear()
-  })
-
-  it('says to update Orca, not to try again', async () => {
-    // As the host answers it (pinned in `journal-open-failure.test.ts`).
-    mocks.call.mockResolvedValue({
-      ok: false,
-      refusal: {
-        code: 'agent_session_journal_unreadable',
-        message: 'Chats were saved by a newer Orca. Update Orca to keep using them.',
-        details: { reason: 'journalWrittenByNewerOrca' }
-      }
-    })
-    const { result } = renderHook(() =>
-      useStructuredAgentSessionOutbox({
-        journalItems: NO_JOURNAL_ITEMS,
-        sessionId: 'session-1',
-        target: { kind: 'local' },
-        fence: 1,
-        submissions: []
-      })
-    )
-
-    act(() => expect(result.current.send('hello')).toBe(true))
-
-    await waitFor(() =>
-      expect(shownFailure(result.current.outbox[0])).toBe(
-        'Chats were saved by a newer Orca. Your message was not sent. Update Orca to keep using them.'
-      )
-    )
-  })
-})
diff --git a/src/renderer/src/components/native-chat/use-structured-agent-session-outbox-relaunch-hold.test.tsx b/src/renderer/src/components/native-chat/use-structured-agent-session-outbox-relaunch-hold.test.tsx
deleted file mode 100644
index c40123377ea2..000000000000
--- a/src/renderer/src/components/native-chat/use-structured-agent-session-outbox-relaunch-hold.test.tsx
+++ /dev/null
@@ -1,572 +0,0 @@
-// @vitest-environment happy-dom
-
-// A message the chat said was not sent, with a Retry beside it, waits for that Retry. The hold is
-// read from the saved message, so quitting and reopening Orca (a new mount over the same storage)
-// holds it exactly as the refusal did.
-
-import { act, cleanup, renderHook, waitFor } from '@testing-library/react'
-import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest'
-
-import { AGENT_SESSION_ACCEPTED_SEND_RUNTIME_CAPABILITY } from '../../../../shared/protocol-version'
-import type { AgentSessionWireRefusalCode } from '../../../../shared/agent-session-wire'
-
-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 { RuntimeRpcCallError } from '@/runtime/runtime-rpc-result'
-import { agentJournalSubmissionKey } from '../../../../shared/agent-session-journal-item-key'
-import { useStructuredAgentSessionOutbox } from './use-structured-agent-session-outbox'
-import {
-  clearNativeChatDraftCacheForTests,
-  readNativeChatDraftCache
-} from './native-chat-draft-cache'
-import { createStructuredAgentSessionOutboxEntry } from '../../../../shared/structured-agent-session-outbox'
-import { writeOutbox } from './structured-agent-session-outbox-storage'
-import { structuredAgentSessionDeliveryNotices } from './structured-agent-session-delivery-notices'
-
-import type { AgentJournalRenderItem } from '../../../../shared/agent-session-journal-types'
-
-const NO_JOURNAL_ITEMS: readonly AgentJournalRenderItem[] = []
-
-const SESSION = 'session-1'
-// Stable, as the view passes it: a new object each render would re-run the owner-change requeue.
-const LOCAL_TARGET = { kind: 'local' } as const
-// Read back from storage, the cause may have cleared since (the user updated Orca, say).
-const NOT_SENT_WORDS = 'Your message was not sent.'
-const NEWER_ORCA_WORDS =
-  'Chats were saved by a newer Orca. Your message was not sent. Update Orca to keep using them.'
-
-type SendRequest = {
-  body?: { blocks?: { text?: string }[] }
-  envelope?: { clientOperationId?: string }
-}
-
-function requestId(params: SendRequest | undefined): string {
-  return String(params?.envelope?.clientOperationId)
-}
-
-function sentIds(): string[] {
-  return mocks.call.mock.calls.map((call) => requestId(call[2]))
-}
-
-function newerOrcaRefusal() {
-  return {
-    ok: false,
-    refusal: {
-      code: 'agent_session_journal_unreadable',
-      message: 'Chats were saved by a newer Orca. Update Orca to keep using them.',
-      details: { reason: 'journalWrittenByNewerOrca' }
-    }
-  }
-}
-
-function refusal(code: AgentSessionWireRefusalCode) {
-  return { ok: false, refusal: { code, message: code } }
-}
-
-function accepted(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 hostAccepts(): void {
-  mocks.call.mockImplementation((_target, _method, params: SendRequest) =>
-    Promise.resolve(accepted(requestId(params)))
-  )
-}
-
-function mount(fence = 1) {
-  return renderHook(
-    ({ fence: current }: { fence: number }) =>
-      useStructuredAgentSessionOutbox({
-        journalItems: NO_JOURNAL_ITEMS,
-        sessionId: SESSION,
-        target: LOCAL_TARGET,
-        fence: current,
-        submissions: []
-      }),
-    { initialProps: { fence } }
-  )
-}
-
-type Outbox = ReturnType<typeof mount>['result']['current']
-
-function notices(outbox: Outbox) {
-  return structuredAgentSessionDeliveryNotices(
-    outbox.outbox,
-    'Claude',
-    outbox.retry,
-    [],
-    [],
-    outbox.failedHere
-  )
-}
-
-function noticeFor(outbox: Outbox, clientMessageId: string) {
-  return notices(outbox).get(agentJournalSubmissionKey(clientMessageId))
-}
-
-/** Long enough for any effect a mount or a state change schedules to have sent. */
-async function settle(): Promise<void> {
-  await act(() => new Promise<void>((resolve) => setTimeout(resolve, 50)))
-}
-
-describe('a message the host refused, across a relaunch', () => {
-  afterEach(() => {
-    cleanup()
-    setLocalRuntimeCapabilitiesForTests(null)
-  })
-
-  beforeEach(() => {
-    vi.clearAllMocks()
-    localStorage.clear()
-    setLocalRuntimeCapabilitiesForTests([AGENT_SESSION_ACCEPTED_SEND_RUNTIME_CAPABILITY])
-  })
-
-  it.each(['returned', 'thrown'] as const)(
-    'is not sent on its own after a relaunch; its Retry sends it (refusal %s)',
-    async (refusalDelivery) => {
-      if (refusalDelivery === 'returned') {
-        mocks.call.mockResolvedValueOnce(newerOrcaRefusal())
-      } else {
-        // As `mapRuntimeError` sends a thrown refusal (pinned in `rpc/errors.test.ts`).
-        mocks.call.mockRejectedValueOnce(
-          new RuntimeRpcCallError({
-            id: 'req-1',
-            ok: false,
-            error: {
-              code: 'runtime_error',
-              message: 'agent_session_journal_unreadable',
-              data: {
-                refusal: {
-                  code: 'agent_session_journal_unreadable',
-                  details: { reason: 'journalWrittenByNewerOrca' }
-                }
-              }
-            }
-          })
-        )
-      }
-      const before = mount()
-      act(() => expect(before.result.current.send('hello')).toBe(true))
-      await waitFor(() => expect(before.result.current.outbox[0]?.lastFailure).toBeDefined())
-      const refusedId = sentIds()[0]!
-      expect(noticeFor(before.result.current, refusedId)?.text).toBe(NEWER_ORCA_WORDS)
-      before.unmount()
-
-      // The user updates Orca and opens the chat again; the host now takes sends.
-      hostAccepts()
-      const after = mount()
-      await settle()
-      expect(mocks.call).toHaveBeenCalledTimes(1)
-      const notice = noticeFor(after.result.current, refusedId)
-      expect(notice?.text).toBe(NOT_SENT_WORDS)
-      expect(notice?.onRetry).toBeDefined()
-
-      act(() => notice?.onRetry?.())
-      await waitFor(() => expect(after.result.current.outbox).toHaveLength(0))
-      // The refusal recorded nothing, so the Retry goes out under the refused id.
-      expect(sentIds()).toEqual([refusedId, refusedId])
-    }
-  )
-
-  it('sends a message typed again after a refusal once, not a second time after a relaunch', async () => {
-    // The chat's history is from a newer Orca: every send is refused until the user updates.
-    mocks.call.mockResolvedValue(newerOrcaRefusal())
-    const before = mount()
-    act(() => expect(before.result.current.send('hello')).toBe(true))
-    await waitFor(() => expect(before.result.current.outbox[0]?.lastFailure).toBeDefined())
-    // The user types the same message again rather than pressing Retry.
-    act(() => expect(before.result.current.send('hello')).toBe(true))
-    await settle()
-    const refusedBeforeUpdate = mocks.call.mock.calls.length
-    before.unmount()
-
-    hostAccepts()
-    const after = mount()
-    await settle()
-    // Nothing goes out on its own: each message still says it was not sent, with its own Retry.
-    expect(mocks.call).toHaveBeenCalledTimes(refusedBeforeUpdate)
-    expect(after.result.current.outbox).toHaveLength(2)
-    for (const entry of after.result.current.outbox) {
-      expect(noticeFor(after.result.current, entry.clientMessageId)?.onRetry).toBeDefined()
-    }
-
-    // One Retry delivers the message once; the other copy stays unsent.
-    act(() => after.result.current.retry(after.result.current.outbox[1]!.clientMessageId))
-    await waitFor(() => expect(after.result.current.outbox).toHaveLength(1))
-    await settle()
-    expect(mocks.call).toHaveBeenCalledTimes(refusedBeforeUpdate + 1)
-  })
-
-  it('keeps a send that never reached the host held across a relaunch', async () => {
-    mocks.call.mockRejectedValueOnce(new Error('send failed'))
-    const before = mount()
-    act(() => expect(before.result.current.send('hello')).toBe(true))
-    await waitFor(() =>
-      expect(before.result.current.outbox[0]?.lastFailure).toEqual({ kind: 'failed' })
-    )
-    const failedId = sentIds()[0]!
-    before.unmount()
-
-    hostAccepts()
-    const after = mount()
-    await settle()
-    expect(mocks.call).toHaveBeenCalledTimes(1)
-    expect(noticeFor(after.result.current, failedId)?.onRetry).toBeDefined()
-  })
-
-  it('holds a refused message an earlier Orca saved, in the shape that build writes', async () => {
-    // Exactly what a build from before this hold leaves behind after the refusal: no new field.
-    localStorage.setItem(
-      `orca:desktopStructuredAgentSessionOutbox:v1:${SESSION}`,
-      JSON.stringify([
-        {
-          clientMessageId: 'op-refused',
-          sessionId: SESSION,
-          body: { kind: 'message', role: 'user', blocks: [{ type: 'text', text: 'hello' }] },
-          previewUris: [],
-          state: 'queued',
-          queuedAt: 1,
-          lastAttemptAt: 2,
-          retryAfterUnknownSubmittedAt: null,
-          lastFailure: {
-            kind: 'refused',
-            code: 'agent_session_journal_unreadable',
-            details: { reason: 'journalWrittenByNewerOrca' }
-          }
-        }
-      ])
-    )
-    hostAccepts()
-    const { result } = mount()
-    await settle()
-    expect(mocks.call).not.toHaveBeenCalled()
-    expect(noticeFor(result.current, 'op-refused')?.text).toBe(NOT_SENT_WORDS)
-  })
-
-  it("words the cause again once a Retry is refused for it; a relaunch's row only says not sent", async () => {
-    mocks.call.mockResolvedValue(newerOrcaRefusal())
-    const before = mount()
-    act(() => expect(before.result.current.send('hello')).toBe(true))
-    await waitFor(() => expect(before.result.current.outbox[0]?.lastFailure).toBeDefined())
-    const refusedId = sentIds()[0]!
-    before.unmount()
-
-    // The chat's history is still from a newer Orca.
-    const after = mount()
-    await settle()
-    expect(noticeFor(after.result.current, refusedId)).toMatchObject({ text: NOT_SENT_WORDS })
-
-    act(() => noticeFor(after.result.current, refusedId)?.onRetry?.())
-    await waitFor(() => expect(mocks.call).toHaveBeenCalledTimes(2))
-    await waitFor(() =>
-      expect(noticeFor(after.result.current, refusedId)?.text).toBe(NEWER_ORCA_WORDS)
-    )
-    expect(noticeFor(after.result.current, refusedId)?.onRetry).toBeDefined()
-  })
-})
-
-// An older host restarts the agent inside a send and refuses it unrecorded when that fails. The
-// refused message was shown as not sent, so neither a relaunch nor a new owner sends it.
-describe('a message an older host refused, across a relaunch', () => {
-  afterEach(() => {
-    cleanup()
-    setLocalRuntimeCapabilitiesForTests(null)
-  })
-
-  beforeEach(() => {
-    vi.clearAllMocks()
-    localStorage.clear()
-    setLocalRuntimeCapabilitiesForTests([])
-  })
-
-  it('is not sent on its own when the chat reopens on a moved fence', async () => {
-    mocks.call.mockResolvedValueOnce(refusal('agent_session_checkpoint_stale'))
-    const before = mount(1)
-    act(() => expect(before.result.current.send('hello')).toBe(true))
-    await waitFor(() => expect(before.result.current.outbox[0]?.lastFailure).toBeDefined())
-    before.unmount()
-
-    hostAccepts()
-    mount(3)
-    await settle()
-    expect(mocks.call).toHaveBeenCalledTimes(1)
-  })
-
-  it('is not sent when the fence moves while the chat is open; its Retry sends it once', async () => {
-    hostAccepts()
-    mocks.call.mockResolvedValueOnce(refusal('agent_session_checkpoint_stale'))
-    const { result, rerender } = mount(1)
-    act(() => expect(result.current.send('hello')).toBe(true))
-    await waitFor(() => expect(result.current.outbox[0]?.lastFailure).toBeDefined())
-
-    rerender({ fence: 3 })
-    await settle()
-    expect(mocks.call).toHaveBeenCalledTimes(1)
-
-    act(() => result.current.retry(result.current.outbox[0]!.clientMessageId))
-    await waitFor(() => expect(result.current.outbox).toHaveLength(0))
-    await settle()
-    expect(sentIds()).toHaveLength(2)
-    expect(sentIds()[1]).toBe(sentIds()[0])
-  })
-})
-
-// A message left on its way out is in doubt after a relaunch, whatever an earlier attempt failed
-// with: the unconfirmed probe resends it under its id rather than holding it for a Retry.
-describe('a message in doubt that carries an earlier failure', () => {
-  afterEach(() => {
-    cleanup()
-    setLocalRuntimeCapabilitiesForTests(null)
-  })
-
-  beforeEach(() => {
-    vi.clearAllMocks()
-    localStorage.clear()
-    setLocalRuntimeCapabilitiesForTests([AGENT_SESSION_ACCEPTED_SEND_RUNTIME_CAPABILITY])
-  })
-
-  it('is probed and sent again, not held', async () => {
-    // What an earlier build left: on its way out, beside a failure it never cleared.
-    const inDoubt = {
-      ...createStructuredAgentSessionOutboxEntry({
-        clientMessageId: 'op-in-doubt',
-        sessionId: SESSION,
-        text: 'hello',
-        attachments: [],
-        queuedAt: 1
-      }),
-      state: 'dispatching' as const,
-      lastAttemptAt: 2,
-      lastFailure: { kind: 'refused' as const, code: 'execution_owner_reconciling' as const }
-    }
-    writeOutbox(SESSION, [inDoubt])
-    hostAccepts()
-    const { result } = mount()
-    await waitFor(() => expect(result.current.outbox).toHaveLength(0), { timeout: 5000 })
-    expect(sentIds()).toEqual(['op-in-doubt'])
-  })
-})
-
-describe('a message whose send could not be saved before it went out', () => {
-  afterEach(() => {
-    cleanup()
-    vi.restoreAllMocks()
-    setLocalRuntimeCapabilitiesForTests(null)
-  })
-
-  beforeEach(() => {
-    vi.clearAllMocks()
-    localStorage.clear()
-    setLocalRuntimeCapabilitiesForTests([AGENT_SESSION_ACCEPTED_SEND_RUNTIME_CAPABILITY])
-  })
-
-  it('waits for its Retry, and does not hold back the next message', async () => {
-    hostAccepts()
-    const save = localStorage.setItem.bind(localStorage)
-    // The send saves; the save that marks it on its way out fails.
-    const setItem = vi
-      .spyOn(localStorage, 'setItem')
-      .mockImplementationOnce(save)
-      .mockImplementationOnce(() => {
-        throw new Error('storage full')
-      })
-    const { result } = mount()
-    act(() => expect(result.current.send('first')).toBe(true))
-    await waitFor(() => expect(result.current.error).toBe("Couldn't save your message. Try again."))
-    setItem.mockRestore()
-    const firstId = result.current.outbox[0]!.clientMessageId
-
-    act(() => expect(result.current.send('second')).toBe(true))
-    await waitFor(() => expect(result.current.outbox).toHaveLength(1))
-    await settle()
-    expect(mocks.call).toHaveBeenCalledOnce()
-    expect(sentIds()).not.toContain(firstId)
-    expect(noticeFor(result.current, firstId)?.onRetry).toBeDefined()
-  })
-
-  function failingWrites(failing: readonly number[]): void {
-    const save = localStorage.setItem.bind(localStorage)
-    let writes = 0
-    vi.spyOn(localStorage, 'setItem').mockImplementation((key: string, value: string) => {
-      writes += 1
-      if (failing.includes(writes)) {
-        throw new Error('storage full')
-      }
-      save(key, value)
-    })
-  }
-
-  it('stays held when the message behind it goes out, though no save recorded the hold', async () => {
-    hostAccepts()
-    // Both messages save; the save marking the first on its way out, and the one recording its
-    // hold, fail; storage then works again for the second.
-    failingWrites([3, 4])
-    const detached: { fence: number | null } = { fence: null }
-    const { result, rerender } = renderHook(
-      ({ fence }: { fence: number | null }) =>
-        useStructuredAgentSessionOutbox({
-          journalItems: NO_JOURNAL_ITEMS,
-          sessionId: SESSION,
-          target: LOCAL_TARGET,
-          fence,
-          submissions: []
-        }),
-      { initialProps: detached }
-    )
-    act(() => expect(result.current.send('first')).toBe(true))
-    act(() => expect(result.current.send('second')).toBe(true))
-    const [firstId, secondId] = result.current.outbox.map((entry) => entry.clientMessageId)
-    rerender({ fence: 1 })
-    await waitFor(() => expect(result.current.outbox).toHaveLength(1))
-    await settle()
-    expect(sentIds()).toEqual([secondId])
-    expect(result.current.outbox[0]).toMatchObject({
-      clientMessageId: firstId,
-      lastFailure: { kind: 'failed' }
-    })
-    expect(noticeFor(result.current, firstId!)?.onRetry).toBeDefined()
-  })
-
-  it('stays held across a relaunch once storage takes the hold', async () => {
-    hostAccepts()
-    // The send saves; the save marking it on its way out fails; the hold's own save goes through.
-    failingWrites([2])
-    const before = mount()
-    act(() => expect(before.result.current.send('first')).toBe(true))
-    await waitFor(() =>
-      expect(before.result.current.error).toBe("Couldn't save your message. Try again.")
-    )
-    const firstId = before.result.current.outbox[0]!.clientMessageId
-    before.unmount()
-    vi.restoreAllMocks()
-
-    const after = mount()
-    await settle()
-    expect(mocks.call).not.toHaveBeenCalled()
-    expect(noticeFor(after.result.current, firstId)?.onRetry).toBeDefined()
-  })
-})
-
-// A host forgets an operation id a day after it was made and refuses it for good after that. An
-// earlier attempt under that id may already be in the chat, so the message stays a held row that
-// says so; only the user's Retry sends it, under a new id.
-describe('a held message whose id expired', () => {
-  const DAY = 24 * 60 * 60 * 1000
-  const EXPIRED_WORDS = "Orca couldn't confirm what happened. Check the chat."
-
-  function expired() {
-    return {
-      ok: false,
-      refusal: {
-        code: 'agent_session_operation_expired',
-        message: 'Operation expired.',
-        details: { reason: 'operationExpired' }
-      }
-    }
-  }
-
-  afterEach(() => {
-    cleanup()
-    setLocalRuntimeCapabilitiesForTests(null)
-  })
-
-  beforeEach(() => {
-    vi.clearAllMocks()
-    localStorage.clear()
-    clearNativeChatDraftCacheForTests()
-    setLocalRuntimeCapabilitiesForTests([AGENT_SESSION_ACCEPTED_SEND_RUNTIME_CAPABILITY])
-  })
-
-  it('stays a row that says it may be in the chat; its Retry sends it under a new id', async () => {
-    mocks.call.mockResolvedValueOnce(newerOrcaRefusal()).mockResolvedValueOnce(expired())
-    const before = mount()
-    act(() => expect(before.result.current.send('hello')).toBe(true))
-    await waitFor(() => expect(before.result.current.outbox[0]?.lastFailure).toBeDefined())
-    const keptId = sentIds()[0]!
-    act(() => before.result.current.retry(keptId))
-    await waitFor(() =>
-      expect(before.result.current.outbox[0]?.lastFailure).toMatchObject({
-        code: 'agent_session_operation_expired'
-      })
-    )
-    expect(before.result.current.error).toBeNull()
-    before.unmount()
-
-    hostAccepts()
-    const after = mount()
-    await settle()
-    expect(mocks.call).toHaveBeenCalledTimes(2)
-    const notice = noticeFor(after.result.current, keptId)
-    expect(notice?.text).toBe(EXPIRED_WORDS)
-    expect(notice?.onRetry).toBeDefined()
-
-    act(() => notice?.onRetry?.())
-    await waitFor(() => expect(after.result.current.outbox).toHaveLength(0))
-    expect(sentIds()).toHaveLength(3)
-    expect(sentIds()[2]).not.toBe(keptId)
-  })
-
-  it('stays in the chat, not the composer, when a relaunch resends it on its own', async () => {
-    // Quit mid-send two days ago: the first message was on its way, the second queued behind it.
-    const old = Date.now() - 2 * DAY
-    const inFlight = {
-      ...createStructuredAgentSessionOutboxEntry({
-        clientMessageId: `${old}-${'1'.repeat(32)}`,
-        sessionId: SESSION,
-        text: 'first',
-        attachments: [],
-        queuedAt: old
-      }),
-      state: 'dispatching' as const,
-      lastAttemptAt: old
-    }
-    writeOutbox(SESSION, [inFlight])
-    mocks.call.mockResolvedValue(expired())
-    const { result } = renderHook(() =>
-      useStructuredAgentSessionOutbox({
-        journalItems: NO_JOURNAL_ITEMS,
-        sessionId: SESSION,
-        target: LOCAL_TARGET,
-        fence: 1,
-        submissions: [],
-        composerScopeKey: 'pane-1'
-      })
-    )
-    await waitFor(() => expect(mocks.call).toHaveBeenCalled(), { timeout: 5000 })
-    await waitFor(() =>
-      expect(result.current.outbox[0]?.lastFailure).toMatchObject({
-        code: 'agent_session_operation_expired'
-      })
-    )
-    await settle()
-    expect(readNativeChatDraftCache('pane-1')).toBe('')
-    expect(result.current.outbox).toMatchObject([
-      { clientMessageId: inFlight.clientMessageId, state: 'queued' }
-    ])
-    expect(noticeFor(result.current, inFlight.clientMessageId)?.text).toBe(EXPIRED_WORDS)
-    expect(sentIds()).toEqual([inFlight.clientMessageId])
-  })
-})
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
deleted file mode 100644
index 819995bee0ff..000000000000
--- a/src/renderer/src/components/native-chat/use-structured-agent-session-outbox-unconfirmed-probe.ts
+++ /dev/null
@@ -1,73 +0,0 @@
-import { useEffect, useLayoutEffect, useRef } from 'react'
-import type { AgentJournalSubmission } from '../../../../shared/agent-session-journal-types'
-import type { StructuredAgentSessionOutboxEntry } from '../../../../shared/structured-agent-session-outbox'
-import { structuredAgentSessionEntryResendsUnconfirmed } from '../../../../shared/structured-agent-session-outbox-unconfirmed-resend'
-import {
-  commitStructuredAgentSessionOutbox,
-  getStructuredAgentSessionOutbox
-} 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 still ends probing until a manual Retry, 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 }
-}): void {
-  const { outbox, owner, sessionId, 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, and that no Stop outlived, are safe to probe automatically.
-  // The delivery notices read the same rule: while it is resent here, its row says it is sending.
-  const probeId =
-    blocker &&
-    blocker.sessionId === sessionId &&
-    structuredAgentSessionEntryResendsUnconfirmed(blocker, submissions)
-      ? blocker.clientMessageId
-      : null
-  useEffect(() => {
-    if (probeId === null || !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 = getStructuredAgentSessionOutbox(sessionId).map((entry) => {
-          if (entry.clientMessageId !== probeId) {
-            return entry
-          }
-          // A saved failure would hold it for a Retry instead of resending it.
-          const { lastFailure: _probed, ...probed } = entry
-          return { ...probed, state: 'queued' as const }
-        })
-        commitStructuredAgentSessionOutbox(sessionId, next)
-      },
-      Math.min(UNCONFIRMED_PROBE_BASE_DELAY_MS * 2 ** attempts, UNCONFIRMED_PROBE_MAX_DELAY_MS)
-    )
-    return () => clearTimeout(timer)
-  }, [owner.attached, owner.ownerChange, owner.targetKey, probeId, sessionId])
-}
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
deleted file mode 100644
index 84eac65b640e..000000000000
--- a/src/renderer/src/components/native-chat/use-structured-agent-session-outbox-withdrawal.test.tsx
+++ /dev/null
@@ -1,182 +0,0 @@
-// 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 {
-  AgentJournalRenderItem,
-  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'
-
-const NO_JOURNAL_ITEMS: readonly AgentJournalRenderItem[] = []
-
-// 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({
-        journalItems: NO_JOURNAL_ITEMS,
-        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. With no composer to
-    // take it, the one behind it stays as not sent, on its Retry, and never goes out by itself.
-    const states = (entries: readonly { clientMessageId: string; state: string }[]) =>
-      entries.map((candidate) => [candidate.clientMessageId === firstId, candidate.state])
-    expect(states(result.current.outbox)).toEqual([
-      [true, 'dispatching'],
-      [false, 'rejected']
-    ])
-    expect(states(readOutbox('session-1', { recoverDispatching: false }))).toEqual([
-      [true, 'dispatching'],
-      [false, 'rejected']
-    ])
-    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).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'), lastFailure: { kind: 'failed' as const } },
-      { ...entry('retried-in-doubt', 'unconfirmed'), retryAfterUnknownSubmittedAt: 10 },
-      entry('probed-in-doubt', 'unconfirmed'),
-      entry('local', 'queued')
-    ]
-
-    expect(
-      withdrawUnsentStructuredAgentSessionOutboxEntries(entries, [], null).map(
-        (candidate) => candidate.clientMessageId
-      )
-    ).toEqual(['blocked', 'retried-in-doubt'])
-    expect(hasUnsentStructuredAgentSessionOutboxEntry(entries.slice(0, 2), [])).toBe(false)
-    expect(hasUnsentStructuredAgentSessionOutboxEntry(entries, [])).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({
-        journalItems: NO_JOURNAL_ITEMS,
-        sessionId: 'session-1',
-        target: TARGET,
-        fence: 1,
-        submissions: []
-      })
-    )
-    act(() => expect(result.current.send('first')).toBe(true))
-    await waitFor(() => expect(result.current.outbox[0]?.lastFailure).toEqual({ kind: 'failed' }))
-
-    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.batch-churn.test.tsx b/src/renderer/src/components/native-chat/use-structured-agent-session-outbox.batch-churn.test.tsx
deleted file mode 100644
index 26e46bd2bbf8..000000000000
--- a/src/renderer/src/components/native-chat/use-structured-agent-session-outbox.batch-churn.test.tsx
+++ /dev/null
@@ -1,117 +0,0 @@
-// @vitest-environment happy-dom
-
-// The outbox re-reads the journal on every batch; a batch that settles nothing writes nothing, so a
-// message left in doubt costs no storage write per streamed delta. And a copy the host recorded and
-// rejected owes no delivery, so it keeps no hidden pane reading the journal.
-
-import { act, cleanup, renderHook } from '@testing-library/react'
-import { afterEach, beforeEach, expect, it, vi } from 'vitest'
-import type {
-  AgentJournalRenderItem,
-  AgentJournalSubmission
-} from '../../../../shared/agent-session-journal-types'
-import { createStructuredAgentSessionOutboxEntry } from '../../../../shared/structured-agent-session-outbox'
-
-vi.mock('@/runtime/structured-agent-session-client', () => ({
-  callStructuredAgentSession: vi.fn(() => new Promise(() => {}))
-}))
-
-import {
-  hasUndeliveredStructuredAgentSessionOutbox,
-  writeOutbox
-} from './structured-agent-session-outbox-storage'
-import { useStructuredAgentSessionOutbox } from './use-structured-agent-session-outbox'
-
-afterEach(cleanup)
-
-beforeEach(() => {
-  localStorage.clear()
-})
-
-const SESSION = 'session-churn'
-
-function stored(
-  id: string,
-  patch: Partial<ReturnType<typeof createStructuredAgentSessionOutboxEntry>>
-) {
-  return {
-    ...createStructuredAgentSessionOutboxEntry({
-      clientMessageId: id,
-      sessionId: SESSION,
-      text: id,
-      attachments: [],
-      queuedAt: 1
-    }),
-    ...patch
-  }
-}
-
-function inDoubt(clientMessageId: string): AgentJournalSubmission {
-  return {
-    clientMessageId,
-    fence: 1,
-    payloadFingerprint: clientMessageId,
-    dispatchState: 'unknown',
-    providerItemId: null,
-    reason: 'in doubt',
-    submittedAt: 5,
-    resolvedAt: 6
-  }
-}
-
-function streamed(sequence: number): AgentJournalRenderItem[] {
-  return [
-    {
-      itemId: `answer-${sequence}`,
-      revision: sequence,
-      sequence,
-      observedAt: sequence,
-      body: { kind: 'message', role: 'assistant', blocks: [{ type: 'text', text: 'streaming' }] }
-    }
-  ]
-}
-
-it('writes nothing to storage across 50 batches while a message waits in doubt', async () => {
-  writeOutbox(SESSION, [stored('doubt', { state: 'dispatching', lastAttemptAt: 2 })])
-  const { rerender } = renderHook(
-    (props: { items: AgentJournalRenderItem[]; submissions: AgentJournalSubmission[] }) =>
-      useStructuredAgentSessionOutbox({
-        sessionId: SESSION,
-        target: { kind: 'local' },
-        fence: 1,
-        submissions: props.submissions,
-        journalItems: props.items
-      }),
-    { initialProps: { items: streamed(1), submissions: [inDoubt('doubt')] } }
-  )
-  await act(async () => {})
-  const writes = vi.spyOn(localStorage, 'setItem')
-
-  for (let sequence = 2; sequence <= 51; sequence += 1) {
-    // Each batch is a new journal array and a new submissions array with the same content.
-    rerender({ items: streamed(sequence), submissions: [inDoubt('doubt')] })
-  }
-  await act(async () => {})
-
-  expect(writes).not.toHaveBeenCalled()
-  writes.mockRestore()
-})
-
-it('counts a copy the host recorded and rejected as owing no delivery', () => {
-  writeOutbox(SESSION, [
-    stored('recorded', {
-      state: 'rejected',
-      lastFailure: { kind: 'rejected', reason: 'Orca restarted before this message was sent.' }
-    })
-  ])
-  expect(hasUndeliveredStructuredAgentSessionOutbox(SESSION)).toBe(false)
-
-  writeOutbox(SESSION, [
-    stored('recorded', {
-      state: 'rejected',
-      lastFailure: { kind: 'rejected', reason: 'Orca restarted before this message was sent.' }
-    }),
-    stored('waiting', {})
-  ])
-  expect(hasUndeliveredStructuredAgentSessionOutbox(SESSION)).toBe(true)
-})
diff --git a/src/renderer/src/components/native-chat/use-structured-agent-session-outbox.draft-hand-off.test.tsx b/src/renderer/src/components/native-chat/use-structured-agent-session-outbox.draft-hand-off.test.tsx
deleted file mode 100644
index 1425deec66a8..000000000000
--- a/src/renderer/src/components/native-chat/use-structured-agent-session-outbox.draft-hand-off.test.tsx
+++ /dev/null
@@ -1,214 +0,0 @@
-// @vitest-environment happy-dom
-
-// A submission's `queuedMessageId` is the only link between a queued send and what the host did
-// with it: the host hands every draft off under a fresh submission id. An outbox entry the host
-// handed off belongs to the host, whatever the hand-off's state, and nothing here compares a draft
-// id with a submission id.
-
-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 { createStructuredAgentSessionOutboxEntry } from '../../../../shared/structured-agent-session-outbox'
-import { DISPATCH_REJECTED_CANCELLED } from '../../../../shared/structured-agent-session-dispatch-rejection'
-import {
-  clearNativeChatDraftCacheForTests,
-  readNativeChatDraftCache
-} from './native-chat-draft-cache'
-
-type SentParams = { envelope: { clientOperationId: string } }
-
-const mocks = vi.hoisted(() => ({
-  call: vi.fn<(target: unknown, method: string, params: SentParams) => Promise<unknown>>()
-}))
-
-vi.mock('@/runtime/structured-agent-session-client', () => ({
-  callStructuredAgentSession: mocks.call
-}))
-
-import { useStructuredAgentSessionOutbox } from './use-structured-agent-session-outbox'
-import { writeOutbox } from './structured-agent-session-outbox-storage'
-
-const NO_JOURNAL_ITEMS: readonly AgentJournalRenderItem[] = []
-
-// Why: every hook here shares the session outbox store; one left mounted would drain the next test's.
-afterEach(cleanup)
-
-const TARGET = { kind: 'local' } as const
-const QUEUEING = { capability: 'supported', enabled: true } as const
-
-function submission(
-  clientMessageId: string,
-  overrides: Partial<AgentJournalSubmission> = {}
-): AgentJournalSubmission {
-  return {
-    clientMessageId,
-    fence: 1,
-    payloadFingerprint: 'fingerprint',
-    dispatchState: 'accepted',
-    providerItemId: null,
-    reason: null,
-    submittedAt: 10,
-    resolvedAt: 11,
-    handoverRecorded: true,
-    ...overrides
-  }
-}
-
-const WITHDRAWN = { dispatchState: 'rejected', reason: DISPATCH_REJECTED_CANCELLED } as const
-
-function seed(clientMessageId: string, queued: boolean): void {
-  writeOutbox('session-1', [
-    {
-      ...createStructuredAgentSessionOutboxEntry({
-        clientMessageId,
-        sessionId: 'session-1',
-        text: 'follow-up',
-        attachments: [],
-        queuedAt: 1
-      }),
-      sentDelivery: queued ? ('queue-if-active' as const) : null,
-      state: 'unconfirmed',
-      lastAttemptAt: 5
-    }
-  ])
-}
-
-function renderOutbox() {
-  type Props = { submissions: AgentJournalSubmission[] }
-  const initialProps: Props = { submissions: [] }
-  return renderHook(
-    (props: Props) =>
-      useStructuredAgentSessionOutbox({
-        journalItems: NO_JOURNAL_ITEMS,
-        sessionId: 'session-1',
-        target: TARGET,
-        fence: 1,
-        submissions: props.submissions,
-        composerScopeKey: 'scope',
-        queueDelivery: QUEUEING
-      }),
-    { initialProps }
-  )
-}
-
-beforeEach(() => {
-  localStorage.clear()
-  clearNativeChatDraftCacheForTests()
-  mocks.call.mockReset()
-  mocks.call.mockImplementation(() => new Promise(() => {}))
-})
-
-afterEach(() => {
-  localStorage.clear()
-  clearNativeChatDraftCacheForTests()
-})
-
-describe('an outbox entry the host handed off as a queued draft', () => {
-  it('lost answer, Stop, then drained under a fresh id: it leaves, and the composer gets nothing', async () => {
-    seed('draft', true)
-    const view = renderOutbox()
-    act(() => {
-      view.result.current.withdrawUnsent()
-    })
-    expect(view.result.current.outbox).toHaveLength(1)
-    view.rerender({
-      submissions: [
-        submission('first', { ...WITHDRAWN, queuedMessageId: 'draft' }),
-        submission('second', { queuedMessageId: 'draft' })
-      ]
-    })
-    await waitFor(() => expect(view.result.current.outbox).toHaveLength(0))
-    expect(readNativeChatDraftCache('scope')).toBe('')
-  })
-
-  it('lost answer, then refused: the returned card carries it, with no Retry row here', async () => {
-    seed('draft', true)
-    const view = renderOutbox()
-    // No published list yet: the link alone settles it, whichever effect runs first.
-    view.rerender({
-      submissions: [
-        submission('first', {
-          dispatchState: 'rejected',
-          reason: 'The provider refused this message.',
-          queuedMessageId: 'draft'
-        })
-      ]
-    })
-    await waitFor(() => expect(view.result.current.outbox).toHaveLength(0))
-    expect(readNativeChatDraftCache('scope')).toBe('')
-  })
-
-  it('a withdrawn immediate send leaves the outbox and stays in the transcript, not the composer', async () => {
-    seed('plain', false)
-    const view = renderOutbox()
-    view.rerender({ submissions: [submission('plain', WITHDRAWN)] })
-    await waitFor(() => expect(view.result.current.outbox).toHaveLength(0))
-    expect(readNativeChatDraftCache('scope')).toBe('')
-  })
-
-  it('a withdrawn hand-off is never restored, even one under the id of the entry', async () => {
-    seed('draft', true)
-    const view = renderOutbox()
-    view.rerender({ submissions: [submission('draft', { ...WITHDRAWN, queuedMessageId: 'q' })] })
-    await waitFor(() => expect(view.result.current.outbox).toHaveLength(0))
-    expect(readNativeChatDraftCache('scope')).toBe('')
-  })
-
-  it('a replayed send answered with the hand-off settles as the host holding it', async () => {
-    mocks.call.mockImplementationOnce(async (_target, _method, params) => ({
-      ok: true,
-      replayed: true,
-      fence: 1,
-      cursor: { epoch: 'epoch-1', sequence: 1 },
-      value: {
-        clientMessageId: 'second',
-        submission: submission('second', {
-          dispatchState: 'pending',
-          resolvedAt: null,
-          queuedMessageId: params.envelope.clientOperationId
-        })
-      }
-    }))
-    const view = renderOutbox()
-    act(() => {
-      expect(view.result.current.send('follow-up')).toBe(true)
-    })
-    await waitFor(() => expect(mocks.call).toHaveBeenCalledTimes(1))
-    // Let the answer land before reading the outbox.
-    await act(async () => new Promise((resolve) => setTimeout(resolve, 20)))
-    expect(view.result.current.outbox).toEqual([])
-    expect(view.result.current.error).toBeNull()
-    // Single-flight is free again: the next send goes out.
-    expect(view.result.current.send('next')).toBe(true)
-    await waitFor(() => expect(mocks.call).toHaveBeenCalledTimes(2))
-  })
-
-  it('a replay of a deleted card is answered spent: it leaves with no restore and no Retry', async () => {
-    mocks.call.mockImplementationOnce(async (_target, _method, params) => ({
-      ok: true,
-      replayed: true,
-      fence: 1,
-      cursor: { epoch: 'epoch-1', sequence: 1 },
-      value: {
-        clientMessageId: params.envelope.clientOperationId,
-        queued: { messageId: params.envelope.clientOperationId, position: 0, state: 'withdrawn' }
-      }
-    }))
-    const view = renderOutbox()
-    act(() => {
-      expect(view.result.current.send('deleted on another device')).toBe(true)
-    })
-    await waitFor(() => expect(mocks.call).toHaveBeenCalledTimes(1))
-    await act(async () => new Promise((resolve) => setTimeout(resolve, 20)))
-    expect(view.result.current.outbox).toEqual([])
-    expect(view.result.current.error).toBeNull()
-    expect(readNativeChatDraftCache('scope')).toBe('')
-    act(() => {
-      expect(view.result.current.send('next')).toBe(true)
-    })
-    await waitFor(() => expect(mocks.call).toHaveBeenCalledTimes(2))
-  })
-})
diff --git a/src/renderer/src/components/native-chat/use-structured-agent-session-outbox.external-send.test.tsx b/src/renderer/src/components/native-chat/use-structured-agent-session-outbox.external-send.test.tsx
deleted file mode 100644
index 0cb70aab14b3..000000000000
--- a/src/renderer/src/components/native-chat/use-structured-agent-session-outbox.external-send.test.tsx
+++ /dev/null
@@ -1,65 +0,0 @@
-// @vitest-environment happy-dom
-
-// A message queued on a session's outbox from outside its chat (review notes, annotations) is the
-// same entry the composer would add, drained by the open chat.
-
-import { act, cleanup, renderHook, waitFor } from '@testing-library/react'
-import { afterEach, beforeEach, expect, it, vi } from 'vitest'
-
-const mocks = vi.hoisted(() => ({ call: vi.fn() }))
-
-vi.mock('@/runtime/structured-agent-session-client', () => ({
-  callStructuredAgentSession: mocks.call
-}))
-
-import { appendStructuredAgentSessionOutboxMessage } from './structured-agent-session-outbox-storage'
-import { useStructuredAgentSessionOutbox } from './use-structured-agent-session-outbox'
-
-import type { AgentJournalRenderItem } from '../../../../shared/agent-session-journal-types'
-
-const NO_JOURNAL_ITEMS: readonly AgentJournalRenderItem[] = []
-
-afterEach(cleanup)
-
-beforeEach(() => {
-  vi.clearAllMocks()
-  localStorage.clear()
-})
-
-it('delivers a message queued from outside the chat through the open outbox', async () => {
-  mocks.call.mockImplementation(async (_target, _method, params) => {
-    const clientMessageId = (params as { envelope: { clientOperationId: string } }).envelope
-      .clientOperationId
-    return {
-      ok: true,
-      replayed: false,
-      fence: 1,
-      cursor: { epoch: 'epoch-1', sequence: 1 },
-      value: {
-        clientMessageId,
-        submission: { clientMessageId, fence: 1, dispatchState: 'accepted', submittedAt: 1 }
-      }
-    }
-  })
-  const { result } = renderHook(() =>
-    useStructuredAgentSessionOutbox({
-      journalItems: NO_JOURNAL_ITEMS,
-      sessionId: 'session-1',
-      target: { kind: 'local' },
-      fence: 1,
-      submissions: []
-    })
-  )
-
-  act(() => {
-    appendStructuredAgentSessionOutboxMessage('session-1', 'review notes')
-  })
-
-  expect(result.current.outbox[0]?.body.blocks).toEqual([{ type: 'text', text: 'review notes' }])
-  await waitFor(() => expect(mocks.call).toHaveBeenCalledOnce())
-  expect(mocks.call.mock.calls[0]?.[1]).toBe('agentSession.send')
-  expect(mocks.call.mock.calls[0]?.[2]).toMatchObject({
-    envelope: { sessionId: 'session-1', expectedRuntimeFence: 1 },
-    body: { blocks: [{ type: 'text', text: 'review notes' }] }
-  })
-})
diff --git a/src/renderer/src/components/native-chat/use-structured-agent-session-outbox.queue-delivery.test.tsx b/src/renderer/src/components/native-chat/use-structured-agent-session-outbox.queue-delivery.test.tsx
deleted file mode 100644
index 5e4ea8d29e6f..000000000000
--- a/src/renderer/src/components/native-chat/use-structured-agent-session-outbox.queue-delivery.test.tsx
+++ /dev/null
@@ -1,504 +0,0 @@
-// @vitest-environment happy-dom
-
-// What the wire sees when queueing is available: `delivery` rides the send and
-// its operation fingerprint only for a capable host with the setting on, a
-// `queued` answer spends the entry, and everything else is byte-for-byte
-// today's request — an older host must never see the key at all.
-
-import { act, cleanup, renderHook, waitFor } from '@testing-library/react'
-import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest'
-import { structuredAgentSessionPayloadFingerprint } from '../../../../shared/structured-agent-session-mutation'
-import type { StructuredAgentSessionQueueCapability } from '../../../../shared/structured-agent-session-outbox-delivery'
-import {
-  clearNativeChatDraftCacheForTests,
-  readNativeChatDraftCache
-} from './native-chat-draft-cache'
-
-type SentParams = {
-  envelope: { clientOperationId: string; sessionId: string; payloadFingerprint: string }
-  body?: unknown
-  delivery?: 'queue-if-active'
-}
-
-const mocks = vi.hoisted(() => ({
-  call: vi.fn<(target: unknown, method: string, params: SentParams) => Promise<unknown>>()
-}))
-
-vi.mock('@/runtime/structured-agent-session-client', () => ({
-  callStructuredAgentSession: mocks.call
-}))
-
-import { useStructuredAgentSessionOutbox } from './use-structured-agent-session-outbox'
-import { readOutbox, writeOutbox } from './structured-agent-session-outbox-storage'
-import { createStructuredAgentSessionOutboxEntry } from '../../../../shared/structured-agent-session-outbox'
-import type {
-  AgentJournalRenderItem,
-  AgentJournalSubmission
-} from '../../../../shared/agent-session-journal-types'
-
-const NO_JOURNAL_ITEMS: readonly AgentJournalRenderItem[] = []
-
-// Why: every hook here shares the session outbox store; one left mounted would drain the next test's.
-afterEach(cleanup)
-
-const LOCAL_TARGET = { kind: 'local' } as const
-const QUEUEING = { capability: 'supported', enabled: true } as const
-
-function queuedReceipt(clientMessageId: string) {
-  return {
-    ok: true,
-    replayed: false,
-    fence: 1,
-    cursor: { epoch: 'epoch-1', sequence: 1 },
-    value: {
-      clientMessageId,
-      queued: { messageId: clientMessageId, position: 1, state: 'waiting' as const }
-    }
-  }
-}
-
-function renderOutbox(queue: boolean) {
-  return renderHook(() =>
-    useStructuredAgentSessionOutbox({
-      journalItems: NO_JOURNAL_ITEMS,
-      sessionId: 'session-1',
-      target: LOCAL_TARGET,
-      fence: 1,
-      submissions: [],
-      queueDelivery: queue ? QUEUEING : { capability: 'unsupported', enabled: true }
-    })
-  )
-}
-
-async function sentParams(): Promise<SentParams> {
-  await waitFor(() => expect(mocks.call).toHaveBeenCalled())
-  const call = mocks.call.mock.calls[0]
-  expect(call?.[1]).toBe('agentSession.send')
-  const params = call?.[2]
-  if (!params) {
-    throw new Error('no send left the outbox')
-  }
-  return params
-}
-
-beforeEach(() => {
-  localStorage.clear()
-  clearNativeChatDraftCacheForTests()
-  mocks.call.mockReset()
-})
-
-afterEach(() => {
-  localStorage.clear()
-  clearNativeChatDraftCacheForTests()
-})
-
-describe('outbox queue delivery selection', () => {
-  it('stamps `delivery` on the send and its operation fingerprint when queueing is on', async () => {
-    mocks.call.mockImplementation(async (_target, _method, params) =>
-      queuedReceipt(params.envelope.clientOperationId)
-    )
-    const { result } = renderOutbox(true)
-    expect(result.current.send('queue me')).toBe(true)
-    const params = await sentParams()
-    expect(params.delivery).toBe('queue-if-active')
-    expect(params.envelope.payloadFingerprint).toBe(
-      structuredAgentSessionPayloadFingerprint({
-        method: 'agentSession.send',
-        sessionId: 'session-1',
-        fields: { body: params.body, delivery: 'queue-if-active' }
-      })
-    )
-    // The host owns the draft now: the queued answer spends the outbox entry.
-    await waitFor(() => expect(result.current.outbox).toHaveLength(0))
-  })
-
-  it("sends exactly today's request when the host lacks the capability or the setting is off", async () => {
-    mocks.call.mockImplementation(async () => ({
-      ok: true,
-      replayed: false,
-      fence: 1,
-      cursor: { epoch: 'epoch-1', sequence: 1 },
-      value: {
-        clientMessageId: 'ignored',
-        submission: {
-          clientMessageId: 'ignored',
-          fence: 1,
-          payloadFingerprint: 'fingerprint',
-          dispatchState: 'accepted',
-          providerItemId: 'provider-1',
-          reason: null,
-          submittedAt: 1,
-          resolvedAt: 1
-        }
-      }
-    }))
-    const { result } = renderOutbox(false)
-    expect(result.current.send('plain send')).toBe(true)
-    const params = await sentParams()
-    expect('delivery' in params).toBe(false)
-    expect(params.envelope.payloadFingerprint).toBe(
-      structuredAgentSessionPayloadFingerprint({
-        method: 'agentSession.send',
-        sessionId: 'session-1',
-        fields: { body: params.body }
-      })
-    )
-  })
-
-  it('routes an image send down the immediate path even with queueing on (text-only v1)', async () => {
-    mocks.call.mockImplementation(async () => queuedReceipt('unused'))
-    const { result } = renderOutbox(true)
-    expect(
-      result.current.send('with image', [{ path: '/tmp/a.png', previewUri: 'file:///tmp/a.png' }])
-    ).toBe(true)
-    const params = await sentParams()
-    expect('delivery' in params).toBe(false)
-  })
-
-  it('retires an entry the host visibly holds as a draft, with no second copy of the text', async () => {
-    // A queued send whose acknowledgement was lost: the entry survives under the
-    // draft's own id, then the published draft list proves the host owns it.
-    mocks.call.mockImplementation(() => new Promise(() => {}))
-    const first = renderHook(
-      (props: { queuedMessageIds: string[] }) =>
-        useStructuredAgentSessionOutbox({
-          journalItems: NO_JOURNAL_ITEMS,
-          sessionId: 'session-1',
-          target: LOCAL_TARGET,
-          fence: 1,
-          submissions: [],
-          queueDelivery: { capability: 'supported' as const, enabled: true },
-          queuedMessageIds: props.queuedMessageIds
-        }),
-      { initialProps: { queuedMessageIds: Array.of<string>() } }
-    )
-    expect(first.result.current.send('lost ack')).toBe(true)
-    await waitFor(() => expect(mocks.call).toHaveBeenCalled())
-    const entryId = mocks.call.mock.calls[0]?.[2]?.envelope.clientOperationId
-    expect(entryId).toBeTruthy()
-    expect(first.result.current.outbox).toHaveLength(1)
-    first.rerender({ queuedMessageIds: [entryId ?? ''] })
-    await waitFor(() => expect(first.result.current.outbox).toHaveLength(0))
-    // Retired, not restored: nothing to resend, nothing appended anywhere.
-    expect(localStorage.getItem('orca:desktopStructuredAgentSessionOutbox:v1:session-1')).toBeNull()
-    // The held draft answered the send, so the next one goes without waiting on the lost reply.
-    expect(first.result.current.send('next')).toBe(true)
-    await waitFor(() => expect(mocks.call).toHaveBeenCalledTimes(2))
-  })
-
-  // After a quit, the outbox sends an unconfirmed message again under its own id, to a host that
-  // does not queue, and the host has kept that message as a held card under the same id. Its reply
-  // is the send's own rejected record; the card is what says the host holds it.
-  it.each(['reply first', 'card first'] as const)(
-    'a send a restart kept as a card leaves the outbox with no Retry and no restore (%s)',
-    async (order) => {
-      let answer: (value: unknown) => void = () => undefined
-      mocks.call.mockImplementation(() => new Promise((resolve) => (answer = resolve)))
-      const view = renderHook(
-        (props: { queuedMessageIds: string[] }) =>
-          useStructuredAgentSessionOutbox({
-            journalItems: NO_JOURNAL_ITEMS,
-            sessionId: 'session-1',
-            target: LOCAL_TARGET,
-            fence: 1,
-            submissions: [],
-            composerScopeKey: 'kept-scope',
-            queueDelivery: { capability: 'unsupported', enabled: true },
-            queuedMessageIds: props.queuedMessageIds
-          }),
-        { initialProps: { queuedMessageIds: Array.of<string>() } }
-      )
-      expect(view.result.current.send('kept by the host')).toBe(true)
-      const id = (await sentParams()).envelope.clientOperationId
-      const rejectedReplay = {
-        ok: true,
-        replayed: true,
-        fence: 1,
-        cursor: { epoch: 'epoch-1', sequence: 2 },
-        value: {
-          clientMessageId: id,
-          submission: {
-            clientMessageId: id,
-            fence: 1,
-            payloadFingerprint: 'fp',
-            dispatchState: 'rejected',
-            providerItemId: null,
-            reason: 'Orca restarted before this message was sent.',
-            rejection: { kind: 'hostRestarted' },
-            submittedAt: 1,
-            resolvedAt: 2,
-            recovered: true,
-            handoverRecorded: true
-          }
-        }
-      }
-      if (order === 'reply first') {
-        await act(async () => answer(rejectedReplay))
-        await waitFor(() => expect(view.result.current.outbox[0]?.state).toBe('rejected'))
-        view.rerender({ queuedMessageIds: [id] })
-      } else {
-        view.rerender({ queuedMessageIds: [id] })
-        await waitFor(() => expect(view.result.current.outbox).toHaveLength(0))
-        await act(async () => answer(rejectedReplay))
-      }
-      await waitFor(() => expect(view.result.current.outbox).toHaveLength(0))
-      expect(readOutbox('session-1')).toEqual([])
-      expect(readNativeChatDraftCache('kept-scope')).toBe('')
-      expect(mocks.call).toHaveBeenCalledTimes(1)
-    }
-  )
-
-  // The card may be sent, edited or deleted on another device before this desktop ever sees it:
-  // the send's own record says the host kept it, so its local copy leaves with no Retry.
-  describe('a send the host kept as a card, its card never seen here', () => {
-    function keptRejection(id: string): AgentJournalSubmission {
-      return {
-        clientMessageId: id,
-        fence: 1,
-        payloadFingerprint: 'fp',
-        dispatchState: 'rejected',
-        providerItemId: null,
-        reason: 'Orca restarted before this message was sent.',
-        rejection: { kind: 'hostRestarted' },
-        submittedAt: 1,
-        resolvedAt: 2,
-        recovered: true,
-        handoverRecorded: true,
-        keptAsQueuedMessageId: id
-      }
-    }
-
-    it('leaves the outbox on the host’s answer', async () => {
-      mocks.call.mockImplementation(async (_target, _method, params) => ({
-        ok: true,
-        replayed: true,
-        fence: 1,
-        cursor: { epoch: 'epoch-1', sequence: 2 },
-        value: {
-          clientMessageId: params.envelope.clientOperationId,
-          submission: keptRejection(params.envelope.clientOperationId)
-        }
-      }))
-      const view = renderHook(() =>
-        useStructuredAgentSessionOutbox({
-          journalItems: NO_JOURNAL_ITEMS,
-          sessionId: 'session-1',
-          target: LOCAL_TARGET,
-          fence: 1,
-          submissions: [],
-          composerScopeKey: 'kept-elsewhere',
-          queueDelivery: { capability: 'unsupported', enabled: true }
-        })
-      )
-      expect(view.result.current.send('kept, then deleted elsewhere')).toBe(true)
-      await waitFor(() => expect(mocks.call).toHaveBeenCalledTimes(1))
-      await waitFor(() => expect(view.result.current.outbox).toHaveLength(0))
-      expect(readOutbox('session-1')).toEqual([])
-      expect(readNativeChatDraftCache('kept-elsewhere')).toBe('')
-    })
-
-    it('leaves the outbox when the journal shows it, from a stored not-sent copy', async () => {
-      writeOutbox('session-1', [
-        {
-          ...createStructuredAgentSessionOutboxEntry({
-            clientMessageId: 'kept-id',
-            sessionId: 'session-1',
-            text: 'kept, then deleted elsewhere',
-            attachments: [],
-            queuedAt: 1
-          }),
-          state: 'unconfirmed',
-          lastAttemptAt: 5
-        }
-      ])
-      const view = renderHook(() =>
-        useStructuredAgentSessionOutbox({
-          journalItems: NO_JOURNAL_ITEMS,
-          sessionId: 'session-1',
-          target: LOCAL_TARGET,
-          fence: 1,
-          submissions: [keptRejection('kept-id')],
-          queueDelivery: { capability: 'unsupported', enabled: true }
-        })
-      )
-      await waitFor(() => expect(view.result.current.outbox).toHaveLength(0))
-      expect(readOutbox('session-1')).toEqual([])
-      expect(mocks.call).not.toHaveBeenCalled()
-    })
-  })
-
-  it("Stop's local step never restores a queued send already in flight — its answer settles it", async () => {
-    // The send is on its way; the Stop lands behind it, so the host may already hold
-    // it as a paused card. Restoring it locally too would double the text.
-    mocks.call.mockImplementation(() => new Promise(() => {}))
-    const view = renderHook(
-      (props: { queuedMessageIds: string[] }) =>
-        useStructuredAgentSessionOutbox({
-          journalItems: NO_JOURNAL_ITEMS,
-          sessionId: 'session-1',
-          target: LOCAL_TARGET,
-          fence: 1,
-          submissions: [],
-          composerScopeKey: 'stop-scope',
-          queueDelivery: { capability: 'supported' as const, enabled: true },
-          queuedMessageIds: props.queuedMessageIds
-        }),
-      { initialProps: { queuedMessageIds: Array.of<string>() } }
-    )
-    expect(view.result.current.send('issued text')).toBe(true)
-    await waitFor(() => expect(mocks.call).toHaveBeenCalled())
-    // A second send waits behind single-flight: the Stop still owns ITS text locally.
-    expect(view.result.current.send('never left')).toBe(true)
-    act(() => {
-      view.result.current.withdrawUnsent()
-    })
-    // The unissued entry came back to the composer; the issued one stayed put.
-    expect(readNativeChatDraftCache('stop-scope')).toBe('never left')
-    // The issued one waits for its answer, marked: only the user's Retry sends it again.
-    expect(view.result.current.outbox.map((entry) => [entry.state, entry.outlivedStop])).toEqual([
-      ['dispatching', true]
-    ])
-    // The host publishes the issued send as a card: retired, still nothing restored.
-    const entryId = mocks.call.mock.calls[0]?.[2]?.envelope.clientOperationId
-    view.rerender({ queuedMessageIds: [entryId ?? ''] })
-    await waitFor(() => expect(view.result.current.outbox).toHaveLength(0))
-    expect(readNativeChatDraftCache('stop-scope')).toBe('never left')
-  })
-
-  it('while the capability is unknown, an attempted queue send replays what it sent', async () => {
-    const view = await attemptedQueueSend()
-    view.rerender({ capability: 'unknown' })
-    const id = view.result.current.outbox[0]?.clientMessageId ?? ''
-    act(() => {
-      view.result.current.retry(id)
-    })
-    await waitFor(() => expect(mocks.call).toHaveBeenCalledTimes(2))
-    const params = mocks.call.mock.calls[1]?.[2]
-    expect(params?.envelope.clientOperationId).toBe(id)
-    expect(params?.delivery).toBe('queue-if-active')
-    expect(params?.envelope.payloadFingerprint).toBe(
-      mocks.call.mock.calls[0]?.[2]?.envelope.payloadFingerprint
-    )
-  })
-
-  it('while the capability is unknown, a new send goes out plain and holds up nothing', async () => {
-    mocks.call.mockImplementation(async (_target, _method, params) => ({
-      ok: true,
-      replayed: false,
-      fence: 1,
-      cursor: { epoch: 'epoch-1', sequence: 1 },
-      value: {
-        clientMessageId: params.envelope.clientOperationId,
-        submission: {
-          clientMessageId: params.envelope.clientOperationId,
-          fence: 1,
-          payloadFingerprint: 'fingerprint',
-          dispatchState: 'accepted',
-          providerItemId: 'provider-1',
-          reason: null,
-          submittedAt: 1,
-          resolvedAt: 1
-        }
-      }
-    }))
-    const { result } = renderHook(() =>
-      useStructuredAgentSessionOutbox({
-        journalItems: NO_JOURNAL_ITEMS,
-        sessionId: 'session-1',
-        target: LOCAL_TARGET,
-        fence: 1,
-        submissions: [],
-        queueDelivery: { capability: 'unknown', enabled: true }
-      })
-    )
-    act(() => {
-      result.current.send('first')
-    })
-    await waitFor(() => expect(mocks.call).toHaveBeenCalledTimes(1))
-    act(() => {
-      result.current.send('second')
-    })
-    await waitFor(() => expect(mocks.call).toHaveBeenCalledTimes(2))
-    for (const call of mocks.call.mock.calls) {
-      expect('delivery' in call[2]).toBe(false)
-    }
-  })
-
-  it('a host known not to queue gets the Retry without `delivery`; the entry keeps what it sent', async () => {
-    // Such a host rejects the strict field before its operation ledger, so a replay carrying it
-    // again could only fail the same way.
-    const view = await attemptedQueueSend()
-    view.rerender({ capability: 'unsupported' })
-    const id = view.result.current.outbox[0]?.clientMessageId ?? ''
-    act(() => {
-      view.result.current.retry(id)
-    })
-    await waitFor(() => expect(mocks.call).toHaveBeenCalledTimes(2))
-    const params = mocks.call.mock.calls[1]?.[2]
-    expect(params?.envelope.clientOperationId).toBe(id)
-    expect(params && 'delivery' in params).toBe(false)
-    expect(params?.envelope.payloadFingerprint).toBe(
-      structuredAgentSessionPayloadFingerprint({
-        method: 'agentSession.send',
-        sessionId: 'session-1',
-        fields: { body: params?.body }
-      })
-    )
-    expect(readOutbox('session-1')[0]?.sentDelivery).toBe('queue-if-active')
-  })
-})
-
-const SUPPORTED: StructuredAgentSessionQueueCapability = 'supported'
-
-/** A queue send whose first attempt failed and now waits on the user's Retry. */
-async function attemptedQueueSend() {
-  mocks.call.mockImplementationOnce(async () => {
-    throw new Error('invalid_argument: Unrecognized key: "delivery"')
-  })
-  const view = renderHook(
-    (props: { capability: StructuredAgentSessionQueueCapability }) =>
-      useStructuredAgentSessionOutbox({
-        journalItems: NO_JOURNAL_ITEMS,
-        sessionId: 'session-1',
-        target: LOCAL_TARGET,
-        fence: 1,
-        submissions: [],
-        queueDelivery: { capability: props.capability, enabled: true }
-      }),
-    { initialProps: { capability: SUPPORTED } }
-  )
-  expect(view.result.current.send('follow-up')).toBe(true)
-  await waitFor(() => expect(view.result.current.outbox[0]?.lastFailure).toBeDefined())
-  expect(mocks.call.mock.calls[0]?.[2]?.delivery).toBe('queue-if-active')
-  mocks.call.mockImplementation(() => new Promise(() => {}))
-  return view
-}
-
-// The composer moves the reader only for a message the transcript draws as a bubble.
-it.each([
-  ['a text follow-up while the agent works', QUEUEING, true, [], 'queued'],
-  ['the same follow-up when the agent is idle', QUEUEING, false, [], true],
-  ['with the queue setting off', { capability: 'supported', enabled: false }, true, [], true],
-  ['an image, which never queues', QUEUEING, true, [{ path: '/a.png', previewUri: '/a.png' }], true]
-] as const)(
-  'answers whether %s waits as a queued card',
-  (_case, queueDelivery, isWorking, images, admission) => {
-    mocks.call.mockImplementation(() => new Promise(() => {}))
-    const { result } = renderHook(() =>
-      useStructuredAgentSessionOutbox({
-        journalItems: NO_JOURNAL_ITEMS,
-        sessionId: 'session-1',
-        target: LOCAL_TARGET,
-        fence: 1,
-        submissions: [],
-        queueDelivery,
-        isWorking
-      })
-    )
-    let sent: boolean | 'queued' = false
-    act(() => {
-      sent = result.current.send('follow up', images)
-    })
-    expect(sent).toBe(admission)
-  }
-)
diff --git a/src/renderer/src/components/native-chat/use-structured-agent-session-outbox.rejected-reply.test.tsx b/src/renderer/src/components/native-chat/use-structured-agent-session-outbox.rejected-reply.test.tsx
deleted file mode 100644
index 5e736e1dcfe2..000000000000
--- a/src/renderer/src/components/native-chat/use-structured-agent-session-outbox.rejected-reply.test.tsx
+++ /dev/null
@@ -1,100 +0,0 @@
-// @vitest-environment happy-dom
-
-// A send whose own reply says the host recorded it and then rejected it is shown once, in the chat
-// where it was sent; its text never also goes back to the composer.
-
-import { act, cleanup, renderHook, waitFor } from '@testing-library/react'
-import { afterEach, beforeEach, expect, it, vi } from 'vitest'
-import type {
-  AgentJournalRenderItem,
-  AgentJournalSubmission
-} from '../../../../shared/agent-session-journal-types'
-import { agentJournalSubmissionKey } from '../../../../shared/agent-session-journal-item-key'
-import { DISPATCH_REJECTED_NOT_DELIVERED } from '../../../../shared/structured-agent-session-dispatch-rejection'
-
-type SendParams = { envelope: { clientOperationId: string; payloadFingerprint: string } }
-
-const mocks = vi.hoisted(() => ({
-  call: vi.fn<(target: unknown, method: string, params: SendParams) => Promise<unknown>>()
-}))
-
-vi.mock('@/runtime/structured-agent-session-client', () => ({
-  callStructuredAgentSession: mocks.call
-}))
-
-import {
-  clearNativeChatDraftCacheForTests,
-  readNativeChatDraftCache
-} from './native-chat-draft-cache'
-import { projectStructuredAgentSessionMessages } from './structured-agent-session-message-projection'
-import { useStructuredAgentSessionOutbox } from './use-structured-agent-session-outbox'
-
-const NO_JOURNAL_ITEMS: readonly AgentJournalRenderItem[] = []
-
-afterEach(cleanup)
-
-beforeEach(() => {
-  vi.clearAllMocks()
-  localStorage.clear()
-  clearNativeChatDraftCacheForTests()
-})
-
-it('draws a send its reply rejected in place once, and leaves the composer empty', async () => {
-  const reply: { submission: AgentJournalSubmission | null } = { submission: null }
-  mocks.call.mockImplementationOnce(async (_target, _method, { envelope }) => {
-    const rejected: AgentJournalSubmission = {
-      clientMessageId: envelope.clientOperationId,
-      fence: 1,
-      payloadFingerprint: envelope.payloadFingerprint,
-      dispatchState: 'rejected',
-      providerItemId: null,
-      reason: DISPATCH_REJECTED_NOT_DELIVERED,
-      rejection: { kind: 'notDelivered' },
-      submittedAt: 10,
-      resolvedAt: 11
-    }
-    reply.submission = rejected
-    return {
-      ok: true,
-      replayed: false,
-      fence: 1,
-      cursor: { epoch: 'epoch-1', sequence: 10 },
-      value: { clientMessageId: envelope.clientOperationId, submission: rejected }
-    }
-  })
-  const { result } = renderHook(() =>
-    useStructuredAgentSessionOutbox({
-      journalItems: NO_JOURNAL_ITEMS,
-      sessionId: 'session-1',
-      target: { kind: 'local' },
-      fence: 1,
-      submissions: [],
-      composerScopeKey: 'pane-1'
-    })
-  )
-
-  act(() => expect(result.current.send('steer this way')).toBe(true))
-  await waitFor(() => expect(result.current.outbox[0]?.state).toBe('rejected'))
-  expect(readNativeChatDraftCache('pane-1')).toBe('')
-
-  const submission = reply.submission
-  if (!submission) {
-    throw new Error('the send was never answered')
-  }
-  const hostItem: AgentJournalRenderItem = {
-    itemId: agentJournalSubmissionKey(submission.clientMessageId),
-    revision: 1,
-    sequence: 10,
-    observedAt: 10,
-    body: { kind: 'message', role: 'user', blocks: [{ type: 'text', text: 'steer this way' }] }
-  }
-  const users = (outbox: typeof result.current.outbox) =>
-    projectStructuredAgentSessionMessages([hostItem], outbox, [submission])
-      .filter((message) => message.role === 'user')
-      .map((message) => ({ id: message.id, unsent: message.unsent }))
-
-  expect(users(result.current.outbox)).toEqual([{ id: hostItem.itemId, unsent: true }])
-  // After a crash takes the outbox, the host's row is still the one row.
-  expect(users([])).toEqual([{ id: hostItem.itemId, unsent: true }])
-  expect(readNativeChatDraftCache('pane-1')).toBe('')
-})
diff --git a/src/renderer/src/components/native-chat/use-structured-agent-session-outbox.stop-parks-in-doubt.test.tsx b/src/renderer/src/components/native-chat/use-structured-agent-session-outbox.stop-parks-in-doubt.test.tsx
deleted file mode 100644
index 45d87f26f666..000000000000
--- a/src/renderer/src/components/native-chat/use-structured-agent-session-outbox.stop-parks-in-doubt.test.tsx
+++ /dev/null
@@ -1,194 +0,0 @@
-// @vitest-environment happy-dom
-
-// A queued follow-up whose answer is out survives a Stop, since the host may hold it as a paused
-// card. From then on only the user's Retry sends it: the unconfirmed probe resending it onto the
-// now-idle session would start a turn the user just stopped.
-
-import { act, cleanup, renderHook } from '@testing-library/react'
-import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest'
-import { createStructuredAgentSessionOutboxEntry } from '../../../../shared/structured-agent-session-outbox'
-
-type SentParams = { envelope: { clientOperationId: string }; delivery?: string }
-
-const mocks = vi.hoisted(() => ({
-  call: vi.fn<(target: unknown, method: string, params: SentParams) => Promise<unknown>>()
-}))
-
-vi.mock('@/runtime/structured-agent-session-client', () => ({
-  callStructuredAgentSession: mocks.call
-}))
-
-import { useStructuredAgentSessionOutbox } from './use-structured-agent-session-outbox'
-import { readOutbox, writeOutbox } from './structured-agent-session-outbox-storage'
-import {
-  clearNativeChatDraftCacheForTests,
-  readNativeChatDraftCache
-} from './native-chat-draft-cache'
-
-import type { AgentJournalRenderItem } from '../../../../shared/agent-session-journal-types'
-
-const NO_JOURNAL_ITEMS: readonly AgentJournalRenderItem[] = []
-
-// Why: every hook here shares the session outbox store; one left mounted would drain the next test's.
-afterEach(cleanup)
-
-const TARGET = { kind: 'local' } as const
-const REMOTE = { kind: 'environment', environmentId: 'env-1' } as const
-const NOT_ATTACHED: { fence: number | null } = { fence: null }
-
-beforeEach(() => {
-  localStorage.clear()
-  clearNativeChatDraftCacheForTests()
-  mocks.call.mockReset()
-  mocks.call.mockImplementation(() => new Promise(() => {}))
-  vi.useFakeTimers({ shouldAdvanceTime: true })
-})
-
-afterEach(() => {
-  vi.useRealTimers()
-  localStorage.clear()
-})
-
-describe('a Stop with a queued send in doubt', () => {
-  it('a remote send probed back to queued after a lost answer: Stop keeps it for Retry', async () => {
-    // Lost answer, a re-probe that failed (capability unknown), and the probe flipped the entry
-    // back to `queued`; the Stop lands before the drain sends it again.
-    writeOutbox('session-1', [
-      {
-        ...createStructuredAgentSessionOutboxEntry({
-          clientMessageId: 'probed',
-          sessionId: 'session-1',
-          text: 'follow-up',
-          attachments: [],
-          queuedAt: 1
-        }),
-        sentDelivery: 'queue-if-active',
-        lastAttemptAt: 5,
-        state: 'queued'
-      }
-    ])
-    const view = renderHook(
-      (props: { fence: number | null }) =>
-        useStructuredAgentSessionOutbox({
-          journalItems: NO_JOURNAL_ITEMS,
-          sessionId: 'session-1',
-          target: REMOTE,
-          fence: props.fence,
-          submissions: [],
-          composerScopeKey: 'scope',
-          queueDelivery: { capability: 'unknown', enabled: true }
-        }),
-      { initialProps: NOT_ATTACHED }
-    )
-    act(() => {
-      view.result.current.withdrawUnsent()
-    })
-    // The host may hold it as a paused card: the composer gets nothing.
-    expect(readNativeChatDraftCache('scope')).toBe('')
-    // Marked, state untouched: the mark alone holds it.
-    expect(view.result.current.outbox.map((entry) => [entry.state, entry.outlivedStop])).toEqual([
-      ['queued', true]
-    ])
-    view.rerender({ fence: 1 })
-    // Past the probe's longest backoff several times over.
-    await act(async () => {
-      await vi.advanceTimersByTimeAsync(60_000)
-    })
-    expect(mocks.call).not.toHaveBeenCalled()
-    expect(readOutbox('session-1').map((entry) => entry.clientMessageId)).toEqual(['probed'])
-
-    act(() => {
-      view.result.current.retry('probed')
-    })
-    await act(async () => {
-      await vi.advanceTimersByTimeAsync(0)
-    })
-    // The same operation with what it first sent, though the capability is still unknown.
-    expect(mocks.call.mock.calls.map((call) => call[2].envelope.clientOperationId)).toEqual([
-      'probed'
-    ])
-    expect(mocks.call.mock.calls[0]?.[2].delivery).toBe('queue-if-active')
-  })
-
-  it('never resends one a Stop found in flight whose answer later comes back unknown', async () => {
-    const answer = Promise.withResolvers<unknown>()
-    mocks.call.mockImplementationOnce(() => answer.promise)
-    const { result } = renderHook(() =>
-      useStructuredAgentSessionOutbox({
-        journalItems: NO_JOURNAL_ITEMS,
-        sessionId: 'session-1',
-        target: TARGET,
-        fence: 1,
-        submissions: [],
-        composerScopeKey: 'scope',
-        queueDelivery: { capability: 'supported' as const, enabled: true }
-      })
-    )
-    act(() => {
-      result.current.send('follow-up')
-    })
-    await act(async () => {
-      await vi.advanceTimersByTimeAsync(0)
-    })
-    expect(mocks.call).toHaveBeenCalledTimes(1)
-    const id = mocks.call.mock.calls[0]?.[2].envelope.clientOperationId ?? ''
-    act(() => {
-      result.current.withdrawUnsent()
-    })
-    // The transport loses the answer: delivery unknown, after the Stop.
-    await act(async () => {
-      answer.reject(new Error('connection closed'))
-      await vi.advanceTimersByTimeAsync(0)
-    })
-    expect(result.current.outbox.map((entry) => entry.state)).toEqual(['unconfirmed'])
-    await act(async () => {
-      await vi.advanceTimersByTimeAsync(60_000)
-    })
-    expect(mocks.call).toHaveBeenCalledTimes(1)
-
-    act(() => {
-      result.current.retry(id)
-    })
-    await act(async () => {
-      await vi.advanceTimersByTimeAsync(0)
-    })
-    expect(mocks.call.mock.calls.map((call) => call[2].envelope.clientOperationId)).toEqual([
-      id,
-      id
-    ])
-  })
-
-  it('the drain never sends one a Stop outlived, even after a reload left it queued', async () => {
-    writeOutbox('session-1', [
-      {
-        ...createStructuredAgentSessionOutboxEntry({
-          clientMessageId: 'outlived',
-          sessionId: 'session-1',
-          text: 'follow-up',
-          attachments: [],
-          queuedAt: 1
-        }),
-        sentDelivery: 'queue-if-active',
-        lastAttemptAt: 5,
-        outlivedStop: true,
-        state: 'queued'
-      }
-    ])
-    const { result } = renderHook(() =>
-      useStructuredAgentSessionOutbox({
-        journalItems: NO_JOURNAL_ITEMS,
-        sessionId: 'session-1',
-        target: TARGET,
-        fence: 1,
-        submissions: [],
-        queueDelivery: { capability: 'supported', enabled: true }
-      })
-    )
-    await act(async () => {
-      await vi.advanceTimersByTimeAsync(60_000)
-    })
-    expect(mocks.call).not.toHaveBeenCalled()
-    // Held by the mark alone; its state, and so its notice, stays what its answer made it.
-    expect(result.current.outbox.map((entry) => entry.state)).toEqual(['queued'])
-  })
-})
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
deleted file mode 100644
index f9957ed41cc9..000000000000
--- a/src/renderer/src/components/native-chat/use-structured-agent-session-outbox.test.tsx
+++ /dev/null
@@ -1,864 +0,0 @@
-// @vitest-environment happy-dom
-
-import { act, cleanup, renderHook, waitFor } from '@testing-library/react'
-import { useLayoutEffect } from 'react'
-import { createRoot } from 'react-dom/client'
-import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest'
-import type {
-  AgentJournalRenderItem,
-  AgentJournalSubmission
-} from '../../../../shared/agent-session-journal-types'
-import type { AgentSessionWireRefusalCode } from '../../../../shared/agent-session-wire'
-import { enqueueStructuredAgentSessionLaunchPrompt } from './structured-agent-session-outbox-storage'
-
-const mocks = vi.hoisted(() => ({
-  call: vi.fn()
-}))
-
-vi.mock('@/runtime/structured-agent-session-client', () => ({
-  callStructuredAgentSession: mocks.call
-}))
-
-import { useStructuredAgentSessionOutbox } from './use-structured-agent-session-outbox'
-import { settleStructuredAgentLaunchPrompt } from '@/lib/structured-agent-session-launch-prompt'
-
-const hostRow = (id: string): AgentJournalRenderItem => ({
-  itemId: `orca:${id}`,
-  revision: 1,
-  sequence: 1,
-  observedAt: 1,
-  body: { kind: 'message', role: 'user', blocks: [{ type: 'text', text: id }] }
-})
-
-const NO_JOURNAL_ITEMS: readonly AgentJournalRenderItem[] = []
-
-// Why: every hook here shares the session outbox store; one left mounted would drain the next test's.
-afterEach(cleanup)
-
-const LOCAL_TARGET = { kind: 'local' } as const
-
-function deferred<T>() {
-  let resolve!: (value: T) => void
-  let reject!: (reason: unknown) => void
-  const promise = new Promise<T>((next, fail) => {
-    resolve = next
-    reject = fail
-  })
-  return { promise, reject, resolve }
-}
-
-function acceptedResult(fence: number) {
-  return {
-    ok: true,
-    replayed: false,
-    fence,
-    cursor: { epoch: 'epoch-1', sequence: fence },
-    value: {
-      clientMessageId: 'client-1',
-      submission: {
-        clientMessageId: 'client-1',
-        fence,
-        payloadFingerprint: 'fingerprint',
-        dispatchState: 'accepted',
-        providerItemId: 'provider-1',
-        reason: null,
-        submittedAt: fence,
-        resolvedAt: fence
-      }
-    }
-  }
-}
-
-function acceptedResultFor(clientMessageId: string, fence: number) {
-  return {
-    ok: true,
-    replayed: false,
-    fence,
-    cursor: { epoch: 'epoch-1', sequence: fence },
-    value: {
-      clientMessageId,
-      submission: {
-        clientMessageId,
-        fence,
-        payloadFingerprint: 'fingerprint',
-        dispatchState: 'accepted',
-        providerItemId: `provider-${clientMessageId}`,
-        reason: null,
-        submittedAt: fence,
-        resolvedAt: fence
-      }
-    }
-  }
-}
-
-function unknownResultFor(clientMessageId: string, submittedAt: number) {
-  return {
-    ok: true,
-    replayed: false,
-    fence: 1,
-    cursor: { epoch: 'epoch-1', sequence: submittedAt },
-    value: {
-      clientMessageId,
-      submission: {
-        clientMessageId,
-        fence: 1,
-        payloadFingerprint: 'fingerprint',
-        dispatchState: 'unknown' as const,
-        providerItemId: null,
-        reason: 'socket closed',
-        submittedAt,
-        resolvedAt: submittedAt
-      }
-    }
-  }
-}
-
-function pendingResultFor(clientMessageId: string, submittedAt: number) {
-  return {
-    ok: true,
-    replayed: false,
-    fence: 1,
-    cursor: { epoch: 'epoch-1', sequence: submittedAt },
-    value: {
-      clientMessageId,
-      submission: {
-        clientMessageId,
-        fence: 1,
-        payloadFingerprint: 'fingerprint',
-        dispatchState: 'pending' as const,
-        providerItemId: null,
-        reason: null,
-        submittedAt,
-        resolvedAt: null
-      }
-    }
-  }
-}
-
-function refusedResult(code: AgentSessionWireRefusalCode) {
-  return { ok: false, refusal: { code, message: code } }
-}
-
-describe('useStructuredAgentSessionOutbox', () => {
-  let randomUuidSequence = 0
-
-  beforeEach(() => {
-    vi.clearAllMocks()
-    localStorage.clear()
-    randomUuidSequence = 0
-    vi.spyOn(globalThis.crypto, 'randomUUID').mockImplementation(() => {
-      randomUuidSequence += 1
-      return `11111111-1111-4111-8111-${randomUuidSequence.toString(16).padStart(12, '0')}`
-    })
-  })
-
-  it('does not redispatch a launch prompt settled before the mounted outbox gets its fence', async () => {
-    const stagedEntry = enqueueStructuredAgentSessionLaunchPrompt('session-1', 'review this')
-    if (!stagedEntry) {
-      throw new Error('fixture outbox entry was not persisted')
-    }
-    mocks.call.mockResolvedValue(acceptedResultFor(stagedEntry.clientMessageId, 1))
-    const initialProps: { fence: number | null } = { fence: null }
-    const { result, rerender } = renderHook(
-      ({ fence }) =>
-        useStructuredAgentSessionOutbox({
-          journalItems: NO_JOURNAL_ITEMS,
-          sessionId: 'session-1',
-          target: LOCAL_TARGET,
-          fence,
-          submissions: []
-        }),
-      { initialProps }
-    )
-    expect(result.current.outbox).toHaveLength(1)
-
-    await expect(
-      settleStructuredAgentLaunchPrompt({
-        launchResult: Promise.resolve({ sessionId: 'session-1', fence: 1 }),
-        target: { kind: 'local' },
-        options: { prompt: 'review this' },
-        stagedEntry
-      })
-    ).resolves.toEqual({ delivered: true, failureNotified: false })
-    expect(mocks.call).toHaveBeenCalledOnce()
-
-    rerender({ fence: 1 })
-    await waitFor(() => expect(result.current.outbox).toHaveLength(0))
-    expect(mocks.call).toHaveBeenCalledOnce()
-  })
-
-  it('joins a launch prompt dispatch already in flight when the outbox mounts', async () => {
-    const stagedEntry = enqueueStructuredAgentSessionLaunchPrompt('session-1', 'review this')
-    if (!stagedEntry) {
-      throw new Error('fixture outbox entry was not persisted')
-    }
-    const admission = deferred<ReturnType<typeof acceptedResultFor>>()
-    mocks.call.mockReturnValueOnce(admission.promise)
-    const delivery = settleStructuredAgentLaunchPrompt({
-      launchResult: Promise.resolve({ sessionId: 'session-1', fence: 1 }),
-      target: { kind: 'local' },
-      options: { prompt: 'review this' },
-      stagedEntry
-    })
-    await waitFor(() => expect(mocks.call).toHaveBeenCalledOnce())
-
-    const { result } = renderHook(() =>
-      useStructuredAgentSessionOutbox({
-        journalItems: NO_JOURNAL_ITEMS,
-        sessionId: 'session-1',
-        target: LOCAL_TARGET,
-        fence: 1,
-        submissions: []
-      })
-    )
-    expect(result.current.outbox[0]?.state).toBe('dispatching')
-
-    await act(async () => admission.resolve(acceptedResultFor(stagedEntry.clientMessageId, 1)))
-    await expect(delivery).resolves.toEqual({ delivered: true, failureNotified: false })
-    await waitFor(() => expect(result.current.outbox).toHaveLength(0))
-    expect(mocks.call).toHaveBeenCalledOnce()
-  })
-
-  it('requeues across a fence change and ignores the stale settlement', async () => {
-    const first = deferred<ReturnType<typeof acceptedResult>>()
-    const second = deferred<ReturnType<typeof acceptedResult>>()
-    mocks.call.mockReturnValueOnce(first.promise).mockReturnValueOnce(second.promise)
-    const { result, rerender } = renderHook(
-      ({ fence }) =>
-        useStructuredAgentSessionOutbox({
-          journalItems: NO_JOURNAL_ITEMS,
-          sessionId: 'session-1',
-          target: LOCAL_TARGET,
-          fence,
-          submissions: []
-        }),
-      { initialProps: { fence: 1 } }
-    )
-
-    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(mocks.call.mock.calls[1]?.[2]).toMatchObject({
-      envelope: { expectedRuntimeFence: 2 }
-    })
-
-    await act(async () => first.resolve(acceptedResult(1)))
-    expect(result.current.outbox).toHaveLength(1)
-
-    await act(async () => second.resolve(acceptedResult(2)))
-    await waitFor(() => expect(result.current.outbox).toHaveLength(0))
-  })
-
-  it.each(['agent_session_operation_conflict', 'agent_session_operation_expired'] as const)(
-    'rotates a send operation after %s',
-    async (code) => {
-      // oxlint-disable-next-line no-restricted-properties -- stubbing the global the generator reads, to pin ids in this test
-      vi.mocked(globalThis.crypto.randomUUID)
-        .mockReturnValueOnce('11111111-1111-4111-8111-111111111111')
-        .mockReturnValueOnce('22222222-2222-4222-8222-222222222222')
-      mocks.call.mockResolvedValueOnce(refusedResult(code)).mockResolvedValueOnce(acceptedResult(1))
-      const { result } = renderHook(() =>
-        useStructuredAgentSessionOutbox({
-          journalItems: NO_JOURNAL_ITEMS,
-          sessionId: 'session-1',
-          target: LOCAL_TARGET,
-          fence: 1,
-          submissions: []
-        })
-      )
-
-      act(() => expect(result.current.send('hello')).toBe(true))
-      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
-      expect(retryId).not.toBe(firstId)
-
-      act(() => result.current.retry(retryId))
-      await waitFor(() => expect(mocks.call).toHaveBeenCalledTimes(2))
-      expect(
-        (mocks.call.mock.calls[1]![2] as { envelope: { clientOperationId: string } }).envelope
-          .clientOperationId
-      ).toBe(retryId)
-    }
-  )
-
-  it('leaves an admitted send dispatching, never unconfirmed', async () => {
-    mocks.call.mockImplementationOnce(async (_target, _method, params) => {
-      const clientMessageId = (params as { envelope: { clientOperationId: string } }).envelope
-        .clientOperationId
-      return pendingResultFor(clientMessageId, 10)
-    })
-    const { result, rerender } = renderHook(
-      ({ submissions }: { submissions: readonly AgentJournalSubmission[] }) =>
-        useStructuredAgentSessionOutbox({
-          journalItems: NO_JOURNAL_ITEMS,
-          sessionId: 'session-1',
-          target: LOCAL_TARGET,
-          fence: 1,
-          submissions
-        }),
-      { initialProps: { submissions: [] as readonly AgentJournalSubmission[] } }
-    )
-
-    act(() => expect(result.current.send('queued behind a running turn')).toBe(true))
-    await waitFor(() => expect(mocks.call).toHaveBeenCalledTimes(1))
-    const id = result.current.outbox[0]!.clientMessageId
-    // Written and awaiting the provider's acknowledgement: no doubt, no banner.
-    await waitFor(() => expect(result.current.outbox[0]?.state).toBe('dispatching'))
-    expect(result.current.error).toBeNull()
-
-    // A long-lived `pending` submission republished keeps it out of doubt.
-    rerender({
-      submissions: [pendingResultFor(id, 10).value.submission]
-    })
-    expect(result.current.outbox[0]?.state).toBe('dispatching')
-    expect(mocks.call).toHaveBeenCalledTimes(1)
-
-    // The provider's echo lands and settles it; the entry leaves the outbox.
-    rerender({
-      submissions: [
-        { ...pendingResultFor(id, 10).value.submission, dispatchState: 'accepted' as const }
-      ]
-    })
-    await waitFor(() => expect(result.current.outbox).toHaveLength(0))
-    expect(result.current.error).toBeNull()
-  })
-
-  it('lets no transport error reopen a send the journal already settled', async () => {
-    // The RPC fails while the host has already accepted: the journal is the
-    // authority, so the entry leaves the outbox and no Retry is offered for it.
-    mocks.call.mockRejectedValue(new Error('socket closed'))
-    const { result, rerender } = renderHook(
-      ({ submissions }: { submissions: readonly AgentJournalSubmission[] }) =>
-        useStructuredAgentSessionOutbox({
-          journalItems: NO_JOURNAL_ITEMS,
-          sessionId: 'session-1',
-          target: LOCAL_TARGET,
-          fence: 1,
-          submissions
-        }),
-      { initialProps: { submissions: [] as readonly AgentJournalSubmission[] } }
-    )
-
-    act(() => expect(result.current.send('settled for good')).toBe(true))
-    await waitFor(() => expect(mocks.call).toHaveBeenCalledTimes(1))
-    const id = result.current.outbox[0]!.clientMessageId
-    await waitFor(() => expect(result.current.outbox[0]?.state).toBe('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: [
-        { ...pendingResultFor(id, 10).value.submission, dispatchState: 'accepted' as const }
-      ]
-    })
-    await waitFor(() => expect(result.current.outbox).toHaveLength(0))
-    expect(result.current.error).toBeNull()
-  })
-
-  it('ignores a transport failure after the journal already settled the send', async () => {
-    const inFlight = deferred<ReturnType<typeof acceptedResult>>()
-    mocks.call.mockReturnValueOnce(inFlight.promise)
-    const { result, rerender } = renderHook(
-      ({ submissions }: { submissions: readonly AgentJournalSubmission[] }) =>
-        useStructuredAgentSessionOutbox({
-          journalItems: NO_JOURNAL_ITEMS,
-          sessionId: 'session-1',
-          target: LOCAL_TARGET,
-          fence: 1,
-          submissions
-        }),
-      { initialProps: { submissions: [] as readonly AgentJournalSubmission[] } }
-    )
-
-    act(() => expect(result.current.send('settled before the RPC')).toBe(true))
-    await waitFor(() => expect(mocks.call).toHaveBeenCalledOnce())
-    const id = result.current.outbox[0]!.clientMessageId
-    rerender({
-      submissions: [
-        { ...pendingResultFor(id, 10).value.submission, dispatchState: 'accepted' as const }
-      ]
-    })
-    await waitFor(() => expect(result.current.outbox).toHaveLength(0))
-
-    await act(async () => inFlight.reject(new Error('socket closed')))
-    expect(result.current.outbox).toHaveLength(0)
-    expect(result.current.error).toBeNull()
-  })
-
-  it('ignores a transport failure after the host admitted the send', async () => {
-    const inFlight = deferred<ReturnType<typeof acceptedResult>>()
-    mocks.call.mockReturnValueOnce(inFlight.promise)
-    const { result, rerender } = renderHook(
-      ({ submissions }: { submissions: readonly AgentJournalSubmission[] }) =>
-        useStructuredAgentSessionOutbox({
-          journalItems: NO_JOURNAL_ITEMS,
-          sessionId: 'session-1',
-          target: LOCAL_TARGET,
-          fence: 1,
-          submissions
-        }),
-      { initialProps: { submissions: [] as readonly AgentJournalSubmission[] } }
-    )
-
-    act(() => expect(result.current.send('admitted before the RPC')).toBe(true))
-    await waitFor(() => expect(mocks.call).toHaveBeenCalledOnce())
-    const id = result.current.outbox[0]!.clientMessageId
-    rerender({ submissions: [pendingResultFor(id, 10).value.submission] })
-    expect(result.current.outbox[0]?.state).toBe('dispatching')
-
-    await act(async () => inFlight.reject(new Error('socket closed')))
-    expect(result.current.outbox[0]?.state).toBe('dispatching')
-    expect(result.current.error).toBeNull()
-  })
-
-  it('keeps a failed tail-save error when the admitted head is republished', async () => {
-    const inFlight = deferred<ReturnType<typeof acceptedResult>>()
-    mocks.call.mockReturnValueOnce(inFlight.promise)
-    const { result, rerender } = renderHook(
-      ({ submissions }: { submissions: readonly AgentJournalSubmission[] }) =>
-        useStructuredAgentSessionOutbox({
-          journalItems: NO_JOURNAL_ITEMS,
-          sessionId: 'session-1',
-          target: LOCAL_TARGET,
-          fence: 1,
-          submissions
-        }),
-      { initialProps: { submissions: [] as readonly AgentJournalSubmission[] } }
-    )
-
-    act(() => expect(result.current.send('admitted head')).toBe(true))
-    await waitFor(() => expect(mocks.call).toHaveBeenCalledOnce())
-    const id = result.current.outbox[0]!.clientMessageId
-    rerender({ submissions: [pendingResultFor(id, 10).value.submission] })
-    const setItem = vi.spyOn(localStorage, 'setItem').mockImplementationOnce(() => {
-      throw new Error('storage full')
-    })
-    act(() => expect(result.current.send('tail that cannot be saved')).toBe(false))
-    expect(result.current.error).toBe("Couldn't save your message. Try again.")
-
-    rerender({ submissions: [{ ...pendingResultFor(id, 10).value.submission }] })
-    expect(result.current.error).toBe("Couldn't save your message. Try again.")
-    setItem.mockRestore()
-  })
-
-  it('restores a persisted admitted send from host pending state', async () => {
-    mocks.call.mockImplementationOnce(async (_target, _method, params) => {
-      const clientMessageId = (params as { envelope: { clientOperationId: string } }).envelope
-        .clientOperationId
-      return pendingResultFor(clientMessageId, 10)
-    })
-    const first = renderHook(() =>
-      useStructuredAgentSessionOutbox({
-        journalItems: NO_JOURNAL_ITEMS,
-        sessionId: 'session-1',
-        target: LOCAL_TARGET,
-        fence: 1,
-        submissions: []
-      })
-    )
-
-    act(() => expect(first.result.current.send('still waiting behind a turn')).toBe(true))
-    await waitFor(() => expect(first.result.current.outbox[0]?.state).toBe('dispatching'))
-    const id = first.result.current.outbox[0]!.clientMessageId
-    first.unmount()
-
-    const restored = renderHook(() =>
-      useStructuredAgentSessionOutbox({
-        journalItems: NO_JOURNAL_ITEMS,
-        sessionId: 'session-1',
-        target: LOCAL_TARGET,
-        fence: 1,
-        submissions: [pendingResultFor(id, 10).value.submission]
-      })
-    )
-    await waitFor(() => expect(restored.result.current.outbox[0]?.state).toBe('dispatching'))
-    expect(restored.result.current.error).toBeNull()
-    expect(mocks.call).toHaveBeenCalledOnce()
-  })
-
-  it('drains a head the host refuses to redeliver so the queue behind it advances', async () => {
-    // The guard refuses a retry it cannot prove is a first delivery. That must
-    // not leave a Retry that does nothing in front of a wedged queue: the entry
-    // leaves the outbox, the user is told to check the chat before sending it again, and the
-    // message queued behind it goes out.
-    // The second send never settles, so the refusal's error is still on screen
-    // when the queue behind it advances.
-    mocks.call.mockImplementation(async (_target, _method, params) => {
-      const request = params as {
-        envelope: { clientOperationId: string }
-        body: { blocks: { text?: string }[] }
-      }
-      if (request.body.blocks[0]?.text === 'second') {
-        return new Promise(() => {})
-      }
-      return unknownResultFor(request.envelope.clientOperationId, 10)
-    })
-    const { result, rerender } = renderHook(
-      ({ submissions }: { submissions: readonly AgentJournalSubmission[] }) =>
-        useStructuredAgentSessionOutbox({
-          journalItems: NO_JOURNAL_ITEMS,
-          sessionId: 'session-1',
-          target: LOCAL_TARGET,
-          fence: 1,
-          submissions
-        }),
-      { initialProps: { submissions: [] as readonly AgentJournalSubmission[] } }
-    )
-
-    act(() => expect(result.current.send('first')).toBe(true))
-    await waitFor(() => expect(result.current.outbox[0]?.state).toBe('unconfirmed'))
-    const firstId = result.current.outbox[0]!.clientMessageId
-    rerender({ submissions: [unknownResultFor(firstId, 10).value.submission] })
-
-    act(() => expect(result.current.send('second')).toBe(true))
-    expect(result.current.outbox).toHaveLength(2)
-
-    act(() => result.current.retry(firstId))
-    await waitFor(() =>
-      expect(result.current.outbox.some((entry) => entry.clientMessageId === firstId)).toBe(false)
-    )
-    await act(async () => {
-      await new Promise((resolve) => setTimeout(resolve, 200))
-    })
-
-    const sent = mocks.call.mock.calls.map(
-      (call) => (call[2] as { body?: { blocks?: { text?: string }[] } })?.body?.blocks?.[0]?.text
-    )
-    expect(sent).toContain('second')
-    expect(result.current.error).toBe(
-      "Orca couldn't confirm your message reached the agent. Check the chat, then send it again if needed."
-    )
-  })
-
-  it('retains a send operation after a pending-admission refusal', async () => {
-    mocks.call
-      .mockResolvedValueOnce(refusedResult('agent_session_checkpoint_stale'))
-      .mockResolvedValueOnce(acceptedResult(1))
-    const { result } = renderHook(() =>
-      useStructuredAgentSessionOutbox({
-        journalItems: NO_JOURNAL_ITEMS,
-        sessionId: 'session-1',
-        target: LOCAL_TARGET,
-        fence: 1,
-        submissions: []
-      })
-    )
-
-    act(() => expect(result.current.send('hello')).toBe(true))
-    await waitFor(() => expect(result.current.outbox[0]?.state).toBe('queued'))
-    const firstId = (mocks.call.mock.calls[0]![2] as { envelope: { clientOperationId: string } })
-      .envelope.clientOperationId
-    expect(result.current.outbox[0]?.clientMessageId).toBe(firstId)
-
-    act(() => result.current.retry(firstId))
-    await waitFor(() => expect(mocks.call).toHaveBeenCalledTimes(2))
-    expect(
-      (mocks.call.mock.calls[1]![2] as { envelope: { clientOperationId: string } }).envelope
-        .clientOperationId
-    ).toBe(firstId)
-  })
-
-  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,
-      refusal: { code: 'agent_session_owner_restart_failed', message }
-    })
-    const { result } = renderHook(() =>
-      useStructuredAgentSessionOutbox({
-        journalItems: NO_JOURNAL_ITEMS,
-        sessionId: 'session-1',
-        target: LOCAL_TARGET,
-        fence: 1,
-        submissions: []
-      })
-    )
-
-    act(() => expect(result.current.send('hello')).toBe(true))
-    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)
-    // 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')
-    // 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
-    expect(retryId).not.toBe(sentId)
-
-    // A manual Retry sends again, which is what asks the host for another restart.
-    act(() => result.current.retry(retryId))
-    await waitFor(() => expect(mocks.call).toHaveBeenCalledTimes(2))
-    const retriedId: unknown = mocks.call.mock.calls[1]![2].envelope.clientOperationId
-    expect(retriedId).toBe(retryId)
-  })
-
-  it('persists and dispatches an attachment-only structured send', async () => {
-    mocks.call.mockResolvedValue(acceptedResult(1))
-    const { result } = renderHook(() =>
-      useStructuredAgentSessionOutbox({
-        journalItems: NO_JOURNAL_ITEMS,
-        sessionId: 'session-1',
-        target: LOCAL_TARGET,
-        fence: 1,
-        submissions: []
-      })
-    )
-
-    act(() =>
-      expect(
-        result.current.send('', [{ path: '/tmp/image.png', previewUri: 'file:///tmp/image.png' }])
-      ).toBe(true)
-    )
-    await waitFor(() => expect(mocks.call).toHaveBeenCalledOnce())
-
-    expect(mocks.call.mock.calls[0]?.[2]).toMatchObject({
-      body: {
-        kind: 'message',
-        role: 'user',
-        blocks: [{ type: 'image-ref', path: '/tmp/image.png' }]
-      }
-    })
-  })
-
-  it('retries an unknown head and advances a queued tail', async () => {
-    // oxlint-disable-next-line no-restricted-properties -- stubbing the global the generator reads, to pin ids in this test
-    vi.mocked(globalThis.crypto.randomUUID)
-      .mockReturnValueOnce('aaaaaaaa-aaaa-4aaa-8aaa-aaaaaaaaaaaa')
-      .mockReturnValueOnce('bbbbbbbb-bbbb-4bbb-8bbb-bbbbbbbbbbbb')
-    mocks.call
-      .mockImplementationOnce(async (_target, _method, params) => {
-        const clientMessageId = (params as { envelope: { clientOperationId: string } }).envelope
-          .clientOperationId
-        return unknownResultFor(clientMessageId, 10)
-      })
-      .mockImplementationOnce(async (_target, _method, params) => {
-        const clientMessageId = (params as { envelope: { clientOperationId: string } }).envelope
-          .clientOperationId
-        return acceptedResultFor(clientMessageId, 11)
-      })
-      .mockImplementationOnce(async (_target, _method, params) => {
-        const clientMessageId = (params as { envelope: { clientOperationId: string } }).envelope
-          .clientOperationId
-        return acceptedResultFor(clientMessageId, 12)
-      })
-    const { result, rerender } = renderHook(
-      ({ submissions }: { submissions: readonly AgentJournalSubmission[] }) =>
-        useStructuredAgentSessionOutbox({
-          journalItems: NO_JOURNAL_ITEMS,
-          sessionId: 'session-1',
-          target: LOCAL_TARGET,
-          fence: 1,
-          submissions
-        }),
-      { initialProps: { submissions: [] as readonly AgentJournalSubmission[] } }
-    )
-
-    act(() => {
-      expect(result.current.send('first')).toBe(true)
-    })
-    await waitFor(() => expect(result.current.outbox[0]?.state).toBe('unconfirmed'))
-    const firstId = result.current.outbox[0]!.clientMessageId
-    rerender({
-      submissions: [
-        {
-          clientMessageId: firstId,
-          fence: 1,
-          payloadFingerprint: 'fingerprint',
-          dispatchState: 'unknown',
-          providerItemId: null,
-          reason: 'socket closed',
-          submittedAt: 10,
-          resolvedAt: 10
-        }
-      ]
-    })
-    act(() => {
-      expect(result.current.send('second')).toBe(true)
-    })
-    expect(result.current.outbox).toHaveLength(2)
-
-    act(() => result.current.retry(firstId))
-    await waitFor(() => expect(mocks.call).toHaveBeenCalledTimes(3))
-    await waitFor(() => expect(result.current.outbox).toHaveLength(0))
-    const retryParams = mocks.call.mock.calls[1]?.[2] as { retryUnknown?: true } | undefined
-    expect(retryParams?.retryUnknown).toBeUndefined()
-  })
-
-  it('lets a history-rejected unknown head go to the journal so the queued tail advances', async () => {
-    mocks.call
-      .mockImplementationOnce(async (_target, _method, params) => {
-        const clientMessageId = (params as { envelope: { clientOperationId: string } }).envelope
-          .clientOperationId
-        return unknownResultFor(clientMessageId, 10)
-      })
-      .mockImplementationOnce(async (_target, _method, params) => {
-        const clientMessageId = (params as { envelope: { clientOperationId: string } }).envelope
-          .clientOperationId
-        return acceptedResultFor(clientMessageId, 11)
-      })
-    let rows = NO_JOURNAL_ITEMS
-    const { result, rerender } = renderHook(
-      ({ submissions }: { submissions: readonly AgentJournalSubmission[] }) =>
-        useStructuredAgentSessionOutbox({
-          journalItems: rows,
-          sessionId: 'session-1',
-          target: LOCAL_TARGET,
-          fence: 1,
-          submissions
-        }),
-      { initialProps: { submissions: [] as readonly AgentJournalSubmission[] } }
-    )
-
-    act(() => expect(result.current.send('first')).toBe(true))
-    await waitFor(() => expect(result.current.outbox[0]?.state).toBe('unconfirmed'))
-    const firstId = result.current.outbox[0]!.clientMessageId
-    act(() => expect(result.current.send('second')).toBe(true))
-    rows = [hostRow(firstId)]
-    rerender({
-      submissions: [
-        {
-          clientMessageId: firstId,
-          fence: 1,
-          payloadFingerprint: 'fingerprint',
-          dispatchState: 'rejected',
-          providerItemId: null,
-          reason: 'not_delivered',
-          submittedAt: 10,
-          resolvedAt: 10
-        }
-      ]
-    })
-
-    // The host's row shows the first as not sent; nothing resends it.
-    await waitFor(() => expect(mocks.call).toHaveBeenCalledTimes(2))
-    await waitFor(() => expect(result.current.outbox).toHaveLength(0))
-    expect(mocks.call.mock.calls[1]?.[2]).toMatchObject({ body: { blocks: [{ text: 'second' }] } })
-    expect(mocks.call.mock.calls[1]?.[2]).not.toMatchObject({
-      envelope: { clientOperationId: firstId }
-    })
-  })
-
-  it('loads the new session outbox when a pane switches sessions', async () => {
-    mocks.call.mockImplementationOnce(async (_target, _method, params) => {
-      const clientMessageId = (params as { envelope: { clientOperationId: string } }).envelope
-        .clientOperationId
-      return unknownResultFor(clientMessageId, 10)
-    })
-
-    const { result, rerender } = renderHook(
-      ({ sessionId }: { sessionId: string }) =>
-        useStructuredAgentSessionOutbox({
-          journalItems: NO_JOURNAL_ITEMS,
-          sessionId,
-          target: LOCAL_TARGET,
-          fence: 1,
-          submissions: []
-        }),
-      { initialProps: { sessionId: 'session-1' } }
-    )
-
-    act(() => expect(result.current.send('first session')).toBe(true))
-    await waitFor(() => expect(result.current.outbox[0]?.state).toBe('unconfirmed'))
-
-    rerender({ sessionId: 'session-2' })
-    expect(result.current.outbox).toHaveLength(0)
-
-    act(() => expect(result.current.send('second session')).toBe(true))
-    await waitFor(() => expect(mocks.call).toHaveBeenCalledTimes(2))
-    expect(mocks.call.mock.calls[1]?.[2]).toMatchObject({
-      envelope: { sessionId: 'session-2' },
-      body: {
-        blocks: [{ type: 'text', text: 'second session' }]
-      }
-    })
-  })
-
-  it('drops a session error on switch and does not resurrect it on return', async () => {
-    const redispatch = deferred<ReturnType<typeof acceptedResult>>()
-    mocks.call
-      .mockResolvedValueOnce(refusedResult('agent_session_checkpoint_stale'))
-      .mockReturnValueOnce(redispatch.promise)
-    const { result, rerender } = renderHook(
-      ({ sessionId }: { sessionId: string }) =>
-        useStructuredAgentSessionOutbox({
-          journalItems: NO_JOURNAL_ITEMS,
-          sessionId,
-          target: LOCAL_TARGET,
-          fence: 1,
-          submissions: []
-        }),
-      { initialProps: { sessionId: 'session-1' } }
-    )
-
-    act(() => expect(result.current.send('hello')).toBe(true))
-    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()
-
-    rerender({ sessionId: 'session-1' })
-    expect(result.current.error).toBeNull()
-  })
-
-  it('invalidates an old dispatch before it settles during a session switch', async () => {
-    const oldDispatch = deferred<ReturnType<typeof refusedResult>>()
-    const sessionTwoCommitted = deferred<void>()
-    mocks.call.mockReturnValueOnce(oldDispatch.promise)
-    const controllerRef: {
-      current: ReturnType<typeof useStructuredAgentSessionOutbox> | null
-    } = { current: null }
-    function Probe({ sessionId }: { sessionId: string }): null {
-      controllerRef.current = useStructuredAgentSessionOutbox({
-        journalItems: NO_JOURNAL_ITEMS,
-        sessionId,
-        target: LOCAL_TARGET,
-        fence: 1,
-        submissions: []
-      })
-      useLayoutEffect(() => {
-        if (sessionId === 'session-2') {
-          oldDispatch.resolve(refusedResult('agent_session_checkpoint_stale'))
-          sessionTwoCommitted.resolve()
-        }
-      }, [sessionId])
-      return null
-    }
-
-    const container = document.createElement('div')
-    const root = createRoot(container)
-    const actEnvironment = globalThis.IS_REACT_ACT_ENVIRONMENT
-    try {
-      await act(async () => root.render(<Probe sessionId="session-1" />))
-      act(() => expect(controllerRef.current?.send('hello')).toBe(true))
-      await waitFor(() => expect(mocks.call).toHaveBeenCalledTimes(1))
-      const oldSettlementProcessed = oldDispatch.promise.then(() => undefined)
-
-      globalThis.IS_REACT_ACT_ENVIRONMENT = false
-      root.render(<Probe sessionId="session-2" />)
-      await sessionTwoCommitted.promise
-      globalThis.IS_REACT_ACT_ENVIRONMENT = actEnvironment
-      await act(async () => oldSettlementProcessed)
-
-      expect(controllerRef.current?.error).toBeNull()
-      await act(async () => root.render(<Probe sessionId="session-1" />))
-      expect(controllerRef.current?.error).toBeNull()
-    } finally {
-      globalThis.IS_REACT_ACT_ENVIRONMENT = actEnvironment
-      await act(async () => root.unmount())
-    }
-  })
-})
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
deleted file mode 100644
index 2f118fb534a9..000000000000
--- a/src/renderer/src/components/native-chat/use-structured-agent-session-outbox.ts
+++ /dev/null
@@ -1,339 +0,0 @@
-import {
-  useCallback,
-  useEffect,
-  useLayoutEffect,
-  useRef,
-  useState,
-  useSyncExternalStore
-} from 'react'
-import type {
-  AgentJournalRenderItem,
-  AgentJournalSubmission
-} from '../../../../shared/agent-session-journal-types'
-import { createStructuredAgentSessionOperationId } from '../../../../shared/structured-agent-session-mutation'
-import {
-  admitStructuredAgentSessionOutboxEntry,
-  structuredAgentSessionEntryHeldForRetry
-} from '../../../../shared/structured-agent-session-outbox-admission'
-import {
-  journalAnswersInFlightSend,
-  STRUCTURED_AGENT_SESSION_OUTBOX_NOT_SAVED,
-  type StructuredAgentSessionSendDisposition
-} from '../../../../shared/structured-agent-session-send-disposition'
-import type { RuntimeClientTarget } from '@/runtime/runtime-rpc-client'
-import {
-  appendStructuredAgentSessionOutboxMessage,
-  commitStructuredAgentSessionOutbox,
-  getStructuredAgentSessionOutbox,
-  loadStructuredAgentSessionOutbox,
-  readOutbox,
-  subscribeToStructuredAgentSessionOutbox
-} from './structured-agent-session-outbox-storage'
-import {
-  dispatchStructuredAgentSessionOutboxEntry,
-  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'
-import { useStructuredAgentSessionOutboxOwnership } from './use-structured-agent-session-outbox-ownership'
-import {
-  handedOffQueuedMessageIds,
-  reconcileStructuredAgentSessionOutboxWithQueue
-} from '../../../../shared/structured-agent-session-draft-hand-off'
-import {
-  structuredAgentSessionEntryAttempt,
-  type StructuredAgentSessionQueueDelivery
-} from '../../../../shared/structured-agent-session-outbox-delivery'
-import { retryStructuredAgentSessionOutboxEntry } from './structured-agent-session-outbox-retry'
-import { useStructuredAgentSessionOutboxFailedHere } from './use-structured-agent-session-outbox-failed-here'
-import { agentSessionWriteNoticeText } from './agent-session-write-notice-text'
-import { outboxOutsideQueuedCards } from './structured-agent-session-queued-cards'
-
-const NO_QUEUE_DELIVERY: StructuredAgentSessionQueueDelivery = {
-  capability: 'unsupported',
-  enabled: false
-}
-
-export function structuredSessionOperationId(): string {
-  return createStructuredAgentSessionOperationId(createBrowserUuid)
-}
-
-export function useStructuredAgentSessionOutbox(args: {
-  sessionId: string
-  target: RuntimeClientTarget
-  fence: number | null
-  submissions: readonly AgentJournalSubmission[]
-  /** The loaded journal rows: a rejected message stays here until the row that draws it loads. */
-  journalItems: readonly AgentJournalRenderItem[]
-  /** The composer that gets back, when empty, what a Stop took from this client's outbox. */
-  composerScopeKey?: string
-  /** The host's queued-messages capability and the user's setting; a send stamped
-   *  `delivery: 'queue-if-active'` is held as a draft only while the agent is working. */
-  queueDelivery?: StructuredAgentSessionQueueDelivery
-  /** Ids of the host's published drafts. A queued send whose acknowledgement was lost keeps
-   *  its entry here under the draft's own id; once the host visibly holds the draft, the
-   *  entry retires so the same text can never come back twice. */
-  queuedMessageIds?: readonly string[]
-  /** With the queue delivery, whether a new send waits as a queued card. */
-  isWorking?: boolean
-  /** The chat reads Stopping: a send made now is marked as made while stopping. */
-  stopping?: boolean
-}) {
-  const {
-    composerScopeKey,
-    fence,
-    isWorking = false,
-    journalItems,
-    queueDelivery = NO_QUEUE_DELIVERY,
-    queuedMessageIds,
-    sessionId,
-    stopping: sentWhileStopping = false,
-    submissions,
-    target
-  } = args
-  const { capability: queueCapability, enabled: queueEnabled } = queueDelivery
-  // What resends and drops a send in flight besides a Retry or a new send; see the hook.
-  const owner = useStructuredAgentSessionOutboxOwnerChange(target, fence)
-  const restoreWithdrawn = useStructuredAgentSessionWithdrawnRestore(composerScopeKey)
-  // The outbox lives in the session's store, shared with every other writer; this view holds it
-  // open and drains it. Loading maps what a previous owner left mid-send.
-  const load = useCallback(
-    () => readMountedStructuredAgentSessionOutbox(sessionId, fence, readOutbox),
-    // Why: only the load at open reads the fence; later fences must not re-create the hold.
-    // eslint-disable-next-line react-hooks/exhaustive-deps
-    [sessionId]
-  )
-  const subscribe = useCallback(
-    (listener: () => void) => subscribeToStructuredAgentSessionOutbox(sessionId, load, listener),
-    [load, sessionId]
-  )
-  const outbox = useSyncExternalStore(subscribe, () =>
-    loadStructuredAgentSessionOutbox(sessionId, load)
-  )
-  const outboxSessionRef = useRef(sessionId)
-  // The entry whose send is in flight, or null. One ref, because "is something in flight" and
-  // "which entry" must never disagree: the journal can settle the tail while the head moves.
-  const inFlightIdRef = useRef<string | null>(null)
-  const dispatchGenerationRef = useRef(0)
-  const [error, setError] = useState<string | null>(null)
-  const { failedHere, recordFailures, forget } =
-    useStructuredAgentSessionOutboxFailedHere(sessionId)
-  const [errorSession, setErrorSession] = useState(sessionId)
-  // Render-time reset (react.dev: adjusting state when a prop changes), so the
-  // old session's banner neither flashes for a frame nor resurrects on return.
-  if (errorSession !== sessionId) {
-    setErrorSession(sessionId)
-    setError(null)
-  }
-
-  useLayoutEffect(() => {
-    dispatchGenerationRef.current += 1
-    inFlightIdRef.current = null
-  }, [owner.ownerChange, owner.targetKey, sessionId])
-
-  useEffect(() => {
-    const sessionChanged = outboxSessionRef.current !== sessionId
-    outboxSessionRef.current = sessionId
-    const current = getStructuredAgentSessionOutbox(sessionId)
-    const next = requeueInterruptedStructuredAgentSessionDispatches(current, owner.fenceRef.current)
-    if (
-      sessionChanged ||
-      next.some((entry, index) => entry !== current[index]) ||
-      next.length !== current.length
-    ) {
-      commitStructuredAgentSessionOutbox(sessionId, next)
-    }
-  }, [owner.fenceRef, owner.ownerChange, sessionId, target])
-
-  useEffect(() => {
-    const current = getStructuredAgentSessionOutbox(sessionId)
-    const hostOwns = new Set([
-      ...submissions
-        .filter(
-          (submission) =>
-            submission.dispatchState === 'pending' || submission.dispatchState === 'accepted'
-        )
-        .map((submission) => submission.clientMessageId),
-      ...handedOffQueuedMessageIds(submissions)
-    ])
-    const next = reconcileStructuredAgentSessionOutboxWithQueue(current, submissions, journalItems)
-    const admittedInFlight = journalAnswersInFlightSend(submissions, inFlightIdRef.current)
-    // The reconcile returns `current` itself when no entry changed, so a batch that changes
-    // nothing writes nothing.
-    if (admittedInFlight || next !== current) {
-      commitStructuredAgentSessionOutbox(sessionId, [...next])
-    }
-    // Keyed on the entry actually in flight, which is no longer always the head: the journal
-    // owning it outranks a send promise that has not settled, so release single-flight and make
-    // that promise a no-op. Keying on the head would discard the tail's unsettled send instead,
-    // and with it a refusal only that send can report.
-    if (admittedInFlight) {
-      dispatchGenerationRef.current += 1
-      inFlightIdRef.current = null
-    }
-    if (
-      current.some(
-        (entry) =>
-          (entry.state === 'unconfirmed' || structuredAgentSessionEntryHeldForRetry(entry)) &&
-          hostOwns.has(entry.clientMessageId)
-      )
-    ) {
-      setError(null)
-    }
-  }, [journalItems, sessionId, submissions])
-
-  // The one place that owns the refs, the React state and the storage write.
-  const applyDisposition = useCallback(
-    (disposition: StructuredAgentSessionSendDisposition): void => {
-      // Released here rather than in a `.finally`: the state write below is what re-runs the
-      // drain, so a later microtask would leave the queue with no trigger to move on.
-      inFlightIdRef.current = null
-      setError(disposition.error ? agentSessionWriteNoticeText(disposition.error) : null)
-      recordFailures(getStructuredAgentSessionOutbox(sessionId), disposition.entries)
-      commitStructuredAgentSessionOutbox(sessionId, disposition.entries)
-    },
-    [recordFailures, sessionId]
-  )
-
-  const [drains, setDrains] = useState(0)
-  const drainAgain = useCallback(() => setDrains((count) => count + 1), [])
-
-  useEffect(() => {
-    // The shared outbox, not this render's copy: an effect earlier in this commit (an owner
-    // change's requeue, a reconcile) or a launch settlement may have written a newer one.
-    const current = getStructuredAgentSessionOutbox(sessionId)
-    const head = current[0]
-    if (!head || head.sessionId !== sessionId) {
-      return
-    }
-    // A launch settlement dispatches outside this hook's single-flight, so while its send is up
-    // nothing else may go out beside it and race it for the host's arrival order. Its writes land
-    // in the shared outbox, but it releases its marker after the last one, so drain again then.
-    const launching = current.find((entry) => entry.source === 'launch')
-    const launchDispatch = launching
-      ? getStructuredAgentLaunchPromptDispatch(
-          launching.sessionId,
-          launching.clientMessageId,
-          fence ?? undefined
-        )
-      : undefined
-    if (launchDispatch) {
-      void launchDispatch.then(drainAgain, drainAgain)
-      return
-    }
-    const admission = admitStructuredAgentSessionOutboxEntry(current)
-    if (admission.state !== 'dispatch' || fence === null || inFlightIdRef.current !== null) {
-      return
-    }
-    const next = admission.entry
-    // The request reads the capability; the entry keeps only what its first attempt sent.
-    const attempt = structuredAgentSessionEntryAttempt(next, {
-      capability: queueCapability,
-      enabled: queueEnabled
-    })
-    const dispatch = dispatchStructuredAgentSessionOutboxEntry({
-      next: attempt.wire,
-      entries: current.map((entry) => (entry === next ? attempt.stored : entry)),
-      sessionId,
-      target,
-      fence,
-      dispatchGeneration: dispatchGenerationRef.current,
-      dispatchGenerationRef,
-      inFlightIdRef,
-      setError,
-      applyDisposition,
-      createOperationId: structuredSessionOperationId
-    })
-    if (!dispatch.started) {
-      // A launch settlement already owns this entry's send.
-      void dispatch.promise.then(drainAgain, drainAgain)
-    }
-  }, [
-    applyDisposition,
-    drainAgain,
-    drains,
-    fence,
-    outbox,
-    queueCapability,
-    queueEnabled,
-    sessionId,
-    target
-  ])
-
-  useStructuredAgentSessionOutboxUnconfirmedProbe({
-    sessionId,
-    outbox,
-    submissions,
-    owner
-  })
-
-  /** Whether the message was admitted; 'queued' when it waits as a queued card, not a bubble. */
-  const send = useCallback(
-    (
-      text: string,
-      attachments: readonly { path: string; previewUri: string }[] = []
-    ): boolean | 'queued' => {
-      if (!text.trim() && attachments.length === 0) {
-        return false
-      }
-      // Whether it asks to be queued is decided when it first goes out.
-      if (
-        !appendStructuredAgentSessionOutboxMessage(
-          sessionId,
-          text,
-          attachments,
-          undefined,
-          sentWhileStopping
-        )
-      ) {
-        setError(agentSessionWriteNoticeText(STRUCTURED_AGENT_SESSION_OUTBOX_NOT_SAVED))
-        return false
-      }
-      setError(null)
-      // The same projection that draws the transcript decides it.
-      const current = getStructuredAgentSessionOutbox(sessionId)
-      const admitted = current.at(-1)
-      const shown = outboxOutsideQueuedCards(
-        current,
-        queuedMessageIds ?? [],
-        isWorking,
-        queueDelivery
-      )
-      return admitted && !shown.includes(admitted) ? 'queued' : true
-    },
-    [isWorking, queueDelivery, queuedMessageIds, sentWhileStopping, sessionId]
-  )
-
-  const { withdrawUnsent } = useStructuredAgentSessionOutboxOwnership({
-    sessionId,
-    submissions,
-    queuedMessageIds,
-    inFlightIdRef,
-    dispatchGenerationRef,
-    restoreWithdrawn
-  })
-
-  const retry = (clientMessageId: string): void => {
-    setError(null)
-    forget(clientMessageId)
-    retryStructuredAgentSessionOutboxEntry({
-      clientMessageId,
-      sessionId,
-      submissions,
-      setError,
-      createOperationId: structuredSessionOperationId
-    })
-  }
-  return {
-    outbox,
-    error,
-    failedHere,
-    send,
-    retry,
-    withdrawUnsent
-  }
-}
diff --git a/src/renderer/src/components/native-chat/use-structured-agent-session-paired-runtime.test.tsx b/src/renderer/src/components/native-chat/use-structured-agent-session-paired-runtime.test.tsx
index 561a5d8fa940..d9ea6637bbcf 100644
--- a/src/renderer/src/components/native-chat/use-structured-agent-session-paired-runtime.test.tsx
+++ b/src/renderer/src/components/native-chat/use-structured-agent-session-paired-runtime.test.tsx
@@ -16,6 +16,8 @@ const mocks = vi.hoisted(() => ({
 vi.mock('@/runtime/runtime-rpc-client', async (importOriginal) => ({
   ...(await importOriginal<Record<string, unknown>>()),
   callRuntimeRpc: mocks.call,
+  // The sender checks compatibility itself before its send goes out.
+  ensureRuntimeEnvironmentCompatible: async () => undefined,
   runtimeEnvironmentSupportsCapability: async (environmentId: string, capability: string) =>
     mocks.hostCapabilities.get(environmentId)?.includes(capability) === true
 }))
@@ -38,7 +40,6 @@ import {
 import { setLocalRuntimeCapabilitiesForTests } from '@/runtime/local-runtime-capabilities'
 import type { RuntimeClientTarget } from '@/runtime/runtime-rpc-client'
 import { resetStructuredAgentSessionReadOwnersForTests } from './structured-agent-session-read-owner'
-import { resetUndeliveredStructuredAgentSessionOutboxForTests } from './structured-agent-session-outbox-storage'
 import {
   useStructuredAgentSession,
   type StructuredPromptItem
@@ -127,7 +128,6 @@ describe('a structured chat on a paired server', () => {
   beforeEach(() => {
     vi.clearAllMocks()
     resetStructuredAgentSessionReadOwnersForTests()
-    resetUndeliveredStructuredAgentSessionOutboxForTests()
     localStorage.clear()
     olderHistoryUnloaded = false
     mocks.hostCapabilities.clear()
diff --git a/src/renderer/src/components/native-chat/use-structured-agent-session-prompt-cancel.test.tsx b/src/renderer/src/components/native-chat/use-structured-agent-session-prompt-cancel.test.tsx
index 8e1259ad0d94..e905c805a964 100644
--- a/src/renderer/src/components/native-chat/use-structured-agent-session-prompt-cancel.test.tsx
+++ b/src/renderer/src/components/native-chat/use-structured-agent-session-prompt-cancel.test.tsx
@@ -29,13 +29,15 @@ vi.mock('./use-structured-agent-session-read', () => ({
     loadOlder: vi.fn()
   })
 }))
-vi.mock('./use-structured-agent-session-outbox', () => ({
-  structuredSessionOperationId: mocks.operationId,
-  useStructuredAgentSessionOutbox: () => ({
-    outbox: [],
+vi.mock('./structured-agent-session-operation-id', () => ({
+  structuredSessionOperationId: mocks.operationId
+}))
+vi.mock('./use-structured-agent-session-sends', () => ({
+  useStructuredAgentSessionSends: () => ({
+    pending: [],
     error: null,
     send: vi.fn(),
-    retry: vi.fn()
+    stopSends: vi.fn()
   })
 }))
 
diff --git a/src/renderer/src/components/native-chat/use-structured-agent-session-prompt-state.test.tsx b/src/renderer/src/components/native-chat/use-structured-agent-session-prompt-state.test.tsx
index b5a18fbfb12a..1721f169862e 100644
--- a/src/renderer/src/components/native-chat/use-structured-agent-session-prompt-state.test.tsx
+++ b/src/renderer/src/components/native-chat/use-structured-agent-session-prompt-state.test.tsx
@@ -52,12 +52,12 @@ vi.mock('./use-structured-agent-session-read', () => ({
   })
 }))
 
-vi.mock('./use-structured-agent-session-outbox', () => ({
-  useStructuredAgentSessionOutbox: () => ({
-    outbox: [],
+vi.mock('./use-structured-agent-session-sends', () => ({
+  useStructuredAgentSessionSends: () => ({
+    pending: [],
     error: null,
     send: vi.fn(),
-    retry: vi.fn()
+    stopSends: vi.fn()
   })
 }))
 
diff --git a/src/renderer/src/components/native-chat/use-structured-agent-session-provisional.test.tsx b/src/renderer/src/components/native-chat/use-structured-agent-session-provisional.test.tsx
index fda9871c73ec..3817bec80a03 100644
--- a/src/renderer/src/components/native-chat/use-structured-agent-session-provisional.test.tsx
+++ b/src/renderer/src/components/native-chat/use-structured-agent-session-provisional.test.tsx
@@ -2,20 +2,20 @@
 
 import { act, renderHook, waitFor } from '@testing-library/react'
 import { beforeEach, describe, expect, it, vi } from 'vitest'
-import type { StructuredAgentSessionOutboxEntry } from '../../../../shared/structured-agent-session-outbox'
+import type { StructuredAgentSessionPendingSend } from './structured-agent-session-pending-sends'
 import type { StructuredAgentSessionState } from '../../../../shared/structured-agent-session-reducer'
 
 const mocks = vi.hoisted(() => {
-  const outboxEntries: StructuredAgentSessionOutboxEntry[] = []
+  const pending: StructuredAgentSessionPendingSend[] = []
   return {
     call: vi.fn<(target: unknown, method: string, params: unknown) => Promise<unknown>>(),
     hold: vi.fn((_args: { enabled?: boolean }) => ({ error: null })),
     read: vi.fn<(args: { isVisible?: boolean }) => void>(),
     outbox: vi.fn<(args: { fence: number | null; submissions: readonly unknown[] }) => void>(),
     send: vi.fn<(text: string) => boolean>(),
-    retry: vi.fn<(clientMessageId: string) => void>(),
-    withdrawUnsent: vi.fn<() => void>(),
-    outboxEntries
+    stopSends: vi.fn<() => void>(),
+    takeBackLaunchText: vi.fn<(sessionId: string) => void>(),
+    pending
   }
 })
 
@@ -41,23 +41,28 @@ vi.mock('./use-structured-agent-session-read', () => ({
   }
 }))
 
-vi.mock('./use-structured-agent-session-outbox', () => ({
-  structuredSessionOperationId: () => 'operation-1',
-  useStructuredAgentSessionOutbox: (args: {
+vi.mock('./structured-agent-session-operation-id', () => ({
+  structuredSessionOperationId: () => 'operation-1'
+}))
+vi.mock('./use-structured-agent-session-sends', () => ({
+  useStructuredAgentSessionSends: (args: {
     fence: number | null
     submissions: readonly unknown[]
   }) => {
     mocks.outbox(args)
     return {
-      outbox: mocks.outboxEntries,
+      pending: mocks.pending,
       error: null,
       send: mocks.send,
-      retry: mocks.retry,
-      withdrawUnsent: mocks.withdrawUnsent
+      stopSends: mocks.stopSends
     }
   }
 }))
 
+vi.mock('@/lib/structured-agent-session-launch-prompt', () => ({
+  takeBackStructuredLaunchPrompts: mocks.takeBackLaunchText
+}))
+
 vi.mock('./native-chat-session-option-settings-write', () => ({
   enqueueSessionOptionSettingsWrite: vi.fn<(target: unknown, mutation: unknown) => Promise<void>>()
 }))
@@ -106,7 +111,7 @@ function sessionState(): StructuredAgentSessionState {
 describe('useStructuredAgentSession provisional launch gate', () => {
   beforeEach(() => {
     vi.clearAllMocks()
-    mocks.outboxEntries = []
+    mocks.pending = []
     readState = sessionState()
     mocks.send.mockReturnValue(true)
     mocks.call.mockResolvedValue(OPTIONS)
@@ -153,7 +158,7 @@ describe('useStructuredAgentSession provisional launch gate', () => {
     expect(methodsCalled()).toEqual(['agentSession.modelCatalog'])
   })
 
-  it('offers Stop for a message sent while the launch is unpublished, and takes it back locally', async () => {
+  it("offers Stop while the launch's text waits on an unpublished chat, and takes it back locally", async () => {
     const render = () =>
       renderHook(() =>
         useStructuredAgentSession({
@@ -166,16 +171,15 @@ describe('useStructuredAgentSession provisional launch gate', () => {
         })
       )
     expect(render().result.current.canStop).toBe(false)
-    mocks.outboxEntries = [
+    mocks.pending = [
       {
         clientMessageId: 'sent-while-starting',
         sessionId: 'session-1',
         body: { kind: 'message', role: 'user', blocks: [{ type: 'text', text: 'hello' }] },
         previewUris: [],
-        state: 'queued',
         queuedAt: 1,
-        lastAttemptAt: null,
-        retryAfterUnknownSubmittedAt: null
+        phase: 'sending',
+        issued: false
       }
     ]
     const { result } = render()
@@ -185,7 +189,8 @@ describe('useStructuredAgentSession provisional launch gate', () => {
       await result.current.stop()
     })
 
-    expect(mocks.withdrawUnsent).toHaveBeenCalledTimes(1)
+    expect(mocks.takeBackLaunchText).toHaveBeenCalledWith('session-1')
+    expect(mocks.stopSends).toHaveBeenCalledTimes(1)
     // Nothing reached a host, so nothing is asked of one.
     expect(methodsCalled().filter((method) => method === 'agentSession.cancel')).toEqual([])
   })
diff --git a/src/renderer/src/components/native-chat/use-structured-agent-session-question-answers.test.tsx b/src/renderer/src/components/native-chat/use-structured-agent-session-question-answers.test.tsx
index a8ffff83ce4c..5d43c6e3b777 100644
--- a/src/renderer/src/components/native-chat/use-structured-agent-session-question-answers.test.tsx
+++ b/src/renderer/src/components/native-chat/use-structured-agent-session-question-answers.test.tsx
@@ -30,13 +30,15 @@ vi.mock('./use-structured-agent-session-read', () => ({
     loadOlder: vi.fn()
   })
 }))
-vi.mock('./use-structured-agent-session-outbox', () => ({
-  structuredSessionOperationId: mocks.operationId,
-  useStructuredAgentSessionOutbox: () => ({
-    outbox: [],
+vi.mock('./structured-agent-session-operation-id', () => ({
+  structuredSessionOperationId: mocks.operationId
+}))
+vi.mock('./use-structured-agent-session-sends', () => ({
+  useStructuredAgentSessionSends: () => ({
+    pending: [],
     error: null,
     send: vi.fn(),
-    retry: vi.fn()
+    stopSends: vi.fn()
   })
 }))
 
diff --git a/src/renderer/src/components/native-chat/use-structured-agent-session-queued-messages.resume.test.tsx b/src/renderer/src/components/native-chat/use-structured-agent-session-queued-messages.resume.test.tsx
index bfe2599e6572..37d4ead942e9 100644
--- a/src/renderer/src/components/native-chat/use-structured-agent-session-queued-messages.resume.test.tsx
+++ b/src/renderer/src/components/native-chat/use-structured-agent-session-queued-messages.resume.test.tsx
@@ -295,7 +295,7 @@ function renderRevealingController(sessionId = 'session-1', fence: number | null
     ({ isVisible }) => {
       const queue = useQueue(sessionId, fence)
       const submits = useStructuredNativeChatSubmitReveal(
-        { queuedMessages: queue, respond: async () => null, retry: vi.fn() },
+        { queuedMessages: queue, respond: async () => null },
         vi.fn()
       )
       const scrollRef = useRef(document.createElement('div'))
@@ -316,6 +316,7 @@ function renderRevealingController(sessionId = 'session-1', fence: number | null
         showsTailRow: false,
         isVisible,
         alignToViewportTop: vi.fn(),
+        isAlignPending: () => false,
         scrollToEnd,
         restoreScrollOffset,
         consumeProgrammaticScroll: () => false,
diff --git a/src/renderer/src/components/native-chat/use-structured-agent-session-sends.test.tsx b/src/renderer/src/components/native-chat/use-structured-agent-session-sends.test.tsx
new file mode 100644
index 000000000000..8ff5c03ae37b
--- /dev/null
+++ b/src/renderer/src/components/native-chat/use-structured-agent-session-sends.test.tsx
@@ -0,0 +1,73 @@
+// @vitest-environment happy-dom
+
+import { act, renderHook } from '@testing-library/react'
+import { afterEach, expect, it, vi } from 'vitest'
+
+const mocks = vi.hoisted(() => ({ call: vi.fn() }))
+
+vi.mock('@/runtime/structured-agent-session-client', () => ({
+  callStructuredAgentSession: mocks.call
+}))
+
+import { resetStructuredAgentSessionSendsForTests } from './structured-agent-session-message-sender'
+import { useStructuredAgentSessionSends } from './use-structured-agent-session-sends'
+
+const QUEUEING = { capability: 'supported', enabled: true } as const
+
+afterEach(() => {
+  resetStructuredAgentSessionSendsForTests()
+})
+
+// The composer moves the reader only for a message the transcript draws as a bubble.
+it.each([
+  ['a text follow-up while the agent works', QUEUEING, true, [], 'queued'],
+  ['the same follow-up when the agent is idle', QUEUEING, false, [], true],
+  ['with the queue setting off', { capability: 'supported', enabled: false }, true, [], true],
+  ['an image, which never queues', QUEUEING, true, [{ path: '/a.png', previewUri: '/a.png' }], true]
+] as const)(
+  'answers whether %s waits as a queued card',
+  (_case, queue, isWorking, images, admission) => {
+    mocks.call.mockImplementation(() => new Promise(() => {}))
+    const { result } = renderHook(() =>
+      useStructuredAgentSessionSends({
+        sessionId: 'session-1',
+        target: { kind: 'local' },
+        fence: 1,
+        submissions: [],
+        queuedMessageIds: [],
+        queue,
+        historyLoaded: false,
+        isWorking
+      })
+    )
+    let sent: boolean | 'queued' = false
+    act(() => {
+      sent = result.current.send('follow up', images)
+    })
+    expect(sent).toBe(admission)
+  }
+)
+
+it('takes no second send while the first is out', () => {
+  mocks.call.mockImplementation(() => new Promise(() => {}))
+  const { result } = renderHook(() =>
+    useStructuredAgentSessionSends({
+      sessionId: 'session-1',
+      target: { kind: 'local' },
+      fence: 1,
+      submissions: [],
+      queuedMessageIds: [],
+      queue: QUEUEING,
+      historyLoaded: false,
+      isWorking: true
+    })
+  )
+  let first: boolean | 'queued' = false
+  let second: boolean | 'queued' = true
+  act(() => {
+    first = result.current.send('one')
+    second = result.current.send('two')
+  })
+  expect(first).toBe('queued')
+  expect(second).toBe(false)
+})
diff --git a/src/renderer/src/components/native-chat/use-structured-agent-session-sends.ts b/src/renderer/src/components/native-chat/use-structured-agent-session-sends.ts
new file mode 100644
index 000000000000..04f72d1224b0
--- /dev/null
+++ b/src/renderer/src/components/native-chat/use-structured-agent-session-sends.ts
@@ -0,0 +1,127 @@
+import { useCallback, useEffect, useSyncExternalStore } from 'react'
+import type { AgentJournalSubmission } from '../../../../shared/agent-session-journal-types'
+import type { StructuredAgentSessionAttachment } from '../../../../shared/structured-agent-session-send-mutation'
+import type { RuntimeClientTarget } from '@/runtime/runtime-rpc-client'
+import {
+  structuredAgentSessionQueueRequest,
+  type StructuredAgentSessionQueueDelivery
+} from './structured-agent-session-queue-request'
+import {
+  sendStructuredAgentSessionMessage,
+  settleStructuredAgentSessionSendsFromJournal,
+  stopStructuredAgentSessionSends
+} from './structured-agent-session-message-sender'
+import {
+  getStructuredAgentSessionPendingSends,
+  getStructuredAgentSessionSendNotice,
+  structuredAgentSessionSendsHeld,
+  subscribeToStructuredAgentSessionPendingSends
+} from './structured-agent-session-pending-sends'
+import { noteStructuredAgentSessionFence } from './structured-agent-session-send-attempt'
+import { recoverLegacyStructuredAgentSessionOutbox } from './structured-agent-session-legacy-outbox'
+import { pendingSendsOutsideQueuedCards } from './structured-agent-session-queued-cards'
+
+/** The open chat's view of its sends: they live in the sender, which works without this view. */
+export function useStructuredAgentSessionSends(args: {
+  sessionId: string
+  target: RuntimeClientTarget
+  fence: number | null
+  submissions: readonly AgentJournalSubmission[]
+  queuedMessageIds: readonly string[]
+  queue: StructuredAgentSessionQueueDelivery
+  /** The chat's history has loaded, so its rows and cards can answer for a legacy copy. */
+  historyLoaded: boolean
+  /** Whether a new send that asks to be queued waits as a card. */
+  isWorking?: boolean
+  /** The chat reads Stopping: a send made now is drawn after the turn being stopped. */
+  stopping?: boolean
+}) {
+  const {
+    fence,
+    historyLoaded,
+    isWorking = false,
+    queue,
+    queuedMessageIds,
+    sessionId,
+    stopping,
+    submissions,
+    target
+  } = args
+  const subscribe = useCallback(
+    (listener: () => void) => subscribeToStructuredAgentSessionPendingSends(sessionId, listener),
+    [sessionId]
+  )
+  const pending = useSyncExternalStore(subscribe, () =>
+    getStructuredAgentSessionPendingSends(sessionId)
+  )
+  const notice = useSyncExternalStore(subscribe, () =>
+    getStructuredAgentSessionSendNotice(sessionId)
+  )
+  const held = useSyncExternalStore(subscribe, () => structuredAgentSessionSendsHeld(sessionId))
+
+  useEffect(() => {
+    noteStructuredAgentSessionFence(sessionId, fence)
+  }, [fence, sessionId])
+
+  useEffect(() => {
+    settleStructuredAgentSessionSendsFromJournal(sessionId, submissions, queuedMessageIds)
+  }, [pending, queuedMessageIds, sessionId, submissions])
+
+  const recoverLegacy = historyLoaded && fence !== null
+  useEffect(() => {
+    if (recoverLegacy) {
+      void recoverLegacyStructuredAgentSessionOutbox({
+        sessionId,
+        target,
+        submissions,
+        queuedMessageIds
+      })
+    }
+    // Why: once per open, from the first loaded history; later batches add nothing it needs.
+    // eslint-disable-next-line react-hooks/exhaustive-deps
+  }, [recoverLegacy, sessionId, target])
+
+  /** Whether the message was taken; 'queued' when it waits as a queued card, not a bubble. */
+  const send = useCallback(
+    (
+      text: string,
+      attachments: readonly StructuredAgentSessionAttachment[] = []
+    ): boolean | 'queued' => {
+      if (!text.trim() && attachments.length === 0) {
+        return false
+      }
+      const delivery = structuredAgentSessionQueueRequest(queue, attachments)
+      const sent = sendStructuredAgentSessionMessage({
+        sessionId,
+        target,
+        text,
+        attachments,
+        ...(delivery ? { delivery } : {}),
+        ...(stopping ? { sentWhileStopping: true as const } : {})
+      })
+      // Refused while the chat's send is out: the text stays in the box.
+      if (!sent) {
+        return false
+      }
+      // The same projection that draws the transcript decides it.
+      const admitted = getStructuredAgentSessionPendingSends(sessionId).filter(
+        (entry) => entry.clientMessageId === sent.clientMessageId
+      )
+      return admitted.length > 0 &&
+        pendingSendsOutsideQueuedCards(admitted, queuedMessageIds, isWorking).length === 0
+        ? 'queued'
+        : true
+    },
+    [isWorking, queue, queuedMessageIds, sessionId, stopping, target]
+  )
+
+  return {
+    pending,
+    /** A write such as a /clear keeps every send out meanwhile. */
+    held,
+    /** Why the last message came back to the composer, until the next send. */
+    error: notice,
+    send,
+    stopSends: () => stopStructuredAgentSessionSends(sessionId)
+  }
+}
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
index 0b71b51cec93..70f86c2bfed7 100644
--- 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
@@ -10,17 +10,17 @@ import type {
   AgentJournalRenderItem,
   AgentJournalSubmission
 } from '../../../../shared/agent-session-journal-types'
-import type { StructuredAgentSessionOutboxEntry } from '../../../../shared/structured-agent-session-outbox'
+import type { StructuredAgentSessionPendingSend } from './structured-agent-session-pending-sends'
 import type { AgentSessionLatestTurn } from '../../../../shared/agent-session-wire'
 
 const mocks = vi.hoisted(() => ({
   call: vi.fn(),
-  withdrawUnsent: vi.fn(),
+  stopSends: vi.fn(),
   operations: 0
 }))
 let items: AgentJournalRenderItem[] = []
 let submissions: AgentJournalSubmission[] = []
-let outbox: StructuredAgentSessionOutboxEntry[] = []
+let outbox: StructuredAgentSessionPendingSend[] = []
 let fence = 3
 let latestTurn: AgentSessionLatestTurn | null | undefined
 
@@ -46,14 +46,12 @@ vi.mock('./use-structured-agent-session-read', () => ({
   })
 }))
 
-vi.mock('./use-structured-agent-session-outbox', () => ({
-  structuredSessionOperationId: () => `operation-${++mocks.operations}`,
-  useStructuredAgentSessionOutbox: () => ({
-    outbox,
+vi.mock('./use-structured-agent-session-sends', () => ({
+  useStructuredAgentSessionSends: () => ({
+    pending: outbox,
     error: null,
     send: vi.fn(),
-    retry: vi.fn(),
-    withdrawUnsent: mocks.withdrawUnsent
+    stopSends: mocks.stopSends
   })
 }))
 
@@ -67,17 +65,16 @@ import { structuredAgentSessionAgentStatus } from '../../../../shared/structured
 import { useStructuredAgentSession } from './use-structured-agent-session'
 
 function entry(
-  state: StructuredAgentSessionOutboxEntry['state']
-): StructuredAgentSessionOutboxEntry {
+  phase: StructuredAgentSessionPendingSend['phase']
+): StructuredAgentSessionPendingSend {
   return {
     clientMessageId: 'client-1',
     sessionId: 'session-1',
     body: { kind: 'message', role: 'user', blocks: [{ type: 'text', text: 'hi' }] },
     previewUris: [],
-    state,
+    phase,
     queuedAt: 1,
-    lastAttemptAt: null,
-    retryAfterUnknownSubmittedAt: null
+    issued: true
   }
 }
 
@@ -106,7 +103,7 @@ const RUNNING_TURN: AgentJournalRenderItem = {
 // 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')]
+    outbox = [entry('sending')]
   },
   'the host has queued it': () => {
     submissions = [submission({ handoverRecorded: true })]
@@ -171,12 +168,12 @@ describe('Stop against a host that stops the conversation', () => {
         await result.current.stop()
       })
 
-      expect(mocks.withdrawUnsent).toHaveBeenCalledOnce()
+      expect(mocks.stopSends).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(
+      expect(mocks.stopSends.mock.invocationCallOrder[0]).toBeLessThan(
         mocks.call.mock.invocationCallOrder[cancelCall] ?? 0
       )
       expect(cancels()).toEqual([expect.not.objectContaining({ turnId: expect.anything() })])
@@ -300,7 +297,7 @@ describe('Stop against a host that stops the conversation', () => {
       first = result.current.stop()
     })
     // The next message goes out, and reaches the host ahead of the second Stop.
-    outbox = [entry('dispatching')]
+    outbox = [entry('sending')]
     rerender()
     act(() => {
       second = result.current.stop()
@@ -396,20 +393,14 @@ describe('Stop against a host that stops the conversation', () => {
     expect(ids[1]).not.toBe(ids[0])
   })
 
-  it('is hidden at rest, and with only a message that will not run', () => {
+  it('is hidden at rest, and with only a message the host settled', () => {
     expect(render().result.current.canStop).toBe(false)
-    outbox = [entry('rejected')]
+    outbox = [entry('recorded')]
     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 waits, with its saved failure, until the user retries it.
-    outbox = [{ ...entry('queued'), lastFailure: { kind: 'failed' } }]
-    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 }]
+  it('is hidden once the host reads idle after a restart', () => {
     submissions = [
       submission({
         dispatchState: 'unknown',
@@ -537,7 +528,7 @@ describe.each([
         await result.current.stop()
       })
       expect(cancels()).toEqual([])
-      expect(mocks.withdrawUnsent).not.toHaveBeenCalled()
+      expect(mocks.stopSends).not.toHaveBeenCalled()
     }
   )
 
@@ -550,7 +541,8 @@ describe.each([
       await result.current.stop()
     })
     expect(cancels()).toEqual([expect.objectContaining({ turnId: 'provider-turn' })])
-    expect(mocks.withdrawUnsent).not.toHaveBeenCalled()
+    // Every Stop takes back what has not gone out and keeps what has from being sent again.
+    expect(mocks.stopSends).toHaveBeenCalledOnce()
   })
 })
 
diff --git a/src/renderer/src/components/native-chat/use-structured-agent-session-stop.ts b/src/renderer/src/components/native-chat/use-structured-agent-session-stop.ts
index afa61f965f58..f74e247d88ac 100644
--- a/src/renderer/src/components/native-chat/use-structured-agent-session-stop.ts
+++ b/src/renderer/src/components/native-chat/use-structured-agent-session-stop.ts
@@ -23,7 +23,7 @@ export function useStructuredAgentSessionStop(input: {
   /** 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. */
   stopsConversation: boolean
-  stop: (turnId: string | null, withdrawUnsent: () => void) => Promise<unknown>
+  stop: (turnId: string | null, stopSends: () => void) => Promise<unknown>
 } {
   const { sessionId, target, transportState, hostStopping, mutate } = input
   const press = useStructuredAgentSessionStopPress(sessionId)
@@ -38,17 +38,18 @@ export function useStructuredAgentSessionStop(input: {
       }) === 'stopping',
     pressed: press.pressed,
     stopsConversation,
-    stop: (turnId, withdrawUnsent) => {
+    stop: (turnId, stopSends) => {
+      // The chat's own send goes no further if it has not gone out yet. Host-held cards are
+      // never withdrawn by a Stop: the host pauses them, visible on every device, until acted on.
       if (stopsConversation) {
-        // Unsent text this client still owns goes back to an empty composer — a local move.
-        // Host-held drafts are never withdrawn by a Stop: the host pauses them and
-        // they stay visible as cards, on every device, until the user acts on one.
-        withdrawUnsent()
+        stopSends()
         return press.track(() => mutate('agentSession.cancel', 'agentSession.cancel', {}))
       }
-      return turnId
-        ? press.track(() => mutate('agentSession.cancel', 'agentSession.cancel', { turnId }))
-        : Promise.resolve(null)
+      if (!turnId) {
+        return Promise.resolve(null)
+      }
+      stopSends()
+      return press.track(() => mutate('agentSession.cancel', 'agentSession.cancel', { turnId }))
     }
   }
 }
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 7a40ac48a007..fbc3a3674e23 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
@@ -4,7 +4,7 @@ import { isStructuredAgentSessionMainAgentWorking } from '../../../../shared/str
 import type { StructuredAgentSessionState } from '../../../../shared/structured-agent-session-reducer'
 import type { StructuredAgentSubagentRoster } from '../../../../shared/structured-agent-session-subagent-roster'
 import { selectStructuredAgentTurnActivity } from '../../../../shared/native-chat-turn-activity'
-import { structuredSessionBackgroundTasksView } from './structured-session-background-tasks-view'
+import { structuredSessionBackgroundTasksView } from '../../../../shared/structured-session-background-tasks-view'
 import { useStructuredAgentTurnTiming } from './use-structured-agent-turn-timing'
 
 const NO_JOURNAL_ITEMS: StructuredAgentSessionState['items'] = []
diff --git a/src/renderer/src/components/native-chat/use-structured-agent-session-transport.test.tsx b/src/renderer/src/components/native-chat/use-structured-agent-session-transport.test.tsx
index d920f24ba589..f771ce534d98 100644
--- a/src/renderer/src/components/native-chat/use-structured-agent-session-transport.test.tsx
+++ b/src/renderer/src/components/native-chat/use-structured-agent-session-transport.test.tsx
@@ -1,9 +1,5 @@
-// Why the transport reads at all.
-//
-// A worktree switch hides the chat 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 is
-// what keeps the host from evicting the session out from under it -- so undelivered work holds
-// the read open on its own, without the user looking at the pane.
+// A hidden chat pane reads nothing: a message sent from it is settled by its own reply, not by the
+// journal read.
 
 // @vitest-environment happy-dom
 
@@ -22,11 +18,6 @@ vi.mock('@/runtime/structured-agent-session-client', () => ({
 
 import { useStructuredAgentSessionTransport } from './use-structured-agent-session-transport'
 import { resetStructuredAgentSessionReadOwnersForTests } from './structured-agent-session-read-owner'
-import {
-  resetUndeliveredStructuredAgentSessionOutboxForTests,
-  writeOutbox
-} from './structured-agent-session-outbox-storage'
-import { createStructuredAgentSessionOutboxEntry } from '../../../../shared/structured-agent-session-outbox'
 
 const LOCAL_TARGET = { kind: 'local' } as const
 
@@ -46,78 +37,36 @@ function emptyPage(): AgentSessionHistoryPage {
   }
 }
 
-function undeliveredEntry(sessionId: string) {
-  return createStructuredAgentSessionOutboxEntry({
-    clientMessageId: 'client-queued',
-    sessionId,
-    text: 'still undelivered',
-    attachments: [],
-    queuedAt: 1
-  })
-}
-
-function renderHiddenTransport(sessionId: string, enabled = true) {
+function renderTransport(sessionId: string, isVisible: boolean) {
   return renderHook(() =>
     useStructuredAgentSessionTransport({
       sessionId,
       target: LOCAL_TARGET,
-      isVisible: false,
-      enabled
+      isVisible,
+      enabled: true
     })
   )
 }
 
-describe('useStructuredAgentSessionTransport undelivered retention', () => {
+describe('useStructuredAgentSessionTransport reads', () => {
   afterEach(cleanup)
 
   beforeEach(() => {
     vi.clearAllMocks()
     resetStructuredAgentSessionReadOwnersForTests()
-    resetUndeliveredStructuredAgentSessionOutboxForTests()
-    localStorage.clear()
     mocks.call.mockResolvedValue({ ok: true, page: emptyPage() })
     mocks.subscribe.mockResolvedValue({ unsubscribe: vi.fn() })
   })
 
-  it('keeps reading a hidden session that still owes a delivery', async () => {
-    writeOutbox('session-undelivered', [undeliveredEntry('session-undelivered')])
-
-    const view = renderHiddenTransport('session-undelivered')
+  it('reads a visible session', async () => {
+    const view = renderTransport('session-visible', true)
 
     await waitFor(() => expect(mocks.subscribe).toHaveBeenCalledTimes(1))
     view.unmount()
   })
 
-  it('stops reading a hidden session once its outbox drains', async () => {
-    const unsubscribe = vi.fn()
-    mocks.subscribe.mockResolvedValue({ unsubscribe })
-    writeOutbox('session-drained', [undeliveredEntry('session-drained')])
-
-    const view = renderHiddenTransport('session-drained')
-    await waitFor(() => expect(mocks.subscribe).toHaveBeenCalledTimes(1))
-
-    act(() => {
-      writeOutbox('session-drained', [])
-    })
-
-    await waitFor(() => expect(unsubscribe).toHaveBeenCalledTimes(1))
-    view.unmount()
-  })
-
-  it('leaves a hidden session with nothing owed unread', async () => {
-    const view = renderHiddenTransport('session-idle')
-
-    await act(async () => {
-      await Promise.resolve()
-    })
-    expect(mocks.subscribe).not.toHaveBeenCalled()
-    view.unmount()
-  })
-
-  it('does not read an unpublished session holding a staged launch prompt', async () => {
-    writeOutbox('session-provisional', [undeliveredEntry('session-provisional')])
-
-    const view = renderHiddenTransport('session-provisional', false)
+  it('leaves a hidden session unread', async () => {
+    const view = renderTransport('session-hidden', false)
 
     await act(async () => {
       await Promise.resolve()
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 1db7aae50dd7..47ca68a5db76 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
@@ -3,7 +3,6 @@ import type { RuntimeClientTarget } from '@/runtime/runtime-rpc-client'
 import { useStructuredAgentSessionHold } from './use-structured-agent-session-hold'
 import { useStructuredAgentSessionMutate } from './use-structured-agent-session-mutate'
 import { useStructuredAgentSessionRead } from './use-structured-agent-session-read'
-import { useUndeliveredStructuredAgentSessionOutbox } from './use-undelivered-structured-agent-session-outbox'
 
 export function useStructuredAgentSessionTransport(args: {
   sessionId: string
@@ -19,16 +18,8 @@ export function useStructuredAgentSessionTransport(args: {
     surface: 'desktop-chat',
     enabled: providerVisible
   })
-  // A worktree switch hides the pane, but a message the user already sent is still owed a
-  // 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,
-    target,
-    isVisible: providerVisible || (enabled && hasUndelivered),
-    isViewed: providerVisible
-  })
+  // A message sent from here is settled by its own reply, so a hidden pane reads nothing.
+  const read = useStructuredAgentSessionRead({ sessionId, target, isVisible: providerVisible })
   const stateRef = useRef(read.state)
   const mutation = useStructuredAgentSessionMutate({
     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
index 034c2a361b3b..b6ef99e9e4f1 100644
--- 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
@@ -31,13 +31,15 @@ vi.mock('./use-structured-agent-session-read', () => ({
   })
 }))
 
-vi.mock('./use-structured-agent-session-outbox', () => ({
-  structuredSessionOperationId: () => 'operation-1',
-  useStructuredAgentSessionOutbox: () => ({
-    outbox: [],
+vi.mock('./structured-agent-session-operation-id', () => ({
+  structuredSessionOperationId: () => 'operation-1'
+}))
+vi.mock('./use-structured-agent-session-sends', () => ({
+  useStructuredAgentSessionSends: () => ({
+    pending: [],
     error: null,
     send: vi.fn(),
-    retry: vi.fn()
+    stopSends: vi.fn()
   })
 }))
 
diff --git a/src/renderer/src/components/native-chat/use-structured-agent-session.clear-send.test.tsx b/src/renderer/src/components/native-chat/use-structured-agent-session.clear-send.test.tsx
new file mode 100644
index 000000000000..81a878d0efe3
--- /dev/null
+++ b/src/renderer/src/components/native-chat/use-structured-agent-session.clear-send.test.tsx
@@ -0,0 +1,221 @@
+// @vitest-environment happy-dom
+
+// A /clear moves the chat to a new conversation, and its host refuses a send made meanwhile. Text
+// typed during it stays in the box: it is never sent into that refusal.
+
+import { act, renderHook } from '@testing-library/react'
+import { afterEach, beforeEach, expect, it, vi } from 'vitest'
+import type { AgentJournalRenderItem } from '../../../../shared/agent-session-journal-types'
+
+const mocks = vi.hoisted(() => ({ call: vi.fn() }))
+
+vi.mock('@/runtime/structured-agent-session-client', () => ({
+  callStructuredAgentSession: mocks.call,
+  supportsStructuredAgentSessionPromptCancel: vi.fn(async () => false)
+}))
+
+// Turn-scoped rows: a host that runs a /compact as a turn, so only a /clear holds sends back.
+const ANSWER: AgentJournalRenderItem = {
+  itemId: 'answer',
+  revision: 0,
+  sequence: 1,
+  observedAt: 1,
+  body: { kind: 'message', role: 'assistant', blocks: [{ type: 'text', text: 'done' }] },
+  turnScope: { kind: 'thread' }
+}
+
+vi.mock('./use-structured-agent-session-read', () => ({
+  useStructuredAgentSessionRead: () => ({
+    state: {
+      fence: 3,
+      items: [ANSWER],
+      submissions: [],
+      status: 'ready',
+      error: null,
+      hasOlder: false,
+      handoff: null
+    },
+    loadingOlder: false,
+    loadOlder: vi.fn()
+  })
+}))
+
+import { AGENT_SESSION_CONVERSATION_COMMAND_TIMEOUT_MS } from '../../../../shared/agent-session-conversation-command'
+import { useStructuredAgentSession } from './use-structured-agent-session'
+import { resetStructuredAgentSessionSendsForTests } from './structured-agent-session-message-sender'
+import { structuredAgentSessionSendOut } from './structured-agent-session-pending-sends'
+import {
+  clearNativeChatComposerDraftsForTests,
+  structuredAgentSessionDraftScopeKey
+} from './native-chat-composer-draft-store'
+
+const CONVERSATION_IN_FLIGHT = {
+  ok: false,
+  refusal: {
+    code: 'agent_session_operation_invalid',
+    message: 'Wait for the conversation operation to finish.',
+    details: { reason: 'conversationCommandInFlight' }
+  }
+}
+
+type Deferred = { resolve: (value: unknown) => void }
+
+function hostWithAClearOut(): Deferred[] {
+  const clears: Deferred[] = []
+  mocks.call.mockImplementation((_target: unknown, method: string) => {
+    if (method === 'agentSession.conversationCommand') {
+      return new Promise((resolve) => clears.push({ resolve }))
+    }
+    if (method === 'agentSession.send') {
+      return Promise.resolve(CONVERSATION_IN_FLIGHT)
+    }
+    return Promise.resolve(null)
+  })
+  return clears
+}
+
+function view(sessionId: string) {
+  return renderHook(
+    ({ id }) =>
+      useStructuredAgentSession({
+        sessionId: id,
+        agent: 'codex',
+        target: { kind: 'local' },
+        isVisible: true,
+        composerScopeKey: structuredAgentSessionDraftScopeKey(id)
+      }),
+    { initialProps: { id: sessionId } }
+  )
+}
+
+beforeEach(() => {
+  vi.clearAllMocks()
+  clearNativeChatComposerDraftsForTests()
+})
+
+afterEach(() => {
+  resetStructuredAgentSessionSendsForTests()
+})
+
+function cleared(replacementSessionId?: string) {
+  return {
+    ok: true,
+    replayed: false,
+    fence: 3,
+    cursor: { epoch: 'e', sequence: 2 },
+    value: {
+      command: 'clear',
+      state: 'completed',
+      ...(replacementSessionId ? { replacementSessionId } : {})
+    }
+  }
+}
+
+it('takes no send while a /clear is out: the text stays in the box and nothing is sent', async () => {
+  const clears = hostWithAClearOut()
+  const { result } = view('session-a')
+  act(() => {
+    void result.current.runConversationCommand('clear')
+  })
+  await act(async () => {})
+  expect(result.current.sendOut).toBe(true)
+  expect(structuredAgentSessionSendOut('session-a')).toBe(true)
+
+  let sent: boolean | 'queued' = true
+  act(() => {
+    sent = result.current.send('c4 during clear')
+  })
+  await act(async () => {})
+  expect(sent).toBe(false)
+  expect(mocks.call.mock.calls.some(([, method]) => method === 'agentSession.send')).toBe(false)
+
+  // A /clear that did not move the chat gives the slot back.
+  await act(async () => {
+    clears[0].resolve(cleared())
+  })
+  expect(result.current.sendOut).toBe(false)
+})
+
+it('keeps a conversation a /clear moved away from taking no send until the view leaves it', async () => {
+  const clears = hostWithAClearOut()
+  const { result, rerender } = view('session-a')
+  act(() => {
+    void result.current.runConversationCommand('clear')
+  })
+  await act(async () => {
+    clears[0].resolve(cleared('session-b'))
+  })
+  // Its host refuses the old conversation now; the chat shows the new one once its tab moves.
+  expect(result.current.sendOut).toBe(true)
+  expect(structuredAgentSessionSendOut('session-a')).toBe(true)
+
+  rerender({ id: 'session-b' })
+  expect(structuredAgentSessionSendOut('session-a')).toBe(false)
+  expect(result.current.sendOut).toBe(false)
+})
+
+it('gives the old conversation back when its view unmounted before the /clear that moved it answered', async () => {
+  const clears = hostWithAClearOut()
+  const { result, unmount } = view('session-a')
+  act(() => {
+    void result.current.runConversationCommand('clear')
+  })
+  await act(async () => {})
+  unmount()
+  await act(async () => {
+    clears[0].resolve(cleared('session-b'))
+  })
+  expect(structuredAgentSessionSendOut('session-a')).toBe(false)
+  expect(view('session-a').result.current.sendOut).toBe(false)
+})
+
+it('gives the slot back when the host refuses the /clear, or its call fails', async () => {
+  for (const answer of [
+    () => Promise.resolve(CONVERSATION_IN_FLIGHT),
+    () => Promise.reject(new Error('connection closed'))
+  ]) {
+    mocks.call.mockImplementation((_target: unknown, method: string) =>
+      method === 'agentSession.conversationCommand' ? answer() : Promise.resolve(null)
+    )
+    const { result, unmount } = view('session-a')
+    await act(async () => {
+      await result.current.runConversationCommand('clear')
+    })
+    expect(structuredAgentSessionSendOut('session-a')).toBe(false)
+    expect(result.current.sendOut).toBe(false)
+    unmount()
+  }
+})
+
+it('holds nothing for a /compact, which the host runs as a turn with sends queued behind it', async () => {
+  hostWithAClearOut()
+  const { result } = view('session-a')
+  act(() => {
+    void result.current.runConversationCommand('compact')
+  })
+  await act(async () => {})
+  expect(result.current.sendOut).toBe(false)
+})
+
+// The local call has no deadline of its own: a /clear that never answers must not keep Send off.
+it('takes sends again once a /clear that never answers passes its deadline', async () => {
+  vi.useFakeTimers()
+  try {
+    hostWithAClearOut()
+    const { result } = view('session-a')
+    act(() => {
+      void result.current.runConversationCommand('clear')
+    })
+    await act(async () => {
+      await vi.advanceTimersByTimeAsync(AGENT_SESSION_CONVERSATION_COMMAND_TIMEOUT_MS - 1)
+    })
+    expect(result.current.sendOut).toBe(true)
+    await act(async () => {
+      await vi.advanceTimersByTimeAsync(1)
+    })
+    expect(structuredAgentSessionSendOut('session-a')).toBe(false)
+    expect(result.current.sendOut).toBe(false)
+  } finally {
+    vi.useRealTimers()
+  }
+})
diff --git a/src/renderer/src/components/native-chat/use-structured-agent-session.cut-turn-notice.test.tsx b/src/renderer/src/components/native-chat/use-structured-agent-session.cut-turn-notice.test.tsx
index b3f4a938fb25..f4cd4c927ad7 100644
--- a/src/renderer/src/components/native-chat/use-structured-agent-session.cut-turn-notice.test.tsx
+++ b/src/renderer/src/components/native-chat/use-structured-agent-session.cut-turn-notice.test.tsx
@@ -59,13 +59,15 @@ vi.mock('./use-structured-agent-session-read', () => ({
     loadOlder: vi.fn()
   })
 }))
-vi.mock('./use-structured-agent-session-outbox', () => ({
-  structuredSessionOperationId: vi.fn(),
-  useStructuredAgentSessionOutbox: () => ({
-    outbox: [],
+vi.mock('./structured-agent-session-operation-id', () => ({
+  structuredSessionOperationId: vi.fn()
+}))
+vi.mock('./use-structured-agent-session-sends', () => ({
+  useStructuredAgentSessionSends: () => ({
+    pending: [],
     error: null,
     send: vi.fn(),
-    retry: vi.fn()
+    stopSends: vi.fn()
   })
 }))
 
diff --git a/src/renderer/src/components/native-chat/use-structured-agent-session.queue-while-stopping.test.tsx b/src/renderer/src/components/native-chat/use-structured-agent-session.queue-while-stopping.test.tsx
index 397c3a422bfe..f1f7875f9e60 100644
--- a/src/renderer/src/components/native-chat/use-structured-agent-session.queue-while-stopping.test.tsx
+++ b/src/renderer/src/components/native-chat/use-structured-agent-session.queue-while-stopping.test.tsx
@@ -1,6 +1,6 @@
 // @vitest-environment happy-dom
 
-// A message sent while the chat reads Stopping, through the chat's own send and its real outbox:
+// A message sent while the chat reads Stopping, through the chat's own send and its real sender:
 // where the host does not queue sends, it goes out plain, for the host to hold until the stop lands,
 // and is marked as sent while stopping, so it draws after the Stopping line.
 
@@ -32,6 +32,7 @@ import { AGENT_SESSION_CONVERSATION_STOP_RUNTIME_CAPABILITY } from '../../../../
 import { setLocalRuntimeCapabilitiesForTests } from '@/runtime/local-runtime-capabilities'
 import { clearNativeChatDraftCacheForTests } from './native-chat-draft-cache'
 import { useStructuredAgentSession } from './use-structured-agent-session'
+import { resetStructuredAgentSessionSendsForTests } from './structured-agent-session-message-sender'
 
 const RUNNING_TURN: AgentJournalRenderItem = {
   itemId: 'turn-1',
@@ -59,6 +60,8 @@ beforeEach(() => {
 
 afterEach(() => {
   cleanup()
+  // The sender is module-wide: a send still out would refuse the next test's.
+  resetStructuredAgentSessionSendsForTests()
   setLocalRuntimeCapabilitiesForTests(null)
   mocks.call.mockReset()
 })
diff --git a/src/renderer/src/components/native-chat/use-structured-agent-session.queued-gating.test.tsx b/src/renderer/src/components/native-chat/use-structured-agent-session.queued-gating.test.tsx
index 16654cd9dea2..dae635600e69 100644
--- a/src/renderer/src/components/native-chat/use-structured-agent-session.queued-gating.test.tsx
+++ b/src/renderer/src/components/native-chat/use-structured-agent-session.queued-gating.test.tsx
@@ -11,20 +11,17 @@ import { act, renderHook } from '@testing-library/react'
 import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest'
 import type { AgentJournalRenderItem } from '../../../../shared/agent-session-journal-types'
 import type { AgentSessionQueuedMessage } from '../../../../shared/agent-session-wire'
-import {
-  createStructuredAgentSessionOutboxEntry,
-  type StructuredAgentSessionOutboxEntry
-} from '../../../../shared/structured-agent-session-outbox'
+import type { StructuredAgentSessionPendingSend } from './structured-agent-session-pending-sends'
 
 const mocks = vi.hoisted(() => ({
   call: vi.fn(),
-  outboxArgs: Array.of<{ queueDelivery?: { capability: string; enabled: boolean } }>(),
+  outboxArgs: Array.of<{ queue?: { capability: string; enabled: boolean } }>(),
   operations: 0
 }))
 let items: AgentJournalRenderItem[] = []
 let queuedMessages: AgentSessionQueuedMessage[] | undefined
 let nextQueuedMessageId: string | null = null
-let outboxEntries: StructuredAgentSessionOutboxEntry[] = []
+let outboxEntries: StructuredAgentSessionPendingSend[] = []
 
 vi.mock('@/runtime/structured-agent-session-client', () => ({
   callStructuredAgentSession: mocks.call,
@@ -47,18 +44,14 @@ vi.mock('./use-structured-agent-session-read', () => ({
   })
 }))
 
-vi.mock('./use-structured-agent-session-outbox', () => ({
-  structuredSessionOperationId: () => `operation-${++mocks.operations}`,
-  useStructuredAgentSessionOutbox: (args: {
-    queueDelivery?: { capability: string; enabled: boolean }
-  }) => {
+vi.mock('./use-structured-agent-session-sends', () => ({
+  useStructuredAgentSessionSends: (args: { queue?: { capability: string; enabled: boolean } }) => {
     mocks.outboxArgs.push(args)
     return {
-      outbox: outboxEntries,
+      pending: outboxEntries,
       error: null,
       send: vi.fn(),
-      retry: vi.fn(),
-      withdrawUnsent: vi.fn()
+      stopSends: vi.fn()
     }
   }
 }))
@@ -171,13 +164,13 @@ describe('against a capable host', () => {
 
   it('queues sends while the setting is on, immediately when it is off', () => {
     render()
-    expect(mocks.outboxArgs.at(-1)?.queueDelivery).toEqual({
+    expect(mocks.outboxArgs.at(-1)?.queue).toEqual({
       capability: 'supported',
       enabled: true
     })
     mocks.outboxArgs.length = 0
     render(false)
-    expect(mocks.outboxArgs.at(-1)?.queueDelivery).toEqual({
+    expect(mocks.outboxArgs.at(-1)?.queue).toEqual({
       capability: 'supported',
       enabled: false
     })
@@ -209,14 +202,14 @@ describe('against a capable host', () => {
     const newer = newerApproval()
     items = [newer]
     render()
-    expect(mocks.outboxArgs.at(-1)?.queueDelivery).toEqual({
+    expect(mocks.outboxArgs.at(-1)?.queue).toEqual({
       capability: 'supported',
       enabled: false
     })
     mocks.outboxArgs.length = 0
     items = [newer, approval({ kind: 'plan', text: 'do it' })]
     render()
-    expect(mocks.outboxArgs.at(-1)?.queueDelivery).toEqual({
+    expect(mocks.outboxArgs.at(-1)?.queue).toEqual({
       capability: 'supported',
       enabled: true
     })
@@ -303,24 +296,25 @@ describe('against a capable host', () => {
   })
 
   it('a mid-turn queue send is never a transcript bubble, before or after the host holds it', () => {
-    const entry = (id: string, text: string) =>
-      createStructuredAgentSessionOutboxEntry({
-        clientMessageId: id,
-        sessionId: 'session-1',
-        text,
-        attachments: [],
-        queuedAt: 1
-      })
+    const entry = (
+      id: string,
+      text: string,
+      delivery?: 'queue-if-active'
+    ): StructuredAgentSessionPendingSend => ({
+      clientMessageId: id,
+      sessionId: 'session-1',
+      body: { kind: 'message', role: 'user', blocks: [{ type: 'text', text }] },
+      previewUris: [],
+      queuedAt: 1,
+      phase: 'sending',
+      issued: true,
+      ...(delivery ? { delivery } : {})
+    })
     outboxEntries = [
-      // Not sent yet: against a host that queues, with the setting on, it will ask to be queued.
-      entry('pending-queue', 'awaiting the answer'),
-      // Sent plain: a bubble, whatever the capability now says.
-      {
-        ...entry('plain', 'immediate send'),
-        state: 'dispatching',
-        lastAttemptAt: 2,
-        sentDelivery: null
-      }
+      // On its way asking to be queued: its card, not a bubble, shows it.
+      entry('pending-queue', 'awaiting the answer', 'queue-if-active'),
+      // Sent plain: a bubble.
+      entry('plain', 'immediate send')
     ]
     const working = render()
     const workingText = JSON.stringify(working.result.current.messages)
@@ -366,7 +360,7 @@ describe('against a host without the capability', () => {
 
   it('never asks for queue delivery, whatever the setting says', () => {
     render()
-    expect(mocks.outboxArgs.at(-1)?.queueDelivery?.capability).toBe('unsupported')
+    expect(mocks.outboxArgs.at(-1)?.queue?.capability).toBe('unsupported')
   })
 
   it("Stop stays exactly today's conversation Stop — no withdrawQueued key at all", async () => {
diff --git a/src/renderer/src/components/native-chat/use-structured-agent-session.rejected-card.test.tsx b/src/renderer/src/components/native-chat/use-structured-agent-session.rejected-card.test.tsx
index 025aba64fb8b..72ab7631a78f 100644
--- a/src/renderer/src/components/native-chat/use-structured-agent-session.rejected-card.test.tsx
+++ b/src/renderer/src/components/native-chat/use-structured-agent-session.rejected-card.test.tsx
@@ -64,14 +64,15 @@ vi.mock('./use-structured-agent-session-read', () => ({
   })
 }))
 
-vi.mock('./use-structured-agent-session-outbox', () => ({
-  structuredSessionOperationId: () => 'operation-1',
-  useStructuredAgentSessionOutbox: () => ({
-    outbox: [],
+vi.mock('./structured-agent-session-operation-id', () => ({
+  structuredSessionOperationId: () => 'operation-1'
+}))
+vi.mock('./use-structured-agent-session-sends', () => ({
+  useStructuredAgentSessionSends: () => ({
+    pending: [],
     error: null,
     send: vi.fn(),
-    retry: vi.fn(),
-    withdrawUnsent: vi.fn()
+    stopSends: vi.fn()
   })
 }))
 
diff --git a/src/renderer/src/components/native-chat/use-structured-agent-session.rewind-outbox.test.tsx b/src/renderer/src/components/native-chat/use-structured-agent-session.rewind-outbox.test.tsx
deleted file mode 100644
index 5ac9a1c695c5..000000000000
--- a/src/renderer/src/components/native-chat/use-structured-agent-session.rewind-outbox.test.tsx
+++ /dev/null
@@ -1,78 +0,0 @@
-// @vitest-environment happy-dom
-
-import { act, renderHook } from '@testing-library/react'
-import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest'
-import { EMPTY_STRUCTURED_AGENT_SESSION } from '../../../../shared/structured-agent-session-reducer'
-import {
-  enqueueStructuredAgentSessionLaunchPrompt,
-  readOutbox,
-  writeOutbox
-} from './structured-agent-session-outbox-storage'
-
-const mocks = vi.hoisted(() => ({ call: vi.fn() }))
-const state = {
-  ...EMPTY_STRUCTURED_AGENT_SESSION,
-  epoch: 'epoch-1',
-  fence: 3,
-  status: 'ready' as const
-}
-
-vi.mock('@/runtime/structured-agent-session-client', () => ({
-  callStructuredAgentSession: mocks.call
-}))
-vi.mock('./use-structured-agent-session-hold', () => ({
-  useStructuredAgentSessionHold: () => undefined
-}))
-vi.mock('./use-structured-agent-session-read', () => ({
-  useStructuredAgentSessionRead: () => ({ state, loadingOlder: false, loadOlder: vi.fn() })
-}))
-
-import { useStructuredAgentSession } from './use-structured-agent-session'
-
-const args = {
-  sessionId: 'rewind-outbox',
-  target: { kind: 'local' as const },
-  agent: 'codex' as const,
-  isVisible: true
-}
-
-describe("the host's in-doubt rewind latch and the outbox", () => {
-  beforeEach(() => {
-    vi.useFakeTimers()
-    vi.clearAllMocks()
-    localStorage.clear()
-    mocks.call.mockImplementation((_target, method) =>
-      method === 'agentSession.send'
-        ? new Promise(() => {})
-        : Promise.resolve({ models: [], current: {}, rewind: { supported: true } })
-    )
-  })
-  afterEach(() => vi.useRealTimers())
-
-  // The host recovers an in-doubt rewind on the next send, so holding sends here would deadlock it.
-  it.each(['queued', 'unconfirmed'] as const)(
-    'keeps delivering a restored %s message and new sends while the latch is set',
-    async (entryState) => {
-      const entry = enqueueStructuredAgentSessionLaunchPrompt(args.sessionId, 'Pending prompt')!
-      writeOutbox(args.sessionId, [{ ...entry, state: entryState }])
-      const view = renderHook(() =>
-        useStructuredAgentSession({ ...args, rewind: { hostBlockedReason: 'outcome-unknown' } })
-      )
-      await act(async () => {
-        if (entryState === 'unconfirmed') {
-          view.result.current.retry(entry.clientMessageId)
-        }
-        await vi.advanceTimersByTimeAsync(60_000)
-      })
-      const sends = () =>
-        mocks.call.mock.calls.filter(([, method]) => method === 'agentSession.send')
-      expect(sends()).toHaveLength(1)
-      expect(view.result.current.send('New prompt', [])).toBe(true)
-      expect(view.result.current.error).toBeNull()
-      expect(readOutbox(args.sessionId).map((queued) => queued.clientMessageId)).toContain(
-        entry.clientMessageId
-      )
-      view.unmount()
-    }
-  )
-})
diff --git a/src/renderer/src/components/native-chat/use-structured-agent-session.rewind.test.tsx b/src/renderer/src/components/native-chat/use-structured-agent-session.rewind.test.tsx
index 34ae77bcb4ce..e1920b5b5804 100644
--- a/src/renderer/src/components/native-chat/use-structured-agent-session.rewind.test.tsx
+++ b/src/renderer/src/components/native-chat/use-structured-agent-session.rewind.test.tsx
@@ -11,7 +11,6 @@ const mocks = vi.hoisted(() => ({
   toastError: vi.fn(),
   toastMessage: vi.fn(),
   outboxSend: vi.fn(),
-  outboxRetry: vi.fn(),
   remoteCapabilities: new Set<string>()
 }))
 
@@ -55,13 +54,15 @@ vi.mock('./use-structured-agent-session-read', () => ({
   })
 }))
 
-vi.mock('./use-structured-agent-session-outbox', () => ({
-  structuredSessionOperationId: mocks.operationId,
-  useStructuredAgentSessionOutbox: () => ({
-    outbox: [],
+vi.mock('./structured-agent-session-operation-id', () => ({
+  structuredSessionOperationId: mocks.operationId
+}))
+vi.mock('./use-structured-agent-session-sends', () => ({
+  useStructuredAgentSessionSends: () => ({
+    pending: [],
     error: null,
     send: mocks.outboxSend,
-    retry: mocks.outboxRetry
+    stopSends: vi.fn()
   })
 }))
 
@@ -246,9 +247,7 @@ describe('useStructuredAgentSession rewind RPC', () => {
     expect(mocks.toastError).toHaveBeenCalledExactlyOnceWith(nativeChatRewindReturnedUnknownCopy())
     expect(view.result.current.error).toBeNull()
     view.result.current.send('Prompt', [])
-    view.result.current.retry('message-1')
     expect(mocks.outboxSend).toHaveBeenCalledOnce()
-    expect(mocks.outboxRetry).toHaveBeenCalledOnce()
   })
 
   it("lets the host's in-doubt latch disable only the action", async () => {
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 d9956651626b..d18fad4a2a5d 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
@@ -42,13 +42,15 @@ vi.mock('./use-structured-agent-session-read', () => ({
   })
 }))
 
-vi.mock('./use-structured-agent-session-outbox', () => ({
-  structuredSessionOperationId: mocks.operationId,
-  useStructuredAgentSessionOutbox: () => ({
-    outbox: [],
+vi.mock('./structured-agent-session-operation-id', () => ({
+  structuredSessionOperationId: mocks.operationId
+}))
+vi.mock('./use-structured-agent-session-sends', () => ({
+  useStructuredAgentSessionSends: () => ({
+    pending: [],
     error: null,
     send: vi.fn(),
-    retry: vi.fn()
+    stopSends: vi.fn()
   })
 }))
 
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 2f1d8d0fd8ed..fd220e76c9fa 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
@@ -1,14 +1,14 @@
 import { useMemo, useRef } from 'react'
 import * as structuredConversationCommands from './structured-conversation-command-send'
 import type { AgentSessionPromptResult } from '../../../../shared/agent-session-wire'
-import { useStructuredAgentSessionOutbox } from './use-structured-agent-session-outbox'
-import type {
-  AgentSessionConversationCommand,
-  AgentSessionConversationCommandResult
-} from '../../../../shared/agent-session-conversation-command'
+import { useStructuredAgentSessionSends } from './use-structured-agent-session-sends'
+import { useStructuredAgentSessionCommandWrite } from './use-structured-agent-session-command-write'
+import { structuredAgentSessionNewSendsQueue } from './structured-agent-session-queue-request'
+import type { AgentSessionConversationCommand } from '../../../../shared/agent-session-conversation-command'
 import type { AgentType } from '../../../../shared/agent-status-types'
 import type { RuntimeClientTarget } from '@/runtime/runtime-rpc-client'
 import { structuredAgentLabel } from '@/lib/structured-agent-session-launch-label'
+import { takeBackStructuredLaunchPrompts } from '@/lib/structured-agent-session-launch-prompt'
 import {
   supportsStructuredAgentSessionPromptCancel,
   supportsStructuredAgentSessionQuestionAnswers
@@ -33,10 +33,9 @@ import { useStructuredAgentSessionThreadGoal } from './use-structured-agent-sess
 import { useStructuredAgentSessionContextUsage } from './use-structured-agent-session-context-usage'
 import { useStructuredAgentSessionRailOutline } from './use-structured-agent-session-rail-outline'
 import { useStructuredAgentSessionQueuedMessages } from './use-structured-agent-session-queued-messages'
-import { outboxOutsideQueuedCards } from './structured-agent-session-queued-cards'
+import { pendingSendsOutsideQueuedCards } from './structured-agent-session-queued-cards'
 import { structuredAgentSessionStartFailureFacts } from './structured-agent-session-delivery-notices'
 import { hostStatesTurnScopes } from '../../../../shared/native-chat-turn-membership'
-import { structuredAgentSessionNewSendsQueue } from '../../../../shared/structured-agent-session-outbox-delivery'
 import { pendingPromptsAllUnanswerableHere } from '../../../../shared/agent-session-approval-subject'
 import { withNativeChatCutTurnNotices } from '../../../../shared/native-chat-cut-turn-notice'
 import { useStructuredAgentSessionRewind } from './use-native-chat-rewind'
@@ -56,7 +55,7 @@ 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 Edit copies a card's text into, and that gets back unsent outbox text. */
+  /** The composer Edit copies a card's text into. */
   composerScopeKey?: string
   /** The chat-wide "queue follow-ups" setting; off keeps mid-turn sends immediate. */
   queueFollowUps?: boolean
@@ -133,20 +132,19 @@ export function useStructuredAgentSession(args: {
   // A host's queue waits on any pending prompt, and nothing here can settle one this build cannot
   // answer: the send must start a turn, after which the card's cancel works.
   const queueEnabled = queueFollowUps && !pendingPromptsAllUnanswerableHere(prompts)
-  const queueDelivery = useMemo(
+  const queue = useMemo(
     () => ({ capability: queueCapability, enabled: queueEnabled }),
     [queueCapability, queueEnabled]
   )
-  const outboxController = useStructuredAgentSessionOutbox({
+  const sends = useStructuredAgentSessionSends({
     sessionId,
     target,
     // Never held for an in-doubt rewind: the host recovers it on the next send.
     fence: transportState.fence,
     submissions: transportState.submissions,
-    journalItems: transportState.journalItems,
-    composerScopeKey,
-    queueDelivery,
     queuedMessageIds,
+    queue,
+    historyLoaded: transportEnabled && state.status === 'ready',
     isWorking: transportState.isWorking,
     stopping: stopControl.stopping
   })
@@ -168,13 +166,16 @@ export function useStructuredAgentSession(args: {
     enabled: providerVisible
   })
 
-  const { outbox } = outboxController
+  const { pending } = sends
+  const commandWrite = useStructuredAgentSessionCommandWrite(sessionId, write)
+  // Out and unsettled: the chat takes no other send, and Stop stops it.
+  const sending = pending.some((entry) => entry.phase === 'sending')
   // What the host refuses a conversation command or a rewind behind.
   const conversationBusy = Boolean(
     transportState.turnId ||
     prompts.length ||
     transportState.backgroundTasks.isMonitoring ||
-    outbox.length
+    sending
   )
   const rewind = useStructuredAgentSessionRewind({
     sessionId,
@@ -189,9 +190,9 @@ export function useStructuredAgentSession(args: {
   })
   // A queued send is a card, never a transcript bubble.
   const isWorking = transportState.isWorking || transportState.queueSendsNext
-  const transcriptOutbox = useMemo(
-    () => outboxOutsideQueuedCards(outbox, queuedMessageIds, isWorking, queueDelivery),
-    [isWorking, outbox, queueDelivery, queuedMessageIds]
+  const transcriptPending = useMemo(
+    () => pendingSendsOutsideQueuedCards(pending, queuedMessageIds, isWorking),
+    [isWorking, pending, queuedMessageIds]
   )
   // What the transcript reads: the journal plus the one notice a cut turn with no row gets.
   const transcriptItems = useMemo(
@@ -203,7 +204,7 @@ export function useStructuredAgentSession(args: {
   )
   const messages = useStructuredAgentSessionMessages(
     transcriptItems,
-    transcriptOutbox,
+    transcriptPending,
     transportState.submissions
   )
   const queuedController = useStructuredAgentSessionQueuedMessages({
@@ -226,12 +227,7 @@ export function useStructuredAgentSession(args: {
         pending: commandPending,
         blocked: conversationBusy || rewind.blockedRef.current,
         startFailures: () => structuredAgentSessionStartFailureFacts(stateRef.current.items),
-        send: (command) =>
-          write<AgentSessionConversationCommandResult>(
-            'agentSession.conversationCommand',
-            'agentSession.conversationCommand',
-            { command }
-          )
+        send: commandWrite
       }),
     journalItems: transcriptItems,
     /** The host's newest turn record, which places a live turn whose record is not loaded. */
@@ -239,8 +235,9 @@ export function useStructuredAgentSession(args: {
     subagentRoster: transportState.subagentRoster,
     messages,
     status: transportEnabled ? state.status : 'ready',
-    /** The outbox's own line; a failed read is worded from `readRefusal`, never its text. */
-    error: outboxController.error,
+    /** Why the last message came back to the composer; a failed read is worded from
+     *  `readRefusal`, never its text. */
+    error: sends.error,
     /** The refusal the failed read met, while `status` is `error`. */
     readRefusal: transportEnabled ? state.readRefusal : undefined,
     hasOlder: transportEnabled && state.hasOlder,
@@ -249,17 +246,17 @@ export function useStructuredAgentSession(args: {
     olderHistoryGeneration,
     loadOlder,
     prompts,
-    outbox,
-    failedHere: outboxController.failedHere,
+    pending,
+    /** A send is out, or a /clear holds sends; the chat takes none until it settles. */
+    sendOut: sending || sends.held,
     /** The journal's rows for sent messages, which carry a rejected message's whole fact. */
     submissions: transportState.submissions,
     // A message typed during a command queues behind it on the host.
-    send: (...input: Parameters<typeof outboxController.send>) =>
+    send: (...input: Parameters<typeof sends.send>) =>
       // Legacy: an older host refuses sends while a command runs; removable once those hosts age out.
       (!commandPending.current || hostStatesTurnScopes(transportState.journalItems)) &&
       rewind.admitsSend() &&
-      outboxController.send(...input),
-    retry: rewind.unlessBlocked(outboxController.retry),
+      sends.send(...input),
     isWorking,
     queueSendsNext: transportState.queueSendsNext,
     workingStartedAt: transportState.turnTiming.workingStartedAt,
@@ -271,20 +268,24 @@ export function useStructuredAgentSession(args: {
       published: transportEnabled,
       host: stopControl,
       transportState,
-      outbox: outboxController
+      sends: {
+        sending,
+        stopSends: sends.stopSends,
+        takeBackLaunchText: () => takeBackStructuredLaunchPrompts(sessionId)
+      }
     }),
     stopPressed: stopControl.pressed,
     queuedMessages: queuedController,
     /** A send made now while the agent works is held as a queued card: the host queues, and this
      *  send asks it to (the setting is on and no pending prompt blocks the queue). */
-    sendsQueue: structuredAgentSessionNewSendsQueue(queueDelivery),
-    cancel: async (turnId: string, prompt?: StructuredPromptCancelTarget) => {
+    sendsQueue: structuredAgentSessionNewSendsQueue(queue),
+    cancel: async (turnId: string | undefined, prompt?: StructuredPromptCancelTarget) => {
       // Capability negotiation must complete before mutate fingerprints the payload:
       // older hosts reject the strict prompt field.
       const promptSupported =
         prompt !== undefined && (await supportsStructuredAgentSessionPromptCancel(target))
       return mutate('agentSession.cancel', 'agentSession.cancel', {
-        turnId,
+        ...(turnId ? { turnId } : {}),
         ...(promptSupported ? { prompt } : {})
       })
     },
diff --git a/src/renderer/src/components/native-chat/use-structured-chat-live-session.ts b/src/renderer/src/components/native-chat/use-structured-chat-live-session.ts
new file mode 100644
index 000000000000..1c3e8ad155a3
--- /dev/null
+++ b/src/renderer/src/components/native-chat/use-structured-chat-live-session.ts
@@ -0,0 +1,57 @@
+import { useMemo } from 'react'
+import type { NativeChatLiveSession } from './use-native-chat-live-session'
+import type { useStructuredAgentSession } from './use-structured-agent-session'
+import type { structuredChatHistoryPhase } from './native-chat-view-state'
+
+type StructuredChatController = Pick<
+  ReturnType<typeof useStructuredAgentSession>,
+  | 'messages'
+  | 'status'
+  | 'isWorking'
+  | 'error'
+  | 'hasOlder'
+  | 'loadingOlder'
+  | 'olderHistoryGeneration'
+  | 'loadOlder'
+>
+
+/** The structured chat as the shared transcript reads it: its rows, and a status that stays
+ *  `loading` until the chat's history is known. */
+export function useStructuredChatLiveSession(
+  controller: StructuredChatController,
+  historyPhase: ReturnType<typeof structuredChatHistoryPhase>,
+  sessionId: string,
+  agent: NativeChatLiveSession['agent'],
+  hostReachable: boolean
+): NativeChatLiveSession {
+  return useMemo<NativeChatLiveSession>(
+    () => ({
+      messages: controller.messages,
+      status:
+        controller.status === 'error'
+          ? 'error'
+          : historyPhase !== 'known'
+            ? 'loading'
+            : controller.isWorking
+              ? 'working'
+              : controller.messages.length === 0
+                ? 'empty'
+                : 'ready',
+      sessionId,
+      agent,
+      ...(controller.error ? { error: controller.error } : {}),
+      // Older pages can't load while the host is unreachable, so the row waits for it.
+      hasMore: controller.hasOlder && hostReachable,
+      loadingEarlier: controller.loadingOlder,
+      olderHistoryGeneration: controller.olderHistoryGeneration,
+      loadEarlier: controller.loadOlder,
+      readPhase:
+        controller.status === 'loading'
+          ? 'loading'
+          : controller.status === 'error'
+            ? 'error'
+            : 'ready'
+    }),
+    [controller, historyPhase, agent, sessionId, hostReachable]
+  )
+}
diff --git a/src/renderer/src/components/native-chat/use-structured-native-chat-pane-commands.test.tsx b/src/renderer/src/components/native-chat/use-structured-native-chat-pane-commands.test.tsx
index 1076dc62d34f..0975e1be319e 100644
--- a/src/renderer/src/components/native-chat/use-structured-native-chat-pane-commands.test.tsx
+++ b/src/renderer/src/components/native-chat/use-structured-native-chat-pane-commands.test.tsx
@@ -41,6 +41,9 @@ vi.mock('@/components/ui/tooltip', () => {
 vi.mock('@/components/tab-bar/TabWorkspaceLayoutMenuSection', () => ({
   TabWorkspaceLayoutMenuSection: () => null
 }))
+vi.mock('@/components/tab-bar/tab-move-to-pane-column', () => ({
+  canMoveTabToNewPaneColumn: () => false
+}))
 vi.mock('@/store', () => ({
   useAppStore: (select: (state: { keybindings: object }) => unknown) => select({ keybindings: {} })
 }))
@@ -71,6 +74,7 @@ function StructuredChatTab(): ReactNode {
     isVisible: true,
     rootRef: createRef<HTMLDivElement>(),
     composerRef: createRef<NativeChatComposerHandle>(),
+    questionAnswerInputRef: createRef<HTMLInputElement>(),
     sessionId: SESSION,
     target: TARGET
   })
diff --git a/src/renderer/src/components/native-chat/use-structured-native-chat-pane-commands.ts b/src/renderer/src/components/native-chat/use-structured-native-chat-pane-commands.ts
index b3aef76f7ee6..06bc0d47126a 100644
--- a/src/renderer/src/components/native-chat/use-structured-native-chat-pane-commands.ts
+++ b/src/renderer/src/components/native-chat/use-structured-native-chat-pane-commands.ts
@@ -21,6 +21,7 @@ export function useStructuredNativeChatPaneCommands({
   isVisible,
   rootRef,
   composerRef,
+  questionAnswerInputRef,
   terminalPaneActions,
   sessionId,
   target
@@ -30,6 +31,7 @@ export function useStructuredNativeChatPaneCommands({
   isVisible: boolean
   rootRef: RefObject<HTMLDivElement | null>
   composerRef: RefObject<NativeChatComposerHandle | null>
+  questionAnswerInputRef: RefObject<HTMLInputElement | null>
   terminalPaneActions?: Omit<NativeChatContextMenuActions, 'onPaste'>
   sessionId: string
   target: RuntimeClientTarget
@@ -42,7 +44,11 @@ export function useStructuredNativeChatPaneCommands({
         : undefined,
     [sessionId, target]
   )
-  const pasteClipboardIntoComposer = useNativeChatPasteBridge({ rootRef, composerRef })
+  const pasteClipboardIntoComposer = useNativeChatPasteBridge({
+    rootRef,
+    composerRef,
+    questionAnswerInputRef
+  })
   const contextMenu = useNativeChatContextMenu({
     rootRef,
     actions: {
@@ -52,6 +58,7 @@ export function useStructuredNativeChatPaneCommands({
     },
     enabled: isVisible,
     resolveOrcaSessionId,
+    composerRef,
     showTerminalPaneActions: terminalPaneActions !== undefined,
     splitShortcutLabels: {
       right: formatShortcutLabel('terminal.splitRight', keybindings),
diff --git a/src/renderer/src/components/native-chat/use-structured-native-chat-submit-reveal.test.ts b/src/renderer/src/components/native-chat/use-structured-native-chat-submit-reveal.test.ts
index 5e076f58dbf3..69767fb79282 100644
--- a/src/renderer/src/components/native-chat/use-structured-native-chat-submit-reveal.test.ts
+++ b/src/renderer/src/components/native-chat/use-structured-native-chat-submit-reveal.test.ts
@@ -3,11 +3,10 @@ import { act, renderHook } from '@testing-library/react'
 import { expect, it, vi } from 'vitest'
 import { useStructuredNativeChatSubmitReveal } from './use-structured-native-chat-submit-reveal'
 
-it('reveals before Retry, but waits for a successful queue Resume', async () => {
+it('reveals before launch Retry, but waits for a successful queue Resume', async () => {
   const order: string[] = []
   const controller = {
     respond: vi.fn(async () => null),
-    retry: vi.fn(() => order.push('retry')),
     queuedMessages: {
       queueCapable: true,
       cards: [],
@@ -29,10 +28,8 @@ it('reveals before Retry, but waits for a successful queue Resume', async () =>
   const { result } = renderHook(() => useStructuredNativeChatSubmitReveal(controller, retryLaunch))
   result.current.messageListRef.current = { revealLatest: () => order.push('reveal') }
 
-  act(() => result.current.retryDelivery('client-1'))
   act(() => result.current.retryLaunch())
   await act(() => result.current.queuedMessages.resume())
 
-  expect(controller.retry).toHaveBeenCalledWith('client-1')
-  expect(order).toEqual(['reveal', 'retry', 'reveal', 'launch', 'resume', 'reveal'])
+  expect(order).toEqual(['reveal', 'launch', 'resume', 'reveal'])
 })
diff --git a/src/renderer/src/components/native-chat/use-structured-native-chat-submit-reveal.ts b/src/renderer/src/components/native-chat/use-structured-native-chat-submit-reveal.ts
index 1a6bf36cc7cb..c78372a76e0d 100644
--- a/src/renderer/src/components/native-chat/use-structured-native-chat-submit-reveal.ts
+++ b/src/renderer/src/components/native-chat/use-structured-native-chat-submit-reveal.ts
@@ -1,7 +1,7 @@
 // Local actions reveal this pane at the press. Resume reveals once the host lifts the pause;
 // host delivery, queued drafts and Stop never move the reader.
 
-import { useCallback, useEffect, useMemo, useRef } from 'react'
+import { useCallback, useMemo } from 'react'
 import {
   useNativeChatRevealLatest,
   type NativeChatMessageListHandle
@@ -12,32 +12,19 @@ import type { StructuredAgentSessionQueuedMessagesController } from './use-struc
 type StructuredController = ReturnType<typeof useStructuredAgentSession>
 
 export function useStructuredNativeChatSubmitReveal(
-  controller: Pick<StructuredController, 'respond' | 'retry' | 'queuedMessages'>,
-  /** Relaunches a start that failed; the messages parked behind it go out on publish. */
+  controller: Pick<StructuredController, 'respond' | 'queuedMessages'>,
+  /** Relaunches a start that failed. */
   retryLaunch: () => void
 ): {
   messageListRef: React.RefObject<NativeChatMessageListHandle | null>
   /** For the composer, which reveals as it sends. */
   revealLatest: () => void
-  retryDelivery: (clientMessageId: string) => void
   retryLaunch: () => void
   respond: StructuredController['respond']
   queuedMessages: StructuredAgentSessionQueuedMessagesController
 } {
   const { messageListRef, revealLatest } = useNativeChatRevealLatest()
   const { respond, queuedMessages } = controller
-  // 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) => {
-      revealLatest()
-      retryRef.current(clientMessageId)
-    },
-    [revealLatest]
-  )
   const revealingRetryLaunch = useCallback(() => {
     revealLatest()
     retryLaunch()
@@ -80,7 +67,6 @@ export function useStructuredNativeChatSubmitReveal(
   return {
     messageListRef,
     revealLatest,
-    retryDelivery,
     retryLaunch: revealingRetryLaunch,
     respond: revealingRespond,
     queuedMessages: revealingQueue
diff --git a/src/renderer/src/components/native-chat/use-structured-prompt-response-hold.ts b/src/renderer/src/components/native-chat/use-structured-prompt-response-hold.ts
new file mode 100644
index 000000000000..c8df4b82903e
--- /dev/null
+++ b/src/renderer/src/components/native-chat/use-structured-prompt-response-hold.ts
@@ -0,0 +1,37 @@
+import { useCallback, useState } from 'react'
+import type { useStructuredAgentSession } from './use-structured-agent-session'
+
+type Respond = ReturnType<typeof useStructuredAgentSession>['respond']
+type PromptItem = Parameters<Respond>[0]
+
+const promptKey = (item: PromptItem): string => `${item.itemId}:${item.revision}`
+
+/**
+ * Holds a prompt card from the press until the host refuses the response. An accepted one stays
+ * held: the host retires that prompt, and a second response to it would only be refused.
+ */
+export function useStructuredPromptResponseHold(respond: Respond): {
+  respond: Respond
+  holds: (item: PromptItem) => boolean
+} {
+  const [heldKey, setHeldKey] = useState<string | null>(null)
+  const holdingRespond = useCallback<Respond>(
+    async (item, response) => {
+      const key = promptKey(item)
+      setHeldKey(key)
+      const release = (): void => setHeldKey((held) => (held === key ? null : held))
+      try {
+        const result = await respond(item, response)
+        if (result === null) {
+          release()
+        }
+        return result
+      } catch (error) {
+        release()
+        throw error
+      }
+    },
+    [respond]
+  )
+  return { respond: holdingRespond, holds: (item) => heldKey === promptKey(item) }
+}
diff --git a/src/renderer/src/components/native-chat/use-undelivered-structured-agent-session-outbox.ts b/src/renderer/src/components/native-chat/use-undelivered-structured-agent-session-outbox.ts
deleted file mode 100644
index ff46ef167a8c..000000000000
--- a/src/renderer/src/components/native-chat/use-undelivered-structured-agent-session-outbox.ts
+++ /dev/null
@@ -1,20 +0,0 @@
-import { useCallback, useSyncExternalStore } from 'react'
-import {
-  hasUndeliveredStructuredAgentSessionOutbox,
-  subscribeToUndeliveredStructuredAgentSessionOutbox
-} from './structured-agent-session-outbox-storage'
-
-/** Whether this session still owes a delivery, so a caller can keep working on it after the
- *  user's attention has moved elsewhere. */
-export function useUndeliveredStructuredAgentSessionOutbox(sessionId: string): boolean {
-  const getUndelivered = useCallback(
-    () => hasUndeliveredStructuredAgentSessionOutbox(sessionId),
-    [sessionId]
-  )
-  const subscribe = useCallback(
-    (listener: () => void) =>
-      subscribeToUndeliveredStructuredAgentSessionOutbox(sessionId, listener),
-    [sessionId]
-  )
-  return useSyncExternalStore(subscribe, getUndelivered, getUndelivered)
-}
diff --git a/src/renderer/src/components/new-workspace/SmartWorkspaceNameField-provider-boundaries.test.ts b/src/renderer/src/components/new-workspace/SmartWorkspaceNameField-provider-boundaries.test.ts
index 51a394e416be..3e1912250d51 100644
--- a/src/renderer/src/components/new-workspace/SmartWorkspaceNameField-provider-boundaries.test.ts
+++ b/src/renderer/src/components/new-workspace/SmartWorkspaceNameField-provider-boundaries.test.ts
@@ -1,5 +1,5 @@
 import { describe, expect, it } from 'vitest'
-import { canUseGitLabSmartSource } from './SmartWorkspaceNameField'
+import { canUseGitLabSmartSource } from './smart-workspace-provider-availability'
 
 describe('SmartWorkspaceNameField provider boundaries', () => {
   it('advertises local GitLab smart lookup only when local glab is available', () => {
diff --git a/src/renderer/src/components/new-workspace/SmartWorkspaceNameField-repo-slug-routing.test.ts b/src/renderer/src/components/new-workspace/SmartWorkspaceNameField-repo-slug-routing.test.ts
index f2f6d4bd787a..32572a3b7eff 100644
--- a/src/renderer/src/components/new-workspace/SmartWorkspaceNameField-repo-slug-routing.test.ts
+++ b/src/renderer/src/components/new-workspace/SmartWorkspaceNameField-repo-slug-routing.test.ts
@@ -2,7 +2,7 @@ import { beforeEach, describe, expect, it, vi } from 'vitest'
 import { callRuntimeRpc } from '@/runtime/runtime-rpc-client'
 import type * as RuntimeRpcClient from '@/runtime/runtime-rpc-client'
 import type { TaskSourceContext } from '../../../../shared/task-source-context'
-import { getRepoSlugCached } from './SmartWorkspaceNameField'
+import { getRepoSlugCached } from './smart-workspace-repo-slug'
 
 vi.mock('@/runtime/runtime-rpc-client', async (importOriginal) => ({
   ...(await importOriginal<typeof RuntimeRpcClient>()),
diff --git a/src/renderer/src/components/new-workspace/SmartWorkspaceNameField.jira-accessibility.test.tsx b/src/renderer/src/components/new-workspace/SmartWorkspaceNameField.jira-accessibility.test.tsx
index 54c2e0832c74..51018fb8c446 100644
--- a/src/renderer/src/components/new-workspace/SmartWorkspaceNameField.jira-accessibility.test.tsx
+++ b/src/renderer/src/components/new-workspace/SmartWorkspaceNameField.jira-accessibility.test.tsx
@@ -4,9 +4,8 @@ import React, { act } from 'react'
 import { cleanup, createEvent, fireEvent, render, screen } from '@testing-library/react'
 import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest'
 import type { JiraIssue } from '../../../../shared/jira-types'
-import SmartWorkspaceNameField, {
-  type SmartWorkspaceNameSelection
-} from './SmartWorkspaceNameField'
+import SmartWorkspaceNameField from './SmartWorkspaceNameField'
+import type { SmartWorkspaceNameSelection } from './smart-workspace-name-field-model'
 
 const jiraMock = vi.hoisted(() => ({
   retry: vi.fn(),
diff --git a/src/renderer/src/components/new-workspace/SmartWorkspaceNameField.tsx b/src/renderer/src/components/new-workspace/SmartWorkspaceNameField.tsx
index f9165998e5af..4d7c34423fa1 100644
--- a/src/renderer/src/components/new-workspace/SmartWorkspaceNameField.tsx
+++ b/src/renderer/src/components/new-workspace/SmartWorkspaceNameField.tsx
@@ -3,13 +3,6 @@ import { renderSmartWorkspaceNameField } from './smart-workspace-name-field-surf
 import type { SmartWorkspaceNameFieldProps } from './smart-workspace-name-field-model'
 import { useSmartWorkspaceNameFieldController } from './use-smart-workspace-name-field-controller'
 
-export type {
-  SmartWorkspaceNameSelection,
-  SmartWorkspaceNameFieldProps
-} from './smart-workspace-name-field-model'
-export { canUseGitLabSmartSource } from './smart-workspace-provider-availability'
-export { getRepoSlugCached } from './smart-workspace-repo-slug'
-
 export default function SmartWorkspaceNameField(
   props: SmartWorkspaceNameFieldProps
 ): React.JSX.Element {
diff --git a/src/renderer/src/components/new-workspace/SmartWorkspaceSourceResultList.tsx b/src/renderer/src/components/new-workspace/SmartWorkspaceSourceResultList.tsx
new file mode 100644
index 000000000000..f0c62a5f14e5
--- /dev/null
+++ b/src/renderer/src/components/new-workspace/SmartWorkspaceSourceResultList.tsx
@@ -0,0 +1,166 @@
+import React from 'react'
+import { Button } from '@/components/ui/button'
+import { CommandGroup, CommandItem, CommandList } from '@/components/ui/command'
+import { translate } from '@/i18n/i18n'
+import { cn } from '@/lib/utils'
+import { getSmartWorkspaceEmptyHint } from '../../../../shared/new-workspace/smart-workspace-source-results'
+import { getRowItemClassName, RowIcon, RowLabel } from './smart-workspace-source-row-content'
+import type { RowEntry } from './smart-workspace-name-field-model'
+import type { WorkItemSourceSearch } from './use-work-item-source-search'
+
+export function SmartWorkspaceSourceResultList({
+  model,
+  onSelect,
+  isLinked,
+  beforeResults,
+  emptyHint,
+  isRowDisabled
+}: {
+  model: Pick<
+    WorkItemSourceSearch,
+    | 'mode'
+    | 'mrStateFilters'
+    | 'mrStateFilter'
+    | 'setMrStateFilter'
+    | 'typedTextActionRow'
+    | 'jiraSource'
+    | 'loading'
+    | 'searchResultRows'
+    | 'linearStatusChecked'
+    | 'linearStatus'
+    | 'showJiraSiteContext'
+    | 'jiraConnectionStatus'
+    | 'reserveLinearLoadingResults'
+    | 'showLinearUrlLoadingFeedback'
+  >
+  onSelect: (row: RowEntry) => void
+  isLinked?: (row: RowEntry) => boolean
+  beforeResults?: React.ReactNode
+  emptyHint?: string
+  isRowDisabled?: (row: RowEntry) => boolean
+}): React.JSX.Element {
+  const {
+    mode,
+    mrStateFilters,
+    mrStateFilter,
+    setMrStateFilter,
+    typedTextActionRow,
+    jiraSource,
+    loading,
+    searchResultRows,
+    linearStatusChecked,
+    linearStatus,
+    showJiraSiteContext,
+    jiraConnectionStatus,
+    reserveLinearLoadingResults,
+    showLinearUrlLoadingFeedback
+  } = model
+  return (
+    <>
+      {mode === 'gitlab' ? (
+        // Why: state chips mirror GitLab's merge-request tab strip.
+        <div
+          className="flex shrink-0 items-center gap-1 border-b border-border/40 px-2 py-1.5"
+          onMouseDown={(e) => e.preventDefault()}
+        >
+          {mrStateFilters.map(({ id, label }) => (
+            <Button
+              key={id}
+              type="button"
+              variant={mrStateFilter === id ? 'secondary' : 'ghost'}
+              size="sm"
+              onClick={() => setMrStateFilter(id)}
+              className="h-6 px-2 text-xs"
+            >
+              {label}
+            </Button>
+          ))}
+        </div>
+      ) : null}
+      <CommandList className="!max-h-none min-h-0 flex-1 scrollbar-sleek">
+        {beforeResults}
+        {typedTextActionRow ? (
+          <div
+            className="sticky top-0 z-10 border-b border-border/40 bg-popover p-1"
+            onMouseDown={(event) => event.preventDefault()}
+          >
+            <CommandItem
+              selection="palette"
+              key={typedTextActionRow.value}
+              value={typedTextActionRow.value}
+              onSelect={() => onSelect(typedTextActionRow)}
+              className={getRowItemClassName(typedTextActionRow, { pinnedAction: true })}
+            >
+              <RowIcon row={typedTextActionRow} />
+              <RowLabel row={typedTextActionRow} />
+            </CommandItem>
+          </div>
+        ) : null}
+        {jiraSource.errorKind ? null : reserveLinearLoadingResults ? (
+          <div
+            aria-hidden="true"
+            className={cn('space-y-1 p-1', !showLinearUrlLoadingFeedback && 'invisible')}
+          >
+            {[0, 1, 2].map((index) => (
+              <div
+                key={index}
+                className={cn(
+                  'h-8 rounded bg-muted/40',
+                  showLinearUrlLoadingFeedback && 'animate-pulse'
+                )}
+              />
+            ))}
+          </div>
+        ) : loading && searchResultRows.length === 0 ? (
+          <div className="space-y-1 p-1">
+            {[0, 1, 2].map((index) => (
+              <div key={index} className="h-8 animate-pulse rounded bg-muted/40" />
+            ))}
+          </div>
+        ) : searchResultRows.length === 0 && !typedTextActionRow ? (
+          <div className="px-3 py-6 text-center text-xs text-muted-foreground">
+            {jiraSource.intent
+              ? null
+              : mode === 'linear' && linearStatusChecked && !linearStatus.connected
+                ? translate(
+                    'auto.components.new.workspace.SmartWorkspaceNameField.3e8bb1176a',
+                    'Connect Linear in Settings to search issues.'
+                  )
+                : (emptyHint ?? getSmartWorkspaceEmptyHint(mode))}
+          </div>
+        ) : searchResultRows.length > 0 ? (
+          <CommandGroup className="p-1">
+            {searchResultRows.map((row) => (
+              <CommandItem
+                selection="palette"
+                key={row.value}
+                value={row.value}
+                disabled={isLinked?.(row) || isRowDisabled?.(row)}
+                onSelect={() => onSelect(row)}
+                className={getRowItemClassName(row)}
+              >
+                <RowIcon row={row} />
+                <RowLabel
+                  row={row}
+                  jiraSite={
+                    showJiraSiteContext && row.kind === 'jira'
+                      ? (jiraConnectionStatus?.sites?.find(
+                          (site) => site.id === row.issue.siteId
+                        ) ?? null)
+                      : null
+                  }
+                  showJiraSiteContext={showJiraSiteContext}
+                />
+                {isLinked?.(row) ? (
+                  <span className="ml-auto shrink-0 text-xs text-muted-foreground">
+                    {translate('workspace.links.linkedResult', 'Linked')}
+                  </span>
+                ) : null}
+              </CommandItem>
+            ))}
+          </CommandGroup>
+        ) : null}
+      </CommandList>
+    </>
+  )
+}
diff --git a/src/renderer/src/components/new-workspace/SmartWorkspaceSourceTabs.tsx b/src/renderer/src/components/new-workspace/SmartWorkspaceSourceTabs.tsx
new file mode 100644
index 000000000000..830ad898532b
--- /dev/null
+++ b/src/renderer/src/components/new-workspace/SmartWorkspaceSourceTabs.tsx
@@ -0,0 +1,57 @@
+import React from 'react'
+import { Tabs, TabsList, TabsTrigger } from '@/components/ui/tabs'
+import type { WorkItemSourceSearch } from './use-work-item-source-search'
+
+export function SmartWorkspaceSourceTabs({
+  model,
+  onModeChange,
+  inputRef,
+  tabsListRef
+}: {
+  model: Pick<WorkItemSourceSearch, 'mode' | 'availableModes'>
+  onModeChange: (mode: WorkItemSourceSearch['mode']) => void
+  inputRef?: React.RefObject<HTMLInputElement | null>
+  tabsListRef?: React.RefObject<HTMLDivElement | null>
+}): React.JSX.Element {
+  return (
+    <div className="flex min-w-0 items-center gap-2 border-b border-border/40">
+      <Tabs
+        value={model.mode}
+        onValueChange={(value) => {
+          const mode = model.availableModes.find((item) => item.id === value)?.id
+          if (mode) {
+            onModeChange(mode)
+          }
+        }}
+        className="min-w-0 flex-1 gap-0"
+      >
+        <TabsList
+          ref={tabsListRef}
+          variant="line"
+          className="h-7 w-full justify-start gap-4 overflow-x-auto overflow-y-hidden px-0 scrollbar-sleek"
+          onFocusCapture={(event) => {
+            const previous = event.relatedTarget instanceof HTMLElement ? event.relatedTarget : null
+            const list = event.currentTarget
+            if (previous && previous !== inputRef?.current && !list.contains(previous)) {
+              event.stopPropagation()
+              inputRef?.current?.focus({ preventScroll: true })
+            }
+          }}
+        >
+          {model.availableModes.map(({ id, label, Icon }) => (
+            <TabsTrigger
+              key={id}
+              value={id}
+              tabIndex={-1}
+              data-smart-name-mode={id}
+              className="flex-none gap-1.5 px-0 text-xs"
+            >
+              <Icon className="size-3.5" />
+              <span>{label}</span>
+            </TabsTrigger>
+          ))}
+        </TabsList>
+      </Tabs>
+    </div>
+  )
+}
diff --git a/src/renderer/src/components/new-workspace/base-ref-picker-visibility.ts b/src/renderer/src/components/new-workspace/base-ref-picker-visibility.ts
index 5a86e8310214..721a6a2af6cf 100644
--- a/src/renderer/src/components/new-workspace/base-ref-picker-visibility.ts
+++ b/src/renderer/src/components/new-workspace/base-ref-picker-visibility.ts
@@ -1,5 +1,5 @@
-import type { SmartWorkspaceNameSelection } from '@/components/new-workspace/SmartWorkspaceNameField'
-import type { SmartNameMode } from './smart-workspace-source-results'
+import type { SmartWorkspaceNameSelection } from '@/components/new-workspace/smart-workspace-name-field-model'
+import type { SmartNameMode } from '../../../../shared/new-workspace/smart-workspace-source-results'
 
 /**
  * Whether the composer offers a base ref for the worktree it is about to create.
diff --git a/src/renderer/src/components/new-workspace/jira-source-status-message.ts b/src/renderer/src/components/new-workspace/jira-source-status-message.ts
new file mode 100644
index 000000000000..95b9537500c4
--- /dev/null
+++ b/src/renderer/src/components/new-workspace/jira-source-status-message.ts
@@ -0,0 +1,43 @@
+import { translate } from '@/i18n/i18n'
+import type { JiraUrlSourceState } from './use-jira-url-source'
+
+export function getJiraSourceStatusMessage(jiraSource: JiraUrlSourceState): string {
+  if (jiraSource.loading) {
+    return translate(
+      'auto.components.new.workspace.SmartWorkspaceNameField.loadingJira',
+      'Loading Jira issue…'
+    )
+  }
+  switch (jiraSource.errorKind) {
+    case 'disconnected':
+      return translate(
+        'auto.components.new.workspace.SmartWorkspaceNameField.jiraDisconnected',
+        'Connect Jira in Settings to link this issue'
+      )
+    case 'site-not-connected':
+      return translate(
+        'auto.components.new.workspace.SmartWorkspaceNameField.jiraSiteNotConnected',
+        'This Jira site is not connected'
+      )
+    case 'update-runtime':
+      return translate(
+        'auto.components.new.workspace.SmartWorkspaceNameField.jiraRuntimeUpdate',
+        'Update the remote runtime to link Jira'
+      )
+    case 'read-failed':
+      return translate(
+        'auto.components.new.workspace.SmartWorkspaceNameField.jiraReadFailed',
+        'Couldn’t load this Jira issue'
+      )
+    case null:
+      return jiraSource.accountChoices.length > 0
+        ? translate(
+            'auto.components.new.workspace.SmartWorkspaceNameField.chooseJiraAccount',
+            'Choose a Jira account'
+          )
+        : translate(
+            'auto.components.new.workspace.SmartWorkspaceNameField.jiraLoaded',
+            'Jira issue loaded'
+          )
+  }
+}
diff --git a/src/renderer/src/components/new-workspace/new-workspace-composer-card-props.ts b/src/renderer/src/components/new-workspace/new-workspace-composer-card-props.ts
index 875d926a7795..a23ac3e22e0e 100644
--- a/src/renderer/src/components/new-workspace/new-workspace-composer-card-props.ts
+++ b/src/renderer/src/components/new-workspace/new-workspace-composer-card-props.ts
@@ -6,9 +6,9 @@ import type {
 } from '@/lib/project-host-setup-options'
 import type { SetupConfig } from '@/lib/new-workspace'
 import type { WorkspaceCreateErrorDisplay } from '@/lib/workspace-create-error-format'
-import type { SmartNameMode } from '@/components/new-workspace/smart-workspace-source-results'
-import type SmartWorkspaceNameField from '@/components/new-workspace/SmartWorkspaceNameField'
-import type { SmartWorkspaceNameSelection } from '@/components/new-workspace/SmartWorkspaceNameField'
+import type { SmartNameMode } from '../../../../shared/new-workspace/smart-workspace-source-results'
+import type SmartWorkspaceNameField from './SmartWorkspaceNameField'
+import type { SmartWorkspaceNameSelection } from '@/components/new-workspace/smart-workspace-name-field-model'
 import type { GitHubWorkItem } from '../../../../shared/github/work-item-types'
 import type { GitLabWorkItem } from '../../../../shared/gitlab-types'
 import type { JiraIssue } from '../../../../shared/jira-types'
@@ -31,6 +31,8 @@ export type NewWorkspaceComposerCardProps = {
   contextualTourSource?: string
   containerClassName?: string
   contentClassName?: string
+  selectedRepoPath?: string | null
+  onNativeFileDrop?: (paths: string[], isCurrent: () => boolean) => Promise<void>
   composerRef?: React.RefObject<HTMLDivElement | null>
   onComposerNodeChange?: (node: HTMLDivElement | null) => void
   nameInputRef?: React.RefObject<HTMLInputElement | null>
diff --git a/src/renderer/src/components/new-workspace/smart-workspace-localized-options.tsx b/src/renderer/src/components/new-workspace/smart-workspace-localized-options.tsx
index 64697e2164d2..44bd03470c87 100644
--- a/src/renderer/src/components/new-workspace/smart-workspace-localized-options.tsx
+++ b/src/renderer/src/components/new-workspace/smart-workspace-localized-options.tsx
@@ -3,7 +3,7 @@ import { CaseSensitive, GitBranch, Github, Gitlab, Sparkles } from 'lucide-react
 
 import { JiraIcon } from '@/components/icons/JiraIcon'
 import { translate } from '@/i18n/i18n'
-import type { SmartNameMode } from './smart-workspace-source-results'
+import type { SmartNameMode } from '../../../../shared/new-workspace/smart-workspace-source-results'
 
 export type MrStateFilter = 'opened' | 'merged' | 'closed' | 'all'
 
diff --git a/src/renderer/src/components/new-workspace/smart-workspace-name-field-copy.ts b/src/renderer/src/components/new-workspace/smart-workspace-name-field-copy.ts
index ca171335083f..bae8b68ea6ec 100644
--- a/src/renderer/src/components/new-workspace/smart-workspace-name-field-copy.ts
+++ b/src/renderer/src/components/new-workspace/smart-workspace-name-field-copy.ts
@@ -1,5 +1,5 @@
 import { translate } from '@/i18n/i18n'
-import type { SmartNameMode } from './smart-workspace-source-results'
+import type { SmartNameMode } from '../../../../shared/new-workspace/smart-workspace-source-results'
 
 export function getSmartWorkspaceNameFieldCopy({
   repoBackedSourcesDisabled,
diff --git a/src/renderer/src/components/new-workspace/smart-workspace-name-field-model.ts b/src/renderer/src/components/new-workspace/smart-workspace-name-field-model.ts
index c4a85dd95273..52f7b892f84a 100644
--- a/src/renderer/src/components/new-workspace/smart-workspace-name-field-model.ts
+++ b/src/renderer/src/components/new-workspace/smart-workspace-name-field-model.ts
@@ -7,7 +7,10 @@ import type { JiraIssue, JiraSite } from '../../../../shared/jira-types'
 import type { LinearIssue } from '../../../../shared/linear/issue-types'
 import type { BaseRefSearchResult } from '../../../../shared/repo-types'
 import type { TaskSourceContext } from '../../../../shared/task-source-context'
-import type { SmartNameMode, SmartWorkspaceSourceRow } from './smart-workspace-source-results'
+import type {
+  SmartNameMode,
+  SmartWorkspaceSourceRow
+} from '../../../../shared/new-workspace/smart-workspace-source-results'
 
 export type RepoOption = ReturnType<typeof useAppStore.getState>['repos'][number]
 
@@ -26,6 +29,8 @@ export type SmartWorkspaceNameFieldProps = {
   onOpenJiraSettings?: () => void
   selectedSource: SmartWorkspaceNameSelection | null
   onClearSelectedSource: () => void
+  gitlabSourceContext?: TaskSourceContext | null
+  linearSourceContext?: TaskSourceContext | null
   githubSourceContext?: TaskSourceContext | null
   jiraSourceContext?: TaskSourceContext | null
   inputRef?: React.RefObject<HTMLInputElement | null>
@@ -41,27 +46,6 @@ export type SmartWorkspaceNameFieldProps = {
   onActiveSourceModeChange?: (mode: SmartNameMode) => void
 }
 
-export type NormalizedSmartWorkspaceNameFieldProps = Omit<
-  SmartWorkspaceNameFieldProps,
-  | 'jiraSourceContext'
-  | 'disabled'
-  | 'textOnly'
-  | 'branchesEnabled'
-  | 'repoBackedSourcesDisabled'
-  | 'repoBackedSearchRepos'
-  | 'allowCrossRepoProjectAdd'
-  | 'crossRepoSwitchTarget'
-> & {
-  jiraSourceContext: TaskSourceContext | null
-  disabled: boolean
-  textOnly: boolean
-  branchesEnabled: boolean
-  repoBackedSourcesDisabled: boolean
-  repoBackedSearchRepos: readonly RepoOption[]
-  allowCrossRepoProjectAdd: boolean
-  crossRepoSwitchTarget: 'project' | 'task-source'
-}
-
 export type SmartWorkspaceNameSelection = {
   kind: 'github-pr' | 'github-issue' | 'gitlab-mr' | 'gitlab-issue' | 'branch' | 'linear' | 'jira'
   label: string
@@ -103,3 +87,29 @@ export type CachedRepoSlug = RepoSlug
 export const EMPTY_REPO_SEARCH_REPOS: readonly RepoOption[] = []
 export const SEARCH_DEBOUNCE_MS = 200
 export const RESULT_LIMIT = 12
+
+export type WorkItemSourceSearchProps = Pick<
+  SmartWorkspaceNameFieldProps,
+  | 'repos'
+  | 'repoId'
+  | 'value'
+  | 'disabled'
+  | 'textOnly'
+  | 'branchesEnabled'
+  | 'repoBackedSourcesDisabled'
+  | 'repoBackedSearchRepos'
+  | 'crossRepoSwitchTarget'
+  | 'githubSourceContext'
+  | 'gitlabSourceContext'
+  | 'linearSourceContext'
+  | 'jiraSourceContext'
+> & { sourceSelected?: boolean; gitlabEnabled?: boolean; typedTextEnabled?: boolean }
+export type NormalizedWorkItemSourceSearchProps = WorkItemSourceSearchProps & {
+  disabled: boolean
+  textOnly: boolean
+  branchesEnabled: boolean
+  repoBackedSourcesDisabled: boolean
+  repoBackedSearchRepos: readonly RepoOption[]
+  crossRepoSwitchTarget: 'project' | 'task-source'
+  jiraSourceContext: TaskSourceContext | null
+}
diff --git a/src/renderer/src/components/new-workspace/smart-workspace-name-field-surface.tsx b/src/renderer/src/components/new-workspace/smart-workspace-name-field-surface.tsx
index 3e14c244ec4b..64dc62e65afa 100644
--- a/src/renderer/src/components/new-workspace/smart-workspace-name-field-surface.tsx
+++ b/src/renderer/src/components/new-workspace/smart-workspace-name-field-surface.tsx
@@ -2,74 +2,24 @@ import React from 'react'
 import { Button } from '@/components/ui/button'
 import { Command } from '@/components/ui/command'
 import { Popover, PopoverAnchor } from '@/components/ui/popover'
-import { Tabs, TabsList, TabsTrigger } from '@/components/ui/tabs'
+import { SmartWorkspaceSourceTabs } from './SmartWorkspaceSourceTabs'
 import { cn } from '@/lib/utils'
 import { translate } from '@/i18n/i18n'
 import { WorkspaceEmojiSuggestionPopover } from '@/components/workspace-emoji/WorkspaceEmojiSuggestionPopover'
 import { renderSmartWorkspaceCrossRepoDialog } from './smart-workspace-cross-repo-dialog'
 import { renderSmartWorkspaceNameInput } from './smart-workspace-name-input-surface'
 import { renderSmartWorkspaceSourceResults } from './smart-workspace-source-results-surface'
-import type { JiraUrlSourceState } from './use-jira-url-source'
+import { getJiraSourceStatusMessage } from './jira-source-status-message'
 import type { SmartWorkspaceNameFieldController } from './use-smart-workspace-name-field-controller'
 
-function getJiraSourceStatusMessage(jiraSource: JiraUrlSourceState): string {
-  if (jiraSource.loading) {
-    return translate(
-      'auto.components.new.workspace.SmartWorkspaceNameField.loadingJira',
-      'Loading Jira issue…'
-    )
-  }
-  switch (jiraSource.errorKind) {
-    case 'disconnected':
-      return translate(
-        'auto.components.new.workspace.SmartWorkspaceNameField.jiraDisconnected',
-        'Connect Jira in Settings to link this issue'
-      )
-    case 'site-not-connected':
-      return translate(
-        'auto.components.new.workspace.SmartWorkspaceNameField.jiraSiteNotConnected',
-        'This Jira site is not connected'
-      )
-    case 'update-runtime':
-      return translate(
-        'auto.components.new.workspace.SmartWorkspaceNameField.jiraRuntimeUpdate',
-        'Update the remote runtime to link Jira'
-      )
-    case 'read-failed':
-      return translate(
-        'auto.components.new.workspace.SmartWorkspaceNameField.jiraReadFailed',
-        'Couldn’t load this Jira issue'
-      )
-    case null:
-      return jiraSource.accountChoices.length > 0
-        ? translate(
-            'auto.components.new.workspace.SmartWorkspaceNameField.chooseJiraAccount',
-            'Choose a Jira account'
-          )
-        : translate(
-            'auto.components.new.workspace.SmartWorkspaceNameField.jiraLoaded',
-            'Jira issue loaded'
-          )
-  }
-}
-
 export function renderSmartWorkspaceNameField(
   controller: SmartWorkspaceNameFieldController
 ): React.JSX.Element {
   const {
-    textOnly,
     mode,
-    onActiveSourceModeChange,
-    setMode,
+    localInputRef,
     disabled,
     selectedSource,
-    markSourcePopoverUserEngaged,
-    setOpen,
-    cancelLocalInputFocusFrame,
-    localInputFocusFrameRef,
-    localInputRef,
-    tabsListRef,
-    availableModes,
     open,
     handleSourcePopoverOpenChange,
     resolvedCommandValue,
@@ -90,62 +40,13 @@ export function renderSmartWorkspaceNameField(
 
   return (
     <div className="min-w-0 space-y-1.5">
-      {textOnly ? null : (
-        <div className="flex min-w-0 items-center gap-2 border-b border-border/40">
-          <Tabs
-            value={mode}
-            onValueChange={(next) => {
-              const nextMode = next as typeof mode
-              onActiveSourceModeChange?.(nextMode)
-              setMode(nextMode)
-              if (!disabled && nextMode !== 'text' && selectedSource === null) {
-                markSourcePopoverUserEngaged()
-                setOpen(true)
-              } else {
-                setOpen(false)
-              }
-              cancelLocalInputFocusFrame()
-              localInputFocusFrameRef.current = requestAnimationFrame(() => {
-                localInputFocusFrameRef.current = null
-                localInputRef.current?.focus({ preventScroll: true })
-              })
-            }}
-            className="min-w-0 flex-1 gap-0"
-          >
-            <TabsList
-              ref={tabsListRef}
-              variant="line"
-              className="h-7 w-full justify-start gap-4 overflow-x-auto overflow-y-hidden px-0 scrollbar-sleek"
-              onFocusCapture={(event) => {
-                // Why: Radix roving focus races commits, so forward external Tab focus to the input.
-                const previous = event.relatedTarget as HTMLElement | null
-                const list = tabsListRef.current
-                const input = localInputRef.current
-                if (!list || !input) {
-                  return
-                }
-                if (!previous || previous === input || list.contains(previous)) {
-                  return
-                }
-                event.stopPropagation()
-                input.focus({ preventScroll: true })
-              }}
-            >
-              {availableModes.map(({ id, label, Icon }) => (
-                <TabsTrigger
-                  key={id}
-                  value={id}
-                  tabIndex={-1}
-                  data-smart-name-mode={id}
-                  className="flex-none gap-1.5 px-0 text-xs"
-                >
-                  <Icon className="size-3.5" />
-                  <span>{label}</span>
-                </TabsTrigger>
-              ))}
-            </TabsList>
-          </Tabs>
-        </div>
+      {controller.textOnly ? null : (
+        <SmartWorkspaceSourceTabs
+          model={controller}
+          onModeChange={controller.handleModeChange}
+          inputRef={controller.localInputRef}
+          tabsListRef={controller.tabsListRef}
+        />
       )}
       <Popover
         open={!disabled && open && mode !== 'text' && selectedSource === null}
diff --git a/src/renderer/src/components/new-workspace/smart-workspace-name-input-surface.tsx b/src/renderer/src/components/new-workspace/smart-workspace-name-input-surface.tsx
index d43695e1c013..ffe9e4ad2154 100644
--- a/src/renderer/src/components/new-workspace/smart-workspace-name-input-surface.tsx
+++ b/src/renderer/src/components/new-workspace/smart-workspace-name-input-surface.tsx
@@ -4,7 +4,7 @@ import { Button } from '@/components/ui/button'
 import { Input } from '@/components/ui/input'
 import { Tooltip, TooltipContent, TooltipTrigger } from '@/components/ui/tooltip'
 import { isImeCompositionKeyDown } from '@/lib/ime-composition-keyboard-event'
-import { isBlockingJiraUrlIntent } from './smart-workspace-source-results'
+import { isBlockingJiraUrlIntent } from '../../../../shared/new-workspace/smart-workspace-source-results'
 import { isBlockingLinearUrlIntent } from '../../../../shared/new-workspace/smart-workspace-linear-intent'
 import { isComposerFieldToFieldFocus } from './smart-workspace-source-popover-focus'
 import { replaceCompletedWorkspaceEmojiShortcode } from '@/lib/workspace-emoji-shortcodes'
diff --git a/src/renderer/src/components/new-workspace/smart-workspace-source-results-surface.tsx b/src/renderer/src/components/new-workspace/smart-workspace-source-results-surface.tsx
index 54402492d6b4..f60c78210a50 100644
--- a/src/renderer/src/components/new-workspace/smart-workspace-source-results-surface.tsx
+++ b/src/renderer/src/components/new-workspace/smart-workspace-source-results-surface.tsx
@@ -1,35 +1,12 @@
 import React from 'react'
-import { Button } from '@/components/ui/button'
-import { CommandGroup, CommandItem, CommandList } from '@/components/ui/command'
+import { SmartWorkspaceSourceResultList } from './SmartWorkspaceSourceResultList'
 import { PopoverContent } from '@/components/ui/popover'
-import { translate } from '@/i18n/i18n'
-import { cn } from '@/lib/utils'
-import { getSmartWorkspaceEmptyHint } from './smart-workspace-source-results'
-import { getRowItemClassName, RowIcon, RowLabel } from './smart-workspace-source-row-content'
 import type { SmartWorkspaceNameFieldController } from './use-smart-workspace-name-field-controller'
 
 export function renderSmartWorkspaceSourceResults(
   controller: SmartWorkspaceNameFieldController
 ): React.JSX.Element {
-  const {
-    localInputRef,
-    tabsListRef,
-    mode,
-    mrStateFilters,
-    mrStateFilter,
-    setMrStateFilter,
-    typedTextActionRow,
-    handleSelect,
-    jiraSource,
-    loading,
-    searchResultRows,
-    linearStatusChecked,
-    linearStatus,
-    showJiraSiteContext,
-    jiraConnectionStatus,
-    reserveLinearLoadingResults,
-    showLinearUrlLoadingFeedback
-  } = controller
+  const { localInputRef, tabsListRef } = controller
 
   return (
     <PopoverContent
@@ -56,101 +33,7 @@ export function renderSmartWorkspaceSourceResults(
         }
       }}
     >
-      {mode === 'gitlab' ? (
-        // Why: state chips mirror GitLab's merge-request tab strip.
-        <div
-          className="flex shrink-0 items-center gap-1 border-b border-border/40 px-2 py-1.5"
-          onMouseDown={(e) => e.preventDefault()}
-        >
-          {mrStateFilters.map(({ id, label }) => (
-            <Button
-              key={id}
-              type="button"
-              variant={mrStateFilter === id ? 'secondary' : 'ghost'}
-              size="sm"
-              onClick={() => setMrStateFilter(id)}
-              className="h-6 px-2 text-xs"
-            >
-              {label}
-            </Button>
-          ))}
-        </div>
-      ) : null}
-      <CommandList className="!max-h-none min-h-0 flex-1 scrollbar-sleek">
-        {typedTextActionRow ? (
-          <div
-            className="sticky top-0 z-10 border-b border-border/40 bg-popover p-1"
-            onMouseDown={(event) => event.preventDefault()}
-          >
-            <CommandItem
-              key={typedTextActionRow.value}
-              value={typedTextActionRow.value}
-              onSelect={() => handleSelect(typedTextActionRow)}
-              className={getRowItemClassName(typedTextActionRow, { pinnedAction: true })}
-            >
-              <RowIcon row={typedTextActionRow} />
-              <RowLabel row={typedTextActionRow} />
-            </CommandItem>
-          </div>
-        ) : null}
-        {jiraSource.errorKind ? null : reserveLinearLoadingResults ? (
-          <div
-            aria-hidden="true"
-            className={cn('space-y-1 p-1', !showLinearUrlLoadingFeedback && 'invisible')}
-          >
-            {[0, 1, 2].map((index) => (
-              <div
-                key={index}
-                className={cn(
-                  'h-8 rounded bg-muted/40',
-                  showLinearUrlLoadingFeedback && 'animate-pulse'
-                )}
-              />
-            ))}
-          </div>
-        ) : loading && searchResultRows.length === 0 ? (
-          <div className="space-y-1 p-1">
-            {[0, 1, 2].map((index) => (
-              <div key={index} className="h-8 animate-pulse rounded bg-muted/40" />
-            ))}
-          </div>
-        ) : searchResultRows.length === 0 && !typedTextActionRow ? (
-          <div className="px-3 py-6 text-center text-xs text-muted-foreground">
-            {jiraSource.intent
-              ? null
-              : mode === 'linear' && linearStatusChecked && !linearStatus.connected
-                ? translate(
-                    'auto.components.new.workspace.SmartWorkspaceNameField.3e8bb1176a',
-                    'Connect Linear in Settings to search issues.'
-                  )
-                : getSmartWorkspaceEmptyHint(mode)}
-          </div>
-        ) : searchResultRows.length > 0 ? (
-          <CommandGroup className="p-1">
-            {searchResultRows.map((row) => (
-              <CommandItem
-                key={row.value}
-                value={row.value}
-                onSelect={() => handleSelect(row)}
-                className={getRowItemClassName(row)}
-              >
-                <RowIcon row={row} />
-                <RowLabel
-                  row={row}
-                  jiraSite={
-                    showJiraSiteContext && row.kind === 'jira'
-                      ? (jiraConnectionStatus?.sites?.find(
-                          (site) => site.id === row.issue.siteId
-                        ) ?? null)
-                      : null
-                  }
-                  showJiraSiteContext={showJiraSiteContext}
-                />
-              </CommandItem>
-            ))}
-          </CommandGroup>
-        ) : null}
-      </CommandList>
+      <SmartWorkspaceSourceResultList model={controller} onSelect={controller.handleSelect} />
     </PopoverContent>
   )
 }
diff --git a/src/renderer/src/components/new-workspace/smart-workspace-source-results.test.ts b/src/renderer/src/components/new-workspace/smart-workspace-source-results.test.ts
index b2d2b8a10976..67daefc0e108 100644
--- a/src/renderer/src/components/new-workspace/smart-workspace-source-results.test.ts
+++ b/src/renderer/src/components/new-workspace/smart-workspace-source-results.test.ts
@@ -9,7 +9,7 @@ import {
   isBlockingJiraUrlIntent,
   isBlockingTaskUrlResolution,
   shouldHoldSourceResultsForQuery
-} from './smart-workspace-source-results'
+} from '../../../../shared/new-workspace/smart-workspace-source-results'
 import {
   getSmartWorkspaceLinearSearchQuery,
   isBlockingLinearUrlIntent,
diff --git a/src/renderer/src/components/new-workspace/smart-workspace-source-results.ts b/src/renderer/src/components/new-workspace/smart-workspace-source-results.ts
deleted file mode 100644
index afa2d10651f1..000000000000
--- a/src/renderer/src/components/new-workspace/smart-workspace-source-results.ts
+++ /dev/null
@@ -1,2 +0,0 @@
-// Re-export shim: the implementation moved to src/shared so mobile can share it.
-export * from '../../../../shared/new-workspace/smart-workspace-source-results'
diff --git a/src/renderer/src/components/new-workspace/use-linear-source-connection.test.tsx b/src/renderer/src/components/new-workspace/use-linear-source-connection.test.tsx
new file mode 100644
index 000000000000..09521348ae01
--- /dev/null
+++ b/src/renderer/src/components/new-workspace/use-linear-source-connection.test.tsx
@@ -0,0 +1,182 @@
+// @vitest-environment happy-dom
+
+import { act, cleanup, renderHook, waitFor } from '@testing-library/react'
+import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest'
+import { useStore } from 'zustand'
+import { createStore } from 'zustand/vanilla'
+import type { TaskSourceContext } from '../../../../shared/task-source-context'
+import type { LinearConnectionStatus } from '../../../../shared/linear/workspace-types'
+import { useLinearSourceConnection } from './use-linear-source-connection'
+
+const mocks = vi.hoisted(() => ({ linearStatus: vi.fn() }))
+vi.mock('@/runtime/runtime-linear-client', () => mocks)
+type ConnectionState = {
+  runtimeStatusByEnvironmentId: Map<
+    string,
+    { connectionGeneration?: number; hostContactEpoch?: number }
+  >
+  linearStatus: LinearConnectionStatus
+  linearStatusContextKey: string | null
+}
+const store = createStore<ConnectionState>(() => ({
+  runtimeStatusByEnvironmentId: new Map(),
+  linearStatus: { connected: false, viewer: null },
+  linearStatusContextKey: null
+}))
+vi.mock('@/store', () => ({
+  useAppStore: (selector: (state: ConnectionState) => unknown) => useStore(store, selector)
+}))
+
+function context(hostId: TaskSourceContext['hostId']): TaskSourceContext {
+  return {
+    kind: 'task-source',
+    provider: 'linear',
+    projectId: 'project-1',
+    hostId,
+    repoId: 'repo-1',
+    accountLabel: null,
+    providerIdentity: null
+  }
+}
+
+function status(connected: boolean): LinearConnectionStatus {
+  return { connected, viewer: null }
+}
+
+describe('useLinearSourceConnection', () => {
+  afterEach(cleanup)
+  beforeEach(() => {
+    vi.clearAllMocks()
+    store.setState({
+      runtimeStatusByEnvironmentId: new Map(),
+      linearStatus: status(false),
+      linearStatusContextKey: null
+    })
+  })
+
+  it('reads the explicit source host independently of focused runtime status', async () => {
+    const source = context('runtime:source-host')
+    mocks.linearStatus.mockResolvedValue(status(true))
+    const { result } = renderHook(() =>
+      useLinearSourceConnection({ enabled: true, sourceContext: source })
+    )
+    expect(result.current).toEqual({ status: null, loaded: false })
+    await waitFor(() => expect(result.current.status?.connected).toBe(true))
+    expect(result.current.loaded).toBe(true)
+    expect(mocks.linearStatus).toHaveBeenCalledWith(source)
+  })
+
+  it('does not add reads to existing consumers without an explicit source', async () => {
+    renderHook(() => useLinearSourceConnection({ enabled: true, sourceContext: null }))
+    renderHook(() => useLinearSourceConnection({ enabled: false, sourceContext: context('local') }))
+    await act(async () => {})
+    expect(mocks.linearStatus).not.toHaveBeenCalled()
+  })
+
+  it('keeps equivalent source objects from refetching on every renderer update', async () => {
+    mocks.linearStatus.mockResolvedValue(status(true))
+    const { result, rerender } = renderHook(() =>
+      useLinearSourceConnection({ enabled: true, sourceContext: context('local') })
+    )
+    await waitFor(() => expect(result.current.loaded).toBe(true))
+    const loaded = result.current
+    rerender()
+    expect(result.current).toBe(loaded)
+    expect(mocks.linearStatus).toHaveBeenCalledTimes(1)
+  })
+
+  it('hides old status immediately and rejects late responses after a host switch', async () => {
+    let resolveOld: (value: LinearConnectionStatus) => void = () => {}
+    const oldRead = new Promise<LinearConnectionStatus>((resolve) => {
+      resolveOld = resolve
+    })
+    mocks.linearStatus.mockReturnValueOnce(oldRead).mockResolvedValueOnce(status(false))
+    const { result, rerender } = renderHook(
+      ({ source }) => useLinearSourceConnection({ enabled: true, sourceContext: source }),
+      { initialProps: { source: context('local') } }
+    )
+    rerender({ source: context('runtime:new-host') })
+    expect(result.current).toEqual({ status: null, loaded: false })
+    await waitFor(() => expect(result.current.loaded).toBe(true))
+    await act(async () => {
+      resolveOld(status(true))
+      await oldRead
+    })
+    expect(result.current.status?.connected).toBe(false)
+  })
+
+  it('settles failed status reads as disconnected', async () => {
+    mocks.linearStatus.mockRejectedValue(new Error('Host unavailable'))
+    const { result } = renderHook(() =>
+      useLinearSourceConnection({ enabled: true, sourceContext: context('runtime:offline') })
+    )
+    await waitFor(() => expect(result.current.loaded).toBe(true))
+    expect(result.current.status?.connected).toBe(false)
+  })
+
+  it.each(['hostContactEpoch', 'connectionGeneration'] as const)(
+    'retries a failed saved-host read when %s advances without changing focus',
+    async (revision) => {
+      mocks.linearStatus.mockRejectedValueOnce(new Error('Offline')).mockResolvedValue(status(true))
+      const { result } = renderHook(() =>
+        useLinearSourceConnection({ enabled: true, sourceContext: context('runtime:saved-host') })
+      )
+      await waitFor(() => expect(result.current.status?.connected).toBe(false))
+      act(() => {
+        store.setState({
+          runtimeStatusByEnvironmentId: new Map([['saved-host', { [revision]: 1 }]])
+        })
+      })
+      await waitFor(() => expect(result.current.status?.connected).toBe(true))
+      expect(mocks.linearStatus).toHaveBeenCalledTimes(2)
+    }
+  )
+
+  it('rejects an earlier status read after the same host reconnects', async () => {
+    let resolveOld: (value: LinearConnectionStatus) => void = () => {}
+    const oldRead = new Promise<LinearConnectionStatus>((resolve) => {
+      resolveOld = resolve
+    })
+    mocks.linearStatus.mockReturnValueOnce(oldRead).mockResolvedValueOnce(status(true))
+    const { result } = renderHook(() =>
+      useLinearSourceConnection({ enabled: true, sourceContext: context('runtime:saved-host') })
+    )
+    act(() => {
+      store.setState({
+        runtimeStatusByEnvironmentId: new Map([['saved-host', { hostContactEpoch: 1 }]])
+      })
+    })
+    await waitFor(() => expect(result.current.status?.connected).toBe(true))
+    await act(async () => {
+      resolveOld(status(false))
+      await oldRead
+    })
+    expect(result.current.status?.connected).toBe(true)
+  })
+
+  it('refreshes matching-host workspace changes without borrowing another host status', async () => {
+    mocks.linearStatus.mockResolvedValue({ ...status(true), selectedWorkspaceId: 'original' })
+    const { result } = renderHook(() =>
+      useLinearSourceConnection({ enabled: true, sourceContext: context('runtime:saved-host') })
+    )
+    await waitFor(() => expect(result.current.loaded).toBe(true))
+    act(() => {
+      store.setState({
+        linearStatusContextKey: 'runtime:other-host#0',
+        linearStatus: { ...status(true), selectedWorkspaceId: 'other' },
+        runtimeStatusByEnvironmentId: new Map([['other-host', { hostContactEpoch: 1 }]])
+      })
+    })
+    expect(result.current.status?.selectedWorkspaceId).toBe('original')
+    expect(mocks.linearStatus).toHaveBeenCalledTimes(1)
+    mocks.linearStatus.mockResolvedValue({ ...status(true), selectedWorkspaceId: 'updated' })
+    act(() => {
+      store.setState({
+        linearStatusContextKey: 'runtime:saved-host#0',
+        linearStatus: { ...status(true), selectedWorkspaceId: 'updated' }
+      })
+    })
+    await waitFor(() => expect(result.current.status?.selectedWorkspaceId).toBe('updated'))
+    expect(mocks.linearStatus).toHaveBeenCalledTimes(2)
+  })
+})
diff --git a/src/renderer/src/components/new-workspace/use-linear-source-connection.ts b/src/renderer/src/components/new-workspace/use-linear-source-connection.ts
new file mode 100644
index 000000000000..1630027de128
--- /dev/null
+++ b/src/renderer/src/components/new-workspace/use-linear-source-connection.ts
@@ -0,0 +1,82 @@
+import { useEffect, useLayoutEffect, useMemo, useRef, useState } from 'react'
+import { linearStatus } from '@/runtime/runtime-linear-client'
+import { useAppStore } from '@/store'
+import { getProviderRuntimeContextKey } from '@/lib/provider-runtime-context'
+import {
+  getTaskSourceCacheScope,
+  getTaskSourceRuntimeSettings,
+  type TaskSourceContext
+} from '../../../../shared/task-source-context'
+import type { LinearConnectionStatus } from '../../../../shared/linear/workspace-types'
+
+type LinearSourceConnection = {
+  status: LinearConnectionStatus | null
+  loaded: boolean
+}
+
+const UNLOADED_CONNECTION: LinearSourceConnection = { status: null, loaded: false }
+
+export function useLinearSourceConnection(args: {
+  enabled: boolean
+  sourceContext: TaskSourceContext | null
+}): LinearSourceConnection {
+  const scope = args.sourceContext ? getTaskSourceCacheScope(args.sourceContext) : null
+  const runtimeSettings = getTaskSourceRuntimeSettings(args.sourceContext)
+  const environmentId = runtimeSettings.activeRuntimeEnvironmentId
+  const runtimeRevision = useAppStore((state) => {
+    const runtime = environmentId ? state.runtimeStatusByEnvironmentId?.get(environmentId) : null
+    return `${runtime?.connectionGeneration ?? 0}:${runtime?.hostContactEpoch ?? 0}`
+  })
+  const statusContextKey = getProviderRuntimeContextKey(runtimeSettings)
+  const sourceStoreStatus = useAppStore((state) =>
+    scope && state.linearStatusContextKey === statusContextKey ? state.linearStatus : null
+  )
+  const sourceRef = useRef(args.sourceContext)
+  useLayoutEffect(() => {
+    sourceRef.current = args.sourceContext
+  })
+  const [state, setState] = useState<{
+    scope: string | null
+    runtimeRevision: string
+    sourceStoreStatus: LinearConnectionStatus | null
+    status: LinearConnectionStatus | null
+  }>({ scope: null, runtimeRevision, sourceStoreStatus, status: null })
+
+  useEffect(() => {
+    const source = sourceRef.current
+    if (!args.enabled || !source || !scope) {
+      return
+    }
+    let stale = false
+    void linearStatus(source)
+      .then((status) => {
+        if (!stale) {
+          setState({ scope, runtimeRevision, sourceStoreStatus, status })
+        }
+      })
+      .catch(() => {
+        if (!stale) {
+          setState({
+            scope,
+            runtimeRevision,
+            sourceStoreStatus,
+            status: { connected: false, viewer: null }
+          })
+        }
+      })
+    return () => {
+      stale = true
+    }
+  }, [args.enabled, scope, runtimeRevision, sourceStoreStatus])
+
+  return useMemo(
+    () =>
+      scope !== null &&
+      state.scope === scope &&
+      state.runtimeRevision === runtimeRevision &&
+      state.sourceStoreStatus === sourceStoreStatus
+        ? { status: state.status, loaded: true }
+        : UNLOADED_CONNECTION,
+    [scope, state, runtimeRevision, sourceStoreStatus]
+  )
+}
diff --git a/src/renderer/src/components/new-workspace/use-new-workspace-composer-file-drop.ts b/src/renderer/src/components/new-workspace/use-new-workspace-composer-file-drop.ts
new file mode 100644
index 000000000000..234daa1bcfdd
--- /dev/null
+++ b/src/renderer/src/components/new-workspace/use-new-workspace-composer-file-drop.ts
@@ -0,0 +1,62 @@
+import { useLayoutEffect, useRef, useState } from 'react'
+import { toast } from 'sonner'
+import { createOsFileDropSequence, useOsFileDropOwner } from '@/hooks/use-os-file-drop-owner'
+import { getNativeFileDropRejectionMessage } from '@/lib/native-file-drop-rejection-message'
+import { useMountedRef } from '@/hooks/useMountedRef'
+import { useAppStore } from '@/store'
+import { parseExecutionHostId, type ExecutionHostId } from '../../../../shared/execution-host'
+
+type Args = {
+  projectPath?: string | null
+  hostId?: ExecutionHostId | null
+  connectionId: string | null
+  applyDrop?: (paths: string[], isCurrent: () => boolean) => Promise<void>
+}
+
+export function useNewWorkspaceComposerFileDrop(args: Args) {
+  const ownerRef = useRef<HTMLElement | null>(null)
+  const [sequence] = useState(createOsFileDropSequence)
+  const mounted = useMountedRef()
+  const identity = JSON.stringify([args.projectPath, args.hostId, args.connectionId])
+  const identityRef = useRef(identity)
+  useLayoutEffect(() => {
+    identityRef.current = identity
+  }, [identity])
+  return useOsFileDropOwner(ownerRef, {
+    consumer: 'agent',
+    sequence,
+    canAccept: Boolean(args.projectPath && args.hostId && args.applyDrop),
+    captureDestination: () => {
+      const connectionId = args.connectionId
+      const host = parseExecutionHostId(args.hostId)
+      const currentGeneration = (): number | undefined => {
+        if (!connectionId) {
+          return undefined
+        }
+        const state = useAppStore.getState()
+        return host?.kind === 'runtime'
+          ? state.sshStateByEnvironment?.get(host.environmentId)?.connectionStates.get(connectionId)
+              ?.connectionGeneration
+          : state.sshConnectionStates.get(connectionId)?.connectionGeneration
+      }
+      const generation = currentGeneration()
+      return {
+        applyDrop: args.applyDrop,
+        isCurrent: () =>
+          mounted.current && identityRef.current === identity && generation === currentGeneration()
+      }
+    },
+    onDrop: async (prepared, { destination }) => {
+      if (!destination?.isCurrent()) {
+        return
+      }
+      for (const failure of prepared.failures) {
+        const message = getNativeFileDropRejectionMessage(failure)
+        toast.error(message.title, { description: message.description })
+      }
+      if (prepared.paths.length > 0) {
+        await destination.applyDrop?.(prepared.paths, destination.isCurrent)
+      }
+    }
+  })
+}
diff --git a/src/renderer/src/components/new-workspace/use-smart-workspace-field-availability.ts b/src/renderer/src/components/new-workspace/use-smart-workspace-field-availability.ts
index 1f48e4ce5d35..c5ba8926a3cd 100644
--- a/src/renderer/src/components/new-workspace/use-smart-workspace-field-availability.ts
+++ b/src/renderer/src/components/new-workspace/use-smart-workspace-field-availability.ts
@@ -4,13 +4,12 @@ import type { ExecutionHostId } from '../../../../shared/execution-host'
 import { getMrStateFilters, getSmartWorkspaceNameModes } from './smart-workspace-localized-options'
 import {
   SEARCH_DEBOUNCE_MS,
-  type NormalizedSmartWorkspaceNameFieldProps
+  type NormalizedWorkItemSourceSearchProps
 } from './smart-workspace-name-field-model'
 import { canUseGitLabSmartSource } from './smart-workspace-provider-availability'
-import { useSmartWorkspaceFieldFocusControls } from './use-smart-workspace-field-focus-controls'
-import type { useSmartWorkspaceNameFieldState } from './use-smart-workspace-name-field-state'
+import type { useWorkItemSourceState } from './use-work-item-source-state'
 
-type FieldState = ReturnType<typeof useSmartWorkspaceNameFieldState>
+type FieldState = ReturnType<typeof useWorkItemSourceState>
 
 export function useSmartWorkspaceFieldAvailability({
   props,
@@ -26,7 +25,7 @@ export function useSmartWorkspaceFieldAvailability({
   checkLinearConnection,
   jiraSourceConnected
 }: {
-  props: NormalizedSmartWorkspaceNameFieldProps
+  props: NormalizedWorkItemSourceSearchProps
   state: FieldState
   repoBackedSearchTargets: {
     gitlabSourceContext: { hostId?: ExecutionHostId | null } | null
@@ -41,37 +40,8 @@ export function useSmartWorkspaceFieldAvailability({
   checkLinearConnection: () => Promise<void>
   jiraSourceConnected: boolean
 }) {
-  const {
-    disabled,
-    textOnly,
-    repoBackedSourcesDisabled,
-    branchesEnabled,
-    onActiveSourceModeChange,
-    value
-  } = props
-  const {
-    mode,
-    setMode,
-    setOpen,
-    setGithubItems,
-    setGitlabItems,
-    setBranches,
-    setGithubLoading,
-    setGitlabLoading,
-    setBranchesLoading,
-    setBranchResultsSource,
-    setCrossRepoPrompt,
-    setLinearIssues,
-    setJiraIssues,
-    setLinearLoading,
-    setJiraLoading,
-    setCommandValue,
-    setDebouncedQuery
-  } = state
-
-  useEffect(() => {
-    onActiveSourceModeChange?.(mode)
-  }, [mode, onActiveSourceModeChange])
+  const { disabled, textOnly, repoBackedSourcesDisabled, branchesEnabled, value } = props
+  const { mode: storedMode, setMode, setDebouncedQuery } = state
   const preflightStatusCurrent = preflightStatusContextKey === expectedPreflightContextKey
   const localGitlabAvailable = preflightStatusCurrent && preflightStatus?.glab?.installed === true
   const gitlabSourceAvailable = repoBackedSearchTargets.some((target) =>
@@ -109,42 +79,17 @@ export function useSmartWorkspaceFieldAvailability({
     if (item.id === 'branches') {
       return branchesEnabled && !repoBackedSourcesDisabled
     }
-    return true
+    return item.id !== 'text' || props.typedTextEnabled === true
   })
-  const mrStateFilters = getMrStateFilters()
-
+  const mode = availableModes.some((item) => item.id === storedMode)
+    ? storedMode
+    : (availableModes[0]?.id ?? 'text')
   useEffect(() => {
-    if (availableModes.some((item) => item.id === mode)) {
-      return
+    if (storedMode !== mode) {
+      setMode(mode)
     }
-    setMode(availableModes[0]?.id ?? 'text')
-  }, [availableModes, mode, setMode])
-
-  useEffect(() => {
-    if (!repoBackedSourcesDisabled) {
-      return
-    }
-    setGithubItems([])
-    setGitlabItems([])
-    setBranches([])
-    setGithubLoading(false)
-    setGitlabLoading(false)
-    setBranchesLoading(false)
-    setBranchResultsSource(null)
-    setCrossRepoPrompt(null)
-  }, [
-    repoBackedSourcesDisabled,
-    setBranches,
-    setBranchesLoading,
-    setBranchResultsSource,
-    setCrossRepoPrompt,
-    setGithubItems,
-    setGithubLoading,
-    setGitlabItems,
-    setGitlabLoading
-  ])
-
-  const focusControls = useSmartWorkspaceFieldFocusControls({ props, state })
+  }, [storedMode, setMode, mode])
+  const mrStateFilters = getMrStateFilters()
 
   useEffect(() => {
     if (disabled || textOnly) {
@@ -166,90 +111,16 @@ export function useSmartWorkspaceFieldAvailability({
     textOnly
   ])
 
-  useEffect(() => {
-    if (textOnly) {
-      if (mode !== 'text') {
-        setMode('text')
-      }
-      setOpen(false)
-      return
-    }
-    if ((mode === 'gitlab' && gitlabSourceAvailable) || (mode === 'linear' && linearAvailable)) {
-      return
-    }
-    if (mode !== 'gitlab' && mode !== 'linear') {
-      return
-    }
-    setMode('smart')
-    setGitlabItems([])
-    setLinearIssues([])
-    setJiraIssues([])
-    setGitlabLoading(false)
-    setLinearLoading(false)
-    setJiraLoading(false)
-    setCommandValue('')
-  }, [
-    gitlabSourceAvailable,
-    linearAvailable,
-    mode,
-    setCommandValue,
-    setGitlabItems,
-    setGitlabLoading,
-    setJiraIssues,
-    setJiraLoading,
-    setLinearIssues,
-    setLinearLoading,
-    setMode,
-    setOpen,
-    textOnly
-  ])
-
-  useEffect(() => {
-    if (!disabled) {
-      return
-    }
-    setOpen(false)
-    setGithubItems([])
-    setGitlabItems([])
-    setBranches([])
-    setBranchResultsSource(null)
-    setLinearIssues([])
-    setJiraIssues([])
-    setGithubLoading(false)
-    setGitlabLoading(false)
-    setBranchesLoading(false)
-    setLinearLoading(false)
-    setJiraLoading(false)
-    setCommandValue('')
-    setCrossRepoPrompt(null)
-  }, [
-    disabled,
-    setBranches,
-    setBranchesLoading,
-    setBranchResultsSource,
-    setCommandValue,
-    setCrossRepoPrompt,
-    setGithubItems,
-    setGithubLoading,
-    setGitlabItems,
-    setGitlabLoading,
-    setJiraIssues,
-    setJiraLoading,
-    setLinearIssues,
-    setLinearLoading,
-    setOpen
-  ])
-
   useEffect(() => {
     const timer = window.setTimeout(() => setDebouncedQuery(value), SEARCH_DEBOUNCE_MS)
     return () => window.clearTimeout(timer)
   }, [setDebouncedQuery, value])
 
   return {
+    mode,
     gitlabSourceAvailable,
     linearAvailable,
     availableModes,
-    mrStateFilters,
-    ...focusControls
+    mrStateFilters
   }
 }
diff --git a/src/renderer/src/components/new-workspace/use-smart-workspace-field-focus-controls.test.tsx b/src/renderer/src/components/new-workspace/use-smart-workspace-field-focus-controls.test.tsx
new file mode 100644
index 000000000000..9eb1ec031478
--- /dev/null
+++ b/src/renderer/src/components/new-workspace/use-smart-workspace-field-focus-controls.test.tsx
@@ -0,0 +1,31 @@
+// @vitest-environment happy-dom
+import { act, renderHook } from '@testing-library/react'
+import { expect, it } from 'vitest'
+import { useSmartWorkspaceFieldFocusControls } from './use-smart-workspace-field-focus-controls'
+
+it.each(['disabled', 'text', 'cross-repository'] as const)(
+  'keeps a suspended %s source popover closed when the field resumes',
+  (reason) => {
+    let suspended = false
+    const { result, rerender } = renderHook(() =>
+      useSmartWorkspaceFieldFocusControls({
+        props: { selectedSource: null, disabled: suspended && reason === 'disabled' },
+        state: {
+          mode: suspended && reason === 'text' ? 'text' : 'smart',
+          crossRepoPrompt: suspended && reason === 'cross-repository'
+        }
+      })
+    )
+    act(() => {
+      result.current.markSourcePopoverUserEngaged()
+      result.current.setOpen(true)
+    })
+    expect(result.current.open).toBe(true)
+    suspended = true
+    rerender()
+    expect(result.current.open).toBe(false)
+    suspended = false
+    rerender()
+    expect(result.current.open).toBe(false)
+  }
+)
diff --git a/src/renderer/src/components/new-workspace/use-smart-workspace-field-focus-controls.ts b/src/renderer/src/components/new-workspace/use-smart-workspace-field-focus-controls.ts
index dcd1d9dc7160..771d5a4ae192 100644
--- a/src/renderer/src/components/new-workspace/use-smart-workspace-field-focus-controls.ts
+++ b/src/renderer/src/components/new-workspace/use-smart-workspace-field-focus-controls.ts
@@ -1,25 +1,31 @@
-import { useCallback } from 'react'
-import type { NormalizedSmartWorkspaceNameFieldProps } from './smart-workspace-name-field-model'
-import type { useSmartWorkspaceNameFieldState } from './use-smart-workspace-name-field-state'
+import { useCallback, useEffect, useRef, useState } from 'react'
+import type { SmartWorkspaceNameFieldProps } from './smart-workspace-name-field-model'
+import type { SmartNameMode } from '../../../../shared/new-workspace/smart-workspace-source-results'
 
-type FieldState = ReturnType<typeof useSmartWorkspaceNameFieldState>
+type FieldState = { mode: SmartNameMode; crossRepoPrompt?: unknown }
 
 export function useSmartWorkspaceFieldFocusControls({
   props,
   state
 }: {
-  props: NormalizedSmartWorkspaceNameFieldProps
+  props: Pick<SmartWorkspaceNameFieldProps, 'selectedSource' | 'inputRef'> & { disabled: boolean }
   state: FieldState
 }) {
   const { disabled, selectedSource, inputRef } = props
-  const {
-    mode,
-    setOpen,
-    focusedSelectedSourceKeyRef,
-    localInputFocusFrameRef,
-    deferSourcePopoverUntilInteractionRef,
-    localInputRef
-  } = state
+  const { mode, crossRepoPrompt } = state
+  const [open, setOpen] = useState(false)
+  const [emojiCommandValue, setEmojiCommandValue] = useState('')
+  const [emojiCursor, setEmojiCursor] = useState<number | null>(null)
+  const localInputRef = useRef<HTMLInputElement | null>(null)
+  const focusedSelectedSourceKeyRef = useRef<string | null>(null)
+  const tabsListRef = useRef<HTMLDivElement | null>(null)
+  const localInputFocusFrameRef = useRef<number | null>(null)
+  const deferSourcePopoverUntilInteractionRef = useRef(true)
+  useEffect(() => {
+    if (disabled || mode === 'text' || crossRepoPrompt) {
+      setOpen(false)
+    }
+  }, [disabled, mode, crossRepoPrompt])
   const selectedSourceFocusKey = selectedSource
     ? `${selectedSource.kind}:${selectedSource.label}:${selectedSource.url ?? ''}`
     : null
@@ -84,6 +90,15 @@ export function useSmartWorkspaceFieldFocusControls({
   )
 
   return {
+    open,
+    setOpen,
+    emojiCommandValue,
+    setEmojiCommandValue,
+    emojiCursor,
+    setEmojiCursor,
+    localInputRef,
+    tabsListRef,
+    localInputFocusFrameRef,
     setSelectedSourceNode,
     cancelLocalInputFocusFrame,
     markSourcePopoverUserEngaged,
diff --git a/src/renderer/src/components/new-workspace/use-smart-workspace-github-search.ts b/src/renderer/src/components/new-workspace/use-smart-workspace-github-search.ts
index 5351890801fb..39a686b46ec4 100644
--- a/src/renderer/src/components/new-workspace/use-smart-workspace-github-search.ts
+++ b/src/renderer/src/components/new-workspace/use-smart-workspace-github-search.ts
@@ -8,9 +8,9 @@ import { lookupSmartGitHubSubmitItem } from '@/lib/smart-github-submit'
 import type { GitHubWorkItem } from '../../../../shared/github/work-item-types'
 import { RESULT_LIMIT } from './smart-workspace-name-field-model'
 import { resolveSmartWorkspaceGithubDirectLink } from './smart-workspace-github-direct-link'
-import type { useSmartWorkspaceNameFieldFoundation } from './use-smart-workspace-name-field-foundation'
+import type { useWorkItemSourceFoundation } from './use-work-item-source-foundation'
 
-type Foundation = ReturnType<typeof useSmartWorkspaceNameFieldFoundation>
+type Foundation = ReturnType<typeof useWorkItemSourceFoundation>
 
 export function useSmartWorkspaceGithubSearch({
   foundation,
@@ -36,7 +36,6 @@ export function useSmartWorkspaceGithubSearch({
     fetchWorkItemsAcrossRepos,
     setGithubItems,
     setGithubLoading,
-    setOpen,
     setCrossRepoPrompt
   } = foundation
   const normalizedGhQuery = useMemo(
@@ -50,6 +49,7 @@ export function useSmartWorkspaceGithubSearch({
 
   useEffect(() => {
     if (disabled || !shouldQueryGithub) {
+      setCrossRepoPrompt(null)
       setGithubItems([])
       setGithubLoading(false)
       return
@@ -80,7 +80,6 @@ export function useSmartWorkspaceGithubSearch({
           }
           setGithubItems(result.items)
           if (result.prompt) {
-            setOpen(false)
             setCrossRepoPrompt(result.prompt)
           }
         })
@@ -234,7 +233,6 @@ export function useSmartWorkspaceGithubSearch({
     repoSlugCacheRef,
     setCrossRepoPrompt,
     setGithubItems,
-    setGithubLoading,
-    setOpen
+    setGithubLoading
   ])
 }
diff --git a/src/renderer/src/components/new-workspace/use-smart-workspace-gitlab-search.ts b/src/renderer/src/components/new-workspace/use-smart-workspace-gitlab-search.ts
index 7f222aff95c1..faa61be2d5f3 100644
--- a/src/renderer/src/components/new-workspace/use-smart-workspace-gitlab-search.ts
+++ b/src/renderer/src/components/new-workspace/use-smart-workspace-gitlab-search.ts
@@ -6,9 +6,9 @@ import {
 import { parseGitLabIssueOrMRLink } from '@/lib/gitlab-links'
 import type { GitLabWorkItem } from '../../../../shared/gitlab-types'
 import { RESULT_LIMIT } from './smart-workspace-name-field-model'
-import type { useSmartWorkspaceNameFieldFoundation } from './use-smart-workspace-name-field-foundation'
+import type { useWorkItemSourceFoundation } from './use-work-item-source-foundation'
 
-type Foundation = ReturnType<typeof useSmartWorkspaceNameFieldFoundation>
+type Foundation = ReturnType<typeof useWorkItemSourceFoundation>
 
 export function useSmartWorkspaceGitlabSearch({
   foundation,
@@ -22,7 +22,7 @@ export function useSmartWorkspaceGitlabSearch({
   const {
     debouncedQuery,
     disabled,
-    onGitLabItemSelect,
+    gitlabEnabled,
     mode,
     repoBackedSearchTargets,
     mrStateFilter,
@@ -36,7 +36,7 @@ export function useSmartWorkspaceGitlabSearch({
   )
 
   useEffect(() => {
-    if (!shouldQueryGitlab || disabled || !onGitLabItemSelect) {
+    if (!shouldQueryGitlab || disabled || gitlabEnabled === false) {
       // Why: the list effect below is the sole writer in GitLab mode without a URL.
       if (!shouldQueryGitlab || (parsedGlLink === null && mode !== 'gitlab')) {
         setGitlabItems([])
@@ -89,7 +89,7 @@ export function useSmartWorkspaceGitlabSearch({
   }, [
     disabled,
     mode,
-    onGitLabItemSelect,
+    gitlabEnabled,
     parsedGlLink,
     repoBackedSearchTargets,
     setGitlabItems,
@@ -99,7 +99,7 @@ export function useSmartWorkspaceGitlabSearch({
 
   // Why: state chips mirror GitLab's default opened-MR list when no URL is pasted.
   useEffect(() => {
-    if (!shouldQueryGitlab || disabled || !onGitLabItemSelect) {
+    if (!shouldQueryGitlab || disabled || gitlabEnabled === false) {
       if (!shouldQueryGitlab) {
         setGitlabItems([])
         setGitlabLoading(false)
@@ -163,7 +163,7 @@ export function useSmartWorkspaceGitlabSearch({
     disabled,
     mode,
     mrStateFilter,
-    onGitLabItemSelect,
+    gitlabEnabled,
     parsedGlLink,
     repoBackedSearchTargets,
     setGitlabItems,
diff --git a/src/renderer/src/components/new-workspace/use-smart-workspace-name-field-actions.ts b/src/renderer/src/components/new-workspace/use-smart-workspace-name-field-actions.ts
index f54cb6f965b0..ac647876f333 100644
--- a/src/renderer/src/components/new-workspace/use-smart-workspace-name-field-actions.ts
+++ b/src/renderer/src/components/new-workspace/use-smart-workspace-name-field-actions.ts
@@ -6,18 +6,28 @@ import { lookupGitHubWorkItemByOwnerRepoForSource } from '@/lib/github-work-item
 import {
   applyWorkspaceEmojiSuggestion,
   type WorkspaceEmojiReplacement,
+  type getActiveWorkspaceEmojiShortcode,
   type WorkspaceEmojiSuggestion
 } from '@/lib/workspace-emoji-shortcodes'
 import type { GitHubWorkItem } from '../../../../shared/github/work-item-types'
 import { buildTaskSourceContextFromRepo } from '../../../../shared/task-source-context'
-import { bindJiraIssueSourceContext } from './use-jira-url-source'
-import type { RepoOption, RowEntry } from './smart-workspace-name-field-model'
+import type {
+  RepoOption,
+  RowEntry,
+  SmartWorkspaceNameFieldProps
+} from './smart-workspace-name-field-model'
 import { getRepoSlugCached, sameSlug } from './smart-workspace-repo-slug'
-import type { useSmartWorkspaceNameFieldFoundation } from './use-smart-workspace-name-field-foundation'
-import type { useSmartWorkspaceNameFieldPresentation } from './use-smart-workspace-name-field-presentation'
+import type { useWorkItemSourceSearch } from './use-work-item-source-search'
+import type { useSmartWorkspaceFieldFocusControls } from './use-smart-workspace-field-focus-controls'
+import { useAppStore } from '@/store'
+import type { useWorkItemSourcePresentation } from './use-work-item-source-presentation'
 
-type Foundation = ReturnType<typeof useSmartWorkspaceNameFieldFoundation>
-type Presentation = ReturnType<typeof useSmartWorkspaceNameFieldPresentation>
+type Foundation = ReturnType<typeof useWorkItemSourceSearch> &
+  SmartWorkspaceNameFieldProps &
+  ReturnType<typeof useSmartWorkspaceFieldFocusControls>
+type Presentation = ReturnType<typeof useWorkItemSourcePresentation> & {
+  activeEmojiShortcode: ReturnType<typeof getActiveWorkspaceEmojiShortcode>
+}
 
 function scheduleEmojiInputFocus(
   frameRef: React.RefObject<number | null>,
@@ -36,8 +46,7 @@ export function useSmartWorkspaceNameFieldActions(
   presentation: Presentation
 ) {
   const {
-    jiraConnectionStatus,
-    jiraSourceContext,
+    resolveRow,
     onBranchSelect,
     onGitHubItemSelect,
     onGitLabItemSelect,
@@ -59,10 +68,10 @@ export function useSmartWorkspaceNameFieldActions(
     setCrossRepoPrompt,
     selectedRepo,
     allowCrossRepoProjectAdd,
-    addRepo,
     repoSlugCacheRef
   } = foundation
-  const { selectJiraAccount, jiraBoundSourceContext, activeEmojiShortcode } = presentation
+  const addRepo = useAppStore((s) => s.addRepo)
+  const { selectJiraAccount, activeEmojiShortcode } = presentation
 
   const handleSelect = useCallback(
     (row: RowEntry) => {
@@ -80,15 +89,7 @@ export function useSmartWorkspaceNameFieldActions(
       } else if (row.kind === 'branch') {
         onBranchSelect(row.refName, row.localBranchName)
       } else if (row.kind === 'jira') {
-        const sites = jiraConnectionStatus?.sites ?? []
-        const site =
-          sites.find((candidate) => candidate.id === row.issue.siteId) ??
-          (sites.length === 1 ? sites[0] : null)
-        const sourceContext =
-          jiraBoundSourceContext ??
-          (jiraSourceContext && site
-            ? bindJiraIssueSourceContext(jiraSourceContext, site, row.issue)
-            : null)
+        const sourceContext = resolveRow(row)?.taskSourceContext
         if (!sourceContext) {
           toast.error(
             translate(
@@ -105,9 +106,7 @@ export function useSmartWorkspaceNameFieldActions(
       setOpen(false)
     },
     [
-      jiraBoundSourceContext,
-      jiraConnectionStatus?.sites,
-      jiraSourceContext,
+      resolveRow,
       onBranchSelect,
       onGitHubItemSelect,
       onGitLabItemSelect,
diff --git a/src/renderer/src/components/new-workspace/use-smart-workspace-name-field-controller.ts b/src/renderer/src/components/new-workspace/use-smart-workspace-name-field-controller.ts
index 220b8e27e694..968966687bd5 100644
--- a/src/renderer/src/components/new-workspace/use-smart-workspace-name-field-controller.ts
+++ b/src/renderer/src/components/new-workspace/use-smart-workspace-name-field-controller.ts
@@ -1,151 +1,98 @@
 import { useEffect, useMemo } from 'react'
-import { useTranslation } from 'react-i18next'
 import {
-  getJiraIssueSearchQuery,
-  isSmartWorkspaceSourceQueryWithinLimit
-} from './smart-workspace-source-results'
-import { parseBoundedSmartWorkspaceLinearIssueUrlIntent } from '../../../../shared/new-workspace/smart-workspace-linear-intent'
-import {
-  EMPTY_REPO_SEARCH_REPOS,
-  type NormalizedSmartWorkspaceNameFieldProps,
-  type SmartWorkspaceNameFieldProps
-} from './smart-workspace-name-field-model'
-import { getSmartWorkspaceNameFieldCopy } from './smart-workspace-name-field-copy'
+  getActiveWorkspaceEmojiShortcode,
+  searchWorkspaceEmojiShortcodes,
+  type WorkspaceEmojiSuggestion
+} from '@/lib/workspace-emoji-shortcodes'
+import type { SmartWorkspaceNameFieldProps } from './smart-workspace-name-field-model'
+import { useWorkItemSourceSearch } from './use-work-item-source-search'
+import { useSmartWorkspaceFieldFocusControls } from './use-smart-workspace-field-focus-controls'
 import { useSmartWorkspaceNameFieldActions } from './use-smart-workspace-name-field-actions'
-import { useSmartWorkspaceNameFieldFoundation } from './use-smart-workspace-name-field-foundation'
-import { useSmartWorkspaceGithubSearch } from './use-smart-workspace-github-search'
-import { useSmartWorkspaceGitlabSearch } from './use-smart-workspace-gitlab-search'
-import { useSmartWorkspaceNameFieldPresentation } from './use-smart-workspace-name-field-presentation'
-import { useSmartWorkspaceSecondarySearches } from './use-smart-workspace-secondary-searches'
+import { getSmartWorkspaceNameFieldCopy } from './smart-workspace-name-field-copy'
 
-export function useSmartWorkspaceNameFieldController({
-  jiraSourceContext = null,
-  disabled = false,
-  textOnly = false,
-  branchesEnabled = true,
-  repoBackedSourcesDisabled = false,
-  repoBackedSearchRepos = EMPTY_REPO_SEARCH_REPOS,
-  allowCrossRepoProjectAdd = true,
-  crossRepoSwitchTarget = 'project',
-  ...props
-}: SmartWorkspaceNameFieldProps) {
-  // Why: translate()-based options must refresh on language changes without remounting.
-  useTranslation()
-  const normalizedProps: NormalizedSmartWorkspaceNameFieldProps = {
+export function useSmartWorkspaceNameFieldController(props: SmartWorkspaceNameFieldProps) {
+  const search = useWorkItemSourceSearch({
     ...props,
-    jiraSourceContext,
-    disabled,
-    textOnly,
-    branchesEnabled,
-    repoBackedSourcesDisabled,
-    repoBackedSearchRepos,
-    allowCrossRepoProjectAdd,
-    crossRepoSwitchTarget
-  }
-  const foundation = useSmartWorkspaceNameFieldFoundation(normalizedProps)
-  const { linearLoading, setLinearUrlLoadingFeedbackQuery } = foundation
-  const linearUrlIntent = useMemo(
-    () => parseBoundedSmartWorkspaceLinearIssueUrlIntent(foundation.value),
-    [foundation.value]
+    typedTextEnabled: true,
+    sourceSelected: props.selectedSource !== null,
+    gitlabEnabled: Boolean(props.onGitLabItemSelect)
+  })
+  const focus = useSmartWorkspaceFieldFocusControls({
+    props: {
+      selectedSource: props.selectedSource,
+      inputRef: props.inputRef,
+      disabled: search.disabled
+    },
+    state: search
+  })
+  const { value, selectedSource, disabled = false, onActiveSourceModeChange } = props
+  const { mode: sourceMode } = search
+  const { emojiCursor, emojiCommandValue } = focus
+  const activeEmojiShortcode = useMemo(
+    () => getActiveWorkspaceEmojiShortcode(value, emojiCursor),
+    [emojiCursor, value]
   )
-  const linearUrlIntentOwnsInput =
-    linearUrlIntent !== null && (foundation.mode === 'smart' || foundation.mode === 'linear')
-  const linearQuery = linearUrlIntentOwnsInput ? foundation.value : foundation.debouncedQuery
-  const sourceQueryWithinLimit = useMemo(
-    () => isSmartWorkspaceSourceQueryWithinLimit(foundation.debouncedQuery),
-    [foundation.debouncedQuery]
+  const emojiSuggestions: WorkspaceEmojiSuggestion[] = useMemo(
+    () => (activeEmojiShortcode ? searchWorkspaceEmojiShortcodes(activeEmojiShortcode.query) : []),
+    [activeEmojiShortcode]
   )
-  const linearQueryWithinLimit = useMemo(
-    () => isSmartWorkspaceSourceQueryWithinLimit(linearQuery),
-    [linearQuery]
+  const emojiMenuOpen =
+    !disabled &&
+    selectedSource === null &&
+    activeEmojiShortcode !== null &&
+    emojiSuggestions.length > 0
+  const resolvedEmojiCommandValue = emojiSuggestions.some(
+    (suggestion) => `emoji:${suggestion.shortcode}` === emojiCommandValue
   )
+    ? emojiCommandValue
+    : emojiSuggestions[0]
+      ? `emoji:${emojiSuggestions[0].shortcode}`
+      : ''
+  const selectedEmojiSuggestion =
+    emojiSuggestions.find(
+      (suggestion) => `emoji:${suggestion.shortcode}` === resolvedEmojiCommandValue
+    ) ?? null
   useEffect(() => {
-    if (!linearUrlIntentOwnsInput || !linearLoading) {
-      setLinearUrlLoadingFeedbackQuery(null)
-      return
+    onActiveSourceModeChange?.(sourceMode)
+  }, [sourceMode, onActiveSourceModeChange])
+  const handleModeChange = (mode: typeof search.mode): void => {
+    search.setMode(mode)
+    if (!search.disabled && mode !== 'text' && selectedSource === null) {
+      focus.markSourcePopoverUserEngaged()
+      focus.setOpen(true)
+    } else {
+      focus.setOpen(false)
     }
-    setLinearUrlLoadingFeedbackQuery(null)
-    const timer = window.setTimeout(() => setLinearUrlLoadingFeedbackQuery(linearQuery), 200)
-    return () => window.clearTimeout(timer)
-  }, [linearLoading, setLinearUrlLoadingFeedbackQuery, linearQuery, linearUrlIntentOwnsInput])
-  const shouldQueryGithub =
-    sourceQueryWithinLimit &&
-    !repoBackedSourcesDisabled &&
-    !foundation.jiraSource.intent &&
-    !linearUrlIntentOwnsInput &&
-    !textOnly &&
-    foundation.repoBackedSearchTargets.length > 0 &&
-    (foundation.mode === 'smart' || foundation.mode === 'github')
-  const shouldQueryLinear =
-    linearQueryWithinLimit &&
-    !foundation.jiraSource.intent &&
-    !textOnly &&
-    foundation.linearAvailable &&
-    (foundation.mode === 'smart' || foundation.mode === 'linear')
-  const jiraSearchQuery =
-    foundation.mode === 'jira' && !foundation.jiraSource.intent && sourceQueryWithinLimit
-      ? getJiraIssueSearchQuery(foundation.debouncedQuery)
-      : null
-  const shouldQueryJira =
-    !disabled &&
-    !textOnly &&
-    foundation.jiraSourceConnected &&
-    jiraSourceContext !== null &&
-    jiraSearchQuery !== null
-
-  useSmartWorkspaceGithubSearch({
-    foundation,
-    sourceQueryWithinLimit,
-    shouldQueryGithub
-  })
-  useSmartWorkspaceSecondarySearches({
-    foundation,
-    shouldQueryLinear,
-    linearQuery,
-    linearUrlIntent,
-    linearUrlIntentOwnsInput,
-    shouldQueryJira,
-    jiraSearchQuery
-  })
-  const shouldQueryGitlab =
-    sourceQueryWithinLimit &&
-    !repoBackedSourcesDisabled &&
-    !foundation.jiraSource.intent &&
-    !linearUrlIntentOwnsInput &&
-    !textOnly &&
-    foundation.gitlabSourceAvailable &&
-    foundation.repoBackedSearchTargets.length > 0 &&
-    (foundation.mode === 'smart' || foundation.mode === 'gitlab')
-  useSmartWorkspaceGitlabSearch({
-    foundation,
-    sourceQueryWithinLimit,
-    shouldQueryGitlab
-  })
-  const presentation = useSmartWorkspaceNameFieldPresentation(foundation, {
-    linearUrlIntent,
-    linearUrlIntentOwnsInput,
-    linearQuery
-  })
-  const actions = useSmartWorkspaceNameFieldActions(foundation, presentation)
+    focus.cancelLocalInputFocusFrame()
+    focus.localInputFocusFrameRef.current = requestAnimationFrame(() => {
+      focus.localInputFocusFrameRef.current = null
+      focus.localInputRef.current?.focus({ preventScroll: true })
+    })
+  }
+  const foundation = {
+    ...props,
+    ...search,
+    ...focus,
+    allowCrossRepoProjectAdd: props.allowCrossRepoProjectAdd ?? true
+  }
+  const actions = useSmartWorkspaceNameFieldActions(foundation, { ...search, activeEmojiShortcode })
   const copy = getSmartWorkspaceNameFieldCopy({
-    repoBackedSourcesDisabled,
-    linearAvailable: foundation.linearAvailable,
-    branchesEnabled,
-    crossRepoSwitchTarget,
-    disabled,
-    disabledPlaceholder: props.disabledPlaceholder,
-    mode: foundation.mode
+    ...search,
+    disabledPlaceholder: props.disabledPlaceholder
   })
-
   return {
     ...foundation,
-    ...presentation,
     ...actions,
     ...copy,
-    linearStatusId: foundation.linearStatusId
+    handleModeChange,
+    activeEmojiShortcode,
+    emojiSuggestions,
+    emojiMenuOpen,
+    resolvedEmojiCommandValue,
+    selectedEmojiSuggestion,
+    open: focus.open && !search.crossRepoPrompt && !search.disabled && search.mode !== 'text'
   }
 }
-
 export type SmartWorkspaceNameFieldController = ReturnType<
   typeof useSmartWorkspaceNameFieldController
 >
diff --git a/src/renderer/src/components/new-workspace/use-smart-workspace-name-field-foundation.source.test.tsx b/src/renderer/src/components/new-workspace/use-smart-workspace-name-field-foundation.source.test.tsx
new file mode 100644
index 000000000000..abeea9ba49cc
--- /dev/null
+++ b/src/renderer/src/components/new-workspace/use-smart-workspace-name-field-foundation.source.test.tsx
@@ -0,0 +1,167 @@
+// @vitest-environment happy-dom
+
+import { act, renderHook, waitFor } from '@testing-library/react'
+import { beforeEach, describe, expect, it, vi } from 'vitest'
+import type { LinearIssue } from '../../../../shared/linear/issue-types'
+import type { TaskSourceContext } from '../../../../shared/task-source-context'
+import type { NormalizedWorkItemSourceSearchProps } from './smart-workspace-name-field-model'
+import { useWorkItemSourceSearch } from './use-work-item-source-search'
+import { referenceLinearIssue } from '../sidebar/workspace-reference-fixtures.test-support'
+import { useWorkItemSourceFoundation } from './use-work-item-source-foundation'
+import { useSmartWorkspaceSecondarySearches } from './use-smart-workspace-secondary-searches'
+
+const mocks = vi.hoisted(() => ({
+  readStatus: vi.fn(),
+  readJiraSource: vi.fn(() => ({ intent: false })),
+  state: {
+    addRepo: vi.fn(),
+    checkLinearConnection: vi.fn(),
+    linearStatus: { connected: false, viewer: null, selectedWorkspaceId: 'focused-workspace' },
+    linearStatusChecked: true,
+    settings: null,
+    preflightStatus: null,
+    preflightStatusChecked: true,
+    preflightStatusContextKey: 'test',
+    refreshPreflightStatus: vi.fn(),
+    searchLinearIssues: vi.fn<
+      (query: string, limit: number, options: unknown) => Promise<LinearIssue[]>
+    >(async () => [])
+  }
+}))
+vi.mock('@/runtime/runtime-linear-client', () => ({ linearStatus: mocks.readStatus }))
+vi.mock('@/store', () => ({
+  useAppStore: (selector: (state: typeof mocks.state) => unknown) => selector(mocks.state)
+}))
+vi.mock('@/lib/local-preflight-context', () => ({
+  getLocalPreflightContext: () => ({}),
+  localPreflightContextKey: () => 'test'
+}))
+vi.mock('@/i18n/i18n', () => ({ translate: (_key: string, fallback: string) => fallback }))
+vi.mock('./use-jira-source-connection', () => ({
+  useJiraSourceConnection: () => ({ status: null, loaded: false })
+}))
+vi.mock('./use-jira-url-source', () => ({ useJiraUrlSource: mocks.readJiraSource }))
+
+const source: TaskSourceContext = {
+  kind: 'task-source',
+  provider: 'linear',
+  projectId: 'project-1',
+  hostId: 'runtime:saved-host',
+  repoId: null,
+  providerIdentity: null,
+  accountLabel: null
+}
+
+function props(context?: TaskSourceContext): NormalizedWorkItemSourceSearchProps {
+  return {
+    repos: [],
+    repoId: '',
+    value: '',
+    jiraSourceContext: null,
+    linearSourceContext: context,
+    disabled: false,
+    textOnly: false,
+    branchesEnabled: false,
+    repoBackedSourcesDisabled: true,
+    repoBackedSearchRepos: [],
+    crossRepoSwitchTarget: 'task-source'
+  }
+}
+
+describe('smart workspace explicit source connection', () => {
+  beforeEach(() => {
+    vi.clearAllMocks()
+    mocks.state.linearStatus = {
+      connected: false,
+      viewer: null,
+      selectedWorkspaceId: 'focused-workspace'
+    }
+  })
+
+  it('exposes Linear on a connected saved host while the focused runtime is disconnected', async () => {
+    mocks.readStatus.mockResolvedValue({
+      connected: true,
+      viewer: null,
+      selectedWorkspaceId: 'source-workspace'
+    })
+    const fieldProps = props(source)
+    const { result } = renderHook(() => {
+      const foundation = useWorkItemSourceFoundation(fieldProps)
+      useSmartWorkspaceSecondarySearches({
+        foundation,
+        shouldQueryLinear: foundation.linearAvailable,
+        linearQuery: 'launch',
+        linearUrlIntent: null,
+        linearUrlIntentOwnsInput: false,
+        shouldQueryJira: false,
+        jiraSearchQuery: null
+      })
+      return foundation
+    })
+    await waitFor(() =>
+      expect(result.current.availableModes.some((mode) => mode.id === 'linear')).toBe(true)
+    )
+    expect(result.current.linearSourceContext).toBe(source)
+    expect(result.current.linearStatus.connected).toBe(true)
+    expect(mocks.state.searchLinearIssues).toHaveBeenCalledWith('launch', 12, {
+      sourceContext: source,
+      workspaceId: 'source-workspace'
+    })
+    expect(mocks.readStatus).toHaveBeenCalledWith(source)
+    expect(mocks.state.checkLinearConnection).not.toHaveBeenCalled()
+    expect(mocks.state.linearStatus.connected).toBe(false)
+  })
+
+  it('hides disconnected saved-host Linear even when the focused runtime is connected', async () => {
+    mocks.state.linearStatus = { ...mocks.state.linearStatus, connected: true }
+    mocks.readStatus.mockResolvedValue({ connected: false, viewer: null })
+    const fieldProps = props(source)
+    const { result } = renderHook(() => useWorkItemSourceFoundation(fieldProps))
+    await waitFor(() => expect(result.current.linearStatusChecked).toBe(true))
+    expect(result.current.availableModes.some((mode) => mode.id === 'linear')).toBe(false)
+    expect(result.current.linearStatus.connected).toBe(false)
+  })
+
+  it('retains focused runtime status and avoids a new status read without an override', async () => {
+    mocks.state.linearStatus = { ...mocks.state.linearStatus, connected: true }
+    const fieldProps = props()
+    const { result } = renderHook(() => useWorkItemSourceFoundation(fieldProps))
+    await act(async () => {})
+    expect(result.current.availableModes.some((mode) => mode.id === 'linear')).toBe(true)
+    expect(result.current.linearStatus).toBe(mocks.state.linearStatus)
+    expect(mocks.readStatus).not.toHaveBeenCalled()
+  })
+  it('returns to Smart after losing a provider and does not resurrect its stale mode or rows', async () => {
+    mocks.state.linearStatus = { ...mocks.state.linearStatus, connected: true }
+    mocks.state.searchLinearIssues.mockResolvedValue([referenceLinearIssue()])
+    const searchProps = { ...props(), value: 'launch' }
+    const { result, rerender } = renderHook(() => useWorkItemSourceSearch(searchProps))
+    act(() => result.current.setMode('linear'))
+    await waitFor(() => expect(result.current.rows.some((row) => row.kind === 'linear')).toBe(true))
+    mocks.state.linearStatus = { ...mocks.state.linearStatus, connected: false }
+    rerender()
+    await waitFor(() => expect(result.current.mode).toBe('smart'))
+    expect(result.current.rows).toEqual([])
+    mocks.state.searchLinearIssues.mockResolvedValue([])
+    mocks.state.linearStatus = { ...mocks.state.linearStatus, connected: true }
+    rerender()
+    await waitFor(() => expect(result.current.loading).toBe(false))
+    expect(result.current.mode).toBe('smart')
+    expect(result.current.rows).toEqual([])
+  })
+
+  it.each([false, true])(
+    'allows Jira URL resolution only while sourceSelected=%s is false',
+    (sourceSelected) => {
+      const fieldProps = {
+        ...props(),
+        sourceSelected,
+        value: 'https://company.atlassian.net/browse/ENG-1'
+      }
+      renderHook(() => useWorkItemSourceFoundation(fieldProps))
+      expect(mocks.readJiraSource).toHaveBeenLastCalledWith(
+        expect.objectContaining({ enabled: !sourceSelected })
+      )
+    }
+  )
+})
diff --git a/src/renderer/src/components/new-workspace/use-smart-workspace-secondary-searches.ts b/src/renderer/src/components/new-workspace/use-smart-workspace-secondary-searches.ts
index 053614f9b2f1..7c18681bb1d2 100644
--- a/src/renderer/src/components/new-workspace/use-smart-workspace-secondary-searches.ts
+++ b/src/renderer/src/components/new-workspace/use-smart-workspace-secondary-searches.ts
@@ -6,10 +6,10 @@ import { linearWorkspaceScopeSignature } from '../../../../shared/linear/workspa
 import { getSmartWorkspaceLinearSearchQuery } from '../../../../shared/new-workspace/smart-workspace-linear-intent'
 import type { parseBoundedSmartWorkspaceLinearIssueUrlIntent } from '../../../../shared/new-workspace/smart-workspace-linear-intent'
 import { RESULT_LIMIT } from './smart-workspace-name-field-model'
-import { getBranchSearchRequest } from './smart-workspace-source-results'
-import type { useSmartWorkspaceNameFieldFoundation } from './use-smart-workspace-name-field-foundation'
+import { getBranchSearchRequest } from '../../../../shared/new-workspace/smart-workspace-source-results'
+import type { useWorkItemSourceFoundation } from './use-work-item-source-foundation'
 
-type Foundation = ReturnType<typeof useSmartWorkspaceNameFieldFoundation>
+type Foundation = ReturnType<typeof useWorkItemSourceFoundation>
 
 export function useSmartWorkspaceSecondarySearches({
   foundation,
@@ -46,6 +46,7 @@ export function useSmartWorkspaceSecondarySearches({
     searchLinearIssues,
     listLinearIssues,
     linearSourceContext,
+    linearWorkspaceIdOverride,
     setLinearIssues,
     setLinearLoading,
     setSettledLinearUrlQuery,
@@ -171,13 +172,21 @@ export function useSmartWorkspaceSecondarySearches({
             getSmartWorkspaceLinearSearchQuery(trimmed),
             RESULT_LIMIT,
             {
-              sourceContext: linearSourceContext
+              sourceContext: linearSourceContext,
+              ...(linearWorkspaceIdOverride !== undefined
+                ? { workspaceId: linearWorkspaceIdOverride }
+                : {})
             }
           )
         : linearReadMethodsRef.current
             .listLinearIssues(
               { kind: 'list', filter: 'assigned', limit: RESULT_LIMIT },
-              { sourceContext: linearSourceContext }
+              {
+                sourceContext: linearSourceContext,
+                ...(linearWorkspaceIdOverride !== undefined
+                  ? { workspaceId: linearWorkspaceIdOverride }
+                  : {})
+              }
             )
             .then((result) => result.items)
     void request
@@ -208,6 +217,7 @@ export function useSmartWorkspaceSecondarySearches({
     linearQuery,
     linearScopeSignature,
     linearSourceContext,
+    linearWorkspaceIdOverride,
     linearUrlIntent,
     setSettledLinearUrlQuery,
     shouldQueryLinear
diff --git a/src/renderer/src/components/new-workspace/use-smart-workspace-name-field-foundation.ts b/src/renderer/src/components/new-workspace/use-work-item-source-foundation.ts
similarity index 72%
rename from src/renderer/src/components/new-workspace/use-smart-workspace-name-field-foundation.ts
rename to src/renderer/src/components/new-workspace/use-work-item-source-foundation.ts
index 7cf2095e93fa..01198f759015 100644
--- a/src/renderer/src/components/new-workspace/use-smart-workspace-name-field-foundation.ts
+++ b/src/renderer/src/components/new-workspace/use-work-item-source-foundation.ts
@@ -5,17 +5,16 @@ import { getLocalPreflightContext, localPreflightContextKey } from '@/lib/local-
 import { getRepoOwnerRoutedSettings } from '@/lib/repo-runtime-owner'
 import { buildTaskSourceContextFromRepo } from '../../../../shared/task-source-context'
 import type {
-  NormalizedSmartWorkspaceNameFieldProps,
+  NormalizedWorkItemSourceSearchProps,
   RepoBackedSearchTarget
 } from './smart-workspace-name-field-model'
 import { useJiraSourceConnection } from './use-jira-source-connection'
 import { useJiraUrlSource } from './use-jira-url-source'
+import { useLinearSourceConnection } from './use-linear-source-connection'
 import { useSmartWorkspaceFieldAvailability } from './use-smart-workspace-field-availability'
-import { useSmartWorkspaceNameFieldState } from './use-smart-workspace-name-field-state'
+import { useWorkItemSourceState } from './use-work-item-source-state'
 
-export function useSmartWorkspaceNameFieldFoundation(
-  props: NormalizedSmartWorkspaceNameFieldProps
-) {
+export function useWorkItemSourceFoundation(props: NormalizedWorkItemSourceSearchProps) {
   const {
     repos,
     repoId,
@@ -25,17 +24,16 @@ export function useSmartWorkspaceNameFieldFoundation(
     value,
     disabled,
     jiraSourceContext,
-    selectedSource
+    sourceSelected
   } = props
   const {
-    addRepo,
     checkLinearConnection,
     fetchWorkItems,
     fetchWorkItemsAcrossRepos,
     fetchLinearIssue,
     getCachedWorkItems,
-    linearStatus,
-    linearStatusChecked,
+    linearStatus: defaultLinearStatus,
+    linearStatusChecked: defaultLinearStatusChecked,
     listLinearIssues,
     preflightStatus,
     preflightStatusChecked,
@@ -47,7 +45,6 @@ export function useSmartWorkspaceNameFieldFoundation(
     settings
   } = useAppStore(
     useShallow((s) => ({
-      addRepo: s.addRepo,
       checkLinearConnection: s.checkLinearConnection,
       fetchWorkItems: s.fetchWorkItems,
       fetchWorkItemsAcrossRepos: s.fetchWorkItemsAcrossRepos,
@@ -88,14 +85,16 @@ export function useSmartWorkspaceNameFieldFoundation(
   }, [githubSourceContextOverride, selectedRepo])
   const gitlabSourceContext = useMemo(
     () =>
-      selectedRepo
-        ? buildTaskSourceContextFromRepo({
-            provider: 'gitlab',
-            projectId: selectedRepo.id,
-            repo: selectedRepo
-          })
-        : null,
-    [selectedRepo]
+      props.gitlabSourceContext?.provider === 'gitlab'
+        ? props.gitlabSourceContext
+        : selectedRepo
+          ? buildTaskSourceContextFromRepo({
+              provider: 'gitlab',
+              projectId: selectedRepo.id,
+              repo: selectedRepo
+            })
+          : null,
+    [props.gitlabSourceContext, selectedRepo]
   )
   const repoBackedSearchTargets = useMemo<RepoBackedSearchTarget[]>(
     () =>
@@ -127,16 +126,29 @@ export function useSmartWorkspaceNameFieldFoundation(
   )
   const linearSourceContext = useMemo(
     () =>
-      selectedRepo
-        ? buildTaskSourceContextFromRepo({
-            provider: 'linear',
-            projectId: selectedRepo.id,
-            repo: selectedRepo
-          })
-        : null,
-    [selectedRepo]
+      props.linearSourceContext?.provider === 'linear'
+        ? props.linearSourceContext
+        : selectedRepo
+          ? buildTaskSourceContextFromRepo({
+              provider: 'linear',
+              projectId: selectedRepo.id,
+              repo: selectedRepo
+            })
+          : null,
+    [props.linearSourceContext, selectedRepo]
   )
-  const state = useSmartWorkspaceNameFieldState(textOnly, value)
+  const state = useWorkItemSourceState(textOnly, value)
+  const hasLinearSourceOverride = props.linearSourceContext?.provider === 'linear'
+  const linearConnection = useLinearSourceConnection({
+    enabled: hasLinearSourceOverride && !disabled && !textOnly,
+    sourceContext: hasLinearSourceOverride ? linearSourceContext : null
+  })
+  const linearStatus = hasLinearSourceOverride
+    ? (linearConnection.status ?? { connected: false, viewer: null })
+    : defaultLinearStatus
+  const linearStatusChecked = hasLinearSourceOverride
+    ? linearConnection.loaded
+    : defaultLinearStatusChecked
   const jiraConnection = useJiraSourceConnection({
     enabled: !disabled && !textOnly && jiraSourceContext !== null,
     sourceContext: jiraSourceContext
@@ -148,7 +160,7 @@ export function useSmartWorkspaceNameFieldFoundation(
       !disabled &&
       !textOnly &&
       (state.mode === 'smart' || state.mode === 'jira') &&
-      selectedSource === null,
+      !sourceSelected,
     sourceContext: jiraSourceContext,
     connection: jiraConnection
   })
@@ -167,7 +179,8 @@ export function useSmartWorkspaceNameFieldFoundation(
     expectedPreflightContextKey,
     refreshPreflightStatus,
     linearStatus,
-    linearStatusChecked,
+    // Explicit sources load independently instead of refreshing the focused runtime's store.
+    linearStatusChecked: hasLinearSourceOverride || linearStatusChecked,
     checkLinearConnection,
     jiraSourceConnected
   })
@@ -176,19 +189,22 @@ export function useSmartWorkspaceNameFieldFoundation(
     ...props,
     ...state,
     ...availability,
-    addRepo,
     fetchWorkItems,
     fetchWorkItemsAcrossRepos,
     fetchLinearIssue,
     getCachedWorkItems,
     linearStatus,
     linearStatusChecked,
+    linearWorkspaceIdOverride: hasLinearSourceOverride
+      ? (linearStatus.selectedWorkspaceId ?? linearStatus.activeWorkspaceId ?? null)
+      : undefined,
     listLinearIssues,
     searchJiraIssues,
     searchLinearIssues,
     selectedRepo,
     selectedRepoOwnerSettings,
     githubSourceContext,
+    gitlabSourceContext,
     repoBackedSearchTargets,
     linearSourceContext,
     jiraConnectionStatus,
diff --git a/src/renderer/src/components/new-workspace/use-smart-workspace-name-field-presentation.ts b/src/renderer/src/components/new-workspace/use-work-item-source-presentation.ts
similarity index 84%
rename from src/renderer/src/components/new-workspace/use-smart-workspace-name-field-presentation.ts
rename to src/renderer/src/components/new-workspace/use-work-item-source-presentation.ts
index 5665e60a0aff..212d9d724505 100644
--- a/src/renderer/src/components/new-workspace/use-smart-workspace-name-field-presentation.ts
+++ b/src/renderer/src/components/new-workspace/use-work-item-source-presentation.ts
@@ -8,11 +8,6 @@ import {
   parseBoundedSmartWorkspaceLinearIssueUrlIntent,
   prioritizeSmartWorkspaceLinearIssueResults
 } from '../../../../shared/new-workspace/smart-workspace-linear-intent'
-import {
-  getActiveWorkspaceEmojiShortcode,
-  searchWorkspaceEmojiShortcodes,
-  type WorkspaceEmojiSuggestion
-} from '@/lib/workspace-emoji-shortcodes'
 import { resolveSmartWorkspaceCommandValue } from './smart-workspace-command-value'
 import {
   buildSmartWorkspaceSourceRows,
@@ -20,17 +15,17 @@ import {
   getVisibleHeldProviderResults,
   isBlockingTaskUrlResolution,
   isSmartWorkspaceSourceQueryWithinLimit
-} from './smart-workspace-source-results'
+} from '../../../../shared/new-workspace/smart-workspace-source-results'
 import { RESULT_LIMIT, type RowEntry } from './smart-workspace-name-field-model'
-import type { useSmartWorkspaceNameFieldFoundation } from './use-smart-workspace-name-field-foundation'
+import type { useWorkItemSourceFoundation } from './use-work-item-source-foundation'
 
-type Foundation = ReturnType<typeof useSmartWorkspaceNameFieldFoundation>
+type Foundation = ReturnType<typeof useWorkItemSourceFoundation>
 
 function isTypedTextSourceRow(row: RowEntry): boolean {
   return row.kind === 'use-name' || row.kind === 'create-branch'
 }
 
-export function useSmartWorkspaceNameFieldPresentation(
+export function useWorkItemSourcePresentation(
   foundation: Foundation,
   options?: {
     linearUrlIntent?: ReturnType<typeof parseBoundedSmartWorkspaceLinearIssueUrlIntent>
@@ -54,10 +49,6 @@ export function useSmartWorkspaceNameFieldPresentation(
     linearIssues,
     commandValue,
     setCommandValue,
-    emojiCursor,
-    disabled,
-    selectedSource,
-    emojiCommandValue,
     githubLoading,
     gitlabLoading,
     branchesLoading,
@@ -100,7 +91,7 @@ export function useSmartWorkspaceNameFieldPresentation(
         site
       }))
     }
-    return buildSmartWorkspaceSourceRows({
+    const results = buildSmartWorkspaceSourceRows({
       branches: getVisibleBranchResults({
         branches,
         mode,
@@ -143,7 +134,11 @@ export function useSmartWorkspaceNameFieldPresentation(
       resultLimit: RESULT_LIMIT,
       value
     })
+    return foundation.typedTextEnabled
+      ? results
+      : results.filter((row) => !isTypedTextSourceRow(row))
   }, [
+    foundation.typedTextEnabled,
     branches,
     branchResultsSource,
     debouncedQuery,
@@ -235,33 +230,6 @@ export function useSmartWorkspaceNameFieldPresentation(
     }
     setCommandValue(resolvedCommandValue)
   }, [commandValue, resolvedCommandValue, setCommandValue])
-  const activeEmojiShortcode = useMemo(
-    () => getActiveWorkspaceEmojiShortcode(value, emojiCursor),
-    [emojiCursor, value]
-  )
-  const emojiSuggestions = useMemo(
-    () =>
-      activeEmojiShortcode
-        ? searchWorkspaceEmojiShortcodes(activeEmojiShortcode.query)
-        : ([] as WorkspaceEmojiSuggestion[]),
-    [activeEmojiShortcode]
-  )
-  const emojiMenuOpen =
-    !disabled &&
-    selectedSource === null &&
-    activeEmojiShortcode !== null &&
-    emojiSuggestions.length > 0
-  const resolvedEmojiCommandValue = emojiSuggestions.some(
-    (suggestion) => `emoji:${suggestion.shortcode}` === emojiCommandValue
-  )
-    ? emojiCommandValue
-    : emojiSuggestions[0]
-      ? `emoji:${emojiSuggestions[0].shortcode}`
-      : ''
-  const selectedEmojiSuggestion =
-    emojiSuggestions.find(
-      (suggestion) => `emoji:${suggestion.shortcode}` === resolvedEmojiCommandValue
-    ) ?? null
   const showLinearUrlLoadingFeedback =
     linearLoading && linearUrlIntentOwnsInput && linearUrlLoadingFeedbackQuery === linearQuery
   const visibleLinearLoading =
@@ -280,11 +248,6 @@ export function useSmartWorkspaceNameFieldPresentation(
     searchResultRows,
     isQueryStale,
     resolvedCommandValue,
-    activeEmojiShortcode,
-    emojiSuggestions,
-    emojiMenuOpen,
-    resolvedEmojiCommandValue,
-    selectedEmojiSuggestion,
     loading,
     showSearchSpinner,
     linearUrlIntent,
diff --git a/src/renderer/src/components/new-workspace/use-work-item-source-search.ts b/src/renderer/src/components/new-workspace/use-work-item-source-search.ts
new file mode 100644
index 000000000000..98ee5f0f1578
--- /dev/null
+++ b/src/renderer/src/components/new-workspace/use-work-item-source-search.ts
@@ -0,0 +1,155 @@
+import { resolveWorkItemSourceRow } from './work-item-source-selection'
+import { useCallback, useEffect, useMemo } from 'react'
+import { useTranslation } from 'react-i18next'
+import {
+  getJiraIssueSearchQuery,
+  isSmartWorkspaceSourceQueryWithinLimit
+} from '../../../../shared/new-workspace/smart-workspace-source-results'
+import { parseBoundedSmartWorkspaceLinearIssueUrlIntent } from '../../../../shared/new-workspace/smart-workspace-linear-intent'
+import {
+  EMPTY_REPO_SEARCH_REPOS,
+  type NormalizedWorkItemSourceSearchProps,
+  type WorkItemSourceSearchProps
+} from './smart-workspace-name-field-model'
+import { useWorkItemSourceFoundation } from './use-work-item-source-foundation'
+import { useSmartWorkspaceGithubSearch } from './use-smart-workspace-github-search'
+import { useSmartWorkspaceGitlabSearch } from './use-smart-workspace-gitlab-search'
+import { useWorkItemSourcePresentation } from './use-work-item-source-presentation'
+import { useSmartWorkspaceSecondarySearches } from './use-smart-workspace-secondary-searches'
+
+export function useWorkItemSourceSearch({
+  jiraSourceContext = null,
+  disabled = false,
+  textOnly = false,
+  branchesEnabled = true,
+  repoBackedSourcesDisabled = false,
+  repoBackedSearchRepos = EMPTY_REPO_SEARCH_REPOS,
+  crossRepoSwitchTarget = 'project',
+  ...props
+}: WorkItemSourceSearchProps) {
+  // Why: translate()-based options must refresh on language changes without remounting.
+  useTranslation()
+  const normalizedProps: NormalizedWorkItemSourceSearchProps = {
+    ...props,
+    jiraSourceContext,
+    disabled,
+    textOnly,
+    branchesEnabled,
+    repoBackedSourcesDisabled,
+    repoBackedSearchRepos,
+    crossRepoSwitchTarget
+  }
+  const foundation = useWorkItemSourceFoundation(normalizedProps)
+  const { linearLoading, setLinearUrlLoadingFeedbackQuery } = foundation
+  const linearUrlIntent = useMemo(
+    () => parseBoundedSmartWorkspaceLinearIssueUrlIntent(foundation.value),
+    [foundation.value]
+  )
+  const linearUrlIntentOwnsInput =
+    linearUrlIntent !== null && (foundation.mode === 'smart' || foundation.mode === 'linear')
+  const linearQuery = linearUrlIntentOwnsInput ? foundation.value : foundation.debouncedQuery
+  const sourceQueryWithinLimit = useMemo(
+    () => isSmartWorkspaceSourceQueryWithinLimit(foundation.debouncedQuery),
+    [foundation.debouncedQuery]
+  )
+  const linearQueryWithinLimit = useMemo(
+    () => isSmartWorkspaceSourceQueryWithinLimit(linearQuery),
+    [linearQuery]
+  )
+  useEffect(() => {
+    if (!linearUrlIntentOwnsInput || !linearLoading) {
+      setLinearUrlLoadingFeedbackQuery(null)
+      return
+    }
+    setLinearUrlLoadingFeedbackQuery(null)
+    const timer = window.setTimeout(() => setLinearUrlLoadingFeedbackQuery(linearQuery), 200)
+    return () => window.clearTimeout(timer)
+  }, [linearLoading, setLinearUrlLoadingFeedbackQuery, linearQuery, linearUrlIntentOwnsInput])
+  const shouldQueryGithub =
+    sourceQueryWithinLimit &&
+    !repoBackedSourcesDisabled &&
+    !foundation.jiraSource.intent &&
+    !linearUrlIntentOwnsInput &&
+    !textOnly &&
+    foundation.repoBackedSearchTargets.length > 0 &&
+    (foundation.mode === 'smart' || foundation.mode === 'github')
+  const shouldQueryLinear =
+    linearQueryWithinLimit &&
+    !foundation.jiraSource.intent &&
+    !textOnly &&
+    foundation.linearAvailable &&
+    (foundation.mode === 'smart' || foundation.mode === 'linear')
+  const jiraSearchQuery =
+    foundation.mode === 'jira' && !foundation.jiraSource.intent && sourceQueryWithinLimit
+      ? getJiraIssueSearchQuery(foundation.debouncedQuery)
+      : null
+  const shouldQueryJira =
+    !disabled &&
+    !textOnly &&
+    foundation.jiraSourceConnected &&
+    jiraSourceContext !== null &&
+    jiraSearchQuery !== null
+
+  useSmartWorkspaceGithubSearch({
+    foundation,
+    sourceQueryWithinLimit,
+    shouldQueryGithub
+  })
+  useSmartWorkspaceSecondarySearches({
+    foundation,
+    shouldQueryLinear,
+    linearQuery,
+    linearUrlIntent,
+    linearUrlIntentOwnsInput,
+    shouldQueryJira,
+    jiraSearchQuery
+  })
+  const shouldQueryGitlab =
+    sourceQueryWithinLimit &&
+    !repoBackedSourcesDisabled &&
+    !foundation.jiraSource.intent &&
+    !linearUrlIntentOwnsInput &&
+    !textOnly &&
+    foundation.gitlabSourceAvailable &&
+    foundation.repoBackedSearchTargets.length > 0 &&
+    (foundation.mode === 'smart' || foundation.mode === 'gitlab')
+  useSmartWorkspaceGitlabSearch({
+    foundation,
+    sourceQueryWithinLimit,
+    shouldQueryGitlab
+  })
+  const presentation = useWorkItemSourcePresentation(foundation, {
+    linearUrlIntent,
+    linearUrlIntentOwnsInput,
+    linearQuery
+  })
+  const resolveRow = useCallback(
+    (row: (typeof presentation.rows)[number]) =>
+      resolveWorkItemSourceRow(
+        row,
+        {
+          github: foundation.githubSourceContext,
+          gitlab: foundation.gitlabSourceContext ?? null,
+          linear: foundation.linearSourceContext,
+          jira: foundation.jiraSource.boundSourceContext ?? foundation.jiraSourceContext
+        },
+        foundation.jiraConnectionStatus?.sites
+      ),
+    [
+      foundation.githubSourceContext,
+      foundation.gitlabSourceContext,
+      foundation.linearSourceContext,
+      foundation.jiraSource.boundSourceContext,
+      foundation.jiraSourceContext,
+      foundation.jiraConnectionStatus?.sites
+    ]
+  )
+  return {
+    ...foundation,
+    ...presentation,
+    resolveRow,
+    linearStatusId: foundation.linearStatusId
+  }
+}
+
+export type WorkItemSourceSearch = ReturnType<typeof useWorkItemSourceSearch>
diff --git a/src/renderer/src/components/new-workspace/use-smart-workspace-name-field-state.ts b/src/renderer/src/components/new-workspace/use-work-item-source-state.ts
similarity index 74%
rename from src/renderer/src/components/new-workspace/use-smart-workspace-name-field-state.ts
rename to src/renderer/src/components/new-workspace/use-work-item-source-state.ts
index bf75ca318697..05641de4ed6b 100644
--- a/src/renderer/src/components/new-workspace/use-smart-workspace-name-field-state.ts
+++ b/src/renderer/src/components/new-workspace/use-work-item-source-state.ts
@@ -5,14 +5,13 @@ import type { GitLabWorkItem } from '../../../../shared/gitlab-types'
 import type { JiraIssue } from '../../../../shared/jira-types'
 import type { LinearIssue } from '../../../../shared/linear/issue-types'
 import type { BaseRefSearchResult } from '../../../../shared/repo-types'
-import type { SmartNameMode } from './smart-workspace-source-results'
+import type { SmartNameMode } from '../../../../shared/new-workspace/smart-workspace-source-results'
 import type { MrStateFilter } from './smart-workspace-localized-options'
 import type { CrossRepoPrompt } from './smart-workspace-name-field-model'
 
-export function useSmartWorkspaceNameFieldState(textOnly: boolean, value: string) {
+export function useWorkItemSourceState(textOnly: boolean, value: string) {
   const [mode, setMode] = useState<SmartNameMode>(textOnly ? 'text' : 'smart')
   const [mrStateFilter, setMrStateFilter] = useState<MrStateFilter>('opened')
-  const [open, setOpen] = useState(false)
   const [debouncedQuery, setDebouncedQuery] = useState(value)
   const [githubItems, setGithubItems] = useState<GitHubWorkItem[]>([])
   const [gitlabItems, setGitlabItems] = useState<GitLabWorkItem[]>([])
@@ -33,16 +32,8 @@ export function useSmartWorkspaceNameFieldState(textOnly: boolean, value: string
   const [settledLinearUrlQuery, setSettledLinearUrlQuery] = useState<string | null>(null)
   const [jiraLoading, setJiraLoading] = useState(false)
   const [commandValue, setCommandValue] = useState('')
-  const [emojiCommandValue, setEmojiCommandValue] = useState('')
-  const [emojiCursor, setEmojiCursor] = useState<number | null>(null)
-  const localInputRef = useRef<HTMLInputElement | null>(null)
-  const focusedSelectedSourceKeyRef = useRef<string | null>(null)
-  const tabsListRef = useRef<HTMLDivElement | null>(null)
   const repoSlugCacheRef = useRef<Map<string, RepoSlug>>(new Map())
   const handledCrossRepoUrlRef = useRef<string | null>(null)
-  const localInputFocusFrameRef = useRef<number | null>(null)
-  // Why: Electron makes programmatic .focus() look user-initiated, so wait for real interaction.
-  const deferSourcePopoverUntilInteractionRef = useRef(true)
   const [crossRepoPrompt, setCrossRepoPrompt] = useState<CrossRepoPrompt | null>(null)
 
   return {
@@ -50,8 +41,6 @@ export function useSmartWorkspaceNameFieldState(textOnly: boolean, value: string
     setMode,
     mrStateFilter,
     setMrStateFilter,
-    open,
-    setOpen,
     debouncedQuery,
     setDebouncedQuery,
     githubItems,
@@ -82,17 +71,8 @@ export function useSmartWorkspaceNameFieldState(textOnly: boolean, value: string
     setJiraLoading,
     commandValue,
     setCommandValue,
-    emojiCommandValue,
-    setEmojiCommandValue,
-    emojiCursor,
-    setEmojiCursor,
-    localInputRef,
-    focusedSelectedSourceKeyRef,
-    tabsListRef,
     repoSlugCacheRef,
     handledCrossRepoUrlRef,
-    localInputFocusFrameRef,
-    deferSourcePopoverUntilInteractionRef,
     crossRepoPrompt,
     setCrossRepoPrompt
   }
diff --git a/src/renderer/src/components/new-workspace/work-item-source-selection.test.ts b/src/renderer/src/components/new-workspace/work-item-source-selection.test.ts
new file mode 100644
index 000000000000..7475986d2e5e
--- /dev/null
+++ b/src/renderer/src/components/new-workspace/work-item-source-selection.test.ts
@@ -0,0 +1,69 @@
+import { describe, expect, it } from 'vitest'
+import type { JiraIssue, JiraSite } from '../../../../shared/jira-types'
+import type { TaskSourceContext } from '../../../../shared/task-source-context'
+import { bindJiraIssueSourceContext } from './use-jira-url-source'
+import { resolveWorkItemSourceRow } from './work-item-source-selection'
+
+const source: TaskSourceContext = {
+  kind: 'task-source',
+  provider: 'jira',
+  projectId: 'project',
+  hostId: 'ssh:box',
+  repoId: null,
+  providerIdentity: null,
+  accountLabel: null
+}
+const site: JiraSite = {
+  id: 'site',
+  siteUrl: 'https://company.atlassian.net',
+  email: 'account@example.com',
+  displayName: 'Account',
+  accountId: 'account'
+}
+const issue: JiraIssue = {
+  id: 'issue',
+  key: 'ENG-1',
+  title: 'Issue',
+  url: `${site.siteUrl}/browse/ENG-1`,
+  siteId: site.id,
+  project: { id: 'project', key: 'ENG', name: 'Engineering' },
+  issueType: { id: 'bug', name: 'Bug' },
+  status: { id: 'open', name: 'Open', categoryKey: 'new', categoryName: 'To do' },
+  labels: [],
+  updatedAt: '',
+  createdAt: ''
+}
+const contexts = { github: null, gitlab: null, linear: null, jira: source }
+
+describe('shared work-item source resolution', () => {
+  it('binds a known Jira account for both creation and attachment selection', () => {
+    expect(
+      resolveWorkItemSourceRow({ kind: 'jira', value: 'jira', issue }, contexts, [site])
+        ?.taskSourceContext
+    ).toEqual(bindJiraIssueSourceContext(source, site, issue))
+  })
+  it('rejects a row whose account is no longer available', () => {
+    expect(
+      resolveWorkItemSourceRow({ kind: 'jira', value: 'jira', issue }, contexts, [])
+    ).toBeNull()
+  })
+  it.each([{ siteId: 'another-account' }, { url: 'https://other.atlassian.net/browse/ENG-1' }])(
+    'rejects a pre-bound account that does not match the result: %j',
+    (overrides) => {
+      const bound = bindJiraIssueSourceContext(source, site, issue)
+      expect(
+        resolveWorkItemSourceRow(
+          { kind: 'jira', value: 'jira', issue: { ...issue, ...overrides } },
+          { ...contexts, jira: bound }
+        )
+      ).toBeNull()
+    }
+  )
+  it('accepts the callback-bound account when no connection list is available', () => {
+    const bound = bindJiraIssueSourceContext(source, site, issue)
+    expect(
+      resolveWorkItemSourceRow({ kind: 'jira', value: 'jira', issue }, { ...contexts, jira: bound })
+        ?.taskSourceContext
+    ).toEqual(bound)
+  })
+})
diff --git a/src/renderer/src/components/new-workspace/work-item-source-selection.ts b/src/renderer/src/components/new-workspace/work-item-source-selection.ts
new file mode 100644
index 000000000000..47196d8f7c28
--- /dev/null
+++ b/src/renderer/src/components/new-workspace/work-item-source-selection.ts
@@ -0,0 +1,103 @@
+import type { TaskSourceContext } from '../../../../shared/task-source-context'
+import { getMatchingJiraSites, parseJiraIssueUrl } from '../../../../shared/jira-issue-url'
+import type { JiraSite } from '../../../../shared/jira-types'
+import {
+  buildGitHubWorkspaceSource,
+  buildGitLabWorkspaceSource,
+  buildLinearWorkspaceSource,
+  buildJiraWorkspaceSource,
+  type WorkspaceSourceLinkedItem
+} from '../../../../shared/new-workspace/workspace-source'
+import { parseGitHubIssueOrPRLink } from '../../../../shared/github/links'
+import { parseGitLabIssueOrMRLink } from '../../../../shared/new-workspace/gitlab-links'
+import { bindJiraIssueSourceContext } from './use-jira-url-source'
+import type { RowEntry } from './smart-workspace-name-field-model'
+
+export type WorkItemSourceContexts = Record<
+  'github' | 'gitlab' | 'linear' | 'jira',
+  TaskSourceContext | null
+>
+export function resolveWorkItemSourceRow(
+  row: RowEntry,
+  contexts: WorkItemSourceContexts,
+  sites: readonly JiraSite[] = []
+):
+  | (WorkspaceSourceLinkedItem & { identifier?: string; taskSourceContext?: TaskSourceContext })
+  | null {
+  if (row.kind === 'github' || row.kind === 'gitlab') {
+    const { type, number, title, url, repoId } = row.item
+    const source =
+      row.kind === 'github'
+        ? buildGitHubWorkspaceSource({ ...row.item, type: row.item.type })
+        : buildGitLabWorkspaceSource(row.item)
+    const context = contexts[row.kind]
+    const github = row.kind === 'github' ? parseGitHubIssueOrPRLink(url) : null
+    const gitlab = row.kind === 'gitlab' ? parseGitLabIssueOrMRLink(url) : null
+    const identity = github
+      ? { provider: 'github' as const, ...github.slug }
+      : gitlab
+        ? { provider: 'gitlab' as const, webUrl: `${new URL(url).origin}/${gitlab.slug.path}` }
+        : context?.providerIdentity
+    return {
+      provider: source.provider,
+      type,
+      number,
+      title,
+      url,
+      repoId,
+      taskSourceContext: context ? { ...context, providerIdentity: identity } : undefined
+    }
+  }
+  if (row.kind === 'linear') {
+    const { linearBranchName: _branchName, ...source } = buildLinearWorkspaceSource(row.issue)
+    return {
+      ...source,
+      identifier: row.issue.identifier,
+      taskSourceContext: contexts.linear
+        ? {
+            ...contexts.linear,
+            providerIdentity: {
+              provider: 'linear',
+              workspaceId: row.issue.workspaceId,
+              workspaceName: row.issue.workspaceName,
+              teamId: row.issue.team.id,
+              teamKey: row.issue.team.key
+            }
+          }
+        : undefined
+    }
+  }
+  if (row.kind === 'jira') {
+    const parsed = parseJiraIssueUrl(row.issue.url)
+    const site =
+      sites.find((site) => site.id === row.issue.siteId) ??
+      (!row.issue.siteId && sites.length === 1 ? sites[0] : null)
+    const source = contexts.jira
+    const identity = source?.providerIdentity
+    const boundUrl =
+      identity?.provider === 'jira' && identity.siteUrl
+        ? parseJiraIssueUrl(`${identity.siteUrl.replace(/\/+$/, '')}/browse/${row.issue.key}`)
+        : null
+    const boundMatches =
+      identity?.provider === 'jira' &&
+      (!row.issue.siteId || row.issue.siteId === identity.siteId) &&
+      parsed &&
+      boundUrl &&
+      parsed.origin === boundUrl.origin &&
+      parsed.sitePath === boundUrl.sitePath
+    const context =
+      source && site && parsed && getMatchingJiraSites(parsed, [site]).length
+        ? bindJiraIssueSourceContext(source, site, row.issue)
+        : boundMatches
+          ? source
+          : null
+    return context
+      ? {
+          ...buildJiraWorkspaceSource(row.issue),
+          identifier: row.issue.key,
+          taskSourceContext: context
+        }
+      : null
+  }
+  return null
+}
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 ffa5f401e2b9..6352278add42 100644
--- a/src/renderer/src/components/pull-request-page/page/surface.tsx
+++ b/src/renderer/src/components/pull-request-page/page/surface.tsx
@@ -65,7 +65,12 @@ export default function PullRequestPage({
   const attachedWorkspace = useMemo(
     () =>
       workItem?.type === 'pr'
-        ? findGithubPrWorkspaceAttachment(allWorktrees, effectiveRepoId, workItem.number)
+        ? findGithubPrWorkspaceAttachment(
+            allWorktrees,
+            effectiveRepoId,
+            workItem.number,
+            workItem.url
+          )
         : null,
     [allWorktrees, effectiveRepoId, workItem]
   )
@@ -125,7 +130,8 @@ export default function PullRequestPage({
     const currentAttached = findGithubPrWorkspaceAttachment(
       useAppStore.getState().allWorktrees(),
       targetRepoId,
-      workItem.number
+      workItem.number,
+      workItem.url
     )
     if (!currentAttached) {
       handleUseWorkItem()
diff --git a/src/renderer/src/components/right-sidebar/FileExplorer.tsx b/src/renderer/src/components/right-sidebar/FileExplorer.tsx
index c8800f4655fa..8a36297b9cfb 100644
--- a/src/renderer/src/components/right-sidebar/FileExplorer.tsx
+++ b/src/renderer/src/components/right-sidebar/FileExplorer.tsx
@@ -325,9 +325,7 @@ function FileExplorerFiles(): React.JSX.Element {
             displayRootPath={displayRootPath}
             activeRepo={activeRepo}
             worktreePath={worktreePath}
-            visibleFilesWorktreePath={visibleFilesWorktreePath}
             explorerView={explorerView}
-            isFilesViewActive={isFilesViewActive}
             activeFileId={activeFileId}
             hasNameFilter={hasNameFilter}
             nameFilterSource={nameFilterSource}
diff --git a/src/renderer/src/components/right-sidebar/FileExplorerFilesTreePane.tsx b/src/renderer/src/components/right-sidebar/FileExplorerFilesTreePane.tsx
index a83b4e0a3709..7cbe51de593c 100644
--- a/src/renderer/src/components/right-sidebar/FileExplorerFilesTreePane.tsx
+++ b/src/renderer/src/components/right-sidebar/FileExplorerFilesTreePane.tsx
@@ -21,9 +21,7 @@ type FileExplorerFilesTreePaneProps = {
   activeRepo: Repo | null
   worktreePath: string | null
   displayRootPath: string | null
-  visibleFilesWorktreePath: string | null
   explorerView: RightSidebarExplorerView
-  isFilesViewActive: boolean
   activeFileId: string | null
   hasNameFilter: boolean
   nameFilterSource: FileExplorerNameFilterProjectionSource | null
@@ -45,9 +43,7 @@ export function FileExplorerFilesTreePane({
   activeRepo,
   worktreePath,
   displayRootPath,
-  visibleFilesWorktreePath,
   explorerView,
-  isFilesViewActive,
   activeFileId,
   hasNameFilter,
   nameFilterSource,
@@ -78,7 +74,8 @@ export function FileExplorerFilesTreePane({
     inlineInputState,
     rowScrolling,
     handlers,
-    nodeCommands
+    nodeCommands,
+    fileDropOwnerRef
   } = paneState
   const { inlineInput, inlineInputIndex, startNew, dismissInlineInput, handleInlineSubmit } =
     inlineInputState
@@ -111,9 +108,8 @@ export function FileExplorerFilesTreePane({
   } = nodeCommands
 
   // Why: the root explorer container must stay mounted for loading, error,
-  // and empty states so the data-native-file-drop-target marker is always
-  // present. Without this, external file drops would have no target surface
-  // when the tree is empty, still loading, or showing a read error.
+  // and empty states so it always owns OS file drops; otherwise an empty,
+  // loading or failed tree would have no drop target.
   const isEmptyState = visibleRowCount === 0 && !inlineInput
   const isNameFilterLoading = nameFilterSource?.relativePaths === null
   const isRootLoading = !rootCache || (!!displayRootPath && loadingDirPaths.has(displayRootPath))
@@ -146,14 +142,12 @@ export function FileExplorerFilesTreePane({
           'bg-border',
         isNativeDragOver && explorerView === 'files' && !nativeDropTargetDir && 'bg-border'
       )}
+      ref={fileDropOwnerRef}
       viewportRef={scrollRef}
       viewportTabIndex={-1}
       viewportClassName="h-full min-h-0 py-2"
-      data-native-file-drop-target={isFilesViewActive ? 'file-explorer' : undefined}
-      data-native-file-drop-dir={
-        visibleFilesWorktreePath ? (displayRootPath ?? undefined) : undefined
-      }
       onWheelCapture={handleWheelCapture}
+      onDragOverCapture={rootDragHandlers.onDragOverCapture}
       onDragOver={rootDragHandlers.onDragOver}
       onDragEnter={rootDragHandlers.onDragEnter}
       onDragLeave={rootDragHandlers.onDragLeave}
diff --git a/src/renderer/src/components/right-sidebar/FileExplorerRow.tsx b/src/renderer/src/components/right-sidebar/FileExplorerRow.tsx
index f2eb2ba11412..d71b02da7690 100644
--- a/src/renderer/src/components/right-sidebar/FileExplorerRow.tsx
+++ b/src/renderer/src/components/right-sidebar/FileExplorerRow.tsx
@@ -149,7 +149,8 @@ export function FileExplorerRow({
           )}
           style={{ paddingLeft: `${(node.depth - displayDepthOffset) * 16 + 8}px` }}
           ref={setRowDragNode}
-          data-native-file-drop-dir={rowDropDir}
+          // Why: the explorer's OS-drop owner reads the target folder from this at drop time.
+          data-file-explorer-drop-dir={rowDropDir}
           // Why: marks this draggable row so the wheel-capture handler can rescue
           // scroll Chromium swallows over draggable nodes (file-explorer-drag-scroll-marker).
           data-explorer-draggable="true"
diff --git a/src/renderer/src/components/right-sidebar/file-explorer-operation-generation.test.ts b/src/renderer/src/components/right-sidebar/file-explorer-operation-generation.test.ts
index d5bb840feeb9..75b82277e66e 100644
--- a/src/renderer/src/components/right-sidebar/file-explorer-operation-generation.test.ts
+++ b/src/renderer/src/components/right-sidebar/file-explorer-operation-generation.test.ts
@@ -2,10 +2,11 @@ import { afterEach, describe, expect, it } from 'vitest'
 import type { Worktree } from '../../../../shared/worktree/types'
 import { useAppStore } from '@/store'
 import { folderWorkspaceKey } from '../../../../shared/workspace-scope'
-import { FLOATING_TERMINAL_WORKTREE_ID } from '../../../../shared/constants'
+import { FLOATING_TERMINAL_WORKTREE_ID, getDefaultSettings } from '../../../../shared/constants'
 import {
   captureFileExplorerOperationGuard,
-  getFileExplorerOperationOwner
+  getFileExplorerOperationOwner,
+  getFileExplorerOperationOwnerFromState
 } from './file-explorer-operation-owner'
 
 const initialState = useAppStore.getInitialState()
@@ -27,11 +28,20 @@ afterEach(() => {
 })
 
 describe('file explorer operation generations', () => {
-  it('routes floating workspace file mutations to the local host', () => {
+  it('routes floating file ownership and mutations locally while a runtime is focused', () => {
+    useAppStore.setState({
+      settings: { ...getDefaultSettings('/home/me'), activeRuntimeEnvironmentId: 'focused-env' },
+      activeWorktreeId: FLOATING_TERMINAL_WORKTREE_ID,
+      activeWorkspaceExecutionHostId: 'runtime:focused-env'
+    })
     const owner = getFileExplorerOperationOwner(FLOATING_TERMINAL_WORKTREE_ID)
     const guard = captureFileExplorerOperationGuard(FLOATING_TERMINAL_WORKTREE_ID, owner)
 
     expect(owner).toEqual({ kind: 'local' })
+    expect(
+      getFileExplorerOperationOwnerFromState(useAppStore.getState(), FLOATING_TERMINAL_WORKTREE_ID)
+    ).toEqual(owner)
+    expect(guard.route.settings.activeRuntimeEnvironmentId).toBeNull()
     expect(guard.route.expectedExecutionHostId).toBe('local')
     expect(() => guard.assertCurrent()).not.toThrow()
   })
diff --git a/src/renderer/src/components/right-sidebar/file-explorer-operation-owner.ts b/src/renderer/src/components/right-sidebar/file-explorer-operation-owner.ts
index 6fa5a7fc97b0..2f6297764502 100644
--- a/src/renderer/src/components/right-sidebar/file-explorer-operation-owner.ts
+++ b/src/renderer/src/components/right-sidebar/file-explorer-operation-owner.ts
@@ -10,11 +10,11 @@ import {
 } from '@/lib/worktree-runtime-owner'
 import type { FileExplorerOperationOwner } from './file-explorer-types'
 import {
+  getFloatingWorkspaceOperationRoute,
   resolveWorktreeOperationRoute,
   type WorktreeOperationRoute
 } from '@/lib/worktree-operation-route'
 import { captureWorktreeOperationGenerationGuard } from '@/lib/worktree-operation-generation'
-import { FLOATING_TERMINAL_WORKTREE_ID } from '../../../../shared/constants'
 
 export type FileExplorerOperationRoute = {
   settings: { activeRuntimeEnvironmentId: string | null }
@@ -44,8 +44,9 @@ export function getFileExplorerOperationOwnerFromState(
   state: FileExplorerOwnerState,
   worktreeId: string | null | undefined
 ): FileExplorerOperationOwner {
-  if (worktreeId === FLOATING_TERMINAL_WORKTREE_ID) {
-    return { kind: 'local' }
+  const floatingRoute = worktreeId ? getFloatingWorkspaceOperationRoute(worktreeId) : null
+  if (floatingRoute?.executionHostId) {
+    return operationOwnerFromHostId(floatingRoute.executionHostId)
   }
   const parsedWorkspace = worktreeId ? parseWorkspaceKey(worktreeId) : null
   if (worktreeId && parsedWorkspace?.type !== 'folder') {
diff --git a/src/renderer/src/components/right-sidebar/index.tsx b/src/renderer/src/components/right-sidebar/index.tsx
index cc9011bb2988..4476b59c8c7f 100644
--- a/src/renderer/src/components/right-sidebar/index.tsx
+++ b/src/renderer/src/components/right-sidebar/index.tsx
@@ -12,8 +12,10 @@ import { useShortcutLabel } from '@/hooks/useShortcutLabel'
 import {
   RIGHT_SIDEBAR_MIN_WIDTH,
   clampRightSidebarPanelWidth,
-  computeMaxRightSidebarPanelWidth
+  computeMaxRightSidebarPanelWidth,
+  rightSidebarVisualWidth
 } from './right-sidebar-width'
+import { selectVisibleRightSidebarVisual } from '@/store/slices/editor/actions/right-sidebar-state'
 import { translate } from '@/i18n/i18n'
 import { RightSidebarPanelContent } from './right-sidebar-panel-content'
 import { useMeasuredWidth } from './right-sidebar-measured-width'
@@ -39,6 +41,8 @@ function RightSidebarInner(): React.JSX.Element {
   const rightSidebarOpen = useAppStore((s) => s.rightSidebarOpen)
   const rightSidebarWidth = useAppStore((s) => s.rightSidebarWidth)
   const setRightSidebarWidth = useAppStore((s) => s.setRightSidebarWidth)
+  const visual = useAppStore(selectVisibleRightSidebarVisual)
+  const setRightSidebarVisualWidth = useAppStore((s) => s.setRightSidebarVisualWidth)
   const toggleRightSidebar = useAppStore((s) => s.toggleRightSidebar)
   const checksStatus = useAppStore((s) => (s.rightSidebarOpen ? getActiveChecksStatus(s) : null))
   const activityBarPosition = useAppStore((s) => s.activityBarPosition)
@@ -62,8 +66,10 @@ function RightSidebarInner(): React.JSX.Element {
   const activityBarSideWidth = activityBarPosition === 'side' ? ACTIVITY_BAR_SIDE_WIDTH : 0
   const windowWidth = useWindowWidth()
   const maxWidth = computeMaxRightSidebarPanelWidth(windowWidth, activityBarSideWidth)
+  // Why a separate width: widening for a visual must not persist or reach other clients, and
+  // closing the visual has to land back on the width the user chose.
   const renderedRightSidebarWidth = clampRightSidebarPanelWidth(
-    rightSidebarWidth,
+    visual ? rightSidebarVisualWidth(rightSidebarWidth, visual.width) : rightSidebarWidth,
     windowWidth,
     activityBarSideWidth
   )
@@ -74,7 +80,7 @@ function RightSidebarInner(): React.JSX.Element {
     maxWidth,
     deltaSign: -1,
     renderedExtraWidth: activityBarSideWidth,
-    setWidth: setRightSidebarWidth
+    setWidth: visual ? setRightSidebarVisualWidth : setRightSidebarWidth
   })
   const topActivityStripRef = useMeasuredWidth(setTopActivityStripWidth)
 
@@ -91,7 +97,11 @@ function RightSidebarInner(): React.JSX.Element {
           property) rather than in a bottom-docked dashboard panel that
           competed with file Explorer/Search for vertical space. The right
           sidebar is back to tab-only content. */}
-      <RightSidebarPanelContent effectiveTab={effectiveTab} rightSidebarOpen={rightSidebarOpen} />
+      <RightSidebarPanelContent
+        effectiveTab={effectiveTab}
+        rightSidebarOpen={rightSidebarOpen}
+        visual={visual}
+      />
     </div>
   ) : null
 
diff --git a/src/renderer/src/components/right-sidebar/right-sidebar-panel-content.tsx b/src/renderer/src/components/right-sidebar/right-sidebar-panel-content.tsx
index 8da2783e309a..9c0205b84d62 100644
--- a/src/renderer/src/components/right-sidebar/right-sidebar-panel-content.tsx
+++ b/src/renderer/src/components/right-sidebar/right-sidebar-panel-content.tsx
@@ -1,6 +1,7 @@
 import { Suspense } from 'react'
 import { lazyWithRetry as lazy } from '@/lib/lazy-with-retry'
 import type { ActiveRightSidebarTab } from '@/store/slices/editor'
+import type { RightSidebarVisualState } from '@/store/slices/editor/actions/right-sidebar-state'
 import { isPluginPanelTabKey } from '../../../../shared/plugins/plugin-manifest'
 
 const FileExplorer = lazy(() => import('./FileExplorer'))
@@ -11,16 +12,32 @@ const AiVaultPanel = lazy(() => import('./AiVaultPanel'))
 const FolderWorkspaceWorktreesPanel = lazy(() => import('./FolderWorkspaceWorktreesPanel'))
 const FolderWorkspacePrChecksPanel = lazy(() => import('./FolderWorkspacePrChecksPanel'))
 const PluginPanel = lazy(() => import('./PluginPanel'))
+const NativeChatVisualPanel = lazy(() => import('../native-chat/NativeChatVisualPanel'))
 
 type RightSidebarPanelContentProps = {
   effectiveTab: ActiveRightSidebarTab
   rightSidebarOpen: boolean
+  visual: RightSidebarVisualState | null
 }
 
 export function RightSidebarPanelContent({
   effectiveTab,
-  rightSidebarOpen
+  rightSidebarOpen,
+  visual
 }: RightSidebarPanelContentProps): React.JSX.Element {
+  if (visual) {
+    // Why key: a different visual is a different frame, never a reused one.
+    return (
+      <div className="flex min-h-0 flex-1 flex-col overflow-hidden">
+        <Suspense fallback={null}>
+          <NativeChatVisualPanel
+            key={`${visual.sessionId}:${visual.messageId}:${visual.file}`}
+            route={visual}
+          />
+        </Suspense>
+      </div>
+    )
+  }
   return (
     <div className="flex min-h-0 flex-1 flex-col overflow-hidden">
       <Suspense fallback={null}>
diff --git a/src/renderer/src/components/right-sidebar/right-sidebar-width.ts b/src/renderer/src/components/right-sidebar/right-sidebar-width.ts
index 6598d7314549..6f04b5218c5e 100644
--- a/src/renderer/src/components/right-sidebar/right-sidebar-width.ts
+++ b/src/renderer/src/components/right-sidebar/right-sidebar-width.ts
@@ -26,3 +26,11 @@ export function clampRightSidebarPanelWidth(
     Math.max(RIGHT_SIDEBAR_MIN_WIDTH, width)
   )
 }
+
+/** Width the sidebar opens to while it shows a chat visual: wide enough for a chart to read. */
+export const RIGHT_SIDEBAR_VISUAL_PREFERRED_WIDTH = 720
+
+/** The sidebar's width while it shows a visual: its own resize, else the wider of stored and preferred. */
+export function rightSidebarVisualWidth(storedWidth: number, visualWidth: number | null): number {
+  return visualWidth ?? Math.max(storedWidth, RIGHT_SIDEBAR_VISUAL_PREFERRED_WIDTH)
+}
diff --git a/src/renderer/src/components/right-sidebar/use-checks-panel-terminal-worktree.test.ts b/src/renderer/src/components/right-sidebar/use-checks-panel-terminal-worktree.test.ts
index d79f9a16fbe5..a65697bed8f7 100644
--- a/src/renderer/src/components/right-sidebar/use-checks-panel-terminal-worktree.test.ts
+++ b/src/renderer/src/components/right-sidebar/use-checks-panel-terminal-worktree.test.ts
@@ -7,7 +7,7 @@ import type { Repo } from '../../../../shared/repo-types'
 import type { Worktree } from '../../../../shared/worktree/types'
 import { useAppStore } from '@/store'
 import type { AppState } from '@/store/types'
-import { makeWorktree, TEST_REPO } from '@/store/slices/store-test-helpers'
+import { makeWorktree, TEST_REPO } from '../../store/slices/worktrees-slice-test-fixtures'
 import { useChecksPanelTerminalWorktree } from './use-checks-panel-terminal-worktree'
 
 const initialAppState = useAppStore.getInitialState()
diff --git a/src/renderer/src/components/right-sidebar/use-file-explorer-tree-pane-state.ts b/src/renderer/src/components/right-sidebar/use-file-explorer-tree-pane-state.ts
index 1df290682de3..2a50566fc84b 100644
--- a/src/renderer/src/components/right-sidebar/use-file-explorer-tree-pane-state.ts
+++ b/src/renderer/src/components/right-sidebar/use-file-explorer-tree-pane-state.ts
@@ -56,6 +56,7 @@ type UseFileExplorerTreePaneStateResult = {
   rowScrolling: ReturnType<typeof useFileExplorerRowScrolling>
   handlers: ReturnType<typeof useFileExplorerHandlers>
   nodeCommands: ReturnType<typeof useFileExplorerNodeCommands>
+  fileDropOwnerRef: (root: HTMLElement | null) => void
 }
 
 /**
@@ -217,10 +218,10 @@ export function useFileExplorerTreePaneState({
     operationOwner: rootCache?.operationOwner
   })
 
-  useFileExplorerImport({
+  const fileDropOwnerRef = useFileExplorerImport({
     displayRootPath,
     worktreePath: visibleFilesWorktreePath,
-    activeWorktreeId,
+    worktreeId: activeWorktreeId,
     refreshDir,
     clearNativeDragState: dragDrop.clearNativeDragState,
     setSelectedPath: setSingleSelectedPath,
@@ -292,6 +293,7 @@ export function useFileExplorerTreePaneState({
     inlineInputState,
     rowScrolling,
     handlers,
-    nodeCommands
+    nodeCommands,
+    fileDropOwnerRef
   }
 }
diff --git a/src/renderer/src/components/right-sidebar/useFileExplorerDragDrop.os-file-drop.test.tsx b/src/renderer/src/components/right-sidebar/useFileExplorerDragDrop.os-file-drop.test.tsx
new file mode 100644
index 000000000000..5922b56bfbf4
--- /dev/null
+++ b/src/renderer/src/components/right-sidebar/useFileExplorerDragDrop.os-file-drop.test.tsx
@@ -0,0 +1,82 @@
+// @vitest-environment happy-dom
+import { useRef, type ComponentProps } from 'react'
+import { act, cleanup, render } from '@testing-library/react'
+import { afterEach, describe, expect, it, vi } from 'vitest'
+import { useFileExplorerDragDrop } from './useFileExplorerDragDrop'
+import { useFileExplorerImport } from './useFileExplorerImport'
+import { FileExplorerFilesTreePane } from './FileExplorerFilesTreePane'
+
+const mocks = vi.hoisted(() => ({ startDragEdgeScroll: vi.fn(), stopDragEdgeScroll: vi.fn() }))
+vi.mock('./useFileExplorerDragEdgeScroll', () => ({
+  useFileExplorerDragEdgeScroll: () => ({
+    startDragEdgeScroll: mocks.startDragEdgeScroll,
+    stopDragEdgeScroll: mocks.stopDragEdgeScroll
+  })
+}))
+
+const refreshDir = vi.fn().mockResolvedValue(undefined)
+
+function Explorer(): React.JSX.Element {
+  const scrollRef = useRef<HTMLDivElement | null>(null)
+  const dragDrop = useFileExplorerDragDrop({
+    worktreePath: '/repo',
+    activeWorktreeId: 'wt-1',
+    expanded: new Set(),
+    toggleDir: vi.fn(),
+    refreshDir,
+    scrollRef,
+    getOperationOwnerForPath: () => undefined
+  })
+  const ownerRef = useFileExplorerImport({
+    worktreeId: 'wt-1',
+    worktreePath: '/repo',
+    refreshDir,
+    clearNativeDragState: dragDrop.clearNativeDragState,
+    setSelectedPath: vi.fn()
+  })
+  // oxlint-disable-next-line typescript/consistent-type-assertions -- SAFETY: The empty pane reads these fields only; row handlers and virtual rows are not rendered.
+  const props = {
+    worktreePath: '/repo',
+    displayRootPath: '/repo',
+    explorerView: 'files',
+    visibleRowCount: 0,
+    hasNameFilter: false,
+    tree: { loadingDirPaths: new Set(), rootError: null, dirCache: { '/repo': { children: [] } } },
+    selection: {},
+    paneState: {
+      scrollRef,
+      fileDropOwnerRef: ownerRef,
+      inlineInputState: {},
+      rowScrolling: {},
+      handlers: {},
+      nodeCommands: {},
+      dragDrop
+    }
+  } as unknown as ComponentProps<typeof FileExplorerFilesTreePane>
+  return <FileExplorerFilesTreePane {...props} />
+}
+
+afterEach(() => {
+  cleanup()
+  vi.clearAllMocks()
+})
+
+describe('file explorer edge auto-scroll under the OS-drop owner', () => {
+  it('still auto-scrolls while an OS file drag hovers the tree', () => {
+    const view = render(<Explorer />)
+    const ownerRoot = view.container.querySelector('[data-os-file-drop-owner]')
+    view.rerender(<Explorer />)
+    expect(view.container.querySelector('[data-os-file-drop-owner]')).toBe(ownerRoot)
+    const transfer = { types: ['Files'], files: [], dropEffect: 'move' }
+    const event = new Event('dragover', { bubbles: true, cancelable: true, composed: true })
+    Object.defineProperty(event, 'dataTransfer', { value: transfer })
+    Object.defineProperty(event, 'clientY', { value: 4 })
+    act(() => {
+      view.getByText('No files in this workspace').dispatchEvent(event)
+    })
+    // The owner claimed the drag and stopped it, yet the capture handler saw it first.
+    expect(event.defaultPrevented).toBe(true)
+    expect(transfer.dropEffect).toBe('copy')
+    expect(mocks.startDragEdgeScroll).toHaveBeenCalledWith(4)
+  })
+})
diff --git a/src/renderer/src/components/right-sidebar/useFileExplorerDragDrop.ts b/src/renderer/src/components/right-sidebar/useFileExplorerDragDrop.ts
index 16d9b8ca0add..f892163179d0 100644
--- a/src/renderer/src/components/right-sidebar/useFileExplorerDragDrop.ts
+++ b/src/renderer/src/components/right-sidebar/useFileExplorerDragDrop.ts
@@ -40,6 +40,7 @@ type UseFileExplorerDragDropResult = {
   // Stops the drag edge auto-scroll loop (call on drag end / unmount)
   stopDragEdgeScroll: () => void
   rootDragHandlers: {
+    onDragOverCapture: (e: React.DragEvent) => void
     onDragOver: (e: React.DragEvent) => void
     onDragEnter: (e: React.DragEvent) => void
     onDragLeave: (e: React.DragEvent) => void
@@ -89,9 +90,9 @@ export function useFileExplorerDragDrop({
 
   useEffect(() => {
     const handleGlobalDragFinish = (): void => {
-      // Why: native OS drops are consumed by preload in the capture phase, so
-      // React root onDrop may never run. A document-level capture listener keeps
-      // the edge-scroll loop from surviving rejected, cancelled, or row drops.
+      // Why: the OS-drop owner stops native drops before React's root onDrop, and
+      // drops can land elsewhere. A document-level capture listener keeps the
+      // edge-scroll loop from surviving rejected, cancelled, or row drops.
       stopAndClearDragState()
     }
 
@@ -116,27 +117,31 @@ export function useFileExplorerDragDrop({
   })
 
   const clearNativeDragState = useCallback(() => {
-    // Why: for native OS file drops the preload intercepts the drop event and
-    // stops propagation, so React's onDrop (which calls stopDragEdgeScroll)
-    // never fires. Without this, the edge-scroll rAF loop keeps running with
-    // the last recorded cursor Y, continuously overriding the user's scroll.
+    // Why: the OS-drop owner stops native drops before React's onDrop (which
+    // calls stopDragEdgeScroll), so its drop path clears here. Otherwise the
+    // edge-scroll rAF loop keeps overriding the user's scroll.
     stopAndClearDragState()
   }, [stopAndClearDragState])
 
   const rootDragHandlers = {
-    onDragOver: useCallback(
+    // Why: capture, because the OS-drop owner stops native dragover before it bubbles.
+    onDragOverCapture: useCallback(
       (e: React.DragEvent) => {
-        const isInternal = e.dataTransfer.types.includes(WORKSPACE_FILE_PATH_MIME)
-        const isNative = e.dataTransfer.types.includes('Files')
-        if (!isInternal && !isNative) {
-          return
+        const types = e.dataTransfer.types
+        if (types.includes(WORKSPACE_FILE_PATH_MIME) || types.includes('Files')) {
+          startDragEdgeScroll(e.clientY)
         }
-        e.preventDefault()
-        e.dataTransfer.dropEffect = isInternal ? 'move' : 'copy'
-        startDragEdgeScroll(e.clientY)
       },
       [startDragEdgeScroll]
     ),
+    // OS file drags never reach here; the explorer's OS-drop owner sets their drop effect.
+    onDragOver: useCallback((e: React.DragEvent) => {
+      if (!e.dataTransfer.types.includes(WORKSPACE_FILE_PATH_MIME)) {
+        return
+      }
+      e.preventDefault()
+      e.dataTransfer.dropEffect = 'move'
+    }, []),
     onDragEnter: useCallback((e: React.DragEvent) => {
       const isInternal = e.dataTransfer.types.includes(WORKSPACE_FILE_PATH_MIME)
       const isNative = !isInternal && e.dataTransfer.types.includes('Files')
@@ -183,9 +188,6 @@ export function useFileExplorerDragDrop({
         rootDragCounterRef.current = 0
         setIsRootDragOver(false)
         setDropTargetDir(null)
-        // Why: native Files drops are handled by the preload-relayed IPC event,
-        // not the React drop handler. We only clear native drag visual state
-        // here; the actual import is triggered from onFileDrop.
         clearNativeDragState()
         if (displayRootPath) {
           const dragPaths = readWorkspaceFileDragPaths(e.dataTransfer)
diff --git a/src/renderer/src/components/right-sidebar/useFileExplorerImport.committed-scope.test.tsx b/src/renderer/src/components/right-sidebar/useFileExplorerImport.committed-scope.test.tsx
index efdd716f5b9f..946d133c66c9 100644
--- a/src/renderer/src/components/right-sidebar/useFileExplorerImport.committed-scope.test.tsx
+++ b/src/renderer/src/components/right-sidebar/useFileExplorerImport.committed-scope.test.tsx
@@ -4,7 +4,7 @@ import { act, cleanup, render, waitFor } from '@testing-library/react'
 import { afterEach, expect, it, vi } from 'vitest'
 import { useFileExplorerImport } from './useFileExplorerImport'
 
-const mocks = vi.hoisted(() => ({ importPaths: vi.fn(), subscribe: vi.fn() }))
+const mocks = vi.hoisted(() => ({ importPaths: vi.fn(), prepare: vi.fn() }))
 vi.mock('@/runtime/runtime-file-client', () => ({
   importExternalPathsToRuntime: mocks.importPaths
 }))
@@ -18,20 +18,38 @@ afterEach(() => {
   vi.clearAllMocks()
 })
 
+function dropOn(target: Element): { dropEffect: string } {
+  const transfer = { types: ['Files'], files: [new File(['a'], 'file.ts')], dropEffect: 'move' }
+  for (const type of ['dragover', 'drop']) {
+    const event = new Event(type, { bubbles: true, cancelable: true, composed: true })
+    Object.defineProperty(event, 'dataTransfer', { value: transfer })
+    Object.defineProperty(event, 'isTrusted', { value: true })
+    target.dispatchEvent(event)
+  }
+  return transfer
+}
+
 it('keeps native drops on committed scope when a new scope render suspends', async () => {
-  vi.stubGlobal('api', { ui: { onFileDrop: mocks.subscribe } })
+  vi.stubGlobal('api', {
+    fs: {
+      getPathForFile: () => '/source/file.ts',
+      prepareDroppedPaths: mocks.prepare.mockImplementation(async ({ paths }) => ({
+        paths,
+        failures: []
+      }))
+    }
+  })
   const selected = vi.fn()
   const clearDrag = vi.fn()
   const refresh = vi.fn().mockResolvedValue(undefined)
   const suspended = new Promise<void>(() => {})
-  mocks.subscribe.mockReturnValue(vi.fn())
   mocks.importPaths.mockResolvedValue({
     results: [{ status: 'imported', destPath: '/repo/app/file.ts' }]
   })
 
   function Probe({ scope, suspend = false }: { scope: string; suspend?: boolean }) {
-    useFileExplorerImport({
-      activeWorktreeId: 'wt',
+    const ownerRef = useFileExplorerImport({
+      worktreeId: 'wt',
       worktreePath: '/repo',
       displayRootPath: scope,
       refreshDir: refresh,
@@ -41,7 +59,13 @@ it('keeps native drops on committed scope when a new scope render suspends', asy
     if (suspend) {
       throw suspended
     }
-    return <span>{scope}</span>
+    return (
+      <div ref={ownerRef}>
+        <span data-testid="row" data-file-explorer-drop-dir="/repo/app">
+          {scope}
+        </span>
+      </div>
+    )
   }
   const view = render(
     <Suspense fallback="Loading">
@@ -58,9 +82,8 @@ it('keeps native drops on committed scope when a new scope render suspends', asy
     )
   })
   expect(view.getByText('/repo/app')).toBeTruthy()
-  const drop = mocks.subscribe.mock.calls[0][0]
   await act(async () => {
-    drop({ target: 'file-explorer', paths: ['/source/file.ts'], destinationDir: '/repo/app' })
+    dropOn(view.getByTestId('row'))
   })
   await waitFor(() => expect(selected).toHaveBeenCalledWith('/repo/app/file.ts'))
   expect(refresh).toHaveBeenCalledWith('/repo/app')
@@ -71,12 +94,14 @@ it('keeps native drops on committed scope when a new scope render suspends', asy
       <Probe scope="/repo/api" />
     </Suspense>
   )
+  let transfer: { dropEffect: string } | undefined
   await act(async () => {
-    drop({ target: 'file-explorer', paths: ['/source/file.ts'], destinationDir: '/repo/app' })
+    transfer = dropOn(view.getByTestId('row'))
   })
-  await waitFor(() => expect(clearDrag).toHaveBeenCalledTimes(2))
+  // The row still names /repo/app, which is outside the committed /repo/api root.
+  expect(transfer?.dropEffect).toBe('none')
   expect(selected).not.toHaveBeenCalled()
   expect(mocks.importPaths).toHaveBeenCalledTimes(1)
   expect(refresh).toHaveBeenCalledTimes(1)
-  expect(mocks.subscribe).toHaveBeenCalledTimes(1)
+  expect(mocks.prepare).toHaveBeenCalledTimes(1)
 })
diff --git a/src/renderer/src/components/right-sidebar/useFileExplorerImport.os-file-drop.test.tsx b/src/renderer/src/components/right-sidebar/useFileExplorerImport.os-file-drop.test.tsx
new file mode 100644
index 000000000000..746a70b2bb89
--- /dev/null
+++ b/src/renderer/src/components/right-sidebar/useFileExplorerImport.os-file-drop.test.tsx
@@ -0,0 +1,239 @@
+// @vitest-environment happy-dom
+import { act, cleanup, render, waitFor } from '@testing-library/react'
+import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest'
+import type { PreparedDroppedPaths } from '../../../../shared/native-file-drop-preparation'
+import { WORKSPACE_FILE_PATH_MIME } from '@/lib/workspace-file-drag'
+import { useFileExplorerImport } from './useFileExplorerImport'
+import { useFileExplorerRowDrag } from './useFileExplorerRowDrag'
+
+const mocks = vi.hoisted(() => ({
+  importPaths: vi.fn(),
+  captureGuard: vi.fn(),
+  prepare: vi.fn()
+}))
+vi.mock('@/runtime/runtime-file-client', () => ({
+  importExternalPathsToRuntime: mocks.importPaths
+}))
+vi.mock('./file-explorer-operation-owner', () => ({
+  captureFileExplorerOperationGuard: mocks.captureGuard
+}))
+vi.mock('sonner', () => ({ toast: { error: vi.fn() } }))
+
+type Scope = { worktreeId: string; worktreePath: string; displayRootPath: string }
+type Row = { path: string; dropDir: string }
+
+const refreshDir = vi.fn().mockResolvedValue(undefined)
+const clearDrag = vi.fn()
+const setSelected = vi.fn()
+
+function Explorer({ scope, rows }: { scope: Scope; rows: Row[] }): React.JSX.Element {
+  const ownerRef = useFileExplorerImport({
+    ...scope,
+    refreshDir,
+    clearNativeDragState: clearDrag,
+    setSelectedPath: setSelected
+  })
+  return (
+    <div ref={ownerRef} data-testid="tree">
+      {rows.map((row) => (
+        <button key={row.path} data-testid={row.path} data-file-explorer-drop-dir={row.dropDir}>
+          <span data-testid={`${row.path}:label`} />
+        </button>
+      ))}
+    </div>
+  )
+}
+
+function drag(
+  target: Element,
+  type: 'dragover' | 'drop',
+  types: string[] = ['Files']
+): { dropEffect: string } {
+  const transfer = {
+    types,
+    files: [new File(['a'], 'a.txt')],
+    dropEffect: 'move',
+    getData: (format: string) => (format === WORKSPACE_FILE_PATH_MIME ? '/repo/app/moved.ts' : '')
+  }
+  const event = new Event(type, { bubbles: true, cancelable: true, composed: true })
+  Object.defineProperty(event, 'dataTransfer', { value: transfer })
+  Object.defineProperty(event, 'isTrusted', { value: true })
+  act(() => {
+    target.dispatchEvent(event)
+  })
+  return transfer
+}
+
+function deferredPreparation(): (paths: string[]) => void {
+  let resolve: (prepared: PreparedDroppedPaths) => void = () => undefined
+  mocks.prepare.mockImplementationOnce(
+    () => new Promise<PreparedDroppedPaths>((done) => (resolve = done))
+  )
+  return (paths) => resolve({ paths, failures: [] })
+}
+
+const SCOPE_B: Scope = { worktreeId: 'wt-b', worktreePath: '/repo', displayRootPath: '/repo/app' }
+const ROWS: Row[] = [
+  { path: '/repo/app/src', dropDir: '/repo/app/src' },
+  { path: '/repo/app/README.md', dropDir: '/repo/app' }
+]
+
+beforeEach(() => {
+  mocks.prepare.mockImplementation(async ({ paths }: { paths: string[] }) => ({
+    paths,
+    failures: []
+  }))
+  mocks.captureGuard.mockImplementation(() => ({
+    route: { settings: { activeRuntimeEnvironmentId: null }, expectedExecutionHostId: 'local' },
+    assertCurrent: vi.fn()
+  }))
+  mocks.importPaths.mockResolvedValue({
+    results: [{ status: 'imported', destPath: '/repo/app/src/a.txt' }]
+  })
+  vi.stubGlobal('api', {
+    fs: {
+      getPathForFile: (file: File) => `/source/${file.name}`,
+      prepareDroppedPaths: mocks.prepare
+    }
+  })
+})
+
+afterEach(() => {
+  cleanup()
+  vi.unstubAllGlobals()
+  vi.clearAllMocks()
+})
+
+describe('file explorer OS file drops', () => {
+  it('imports a drop on a folder row into that folder', async () => {
+    const view = render(<Explorer scope={SCOPE_B} rows={ROWS} />)
+    expect(drag(view.getByTestId('/repo/app/src:label'), 'dragover').dropEffect).toBe('copy')
+    drag(view.getByTestId('/repo/app/src:label'), 'drop')
+    await waitFor(() => expect(mocks.importPaths).toHaveBeenCalledTimes(1))
+    expect(mocks.prepare).toHaveBeenCalledWith({
+      paths: ['/source/a.txt'],
+      consumer: 'main-reader'
+    })
+    expect(mocks.importPaths.mock.calls[0][1]).toEqual(['/source/a.txt'])
+    expect(mocks.importPaths.mock.calls[0][2]).toBe('/repo/app/src')
+    await waitFor(() => expect(setSelected).toHaveBeenCalledWith('/repo/app/src/a.txt'))
+    expect(refreshDir).toHaveBeenCalledWith('/repo/app/src')
+    expect(clearDrag).toHaveBeenCalled()
+  })
+
+  it('imports a drop on the empty tree area into the displayed root', async () => {
+    const view = render(<Explorer scope={SCOPE_B} rows={[]} />)
+    drag(view.getByTestId('tree'), 'drop')
+    await waitFor(() => expect(mocks.importPaths).toHaveBeenCalledTimes(1))
+    expect(mocks.importPaths.mock.calls[0][2]).toBe('/repo/app')
+  })
+
+  it('captures the target folder at drop time even if rows re-render during preparation', async () => {
+    const finishPreparation = deferredPreparation()
+    const view = render(<Explorer scope={SCOPE_B} rows={ROWS} />)
+    drag(view.getByTestId('/repo/app/src:label'), 'drop')
+    // A virtualized list recycles the row under the cursor for another node.
+    view.rerender(
+      <Explorer scope={SCOPE_B} rows={[{ path: '/repo/app/lib', dropDir: '/repo/app/lib' }]} />
+    )
+    await act(async () => finishPreparation(['/source/a.txt']))
+    await waitFor(() => expect(mocks.importPaths).toHaveBeenCalledTimes(1))
+    expect(mocks.importPaths.mock.calls[0][2]).toBe('/repo/app/src')
+  })
+
+  it('imports into the workspace the drop landed on, not the one shown after preparation', async () => {
+    const finishPreparation = deferredPreparation()
+    const view = render(<Explorer scope={SCOPE_B} rows={ROWS} />)
+    drag(view.getByTestId('/repo/app/src:label'), 'drop')
+    const scopeA = { worktreeId: 'wt-a', worktreePath: '/other', displayRootPath: '/other' }
+    view.rerender(<Explorer scope={scopeA} rows={[]} />)
+    await act(async () => finishPreparation(['/source/a.txt']))
+    await waitFor(() => expect(mocks.importPaths).toHaveBeenCalledTimes(1))
+    expect(mocks.captureGuard).toHaveBeenCalledTimes(1)
+    expect(mocks.captureGuard.mock.calls[0][0]).toBe('wt-b')
+    expect(mocks.importPaths.mock.calls[0][0]).toMatchObject({
+      worktreeId: 'wt-b',
+      worktreePath: '/repo'
+    })
+    expect(mocks.importPaths.mock.calls[0][2]).toBe('/repo/app/src')
+    // The explorer now shows workspace A, so the B result is not selected there.
+    await waitFor(() => expect(clearDrag).toHaveBeenCalled())
+    expect(setSelected).not.toHaveBeenCalled()
+  })
+
+  it('refuses a drop on a row outside the displayed root', () => {
+    const view = render(
+      <Explorer scope={SCOPE_B} rows={[{ path: '/repo/api/x', dropDir: '/repo/api' }]} />
+    )
+    expect(drag(view.getByTestId('/repo/api/x'), 'dragover').dropEffect).toBe('none')
+    drag(view.getByTestId('/repo/api/x'), 'drop')
+    expect(mocks.prepare).not.toHaveBeenCalled()
+    expect(mocks.importPaths).not.toHaveBeenCalled()
+  })
+
+  it('refuses while the files view is hidden', () => {
+    const hidden = { worktreeId: 'wt-b', worktreePath: null, displayRootPath: '/repo/app' }
+    function HiddenExplorer(): React.JSX.Element {
+      const ownerRef = useFileExplorerImport({
+        ...hidden,
+        refreshDir,
+        clearNativeDragState: clearDrag,
+        setSelectedPath: setSelected
+      })
+      return <div ref={ownerRef} data-testid="tree" />
+    }
+    const view = render(<HiddenExplorer />)
+    expect(drag(view.getByTestId('tree'), 'dragover').dropEffect).toBe('none')
+    drag(view.getByTestId('tree'), 'drop')
+    expect(mocks.prepare).not.toHaveBeenCalled()
+  })
+})
+
+describe('internal explorer row drags under the OS-drop owner', () => {
+  function DraggableRow({ onMoveDrop }: { onMoveDrop: (source: string, dir: string) => void }) {
+    const handlers = useFileExplorerRowDrag({
+      rowDropDir: '/repo/app/src',
+      isDirectory: true,
+      nodePath: '/repo/app/src',
+      isExpanded: true,
+      onDragTargetChange: vi.fn(),
+      onDragExpandDir: vi.fn(),
+      onNativeDragTargetChange: vi.fn(),
+      onNativeDragExpandDir: vi.fn(),
+      onMoveDrop
+    })
+    return (
+      <button
+        data-testid="row"
+        data-file-explorer-drop-dir="/repo/app/src"
+        onDragOver={handlers.handleDragOver}
+        onDrop={handlers.handleDrop}
+      />
+    )
+  }
+  function ExplorerWithRow({ onMoveDrop }: { onMoveDrop: (source: string, dir: string) => void }) {
+    const ownerRef = useFileExplorerImport({
+      ...SCOPE_B,
+      refreshDir,
+      clearNativeDragState: clearDrag,
+      setSelectedPath: setSelected
+    })
+    return (
+      <div ref={ownerRef}>
+        <DraggableRow onMoveDrop={onMoveDrop} />
+      </div>
+    )
+  }
+
+  it('still moves a row dragged onto a folder row', () => {
+    const onMoveDrop = vi.fn()
+    const view = render(<ExplorerWithRow onMoveDrop={onMoveDrop} />)
+    expect(drag(view.getByTestId('row'), 'dragover', [WORKSPACE_FILE_PATH_MIME]).dropEffect).toBe(
+      'move'
+    )
+    drag(view.getByTestId('row'), 'drop', [WORKSPACE_FILE_PATH_MIME])
+    expect(onMoveDrop).toHaveBeenCalledWith('/repo/app/moved.ts', '/repo/app/src')
+    expect(mocks.prepare).not.toHaveBeenCalled()
+    expect(mocks.importPaths).not.toHaveBeenCalled()
+  })
+})
diff --git a/src/renderer/src/components/right-sidebar/useFileExplorerImport.remote.test.tsx b/src/renderer/src/components/right-sidebar/useFileExplorerImport.remote.test.tsx
new file mode 100644
index 000000000000..fd1b68d8a2f1
--- /dev/null
+++ b/src/renderer/src/components/right-sidebar/useFileExplorerImport.remote.test.tsx
@@ -0,0 +1,141 @@
+// @vitest-environment happy-dom
+import { act, cleanup, render, waitFor } from '@testing-library/react'
+import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest'
+import type { PreparedDroppedPaths } from '../../../../shared/native-file-drop-preparation'
+import { useAppStore } from '@/store'
+import {
+  RUNTIME_WORKTREE_PATH as RUNTIME_ROOT,
+  seedRemoteDropWorkspaces,
+  sshConnectionStatesAt,
+  SSH_WORKTREE_PATH as SSH_ROOT
+} from '@/lib/remote-workspace-drop-test-fixtures'
+import { joinPath } from '@/lib/path'
+import { getFileExplorerOperationOwner } from './file-explorer-operation-owner'
+import { useFileExplorerImport } from './useFileExplorerImport'
+
+const mocks = vi.hoisted(() => ({
+  importPaths: vi.fn(),
+  prepare: vi.fn(),
+  toastError: vi.fn()
+}))
+vi.mock('@/runtime/runtime-file-client', () => ({
+  importExternalPathsToRuntime: mocks.importPaths
+}))
+vi.mock('sonner', () => ({ toast: { error: mocks.toastError } }))
+
+const refreshDir = vi.fn().mockResolvedValue(undefined)
+const clearDrag = vi.fn()
+const setSelected = vi.fn()
+
+function Explorer({ worktreeId, root }: { worktreeId: string; root: string }) {
+  // Like the tree pane, the owner is the one the tree root loaded with.
+  const ownerRef = useFileExplorerImport({
+    worktreeId,
+    worktreePath: root,
+    displayRootPath: root,
+    refreshDir,
+    clearNativeDragState: clearDrag,
+    setSelectedPath: setSelected,
+    operationOwner: getFileExplorerOperationOwner(worktreeId)
+  })
+  const srcDir = joinPath(root, 'src')
+  return (
+    <div ref={ownerRef} data-testid="tree">
+      <button data-testid="src" data-file-explorer-drop-dir={srcDir} />
+    </div>
+  )
+}
+
+function dropFile(target: Element): void {
+  const transfer = { types: ['Files'], files: [new File(['x'], 'shot.png')], dropEffect: 'move' }
+  const event = new Event('drop', { bubbles: true, cancelable: true, composed: true })
+  Object.defineProperty(event, 'dataTransfer', { value: transfer })
+  Object.defineProperty(event, 'isTrusted', { value: true })
+  act(() => {
+    target.dispatchEvent(event)
+  })
+}
+
+beforeEach(() => {
+  seedRemoteDropWorkspaces()
+  mocks.prepare.mockImplementation(async ({ paths }: { paths: string[] }) => ({
+    paths,
+    failures: []
+  }))
+  mocks.importPaths.mockImplementation(async (_context, _paths, dir: string) => ({
+    results: [{ status: 'imported', destPath: joinPath(dir, 'shot.png') }]
+  }))
+  vi.stubGlobal('api', {
+    fs: {
+      getPathForFile: (file: File) => `/Users/me/Desktop/${file.name}`,
+      prepareDroppedPaths: mocks.prepare
+    }
+  })
+})
+
+afterEach(() => {
+  cleanup()
+  vi.unstubAllGlobals()
+  vi.clearAllMocks()
+})
+
+describe('file explorer OS file drops on remote workspaces', () => {
+  it('uploads into the SSH folder the drop landed on', async () => {
+    const view = render(<Explorer worktreeId="wt-ssh" root={SSH_ROOT} />)
+    dropFile(view.getByTestId('src'))
+    await waitFor(() => expect(mocks.importPaths).toHaveBeenCalledTimes(1))
+    const [context, paths, dir] = mocks.importPaths.mock.calls[0]
+    expect(context).toMatchObject({
+      worktreeId: 'wt-ssh',
+      worktreePath: SSH_ROOT,
+      connectionId: 'ssh-1',
+      settings: { activeRuntimeEnvironmentId: null },
+      expectedExecutionHostId: 'ssh:ssh-1',
+      expectedSshTargetId: 'ssh-1',
+      expectedSshConnectionGeneration: 3
+    })
+    expect(paths).toEqual(['/Users/me/Desktop/shot.png'])
+    expect(dir).toBe(joinPath(SSH_ROOT, 'src'))
+  })
+
+  it("uploads through the workspace's own runtime, not the focused one", async () => {
+    const view = render(<Explorer worktreeId="wt-runtime" root={RUNTIME_ROOT} />)
+    dropFile(view.getByTestId('src'))
+    await waitFor(() => expect(mocks.importPaths).toHaveBeenCalledTimes(1))
+    expect(mocks.importPaths.mock.calls[0][0]).toMatchObject({
+      worktreeId: 'wt-runtime',
+      settings: { activeRuntimeEnvironmentId: 'owner-runtime' }
+    })
+    expect(mocks.importPaths.mock.calls[0][2]).toBe(joinPath(RUNTIME_ROOT, 'src'))
+  })
+
+  it('refuses after preparation when the SSH connection changed', async () => {
+    let finish: (prepared: PreparedDroppedPaths) => void = () => undefined
+    mocks.prepare.mockImplementationOnce(
+      () => new Promise<PreparedDroppedPaths>((resolve) => (finish = resolve))
+    )
+    const view = render(<Explorer worktreeId="wt-ssh" root={SSH_ROOT} />)
+    dropFile(view.getByTestId('src'))
+    useAppStore.setState({ sshConnectionStates: sshConnectionStatesAt(4) })
+    await act(async () => finish({ paths: ['/Users/me/Desktop/shot.png'], failures: [] }))
+    await waitFor(() => expect(mocks.toastError).toHaveBeenCalledTimes(1))
+    expect(mocks.importPaths).not.toHaveBeenCalled()
+    expect(clearDrag).toHaveBeenCalled()
+  })
+
+  it('reports a host that could not be verified at drop time once preparation finishes', async () => {
+    let finish: (prepared: PreparedDroppedPaths) => void = () => undefined
+    mocks.prepare.mockImplementationOnce(
+      () => new Promise<PreparedDroppedPaths>((resolve) => (finish = resolve))
+    )
+    // A disconnected SSH host has no connection generation to pin the upload to.
+    useAppStore.setState({ sshConnectionStates: new Map() })
+    const view = render(<Explorer worktreeId="wt-ssh" root={SSH_ROOT} />)
+    dropFile(view.getByTestId('src'))
+    expect(mocks.toastError).not.toHaveBeenCalled()
+    await act(async () => finish({ paths: ['/Users/me/Desktop/shot.png'], failures: [] }))
+    await waitFor(() => expect(mocks.toastError).toHaveBeenCalledTimes(1))
+    expect(mocks.importPaths).not.toHaveBeenCalled()
+    expect(clearDrag).toHaveBeenCalled()
+  })
+})
diff --git a/src/renderer/src/components/right-sidebar/useFileExplorerImport.ts b/src/renderer/src/components/right-sidebar/useFileExplorerImport.ts
index 8d7fffd64087..537647ac635b 100644
--- a/src/renderer/src/components/right-sidebar/useFileExplorerImport.ts
+++ b/src/renderer/src/components/right-sidebar/useFileExplorerImport.ts
@@ -1,151 +1,163 @@
 import { getRelativePathInsideRoot } from '@/lib/path'
-import { useEffect, useLayoutEffect, useRef } from 'react'
+import { useLayoutEffect, useRef, useState } from 'react'
 import { toast } from 'sonner'
 import { extractIpcErrorMessage } from '@/lib/ipc-error'
 import { importExternalPathsToRuntime } from '@/runtime/runtime-file-client'
 import { translate } from '@/i18n/i18n'
+import { createOsFileDropSequence, useOsFileDropOwner } from '@/hooks/use-os-file-drop-owner'
+import { getNativeFileDropRejectionMessage } from '@/lib/native-file-drop-rejection-message'
 import type { FileExplorerOperationOwner } from './file-explorer-types'
-import { captureFileExplorerOperationGuard } from './file-explorer-operation-owner'
+import {
+  captureFileExplorerOperationGuard,
+  type FileExplorerOperationGuard
+} from './file-explorer-operation-owner'
+
+/** Row attribute naming the folder an OS file dropped on that row imports into. */
+export const FILE_EXPLORER_DROP_DIR_ATTRIBUTE = 'data-file-explorer-drop-dir'
 
 type UseFileExplorerImportParams = {
+  worktreeId: string | null
   worktreePath: string | null
   displayRootPath?: string | null
-  activeWorktreeId: string | null
   refreshDir: (dirPath: string) => Promise<void>
   clearNativeDragState: () => void
   setSelectedPath: (path: string | null) => void
   operationOwner?: FileExplorerOperationOwner
 }
 
+type FileExplorerDropDestination =
+  | {
+      worktreeId: string
+      worktreePath: string
+      destinationDir: string
+      guard: FileExplorerOperationGuard
+    }
+  | { error: unknown }
+
+function readDropDir(root: HTMLElement | null, target: EventTarget | null): string | null {
+  const row =
+    target instanceof Element ? target.closest(`[${FILE_EXPLORER_DROP_DIR_ATTRIBUTE}]`) : null
+  return row && root?.contains(row) ? row.getAttribute(FILE_EXPLORER_DROP_DIR_ATTRIBUTE) : null
+}
+
 /**
- * Subscribes to native file-drop events targeted at the file explorer and
- * runs the import pipeline: copy into worktree, refresh, reveal.
- *
- * Why this is a separate hook: the actual filesystem paths from native OS
- * drops are only available through the preload-relayed IPC event, not the
- * React drop handler. The drop handler manages visual state; this hook
- * manages the import action.
+ * Makes the explorer tree root the owner of OS file drops: the target folder is
+ * read from the row under the cursor at drop time, then imported, refreshed and selected.
  */
 export function useFileExplorerImport({
+  worktreeId,
   worktreePath,
   displayRootPath = worktreePath,
-  activeWorktreeId,
   refreshDir,
   clearNativeDragState,
   setSelectedPath,
   operationOwner
-}: UseFileExplorerImportParams): void {
-  // Refs to avoid re-subscribing IPC listener on every render
-  const displayRootRef = useRef(displayRootPath)
-  const worktreePathRef = useRef(worktreePath)
-  const activeWorktreeIdRef = useRef(activeWorktreeId)
-  const refreshDirRef = useRef(refreshDir)
-  const clearNativeDragStateRef = useRef(clearNativeDragState)
-  const setSelectedPathRef = useRef(setSelectedPath)
-  const operationOwnerRef = useRef(operationOwner)
-
-  // Native drops must observe only committed workspace state.
+}: UseFileExplorerImportParams): (root: HTMLElement | null) => void {
+  const rootRef = useRef<HTMLElement | null>(null)
+  const [sequence] = useState(createOsFileDropSequence)
+  // Committed scope, read after the import to decide whether to select the result.
+  const shownRef = useRef({ worktreeId, displayRootPath })
   useLayoutEffect(() => {
-    displayRootRef.current = displayRootPath
-    worktreePathRef.current = worktreePath
-    activeWorktreeIdRef.current = activeWorktreeId
-    refreshDirRef.current = refreshDir
-    clearNativeDragStateRef.current = clearNativeDragState
-    setSelectedPathRef.current = setSelectedPath
-    operationOwnerRef.current = operationOwner
-  }, [
-    displayRootPath,
-    worktreePath,
-    activeWorktreeId,
-    refreshDir,
-    clearNativeDragState,
-    setSelectedPath,
-    operationOwner
-  ])
+    shownRef.current = { worktreeId, displayRootPath }
+  }, [worktreeId, displayRootPath])
+  const resolveDropDir = (event: DragEvent): string | null => {
+    // Why: worktreePath is null while the files view is hidden behind search or a closed sidebar.
+    if (!worktreeId || !worktreePath || !displayRootPath) {
+      return null
+    }
+    const dir = readDropDir(rootRef.current, event.target) ?? displayRootPath
+    return getRelativePathInsideRoot(dir, displayRootPath) === null ? null : dir
+  }
 
-  useEffect(() => {
-    return window.api.ui.onFileDrop((data) => {
-      if (data.target !== 'file-explorer') {
-        return
+  return useOsFileDropOwner<FileExplorerDropDestination | null>(rootRef, {
+    consumer: 'main-reader',
+    sequence,
+    canAccept: (event) => resolveDropDir(event) !== null,
+    captureDestination: (event) => {
+      const destinationDir = resolveDropDir(event)
+      if (!destinationDir || !worktreeId || !worktreePath) {
+        return null
       }
-
-      const wtId = activeWorktreeIdRef.current
-      if (!wtId || !worktreePathRef.current) {
-        // Why: the preload stops propagation of the native drop event, so
-        // React onDrop handlers never fire. We must clear the drag highlight
-        // ourselves even when we bail out, otherwise the explorer stays stuck
-        // in its drag-over visual state.
-        clearNativeDragStateRef.current()
+      try {
+        const guard = captureFileExplorerOperationGuard(worktreeId, operationOwner)
+        return { worktreeId, worktreePath, destinationDir, guard }
+      } catch (error) {
+        return { error }
+      }
+    },
+    onDrop: async (prepared, { destination }) => {
+      for (const failure of prepared.failures) {
+        const message = getNativeFileDropRejectionMessage(failure)
+        toast.error(message.title, { description: message.description })
+      }
+      if (!destination || prepared.paths.length === 0) {
+        clearNativeDragState()
         return
       }
+      try {
+        if ('error' in destination) {
+          throw destination.error
+        }
+        const { destinationDir, guard } = destination
+        guard.assertCurrent()
+        const { results } = await importExternalPathsToRuntime(
+          {
+            settings: guard.route.settings,
+            worktreeId: destination.worktreeId,
+            worktreePath: destination.worktreePath,
+            connectionId: guard.route.connectionId,
+            expectedExecutionHostId: guard.route.expectedExecutionHostId,
+            expectedSshTargetId: guard.route.expectedSshTargetId,
+            expectedSshConnectionGeneration: guard.route.expectedSshConnectionGeneration
+          },
+          prepared.paths,
+          destinationDir,
+          { assertCurrent: guard.assertCurrent }
+        )
 
-      const { paths, destinationDir } = data
-
-      void (async () => {
-        try {
-          if (getRelativePathInsideRoot(destinationDir, displayRootRef.current) === null) {
-            return
-          }
-          const operationGuard = captureFileExplorerOperationGuard(wtId, operationOwnerRef.current)
-          operationGuard.assertCurrent()
-          const { results } = await importExternalPathsToRuntime(
-            {
-              settings: operationGuard.route.settings,
-              worktreeId: wtId,
-              worktreePath: worktreePathRef.current,
-              connectionId: operationGuard.route.connectionId,
-              expectedExecutionHostId: operationGuard.route.expectedExecutionHostId,
-              expectedSshTargetId: operationGuard.route.expectedSshTargetId,
-              expectedSshConnectionGeneration: operationGuard.route.expectedSshConnectionGeneration
-            },
-            paths,
-            destinationDir,
-            { assertCurrent: operationGuard.assertCurrent }
-          )
-
-          // Refresh the destination directory once per gesture
-          await refreshDirRef.current(destinationDir)
+        // Refresh the destination directory once per gesture
+        await refreshDir(destinationDir)
 
-          // Why: only select (highlight) the first imported file — don't trigger
-          // the full reveal machinery because watcher refreshes can otherwise
-          // snap the tree viewport away from the user's drop target.
-          const imported = results.filter((r) => r.status === 'imported')
-          const skipped = results.filter((r) => r.status === 'skipped')
-          const failed = results.filter((r) => r.status === 'failed')
+        // Why: only select (highlight) the first imported file — don't trigger
+        // the full reveal machinery because watcher refreshes can otherwise
+        // snap the tree viewport away from the user's drop target.
+        const imported = results.filter((r) => r.status === 'imported')
+        const skipped = results.filter((r) => r.status === 'skipped')
+        const failed = results.filter((r) => r.status === 'failed')
 
-          if (
-            imported.length > 0 &&
-            activeWorktreeIdRef.current === wtId &&
-            getRelativePathInsideRoot(imported[0].destPath, displayRootRef.current) !== null
-          ) {
-            setSelectedPathRef.current(imported[0].destPath)
-          }
+        const shown = shownRef.current
+        if (
+          imported.length > 0 &&
+          shown.worktreeId === destination.worktreeId &&
+          getRelativePathInsideRoot(imported[0].destPath, shown.displayRootPath) !== null
+        ) {
+          setSelectedPath(imported[0].destPath)
+        }
 
-          if (failed.length > 0) {
-            const noun = failed.length === 1 ? 'file' : 'files'
-            toast.error(
-              translate(
-                'auto.components.right.sidebar.useFileExplorerImport.132fd0e1e9',
-                'Failed to import {{value0}} {{value1}}.',
-                { value0: failed.length, value1: noun }
-              )
+        if (failed.length > 0) {
+          const noun = failed.length === 1 ? 'file' : 'files'
+          toast.error(
+            translate(
+              'auto.components.right.sidebar.useFileExplorerImport.132fd0e1e9',
+              'Failed to import {{value0}} {{value1}}.',
+              { value0: failed.length, value1: noun }
             )
-          } else if (skipped.length > 0 && imported.length === 0) {
-            const noun = skipped.length === 1 ? 'file' : 'files'
-            toast.error(
-              translate(
-                'auto.components.right.sidebar.useFileExplorerImport.25919b2050',
-                'Skipped {{value0}} {{value1}}.',
-                { value0: skipped.length, value1: noun }
-              )
+          )
+        } else if (skipped.length > 0 && imported.length === 0) {
+          const noun = skipped.length === 1 ? 'file' : 'files'
+          toast.error(
+            translate(
+              'auto.components.right.sidebar.useFileExplorerImport.25919b2050',
+              'Skipped {{value0}} {{value1}}.',
+              { value0: skipped.length, value1: noun }
             )
-          }
-        } catch (err) {
-          toast.error(extractIpcErrorMessage(err, 'Failed to import files.'))
-        } finally {
-          clearNativeDragStateRef.current()
+          )
         }
-      })()
-    })
-  }, [])
+      } catch (err) {
+        toast.error(extractIpcErrorMessage(err, 'Failed to import files.'))
+      } finally {
+        clearNativeDragState()
+      }
+    }
+  })
 }
diff --git a/src/renderer/src/components/right-sidebar/useFileExplorerRowDrag.ts b/src/renderer/src/components/right-sidebar/useFileExplorerRowDrag.ts
index 9e6b70c9042a..ce372b118525 100644
--- a/src/renderer/src/components/right-sidebar/useFileExplorerRowDrag.ts
+++ b/src/renderer/src/components/right-sidebar/useFileExplorerRowDrag.ts
@@ -70,14 +70,13 @@ export function useFileExplorerRowDrag({
     [clearExpandTimer, clearNativeExpandTimer]
   )
 
+  // OS file dragover and drop are taken by the explorer root's owner before rows see them.
   const handleDragOver = useCallback((e: React.DragEvent) => {
-    const isInternal = e.dataTransfer.types.includes(WORKSPACE_FILE_PATH_MIME)
-    const isNative = e.dataTransfer.types.includes('Files')
-    if (!isInternal && !isNative) {
+    if (!e.dataTransfer.types.includes(WORKSPACE_FILE_PATH_MIME)) {
       return
     }
     e.preventDefault()
-    e.dataTransfer.dropEffect = isInternal ? 'move' : 'copy'
+    e.dataTransfer.dropEffect = 'move'
   }, [])
 
   const handleDragEnter = useCallback(
@@ -174,8 +173,6 @@ export function useFileExplorerRowDrag({
       for (const sourcePath of dragPaths.paths) {
         onMoveDrop(sourcePath, rowDropDir)
       }
-      // Why: native Files drops are handled by the preload-relayed IPC event,
-      // not the React drop handler. We only clear visual state here.
     },
     [
       rowDropDir,
diff --git a/src/renderer/src/components/right-sidebar/useFileExplorerWatch.pending-refresh.test.tsx b/src/renderer/src/components/right-sidebar/useFileExplorerWatch.pending-refresh.test.tsx
index 905e20983e4a..21c16a0b2f5f 100644
--- a/src/renderer/src/components/right-sidebar/useFileExplorerWatch.pending-refresh.test.tsx
+++ b/src/renderer/src/components/right-sidebar/useFileExplorerWatch.pending-refresh.test.tsx
@@ -68,24 +68,38 @@ describe('useFileExplorerWatch pending refreshes', () => {
     vi.useRealTimers()
   })
 
-  function renderWatch(worktreePath: string | null = '/repo') {
+  function renderWatch(
+    worktreePath: string | null = '/repo',
+    interaction: 'rename' | 'drag' | 'native' | null = null
+  ) {
+    const setDirCache = vi.fn()
+    const setSelectedPath = vi.fn()
     return renderHook(
-      ({ visiblePath }: { visiblePath: string | null }) =>
+      ({
+        visiblePath,
+        activeInteraction
+      }: {
+        visiblePath: string | null
+        activeInteraction: typeof interaction
+      }) =>
         useFileExplorerWatch({
           worktreePath: visiblePath,
           activeWorktreeId: 'wt-1',
           dirCache: { '/repo': { children: [] } },
-          setDirCache: vi.fn(),
+          setDirCache,
           expanded: new Set(),
-          setSelectedPath: vi.fn(),
+          setSelectedPath,
           refreshDir,
           refreshTree,
-          inlineInput: null,
-          dragSourcePath: null,
-          isNativeDragOver: false,
+          inlineInput:
+            activeInteraction === 'rename'
+              ? { parentPath: '/repo', type: 'rename', depth: 0 }
+              : null,
+          dragSourcePath: activeInteraction === 'drag' ? '/repo/example.ts' : null,
+          isNativeDragOver: activeInteraction === 'native',
           operationOwner: ownerRef.current
         }),
-      { initialProps: { visiblePath: worktreePath } }
+      { initialProps: { visiblePath: worktreePath, activeInteraction: interaction } }
     )
   }
 
@@ -102,8 +116,8 @@ describe('useFileExplorerWatch pending refreshes', () => {
     expect(mainWatchHandler).not.toBeNull()
 
     act(() => emit(mainWatchHandler!))
-    hook.rerender({ visiblePath: null })
-    hook.rerender({ visiblePath: '/repo' })
+    hook.rerender({ visiblePath: null, activeInteraction: null })
+    hook.rerender({ visiblePath: '/repo', activeInteraction: null })
     await act(async () => vi.advanceTimersByTimeAsync(0))
 
     expect(refreshTree).toHaveBeenCalledOnce()
@@ -157,8 +171,8 @@ describe('useFileExplorerWatch pending refreshes', () => {
     const hook = renderWatch()
     const disposedHandler = runtimeWatch.handler!
 
-    hook.rerender({ visiblePath: null })
-    hook.rerender({ visiblePath: '/repo' })
+    hook.rerender({ visiblePath: null, activeInteraction: null })
+    hook.rerender({ visiblePath: '/repo', activeInteraction: null })
     act(() => emit(disposedHandler))
     await act(async () => vi.advanceTimersByTimeAsync(0))
 
@@ -170,4 +184,47 @@ describe('useFileExplorerWatch pending refreshes', () => {
       await subscriptionReady
     })
   })
+  it.each(['rename', 'drag', 'native'] as const)(
+    'does not refresh the current root on reopen after foreign events during %s',
+    async (interaction) => {
+      const hook = renderWatch('/repo', interaction)
+      const handler = mainWatchHandler
+      if (!handler) {
+        throw new Error('Filesystem listener was not registered')
+      }
+      act(() => {
+        for (const worktreePath of ['/other-repo', '/repo-sibling']) {
+          handler({
+            worktreePath,
+            events: [{ kind: 'overflow', absolutePath: worktreePath }]
+          })
+        }
+      })
+      hook.rerender({ visiblePath: null, activeInteraction: null })
+      hook.rerender({ visiblePath: '/repo', activeInteraction: null })
+      await act(async () => vi.advanceTimersByTimeAsync(0))
+
+      expect(refreshTree).not.toHaveBeenCalled()
+      expect(refreshDir).not.toHaveBeenCalled()
+    }
+  )
+
+  it.each(['rename', 'drag', 'native'] as const)(
+    'preserves current-root refreshes deferred during %s',
+    async (interaction) => {
+      const hook = renderWatch('/repo', interaction)
+      const handler = mainWatchHandler
+      if (!handler) {
+        throw new Error('Filesystem listener was not registered')
+      }
+      act(() => emit(handler))
+      await act(async () => vi.advanceTimersByTimeAsync(0))
+      expect(refreshDir).not.toHaveBeenCalled()
+
+      hook.rerender({ visiblePath: '/repo', activeInteraction: null })
+      await act(async () => vi.advanceTimersByTimeAsync(0))
+      expect(refreshDir).toHaveBeenCalledExactlyOnceWith('/repo')
+      expect(refreshTree).not.toHaveBeenCalled()
+    }
+  )
 })
diff --git a/src/renderer/src/components/right-sidebar/useFileExplorerWatch.ts b/src/renderer/src/components/right-sidebar/useFileExplorerWatch.ts
index c75d112b0e99..1b6c09507be4 100644
--- a/src/renderer/src/components/right-sidebar/useFileExplorerWatch.ts
+++ b/src/renderer/src/components/right-sidebar/useFileExplorerWatch.ts
@@ -209,6 +209,12 @@ export function useFileExplorerWatch({
         }
         return
       }
+      if (
+        normalizeRuntimePathForComparison(payload.worktreePath) !==
+        normalizeRuntimePathForComparison(currentWorktreePath)
+      ) {
+        return
+      }
       // Why: defer refreshes during inline input/drag so rows don't shift; native drags only set isNativeDragOver (design §6.2).
       if (
         inlineInputRef.current !== null ||
diff --git a/src/renderer/src/components/right-sidebar/useGitStatusPolling.rerender.test.ts b/src/renderer/src/components/right-sidebar/useGitStatusPolling.rerender.test.ts
index 7d565090d697..561af39b624c 100644
--- a/src/renderer/src/components/right-sidebar/useGitStatusPolling.rerender.test.ts
+++ b/src/renderer/src/components/right-sidebar/useGitStatusPolling.rerender.test.ts
@@ -7,7 +7,8 @@ import type { Repo } from '../../../../shared/repo-types'
 import type { Worktree } from '../../../../shared/worktree/types'
 import { useAppStore } from '@/store'
 import type { AppState } from '@/store/types'
-import { makeOpenFile, makeWorktree, TEST_REPO } from '@/store/slices/store-test-helpers'
+import { makeOpenFile } from '../../store/slices/store-session-test-harness'
+import { makeWorktree, TEST_REPO } from '../../store/slices/worktrees-slice-test-fixtures'
 import { ORCA_WORKTREE_FILE_CHANGE_EVENT } from '@/hooks/worktree-file-change-event'
 import { useGitStatusPolling } from './useGitStatusPolling'
 
diff --git a/src/renderer/src/components/settings/ChatSettingsSection.inline-visuals.test.tsx b/src/renderer/src/components/settings/ChatSettingsSection.inline-visuals.test.tsx
new file mode 100644
index 000000000000..b7853aa2f250
--- /dev/null
+++ b/src/renderer/src/components/settings/ChatSettingsSection.inline-visuals.test.tsx
@@ -0,0 +1,96 @@
+// @vitest-environment happy-dom
+import { cleanup, fireEvent, render, screen } from '@testing-library/react'
+import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest'
+import { getDefaultSettings } from '../../../../shared/constants'
+import type { GlobalSettings } from '../../../../shared/global-settings-types'
+import { ChatSettingsSection } from './ChatSettingsSection'
+import { ActiveSettingsSectionProvider } from './SettingsSection'
+import { getChatInlineVisualsSearchEntry } from './chat-inline-visuals-search'
+import { matchesSettingsSearch } from './settings-search'
+import { getSettingsScrollTarget } from './settings-navigation-foundations'
+import { buildSettingsNavigationMetadata } from '@/hooks/useSettingsNavigationMetadata'
+import { buildCmdJSettingsResults } from '../cmd-j/palette-results'
+
+const state = vi.hoisted((): { settingsSearchQuery: string; settings: GlobalSettings | null } => ({
+  settingsSearchQuery: '',
+  settings: null
+}))
+vi.mock('../../store', () => ({
+  useAppStore: Object.assign((selector: (value: typeof state) => unknown) => selector(state), {
+    getState: () => state
+  })
+}))
+afterEach(cleanup)
+beforeEach(() => {
+  state.settingsSearchQuery = ''
+  state.settings = null
+})
+
+function renderChat(nativeChatInlineVisuals: boolean | undefined) {
+  const settings = {
+    ...getDefaultSettings('/tmp'),
+    experimentalStructuredNativeChat: true,
+    nativeChatInlineVisuals
+  }
+  state.settings = settings
+  const updateSettings = vi.fn()
+  return {
+    ...render(
+      <ActiveSettingsSectionProvider value="chat">
+        <ChatSettingsSection
+          settings={settings}
+          updateSettings={updateSettings}
+          writeSourceControlAiSettings={async () => {}}
+          searchEntries={[getChatInlineVisualsSearchEntry()]}
+          showDesktopOnlySettings
+          isMounted
+        />
+      </ActiveSettingsSectionProvider>
+    ),
+    updateSettings
+  }
+}
+
+describe('Inline visuals on the Chat settings page', () => {
+  it.each([true, undefined])('defaults on for saved preference %s and turns off', (preference) => {
+    expect(getDefaultSettings('/tmp').nativeChatInlineVisuals).toBe(true)
+    const { updateSettings } = renderChat(preference)
+    const toggle = screen.getByRole('switch', { name: 'Toggle inline visuals' })
+    expect(toggle.getAttribute('aria-checked')).toBe('true')
+    fireEvent.click(toggle)
+    expect(updateSettings).toHaveBeenCalledWith({ nativeChatInlineVisuals: false })
+  })
+
+  it('uses saved off and turns on', () => {
+    const { updateSettings } = renderChat(false)
+    expect(screen.getByText(/Applies to newly started chats/)).toBeTruthy()
+    const toggle = screen.getByRole('switch', { name: 'Toggle inline visuals' })
+    expect(toggle.getAttribute('aria-checked')).toBe('false')
+    fireEvent.click(toggle)
+    expect(updateSettings).toHaveBeenCalledWith({ nativeChatInlineVisuals: true })
+  })
+
+  it.each(['inline visuals', 'charts', 'mockups'])(
+    'finds %s and resolves its own Chat target',
+    (query) => {
+      state.settingsSearchQuery = query
+      const { container } = renderChat(true)
+      const toggle = screen.getByRole('switch', { name: 'Toggle inline visuals' })
+      expect(screen.queryByRole('spinbutton', { name: 'Text size' })).toBeNull()
+      const sections = buildSettingsNavigationMetadata({
+        isMac: false,
+        isWindows: false,
+        isWebClient: false,
+        experimentalStructuredNativeChat: true,
+        repos: []
+      })
+      const results = buildCmdJSettingsResults(sections)
+      expect(matchesSettingsSearch(query, getChatInlineVisualsSearchEntry())).toBe(true)
+      const result = results.find((entry) => entry.title === 'Inline visuals')
+      expect(result?.sectionId).toBe('chat')
+      expect(result?.targetSectionId).toBe('chat-inline-visuals')
+      expect(getSettingsScrollTarget('chat-inline-visuals', container)?.contains(toggle)).toBe(true)
+      expect(results.filter((entry) => entry.title === 'Inline visuals')).toHaveLength(1)
+    }
+  )
+})
diff --git a/src/renderer/src/components/settings/ChatSettingsSection.navigation.test.tsx b/src/renderer/src/components/settings/ChatSettingsSection.navigation.test.tsx
index 6ad47215df5c..4a065f0881ba 100644
--- a/src/renderer/src/components/settings/ChatSettingsSection.navigation.test.tsx
+++ b/src/renderer/src/components/settings/ChatSettingsSection.navigation.test.tsx
@@ -8,6 +8,7 @@ import { ChatSettingsSection } from './ChatSettingsSection'
 import { ActiveSettingsSectionProvider } from './SettingsSection'
 import { getChatAppearanceSearchEntries } from './chat-appearance-search'
 import { getChatNamingSearchEntry } from './chat-naming-search'
+import { getChatInlineVisualsSearchEntry } from './chat-inline-visuals-search'
 import { useSettingsRepoScrollEffects } from './use-settings-repo-scroll-effects'
 import type { SettingsStoreModel } from './use-settings-store-model'
 import type { SettingsInteractionController } from './use-settings-interaction-controller'
@@ -96,7 +97,11 @@ function NavigationHarness({
         settings={settings}
         updateSettings={vi.fn()}
         writeSourceControlAiSettings={async () => {}}
-        searchEntries={[...getChatAppearanceSearchEntries(), getChatNamingSearchEntry()]}
+        searchEntries={[
+          ...getChatAppearanceSearchEntries(),
+          getChatNamingSearchEntry(),
+          getChatInlineVisualsSearchEntry()
+        ]}
         showDesktopOnlySettings
         isMounted
       />
@@ -105,6 +110,23 @@ function NavigationHarness({
 }
 
 describe('Chat settings deep links', () => {
+  it('activates Chat and scrolls to Inline visuals from another settings page', async () => {
+    const scrollIntoView = vi.spyOn(HTMLElement.prototype, 'scrollIntoView')
+    const { container } = render(
+      <NavigationHarness enabled initialSection="appearance" targetSection="chat-inline-visuals" />
+    )
+    await waitFor(() => {
+      expect(screen.getByRole('status', { name: 'Selected settings page' }).textContent).toBe(
+        'chat'
+      )
+    })
+    const visuals = container.querySelector('#chat-inline-visuals')
+    expect(visuals?.querySelector('[role="switch"]')).toBe(
+      screen.getByRole('switch', { name: 'Toggle inline visuals' })
+    )
+    await waitFor(() => expect(scrollIntoView.mock.contexts).toContain(visuals))
+  })
+
   it('activates Chat and renders the moved row for a deep link', async () => {
     render(<NavigationHarness enabled initialSection="appearance" />)
     await waitFor(() => {
diff --git a/src/renderer/src/components/settings/ChatSettingsSection.test.tsx b/src/renderer/src/components/settings/ChatSettingsSection.test.tsx
index b2581d3f280a..9e5716452527 100644
--- a/src/renderer/src/components/settings/ChatSettingsSection.test.tsx
+++ b/src/renderer/src/components/settings/ChatSettingsSection.test.tsx
@@ -7,6 +7,7 @@ import { ChatSettingsSection } from './ChatSettingsSection'
 import { ActiveSettingsSectionProvider } from './SettingsSection'
 import { getChatAppearanceSearchEntries } from './chat-appearance-search'
 import { getChatNamingSearchEntry } from './chat-naming-search'
+import { getChatInlineVisualsSearchEntry } from './chat-inline-visuals-search'
 import { buildSettingsNavigationMetadata } from '@/hooks/useSettingsNavigationMetadata'
 import { buildCmdJSettingsResults } from '../cmd-j/palette-results'
 import { isSettingsNavigationTarget } from '@/lib/settings-navigation-types'
@@ -46,7 +47,12 @@ function renderChat(
         settings={settings}
         updateSettings={updateSettings}
         writeSourceControlAiSettings={async () => {}}
-        searchEntries={[...getChatAppearanceSearchEntries(), getChatNamingSearchEntry()]}
+        searchEntries={[
+          ...getChatAppearanceSearchEntries(),
+          ...(showDesktopOnlySettings
+            ? [getChatNamingSearchEntry(), getChatInlineVisualsSearchEntry()]
+            : [])
+        ]}
         showDesktopOnlySettings={showDesktopOnlySettings}
         isMounted
         hasUnsavedChatPromptChanges={hasUnsavedChatPromptChanges}
@@ -62,6 +68,7 @@ describe('Chat settings page', () => {
     expect(screen.getByRole('spinbutton', { name: 'Text size' })).toBeTruthy()
     expect(container.querySelector('#chat-names')).toBeNull()
     expect(screen.queryByRole('switch', { name: 'Name chats automatically' })).toBeNull()
+    expect(screen.queryByRole('switch', { name: 'Toggle inline visuals' })).toBeNull()
     const sections = buildSettingsNavigationMetadata({
       isMac: false,
       isWindows: false,
@@ -72,6 +79,7 @@ describe('Chat settings page', () => {
     const results = buildCmdJSettingsResults(sections).filter((entry) => entry.sectionId === 'chat')
     expect(results.some((entry) => entry.targetSectionId === 'chat-text-size')).toBe(true)
     expect(results.some((entry) => entry.targetSectionId === 'chat-names')).toBe(false)
+    expect(results.some((entry) => entry.targetSectionId === 'chat-inline-visuals')).toBe(false)
   })
 
   it.each([false, undefined])('is absent with structured chat set to %s', (enabled) => {
@@ -99,14 +107,19 @@ describe('Chat settings page', () => {
     )
   })
 
-  it('renders Appearance and Chat names as peer sections with separate cards', () => {
+  it('renders Appearance, Inline visuals and Chat names as peers with separate cards', () => {
     const { container } = renderChat(true)
     const appearance = container.querySelector('#chat-appearance')
     const names = container.querySelector('#chat-names')
+    const visuals = container.querySelector('#chat-inline-visuals')
     expect(screen.getByRole('heading', { name: 'Chat names', level: 3 })).toBeTruthy()
     expect(appearance).toBeTruthy()
     expect(names).toBeTruthy()
     expect(appearance?.parentElement).toBe(names?.parentElement)
+    expect(visuals?.parentElement).toBe(appearance?.parentElement)
+    expect(visuals?.querySelector('[data-slot="card"]')).toBeTruthy()
+    expect(visuals?.contains(appearance)).toBe(false)
+    expect(visuals?.contains(names)).toBe(false)
     expect(appearance?.closest('[data-slot="card"]')).toBeNull()
     expect(names?.closest('[data-slot="card"]')).toBeNull()
     const appearanceCard = screen
diff --git a/src/renderer/src/components/settings/ChatSettingsSection.tsx b/src/renderer/src/components/settings/ChatSettingsSection.tsx
index df8f28aaa10e..62d83dafa056 100644
--- a/src/renderer/src/components/settings/ChatSettingsSection.tsx
+++ b/src/renderer/src/components/settings/ChatSettingsSection.tsx
@@ -1,6 +1,7 @@
 import { translate } from '@/i18n/i18n'
 import { AppearanceChatSection } from './AppearanceChatSection'
 import { ChatNamingSetting } from './ChatNamingSetting'
+import { NativeChatInlineVisualsSetting } from './NativeChatInlineVisualsSetting'
 import { SettingsSection } from './SettingsSection'
 import { SettingsSubsectionHeader } from './SettingsFormControls'
 import { matchesSettingsSearch } from './settings-search'
@@ -42,10 +43,7 @@ export function ChatSettingsSection({
     <SettingsSection
       id="chat"
       title={title}
-      description={translate(
-        'settings.chat.description',
-        'Choose how chats look and get their names.'
-      )}
+      description={translate('settings.chat.description', 'Choose how chats look and behave.')}
       searchEntries={searchEntries}
       forceVisible={hasUnsavedChatPromptChanges}
       bodyClassName="rounded-none border-0 bg-transparent p-0 shadow-none"
@@ -69,6 +67,13 @@ export function ChatSettingsSection({
               </Card>
             </section>
           ) : null}
+          {showDesktopOnlySettings ? (
+            <NativeChatInlineVisualsSetting
+              settings={settings}
+              updateSettings={updateSettings}
+              forceVisible={matchesSettingsSearch(query, [{ title }])}
+            />
+          ) : null}
           {showDesktopOnlySettings ? (
             <ChatNamingSetting
               key={chatPromptDiscardSignal}
diff --git a/src/renderer/src/components/settings/NativeChatExperimentalSetting.test.tsx b/src/renderer/src/components/settings/NativeChatExperimentalSetting.test.tsx
index d876e33f00c2..8e95b25a45c6 100644
--- a/src/renderer/src/components/settings/NativeChatExperimentalSetting.test.tsx
+++ b/src/renderer/src/components/settings/NativeChatExperimentalSetting.test.tsx
@@ -258,3 +258,15 @@ describe('NativeChatExperimentalSetting queue follow-ups', () => {
     expect(container.querySelector(QUEUE_TOGGLE)).toBeNull()
   })
 })
+
+describe('NativeChatExperimentalSetting inline visuals', () => {
+  it('leaves Inline visuals on the Chat page even while structured chat is enabled', () => {
+    const { queryByRole, getByRole } = renderSetting({
+      experimentalNativeChat: true,
+      openAgentTabsInChatByDefault: true,
+      experimentalStructuredNativeChat: true
+    })
+    expect(getByRole('switch', { name: 'Toggle automatic resume after a restart' })).toBeTruthy()
+    expect(queryByRole('switch', { name: 'Toggle inline visuals' })).toBeNull()
+  })
+})
diff --git a/src/renderer/src/components/settings/NativeChatInlineVisualsSetting.tsx b/src/renderer/src/components/settings/NativeChatInlineVisualsSetting.tsx
new file mode 100644
index 000000000000..4013be576c9c
--- /dev/null
+++ b/src/renderer/src/components/settings/NativeChatInlineVisualsSetting.tsx
@@ -0,0 +1,44 @@
+import type { GlobalSettings } from '../../../../shared/global-settings-types'
+import { translate } from '@/i18n/i18n'
+import { SettingsSwitchRow } from './SettingsFormControls'
+import { Card, CardContent } from '../ui/card'
+import { SearchableSetting } from './SearchableSetting'
+import { getChatInlineVisualsSearchEntry } from './chat-inline-visuals-search'
+
+type NativeChatInlineVisualsSettingProps = {
+  settings: GlobalSettings
+  updateSettings: (updates: Partial<GlobalSettings>) => void
+  forceVisible?: boolean
+}
+
+export function NativeChatInlineVisualsSetting({
+  settings,
+  updateSettings,
+  forceVisible = false
+}: NativeChatInlineVisualsSettingProps): React.JSX.Element {
+  const enabled = settings.nativeChatInlineVisuals !== false
+  const entry = getChatInlineVisualsSearchEntry()
+  return (
+    <SearchableSetting
+      {...entry}
+      id="chat-inline-visuals"
+      forceVisible={forceVisible}
+      className="max-w-none"
+    >
+      <Card>
+        <CardContent>
+          <SettingsSwitchRow
+            label={entry.title}
+            description={entry.description}
+            checked={enabled}
+            ariaLabel={translate(
+              'components.settings.nativeChat.inlineVisualsToggleLabel',
+              'Toggle inline visuals'
+            )}
+            onChange={() => updateSettings({ nativeChatInlineVisuals: !enabled })}
+          />
+        </CardContent>
+      </Card>
+    </SearchableSetting>
+  )
+}
diff --git a/src/renderer/src/components/settings/RepositoryGitHubAccountSection.inventory-lifetime.test.tsx b/src/renderer/src/components/settings/RepositoryGitHubAccountSection.inventory-lifetime.test.tsx
new file mode 100644
index 000000000000..979a79e3baef
--- /dev/null
+++ b/src/renderer/src/components/settings/RepositoryGitHubAccountSection.inventory-lifetime.test.tsx
@@ -0,0 +1,258 @@
+// @vitest-environment happy-dom
+
+import React, { act } from 'react'
+import { createRoot, type Root } from 'react-dom/client'
+import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest'
+import type { Repo } from '../../../../shared/repo-types'
+import type { GlobalSettings } from '../../../../shared/global-settings-types'
+import type { GhAccountBinding } from '../../../../shared/github/account-binding'
+import type { GhAccountBindingInventory } from '../../../../shared/github/auth-types'
+import type * as RepositoryGitHubAccountModule from './repository-github-account'
+import { RepositoryGitHubAccountSection } from './RepositoryGitHubAccountSection'
+
+const { listAccountsMock, validateBindingMock, storeState } = vi.hoisted(() => {
+  const storeState: {
+    settings: Pick<GlobalSettings, 'activeRuntimeEnvironmentId'> | null
+    repos: Repo[]
+    settingsSearchQuery: string
+  } = { settings: null, repos: [], settingsSearchQuery: '' }
+  return { listAccountsMock: vi.fn(), validateBindingMock: vi.fn(), storeState }
+})
+
+vi.mock('../../store', () => {
+  const useAppStore = (selector: (state: typeof storeState) => unknown) => selector(storeState)
+  useAppStore.getState = () => storeState
+  return { useAppStore }
+})
+
+vi.mock('@/runtime/runtime-rpc-client', () => ({
+  getActiveRuntimeTarget: (settings: Pick<GlobalSettings, 'activeRuntimeEnvironmentId'> | null) =>
+    settings?.activeRuntimeEnvironmentId
+      ? { kind: 'environment', environmentId: settings.activeRuntimeEnvironmentId }
+      : { kind: 'local' },
+  callRuntimeRpc: vi.fn()
+}))
+
+vi.mock('./repository-github-account', async (importOriginal) => ({
+  ...(await importOriginal<typeof RepositoryGitHubAccountModule>()),
+  listRepositoryGhBindableAccounts: listAccountsMock,
+  validateRepositoryGhAccountBinding: validateBindingMock
+}))
+
+// Radix requires layout APIs; the native select retains the account interaction.
+vi.mock('../ui/select', () => ({
+  Select: ({
+    value,
+    onValueChange,
+    disabled,
+    children
+  }: {
+    value: string
+    onValueChange: (value: string) => void
+    disabled?: boolean
+    children: React.ReactNode
+  }) => (
+    <select
+      value={value}
+      disabled={disabled}
+      onChange={(event) => onValueChange(event.currentTarget.value)}
+    >
+      {children}
+    </select>
+  ),
+  SelectTrigger: () => null,
+  SelectValue: () => null,
+  SelectContent: ({ children }: { children: React.ReactNode }) => <>{children}</>,
+  SelectItem: ({
+    value,
+    disabled,
+    children
+  }: {
+    value: string
+    disabled?: boolean
+    children: React.ReactNode
+  }) => (
+    <option value={value} disabled={disabled}>
+      {children}
+    </option>
+  )
+}))
+
+const BASE_REPO: Repo = {
+  id: 'repo-1',
+  path: '/generated/project',
+  displayName: 'Generated',
+  badgeColor: '#000000',
+  addedAt: 0,
+  executionHostId: 'local'
+}
+const INVENTORY: GhAccountBindingInventory = {
+  capability: 'supported',
+  accounts: [
+    {
+      host: 'github.com',
+      user: 'alice',
+      active: true,
+      envToken: null,
+      source: 'keyring',
+      scopes: []
+    }
+  ]
+}
+type UpdateRepo = (repoId: string, updates: { ghAccount?: GhAccountBinding | null }) => unknown
+let container: HTMLDivElement
+let root: Root
+
+beforeEach(() => {
+  container = document.createElement('div')
+  document.body.appendChild(container)
+  root = createRoot(container)
+  listAccountsMock.mockReset().mockResolvedValue(INVENTORY)
+  validateBindingMock.mockReset()
+  storeState.settings = { activeRuntimeEnvironmentId: null }
+  storeState.repos = []
+})
+afterEach(() => {
+  act(() => root.unmount())
+  container.remove()
+})
+
+async function render(repo: Repo, updateRepo: UpdateRepo = () => true): Promise<void> {
+  storeState.repos = [repo]
+  await act(async () =>
+    root.render(<RepositoryGitHubAccountSection repo={repo} updateRepo={updateRepo} forceVisible />)
+  )
+}
+function getSelect(): HTMLSelectElement {
+  const select = container.querySelector('select')
+  if (!select) {
+    throw new Error('account select missing')
+  }
+  return select
+}
+function getRefreshButton(): HTMLButtonElement {
+  const button = container.querySelector<HTMLButtonElement>(
+    'button[aria-label="Refresh GitHub accounts"]'
+  )
+  if (!button) {
+    throw new Error('refresh button missing')
+  }
+  return button
+}
+
+describe('repository account inventory request ownership', () => {
+  it('keeps the loaded selector through five committed display-name changes', async () => {
+    await render(BASE_REPO)
+    for (const displayName of [
+      'Generated A',
+      'Generated AB',
+      'Generated ABC',
+      'Generated ABCD',
+      'Generated ABCDE'
+    ]) {
+      await render({ ...BASE_REPO, displayName })
+      expect(getSelect().disabled).toBe(false)
+    }
+    expect(listAccountsMock).toHaveBeenCalledTimes(1)
+  })
+
+  const scopeChanges: { name: string; initial?: Partial<Repo>; updates: Partial<Repo> }[] = [
+    { name: 'repo id', updates: { id: 'repo-2' } },
+    { name: 'repo path', updates: { path: '/generated/other' } },
+    { name: 'execution owner', updates: { executionHostId: 'runtime:server-1' } },
+    { name: 'SSH connection owner', updates: { connectionId: 'ssh-2' } },
+    {
+      name: 'canonical remote identity',
+      updates: {
+        gitRemoteIdentity: {
+          canonicalKey: 'ghe.example.com/team/project',
+          remoteName: 'origin',
+          remoteUrl: 'https://ghe.example.com/team/project'
+        }
+      }
+    },
+    {
+      name: 'bound account host',
+      initial: { ghAccount: { host: 'github.com', user: 'alice' } },
+      updates: { ghAccount: { host: 'ghe.example.com', user: 'alice' } }
+    },
+    {
+      name: 'bound account user',
+      initial: { ghAccount: { host: 'github.com', user: 'alice' } },
+      updates: { ghAccount: { host: 'github.com', user: 'bob' } }
+    }
+  ]
+  it.each(scopeChanges)('refreshes after changing $name', async ({ initial, updates }) => {
+    const repo = { ...BASE_REPO, ...initial }
+    await render(repo)
+    await render({ ...repo, ...updates })
+    expect(listAccountsMock).toHaveBeenCalledTimes(2)
+  })
+
+  it('reloads for a changed legacy runtime target and keeps explicit refresh forced', async () => {
+    const repo: Repo = { ...BASE_REPO, executionHostId: undefined }
+    storeState.settings = { activeRuntimeEnvironmentId: 'server-1' }
+    await render(repo)
+    storeState.settings = { activeRuntimeEnvironmentId: 'server-2' }
+    await render(repo)
+    expect(listAccountsMock).toHaveBeenNthCalledWith(
+      2,
+      { kind: 'environment', environmentId: 'server-2' },
+      { id: repo.id, path: repo.path },
+      { refreshCapability: false }
+    )
+    await act(async () => getRefreshButton().click())
+    expect(listAccountsMock).toHaveBeenNthCalledWith(
+      3,
+      { kind: 'environment', environmentId: 'server-2' },
+      { id: repo.id, path: repo.path },
+      { refreshCapability: true }
+    )
+  })
+
+  it('ignores an earlier scope reply while the current scope still owns loading', async () => {
+    const oldRequest = Promise.withResolvers<GhAccountBindingInventory>()
+    const currentRequest = Promise.withResolvers<GhAccountBindingInventory>()
+    listAccountsMock
+      .mockReset()
+      .mockReturnValueOnce(oldRequest.promise)
+      .mockReturnValueOnce(currentRequest.promise)
+    await render(BASE_REPO)
+    await render({ ...BASE_REPO, path: '/generated/other' })
+    await act(async () => oldRequest.resolve(INVENTORY))
+    expect(getSelect().disabled).toBe(true)
+    expect(container.textContent).not.toContain('alice @ github.com')
+    await act(async () =>
+      currentRequest.resolve({
+        ...INVENTORY,
+        accounts: INVENTORY.accounts.map((account) => ({ ...account, user: 'bob' }))
+      })
+    )
+    expect(getSelect().disabled).toBe(false)
+    expect(container.textContent).toContain('bob @ github.com')
+  })
+
+  it('uses the latest repo in binding callbacks after unrelated edits', async () => {
+    const updateRepo = vi.fn<UpdateRepo>().mockResolvedValue(true)
+    validateBindingMock.mockResolvedValue({
+      ok: true,
+      binding: { host: 'github.com', user: 'alice' }
+    })
+    await render(BASE_REPO, updateRepo)
+    const editedRepo = { ...BASE_REPO, displayName: 'Generated edited' }
+    await render(editedRepo, updateRepo)
+    await act(async () => {
+      const select = getSelect()
+      select.value = 'github.com\0alice'
+      select.dispatchEvent(new Event('change', { bubbles: true }))
+    })
+    expect(validateBindingMock).toHaveBeenCalledWith({ kind: 'local' }, editedRepo, {
+      host: 'github.com',
+      user: 'alice'
+    })
+    expect(updateRepo).toHaveBeenCalledWith(editedRepo.id, {
+      ghAccount: { host: 'github.com', user: 'alice' }
+    })
+    expect(listAccountsMock).toHaveBeenCalledTimes(1)
+  })
+})
diff --git a/src/renderer/src/components/settings/RepositoryGitHubAccountSection.test.tsx b/src/renderer/src/components/settings/RepositoryGitHubAccountSection.test.tsx
index 66adda307796..cd9154797d13 100644
--- a/src/renderer/src/components/settings/RepositoryGitHubAccountSection.test.tsx
+++ b/src/renderer/src/components/settings/RepositoryGitHubAccountSection.test.tsx
@@ -228,9 +228,12 @@ describe('RepositoryGitHubAccountSection', () => {
       await Promise.resolve()
     })
 
-    expect(listAccountsMock).toHaveBeenNthCalledWith(2, expect.anything(), BASE_REPO, {
-      refreshCapability: true
-    })
+    expect(listAccountsMock).toHaveBeenNthCalledWith(
+      2,
+      expect.anything(),
+      { id: BASE_REPO.id, path: BASE_REPO.path },
+      { refreshCapability: true }
+    )
   })
 
   it('validates and then binds a keyring account', async () => {
diff --git a/src/renderer/src/components/settings/RepositoryGitHubAccountSection.tsx b/src/renderer/src/components/settings/RepositoryGitHubAccountSection.tsx
index 142ccc45e571..f5da489a363a 100644
--- a/src/renderer/src/components/settings/RepositoryGitHubAccountSection.tsx
+++ b/src/renderer/src/components/settings/RepositoryGitHubAccountSection.tsx
@@ -59,9 +59,11 @@ export function RepositoryGitHubAccountSection({
       setLoading(true)
       setError(null)
       try {
-        const next = await listRepositoryGhBindableAccounts(runtimeTarget, repo, {
-          refreshCapability
-        })
+        const next = await listRepositoryGhBindableAccounts(
+          runtimeTarget,
+          { id: repo.id, path: repo.path },
+          { refreshCapability }
+        )
         if (generation !== loadGenerationRef.current) {
           return
         }
@@ -78,12 +80,19 @@ export function RepositoryGitHubAccountSection({
         }
       }
     },
-    [repo, runtimeTarget]
+    [repo.id, repo.path, runtimeTarget]
   )
 
   useEffect(() => {
     void loadInventory()
-  }, [loadInventory])
+  }, [
+    loadInventory,
+    repo.executionHostId,
+    repo.connectionId,
+    repo.gitRemoteIdentity?.canonicalKey,
+    repo.ghAccount?.host,
+    repo.ghAccount?.user
+  ])
 
   const capabilityUnsupported = inventory?.capability === 'unsupported'
   const capabilityUnknown = inventory?.capability === 'unknown'
diff --git a/src/renderer/src/components/settings/accounts-pane-account-actions.ts b/src/renderer/src/components/settings/accounts-pane-account-actions.ts
index 98ba3cac3f99..1f0099876d27 100644
--- a/src/renderer/src/components/settings/accounts-pane-account-actions.ts
+++ b/src/renderer/src/components/settings/accounts-pane-account-actions.ts
@@ -176,24 +176,25 @@ export function createClaudeAccountActionRunner(
       await syncClaudeAccounts(next)
       recordFeatureInteraction('claude-account-switching')
       const nextActiveAccountId = getProviderAccountActiveIdForView(next, actionRuntime)
-      const shouldPromptRestart =
-        action === 'adding' ||
-        previousActiveAccountId !== nextActiveAccountId ||
-        (action.startsWith('reauth:') &&
-          nextActiveAccountId !== null &&
-          action === `reauth:${nextActiveAccountId}`)
-      if (shouldPromptRestart) {
+      // Why: switching reaches the next `claude` started in any terminal, so nothing restarts.
+      if (action === 'adding' || previousActiveAccountId !== nextActiveAccountId) {
         toast.info(
           translate('auto.components.settings.AccountsPane.f921d32606', 'Claude account updated.'),
           {
-            description: translate(
-              'auto.components.settings.AccountsPane.b15ce90870',
-              '{{value0}} -> {{value1}}. Restart live Claude terminals before continuing old sessions.',
-              {
-                value0: getClaudeAccountLabel(claudeAccounts, previousActiveAccountId),
-                value1: getClaudeAccountLabel(next, nextActiveAccountId)
-              }
-            )
+            description:
+              previousActiveAccountId === nextActiveAccountId
+                ? translate(
+                    'accounts.claude.added',
+                    'Account added. Select it to use it for the next Claude you start.'
+                  )
+                : translate(
+                    'accounts.claude.nextLaunch',
+                    '{{value0}} → {{value1}}. The next Claude you start uses it. Running sessions keep their account.',
+                    {
+                      value0: getClaudeAccountLabel(claudeAccounts, previousActiveAccountId),
+                      value1: getClaudeAccountLabel(next, nextActiveAccountId)
+                    }
+                  )
           }
         )
       }
diff --git a/src/renderer/src/components/settings/accounts-pane-claude-section.test.tsx b/src/renderer/src/components/settings/accounts-pane-claude-section.test.tsx
new file mode 100644
index 000000000000..dfa13023815f
--- /dev/null
+++ b/src/renderer/src/components/settings/accounts-pane-claude-section.test.tsx
@@ -0,0 +1,156 @@
+import React from 'react'
+import { renderToStaticMarkup } from 'react-dom/server'
+import { beforeEach, describe, expect, it, vi } from 'vitest'
+import { getDefaultSettings } from '../../../../shared/constants'
+import type { GlobalSettings } from '../../../../shared/global-settings-types'
+import type {
+  ClaudeManagedAccountSummary,
+  ClaudeRateLimitAccountsState
+} from '../../../../shared/managed-account-types'
+import { i18n } from '../../i18n/i18n'
+import { useAppStore } from '../../store'
+import { renderClaudeAccountsSection } from './accounts-pane-claude-section'
+import type { AccountsPaneSectionModel } from './accounts-pane-types'
+
+function account(
+  id: string,
+  email: string,
+  overrides: Partial<ClaudeManagedAccountSummary> = {}
+): ClaudeManagedAccountSummary {
+  return {
+    id,
+    email,
+    managedAuthRuntime: 'host',
+    wslDistro: null,
+    authMethod: 'subscription-oauth',
+    organizationUuid: null,
+    organizationName: null,
+    createdAt: 1,
+    updatedAt: 1,
+    lastAuthenticatedAt: 1,
+    ...overrides
+  }
+}
+
+function render(
+  state: Partial<ClaudeRateLimitAccountsState> = {},
+  settings: Partial<GlobalSettings> = {}
+): string {
+  const claudeAccounts: ClaudeRateLimitAccountsState = {
+    accounts: [],
+    activeAccountId: null,
+    ...state
+  }
+  const accountRuntime = { runtime: 'host' as const, wslDistro: null, label: 'This device' }
+  const model: AccountsPaneSectionModel = {
+    // Unused by the Claude section; present only so the model is the real type.
+    updateSettings: vi.fn(),
+    searchQuery: '',
+    recordFeatureInteraction: vi.fn(),
+    wslSupportedPlatform: false,
+    wslAvailable: false,
+    wslDistros: [],
+    localAccountRuntime: accountRuntime,
+    localAccountRuntimeSentenceLabel: 'this device',
+    remoteServerName: null,
+    codexAccounts: { accounts: [], activeAccountId: null },
+    codexAction: 'idle',
+    visibleCodexAccounts: [],
+    systemCodexActive: true,
+    systemCodexNeedsSignIn: false,
+    systemCodexMissingSignIn: false,
+    systemCodexIdentity: undefined,
+    activeCodexAuthWarning: null,
+    activeCodexAccountId: null,
+    codexConfigSync: null,
+    codexConfigSyncWarning: null,
+    codexRateLimits: null,
+    codexRateLimitTarget: { runtime: 'host', wslDistro: null },
+    setRemoveCodexTarget: vi.fn(),
+    runCodexAccountAction: vi.fn(async () => {}),
+    recordOpenCodeSettingEdit: vi.fn(),
+    miniMaxRateLimits: null,
+    miniMaxApiKeyDraft: '',
+    setMiniMaxApiKeyDraft: vi.fn(),
+    miniMaxApiKeyConfigured: false,
+    miniMaxApiKeyProtection: null,
+    saveMiniMaxApiKey: vi.fn(async () => {}),
+    clearMiniMaxApiKey: vi.fn(async () => {}),
+    miniMaxCookieDraft: '',
+    setMiniMaxCookieDraft: vi.fn(),
+    miniMaxConfigured: false,
+    miniMaxCookieProtection: null,
+    miniMaxCredentialBusy: false,
+    saveMiniMaxCookie: vi.fn(async () => {}),
+    clearMiniMaxCookie: vi.fn(async () => {}),
+    accountRuntime,
+    accountRuntimeSentenceLabel: 'this device',
+    accountRuntimeUnavailable: false,
+    accountVisibilityOptions: { remoteOwner: false, ownerPlatform: 'darwin' },
+    claudeAccounts,
+    claudeAction: 'idle',
+    isRemoteAccountScope: false,
+    remoteAccountScopeNotice: null,
+    runClaudeAccountAction: vi.fn(async () => {}),
+    setRemoveClaudeTarget: vi.fn(),
+    settings: { ...getDefaultSettings('/tmp'), ...settings },
+    systemClaudeActive: claudeAccounts.activeAccountId === null,
+    visibleClaudeAccounts: claudeAccounts.accounts,
+    wslCapabilitiesLoading: false
+  }
+  return renderToStaticMarkup(React.createElement(() => renderClaudeAccountsSection(model)))
+}
+
+function selectButtons(markup: string): string[] {
+  return [
+    ...markup.matchAll(/<button type="button"[^>]*class="flex min-w-0 flex-1[^"]*"[^>]*>/g)
+  ].map(([button]) => button)
+}
+
+describe('Claude accounts section', () => {
+  beforeEach(async () => {
+    await i18n.changeLanguage('en')
+    useAppStore.setState({ settingsSearchQuery: '', runtimeEnvironments: [] })
+  })
+
+  it('asks a folder with no login to sign in again, and keeps it unselectable but removable', () => {
+    const markup = render({
+      accounts: [
+        account('legacy', 'old@example.test', { needsSignIn: true }),
+        account('ready', 'ok@example.test')
+      ]
+    })
+    expect(markup).toContain('Sign in again to use this account')
+    expect(selectButtons(markup).map((button) => button.includes('disabled=""'))).toEqual([
+      true,
+      false
+    ])
+    expect(markup.match(/>Remove<\/button>/g)).toHaveLength(2)
+  })
+
+  it("names System default's login and warns only when an older Orca may have copied it there", () => {
+    const saved = {
+      accounts: [account('a', 'A@example.test')],
+      systemDefaultEmail: 'a@example.test'
+    }
+    const copied = render({ ...saved, systemDefaultMayBeCopied: true })
+    expect(copied).toContain('System default: a@example.test')
+    expect(copied).toContain('An earlier Orca version may have copied that login there.')
+    expect(copied).toContain('>Dismiss</button>')
+    // Saving your own login as an account too is normal: no copy evidence, no warning.
+    expect(render(saved)).not.toContain('An earlier Orca version')
+    expect(
+      render(
+        { ...saved, systemDefaultMayBeCopied: true },
+        { claudeCopiedSystemDefaultNoticeDismissed: true }
+      )
+    ).not.toContain('An earlier Orca version')
+    const own = render({
+      ...saved,
+      systemDefaultEmail: 'me@example.test',
+      systemDefaultMayBeCopied: true
+    })
+    expect(own).toContain('System default: me@example.test')
+    expect(own).not.toContain('An earlier Orca version')
+  })
+})
diff --git a/src/renderer/src/components/settings/accounts-pane-claude-section.tsx b/src/renderer/src/components/settings/accounts-pane-claude-section.tsx
index e99758f0db54..29b03daa2921 100644
--- a/src/renderer/src/components/settings/accounts-pane-claude-section.tsx
+++ b/src/renderer/src/components/settings/accounts-pane-claude-section.tsx
@@ -27,9 +27,21 @@ export function renderClaudeAccountsSection(model: AccountsPaneSectionModel): Re
     setRemoveClaudeTarget,
     settings,
     systemClaudeActive,
+    updateSettings,
     visibleClaudeAccounts,
     wslCapabilitiesLoading
   } = model
+  // Why host only: the host reads its own System default, never a WSL distro's.
+  const systemDefaultEmail =
+    accountRuntime.runtime === 'host' ? claudeAccounts.systemDefaultEmail : undefined
+  // Why the copy evidence: saving your own login as an account too is normal and needs no warning.
+  const systemDefaultIsSaved =
+    !!systemDefaultEmail &&
+    claudeAccounts.systemDefaultMayBeCopied === true &&
+    !settings.claudeCopiedSystemDefaultNoticeDismissed &&
+    claudeAccounts.accounts.some(
+      (account) => account.email.toLowerCase() === systemDefaultEmail.toLowerCase()
+    )
   return (
     <section key="claude-accounts" id="accounts-claude" className="space-y-4 scroll-mt-6">
       <div className="space-y-1">
@@ -48,8 +60,8 @@ export function renderClaudeAccountsSection(model: AccountsPaneSectionModel): Re
       <SearchableSetting
         title={translate('auto.components.settings.AccountsPane.8bbfd74556', 'Claude Accounts')}
         description={translate(
-          'auto.components.settings.AccountsPane.79e484c3b2',
-          'Optional account switcher for the shared Claude auth files.'
+          'accounts.claude.profileSwitching',
+          'Switching applies to the next Claude you start in any tab. Running sessions keep their account.'
         )}
         keywords={['claude', 'account', 'rate limit', 'status bar', 'quota']}
         className="space-y-3 py-2"
@@ -139,7 +151,18 @@ export function renderClaudeAccountsSection(model: AccountsPaneSectionModel): Re
             <div className="flex min-w-0 flex-1 flex-col gap-0.5">
               <div className="flex min-w-0 items-center gap-2">
                 <span className="truncate text-sm font-medium">
-                  {translate('auto.components.settings.AccountsPane.f2a265f8c7', 'System default')}
+                  {systemDefaultEmail
+                    ? translate(
+                        'accounts.claude.systemDefaultNamed',
+                        'System default: {{value0}}',
+                        {
+                          value0: systemDefaultEmail
+                        }
+                      )
+                    : translate(
+                        'auto.components.settings.AccountsPane.f2a265f8c7',
+                        'System default'
+                      )}
                 </span>
                 {systemClaudeActive ? (
                   <Badge
@@ -159,6 +182,24 @@ export function renderClaudeAccountsSection(model: AccountsPaneSectionModel): Re
               </span>
             </div>
           </button>
+          {systemDefaultIsSaved ? (
+            <div className="flex items-start justify-between gap-2">
+              <p className="text-xs text-muted-foreground">
+                {translate(
+                  'accounts.claude.systemDefaultIsSaved',
+                  'System default is signed in as {{value0}}, which is also a saved account. An earlier Orca version may have copied that login there. If it is not your own login, select System default and run claude /login.',
+                  { value0: systemDefaultEmail }
+                )}
+              </p>
+              <Button
+                variant="ghost"
+                size="xs"
+                onClick={() => updateSettings({ claudeCopiedSystemDefaultNoticeDismissed: true })}
+              >
+                {translate('accounts.claude.systemDefaultIsSavedDismiss', 'Dismiss')}
+              </Button>
+            </div>
+          ) : null}
           {visibleClaudeAccounts.length === 0 ? (
             <div className="rounded-md border border-dashed border-border/70 px-3 py-4 text-xs text-muted-foreground">
               {isRemoteAccountScope
@@ -208,7 +249,7 @@ export function renderClaudeAccountsSection(model: AccountsPaneSectionModel): Re
                           accountRuntimeView
                         )
                       }}
-                      disabled={isBusy}
+                      disabled={isBusy || account.needsSignIn}
                       className="flex min-w-0 flex-1 flex-col gap-0.5 text-left disabled:cursor-default"
                     >
                       <div className="flex min-w-0 items-center gap-2">
@@ -232,9 +273,14 @@ export function renderClaudeAccountsSection(model: AccountsPaneSectionModel): Re
                         ) : null}
                       </div>
                       <span className="truncate text-[11px] text-muted-foreground">
-                        {account.organizationName
-                          ? `${account.organizationName} · ${formatAccountTimestamp(account.lastAuthenticatedAt)}`
-                          : formatAccountTimestamp(account.lastAuthenticatedAt)}
+                        {account.needsSignIn
+                          ? translate(
+                              'accounts.claude.signInRequired',
+                              'Sign in again to use this account'
+                            )
+                          : account.organizationName
+                            ? `${account.organizationName} · ${formatAccountTimestamp(account.lastAuthenticatedAt)}`
+                            : formatAccountTimestamp(account.lastAuthenticatedAt)}
                       </span>
                     </button>
                     <div className="flex shrink-0 items-center justify-end gap-1 max-md:w-full max-md:flex-wrap">
@@ -260,10 +306,7 @@ export function renderClaudeAccountsSection(model: AccountsPaneSectionModel): Re
                         ) : (
                           <RefreshCw className="size-3" />
                         )}
-                        {translate(
-                          'auto.components.settings.AccountsPane.8a0f870153',
-                          'Re-authenticate'
-                        )}
+                        {translate('accounts.claude.signInAgain', 'Sign in again')}
                       </Button>
                       <Button
                         variant="ghost"
diff --git a/src/renderer/src/components/settings/accounts-pane-removal-dialogs.tsx b/src/renderer/src/components/settings/accounts-pane-removal-dialogs.tsx
index 569a8df6414f..1de050b79d1b 100644
--- a/src/renderer/src/components/settings/accounts-pane-removal-dialogs.tsx
+++ b/src/renderer/src/components/settings/accounts-pane-removal-dialogs.tsx
@@ -85,8 +85,8 @@ export function renderAccountsRemovalDialogs(
             </DialogTitle>
             <DialogDescription>
               {translate(
-                'auto.components.settings.AccountsPane.854ebbcc45',
-                'Orca will delete the managed Claude auth for this saved account. If it is currently active, Orca falls back to the system default Claude login.'
+                'settings.accounts.claudeRemoveFolder',
+                "Orca deletes this account's Claude folder and its sign-in from this computer. Chat history shared with System default stays. If it is selected, the next Claude you start uses System default."
               )}
             </DialogDescription>
           </DialogHeader>
diff --git a/src/renderer/src/components/settings/chat-inline-visuals-search.ts b/src/renderer/src/components/settings/chat-inline-visuals-search.ts
new file mode 100644
index 000000000000..cf9ac9b47437
--- /dev/null
+++ b/src/renderer/src/components/settings/chat-inline-visuals-search.ts
@@ -0,0 +1,12 @@
+import { translate } from '@/i18n/i18n'
+import { createLocalizedCatalog } from '@/i18n/localized-catalog'
+import type { SettingsSearchEntry } from './settings-search'
+
+export const getChatInlineVisualsSearchEntry = createLocalizedCatalog((): SettingsSearchEntry => ({
+  targetSectionId: 'chat-inline-visuals',
+  title: translate('components.settings.nativeChat.inlineVisualsTitle', 'Inline visuals'),
+  description: translate(
+    'components.settings.nativeChat.inlineVisualsCopy',
+    'Let the agent show charts, diagrams and mockups inside its replies. Applies to newly started chats.'
+  )
+}))
diff --git a/src/renderer/src/components/settings/native-chat-experimental-search-entry.test.ts b/src/renderer/src/components/settings/native-chat-experimental-search-entry.test.ts
index 1bedfdb164bb..7a1c28dfbda1 100644
--- a/src/renderer/src/components/settings/native-chat-experimental-search-entry.test.ts
+++ b/src/renderer/src/components/settings/native-chat-experimental-search-entry.test.ts
@@ -10,4 +10,11 @@ describe('native chat experimental search entry', () => {
   it('matches "queue" so the Queue follow-ups switch is findable', () => {
     expect(matchesSettingsSearch('queue', getNativeChatExperimentalSearchEntry())).toBe(true)
   })
+
+  it.each(['inline visuals', 'visuals'])(
+    'leaves the moved switch out of Experimental for %s',
+    (query) => {
+      expect(matchesSettingsSearch(query, getNativeChatExperimentalSearchEntry())).toBe(false)
+    }
+  )
 })
diff --git a/src/renderer/src/components/settings/repository-github-account.ts b/src/renderer/src/components/settings/repository-github-account.ts
index 480713aea1c6..ba1b923f49e6 100644
--- a/src/renderer/src/components/settings/repository-github-account.ts
+++ b/src/renderer/src/components/settings/repository-github-account.ts
@@ -32,7 +32,7 @@ function withTimeout<T>(promise: Promise<T>, timeoutMs: number, label: string):
 /** Routes through RPC for remote environments and IPC locally; both read the repo's execution host. */
 export function listRepositoryGhBindableAccounts(
   runtimeTarget: RuntimeTarget,
-  repo: Repo,
+  repo: Pick<Repo, 'id' | 'path'>,
   options: { refreshCapability?: boolean } = {}
 ): Promise<GhAccountBindingInventory> {
   if (runtimeTarget.kind === 'environment') {
diff --git a/src/renderer/src/components/sidebar/CommentMarkdown.github-callout.test.tsx b/src/renderer/src/components/sidebar/CommentMarkdown.github-callout.test.tsx
new file mode 100644
index 000000000000..e844ceb3d0f7
--- /dev/null
+++ b/src/renderer/src/components/sidebar/CommentMarkdown.github-callout.test.tsx
@@ -0,0 +1,81 @@
+import { renderToStaticMarkup } from 'react-dom/server'
+import { describe, expect, it } from 'vitest'
+import CommentMarkdown from './CommentMarkdown'
+import { MarkdownPreviewBody } from '@/components/editor/MarkdownPreviewBody'
+import { NativeChatCodeBlock } from '@/components/native-chat/NativeChatCodeBlock'
+import { NativeChatMarkdown } from '@/components/native-chat/NativeChatMarkdown'
+
+function renderComment(content: string, variant: 'compact' | 'document' = 'document'): string {
+  return renderToStaticMarkup(<CommentMarkdown variant={variant} content={content} />)
+}
+
+describe('GitHub callouts', () => {
+  it.each(['compact', 'document'] as const)(
+    'renders a %s quote that opens with a marker as a titled callout',
+    (variant) => {
+      const markup = renderComment('> [!NOTE]\n> The content of the note.', variant)
+
+      expect(markup).toContain('data-callout="note"')
+      expect(markup).toContain('Note')
+      expect(markup).not.toContain('[!NOTE]')
+      expect(markup).not.toContain('<blockquote')
+      expect(markup).toContain('The content of the note.')
+    }
+  )
+
+  it('keeps blocks that follow a marker-only paragraph', () => {
+    const markup = renderComment('> [!WARNING]\n>\n> ### A heading\n>\n> And a paragraph.')
+
+    expect(markup).toContain('data-callout="warning"')
+    expect(markup).not.toContain('[!WARNING]')
+    expect(markup).toContain('A heading')
+    expect(markup).toContain('And a paragraph.')
+  })
+
+  it('keeps a body line that opens with inline formatting', () => {
+    const markup = renderComment('> [!tip]\n> **Medium Risk** Changes transcript routing.')
+
+    expect(markup).toContain('data-callout="tip"')
+    expect(markup).toContain('<strong>Medium Risk</strong>')
+    expect(markup).toContain('Changes transcript routing.')
+  })
+
+  it.each([
+    ['text sharing the marker line', '> [!NOTE] an ordinary quote', '[!NOTE] an ordinary quote'],
+    ['inline formatting sharing the marker line', '> [!NOTE]*aside*', '[!NOTE]'],
+    ['an unknown marker', "> [!DANGER]\n> Not one of GitHub's.", '[!DANGER]']
+  ])('leaves a quote with %s alone', (_name, content, literal) => {
+    const markup = renderComment(content)
+
+    expect(markup).not.toContain('data-callout')
+    expect(markup).toContain('<blockquote')
+    expect(markup).toContain(literal)
+  })
+
+  it('renders callouts in native chat assistant messages', () => {
+    const markup = renderToStaticMarkup(
+      <NativeChatMarkdown
+        content={'Done.\n\n> [!IMPORTANT]\n> Restart the app to pick up `config.ts`.'}
+        variant="document"
+        renderCodeBlock={NativeChatCodeBlock}
+        onLinkClick={() => {}}
+        linkifyFilePaths
+      />
+    )
+
+    expect(markup).toContain('data-callout="important"')
+    expect(markup).toContain('Important')
+    expect(markup).not.toContain('[!IMPORTANT]')
+    expect(markup).toContain('Restart the app to pick up')
+  })
+
+  it('renders callouts in the markdown preview', () => {
+    const markup = renderToStaticMarkup(
+      <MarkdownPreviewBody content={'> [!CAUTION]\n> Irreversible.'} components={{}} />
+    )
+
+    expect(markup).toContain('data-callout="caution"')
+    expect(markup).not.toContain('[!CAUTION]')
+    expect(markup).toContain('Irreversible.')
+  })
+})
diff --git a/src/renderer/src/components/sidebar/CommentMarkdown.tsx b/src/renderer/src/components/sidebar/CommentMarkdown.tsx
index 8b862c90c78e..190d93a768d0 100644
--- a/src/renderer/src/components/sidebar/CommentMarkdown.tsx
+++ b/src/renderer/src/components/sidebar/CommentMarkdown.tsx
@@ -1,9 +1,9 @@
 import React from 'react'
-import Markdown, { defaultUrlTransform } from 'react-markdown'
+import Markdown, { defaultUrlTransform, type Components } from 'react-markdown'
 import remarkGfm from 'remark-gfm'
 import remarkBreaks from 'remark-breaks'
 import rehypeRaw from 'rehype-raw'
-import rehypeSanitize, { defaultSchema } from 'rehype-sanitize'
+import rehypeSanitize, { defaultSchema, type Options as SanitizeSchema } from 'rehype-sanitize'
 import { cn } from '@/lib/utils'
 import {
   compactCommentMarkdownComponents,
@@ -15,10 +15,15 @@ import {
   type DocumentCodeBlockRenderer
 } from './comment-markdown-element-renderers'
 import { remarkNativeChatFileLinks } from './comment-markdown-native-chat-file-links'
+import {
+  GITHUB_CALLOUT_SANITIZE_ATTRIBUTE,
+  remarkGitHubCallouts
+} from '@/lib/remark-github-callouts'
 
 export type { CommentMarkdownLinkClickHandler } from './comment-markdown-element-renderers'
 
 type MarkdownPlugins = NonNullable<React.ComponentProps<typeof Markdown>['rehypePlugins']>
+type RemarkPlugins = NonNullable<React.ComponentProps<typeof Markdown>['remarkPlugins']>
 type UrlTransform = NonNullable<React.ComponentProps<typeof Markdown>['urlTransform']>
 
 type GitHubRepoReference = {
@@ -62,7 +67,7 @@ const commentMarkdownFileUriUrlTransform: UrlTransform = (value, key, node) => {
 // plain-text renderer used whitespace-pre-wrap which preserved them. Adding
 // remark-breaks converts single newlines to <br>, keeping backward compat
 // with existing plain-text comments that rely on newline formatting.
-const remarkPlugins = [remarkGfm, remarkBreaks]
+const remarkPlugins = [remarkGfm, remarkGitHubCallouts, remarkBreaks]
 
 const GITHUB_REFERENCE_PATTERN = /(?:\b([A-Za-z0-9_.-]+)\/([A-Za-z0-9_.-]+))?#([1-9][0-9]*)\b/g
 
@@ -162,6 +167,10 @@ const commentMarkdownSanitizeSchema = {
   attributes: {
     ...defaultSchema.attributes,
     a: [...(defaultSchema.attributes?.a ?? []), 'href', 'title'],
+    blockquote: [
+      ...(defaultSchema.attributes?.blockquote ?? []),
+      GITHUB_CALLOUT_SANITIZE_ATTRIBUTE
+    ],
     details: [...(defaultSchema.attributes?.details ?? []), 'open'],
     img: [...(defaultSchema.attributes?.img ?? []), 'src', 'alt', 'title', 'width', 'height'],
     input: [...(defaultSchema.attributes?.input ?? []), 'type', 'checked', 'disabled'],
@@ -181,6 +190,27 @@ const commentMarkdownSanitizeSchema = {
 // `<br />`). Parse it, then sanitize immediately before React renders it.
 const rehypePlugins: MarkdownPlugins = [rehypeRaw, [rehypeSanitize, commentMarkdownSanitizeSchema]]
 
+/**
+ * A surface-specific markdown addition: its own remark plugins, the element attributes those
+ * plugins need to survive sanitize, and the components that render them. Keep the object stable
+ * per surface; a new one rebuilds the components and remounts what they rendered.
+ */
+export type CommentMarkdownExtension = {
+  remarkPlugins: RemarkPlugins
+  sanitizeAttributes: Record<string, readonly string[]>
+  components: Components
+}
+
+function extensionRehypePlugins(extension: CommentMarkdownExtension): MarkdownPlugins {
+  const attributes: NonNullable<SanitizeSchema['attributes']> = {
+    ...commentMarkdownSanitizeSchema.attributes
+  }
+  for (const [tagName, names] of Object.entries(extension.sanitizeAttributes)) {
+    attributes[tagName] = [...(attributes[tagName] ?? []), ...names]
+  }
+  return [rehypeRaw, [rehypeSanitize, { ...commentMarkdownSanitizeSchema, attributes }]]
+}
+
 type CommentMarkdownProps = React.ComponentPropsWithoutRef<'div'> & {
   content: string
   variant?: 'compact' | 'document'
@@ -190,6 +220,7 @@ type CommentMarkdownProps = React.ComponentPropsWithoutRef<'div'> & {
   linkifyFilePaths?: boolean
   expandImages?: boolean
   renderCodeBlock?: DocumentCodeBlockRenderer
+  extension?: CommentMarkdownExtension
 }
 
 // Why forwardRef + rest props: Radix's HoverCardTrigger asChild merges a ref
@@ -207,11 +238,12 @@ const CommentMarkdown = React.memo(
       linkifyFilePaths = false,
       expandImages = false,
       renderCodeBlock,
+      extension,
       ...rest
     },
     ref
   ) {
-    const components = React.useMemo(() => {
+    const baseComponents = React.useMemo(() => {
       if (!onLinkClick) {
         return variant === 'document'
           ? renderCodeBlock
@@ -225,12 +257,21 @@ const CommentMarkdown = React.memo(
         ? createDocumentCommentMarkdownComponents(onLinkClick, renderCodeBlock)
         : createCompactCommentMarkdownComponents(onLinkClick, expandImages)
     }, [expandImages, renderCodeBlock, variant, onLinkClick])
+    const components = React.useMemo(
+      () => (extension ? { ...baseComponents, ...extension.components } : baseComponents),
+      [baseComponents, extension]
+    )
+    const activeRehypePlugins = React.useMemo(
+      () => (extension ? extensionRehypePlugins(extension) : rehypePlugins),
+      [extension]
+    )
     const activeRemarkPlugins = React.useMemo(() => {
       const plugins = linkifyFilePaths
         ? [...remarkPlugins, remarkNativeChatFileLinks]
         : remarkPlugins
-      return githubRepo ? [...plugins, remarkGitHubReferences(githubRepo)] : plugins
-    }, [githubRepo, linkifyFilePaths])
+      const withExtension = extension ? [...plugins, ...extension.remarkPlugins] : plugins
+      return githubRepo ? [...withExtension, remarkGitHubReferences(githubRepo)] : withExtension
+    }, [extension, githubRepo, linkifyFilePaths])
 
     return (
       <div
@@ -247,7 +288,7 @@ const CommentMarkdown = React.memo(
       >
         <Markdown
           remarkPlugins={activeRemarkPlugins}
-          rehypePlugins={rehypePlugins}
+          rehypePlugins={activeRehypePlugins}
           components={components}
           urlTransform={
             allowFileUriLinks ? commentMarkdownFileUriUrlTransform : commentMarkdownUrlTransform
diff --git a/src/renderer/src/components/sidebar/DeleteWorktreeDialog.tsx b/src/renderer/src/components/sidebar/DeleteWorktreeDialog.tsx
index f8f7731e3cb8..35e3ccc0085a 100644
--- a/src/renderer/src/components/sidebar/DeleteWorktreeDialog.tsx
+++ b/src/renderer/src/components/sidebar/DeleteWorktreeDialog.tsx
@@ -154,6 +154,7 @@ const DeleteWorktreeDialog = React.memo(function DeleteWorktreeDialog() {
   const allowSkipConfirm =
     !isBatchDelete && modalData.allowSkipConfirm !== false && childWorkspaceCount === 0
   const [dontAskAgain, setDontAskAgain] = useState(false)
+  const [isSavingForcePreference, setIsSavingForcePreference] = useState(false)
   const deleteTargets = useMemo(
     () => (canDeleteAllLineage ? lineageDelete.deleteAllTargets : worktrees),
     [canDeleteAllLineage, lineageDelete.deleteAllTargets, worktrees]
@@ -218,7 +219,7 @@ const DeleteWorktreeDialog = React.memo(function DeleteWorktreeDialog() {
 
   const handleOpenChange = useCallback(
     (open: boolean) => {
-      if (open) {
+      if (open || isSavingForcePreference) {
         return
       }
       const state = useAppStore.getState().deleteStateByWorktreeId
@@ -237,7 +238,14 @@ const DeleteWorktreeDialog = React.memo(function DeleteWorktreeDialog() {
       }
       closeModal()
     },
-    [clearWorktreeDeleteState, closeModal, deleteStateTargets, isBatchDelete, worktreeId]
+    [
+      clearWorktreeDeleteState,
+      closeModal,
+      deleteStateTargets,
+      isBatchDelete,
+      isSavingForcePreference,
+      worktreeId
+    ]
   )
 
   const persistDontAskAgainPreference = useCallback((): void => {
@@ -249,9 +257,7 @@ const DeleteWorktreeDialog = React.memo(function DeleteWorktreeDialog() {
   }, [openSettingsPage, openSettingsTarget, updateSettings])
 
   const handleForceDeletedFromToast = useCallback(
-    (deletedTarget: WorktreeRemovalTarget): void => {
-      onDeleted?.([deletedTarget])
-    },
+    (deletedTarget: WorktreeRemovalTarget): void => onDeleted?.([deletedTarget]),
     [onDeleted]
   )
 
@@ -313,7 +319,7 @@ const DeleteWorktreeDialog = React.memo(function DeleteWorktreeDialog() {
     ]
   )
 
-  const handleDeleteAll = useCallback(() => {
+  const handleDeleteAll = (): void => {
     runLineageDeleteAll({
       deleteAllTargetCount: lineageDelete.deleteAllTargets.length,
       lineageDeleteIdentities,
@@ -323,15 +329,7 @@ const DeleteWorktreeDialog = React.memo(function DeleteWorktreeDialog() {
       closeModal,
       onDeleted
     })
-  }, [
-    closeModal,
-    handleForceDeletedFromToast,
-    forceOnConfirm,
-    lineageDelete.deleteAllTargets.length,
-    lineageDeleteIdentities,
-    onDeleted,
-    resolveConfirmedTargets
-  ])
+  }
 
   return (
     <Dialog open={isOpen} onOpenChange={handleOpenChange}>
@@ -414,7 +412,7 @@ const DeleteWorktreeDialog = React.memo(function DeleteWorktreeDialog() {
         <DialogFooter>
           <DeleteWorktreeDialogFooter
             isMainWorktree={isMainWorktree}
-            isDeleting={isDeleting}
+            isDeleting={isDeleting || isSavingForcePreference}
             canForceDelete={canForceDelete}
             isBatchDelete={isBatchDelete}
             worktreeCount={worktrees.length}
@@ -422,6 +420,7 @@ const DeleteWorktreeDialog = React.memo(function DeleteWorktreeDialog() {
             lineageDeleteTargetCount={lineageDelete.deleteAllTargets.length}
             onCancel={() => handleOpenChange(false)}
             onForceDelete={() => handleDelete(true)}
+            onSavingChange={setIsSavingForcePreference}
             onDelete={canDeleteAllLineage ? handleDeleteAll : () => handleDelete(false)}
             confirmButtonRef={confirmButtonRef}
           />
diff --git a/src/renderer/src/components/sidebar/DeleteWorktreeDialogFooter.test.tsx b/src/renderer/src/components/sidebar/DeleteWorktreeDialogFooter.test.tsx
new file mode 100644
index 000000000000..f805bca5c478
--- /dev/null
+++ b/src/renderer/src/components/sidebar/DeleteWorktreeDialogFooter.test.tsx
@@ -0,0 +1,111 @@
+// @vitest-environment happy-dom
+
+import { act, createRef } from 'react'
+import { createRoot, type Root } from 'react-dom/client'
+import { afterEach, expect, it, vi } from 'vitest'
+import { toast } from 'sonner'
+import { TooltipProvider } from '../ui/tooltip'
+import { DeleteWorktreeDialogFooter } from './DeleteWorktreeDialogFooter'
+
+const savePreference = vi.hoisted(() => vi.fn())
+vi.mock('@/store', () => ({
+  useAppStore: { getState: () => ({ updateSettingsOrThrow: savePreference }) }
+}))
+vi.mock('sonner', () => ({ toast: { error: vi.fn(), dismiss: vi.fn() } }))
+let root: Root | undefined
+
+function renderFooter(disabled = false) {
+  const container = document.createElement('div')
+  document.body.appendChild(container)
+  root = createRoot(container)
+  const onForceDelete = vi.fn()
+  const onSavingChange = vi.fn()
+  const confirmButtonRef = createRef<HTMLButtonElement>()
+  act(() =>
+    root?.render(
+      <TooltipProvider delayDuration={0}>
+        <DeleteWorktreeDialogFooter
+          isMainWorktree={false}
+          isDeleting={disabled}
+          canForceDelete
+          isBatchDelete={false}
+          worktreeCount={1}
+          canDeleteAllLineage={false}
+          lineageDeleteTargetCount={1}
+          onCancel={vi.fn()}
+          onDelete={vi.fn()}
+          onForceDelete={onForceDelete}
+          onSavingChange={onSavingChange}
+          confirmButtonRef={confirmButtonRef}
+        />
+      </TooltipProvider>
+    )
+  )
+  return { container, onForceDelete, onSavingChange, confirmButtonRef }
+}
+
+async function selectPreference(container: HTMLElement) {
+  await act(async () => {
+    container
+      .querySelector('button[aria-label="More force delete options"]')
+      ?.dispatchEvent(new KeyboardEvent('keydown', { key: 'ArrowDown', bubbles: true }))
+  })
+  const item = document.querySelector('[role="menuitem"]')
+  if (!(item instanceof HTMLElement)) {
+    throw new Error('Missing preference option')
+  }
+  await act(async () => item.click())
+}
+
+afterEach(() => {
+  act(() => root?.unmount())
+  root = undefined
+  document.body.innerHTML = ''
+  vi.clearAllMocks()
+})
+
+it('keeps the primary button focused, full size, and a one-time delete', async () => {
+  const { confirmButtonRef, onForceDelete } = renderFooter()
+  expect(confirmButtonRef.current?.dataset.size).toBe('default')
+  expect(confirmButtonRef.current?.textContent).toBe('Force Delete')
+  await act(async () => confirmButtonRef.current?.click())
+  expect(onForceDelete).toHaveBeenCalledOnce()
+  expect(savePreference).not.toHaveBeenCalled()
+  expect(toast.dismiss).not.toHaveBeenCalled()
+})
+
+it('saves the shared preference before retrying and exposes the pending state', async () => {
+  let finish: (() => void) | undefined
+  savePreference.mockImplementation(
+    () =>
+      new Promise<void>((resolve) => {
+        finish = resolve
+      })
+  )
+  const { container, onForceDelete, onSavingChange } = renderFooter()
+  await selectPreference(container)
+  expect(savePreference).toHaveBeenCalledWith({ alwaysForceDeleteWorktrees: true })
+  expect(onForceDelete).not.toHaveBeenCalled()
+  expect(onSavingChange).toHaveBeenLastCalledWith(true)
+  expect(container.querySelectorAll('button:disabled')).toHaveLength(2)
+  await act(async () => finish?.())
+  expect(onSavingChange).toHaveBeenLastCalledWith(false)
+  expect(onForceDelete).toHaveBeenCalledOnce()
+})
+
+it('leaves the recovery action available when saving fails', async () => {
+  savePreference.mockRejectedValue(new Error('Disk full'))
+  const { container, onForceDelete, onSavingChange } = renderFooter()
+  await selectPreference(container)
+  expect(onForceDelete).not.toHaveBeenCalled()
+  expect(onSavingChange).toHaveBeenLastCalledWith(false)
+  expect(container.querySelectorAll('button:disabled')).toHaveLength(0)
+  expect(toast.error).toHaveBeenCalledWith('Could not save deletion preference', {
+    description: 'Disk full'
+  })
+})
+
+it('disables both retry choices while deletion is in progress', () => {
+  const { container } = renderFooter(true)
+  expect(container.querySelectorAll('button:disabled')).toHaveLength(3)
+})
diff --git a/src/renderer/src/components/sidebar/DeleteWorktreeDialogFooter.tsx b/src/renderer/src/components/sidebar/DeleteWorktreeDialogFooter.tsx
index e77787f23ee5..dce8257956d1 100644
--- a/src/renderer/src/components/sidebar/DeleteWorktreeDialogFooter.tsx
+++ b/src/renderer/src/components/sidebar/DeleteWorktreeDialogFooter.tsx
@@ -2,6 +2,8 @@ import type { JSX, Ref } from 'react'
 import { LoaderCircle, Trash2 } from 'lucide-react'
 import { Button } from '@/components/ui/button'
 import { translate } from '@/i18n/i18n'
+import { useAppStore } from '@/store'
+import { WorktreeForceDeleteButton } from './WorktreeForceDeleteButton'
 
 export function DeleteWorktreeDialogFooter({
   isMainWorktree,
@@ -13,6 +15,7 @@ export function DeleteWorktreeDialogFooter({
   lineageDeleteTargetCount,
   onCancel,
   onForceDelete,
+  onSavingChange,
   onDelete,
   confirmButtonRef
 }: {
@@ -25,6 +28,7 @@ export function DeleteWorktreeDialogFooter({
   lineageDeleteTargetCount: number
   onCancel: () => void
   onForceDelete: () => void
+  onSavingChange: (saving: boolean) => void
   onDelete: () => void
   confirmButtonRef: Ref<HTMLButtonElement>
 }): JSX.Element {
@@ -47,17 +51,31 @@ export function DeleteWorktreeDialogFooter({
           ? translate('auto.components.sidebar.DeleteWorktreeDialogFooter.cf95e3b5bb', 'Close')
           : translate('auto.components.sidebar.DeleteWorktreeDialogFooter.c0e972d726', 'Cancel')}
       </Button>
-      {!isMainWorktree && (
+      {!isMainWorktree && canForceDelete ? (
+        <WorktreeForceDeleteButton
+          buttonRef={confirmButtonRef}
+          size="default"
+          disabled={isDeleting}
+          onForceDelete={onForceDelete}
+          onSavingChange={onSavingChange}
+          onAlwaysForceDelete={() =>
+            useAppStore.getState().updateSettingsOrThrow({ alwaysForceDeleteWorktrees: true })
+          }
+        >
+          {isDeleting ? <LoaderCircle className="size-4 animate-spin" /> : <Trash2 />}
+          {label}
+        </WorktreeForceDeleteButton>
+      ) : !isMainWorktree ? (
         <Button
           ref={confirmButtonRef}
           variant="destructive"
-          onClick={canForceDelete ? onForceDelete : onDelete}
+          onClick={onDelete}
           disabled={isDeleting}
         >
           {isDeleting ? <LoaderCircle className="size-4 animate-spin" /> : <Trash2 />}
           {label}
         </Button>
-      )}
+      ) : null}
     </>
   )
 }
diff --git a/src/renderer/src/components/sidebar/Sidebar.test.tsx b/src/renderer/src/components/sidebar/Sidebar.test.tsx
index a260805cff11..8c0c869e1d97 100644
--- a/src/renderer/src/components/sidebar/Sidebar.test.tsx
+++ b/src/renderer/src/components/sidebar/Sidebar.test.tsx
@@ -12,6 +12,7 @@ const mocks = vi.hoisted(() => ({
   state: {} as Record<string, unknown>,
   // Stable callback identities so companion-board Effects only re-run on real state changes.
   closeWorkspaceBoard: vi.fn(),
+  dropOwnerRef: vi.fn(),
   panel: {
     workspaceBoardOpen: false,
     workspaceBoardRenderedOpen: true,
@@ -80,7 +81,7 @@ vi.mock('./WorkspaceKanbanDrawer', () => ({
 
 vi.mock('./useSidebarProjectDrop', () => ({
   useSidebarProjectDrop: () => ({
-    nativeDropTarget: undefined,
+    dropOwnerRef: mocks.dropOwnerRef,
     dropHandlers: {},
     affordance: { visible: false }
   })
@@ -133,6 +134,7 @@ function sidebarElement(): ReactNode {
 
 beforeEach(() => {
   mocks.closeWorkspaceBoard.mockClear()
+  mocks.dropOwnerRef.mockClear()
   mocks.panel = {
     workspaceBoardOpen: false,
     workspaceBoardRenderedOpen: true,
@@ -245,4 +247,14 @@ describe('Sidebar', () => {
 
     await waitFor(() => expect(setAgentDashboardDrawerOpen).toHaveBeenCalledWith(false))
   })
+
+  it('detaches the project-drop owner while the sidebar is collapsed', () => {
+    setSidebarState(getDefaultSettings(tmpdir()))
+    const view = render(sidebarElement())
+    expect(mocks.dropOwnerRef).toHaveBeenLastCalledWith(expect.any(HTMLDivElement))
+
+    mocks.state = { ...mocks.state, sidebarOpen: false }
+    view.rerender(sidebarElement())
+    expect(mocks.dropOwnerRef).toHaveBeenLastCalledWith(null)
+  })
 })
diff --git a/src/renderer/src/components/sidebar/WorkspaceAttachmentComposer.tsx b/src/renderer/src/components/sidebar/WorkspaceAttachmentComposer.tsx
new file mode 100644
index 000000000000..da8b6114450d
--- /dev/null
+++ b/src/renderer/src/components/sidebar/WorkspaceAttachmentComposer.tsx
@@ -0,0 +1,47 @@
+import React, { useState } from 'react'
+import type { Repo } from '../../../../shared/repo-types'
+import type { WorkspaceAttachment, Worktree } from '../../../../shared/worktree/types'
+import type { AttachmentInputKind } from './worktree-attachment-editing'
+import { WorkspaceAttachmentSearch } from './WorkspaceAttachmentSearch'
+
+export type WorkspaceAttachmentComposerProps = {
+  items: readonly WorkspaceAttachment[]
+  repo?: Repo
+  workspace?: Worktree
+  disabled: boolean
+  initialKind: AttachmentInputKind
+  initialInput?: string
+  inputRef: React.RefObject<HTMLInputElement | null>
+  onAdd: (item: WorkspaceAttachment) => boolean
+  onSave: () => void
+  getScopeError: (item: WorkspaceAttachment) => string | null
+  error: string | null
+  onQueryChange: () => void
+}
+
+export function WorkspaceAttachmentComposer(
+  props: WorkspaceAttachmentComposerProps
+): React.JSX.Element {
+  const [query, setQuery] = useState(props.initialInput ?? '')
+  const [kind, setKind] = useState(props.initialKind)
+  const [retryGeneration, setRetryGeneration] = useState(0)
+  return (
+    <div data-workspace-reference-search="">
+      <WorkspaceAttachmentSearch
+        key={retryGeneration}
+        {...props}
+        onRetry={() => {
+          setRetryGeneration((generation) => generation + 1)
+          requestAnimationFrame(() => props.inputRef.current?.focus())
+        }}
+        query={query}
+        onQueryChange={(value) => {
+          setQuery(value)
+          props.onQueryChange()
+        }}
+        kind={kind}
+        onKindChange={setKind}
+      />
+    </div>
+  )
+}
diff --git a/src/renderer/src/components/sidebar/WorkspaceAttachmentOrigins.test.tsx b/src/renderer/src/components/sidebar/WorkspaceAttachmentOrigins.test.tsx
new file mode 100644
index 000000000000..799c1586c614
--- /dev/null
+++ b/src/renderer/src/components/sidebar/WorkspaceAttachmentOrigins.test.tsx
@@ -0,0 +1,262 @@
+// @vitest-environment happy-dom
+import { cleanup, fireEvent, render, screen } from '@testing-library/react'
+import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest'
+import type { Tab } from '../../../../shared/tab-types'
+import type {
+  WorkspaceAttachment,
+  WorkspaceAttachmentOrigin
+} from '../../../../shared/worktree/types'
+import { makePaneKey } from '../../../../shared/stable-pane-id'
+import { singlePaneLayoutSnapshot } from '../../store/slices/terminal-helpers'
+import { TooltipProvider } from '@/components/ui/tooltip'
+import { WorktreeLinkedItemRow } from './WorktreeLinkedItemRow'
+import { makeWorktree, makeTerminalTab } from '../../store/slices/worktrees-slice-test-fixtures'
+import { WorkspaceAttachmentOrigins } from './WorkspaceAttachmentOrigins'
+
+const mocks = vi.hoisted(() => ({
+  state: {
+    unifiedTabsByWorktree: {},
+    terminalLayoutsByTabId: {},
+    tabsByWorktree: {},
+    agentStatusByPaneKey: {},
+    setActiveWorktree: vi.fn(() => true),
+    activateTab: vi.fn()
+  },
+  activateTabAndFocusPane: vi.fn()
+}))
+vi.mock('@/lib/activate-tab-and-focus-pane', () => ({
+  activateTabAndFocusPane: mocks.activateTabAndFocusPane
+}))
+vi.mock('@/store', () => ({
+  useAppStore: Object.assign(
+    (selector: (state: typeof mocks.state) => unknown) => selector(mocks.state),
+    { getState: () => mocks.state }
+  )
+}))
+vi.mock('@/attention/notification-subject-owner', () => ({
+  resolveNotificationTabOwner: (_state: unknown, tab: Tab) => ({
+    executionHostId: tab.executionHostId ?? 'local',
+    runtimeEnvironmentId: null
+  })
+}))
+const workspace = makeWorktree({ id: 'repo::/feature', repoId: 'repo', hostId: 'local' })
+const reference: WorkspaceAttachment = { provider: 'github', type: 'pr', number: 23 }
+const tab = (id: string): Tab => ({
+  id,
+  entityId: id,
+  groupId: 'group',
+  worktreeId: workspace.id,
+  executionHostId: 'local',
+  contentType: 'agent-session',
+  label: id,
+  customLabel: null,
+  color: null,
+  sortOrder: 0,
+  createdAt: 0,
+  agentSessionAgent: 'codex'
+})
+afterEach(() => {
+  cleanup()
+  vi.clearAllMocks()
+})
+function setup() {
+  mocks.state.unifiedTabsByWorktree = {
+    [workspace.id]: [
+      tab('Session A'),
+      tab('Session B'),
+      { ...tab('Foreign session'), executionHostId: 'ssh:other' }
+    ]
+  }
+}
+describe('reference session associations', () => {
+  it('reveals automatic observations without checks selection or manual assignment controls', () => {
+    setup()
+    const onRemove = vi.fn()
+    const parentKeyDown = vi.fn()
+    render(
+      <TooltipProvider>
+        <div onKeyDown={parentKeyDown}>
+          <WorktreeLinkedItemRow
+            item={{
+              ...reference,
+              title: 'Observed review',
+              origins: [{ kind: 'observed', tabId: 'Session B', hostId: 'local' }]
+            }}
+            workspace={workspace}
+            disabled={false}
+            onRemove={onRemove}
+          />
+        </div>
+      </TooltipProvider>
+    )
+    expect(screen.getByText('PR #23')).toBeTruthy()
+    expect(screen.getByText('Observed review')).toBeTruthy()
+    expect(screen.queryByRole('checkbox')).toBeNull()
+    expect(screen.queryByText('Used for checks')).toBeNull()
+    expect(screen.queryByRole('button', { name: /Use .* for checks/ })).toBeNull()
+    const disclosure = screen.getByRole('button', { name: 'Sessions & terminals for PR #23 · 1' })
+    fireEvent.keyDown(disclosure, { key: 'Enter' })
+    expect(parentKeyDown).not.toHaveBeenCalled()
+    fireEvent.click(disclosure)
+    expect(screen.getByRole('button', { name: 'Seen in Session B' })).toBeTruthy()
+    expect(screen.queryByText('Linked to Session A')).toBeNull()
+    expect(screen.queryByRole('checkbox')).toBeNull()
+    fireEvent.click(screen.getByRole('button', { name: 'Seen in Session B' }))
+    expect(mocks.state.activateTab).toHaveBeenCalledWith('Session B', { worktreeId: workspace.id })
+    fireEvent.click(screen.getByRole('button', { name: 'Unlink PR #23' }))
+    expect(onRemove).toHaveBeenCalledOnce()
+  })
+  it('shows no session disclosure for a reference without automatic observations', () => {
+    setup()
+    render(
+      <TooltipProvider>
+        <WorktreeLinkedItemRow
+          item={reference}
+          workspace={workspace}
+          disabled={false}
+          onRemove={vi.fn()}
+        />
+      </TooltipProvider>
+    )
+    expect(screen.queryByRole('button', { name: /Sessions & terminals/ })).toBeNull()
+    expect(screen.queryByRole('checkbox')).toBeNull()
+  })
+  it('opens a related live tab and describes evidence without implying authorship', () => {
+    setup()
+    render(
+      <WorkspaceAttachmentOrigins
+        item={{
+          ...reference,
+          origins: [
+            {
+              kind: 'observed',
+              tabId: 'Session A',
+              label: 'Session A',
+              hostId: 'local',
+              sessionId: 'session-provider-id'
+            }
+          ]
+        }}
+        workspace={workspace}
+      />
+    )
+    fireEvent.click(screen.getByRole('button', { name: 'Seen in Session A' }))
+    expect(mocks.state.setActiveWorktree).toHaveBeenCalledWith(workspace.id, 'local')
+    expect(mocks.state.activateTab).toHaveBeenCalledWith('Session A', { worktreeId: workspace.id })
+  })
+
+  it.each([true, false])(
+    'focuses a recorded pane only while it remains in the layout (present=%s)',
+    (present) => {
+      setup()
+      const leafId = '11111111-1111-4111-8111-111111111111'
+      const otherLeaf = '22222222-2222-4222-8222-222222222222'
+      mocks.state.unifiedTabsByWorktree = {
+        [workspace.id]: [{ ...tab('Terminal'), contentType: 'terminal' }]
+      }
+      mocks.state.tabsByWorktree = {
+        [workspace.id]: [makeTerminalTab({ id: 'Terminal', worktreeId: workspace.id })]
+      }
+      mocks.state.terminalLayoutsByTabId = {
+        Terminal: {
+          ...singlePaneLayoutSnapshot(otherLeaf),
+          root: present
+            ? {
+                type: 'split',
+                direction: 'horizontal',
+                ratio: 0.5,
+                first: { type: 'leaf', leafId },
+                second: { type: 'leaf', leafId: otherLeaf }
+              }
+            : { type: 'leaf', leafId: otherLeaf }
+        }
+      }
+      render(
+        <WorkspaceAttachmentOrigins
+          workspace={workspace}
+          item={{
+            ...reference,
+            origins: [
+              {
+                kind: 'observed',
+                tabId: 'Terminal',
+                hostId: 'local',
+                paneKey: makePaneKey('Terminal', leafId)
+              }
+            ]
+          }}
+        />
+      )
+      fireEvent.click(screen.getByRole('button', { name: 'Seen in Terminal' }))
+      expect(mocks.state.activateTab).toHaveBeenCalledWith('Terminal', { worktreeId: workspace.id })
+      if (present) {
+        expect(mocks.activateTabAndFocusPane).toHaveBeenCalledWith('Terminal', leafId)
+      } else {
+        expect(mocks.activateTabAndFocusPane).not.toHaveBeenCalled()
+      }
+    }
+  )
+})
+
+const localTab: Tab = { ...tab('same-tab'), contentType: 'terminal', label: 'Current terminal' }
+const foreignOrigin: WorkspaceAttachmentOrigin = {
+  kind: 'observed',
+  tabId: localTab.id,
+  hostId: 'ssh:other',
+  label: 'Other host terminal'
+}
+describe('session association host and keyboard regressions', () => {
+  beforeEach(() => {
+    mocks.state.unifiedTabsByWorktree = { [workspace.id]: [localTab] }
+  })
+  it('keeps another host observation unavailable even when a live tab has the same id', () => {
+    render(
+      <WorkspaceAttachmentOrigins
+        workspace={workspace}
+        item={{ provider: 'github', type: 'pr', number: 23, origins: [foreignOrigin] }}
+      />
+    )
+    expect(screen.queryByRole('button')).toBeNull()
+    expect(screen.getByText(/Other host terminal/).textContent).toContain('Tab unavailable')
+  })
+  it.each([
+    ['Escape', false, false, 1],
+    ['Enter', true, false, 1],
+    ['Enter', false, true, 1],
+    ['Enter', false, false, 0]
+  ])('handles parent dialog shortcut %s meta=%s ctrl=%s', (key, metaKey, ctrlKey, calls) => {
+    const parent = vi.fn()
+    render(
+      <div onKeyDown={parent}>
+        <WorkspaceAttachmentOrigins
+          workspace={workspace}
+          item={{
+            ...reference,
+            origins: [{ kind: 'observed', tabId: localTab.id, hostId: 'local' }]
+          }}
+        />
+      </div>
+    )
+    fireEvent.keyDown(screen.getByRole('button', { name: 'Seen in Current terminal' }), {
+      key,
+      metaKey,
+      ctrlKey
+    })
+    expect(parent).toHaveBeenCalledTimes(calls)
+  })
+  it('uses the live tab name while preserving evidence semantics', () => {
+    render(
+      <WorkspaceAttachmentOrigins
+        workspace={workspace}
+        item={{
+          provider: 'github',
+          type: 'pr',
+          number: 23,
+          origins: [{ kind: 'observed', tabId: localTab.id, hostId: 'local', label: 'Old name' }]
+        }}
+      />
+    )
+    expect(screen.getByRole('button', { name: 'Seen in Current terminal' })).toBeTruthy()
+    expect(screen.queryByText('Seen in Old name')).toBeNull()
+  })
+})
diff --git a/src/renderer/src/components/sidebar/WorkspaceAttachmentOrigins.tsx b/src/renderer/src/components/sidebar/WorkspaceAttachmentOrigins.tsx
new file mode 100644
index 000000000000..6953f23ba744
--- /dev/null
+++ b/src/renderer/src/components/sidebar/WorkspaceAttachmentOrigins.tsx
@@ -0,0 +1,102 @@
+import React from 'react'
+import { useAppStore } from '@/store'
+import { Button } from '@/components/ui/button'
+import { translate } from '@/i18n/i18n'
+import { resolveNotificationTabOwner } from '@/attention/notification-subject-owner'
+import { terminalLayoutContainsLeaf } from '../../../../shared/workspace-session-pane-ownership'
+import { activateTabAndFocusPane } from '@/lib/activate-tab-and-focus-pane'
+import { parsePaneKey } from '../../../../shared/stable-pane-id'
+import type { WorkspaceAttachment, Worktree } from '../../../../shared/worktree/types'
+import type { Tab } from '../../../../shared/tab-types'
+import { getWorkspaceAttachmentOriginKey } from '../../../../shared/workspace-attachment-origins'
+
+const EMPTY_TABS: Tab[] = []
+
+function useReferenceTabs(workspace: Worktree): Tab[] {
+  const tabs = useAppStore((s) => s.unifiedTabsByWorktree?.[workspace.id] ?? EMPTY_TABS)
+  const state = useAppStore.getState()
+  return tabs.filter((tab) => {
+    if (tab.contentType !== 'terminal' && tab.contentType !== 'agent-session') {
+      return false
+    }
+    const owner = resolveNotificationTabOwner(state, tab)
+    return owner !== null && owner.executionHostId === (workspace.hostId ?? 'local')
+  })
+}
+
+export function WorkspaceAttachmentOrigins({
+  item,
+  workspace
+}: {
+  item: WorkspaceAttachment
+  workspace: Worktree
+}): React.JSX.Element | null {
+  const tabs = useReferenceTabs(workspace)
+  const origins = item.origins?.filter((origin) => origin.kind === 'observed') ?? []
+  if (!origins.length) {
+    return null
+  }
+  return (
+    <div className="flex flex-wrap items-center gap-1 pl-5">
+      {origins.map((origin) => {
+        const tab = tabs.find(
+          (candidate) =>
+            candidate.id === origin.tabId &&
+            (origin.hostId ?? 'local') === (workspace.hostId ?? 'local')
+        )
+        const label =
+          tab?.customLabel ||
+          tab?.label ||
+          origin.label ||
+          origin.agent ||
+          translate('workspace.links.terminal', 'Terminal')
+        const description = translate('workspace.links.seenIn', 'Seen in {{label}}', { label })
+        return tab ? (
+          <Button
+            key={getWorkspaceAttachmentOriginKey(origin)}
+            type="button"
+            variant="ghost"
+            size="xs"
+            title={origin.sessionId ? `${description} · ${origin.sessionId}` : description}
+            onKeyDown={(event) => {
+              if (event.key === 'Enter' && !event.metaKey && !event.ctrlKey) {
+                event.stopPropagation()
+              }
+            }}
+            onClick={(event) => {
+              event.stopPropagation()
+              const state = useAppStore.getState()
+              if (!state.setActiveWorktree(workspace.id, workspace.hostId)) {
+                return
+              }
+              state.activateTab(tab.id, { worktreeId: workspace.id })
+              const pane = origin.paneKey ? parsePaneKey(origin.paneKey) : null
+              if (
+                tab.contentType === 'terminal' &&
+                pane &&
+                pane.tabId === tab.entityId &&
+                state.tabsByWorktree[workspace.id]?.some((entry) => entry.id === tab.entityId) &&
+                terminalLayoutContainsLeaf(
+                  state.terminalLayoutsByTabId[tab.entityId]?.root,
+                  pane.leafId
+                )
+              ) {
+                activateTabAndFocusPane(tab.entityId, pane.leafId)
+              }
+            }}
+          >
+            {description}
+          </Button>
+        ) : (
+          <span
+            key={getWorkspaceAttachmentOriginKey(origin)}
+            className="text-[11px] text-muted-foreground"
+            title={origin.sessionId}
+          >
+            {description} · {translate('workspace.links.unavailableTab', 'Tab unavailable')}
+          </span>
+        )
+      })}
+    </div>
+  )
+}
diff --git a/src/renderer/src/components/sidebar/WorkspaceAttachmentSearch.resolution.test.tsx b/src/renderer/src/components/sidebar/WorkspaceAttachmentSearch.resolution.test.tsx
new file mode 100644
index 000000000000..62522ad2651b
--- /dev/null
+++ b/src/renderer/src/components/sidebar/WorkspaceAttachmentSearch.resolution.test.tsx
@@ -0,0 +1,335 @@
+// @vitest-environment happy-dom
+import React, { createRef, type ReactNode } from 'react'
+import { act, cleanup, fireEvent, render, screen, waitFor } from '@testing-library/react'
+import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest'
+import { useAppStore } from '@/store'
+import type { JiraConnectionStatus, JiraIssue, JiraSite } from '../../../../shared/jira-types'
+import type { LinearIssue } from '../../../../shared/linear/issue-types'
+import type { LinearConnectionStatus } from '../../../../shared/linear/workspace-types'
+import type { Repo } from '../../../../shared/repo-types'
+import type { WorkspaceAttachment } from '../../../../shared/worktree/types'
+import type { JiraUrlSourceState } from '../new-workspace/use-jira-url-source'
+import type * as JiraUrlSourceModule from '../new-workspace/use-jira-url-source'
+import type * as JiraSourceConnectionModule from '../new-workspace/use-jira-source-connection'
+import { bindJiraIssueSourceContext } from '../new-workspace/use-jira-url-source'
+import { getWorkspaceAttachmentSourceContext } from './workspace-attachment-source-result'
+import { WorkspaceAttachmentComposer } from './WorkspaceAttachmentComposer'
+
+const sourceMock = vi.hoisted(() => {
+  const jiraState: Omit<JiraUrlSourceState, 'retry' | 'selectAccount'> = {
+    intent: false,
+    loading: false,
+    issue: null,
+    boundSourceContext: null,
+    accountChoices: [],
+    errorKind: null
+  }
+  const jiraStatus: JiraConnectionStatus = { connected: false, viewer: null, sites: [] }
+  const linearStatus: LinearConnectionStatus = { connected: false, viewer: null }
+  return {
+    jiraState,
+    jiraStatus,
+    linearStatus,
+    retryJira: vi.fn(),
+    selectAccount: vi.fn(),
+    readLinearStatus: vi.fn<() => Promise<LinearConnectionStatus>>()
+  }
+})
+vi.mock('../new-workspace/use-jira-url-source', async (importOriginal) => ({
+  ...(await importOriginal<typeof JiraUrlSourceModule>()),
+  useJiraUrlSource: () => ({
+    ...sourceMock.jiraState,
+    retry: sourceMock.retryJira,
+    selectAccount: sourceMock.selectAccount
+  })
+}))
+vi.mock('../new-workspace/use-jira-source-connection', async (importOriginal) => ({
+  ...(await importOriginal<typeof JiraSourceConnectionModule>()),
+  useJiraSourceConnection: () => ({ status: sourceMock.jiraStatus, loaded: true })
+}))
+vi.mock('@/runtime/runtime-linear-client', () => ({ linearStatus: sourceMock.readLinearStatus }))
+vi.mock('@/components/ui/tooltip', () => ({
+  Tooltip: ({ children }: { children?: ReactNode }) => <>{children}</>,
+  TooltipContent: () => null,
+  TooltipTrigger: ({ children }: { children?: ReactNode }) => <>{children}</>
+}))
+
+const initialState = useAppStore.getInitialState()
+const repo: Repo = {
+  id: 'repo',
+  path: '/repo',
+  displayName: 'orca',
+  badgeColor: '',
+  addedAt: 1,
+  executionHostId: 'ssh:dev',
+  gitRemoteIdentity: {
+    canonicalKey: 'github.com/acme/orca',
+    remoteName: 'origin',
+    remoteUrl: 'https://github.com/acme/orca.git'
+  }
+}
+const jiraUrl = 'https://company.atlassian.net/browse/ORCA-123'
+const linearUrl = 'https://linear.app/acme/issue/ORCA-123/fix-it'
+const site: JiraSite = {
+  id: 'site-2',
+  siteUrl: 'https://company.atlassian.net',
+  email: 'chosen@example.com',
+  displayName: 'Chosen account',
+  accountId: 'account-2'
+}
+const jiraIssue: JiraIssue = {
+  id: 'issue-123',
+  key: 'ORCA-123',
+  title: 'Fix it',
+  url: jiraUrl,
+  siteId: site.id,
+  project: { id: 'project-jira', key: 'ORCA', name: 'Orca' },
+  issueType: { id: 'bug', name: 'Bug' },
+  status: { id: 'open', name: 'Open', categoryKey: 'new', categoryName: 'To do' },
+  labels: [],
+  createdAt: '',
+  updatedAt: ''
+}
+const linearIssue: LinearIssue = {
+  id: 'linear-123',
+  identifier: 'ORCA-123',
+  title: 'Fix it',
+  url: linearUrl,
+  workspaceId: 'acme-workspace',
+  workspaceName: 'Acme',
+  state: { name: 'Todo', type: 'unstarted', color: '' },
+  team: { id: 'team', name: 'Orca', key: 'ORCA' },
+  labels: [],
+  labelIds: [],
+  priority: 0,
+  updatedAt: ''
+}
+const connectedLinear: LinearConnectionStatus = {
+  connected: true,
+  viewer: null,
+  activeWorkspaceId: 'acme-workspace',
+  workspaces: [
+    {
+      id: 'acme-workspace',
+      organizationId: 'acme',
+      organizationName: 'Acme',
+      organizationUrlKey: 'acme',
+      displayName: 'Account',
+      email: null
+    }
+  ]
+}
+const onAdd = vi.fn<(item: WorkspaceAttachment) => boolean>(() => true)
+const fetchLinearIssue = vi.fn<() => Promise<LinearIssue | null>>()
+
+function composer(value: string): React.JSX.Element {
+  return (
+    <WorkspaceAttachmentComposer
+      items={[]}
+      repo={repo}
+      disabled={false}
+      initialKind="github-issue"
+      initialInput={value}
+      inputRef={createRef()}
+      onAdd={onAdd}
+      onSave={vi.fn()}
+      getScopeError={() => null}
+      error={null}
+      onQueryChange={vi.fn()}
+    />
+  )
+}
+function input(): HTMLElement {
+  return screen.getByRole('combobox', { name: 'Search references' })
+}
+function direct(): HTMLElement {
+  return screen.getByRole('option', { name: /^Add ORCA-123/ })
+}
+function enter(): void {
+  fireEvent.keyDown(input(), { key: 'Enter' })
+}
+
+describe('workspace reference URL resolution and recovery', () => {
+  beforeEach(() => {
+    vi.clearAllMocks()
+    useAppStore.setState(initialState, true)
+    useAppStore.setState({
+      fetchWorkItems: vi.fn(async () => []),
+      getCachedWorkItems: vi.fn(() => []),
+      refreshPreflightStatus: vi.fn(async () => {}),
+      checkLinearConnection: vi.fn(async () => {}),
+      linearStatusChecked: true,
+      fetchLinearIssue,
+      searchLinearIssues: vi.fn(async () => []),
+      listLinearIssues: vi.fn(async () => ({ items: [] }))
+    })
+    Object.assign(sourceMock.jiraState, {
+      intent: false,
+      loading: false,
+      issue: null,
+      boundSourceContext: null,
+      accountChoices: [],
+      errorKind: null
+    })
+    sourceMock.jiraStatus = { connected: false, viewer: null, sites: [] }
+    sourceMock.linearStatus = { connected: false, viewer: null }
+    sourceMock.readLinearStatus.mockImplementation(async () => sourceMock.linearStatus)
+    fetchLinearIssue.mockResolvedValue(null)
+    Element.prototype.scrollIntoView = vi.fn()
+  })
+  afterEach(cleanup)
+
+  it('blocks pasted Jira URLs while loading, including plain Enter', () => {
+    Object.assign(sourceMock.jiraState, { intent: true, loading: true })
+    render(composer(jiraUrl))
+    expect(direct().getAttribute('data-disabled')).toBe('true')
+    expect(screen.getByRole('status').textContent).toContain('Loading Jira issue')
+    enter()
+    expect(onAdd).not.toHaveBeenCalled()
+  })
+
+  it.each([
+    ['disconnected', 'Connect Jira in Settings'],
+    ['site-not-connected', 'This Jira site is not connected'],
+    ['read-failed', 'Couldn’t load this Jira issue'],
+    ['update-runtime', 'Update the remote runtime']
+  ] as const)(
+    'shows %s guidance and retries without discarding the query',
+    (errorKind, message) => {
+      Object.assign(sourceMock.jiraState, { intent: true, errorKind })
+      render(composer(jiraUrl))
+      expect(screen.getByRole('status').textContent).toContain(message)
+      expect(direct().getAttribute('data-disabled')).toBe('true')
+      enter()
+      fireEvent.click(screen.getByRole('button', { name: 'Retry' }))
+      expect(sourceMock.retryJira).toHaveBeenCalledOnce()
+      expect(input()).toHaveProperty('value', jiraUrl)
+      expect(onAdd).not.toHaveBeenCalled()
+    }
+  )
+
+  it('requires an account choice and attaches the resolved Jira account on the execution host', async () => {
+    const otherSite = { ...site, id: 'site-1', email: 'other@example.com' }
+    sourceMock.jiraStatus = { connected: true, viewer: null, sites: [otherSite, site] }
+    Object.assign(sourceMock.jiraState, { intent: true, accountChoices: [otherSite, site] })
+    const view = render(composer(jiraUrl))
+    expect(direct().getAttribute('data-disabled')).toBe('true')
+    expect(screen.getByRole('status').textContent).toContain('Choose a Jira account')
+    fireEvent.click(screen.getByRole('option', { name: /chosen@example.com/ }))
+    expect(sourceMock.selectAccount).toHaveBeenCalledWith(site.id)
+    const context = getWorkspaceAttachmentSourceContext('jira', repo, undefined)
+    if (!context) {
+      throw new Error('Expected Jira source context')
+    }
+    Object.assign(sourceMock.jiraState, {
+      accountChoices: [],
+      issue: jiraIssue,
+      boundSourceContext: bindJiraIssueSourceContext(context, site, jiraIssue)
+    })
+    view.rerender(composer(jiraUrl))
+    await waitFor(() => expect(direct().getAttribute('data-disabled')).not.toBe('true'))
+    enter()
+    expect(onAdd).toHaveBeenCalledWith(
+      expect.objectContaining({
+        provider: 'jira',
+        title: 'Fix it',
+        taskSourceContext: expect.objectContaining({
+          hostId: 'ssh:dev',
+          accountLabel: site.email,
+          providerIdentity: expect.objectContaining({ siteId: site.id })
+        })
+      })
+    )
+  })
+
+  it('waits for remote Linear connection and issue lookup before attaching the bound workspace', async () => {
+    let finishStatus: ((status: LinearConnectionStatus) => void) | undefined
+    let finishIssue: ((issue: LinearIssue) => void) | undefined
+    sourceMock.readLinearStatus.mockImplementation(
+      () =>
+        new Promise((resolve) => {
+          finishStatus = resolve
+        })
+    )
+    fetchLinearIssue.mockImplementation(
+      () =>
+        new Promise((resolve) => {
+          finishIssue = resolve
+        })
+    )
+    render(composer(linearUrl))
+    expect(screen.getByRole('status').textContent).toContain('Loading Linear issue')
+    enter()
+    expect(onAdd).not.toHaveBeenCalled()
+    await act(async () => finishStatus?.(connectedLinear))
+    await waitFor(() => expect(fetchLinearIssue).toHaveBeenCalled())
+    expect(direct().getAttribute('data-disabled')).toBe('true')
+    enter()
+    expect(onAdd).not.toHaveBeenCalled()
+    await act(async () => finishIssue?.(linearIssue))
+    await waitFor(() => expect(direct().getAttribute('data-disabled')).not.toBe('true'))
+    enter()
+    expect(onAdd).toHaveBeenCalledWith(
+      expect.objectContaining({
+        provider: 'linear',
+        linearWorkspaceId: 'acme-workspace',
+        title: 'Fix it',
+        taskSourceContext: expect.objectContaining({
+          hostId: 'ssh:dev',
+          providerIdentity: expect.objectContaining({ workspaceId: 'acme-workspace' })
+        })
+      })
+    )
+  })
+
+  it('recovers from disconnected Linear without replacing the draft or pasted query', async () => {
+    render(composer(linearUrl))
+    await screen.findByText('Connect Linear in Settings to link this issue.')
+    enter()
+    expect(onAdd).not.toHaveBeenCalled()
+    sourceMock.linearStatus = connectedLinear
+    fetchLinearIssue.mockResolvedValue(linearIssue)
+    fireEvent.click(screen.getByRole('button', { name: 'Retry' }))
+    expect(input()).toHaveProperty('value', linearUrl)
+    await waitFor(() => expect(direct().getAttribute('data-disabled')).not.toBe('true'))
+    enter()
+    expect(onAdd).toHaveBeenCalledOnce()
+  })
+
+  it('keeps failed Linear URL lookup blocked and retries the same URL', async () => {
+    sourceMock.linearStatus = connectedLinear
+    render(composer(linearUrl))
+    await screen.findByText(
+      'Couldn’t load this Linear issue. Check the URL and connected workspace.'
+    )
+    expect(direct().getAttribute('data-disabled')).toBe('true')
+    enter()
+    expect(onAdd).not.toHaveBeenCalled()
+    fetchLinearIssue.mockResolvedValue(linearIssue)
+    fireEvent.click(screen.getByRole('button', { name: 'Retry' }))
+    await waitFor(() => expect(direct().getAttribute('data-disabled')).not.toBe('true'))
+    enter()
+    expect(onAdd).toHaveBeenCalledOnce()
+  })
+
+  it('retains explicit bare task identifiers as manual attachments', () => {
+    render(
+      <WorkspaceAttachmentComposer
+        items={[]}
+        repo={repo}
+        disabled={false}
+        initialKind="linear-issue"
+        initialInput="ORCA-123"
+        inputRef={createRef()}
+        onAdd={onAdd}
+        onSave={vi.fn()}
+        getScopeError={() => null}
+        error={null}
+        onQueryChange={vi.fn()}
+      />
+    )
+    expect(direct().getAttribute('data-disabled')).not.toBe('true')
+    enter()
+    expect(onAdd).toHaveBeenCalledOnce()
+  })
+})
diff --git a/src/renderer/src/components/sidebar/WorkspaceAttachmentSearch.tsx b/src/renderer/src/components/sidebar/WorkspaceAttachmentSearch.tsx
new file mode 100644
index 000000000000..7c5fb9fa48c8
--- /dev/null
+++ b/src/renderer/src/components/sidebar/WorkspaceAttachmentSearch.tsx
@@ -0,0 +1,336 @@
+import React, { useCallback, useId, useMemo, useState } from 'react'
+import { ChevronDown, Loader2, Plus, X } from 'lucide-react'
+import { Button } from '@/components/ui/button'
+import { Command, CommandInput, CommandItem } from '@/components/ui/command'
+import {
+  DropdownMenu,
+  DropdownMenuContent,
+  DropdownMenuRadioGroup,
+  DropdownMenuRadioItem,
+  DropdownMenuTrigger
+} from '@/components/ui/dropdown-menu'
+import { translate } from '@/i18n/i18n'
+import { isScreenSubmitShortcut } from '@/lib/screen-submit-shortcut'
+import type { WorkspaceAttachment } from '../../../../shared/worktree/types'
+import type { RowEntry } from '../new-workspace/smart-workspace-name-field-model'
+import type { SmartNameMode } from '../../../../shared/new-workspace/smart-workspace-source-results'
+import { useWorkItemSourceSearch } from '../new-workspace/use-work-item-source-search'
+import { SmartWorkspaceSourceTabs } from '../new-workspace/SmartWorkspaceSourceTabs'
+import { SmartWorkspaceSourceResultList } from '../new-workspace/SmartWorkspaceSourceResultList'
+import { getWorkspaceAttachmentKey } from '../../../../shared/workspace-attachment-normalization'
+import {
+  ATTACHMENT_INPUT_KINDS,
+  isAttachmentInputKind,
+  parseWorkspaceAttachmentInput,
+  workspaceAttachmentLabel,
+  type AttachmentInputKind
+} from './worktree-attachment-editing'
+import {
+  getWorkspaceAttachmentSourceContext,
+  matchesWorkspaceAttachmentQuery,
+  isWorkspaceAttachmentLinked
+} from './workspace-attachment-source-result'
+
+import type { WorkspaceAttachmentComposerProps } from './WorkspaceAttachmentComposer'
+import { WorkspaceAttachmentSourceStatus } from './WorkspaceAttachmentSourceStatus'
+
+export function WorkspaceAttachmentSearch({
+  query,
+  onQueryChange,
+  kind,
+  onKindChange,
+  onRetry,
+  ...props
+}: Omit<WorkspaceAttachmentComposerProps, 'onQueryChange'> & {
+  query: string
+  onQueryChange: (value: string) => void
+  kind: AttachmentInputKind
+  onKindChange: (kind: AttachmentInputKind) => void
+  onRetry: () => void
+}): React.JSX.Element {
+  const [selection, setSelection] = useState('')
+  const inputId = useId()
+  const contexts = useMemo(
+    () => ({
+      github: getWorkspaceAttachmentSourceContext('github', props.repo, props.workspace),
+      gitlab: getWorkspaceAttachmentSourceContext('gitlab', props.repo, props.workspace),
+      linear: getWorkspaceAttachmentSourceContext('linear', props.repo, props.workspace),
+      jira: getWorkspaceAttachmentSourceContext('jira', props.repo, props.workspace)
+    }),
+    [props.repo, props.workspace]
+  )
+  const repos = useMemo(() => (props.repo ? [props.repo] : []), [props.repo])
+  const add = (item: WorkspaceAttachment): void => {
+    if (!props.onAdd(item)) {
+      return
+    }
+    onQueryChange('')
+    setSelection('')
+    props.inputRef.current?.focus()
+  }
+  const changeMode = useCallback(
+    (mode: SmartNameMode): void => {
+      if (mode === 'linear') {
+        onKindChange('linear-issue')
+      } else if (mode === 'jira') {
+        onKindChange('jira-issue')
+      } else if (mode === 'gitlab') {
+        onKindChange(kind === 'gitlab-issue' ? 'gitlab-issue' : 'gitlab-mr')
+      } else if (mode === 'github' && kind !== 'github-pr' && kind !== 'github-issue') {
+        onKindChange('github-issue')
+      }
+    },
+    [kind, onKindChange]
+  )
+  const controller = useWorkItemSourceSearch({
+    repos,
+    disabled: props.disabled,
+    repoId: props.repo?.id ?? '',
+    value: query,
+    branchesEnabled: false,
+    repoBackedSourcesDisabled: !props.repo,
+    crossRepoSwitchTarget: 'task-source',
+    githubSourceContext: contexts.github,
+    linearSourceContext: contexts.linear,
+    gitlabSourceContext: contexts.gitlab,
+    jiraSourceContext: contexts.jira
+  })
+  const toAttachment = controller.resolveRow
+  const linked = (row: RowEntry): boolean => {
+    const item = toAttachment(row)
+    return item ? isWorkspaceAttachmentLinked(props.items, item) : false
+  }
+  const selectRow = (row: RowEntry): void => {
+    if (controller.isQueryStale) {
+      return
+    }
+    if (row.kind === 'jira-account') {
+      controller.selectJiraAccount(row.site.id)
+      return
+    }
+    const item = toAttachment(row)
+    if (item && !isWorkspaceAttachmentLinked(props.items, item)) {
+      add(item)
+    }
+  }
+  const rows = controller.rows
+  const parsedDirect = parseWorkspaceAttachmentInput(query, kind)
+  const resolvedDirectRow =
+    !controller.isQueryStale && parsedDirect
+      ? rows.find((row) => {
+          const item = toAttachment(row)
+          return item ? matchesWorkspaceAttachmentQuery(parsedDirect, item) : false
+        })
+      : null
+  const direct = resolvedDirectRow
+    ? (toAttachment(resolvedDirectRow) ?? parsedDirect)
+    : parsedDirect
+  const directLinked = direct ? isWorkspaceAttachmentLinked(props.items, direct) : false
+  const scopeError = direct ? props.getScopeError(direct) : null
+  const directValue = direct ? `attachment-direct:${getWorkspaceAttachmentKey(direct)}` : ''
+  const ambiguousNumber = /^#?\d+$/.test(query.trim())
+  const taskUrlProvider =
+    /^https?:\/\//i.test(query.trim()) &&
+    (parsedDirect?.provider === 'linear' || parsedDirect?.provider === 'jira')
+      ? parsedDirect.provider
+      : null
+  const directEnabled = Boolean(
+    direct &&
+    !props.disabled &&
+    !directLinked &&
+    !scopeError &&
+    !controller.blockingTaskUrlResolution &&
+    (!taskUrlProvider || resolvedDirectRow) &&
+    (taskUrlProvider !== 'jira' ||
+      (!controller.jiraSource.loading && !controller.jiraSource.errorKind)) &&
+    !controller.unresolvedLinearUrlIntent &&
+    (!ambiguousNumber || (!controller.isQueryStale && !controller.loading))
+  )
+  const actionableRows = controller.isQueryStale ? [] : rows.filter((row) => !linked(row))
+  const commandValue =
+    selection === directValue && directEnabled
+      ? directValue
+      : actionableRows.some((row) => row.value === selection)
+        ? selection
+        : directEnabled
+          ? directValue
+          : (actionableRows[0]?.value ?? '')
+  return (
+    <Command
+      label={translate('workspace.links.searchLabel', 'Search references')}
+      value={commandValue}
+      onValueChange={setSelection}
+      shouldFilter={false}
+      surface="inline"
+      className="min-h-0"
+    >
+      <div className="shrink-0 space-y-2">
+        <label htmlFor={inputId} className="text-xs font-medium">
+          {translate('workspace.links.addReference', 'Add reference')}
+        </label>
+        <SmartWorkspaceSourceTabs
+          model={controller}
+          inputRef={props.inputRef}
+          onModeChange={(mode) => {
+            controller.setMode(mode)
+            changeMode(mode)
+            requestAnimationFrame(() => props.inputRef.current?.focus({ preventScroll: true }))
+          }}
+        />
+        <CommandInput
+          ref={props.inputRef}
+          id={inputId}
+          value={query}
+          placeholder={translate(
+            'workspace.links.searchReferences',
+            'Search reviews and tasks, or paste a link'
+          )}
+          variant="framed"
+          disabled={props.disabled}
+          trailing={
+            <div className="flex items-center gap-1">
+              {controller.showSearchSpinner ? (
+                <Loader2 className="size-3.5 animate-spin text-muted-foreground" />
+              ) : null}
+              {query ? (
+                <Button
+                  type="button"
+                  variant="ghost"
+                  size="icon-xs"
+                  aria-label={translate('workspace.links.clearSearch', 'Clear search')}
+                  onClick={() => {
+                    onQueryChange('')
+                    setSelection('')
+                    props.inputRef.current?.focus()
+                  }}
+                >
+                  <X />
+                </Button>
+              ) : null}
+            </div>
+          }
+          aria-invalid={Boolean(scopeError || props.error) || undefined}
+          onValueChange={(value) => {
+            onQueryChange(value)
+            setSelection('')
+          }}
+          onCompositionStart={(event) => {
+            event.currentTarget.dataset.imeComposing = 'true'
+          }}
+          onCompositionEnd={(event) => {
+            delete event.currentTarget.dataset.imeComposing
+          }}
+          onBlur={(event) => {
+            delete event.currentTarget.dataset.imeComposing
+          }}
+          onKeyDown={(event) => {
+            if (event.key === 'Escape' && query) {
+              event.preventDefault()
+              event.stopPropagation()
+              onQueryChange('')
+              setSelection('')
+              return
+            }
+            if (isScreenSubmitShortcut(event)) {
+              event.preventDefault()
+              event.stopPropagation()
+              props.onSave()
+              return
+            }
+            if (event.key === 'Enter') {
+              event.preventDefault()
+              event.stopPropagation()
+              if (!query.trim()) {
+                return
+              }
+              if (commandValue === directValue && direct && directEnabled) {
+                add(direct)
+              } else {
+                const selected = actionableRows.find((row) => row.value === commandValue)
+                if (selected) {
+                  selectRow(selected)
+                }
+              }
+            }
+          }}
+        />
+      </div>
+      {query.trim() ? (
+        <div className="mt-2 flex max-h-60 min-h-0 shrink flex-col overflow-hidden">
+          <SmartWorkspaceSourceResultList
+            model={controller}
+            onSelect={selectRow}
+            isLinked={linked}
+            isRowDisabled={() => props.disabled || controller.isQueryStale}
+            emptyHint={translate(
+              'workspace.links.noReferences',
+              'No matching references. Try a title, number, or URL.'
+            )}
+            beforeResults={
+              direct ? (
+                <div className="border-b border-border p-1">
+                  <CommandItem
+                    value={directValue}
+                    selection="palette"
+                    disabled={!directEnabled}
+                    onSelect={() => add(direct)}
+                  >
+                    <Plus className="size-3.5" />
+                    <span>
+                      {translate('workspace.links.addItem', 'Add {{label}}', {
+                        label: workspaceAttachmentLabel(direct)
+                      })}
+                    </span>
+                    {directLinked ? (
+                      <span className="ml-auto text-xs text-muted-foreground">
+                        {translate('workspace.links.linkedResult', 'Linked')}
+                      </span>
+                    ) : null}
+                  </CommandItem>
+                </div>
+              ) : null
+            }
+          />
+        </div>
+      ) : null}
+      {query.trim() ? (
+        <div className="mt-2 flex shrink-0 items-center justify-between gap-3">
+          <WorkspaceAttachmentSourceStatus
+            controller={controller}
+            taskUrlProvider={taskUrlProvider}
+            resolved={Boolean(resolvedDirectRow)}
+            error={props.error ?? scopeError}
+            onRetry={onRetry}
+          />
+          {/^[#!]?\d+$|^[a-z][a-z0-9]*-\d+$/i.test(query.trim()) ? (
+            <DropdownMenu modal={false}>
+              <DropdownMenuTrigger asChild>
+                <Button type="button" variant="ghost" size="xs">
+                  <ChevronDown className="size-3" />
+                  {translate('workspace.links.referenceType', 'Reference type')}
+                </Button>
+              </DropdownMenuTrigger>
+              <DropdownMenuContent align="end">
+                <DropdownMenuRadioGroup
+                  value={kind}
+                  onValueChange={(value) => {
+                    if (isAttachmentInputKind(value)) {
+                      controller.setMode('smart')
+                      onKindChange(value)
+                    }
+                  }}
+                >
+                  {ATTACHMENT_INPUT_KINDS.map((option) => (
+                    <DropdownMenuRadioItem key={option.value} value={option.value}>
+                      {option.label()}
+                    </DropdownMenuRadioItem>
+                  ))}
+                </DropdownMenuRadioGroup>
+              </DropdownMenuContent>
+            </DropdownMenu>
+          ) : null}
+        </div>
+      ) : null}
+    </Command>
+  )
+}
diff --git a/src/renderer/src/components/sidebar/WorkspaceAttachmentSourceStatus.tsx b/src/renderer/src/components/sidebar/WorkspaceAttachmentSourceStatus.tsx
new file mode 100644
index 000000000000..c8239f8f9500
--- /dev/null
+++ b/src/renderer/src/components/sidebar/WorkspaceAttachmentSourceStatus.tsx
@@ -0,0 +1,81 @@
+import type React from 'react'
+import { Button } from '@/components/ui/button'
+import { translate } from '@/i18n/i18n'
+import { getJiraSourceStatusMessage } from '../new-workspace/jira-source-status-message'
+import type { WorkItemSourceSearch } from '../new-workspace/use-work-item-source-search'
+
+export function WorkspaceAttachmentSourceStatus({
+  controller,
+  taskUrlProvider,
+  resolved,
+  error,
+  onRetry
+}: {
+  controller: WorkItemSourceSearch
+  taskUrlProvider: 'linear' | 'jira' | null
+  resolved: boolean
+  error: string | null
+  onRetry: () => void
+}): React.JSX.Element {
+  let message =
+    error ?? translate('workspace.links.inlineSearchHint', 'Select a result to attach it.')
+  let retry: (() => void) | null = null
+  if (!error && taskUrlProvider === 'jira') {
+    if (controller.jiraSource.intent) {
+      message = getJiraSourceStatusMessage(controller.jiraSource)
+      if (controller.jiraSource.errorKind) {
+        retry = controller.jiraSource.retry
+      }
+    } else {
+      message = translate(
+        'workspace.links.jiraModeRequired',
+        'Select Smart or Jira to load this issue.'
+      )
+      retry = () => controller.setMode('jira')
+    }
+  } else if (!error && taskUrlProvider === 'linear' && !resolved) {
+    if (!controller.linearUrlIntentOwnsInput) {
+      message = translate(
+        'workspace.links.linearModeRequired',
+        'Select Smart or Linear to load this issue.'
+      )
+      retry = () => controller.setMode('linear')
+    } else if (!controller.linearStatusChecked) {
+      message = translate('workspace.links.loadingLinear', 'Loading Linear issue…')
+    } else if (!controller.linearStatus.connected) {
+      message = translate(
+        'workspace.links.linearConnectRequired',
+        'Connect Linear in Settings to link this issue.'
+      )
+      retry = onRetry
+    } else if (controller.unresolvedLinearUrlIntent || controller.linearLoading) {
+      message = translate('workspace.links.loadingLinear', 'Loading Linear issue…')
+    } else {
+      message = translate(
+        'workspace.links.linearReadFailed',
+        'Couldn’t load this Linear issue. Check the URL and connected workspace.'
+      )
+      retry = onRetry
+    }
+  }
+  return (
+    <div
+      role="status"
+      aria-live="polite"
+      className="flex min-w-0 items-center gap-2 text-xs text-muted-foreground"
+    >
+      <span>{message}</span>
+      {retry ? (
+        <Button
+          type="button"
+          variant="link"
+          size="xs"
+          disabled={controller.disabled}
+          onClick={retry}
+        >
+          {translate('workspace.links.retrySource', 'Retry')}
+        </Button>
+      ) : null}
+    </div>
+  )
+}
diff --git a/src/renderer/src/components/sidebar/WorkspaceKanbanCard.host-identity.test.tsx b/src/renderer/src/components/sidebar/WorkspaceKanbanCard.host-identity.test.tsx
index 44daf3f00e60..4c94c30fc36a 100644
--- a/src/renderer/src/components/sidebar/WorkspaceKanbanCard.host-identity.test.tsx
+++ b/src/renderer/src/components/sidebar/WorkspaceKanbanCard.host-identity.test.tsx
@@ -3,7 +3,7 @@
 import { cleanup, fireEvent, render } from '@testing-library/react'
 import React from 'react'
 import { afterEach, describe, expect, it, vi } from 'vitest'
-import { makeWorktree } from '../../store/slices/store-test-helpers'
+import { makeWorktree } from '../../store/slices/worktrees-slice-test-fixtures'
 import WorkspaceKanbanCard from './WorkspaceKanbanCard'
 
 vi.mock('@/components/ui/badge', () => ({
diff --git a/src/renderer/src/components/sidebar/WorkspaceReviewChecksIndicator.tsx b/src/renderer/src/components/sidebar/WorkspaceReviewChecksIndicator.tsx
new file mode 100644
index 000000000000..ac8cab6f8a37
--- /dev/null
+++ b/src/renderer/src/components/sidebar/WorkspaceReviewChecksIndicator.tsx
@@ -0,0 +1,37 @@
+import React from 'react'
+import { cn } from '@/lib/utils'
+import { translate } from '@/i18n/i18n'
+import type { WorkspaceReviewChecksSummary } from '../../../../shared/workspace-review-checks'
+import { PullRequestIcon } from './WorktreeCardHelpers'
+import { getReviewChecksTone } from './worktree-review-helpers'
+
+export function workspaceReviewChecksLabel(summary: WorkspaceReviewChecksSummary): string {
+  const status =
+    summary.state === 'failure'
+      ? translate('workspace.links.checksFailed', 'Failed')
+      : summary.state === 'pending'
+        ? translate('workspace.links.checksPending', 'Pending')
+        : summary.state === 'success'
+          ? translate('workspace.links.checksPassing', 'Passing')
+          : summary.state === 'unknown'
+            ? translate('workspace.links.checksUnknown', 'Unknown')
+            : translate('workspace.links.checksNeutral', 'Neutral')
+  return translate('workspace.links.allReviewChecks', 'Reviews: {{count}} · Checks: {{status}}', {
+    count: summary.total,
+    status
+  })
+}
+
+export function WorkspaceReviewChecksIndicator({
+  summary,
+  className
+}: {
+  summary: WorkspaceReviewChecksSummary
+  className?: string
+}): React.JSX.Element {
+  const tone =
+    summary.state === 'failure' || summary.state === 'pending' || summary.state === 'success'
+      ? getReviewChecksTone(summary.state)
+      : null
+  return <PullRequestIcon className={cn(className, tone ?? 'text-muted-foreground')} />
+}
diff --git a/src/renderer/src/components/sidebar/WorktreeCard.compact-hover.test.tsx b/src/renderer/src/components/sidebar/WorktreeCard.compact-hover.test.tsx
index 6b9b85152107..09517679688c 100644
--- a/src/renderer/src/components/sidebar/WorktreeCard.compact-hover.test.tsx
+++ b/src/renderer/src/components/sidebar/WorktreeCard.compact-hover.test.tsx
@@ -31,38 +31,42 @@ let settings: Partial<GlobalSettings> | null = { compactWorktreeCards: true }
 let agentActivityDisplayMode: 'compact' | 'full' | undefined
 let mockInlineAgentRows: DashboardAgentRowData[] = []
 
-vi.mock('@/store', () => ({
-  useAppStore: (selector: (state: unknown) => unknown) =>
-    selector({
-      browserTabsByWorktree: {},
-      agentActivityDisplayMode,
-      createBrowserTab: vi.fn(),
-      deleteStateByWorktreeId: {},
-      fetchHostedReviewForBranch,
-      fetchIssue,
-      fetchLinearIssue,
-      gitConflictOperationByWorktree: {},
-      hostedReviewCache,
-      issueCache,
-      linearIssueCache: {},
-      openModal,
-      openTaskPage,
-      projectGroups,
-      ptyIdsByTabId: {},
-      recordFeatureInteraction,
-      remoteBranchConflictByWorktreeId: {},
-      setRemoteBrowserPageHandle: vi.fn(),
-      replaceWorkspacePortScans,
-      setWorkspacePortScanRefreshing,
-      settings,
-      sshConnectionStates: new Map(),
-      sshTargetLabels: new Map(),
-      tabsByWorktree: {},
-      updateWorktreeMeta,
-      workspacePortScan,
-      worktreeCardProperties
+vi.mock('@/store', () => {
+  const getState = () => ({
+    browserTabsByWorktree: {},
+    agentActivityDisplayMode,
+    createBrowserTab: vi.fn(),
+    deleteStateByWorktreeId: {},
+    fetchHostedReviewForBranch,
+    fetchIssue,
+    fetchLinearIssue,
+    gitConflictOperationByWorktree: {},
+    hostedReviewCache,
+    issueCache,
+    linearIssueCache: {},
+    openModal,
+    openTaskPage,
+    projectGroups,
+    ptyIdsByTabId: {},
+    recordFeatureInteraction,
+    remoteBranchConflictByWorktreeId: {},
+    setRemoteBrowserPageHandle: vi.fn(),
+    replaceWorkspacePortScans,
+    setWorkspacePortScanRefreshing,
+    settings,
+    sshConnectionStates: new Map(),
+    sshTargetLabels: new Map(),
+    tabsByWorktree: {},
+    updateWorktreeMeta,
+    workspacePortScan,
+    worktreeCardProperties
+  })
+  return {
+    useAppStore: Object.assign((selector: (state: unknown) => unknown) => selector(getState()), {
+      getState
     })
-}))
+  }
+})
 
 vi.mock('@/components/ui/hover-card', () => ({
   HoverCard: ({ children, openDelay }: { children: ReactNode; openDelay?: number }) => (
@@ -293,7 +297,7 @@ describe('WorktreeCard compact hover details', () => {
     expect(markup).toContain('data-hover-open-delay="100"')
     expectIdentityBodyIsHoverTrigger(markup)
     expect(markup).toContain('Issue #123')
-    expect(markup).toContain('Linear ENG-123')
+    expect(markup).toContain('ENG-123 · Linear')
     expect(markup).toContain('Reviewer handoff note')
     expect(markup).toContain('Live Ports')
     expect(markup).toContain('58941')
diff --git a/src/renderer/src/components/sidebar/WorktreeCard.compact-ports-hover-independence.test.tsx b/src/renderer/src/components/sidebar/WorktreeCard.compact-ports-hover-independence.test.tsx
index 4720e015bf8a..dd324b3e1534 100644
--- a/src/renderer/src/components/sidebar/WorktreeCard.compact-ports-hover-independence.test.tsx
+++ b/src/renderer/src/components/sidebar/WorktreeCard.compact-ports-hover-independence.test.tsx
@@ -22,41 +22,44 @@ const cacheTimerMocks = vi.hoisted(() => ({
 let worktreeCardProperties: WorktreeCardProperty[] = ['status', 'ports']
 let settings: Partial<GlobalSettings> | null = { compactWorktreeCards: true }
 
-vi.mock('@/store', () => ({
-  useAppStore: (selector: (state: unknown) => unknown) =>
-    selector({
-      browserTabsByWorktree: {},
-      agentActivityDisplayMode: undefined,
-      createBrowserTab: vi.fn(),
-      deleteStateByWorktreeId: {},
-      fetchHostedReviewForBranch,
-      fetchIssue,
-      fetchLinearIssue,
-      gitConflictOperationByWorktree: {},
-      hostedReviewCache: {},
-      issueCache: {},
-      linearIssueCache: {},
-      openModal: vi.fn(),
-      openTaskPage: vi.fn(),
-      projectGroups: [],
-      ptyIdsByTabId: {},
-      recordFeatureInteraction: vi.fn(),
-      remoteBranchConflictByWorktreeId: {},
-      setRemoteBrowserPageHandle: vi.fn(),
-      replaceWorkspacePortScans,
-      setWorkspacePortScanRefreshing,
-      settings,
-      sshConnectionStates: new Map(),
-      sshTargetLabels: new Map(),
-      tabsByWorktree: {},
-      updateWorktreeMeta: vi.fn(),
-      workspacePortScan,
-      worktreeCardProperties
+vi.mock('@/store', () => {
+  const getState = () => ({
+    browserTabsByWorktree: {},
+    agentActivityDisplayMode: undefined,
+    createBrowserTab: vi.fn(),
+    deleteStateByWorktreeId: {},
+    fetchHostedReviewForBranch,
+    fetchIssue,
+    fetchLinearIssue,
+    gitConflictOperationByWorktree: {},
+    hostedReviewCache: {},
+    issueCache: {},
+    linearIssueCache: {},
+    openModal: vi.fn(),
+    openTaskPage: vi.fn(),
+    projectGroups: [],
+    ptyIdsByTabId: {},
+    recordFeatureInteraction: vi.fn(),
+    remoteBranchConflictByWorktreeId: {},
+    setRemoteBrowserPageHandle: vi.fn(),
+    replaceWorkspacePortScans,
+    setWorkspacePortScanRefreshing,
+    settings,
+    sshConnectionStates: new Map(),
+    sshTargetLabels: new Map(),
+    tabsByWorktree: {},
+    updateWorktreeMeta: vi.fn(),
+    workspacePortScan,
+    worktreeCardProperties
+  })
+  return {
+    useAppStore: Object.assign((selector: (state: unknown) => unknown) => selector(getState()), {
+      getState
     })
-}))
+  }
+})
 
-// Why: the real Radix HoverCard is controlled by each root's `open`/`onOpenChange`; expose them so the test can
-// prove the compact title root and the ports root track independent open-state controllers.
+// Expose hover controls to verify compact identity and metadata have one owner.
 const openChangeByRoot = new Map<HTMLElement, (open: boolean) => void>()
 vi.mock('@/components/ui/hover-card', () => ({
   HoverCard: ({
@@ -207,7 +210,7 @@ function rootContaining(selector: string): HTMLElement {
   return root
 }
 
-describe('WorktreeCard compact ports hover independence', () => {
+describe('WorktreeCard compact hover ownership', () => {
   let container: HTMLDivElement
   let root: Root
 
@@ -229,8 +232,26 @@ describe('WorktreeCard compact ports hover independence', () => {
     container.remove()
   })
 
-  it('does not force the compact title hover open when the live-ports hover opens', async () => {
-    const worktree = makeWorktree()
+  it('uses one full identity anchor for compact title, metadata, and live ports', async () => {
+    const worktree = makeWorktree({
+      linkedItems: [
+        {
+          provider: 'github',
+          type: 'pr',
+          number: 57,
+          title: 'Review',
+          url: 'https://github.com/acme/orca/pull/57'
+        },
+        {
+          provider: 'linear',
+          type: 'issue',
+          number: 0,
+          identifier: 'ENG-2',
+          title: 'Task',
+          url: 'https://linear.app/acme/issue/ENG-2/task'
+        }
+      ]
+    })
     workspacePortScan = makePortScan(worktree)
     const { default: WorktreeCard } = await import('./WorktreeCard')
 
@@ -238,22 +259,30 @@ describe('WorktreeCard compact ports hover independence', () => {
       root.render(<WorktreeCard worktree={worktree} repo={makeRepo()} isActive={false} />)
     })
 
-    // Compact mode renders two hover roots: the title-wrapper root and the plug/ports root.
     const titleRoot = rootContaining('[data-worktree-title-inline-rename]')
     const portsRoot = rootContaining('[aria-label="1 live port"]')
-    expect(titleRoot).not.toBe(portsRoot)
-    expect(titleRoot.dataset.open).toBe('false')
-    expect(portsRoot.dataset.open).toBe('false')
-
-    // Opening the ports hover must not drag the (separately anchored, wider) title card open — that cross-root
-    // force-open was the flicker loop in #9304.
-    const openPorts = openChangeByRoot.get(portsRoot)
-    expect(openPorts).toBeTypeOf('function')
+    const metadataRoot = rootContaining('[aria-label="Workspace metadata"]')
+    expect(titleRoot).toBe(portsRoot)
+    expect(titleRoot).toBe(metadataRoot)
+    expect(container.querySelectorAll('[data-hovercard-root]')).toHaveLength(1)
+    expect(container.querySelectorAll('[data-hover-card-content]')).toHaveLength(1)
+    expect(
+      container
+        .querySelector('[data-worktree-card-hover-trigger]')
+        ?.hasAttribute('data-hover-card-trigger')
+    ).toBe(true)
+    const open = openChangeByRoot.get(titleRoot)
     act(() => {
-      openPorts?.(true)
+      open?.(true)
     })
-
-    expect(portsRoot.dataset.open).toBe('true')
-    expect(titleRoot.dataset.open).toBe('false')
+    expect(container.querySelectorAll('[data-open="true"]')).toHaveLength(1)
+    act(() => {
+      open?.(false)
+      open?.(true)
+    })
+    expect(container.querySelectorAll('[data-open="true"]')).toHaveLength(1)
+    expect(titleRoot.textContent).toContain('Reviews · 1')
+    expect(titleRoot.textContent).toContain('Issues & tasks · 1')
+    expect(titleRoot.textContent).toContain('58941')
   })
 })
diff --git a/src/renderer/src/components/sidebar/WorktreeCard.pr-display.test.tsx b/src/renderer/src/components/sidebar/WorktreeCard.pr-display.test.tsx
index 18f01fe92b6e..7b03b8ad777a 100644
--- a/src/renderer/src/components/sidebar/WorktreeCard.pr-display.test.tsx
+++ b/src/renderer/src/components/sidebar/WorktreeCard.pr-display.test.tsx
@@ -23,29 +23,33 @@ let prCache: Record<string, unknown> = {}
 let workspacePortScan: WorkspacePortScanResult | null = null
 let settings: Partial<GlobalSettings> | null = null
 
-vi.mock('@/store', () => ({
-  useAppStore: (selector: (state: unknown) => unknown) =>
-    selector({
-      deleteStateByWorktreeId: {},
-      fetchHostedReviewForBranch,
-      fetchIssue,
-      fetchLinearIssue,
-      gitConflictOperationByWorktree: {},
-      hostedReviewCache,
-      issueCache,
-      linearIssueCache: {},
-      openModal,
-      prCache,
-      projectGroups: [],
-      remoteBranchConflictByWorktreeId: {},
-      settings,
-      sshConnectionStates: new Map(),
-      sshTargetLabels: new Map(),
-      updateWorktreeMeta,
-      workspacePortScan,
-      worktreeCardProperties
+vi.mock('@/store', () => {
+  const getState = () => ({
+    deleteStateByWorktreeId: {},
+    fetchHostedReviewForBranch,
+    fetchIssue,
+    fetchLinearIssue,
+    gitConflictOperationByWorktree: {},
+    hostedReviewCache,
+    issueCache,
+    linearIssueCache: {},
+    openModal,
+    prCache,
+    projectGroups: [],
+    remoteBranchConflictByWorktreeId: {},
+    settings,
+    sshConnectionStates: new Map(),
+    sshTargetLabels: new Map(),
+    updateWorktreeMeta,
+    workspacePortScan,
+    worktreeCardProperties
+  })
+  return {
+    useAppStore: Object.assign((selector: (state: unknown) => unknown) => selector(getState()), {
+      getState
     })
-}))
+  }
+})
 
 vi.mock('@/lib/worktree-activation', () => ({
   activateAndRevealWorktree: vi.fn()
diff --git a/src/renderer/src/components/sidebar/WorktreeCard.single-reference-details.test.tsx b/src/renderer/src/components/sidebar/WorktreeCard.single-reference-details.test.tsx
new file mode 100644
index 000000000000..751d3bdb68aa
--- /dev/null
+++ b/src/renderer/src/components/sidebar/WorktreeCard.single-reference-details.test.tsx
@@ -0,0 +1,110 @@
+// @vitest-environment happy-dom
+import type { ReactNode } from 'react'
+import { render, renderHook, screen, cleanup } from '@testing-library/react'
+import { afterEach, describe, expect, it, vi } from 'vitest'
+import { WorktreeCardDetailsHover } from './WorktreeCardMeta'
+import { useWorktreeCardReviewDetails } from './use-worktree-card-review-details'
+import { useWorktreeCardLinkedDetails } from './use-worktree-card-linked-details'
+import {
+  referenceWorkspace,
+  referenceRepo,
+  referenceLinearIssue
+} from './workspace-reference-fixtures.test-support'
+import { normalizeTaskSourceContext } from '../../../../shared/task-source-context'
+import { getLinearReadScope, scopedLinearCacheKey } from '@/store/slices/linear/linear-slice-scope'
+
+const cache = vi.hoisted(() => ({ entries: {} }))
+vi.mock('@/store', () => ({
+  useAppStore: (selector: (state: unknown) => unknown) =>
+    selector({
+      hostedReviewCache: {},
+      prCache: {},
+      issueCache: {},
+      linearIssueCache: cache.entries
+    })
+}))
+vi.mock('@/components/ui/hover-card', () => ({
+  HoverCard: ({ children }: { children: ReactNode }) => <>{children}</>,
+  HoverCardTrigger: ({ children }: { children: ReactNode }) => <>{children}</>,
+  HoverCardContent: ({ children }: { children: ReactNode }) => <div>{children}</div>
+}))
+vi.mock('@/components/ui/tooltip', () => ({
+  Tooltip: ({ children }: { children: ReactNode }) => <>{children}</>,
+  TooltipTrigger: ({ children }: { children: ReactNode }) => <>{children}</>,
+  TooltipContent: () => null
+}))
+vi.mock('@/components/SelectedTextCopyMenu', () => ({
+  SelectedTextCopyMenu: ({ children }: { children: ReactNode }) => <div>{children}</div>
+}))
+vi.mock('./workspace-delete-quick-action', () => ({
+  useWorkspaceDeleteModifierPressed: () => false
+}))
+afterEach(cleanup)
+
+describe('single linked reference rich hover details', () => {
+  it('reuses source-bound Linear details when an exact workspace read is outside the legacy all-workspaces cache slot', () => {
+    const source = normalizeTaskSourceContext({
+      provider: 'linear',
+      projectId: 'project',
+      hostId: 'runtime:owner',
+      providerIdentity: { provider: 'linear', workspaceId: 'workspace' }
+    })
+    const item = {
+      provider: 'linear' as const,
+      type: 'issue' as const,
+      number: 0,
+      identifier: 'ENG-1',
+      url: 'https://linear.app/acme/issue/ENG-1/task',
+      taskSourceContext: source ?? undefined
+    }
+    const workspace = {
+      ...referenceWorkspace,
+      linkedPR: null,
+      linkedLinearIssue: 'ENG-1',
+      linkedItems: [item],
+      linkedTaskSourceContext: source
+    }
+    const issue = referenceLinearIssue()
+    cache.entries = {
+      [scopedLinearCacheKey(getLinearReadScope(null, source), 'workspace::ENG-1')]: {
+        data: issue,
+        fetchedAt: Date.now()
+      }
+    }
+    const legacy = renderHook(() => {
+      const review = useWorktreeCardReviewDetails({
+        worktree: workspace,
+        repo: referenceRepo,
+        settings: null,
+        projectGroups: [],
+        cardProps: ['linear-issue'],
+        newCardStyle: false
+      })
+      return {
+        review,
+        linked: useWorktreeCardLinkedDetails({
+          worktree: workspace,
+          newCardStyle: false,
+          deleteState: undefined,
+          ...review
+        })
+      }
+    })
+    expect(legacy.result.current.review.linearIssueEntry?.data).toEqual(issue)
+    const { container } = render(
+      <WorktreeCardDetailsHover
+        workspace={workspace}
+        issue={null}
+        linearIssue={legacy.result.current.linked.linearIssueDisplay}
+        review={null}
+        comment={null}
+      >
+        <span>Workspace</span>
+      </WorktreeCardDetailsHover>
+    )
+    expect(screen.getByText('Task')).toBeTruthy()
+    expect(screen.getByText('State: In Progress')).toBeTruthy()
+    expect(screen.queryByText('Loading Linear issue...')).toBeNull()
+    expect(container.querySelector('[data-workspace-hover-reference]')).toBeNull()
+  })
+})
diff --git a/src/renderer/src/components/sidebar/WorktreeCardLinkedItemsSection.test.tsx b/src/renderer/src/components/sidebar/WorktreeCardLinkedItemsSection.test.tsx
new file mode 100644
index 000000000000..eb70753efa9f
--- /dev/null
+++ b/src/renderer/src/components/sidebar/WorktreeCardLinkedItemsSection.test.tsx
@@ -0,0 +1,220 @@
+// @vitest-environment happy-dom
+import type { ReactNode } from 'react'
+import { render, screen, fireEvent, cleanup } from '@testing-library/react'
+import { afterEach, describe, expect, it, vi } from 'vitest'
+import { WorktreeCardDetailsHover } from './WorktreeCardMeta'
+import type { Worktree, WorkspaceAttachment } from '../../../../shared/worktree/types'
+import { makeWorktree } from '../../store/slices/worktrees-slice-test-fixtures'
+import { getWorkspaceAttachmentKey } from '../../../../shared/workspace-attachment-normalization'
+import { useWorktreeCardDetailsHoverControl } from './worktree-card-details-hover-state'
+import type { WorkspaceReferenceDetailsMap } from './workspace-reference-details'
+
+vi.mock('@/components/ui/tooltip', () => ({
+  Tooltip: ({ children }: { children: ReactNode }) => <>{children}</>,
+  TooltipTrigger: ({ children }: { children: ReactNode }) => <>{children}</>,
+  TooltipContent: () => null
+}))
+vi.mock('@/components/SelectedTextCopyMenu', () => ({
+  SelectedTextCopyMenu: ({ children }: { children: ReactNode }) => <div>{children}</div>
+}))
+vi.mock('@/components/ui/hover-card', () => ({
+  HoverCard: ({
+    children,
+    open,
+    onOpenChange
+  }: {
+    children: ReactNode
+    open: boolean
+    onOpenChange: (open: boolean) => void
+  }) => (
+    <div data-hover-open={String(open)}>
+      <button onClick={() => onOpenChange(true)}>Hover workspace</button>
+      {children}
+    </div>
+  ),
+  HoverCardTrigger: ({ children }: { children: ReactNode }) => <>{children}</>,
+  HoverCardContent: ({ children }: { children: ReactNode }) => (
+    <div data-hover-content="">{children}</div>
+  )
+}))
+const attachments = [
+  {
+    provider: 'github',
+    type: 'pr',
+    number: 57,
+    title: 'Active review',
+    url: 'https://github.com/acme/orca/pull/57'
+  },
+  {
+    provider: 'gitlab',
+    type: 'mr',
+    number: 42,
+    title: 'Sibling review',
+    url: 'https://gitlab.example.com/team/orca/-/merge_requests/42'
+  },
+  {
+    provider: 'linear',
+    type: 'issue',
+    number: 0,
+    identifier: 'ENG-215',
+    title: 'Keyboard accessibility',
+    url: 'https://linear.app/acme/issue/ENG-215/title'
+  },
+  {
+    provider: 'jira',
+    type: 'issue',
+    number: 0,
+    identifier: 'APP-18',
+    title: 'Fix attachments',
+    url: 'https://acme.atlassian.net/browse/APP-18'
+  }
+] satisfies WorkspaceAttachment[]
+const workspace = makeWorktree({
+  id: 'repo::/repo/feature',
+  repoId: 'repo',
+  hostId: 'ssh:owner',
+  linkedPR: 57,
+  linkedItems: attachments
+})
+const review = {
+  provider: 'github' as const,
+  number: 57,
+  title: 'Active review',
+  url: 'https://github.com/acme/orca/pull/57',
+  status: 'success' as const
+}
+function Fixture({
+  onManage,
+  referenceDetails,
+  worktree = workspace
+}: {
+  onManage: () => void
+  referenceDetails?: WorkspaceReferenceDetailsMap
+  worktree?: Worktree
+}): React.JSX.Element {
+  const hoverControl = useWorktreeCardDetailsHoverControl()
+  return (
+    <WorktreeCardDetailsHover
+      workspace={worktree}
+      referenceDetails={referenceDetails}
+      review={review}
+      issue={null}
+      linearIssue={null}
+      comment={null}
+      onManageLinks={onManage}
+      hoverControl={hoverControl}
+    >
+      <span>Workspace</span>
+    </WorktreeCardDetailsHover>
+  )
+}
+afterEach(cleanup)
+describe('workspace linked references in hover details', () => {
+  it('shows each fetched sibling status and target without applying primary checks to its peers', () => {
+    const [, sibling, task] = attachments
+    const details: WorkspaceReferenceDetailsMap = {
+      [getWorkspaceAttachmentKey(sibling)]: {
+        title: 'Merged sibling',
+        url: sibling.url ?? '',
+        review: {
+          provider: 'gitlab',
+          number: 42,
+          title: 'Merged sibling',
+          url: sibling.url,
+          state: 'merged',
+          status: 'neutral',
+          baseRefName: 'release',
+          updatedAt: '2026-10-07',
+          mergeable: 'UNKNOWN'
+        }
+      },
+      [getWorkspaceAttachmentKey(task)]: {
+        title: 'Known task',
+        url: task.url ?? '',
+        stateName: 'In Progress'
+      }
+    }
+    const { container } = render(<Fixture onManage={vi.fn()} referenceDetails={details} />)
+    expect(screen.getByText('Merged sibling')).toBeTruthy()
+    expect(screen.getByText('State: Merged')).toBeTruthy()
+    expect(screen.getByText('Target: release')).toBeTruthy()
+    expect(screen.getByText('State: In Progress')).toBeTruthy()
+    expect(screen.getAllByText('Checks: Passing')).toHaveLength(1)
+    expect(screen.queryByText('Used for checks')).toBeNull()
+    const siblingRow = Array.from(
+      container.querySelectorAll('[data-workspace-hover-reference]')
+    ).find((node) => node.textContent?.includes('Merged sibling'))
+    const icon = siblingRow?.querySelector('svg')
+    expect(icon?.classList.contains('lucide-git-merge')).toBe(true)
+    expect(icon?.classList.contains('dark:text-purple-400/70')).toBe(true)
+  })
+  it('shows grouped peers and only each review’s own known checks', () => {
+    const { container } = render(<Fixture onManage={vi.fn()} />)
+    expect(screen.getByText('Reviews · 2')).toBeTruthy()
+    expect(screen.getByText('Issues & tasks · 2')).toBeTruthy()
+    expect(screen.getAllByText('Active review')).toHaveLength(1)
+    expect(screen.getByText('MR !42 · GitLab · gitlab.example.com/team/orca')).toBeTruthy()
+    expect(screen.getByText('ENG-215 · Linear · acme')).toBeTruthy()
+    const key = getWorkspaceAttachmentKey(attachments[0])
+    expect(
+      Array.from(container.querySelectorAll('[data-workspace-hover-reference]')).find(
+        (node) => node.getAttribute('data-workspace-hover-reference') === key
+      )?.textContent
+    ).toContain('Checks: Passing')
+    expect(screen.queryByText('Used for checks')).toBeNull()
+    expect(screen.getAllByText('Checks: Passing')).toHaveLength(1)
+  })
+  it('opens a reference without activating the parent and dismisses hover', () => {
+    const openUrl = vi.fn()
+    Object.defineProperty(window, 'api', { configurable: true, value: { shell: { openUrl } } })
+    const parentClick = vi.fn()
+    const { container } = render(
+      <div onClick={parentClick}>
+        <Fixture onManage={vi.fn()} />
+      </div>
+    )
+    fireEvent.click(screen.getByRole('button', { name: 'Hover workspace' }))
+    parentClick.mockClear()
+    fireEvent.click(screen.getByRole('button', { name: 'Open MR !42' }))
+    expect(openUrl).toHaveBeenCalledWith('https://gitlab.example.com/team/orca/-/merge_requests/42')
+    expect(parentClick).not.toHaveBeenCalled()
+    expect(container.querySelector('[data-hover-open]')?.getAttribute('data-hover-open')).toBe(
+      'false'
+    )
+  })
+  it('dismisses hover before managing links and exposes no second picker', () => {
+    const onManage = vi.fn()
+    const { container } = render(<Fixture onManage={onManage} />)
+    fireEvent.click(screen.getByRole('button', { name: 'Hover workspace' }))
+    fireEvent.click(screen.getByRole('button', { name: 'Manage links…' }))
+    expect(onManage).toHaveBeenCalledTimes(1)
+    expect(container.querySelector('[data-hover-open]')?.getAttribute('data-hover-open')).toBe(
+      'false'
+    )
+    expect(screen.queryByRole('combobox')).toBeNull()
+  })
+  it('opens metadata management for a URL-less reference and handles attachment-only folders', () => {
+    const onManage = vi.fn()
+    const { container } = render(
+      <WorktreeCardDetailsHover
+        workspace={{
+          ...workspace,
+          id: 'folder:docs',
+          linkedPR: null,
+          linkedItems: [{ provider: 'gitea', type: 'pr', number: 7 }]
+        }}
+        onManageLinks={onManage}
+        issue={null}
+        linearIssue={null}
+        review={null}
+        comment={null}
+      >
+        <span>Folder</span>
+      </WorktreeCardDetailsHover>
+    )
+    expect(container.querySelector('[data-workspace-hover-reference]')).toBeTruthy()
+    fireEvent.click(screen.getByRole('button', { name: 'Open PR #7' }))
+    expect(onManage).toHaveBeenCalledTimes(1)
+    expect(screen.queryByText('Used for checks')).toBeNull()
+  })
+})
diff --git a/src/renderer/src/components/sidebar/WorktreeCardLinkedItemsSection.tsx b/src/renderer/src/components/sidebar/WorktreeCardLinkedItemsSection.tsx
new file mode 100644
index 000000000000..0db0a15c76d8
--- /dev/null
+++ b/src/renderer/src/components/sidebar/WorktreeCardLinkedItemsSection.tsx
@@ -0,0 +1,204 @@
+import React from 'react'
+import { CircleDot, ExternalLink, GitMerge, GitPullRequest, Link2, Plus } from 'lucide-react'
+import { Button } from '@/components/ui/button'
+import { translate } from '@/i18n/i18n'
+import type { WorkspaceAttachment, Worktree } from '../../../../shared/worktree/types'
+import { getWorkspaceAttachmentKey } from '../../../../shared/workspace-attachment-normalization'
+import {
+  workspaceAttachmentLabel,
+  workspaceAttachmentProviderLabel
+} from './worktree-attachment-editing'
+import { getWorkspaceAttachmentSourceLabel } from './workspace-attachment-source-label'
+import { WorktreeCardDetailSection } from './WorktreeCardDetailSection'
+import { DetailHeader } from './WorktreeCardMetadataControls'
+import {
+  IssueStateBadge,
+  LinearStateBadge,
+  ReviewChecksBadge,
+  ReviewStateBadge
+} from './WorktreeCardMetadataStatusBadges'
+import { WorkspaceAttachmentOrigins } from './WorkspaceAttachmentOrigins'
+import { getReviewLabel, ReviewIcon } from './worktree-review-helpers'
+import type { WorkspaceReferenceDetailsMap } from './workspace-reference-details'
+import { getWorkspaceHoverAttachments } from './workspace-hover-attachments'
+import type {
+  WorktreeCardIssueDisplay,
+  WorktreeCardLinearIssueDisplay,
+  WorktreeCardJiraIssueDisplay
+} from './worktree-card-meta-types'
+import type { WorktreeCardPrDisplay } from './worktree-card-pr-display'
+
+export function WorktreeCardLinkedItemsSection({
+  workspace,
+  referenceDetails,
+  review,
+  issue,
+  linearIssue,
+  jiraIssue,
+  showItems,
+  onManage,
+  onOpen
+}: {
+  workspace?: Worktree
+  referenceDetails?: WorkspaceReferenceDetailsMap
+  review: WorktreeCardPrDisplay | null
+  issue?: WorktreeCardIssueDisplay | null
+  linearIssue?: WorktreeCardLinearIssueDisplay | null
+  jiraIssue?: WorktreeCardJiraIssueDisplay | null
+  showItems: boolean
+  onManage?: (event: React.MouseEvent) => void
+  onOpen?: (url: string) => void
+}): React.JSX.Element | null {
+  if (!workspace) {
+    return null
+  }
+  const { items, activeKey, referenceKeys } = getWorkspaceHoverAttachments(workspace, {
+    review,
+    issue,
+    linearIssue,
+    jiraIssue
+  })
+  const groups = [
+    {
+      label: translate('workspace.links.reviews', 'Reviews'),
+      items: items.filter((item) => item.type !== 'issue')
+    },
+    {
+      label: translate('workspace.links.tasks', 'Issues & tasks'),
+      items: items.filter((item) => item.type === 'issue')
+    }
+  ].filter((group) => group.items.length)
+  const open = (item: WorkspaceAttachment, event: React.MouseEvent): void => {
+    event.stopPropagation()
+    if (item.url) {
+      if (onOpen) {
+        onOpen(item.url)
+      } else {
+        void window.api.shell.openUrl(item.url)
+      }
+    } else {
+      onManage?.(event)
+    }
+  }
+  return (
+    <WorktreeCardDetailSection data-workspace-hover-linked-items="">
+      {showItems
+        ? groups.map((group) => (
+            <div key={group.label} className="space-y-1.5">
+              <DetailHeader
+                icon={<Link2 className="size-3" />}
+                label={`${group.label} · ${group.items.length}`}
+              />
+              <div className="divide-y divide-border">
+                {group.items.map((item) => {
+                  const key = getWorkspaceAttachmentKey(item)
+                  const label = workspaceAttachmentLabel(item)
+                  const source = getWorkspaceAttachmentSourceLabel(item)
+                  const active = key === activeKey
+                  const detail = referenceDetails?.[referenceKeys[items.indexOf(item)]]
+                  const url = item.url || detail?.url
+                  const live =
+                    detail?.review ??
+                    (active &&
+                    review?.provider === item.provider &&
+                    review.number === item.number &&
+                    (!item.url || review.url === item.url)
+                      ? review
+                      : null)
+                  return (
+                    <div
+                      key={key}
+                      className="space-y-1 py-1.5"
+                      data-workspace-hover-reference={key}
+                    >
+                      <div className="flex min-w-0 items-start gap-2">
+                        {live ? (
+                          <ReviewIcon review={live} className="mt-0.5 size-3.5 shrink-0" />
+                        ) : item.type === 'mr' ? (
+                          <GitMerge className="mt-0.5 size-3.5 shrink-0 text-muted-foreground" />
+                        ) : item.type === 'pr' ? (
+                          <GitPullRequest className="mt-0.5 size-3.5 shrink-0 text-muted-foreground" />
+                        ) : (
+                          <CircleDot className="mt-0.5 size-3.5 shrink-0 text-muted-foreground" />
+                        )}
+                        <button
+                          type="button"
+                          className="min-w-0 flex-1 rounded-sm text-left outline-none hover:text-foreground focus-visible:ring-2 focus-visible:ring-ring"
+                          disabled={!url && !onManage}
+                          aria-label={translate('workspace.links.openItem', 'Open {{label}}', {
+                            label
+                          })}
+                          onClick={(event) => open({ ...item, url }, event)}
+                          onKeyDown={(event) => event.stopPropagation()}
+                        >
+                          <p className="line-clamp-2 text-xs font-medium leading-snug">
+                            {detail?.title || item.title || (live?.url ? live.title : label)}
+                          </p>
+                          <p className="truncate text-[11px] text-muted-foreground">
+                            {label} · {workspaceAttachmentProviderLabel(item)}
+                            {source ? ` · ${source}` : ''}
+                          </p>
+                        </button>
+                        {url ? (
+                          <ExternalLink
+                            aria-hidden
+                            className="mt-0.5 size-3 shrink-0 text-muted-foreground"
+                          />
+                        ) : null}
+                      </div>
+                      {live?.state || live?.status || detail?.stateName || detail?.issueState ? (
+                        <div className="flex flex-wrap items-center gap-1 pl-5">
+                          {live?.state ? (
+                            <ReviewStateBadge state={live.state} label={getReviewLabel(live)} />
+                          ) : null}
+                          {live?.status ? <ReviewChecksBadge status={live.status} /> : null}
+                          {detail?.stale ? (
+                            <span className="text-[11px] text-muted-foreground">
+                              {translate('workspace.links.lastKnownStatus', 'Last known status')}
+                            </span>
+                          ) : null}
+                          {live && 'baseRefName' in live && live.baseRefName ? (
+                            <span className="text-[11px] text-muted-foreground">
+                              {translate('workspace.links.reviewTarget', 'Target: {{branch}}', {
+                                branch: live.baseRefName
+                              })}
+                            </span>
+                          ) : null}
+                          {detail?.stateName ? (
+                            <LinearStateBadge
+                              stateName={detail.stateName}
+                              stateType={detail.stateType}
+                            />
+                          ) : null}
+                          {detail?.issueState ? (
+                            <IssueStateBadge state={detail.issueState} />
+                          ) : null}
+                        </div>
+                      ) : null}
+                      {item.origins?.length ? (
+                        <WorkspaceAttachmentOrigins item={item} workspace={workspace} />
+                      ) : null}
+                    </div>
+                  )
+                })}
+              </div>
+            </div>
+          ))
+        : null}
+      {onManage ? (
+        <Button
+          type="button"
+          variant="ghost"
+          size="xs"
+          onClick={onManage}
+          onKeyDown={(event) => event.stopPropagation()}
+        >
+          <Plus />
+          {items.length
+            ? translate('workspace.links.manage', 'Manage links…')
+            : translate('workspace.links.addReference', 'Add reference')}
+        </Button>
+      ) : null}
+    </WorktreeCardDetailSection>
+  )
+}
diff --git a/src/renderer/src/components/sidebar/WorktreeCardMeta.tsx b/src/renderer/src/components/sidebar/WorktreeCardMeta.tsx
index 673dcad0f06c..d6bef7520354 100644
--- a/src/renderer/src/components/sidebar/WorktreeCardMeta.tsx
+++ b/src/renderer/src/components/sidebar/WorktreeCardMeta.tsx
@@ -1,4 +1,6 @@
 import React from 'react'
+import { getWorkspaceAttachments } from '../../../../shared/workspace-attachments'
+import { WorktreeCardLinkedItemsSection } from './WorktreeCardLinkedItemsSection'
 import { Badge } from '@/components/ui/badge'
 import { HoverCard, HoverCardTrigger, HoverCardContent } from '@/components/ui/hover-card'
 import { ExternalLink, MonitorUp, Pencil, StickyNote } from 'lucide-react'
@@ -53,6 +55,9 @@ function hasComment(comment: string | null): boolean {
 }
 
 export function WorktreeCardDetailsHover({
+  workspace,
+  referenceDetails,
+  onManageLinks,
   issue,
   linearIssue,
   jiraIssue,
@@ -162,9 +167,15 @@ export function WorktreeCardDetailsHover({
   }, [copyLinkedWorkItemLink, review])
 
   const showIdentityHeader = Boolean(branchName || workspaceTitle)
+  const attachments = getWorkspaceAttachments(workspace ?? {})
+  const showAttachmentCollection =
+    attachments.length > 1 ||
+    (attachments.length === 1 && !issue && !linearIssue && !jiraIssue && !review)
 
   if (
     !showIdentityHeader &&
+    attachments.length === 0 &&
+    !onManageLinks &&
     !hasWorktreeCardDetails({
       issue,
       linearIssue,
@@ -196,7 +207,7 @@ export function WorktreeCardDetailsHover({
         side="right"
         align="start"
         sideOffset={8}
-        className="w-80 max-h-[28rem] overflow-y-auto p-3 text-xs scrollbar-sleek"
+        variant="workspace-details"
         {...{ [WORKTREE_NATIVE_CONTEXT_MENU_ATTR]: '' }}
         onClick={(event) => event.stopPropagation()}
         onDoubleClick={(event) => event.stopPropagation()}
@@ -213,122 +224,143 @@ export function WorktreeCardDetailsHover({
             />
           )}
 
-          <WorktreeCardIssueDetailSection
-            issue={issue}
-            issueMenuOpen={issueMenuOpen}
-            onIssueMenuOpenChange={handleIssueMenuOpenChange}
-            onCopyIssueLink={issue?.url ? handleCopyIssueLink : undefined}
-            onEditIssue={onEditIssue}
-            onOpenGitHubIssueInOrca={
-              onOpenGitHubIssueInOrca ? dismissAndRun(onOpenGitHubIssueInOrca) : undefined
-            }
-            onOpenIssueInBrowser={
-              onOpenIssueInBrowser && issue?.url
-                ? (url: string) => {
-                    closeHover()
-                    onOpenIssueInBrowser(url)
-                  }
-                : undefined
-            }
-          />
+          {!showAttachmentCollection ? (
+            <>
+              <WorktreeCardIssueDetailSection
+                issue={issue}
+                issueMenuOpen={issueMenuOpen}
+                onIssueMenuOpenChange={handleIssueMenuOpenChange}
+                onCopyIssueLink={issue?.url ? handleCopyIssueLink : undefined}
+                onEditIssue={onEditIssue}
+                onOpenGitHubIssueInOrca={
+                  onOpenGitHubIssueInOrca ? dismissAndRun(onOpenGitHubIssueInOrca) : undefined
+                }
+                onOpenIssueInBrowser={
+                  onOpenIssueInBrowser && issue?.url
+                    ? (url: string) => {
+                        closeHover()
+                        onOpenIssueInBrowser(url)
+                      }
+                    : undefined
+                }
+              />
 
-          {linearIssue && (
-            <WorktreeCardDetailSection>
-              <DetailHeader
-                icon={<LinearIcon className="size-3 text-muted-foreground" />}
-                label={translate(
-                  'auto.components.sidebar.WorktreeCardMeta.5e982e6128',
-                  'Linear {{value0}}',
-                  { value0: linearIssue.identifier }
-                )}
-                actions={
-                  <>
-                    {linearIssue.url && onOpenLinearIssueInOrca && (
-                      <MetadataActionIcon
-                        label={translate(
-                          'auto.components.sidebar.WorktreeCardMeta.2c67730e07',
-                          'Open in Orca'
+              {linearIssue && (
+                <WorktreeCardDetailSection>
+                  <DetailHeader
+                    icon={<LinearIcon className="size-3 text-muted-foreground" />}
+                    label={translate(
+                      'auto.components.sidebar.WorktreeCardMeta.5e982e6128',
+                      'Linear {{value0}}',
+                      { value0: linearIssue.identifier }
+                    )}
+                    actions={
+                      <>
+                        {linearIssue.url && onOpenLinearIssueInOrca && (
+                          <MetadataActionIcon
+                            label={translate(
+                              'auto.components.sidebar.WorktreeCardMeta.2c67730e07',
+                              'Open in Orca'
+                            )}
+                            onClick={dismissAndRun(onOpenLinearIssueInOrca)}
+                          >
+                            <MonitorUp className="size-3" />
+                          </MetadataActionIcon>
                         )}
-                        onClick={dismissAndRun(onOpenLinearIssueInOrca)}
-                      >
-                        <MonitorUp className="size-3" />
-                      </MetadataActionIcon>
+                        {linearIssue.url && (
+                          <MetadataActionIcon
+                            label={translate(
+                              'auto.components.sidebar.WorktreeCardMeta.e42941631a',
+                              'View on Linear'
+                            )}
+                            href={linearIssue.url}
+                          >
+                            <ExternalLink className="size-3" />
+                          </MetadataActionIcon>
+                        )}
+                      </>
+                    }
+                  />
+                  <WorktreeCardDetailSectionContent className="space-y-1.5">
+                    <div className="text-[13px] font-semibold leading-snug text-foreground break-words">
+                      {linearIssue.title}
+                    </div>
+                    {((linearIssue.labels && linearIssue.labels.length > 0) ||
+                      linearIssue.stateName) && (
+                      <div className="flex flex-wrap gap-1">
+                        {linearIssue.stateName && (
+                          <LinearStateBadge
+                            stateName={linearIssue.stateName}
+                            stateType={linearIssue.stateType}
+                          />
+                        )}
+                        {(linearIssue.labels ?? []).map((label) => (
+                          <Badge key={label} variant="outline" className="h-4 px-1.5 text-[9px]">
+                            {label}
+                          </Badge>
+                        ))}
+                      </div>
+                    )}
+                  </WorktreeCardDetailSectionContent>
+                </WorktreeCardDetailSection>
+              )}
+
+              {jiraIssue && (
+                <WorktreeCardDetailSection>
+                  <DetailHeader
+                    icon={<JiraIcon className="size-3 text-muted-foreground" />}
+                    label={translate(
+                      'auto.components.sidebar.WorktreeCardMeta.jiraIssue',
+                      'Jira {{value0}}',
+                      { value0: jiraIssue.identifier }
                     )}
-                    {linearIssue.url && (
+                    actions={
                       <MetadataActionIcon
                         label={translate(
-                          'auto.components.sidebar.WorktreeCardMeta.e42941631a',
-                          'View on Linear'
+                          'auto.components.sidebar.WorktreeCardMeta.viewOnJira',
+                          'View on Jira'
                         )}
-                        href={linearIssue.url}
+                        href={jiraIssue.url}
                       >
                         <ExternalLink className="size-3" />
                       </MetadataActionIcon>
-                    )}
-                  </>
-                }
-              />
-              <WorktreeCardDetailSectionContent className="space-y-1.5">
-                <div className="text-[13px] font-semibold leading-snug text-foreground break-words">
-                  {linearIssue.title}
-                </div>
-                {((linearIssue.labels && linearIssue.labels.length > 0) ||
-                  linearIssue.stateName) && (
-                  <div className="flex flex-wrap gap-1">
-                    {linearIssue.stateName && (
-                      <LinearStateBadge stateName={linearIssue.stateName} />
-                    )}
-                    {(linearIssue.labels ?? []).map((label) => (
-                      <Badge key={label} variant="outline" className="h-4 px-1.5 text-[9px]">
-                        {label}
-                      </Badge>
-                    ))}
-                  </div>
-                )}
-              </WorktreeCardDetailSectionContent>
-            </WorktreeCardDetailSection>
-          )}
+                    }
+                  />
+                  <WorktreeCardDetailSectionContent>
+                    <div className="text-[13px] font-semibold leading-snug text-foreground break-words">
+                      {jiraIssue.title}
+                    </div>
+                  </WorktreeCardDetailSectionContent>
+                </WorktreeCardDetailSection>
+              )}
 
-          {jiraIssue && (
-            <WorktreeCardDetailSection>
-              <DetailHeader
-                icon={<JiraIcon className="size-3 text-muted-foreground" />}
-                label={translate(
-                  'auto.components.sidebar.WorktreeCardMeta.jiraIssue',
-                  'Jira {{value0}}',
-                  { value0: jiraIssue.identifier }
-                )}
-                actions={
-                  <MetadataActionIcon
-                    label={translate(
-                      'auto.components.sidebar.WorktreeCardMeta.viewOnJira',
-                      'View on Jira'
-                    )}
-                    href={jiraIssue.url}
-                  >
-                    <ExternalLink className="size-3" />
-                  </MetadataActionIcon>
+              <WorktreeCardReviewDetailSection
+                review={review}
+                reviewMenuOpen={reviewMenuOpen}
+                onReviewMenuOpenChange={handleReviewMenuOpenChange}
+                onOpenReviewInOrca={onOpenReviewInOrca}
+                onOpenReviewInBrowser={
+                  onOpenReviewInBrowser && review?.url ? onOpenReviewInBrowser : undefined
                 }
+                onCopyReviewLink={review?.url ? handleCopyReviewLink : undefined}
+                onUnlinkReview={onUnlinkReview}
+                closeHover={closeHover}
               />
-              <WorktreeCardDetailSectionContent>
-                <div className="text-[13px] font-semibold leading-snug text-foreground break-words">
-                  {jiraIssue.title}
-                </div>
-              </WorktreeCardDetailSectionContent>
-            </WorktreeCardDetailSection>
-          )}
-
-          <WorktreeCardReviewDetailSection
+            </>
+          ) : null}
+          <WorktreeCardLinkedItemsSection
+            workspace={workspace}
+            referenceDetails={referenceDetails}
             review={review}
-            reviewMenuOpen={reviewMenuOpen}
-            onReviewMenuOpenChange={handleReviewMenuOpenChange}
-            onOpenReviewInOrca={onOpenReviewInOrca}
-            onOpenReviewInBrowser={
-              onOpenReviewInBrowser && review?.url ? onOpenReviewInBrowser : undefined
-            }
-            onCopyReviewLink={review?.url ? handleCopyReviewLink : undefined}
-            onUnlinkReview={onUnlinkReview}
-            closeHover={closeHover}
+            issue={issue}
+            linearIssue={linearIssue}
+            jiraIssue={jiraIssue}
+            showItems={showAttachmentCollection}
+            onManage={onManageLinks ? dismissAndRun(onManageLinks) : undefined}
+            onOpen={(url) => {
+              closeHover()
+              void window.api.shell.openUrl(url)
+            }}
           />
 
           {automationProvenance && (
diff --git a/src/renderer/src/components/sidebar/WorktreeCardMetaBadges.tsx b/src/renderer/src/components/sidebar/WorktreeCardMetaBadges.tsx
index 634bc59d126f..4b2bb876d182 100644
--- a/src/renderer/src/components/sidebar/WorktreeCardMetaBadges.tsx
+++ b/src/renderer/src/components/sidebar/WorktreeCardMetaBadges.tsx
@@ -1,5 +1,5 @@
 import React from 'react'
-import { CalendarClock, CircleDot, SquareTerminal, StickyNote } from 'lucide-react'
+import { CalendarClock, CircleDot, Link2, SquareTerminal, StickyNote } from 'lucide-react'
 import { cn } from '@/lib/utils'
 import { LinearIcon } from '@/components/icons/LinearIcon'
 import { JiraIcon } from '@/components/icons/JiraIcon'
@@ -10,12 +10,14 @@ import type {
   WorktreeCardMetaBadgesRootProps
 } from './worktree-card-meta-types'
 import { translate } from '@/i18n/i18n'
+import { WorktreeReferenceStack } from './WorktreeReferenceStack'
 
 function hasComment(comment: string | null): boolean {
   return (comment ?? '').trim().length > 0
 }
 
 export function hasWorktreeCardDetails({
+  linkedItemCount = 0,
   issue,
   linearIssue,
   jiraIssue,
@@ -25,6 +27,7 @@ export function hasWorktreeCardDetails({
   cliProvenance
 }: WorktreeCardMetaBadgesProps): boolean {
   return Boolean(
+    linkedItemCount > 0 ||
     issue ||
     linearIssue ||
     jiraIssue ||
@@ -40,6 +43,9 @@ export const WorktreeCardMetaBadges = React.forwardRef<
   WorktreeCardMetaBadgesRootProps
 >(function WorktreeCardMetaBadges(
   {
+    linkedItemCount = 0,
+    referenceItems,
+    referenceDetails,
     issue,
     linearIssue,
     jiraIssue,
@@ -54,6 +60,7 @@ export const WorktreeCardMetaBadges = React.forwardRef<
 ): React.JSX.Element | null {
   if (
     !hasWorktreeCardDetails({
+      linkedItemCount,
       issue,
       linearIssue,
       jiraIssue,
@@ -66,6 +73,14 @@ export const WorktreeCardMetaBadges = React.forwardRef<
     return null
   }
 
+  const reviewItems = referenceItems?.filter((item) => item.type !== 'issue') ?? []
+  const linearItems = referenceItems?.filter((item) => item.provider === 'linear') ?? []
+  const jiraItems = referenceItems?.filter((item) => item.provider === 'jira') ?? []
+  const issueItems =
+    referenceItems?.filter(
+      (item) => item.type === 'issue' && item.provider !== 'linear' && item.provider !== 'jira'
+    ) ?? []
+
   return (
     // Why: Radix HoverCardTrigger uses `asChild`, so this group must forward
     // trigger props/ref to the actual DOM node for attachment-only hover.
@@ -78,6 +93,20 @@ export const WorktreeCardMetaBadges = React.forwardRef<
         'Workspace metadata'
       )}
     >
+      {linkedItemCount > 0 &&
+      !referenceItems?.length &&
+      !issue &&
+      !linearIssue &&
+      !jiraIssue &&
+      !review ? (
+        <MetaIconBadge
+          label={translate('workspace.links.show', 'Show {{count}} linked reviews and tasks', {
+            count: linkedItemCount
+          })}
+        >
+          <Link2 />
+        </MetaIconBadge>
+      ) : null}
       {hasComment(comment) && (
         <MetaIconBadge
           label={translate(
@@ -108,40 +137,58 @@ export const WorktreeCardMetaBadges = React.forwardRef<
           <SquareTerminal className="text-muted-foreground" />
         </MetaIconBadge>
       )}
-      {issue && (
-        <MetaIconBadge
-          label={translate(
-            'auto.components.sidebar.WorktreeCardMeta.3f2649eeb8',
-            'Linked issue #{{value0}}',
-            { value0: issue.number }
-          )}
-        >
-          <CircleDot className="text-muted-foreground" />
-        </MetaIconBadge>
+      {issueItems.length ? (
+        <WorktreeReferenceStack items={issueItems} details={referenceDetails} />
+      ) : (
+        issue && (
+          <MetaIconBadge
+            label={translate(
+              'auto.components.sidebar.WorktreeCardMeta.3f2649eeb8',
+              'Linked issue #{{value0}}',
+              { value0: issue.number }
+            )}
+          >
+            <CircleDot className="text-muted-foreground" />
+          </MetaIconBadge>
+        )
       )}
-      {linearIssue && (
-        <MetaIconBadge
-          label={translate(
-            'auto.components.sidebar.WorktreeCardMeta.b105fd3057',
-            'Linked Linear {{value0}}',
-            { value0: linearIssue.identifier }
-          )}
-        >
-          <LinearIcon className="text-muted-foreground" />
-        </MetaIconBadge>
+      {jiraItems.length ? (
+        <WorktreeReferenceStack items={jiraItems} details={referenceDetails} />
+      ) : (
+        jiraIssue && (
+          <MetaIconBadge
+            label={translate(
+              'auto.components.sidebar.WorktreeCardMeta.linkedJira',
+              'Linked Jira {{value0}}',
+              { value0: jiraIssue.identifier }
+            )}
+          >
+            <JiraIcon className="text-muted-foreground" />
+          </MetaIconBadge>
+        )
       )}
-      {jiraIssue && (
-        <MetaIconBadge
-          label={translate(
-            'auto.components.sidebar.WorktreeCardMeta.linkedJira',
-            'Linked Jira {{value0}}',
-            { value0: jiraIssue.identifier }
-          )}
+      {linearItems.length || reviewItems.length ? (
+        <span
+          className="inline-flex shrink-0 items-center gap-1.5"
+          data-workspace-reference-groups=""
         >
-          <JiraIcon className="text-muted-foreground" />
-        </MetaIconBadge>
+          <WorktreeReferenceStack items={linearItems} details={referenceDetails} />
+          <WorktreeReferenceStack items={reviewItems} details={referenceDetails} />
+        </span>
+      ) : (
+        linearIssue && (
+          <MetaIconBadge
+            label={translate(
+              'auto.components.sidebar.WorktreeCardMeta.b105fd3057',
+              'Linked Linear {{value0}}',
+              { value0: linearIssue.identifier }
+            )}
+          >
+            <LinearIcon className="text-muted-foreground" />
+          </MetaIconBadge>
+        )
       )}
-      {review && (
+      {!reviewItems.length && review && (
         <MetaIconBadge
           label={translate(
             'auto.components.sidebar.WorktreeCardMeta.3ea2702e62',
diff --git a/src/renderer/src/components/sidebar/WorktreeCardMetadataStatusBadges.tsx b/src/renderer/src/components/sidebar/WorktreeCardMetadataStatusBadges.tsx
index 21b064cc323c..d9cf841fb7b0 100644
--- a/src/renderer/src/components/sidebar/WorktreeCardMetadataStatusBadges.tsx
+++ b/src/renderer/src/components/sidebar/WorktreeCardMetadataStatusBadges.tsx
@@ -58,11 +58,23 @@ export function IssueStateBadge({ state }: { state: IssueInfo['state'] }): React
   )
 }
 
-export function LinearStateBadge({ stateName }: { stateName: string }): React.JSX.Element {
+export function LinearStateBadge({
+  stateName,
+  stateType
+}: {
+  stateName: string
+  stateType?: string
+}): React.JSX.Element {
   const normalized = stateName.toLowerCase()
-  const done = /done|closed|complete|completed|merged|resolved/.test(normalized)
-  const cancelled = /cancel|canceled|duplicate|wontfix/.test(normalized)
-  const active = /progress|doing|started|active/.test(normalized)
+  const done = stateType
+    ? stateType === 'completed'
+    : /done|closed|complete|completed|merged|resolved/.test(normalized)
+  const cancelled = stateType
+    ? stateType === 'canceled'
+    : /cancel|canceled|duplicate|wontfix/.test(normalized)
+  const active = stateType
+    ? stateType === 'started'
+    : /progress|doing|started|active/.test(normalized)
   const Icon = done ? CircleCheck : cancelled ? CircleX : active ? Clock : CircleDot
   const tone = done
     ? 'border-purple-500/25 bg-purple-500/5 text-purple-600 dark:text-purple-300'
diff --git a/src/renderer/src/components/sidebar/WorktreeCardStatusSlot.test.tsx b/src/renderer/src/components/sidebar/WorktreeCardStatusSlot.test.tsx
index f8fc458a5dd8..dbdda9d713aa 100644
--- a/src/renderer/src/components/sidebar/WorktreeCardStatusSlot.test.tsx
+++ b/src/renderer/src/components/sidebar/WorktreeCardStatusSlot.test.tsx
@@ -3,6 +3,9 @@ import type { ReactNode } from 'react'
 import { beforeEach, describe, expect, it, vi } from 'vitest'
 import { WorktreeCardStatusSlot } from './WorktreeCardStatusSlot'
 import type { WorktreeCardPrDisplay } from './worktree-card-pr-display'
+import { summarizeWorkspaceReviewChecks } from '../../../../shared/workspace-review-checks'
+import { getWorkspaceAttachmentKey } from '../../../../shared/workspace-attachment-normalization'
+import { referenceAttachment, referenceReview } from './workspace-reference-fixtures.test-support'
 
 const mocks = vi.hoisted(() => ({
   status: 'active',
@@ -46,6 +49,79 @@ describe('WorktreeCardStatusSlot', () => {
     status: 'pending'
   }
 
+  it('uses checks from every attached review rather than the legacy passing review', () => {
+    const items = [referenceAttachment(1), referenceAttachment(2)]
+    const details = Object.fromEntries(
+      items.map((item) => [
+        getWorkspaceAttachmentKey(item),
+        {
+          review: referenceReview(item.number, {
+            status: item.number === 1 ? 'success' : 'failure'
+          })
+        }
+      ])
+    )
+    const markup = renderToStaticMarkup(
+      <WorktreeCardStatusSlot
+        worktreeId="wt-1"
+        showStatus
+        showUnreadAction={false}
+        isUnread={false}
+        unreadTooltip=""
+        onPointerDown={vi.fn()}
+        onToggleUnread={vi.fn()}
+        newCardStyle
+        prDisplay={{ ...review, status: 'success' }}
+        reviewChecks={summarizeWorkspaceReviewChecks(items, details)}
+      />
+    )
+    expect(markup).toContain('Reviews: 2 · Checks: Failed')
+    expect(markup).toContain('text-rose-500/85')
+    expect(markup).not.toContain('checks: Passing')
+  })
+  it('keeps incomplete collection checks neutral instead of claiming passing', () => {
+    const items = [referenceAttachment(1), referenceAttachment(2)]
+    const markup = renderToStaticMarkup(
+      <WorktreeCardStatusSlot
+        worktreeId="wt-1"
+        showStatus
+        showUnreadAction={false}
+        isUnread={false}
+        unreadTooltip=""
+        onPointerDown={vi.fn()}
+        onToggleUnread={vi.fn()}
+        newCardStyle
+        prDisplay={{ ...review, status: 'success' }}
+        reviewChecks={summarizeWorkspaceReviewChecks(items, {})}
+      />
+    )
+    expect(markup).toContain('Reviews: 2 · Checks: Unknown')
+    expect(markup).toContain('text-muted-foreground')
+    expect(markup).not.toContain('text-emerald-500')
+  })
+  it.each([{ items: [] }, { items: [referenceAttachment(1)] }])(
+    'preserves discovered and singleton review lifecycle glyphs',
+    ({ items }) => {
+      const markup = renderToStaticMarkup(
+        <WorktreeCardStatusSlot
+          worktreeId="wt-1"
+          showStatus
+          showUnreadAction={false}
+          isUnread={false}
+          unreadTooltip=""
+          onPointerDown={vi.fn()}
+          onToggleUnread={vi.fn()}
+          newCardStyle
+          prDisplay={{ ...review, state: 'draft' }}
+          reviewChecks={summarizeWorkspaceReviewChecks(items, {})}
+        />
+      )
+      expect(markup).toContain('PR: Draft')
+      expect(markup).toContain('lucide-git-pull-request-draft')
+      expect(markup).not.toContain('Reviews:')
+    }
+  )
+
   it('lets the unread bell replace the visual status dot by default', () => {
     const markup = renderToStaticMarkup(
       <WorktreeCardStatusSlot
diff --git a/src/renderer/src/components/sidebar/WorktreeCardStatusSlot.tsx b/src/renderer/src/components/sidebar/WorktreeCardStatusSlot.tsx
index aaceddad4641..e7734a23cc86 100644
--- a/src/renderer/src/components/sidebar/WorktreeCardStatusSlot.tsx
+++ b/src/renderer/src/components/sidebar/WorktreeCardStatusSlot.tsx
@@ -10,6 +10,11 @@ import { useWorktreeActivityStatus } from './use-worktree-activity-status'
 import { useIsSleepingWorktree } from './use-worktree-sleep-state'
 import type { WorktreeCardPrDisplay } from './worktree-card-pr-display'
 import { getReviewLabel, ReviewIcon } from './worktree-review-helpers'
+import type { WorkspaceReviewChecksSummary } from '../../../../shared/workspace-review-checks'
+import {
+  WorkspaceReviewChecksIndicator,
+  workspaceReviewChecksLabel
+} from './WorkspaceReviewChecksIndicator'
 
 type WorktreeCardStatusSlotProps = {
   worktreeId: string
@@ -20,6 +25,7 @@ type WorktreeCardStatusSlotProps = {
   onToggleUnread: React.MouseEventHandler<HTMLButtonElement>
   onPointerDown: React.PointerEventHandler<HTMLButtonElement>
   prDisplay?: WorktreeCardPrDisplay | null
+  reviewChecks?: WorkspaceReviewChecksSummary
   newCardStyle?: boolean
   hasBranchIdentity?: boolean
   branchIdentityLabel?: string
@@ -102,11 +108,13 @@ export function WorktreeCardStatusSlot({
   onToggleUnread,
   onPointerDown,
   prDisplay = null,
+  reviewChecks,
   newCardStyle = false,
   hasBranchIdentity = false,
   branchIdentityLabel,
   className
 }: WorktreeCardStatusSlotProps): React.JSX.Element | null {
+  const collectionChecks = reviewChecks && reviewChecks.total > 1 ? reviewChecks : undefined
   const status = useWorktreeActivityStatus(worktreeId)
   const isSleeping = useIsSleepingWorktree(worktreeId)
   const statusLabel = getWorktreeStatusLabel(status) || status
@@ -118,7 +126,7 @@ export function WorktreeCardStatusSlot({
   const canShowReviewStatus =
     newCardStyle &&
     showStatus &&
-    prDisplay !== null &&
+    (prDisplay !== null || Boolean(collectionChecks)) &&
     !canShowSleepingStatus &&
     QUIET_REVIEW_REPLACEABLE_STATUSES.has(status)
   const canShowBranchStatus =
@@ -126,15 +134,18 @@ export function WorktreeCardStatusSlot({
     showStatus &&
     hasBranchIdentity &&
     prDisplay === null &&
+    !collectionChecks &&
     !canShowSleepingStatus &&
     QUIET_REVIEW_REPLACEABLE_STATUSES.has(status)
   const passiveStatusLabel = canShowSleepingStatus
     ? getSleepingStatusLabel()
-    : canShowReviewStatus && prDisplay
-      ? getReviewStatusLabel(prDisplay)
-      : canShowBranchStatus
-        ? (branchIdentityLabel ?? getDefaultBranchIdentityLabel())
-        : statusLabel
+    : canShowReviewStatus && collectionChecks
+      ? workspaceReviewChecksLabel(collectionChecks)
+      : canShowReviewStatus && prDisplay
+        ? getReviewStatusLabel(prDisplay)
+        : canShowBranchStatus
+          ? (branchIdentityLabel ?? getDefaultBranchIdentityLabel())
+          : statusLabel
   const passiveStatusAnnouncement =
     newCardStyle && isUnread ? `${passiveStatusLabel} · Unread` : passiveStatusLabel
   // Why: working and permission already own the new-card status lane, but
@@ -149,9 +160,16 @@ export function WorktreeCardStatusSlot({
       {sleepingStatusIcon}
       <span className="sr-only">{passiveStatusAnnouncement}</span>
     </span>
-  ) : canShowReviewStatus && prDisplay ? (
+  ) : canShowReviewStatus && (collectionChecks || prDisplay) ? (
     <span className={cn('inline-flex size-5 items-center justify-center p-0.5', className)}>
-      <ReviewIcon review={prDisplay} className={reviewStatusIconClassName} variant="generic" />
+      {collectionChecks ? (
+        <WorkspaceReviewChecksIndicator
+          summary={collectionChecks}
+          className={reviewStatusIconClassName}
+        />
+      ) : prDisplay ? (
+        <ReviewIcon review={prDisplay} className={reviewStatusIconClassName} variant="generic" />
+      ) : null}
       <span className="sr-only">{passiveStatusAnnouncement}</span>
     </span>
   ) : canShowBranchStatus ? (
diff --git a/src/renderer/src/components/sidebar/WorktreeDisplayNameField.tsx b/src/renderer/src/components/sidebar/WorktreeDisplayNameField.tsx
index 715c9976e178..381c951c2b6d 100644
--- a/src/renderer/src/components/sidebar/WorktreeDisplayNameField.tsx
+++ b/src/renderer/src/components/sidebar/WorktreeDisplayNameField.tsx
@@ -68,10 +68,10 @@ export function WorktreeDisplayNameField({
         portalContainer={portalContainer}
         side="bottom"
       />
-      <p className="text-[10px] text-muted-foreground">
+      <p className="text-xs text-muted-foreground">
         {translate(
-          'auto.components.sidebar.WorktreeMetaDialog.459ad7f650',
-          'Only changes the name shown in the sidebar — the folder on disk stays the same. Leave blank to use the branch or folder name.'
+          'workspace.links.nameHelp',
+          'Shown in the sidebar. The folder name stays the same.'
         )}
       </p>
     </div>
diff --git a/src/renderer/src/components/sidebar/WorktreeForceDeleteButton.tsx b/src/renderer/src/components/sidebar/WorktreeForceDeleteButton.tsx
new file mode 100644
index 000000000000..2c7e28f06705
--- /dev/null
+++ b/src/renderer/src/components/sidebar/WorktreeForceDeleteButton.tsx
@@ -0,0 +1,128 @@
+import { useState, type ReactNode, type Ref } from 'react'
+import { ChevronDown } from 'lucide-react'
+import { toast } from 'sonner'
+import { translate } from '@/i18n/i18n'
+import { Button } from '../ui/button'
+import { ButtonGroup } from '../ui/button-group'
+import {
+  DropdownMenu,
+  DropdownMenuContent,
+  DropdownMenuItem,
+  DropdownMenuTrigger
+} from '../ui/dropdown-menu'
+import { Tooltip, TooltipContent, TooltipTrigger } from '../ui/tooltip'
+
+export function WorktreeForceDeleteButton({
+  toastId,
+  onForceDelete,
+  onAlwaysForceDelete,
+  onSavingChange,
+  size = 'sm',
+  disabled = false,
+  buttonRef,
+  children
+}: {
+  toastId?: string
+  onForceDelete: () => void
+  onAlwaysForceDelete?: () => Promise<void>
+  onSavingChange?: (saving: boolean) => void
+  size?: 'sm' | 'default'
+  disabled?: boolean
+  buttonRef?: Ref<HTMLButtonElement>
+  children?: ReactNode
+}): React.JSX.Element {
+  const [isSaving, setIsSaving] = useState(false)
+  const forceDelete = (): void => {
+    if (toastId) {
+      toast.dismiss(toastId)
+    }
+    onForceDelete()
+  }
+  const alwaysForceDelete = async (): Promise<void> => {
+    if (!onAlwaysForceDelete) {
+      return
+    }
+    setIsSaving(true)
+    onSavingChange?.(true)
+    try {
+      await onAlwaysForceDelete()
+    } catch (error) {
+      toast.error(
+        translate('workspaceDeletion.preferenceSaveFailed', 'Could not save deletion preference'),
+        { description: error instanceof Error ? error.message : String(error) }
+      )
+      return
+    } finally {
+      setIsSaving(false)
+      onSavingChange?.(false)
+    }
+    forceDelete()
+  }
+
+  return (
+    <DropdownMenu modal={false}>
+      <ButtonGroup
+        onBlur={(event) => {
+          if (
+            event.relatedTarget instanceof HTMLElement &&
+            event.relatedTarget.closest('[data-radix-menu-content]')
+          ) {
+            event.stopPropagation()
+          }
+        }}
+      >
+        <Button
+          ref={buttonRef}
+          type="button"
+          variant="destructive"
+          size={size}
+          disabled={disabled || isSaving}
+          onClick={forceDelete}
+        >
+          {children ??
+            translate('auto.components.sidebar.delete.worktree.flow.2b20ce87b3', 'Force Delete')}
+        </Button>
+        {onAlwaysForceDelete ? (
+          <DropdownMenuTrigger asChild>
+            <Button
+              type="button"
+              variant="destructive"
+              size={size === 'sm' ? 'icon-sm' : 'icon'}
+              disabled={disabled || isSaving}
+              aria-label={translate('workspaceDeletion.moreActions', 'More force delete options')}
+            >
+              <ChevronDown className="size-3.5" />
+            </Button>
+          </DropdownMenuTrigger>
+        ) : null}
+      </ButtonGroup>
+      {onAlwaysForceDelete ? (
+        <DropdownMenuContent
+          align="end"
+          // Sonner restores toast focus on blur; the portaled menu owns its focus.
+          onFocus={(event) => event.stopPropagation()}
+          onBlur={(event) => event.stopPropagation()}
+        >
+          <Tooltip>
+            <TooltipTrigger asChild>
+              <DropdownMenuItem
+                variant="destructive"
+                onSelect={() => {
+                  void alwaysForceDelete()
+                }}
+              >
+                {translate('workspaceDeletion.alwaysForceDelete', 'Always force delete')}
+              </DropdownMenuItem>
+            </TooltipTrigger>
+            <TooltipContent side="left" sideOffset={8}>
+              {translate(
+                'workspaceDeletion.alwaysForceDeleteTooltip',
+                'Applies to all future workspace deletions.'
+              )}
+            </TooltipContent>
+          </Tooltip>
+        </DropdownMenuContent>
+      ) : null}
+    </DropdownMenu>
+  )
+}
diff --git a/src/renderer/src/components/sidebar/WorktreeIssueLinkField.tsx b/src/renderer/src/components/sidebar/WorktreeIssueLinkField.tsx
deleted file mode 100644
index 6a7306d01007..000000000000
--- a/src/renderer/src/components/sidebar/WorktreeIssueLinkField.tsx
+++ /dev/null
@@ -1,260 +0,0 @@
-import React, { useCallback, useId, useMemo } from 'react'
-import { Button } from '@/components/ui/button'
-import { Input } from '@/components/ui/input'
-import {
-  DropdownMenu,
-  DropdownMenuContent,
-  DropdownMenuRadioGroup,
-  DropdownMenuRadioItem,
-  DropdownMenuTrigger
-} from '@/components/ui/dropdown-menu'
-import { Tooltip, TooltipContent, TooltipTrigger } from '@/components/ui/tooltip'
-import { LinearIcon } from '@/components/icons/LinearIcon'
-import { ChevronDown, ExternalLink, Github, LoaderCircle } from 'lucide-react'
-import { cn } from '@/lib/utils'
-import { translate } from '@/i18n/i18n'
-import {
-  ISSUE_LINK_PROVIDERS,
-  isIssueLinkProvider,
-  type IssueLinkProvider
-} from '../../../../shared/issue-link-input'
-
-// Why: the value must clear the chip and the open-issue button that float over
-// the input's right edge. Provider labels are localized, so the text share is
-// measured in `ch` rather than baked into a Tailwind `pr-*` step that a longer
-// translation would overlap.
-const ADORNMENT_RESERVE_PX = 70
-const MAX_RESERVE = '55%'
-
-/** Exported for test: happy-dom drops `min()`, so this cannot be read back off a style. */
-export function issueAdornmentReserve(providerLabel: string): string {
-  return `min(calc(${ADORNMENT_RESERVE_PX}px + ${providerLabel.length}ch), ${MAX_RESERVE})`
-}
-
-function providerLabel(provider: IssueLinkProvider): string {
-  return provider === 'linear'
-    ? translate('auto.components.sidebar.WorktreeIssueLinkField.25852bfc59', 'Linear')
-    : translate('auto.components.sidebar.WorktreeIssueLinkField.5b440069e6', 'GitHub')
-}
-
-function ProviderIcon({
-  provider,
-  className
-}: {
-  provider: IssueLinkProvider
-  className?: string
-}): React.JSX.Element {
-  return provider === 'linear' ? (
-    <LinearIcon className={className} />
-  ) : (
-    <Github className={className} />
-  )
-}
-
-export type WorktreeIssueLinkFieldProps = {
-  inputRef: React.RefObject<HTMLInputElement | null>
-  value: string
-  provider: IssueLinkProvider
-  /** Set when the current value cannot be saved, so the row can explain why. */
-  isInvalid: boolean
-  /** Names the links this save would drop; both slots can be filled at once. */
-  displacedLinkLabels: string[] | null
-  /** Folder workspaces have no persisted link slots — see the design doc. */
-  isReadOnly: boolean
-  canOpenIssue: boolean
-  openingIssue: boolean
-  /** The last open attempt resolved to nothing — see useWorktreeIssueLink. */
-  openIssueFailed: boolean
-  onValueChange: (value: string) => void
-  onProviderChange: (provider: IssueLinkProvider) => void
-  onOpenIssue: () => void
-  onKeyDown: (event: React.KeyboardEvent<HTMLInputElement>) => void
-}
-
-export function WorktreeIssueLinkField(props: WorktreeIssueLinkFieldProps): React.JSX.Element {
-  const {
-    inputRef,
-    value,
-    provider,
-    isInvalid,
-    displacedLinkLabels,
-    isReadOnly,
-    canOpenIssue,
-    openingIssue,
-    openIssueFailed,
-    onValueChange,
-    onProviderChange,
-    onOpenIssue,
-    onKeyDown
-  } = props
-
-  // Why: the helper `<p>` is the only surface for the invalid and displacement
-  // states, so it has to be announced with the field rather than just seen.
-  const helperId = useId()
-  const inputId = useId()
-  const label = providerLabel(provider)
-  const openIssueLabel = translate(
-    'auto.components.sidebar.WorktreeIssueLinkField.161b2d053a',
-    'Open linked issue'
-  )
-
-  const handleProviderChange = useCallback(
-    (next: string) => {
-      if (isIssueLinkProvider(next)) {
-        onProviderChange(next)
-      }
-    },
-    [onProviderChange]
-  )
-
-  const helperText = useMemo(() => {
-    if (isReadOnly) {
-      return translate(
-        'auto.components.sidebar.WorktreeIssueLinkField.d4785f9954',
-        "Issue links are set when a folder workspace is created and can't be changed here yet."
-      )
-    }
-    if (isInvalid) {
-      return provider === 'linear'
-        ? translate(
-            'auto.components.sidebar.WorktreeIssueLinkField.964d9bc00a',
-            'Not a Linear issue key or linear.app issue URL.'
-          )
-        : translate(
-            'auto.components.sidebar.WorktreeIssueLinkField.0a7a2c6efd',
-            'Not a GitHub issue number or issue URL.'
-          )
-    }
-    // Why: ranked above displacement because it answers the click the user just
-    // made, and it clears as soon as they edit the value that caused it.
-    if (openIssueFailed) {
-      return provider === 'linear'
-        ? translate(
-            'auto.components.sidebar.WorktreeIssueLinkField.d8c8a30d1f',
-            "Couldn't open that issue. Check the identifier and your Linear connection."
-          )
-        : translate(
-            'auto.components.sidebar.WorktreeIssueLinkField.269198eeda',
-            "Couldn't open that issue. Check the number and your GitHub connection."
-          )
-    }
-    // Whole sentences per arity rather than a joined list: a translated " and "
-    // fragment would not survive languages that order or punctuate lists differently.
-    if (displacedLinkLabels && displacedLinkLabels.length > 1) {
-      return translate(
-        'auto.components.sidebar.WorktreeIssueLinkField.72486800ff',
-        'Saving unlinks {{first}} and {{second}} — a workspace tracks one issue.',
-        { first: displacedLinkLabels[0], second: displacedLinkLabels[1] }
-      )
-    }
-    if (displacedLinkLabels?.length) {
-      return translate(
-        'auto.components.sidebar.WorktreeIssueLinkField.2c245ac134',
-        'Saving unlinks {{link}} — a workspace tracks one issue.',
-        { link: displacedLinkLabels[0] }
-      )
-    }
-    return translate(
-      'auto.components.sidebar.WorktreeIssueLinkField.f047887705',
-      'Paste a GitHub or Linear URL, or enter a number. Leave blank to remove the link.'
-    )
-  }, [displacedLinkLabels, isInvalid, isReadOnly, openIssueFailed, provider])
-
-  return (
-    <div className="space-y-1">
-      <label htmlFor={inputId} className="text-[11px] font-medium text-muted-foreground">
-        {translate('auto.components.sidebar.WorktreeIssueLinkField.ad78f9bee2', 'Issue')}
-      </label>
-      <div className="relative">
-        <Input
-          ref={inputRef}
-          id={inputId}
-          aria-describedby={helperId}
-          value={value}
-          onChange={(e) => onValueChange(e.target.value)}
-          onKeyDown={onKeyDown}
-          disabled={isReadOnly}
-          aria-invalid={isInvalid || undefined}
-          placeholder={translate(
-            'auto.components.sidebar.WorktreeIssueLinkField.662ae142f8',
-            'Issue #, or a GitHub or Linear URL'
-          )}
-          className="h-8 text-xs"
-          style={{ paddingRight: issueAdornmentReserve(label) }}
-        />
-        <div className="absolute right-1 top-1 flex items-center gap-0.5">
-          {/* Why: `modal` would stack a second scroll-lock layer over the
-              Dialog's, whose nested teardown strands pointer-events on body. */}
-          <DropdownMenu modal={false}>
-            <DropdownMenuTrigger asChild>
-              <Button
-                type="button"
-                variant="ghost"
-                size="xs"
-                disabled={isReadOnly}
-                aria-label={translate(
-                  'auto.components.sidebar.WorktreeIssueLinkField.929c98d05a',
-                  'Issue provider'
-                )}
-                className="h-6 px-1 text-[10px] font-medium text-muted-foreground"
-              >
-                <ProviderIcon provider={provider} className="size-3" />
-                {label}
-                <ChevronDown className="size-2.5 opacity-60" />
-              </Button>
-            </DropdownMenuTrigger>
-            <DropdownMenuContent align="end" className="min-w-32">
-              <DropdownMenuRadioGroup value={provider} onValueChange={handleProviderChange}>
-                {ISSUE_LINK_PROVIDERS.map((item) => (
-                  <DropdownMenuRadioItem key={item} value={item} className="text-xs">
-                    <ProviderIcon provider={item} className="size-3" />
-                    {providerLabel(item)}
-                  </DropdownMenuRadioItem>
-                ))}
-              </DropdownMenuRadioGroup>
-            </DropdownMenuContent>
-          </DropdownMenu>
-          <Tooltip>
-            <TooltipTrigger asChild>
-              <Button
-                type="button"
-                variant="ghost"
-                size="icon-xs"
-                aria-label={openIssueLabel}
-                disabled={!canOpenIssue || openingIssue}
-                onClick={onOpenIssue}
-                className="text-muted-foreground"
-              >
-                {openingIssue ? (
-                  <LoaderCircle className="size-3 animate-spin" />
-                ) : (
-                  <ExternalLink className="size-3" />
-                )}
-              </Button>
-            </TooltipTrigger>
-            <TooltipContent side="top" sideOffset={4}>
-              {openIssueLabel}
-            </TooltipContent>
-          </Tooltip>
-        </div>
-      </div>
-      {/* Why: two lines are reserved up front. The dialog is centered by
-          transform, so a wrap-count change would shift the field being typed in. */}
-      {/* Why: the failure and displacement messages appear without focus moving
-          here, so only a live region announces them. */}
-      <p
-        id={helperId}
-        role="status"
-        aria-live="polite"
-        className={cn(
-          'min-h-[28px] text-[10px] leading-[14px]',
-          (openIssueFailed || displacedLinkLabels?.length) && !isInvalid && !isReadOnly
-            ? 'text-amber-600 dark:text-amber-400'
-            : 'text-muted-foreground'
-        )}
-      >
-        {helperText}
-      </p>
-    </div>
-  )
-}
diff --git a/src/renderer/src/components/sidebar/WorktreeLinkedItemRow.tsx b/src/renderer/src/components/sidebar/WorktreeLinkedItemRow.tsx
new file mode 100644
index 000000000000..a7a595c3d6e7
--- /dev/null
+++ b/src/renderer/src/components/sidebar/WorktreeLinkedItemRow.tsx
@@ -0,0 +1,135 @@
+import React from 'react'
+import { ExternalLink, GitPullRequest, Terminal, Ticket, X } from 'lucide-react'
+import { Button } from '@/components/ui/button'
+import { Collapsible, CollapsibleContent, CollapsibleTrigger } from '@/components/ui/collapsible'
+import { Tooltip, TooltipContent, TooltipTrigger } from '@/components/ui/tooltip'
+import { translate } from '@/i18n/i18n'
+import type { WorkspaceAttachment, Worktree } from '../../../../shared/worktree/types'
+import { WorkspaceAttachmentOrigins } from './WorkspaceAttachmentOrigins'
+import {
+  workspaceAttachmentLabel,
+  workspaceAttachmentProviderLabel
+} from './worktree-attachment-editing'
+import { getWorkspaceAttachmentSourceLabel } from './workspace-attachment-source-label'
+
+type Props = {
+  item: WorkspaceAttachment
+  workspace?: Worktree
+  disabled: boolean
+  onRemove: () => void
+}
+
+export function WorktreeLinkedItemRow({
+  item,
+  workspace,
+  disabled,
+  onRemove
+}: Props): React.JSX.Element {
+  const label = workspaceAttachmentLabel(item)
+  const source = getWorkspaceAttachmentSourceLabel(item)
+  const provider = workspaceAttachmentProviderLabel(item)
+  const observedCount = item.origins?.filter((origin) => origin.kind === 'observed').length ?? 0
+  const sessionsLabel = translate('workspace.links.sessions', 'Sessions & terminals')
+  return (
+    <Collapsible
+      data-workspace-linked-item=""
+      onKeyDown={(event) => {
+        if (event.key === 'Enter' && !event.metaKey && !event.ctrlKey) {
+          event.stopPropagation()
+        }
+      }}
+    >
+      <div className="flex min-h-8 min-w-0 items-center gap-1 py-1">
+        {item.type === 'issue' ? (
+          <Ticket className="size-3.5 shrink-0 text-muted-foreground" />
+        ) : (
+          <GitPullRequest className="size-3.5 shrink-0 text-muted-foreground" />
+        )}
+        <Tooltip>
+          <TooltipTrigger asChild>
+            <div className="flex min-w-0 flex-1 items-baseline gap-2 text-xs">
+              <span className="shrink-0 font-medium">{label}</span>
+              {item.title ? (
+                <span className="truncate text-muted-foreground">{item.title}</span>
+              ) : null}
+              <span className="sr-only">
+                {provider}
+                {source ? ` · ${source}` : ''}
+              </span>
+            </div>
+          </TooltipTrigger>
+          <TooltipContent className="max-w-sm">
+            <p>{item.title || label}</p>
+            <p>
+              {label} · {provider}
+              {source ? ` · ${source}` : ''}
+            </p>
+          </TooltipContent>
+        </Tooltip>
+        {workspace && observedCount > 0 ? (
+          <Tooltip>
+            <TooltipTrigger asChild>
+              <CollapsibleTrigger asChild>
+                <Button
+                  type="button"
+                  variant="ghost"
+                  size="xs"
+                  disabled={disabled}
+                  aria-label={translate(
+                    'workspace.links.sessionsForItem',
+                    'Sessions & terminals for {{label}} · {{count}}',
+                    { label, count: observedCount }
+                  )}
+                >
+                  <Terminal className="size-3" />
+                  <span>{observedCount}</span>
+                </Button>
+              </CollapsibleTrigger>
+            </TooltipTrigger>
+            <TooltipContent>{sessionsLabel}</TooltipContent>
+          </Tooltip>
+        ) : null}
+        {item.url ? (
+          <Tooltip>
+            <TooltipTrigger asChild>
+              <Button
+                type="button"
+                variant="ghost"
+                size="icon-xs"
+                aria-label={translate('workspace.links.openItem', 'Open {{label}}', { label })}
+                onClick={() => void window.api.shell.openUrl(item.url ?? '')}
+              >
+                <ExternalLink className="size-3" />
+              </Button>
+            </TooltipTrigger>
+            <TooltipContent>{translate('workspace.links.open', 'Open link')}</TooltipContent>
+          </Tooltip>
+        ) : null}
+        <Tooltip>
+          <TooltipTrigger asChild>
+            <Button
+              type="button"
+              variant="ghost"
+              size="icon-xs"
+              disabled={disabled}
+              aria-label={translate('workspace.links.unlinkItem', 'Unlink {{label}}', { label })}
+              onClick={onRemove}
+            >
+              <X className="size-3" />
+            </Button>
+          </TooltipTrigger>
+          <TooltipContent>
+            {translate('workspace.links.unlink', 'Unlink from workspace')}
+          </TooltipContent>
+        </Tooltip>
+      </div>
+      {workspace && observedCount > 0 ? (
+        <CollapsibleContent>
+          <div className="text-xs">
+            <WorkspaceAttachmentOrigins item={item} workspace={workspace} />
+          </div>
+        </CollapsibleContent>
+      ) : null}
+    </Collapsible>
+  )
+}
diff --git a/src/renderer/src/components/sidebar/WorktreeLinkedItemsField.tsx b/src/renderer/src/components/sidebar/WorktreeLinkedItemsField.tsx
new file mode 100644
index 000000000000..f8a5cb74d606
--- /dev/null
+++ b/src/renderer/src/components/sidebar/WorktreeLinkedItemsField.tsx
@@ -0,0 +1,173 @@
+import { WorktreeLinkedItemRow } from './WorktreeLinkedItemRow'
+import { translate } from '@/i18n/i18n'
+import React, { useState } from 'react'
+import { Link2 } from 'lucide-react'
+import { Label } from '@/components/ui/label'
+import type { Repo } from '../../../../shared/repo-types'
+import type { WorkspaceAttachment, Worktree } from '../../../../shared/worktree/types'
+import { getWorkspaceAttachmentKey } from '../../../../shared/workspace-attachment-normalization'
+import {
+  canUseWorkspaceReviewForChecks,
+  isWorkspaceRepositoryAttachment,
+  type AttachmentInputKind
+} from './worktree-attachment-editing'
+import { WorkspaceAttachmentComposer } from './WorkspaceAttachmentComposer'
+import {
+  appendWorkspaceAttachment,
+  isWorkspaceAttachmentLinked
+} from './workspace-attachment-source-result'
+
+type Props = {
+  items: readonly WorkspaceAttachment[]
+  onItemsChange: (items: WorkspaceAttachment[]) => void
+  onSave: () => void
+  repo?: Repo
+  workspace?: Worktree
+  isFolderWorkspace?: boolean
+  inputRef: React.RefObject<HTMLInputElement | null>
+  initialKind: AttachmentInputKind
+  initialInput?: string
+  disabled: boolean
+}
+
+export function WorktreeLinkedItemsField({
+  items,
+  onItemsChange,
+  onSave,
+  repo,
+  workspace,
+  isFolderWorkspace = false,
+  inputRef,
+  initialKind,
+  initialInput = '',
+  disabled
+}: Props): React.JSX.Element {
+  const [error, setError] = useState<string | null>(null)
+  const getScopeError = (item: WorkspaceAttachment): string | null => {
+    if (
+      !isFolderWorkspace &&
+      item.type !== 'issue' &&
+      !item.url &&
+      !canUseWorkspaceReviewForChecks(item, repo)
+    ) {
+      return translate(
+        'workspace.links.reviewUrlRequired',
+        'Paste the review URL to verify its repository and provider.'
+      )
+    }
+    if (
+      !item.url ||
+      (item.type === 'issue' && item.provider !== 'github' && item.provider !== 'gitlab') ||
+      isFolderWorkspace ||
+      isWorkspaceRepositoryAttachment(item, repo)
+    ) {
+      return null
+    }
+    if (!repo?.gitRemoteIdentity) {
+      return translate(
+        'workspace.links.repositoryLoading',
+        'Repository identity is still loading. Try again once it is available.'
+      )
+    }
+    return item.type === 'issue'
+      ? translate(
+          'workspace.links.foreignIssue',
+          'This issue belongs to another repository. Add issues from this workspace’s repository.'
+        )
+      : translate(
+          'workspace.links.foreignReview',
+          'This review belongs to another repository. Add reviews from this workspace’s repository.'
+        )
+  }
+  const add = (item: WorkspaceAttachment): boolean => {
+    if (disabled) {
+      return false
+    }
+    const scopeError = getScopeError(item)
+    if (scopeError) {
+      setError(scopeError)
+      return false
+    }
+    if (isWorkspaceAttachmentLinked(items, item)) {
+      setError(translate('workspace.links.duplicate', 'This link is already attached.'))
+      return false
+    }
+    onItemsChange(appendWorkspaceAttachment(items, item))
+    setError(null)
+    return true
+  }
+  const remove = (key: string): void => {
+    const next = items.filter((item) => getWorkspaceAttachmentKey(item) !== key)
+    onItemsChange(next)
+  }
+  const groups = [
+    {
+      label: translate('workspace.links.reviews', 'Reviews'),
+      items: items.filter((item) => item.type !== 'issue')
+    },
+    {
+      label: translate('workspace.links.tasks', 'Issues & tasks'),
+      items: items.filter((item) => item.type === 'issue')
+    }
+  ].filter((group) => group.items.length > 0)
+
+  return (
+    <div className="space-y-3" data-workspace-linked-items="">
+      <div className="flex items-center justify-between gap-2">
+        <Label>{translate('workspace.links.title', 'Linked work')}</Label>
+        <span className="text-xs text-muted-foreground">
+          {translate('workspace.links.count', '{{count}} linked', { count: items.length })}
+        </span>
+      </div>
+      <WorkspaceAttachmentComposer
+        items={items}
+        repo={repo}
+        workspace={workspace}
+        disabled={disabled}
+        initialKind={initialKind}
+        initialInput={initialInput}
+        inputRef={inputRef}
+        onAdd={add}
+        onSave={onSave}
+        onQueryChange={() => setError(null)}
+        getScopeError={getScopeError}
+        error={error}
+      />
+      {items.length === 0 ? (
+        <div className="flex items-center gap-2 py-2 text-xs text-muted-foreground">
+          <Link2 className="size-4 shrink-0" />
+          <span>
+            {translate(
+              'workspace.links.empty',
+              'Keep every review and task for this workspace together.'
+            )}
+          </span>
+        </div>
+      ) : (
+        <div className="space-y-3">
+          {groups.map((group) => (
+            <div key={group.label} className="space-y-1">
+              <p className="text-[11px] font-semibold uppercase tracking-wide text-muted-foreground">
+                {group.label} · {group.items.length}
+              </p>
+              <div className="divide-y divide-border">
+                {group.items.map((item) => {
+                  const key = getWorkspaceAttachmentKey(item)
+                  return (
+                    <WorktreeLinkedItemRow
+                      key={key}
+                      item={item}
+                      workspace={workspace}
+                      disabled={disabled}
+                      onRemove={() => remove(key)}
+                    />
+                  )
+                })}
+              </div>
+            </div>
+          ))}
+        </div>
+      )}
+    </div>
+  )
+}
diff --git a/src/renderer/src/components/sidebar/WorktreeMetaDialog.host-scope.test.tsx b/src/renderer/src/components/sidebar/WorktreeMetaDialog.host-scope.test.tsx
new file mode 100644
index 000000000000..ca67c631271b
--- /dev/null
+++ b/src/renderer/src/components/sidebar/WorktreeMetaDialog.host-scope.test.tsx
@@ -0,0 +1,155 @@
+// @vitest-environment happy-dom
+import { cleanup, fireEvent, render, screen, waitFor } from '@testing-library/react'
+import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest'
+import { useAppStore } from '@/store'
+import type { Repo } from '../../../../shared/repo-types'
+import type { Worktree, WorkspaceAttachment } from '../../../../shared/worktree/types'
+import type { FolderWorkspace } from '../../../../shared/folder-workspace-types'
+import { folderWorkspaceKey } from '../../../../shared/workspace-scope'
+import WorktreeMetaDialog from './WorktreeMetaDialog'
+
+vi.mock('./WorktreeDisplayNameField', () => ({ WorktreeDisplayNameField: () => null }))
+vi.mock('./WorktreeLinkedItemsField', () => ({
+  WorktreeLinkedItemsField: ({ items, repo }: { items: WorkspaceAttachment[]; repo?: Repo }) => (
+    <div>
+      <span data-testid="owner-repo">{repo?.path ?? 'none'}</span>
+      {items.map((item) => (
+        <span key={item.number}>{item.title}</span>
+      ))}
+    </div>
+  )
+}))
+
+const initialState = useAppStore.getInitialState()
+const update = vi.fn(async () => ({ ok: true as const }))
+const localRepo: Repo = {
+  id: 'repo',
+  path: '/local',
+  displayName: 'Local',
+  badgeColor: '',
+  addedAt: 1
+}
+const remoteRepo: Repo = { ...localRepo, path: '/remote', executionHostId: 'ssh:box' }
+function workspace(hostId?: Worktree['hostId']): Worktree {
+  return {
+    id: 'shared-id',
+    repoId: 'repo',
+    path: '/workspace',
+    branch: 'feature',
+    head: 'abc',
+    isBare: false,
+    isMainWorktree: false,
+    isArchived: false,
+    isUnread: false,
+    isPinned: false,
+    sortOrder: 0,
+    lastActivityAt: 1,
+    displayName: 'Workspace',
+    comment: 'note',
+    hostId,
+    linkedPR: null,
+    linkedIssue: null,
+    linkedLinearIssue: null,
+    linkedItems: [
+      {
+        provider: 'github',
+        type: 'issue',
+        number: hostId ? 2 : 1,
+        title: hostId ? 'Remote task' : 'Local task'
+      }
+    ]
+  }
+}
+function open(
+  executionHostId: string,
+  rows: Worktree[] = [workspace(), workspace('ssh:box')],
+  repos: Repo[] = [localRepo, remoteRepo]
+): void {
+  useAppStore.setState({
+    repos,
+    worktreesByRepo: { repo: rows },
+    updateWorktreeMeta: update,
+    activeModal: 'edit-meta',
+    modalData: { worktreeId: 'shared-id', repoId: 'repo', executionHostId }
+  })
+  render(<WorktreeMetaDialog />)
+}
+
+describe('workspace details exact host selection', () => {
+  beforeEach(() => {
+    useAppStore.setState(initialState, true)
+    update.mockClear()
+  })
+  afterEach(cleanup)
+
+  it.each([
+    ['local', '/local', 'Local task', 'Remote task'],
+    ['ssh:box', '/remote', 'Remote task', 'Local task']
+  ])(
+    'seeds the %s workspace and repository with duplicate IDs',
+    async (host, path, shown, hidden) => {
+      open(host)
+      expect(screen.getByTestId('owner-repo').textContent).toBe(path)
+      expect(screen.getByText(shown)).toBeTruthy()
+      expect(screen.queryByText(hidden)).toBeNull()
+      fireEvent.click(screen.getByRole('button', { name: 'Save' }))
+      await waitFor(() =>
+        expect(update).toHaveBeenCalledWith('shared-id', {}, { executionHostId: host })
+      )
+    }
+  )
+
+  it('does not fall back to another host when the requested workspace disappeared', () => {
+    open('ssh:missing', [workspace()])
+    expect(screen.getByTestId('owner-repo').textContent).toBe('none')
+    expect(screen.queryByText('Local task')).toBeNull()
+    const save = screen.getByRole('button', { name: 'Save' })
+    expect(save.hasAttribute('disabled')).toBe(true)
+    fireEvent.click(save)
+    expect(update).not.toHaveBeenCalled()
+  })
+
+  it('uses the owning runtime repository for its nested SSH worktree alias', () => {
+    const row = { ...workspace('ssh:nested'), runtimeOwnerEnvironmentId: 'hub' }
+    open('runtime:hub', [row], [{ ...localRepo, path: '/hub', executionHostId: 'runtime:hub' }])
+    expect(screen.getByTestId('owner-repo').textContent).toBe('/hub')
+    expect(screen.getByText('Remote task')).toBeTruthy()
+  })
+
+  it('selects the host-qualified folder when folder IDs are duplicated', () => {
+    const folder: FolderWorkspace = {
+      id: 'folder',
+      projectGroupId: 'group',
+      name: 'Docs',
+      folderPath: '/docs',
+      linkedTask: null,
+      comment: '',
+      isArchived: false,
+      isUnread: false,
+      isPinned: false,
+      sortOrder: 0,
+      lastActivityAt: 1,
+      createdAt: 1,
+      updatedAt: 1,
+      linkedItems: [{ provider: 'github', type: 'issue', number: 1, title: 'Local folder task' }]
+    }
+    useAppStore.setState({
+      folderWorkspaces: [
+        folder,
+        {
+          ...folder,
+          executionHostId: 'ssh:box',
+          linkedItems: [
+            { provider: 'github', type: 'issue', number: 2, title: 'Remote folder task' }
+          ]
+        }
+      ],
+      updateWorktreeMeta: update,
+      activeModal: 'edit-meta',
+      modalData: { worktreeId: folderWorkspaceKey('folder'), executionHostId: 'ssh:box' }
+    })
+    render(<WorktreeMetaDialog />)
+    expect(screen.getByText('Remote folder task')).toBeTruthy()
+    expect(screen.queryByText('Local folder task')).toBeNull()
+  })
+})
diff --git a/src/renderer/src/components/sidebar/WorktreeMetaDialog.test.tsx b/src/renderer/src/components/sidebar/WorktreeMetaDialog.test.tsx
index 1b1eeb8f81de..d6a998de3cdd 100644
--- a/src/renderer/src/components/sidebar/WorktreeMetaDialog.test.tsx
+++ b/src/renderer/src/components/sidebar/WorktreeMetaDialog.test.tsx
@@ -1,82 +1,49 @@
 // @vitest-environment happy-dom
-
-import { act, type ReactNode } from 'react'
+import { act, createContext, useContext, type ReactNode } from 'react'
 import { cleanup, fireEvent, render, screen, waitFor } from '@testing-library/react'
 import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest'
 import { useAppStore } from '@/store'
-import type { FolderWorkspace } from '../../../../shared/folder-workspace-types'
-import type { LinearIssue } from '../../../../shared/linear/issue-types'
-import type { Repo } from '../../../../shared/repo-types'
+import type { GitHubWorkItem } from '../../../../shared/github/work-item-types'
+import type { Worktree } from '../../../../shared/worktree/types'
 import type { WorktreeMeta } from '../../../../shared/worktree/meta-types'
 import type { WorktreeMetaUpdateOptions } from '@/store/slices/worktree-helpers'
-import type { Worktree } from '../../../../shared/worktree/types'
+import type { FolderWorkspace } from '../../../../shared/folder-workspace-types'
 import { folderWorkspaceKey } from '../../../../shared/workspace-scope'
 
-// Why: Radix tooltips need a provider the dialog does not own, and the menu's
-// portal needs real layout. Stand-ins keep these tests on provider selection.
 vi.mock('@/components/ui/tooltip', () => ({
   Tooltip: ({ children }: { children?: ReactNode }) => <>{children}</>,
   TooltipContent: () => null,
   TooltipTrigger: ({ children }: { children?: ReactNode }) => <>{children}</>
 }))
-
-vi.mock('@/components/ui/dropdown-menu', async () => {
-  const React = await import('react')
-  const SelectContext = React.createContext<(value: string) => void>(() => {})
-  const Passthrough = ({ children }: { children?: ReactNode }) => <>{children}</>
+vi.mock('@/components/ui/dropdown-menu', () => {
+  const Selection = createContext<(value: string) => void>(() => {})
+  const Pass = ({ children }: { children?: ReactNode }) => <>{children}</>
   return {
-    DropdownMenu: Passthrough,
-    DropdownMenuTrigger: Passthrough,
-    DropdownMenuContent: Passthrough,
+    DropdownMenu: Pass,
+    DropdownMenuContent: Pass,
+    DropdownMenuTrigger: Pass,
     DropdownMenuRadioGroup: ({
-      value,
-      onValueChange,
-      children
+      children,
+      onValueChange
     }: {
-      value: string
-      onValueChange: (value: string) => void
       children?: ReactNode
-    }) => (
-      <SelectContext.Provider value={onValueChange}>
-        <div data-selected={value}>{children}</div>
-      </SelectContext.Provider>
-    ),
+      onValueChange: (value: string) => void
+    }) => <Selection.Provider value={onValueChange}>{children}</Selection.Provider>,
     DropdownMenuRadioItem: ({ value, children }: { value: string; children?: ReactNode }) => {
-      const onSelect = React.useContext(SelectContext)
+      const select = useContext(Selection)
       return (
-        <button type="button" role="menuitemradio" onClick={() => onSelect(value)}>
+        <button type="button" onClick={() => select(value)}>
           {children}
         </button>
       )
     }
   }
 })
-
+vi.mock('@/runtime/runtime-linear-client', () => ({
+  linearStatus: vi.fn(async () => ({ connected: false, viewer: null }))
+}))
 import WorktreeMetaDialog from './WorktreeMetaDialog'
 
-const REPO_ID = 'repo-1'
-const WORKTREE_ID = 'repo-1::/repo/worktrees/feature'
-
-const IME_FIELDS = [
-  {
-    placeholder: 'Notes about this worktree...',
-    value: '日本語',
-    updates: { comment: '日本語' }
-  },
-  {
-    placeholder: 'Custom display name...',
-    value: '日本語の名前',
-    updates: { displayName: '日本語の名前' }
-  },
-  {
-    placeholder: 'Issue #, or a GitHub or Linear URL',
-    value: '42',
-    updates: { linkedIssue: 42 }
-  },
-  { placeholder: 'PR # or GitHub URL', value: '43', updates: { linkedPR: 43 } },
-  { placeholder: 'MR ! or GitLab URL', value: '!44', updates: { linkedGitLabMR: 44 } }
-] as const
-
 const initialState = useAppStore.getInitialState()
 const updateWorktreeMeta =
   vi.fn<
@@ -86,26 +53,15 @@ const updateWorktreeMeta =
       options?: WorktreeMetaUpdateOptions
     ) => Promise<{ ok: true } | { ok: false; error: string }>
   >()
-const fetchLinearIssue = vi.fn<(...args: never[]) => Promise<LinearIssue | null>>()
-const openUrl = vi.fn<(url: string) => void>()
-
-/** Only `url` is read by the open-issue path. */
-function makeLinearIssue(url: string): LinearIssue {
-  return { url } as LinearIssue
-}
-
-function makeRepo(id: string = REPO_ID, path: string = '/repo'): Repo {
-  return { id, path, displayName: 'orca', badgeColor: '#999999', addedAt: 1 }
-}
-
-function makeWorktree(overrides: Partial<Worktree> = {}): Worktree {
+const openUrl = vi.fn()
+function worktree(overrides: Partial<Worktree> = {}): Worktree {
   return {
-    id: WORKTREE_ID,
-    repoId: REPO_ID,
+    id: 'repo::/repo/worktrees/feature',
+    repoId: 'repo',
     path: '/repo/worktrees/feature',
     displayName: 'Feature work',
     branch: 'feature',
-    head: 'abc123',
+    head: 'abc',
     isBare: false,
     isMainWorktree: false,
     comment: 'existing note',
@@ -120,694 +76,553 @@ function makeWorktree(overrides: Partial<Worktree> = {}): Worktree {
     ...overrides
   }
 }
-
-function makeFolderWorkspace(overrides: Partial<FolderWorkspace> = {}): FolderWorkspace {
-  return {
-    id: 'fw-1',
-    projectGroupId: 'pg-1',
-    name: 'Docs folder',
-    folderPath: '/repo/docs',
-    linkedTask: {
-      provider: 'linear',
-      type: 'issue',
-      number: 901,
-      title: 'Fix auth',
-      url: 'https://linear.app/acme/issue/STA-901',
-      linearIdentifier: 'STA-901'
-    },
-    comment: '',
-    isArchived: false,
-    isUnread: false,
-    isPinned: false,
-    sortOrder: 0,
-    lastActivityAt: 1,
-    createdAt: 1,
-    updatedAt: 1,
-    ...overrides
-  }
-}
-
 function openDialog(
-  options: {
-    worktree?: Partial<Worktree>
-    worktreeId?: string
-    folderWorkspace?: Partial<FolderWorkspace>
-    /** Extra owners of the same workspace ID, which the index reads as ambiguous. */
-    otherRepos?: { repoId: string; worktree?: Partial<Worktree> }[]
-    modalRepoId?: string
-    modalExecutionHostId?: string
-    modalReviewProvider?: 'github' | 'gitlab'
-    modalCurrentReview?: number
-    modalSuppressHostedReviewRefresh?: boolean
-    linearViewerOrganizationUrlKey?: string
-  } = {}
-): void {
-  const worktree = makeWorktree(options.worktree)
-  const otherRepos = options.otherRepos ?? []
+  overrides: Partial<Worktree> = {},
+  modal: Record<string, unknown> = {}
+): Worktree {
+  const item = worktree(overrides)
   useAppStore.setState({
-    repos: [makeRepo(), ...otherRepos.map((other) => makeRepo(other.repoId, `/${other.repoId}`))],
-    worktreesByRepo: {
-      [REPO_ID]: [worktree],
-      ...Object.fromEntries(
-        otherRepos.map((other) => [
-          other.repoId,
-          [makeWorktree({ repoId: other.repoId, ...other.worktree })]
-        ])
-      )
-    },
-    ...(options.folderWorkspace
-      ? { folderWorkspaces: [makeFolderWorkspace(options.folderWorkspace)] }
-      : {}),
-    ...(options.linearViewerOrganizationUrlKey
-      ? {
-          linearStatus: {
-            connected: true,
-            viewer: {
-              displayName: 'Viewer',
-              email: null,
-              organizationName: 'Active',
-              organizationUrlKey: options.linearViewerOrganizationUrlKey
-            }
-          }
+    repos: [
+      {
+        id: 'repo',
+        path: '/repo',
+        displayName: 'orca',
+        badgeColor: '',
+        addedAt: 1,
+        ...(overrides.hostId ? { executionHostId: overrides.hostId } : {}),
+        gitRemoteIdentity: {
+          canonicalKey: 'github.com/acme/orca',
+          remoteName: 'origin',
+          remoteUrl: 'https://github.com/acme/orca.git'
         }
-      : {}),
+      }
+    ],
+    worktreesByRepo: { repo: [item] },
     activeModal: 'edit-meta',
     modalData: {
-      worktreeId: options.worktreeId ?? worktree.id,
-      ...(options.modalRepoId ? { repoId: options.modalRepoId } : {}),
-      ...(options.modalExecutionHostId ? { executionHostId: options.modalExecutionHostId } : {}),
-      ...(options.modalReviewProvider ? { reviewProvider: options.modalReviewProvider } : {}),
-      ...(options.modalCurrentReview ? { currentReview: options.modalCurrentReview } : {}),
-      ...(options.modalSuppressHostedReviewRefresh ? { suppressHostedReviewRefresh: true } : {}),
-      currentDisplayName: worktree.displayName,
-      currentComment: worktree.comment,
-      focus: 'comment'
+      worktreeId: item.id,
+      repoId: item.repoId,
+      currentDisplayName: item.displayName,
+      currentComment: item.comment,
+      focus: 'comment',
+      ...modal
     },
-    updateWorktreeMeta,
-    fetchLinearIssue: fetchLinearIssue as unknown as ReturnType<
-      typeof useAppStore.getState
-    >['fetchLinearIssue']
+    updateWorktreeMeta
   })
   render(<WorktreeMetaDialog />)
+  return item
 }
-
-function issueInput(): HTMLInputElement {
-  return screen.getByPlaceholderText('Issue #, or a GitHub or Linear URL')
+function input(): HTMLElement {
+  const field = screen.getByRole('combobox', { name: 'Search references' })
+  act(() => field.focus())
+  return field
 }
-
-function providerChip(): HTMLButtonElement {
-  return screen.getByRole('button', { name: 'Issue provider' })
+async function add(value: string, kind?: string): Promise<void> {
+  const field = input()
+  fireEvent.change(field, { target: { value } })
+  if (kind) {
+    fireEvent.click(screen.getByRole('button', { name: kind }))
+  }
+  const command = await screen.findByRole('option', { name: /^Add (PR|Issue|MR|STA)/ })
+  await waitFor(() => expect(command.getAttribute('data-disabled')).not.toBe('true'))
+  fireEvent.click(command)
 }
-
-function saveButton(): HTMLButtonElement {
-  return screen.getByRole('button', { name: 'Save' })
+async function save(): Promise<void> {
+  fireEvent.click(screen.getByRole('button', { name: 'Save' }))
+  await waitFor(() => expect(updateWorktreeMeta).toHaveBeenCalled())
 }
 
-function openIssueButton(): HTMLButtonElement {
-  return screen.getByRole('button', { name: 'Open linked issue' })
-}
-
-describe('WorktreeMetaDialog issue link row', () => {
+describe('workspace linked work editor', () => {
   beforeEach(() => {
     useAppStore.setState(initialState, true)
-    updateWorktreeMeta.mockReset()
-    updateWorktreeMeta.mockResolvedValue({ ok: true })
-    fetchLinearIssue.mockReset()
-    fetchLinearIssue.mockResolvedValue(null)
-    openUrl.mockReset()
-    Object.defineProperty(window, 'api', {
-      configurable: true,
-      value: { shell: { openUrl } }
+    useAppStore.setState({
+      fetchWorkItems: vi.fn(async () => []),
+      getCachedWorkItems: vi.fn(() => []),
+      refreshPreflightStatus: vi.fn(async () => {}),
+      checkLinearConnection: vi.fn(async () => {}),
+      readJiraStatus: vi.fn(async () => ({ connected: false, viewer: null, sites: [] })),
+      linearStatusChecked: true
     })
+    Element.prototype.scrollIntoView = vi.fn()
+    updateWorktreeMeta.mockReset().mockResolvedValue({ ok: true })
+    openUrl.mockReset()
+    Object.defineProperty(window, 'api', { configurable: true, value: { shell: { openUrl } } })
   })
-
-  afterEach(() => {
-    cleanup()
-    vi.restoreAllMocks()
-    useAppStore.setState(initialState, true)
+  afterEach(cleanup)
+
+  it('adds multiple reviews and tasks without displacing existing links', async () => {
+    openDialog({ linkedPR: 1, linkedIssue: 2 })
+    await add('3', 'GitHub PR')
+    await add('STA-4', 'Linear task')
+    expect(screen.getByText('PR #1')).toBeTruthy()
+    expect(screen.getByText('PR #3')).toBeTruthy()
+    expect(screen.getByText('Issue #2')).toBeTruthy()
+    expect(screen.getByText('STA-4')).toBeTruthy()
+    await save()
+    expect(updateWorktreeMeta.mock.calls[0]?.[1].linkedItems).toEqual(
+      expect.arrayContaining([
+        expect.objectContaining({ provider: 'github', type: 'pr', number: 1 }),
+        expect.objectContaining({ provider: 'github', type: 'pr', number: 3 }),
+        expect.objectContaining({ provider: 'linear', identifier: 'STA-4' })
+      ])
+    )
   })
-
-  it.each(IME_FIELDS)(
-    'ignores IME Enter and resets on blur in $placeholder',
-    async ({ placeholder, value, updates }) => {
-      openDialog(placeholder === 'MR ! or GitLab URL' ? { modalReviewProvider: 'gitlab' } : {})
-      const input = screen.getByPlaceholderText(placeholder)
-      fireEvent.change(input, { target: { value } })
-      for (const marker of [{ isComposing: true, keyCode: 13 }, { keyCode: 229 }]) {
-        expect(fireEvent.keyDown(input, { key: 'Enter', ...marker })).toBe(true)
-        expect(updateWorktreeMeta).not.toHaveBeenCalled()
-        expect(useAppStore.getState().activeModal).toBe('edit-meta')
-      }
-      fireEvent.compositionStart(input)
-      expect(fireEvent.keyDown(input, { key: 'Enter', keyCode: 13 })).toBe(true)
-      expect(updateWorktreeMeta).not.toHaveBeenCalled()
-      fireEvent.blur(input)
-      await act(async () => {
-        fireEvent.keyDown(input, { key: 'Enter', keyCode: 13 })
+  it('adds a pasted URL according to its provider and type', async () => {
+    openDialog()
+    act(() =>
+      useAppStore.setState({
+        repos: [
+          {
+            id: 'repo',
+            path: '/repo',
+            displayName: 'orca',
+            badgeColor: '',
+            addedAt: 1,
+            gitRemoteIdentity: {
+              canonicalKey: 'gitlab.example.com/team/orca',
+              remoteName: 'origin',
+              remoteUrl: 'https://gitlab.example.com/team/orca.git'
+            }
+          }
+        ]
       })
-      expect(updateWorktreeMeta).toHaveBeenCalledTimes(1)
-      expect(updateWorktreeMeta.mock.calls[0]?.[1]).toEqual(expect.objectContaining(updates))
-      expect(useAppStore.getState().activeModal).toBe('none')
-    }
-  )
-
-  it.each(
-    ['before keyup', 'after keyup'].flatMap((order) =>
-      IME_FIELDS.map((field) => ({ ...field, order }))
     )
-  )(
-    'ignores the IME Enter redispatch $order in $placeholder',
-    async ({ order, placeholder, value, updates }) => {
-      openDialog(placeholder === 'MR ! or GitLab URL' ? { modalReviewProvider: 'gitlab' } : {})
-      const input = screen.getByPlaceholderText(placeholder)
-      const frames: FrameRequestCallback[] = []
-      vi.spyOn(window, 'requestAnimationFrame').mockImplementation((callback) =>
-        frames.push(callback)
-      )
-      fireEvent.compositionStart(input)
-      fireEvent.keyDown(input, { key: 'Process', keyCode: 229, isComposing: true })
-      fireEvent.change(input, { target: { value } })
-      fireEvent.compositionEnd(input)
-      if (order === 'after keyup') {
-        fireEvent.keyUp(input, { key: 'Enter', keyCode: 13 })
-      }
-      expect(fireEvent.keyDown(input, { key: 'Enter', keyCode: 13 })).toBe(false)
-      expect(updateWorktreeMeta).not.toHaveBeenCalled()
-      expect(useAppStore.getState().activeModal).toBe('edit-meta')
-      fireEvent.keyUp(input, { key: 'Enter', keyCode: 13 })
-      act(() => frames.forEach((callback) => callback(0)))
-      await act(async () => {
-        fireEvent.keyDown(input, { key: 'Enter', keyCode: 13 })
-      })
-      expect(updateWorktreeMeta.mock.calls[0]?.[1]).toEqual(expect.objectContaining(updates))
-      expect(updateWorktreeMeta).toHaveBeenCalledTimes(1)
-      expect(useAppStore.getState().activeModal).toBe('none')
-    }
-  )
-
-  it.each(IME_FIELDS)(
-    'expires an IME gesture without redispatch in $placeholder',
-    async ({ placeholder }) => {
-      openDialog(placeholder === 'MR ! or GitLab URL' ? { modalReviewProvider: 'gitlab' } : {})
-      const input = screen.getByPlaceholderText(placeholder)
-      const frames: FrameRequestCallback[] = []
-      vi.spyOn(window, 'requestAnimationFrame').mockImplementation((callback) =>
-        frames.push(callback)
-      )
-      fireEvent.compositionStart(input)
-      fireEvent.keyDown(input, { key: 'Enter', keyCode: 229 })
-      fireEvent.compositionEnd(input)
-      fireEvent.keyUp(input, { key: 'Enter', keyCode: 13 })
-      act(() => frames.forEach((callback) => callback(0)))
-      await act(async () => {
-        fireEvent.keyDown(input, { key: 'Enter', keyCode: 13 })
+    await add('https://gitlab.example.com/team/orca/-/merge_requests/12')
+    expect(screen.getByText('MR !12')).toBeTruthy()
+    await save()
+    expect(updateWorktreeMeta.mock.calls[0]?.[1].linkedItems).toEqual([
+      expect.objectContaining({ provider: 'gitlab', type: 'mr', number: 12 })
+    ])
+  })
+  it('shows an existing reference as linked', async () => {
+    openDialog({ linkedIssue: 42 })
+    fireEvent.change(input(), { target: { value: '#42' } })
+    expect(await screen.findByText('Linked')).toBeTruthy()
+    expect(screen.getAllByText('Issue #42')).toHaveLength(1)
+  })
+  it('unlinks only the chosen item', async () => {
+    openDialog({
+      linkedPR: 1,
+      linkedItems: [
+        { provider: 'github', type: 'pr', number: 1 },
+        { provider: 'github', type: 'pr', number: 2 }
+      ]
+    })
+    fireEvent.click(screen.getByRole('button', { name: 'Unlink PR #2' }))
+    await save()
+    expect(updateWorktreeMeta.mock.calls[0]?.[1].linkedItems).toEqual([
+      { provider: 'github', type: 'pr', number: 1 }
+    ])
+  })
+  it('keeps all reviews without exposing a checks selector', async () => {
+    openDialog({
+      linkedPR: 1,
+      linkedItems: [
+        { provider: 'github', type: 'pr', number: 1 },
+        { provider: 'github', type: 'pr', number: 2 }
+      ]
+    })
+    expect(screen.queryByRole('button', { name: /Use .* for checks/ })).toBeNull()
+    expect(screen.queryByText('Used for checks')).toBeNull()
+    await save()
+    expect(updateWorktreeMeta.mock.calls[0]?.[1]).toEqual({})
+  })
+  it('unlinks a review without overriding another client’s concurrently selected review', async () => {
+    const original = openDialog({
+      linkedPR: 1,
+      linkedItems: [
+        { provider: 'github', type: 'pr', number: 1 },
+        { provider: 'github', type: 'pr', number: 2 }
+      ]
+    })
+    fireEvent.click(screen.getByRole('button', { name: 'Unlink PR #1' }))
+    act(() =>
+      useAppStore.setState({
+        worktreesByRepo: {
+          repo: [
+            {
+              ...original,
+              linkedPR: 3,
+              linkedItems: [
+                ...(original.linkedItems ?? []),
+                { provider: 'github', type: 'pr', number: 3 }
+              ]
+            }
+          ]
+        }
       })
-      expect(updateWorktreeMeta).toHaveBeenCalledTimes(1)
-      expect(useAppStore.getState().activeModal).toBe('none')
-    }
-  )
-
-  it.each(
-    ['active composition', 'pending confirmation'].flatMap((phase) =>
-      IME_FIELDS.map((field) => ({ ...field, phase }))
     )
-  )(
-    'allows a deliberate save after closing with $phase in $placeholder',
-    async ({ phase, placeholder, value, updates }) => {
-      openDialog(placeholder === 'MR ! or GitLab URL' ? { modalReviewProvider: 'gitlab' } : {})
-      const input = screen.getByPlaceholderText(placeholder)
-      const modalData = useAppStore.getState().modalData
-      fireEvent.compositionStart(input)
-      if (phase === 'pending confirmation') {
-        fireEvent.keyDown(input, { key: 'Enter', keyCode: 229 })
-        fireEvent.compositionEnd(input)
-      }
-      act(() => useAppStore.getState().closeModal())
-      expect(screen.queryByPlaceholderText(placeholder)).toBeNull()
-      act(() => useAppStore.setState({ activeModal: 'edit-meta', modalData }))
-      const reopenedInput = screen.getByPlaceholderText(placeholder)
-      fireEvent.change(reopenedInput, { target: { value } })
-      await act(async () => {
-        fireEvent.keyDown(reopenedInput, { key: 'Enter', keyCode: 13 })
-      })
-      expect(updateWorktreeMeta).toHaveBeenCalledTimes(1)
-      expect(updateWorktreeMeta.mock.calls[0]?.[1]).toEqual(expect.objectContaining(updates))
-      expect(useAppStore.getState().activeModal).toBe('none')
-    }
-  )
-
-  it('keeps a folder workspace note open through composition confirmation', async () => {
-    const worktreeId = folderWorkspaceKey('fw-1')
-    openDialog({ worktreeId, folderWorkspace: {} })
-    const input = screen.getByPlaceholderText('Notes about this worktree...')
-    fireEvent.change(input, { target: { value: '日本語' } })
-    fireEvent.compositionStart(input)
-    fireEvent.keyDown(input, { key: 'Enter', keyCode: 229 })
-    fireEvent.compositionEnd(input)
-    fireEvent.keyDown(input, { key: 'Enter', keyCode: 13 })
-    expect(updateWorktreeMeta).not.toHaveBeenCalled()
-    expect(useAppStore.getState().activeModal).toBe('edit-meta')
-    await act(async () => {
-      fireEvent.keyDown(input, { key: 'Enter', keyCode: 13 })
+    await save()
+    expect(updateWorktreeMeta.mock.calls[0]?.[1]).toEqual({
+      linkedItemsBase: original.linkedItems,
+      linkedItems: [{ provider: 'github', type: 'pr', number: 2 }]
     })
-    expect(updateWorktreeMeta).toHaveBeenCalledExactlyOnceWith(worktreeId, { comment: '日本語' })
-    expect(useAppStore.getState().activeModal).toBe('none')
   })
-
-  it.each([
-    { userAgent: 'Macintosh', modifier: { metaKey: true } },
-    { userAgent: 'Windows', modifier: { ctrlKey: true } },
-    { userAgent: 'Linux', modifier: { ctrlKey: true } }
-  ])(
-    'keeps the save shortcut outside composition on $userAgent',
-    async ({ userAgent, modifier }) => {
-      vi.spyOn(navigator, 'userAgent', 'get').mockReturnValue(userAgent)
-      openDialog()
-      const input = screen.getByPlaceholderText('Notes about this worktree...')
-      fireEvent.compositionStart(input)
-      fireEvent.keyDown(input, { key: 'Enter', keyCode: 13, ...modifier })
-      expect(updateWorktreeMeta).not.toHaveBeenCalled()
-      fireEvent.compositionEnd(input)
-      await act(async () => {
-        fireEvent.keyDown(input, { key: 'Enter', keyCode: 13, ...modifier })
+  it('passes the original snapshot so persistence can preserve background additions', async () => {
+    const original = openDialog({ linkedIssue: 1 })
+    fireEvent.click(screen.getByRole('button', { name: 'Unlink Issue #1' }))
+    act(() =>
+      useAppStore.setState({
+        worktreesByRepo: {
+          repo: [
+            {
+              ...original,
+              linkedItems: [
+                { provider: 'github', type: 'issue', number: 1 },
+                { provider: 'github', type: 'issue', number: 2 }
+              ]
+            }
+          ]
+        }
       })
-      expect(updateWorktreeMeta).toHaveBeenCalledTimes(1)
-    }
-  )
-
-  it('leaves Shift+Enter available for a newline', () => {
+    )
+    await save()
+    expect(updateWorktreeMeta.mock.calls[0]?.[1]).toEqual({
+      linkedItemsBase: [{ provider: 'github', type: 'issue', number: 1 }],
+      linkedItems: []
+    })
+  })
+  it('omits untouched links on comment-only saves', async () => {
+    openDialog({ linkedIssue: 1, linkedLinearIssue: 'STA-2' })
+    fireEvent.change(screen.getByPlaceholderText('Notes about this worktree...'), {
+      target: { value: 'new note' }
+    })
+    await save()
+    expect(updateWorktreeMeta.mock.calls[0]?.[1]).toEqual({ comment: 'new note' })
+  })
+  it('keeps the draft and error visible after a failed save', async () => {
+    updateWorktreeMeta.mockResolvedValue({ ok: false, error: 'Host is disconnected' })
     openDialog()
-    const input = screen.getByPlaceholderText('Notes about this worktree...')
-    expect(fireEvent.keyDown(input, { key: 'Enter', keyCode: 13, shiftKey: true })).toBe(true)
-    expect(updateWorktreeMeta).not.toHaveBeenCalled()
+    await add('4')
+    await save()
+    const alert = await screen.findByRole('alert')
+    expect(alert.textContent).toBe('Host is disconnected')
+    expect(alert.parentElement?.contains(screen.getByRole('button', { name: 'Save' }))).toBe(true)
+    expect(screen.getByText('Issue #4')).toBeTruthy()
     expect(useAppStore.getState().activeModal).toBe('edit-meta')
   })
-
-  it('seeds the chip and value from a GitHub link', () => {
-    openDialog({ worktree: { linkedIssue: 42 } })
-
-    expect(providerChip().textContent).toContain('GitHub')
-    expect(issueInput().value).toBe('42')
+  it('supports folder workspace links', async () => {
+    const folder: FolderWorkspace = {
+      id: 'folder-1',
+      projectGroupId: 'group',
+      name: 'Docs',
+      folderPath: '/docs',
+      linkedTask: null,
+      comment: '',
+      isArchived: false,
+      isUnread: false,
+      isPinned: false,
+      sortOrder: 0,
+      lastActivityAt: 1,
+      createdAt: 1,
+      updatedAt: 1
+    }
+    useAppStore.setState({ folderWorkspaces: [folder] })
+    openDialog({}, { worktreeId: folderWorkspaceKey(folder.id), repoId: undefined })
+    await add('STA-5', 'Linear task')
+    await save()
+    expect(updateWorktreeMeta.mock.calls[0]?.[0]).toBe(folderWorkspaceKey(folder.id))
+    expect(updateWorktreeMeta.mock.calls[0]?.[1].linkedItems).toEqual([
+      expect.objectContaining({ provider: 'linear', identifier: 'STA-5' })
+    ])
   })
-
-  it('seeds and saves the GitLab MR row through the GitLab slot', async () => {
-    openDialog({
-      worktree: { linkedGitLabMR: 42 },
-      modalReviewProvider: 'gitlab',
-      modalCurrentReview: 42,
-      modalSuppressHostedReviewRefresh: true
-    })
-    const input = screen.getByPlaceholderText('MR ! or GitLab URL')
-
-    expect(screen.getByText('GitLab MR')).toBeTruthy()
-    expect((input as HTMLInputElement).value).toBe('42')
-    fireEvent.change(input, { target: { value: '!43' } })
-    await act(async () => fireEvent.click(saveButton()))
-
-    await waitFor(() => expect(updateWorktreeMeta).toHaveBeenCalledTimes(1))
-    expect(updateWorktreeMeta.mock.calls[0]?.[1]).toEqual(
-      expect.objectContaining({ linkedGitLabMR: 43 })
-    )
-    expect(updateWorktreeMeta.mock.calls[0]?.[1]).not.toHaveProperty('linkedPR')
-    expect(updateWorktreeMeta.mock.calls[0]?.[2]).toEqual({ suppressHostedReviewRefresh: true })
+  it('preserves the execution host in a metadata save', async () => {
+    openDialog({ hostId: 'runtime:host-1' }, { executionHostId: 'runtime:host-1' })
+    await add('4')
+    await save()
+    expect(updateWorktreeMeta.mock.calls[0]?.[2]).toEqual({ executionHostId: 'runtime:host-1' })
   })
-
-  it('replaces a completed emoji shortcode in the display name', () => {
+  it('Enter adds another link and leaves the editor open', async () => {
     openDialog()
-    const displayNameInput = screen.getByRole('textbox', { name: 'Display Name' })
-
-    fireEvent.change(displayNameInput, {
-      target: { value: 'Feature :wink:', selectionStart: 14 }
-    })
-
-    expect((displayNameInput as HTMLInputElement).value).toBe('Feature 😉')
+    const field = input()
+    fireEvent.change(field, { target: { value: 'https://github.com/acme/orca/issues/4' } })
+    fireEvent.keyDown(field, { key: 'Enter' })
+    expect(screen.queryByText('Issue #4')).toBeNull()
+    const command = await screen.findByRole('option', { name: 'Add Issue #4' })
+    await waitFor(() => expect(command.getAttribute('data-disabled')).not.toBe('true'))
+    fireEvent.keyDown(field, { key: 'Enter' })
+    expect(screen.getByText('Issue #4')).toBeTruthy()
+    expect(updateWorktreeMeta).not.toHaveBeenCalled()
   })
-
-  it('seeds the chip and value from a Linear link', () => {
-    openDialog({ worktree: { linkedLinearIssue: 'STA-335' } })
-
-    expect(providerChip().textContent).toContain('Linear')
-    expect(issueInput().value).toBe('STA-335')
+  it('does not add during an IME composition gesture', () => {
+    openDialog()
+    const field = input()
+    fireEvent.change(field, { target: { value: '4' } })
+    fireEvent.compositionStart(field)
+    fireEvent.keyDown(field, { key: 'Enter', isComposing: true })
+    expect(screen.queryByText('Issue #4')).toBeNull()
+    expect(updateWorktreeMeta).not.toHaveBeenCalled()
   })
-
-  it('flips to Linear when a linear.app issue URL is pasted', () => {
-    openDialog({ worktree: { linkedIssue: 42 } })
-
-    fireEvent.change(issueInput(), {
-      target: { value: 'https://linear.app/acme/issue/STA-335/fix-the-thing' }
-    })
-
-    expect(providerChip().textContent).toContain('Linear')
+  it.each([
+    { key: 'Enter', keyCode: 13, isComposing: true },
+    { key: 'Enter', keyCode: 229 },
+    { key: 'Enter', keyCode: 13 }
+  ])('keeps notes open through IME confirmation and redispatch: %j', async (event) => {
+    openDialog()
+    const notes = screen.getByRole('textbox', { name: 'Notes' })
+    fireEvent.compositionStart(notes)
+    fireEvent.change(notes, { target: { value: '確定' } })
+    fireEvent.keyDown(notes, event)
+    fireEvent.compositionEnd(notes)
+    fireEvent.keyUp(notes, { key: 'Enter', keyCode: 13 })
+    fireEvent.keyDown(notes, { key: 'Enter', keyCode: 13 })
+    expect(updateWorktreeMeta).not.toHaveBeenCalled()
+    expect(useAppStore.getState().activeModal).toBe('edit-meta')
+    fireEvent.keyDown(notes, { key: 'Enter', keyCode: 13 })
+    await waitFor(() => expect(updateWorktreeMeta).toHaveBeenCalled())
+    expect(updateWorktreeMeta.mock.calls[0]?.[1].comment).toBe('確定')
   })
-
-  // Why: Linear and Jira issue keys are the same shape, so only a URL may steer
-  // the provider — a bare key must never override the user's explicit choice.
-  it('keeps the chip on GitHub when a bare issue key is typed', () => {
-    openDialog({ worktree: { linkedIssue: 42 } })
-
-    fireEvent.change(issueInput(), { target: { value: 'GH-1234' } })
-
-    expect(providerChip().textContent).toContain('GitHub')
-    expect(providerChip().textContent).not.toContain('Linear')
+  it('saves selected drafts while leaving search text unattached', async () => {
+    openDialog({ linkedIssue: 1 })
+    await add('https://github.com/acme/orca/issues/4')
+    fireEvent.change(input(), { target: { value: '42' } })
+    expect(screen.getByRole('button', { name: 'Save' }).hasAttribute('disabled')).toBe(false)
+    expect(screen.getByText('Select a result to attach it.')).toBeTruthy()
+    await save()
+    expect(updateWorktreeMeta.mock.calls[0]?.[1].linkedItems).toEqual([
+      expect.objectContaining({ number: 1 }),
+      expect.objectContaining({ number: 4 })
+    ])
   })
-
-  it('flips to GitHub when a GitHub issue URL is pasted over a Linear link', () => {
-    openDialog({ worktree: { linkedLinearIssue: 'STA-335' } })
-
-    fireEvent.change(issueInput(), {
-      target: { value: 'https://github.com/acme/orca/issues/77' }
+  it('blocks known foreign issue URLs with an explanation', () => {
+    openDialog()
+    fireEvent.change(input(), {
+      target: { value: 'https://github.com/other/project/issues/4' }
     })
-
-    expect(providerChip().textContent).toContain('GitHub')
-  })
-
-  it('names the Linear issue that switching to GitHub would unlink', () => {
-    openDialog({ worktree: { linkedLinearIssue: 'STA-335' } })
-
-    fireEvent.click(screen.getByRole('menuitemradio', { name: 'GitHub' }))
-    fireEvent.change(issueInput(), { target: { value: '99' } })
-
     expect(
-      screen.getByText('Saving unlinks Linear STA-335 — a workspace tracks one issue.')
+      screen.getByRole('option', { name: /^Add / }).getAttribute('aria-disabled') === 'true'
+    ).toBe(true)
+    expect(
+      screen.getByText(
+        'This issue belongs to another repository. Add issues from this workspace’s repository.'
+      )
     ).toBeTruthy()
   })
-
-  // Both slots can hold a link at once — naming only one understates the save.
-  it('names both links when clearing the field would drop both', () => {
-    openDialog({ worktree: { linkedIssue: 42, linkedLinearIssue: 'STA-335' } })
-
-    fireEvent.change(issueInput(), { target: { value: '' } })
-
+  it('blocks known foreign review URLs with an explanation', () => {
+    openDialog()
+    fireEvent.change(input(), {
+      target: { value: 'https://github.com/other/project/pull/4' }
+    })
+    expect(
+      screen.getByRole('option', { name: /^Add / }).getAttribute('aria-disabled') === 'true'
+    ).toBe(true)
     expect(
       screen.getByText(
-        'Saving unlinks Linear STA-335 and GitHub #42 — a workspace tracks one issue.'
+        'This review belongs to another repository. Add reviews from this workspace’s repository.'
       )
     ).toBeTruthy()
   })
-
-  // The warning above only promises the displacement — this asserts the payload
-  // that carries it out, which is where the one-issue-per-workspace rule lives.
-  it('clears the displaced GitHub link when a Linear value is saved', async () => {
-    openDialog({ worktree: { linkedIssue: 42 } })
-
-    fireEvent.click(screen.getByRole('menuitemradio', { name: 'Linear' }))
-    fireEvent.change(issueInput(), { target: { value: 'STA-335' } })
-    await act(async () => {
-      fireEvent.click(saveButton())
-    })
-
-    await waitFor(() => expect(updateWorktreeMeta).toHaveBeenCalledTimes(1))
-    const updates = updateWorktreeMeta.mock.calls[0]?.[1] ?? {}
-    expect(updates.linkedLinearIssue).toBe('STA-335')
-    expect(updates.linkedIssue).toBeNull()
+  it('clears search with captured Escape before the next Escape closes details', () => {
+    openDialog()
+    const field = input()
+    fireEvent.change(field, { target: { value: 'unselected search' } })
+    fireEvent.keyDown(field, { key: 'Escape' })
+    expect(screen.getByRole('combobox')).toBe(field)
+    expect(screen.queryByRole('option')).toBeNull()
+    expect(screen.queryByRole('button', { name: 'Clear search' })).toBeNull()
+    expect(useAppStore.getState().activeModal).toBe('edit-meta')
+    fireEvent.keyDown(field, { key: 'Escape' })
+    expect(useAppStore.getState().activeModal).toBe('none')
   })
-
-  // A GitHub-only save must carry no Linear keys: persistence gates the remote
-  // Linear capability on key presence, so a synthetic clear fails the save.
-  it('sends no Linear keys when the workspace has no Linear link', async () => {
-    openDialog({ worktree: { linkedIssue: 42 } })
-
-    fireEvent.change(issueInput(), { target: { value: '99' } })
-    await act(async () => {
-      fireEvent.click(saveButton())
-    })
-
-    await waitFor(() => expect(updateWorktreeMeta).toHaveBeenCalledTimes(1))
-    const updates = updateWorktreeMeta.mock.calls[0]?.[1] ?? {}
-    expect(updates.linkedIssue).toBe(99)
-    expect(updates).not.toHaveProperty('linkedLinearIssue')
+  it('keeps real GitLab-enabled controller effects bounded in Smart mode', async () => {
+    const errors = vi.spyOn(console, 'error').mockImplementation(() => {})
+    openDialog({ hostId: 'ssh:test-host' })
+    input()
+    await waitFor(() => expect(useAppStore.getState().fetchWorkItems).toHaveBeenCalledTimes(1))
+    expect(screen.getByRole('tab', { name: 'GitLab' })).toBeTruthy()
+    expect(errors.mock.calls.flat().join(' ')).not.toContain('Maximum update depth')
+    errors.mockRestore()
   })
-  it('qualifies a save with the host selected by the opening row', async () => {
-    openDialog({
-      worktree: { hostId: 'ssh:build-box' },
-      modalExecutionHostId: 'ssh:build-box'
-    })
-
-    fireEvent.change(screen.getByPlaceholderText('Notes about this worktree...'), {
-      target: { value: 'remote note' }
-    })
-    await act(async () => {
-      fireEvent.click(saveButton())
+  it('adds a searched issue with title and source context and stays ready for another', async () => {
+    useAppStore.setState({
+      fetchWorkItems: vi.fn(async (): Promise<GitHubWorkItem[]> => [
+        {
+          id: 'issue-71',
+          repoId: 'repo',
+          type: 'issue',
+          number: 71,
+          title: 'Searchable issue',
+          state: 'open',
+          url: 'https://github.com/acme/orca/issues/71',
+          labels: [],
+          updatedAt: '2026-10-05',
+          author: null
+        }
+      ])
     })
-
+    openDialog()
+    const field = input()
+    fireEvent.change(field, { target: { value: 'Searchable' } })
+    await screen.findByRole('option', { name: /Searchable issue/ })
     await waitFor(() =>
-      expect(updateWorktreeMeta).toHaveBeenCalledWith(
-        WORKTREE_ID,
-        expect.objectContaining({ comment: 'remote note' }),
-        { executionHostId: 'ssh:build-box' }
-      )
+      expect(
+        screen.getByRole('option', { name: /Searchable issue/ }).getAttribute('data-disabled')
+      ).not.toBe('true')
     )
+    fireEvent.click(screen.getByRole('option', { name: /Searchable issue/ }))
+    expect(screen.getByRole('combobox')).toBeTruthy()
+    expect(field).toBeInstanceOf(HTMLInputElement)
+    if (!(field instanceof HTMLInputElement)) {
+      throw new Error('Expected reference input')
+    }
+    expect(field.value).toBe('')
+    await save()
+    expect(updateWorktreeMeta.mock.calls[0]?.[1].linkedItems).toEqual([
+      expect.objectContaining({
+        number: 71,
+        title: 'Searchable issue',
+        taskSourceContext: expect.objectContaining({
+          provider: 'github',
+          providerIdentity: expect.objectContaining({ owner: 'acme', repo: 'orca' })
+        })
+      })
+    ])
   })
-
-  // updateWorktreeMeta stamps lastActivityAt on any comment write, which would
-  // reorder the workspace under the time-decay sidebar sort.
-  it('sends no comment when only the issue link changed', async () => {
-    openDialog({ worktree: { linkedLinearIssue: 'STA-335' } })
-
-    fireEvent.change(issueInput(), { target: { value: 'STA-999' } })
-    await act(async () => {
-      fireEvent.click(saveButton())
+  it('does not select a held result after typing a different query', async () => {
+    useAppStore.setState({
+      fetchWorkItems: vi.fn(async (): Promise<GitHubWorkItem[]> => [
+        {
+          id: 'issue-71',
+          repoId: 'repo',
+          type: 'issue',
+          number: 71,
+          title: 'Old result',
+          state: 'open',
+          url: 'https://github.com/acme/orca/issues/71',
+          labels: [],
+          updatedAt: '2026-10-05',
+          author: null
+        }
+      ])
     })
-
-    await waitFor(() => expect(updateWorktreeMeta).toHaveBeenCalledTimes(1))
-    expect(updateWorktreeMeta.mock.calls[0]?.[1] ?? {}).not.toHaveProperty('comment')
+    openDialog()
+    const field = input()
+    fireEvent.change(field, { target: { value: 'Old' } })
+    const result = await screen.findByRole('option', { name: /Old result/ })
+    fireEvent.change(field, { target: { value: 'new query' } })
+    fireEvent.keyDown(field, { key: 'Enter' })
+    fireEvent.click(result)
+    expect(screen.getByText('0 linked')).toBeTruthy()
   })
-
-  // A failed save refetches and reverts the optimistic write, so closing here
-  // would report success for an edit that silently undid itself.
-  it('keeps the dialog open and reports why when the save fails', async () => {
-    openDialog({ worktree: { linkedLinearIssue: 'STA-335' } })
-    updateWorktreeMeta.mockResolvedValue({ ok: false, error: 'Runtime is offline' })
-
-    fireEvent.change(issueInput(), { target: { value: 'STA-999' } })
-    await act(async () => {
-      fireEvent.click(saveButton())
-    })
-
-    expect(screen.getByRole('alert').textContent).toBe('Runtime is offline')
-    expect(useAppStore.getState().activeModal).toBe('edit-meta')
+  it('stops cmdk from adding an IME-owned unmarked Enter', () => {
+    openDialog()
+    const field = input()
+    fireEvent.change(field, { target: { value: 'https://github.com/acme/orca/issues/71' } })
+    fireEvent.compositionStart(field)
+    fireEvent.keyDown(field, { key: 'Enter', keyCode: 13, isComposing: false })
+    fireEvent.compositionEnd(field)
+    fireEvent.keyDown(field, { key: 'Enter', keyCode: 13, isComposing: false })
+    expect(screen.getByText('0 linked')).toBeTruthy()
   })
 
-  it('leaves the Linear link alone when only the comment is edited', async () => {
-    openDialog({ worktree: { linkedLinearIssue: 'STA-335' } })
-
-    fireEvent.change(screen.getByPlaceholderText('Notes about this worktree...'), {
-      target: { value: 'updated note' }
-    })
-
-    expect(screen.queryByText(/Saving unlinks/)).toBeNull()
-
-    await act(async () => {
-      fireEvent.click(saveButton())
-    })
-
-    await waitFor(() => expect(updateWorktreeMeta).toHaveBeenCalledTimes(1))
-    const updates = updateWorktreeMeta.mock.calls[0]?.[1] ?? {}
-    expect(Object.keys(updates)).not.toContain('linkedLinearIssue')
-    expect(Object.keys(updates)).not.toContain('linkedIssue')
-    expect(updates.comment).toBe('updated note')
+  it('focuses an inline suggested review without assuming it has been attached', () => {
+    openDialog({}, { focus: 'pr', currentReview: 42 })
+    expect(screen.getByRole('combobox', { name: 'Search references' })).toBeTruthy()
+    expect(screen.getByRole('button', { name: 'Save' }).hasAttribute('disabled')).toBe(false)
+    expect(screen.getByRole('option', { name: 'Add PR #42' })).toBeTruthy()
   })
-
-  it('blocks saving an unparseable Linear value', () => {
-    openDialog({ worktree: { linkedLinearIssue: 'STA-335' } })
-
-    fireEvent.change(issueInput(), { target: { value: 'not an issue' } })
-
-    expect(screen.getByText('Not a Linear issue key or linear.app issue URL.')).toBeTruthy()
-    expect(saveButton().disabled).toBe(true)
+  it('keeps search inside the single details dialog and starts with no result overlay', () => {
+    openDialog()
+    const field = input()
+    expect(screen.getAllByRole('dialog')).toHaveLength(1)
+    expect(screen.getByRole('dialog').contains(field)).toBe(true)
+    expect(screen.queryByRole('option')).toBeNull()
+    fireEvent.keyDown(field, { key: 'Enter' })
+    expect(screen.getByText('0 linked')).toBeTruthy()
   })
-
-  it('is read-only for a folder workspace', () => {
-    openDialog({ worktreeId: folderWorkspaceKey('fw-1') })
-
-    expect(issueInput().disabled).toBe(true)
-    expect(providerChip().disabled).toBe(true)
-    expect(
-      screen.getByText(
-        "Issue links are set when a folder workspace is created and can't be changed here yet."
-      )
-    ).toBeTruthy()
+  it('clears results explicitly and preserves the selected drafts', async () => {
+    openDialog()
+    await add('https://github.com/acme/orca/issues/4')
+    fireEvent.change(input(), { target: { value: 'unselected' } })
+    fireEvent.click(screen.getByRole('button', { name: 'Clear search' }))
+    expect(screen.queryByRole('option')).toBeNull()
+    expect(screen.getByText('Issue #4')).toBeTruthy()
+    expect(document.activeElement).toBe(input())
   })
-
-  // Folder workspaces live outside worktreesByRepo, so the indexed lookup alone
-  // leaves the row blank and the link it does hold looks lost.
-  it('shows a folder workspace its own linked issue', () => {
-    openDialog({ worktreeId: folderWorkspaceKey('fw-1'), folderWorkspace: {} })
-
-    expect(issueInput().value).toBe('STA-901')
-    expect(providerChip().textContent).toContain('Linear')
+  it('cancels added references without a metadata write', async () => {
+    openDialog()
+    await add('https://github.com/acme/orca/issues/4')
+    fireEvent.click(screen.getByRole('button', { name: 'Cancel' }))
+    expect(updateWorktreeMeta).not.toHaveBeenCalled()
+    expect(useAppStore.getState().activeModal).toBe('none')
   })
-
-  // A background `orca worktree set` must not move the baseline mid-edit: the
-  // field would read as dirty and a comment-only save would write the stale seed.
-  it('keeps the baseline frozen when the store changes while open', async () => {
-    openDialog({ worktree: { linkedLinearIssue: 'STA-335' } })
-
-    act(() => {
-      useAppStore.setState({
-        worktreesByRepo: {
-          [REPO_ID]: [makeWorktree({ linkedLinearIssue: 'STA-999' })]
-        }
-      })
-    })
-    fireEvent.change(screen.getByPlaceholderText('Notes about this worktree...'), {
-      target: { value: 'still working' }
-    })
-    await act(async () => {
-      fireEvent.click(saveButton())
-    })
-
-    const updates = updateWorktreeMeta.mock.calls[0]?.[1] ?? {}
-    expect(updates.comment).toBe('still working')
-    expect(updates).not.toHaveProperty('linkedLinearIssue')
-    expect(updates).not.toHaveProperty('linkedIssue')
+  it('keeps empty notes collapsed for link focus and preserves existing notes', () => {
+    openDialog({ comment: '' }, { focus: 'links' })
+    expect(screen.queryByRole('textbox', { name: 'Notes' })).toBeNull()
+    fireEvent.click(screen.getByRole('button', { name: 'Add notes' }))
+    expect(screen.getByRole('textbox', { name: 'Notes' })).toBeTruthy()
+    expect(document.activeElement).toBe(screen.getByRole('textbox', { name: 'Notes' }))
   })
-
-  // A bare key names no organization. Building one from the connected viewer
-  // opens a not-found page — or a colliding issue — for every other workspace
-  // the user belongs to, and skips the lookup that would have said so.
-  it('resolves a bare Linear key across workspaces rather than the active organization', async () => {
-    fetchLinearIssue.mockResolvedValue(makeLinearIssue('https://linear.app/other/issue/STA-999'))
-    openDialog({
-      worktree: { linkedLinearIssue: 'STA-335' },
-      linearViewerOrganizationUrlKey: 'active-org'
-    })
-
-    fireEvent.change(issueInput(), { target: { value: 'STA-999' } })
-    await act(async () => {
-      fireEvent.click(openIssueButton())
-    })
-
-    expect(fetchLinearIssue.mock.calls[0]?.slice(0, 2)).toEqual(['STA-999', 'all'])
-    expect(openUrl).toHaveBeenCalledWith('https://linear.app/other/issue/STA-999')
+  it('preserves name and comment autofocus while search remains inline', () => {
+    openDialog({}, { focus: 'displayName' })
+    expect(document.activeElement).toBe(screen.getByRole('textbox', { name: 'Display Name' }))
   })
-
-  // The stored key belongs to the persisted identifier, so it stays authoritative
-  // for it — no lookup, no round trip.
-  it('opens a stored Linear link directly from its organization key', async () => {
-    openDialog({
-      worktree: {
-        linkedLinearIssue: 'STA-335',
-        linkedLinearIssueOrganizationUrlKey: 'acme'
-      },
-      linearViewerOrganizationUrlKey: 'active-org'
-    })
-
-    await act(async () => {
-      fireEvent.click(openIssueButton())
-    })
-
-    expect(fetchLinearIssue).not.toHaveBeenCalled()
-    expect(openUrl).toHaveBeenCalledWith('https://linear.app/acme/issue/STA-335')
+  it('does not dismiss the dialog when Escape belongs to IME composition', () => {
+    openDialog()
+    const field = input()
+    fireEvent.compositionStart(field)
+    fireEvent.keyDown(field, { key: 'Escape', isComposing: false })
+    expect(useAppStore.getState().activeModal).toBe('edit-meta')
+    fireEvent.compositionEnd(field)
   })
-
-  // Promise.race cannot cancel the lookup, and the field stays editable while it
-  // runs — a late result must not open the issue the user just replaced.
-  it('does not open a lookup result after the field moved on', async () => {
-    let resolveLookup: ((issue: LinearIssue | null) => void) | undefined
-    fetchLinearIssue.mockReturnValue(
-      new Promise<LinearIssue | null>((resolve) => {
-        resolveLookup = resolve
-      })
-    )
-    openDialog({ worktree: { linkedLinearIssue: 'STA-335' } })
-
-    fireEvent.change(issueInput(), { target: { value: 'STA-999' } })
-    fireEvent.click(openIssueButton())
-    fireEvent.change(issueInput(), { target: { value: 'STA-777' } })
-    await act(async () => {
-      resolveLookup?.(makeLinearIssue('https://linear.app/acme/issue/STA-999'))
+  it('resets the draft when another host opens the same workspace ID', async () => {
+    const original = openDialog({ linkedIssue: 1 }, { executionHostId: 'local' })
+    fireEvent.change(screen.getByRole('textbox', { name: 'Notes' }), {
+      target: { value: 'Local draft' }
     })
-
-    expect(openUrl).not.toHaveBeenCalled()
-    expect(
-      screen.queryByText(
-        "Couldn't open that issue. Check the identifier and your Linear connection."
-      )
-    ).toBeNull()
-  })
-
-  // Displacement is decided at save time, not at open: a link added by the CLI
-  // while the dialog sat open must not outlive the save that warned about it.
-  it('clears a Linear link added while the dialog was open', async () => {
-    openDialog({ worktree: { linkedIssue: 42 } })
-
-    act(() => {
+    await add('https://github.com/acme/orca/issues/3')
+    act(() =>
       useAppStore.setState({
         worktreesByRepo: {
-          [REPO_ID]: [makeWorktree({ linkedIssue: 42, linkedLinearIssue: 'STA-999' })]
+          repo: [
+            original,
+            { ...original, hostId: 'ssh:other', linkedIssue: 2, comment: 'Remote note' }
+          ]
+        },
+        modalData: {
+          worktreeId: original.id,
+          repoId: 'repo',
+          executionHostId: 'ssh:other',
+          focus: 'comment'
         }
       })
-    })
-    fireEvent.change(issueInput(), { target: { value: '99' } })
-
+    )
+    expect(screen.getByText('Issue #2')).toBeTruthy()
+    expect(screen.queryByText('Issue #1')).toBeNull()
+    expect(screen.queryByText('Issue #3')).toBeNull()
     expect(
-      screen.getByText('Saving unlinks Linear STA-999 — a workspace tracks one issue.')
-    ).toBeTruthy()
-
-    await act(async () => {
-      fireEvent.click(saveButton())
-    })
-
-    await waitFor(() => expect(updateWorktreeMeta).toHaveBeenCalledTimes(1))
-    const updates = updateWorktreeMeta.mock.calls[0]?.[1] ?? {}
-    expect(updates.linkedIssue).toBe(99)
-    expect(updates.linkedLinearIssue).toBeNull()
+      screen.getByRole('textbox', { name: 'Notes' }).getAttribute('value') ??
+        screen.getByRole('textbox', { name: 'Notes' }).textContent
+    ).toBe('Remote note')
+    await save()
+    expect(updateWorktreeMeta.mock.calls[0]).toEqual([
+      original.id,
+      {},
+      { executionHostId: 'ssh:other' }
+    ])
   })
-
-  // Same issue, different spelling: the link is unchanged, so its title and
-  // SSH/runtime source context must survive the save.
-  it('keeps the linked work item when the value is only respelled', async () => {
-    openDialog({
-      worktree: {
-        linkedLinearIssue: 'STA-335',
-        linkedWorkItem: {
-          provider: 'linear',
-          type: 'issue',
-          number: 335,
-          title: 'Fix auth',
-          url: 'https://linear.app/acme/issue/STA-335'
+  it('does not close a new owner’s draft when an earlier save completes', async () => {
+    const original = openDialog({}, { executionHostId: 'local' })
+    const pending = Promise.withResolvers<{ ok: true }>()
+    updateWorktreeMeta.mockReturnValueOnce(pending.promise)
+    fireEvent.click(screen.getByRole('button', { name: 'Save' }))
+    expect(updateWorktreeMeta).toHaveBeenCalledOnce()
+    act(() =>
+      useAppStore.setState({
+        worktreesByRepo: {
+          repo: [original, { ...original, hostId: 'ssh:other', comment: 'Remote draft' }]
+        },
+        modalData: {
+          worktreeId: original.id,
+          repoId: 'repo',
+          executionHostId: 'ssh:other',
+          focus: 'comment'
         }
-      }
-    })
-
-    fireEvent.change(issueInput(), { target: { value: 'sta-335' } })
-
-    expect(screen.queryByText(/Saving unlinks/)).toBeNull()
-
-    await act(async () => {
-      fireEvent.click(saveButton())
-    })
-
-    await waitFor(() => expect(updateWorktreeMeta).toHaveBeenCalledTimes(1))
-    const updates = updateWorktreeMeta.mock.calls[0]?.[1] ?? {}
-    expect(updates).not.toHaveProperty('linkedWorkItem')
-    expect(updates).not.toHaveProperty('linkedTaskSourceContext')
-    expect(updates).not.toHaveProperty('linkedLinearIssue')
-  })
-
-  // The owner index reports a duplicated workspace ID as ambiguous rather than
-  // guessing, so the opening row has to name its own bucket.
-  it('shows the clicked row when the same workspace ID exists under two hosts', () => {
-    openDialog({
-      worktree: { linkedIssue: 42 },
-      otherRepos: [{ repoId: 'repo-2', worktree: { linkedIssue: 77 } }],
-      modalRepoId: 'repo-2'
-    })
-
-    expect(issueInput().value).toBe('77')
-    expect(providerChip().textContent).toContain('GitHub')
-  })
-
-  it('dispatches nothing when the dialog is cancelled', async () => {
-    openDialog({ worktree: { linkedLinearIssue: 'STA-335' } })
-
-    fireEvent.change(issueInput(), { target: { value: '99' } })
-    await act(async () => {
-      fireEvent.click(screen.getByRole('button', { name: 'Cancel' }))
-    })
-
-    expect(updateWorktreeMeta).not.toHaveBeenCalled()
-    expect(useAppStore.getState().activeModal).toBe('none')
+      })
+    )
+    await act(async () => pending.resolve({ ok: true }))
+    expect(useAppStore.getState().activeModal).toBe('edit-meta')
+    expect(screen.getByRole('button', { name: 'Save' }).hasAttribute('disabled')).toBe(false)
+    expect(screen.getByRole('textbox', { name: 'Notes' }).textContent).toBe('Remote draft')
   })
 })
diff --git a/src/renderer/src/components/sidebar/WorktreeMetaDialog.tsx b/src/renderer/src/components/sidebar/WorktreeMetaDialog.tsx
index 197485851a47..57a000bd9e8e 100644
--- a/src/renderer/src/components/sidebar/WorktreeMetaDialog.tsx
+++ b/src/renderer/src/components/sidebar/WorktreeMetaDialog.tsx
@@ -1,436 +1,9 @@
-import { ImeTextarea } from '@/lib/ime-text-field'
-import React, { useCallback, useMemo, useRef, useState } from 'react'
+import React from 'react'
 import { useAppStore } from '@/store'
-import {
-  Dialog,
-  DialogContent,
-  DialogDescription,
-  DialogFooter,
-  DialogHeader,
-  DialogTitle
-} from '@/components/ui/dialog'
-import { Button } from '@/components/ui/button'
-import { getDisplacedLinkLabels } from './worktree-issue-displacement'
-import {
-  buildWorktreeMetaUpdates,
-  parseGitLabMergeRequestNumberForMetaField,
-  parseGitHubWorkItemNumberForMetaField,
-  type WorktreeReviewProvider,
-  type WorktreeMetaDraft,
-  type WorktreeMetaSavedPayload,
-  type WorktreeMetaSnapshot
-} from './worktree-meta-updates'
-import { useWorktreeIssueLink } from './use-worktree-issue-link'
-import { useWorktreeMetaWorkspace } from './use-worktree-meta-workspace'
-import { WorktreeIssueLinkField } from './WorktreeIssueLinkField'
-import { getScreenSubmitShortcutLabel, isScreenSubmitShortcut } from '@/lib/screen-submit-shortcut'
-import { useMountedRef } from '@/hooks/useMountedRef'
-import { translate } from '@/i18n/i18n'
-import { isWorkItemLinkQueryTooLarge } from '../../../../shared/new-workspace/work-item-link-query-bounds'
-import {
-  getIssueLinkProviderFromUrl,
-  parseIssueLinkInput,
-  type IssueLinkProvider
-} from '../../../../shared/issue-link-input'
-import { parseExecutionHostId } from '../../../../shared/execution-host'
-import { WorktreeDisplayNameField } from './WorktreeDisplayNameField'
-import { WorktreeReviewLinkField } from './WorktreeReviewLinkField'
-import { resizeCommentTextarea } from './worktree-comment-textarea-sizing'
+import WorktreeMetaDialogDraft from './WorktreeMetaDialogDraft'
+import { getWorktreeMetaDialogOwner } from './worktree-meta-dialog-owner'
 
-/** Only read before the first open, when nothing can be saved yet. */
-const EMPTY_SNAPSHOT: WorktreeMetaSnapshot = {
-  displayName: '',
-  comment: '',
-  issueInput: '',
-  issueProvider: 'github',
-  prInput: ''
+export default function WorktreeMetaDialog(): React.JSX.Element {
+  const owner = useAppStore(getWorktreeMetaDialogOwner)
+  return <WorktreeMetaDialogDraft key={owner ?? 'closed'} />
 }
-
-const WorktreeMetaDialog = React.memo(function WorktreeMetaDialog() {
-  const activeModal = useAppStore((s) => s.activeModal)
-  const modalData = useAppStore((s) => s.modalData)
-  const closeModal = useAppStore((s) => s.closeModal)
-  const updateWorktreeMeta = useAppStore((s) => s.updateWorktreeMeta)
-
-  const isOpen = activeModal === 'edit-meta'
-
-  const worktreeId = typeof modalData.worktreeId === 'string' ? modalData.worktreeId : ''
-  const executionHostId =
-    typeof modalData.executionHostId === 'string'
-      ? (parseExecutionHostId(modalData.executionHostId)?.id ?? undefined)
-      : undefined
-  const currentDisplayName =
-    typeof modalData.currentDisplayName === 'string' ? modalData.currentDisplayName : ''
-  const currentComment =
-    typeof modalData.currentComment === 'string' ? modalData.currentComment : ''
-  const focusField = typeof modalData.focus === 'string' ? modalData.focus : 'comment'
-  const reviewProvider: WorktreeReviewProvider =
-    modalData.reviewProvider === 'gitlab' ? 'gitlab' : 'github'
-  const suppressHostedReviewRefresh = modalData.suppressHostedReviewRefresh === true
-  const afterSave =
-    typeof modalData.afterSave === 'function'
-      ? (modalData.afterSave as (payload: WorktreeMetaSavedPayload) => void | Promise<void>)
-      : null
-
-  // Why: the opening row names its repo bucket for workspace IDs the owner index
-  // reads as ambiguous across hosts.
-  const ownerRepoId = typeof modalData.repoId === 'string' ? modalData.repoId : null
-  const {
-    worktree,
-    linkedIssue,
-    linkedLinearIssue,
-    currentIssue,
-    currentProvider,
-    isFolderWorkspace,
-    liveLinks
-  } = useWorktreeMetaWorkspace({ worktreeId, ownerRepoId, executionHostId })
-  // Why: ChecksPanel seeds the review it is looking at, which may not be linked yet.
-  const currentReview =
-    typeof modalData.currentReview === 'number'
-      ? String(modalData.currentReview)
-      : reviewProvider === 'gitlab'
-        ? worktree?.linkedGitLabMR != null
-          ? String(worktree.linkedGitLabMR)
-          : ''
-        : typeof modalData.currentPR === 'number'
-          ? String(modalData.currentPR)
-          : worktree?.linkedPR != null
-            ? String(worktree.linkedPR)
-            : ''
-
-  const [displayNameInput, setDisplayNameInput] = useState('')
-  const [issueInput, setIssueInput] = useState('')
-  const [issueProvider, setIssueProvider] = useState<IssueLinkProvider>('github')
-  const [reviewInput, setReviewInput] = useState('')
-  const [commentInput, setCommentInput] = useState('')
-  const [saving, setSaving] = useState(false)
-  const [saveError, setSaveError] = useState<string | null>(null)
-  const [snapshot, setSnapshot] = useState<WorktreeMetaSnapshot>(EMPTY_SNAPSHOT)
-  const [dialogElement, setDialogElement] = useState<HTMLElement | null>(null)
-  const { canOpenIssue, openingIssue, openIssueFailed, handleOpenIssue, resetOpeningIssue } =
-    useWorktreeIssueLink({
-      worktreeId,
-      ownerRepoId,
-      issueInput,
-      issueProvider,
-      linearOrganizationUrlKey: worktree?.linkedLinearIssueOrganizationUrlKey ?? null,
-      linkedLinearIssue: worktree?.linkedLinearIssue ?? null,
-      linearSourceContext: worktree?.linkedTaskSourceContext ?? null
-    })
-
-  const issueInputRef = useRef<HTMLInputElement>(null)
-  const reviewInputRef = useRef<HTMLInputElement>(null)
-  const textareaRef = useRef<HTMLTextAreaElement>(null)
-  const prevIsOpenRef = useRef(false)
-  const displayNameInputRef = useRef<HTMLInputElement>(null)
-  const mountedRef = useMountedRef()
-  if (isOpen && !prevIsOpenRef.current) {
-    setDisplayNameInput(currentDisplayName)
-    setIssueInput(currentIssue)
-    setIssueProvider(currentProvider)
-    setReviewInput(currentReview)
-    setCommentInput(currentComment)
-    // Why: the baseline is frozen with the seed instead of tracking the store.
-    // A background `orca worktree set --linear-issue` while the dialog is open
-    // would otherwise move it, making the untouched field read as dirty — and
-    // the next comment-only save would write the stale seed back over the new link.
-    setSnapshot({
-      displayName: currentDisplayName,
-      comment: currentComment,
-      issueInput: currentIssue,
-      issueProvider: currentProvider,
-      prInput: worktree?.linkedPR != null ? String(worktree.linkedPR) : '',
-      linkedLinearIssueOrganizationUrlKey: worktree?.linkedLinearIssueOrganizationUrlKey ?? null
-    })
-    setSaveError(null)
-    resetOpeningIssue()
-  }
-  prevIsOpenRef.current = isOpen
-
-  const draft = useMemo<WorktreeMetaDraft>(
-    () => ({ displayNameInput, issueInput, issueProvider, reviewInput, commentInput }),
-    [displayNameInput, issueInput, issueProvider, reviewInput, commentInput]
-  )
-
-  // Why: a URL names its provider unambiguously. A bare key does not — Linear
-  // and Jira identifiers are the same shape — so typing never steers the chip.
-  const handleIssueInputChange = useCallback((next: string) => {
-    setIssueInput(next)
-    // Why: the same bound the save gate applies. Detection parses on every
-    // keystroke, and the field accepts pasted URLs of any length.
-    const detected = isWorkItemLinkQueryTooLarge(next) ? null : getIssueLinkProviderFromUrl(next)
-    if (detected) {
-      setIssueProvider(detected)
-    }
-  }, [])
-
-  const setCommentTextareaRef = useCallback(
-    (textarea: HTMLTextAreaElement | null) => {
-      textareaRef.current = textarea
-      if (textarea && isOpen) {
-        resizeCommentTextarea(textarea)
-      }
-    },
-    [isOpen]
-  )
-
-  const handleCommentChange = useCallback((event: React.ChangeEvent<HTMLTextAreaElement>) => {
-    setCommentInput(event.target.value)
-    // Why: notes should grow in the same input event; a passive Effect leaves a stale height.
-    resizeCommentTextarea(event.currentTarget)
-  }, [])
-
-  // Why: bound the parse before it runs on every keystroke — the field accepts
-  // pasted URLs and has no length cap of its own.
-  const issueInvalid = useMemo(() => {
-    const trimmed = issueInput.trim()
-    if (trimmed === '' || isFolderWorkspace) {
-      return false
-    }
-    return (
-      isWorkItemLinkQueryTooLarge(trimmed) || parseIssueLinkInput(trimmed, issueProvider) === null
-    )
-  }, [isFolderWorkspace, issueInput, issueProvider])
-
-  const canSave = useMemo(() => {
-    if (!worktreeId) {
-      return false
-    }
-    const trimmedPR = reviewInput.trim()
-    // Same quadratic-parse bound as the issue field — this runs on every keystroke.
-    const prValid =
-      trimmedPR === '' ||
-      (!isWorkItemLinkQueryTooLarge(trimmedPR) &&
-        (reviewProvider === 'gitlab'
-          ? parseGitLabMergeRequestNumberForMetaField(trimmedPR)
-          : parseGitHubWorkItemNumberForMetaField(trimmedPR, 'pr')) !== null)
-    return !issueInvalid && prValid
-  }, [worktreeId, issueInvalid, reviewInput, reviewProvider])
-
-  const displacedLinkLabels = useMemo(
-    () =>
-      getDisplacedLinkLabels({
-        draft,
-        snapshot,
-        isFolderWorkspace,
-        linkedIssue,
-        linkedLinearIssue
-      }),
-    [draft, snapshot, isFolderWorkspace, linkedIssue, linkedLinearIssue]
-  )
-
-  const handleOpenChange = useCallback(
-    (open: boolean) => {
-      if (!open) {
-        closeModal()
-      }
-    },
-    [closeModal]
-  )
-
-  const handleSave = useCallback(async () => {
-    if (!canSave) {
-      return
-    }
-    setSaving(true)
-    // Why: a stale failure from the previous attempt must not sit under the
-    // spinner for the whole in-flight save.
-    setSaveError(null)
-    try {
-      const updates = buildWorktreeMetaUpdates(draft, snapshot, liveLinks, reviewProvider)
-
-      const result =
-        executionHostId || suppressHostedReviewRefresh
-          ? await updateWorktreeMeta(worktreeId, updates, {
-              ...(executionHostId ? { executionHostId } : {}),
-              ...(suppressHostedReviewRefresh ? { suppressHostedReviewRefresh: true } : {})
-            })
-          : await updateWorktreeMeta(worktreeId, updates)
-      // Why: a failed save refetches and reverts the optimistic write. Closing
-      // here would report success for an edit that silently undid itself, and
-      // would discard the name, comment and PR changes in the same payload.
-      if (!result.ok) {
-        if (mountedRef.current) {
-          setSaveError(result.error)
-        }
-        return
-      }
-      closeModal()
-      // Why: follow-up refreshes should not turn a successful metadata save
-      // into a failed dialog.
-      try {
-        void Promise.resolve(afterSave?.({ worktreeId, updates })).catch(console.error)
-      } catch (error) {
-        console.error(error)
-      }
-    } finally {
-      if (mountedRef.current) {
-        setSaving(false)
-      }
-    }
-  }, [
-    worktreeId,
-    executionHostId,
-    suppressHostedReviewRefresh,
-    canSave,
-    draft,
-    snapshot,
-    liveLinks,
-    reviewProvider,
-    updateWorktreeMeta,
-    closeModal,
-    afterSave,
-    mountedRef
-  ])
-
-  const handleCommentKeyDown = useCallback(
-    (e: React.KeyboardEvent<HTMLTextAreaElement>) => {
-      const isPlainEnter = e.key === 'Enter' && !e.shiftKey && !e.altKey && !e.metaKey && !e.ctrlKey
-      if (isPlainEnter || isScreenSubmitShortcut(e)) {
-        e.preventDefault()
-        e.stopPropagation()
-        handleSave()
-      }
-    },
-    [handleSave]
-  )
-
-  const handleIssueKeyDown = useCallback(
-    (e: React.KeyboardEvent<HTMLInputElement>) => {
-      if (e.key === 'Enter') {
-        e.preventDefault()
-        handleSave()
-      }
-    },
-    [handleSave]
-  )
-
-  return (
-    <Dialog open={isOpen} onOpenChange={handleOpenChange}>
-      <DialogContent
-        ref={setDialogElement}
-        className="max-w-md"
-        onOpenAutoFocus={(e) => {
-          e.preventDefault()
-          if (focusField === 'displayName') {
-            displayNameInputRef.current?.focus()
-          } else if (focusField === 'issue') {
-            issueInputRef.current?.focus()
-          } else if (focusField === 'pr') {
-            reviewInputRef.current?.focus()
-          } else {
-            textareaRef.current?.focus()
-          }
-        }}
-      >
-        <DialogHeader>
-          <DialogTitle className="text-sm">
-            {translate(
-              'auto.components.sidebar.WorktreeMetaDialog.382fd11a3e',
-              'Edit Worktree Details'
-            )}
-          </DialogTitle>
-          <DialogDescription className="text-xs">
-            {reviewProvider === 'gitlab'
-              ? translate(
-                  'auto.components.sidebar.WorktreeMetaDialog.gitlabDescription',
-                  'Edit issue links, merge request links, and notes for this workspace.'
-                )
-              : translate(
-                  'auto.components.sidebar.WorktreeMetaDialog.a0d191b7a7',
-                  'Edit issue links, pull request links, and notes for this workspace.'
-                )}
-          </DialogDescription>
-        </DialogHeader>
-
-        <div className="space-y-4">
-          <WorktreeDisplayNameField
-            disabled={saving}
-            inputRef={displayNameInputRef}
-            onEnter={handleSave}
-            onValueChange={setDisplayNameInput}
-            portalContainer={dialogElement}
-            value={displayNameInput}
-          />
-
-          <WorktreeIssueLinkField
-            inputRef={issueInputRef}
-            value={issueInput}
-            provider={issueProvider}
-            isInvalid={issueInvalid}
-            displacedLinkLabels={displacedLinkLabels}
-            isReadOnly={isFolderWorkspace}
-            canOpenIssue={canOpenIssue}
-            openingIssue={openingIssue}
-            openIssueFailed={openIssueFailed}
-            onValueChange={handleIssueInputChange}
-            onProviderChange={setIssueProvider}
-            onOpenIssue={handleOpenIssue}
-            onKeyDown={handleIssueKeyDown}
-          />
-
-          <WorktreeReviewLinkField
-            inputRef={reviewInputRef}
-            onKeyDown={handleIssueKeyDown}
-            onValueChange={setReviewInput}
-            provider={reviewProvider}
-            value={reviewInput}
-          />
-
-          <div className="space-y-1">
-            <label className="text-[11px] font-medium text-muted-foreground">
-              {translate('auto.components.sidebar.WorktreeMetaDialog.9c1d1e9b71', 'Comment')}
-            </label>
-            <ImeTextarea
-              ref={setCommentTextareaRef}
-              value={commentInput}
-              onChange={handleCommentChange}
-              onKeyDown={handleCommentKeyDown}
-              placeholder={translate(
-                'auto.components.sidebar.WorktreeMetaDialog.030d484fc0',
-                'Notes about this worktree...'
-              )}
-              rows={3}
-              className="w-full min-w-0 rounded-md border border-input bg-transparent px-3 py-2 text-xs shadow-xs transition-[color,box-shadow] outline-none placeholder:text-muted-foreground focus-visible:border-ring focus-visible:ring-[3px] focus-visible:ring-ring/50 resize-none max-h-60 overflow-y-auto scrollbar-sleek"
-            />
-            <p className="text-[10px] text-muted-foreground">
-              {translate(
-                'auto.components.sidebar.WorktreeMetaDialog.7f0be5e9a6',
-                'Supports **markdown** — bold, lists, `code`, links. Press Enter or'
-              )}{' '}
-              {getScreenSubmitShortcutLabel()}{' '}
-              {translate(
-                'auto.components.sidebar.WorktreeMetaDialog.b48c271d39',
-                'to save, Shift+Enter for a new line.'
-              )}
-            </p>
-          </div>
-        </div>
-
-        {saveError ? (
-          <p role="alert" className="text-[11px] leading-[15px] text-destructive">
-            {saveError}
-          </p>
-        ) : null}
-
-        <DialogFooter>
-          <Button
-            variant="outline"
-            size="sm"
-            onClick={() => handleOpenChange(false)}
-            className="text-xs"
-          >
-            {translate('auto.components.sidebar.WorktreeMetaDialog.3db0a2a593', 'Cancel')}
-          </Button>
-          <Button size="sm" onClick={handleSave} disabled={!canSave || saving} className="text-xs">
-            {saving
-              ? translate('auto.components.sidebar.WorktreeMetaDialog.61d6f612cf', 'Saving...')
-              : translate('auto.components.sidebar.WorktreeMetaDialog.2174f17011', 'Save')}
-          </Button>
-        </DialogFooter>
-      </DialogContent>
-    </Dialog>
-  )
-})
-
-export default WorktreeMetaDialog
diff --git a/src/renderer/src/components/sidebar/WorktreeMetaDialogDraft.tsx b/src/renderer/src/components/sidebar/WorktreeMetaDialogDraft.tsx
new file mode 100644
index 000000000000..d28a6be3d94f
--- /dev/null
+++ b/src/renderer/src/components/sidebar/WorktreeMetaDialogDraft.tsx
@@ -0,0 +1,360 @@
+import React, { useCallback, useRef, useState } from 'react'
+import { getWorktreeMetaDialogOwner } from './worktree-meta-dialog-owner'
+import { Plus } from 'lucide-react'
+import { useAppStore } from '@/store'
+import {
+  Dialog,
+  DialogContent,
+  DialogDescription,
+  DialogFooter,
+  DialogHeader,
+  DialogTitle
+} from '@/components/ui/dialog'
+import { Button } from '@/components/ui/button'
+import { Textarea } from '@/components/ui/textarea'
+import { Label } from '@/components/ui/label'
+import { useWorktreeMetaWorkspace } from './use-worktree-meta-workspace'
+import { getScreenSubmitShortcutLabel, isScreenSubmitShortcut } from '@/lib/screen-submit-shortcut'
+import { useMountedRef } from '@/hooks/useMountedRef'
+import { translate } from '@/i18n/i18n'
+import {
+  getWorktreeExecutionHostId,
+  parseExecutionHostId,
+  toRuntimeExecutionHostId
+} from '../../../../shared/execution-host'
+import { findIndexedRepoOwnerForHost } from '@/lib/worktree-runtime-owner-index'
+import { getWorkspaceAttachments } from '../../../../shared/workspace-attachments'
+import type { WorkspaceAttachment } from '../../../../shared/worktree/types'
+import { WorktreeDisplayNameField } from './WorktreeDisplayNameField'
+import { WorktreeLinkedItemsField } from './WorktreeLinkedItemsField'
+import { buildWorkspaceAttachmentEdits } from './worktree-attachment-editing'
+import { resizeCommentTextarea } from './worktree-comment-textarea-sizing'
+import {
+  isImeOwnedKeyboardEvent,
+  useImeEnterGestureOwnership
+} from '@/lib/ime-composition-keyboard-event'
+
+const WorktreeMetaDialogDraft = React.memo(function WorktreeMetaDialogDraft() {
+  const activeModal = useAppStore((s) => s.activeModal)
+  const modalData = useAppStore((s) => s.modalData)
+  const closeModal = useAppStore((s) => s.closeModal)
+  const updateWorktreeMeta = useAppStore((s) => s.updateWorktreeMeta)
+  const isOpen = activeModal === 'edit-meta'
+  const dialogOwner = getWorktreeMetaDialogOwner({ activeModal, modalData })
+  const worktreeId = typeof modalData.worktreeId === 'string' ? modalData.worktreeId : ''
+  const ownerRepoId = typeof modalData.repoId === 'string' ? modalData.repoId : null
+  const executionHostId =
+    typeof modalData.executionHostId === 'string'
+      ? (parseExecutionHostId(modalData.executionHostId)?.id ?? undefined)
+      : undefined
+  const focusField = typeof modalData.focus === 'string' ? modalData.focus : 'comment'
+  const suppressHostedReviewRefresh = modalData.suppressHostedReviewRefresh === true
+  const suggestedReviewNumber =
+    typeof modalData.currentReview === 'number'
+      ? modalData.currentReview
+      : typeof modalData.currentPR === 'number'
+        ? modalData.currentPR
+        : null
+  const suggestedReviewProvider = modalData.reviewProvider === 'gitlab' ? 'gitlab' : 'github'
+  const { worktree, isFolderWorkspace } = useWorktreeMetaWorkspace({
+    worktreeId,
+    ownerRepoId,
+    executionHostId
+  })
+  const repo = useAppStore((s) =>
+    worktree && !isFolderWorkspace
+      ? (findIndexedRepoOwnerForHost(
+          s.repos,
+          worktree.repoId,
+          worktree.runtimeOwnerEnvironmentId
+            ? toRuntimeExecutionHostId(worktree.runtimeOwnerEnvironmentId)
+            : (executionHostId ?? getWorktreeExecutionHostId(worktree, undefined))
+        ) ?? undefined)
+      : undefined
+  )
+  const [initial] = useState(() => ({
+    displayName:
+      typeof modalData.currentDisplayName === 'string'
+        ? modalData.currentDisplayName
+        : (worktree?.displayName ?? ''),
+    comment:
+      typeof modalData.currentComment === 'string'
+        ? modalData.currentComment
+        : (worktree?.comment ?? ''),
+    items: getWorkspaceAttachments(worktree ?? {})
+  }))
+  const [displayNameInput, setDisplayNameInput] = useState(initial.displayName)
+  const [commentInput, setCommentInput] = useState(initial.comment)
+  const [items, setItems] = useState<WorkspaceAttachment[]>(initial.items)
+  const [notesOpen, setNotesOpen] = useState(
+    Boolean(initial.comment.trim()) || focusField === 'comment'
+  )
+  const [saving, setSaving] = useState(false)
+  const [saveError, setSaveError] = useState<string | null>(null)
+  const [dialogElement, setDialogElement] = useState<HTMLElement | null>(null)
+  const displayNameInputRef = useRef<HTMLInputElement>(null)
+  const linkInputRef = useRef<HTMLInputElement>(null)
+  const textareaRef = useRef<HTMLTextAreaElement>(null)
+  const focusNotesOnMountRef = useRef(false)
+  const mountedRef = useMountedRef()
+  const commentIme = useImeEnterGestureOwnership()
+
+  const handleSave = async (): Promise<void> => {
+    if (!worktreeId || !worktree || saving) {
+      return
+    }
+    setSaving(true)
+    setSaveError(null)
+    try {
+      const updates = {
+        ...(displayNameInput.trim() !== initial.displayName
+          ? { displayName: displayNameInput.trim() }
+          : {}),
+        ...(commentInput.trim() !== initial.comment ? { comment: commentInput.trim() } : {}),
+        ...buildWorkspaceAttachmentEdits({
+          initial: initial.items,
+          draft: items
+        })
+      }
+      const result =
+        executionHostId || suppressHostedReviewRefresh
+          ? await updateWorktreeMeta(worktreeId, updates, {
+              ...(executionHostId ? { executionHostId } : {}),
+              ...(suppressHostedReviewRefresh ? { suppressHostedReviewRefresh: true } : {})
+            })
+          : await updateWorktreeMeta(worktreeId, updates)
+      if (
+        !mountedRef.current ||
+        getWorktreeMetaDialogOwner(useAppStore.getState()) !== dialogOwner
+      ) {
+        return
+      }
+      if (!result.ok) {
+        if (mountedRef.current) {
+          setSaveError(result.error)
+        }
+        return
+      }
+      closeModal()
+      if (typeof modalData.afterSave === 'function') {
+        try {
+          void Promise.resolve(modalData.afterSave({ worktreeId, updates })).catch(console.error)
+        } catch (error) {
+          console.error(error)
+        }
+      }
+    } finally {
+      if (mountedRef.current) {
+        setSaving(false)
+      }
+    }
+  }
+
+  const setCommentTextareaRef = useCallback(
+    (textarea: HTMLTextAreaElement | null) => {
+      textareaRef.current = textarea
+      if (textarea && isOpen) {
+        resizeCommentTextarea(textarea)
+        if (focusNotesOnMountRef.current) {
+          focusNotesOnMountRef.current = false
+          textarea.focus()
+        }
+      }
+    },
+    [isOpen]
+  )
+
+  return (
+    <Dialog
+      open={isOpen}
+      onOpenChange={(open) => {
+        if (!open && !saving) {
+          closeModal()
+        }
+      }}
+    >
+      <DialogContent
+        ref={setDialogElement}
+        className="max-h-[calc(100vh-3rem)] grid-rows-[auto_minmax(0,1fr)_auto] sm:max-w-[640px]"
+        onEscapeKeyDown={(event) => {
+          const search = linkInputRef.current
+          if (
+            isImeOwnedKeyboardEvent(event) ||
+            textareaRef.current?.dataset.imeComposing === 'true' ||
+            search?.dataset.imeComposing === 'true' ||
+            (event.target === search && Boolean(search?.value))
+          ) {
+            event.preventDefault()
+          }
+        }}
+        onOpenAutoFocus={(event) => {
+          event.preventDefault()
+          if (focusField === 'displayName') {
+            displayNameInputRef.current?.focus()
+          } else if (focusField === 'issue' || focusField === 'pr' || focusField === 'links') {
+            linkInputRef.current?.focus()
+          } else {
+            textareaRef.current?.focus()
+          }
+        }}
+      >
+        <DialogHeader>
+          <DialogTitle>{translate('workspace.links.details', 'Workspace details')}</DialogTitle>
+          <DialogDescription>
+            {translate(
+              'workspace.links.description',
+              'Attach reviews and tasks, and keep notes for this workspace.'
+            )}
+          </DialogDescription>
+        </DialogHeader>
+        <div className="min-h-0 space-y-4 overflow-y-auto scrollbar-sleek">
+          <WorktreeDisplayNameField
+            disabled={saving}
+            inputRef={displayNameInputRef}
+            onEnter={handleSave}
+            onValueChange={setDisplayNameInput}
+            portalContainer={dialogElement}
+            value={displayNameInput}
+          />
+          <WorktreeLinkedItemsField
+            key={`${worktreeId}:${isOpen}`}
+            items={items}
+            onItemsChange={setItems}
+            onSave={handleSave}
+            repo={repo}
+            workspace={worktree}
+            isFolderWorkspace={isFolderWorkspace}
+            inputRef={linkInputRef}
+            initialInput={
+              suggestedReviewNumber !== null &&
+              !items.some(
+                (item) =>
+                  item.provider === suggestedReviewProvider &&
+                  item.type !== 'issue' &&
+                  item.number === suggestedReviewNumber
+              )
+                ? String(suggestedReviewNumber)
+                : ''
+            }
+            initialKind={
+              focusField === 'pr'
+                ? modalData.reviewProvider === 'gitlab'
+                  ? 'gitlab-mr'
+                  : 'github-pr'
+                : 'github-issue'
+            }
+            disabled={saving}
+          />
+          <div className="space-y-2">
+            <div className="flex items-center justify-between gap-2">
+              {notesOpen ? (
+                <Label htmlFor="workspace-comment">
+                  {translate('workspace.links.notes', 'Notes')}
+                </Label>
+              ) : (
+                <Button
+                  type="button"
+                  variant="ghost"
+                  size="xs"
+                  disabled={saving}
+                  onClick={() => {
+                    focusNotesOnMountRef.current = true
+                    setNotesOpen(true)
+                  }}
+                >
+                  <Plus />
+                  {translate('workspace.links.addNotes', 'Add notes')}
+                </Button>
+              )}
+              <span className="text-xs text-muted-foreground">
+                {translate('workspace.links.notesOptional', 'Optional · Markdown')}
+              </span>
+            </div>
+            {notesOpen ? (
+              <>
+                <Textarea
+                  id="workspace-comment"
+                  ref={setCommentTextareaRef}
+                  value={commentInput}
+                  disabled={saving}
+                  onChange={(event) => {
+                    setCommentInput(event.target.value)
+                    resizeCommentTextarea(event.currentTarget)
+                  }}
+                  onCompositionStart={(event) => {
+                    commentIme.setComposing(true)
+                    event.currentTarget.dataset.imeComposing = 'true'
+                  }}
+                  onCompositionEnd={(event) => {
+                    commentIme.setComposing(false)
+                    delete event.currentTarget.dataset.imeComposing
+                  }}
+                  onBlur={(event) => {
+                    commentIme.reset()
+                    delete event.currentTarget.dataset.imeComposing
+                  }}
+                  onKeyUp={commentIme.onKeyUp}
+                  onKeyDown={(event) => {
+                    if (
+                      commentIme.ownsKeyDown(event) ||
+                      isImeOwnedKeyboardEvent(event) ||
+                      commentIme.isComposing()
+                    ) {
+                      return
+                    }
+                    const plainEnter =
+                      event.key === 'Enter' &&
+                      !event.shiftKey &&
+                      !event.altKey &&
+                      !event.metaKey &&
+                      !event.ctrlKey
+                    if (plainEnter || isScreenSubmitShortcut(event)) {
+                      event.preventDefault()
+                      event.stopPropagation()
+                      void handleSave()
+                    }
+                  }}
+                  placeholder={translate(
+                    'auto.components.sidebar.WorktreeMetaDialog.030d484fc0',
+                    'Notes about this worktree...'
+                  )}
+                  rows={3}
+                  className="max-h-60 resize-none"
+                />
+                <p className="text-[11px] text-muted-foreground">
+                  {translate(
+                    'workspace.links.commentHelp',
+                    'Markdown supported. Enter or {{shortcut}} to save · Shift+Enter for a new line.',
+                    { shortcut: getScreenSubmitShortcutLabel() }
+                  )}
+                </p>
+              </>
+            ) : null}
+          </div>
+        </div>
+        <div className="space-y-2">
+          {saveError ? (
+            <p role="alert" className="text-xs text-destructive">
+              {saveError}
+            </p>
+          ) : null}
+          <DialogFooter>
+            <p className="mr-auto text-xs text-muted-foreground">
+              {translate('workspace.links.saveHint', 'Changes apply when you save')}
+            </p>
+            <Button variant="ghost" size="sm" disabled={saving} onClick={closeModal}>
+              {translate('auto.components.sidebar.WorktreeMetaDialog.3db0a2a593', 'Cancel')}
+            </Button>
+            <Button size="sm" onClick={handleSave} disabled={!worktreeId || !worktree || saving}>
+              {saving
+                ? translate('auto.components.sidebar.WorktreeMetaDialog.61d6f612cf', 'Saving...')
+                : translate('auto.components.sidebar.WorktreeMetaDialog.2174f17011', 'Save')}
+            </Button>
+          </DialogFooter>
+        </div>
+      </DialogContent>
+    </Dialog>
+  )
+})
+
+export default WorktreeMetaDialogDraft
diff --git a/src/renderer/src/components/sidebar/WorktreeReferenceStack.test.tsx b/src/renderer/src/components/sidebar/WorktreeReferenceStack.test.tsx
new file mode 100644
index 000000000000..3a3c83b9744b
--- /dev/null
+++ b/src/renderer/src/components/sidebar/WorktreeReferenceStack.test.tsx
@@ -0,0 +1,86 @@
+// @vitest-environment happy-dom
+import { cleanup, render } from '@testing-library/react'
+import { afterEach, describe, expect, it } from 'vitest'
+import { WorktreeReferenceStack } from './WorktreeReferenceStack'
+import { WorktreeCardMetaBadges } from './WorktreeCardMetaBadges'
+import { getWorkspaceAttachmentKey } from '../../../../shared/workspace-attachment-normalization'
+import { referenceAttachment, referenceReview } from './workspace-reference-fixtures.test-support'
+import type { WorkspaceAttachment } from '../../../../shared/worktree/types'
+
+afterEach(cleanup)
+describe('fixed workspace reference stacks', () => {
+  it('preserves singleton brand/status icons without ghosts or a count', () => {
+    const linear: WorkspaceAttachment = {
+      provider: 'linear',
+      type: 'issue',
+      number: 0,
+      identifier: 'ENG-1'
+    }
+    const { container } = render(
+      <>
+        <WorktreeReferenceStack items={[referenceAttachment()]} />
+        <WorktreeReferenceStack items={[linear]} />
+      </>
+    )
+    expect(container.querySelectorAll('[data-reference-front]')).toHaveLength(2)
+    expect(container.querySelectorAll('svg')).toHaveLength(2)
+    expect(container.querySelector('[data-reference-count]')).toBeNull()
+    expect(container.querySelector('.workspace-reference-stack-ghost')).toBeNull()
+    expect(container.textContent).toContain('Linked PR #7')
+    expect(container.textContent).toContain('Linked Linear ENG-1')
+    expect(container.textContent).not.toContain('1 linked')
+  })
+  it('prioritizes the review needing attention over a legacy primary and preserves sibling states', () => {
+    const items = [referenceAttachment(1), referenceAttachment(2), referenceAttachment(3)]
+    const details = Object.fromEntries(
+      items.map((item, index) => [
+        getWorkspaceAttachmentKey(item),
+        {
+          title: '',
+          url: item.url ?? '',
+          review: referenceReview(item.number, {
+            state: index === 0 ? 'merged' : index === 1 ? 'draft' : 'open',
+            status: index === 2 ? 'failure' : 'success'
+          })
+        }
+      ])
+    )
+    const { container } = render(<WorktreeReferenceStack items={items} details={details} />)
+    expect(
+      container.querySelector('[data-reference-front] svg')?.classList.contains('text-rose-500/85')
+    ).toBe(true)
+    expect(container.querySelectorAll('.workspace-reference-stack-ghost')).toHaveLength(2)
+    expect(container.querySelector('[data-reference-count]')?.textContent).toBe('3')
+    expect(container.textContent).toContain('PR #2 · draft')
+  })
+  it('keeps two provider cells with the same six-pixel gap and no new metadata row at twelve references', () => {
+    const refs: WorkspaceAttachment[] = [
+      ...Array.from({ length: 12 }, (_, index) => referenceAttachment(index + 1)),
+      ...Array.from({ length: 12 }, (_, index) => ({
+        provider: 'linear' as const,
+        type: 'issue' as const,
+        number: 0,
+        identifier: `ENG-${index + 1}`
+      }))
+    ]
+    const { container } = render(
+      <WorktreeCardMetaBadges
+        linkedItemCount={refs.length}
+        referenceItems={refs}
+        issue={null}
+        linearIssue={null}
+        review={null}
+        comment={null}
+      />
+    )
+    const group = container.querySelector('[data-workspace-reference-groups]')
+    expect(group?.classList.contains('gap-1.5')).toBe(true)
+    expect(group?.querySelectorAll('[data-workspace-reference-stack]')).toHaveLength(2)
+    expect(
+      Array.from(group?.querySelectorAll('[data-reference-count]') ?? []).map(
+        (node) => node.textContent
+      )
+    ).toEqual(['12', '12'])
+    expect(container.textContent).not.toContain('24 linked')
+  })
+})
diff --git a/src/renderer/src/components/sidebar/WorktreeReferenceStack.tsx b/src/renderer/src/components/sidebar/WorktreeReferenceStack.tsx
new file mode 100644
index 000000000000..559697ac634d
--- /dev/null
+++ b/src/renderer/src/components/sidebar/WorktreeReferenceStack.tsx
@@ -0,0 +1,169 @@
+import React from 'react'
+import { CircleDot } from 'lucide-react'
+import { LinearIcon } from '@/components/icons/LinearIcon'
+import { JiraIcon } from '@/components/icons/JiraIcon'
+import { getWorkspaceAttachmentKey } from '../../../../shared/workspace-attachment-normalization'
+import type { WorkspaceAttachment } from '../../../../shared/worktree/types'
+import { ReviewIcon } from './worktree-review-helpers'
+import { workspaceAttachmentLabel } from './worktree-attachment-editing'
+import {
+  workspaceReferenceReview,
+  type WorkspaceReferenceDetailsMap
+} from './workspace-reference-details'
+import { translate } from '@/i18n/i18n'
+const EMPTY_DETAILS: WorkspaceReferenceDetailsMap = {}
+
+function singleReferenceLabel(item: WorkspaceAttachment): string {
+  if (item.provider === 'linear') {
+    return translate(
+      'auto.components.sidebar.WorktreeCardMeta.b105fd3057',
+      'Linked Linear {{value0}}',
+      { value0: item.identifier ?? item.linearIdentifier }
+    )
+  }
+  if (item.provider === 'jira') {
+    return translate(
+      'auto.components.sidebar.WorktreeCardMeta.linkedJira',
+      'Linked Jira {{value0}}',
+      { value0: item.identifier ?? item.jiraIdentifier }
+    )
+  }
+  return item.type === 'issue'
+    ? translate('auto.components.sidebar.WorktreeCardMeta.3f2649eeb8', 'Linked issue #{{value0}}', {
+        value0: item.number
+      })
+    : translate(
+        'auto.components.sidebar.WorktreeCardMeta.3ea2702e62',
+        'Linked {{value0}} #{{value1}}',
+        { value0: item.type === 'mr' ? 'MR' : 'PR', value1: item.number }
+      )
+}
+
+function ReferenceGlyph({
+  item,
+  details
+}: {
+  item: WorkspaceAttachment
+  details: WorkspaceReferenceDetailsMap
+}): React.JSX.Element {
+  const review = workspaceReferenceReview(item, details[getWorkspaceAttachmentKey(item)])
+  if (review) {
+    return <ReviewIcon review={review} />
+  }
+  if (item.provider === 'linear') {
+    return <LinearIcon className="text-muted-foreground" />
+  }
+  if (item.provider === 'jira') {
+    return <JiraIcon className="text-muted-foreground" />
+  }
+  return <CircleDot className="text-muted-foreground" />
+}
+
+function priority(item: WorkspaceAttachment, details: WorkspaceReferenceDetailsMap): number {
+  const key = getWorkspaceAttachmentKey(item)
+  const detail = details[key]
+  if (item.type !== 'issue') {
+    const review = detail?.review
+    return review?.state === 'open'
+      ? review.status === 'failure'
+        ? 0
+        : review.status === 'pending'
+          ? 1
+          : 2
+      : review?.state === 'draft'
+        ? 3
+        : review?.state === 'merged'
+          ? 4
+          : review?.state === 'closed'
+            ? 5
+            : 6
+  }
+  const state = detail?.stateName?.toLowerCase() ?? ''
+  if (detail?.stateType) {
+    return detail.stateType === 'started'
+      ? 0
+      : detail.stateType === 'unstarted' || detail.stateType === 'backlog'
+        ? 1
+        : detail.stateType === 'completed'
+          ? 2
+          : detail.stateType === 'canceled'
+            ? 3
+            : 4
+  }
+  return /progress|started|doing|active/.test(state)
+    ? 0
+    : /todo|backlog|unstarted/.test(state)
+      ? 1
+      : /done|complete|resolved/.test(state)
+        ? 2
+        : /cancel|duplicate/.test(state)
+          ? 3
+          : 4
+}
+
+export function WorktreeReferenceStack({
+  items,
+  details = EMPTY_DETAILS
+}: {
+  items: readonly WorkspaceAttachment[]
+  details?: WorkspaceReferenceDetailsMap
+}): React.JSX.Element | null {
+  const ordered = [...items].sort((a, b) => priority(a, details) - priority(b, details))
+  const front = ordered[0]
+  if (!front) {
+    return null
+  }
+  const summary = ordered
+    .map((item) => {
+      const detail = details[getWorkspaceAttachmentKey(item)]
+      return [
+        workspaceAttachmentLabel(item),
+        detail?.review?.state ?? detail?.stateName,
+        detail?.review?.status
+      ]
+        .filter(Boolean)
+        .join(' · ')
+    })
+    .join(', ')
+  return (
+    <span
+      className="workspace-reference-stack"
+      data-workspace-reference-stack={front.type === 'issue' ? front.provider : 'review'}
+    >
+      {ordered
+        .slice(1, 3)
+        .toReversed()
+        .map((item, index, ghosts) => (
+          <span
+            key={getWorkspaceAttachmentKey(item)}
+            className="workspace-reference-stack-ghost"
+            data-depth={ghosts.length - index}
+            aria-hidden
+          >
+            <ReferenceGlyph item={item} details={details} />
+          </span>
+        ))}
+      <span className="workspace-reference-stack-front" data-reference-front="" aria-hidden>
+        <ReferenceGlyph item={front} details={details} />
+      </span>
+      {items.length > 1 ? (
+        <span
+          className="workspace-reference-stack-count"
+          data-reference-count=""
+          data-multiple-digits={items.length > 9}
+          aria-hidden
+        >
+          {items.length}
+        </span>
+      ) : null}
+      <span className="sr-only">
+        {items.length === 1
+          ? singleReferenceLabel(front)
+          : translate('workspace.links.stackSummary', '{{count}} linked: {{references}}', {
+              count: items.length,
+              references: summary
+            })}
+      </span>
+    </span>
+  )
+}
diff --git a/src/renderer/src/components/sidebar/WorktreeReviewLinkField.tsx b/src/renderer/src/components/sidebar/WorktreeReviewLinkField.tsx
deleted file mode 100644
index 76c4adb3f04a..000000000000
--- a/src/renderer/src/components/sidebar/WorktreeReviewLinkField.tsx
+++ /dev/null
@@ -1,60 +0,0 @@
-import type { RefObject } from 'react'
-import { Input } from '@/components/ui/input'
-import { translate } from '@/i18n/i18n'
-import type { WorktreeReviewProvider } from './worktree-meta-updates'
-
-type WorktreeReviewLinkFieldProps = {
-  inputRef: RefObject<HTMLInputElement | null>
-  onKeyDown: (event: React.KeyboardEvent<HTMLInputElement>) => void
-  onValueChange: (value: string) => void
-  provider: WorktreeReviewProvider
-  value: string
-}
-
-export function WorktreeReviewLinkField({
-  inputRef,
-  onKeyDown,
-  onValueChange,
-  provider,
-  value
-}: WorktreeReviewLinkFieldProps): React.JSX.Element {
-  const isGitLab = provider === 'gitlab'
-  return (
-    <div className="space-y-1">
-      <label className="text-[11px] font-medium text-muted-foreground">
-        {isGitLab
-          ? translate('auto.components.sidebar.WorktreeMetaDialog.gitlabMR', 'GitLab MR')
-          : translate('auto.components.sidebar.WorktreeMetaDialog.1b91db7e14', 'GH PR')}
-      </label>
-      <Input
-        ref={inputRef}
-        value={value}
-        onChange={(event) => onValueChange(event.target.value)}
-        onKeyDown={onKeyDown}
-        placeholder={
-          isGitLab
-            ? translate(
-                'auto.components.sidebar.WorktreeMetaDialog.gitlabPlaceholder',
-                'MR ! or GitLab URL'
-              )
-            : translate(
-                'auto.components.sidebar.WorktreeMetaDialog.077a4f7b5c',
-                'PR # or GitHub URL'
-              )
-        }
-        className="h-8 text-xs"
-      />
-      <p className="text-[10px] text-muted-foreground">
-        {isGitLab
-          ? translate(
-              'auto.components.sidebar.WorktreeMetaDialog.gitlabHelp',
-              'Paste a merge request URL, or enter a number. Leave blank to remove the link.'
-            )
-          : translate(
-              'auto.components.sidebar.WorktreeMetaDialog.5ae06f40fd',
-              'Paste a pull request URL, or enter a number. Leave blank to remove the link.'
-            )}
-      </p>
-    </div>
-  )
-}
diff --git a/src/renderer/src/components/sidebar/comment-markdown-element-renderers.tsx b/src/renderer/src/components/sidebar/comment-markdown-element-renderers.tsx
index c34996a15385..bfcfedfa92a9 100644
--- a/src/renderer/src/components/sidebar/comment-markdown-element-renderers.tsx
+++ b/src/renderer/src/components/sidebar/comment-markdown-element-renderers.tsx
@@ -9,6 +9,8 @@ import {
   isGitHubUserAttachmentVideoLink
 } from './comment-markdown-github-attachment-media'
 import { ExpandableMarkdownImage } from './MarkdownImageLightbox'
+import { MarkdownGitHubCallout } from '@/components/markdown-github-callout'
+import { readGitHubCalloutKind } from '@/lib/remark-github-callouts'
 
 export type CommentMarkdownLinkClickHandler = (
   event: React.MouseEvent<HTMLElement>,
@@ -167,11 +169,18 @@ export function createCompactCommentMarkdownComponents(
     // Horizontal rules as a subtle divider
     hr: () => <hr className="my-1 border-border/50" />,
     // Compact blockquotes
-    blockquote: ({ children }) => (
-      <blockquote className="my-0.5 border-l-2 border-border/60 pl-2 text-muted-foreground/80">
-        {children}
-      </blockquote>
-    ),
+    blockquote: ({ node, children }) => {
+      const calloutKind = readGitHubCalloutKind(node?.properties.dataCallout)
+      return calloutKind ? (
+        <MarkdownGitHubCallout kind={calloutKind} className="my-0.5 border-l-2 pl-2">
+          {children}
+        </MarkdownGitHubCallout>
+      ) : (
+        <blockquote className="my-0.5 border-l-2 border-border/60 pl-2 text-muted-foreground/80">
+          {children}
+        </blockquote>
+      )
+    },
     // Why: agent replies and workspace notes often carry screenshot markdown
     // like "Image #1"; compact cards inline app-managed thumbnails without
     // auto-fetching arbitrary remote image URLs.
@@ -306,11 +315,18 @@ export function createDocumentCommentMarkdownComponents(
     h5: ({ children }) => <h5 className="mb-1 mt-3 font-semibold first:mt-0">{children}</h5>,
     h6: ({ children }) => <h6 className="mb-1 mt-3 font-semibold first:mt-0">{children}</h6>,
     hr: () => <hr className="my-4 border-border/60" />,
-    blockquote: ({ children }) => (
-      <blockquote className="my-3 border-l-2 border-border/70 pl-3 text-muted-foreground">
-        {children}
-      </blockquote>
-    ),
+    blockquote: ({ node, children }) => {
+      const calloutKind = readGitHubCalloutKind(node?.properties.dataCallout)
+      return calloutKind ? (
+        <MarkdownGitHubCallout kind={calloutKind} className="my-3 border-l-2 pl-3">
+          {children}
+        </MarkdownGitHubCallout>
+      ) : (
+        <blockquote className="my-3 border-l-2 border-border/70 pl-3 text-muted-foreground">
+          {children}
+        </blockquote>
+      )
+    },
     img: ({ alt, src }) => {
       if (isGitHubUserAttachmentUrl(src)) {
         // Why: private-repo attachment images fail as cross-origin loads; a
diff --git a/src/renderer/src/components/sidebar/delete-worktree-always-force-preference.test.tsx b/src/renderer/src/components/sidebar/delete-worktree-always-force-preference.test.tsx
new file mode 100644
index 000000000000..c372f5204c6d
--- /dev/null
+++ b/src/renderer/src/components/sidebar/delete-worktree-always-force-preference.test.tsx
@@ -0,0 +1,153 @@
+// @vitest-environment happy-dom
+
+import { act, isValidElement } from 'react'
+import { createRoot, type Root } from 'react-dom/client'
+import { afterEach, expect, it, vi } from 'vitest'
+import { toast } from 'sonner'
+import { TooltipProvider } from '../ui/tooltip'
+import { showDeleteWorktreeFailureToast } from './delete-worktree-failure-toast'
+
+vi.mock('sonner', () => ({ toast: { info: vi.fn(), error: vi.fn(), dismiss: vi.fn() } }))
+
+let root: Root | undefined
+
+function renderRecovery(onAlwaysForceDelete: () => Promise<void>, canForceDelete = true) {
+  const onForceDelete = vi.fn()
+  const onOutsideBlur = vi.fn()
+  showDeleteWorktreeFailureToast({
+    error: 'branch has changes',
+    canForceDelete,
+    forceDeleteReason: canForceDelete ? 'dirty' : null,
+    onViewChanges: vi.fn(),
+    onForceDelete,
+    onAlwaysForceDelete,
+    onDeleteAnyway: vi.fn(),
+    worktreeId: 'wt-1',
+    worktreeName: 'feature/foo'
+  })
+  const description = vi
+    .mocked(canForceDelete ? toast.info : toast.error)
+    .mock.calls.at(-1)?.[1]?.description
+  if (!isValidElement(description)) {
+    throw new Error('Expected a rendered recovery toast')
+  }
+  const container = document.createElement('div')
+  document.body.appendChild(container)
+  root = createRoot(container)
+  act(() =>
+    root?.render(
+      <TooltipProvider delayDuration={0}>
+        <div
+          onBlur={(event) => {
+            if (!event.currentTarget.contains(event.relatedTarget)) {
+              onOutsideBlur()
+            }
+          }}
+        >
+          {description}
+        </div>
+      </TooltipProvider>
+    )
+  )
+  return { container, onForceDelete, onOutsideBlur }
+}
+
+function click(container: HTMLElement, selector: string): void {
+  const element = container.querySelector(selector)
+  if (!(element instanceof HTMLElement)) {
+    throw new Error(`Missing ${selector}`)
+  }
+  element.click()
+}
+
+async function selectAlwaysForceDelete(container: HTMLElement): Promise<void> {
+  await act(async () => {
+    const trigger = container.querySelector('button[aria-label="More force delete options"]')
+    if (!(trigger instanceof HTMLElement)) {
+      throw new Error('Missing dropdown trigger')
+    }
+    trigger.dispatchEvent(new KeyboardEvent('keydown', { key: 'ArrowDown', bubbles: true }))
+  })
+  await act(async () => click(document.body, '[role="menuitem"]'))
+}
+
+afterEach(() => {
+  act(() => root?.unmount())
+  root = undefined
+  document.body.innerHTML = ''
+  vi.clearAllMocks()
+})
+
+it('keeps the main Force Delete button a one-time action', async () => {
+  const savePreference = vi.fn().mockResolvedValue(undefined)
+  const { container, onForceDelete } = renderRecovery(savePreference)
+  expect(container.querySelector('button[aria-label="More force delete options"]')).not.toBeNull()
+  expect(document.querySelector('[role="menuitem"]')).toBeNull()
+
+  await act(async () => click(container, 'button[data-variant="destructive"]'))
+
+  expect(savePreference).not.toHaveBeenCalled()
+  expect(onForceDelete).toHaveBeenCalledOnce()
+})
+
+it('keeps portaled menu focus from triggering toast focus restoration', async () => {
+  const { container, onOutsideBlur } = renderRecovery(vi.fn())
+  const trigger = container.querySelector('button[aria-label="More force delete options"]')
+  if (!(trigger instanceof HTMLElement)) {
+    throw new Error('Missing dropdown trigger')
+  }
+  await act(async () => {
+    trigger.focus()
+    trigger.dispatchEvent(new KeyboardEvent('keydown', { key: 'ArrowDown', bubbles: true }))
+  })
+  const item = document.querySelector('[role="menuitem"]')
+  if (!(item instanceof HTMLElement)) {
+    throw new Error('Missing preference menu item')
+  }
+  await act(async () => item.focus())
+  expect(onOutsideBlur).not.toHaveBeenCalled()
+  expect(document.querySelector('[role="menu"]')).not.toBeNull()
+})
+
+it('waits for the preference to persist before force-deleting and dismissing', async () => {
+  let finishSaving: (() => void) | undefined
+  const savePreference = vi.fn(
+    () =>
+      new Promise<void>((resolve) => {
+        finishSaving = resolve
+      })
+  )
+  const { container, onForceDelete } = renderRecovery(savePreference)
+  await selectAlwaysForceDelete(container)
+
+  expect(savePreference).toHaveBeenCalledOnce()
+  expect(
+    container.querySelector('button[data-variant="destructive"]')?.hasAttribute('disabled')
+  ).toBe(true)
+  expect(onForceDelete).not.toHaveBeenCalled()
+  expect(toast.dismiss).not.toHaveBeenCalled()
+  await act(async () => finishSaving?.())
+  expect(onForceDelete).toHaveBeenCalledOnce()
+  expect(toast.dismiss).toHaveBeenCalledWith('delete-worktree-failure:wt-1')
+})
+
+it('keeps recovery available when saving the preference fails', async () => {
+  const { container, onForceDelete } = renderRecovery(
+    vi.fn().mockRejectedValue(new Error('Disk full'))
+  )
+  await selectAlwaysForceDelete(container)
+
+  expect(onForceDelete).not.toHaveBeenCalled()
+  expect(toast.dismiss).not.toHaveBeenCalled()
+  expect(toast.error).toHaveBeenCalledWith('Could not save deletion preference', {
+    description: 'Disk full'
+  })
+  expect(
+    container.querySelector('button[data-variant="destructive"]')?.hasAttribute('disabled')
+  ).toBe(false)
+})
+
+it('does not offer the preference for a failure that cannot be force-deleted', () => {
+  const { container } = renderRecovery(vi.fn(), false)
+  expect(container.querySelector('button[aria-label="More force delete options"]')).toBeNull()
+})
diff --git a/src/renderer/src/components/sidebar/delete-worktree-failure-toast.tsx b/src/renderer/src/components/sidebar/delete-worktree-failure-toast.tsx
index 5f6e93444fa7..8dc934ae4261 100644
--- a/src/renderer/src/components/sidebar/delete-worktree-failure-toast.tsx
+++ b/src/renderer/src/components/sidebar/delete-worktree-failure-toast.tsx
@@ -3,6 +3,7 @@ import { Button } from '../ui/button'
 import { getDeleteWorktreeToastCopy } from './delete-worktree-toast'
 import { translate } from '@/i18n/i18n'
 import { DeleteNestedWorktreesDialog } from './DeleteNestedWorktreesDialog'
+import { WorktreeForceDeleteButton } from './WorktreeForceDeleteButton'
 import { isNestedWorktreeRemovalError } from '../../../../shared/worktree/nested-removal'
 import {
   isLockedWorktreeRemovalError,
@@ -20,6 +21,7 @@ type DeleteWorktreeFailureToastOptions = {
   canWaiveArchiveHook?: boolean
   onViewChanges: () => void
   onForceDelete: () => void
+  onAlwaysForceDelete?: () => Promise<void>
   onDeleteAnyway: () => void
   worktreeId: string
   worktreeName: string
@@ -38,6 +40,7 @@ function DeleteWorktreeFailureToastBody({
   showViewChanges,
   onViewChanges,
   onForceDelete,
+  onAlwaysForceDelete,
   onDeleteAnyway,
   toastId,
   nestedRemovalTarget,
@@ -50,6 +53,7 @@ function DeleteWorktreeFailureToastBody({
   showViewChanges: boolean
   onViewChanges: () => void
   onForceDelete: () => void
+  onAlwaysForceDelete?: () => Promise<void>
   onDeleteAnyway: () => void
   toastId: string
   nestedRemovalTarget?: WorktreeRemovalTarget
@@ -60,10 +64,6 @@ function DeleteWorktreeFailureToastBody({
     toast.dismiss(toastId)
     onViewChanges()
   }
-  const forceDelete = (): void => {
-    toast.dismiss(toastId)
-    onForceDelete()
-  }
   const deleteAnyway = (): void => {
     toast.dismiss(toastId)
     onDeleteAnyway()
@@ -89,9 +89,11 @@ function DeleteWorktreeFailureToastBody({
           />
         ) : null}
         {canForceDelete ? (
-          <Button type="button" variant="destructive" size="sm" onClick={forceDelete}>
-            {translate('auto.components.sidebar.delete.worktree.flow.2b20ce87b3', 'Force Delete')}
-          </Button>
+          <WorktreeForceDeleteButton
+            toastId={toastId}
+            onForceDelete={onForceDelete}
+            onAlwaysForceDelete={onAlwaysForceDelete}
+          />
         ) : null}
         {canWaiveArchiveHook ? (
           <Button type="button" variant="destructive" size="sm" onClick={deleteAnyway}>
@@ -115,6 +117,7 @@ export function showDeleteWorktreeFailureToast({
   canWaiveArchiveHook,
   onViewChanges,
   onForceDelete,
+  onAlwaysForceDelete,
   onDeleteAnyway,
   worktreeId,
   worktreeName,
@@ -146,6 +149,7 @@ export function showDeleteWorktreeFailureToast({
         showViewChanges={!isLockedWorktreeRemovalError(error) || hasKnownChanges === true}
         onViewChanges={onViewChanges}
         onForceDelete={onForceDelete}
+        onAlwaysForceDelete={onAlwaysForceDelete}
         onDeleteAnyway={onDeleteAnyway}
         toastId={id}
         nestedRemovalTarget={nestedTarget}
diff --git a/src/renderer/src/components/sidebar/folder-workspace-composer-helpers.ts b/src/renderer/src/components/sidebar/folder-workspace-composer-helpers.ts
index a63a2caf9202..6a73cf1e51e6 100644
--- a/src/renderer/src/components/sidebar/folder-workspace-composer-helpers.ts
+++ b/src/renderer/src/components/sidebar/folder-workspace-composer-helpers.ts
@@ -23,7 +23,7 @@ import type { GitLabWorkItem } from '../../../../shared/gitlab-types'
 import type { LinearIssue } from '../../../../shared/linear/issue-types'
 import type { ProjectGroup } from '../../../../shared/project-group-types'
 import type { Repo } from '../../../../shared/repo-types'
-import type { SmartWorkspaceNameSelection } from '@/components/new-workspace/SmartWorkspaceNameField'
+import type { SmartWorkspaceNameSelection } from '@/components/new-workspace/smart-workspace-name-field-model'
 import { translate } from '@/i18n/i18n'
 
 const EMPTY_REPOS: Repo[] = []
diff --git a/src/renderer/src/components/sidebar/index.tsx b/src/renderer/src/components/sidebar/index.tsx
index 6a5b0f3dfa4e..057c494c9179 100644
--- a/src/renderer/src/components/sidebar/index.tsx
+++ b/src/renderer/src/components/sidebar/index.tsx
@@ -95,7 +95,7 @@ function Sidebar({
     () => resolveLeftSidebarStyleVariables(settings, systemPrefersDark),
     [settings, systemPrefersDark]
   ) as React.CSSProperties | undefined
-  const { nativeDropTarget, dropHandlers, affordance } = useSidebarProjectDrop()
+  const { dropOwnerRef, dropHandlers, affordance } = useSidebarProjectDrop()
   const {
     workspaceBoardOpen,
     workspaceBoardRenderedOpen,
@@ -148,12 +148,19 @@ function Sidebar({
   })
 
   useWorkspaceRevealBodyRedirect(sidebarOpen && sidebarBody === 'agents')
+  // A collapsed sidebar takes no drops.
+  const sidebarRef = React.useCallback(
+    (node: HTMLDivElement | null) => {
+      containerRef.current = node
+      dropOwnerRef(sidebarOpen ? node : null)
+    },
+    [containerRef, dropOwnerRef, sidebarOpen]
+  )
 
   return (
     <TooltipProvider delayDuration={400}>
       <div
-        ref={containerRef}
-        data-native-file-drop-target={sidebarOpen ? nativeDropTarget : undefined}
+        ref={sidebarRef}
         className="relative min-h-0 flex-shrink-0 bg-worktree-sidebar flex flex-col overflow-hidden scrollbar-sleek-parent"
         style={leftSidebarStyle}
         {...dropHandlers}
diff --git a/src/renderer/src/components/sidebar/run-worktree-delete-with-toast.ts b/src/renderer/src/components/sidebar/run-worktree-delete-with-toast.ts
index 68f8d0efea42..640ac5fc15aa 100644
--- a/src/renderer/src/components/sidebar/run-worktree-delete-with-toast.ts
+++ b/src/renderer/src/components/sidebar/run-worktree-delete-with-toast.ts
@@ -60,6 +60,8 @@ export function runWorktreeDeleteWithToast(
       lockReason: state?.lockReason ?? null,
       hasKnownChanges,
       onViewChanges: () => viewWorktreeDiff(worktreeId, target.executionHostId),
+      onAlwaysForceDelete: () =>
+        useAppStore.getState().updateSettingsOrThrow({ alwaysForceDeleteWorktrees: true }),
       // Why (#19334): re-runs the archive hook and waives the failure this time, so the waiver
       // is an informed choice made after reading the refusal -- not something `force` implied.
       onDeleteAnyway: () =>
diff --git a/src/renderer/src/components/sidebar/sidebar-lineage-ancestors.test.ts b/src/renderer/src/components/sidebar/sidebar-lineage-ancestors.test.ts
new file mode 100644
index 000000000000..65ae48b8b13c
--- /dev/null
+++ b/src/renderer/src/components/sidebar/sidebar-lineage-ancestors.test.ts
@@ -0,0 +1,67 @@
+import { describe, expect, it } from 'vitest'
+import type { ExecutionHostId } from '../../../../shared/execution-host'
+import { getWorktreeHostIdentity } from '../../../../shared/worktree/host-qualified-identity'
+import type { WorktreeLineage } from '../../../../shared/worktree/lineage-types'
+import type { Worktree } from '../../../../shared/worktree/types'
+import { buildRows } from './worktree-list/grouping/build-rows'
+import { worktree, repoMap } from './worktree-list-groups-test-fixtures'
+import {
+  getCyclicProjectedWorktreeLineageIds,
+  getSidebarLineageAncestors
+} from './worktree-lineage-projection'
+
+function pair(parentHost: ExecutionHostId | undefined, childHost: ExecutionHostId | undefined) {
+  const parent: Worktree = { ...worktree, id: 'parent', instanceId: 'p', hostId: parentHost }
+  const child: Worktree = { ...worktree, id: 'child', instanceId: 'c', hostId: childHost }
+  const lineageById: Record<string, WorktreeLineage> = {
+    child: {
+      worktreeId: 'child',
+      worktreeInstanceId: 'c',
+      parentWorktreeId: 'parent',
+      parentWorktreeInstanceId: 'p',
+      origin: 'cli',
+      capture: { source: 'explicit-cli-flag', confidence: 'explicit' },
+      createdAt: 1
+    }
+  }
+  return { parent, child, lineageById }
+}
+
+describe('getSidebarLineageAncestors', () => {
+  // Why: only a parent on the child's own host nests it; a missing host id matches only another.
+  it.each([
+    ['both without a host id', undefined, undefined, true],
+    ['both local', 'local', 'local', true],
+    ['parent without a host id, child local', undefined, 'local', false],
+    ['parent local, child without a host id', 'local', undefined, false]
+  ] as const)('%s: nests exactly when the sidebar rows do', (_, parentHost, childHost, nests) => {
+    const { parent, child, lineageById } = pair(parentHost, childHost)
+    const worktreeMap = new Map([
+      [parent.id, parent],
+      [child.id, child]
+    ])
+    const sidebarDepth = buildRows(
+      'none',
+      [parent, child],
+      repoMap,
+      null,
+      new Set(),
+      undefined,
+      undefined,
+      undefined,
+      lineageById,
+      worktreeMap,
+      true
+    ).find((row) => row.type === 'item' && row.worktree.id === 'child')
+    const rows = new Map([parent, child].map((entry) => [getWorktreeHostIdentity(entry), entry]))
+    const ancestors = getSidebarLineageAncestors(
+      child,
+      lineageById,
+      rows,
+      getCyclicProjectedWorktreeLineageIds(lineageById, worktreeMap)
+    )
+
+    expect(sidebarDepth?.type === 'item' && sidebarDepth.depth).toBe(nests ? 1 : 0)
+    expect(ancestors.map((entry) => entry.id)).toEqual(nests ? ['parent'] : [])
+  })
+})
diff --git a/src/renderer/src/components/sidebar/stale-agent-row-unverifiable.test.ts b/src/renderer/src/components/sidebar/stale-agent-row-unverifiable.test.ts
index 052adc752b95..a2fb42aaced1 100644
--- a/src/renderer/src/components/sidebar/stale-agent-row-unverifiable.test.ts
+++ b/src/renderer/src/components/sidebar/stale-agent-row-unverifiable.test.ts
@@ -17,7 +17,7 @@ import {
   AGENT_STATUS_STALE_AFTER_MS,
   type AgentStatusEntry
 } from '../../../../shared/agent-status-types'
-import { makeTab } from '../../store/slices/store-test-helpers'
+import { makeTab } from '../../store/slices/store-session-test-harness'
 import { buildWorktreeAgentRows } from './worktree-agent-rows'
 import { getAgentDotState } from './worktree-card-agent-summary'
 import { getCompactAgentSecondary } from './worktree-card-compact-agent-row'
diff --git a/src/renderer/src/components/sidebar/use-feedback-image-drop.test.tsx b/src/renderer/src/components/sidebar/use-feedback-image-drop.test.tsx
index ca6c00c26015..cb0f6dffce25 100644
--- a/src/renderer/src/components/sidebar/use-feedback-image-drop.test.tsx
+++ b/src/renderer/src/components/sidebar/use-feedback-image-drop.test.tsx
@@ -1,11 +1,5 @@
 // @vitest-environment happy-dom
 
-/**
- * Native file drops never reach React in this app: preload claims them on
- * document capture and routes the paths to the editor. These tests pin the
- * window-capture interception that keeps a screenshot dropped on the feedback
- * dialog from being swallowed by that lane.
- */
 import { act } from '@testing-library/react'
 import { createRoot, type Root } from 'react-dom/client'
 import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest'
@@ -15,26 +9,32 @@ import { useFeedbackImageDrop } from './use-feedback-image-drop'
 
 let container: HTMLDivElement
 let root: Root
-let preloadDropSpy: ReturnType<typeof vi.fn<(event: Event) => void>>
-
-function preloadDropListener(event: Event): void {
-  preloadDropSpy(event)
-  // Why: preload consumes the gesture, which is why React's onDrop never runs.
-  event.preventDefault()
-  event.stopPropagation()
-}
+let disposeGuard: () => void
+let unclaimedDropSpy: ReturnType<typeof vi.fn<(event: Event) => void>>
+const showNotice = vi.hoisted(() => vi.fn())
+vi.mock('sonner', () => ({
+  toast: Object.assign(showNotice, {
+    error: showNotice,
+    warning: showNotice,
+    info: showNotice,
+    success: showNotice,
+    message: showNotice
+  })
+}))
 
 beforeEach(() => {
   container = document.createElement('div')
   document.body.appendChild(container)
   root = createRoot(container)
-  preloadDropSpy = vi.fn()
-  // Registered before the hook mounts, exactly like preload's document listener.
-  document.addEventListener('drop', preloadDropListener, true)
+  showNotice.mockClear()
+  disposeGuard = installOsFileDropCancellationGuard()
+  unclaimedDropSpy = vi.fn()
+  document.addEventListener('drop', unclaimedDropSpy)
 })
 
 afterEach(() => {
-  document.removeEventListener('drop', preloadDropListener, true)
+  disposeGuard()
+  document.removeEventListener('drop', unclaimedDropSpy)
   act(() => {
     root.unmount()
   })
@@ -68,6 +68,7 @@ async function renderHarness(
 
 function dragEvent(type: string, files: File[], types: string[] = ['Files']): Event {
   const event = new Event(type, { bubbles: true, cancelable: true })
+  Object.defineProperty(event, 'isTrusted', { value: true })
   Object.defineProperty(event, 'dataTransfer', { value: { files, types } })
   return event
 }
@@ -77,18 +78,19 @@ function pngFile(name = 'shot.png'): File {
 }
 
 function dialogChild(): HTMLElement {
-  const child = container.querySelector('[data-testid="child"]')
+  const child = container.querySelector<HTMLElement>('[data-testid="child"]')
   if (!child) {
     throw new Error('harness child missing')
   }
-  return child as HTMLElement
+  return child
 }
 
 describe('useFeedbackImageDrop', () => {
-  it('claims an image dropped on the dialog before preload can route it away', async () => {
+  it('claims an image dropped on the dialog and attaches it once', async () => {
     const onAddFiles = vi.fn()
     await renderHarness(true, onAddFiles)
 
+    expect(container.querySelector('[data-os-file-drop-owner]')).not.toBeNull()
     const event = dragEvent('drop', [pngFile()])
     act(() => {
       dialogChild().dispatchEvent(event)
@@ -97,24 +99,32 @@ describe('useFeedbackImageDrop', () => {
     expect(onAddFiles).toHaveBeenCalledTimes(1)
     expect(onAddFiles.mock.calls[0][0].map((file: File) => file.name)).toEqual(['shot.png'])
     expect(event.defaultPrevented).toBe(true)
-    expect(preloadDropSpy).not.toHaveBeenCalled()
+    expect(unclaimedDropSpy).not.toHaveBeenCalled()
   })
 
-  it('leaves drops outside the dialog to the existing native lane', async () => {
+  it('silently cancels drops outside the dialog and clears the hover state', async () => {
     const onAddFiles = vi.fn()
     await renderHarness(true, onAddFiles)
 
     const outside = document.createElement('div')
     document.body.appendChild(outside)
     act(() => {
-      outside.dispatchEvent(dragEvent('drop', [pngFile()]))
+      dialogChild().dispatchEvent(dragEvent('dragenter', []))
+    })
+    expect(container.querySelector('[data-drag-active="true"]')).not.toBeNull()
+    const event = dragEvent('drop', [pngFile()])
+    act(() => {
+      outside.dispatchEvent(event)
     })
 
+    expect(event.defaultPrevented).toBe(true)
+    expect(event).toHaveProperty('dataTransfer.dropEffect', 'none')
     expect(onAddFiles).not.toHaveBeenCalled()
-    expect(preloadDropSpy).toHaveBeenCalledTimes(1)
+    expect(showNotice).not.toHaveBeenCalled()
+    expect(container.querySelector('[data-drag-active="true"]')).toBeNull()
   })
 
-  it('ignores non-image drops so they keep their existing behavior', async () => {
+  it('claims non-image drops so they cannot open in the editor behind the dialog', async () => {
     const onAddFiles = vi.fn()
     await renderHarness(true, onAddFiles)
 
@@ -124,28 +134,29 @@ describe('useFeedbackImageDrop', () => {
     })
 
     expect(onAddFiles).not.toHaveBeenCalled()
-    expect(preloadDropSpy).toHaveBeenCalledTimes(1)
-    // Why: dragover accepted the drag, so an uncancelled drop navigates the web
-    // client to the file; preload still gets it because propagation continues.
+    // A refused file still cancels browser navigation.
     expect(event.defaultPrevented).toBe(true)
+    expect(unclaimedDropSpy).not.toHaveBeenCalled()
   })
 
   it('stops listening once the dialog is closed', async () => {
     const onAddFiles = vi.fn()
     await renderHarness(true, onAddFiles)
     await renderHarness(false, onAddFiles)
+    expect(container.querySelector('[data-os-file-drop-owner]')).toBeNull()
 
+    const event = dragEvent('drop', [pngFile()])
     act(() => {
-      dialogChild().dispatchEvent(dragEvent('drop', [pngFile()]))
+      dialogChild().dispatchEvent(event)
     })
 
+    expect(event.defaultPrevented).toBe(true)
+    expect(event).toHaveProperty('dataTransfer.dropEffect', 'none')
     expect(onAddFiles).not.toHaveBeenCalled()
-    expect(preloadDropSpy).toHaveBeenCalledTimes(1)
+    expect(showNotice).not.toHaveBeenCalled()
   })
 
-  // Why: only preload preventDefaults dragover, and the web client has no
-  // preload — without this the browser rejects the drop and opens the file.
-  it('accepts the drag on dragover so the drop can fire without preload', async () => {
+  it('claims dragover so the document guard preserves the accepted copy cursor', async () => {
     await renderHarness(true, vi.fn())
 
     const event = dragEvent('dragover', [])
@@ -154,7 +165,7 @@ describe('useFeedbackImageDrop', () => {
     })
 
     expect(event.defaultPrevented).toBe(true)
-    expect((event as DragEvent).dataTransfer?.dropEffect).toBe('copy')
+    expect(event).toHaveProperty('dataTransfer.dropEffect', 'copy')
   })
 
   it('leaves in-app drags alone on dragover', async () => {
@@ -169,48 +180,44 @@ describe('useFeedbackImageDrop', () => {
   })
 
   it('keeps a web feedback screenshot accepted with the document guard and attaches it once', async () => {
-    document.removeEventListener('drop', preloadDropListener, true)
-    const disposeGuard = installOsFileDropCancellationGuard()
-    try {
-      const onAddFiles = vi.fn()
-      await renderHarness(true, onAddFiles)
-      const image = pngFile()
-      const hover = dragEvent('dragover', [])
-      act(() => {
-        dialogChild().dispatchEvent(hover)
-      })
-      expect(hover.defaultPrevented).toBe(true)
-      expect(hover).toHaveProperty('dataTransfer.dropEffect', 'copy')
-      const drop = dragEvent('drop', [image])
-      act(() => {
-        dialogChild().dispatchEvent(drop)
-      })
-      expect(drop.defaultPrevented).toBe(true)
-      expect(onAddFiles).toHaveBeenCalledExactlyOnceWith([image])
-      expect(preloadDropSpy).not.toHaveBeenCalled()
-
-      const outside = document.createElement('div')
-      document.body.appendChild(outside)
-      const refusedHover = dragEvent('dragover', [])
-      act(() => {
-        outside.dispatchEvent(refusedHover)
-      })
-      expect(refusedHover.defaultPrevented).toBe(true)
-      expect(refusedHover).toHaveProperty('dataTransfer.dropEffect', 'none')
-      const refusedDrop = dragEvent('drop', [image])
-      act(() => {
-        outside.dispatchEvent(refusedDrop)
-      })
-      expect(refusedDrop.defaultPrevented).toBe(true)
-      expect(onAddFiles).toHaveBeenCalledOnce()
-    } finally {
-      disposeGuard()
-    }
+    const onAddFiles = vi.fn()
+    await renderHarness(true, onAddFiles)
+    expect(container.querySelector('[data-os-file-drop-owner]')).not.toBeNull()
+    const image = pngFile()
+    const hover = dragEvent('dragover', [])
+    act(() => {
+      dialogChild().dispatchEvent(hover)
+    })
+    expect(hover.defaultPrevented).toBe(true)
+    expect(hover).toHaveProperty('dataTransfer.dropEffect', 'copy')
+    const drop = dragEvent('drop', [image])
+    act(() => {
+      dialogChild().dispatchEvent(drop)
+    })
+    expect(drop.defaultPrevented).toBe(true)
+    expect(onAddFiles).toHaveBeenCalledExactlyOnceWith([image])
+
+    const outside = document.createElement('div')
+    document.body.appendChild(outside)
+    const refusedHover = dragEvent('dragover', [])
+    act(() => {
+      outside.dispatchEvent(refusedHover)
+    })
+    expect(refusedHover.defaultPrevented).toBe(true)
+    expect(refusedHover).toHaveProperty('dataTransfer.dropEffect', 'none')
+    const refusedDrop = dragEvent('drop', [image])
+    act(() => {
+      outside.dispatchEvent(refusedDrop)
+    })
+    expect(refusedDrop.defaultPrevented).toBe(true)
+    expect(refusedDrop).toHaveProperty('dataTransfer.dropEffect', 'none')
+    expect(onAddFiles).toHaveBeenCalledOnce()
+    expect(showNotice).not.toHaveBeenCalled()
   })
 
   it('highlights from the advertised drag types, which is all a dragenter exposes', async () => {
     await renderHarness(true, vi.fn())
-    const dialog = container.querySelector('[data-testid="dialog"]') as HTMLElement
+    const dialog = container.querySelector<HTMLElement>('[data-testid="dialog"]')!
 
     // Why: DataTransfer.files is empty until drop; only `types` is populated.
     act(() => {
diff --git a/src/renderer/src/components/sidebar/use-feedback-image-drop.ts b/src/renderer/src/components/sidebar/use-feedback-image-drop.ts
index c15d0601e1e8..8fdac155e5fe 100644
--- a/src/renderer/src/components/sidebar/use-feedback-image-drop.ts
+++ b/src/renderer/src/components/sidebar/use-feedback-image-drop.ts
@@ -1,5 +1,6 @@
 import React, { useCallback, useEffect, useRef, useState } from 'react'
 import { hasNativeFileDragTypes } from '../../../../shared/native-file-drop'
+import { OS_FILE_DROP_OWNER_ATTRIBUTE } from '../../../../shared/native-file-drop-preparation'
 import { extractImageFilesFromDataTransfer } from '@/lib/feedback-image-attachments'
 
 type FeedbackImageDragHandlers = {
@@ -10,21 +11,16 @@ type FeedbackImageDragHandlers = {
 
 export type FeedbackImageDrop = {
   isDragActive: boolean
-  contentRef: React.RefObject<HTMLDivElement | null>
+  contentRef: (node: HTMLDivElement | null) => void
   dragHandlers: FeedbackImageDragHandlers
 }
 
-/**
- * Drag-and-drop attachment wiring for the feedback dialog. Native file drops
- * never reach React here: preload consumes them on document capture and routes
- * the paths to the editor, so the drop is claimed one phase earlier on window.
- */
 export function useFeedbackImageDrop(
   open: boolean,
   onAddFiles: (files: readonly File[]) => void
 ): FeedbackImageDrop {
   const [isDragActive, setIsDragActive] = useState(false)
-  const contentRef = useRef<HTMLDivElement | null>(null)
+  const detachRef = useRef<(() => void) | null>(null)
   const dragDepthRef = useRef(0)
 
   const reset = useCallback(() => {
@@ -66,38 +62,50 @@ export function useFeedbackImageDrop(
     }
   }, [])
 
-  useEffect(() => {
-    if (!open) {
-      return
-    }
-    const handleDrop = (event: DragEvent): void => {
-      const droppedInDialog = contentRef.current?.contains(event.target as Node) ?? false
-      reset()
-      if (!droppedInDialog || !hasNativeFileDragTypes(event.dataTransfer?.types)) {
+  const contentRef = useCallback(
+    (node: HTMLDivElement | null): void => {
+      detachRef.current?.()
+      detachRef.current = null
+      if (!node || !open) {
         return
       }
-      // Why: dragover accepted this drag, and a drop left uncancelled after that
-      // is what makes the browser navigate to the file — including the non-image
-      // drops below, which would otherwise wipe the typed feedback on web.
-      event.preventDefault()
-      const images = extractImageFilesFromDataTransfer(event.dataTransfer)
-      if (images.length === 0) {
-        return
+      const handleDrop = (event: DragEvent): void => {
+        if (!hasNativeFileDragTypes(event.dataTransfer?.types)) {
+          return
+        }
+        event.preventDefault()
+        event.stopPropagation()
+        reset()
+        if (!event.isTrusted) {
+          return
+        }
+        const images = extractImageFilesFromDataTransfer(event.dataTransfer)
+        if (images.length > 0) {
+          onAddFiles(images)
+        }
       }
-      // Why: stop preload's native-drop lane from also opening the screenshot
-      // in an editor behind the dialog.
-      event.stopPropagation()
-      onAddFiles(images)
+      node.setAttribute(OS_FILE_DROP_OWNER_ATTRIBUTE, '')
+      node.addEventListener('drop', handleDrop, true)
+      detachRef.current = () => {
+        node.removeEventListener('drop', handleDrop, true)
+        node.removeAttribute(OS_FILE_DROP_OWNER_ATTRIBUTE)
+      }
+    },
+    [onAddFiles, open, reset]
+  )
+  useEffect(() => {
+    if (!open) {
+      reset()
+      return
     }
-    window.addEventListener('drop', handleDrop, true)
-    window.addEventListener('dragend', reset, true)
+    document.addEventListener('drop', reset, true)
+    document.addEventListener('dragend', reset, true)
     return () => {
-      window.removeEventListener('drop', handleDrop, true)
-      window.removeEventListener('dragend', reset, true)
-      // Why: a dialog closed mid-drag would otherwise reopen mid-highlight.
+      document.removeEventListener('drop', reset, true)
+      document.removeEventListener('dragend', reset, true)
       reset()
     }
-  }, [onAddFiles, open, reset])
+  }, [open, reset])
 
   return { isDragActive, contentRef, dragHandlers: { onDragEnter, onDragOver, onDragLeave } }
 }
diff --git a/src/renderer/src/components/sidebar/use-workspace-reference-details.test.tsx b/src/renderer/src/components/sidebar/use-workspace-reference-details.test.tsx
new file mode 100644
index 000000000000..317f7c70918c
--- /dev/null
+++ b/src/renderer/src/components/sidebar/use-workspace-reference-details.test.tsx
@@ -0,0 +1,296 @@
+// @vitest-environment happy-dom
+import { act, cleanup, renderHook, waitFor } from '@testing-library/react'
+import { afterEach, beforeEach, expect, it, vi } from 'vitest'
+import { useAppStore } from '@/store'
+import type * as VisibleReviewTargets from '@/store/github/visible-hosted-review-refresh-targets'
+import { useWorkspaceReferenceDetails } from './use-workspace-reference-details'
+import { useVisibleHostedReviewRefresh } from '@/app-shell/use-visible-hosted-review-refresh'
+import { readWorkspaceReferenceDetails } from './workspace-reference-detail-read'
+import { getWorkspaceReferenceRequest } from './workspace-reference-details'
+import {
+  normalizeTaskSourceContext,
+  getTaskSourceCacheScope
+} from '../../../../shared/task-source-context'
+import { getWorkspaceAttachmentKey } from '../../../../shared/workspace-attachment-normalization'
+import { _clearHostedReviewRequestGenerationsForTest } from '@/store/slices/hosted-review-request-state'
+import { getHostedReviewCacheKey } from '@/store/slices/hosted-review-cache-identity'
+import {
+  referenceAttachment,
+  referenceRepo,
+  referenceReview,
+  referenceWorkspace,
+  referenceLinearIssue
+} from './workspace-reference-fixtures.test-support'
+
+vi.mock('@/store', async () => {
+  const browserWindow = globalThis.window
+  const { createTestStore } = await import('@/store/slices/github-slice-test-harness')
+  globalThis.window = browserWindow
+  return { useAppStore: createTestStore() }
+})
+// Branch refresh has its own integration suite; this suite exercises the additional exact targets.
+vi.mock('@/store/github/visible-hosted-review-refresh-targets', async (original) => ({
+  ...(await original<typeof VisibleReviewTargets>()),
+  getVisibleHostedReviewRefreshTargets: () => [],
+  visibleHostedReviewRefreshInputsChanged: () => true
+}))
+const mocks = vi.hoisted(() => ({ web: false }))
+vi.mock('@/lib/web-client-location', () => ({ isWebClientLocation: () => mocks.web }))
+const read = vi.fn<(...args: unknown[]) => Promise<ReturnType<typeof referenceReview> | null>>()
+const workspace = {
+  ...referenceWorkspace,
+  linkedPR: null,
+  linkedItems: [referenceAttachment(1), referenceAttachment(2)]
+}
+function mount(open = false, enabled = true) {
+  return renderHook(() => {
+    useVisibleHostedReviewRefresh({ enabled })
+    return useWorkspaceReferenceDetails(workspace, referenceRepo, null, open)
+  })
+}
+beforeEach(() => {
+  vi.clearAllMocks()
+  _clearHostedReviewRequestGenerationsForTest()
+  mocks.web = false
+  Object.defineProperty(window, 'api', {
+    configurable: true,
+    value: { hostedReview: { forBranch: read } }
+  })
+  Object.defineProperty(document, 'visibilityState', { configurable: true, value: 'visible' })
+  read.mockResolvedValue(null)
+  useAppStore.setState({
+    settings: null,
+    repos: [referenceRepo],
+    worktreesByRepo: { repo: [workspace] },
+    visibleReviewWorktreeIds: [workspace.id],
+    activeWorktreeId: null,
+    hostedReviewCache: {},
+    prCache: {},
+    linearIssueCache: {},
+    jiraIssueSummaryCache: {},
+    issueCache: {},
+    tabsByWorktree: {},
+    ptyIdsByTabId: {},
+    browserTabsByWorktree: {
+      [workspace.id]: [
+        {
+          id: 'browser',
+          worktreeId: workspace.id,
+          url: '',
+          title: '',
+          loading: false,
+          faviconUrl: null,
+          canGoBack: false,
+          canGoForward: false,
+          loadError: null,
+          createdAt: 1
+        }
+      ]
+    },
+    unifiedTabsByWorktree: {},
+    agentStatusByPaneKey: {},
+    agentStatusEpoch: 0,
+    sshConnectionStates: new Map()
+  })
+})
+afterEach(cleanup)
+
+it('automatically reads every attached review without a mounted reference hook', async () => {
+  renderHook(() => useVisibleHostedReviewRefresh({ enabled: true }))
+  await waitFor(() => expect(read).toHaveBeenCalledTimes(2))
+})
+it.each(['not-visible', 'hidden', 'sleeping', 'archived', 'bare', 'unready', 'web-unselected'])(
+  'does not poll %s workspaces',
+  async (condition) => {
+    if (condition === 'not-visible') {
+      useAppStore.setState({ visibleReviewWorktreeIds: [] })
+    }
+    if (condition === 'hidden') {
+      Object.defineProperty(document, 'visibilityState', { configurable: true, value: 'hidden' })
+    }
+    if (condition === 'sleeping') {
+      useAppStore.setState({ browserTabsByWorktree: {} })
+    }
+    if (condition === 'archived' || condition === 'bare') {
+      useAppStore.setState({
+        worktreesByRepo: {
+          repo: [
+            { ...workspace, isArchived: condition === 'archived', isBare: condition === 'bare' }
+          ]
+        }
+      })
+    }
+    mocks.web = condition === 'web-unselected'
+    mount(false, condition !== 'unready')
+    await act(async () => {
+      await Promise.resolve()
+    })
+    expect(read).not.toHaveBeenCalled()
+  }
+)
+it('shares exact results across hover and scheduler without replacing the primary branch cache', async () => {
+  const primaryKey = getHostedReviewCacheKey(
+    referenceRepo.path,
+    workspace.branch,
+    null,
+    referenceRepo.id,
+    null,
+    null,
+    true
+  )
+  const primary = { data: referenceReview(7), fetchedAt: Date.now() }
+  useAppStore.setState({ hostedReviewCache: { [primaryKey]: primary } })
+  read.mockImplementation(async (args) =>
+    referenceReview(
+      typeof args === 'object' &&
+        args &&
+        'linkedGitHubPR' in args &&
+        typeof args.linkedGitHubPR === 'number'
+        ? args.linkedGitHubPR
+        : 0
+    )
+  )
+  const hook = mount(true)
+  await waitFor(() => expect(Object.values(hook.result.current).filter(Boolean)).toHaveLength(2))
+  expect(read).toHaveBeenCalledTimes(2)
+  expect(useAppStore.getState().hostedReviewCache[primaryKey]).toBe(primary)
+})
+it('keeps failed exact refreshes stale while retaining their last known details', async () => {
+  const request = getWorkspaceReferenceRequest(referenceAttachment(1), workspace, referenceRepo)
+  useAppStore.setState({
+    hostedReviewCache: {
+      [request.key]: { data: referenceReview(1), fetchedAt: Date.now() - 61_000 }
+    }
+  })
+  read.mockRejectedValue(new Error('Disconnected'))
+  await readWorkspaceReferenceDetails(request)
+  const hook = renderHook(() => useWorkspaceReferenceDetails(workspace, referenceRepo, null, false))
+  expect(hook.result.current[getWorkspaceAttachmentKey(request.item)]).toMatchObject({
+    stale: true,
+    review: { number: 1 }
+  })
+})
+it.each(['host', 'remote', 'account'])('drops cached success after %s rebinding', (kind) => {
+  const request = getWorkspaceReferenceRequest(referenceAttachment(1), workspace, referenceRepo)
+  useAppStore.setState({
+    hostedReviewCache: { [request.key]: { data: referenceReview(1), fetchedAt: Date.now() } }
+  })
+  const hook = renderHook(
+    ({ repo }) => useWorkspaceReferenceDetails(workspace, repo, null, false),
+    { initialProps: { repo: referenceRepo } }
+  )
+  expect(hook.result.current[getWorkspaceAttachmentKey(request.item)]?.review?.status).toBe(
+    'success'
+  )
+  hook.rerender({
+    repo: {
+      ...referenceRepo,
+      ...(kind === 'host'
+        ? { executionHostId: 'runtime:other' }
+        : kind === 'account'
+          ? { ghAccount: { host: 'github.com', user: 'other' } }
+          : {
+              gitRemoteIdentity: {
+                canonicalKey: 'github.com/other/project',
+                remoteName: 'origin',
+                remoteUrl: 'https://github.com/other/project.git'
+              }
+            })
+    }
+  })
+  expect(hook.result.current[getWorkspaceAttachmentKey(request.item)]).toBeUndefined()
+})
+it('bounds native reads and cancels queued hover demand without adding a negative cache entry', async () => {
+  const finish: (() => void)[] = []
+  read.mockImplementation(() => new Promise((resolve) => finish.push(() => resolve(null))))
+  const requests = [20, 21, 22, 23].map((number) =>
+    getWorkspaceReferenceRequest(referenceAttachment(number), workspace, referenceRepo)
+  )
+  const active = requests.slice(0, 3).map((request) => readWorkspaceReferenceDetails(request))
+  await waitFor(() => expect(read).toHaveBeenCalledTimes(3))
+  const controller = new AbortController()
+  const queued = readWorkspaceReferenceDetails(requests[3], controller.signal).catch(() => null)
+  controller.abort()
+  await queued
+  finish.forEach((resolve) => resolve())
+  await Promise.all(active)
+  expect(read).toHaveBeenCalledTimes(3)
+  expect(useAppStore.getState().hostedReviewCache[requests[3].key]).toBeUndefined()
+})
+it.each(['hide', 'unmount'])('stops queued scheduler work on %s', async (action) => {
+  const finish: (() => void)[] = []
+  read.mockImplementation(() => new Promise((resolve) => finish.push(() => resolve(null))))
+  useAppStore.setState({
+    worktreesByRepo: {
+      repo: [{ ...workspace, linkedItems: [20, 21, 22, 23, 24].map(referenceAttachment) }]
+    }
+  })
+  const hook = mount()
+  await waitFor(() => expect(read).toHaveBeenCalledTimes(3))
+  if (action === 'unmount') {
+    hook.unmount()
+  } else {
+    act(() => {
+      Object.defineProperty(document, 'visibilityState', { configurable: true, value: 'hidden' })
+      document.dispatchEvent(new Event('visibilitychange'))
+    })
+  }
+  await act(async () => {
+    finish.forEach((resolve) => resolve())
+    await Promise.resolve()
+  })
+  expect(read).toHaveBeenCalledTimes(3)
+})
+it('does not revive primary success after an exact lookup returns unavailable', async () => {
+  const request = getWorkspaceReferenceRequest(referenceAttachment(1), workspace, referenceRepo)
+  await readWorkspaceReferenceDetails(request)
+  const hook = renderHook(() =>
+    useWorkspaceReferenceDetails(workspace, referenceRepo, referenceReview(1), false)
+  )
+  expect(hook.result.current[getWorkspaceAttachmentKey(request.item)]).toBeUndefined()
+})
+
+it('projects task mutations directly from the source provider cache', () => {
+  const source = normalizeTaskSourceContext({
+    provider: 'linear',
+    projectId: 'project',
+    hostId: 'local'
+  })
+  if (!source) {
+    throw new Error('Invalid fixture')
+  }
+  const item = {
+    provider: 'linear',
+    type: 'issue',
+    number: 0,
+    identifier: 'ENG-1',
+    taskSourceContext: source
+  } as const
+  const key = `${getTaskSourceCacheScope(source)}::all::ENG-1`
+  useAppStore.setState({
+    linearIssueCache: { [key]: { data: referenceLinearIssue(), fetchedAt: Date.now() } }
+  })
+  const hook = renderHook(() =>
+    useWorkspaceReferenceDetails({ ...workspace, linkedItems: [item] }, referenceRepo, null, false)
+  )
+  expect(hook.result.current[getWorkspaceAttachmentKey(item)]?.title).toBe('Task')
+  act(() =>
+    useAppStore.setState({
+      linearIssueCache: {
+        [key]: { data: referenceLinearIssue({ title: 'Edited' }), fetchedAt: Date.now() }
+      }
+    })
+  )
+  expect(hook.result.current[getWorkspaceAttachmentKey(item)]?.title).toBe('Edited')
+  const otherAccount = { ...item, taskSourceContext: { ...source, accountLabel: 'other' } }
+  const other = renderHook(() =>
+    useWorkspaceReferenceDetails(
+      { ...workspace, linkedItems: [otherAccount] },
+      referenceRepo,
+      null,
+      false
+    )
+  )
+  expect(other.result.current[getWorkspaceAttachmentKey(otherAccount)]).toBeUndefined()
+  expect(read).not.toHaveBeenCalled()
+})
diff --git a/src/renderer/src/components/sidebar/use-workspace-reference-details.ts b/src/renderer/src/components/sidebar/use-workspace-reference-details.ts
new file mode 100644
index 000000000000..ef116796e279
--- /dev/null
+++ b/src/renderer/src/components/sidebar/use-workspace-reference-details.ts
@@ -0,0 +1,69 @@
+import { useEffect, useMemo } from 'react'
+import { useShallow } from 'zustand/react/shallow'
+import { useAppStore } from '@/store'
+import type { Repo } from '../../../../shared/repo-types'
+import type { Worktree } from '../../../../shared/worktree/types'
+import { getWorkspaceAttachmentKey } from '../../../../shared/workspace-attachment-normalization'
+import { getWorkspaceAttachments } from '../../../../shared/workspace-attachments'
+import type { WorktreeCardPrDisplay } from './worktree-card-pr-display'
+import { canReadWorkspaceReferenceReview } from './workspace-reference-review-source'
+import {
+  getWorkspaceReferenceRequest,
+  getWorkspaceReferenceRuntimeVersion,
+  matchWorkspaceReferenceReview,
+  type WorkspaceReferenceDetailsMap
+} from './workspace-reference-details'
+import {
+  getWorkspaceReferenceLookup,
+  readWorkspaceReferenceDetails
+} from './workspace-reference-detail-read'
+
+export function useWorkspaceReferenceDetails(
+  workspace: Worktree,
+  repo: Repo | undefined,
+  review: WorktreeCardPrDisplay | null,
+  hoverOpen: boolean
+): WorkspaceReferenceDetailsMap {
+  const runtimeVersion = getWorkspaceReferenceRuntimeVersion(workspace, repo)
+  const requests = useMemo(
+    () =>
+      getWorkspaceAttachments(workspace).map((item) => ({
+        ...getWorkspaceReferenceRequest(item, workspace, repo, runtimeVersion),
+        knownProvider: review?.state ? review.provider : undefined
+      })),
+    [workspace, repo, runtimeVersion, review?.state, review?.provider]
+  )
+  useAppStore(
+    useShallow((state) =>
+      requests.map((request) => getWorkspaceReferenceLookup(request, state)?.rawEntry)
+    )
+  )
+  useEffect(() => {
+    if (!hoverOpen) {
+      return
+    }
+    const controller = new AbortController()
+    for (const request of requests) {
+      void readWorkspaceReferenceDetails(request, controller.signal).catch(() => {})
+    }
+    return () => controller.abort()
+  }, [requests, hoverOpen])
+  const matching = requests.filter(
+    (request) =>
+      matchWorkspaceReferenceReview(request.item, review) &&
+      canReadWorkspaceReferenceReview(request, review?.provider)
+  )
+  return Object.fromEntries(
+    requests.map((request) => {
+      const entry = getWorkspaceReferenceLookup(request, useAppStore.getState())?.entry
+      const primary =
+        review?.url && review.state && matching.length === 1 && matching[0] === request
+          ? { title: review.title, url: review.url, review, stale: true }
+          : undefined
+      return [
+        getWorkspaceAttachmentKey(request.item),
+        entry ? (entry.data ? { ...entry.data, stale: entry.stale } : undefined) : primary
+      ]
+    })
+  )
+}
diff --git a/src/renderer/src/components/sidebar/use-worktree-card-controller.ts b/src/renderer/src/components/sidebar/use-worktree-card-controller.ts
index 8a608f371252..92424055d871 100644
--- a/src/renderer/src/components/sidebar/use-worktree-card-controller.ts
+++ b/src/renderer/src/components/sidebar/use-worktree-card-controller.ts
@@ -1,3 +1,6 @@
+import { useWorkspaceReferenceDetails } from './use-workspace-reference-details'
+import { getWorkspaceAttachments } from '../../../../shared/workspace-attachments'
+import { summarizeWorkspaceReviewChecks } from '../../../../shared/workspace-review-checks'
 import { canShowWorkspaceDeleteQuickAction } from './workspace-delete-quick-action'
 import { useWorktreeCardDetailsHoverControl } from './worktree-card-details-hover-state'
 import type { ResolvedWorktreeCardProps } from './worktree-card-model'
@@ -43,6 +46,16 @@ export function useWorktreeCardController(props: ResolvedWorktreeCardProps) {
   const shouldRefreshHostedReview = foundation.newCardStyle ? showStatus : showPR
   const detailsHoverControl = useWorktreeCardDetailsHoverControl()
   const hoverDetailsOpen = detailsHoverControl.hoverOpen
+  const referenceDetails = useWorkspaceReferenceDetails(
+    worktree,
+    repo,
+    review.prDisplay,
+    hoverDetailsOpen
+  )
+  const reviewChecks = summarizeWorkspaceReviewChecks(
+    getWorkspaceAttachments(worktree),
+    referenceDetails
+  )
 
   useWorktreeCardLifecycleEffects({
     worktree,
@@ -63,6 +76,8 @@ export function useWorktreeCardController(props: ResolvedWorktreeCardProps) {
     issueCacheKey: review.issueCacheKey,
     fetchIssue: foundation.fetchIssue,
     showLinearIssue,
+    linearSourceContext: review.linearSourceContext,
+    linearWorkspaceId: review.linearWorkspaceId,
     fetchLinearIssue: foundation.fetchLinearIssue
   })
 
@@ -146,6 +161,8 @@ export function useWorktreeCardController(props: ResolvedWorktreeCardProps) {
     ...review,
     ...linked,
     detailsHoverControl,
+    referenceDetails,
+    reviewChecks,
     showStatus,
     showIssue,
     showLinearIssue,
diff --git a/src/renderer/src/components/sidebar/use-worktree-card-foundation.ts b/src/renderer/src/components/sidebar/use-worktree-card-foundation.ts
index d8ec20bb45a0..376bf0037112 100644
--- a/src/renderer/src/components/sidebar/use-worktree-card-foundation.ts
+++ b/src/renderer/src/components/sidebar/use-worktree-card-foundation.ts
@@ -65,6 +65,21 @@ export function useWorktreeCardFoundation({
     [worktree, openModal]
   )
 
+  const handleManageLinks = useCallback(
+    (event: React.MouseEvent) => {
+      event.stopPropagation()
+      openModal('edit-meta', {
+        worktreeId: worktree.id,
+        repoId: worktree.repoId,
+        executionHostId: worktree.hostId,
+        currentDisplayName: worktree.displayName,
+        currentComment: worktree.comment,
+        focus: 'links'
+      })
+    },
+    [worktree, openModal]
+  )
+
   const handleEditComment = useCallback(
     (e: React.MouseEvent) => {
       e.stopPropagation()
@@ -220,6 +235,7 @@ export function useWorktreeCardFoundation({
     newCardStyle,
     compactCards,
     handleEditIssue,
+    handleManageLinks,
     handleEditComment,
     handleOpenAutomation,
     handleOpenAutomationRun,
diff --git a/src/renderer/src/components/sidebar/use-worktree-card-lifecycle-effects.ts b/src/renderer/src/components/sidebar/use-worktree-card-lifecycle-effects.ts
index 0d130ceb815d..dd28e95099b2 100644
--- a/src/renderer/src/components/sidebar/use-worktree-card-lifecycle-effects.ts
+++ b/src/renderer/src/components/sidebar/use-worktree-card-lifecycle-effects.ts
@@ -28,6 +28,8 @@ export function useWorktreeCardLifecycleEffects({
   issueCacheKey,
   fetchIssue,
   showLinearIssue,
+  linearSourceContext,
+  linearWorkspaceId,
   fetchLinearIssue
 }: Pick<WorktreeCardProps, 'worktree' | 'repo'> &
   Pick<
@@ -41,6 +43,8 @@ export function useWorktreeCardLifecycleEffects({
     | 'linkedGiteaPR'
     | 'branch'
     | 'issueCacheKey'
+    | 'linearSourceContext'
+    | 'linearWorkspaceId'
   > &
   Pick<
     Foundation,
@@ -156,7 +160,9 @@ export function useWorktreeCardLifecycleEffects({
       if (!isWindowVisible()) {
         return
       }
-      void fetchLinearIssue(linearIssueId, 'all')
+      void fetchLinearIssue(linearIssueId, linearWorkspaceId, {
+        sourceContext: linearSourceContext
+      })
     }
     refreshLinearIssueIfVisible()
     window.addEventListener('focus', refreshLinearIssueIfVisible)
@@ -165,18 +171,28 @@ export function useWorktreeCardLifecycleEffects({
       window.removeEventListener('focus', refreshLinearIssueIfVisible)
       document.removeEventListener('visibilitychange', refreshLinearIssueIfVisible)
     }
-  }, [worktree.linkedLinearIssue, fetchLinearIssue, showLinearIssue])
+  }, [
+    worktree.linkedLinearIssue,
+    fetchLinearIssue,
+    showLinearIssue,
+    linearSourceContext,
+    linearWorkspaceId
+  ])
 
   useEffect(() => {
     if (!newCardStyle || !hoverDetailsOpen || showLinearIssue || !worktree.linkedLinearIssue) {
       return
     }
-    void fetchLinearIssue(worktree.linkedLinearIssue, 'all')
+    void fetchLinearIssue(worktree.linkedLinearIssue, linearWorkspaceId, {
+      sourceContext: linearSourceContext
+    })
   }, [
     newCardStyle,
     hoverDetailsOpen,
     showLinearIssue,
     worktree.linkedLinearIssue,
+    linearSourceContext,
+    linearWorkspaceId,
     fetchLinearIssue
   ])
 }
diff --git a/src/renderer/src/components/sidebar/use-worktree-card-linked-details.ts b/src/renderer/src/components/sidebar/use-worktree-card-linked-details.ts
index a2ec8e0774e0..fb3f85e93106 100644
--- a/src/renderer/src/components/sidebar/use-worktree-card-linked-details.ts
+++ b/src/renderer/src/components/sidebar/use-worktree-card-linked-details.ts
@@ -1,7 +1,5 @@
-import React from 'react'
-
 import { translate } from '@/i18n/i18n'
-import { useAppStore } from '@/store'
+import { getWorkspaceAttachments } from '../../../../shared/workspace-attachments'
 import type { IssueInfo } from '../../../../shared/github/pull-request-types'
 import type { LinearIssue } from '../../../../shared/linear/issue-types'
 import { getWorktreeCardJiraIssueDisplay } from './worktree-card-jira-issue-display'
@@ -47,46 +45,16 @@ export function useWorktreeCardLinkedDetails({
           title: issue === null ? 'Issue details unavailable' : 'Loading issue...'
         }
       : null)
-  const linearStatus = useAppStore((s) => s.linearStatus)
   const linearIssue: LinearIssue | null | undefined = worktree.linkedLinearIssue
     ? (linearIssueEntry?.data ?? linearIssueFallbackEntry?.data)
     : null
 
-  // Why: build a fallback Linear URL from org key + identifier while full issue data is still loading, so the link stays navigable.
-  const linearOrgUrlKey = linearStatus?.viewer?.organizationUrlKey
-  const linearWorkspaceUrlKeys = linearStatus?.workspaces?.map((ws) => ({
-    id: ws.id,
-    organizationUrlKey: ws.organizationUrlKey
-  }))
-  const linearIssueUrlFallback = React.useMemo(() => {
-    if (!worktree.linkedLinearIssue || linearIssue?.url) {
-      return undefined
-    }
-
-    // Try to get the orgUrlKey from the issue's workspace if we have workspaceId
-    let orgUrlKey: string | undefined
-    if (linearIssue?.workspaceId && linearWorkspaceUrlKeys) {
-      const issueWorkspace = linearWorkspaceUrlKeys.find((ws) => ws.id === linearIssue.workspaceId)
-      orgUrlKey = issueWorkspace?.organizationUrlKey
-    }
-
-    // Fall back to current viewer's org if no workspace match
-    if (!orgUrlKey) {
-      orgUrlKey = linearOrgUrlKey
-    }
-
-    if (!orgUrlKey) {
-      return undefined
-    }
-
-    return `https://linear.app/${encodeURIComponent(orgUrlKey)}/issue/${encodeURIComponent(worktree.linkedLinearIssue)}`
-  }, [
-    worktree.linkedLinearIssue,
-    linearIssue?.url,
-    linearIssue?.workspaceId,
-    linearOrgUrlKey,
-    linearWorkspaceUrlKeys
-  ])
+  const linearReferences = getWorkspaceAttachments(worktree).filter(
+    (item) =>
+      item.provider === 'linear' &&
+      (item.identifier ?? item.linearIdentifier) === worktree.linkedLinearIssue
+  )
+  const linearIssueUrlFallback = linearReferences.length === 1 ? linearReferences[0].url : undefined
 
   const linearIssueDisplay = worktree.linkedLinearIssue
     ? linearIssue
@@ -95,6 +63,7 @@ export function useWorktreeCardLinkedDetails({
           title: linearIssue.title,
           url: linearIssue.url,
           stateName: linearIssue.state?.name,
+          stateType: linearIssue.state?.type,
           labels: linearIssue.labels
         }
       : {
diff --git a/src/renderer/src/components/sidebar/use-worktree-card-review-details.ts b/src/renderer/src/components/sidebar/use-worktree-card-review-details.ts
index 9d217bd54bee..097d9a19bb42 100644
--- a/src/renderer/src/components/sidebar/use-worktree-card-review-details.ts
+++ b/src/renderer/src/components/sidebar/use-worktree-card-review-details.ts
@@ -1,3 +1,7 @@
+import { useMemo } from 'react'
+import { getLinearReadScope, scopedLinearCacheKey } from '@/store/slices/linear/linear-slice-scope'
+import { getWorkspaceAttachmentSourceContext } from './workspace-attachment-source-result'
+import { getWorkspaceReferenceLinearWorkspaceId } from './workspace-reference-details'
 import { getWorktreeGitIdentityDisplay } from '@/lib/worktree-git-identity-display'
 import { useAppStore } from '@/store'
 import { getGitHubPRCacheKey } from '@/store/slices/github-cache-key'
@@ -79,8 +83,21 @@ export function useWorktreeCardReviewDetails({
           true
         )
       : ''
-  // Why: use 'all' — the issue may belong to a different Linear workspace than the selected one.
-  const linearIssueCacheKey = worktree.linkedLinearIssue ? `all::${worktree.linkedLinearIssue}` : ''
+  // Saved workspace bindings keep equal Linear identifiers separate.
+  const linearSourceContext = useMemo(
+    () => getWorkspaceAttachmentSourceContext('linear', repo, worktree),
+    [repo, worktree]
+  )
+  const linearWorkspaceId = getWorkspaceReferenceLinearWorkspaceId(
+    worktree.linkedLinearIssueWorkspaceId,
+    linearSourceContext
+  )
+  const linearIssueCacheKey = worktree.linkedLinearIssue
+    ? scopedLinearCacheKey(
+        getLinearReadScope(settings, linearSourceContext),
+        `${linearWorkspaceId}::${worktree.linkedLinearIssue}`
+      )
+    : ''
 
   // Subscribe to ONLY the specific cache entry, not entire review/issue caches.
   const hostedReviewEntry = useAppStore((s) =>
@@ -92,7 +109,9 @@ export function useWorktreeCardReviewDetails({
     linearIssueCacheKey ? s.linearIssueCache[linearIssueCacheKey] : undefined
   )
   const linearIssueFallbackEntry = useAppStore((s) =>
-    worktree.linkedLinearIssue ? s.linearIssueCache[worktree.linkedLinearIssue] : undefined
+    !linearSourceContext && worktree.linkedLinearIssue
+      ? s.linearIssueCache[worktree.linkedLinearIssue]
+      : undefined
   )
 
   const hostedReview: HostedReviewInfo | null | undefined =
@@ -188,6 +207,8 @@ export function useWorktreeCardReviewDetails({
     issueEntry,
     linearIssueEntry,
     linearIssueFallbackEntry,
+    linearSourceContext,
+    linearWorkspaceId,
     linkedGitHubPR,
     linkedGitLabMR,
     linkedBitbucketPR,
diff --git a/src/renderer/src/components/sidebar/use-worktree-card-secondary-details.ts b/src/renderer/src/components/sidebar/use-worktree-card-secondary-details.ts
index 5718ad0f2d66..41aaa49451b3 100644
--- a/src/renderer/src/components/sidebar/use-worktree-card-secondary-details.ts
+++ b/src/renderer/src/components/sidebar/use-worktree-card-secondary-details.ts
@@ -1,4 +1,5 @@
 import React, { useCallback } from 'react'
+import { getWorkspaceAttachments } from '../../../../shared/workspace-attachments'
 import { toast } from 'sonner'
 
 import type { GitHubWorkItem } from '../../../../shared/github/work-item-types'
@@ -227,15 +228,17 @@ export function useWorktreeCardSecondaryDetails({
     },
     [linearIssue, openTaskPage]
   )
-  const hasDetails = hasWorktreeCardDetails({
-    issue: metaIssue,
-    linearIssue: metaLinearIssue,
-    jiraIssue: metaJiraIssue,
-    review: newCardStyle ? null : metaReview,
-    comment: metaComment,
-    automationProvenance: metaAutomationProvenance,
-    cliProvenance: metaCliProvenance
-  })
+  const hasDetails =
+    getWorkspaceAttachments(worktree).length > 0 ||
+    hasWorktreeCardDetails({
+      issue: metaIssue,
+      linearIssue: metaLinearIssue,
+      jiraIssue: metaJiraIssue,
+      review: newCardStyle ? null : metaReview,
+      comment: metaComment,
+      automationProvenance: metaAutomationProvenance,
+      cliProvenance: metaCliProvenance
+    })
   const hasPorts = showPorts && workspacePorts.length > 0
   const cacheStartedAt = usePromptCacheCountdownStartedAt(worktree.id, showAggregateCacheTimer)
   // Why: derived from the settings the card already subscribes to — a third store
diff --git a/src/renderer/src/components/sidebar/use-worktree-issue-link.ts b/src/renderer/src/components/sidebar/use-worktree-issue-link.ts
deleted file mode 100644
index 4a3aba425421..000000000000
--- a/src/renderer/src/components/sidebar/use-worktree-issue-link.ts
+++ /dev/null
@@ -1,280 +0,0 @@
-import { useCallback, useMemo, useRef, useState } from 'react'
-import { useAppStore } from '@/store'
-import { parseGitHubIssueOrPRNumber } from '@/lib/github-links'
-import { issueCacheKey as getIssueCacheKey } from '@/store/github/cache-identity'
-import { useMountedRef } from '@/hooks/useMountedRef'
-import { findIndexedWorktreeOwner } from '@/lib/worktree-runtime-owner-index'
-import { buildLinearIssueUrl, parseLinearIssueInput } from '../../../../shared/linear/links'
-import type { IssueLinkProvider } from '../../../../shared/issue-link-input'
-import type { TaskSourceContext } from '../../../../shared/task-source-context'
-import { parseExplicitGitHubIssueUrl } from './worktree-meta-updates'
-import { isWorkItemLinkQueryTooLarge } from '../../../../shared/new-workspace/work-item-link-query-bounds'
-
-// Why: both lookups cross an IPC or runtime-RPC boundary that can stop
-// answering — a hung SSH runtime leaves the await pending, and the button spins
-// for the life of the dialog. Set above the 30s Linear/GitHub client bounds, so a
-// slow-but-live transport reports its own failure rather than being called a bad
-// identifier here.
-const OPEN_ISSUE_TIMEOUT_MS = 35_000
-
-async function resolveIssueUrlWithinTimeout(
-  lookup: Promise<{ url?: string } | null>
-): Promise<string | null> {
-  let timer: ReturnType<typeof setTimeout> | undefined
-  try {
-    const issue = await Promise.race([
-      lookup,
-      new Promise<null>((resolve) => {
-        timer = setTimeout(() => resolve(null), OPEN_ISSUE_TIMEOUT_MS)
-      })
-    ])
-    return issue?.url ?? null
-  } catch {
-    // Why: the store's fetchers already log and normalize failures to null; a
-    // rejection here is a transport fault and reads the same to the user.
-    return null
-  } finally {
-    clearTimeout(timer)
-  }
-}
-
-/** Resolves the "open linked issue" affordance for the worktree meta dialog:
- *  explicit URLs open directly, GitHub numbers resolve via the issue cache or an
- *  owner-routed fetch, Linear identifiers via the stored org key or a lookup. */
-export function useWorktreeIssueLink(args: {
-  worktreeId: string
-  /** The repo bucket the opening row belongs to, for IDs the owner index reports
-   *  as ambiguous across hosts. Falls back to the index when absent. */
-  ownerRepoId?: string | null
-  issueInput: string
-  issueProvider: IssueLinkProvider
-  linearOrganizationUrlKey?: string | null
-  /** The persisted identifier the stored org key belongs to. */
-  linkedLinearIssue?: string | null
-  linearSourceContext?: TaskSourceContext | null
-}): {
-  canOpenIssue: boolean
-  openingIssue: boolean
-  /** A lookup came back empty: wrong identifier, no access, or provider offline. */
-  openIssueFailed: boolean
-  handleOpenIssue: () => Promise<void>
-  resetOpeningIssue: () => void
-} {
-  const {
-    worktreeId,
-    ownerRepoId,
-    issueInput,
-    issueProvider,
-    linearOrganizationUrlKey,
-    linkedLinearIssue,
-    linearSourceContext
-  } = args
-  const isLinear = issueProvider === 'linear'
-  const fetchIssue = useAppStore((s) => s.fetchIssue)
-  const fetchLinearIssue = useAppStore((s) => s.fetchLinearIssue)
-  const [openingIssue, setOpeningIssue] = useState(false)
-  const [failedIssueInput, setFailedIssueInput] = useState<string | null>(null)
-  const mountedRef = useMountedRef()
-  // Why: the field stays editable while a lookup is in flight, and Promise.race
-  // cannot cancel the losing promise. A result that lands after the value moved
-  // on — or after a reset — must not open the issue the user just replaced.
-  const openRequestRef = useRef(0)
-  const latestRequestKeyRef = useRef('')
-  latestRequestKeyRef.current = `${issueProvider}\u0000${issueInput}`
-
-  // Why: `matchGitHubItemPath` strips trailing slashes with an unanchored `/\/+$/`,
-  // which is quadratic — a 160 KB paste of slashes freezes the renderer for ~19s.
-  // These parses run on every keystroke, so they get the same bound the save gate
-  // applies. The check short-circuits on length, so it stays O(1) on a huge paste.
-  const boundedInput = useMemo(
-    () => (isWorkItemLinkQueryTooLarge(issueInput) ? '' : issueInput),
-    [issueInput]
-  )
-
-  const issueNumber = useMemo(
-    () => (isLinear ? null : parseGitHubIssueOrPRNumber(boundedInput)),
-    [isLinear, boundedInput]
-  )
-  const issueUrlFromInput = useMemo(
-    () => (isLinear ? null : parseExplicitGitHubIssueUrl(boundedInput)),
-    [isLinear, boundedInput]
-  )
-  const issueInputLooksLikeUrl = useMemo(
-    () => /^https?:\/\//i.test(boundedInput.trim()),
-    [boundedInput]
-  )
-  const parsedLinearIssue = useMemo(
-    () => (isLinear ? parseLinearIssueInput(boundedInput) : null),
-    [isLinear, boundedInput]
-  )
-  // Why: only an org key that is authoritative *for this identifier* may build a
-  // URL directly — the input's own, or the workspace's stored one while the typed
-  // identifier still is that issue. The connected viewer's key is not: a bare key
-  // for another of the user's Linear workspaces would open a not-found page, or a
-  // different issue on a team-prefix collision. Anything else falls through to the
-  // all-workspace lookup below, which answers with the issue's canonical URL.
-  const linearIssueUrl = useMemo(() => {
-    if (!parsedLinearIssue) {
-      return null
-    }
-    const storedKeyApplies =
-      typeof linkedLinearIssue === 'string' &&
-      linkedLinearIssue.toUpperCase() === parsedLinearIssue.identifier.toUpperCase()
-    return buildLinearIssueUrl({
-      identifier: parsedLinearIssue.identifier,
-      organizationUrlKey:
-        parsedLinearIssue.organizationUrlKey ?? (storedKeyApplies ? linearOrganizationUrlKey : null)
-    })
-  }, [parsedLinearIssue, linkedLinearIssue, linearOrganizationUrlKey])
-
-  const issueRepo = useAppStore((s) => {
-    const repoId = ownerRepoId ?? findIndexedWorktreeOwner(s.worktreesByRepo, worktreeId)?.repoId
-    return repoId ? s.repos.find((repo) => repo.id === repoId) : undefined
-  })
-  const cachedIssueUrl = useAppStore((s) => {
-    if (!issueRepo || issueNumber === null) {
-      return null
-    }
-    return (
-      s.issueCache[
-        getIssueCacheKey(
-          issueRepo.path,
-          issueRepo.id,
-          issueNumber,
-          s.settings,
-          issueRepo.connectionId,
-          issueRepo.executionHostId,
-          true
-        )
-      ]?.data?.url ?? null
-    )
-  })
-  const canOpenIssue = isLinear
-    ? Boolean(parsedLinearIssue)
-    : issueInputLooksLikeUrl
-      ? Boolean(issueUrlFromInput)
-      : Boolean(cachedIssueUrl || (issueRepo && issueNumber))
-
-  const handleOpenIssue = useCallback(async () => {
-    if (openingIssue) {
-      return
-    }
-    setFailedIssueInput(null)
-    const generation = ++openRequestRef.current
-    const requestKey = latestRequestKeyRef.current
-    // Why: the losing side of the timeout race keeps running, so every result
-    // has to prove it still belongs to the field the user is looking at.
-    const isCurrentRequest = (): boolean =>
-      mountedRef.current &&
-      openRequestRef.current === generation &&
-      latestRequestKeyRef.current === requestKey
-
-    if (isLinear) {
-      if (!parsedLinearIssue) {
-        return
-      }
-      if (linearIssueUrl) {
-        void window.api.shell.openUrl(linearIssueUrl)
-        return
-      }
-
-      setOpeningIssue(true)
-      try {
-        // Why: 'all' — the issue may belong to a different Linear workspace than
-        // the selected one, which is the usual case for a bare or pasted identifier.
-        const url = await resolveIssueUrlWithinTimeout(
-          fetchLinearIssue(parsedLinearIssue.identifier, 'all', {
-            sourceContext: linearSourceContext ?? null
-          })
-        )
-        if (!isCurrentRequest()) {
-          return
-        }
-        if (url) {
-          void window.api.shell.openUrl(url)
-        } else {
-          // Why: the fetchers normalize every failure — no Linear connection,
-          // unknown identifier, dead runtime — to null, so without this the
-          // button just stops spinning and the click looks ignored.
-          setFailedIssueInput(issueInput)
-        }
-      } finally {
-        if (mountedRef.current) {
-          setOpeningIssue(false)
-        }
-      }
-      return
-    }
-
-    if (issueUrlFromInput) {
-      void window.api.shell.openUrl(issueUrlFromInput)
-      return
-    }
-
-    if (issueInputLooksLikeUrl) {
-      return
-    }
-
-    if (cachedIssueUrl) {
-      void window.api.shell.openUrl(cachedIssueUrl)
-      return
-    }
-
-    if (!issueRepo || issueNumber === null) {
-      return
-    }
-
-    setOpeningIssue(true)
-    try {
-      const url = await resolveIssueUrlWithinTimeout(
-        fetchIssue(issueRepo.path, issueNumber, { repoId: issueRepo.id })
-      )
-      if (!isCurrentRequest()) {
-        return
-      }
-      if (url) {
-        void window.api.shell.openUrl(url)
-      } else {
-        setFailedIssueInput(issueInput)
-      }
-    } finally {
-      if (mountedRef.current) {
-        setOpeningIssue(false)
-      }
-    }
-  }, [
-    cachedIssueUrl,
-    fetchIssue,
-    fetchLinearIssue,
-    isLinear,
-    issueInput,
-    issueInputLooksLikeUrl,
-    issueNumber,
-    issueRepo,
-    issueUrlFromInput,
-    linearIssueUrl,
-    linearSourceContext,
-    mountedRef,
-    openingIssue,
-    parsedLinearIssue
-  ])
-
-  const resetOpeningIssue = useCallback(() => {
-    // Bumping the generation retires any in-flight lookup: a reset means this is
-    // a fresh dialog session, and the old result must not open or report here.
-    openRequestRef.current += 1
-    setOpeningIssue(false)
-    setFailedIssueInput(null)
-  }, [])
-
-  return {
-    canOpenIssue,
-    openingIssue,
-    // Why: the failure belongs to the value that produced it. Editing the field
-    // is the user's answer to it, so comparing rather than clearing on change
-    // retires the notice without an Effect that would lag a keystroke behind.
-    openIssueFailed: failedIssueInput !== null && failedIssueInput === issueInput,
-    handleOpenIssue,
-    resetOpeningIssue
-  }
-}
diff --git a/src/renderer/src/components/sidebar/use-worktree-meta-workspace.ts b/src/renderer/src/components/sidebar/use-worktree-meta-workspace.ts
index 6a68906f0bfd..2544fd7fb1be 100644
--- a/src/renderer/src/components/sidebar/use-worktree-meta-workspace.ts
+++ b/src/renderer/src/components/sidebar/use-worktree-meta-workspace.ts
@@ -1,31 +1,24 @@
 import { useMemo } from 'react'
 import { useAppStore } from '@/store'
-import { findIndexedWorktreeOwner } from '@/lib/worktree-runtime-owner-index'
+import {
+  findIndexedWorktreeOwner,
+  findIndexedWorktreeOwnerForHost
+} from '@/lib/worktree-runtime-owner-index'
+import { getFolderWorkspaceHostId } from '@/store/folder-workspaces/folder-workspace-catalog'
+import type { ExecutionHostId } from '../../../../shared/execution-host'
 import type { Worktree } from '../../../../shared/worktree/types'
 import { parseWorkspaceKey } from '../../../../shared/workspace-scope'
 import { folderWorkspaceToWorktree } from '../../../../shared/folder-workspace-worktree'
-import type { IssueLinkProvider } from '../../../../shared/issue-link-input'
-import type { WorktreeMetaLiveLinks } from './worktree-meta-updates'
 
-/** Resolves the workspace the meta dialog edits and the issue-link state it
- *  seeds from. Link state is read from the store rather than threaded through
- *  the untyped modalData bag — a call site that forgot a key would otherwise
- *  seed an empty field and silently destroy the link on save. */
+/** Resolves the edited workspace within its execution host, including folders. */
 export function useWorktreeMetaWorkspace(args: {
   worktreeId: string
   /** The repo bucket the opening row belongs to, when it knows. */
   ownerRepoId: string | null
-  executionHostId?: string
+  executionHostId?: ExecutionHostId
 }): {
   worktree: Worktree | undefined
-  linkedIssue: number | null
-  linkedLinearIssue: string | null
-  /** The persisted value and its provider, from one source so they cannot drift. */
-  currentIssue: string
-  currentProvider: IssueLinkProvider
   isFolderWorkspace: boolean
-  /** Link state as it stands now, for save-time displacement decisions. */
-  liveLinks: WorktreeMetaLiveLinks
 } {
   const { worktreeId, ownerRepoId, executionHostId } = args
   const workspaceScope = useMemo(() => parseWorkspaceKey(worktreeId), [worktreeId])
@@ -33,17 +26,11 @@ export function useWorktreeMetaWorkspace(args: {
     // Why: the same workspace ID can exist under two hosts, which the owner index
     // reports as ambiguous rather than guessing. The row that opened the dialog
     // knows which one it is; the index stays the fallback for callers that cannot.
-    const scoped = ownerRepoId
-      ? s.worktreesByRepo[ownerRepoId]?.find(
-          (item) => item.id === worktreeId && (!executionHostId || item.hostId === executionHostId)
-        )
-      : undefined
-    if (scoped) {
-      return scoped
-    }
-    const owner = findIndexedWorktreeOwner(s.worktreesByRepo, worktreeId)
-    return owner
-      ? s.worktreesByRepo[owner.repoId]?.find((item) => item.id === worktreeId)
+    const owner = executionHostId
+      ? findIndexedWorktreeOwnerForHost(s.worktreesByRepo, worktreeId, executionHostId)
+      : findIndexedWorktreeOwner(s.worktreesByRepo, worktreeId)
+    return owner && (!ownerRepoId || owner.repoId === ownerRepoId)
+      ? s.worktreesByRepo[owner.repoId]?.find((item) => item === owner)
       : undefined
   })
   // Why: folder workspaces are absent from worktreesByRepo, so the lookup above
@@ -51,57 +38,23 @@ export function useWorktreeMetaWorkspace(args: {
   // the stored record — a stable reference — and the projection happens outside
   // it, because a selector that built the object would return a fresh identity
   // on every store write and re-render the dialog continuously.
-  const folderWorkspace = useAppStore((s) =>
-    workspaceScope?.type === 'folder'
-      ? (s.folderWorkspaces.find((item) => item.id === workspaceScope.folderWorkspaceId) ?? null)
-      : null
-  )
+  const folderWorkspace = useAppStore((s) => {
+    if (workspaceScope?.type !== 'folder') {
+      return null
+    }
+    const candidates = s.folderWorkspaces.filter(
+      (item) =>
+        item.id === workspaceScope.folderWorkspaceId &&
+        (!executionHostId || getFolderWorkspaceHostId(item, s.projectGroups) === executionHostId)
+    )
+    return candidates.length === 1 ? candidates[0] : null
+  })
   const worktree = useMemo(
     () => (folderWorkspace ? folderWorkspaceToWorktree(folderWorkspace) : indexedWorktree),
     [folderWorkspace, indexedWorktree]
   )
-  const linkedIssue = worktree?.linkedIssue ?? null
-  const linkedLinearIssue = worktree?.linkedLinearIssue ?? null
-  // Why: `typeof` rather than a null check — an unhydrated projection can leave
-  // linkedIssue undefined, which `!== null` would read as a GitHub link.
-  const currentProvider: IssueLinkProvider =
-    typeof linkedIssue === 'number' ? 'github' : linkedLinearIssue ? 'linear' : 'github'
-  const currentIssue =
-    currentProvider === 'linear'
-      ? (linkedLinearIssue ?? '')
-      : typeof linkedIssue === 'number'
-        ? String(linkedIssue)
-        : ''
-  // Why: displacement is decided against live state, not the frozen snapshot —
-  // the dialog's warning reads the same values, so a link added by the CLI while
-  // the dialog was open cannot outlive a save that promised to displace it.
-  const liveLinks = useMemo<WorktreeMetaLiveLinks>(
-    () => ({
-      linkedPR: worktree?.linkedPR ?? null,
-      linkedIssue,
-      linkedLinearIssue,
-      linkedLinearIssueOrganizationUrlKey: worktree?.linkedLinearIssueOrganizationUrlKey ?? null,
-      linkedWorkItemProvider: worktree?.linkedWorkItem?.provider ?? null,
-      linkedWorkItemType: worktree?.linkedWorkItem?.type ?? null
-    }),
-    [
-      linkedIssue,
-      linkedLinearIssue,
-      worktree?.linkedPR,
-      worktree?.linkedLinearIssueOrganizationUrlKey,
-      worktree?.linkedWorkItem
-    ]
-  )
-
   return {
     worktree,
-    linkedIssue,
-    linkedLinearIssue,
-    currentIssue,
-    currentProvider,
-    // Why: folder workspaces persist links only through their creation-time
-    // linkedTask; updateWorktreeMeta drops link keys for them entirely.
-    isFolderWorkspace: workspaceScope?.type === 'folder',
-    liveLinks
+    isFolderWorkspace: workspaceScope?.type === 'folder'
   }
 }
diff --git a/src/renderer/src/components/sidebar/use-worktree-sleep-state.ts b/src/renderer/src/components/sidebar/use-worktree-sleep-state.ts
index 894d6872639d..328e10c03cd1 100644
--- a/src/renderer/src/components/sidebar/use-worktree-sleep-state.ts
+++ b/src/renderer/src/components/sidebar/use-worktree-sleep-state.ts
@@ -67,19 +67,21 @@ function selectWorktreeIdsWithLiveAgent(state: SleepStateInput): ReadonlySet<str
  * predicate, so the moon and the filter cannot disagree about which workspaces
  * are asleep.
  */
-export function useIsSleepingWorktree(worktreeId: string): boolean {
-  return useAppStore((state) =>
-    isInactiveWorkspace(
-      worktreeId,
-      state.tabsByWorktree,
-      state.ptyIdsByTabId,
-      state.browserTabsByWorktree,
-      selectWorktreeIdsWithLiveAgent(state),
-      getWorktreeIdsWithStructuredChat(state.unifiedTabsByWorktree)
-    )
+export function selectIsSleepingWorktree(state: SleepStateInput, worktreeId: string): boolean {
+  return isInactiveWorkspace(
+    worktreeId,
+    state.tabsByWorktree,
+    state.ptyIdsByTabId,
+    state.browserTabsByWorktree,
+    selectWorktreeIdsWithLiveAgent(state),
+    getWorktreeIdsWithStructuredChat(state.unifiedTabsByWorktree)
   )
 }
 
+export function useIsSleepingWorktree(worktreeId: string): boolean {
+  return useAppStore((state) => selectIsSleepingWorktree(state, worktreeId))
+}
+
 export function resetWorktreeSleepStateCacheForTests(): void {
   liveAgentGeneration = null
 }
diff --git a/src/renderer/src/components/sidebar/useSidebarProjectDrop.os-file-drop.test.tsx b/src/renderer/src/components/sidebar/useSidebarProjectDrop.os-file-drop.test.tsx
new file mode 100644
index 000000000000..da16f0f8c60d
--- /dev/null
+++ b/src/renderer/src/components/sidebar/useSidebarProjectDrop.os-file-drop.test.tsx
@@ -0,0 +1,95 @@
+// @vitest-environment happy-dom
+import { act, cleanup, render, waitFor } from '@testing-library/react'
+import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest'
+import { useSidebarProjectDrop } from './useSidebarProjectDrop'
+
+const mocks = vi.hoisted(() => {
+  const settings: { activeRuntimeEnvironmentId: string | null } = {
+    activeRuntimeEnvironmentId: null
+  }
+  return { state: { settings, openModal: vi.fn() }, stat: vi.fn(), prepare: vi.fn() }
+})
+vi.mock('@/store', () => {
+  const useAppStore = (selector: (state: typeof mocks.state) => unknown): unknown =>
+    selector(mocks.state)
+  useAppStore.getState = () => mocks.state
+  return { useAppStore }
+})
+vi.mock('sonner', () => ({ toast: { error: vi.fn(), warning: vi.fn() } }))
+
+function SidebarProbe(): React.JSX.Element {
+  const { dropOwnerRef, dropHandlers } = useSidebarProjectDrop()
+  return (
+    <div ref={dropOwnerRef} data-testid="sidebar" {...dropHandlers}>
+      <div data-testid="worktree-card" />
+    </div>
+  )
+}
+
+function drag(
+  target: Element,
+  type: 'dragover' | 'drop'
+): { dropEffect: string; defaultPrevented: boolean } {
+  const transfer = { types: ['Files'], files: [new File([''], 'project')], dropEffect: 'move' }
+  const event = new Event(type, { bubbles: true, cancelable: true, composed: true })
+  Object.defineProperty(event, 'dataTransfer', { value: transfer })
+  Object.defineProperty(event, 'isTrusted', { value: true })
+  act(() => {
+    target.dispatchEvent(event)
+  })
+  return { dropEffect: transfer.dropEffect, defaultPrevented: event.defaultPrevented }
+}
+
+beforeEach(() => {
+  mocks.state.settings = { activeRuntimeEnvironmentId: null }
+  mocks.stat.mockResolvedValue({ isDirectory: true })
+  mocks.prepare.mockImplementation(async ({ paths }: { paths: string[] }) => ({
+    paths,
+    failures: []
+  }))
+  vi.stubGlobal('api', {
+    fs: {
+      getPathForFile: () => '/Users/me/project',
+      prepareDroppedPaths: mocks.prepare,
+      stat: mocks.stat
+    }
+  })
+})
+
+afterEach(() => {
+  cleanup()
+  vi.unstubAllGlobals()
+  vi.clearAllMocks()
+})
+
+describe('project sidebar OS folder drops', () => {
+  it('offers to add a dropped folder as a project', async () => {
+    const view = render(<SidebarProbe />)
+    expect(drag(view.getByTestId('worktree-card'), 'dragover').dropEffect).toBe('copy')
+    drag(view.getByTestId('worktree-card'), 'drop')
+    await waitFor(() =>
+      expect(mocks.state.openModal).toHaveBeenCalledWith('add-repo', {
+        droppedLocalPath: '/Users/me/project'
+      })
+    )
+    expect(mocks.prepare).toHaveBeenCalledWith({
+      paths: ['/Users/me/project'],
+      consumer: 'main-reader'
+    })
+  })
+
+  it('refuses the drop while a remote runtime is active', () => {
+    mocks.state.settings = { activeRuntimeEnvironmentId: 'env-1' }
+    const legacyRoute = vi.fn()
+    window.addEventListener('drop', legacyRoute)
+    const view = render(<SidebarProbe />)
+    expect(drag(view.getByTestId('worktree-card'), 'dragover').dropEffect).toBe('none')
+    // The sidebar claims the refused drop, so no window-level route can act on it.
+    expect(drag(view.getByTestId('worktree-card'), 'drop').defaultPrevented).toBe(true)
+    window.removeEventListener('drop', legacyRoute)
+    expect(legacyRoute).not.toHaveBeenCalled()
+    expect(mocks.prepare).not.toHaveBeenCalled()
+    expect(mocks.stat).not.toHaveBeenCalled()
+    expect(mocks.state.openModal).not.toHaveBeenCalled()
+  })
+})
diff --git a/src/renderer/src/components/sidebar/useSidebarProjectDrop.ts b/src/renderer/src/components/sidebar/useSidebarProjectDrop.ts
index 90f40d0f8f28..801732acb767 100644
--- a/src/renderer/src/components/sidebar/useSidebarProjectDrop.ts
+++ b/src/renderer/src/components/sidebar/useSidebarProjectDrop.ts
@@ -1,9 +1,8 @@
 import React, { useCallback, useEffect, useMemo, useRef, useState } from 'react'
 import { toast } from 'sonner'
-import {
-  NATIVE_FILE_DROP_TARGET,
-  hasNativeFileDragTypes
-} from '../../../../shared/native-file-drop'
+import { hasNativeFileDragTypes } from '../../../../shared/native-file-drop'
+import { createOsFileDropSequence, useOsFileDropOwner } from '@/hooks/use-os-file-drop-owner'
+import { getNativeFileDropRejectionMessage } from '@/lib/native-file-drop-rejection-message'
 import { useMountedRef } from '@/hooks/useMountedRef'
 import { useAppStore } from '@/store'
 import {
@@ -16,12 +15,12 @@ import { userNamedFileAccess } from '@/lib/local-file-access'
 
 type SidebarProjectDropHandlers = {
   onDragEnter: (event: React.DragEvent<HTMLElement>) => void
-  onDragOver: (event: React.DragEvent<HTMLElement>) => void
   onDragLeave: (event: React.DragEvent<HTMLElement>) => void
 }
 
+/** The sidebar owns OS folder drops and offers to add the dropped folder as a project. */
 export function useSidebarProjectDrop(): {
-  nativeDropTarget: typeof NATIVE_FILE_DROP_TARGET.projectSidebar
+  dropOwnerRef: (root: HTMLElement | null) => void
   dropHandlers: SidebarProjectDropHandlers
   affordance: ReturnType<typeof getSidebarProjectDropAffordance>
 } {
@@ -62,7 +61,8 @@ export function useSidebarProjectDrop(): {
         )
         return
       }
-      if (remoteRuntimeActive) {
+      // Why: re-read live settings; a runtime can be focused while the drop is prepared.
+      if (isRemoteRuntimeActive(useAppStore.getState().settings)) {
         toast.error(
           translate(
             'auto.components.sidebar.useSidebarProjectDrop.849ef13dc0',
@@ -115,17 +115,24 @@ export function useSidebarProjectDrop(): {
         }
       }
     },
-    [mountedRef, openModal, remoteRuntimeActive]
+    [mountedRef, openModal]
   )
 
-  useEffect(() => {
-    return window.api.ui.onFileDrop((data) => {
-      if (data.target !== NATIVE_FILE_DROP_TARGET.projectSidebar) {
-        return
+  const ownerRef = useRef<HTMLElement | null>(null)
+  const [sequence] = useState(createOsFileDropSequence)
+  const dropOwnerRef = useOsFileDropOwner(ownerRef, {
+    consumer: 'main-reader',
+    sequence,
+    // A remote runtime cannot add a local folder, so the drag shows "not allowed".
+    canAccept: !remoteRuntimeActive,
+    onDrop: async (prepared) => {
+      for (const failure of prepared.failures) {
+        const message = getNativeFileDropRejectionMessage(failure)
+        toast.error(message.title, { description: message.description })
       }
-      void handleProjectDropPaths(data.paths)
-    })
-  }, [handleProjectDropPaths])
+      await handleProjectDropPaths(prepared.paths)
+    }
+  })
 
   const dropHandlers = useMemo<SidebarProjectDropHandlers>(
     () => ({
@@ -136,14 +143,6 @@ export function useSidebarProjectDrop(): {
         dragDepthRef.current += 1
         setIsDragOver(true)
       },
-      onDragOver: (event) => {
-        if (!hasNativeFileDragTypes(event.dataTransfer.types)) {
-          return
-        }
-        event.preventDefault()
-        event.dataTransfer.dropEffect = remoteRuntimeActive ? 'none' : 'copy'
-        setIsDragOver(true)
-      },
       onDragLeave: (event) => {
         if (!hasNativeFileDragTypes(event.dataTransfer.types)) {
           return
@@ -154,11 +153,11 @@ export function useSidebarProjectDrop(): {
         }
       }
     }),
-    [remoteRuntimeActive]
+    []
   )
 
   return {
-    nativeDropTarget: NATIVE_FILE_DROP_TARGET.projectSidebar,
+    dropOwnerRef,
     dropHandlers,
     affordance: getSidebarProjectDropAffordance({
       isDragOver,
diff --git a/src/renderer/src/components/sidebar/workspace-attachment-source-label.test.ts b/src/renderer/src/components/sidebar/workspace-attachment-source-label.test.ts
new file mode 100644
index 000000000000..4641fe9a97bd
--- /dev/null
+++ b/src/renderer/src/components/sidebar/workspace-attachment-source-label.test.ts
@@ -0,0 +1,168 @@
+import { expect, it } from 'vitest'
+import type { WorkspaceAttachment } from '../../../../shared/worktree/types'
+import type { TaskSourceContext } from '../../../../shared/task-source-context'
+import { getWorkspaceAttachmentSourceLabel } from './workspace-attachment-source-label'
+
+function source(
+  provider: TaskSourceContext['provider'],
+  providerIdentity: TaskSourceContext['providerIdentity'],
+  accountLabel?: string
+): TaskSourceContext {
+  return {
+    kind: 'task-source',
+    provider,
+    projectId: 'project',
+    hostId: 'runtime:host',
+    providerIdentity,
+    accountLabel
+  }
+}
+
+const linearSource = source(
+  'linear',
+  {
+    provider: 'linear',
+    workspaceId: 'internal-workspace-id',
+    workspaceName: 'Engineering'
+  },
+  'alice@example.com'
+)
+const linear: WorkspaceAttachment = {
+  provider: 'linear',
+  type: 'issue',
+  number: 0,
+  identifier: 'ENG-215',
+  url: 'https://linear.app/acme/issue/ENG-215/title',
+  taskSourceContext: linearSource
+}
+const jira: WorkspaceAttachment = {
+  provider: 'jira',
+  type: 'issue',
+  number: 0,
+  identifier: 'APP-18',
+  url: 'https://jira.example.com/team/browse/APP-18',
+  taskSourceContext: source(
+    'jira',
+    {
+      provider: 'jira',
+      siteId: 'internal-site-id',
+      siteUrl: 'https://jira.example.com/team/'
+    },
+    'alice@example.com'
+  )
+}
+const cases: { name: string; item: Partial<WorkspaceAttachment>; expected: string | null }[] = [
+  {
+    name: 'Linear workspace, organization and account',
+    item: linear,
+    expected: 'Engineering · acme · alice@example.com'
+  },
+  {
+    name: 'another Linear organization',
+    item: { ...linear, url: 'https://linear.app/other/issue/ENG-215/title' },
+    expected: 'Engineering · other · alice@example.com'
+  },
+  {
+    name: 'another Linear account',
+    item: { ...linear, taskSourceContext: { ...linearSource, accountLabel: 'bob@example.com' } },
+    expected: 'Engineering · acme · bob@example.com'
+  },
+  {
+    name: 'Jira site path and account',
+    item: jira,
+    expected: 'jira.example.com/team · alice@example.com'
+  },
+  {
+    name: 'Jira URL without stored context',
+    item: {
+      ...jira,
+      url: 'https://jira.example.com/other/browse/APP-18',
+      taskSourceContext: undefined
+    },
+    expected: 'jira.example.com/other'
+  },
+  {
+    name: 'GitHub Enterprise host',
+    item: { url: 'https://github.example.com/Owner/Repo/pull/7' },
+    expected: 'github.example.com/Owner/Repo'
+  },
+  {
+    name: 'GitHub issue',
+    item: { type: 'issue', url: 'https://github.com/Owner/Repo/issues/7' },
+    expected: 'Owner/Repo'
+  },
+  {
+    name: 'nested GitLab group',
+    item: {
+      provider: 'gitlab',
+      type: 'issue',
+      url: 'https://gitlab.example.com/Group/Subgroup/Repo/-/work_items/7'
+    },
+    expected: 'gitlab.example.com/Group/Subgroup/Repo'
+  },
+  {
+    name: 'legacy GitHub identity without URL',
+    item: {
+      taskSourceContext: source('github', { provider: 'github', owner: 'acme', repo: 'orca' })
+    },
+    expected: 'acme/orca'
+  },
+  {
+    name: 'legacy GitLab identity without URL',
+    item: {
+      provider: 'gitlab',
+      type: 'mr',
+      taskSourceContext: source('gitlab', {
+        provider: 'gitlab',
+        namespace: 'acme/team',
+        project: 'orca'
+      })
+    },
+    expected: 'acme/team/orca'
+  },
+  {
+    name: 'GitHub URL takes precedence over stale identity',
+    item: {
+      url: 'https://github.com/actual/repo/pull/7',
+      taskSourceContext: source('github', { provider: 'github', owner: 'old', repo: 'repo' })
+    },
+    expected: 'actual/repo'
+  },
+  {
+    name: 'Bitbucket scope excludes query secrets',
+    item: {
+      provider: 'bitbucket',
+      url: 'https://bitbucket.org/Team/Repo/pull-requests/7?token=secret'
+    },
+    expected: 'bitbucket.org/Team/Repo'
+  },
+  {
+    name: 'Jira rejects embedded credentials',
+    item: {
+      ...jira,
+      url: 'https://user:secret@jira.example.com/browse/APP-18',
+      taskSourceContext: undefined
+    },
+    expected: null
+  },
+  {
+    name: 'opaque identifiers are not human labels',
+    item: {
+      ...linear,
+      url: undefined,
+      linearWorkspaceId: 'opaque-workspace-id',
+      taskSourceContext: source('linear', {
+        provider: 'linear',
+        workspaceId: 'opaque-workspace-id',
+        workspaceName: '1a234567-1234-1234-1234-123456789abc'
+      })
+    },
+    expected: null
+  },
+  { name: 'missing source', item: {}, expected: null }
+]
+it.each(cases)('$name', ({ item, expected }) => {
+  expect(
+    getWorkspaceAttachmentSourceLabel({ provider: 'github', type: 'pr', number: 7, ...item })
+  ).toBe(expected)
+})
diff --git a/src/renderer/src/components/sidebar/workspace-attachment-source-label.ts b/src/renderer/src/components/sidebar/workspace-attachment-source-label.ts
new file mode 100644
index 000000000000..28edaa3821a8
--- /dev/null
+++ b/src/renderer/src/components/sidebar/workspace-attachment-source-label.ts
@@ -0,0 +1,89 @@
+import type { WorkspaceAttachment } from '../../../../shared/worktree/types'
+import { parseGitHubIssueOrPRLink } from '../../../../shared/github/links'
+import { parseGitLabIssueOrMRLink } from '../../../../shared/new-workspace/gitlab-links'
+import { parseLinearIssueInput } from '../../../../shared/linear/links'
+import { parseJiraIssueUrl } from '../../../../shared/jira-issue-url'
+import { getWorkspaceAttachmentUrlScope } from '../../../../shared/workspace-attachment-normalization'
+
+function humanText(value: string | null | undefined): string | null {
+  const text = value?.trim()
+  return text && !/^[\da-f]{8}-(?:[\da-f]{4}-){3}[\da-f]{12}$/i.test(text) ? text : null
+}
+
+function joinSourceParts(...parts: (string | null | undefined)[]): string | null {
+  const labels = new Map<string, string>()
+  for (const part of parts) {
+    const label = humanText(part)
+    if (label && !labels.has(label.toLowerCase())) {
+      labels.set(label.toLowerCase(), label)
+    }
+  }
+  return labels.size ? [...labels.values()].join(' · ') : null
+}
+
+function urlLabel(value: string | null | undefined): string | null {
+  if (!value) {
+    return null
+  }
+  try {
+    const url = new URL(value)
+    if (!['http:', 'https:'].includes(url.protocol) || url.username || url.password) {
+      return null
+    }
+    return `${url.host}${url.pathname.replace(/\/+$/, '')}`
+  } catch {
+    return null
+  }
+}
+
+export function getWorkspaceAttachmentSourceLabel(item: WorkspaceAttachment): string | null {
+  const source = item.taskSourceContext?.provider === item.provider ? item.taskSourceContext : null
+  const identity = source?.providerIdentity
+  if (item.provider === 'linear') {
+    const organization =
+      item.linearOrganizationUrlKey ??
+      (item.url ? parseLinearIssueInput(item.url)?.organizationUrlKey : null)
+    return joinSourceParts(
+      identity?.provider === 'linear' ? identity.workspaceName : null,
+      organization,
+      source?.accountLabel
+    )
+  }
+  if (item.provider === 'jira') {
+    const parsed = item.url ? parseJiraIssueUrl(item.url) : null
+    return joinSourceParts(
+      urlLabel(
+        identity?.provider === 'jira' && identity.siteUrl
+          ? identity.siteUrl
+          : parsed
+            ? `${parsed.origin}${parsed.sitePath}`
+            : null
+      ),
+      source?.accountLabel
+    )
+  }
+  if (item.provider === 'github') {
+    const repo =
+      (item.url ? parseGitHubIssueOrPRLink(item.url)?.slug : null) ??
+      (identity?.provider === 'github' ? identity : null)
+    if (repo) {
+      const host = repo.host && repo.host.toLowerCase() !== 'github.com' ? `${repo.host}/` : ''
+      return `${host}${repo.owner}/${repo.repo}`
+    }
+  }
+  if (item.provider === 'gitlab') {
+    const parsed = item.url ? parseGitLabIssueOrMRLink(item.url) : null
+    if (parsed) {
+      return `${parsed.slug.host}/${parsed.slug.path}`
+    }
+    if (identity?.provider === 'gitlab') {
+      return (
+        urlLabel(identity.webUrl) ??
+        (identity.namespace && identity.project
+          ? `${identity.namespace}/${identity.project}`
+          : null)
+      )
+    }
+  }
+  return urlLabel(getWorkspaceAttachmentUrlScope(item))
+}
diff --git a/src/renderer/src/components/sidebar/workspace-attachment-source-result.test.ts b/src/renderer/src/components/sidebar/workspace-attachment-source-result.test.ts
new file mode 100644
index 000000000000..8e911a878068
--- /dev/null
+++ b/src/renderer/src/components/sidebar/workspace-attachment-source-result.test.ts
@@ -0,0 +1,177 @@
+import { resolveWorkItemSourceRow } from '../new-workspace/work-item-source-selection'
+import { describe, expect, it } from 'vitest'
+import type { Repo } from '../../../../shared/repo-types'
+import type { WorkspaceAttachment, Worktree } from '../../../../shared/worktree/types'
+import { normalizeTaskSourceContext } from '../../../../shared/task-source-context'
+import {
+  appendWorkspaceAttachment,
+  getWorkspaceAttachmentSourceContext,
+  isWorkspaceAttachmentLinked,
+  matchesWorkspaceAttachmentQuery
+} from './workspace-attachment-source-result'
+
+const repo: Repo = {
+  id: 'repo',
+  path: '/repo',
+  displayName: 'Orca',
+  badgeColor: '',
+  addedAt: 1,
+  connectionId: 'remote'
+}
+const worktree: Worktree = {
+  id: 'workspace',
+  repoId: 'repo',
+  path: '/repo/feature',
+  displayName: 'Feature',
+  branch: 'feature',
+  head: 'abc',
+  comment: '',
+  linkedIssue: null,
+  linkedPR: null,
+  linkedLinearIssue: null,
+  isBare: false,
+  isMainWorktree: false,
+  isArchived: false,
+  isUnread: false,
+  isPinned: false,
+  sortOrder: 0,
+  lastActivityAt: 1
+}
+const github = normalizeTaskSourceContext({
+  provider: 'github',
+  projectId: 'repo',
+  hostId: 'local'
+})
+const review: WorkspaceAttachment = {
+  provider: 'github',
+  type: 'pr',
+  number: 7,
+  url: 'https://github.com/acme/orca/pull/7',
+  repoId: 'repo'
+}
+
+describe('attachment source conversion', () => {
+  it('uses legacy SSH ownership and preserves the saved provider source', () => {
+    expect(getWorkspaceAttachmentSourceContext('gitlab', repo, worktree)?.hostId).toBe('ssh:remote')
+    const stored = normalizeTaskSourceContext({
+      provider: 'linear',
+      projectId: 'other',
+      hostId: 'runtime:saved'
+    })
+    const saved = { ...worktree, linkedTaskSourceContext: stored }
+    expect(getWorkspaceAttachmentSourceContext('linear', repo, saved)).toBe(stored)
+    expect(getWorkspaceAttachmentSourceContext('github', repo, saved)?.projectId).toBe('repo')
+    expect(getWorkspaceAttachmentSourceContext('github', repo, saved)?.hostId).toBe('ssh:remote')
+  })
+  it('binds searched reviews to the source repository and retains their title', () => {
+    const item = resolveWorkItemSourceRow(
+      {
+        kind: 'github',
+        value: 'github:7',
+        item: {
+          id: '7',
+          repoId: 'repo',
+          type: 'pr',
+          number: 7,
+          title: 'Seven',
+          state: 'open',
+          url: review.url ?? '',
+          labels: [],
+          updatedAt: '2026-10-05',
+          author: null
+        }
+      },
+      { github, gitlab: null, linear: null, jira: null }
+    )
+    expect(item).toMatchObject({
+      title: 'Seven',
+      number: 7,
+      taskSourceContext: { providerIdentity: { provider: 'github', owner: 'acme', repo: 'orca' } }
+    })
+  })
+  it('recognizes a rich URL whose older context has no provider identity', () => {
+    const old = { ...review, taskSourceContext: github ?? undefined }
+    const enriched = {
+      ...review,
+      taskSourceContext: github
+        ? {
+            ...github,
+            providerIdentity: { provider: 'github' as const, owner: 'acme', repo: 'orca' }
+          }
+        : undefined
+    }
+    expect(isWorkspaceAttachmentLinked([old], enriched)).toBe(true)
+    expect(
+      isWorkspaceAttachmentLinked([old], {
+        ...enriched,
+        taskSourceContext:
+          normalizeTaskSourceContext({
+            provider: 'github',
+            projectId: 'other',
+            hostId: 'runtime:other'
+          }) ?? undefined
+      })
+    ).toBe(false)
+    expect(
+      isWorkspaceAttachmentLinked([old], {
+        ...enriched,
+        url: 'https://github.com/other/orca/pull/7'
+      })
+    ).toBe(false)
+  })
+  it('enriches a legacy review without adding a duplicate', () => {
+    const bare: WorkspaceAttachment = { provider: 'github', type: 'pr', number: 7 }
+    const result = appendWorkspaceAttachment([bare], review)
+    expect(result).toEqual([review])
+  })
+  it.each(['issue', 'mr'] as const)(
+    'keeps a bare GitLab %s distinct from the same-number other type',
+    (type) => {
+      const query: WorkspaceAttachment = { provider: 'gitlab', type, number: 12 }
+      const other: WorkspaceAttachment = {
+        ...query,
+        type: type === 'issue' ? 'mr' : 'issue',
+        url: `https://gitlab.com/acme/orca/-/${type === 'issue' ? 'merge_requests' : 'issues'}/12`
+      }
+      expect(matchesWorkspaceAttachmentQuery(query, other)).toBe(false)
+      expect(matchesWorkspaceAttachmentQuery(query, { ...query })).toBe(true)
+    }
+  )
+  it.each(['issue', 'pr'] as const)(
+    'resolves a bare GitHub %s across its shared number sequence but keeps URLs typed',
+    (type) => {
+      const query: WorkspaceAttachment = { provider: 'github', type, number: 7 }
+      const other: WorkspaceAttachment = {
+        ...query,
+        type: type === 'issue' ? 'pr' : 'issue',
+        url: `https://github.com/acme/orca/${type === 'issue' ? 'pull' : 'issues'}/7`
+      }
+      expect(matchesWorkspaceAttachmentQuery(query, other)).toBe(true)
+      expect(
+        matchesWorkspaceAttachmentQuery(
+          {
+            ...query,
+            url: `https://github.com/acme/orca/${type === 'issue' ? 'issues' : 'pull'}/7`
+          },
+          other
+        )
+      ).toBe(false)
+    }
+  )
+  it('only enriches the same symbolic identifier and URL source', () => {
+    const task: WorkspaceAttachment = {
+      provider: 'linear',
+      type: 'issue',
+      number: 0,
+      identifier: 'STA-71'
+    }
+    expect(matchesWorkspaceAttachmentQuery(task, { ...task, identifier: 'STA-710' })).toBe(false)
+    expect(matchesWorkspaceAttachmentQuery(task, { ...task, identifier: 'sta-71' })).toBe(true)
+    expect(
+      matchesWorkspaceAttachmentQuery(review, {
+        ...review,
+        url: 'https://github.com/other/orca/pull/7'
+      })
+    ).toBe(false)
+  })
+})
diff --git a/src/renderer/src/components/sidebar/workspace-attachment-source-result.ts b/src/renderer/src/components/sidebar/workspace-attachment-source-result.ts
new file mode 100644
index 000000000000..f2b06060e2db
--- /dev/null
+++ b/src/renderer/src/components/sidebar/workspace-attachment-source-result.ts
@@ -0,0 +1,103 @@
+import type { Repo } from '../../../../shared/repo-types'
+import type { WorkspaceAttachment, Worktree } from '../../../../shared/worktree/types'
+import {
+  buildTaskSourceContextFromRepo,
+  normalizeTaskSourceContext,
+  type TaskSourceContext,
+  type TaskProvider
+} from '../../../../shared/task-source-context'
+import {
+  getWorkspaceAttachmentUrlScope,
+  matchesWorkspaceAttachmentIdentity,
+  normalizeWorkspaceAttachments
+} from '../../../../shared/workspace-attachment-normalization'
+
+export function getWorkspaceAttachmentSourceContext(
+  provider: TaskProvider,
+  repo: Repo | undefined,
+  workspace: Worktree | undefined
+): TaskSourceContext | null {
+  const stored = workspace?.linkedTaskSourceContext
+  if (stored?.provider === provider) {
+    return stored
+  }
+  if (repo) {
+    return buildTaskSourceContextFromRepo({
+      provider,
+      projectId: workspace?.projectId ?? repo.id,
+      repo: { ...repo, executionHostId: workspace?.hostId ?? repo.executionHostId },
+      projectHostSetupId: workspace?.projectHostSetupId
+    })
+  }
+  return workspace
+    ? normalizeTaskSourceContext({
+        provider,
+        projectId: workspace.projectId ?? workspace.repoId,
+        hostId: workspace.hostId,
+        projectHostSetupId: workspace.projectHostSetupId
+      })
+    : null
+}
+
+export function matchesWorkspaceAttachmentQuery(
+  query: WorkspaceAttachment,
+  result: WorkspaceAttachment
+): boolean {
+  if (query.provider !== result.provider || query.number !== result.number) {
+    return false
+  }
+  // GitHub issues and PRs share numbers; GitLab issues and MRs have separate sequences.
+  if (query.type !== result.type && (query.provider !== 'github' || query.url)) {
+    return false
+  }
+  const identifier = query.identifier ?? query.linearIdentifier ?? query.jiraIdentifier
+  const resultIdentifier = result.identifier ?? result.linearIdentifier ?? result.jiraIdentifier
+  if (identifier && identifier.toLowerCase() !== resultIdentifier?.toLowerCase()) {
+    return false
+  }
+  return (
+    !query.url || getWorkspaceAttachmentUrlScope(query) === getWorkspaceAttachmentUrlScope(result)
+  )
+}
+
+export function isWorkspaceAttachmentLinked(
+  items: readonly WorkspaceAttachment[],
+  candidate: WorkspaceAttachment
+): boolean {
+  return items.some((item) => {
+    if (
+      matchesWorkspaceAttachmentIdentity(candidate, item) ||
+      matchesWorkspaceAttachmentIdentity(item, candidate)
+    ) {
+      return true
+    }
+    const sameReference =
+      item.provider === candidate.provider &&
+      item.type === candidate.type &&
+      item.number === candidate.number &&
+      (item.identifier ?? item.linearIdentifier ?? item.jiraIdentifier) ===
+        (candidate.identifier ?? candidate.linearIdentifier ?? candidate.jiraIdentifier)
+    const scope = getWorkspaceAttachmentUrlScope(item)
+    if (!sameReference || !scope || scope !== getWorkspaceAttachmentUrlScope(candidate)) {
+      return false
+    }
+    const oldContext = item.taskSourceContext
+    const newContext = candidate.taskSourceContext
+    return (
+      !oldContext ||
+      !newContext ||
+      (oldContext.hostId === newContext.hostId &&
+        oldContext.projectId === newContext.projectId &&
+        (!oldContext.accountLabel ||
+          !newContext.accountLabel ||
+          oldContext.accountLabel === newContext.accountLabel))
+    )
+  })
+}
+
+export function appendWorkspaceAttachment(
+  items: readonly WorkspaceAttachment[],
+  item: WorkspaceAttachment
+): WorkspaceAttachment[] {
+  return normalizeWorkspaceAttachments([...items, item])
+}
diff --git a/src/renderer/src/components/sidebar/workspace-hover-attachments.test.ts b/src/renderer/src/components/sidebar/workspace-hover-attachments.test.ts
new file mode 100644
index 000000000000..df07f181e9a7
--- /dev/null
+++ b/src/renderer/src/components/sidebar/workspace-hover-attachments.test.ts
@@ -0,0 +1,112 @@
+import { describe, expect, it } from 'vitest'
+import type { Worktree, WorkspaceAttachment } from '../../../../shared/worktree/types'
+import { getWorkspaceAttachmentKey } from '../../../../shared/workspace-attachment-normalization'
+import { getWorkspaceHoverAttachments } from './workspace-hover-attachments'
+const workspace: Worktree = {
+  id: 'repo::/repo/feature',
+  repoId: 'repo',
+  path: '/repo/feature',
+  displayName: 'Feature',
+  branch: 'feature',
+  head: 'abc',
+  isBare: false,
+  isMainWorktree: false,
+  isArchived: false,
+  isPinned: false,
+  isUnread: false,
+  sortOrder: 0,
+  lastActivityAt: 1,
+  comment: '',
+  linkedIssue: null,
+  linkedLinearIssue: null,
+  linkedPR: 57
+}
+const local: WorkspaceAttachment = {
+  provider: 'github',
+  type: 'pr',
+  number: 57,
+  url: 'https://github.com/acme/orca/pull/57'
+}
+const other: WorkspaceAttachment = { ...local, url: 'https://github.com/other/orca/pull/57' }
+describe('source-safe linked hover details', () => {
+  it('uses matching review URL to disambiguate the same number across repositories', () => {
+    const result = getWorkspaceHoverAttachments(
+      { ...workspace, linkedItems: [other, local] },
+      {
+        review: {
+          provider: 'github',
+          number: 57,
+          title: 'Local review',
+          url: local.url,
+          status: 'success'
+        }
+      }
+    )
+    expect(result.activeKey).toBe(getWorkspaceAttachmentKey(local))
+    expect(result.items[0]?.title).toBeUndefined()
+    expect(result.items[1]?.title).toBe('Local review')
+  })
+  it('does not guess active checks or assign cached titles when the source is unresolved', () => {
+    const result = getWorkspaceHoverAttachments(
+      { ...workspace, linkedItems: [other, local] },
+      { review: { provider: 'github', number: 57, title: 'Unknown review' } }
+    )
+    expect(result.activeKey).toBeNull()
+    expect(result.items.every((item) => !item.title)).toBe(true)
+  })
+  it('enriches legacy scalar tasks without introducing duplicate references', () => {
+    const result = getWorkspaceHoverAttachments(
+      { ...workspace, linkedPR: null, linkedIssue: 2, linkedLinearIssue: 'ENG-3' },
+      {
+        review: null,
+        issue: { number: 2, title: 'GitHub task', url: 'https://github.com/acme/orca/issues/2' },
+        linearIssue: {
+          identifier: 'ENG-3',
+          title: 'Linear task',
+          url: 'https://linear.app/acme/issue/ENG-3/title'
+        }
+      }
+    )
+    expect(result.items).toHaveLength(2)
+    expect(result.items.map((item) => item.title)).toEqual(['GitHub task', 'Linear task'])
+  })
+  it('does not attach review checks to folder workspaces', () => {
+    const result = getWorkspaceHoverAttachments(
+      { ...workspace, id: 'folder:docs', linkedItems: [local] },
+      { review: { provider: 'github', number: 57, title: 'Review', url: local.url } }
+    )
+    expect(result.activeKey).toBeNull()
+  })
+  it('does not choose between identical URLs owned by different source contexts', () => {
+    const localHost = {
+      ...local,
+      taskSourceContext: {
+        kind: 'task-source' as const,
+        provider: 'github' as const,
+        projectId: 'repo',
+        hostId: 'local' as const
+      }
+    }
+    const otherHost = {
+      ...local,
+      taskSourceContext: {
+        kind: 'task-source' as const,
+        provider: 'github' as const,
+        projectId: 'repo',
+        hostId: 'runtime:other' as const
+      }
+    }
+    const result = getWorkspaceHoverAttachments(
+      { ...workspace, linkedItems: [localHost, otherHost] },
+      { review: { provider: 'github', number: 57, title: 'Review', url: local.url } }
+    )
+    expect(result.activeKey).toBeNull()
+  })
+  it('uses a reference label rather than a review placeholder with no fetched URL', () => {
+    const result = getWorkspaceHoverAttachments(
+      { ...workspace, linkedItems: [{ provider: 'github', type: 'pr', number: 57 }] },
+      { review: { provider: 'github', number: 57, title: 'Unavailable placeholder' } }
+    )
+    expect(result.items[0]?.title).toBeUndefined()
+  })
+})
diff --git a/src/renderer/src/components/sidebar/workspace-hover-attachments.ts b/src/renderer/src/components/sidebar/workspace-hover-attachments.ts
new file mode 100644
index 000000000000..96ddc18991d8
--- /dev/null
+++ b/src/renderer/src/components/sidebar/workspace-hover-attachments.ts
@@ -0,0 +1,96 @@
+import type { WorkspaceAttachment, Worktree } from '../../../../shared/worktree/types'
+import { getWorkspaceAttachments } from '../../../../shared/workspace-attachments'
+import { getWorkspaceAttachmentKey } from '../../../../shared/workspace-attachment-normalization'
+import { parseWorkspaceKey } from '../../../../shared/workspace-scope'
+import { getActiveWorkspaceReviewKey } from './worktree-attachment-editing'
+import type {
+  WorktreeCardIssueDisplay,
+  WorktreeCardLinearIssueDisplay,
+  WorktreeCardJiraIssueDisplay
+} from './worktree-card-meta-types'
+import type { WorktreeCardPrDisplay } from './worktree-card-pr-display'
+
+type LiveDetails = {
+  issue?: WorktreeCardIssueDisplay | null
+  linearIssue?: WorktreeCardLinearIssueDisplay | null
+  jiraIssue?: WorktreeCardJiraIssueDisplay | null
+  review: WorktreeCardPrDisplay | null
+}
+
+export function getWorkspaceHoverAttachments(
+  workspace: Worktree,
+  details: LiveDetails
+): {
+  items: WorkspaceAttachment[]
+  activeKey: string | null
+  referenceKeys: string[]
+} {
+  const items = getWorkspaceAttachments(workspace)
+  const matches = (item: WorkspaceAttachment): boolean => {
+    if (item.provider === 'github' && item.type === 'issue') {
+      return item.number === details.issue?.number
+    }
+    if (item.provider === 'linear') {
+      return (item.identifier ?? item.linearIdentifier) === details.linearIssue?.identifier
+    }
+    if (item.provider === 'jira') {
+      return (item.identifier ?? item.jiraIdentifier) === details.jiraIssue?.identifier
+    }
+    return (
+      item.type !== 'issue' &&
+      item.provider === details.review?.provider &&
+      item.number === details.review?.number
+    )
+  }
+  const enriched = items.map((item) => {
+    const live =
+      item.provider === 'github' && item.type === 'issue'
+        ? details.issue
+        : item.provider === 'linear'
+          ? details.linearIssue
+          : item.provider === 'jira'
+            ? details.jiraIssue
+            : details.review
+    const sameReference =
+      matches(item) &&
+      live &&
+      (!item.url || item.url === live.url) &&
+      items.filter(
+        (candidate) =>
+          candidate.provider === item.provider &&
+          candidate.type === item.type &&
+          matches(candidate) &&
+          (!candidate.url || candidate.url === live.url)
+      ).length === 1
+    return sameReference
+      ? {
+          ...item,
+          title: item.title || (item.type === 'issue' || live.url ? live.title : undefined),
+          url: item.url || live.url || undefined
+        }
+      : item
+  })
+  const legacyActive = getActiveWorkspaceReviewKey(workspace)
+  const selected = items.find((item) => getWorkspaceAttachmentKey(item) === legacyActive)
+  const candidates = selected
+    ? items.filter(
+        (item) =>
+          item.provider === selected.provider &&
+          item.type === selected.type &&
+          item.number === selected.number
+      )
+    : []
+  const sourceMatches = candidates.filter((item) => item.url && item.url === details.review?.url)
+  const active =
+    candidates.length > 1 ? (sourceMatches.length === 1 ? sourceMatches[0] : undefined) : selected
+  const activeIndex = active ? items.indexOf(active) : -1
+  const activeItem = enriched[activeIndex]
+  return {
+    items: enriched,
+    referenceKeys: items.map(getWorkspaceAttachmentKey),
+    activeKey:
+      parseWorkspaceKey(workspace.id)?.type === 'folder' || !activeItem
+        ? null
+        : getWorkspaceAttachmentKey(activeItem)
+  }
+}
diff --git a/src/renderer/src/components/sidebar/workspace-reference-detail-read.test.ts b/src/renderer/src/components/sidebar/workspace-reference-detail-read.test.ts
new file mode 100644
index 000000000000..af3c6c81a9cb
--- /dev/null
+++ b/src/renderer/src/components/sidebar/workspace-reference-detail-read.test.ts
@@ -0,0 +1,231 @@
+// @vitest-environment happy-dom
+import { beforeEach, describe, expect, it, vi } from 'vitest'
+import type { HostedReviewInfo } from '../../../../shared/hosted-review'
+import type { LinearIssue } from '../../../../shared/linear/issue-types'
+import { normalizeTaskSourceContext } from '../../../../shared/task-source-context'
+import { readWorkspaceReferenceDetails } from './workspace-reference-detail-read'
+import { getWorkspaceReferenceRequest } from './workspace-reference-details'
+import {
+  referenceAttachment,
+  referenceRepo,
+  referenceWorkspace,
+  referenceReview,
+  referenceLinearIssue
+} from './workspace-reference-fixtures.test-support'
+
+const mocks = vi.hoisted(() => ({
+  review: vi.fn<(...args: unknown[]) => Promise<HostedReviewInfo | null>>(),
+  linear: vi.fn<(...args: unknown[]) => Promise<LinearIssue | null>>(),
+  jira: vi.fn(),
+  issue: vi.fn()
+}))
+vi.mock('@/store', () => ({
+  useAppStore: {
+    getState: () => ({
+      hostedReviewCache: {},
+      linearIssueCache: {},
+      jiraIssueSummaryCache: {},
+      issueCache: {},
+      fetchHostedReviewForBranch: mocks.review,
+      settings: { activeRuntimeEnvironmentId: 'focused-elsewhere' },
+      fetchLinearIssue: mocks.linear,
+      lookupJiraIssueSummary: mocks.jira,
+      fetchIssue: mocks.issue
+    })
+  }
+}))
+
+beforeEach(() => {
+  vi.clearAllMocks()
+  Object.defineProperty(window, 'api', {
+    configurable: true,
+    value: { hostedReview: { forBranch: mocks.review } }
+  })
+})
+describe('source-scoped workspace reference status reads', () => {
+  it.each(['open', 'merged', 'draft'] as const)(
+    'loads the exact %s sibling without workspace HEAD filtering or branch cache mutation',
+    async (state) => {
+      mocks.review.mockResolvedValue(referenceReview(42, { state, baseRefName: 'release' }))
+      const item = referenceAttachment(42)
+      const detail = await readWorkspaceReferenceDetails(
+        getWorkspaceReferenceRequest(item, referenceWorkspace, referenceRepo)
+      )
+      expect(detail?.review?.state).toBe(state)
+      expect(mocks.review).toHaveBeenCalledWith(
+        '/repo',
+        'feature',
+        expect.objectContaining({
+          linkedGitHubPR: 42,
+          linkedGitLabMR: null,
+          repoOwnerExecutionHostId: 'local'
+        })
+      )
+      expect(mocks.review.mock.calls[0]?.[2]).not.toHaveProperty('currentHeadOid')
+    }
+  )
+  it.each(['runtime:owner', 'ssh:owner'] as const)(
+    'uses the %s repository owner',
+    async (executionHostId) => {
+      mocks.review.mockResolvedValue(referenceReview())
+      await readWorkspaceReferenceDetails(
+        getWorkspaceReferenceRequest(referenceAttachment(), referenceWorkspace, {
+          ...referenceRepo,
+          executionHostId
+        })
+      )
+      expect(mocks.review).toHaveBeenCalledWith(
+        '/repo',
+        'feature',
+        expect.objectContaining({ repoOwnerExecutionHostId: executionHostId })
+      )
+    }
+  )
+  it('rejects branch fallback, wrong provider and wrong repository responses', async () => {
+    const request = getWorkspaceReferenceRequest(
+      referenceAttachment(),
+      referenceWorkspace,
+      referenceRepo
+    )
+    for (const review of [
+      referenceReview(9),
+      referenceReview(7, { provider: 'gitlab' }),
+      referenceReview(7, { url: 'https://github.com/other/orca/pull/7' })
+    ]) {
+      mocks.review.mockResolvedValue(review)
+      expect(await readWorkspaceReferenceDetails(request)).toBeNull()
+    }
+  })
+  it('does not route folder or known foreign reviews through the current git repository', async () => {
+    expect(
+      await readWorkspaceReferenceDetails(
+        getWorkspaceReferenceRequest(referenceAttachment(), {
+          ...referenceWorkspace,
+          id: 'folder:docs'
+        })
+      )
+    ).toBeNull()
+    expect(
+      await readWorkspaceReferenceDetails(
+        getWorkspaceReferenceRequest(
+          { ...referenceAttachment(), url: 'https://github.com/other/orca/pull/7' },
+          referenceWorkspace,
+          referenceRepo
+        )
+      )
+    ).toBeNull()
+    expect(mocks.review).not.toHaveBeenCalled()
+  })
+  it('binds Linear workspace and host, then rejects same identifier from another organization', async () => {
+    const context = normalizeTaskSourceContext({
+      provider: 'linear',
+      projectId: 'project',
+      hostId: 'runtime:linear-owner',
+      providerIdentity: { provider: 'linear', workspaceId: 'workspace' }
+    })
+    const item = {
+      provider: 'linear' as const,
+      type: 'issue' as const,
+      number: 0,
+      identifier: 'ENG-1',
+      url: 'https://linear.app/acme/issue/ENG-1/task',
+      taskSourceContext: context ?? undefined
+    }
+    mocks.linear.mockResolvedValue(referenceLinearIssue())
+    const request = getWorkspaceReferenceRequest(item, referenceWorkspace, referenceRepo)
+    expect((await readWorkspaceReferenceDetails(request))?.stateName).toBe('In Progress')
+    expect(mocks.linear).toHaveBeenCalledWith('ENG-1', 'workspace', { sourceContext: context })
+    mocks.linear.mockResolvedValue(
+      referenceLinearIssue({ url: 'https://linear.app/other/issue/ENG-1/task' })
+    )
+    expect(await readWorkspaceReferenceDetails(request)).toBeNull()
+  })
+  it('keys equal numbers separately by owning host and task account', () => {
+    const local = getWorkspaceReferenceRequest(
+      referenceAttachment(),
+      referenceWorkspace,
+      referenceRepo
+    )
+    const remote = getWorkspaceReferenceRequest(referenceAttachment(), referenceWorkspace, {
+      ...referenceRepo,
+      connectionId: 'owner'
+    })
+    expect(local.key).not.toBe(remote.key)
+    const context = normalizeTaskSourceContext({
+      provider: 'github',
+      projectId: 'project',
+      hostId: 'local',
+      accountLabel: 'account-a'
+    })
+    const first = getWorkspaceReferenceRequest(
+      { ...referenceAttachment(), taskSourceContext: context ?? undefined },
+      referenceWorkspace,
+      referenceRepo
+    )
+    const second = getWorkspaceReferenceRequest(
+      {
+        ...referenceAttachment(),
+        taskSourceContext: context ? { ...context, accountLabel: 'account-b' } : undefined
+      },
+      referenceWorkspace,
+      referenceRepo
+    )
+    expect(first.key).not.toBe(second.key)
+    expect(
+      getWorkspaceReferenceRequest(referenceAttachment(), referenceWorkspace, {
+        ...referenceRepo,
+        ghAccount: { host: 'github.com', user: 'other' }
+      }).key
+    ).not.toBe(local.key)
+  })
+  it('uses the same all-workspaces cache slot as the existing card when no Linear workspace is bound', async () => {
+    const source = normalizeTaskSourceContext({
+      provider: 'linear',
+      projectId: 'project',
+      hostId: 'local'
+    })
+    const item = {
+      provider: 'linear' as const,
+      type: 'issue' as const,
+      number: 0,
+      identifier: 'ENG-1',
+      taskSourceContext: source ?? undefined
+    }
+    mocks.linear.mockResolvedValue(referenceLinearIssue())
+    expect(
+      (
+        await readWorkspaceReferenceDetails(
+          getWorkspaceReferenceRequest(item, referenceWorkspace, referenceRepo)
+        )
+      )?.stateType
+    ).toBe('started')
+    expect(mocks.linear).toHaveBeenCalledWith('ENG-1', 'all', { sourceContext: source })
+  })
+  it('fails closed for incompatible per-reference account, repository binding and bare provider', async () => {
+    for (const fields of [
+      { accountLabel: 'other-account' },
+      { repoId: 'foreign-repo' },
+      { providerIdentity: { provider: 'github' as const, owner: 'other', repo: 'orca' } }
+    ]) {
+      const context = normalizeTaskSourceContext({
+        provider: 'github',
+        projectId: 'project',
+        hostId: 'local',
+        ...fields
+      })
+      const request = getWorkspaceReferenceRequest(
+        { ...referenceAttachment(), taskSourceContext: context ?? undefined },
+        referenceWorkspace,
+        referenceRepo
+      )
+      expect(await readWorkspaceReferenceDetails(request)).toBeNull()
+    }
+    const wrongProvider = getWorkspaceReferenceRequest(
+      { provider: 'gitlab', type: 'mr', number: 7 },
+      referenceWorkspace,
+      referenceRepo
+    )
+    expect(await readWorkspaceReferenceDetails(wrongProvider)).toBeNull()
+    expect(mocks.review).not.toHaveBeenCalled()
+  })
+})
diff --git a/src/renderer/src/components/sidebar/workspace-reference-detail-read.ts b/src/renderer/src/components/sidebar/workspace-reference-detail-read.ts
new file mode 100644
index 000000000000..36eb9e28da29
--- /dev/null
+++ b/src/renderer/src/components/sidebar/workspace-reference-detail-read.ts
@@ -0,0 +1,147 @@
+import { useAppStore } from '@/store'
+import type { AppState } from '@/store/types'
+import { PrioritySemaphore } from '../../../../shared/priority-semaphore'
+import { getRepoExecutionHostId } from '../../../../shared/execution-host'
+import { getTaskSourceCacheScope } from '../../../../shared/task-source-context'
+import { canReadWorkspaceReferenceReview } from './workspace-reference-review-source'
+import { isWorkspaceRepositoryAttachment } from './worktree-attachment-editing'
+import {
+  matchesWorkspaceReferenceUrl,
+  getWorkspaceReferenceLinearWorkspaceId,
+  matchWorkspaceReferenceReview,
+  type WorkspaceReferenceDetails,
+  type WorkspaceReferenceRequest
+} from './workspace-reference-details'
+
+type Entry<T> = { data: T | null; fetchedAt: number; stale?: boolean }
+const reads = new PrioritySemaphore(3)
+
+function lookup<T>(
+  entry: Entry<T> | undefined,
+  read: () => Promise<T | null>,
+  project: (value: T) => WorkspaceReferenceDetails | null
+) {
+  return {
+    rawEntry: entry,
+    entry: entry && { ...entry, data: entry.data && project(entry.data) },
+    read: async () => {
+      const value = await read()
+      return value && project(value)
+    }
+  }
+}
+
+export function getWorkspaceReferenceLookup(request: WorkspaceReferenceRequest, state: AppState) {
+  const { item, workspace, repo, sourceContext } = request
+  if (item.type !== 'issue') {
+    if (!repo || !canReadWorkspaceReferenceReview(request, request.knownProvider)) {
+      return null
+    }
+    return lookup(
+      state.hostedReviewCache?.[request.key],
+      () =>
+        state.fetchHostedReviewForBranch(repo.path, workspace.branch ?? '', {
+          exactReviewKey: request.key,
+          repoId: repo.id,
+          repoOwnerExecutionHostId: getRepoExecutionHostId(repo),
+          admissionTier: request.admissionTier ?? 'interactive',
+          linkedGitHubPR: item.provider === 'github' ? item.number : null,
+          linkedGitLabMR: item.provider === 'gitlab' ? item.number : null,
+          linkedBitbucketPR: item.provider === 'bitbucket' ? item.number : null,
+          linkedAzureDevOpsPR: item.provider === 'azure-devops' ? item.number : null,
+          linkedGiteaPR: item.provider === 'gitea' ? item.number : null
+        }),
+      (review) =>
+        matchWorkspaceReferenceReview(item, review)
+          ? { title: review.title, url: review.url, review }
+          : null
+    )
+  }
+  if (!sourceContext) {
+    return null
+  }
+  const scope = getTaskSourceCacheScope(sourceContext)
+  const identifier = item.identifier ?? item.linearIdentifier ?? item.jiraIdentifier
+  if (item.provider === 'linear' && identifier && sourceContext.provider === 'linear') {
+    const workspaceId = getWorkspaceReferenceLinearWorkspaceId(
+      item.linearWorkspaceId,
+      sourceContext
+    )
+    return lookup(
+      state.linearIssueCache?.[`${scope}::${workspaceId}::${identifier}`],
+      () => state.fetchLinearIssue(identifier, workspaceId, { sourceContext }),
+      (issue) =>
+        issue.identifier.toLowerCase() === identifier.toLowerCase() &&
+        matchesWorkspaceReferenceUrl(item, issue.url) &&
+        (workspaceId === 'all' || issue.workspaceId === workspaceId)
+          ? {
+              title: issue.title,
+              url: issue.url,
+              stateName: issue.state.name,
+              stateType: issue.state.type
+            }
+          : null
+    )
+  }
+  if (item.provider === 'jira' && identifier && sourceContext.provider === 'jira') {
+    const identity = sourceContext.providerIdentity
+    const siteId = identity?.provider === 'jira' ? identity.siteId : null
+    if (!siteId) {
+      return null
+    }
+    return lookup(
+      state.jiraIssueSummaryCache?.[`${scope}::${siteId}::${identifier.toUpperCase()}`],
+      () => state.lookupJiraIssueSummary(sourceContext, identifier, siteId),
+      (issue) =>
+        issue.key.toLowerCase() === identifier.toLowerCase() &&
+        issue.siteId === siteId &&
+        matchesWorkspaceReferenceUrl(item, issue.url)
+          ? {
+              title: issue.title,
+              url: issue.url,
+              stateName: issue.status.name,
+              stateType:
+                issue.status.categoryKey === 'done'
+                  ? 'completed'
+                  : issue.status.categoryKey === 'indeterminate'
+                    ? 'started'
+                    : issue.status.categoryKey === 'new'
+                      ? 'unstarted'
+                      : undefined
+            }
+          : null
+    )
+  }
+  if (
+    item.provider === 'github' &&
+    repo &&
+    sourceContext.provider === 'github' &&
+    isWorkspaceRepositoryAttachment(item, repo)
+  ) {
+    return lookup(
+      state.issueCache?.[`${scope}::${repo.id}::${item.number}`],
+      () => state.fetchIssue(repo.path, item.number, { repoId: repo.id, sourceContext }),
+      (issue) =>
+        issue.number === item.number && matchesWorkspaceReferenceUrl(item, issue.url)
+          ? { title: issue.title, url: issue.url, issueState: issue.state }
+          : null
+    )
+  }
+  return null
+}
+
+export async function readWorkspaceReferenceDetails(
+  request: WorkspaceReferenceRequest,
+  signal?: AbortSignal
+): Promise<WorkspaceReferenceDetails | null> {
+  const release = await reads.acquire(request.admissionTier === 'background' ? 1 : 0, signal)
+  try {
+    if (signal?.aborted) {
+      return null
+    }
+    return (await getWorkspaceReferenceLookup(request, useAppStore.getState())?.read()) ?? null
+  } finally {
+    // Native reads retain admission until settlement, even after demand disappears.
+    release()
+  }
+}
diff --git a/src/renderer/src/components/sidebar/workspace-reference-details.ts b/src/renderer/src/components/sidebar/workspace-reference-details.ts
new file mode 100644
index 000000000000..c83f302f9a11
--- /dev/null
+++ b/src/renderer/src/components/sidebar/workspace-reference-details.ts
@@ -0,0 +1,139 @@
+import type { WorkspaceAttachment, Worktree } from '../../../../shared/worktree/types'
+import type { Repo } from '../../../../shared/repo-types'
+import {
+  type TaskSourceContext,
+  getTaskSourceCacheScope,
+  buildTaskSourceContextFromRepo
+} from '../../../../shared/task-source-context'
+import { getRepoExecutionHostId, parseExecutionHostId } from '../../../../shared/execution-host'
+import {
+  getWorkspaceAttachmentKey,
+  getWorkspaceAttachmentUrlScope
+} from '../../../../shared/workspace-attachment-normalization'
+import { getWorkspaceAttachments } from '../../../../shared/workspace-attachments'
+import { getWorkspaceAttachmentSourceContext } from './workspace-attachment-source-result'
+import type { WorktreeCardPrDisplay } from './worktree-card-pr-display'
+import type { HostedReviewProvider } from '../../../../shared/hosted-review'
+import { getProviderRuntimeContextKey } from '@/lib/provider-runtime-context'
+import { getRuntimeEnvironmentRevision } from '@/runtime/runtime-environment-revision'
+
+export type WorkspaceReferenceDetails = {
+  stale?: boolean
+  title: string
+  url: string
+  review?: WorktreeCardPrDisplay
+  stateName?: string
+  stateType?: string
+  issueState?: 'open' | 'closed'
+}
+export type WorkspaceReferenceDetailsMap = Readonly<
+  Record<string, WorkspaceReferenceDetails | undefined>
+>
+export type WorkspaceReferenceRequest = {
+  admissionTier?: 'interactive' | 'status' | 'background'
+  knownProvider?: HostedReviewProvider
+  key: string
+  item: WorkspaceAttachment
+  workspace: Worktree
+  repo?: Repo
+  sourceContext: TaskSourceContext | null
+}
+
+export function getWorkspaceReferenceLinearWorkspaceId(
+  workspaceId?: string | null,
+  source?: TaskSourceContext | null
+): string {
+  const identity = source?.providerIdentity
+  return workspaceId ?? (identity?.provider === 'linear' ? identity.workspaceId : null) ?? 'all'
+}
+
+export function getWorkspaceReferenceRequest(
+  item: WorkspaceAttachment,
+  workspace: Worktree,
+  repo?: Repo,
+  runtimeVersion = getWorkspaceReferenceRuntimeVersion(workspace, repo)
+): WorkspaceReferenceRequest {
+  const sourceContext =
+    item.taskSourceContext ??
+    (item.type !== 'issue' && repo && (item.provider === 'github' || item.provider === 'gitlab')
+      ? buildTaskSourceContextFromRepo({
+          provider: item.provider,
+          projectId: workspace.projectId ?? repo.id,
+          repo
+        })
+      : item.provider === 'github' ||
+          item.provider === 'gitlab' ||
+          item.provider === 'linear' ||
+          item.provider === 'jira'
+        ? getWorkspaceAttachmentSourceContext(item.provider, repo, workspace)
+        : null)
+  return {
+    item,
+    workspace,
+    repo,
+    sourceContext,
+    key: JSON.stringify([
+      getWorkspaceAttachmentKey(item),
+      repo
+        ? [repo.id, repo.path, getRepoExecutionHostId(repo), repo.gitRemoteIdentity?.canonicalKey]
+        : [workspace.hostId, workspace.projectId],
+      sourceContext ? getTaskSourceCacheScope(sourceContext) : null,
+      sourceContext?.accountLabel ?? null,
+      repo?.ghAccount ?? null,
+      runtimeVersion
+    ])
+  }
+}
+
+export function getWorkspaceReferenceRuntimeVersion(workspace: Worktree, repo?: Repo): string {
+  const contexts = getWorkspaceAttachments(workspace).map((item) => item.taskSourceContext?.hostId)
+  const hosts = [
+    repo ? getRepoExecutionHostId(repo) : workspace.hostId,
+    workspace.linkedTaskSourceContext?.hostId,
+    ...contexts
+  ]
+  const environments = hosts
+    .map((hostId) => parseExecutionHostId(hostId))
+    .flatMap((host) => (host?.kind === 'runtime' ? [host.environmentId] : []))
+  return JSON.stringify([
+    getProviderRuntimeContextKey(null),
+    ...[...new Set(environments)].sort().map((id) => [id, getRuntimeEnvironmentRevision(id)])
+  ])
+}
+
+export function matchesWorkspaceReferenceUrl(item: WorkspaceAttachment, url: string): boolean {
+  return (
+    !item.url ||
+    getWorkspaceAttachmentUrlScope(item) === getWorkspaceAttachmentUrlScope({ ...item, url })
+  )
+}
+
+export function matchWorkspaceReferenceReview(
+  item: WorkspaceAttachment,
+  review: WorktreeCardPrDisplay | null | undefined
+): boolean {
+  return Boolean(
+    item.type !== 'issue' &&
+    review?.url &&
+    item.provider === review.provider &&
+    item.number === review.number &&
+    matchesWorkspaceReferenceUrl(item, review.url)
+  )
+}
+
+export function workspaceReferenceReview(
+  item: WorkspaceAttachment,
+  details: WorkspaceReferenceDetails | undefined
+): WorktreeCardPrDisplay | null {
+  if (item.provider === 'linear' || item.provider === 'jira' || item.type === 'issue') {
+    return null
+  }
+  return (
+    details?.review ?? {
+      provider: item.provider,
+      number: item.number,
+      title: item.title ?? '',
+      url: item.url
+    }
+  )
+}
diff --git a/src/renderer/src/components/sidebar/workspace-reference-fixtures.test-support.ts b/src/renderer/src/components/sidebar/workspace-reference-fixtures.test-support.ts
new file mode 100644
index 000000000000..312d8f0010c5
--- /dev/null
+++ b/src/renderer/src/components/sidebar/workspace-reference-fixtures.test-support.ts
@@ -0,0 +1,78 @@
+import type { Worktree, WorkspaceAttachment } from '../../../../shared/worktree/types'
+import type { Repo } from '../../../../shared/repo-types'
+import type { HostedReviewInfo } from '../../../../shared/hosted-review'
+import type { LinearIssue } from '../../../../shared/linear/issue-types'
+
+export const referenceRepo: Repo = {
+  id: 'repo',
+  path: '/repo',
+  displayName: 'Orca',
+  badgeColor: '',
+  addedAt: 1,
+  gitRemoteIdentity: {
+    canonicalKey: 'github.com/acme/orca',
+    remoteName: 'origin',
+    remoteUrl: 'https://github.com/acme/orca.git'
+  }
+}
+export const referenceWorkspace: Worktree = {
+  id: 'repo::/repo/feature',
+  repoId: 'repo',
+  path: '/repo/feature',
+  displayName: 'Feature',
+  branch: 'feature',
+  head: 'head',
+  comment: '',
+  linkedIssue: null,
+  linkedPR: 7,
+  linkedLinearIssue: null,
+  isBare: false,
+  isMainWorktree: false,
+  isArchived: false,
+  isUnread: false,
+  isPinned: false,
+  sortOrder: 0,
+  lastActivityAt: 1
+}
+export function referenceAttachment(number = 7): WorkspaceAttachment {
+  return {
+    provider: 'github',
+    type: 'pr',
+    number,
+    url: `https://github.com/acme/orca/pull/${number}`
+  }
+}
+export function referenceReview(
+  number = 7,
+  overrides: Partial<HostedReviewInfo> = {}
+): HostedReviewInfo {
+  const reviewNumber = overrides.number ?? number
+  return {
+    provider: 'github',
+    number: reviewNumber,
+    title: `Review ${reviewNumber}`,
+    url: `https://github.com/acme/orca/pull/${reviewNumber}`,
+    state: 'open',
+    status: 'success',
+    mergeable: 'MERGEABLE',
+    updatedAt: '2026-10-07',
+    ...overrides
+  }
+}
+export function referenceLinearIssue(overrides: Partial<LinearIssue> = {}): LinearIssue {
+  const identifier = overrides.identifier ?? 'ENG-1'
+  return {
+    id: 'id',
+    identifier,
+    title: 'Task',
+    url: `https://linear.app/acme/issue/${identifier}/title`,
+    workspaceId: 'workspace',
+    state: { name: 'In Progress', type: 'started', color: '' },
+    team: { id: 'team', name: 'Engineering', key: 'ENG' },
+    labels: [],
+    labelIds: [],
+    priority: 0,
+    updatedAt: '2026-10-07',
+    ...overrides
+  }
+}
diff --git a/src/renderer/src/components/sidebar/workspace-reference-refresh-targets.test.ts b/src/renderer/src/components/sidebar/workspace-reference-refresh-targets.test.ts
new file mode 100644
index 000000000000..9c56bb8b1408
--- /dev/null
+++ b/src/renderer/src/components/sidebar/workspace-reference-refresh-targets.test.ts
@@ -0,0 +1,167 @@
+// @vitest-environment happy-dom
+import { afterEach, beforeEach, expect, it, vi } from 'vitest'
+import { useAppStore } from '@/store'
+import { makeDetectedResult } from '@/store/slices/worktrees-detected-listing-fixtures'
+import { createVisibleHostedReviewRefreshScheduler } from '@/store/github/visible-hosted-review-refresh-scheduler'
+import { getHostedReviewCacheKey } from '@/store/slices/hosted-review-cache-identity'
+import { getWorkspaceReferenceRefreshTargets } from './workspace-reference-refresh-targets'
+import {
+  referenceAttachment,
+  referenceRepo,
+  referenceWorkspace,
+  referenceReview
+} from './workspace-reference-fixtures.test-support'
+vi.mock('@/store', async () => {
+  const browserWindow = globalThis.window
+  const { createTestStore } = await import('@/store/slices/github-slice-test-harness')
+  globalThis.window = browserWindow
+  return { useAppStore: createTestStore() }
+})
+const read = vi.hoisted(() => vi.fn(async () => null))
+vi.mock('./workspace-reference-detail-read', () => ({ readWorkspaceReferenceDetails: read }))
+const workspace = { ...referenceWorkspace, linkedPR: null, linkedItems: [referenceAttachment()] }
+const update = () => getWorkspaceReferenceRefreshTargets(useAppStore.getState())
+beforeEach(() => {
+  vi.useFakeTimers()
+  vi.clearAllMocks()
+  useAppStore.setState({
+    settings: null,
+    repos: [referenceRepo],
+    worktreesByRepo: { repo: [workspace] },
+    detectedWorktreesByRepo: {},
+    visibleReviewWorktreeIds: [workspace.id],
+    activeWorktreeId: null,
+    activeWorkspaceExecutionHostId: null,
+    visibleWorkspaceHostIds: null,
+    workspaceHostScope: 'all',
+    hostedReviewCache: {},
+    prCache: {},
+    tabsByWorktree: {},
+    ptyIdsByTabId: {},
+    browserTabsByWorktree: {
+      [workspace.id]: [
+        {
+          id: 'browser',
+          worktreeId: workspace.id,
+          url: '',
+          title: '',
+          loading: false,
+          faviconUrl: null,
+          canGoBack: false,
+          canGoForward: false,
+          loadError: null,
+          createdAt: 1
+        }
+      ]
+    },
+    unifiedTabsByWorktree: {},
+    agentStatusByPaneKey: {},
+    agentStatusEpoch: 0,
+    sshConnectionStates: new Map()
+  })
+})
+afterEach(() => {
+  vi.useRealTimers()
+})
+it('pauses disconnected SSH owners and only admits the owning reconnect', () => {
+  useAppStore.setState({ repos: [{ ...referenceRepo, connectionId: 'ssh-a' }] })
+  expect(update()).toEqual([])
+  for (const [targetId, status, count] of [
+    ['other', 'connected', 0],
+    ['ssh-a', 'connected', 1],
+    ['ssh-a', 'connecting', 0]
+  ] as const) {
+    useAppStore
+      .getState()
+      .sshConnectionStates.set(targetId, { targetId, status, error: null, reconnectAttempt: 0 })
+    expect(update()).toHaveLength(count)
+  }
+})
+it('shares one scheduler timer and removes queued work when the workspace leaves the viewport', async () => {
+  useAppStore.setState({
+    worktreesByRepo: {
+      repo: [
+        {
+          ...workspace,
+          linkedItems: Array.from({ length: 12 }, (_, i) => referenceAttachment(i + 1))
+        }
+      ]
+    }
+  })
+  const scheduler = createVisibleHostedReviewRefreshScheduler()
+  try {
+    scheduler.update(update())
+    scheduler.setVisible(true)
+    await vi.advanceTimersByTimeAsync(0)
+    expect(read).toHaveBeenCalledTimes(12)
+    expect(vi.getTimerCount()).toBe(1)
+    useAppStore.setState({ visibleReviewWorktreeIds: [] })
+    scheduler.update(update())
+    expect(vi.getTimerCount()).toBe(0)
+    await vi.advanceTimersByTimeAsync(600_000)
+    expect(read).toHaveBeenCalledTimes(12)
+  } finally {
+    scheduler.dispose()
+  }
+})
+it('uses the known branch provider for sparse enterprise references', () => {
+  const repo = {
+    ...referenceRepo,
+    gitRemoteIdentity: {
+      canonicalKey: 'enterprise.test/acme/orca',
+      remoteName: 'origin',
+      remoteUrl: 'https://enterprise.test/acme/orca.git'
+    }
+  }
+  const key = getHostedReviewCacheKey(repo.path, workspace.branch, null, repo.id, null, null, true)
+  useAppStore.setState({
+    repos: [repo],
+    worktreesByRepo: {
+      repo: [{ ...workspace, linkedItems: [{ provider: 'github', type: 'pr', number: 42 }] }]
+    }
+  })
+  expect(update()).toHaveLength(0)
+  useAppStore.setState({
+    hostedReviewCache: { [key]: { data: referenceReview(), fetchedAt: Date.now() } }
+  })
+  expect(update()).toHaveLength(1)
+})
+it('retains both explicit owners when equal visible workspace IDs exist on two hosts', () => {
+  const remoteRepo = {
+    ...referenceRepo,
+    executionHostId: 'ssh:remote' as const,
+    connectionId: 'remote'
+  }
+  useAppStore.setState({
+    repos: [referenceRepo, remoteRepo],
+    worktreesByRepo: {
+      local: [{ ...workspace, hostId: 'local' }],
+      remote: [{ ...workspace, hostId: 'ssh:remote' }]
+    },
+    sshConnectionStates: new Map([
+      ['remote', { targetId: 'remote', status: 'connected', error: null, reconnectAttempt: 0 }]
+    ])
+  })
+  const targets = update()
+  expect(targets).toHaveLength(2)
+  expect(new Set(targets.map((target) => target.key)).size).toBe(2)
+  useAppStore.setState({ visibleWorkspaceHostIds: ['local'] })
+  expect(update()).toHaveLength(1)
+  useAppStore.setState({
+    activeWorktreeId: workspace.id,
+    activeWorkspaceExecutionHostId: 'ssh:remote'
+  })
+  expect(
+    getWorkspaceReferenceRefreshTargets(useAppStore.getState(), { selectedOnly: true })
+  ).toHaveLength(1)
+})
+
+it('admits attached reviews on visible external detected worktrees', () => {
+  useAppStore.setState({
+    worktreesByRepo: {},
+    detectedWorktreesByRepo: {
+      repo: makeDetectedResult('repo', [workspace])
+    }
+  })
+  expect(update()).toHaveLength(1)
+})
diff --git a/src/renderer/src/components/sidebar/workspace-reference-refresh-targets.ts b/src/renderer/src/components/sidebar/workspace-reference-refresh-targets.ts
new file mode 100644
index 000000000000..9a9c5a564d45
--- /dev/null
+++ b/src/renderer/src/components/sidebar/workspace-reference-refresh-targets.ts
@@ -0,0 +1,89 @@
+import type { AppState } from '@/store/types'
+import { useAppStore } from '@/store'
+import { getVisibleHostedReviewWorkspaces } from '@/store/github/visible-hosted-review-refresh-targets'
+import { getHostedReviewCacheKey } from '@/store/slices/hosted-review-cache-identity'
+import type { VisibleHostedReviewRefreshTarget } from '@/store/github/visible-hosted-review-refresh-scheduler'
+import { reviewRefreshIntervalMs } from '../../../../shared/review-refresh-policy'
+import { withTimeout } from '../../../../shared/promise-timeout-fallback'
+import { getWorkspaceAttachments } from '../../../../shared/workspace-attachments'
+import {
+  getWorkspaceReferenceRequest,
+  getWorkspaceReferenceRuntimeVersion,
+  matchWorkspaceReferenceReview
+} from './workspace-reference-details'
+import { canReadWorkspaceReferenceReview } from './workspace-reference-review-source'
+import { readWorkspaceReferenceDetails } from './workspace-reference-detail-read'
+import { selectIsSleepingWorktree } from './use-worktree-sleep-state'
+
+export function getWorkspaceReferenceRefreshTargets(
+  state: AppState,
+  options?: { selectedOnly?: boolean }
+): VisibleHostedReviewRefreshTarget[] {
+  const targets = new Map<string, VisibleHostedReviewRefreshTarget>()
+  for (const { worktree, repo, candidate, selected } of getVisibleHostedReviewWorkspaces(
+    state,
+    options
+  )) {
+    if (selectIsSleepingWorktree(state, worktree.id)) {
+      continue
+    }
+    const branchKey = getHostedReviewCacheKey(
+      repo.path,
+      candidate.branch,
+      state.settings,
+      repo.id,
+      repo.connectionId,
+      repo.executionHostId,
+      true
+    )
+    const knownProvider =
+      state.hostedReviewCache[branchKey]?.data?.provider ??
+      (state.prCache[candidate.cacheKey]?.data ? 'github' : undefined)
+    const runtimeVersion = getWorkspaceReferenceRuntimeVersion(worktree, repo)
+    for (const item of getWorkspaceAttachments(worktree)) {
+      if (item.type === 'issue') {
+        continue
+      }
+      const request = {
+        ...getWorkspaceReferenceRequest(item, worktree, repo, runtimeVersion),
+        knownProvider
+      }
+      if (!canReadWorkspaceReferenceReview(request, knownProvider)) {
+        continue
+      }
+      const key = request.key
+      if (targets.get(key)?.selected) {
+        continue
+      }
+      const entry = state.hostedReviewCache[key]
+      const review = matchWorkspaceReferenceReview(item, entry?.data) ? entry?.data : null
+      targets.set(key, {
+        key,
+        revision: key,
+        selected,
+        fetchedAt: entry?.fetchedAt ?? null,
+        intervalMs: reviewRefreshIntervalMs({
+          state: review?.state,
+          checksStatus: review?.status,
+          hasReview: review ? true : null,
+          selected
+        }),
+        refresh: (_force, signal) =>
+          withTimeout(
+            readWorkspaceReferenceDetails(
+              { ...request, admissionTier: selected ? 'interactive' : 'background' },
+              signal
+            ).then(
+              (data) =>
+                !signal?.aborted &&
+                data !== null &&
+                !useAppStore.getState().hostedReviewCache[key]?.stale
+            ),
+            30_000,
+            false
+          )
+      })
+    }
+  }
+  return [...targets.values()]
+}
diff --git a/src/renderer/src/components/sidebar/workspace-reference-review-source.ts b/src/renderer/src/components/sidebar/workspace-reference-review-source.ts
new file mode 100644
index 000000000000..423a9c98047a
--- /dev/null
+++ b/src/renderer/src/components/sidebar/workspace-reference-review-source.ts
@@ -0,0 +1,34 @@
+import { getRepoExecutionHostId } from '../../../../shared/execution-host'
+import type { HostedReviewProvider } from '../../../../shared/hosted-review'
+import {
+  canUseWorkspaceReviewForChecks,
+  isWorkspaceRepositoryAttachment
+} from './worktree-attachment-editing'
+import type { WorkspaceReferenceRequest } from './workspace-reference-details'
+
+export function canReadWorkspaceReferenceReview(
+  request: WorkspaceReferenceRequest,
+  knownProvider?: HostedReviewProvider
+): boolean {
+  const { item, sourceContext, repo } = request
+  if (!repo || !canUseWorkspaceReviewForChecks(item, repo, knownProvider)) {
+    return false
+  }
+  if (
+    sourceContext &&
+    (sourceContext.hostId !== getRepoExecutionHostId(repo) ||
+      (sourceContext.repoId && sourceContext.repoId !== repo.id) ||
+      (sourceContext.accountLabel &&
+        (item.provider !== 'github' || sourceContext.accountLabel !== repo.ghAccount?.user)))
+  ) {
+    return false
+  }
+  const identity = sourceContext?.providerIdentity
+  const identityUrl =
+    identity?.provider === 'github'
+      ? `https://${identity.host ?? 'github.com'}/${identity.owner}/${identity.repo}/pull/${item.number}`
+      : identity?.provider === 'gitlab' && identity.webUrl
+        ? `${identity.webUrl}/-/merge_requests/${item.number}`
+        : null
+  return !identityUrl || isWorkspaceRepositoryAttachment({ ...item, url: identityUrl }, repo)
+}
diff --git a/src/renderer/src/components/sidebar/worktree-attachment-editing.test.ts b/src/renderer/src/components/sidebar/worktree-attachment-editing.test.ts
new file mode 100644
index 000000000000..f51b8bb33dfd
--- /dev/null
+++ b/src/renderer/src/components/sidebar/worktree-attachment-editing.test.ts
@@ -0,0 +1,72 @@
+import { describe, expect, it, vi } from 'vitest'
+import type { Repo } from '../../../../shared/repo-types'
+import type { WorkspaceAttachment } from '../../../../shared/worktree/types'
+import {
+  ATTACHMENT_INPUT_KINDS,
+  buildWorkspaceAttachmentEdits,
+  canUseWorkspaceReviewForChecks
+} from './worktree-attachment-editing'
+
+const language = vi.hoisted(() => ({ prefix: '' }))
+vi.mock('@/i18n/i18n', () => ({
+  translate: (_key: string, fallback: string) => language.prefix + fallback
+}))
+
+function repo(host: string): Repo {
+  return {
+    id: 'repo',
+    path: '/repo',
+    displayName: 'Repo',
+    badgeColor: '',
+    addedAt: 0,
+    gitRemoteIdentity: {
+      canonicalKey: `${host}/acme/repo`,
+      remoteName: 'origin',
+      remoteUrl: `https://${host}/acme/repo.git`
+    }
+  }
+}
+const review: WorkspaceAttachment = { provider: 'github', type: 'pr', number: 1 }
+
+describe('workspace attachment editing', () => {
+  it('translates reference type labels when rendered after a language change', () => {
+    expect(ATTACHMENT_INPUT_KINDS[0].label()).toBe('GitHub PR')
+    language.prefix = 'translated: '
+    expect(ATTACHMENT_INPUT_KINDS[0].label()).toBe('translated: GitHub PR')
+    language.prefix = ''
+  })
+  it('requires a compatible provider before a bare review can drive checks', () => {
+    expect(canUseWorkspaceReviewForChecks(review, repo('github.com'))).toBe(true)
+    expect(
+      canUseWorkspaceReviewForChecks(
+        { provider: 'gitlab', type: 'mr', number: 1 },
+        repo('github.com')
+      )
+    ).toBe(false)
+    expect(canUseWorkspaceReviewForChecks(review, repo('git.example.com'))).toBe(false)
+    expect(canUseWorkspaceReviewForChecks(review, repo('git.example.com'), 'github')).toBe(true)
+    expect(canUseWorkspaceReviewForChecks(review, undefined)).toBe(false)
+  })
+
+  it('submits base and draft snapshots without pre-merging concurrent changes', () => {
+    const initial = [{ ...review, title: 'Old' }]
+    const draft = [
+      { ...review, title: 'New', origins: [{ kind: 'observed' as const, tabId: 'tab' }] }
+    ]
+    expect(buildWorkspaceAttachmentEdits({ initial, draft })).toEqual({
+      linkedItemsBase: initial,
+      linkedItems: draft
+    })
+  })
+  it('removes a review through the collection without emitting a scalar selection', () => {
+    const mr: WorkspaceAttachment = { provider: 'gitlab', type: 'mr', number: 2 }
+    const initial = [review, mr]
+    expect(buildWorkspaceAttachmentEdits({ initial, draft: [mr] })).toEqual({
+      linkedItemsBase: initial,
+      linkedItems: [mr]
+    })
+  })
+  it('omits untouched collections', () => {
+    expect(buildWorkspaceAttachmentEdits({ initial: [review], draft: [{ ...review }] })).toEqual({})
+  })
+})
diff --git a/src/renderer/src/components/sidebar/worktree-attachment-editing.ts b/src/renderer/src/components/sidebar/worktree-attachment-editing.ts
new file mode 100644
index 000000000000..f4988487bff6
--- /dev/null
+++ b/src/renderer/src/components/sidebar/worktree-attachment-editing.ts
@@ -0,0 +1,262 @@
+import type { HostedReviewProvider } from '../../../../shared/hosted-review'
+import type { WorkspaceAttachmentMutation } from '../../../../shared/workspace-attachment-mutation'
+import { translate } from '@/i18n/i18n'
+import type { Repo } from '../../../../shared/repo-types'
+import { normalizeGitRemoteUrl } from '../../../../shared/git-remote-identity'
+import type { WorkspaceAttachment, Worktree } from '../../../../shared/worktree/types'
+import type { WorktreeMeta } from '../../../../shared/worktree/meta-types'
+import { getWorkspaceAttachments } from '../../../../shared/workspace-attachments'
+import {
+  getWorkspaceAttachmentKey,
+  getWorkspaceAttachmentUrlScope
+} from '../../../../shared/workspace-attachment-normalization'
+import { parseGitHubIssueOrPRLink } from '../../../../shared/github/links'
+import { parseGitLabIssueOrMRLink } from '../../../../shared/new-workspace/gitlab-links'
+import { parseLinearIssueInput } from '../../../../shared/linear/links'
+import { parseJiraIssueUrl } from '../../../../shared/jira-issue-url'
+import { isWorkItemLinkQueryTooLarge } from '../../../../shared/new-workspace/work-item-link-query-bounds'
+
+export const ATTACHMENT_INPUT_KINDS = [
+  { value: 'github-pr', label: () => translate('workspace.links.kind.github_pr', 'GitHub PR') },
+  {
+    value: 'github-issue',
+    label: () => translate('workspace.links.kind.github_issue', 'GitHub issue')
+  },
+  {
+    value: 'linear-issue',
+    label: () => translate('workspace.links.kind.linear_task', 'Linear task')
+  },
+  { value: 'gitlab-mr', label: () => translate('workspace.links.kind.gitlab_mr', 'GitLab MR') },
+  {
+    value: 'gitlab-issue',
+    label: () => translate('workspace.links.kind.gitlab_issue', 'GitLab issue')
+  },
+  {
+    value: 'jira-issue',
+    label: () => translate('workspace.links.kind.jira_task_url', 'Jira task (URL)')
+  },
+  {
+    value: 'bitbucket-pr',
+    label: () => translate('workspace.links.kind.bitbucket_pr', 'Bitbucket PR')
+  },
+  {
+    value: 'azure-devops-pr',
+    label: () => translate('workspace.links.kind.azure_devops_pr', 'Azure DevOps PR')
+  },
+  { value: 'gitea-pr', label: () => translate('workspace.links.kind.gitea_pr', 'Gitea PR') }
+] as const
+export type AttachmentInputKind = (typeof ATTACHMENT_INPUT_KINDS)[number]['value']
+
+export function isAttachmentInputKind(value: string): value is AttachmentInputKind {
+  return ATTACHMENT_INPUT_KINDS.some((kind) => kind.value === value)
+}
+
+export function workspaceAttachmentProviderLabel(item: WorkspaceAttachment): string {
+  const labels = {
+    github: 'GitHub',
+    gitlab: 'GitLab',
+    linear: 'Linear',
+    jira: 'Jira',
+    bitbucket: 'Bitbucket',
+    'azure-devops': 'Azure DevOps',
+    gitea: 'Gitea'
+  }
+  return labels[item.provider]
+}
+
+export function workspaceAttachmentLabel(item: WorkspaceAttachment): string {
+  if (item.provider === 'linear' || item.provider === 'jira') {
+    return item.identifier ?? item.linearIdentifier ?? item.jiraIdentifier ?? `#${item.number}`
+  }
+  if (item.type === 'mr') {
+    return translate('workspace.links.mrReference', 'MR !{{number}}', { number: item.number })
+  }
+  if (item.type === 'pr') {
+    return translate('workspace.links.prReference', 'PR #{{number}}', { number: item.number })
+  }
+  return translate('workspace.links.issueReference', 'Issue #{{number}}', { number: item.number })
+}
+
+export function parseWorkspaceAttachmentInput(
+  input: string,
+  kind: AttachmentInputKind
+): WorkspaceAttachment | null {
+  const value = input.trim()
+  if (!value || isWorkItemLinkQueryTooLarge(value)) {
+    return null
+  }
+  const github = parseGitHubIssueOrPRLink(value)
+  const gitlab = parseGitLabIssueOrMRLink(value)
+  const jira = parseJiraIssueUrl(value)
+  const linear = parseLinearIssueInput(value)
+  if (/^https?:\/\//i.test(value)) {
+    const otherReview = parseOtherReviewUrl(value)
+    if (otherReview) {
+      return otherReview
+    }
+    if (github) {
+      return { provider: 'github', type: github.type, number: github.number, url: value }
+    }
+    if (gitlab && Number.isSafeInteger(gitlab.number) && gitlab.number > 0) {
+      return { provider: 'gitlab', type: gitlab.type, number: gitlab.number, url: value }
+    }
+    if (jira) {
+      return {
+        provider: 'jira',
+        type: 'issue',
+        number: 0,
+        identifier: jira.issueKey,
+        jiraIdentifier: jira.issueKey,
+        url: value
+      }
+    }
+    if (linear) {
+      return {
+        provider: 'linear',
+        type: 'issue',
+        number: 0,
+        identifier: linear.identifier,
+        linearIdentifier: linear.identifier,
+        url: value,
+        linearOrganizationUrlKey: linear.organizationUrlKey
+      }
+    }
+    return null
+  }
+  if (kind === 'linear-issue') {
+    return linear
+      ? {
+          provider: 'linear',
+          type: 'issue',
+          number: 0,
+          identifier: linear.identifier,
+          linearIdentifier: linear.identifier
+        }
+      : null
+  }
+  if (kind === 'jira-issue') {
+    return null
+  }
+  const number = Number(value.replace(/^[#!]/, ''))
+  if (!/^[#!]?\d+$/.test(value) || !Number.isSafeInteger(number) || number <= 0) {
+    return null
+  }
+  if (kind === 'gitlab-mr' || kind === 'gitlab-issue') {
+    return { provider: 'gitlab', type: kind === 'gitlab-mr' ? 'mr' : 'issue', number }
+  }
+  if (kind === 'bitbucket-pr' || kind === 'azure-devops-pr' || kind === 'gitea-pr') {
+    const provider =
+      kind === 'bitbucket-pr' ? 'bitbucket' : kind === 'gitea-pr' ? 'gitea' : 'azure-devops'
+    return { provider, type: 'pr', number }
+  }
+  return { provider: 'github', type: kind === 'github-pr' ? 'pr' : 'issue', number }
+}
+
+export function buildWorkspaceAttachmentEdits({
+  initial,
+  draft
+}: {
+  initial: readonly WorkspaceAttachment[]
+  draft: readonly WorkspaceAttachment[]
+}): Partial<WorktreeMeta> & WorkspaceAttachmentMutation {
+  return JSON.stringify(initial) === JSON.stringify(draft)
+    ? {}
+    : { linkedItemsBase: [...initial], linkedItems: [...draft] }
+}
+
+export function getActiveWorkspaceReviewKey(worktree: Worktree | undefined): string | null {
+  if (!worktree) {
+    return null
+  }
+  const active = getWorkspaceAttachments(worktree).find((item) =>
+    item.provider === 'github' && item.type === 'pr'
+      ? worktree.linkedPR === item.number
+      : item.provider === 'gitlab' && item.type === 'mr'
+        ? worktree.linkedGitLabMR === item.number
+        : item.provider === 'bitbucket'
+          ? worktree.linkedBitbucketPR === item.number
+          : item.provider === 'azure-devops'
+            ? worktree.linkedAzureDevOpsPR === item.number
+            : item.provider === 'gitea'
+              ? worktree.linkedGiteaPR === item.number
+              : false
+  )
+  return active ? getWorkspaceAttachmentKey(active) : null
+}
+
+function parseOtherReviewUrl(value: string): WorkspaceAttachment | null {
+  let url: URL
+  try {
+    url = new URL(value)
+  } catch {
+    return null
+  }
+  if (url.username || url.password) {
+    return null
+  }
+  const match = /\/(pull-requests|pullrequest|pulls)\/(\d+)\/?$/.exec(url.pathname)
+  if (!match) {
+    return null
+  }
+  const number = Number(match[2])
+  if (!Number.isSafeInteger(number) || number <= 0) {
+    return null
+  }
+  const provider =
+    match[1] === 'pull-requests'
+      ? 'bitbucket'
+      : match[1] === 'pullrequest'
+        ? 'azure-devops'
+        : 'gitea'
+  return { provider, type: 'pr', number, url: value }
+}
+
+export function canUseWorkspaceReviewForChecks(
+  item: WorkspaceAttachment,
+  repo: Repo | undefined,
+  knownProvider?: HostedReviewProvider
+): boolean {
+  if (item.type === 'issue') {
+    return false
+  }
+  const host = repo?.gitRemoteIdentity?.canonicalKey.split('/')[0].toLowerCase()
+  const provider =
+    knownProvider ??
+    (host === 'github.com'
+      ? 'github'
+      : host === 'gitlab.com'
+        ? 'gitlab'
+        : host === 'bitbucket.org'
+          ? 'bitbucket'
+          : host === 'dev.azure.com' ||
+              host === 'ssh.dev.azure.com' ||
+              host?.endsWith('.visualstudio.com')
+            ? 'azure-devops'
+            : host === 'codeberg.org'
+              ? 'gitea'
+              : undefined)
+  if (provider && item.provider !== provider) {
+    return false
+  }
+  return (
+    (!item.url ? provider === item.provider : true) && isWorkspaceRepositoryAttachment(item, repo)
+  )
+}
+
+export function isWorkspaceRepositoryAttachment(
+  item: WorkspaceAttachment,
+  repo: Repo | undefined
+): boolean {
+  if (!item.url) {
+    return true
+  }
+  const remoteKey = repo?.gitRemoteIdentity?.canonicalKey
+  if (!remoteKey) {
+    return false
+  }
+  try {
+    return normalizeGitRemoteUrl(getWorkspaceAttachmentUrlScope(item)) === remoteKey
+  } catch {
+    return false
+  }
+}
diff --git a/src/renderer/src/components/sidebar/worktree-card-compact-agent-row-stopping.test.ts b/src/renderer/src/components/sidebar/worktree-card-compact-agent-row-stopping.test.ts
index ea6227d42285..d92d8445af7a 100644
--- a/src/renderer/src/components/sidebar/worktree-card-compact-agent-row-stopping.test.ts
+++ b/src/renderer/src/components/sidebar/worktree-card-compact-agent-row-stopping.test.ts
@@ -1,6 +1,6 @@
 import { describe, expect, it } from 'vitest'
 import type { AgentStatusEntry } from '../../../../shared/agent-status-types'
-import { makeTab } from '../../store/slices/store-test-helpers'
+import { makeTab } from '../../store/slices/store-session-test-harness'
 import { buildWorktreeAgentRows } from './worktree-agent-rows'
 import { getAgentDotState } from './worktree-card-agent-summary'
 import { getCompactAgentLineOrder } from './worktree-card-compact-agent-line-order'
diff --git a/src/renderer/src/components/sidebar/worktree-card-meta-types.ts b/src/renderer/src/components/sidebar/worktree-card-meta-types.ts
index c35ad3c9fa54..a20f309a2196 100644
--- a/src/renderer/src/components/sidebar/worktree-card-meta-types.ts
+++ b/src/renderer/src/components/sidebar/worktree-card-meta-types.ts
@@ -1,10 +1,13 @@
 import type { IssueInfo } from '../../../../shared/github/pull-request-types'
 import type {
+  Worktree,
+  WorkspaceAttachment,
   AutomationWorkspaceProvenance,
   CliWorkspaceProvenance
 } from '../../../../shared/worktree/types'
 import type { WorktreeCardPrDisplay } from './worktree-card-pr-display'
 import type { WorktreeCardDetailsHoverControl } from './worktree-card-details-hover-state'
+import type { WorkspaceReferenceDetailsMap } from './workspace-reference-details'
 
 export type WorktreeCardIssueDisplay =
   | IssueInfo
@@ -21,6 +24,7 @@ export type WorktreeCardLinearIssueDisplay = {
   title: string
   url?: string
   stateName?: string
+  stateType?: string
   labels?: string[]
 }
 
@@ -31,6 +35,9 @@ export type WorktreeCardJiraIssueDisplay = {
 }
 
 export type WorktreeCardMetaBadgesProps = {
+  referenceItems?: readonly WorkspaceAttachment[]
+  referenceDetails?: WorkspaceReferenceDetailsMap
+  linkedItemCount?: number
   issue: WorktreeCardIssueDisplay | null
   linearIssue: WorktreeCardLinearIssueDisplay | null
   jiraIssue?: WorktreeCardJiraIssueDisplay | null
@@ -44,6 +51,8 @@ export type WorktreeCardMetaBadgesRootProps = WorktreeCardMetaBadgesProps &
   React.HTMLAttributes<HTMLDivElement>
 
 export type WorktreeCardDetailsHoverProps = WorktreeCardMetaBadgesProps & {
+  workspace?: Worktree
+  onManageLinks?: (event: React.MouseEvent) => void
   children: React.ReactElement
   branchName?: string
   workspaceTitle?: string
diff --git a/src/renderer/src/components/sidebar/worktree-card-parent-content.tsx b/src/renderer/src/components/sidebar/worktree-card-parent-content.tsx
index e5aea802b84d..e5d45f60ca79 100644
--- a/src/renderer/src/components/sidebar/worktree-card-parent-content.tsx
+++ b/src/renderer/src/components/sidebar/worktree-card-parent-content.tsx
@@ -1,6 +1,7 @@
 import React from 'react'
 
 import { cn } from '@/lib/utils'
+import { getWorkspaceAttachments } from '../../../../shared/workspace-attachments'
 import { WorktreeCardHeader } from './worktree-card-header'
 import { WorktreeCardMetaRow } from './worktree-card-meta-row'
 import { WorktreeCardDetailsHover } from './WorktreeCardMeta'
@@ -27,10 +28,12 @@ export function WorktreeCardParentContent({
     stopQuickActionPointerPropagation,
     handleToggleUnreadQuick,
     statusLaneReview,
+    reviewChecks,
     branchIdentityDisplay,
     showInlineAgentList,
     titleRenaming,
     isDeleting,
+    referenceDetails,
     hoverIssue,
     hoverLinearIssue,
     hoverJiraIssue,
@@ -42,6 +45,7 @@ export function WorktreeCardParentContent({
     detailsHoverControl,
     handleRenameTitle,
     handleEditIssue,
+    handleManageLinks,
     handleEditComment,
     handleOpenGitHubIssueInOrca,
     handleOpenIssueInBrowser,
@@ -77,6 +81,9 @@ export function WorktreeCardParentContent({
   const identityContentWithHover =
     hasHoverDetails && !titleRenaming ? (
       <WorktreeCardDetailsHover
+        workspace={worktree}
+        referenceDetails={referenceDetails}
+        onManageLinks={affiliateListMode ? undefined : handleManageLinks}
         issue={hoverIssue}
         linearIssue={hoverLinearIssue}
         jiraIssue={hoverJiraIssue}
@@ -147,6 +154,7 @@ export function WorktreeCardParentContent({
             onPointerDown={stopQuickActionPointerPropagation}
             onToggleUnread={handleToggleUnreadQuick}
             prDisplay={statusLaneReview}
+            reviewChecks={reviewChecks.total > 0 ? reviewChecks : undefined}
             newCardStyle={newCardStyle}
             hasBranchIdentity={Boolean(branchIdentityDisplay)}
           />
@@ -158,7 +166,9 @@ export function WorktreeCardParentContent({
         className={cn(
           'flex min-w-0 flex-1 flex-col gap-1.5',
           // Why: inline agent rows intentionally outdent into the card gutter; inner elements handle truncation.
-          showInlineAgentList || (!newCardStyle && lineageChildren)
+          showInlineAgentList ||
+            getWorkspaceAttachments(worktree).length > 1 ||
+            (!newCardStyle && lineageChildren)
             ? 'overflow-visible'
             : 'overflow-hidden'
         )}
diff --git a/src/renderer/src/components/sidebar/worktree-card-presentation.tsx b/src/renderer/src/components/sidebar/worktree-card-presentation.tsx
index 25376e330544..b1c7a3696db0 100644
--- a/src/renderer/src/components/sidebar/worktree-card-presentation.tsx
+++ b/src/renderer/src/components/sidebar/worktree-card-presentation.tsx
@@ -1,4 +1,5 @@
 import React from 'react'
+import { getWorkspaceAttachments } from '../../../../shared/workspace-attachments'
 
 import {
   getFlushWorktreeCardPaddingLeft,
@@ -41,6 +42,11 @@ export function buildWorktreeCardPresentation(card: WorktreeCardController) {
     remoteBranchConflict,
     visibleCardTitle,
     workspacePorts,
+    referenceDetails,
+    showPR,
+    showIssue,
+    showLinearIssue,
+    showJiraIssue,
     metaIssue,
     metaLinearIssue,
     metaJiraIssue,
@@ -55,6 +61,7 @@ export function buildWorktreeCardPresentation(card: WorktreeCardController) {
     hoverComment,
     linearIssue,
     handleEditIssue,
+    handleManageLinks,
     handleEditComment,
     handleOpenGitHubIssueInOrca,
     handleOpenIssueInBrowser,
@@ -128,68 +135,23 @@ export function buildWorktreeCardPresentation(card: WorktreeCardController) {
       : undefined
   const hasHoverIdentity = Boolean(hoverWorkspaceTitle || hoverBranchName)
   const hasHoverDetails =
-    newCardStyle &&
-    (hasWorktreeCardDetails({
-      issue: hoverIssue,
-      linearIssue: hoverLinearIssue,
-      jiraIssue: hoverJiraIssue,
-      review: hoverReview,
-      comment: hoverComment,
-      automationProvenance: metaAutomationProvenance,
-      cliProvenance: metaCliProvenance
-    }) ||
+    (newCardStyle || compactCards) &&
+    (getWorkspaceAttachments(worktree).length > 0 ||
+      hasWorktreeCardDetails({
+        issue: hoverIssue,
+        linearIssue: hoverLinearIssue,
+        jiraIssue: hoverJiraIssue,
+        review: hoverReview,
+        comment: hoverComment,
+        automationProvenance: metaAutomationProvenance,
+        cliProvenance: metaCliProvenance
+      }) ||
       workspacePorts.length > 0 ||
       hasHoverIdentity)
   // Why: the parent row owns metadata hover; don't stack the title's truncation tooltip on the details popover.
-  const titleWrapper = newCardStyle
-    ? hasHoverDetails
-      ? (title: React.ReactElement): React.ReactElement => title
-      : undefined
-    : compactCards && (showBranchIdentityHover || hasDetails || hasPorts)
-      ? (title: React.ReactElement): React.ReactElement => (
-          <WorktreeCardDetailsHover
-            issue={metaIssue}
-            linearIssue={metaLinearIssue}
-            jiraIssue={metaJiraIssue}
-            review={metaReview}
-            comment={metaComment}
-            automationProvenance={metaAutomationProvenance}
-            cliProvenance={metaCliProvenance}
-            branchName={showBranchIdentityHover ? branch : undefined}
-            workspaceTitle={worktree.displayName}
-            identityOrder="branch-first"
-            detailsAfter={hasPorts ? <WorktreeCardPortsDetails ports={workspacePorts} /> : null}
-            openDelay={100}
-            // Why: compact mode also renders the plug/badge hover root; sharing one open-state made hovering the
-            // plug force-open the wider title card and race it closed (#9304), so let this title hover own its state.
-            onEditIssue={affiliateListMode ? undefined : handleEditIssue}
-            onEditComment={affiliateListMode ? undefined : handleEditComment}
-            onOpenGitHubIssueInOrca={
-              metaIssue && 'url' in metaIssue && metaIssue.url
-                ? handleOpenGitHubIssueInOrca
-                : undefined
-            }
-            onOpenIssueInBrowser={
-              metaIssue && 'url' in metaIssue && metaIssue.url
-                ? handleOpenIssueInBrowser
-                : undefined
-            }
-            onOpenLinearIssueInOrca={linearIssue?.url ? handleOpenLinearIssueInOrca : undefined}
-            onOpenReviewInOrca={
-              metaReview?.url && metaReview.provider === 'github'
-                ? handleOpenReviewInOrca
-                : undefined
-            }
-            onOpenReviewInBrowser={metaReview?.url ? handleOpenReviewInBrowser : undefined}
-            onOpenAutomation={affiliateListMode ? undefined : handleOpenAutomation}
-            onOpenAutomationRun={affiliateListMode ? undefined : handleOpenAutomationRun}
-            // Why: compact mode hides the metadata badge row, so title hover carries the review affordance.
-            onUnlinkReview={!affiliateListMode && canUnlinkReview ? handleUnlinkReview : undefined}
-          >
-            {title}
-          </WorktreeCardDetailsHover>
-        )
-      : undefined
+  const titleWrapper = hasHoverDetails
+    ? (title: React.ReactElement): React.ReactElement => title
+    : undefined
   // Why: sidebar rows need a small surface inset while content stays aligned with the pre-inset layout.
   const applyNewCardStyleStatusLaneOffset = newCardStyle && showCombinedStatusSlot
   const cardPaddingLeft = flushSurface
@@ -202,12 +164,27 @@ export function buildWorktreeCardPresentation(card: WorktreeCardController) {
       ? getNewCardStyleParentContentMarginLeft(contentIndent)
       : 0
   const cardStyle = cardPaddingLeft ? { paddingLeft: cardPaddingLeft } : undefined
+  const allReferenceItems = getWorkspaceAttachments(worktree)
+  const referenceItems = allReferenceItems.filter((item) =>
+    item.type !== 'issue'
+      ? showPR &&
+        (!newCardStyle ||
+          allReferenceItems.filter((candidate) => candidate.type !== 'issue').length > 1)
+      : item.provider === 'linear'
+        ? showLinearIssue
+        : item.provider === 'jira'
+          ? showJiraIssue
+          : showIssue
+  )
   const detailsAndPortsContent =
     hasDetails || hasPorts ? (
       <div className="flex shrink-0 items-center gap-1">
         {hasPorts && <WorktreeCardPortsTrigger ports={workspacePorts} />}
         {hasDetails && (
           <WorktreeCardMetaBadges
+            linkedItemCount={allReferenceItems.length}
+            referenceItems={referenceItems}
+            referenceDetails={referenceDetails}
             issue={metaIssue}
             linearIssue={metaLinearIssue}
             jiraIssue={metaJiraIssue}
@@ -221,8 +198,11 @@ export function buildWorktreeCardPresentation(card: WorktreeCardController) {
       </div>
     ) : null
   const detailsAndPorts =
-    detailsAndPortsContent && !newCardStyle ? (
+    detailsAndPortsContent && !newCardStyle && !compactCards ? (
       <WorktreeCardDetailsHover
+        workspace={worktree}
+        referenceDetails={referenceDetails}
+        onManageLinks={affiliateListMode ? undefined : handleManageLinks}
         issue={metaIssue}
         linearIssue={metaLinearIssue}
         jiraIssue={metaJiraIssue}
diff --git a/src/renderer/src/components/sidebar/worktree-delete-host-qualification.test.ts b/src/renderer/src/components/sidebar/worktree-delete-host-qualification.test.ts
index 99ec86874076..00cfddee685d 100644
--- a/src/renderer/src/components/sidebar/worktree-delete-host-qualification.test.ts
+++ b/src/renderer/src/components/sidebar/worktree-delete-host-qualification.test.ts
@@ -23,7 +23,7 @@ import type { AppState } from '@/store/types'
 import type { Worktree } from '../../../../shared/worktree/types'
 import type { ExecutionHostId } from '../../../../shared/execution-host'
 import { makeWorktree } from '@/store/slices/worktrees-slice-test-fixtures'
-import { makeTab } from '@/store/slices/store-test-helpers'
+import { makeTab } from '../../store/slices/store-session-test-harness'
 import {
   createTestStore,
   mockApi,
diff --git a/src/renderer/src/components/sidebar/worktree-issue-displacement.ts b/src/renderer/src/components/sidebar/worktree-issue-displacement.ts
deleted file mode 100644
index bfc74e7162e4..000000000000
--- a/src/renderer/src/components/sidebar/worktree-issue-displacement.ts
+++ /dev/null
@@ -1,48 +0,0 @@
-import { translate } from '@/i18n/i18n'
-import type { IssueLinkProvider } from '../../../../shared/issue-link-input'
-import {
-  isIssueFieldDirty,
-  type WorktreeMetaDraft,
-  type WorktreeMetaSnapshot
-} from './worktree-meta-updates'
-
-function formatLinkLabel(provider: IssueLinkProvider, value: string): string {
-  return provider === 'linear'
-    ? translate(
-        'auto.components.sidebar.worktreeIssueDisplacement.3f61c0a8d2',
-        'Linear {{value}}',
-        { value }
-      )
-    : translate(
-        'auto.components.sidebar.worktreeIssueDisplacement.9c4b7e1f60',
-        'GitHub #{{value}}',
-        { value }
-      )
-}
-
-/** Names the persisted links a save would drop. A workspace tracks one issue, so
- *  a changed field displaces the other provider's slot and clearing drops both.
- *  Only a dirty field displaces anything — the dialog opens focused on Comment,
- *  and an untouched row must leave every link alone. */
-export function getDisplacedLinkLabels(args: {
-  draft: WorktreeMetaDraft
-  snapshot: WorktreeMetaSnapshot
-  isFolderWorkspace: boolean
-  linkedIssue: number | null
-  linkedLinearIssue: string | null
-}): string[] | null {
-  const { draft, snapshot, isFolderWorkspace, linkedIssue, linkedLinearIssue } = args
-  if (isFolderWorkspace || !isIssueFieldDirty(draft, snapshot)) {
-    return null
-  }
-
-  const keeping = draft.issueInput.trim() === '' ? null : draft.issueProvider
-  const displaced: string[] = []
-  if (keeping !== 'linear' && linkedLinearIssue) {
-    displaced.push(formatLinkLabel('linear', linkedLinearIssue))
-  }
-  if (keeping !== 'github' && typeof linkedIssue === 'number') {
-    displaced.push(formatLinkLabel('github', String(linkedIssue)))
-  }
-  return displaced.length > 0 ? displaced : null
-}
diff --git a/src/renderer/src/components/sidebar/worktree-lineage-projection.ts b/src/renderer/src/components/sidebar/worktree-lineage-projection.ts
index 5c14a2fedad5..aec5bec4e085 100644
--- a/src/renderer/src/components/sidebar/worktree-lineage-projection.ts
+++ b/src/renderer/src/components/sidebar/worktree-lineage-projection.ts
@@ -3,6 +3,10 @@ import {
   isValidResolvedWorktreeLineageEdge
 } from '../../../../shared/resolved-worktree-lineage'
 import type { ExecutionHostId } from '../../../../shared/execution-host'
+import {
+  composeWorktreeHostIdentity,
+  getWorktreeHostIdentity
+} from '../../../../shared/worktree/host-qualified-identity'
 import type { WorktreeLineage } from '../../../../shared/worktree/lineage-types'
 import type { Worktree } from '../../../../shared/worktree/types'
 
@@ -173,3 +177,49 @@ export function getWorktreeLineageAncestors(
   }
   return ancestors
 }
+
+/**
+ * The row a worktree nests under in the sidebar: its lineage parent on the worktree's own host,
+ * where a row with no host id (older metadata) nests only under a parent with none either.
+ */
+export function getSidebarLineageParent(
+  worktree: Worktree,
+  lineageById: Readonly<Record<string, WorktreeLineage>>,
+  rowsByHostIdentity: ReadonlyMap<string, Worktree>
+): Worktree | undefined {
+  const projected = getProjectedWorktreeLineage(worktree, lineageById)
+  // oxlint-disable-next-line typescript/consistent-type-assertions -- SAFETY: resolved rows may carry an inline lineage the Worktree type omits; it is only read, never trusted over a matching projection.
+  const inline = (worktree as WorktreeWithResolvedLineage).lineage
+  const lineage = projected?.worktreeInstanceId === worktree.instanceId ? projected : inline
+  if (!lineage) {
+    return undefined
+  }
+  const parent = rowsByHostIdentity.get(
+    composeWorktreeHostIdentity(worktree.hostId, lineage.parentWorktreeId)
+  )
+  return parent && isValidResolvedWorktreeLineageEdge(worktree, parent, lineage)
+    ? parent
+    : undefined
+}
+
+/** The rows a worktree nests under in the sidebar, nearest first; a lineage cycle nests nothing. */
+export function getSidebarLineageAncestors(
+  worktree: Worktree,
+  lineageById: Readonly<Record<string, WorktreeLineage>>,
+  rowsByHostIdentity: ReadonlyMap<string, Worktree>,
+  cyclicLineageIds: ReadonlySet<string>
+): Worktree[] {
+  const ancestors: Worktree[] = []
+  const seen = new Set([getWorktreeHostIdentity(worktree)])
+  let current = worktree
+  while (!cyclicLineageIds.has(current.id)) {
+    const parent = getSidebarLineageParent(current, lineageById, rowsByHostIdentity)
+    if (!parent || seen.has(getWorktreeHostIdentity(parent))) {
+      break
+    }
+    seen.add(getWorktreeHostIdentity(parent))
+    ancestors.push(parent)
+    current = parent
+  }
+  return ancestors
+}
diff --git a/src/renderer/src/components/sidebar/worktree-list/grouping/row-builders.ts b/src/renderer/src/components/sidebar/worktree-list/grouping/row-builders.ts
index e62d0f9ec705..231419088d9e 100644
--- a/src/renderer/src/components/sidebar/worktree-list/grouping/row-builders.ts
+++ b/src/renderer/src/components/sidebar/worktree-list/grouping/row-builders.ts
@@ -2,8 +2,7 @@ import type { Repo } from '../../../../../../shared/repo-types'
 import type { WorktreeLineage } from '../../../../../../shared/worktree/lineage-types'
 import type { Worktree } from '../../../../../../shared/worktree/types'
 import { getWorktreeHostIdentity } from '../../../../../../shared/worktree/host-qualified-identity'
-import { isValidResolvedWorktreeLineageEdge } from '../../../../../../shared/resolved-worktree-lineage'
-import { getProjectedWorktreeLineage } from '../../worktree-lineage-projection'
+import { getSidebarLineageParent } from '../../worktree-lineage-projection'
 import { getWorktreeLineageGroupKey } from './group-keys'
 import type { NoticeHostContext } from './host-labels'
 import type { RenderableFolderWorkspace } from './folder-workspace-lanes'
@@ -149,23 +148,13 @@ export function appendWorktreeRows(
   const childrenByParentIdentity = new Map<string, Worktree[]>()
   const childIdentities = new Set<string>()
   for (const worktree of worktrees) {
-    const projectedLineage = getProjectedWorktreeLineage(worktree, lineageById)
-    const inlineLineage = (worktree as Worktree & { lineage?: WorktreeLineage | null }).lineage
-    const lineage =
-      projectedLineage?.worktreeInstanceId === worktree.instanceId
-        ? projectedLineage
-        : inlineLineage
-    if (!lineage || cyclicLineageIds.has(worktree.id)) {
-      continue
-    }
-    const parentIdentity = getWorktreeHostIdentity({
-      id: lineage.parentWorktreeId,
-      hostId: worktree.hostId
-    })
-    const parent = visibleByIdentity.get(parentIdentity)
-    if (!parent || !isValidResolvedWorktreeLineageEdge(worktree, parent, lineage)) {
+    const parent = cyclicLineageIds.has(worktree.id)
+      ? undefined
+      : getSidebarLineageParent(worktree, lineageById, visibleByIdentity)
+    if (!parent) {
       continue
     }
+    const parentIdentity = getWorktreeHostIdentity(parent)
     const childIdentity = getWorktreeHostIdentity(worktree)
     childIdentities.add(childIdentity)
     const children = childrenByParentIdentity.get(parentIdentity) ?? []
diff --git a/src/renderer/src/components/sidebar/worktree-meta-dialog-owner.ts b/src/renderer/src/components/sidebar/worktree-meta-dialog-owner.ts
new file mode 100644
index 000000000000..b1e47898710f
--- /dev/null
+++ b/src/renderer/src/components/sidebar/worktree-meta-dialog-owner.ts
@@ -0,0 +1,16 @@
+import { parseExecutionHostId } from '../../../../shared/execution-host'
+
+export function getWorktreeMetaDialogOwner(state: {
+  activeModal: string
+  modalData: Record<string, unknown>
+}): string | null {
+  if (state.activeModal !== 'edit-meta') {
+    return null
+  }
+  const { worktreeId, repoId, executionHostId } = state.modalData
+  return JSON.stringify([
+    typeof worktreeId === 'string' ? worktreeId : '',
+    typeof repoId === 'string' ? repoId : null,
+    typeof executionHostId === 'string' ? (parseExecutionHostId(executionHostId)?.id ?? null) : null
+  ])
+}
diff --git a/src/renderer/src/components/sidebar/worktree-meta-updates.test.ts b/src/renderer/src/components/sidebar/worktree-meta-updates.test.ts
deleted file mode 100644
index 654724b89673..000000000000
--- a/src/renderer/src/components/sidebar/worktree-meta-updates.test.ts
+++ /dev/null
@@ -1,399 +0,0 @@
-import { describe, expect, it } from 'vitest'
-import type { WorktreeMeta } from '../../../../shared/worktree/meta-types'
-import {
-  buildWorktreeMetaUpdates,
-  parseGitLabMergeRequestNumberForMetaField,
-  type WorktreeMetaDraft,
-  type WorktreeMetaLiveLinks,
-  type WorktreeMetaSnapshot,
-  type WorktreeReviewProvider
-} from './worktree-meta-updates'
-
-function makeDraft(overrides: Partial<WorktreeMetaDraft> = {}): WorktreeMetaDraft {
-  return {
-    displayNameInput: 'Workspace',
-    issueInput: '',
-    issueProvider: 'github',
-    reviewInput: '',
-    commentInput: '',
-    ...overrides
-  }
-}
-
-function makeSnapshot(overrides: Partial<WorktreeMetaSnapshot> = {}): WorktreeMetaSnapshot {
-  return {
-    displayName: 'Workspace',
-    comment: '',
-    issueInput: '',
-    issueProvider: 'github',
-    prInput: '',
-    ...overrides
-  }
-}
-
-/** Persistence raw-spreads updates, so a present-but-undefined key erases the
- *  stored value — the invariant is asserted on every build in this suite. */
-function buildUpdates(
-  draft: Partial<WorktreeMetaDraft>,
-  snapshot: Partial<WorktreeMetaSnapshot> = {},
-  live: WorktreeMetaLiveLinks = {},
-  reviewProvider: WorktreeReviewProvider = 'github'
-): Partial<WorktreeMeta> {
-  const updates = buildWorktreeMetaUpdates(
-    makeDraft(draft),
-    makeSnapshot(snapshot),
-    live,
-    reviewProvider
-  )
-  const undefinedKeys = Object.keys(updates).filter(
-    (key) => updates[key as keyof WorktreeMeta] === undefined
-  )
-  expect(undefinedKeys).toEqual([])
-  return updates
-}
-
-const LINEAR_LINK_KEYS = [
-  'linkedLinearIssue',
-  'linkedLinearIssueWorkspaceId',
-  'linkedLinearIssueOrganizationUrlKey'
-] as const
-
-describe('buildWorktreeMetaUpdates', () => {
-  it('writes only the GitLab MR slot in GitLab mode', () => {
-    expect(buildUpdates({ reviewInput: '!42' }, {}, {}, 'gitlab')).toEqual({
-      linkedGitLabMR: 42
-    })
-    expect(buildUpdates({ reviewInput: '' }, {}, {}, 'gitlab')).toEqual({ linkedGitLabMR: null })
-  })
-
-  it('accepts only positive MR references for the GitLab review row', () => {
-    expect(parseGitLabMergeRequestNumberForMetaField('42')).toBe(42)
-    expect(parseGitLabMergeRequestNumberForMetaField('!42')).toBe(42)
-    expect(
-      parseGitLabMergeRequestNumberForMetaField(
-        'https://gitlab.example.com/group/project/-/merge_requests/42'
-      )
-    ).toBe(42)
-    for (const invalid of [
-      '#42',
-      '0',
-      '!0',
-      '9007199254740992',
-      'https://gitlab.example.com/group/project/-/issues/42',
-      'https://gitlab.example.com/group/project/-/work_items/42',
-      'ftp://gitlab.example.com/group/project/-/merge_requests/42'
-    ]) {
-      expect(parseGitLabMergeRequestNumberForMetaField(invalid)).toBeNull()
-    }
-  })
-  // The dialog opens focused on Comment, so this is the common save path; a
-  // regression here silently destroys the user's existing link.
-  it('emits no link keys when the issue field is untouched', () => {
-    const updates = buildUpdates(
-      { issueInput: 'STA-335', issueProvider: 'linear', commentInput: 'shipping today' },
-      { issueInput: 'STA-335', issueProvider: 'linear' }
-    )
-
-    expect(updates.comment).toBe('shipping today')
-    expect(updates).not.toHaveProperty('linkedPR')
-    expect(updates).not.toHaveProperty('linkedIssue')
-    for (const key of LINEAR_LINK_KEYS) {
-      expect(updates).not.toHaveProperty(key)
-    }
-  })
-
-  it('writes a GitHub issue number and clears the Linear slots', () => {
-    expect(buildUpdates({ issueInput: '12' }, {}, { linkedLinearIssue: 'STA-335' })).toEqual({
-      linkedIssue: 12,
-      linkedLinearIssue: null,
-      linkedLinearIssueWorkspaceId: null,
-      linkedLinearIssueOrganizationUrlKey: null
-    })
-  })
-
-  // Persistence gates the remote Linear capability on key presence, so a clear
-  // for a link that never existed fails a GitHub-only save on an older runtime.
-  it('emits no Linear clear when the workspace holds no Linear link', () => {
-    const updates = buildUpdates({ issueInput: '12' })
-
-    expect(updates).toEqual({ linkedIssue: 12 })
-    for (const key of LINEAR_LINK_KEYS) {
-      expect(updates).not.toHaveProperty(key)
-    }
-  })
-
-  it('writes a bare Linear identifier and clears the stored organization key', () => {
-    expect(buildUpdates({ issueInput: 'sta-335', issueProvider: 'linear' })).toEqual({
-      linkedIssue: null,
-      linkedLinearIssue: 'STA-335',
-      linkedLinearIssueWorkspaceId: null,
-      linkedLinearIssueOrganizationUrlKey: null
-    })
-  })
-
-  it('clears every provider slot when the issue field is emptied', () => {
-    expect(
-      buildUpdates(
-        { issueInput: '  ' },
-        { issueInput: '42' },
-        { linkedIssue: 42, linkedLinearIssue: 'STA-335' }
-      )
-    ).toEqual({
-      linkedIssue: null,
-      linkedLinearIssue: null,
-      linkedLinearIssueWorkspaceId: null,
-      linkedLinearIssueOrganizationUrlKey: null
-    })
-  })
-
-  it('treats a provider switch with unchanged text as dirty', () => {
-    const updates = buildUpdates(
-      { issueInput: 'STA-335', issueProvider: 'linear' },
-      { issueInput: 'STA-335', issueProvider: 'github' }
-    )
-
-    expect(updates.linkedLinearIssue).toBe('STA-335')
-    expect(updates.linkedIssue).toBeNull()
-  })
-
-  it('displaces a Linear linked work item when the issue field changes', () => {
-    const updates = buildUpdates(
-      { issueInput: '12' },
-      {},
-      {
-        linkedLinearIssue: 'STA-335',
-        linkedWorkItemProvider: 'linear',
-        linkedWorkItemType: 'issue'
-      }
-    )
-
-    expect(updates).toHaveProperty('linkedWorkItem', null)
-    expect(updates).toHaveProperty('linkedTaskSourceContext', null)
-  })
-
-  // linkedWorkItem also records the PR or MR a workspace was created from, which
-  // the Issue row does not own and must not drop.
-  it('leaves a PR-typed work item alone', () => {
-    const updates = buildUpdates(
-      { issueInput: '12' },
-      {},
-      { linkedWorkItemProvider: 'github', linkedWorkItemType: 'pr' }
-    )
-
-    expect(updates).not.toHaveProperty('linkedWorkItem')
-    expect(updates).not.toHaveProperty('linkedTaskSourceContext')
-  })
-
-  // The row cannot render a GitLab or Jira issue, so clearing one would destroy a
-  // link the user was never shown — and neither has another editor to restore it.
-  it('leaves work items owned by other providers alone', () => {
-    for (const provider of ['jira', 'gitlab'] as const) {
-      const updates = buildUpdates(
-        { issueInput: '12' },
-        {},
-        { linkedWorkItemProvider: provider, linkedWorkItemType: 'issue' }
-      )
-
-      expect(updates).not.toHaveProperty('linkedWorkItem')
-      expect(updates).not.toHaveProperty('linkedTaskSourceContext')
-    }
-  })
-
-  // Only the spelling changed, so the field names the same issue it already
-  // holds — treating that as an edit would clear the title and source context.
-  it('emits nothing when a GitHub number is respelled with a hash', () => {
-    const updates = buildUpdates(
-      { issueInput: '#42' },
-      { issueInput: '42' },
-      { linkedIssue: 42, linkedWorkItemProvider: 'github', linkedWorkItemType: 'issue' }
-    )
-
-    expect(updates).toEqual({})
-  })
-
-  it('emits nothing when a Linear identifier is respelled in lower case', () => {
-    const updates = buildUpdates(
-      { issueInput: 'sta-335', issueProvider: 'linear' },
-      { issueInput: 'STA-335', issueProvider: 'linear' },
-      { linkedLinearIssue: 'STA-335' }
-    )
-
-    expect(updates).toEqual({})
-  })
-
-  it('emits nothing when a Linear identifier is respelled as its stored URL', () => {
-    const updates = buildUpdates(
-      { issueInput: 'https://linear.app/acme/issue/STA-335/fix-auth', issueProvider: 'linear' },
-      {
-        issueInput: 'STA-335',
-        issueProvider: 'linear',
-        linkedLinearIssueOrganizationUrlKey: 'acme'
-      },
-      { linkedLinearIssue: 'STA-335' }
-    )
-
-    expect(updates).toEqual({})
-  })
-
-  // The URL adds the org key the stored link lacked, which is worth persisting —
-  // but it still names the same issue, so its title and routing context stay.
-  it('records an organization key for a stored bare identifier without displacing it', () => {
-    const updates = buildUpdates(
-      { issueInput: 'https://linear.app/acme/issue/STA-335', issueProvider: 'linear' },
-      { issueInput: 'STA-335', issueProvider: 'linear' },
-      {
-        linkedLinearIssue: 'STA-335',
-        linkedWorkItemProvider: 'linear',
-        linkedWorkItemType: 'issue'
-      }
-    )
-
-    expect(updates.linkedLinearIssueOrganizationUrlKey).toBe('acme')
-    expect(updates).not.toHaveProperty('linkedWorkItem')
-    expect(updates).not.toHaveProperty('linkedTaskSourceContext')
-  })
-
-  // Same identifier, different organization: a team-prefix collision across two
-  // Linear workspaces is a different issue, so the stale title has to go.
-  it('displaces the work item when a URL names another organization', () => {
-    const updates = buildUpdates(
-      { issueInput: 'https://linear.app/other/issue/STA-335', issueProvider: 'linear' },
-      {
-        issueInput: 'STA-335',
-        issueProvider: 'linear',
-        linkedLinearIssueOrganizationUrlKey: 'acme'
-      },
-      {
-        linkedLinearIssue: 'STA-335',
-        linkedLinearIssueOrganizationUrlKey: 'acme',
-        linkedWorkItemProvider: 'linear',
-        linkedWorkItemType: 'issue'
-      }
-    )
-
-    expect(updates.linkedLinearIssueOrganizationUrlKey).toBe('other')
-    expect(updates).toHaveProperty('linkedWorkItem', null)
-    expect(updates).toHaveProperty('linkedTaskSourceContext', null)
-  })
-
-  // A CLI or background write can land while the dialog is open. Displacement
-  // reads live state, so the save cannot leave both provider slots populated.
-  it('clears a Linear link added after the snapshot was taken', () => {
-    const updates = buildUpdates({ issueInput: '12' }, {}, { linkedLinearIssue: 'STA-999' })
-
-    expect(updates.linkedIssue).toBe(12)
-    expect(updates.linkedLinearIssue).toBeNull()
-  })
-
-  it('clears a Linear link added after the snapshot when the field is emptied', () => {
-    const updates = buildUpdates(
-      { issueInput: '' },
-      { issueInput: '42' },
-      { linkedLinearIssue: 'STA-999' }
-    )
-
-    expect(updates.linkedIssue).toBeNull()
-    expect(updates.linkedLinearIssue).toBeNull()
-  })
-
-  it('ignores a provider switch on an empty field', () => {
-    const updates = buildUpdates(
-      { issueInput: '', issueProvider: 'linear' },
-      { issueInput: '', issueProvider: 'github' }
-    )
-
-    expect(updates).not.toHaveProperty('linkedIssue')
-    for (const key of LINEAR_LINK_KEYS) {
-      expect(updates).not.toHaveProperty(key)
-    }
-  })
-
-  it('does not displace a Linear work item when the issue field is clean', () => {
-    const updates = buildUpdates({ commentInput: 'note' }, {}, { linkedWorkItemProvider: 'linear' })
-
-    expect(updates).not.toHaveProperty('linkedWorkItem')
-    expect(updates).not.toHaveProperty('linkedTaskSourceContext')
-  })
-
-  it('leaves links untouched for unparseable issue input', () => {
-    const updates = buildUpdates(
-      { issueInput: 'not an issue', displayNameInput: 'Renamed', commentInput: 'note' },
-      { displayName: 'Workspace' }
-    )
-
-    expect(updates).toEqual({
-      comment: 'note',
-      displayName: 'Renamed'
-    })
-  })
-
-  it('clears a display name with empty string, never a present-undefined key', () => {
-    const updates = buildUpdates({ displayNameInput: '   ' }, { displayName: 'Custom Name' })
-
-    expect(updates.displayName).toBe('')
-  })
-
-  it('rejects issue URLs in the PR input', () => {
-    expect(buildUpdates({ reviewInput: 'https://github.com/stablyai/orca/issues/6933' })).toEqual(
-      {}
-    )
-  })
-
-  it('accepts PR URLs in the PR input', () => {
-    expect(buildUpdates({ reviewInput: 'https://github.com/stablyai/orca/pull/6934' })).toEqual({
-      linkedPR: 6934
-    })
-  })
-
-  it('records suppression when the user clears an explicit PR link', () => {
-    expect(buildUpdates({ reviewInput: '' }, { prInput: '6934' }, { linkedPR: 6934 })).toEqual({
-      linkedPR: null,
-      suppressedGitHubPR: 6934
-    })
-  })
-
-  it('does not invent suppression for an already-unlinked PR field', () => {
-    expect(buildUpdates({ reviewInput: '' }, {}, { linkedPR: null })).toEqual({})
-  })
-
-  it('does not suppress a PR linked in the background when the PR field is untouched', () => {
-    expect(buildUpdates({ commentInput: 'note' }, {}, { linkedPR: 6934 })).toEqual({
-      comment: 'note'
-    })
-  })
-
-  it('accepts issue URLs in the issue input', () => {
-    expect(
-      buildUpdates(
-        { issueInput: 'https://github.com/stablyai/orca/issues/6933' },
-        {},
-        { linkedLinearIssue: 'STA-335' }
-      )
-    ).toEqual({
-      linkedIssue: 6933,
-      linkedLinearIssue: null,
-      linkedLinearIssueWorkspaceId: null,
-      linkedLinearIssueOrganizationUrlKey: null
-    })
-  })
-
-  it('rejects PR URLs in the issue input', () => {
-    expect(buildUpdates({ issueInput: 'https://github.com/stablyai/orca/pull/6934' })).toEqual({})
-  })
-
-  // Persistence stamps lastActivityAt on any comment write, so re-emitting an
-  // unchanged note reorders the workspace under the time-decay sidebar sort.
-  it('emits no comment when the note is unchanged', () => {
-    const updates = buildUpdates(
-      { issueInput: '12', commentInput: 'shipping today' },
-      { comment: 'shipping today' }
-    )
-
-    expect(updates).not.toHaveProperty('comment')
-    expect(updates.linkedIssue).toBe(12)
-  })
-
-  it('clears a comment with empty string, never a present-undefined key', () => {
-    expect(buildUpdates({ commentInput: '  ' }, { comment: 'old note' }).comment).toBe('')
-  })
-})
diff --git a/src/renderer/src/components/sidebar/worktree-meta-updates.ts b/src/renderer/src/components/sidebar/worktree-meta-updates.ts
deleted file mode 100644
index f12bb38e0a70..000000000000
--- a/src/renderer/src/components/sidebar/worktree-meta-updates.ts
+++ /dev/null
@@ -1,309 +0,0 @@
-import { parseGitHubIssueOrPRLink, parseGitHubIssueOrPRNumber } from '@/lib/github-links'
-import {
-  buildLinearIssueLinkUpdates,
-  LINEAR_ISSUE_LINK_CLEARED
-} from '../../../../shared/linear/links'
-import { parseIssueLinkInput, type IssueLinkProvider } from '../../../../shared/issue-link-input'
-import type { WorkspaceSourceProvider } from '../../../../shared/new-workspace/workspace-source'
-import type { WorktreeMeta } from '../../../../shared/worktree/meta-types'
-import type { WorkspaceLinkedItem } from '../../../../shared/worktree/types'
-import { parseGitLabIssueOrMRLink } from '../../../../shared/new-workspace/gitlab-links'
-
-export type WorktreeReviewProvider = 'github' | 'gitlab'
-
-export type WorktreeMetaSavedPayload = {
-  worktreeId: string
-  updates: Partial<WorktreeMeta>
-}
-
-/** What the user currently has typed in the dialog. */
-export type WorktreeMetaDraft = {
-  displayNameInput: string
-  issueInput: string
-  issueProvider: IssueLinkProvider
-  reviewInput: string
-  commentInput: string
-}
-
-/** The persisted state the dialog was seeded from. Captured once when the
- *  dialog opens: comparing a frozen draft against a live store would let a
- *  background write move the baseline and make an untouched field "dirty". */
-export type WorktreeMetaSnapshot = {
-  displayName: string
-  comment: string
-  issueInput: string
-  issueProvider: IssueLinkProvider
-  prInput: string
-  /** Stands in for an org key the typed value omits, so re-saving a stored bare
-   *  identifier does not read as a change. */
-  linkedLinearIssueOrganizationUrlKey?: string | null
-}
-
-/** The link state as it stands now, read at save time rather than at open.
- *  Displacement is decided against this: a CLI or background write that landed
- *  while the dialog was open must not survive a save the dialog warned would
- *  displace it, and a clear must not be emitted for a slot that is already empty
- *  — persistence gates the remote Linear capability on key presence, not value. */
-export type WorktreeMetaLiveLinks = {
-  linkedPR?: number | null
-  linkedIssue?: number | null
-  linkedLinearIssue?: string | null
-  linkedLinearIssueOrganizationUrlKey?: string | null
-  linkedWorkItemProvider?: WorkspaceSourceProvider | null
-  /** `linkedWorkItem` also describes PRs and MRs, which this row does not own. */
-  linkedWorkItemType?: WorkspaceLinkedItem['type'] | null
-}
-
-export function parseExplicitGitHubIssueUrl(input: string): string | null {
-  const trimmed = input.trim()
-  const link = parseGitHubIssueOrPRLink(trimmed)
-  if (!link || link.type !== 'issue') {
-    return null
-  }
-
-  return trimmed
-}
-
-export function parseGitHubWorkItemNumberForMetaField(
-  input: string,
-  expectedType: 'issue' | 'pr'
-): number | null {
-  const link = parseGitHubIssueOrPRLink(input)
-  if (link) {
-    // Why: issue and PR numbers live in separate GitHub namespaces for refs;
-    // a URL path mismatch must not silently link the other field.
-    return link.type === expectedType ? link.number : null
-  }
-
-  return parseGitHubIssueOrPRNumber(input)
-}
-
-export function parseGitLabMergeRequestNumberForMetaField(input: string): number | null {
-  const trimmed = input.trim()
-  const direct = trimmed.startsWith('!') ? trimmed.slice(1) : trimmed
-  if (/^\d+$/.test(direct)) {
-    const number = Number(direct)
-    return Number.isSafeInteger(number) && number > 0 ? number : null
-  }
-  let url: URL
-  try {
-    url = new URL(trimmed)
-  } catch {
-    return null
-  }
-  if (url.protocol !== 'http:' && url.protocol !== 'https:') {
-    return null
-  }
-  const link = parseGitLabIssueOrMRLink(trimmed)
-  return link?.type === 'mr' && Number.isSafeInteger(link.number) && link.number > 0
-    ? link.number
-    : null
-}
-
-// Why: blanking the field means "fall back to the branch/folder name", and the
-// empty string is how that intent is persisted. Emitting `undefined` instead
-// put a present-but-undefined key into the store spread, wiping the live name
-// and crashing the worktree palette (crash a1f81ea1).
-function buildDisplayNameUpdate(
-  draft: WorktreeMetaDraft,
-  current: WorktreeMetaSnapshot
-): Partial<WorktreeMeta> {
-  const trimmed = draft.displayNameInput.trim()
-  return trimmed === current.displayName ? {} : { displayName: trimmed }
-}
-
-// Why: persistence bumps lastActivityAt whenever a `comment` key is present, so
-// re-emitting an unchanged note reorders the workspace under the time-decay
-// sidebar sort on a save that only touched the issue link.
-function buildCommentUpdate(
-  draft: WorktreeMetaDraft,
-  current: WorktreeMetaSnapshot
-): Partial<WorktreeMeta> {
-  const trimmed = draft.commentInput.trim()
-  return trimmed === current.comment ? {} : { comment: trimmed }
-}
-
-/** Which issue a value names, ignoring spelling: `42` and `#42` are one GitHub
- *  link, `sta-335`, `STA-335` and its linear.app URL are one Linear link. A
- *  Linear URL still refines a
- *  stored org key, so the key belongs to the identity — with the stored one
- *  standing in when the input omits it. Unparseable text compares as raw text:
- *  there is nothing to normalize, and the builder writes nothing for it anyway. */
-function issueLinkIdentity(
-  input: string,
-  provider: IssueLinkProvider,
-  storedLinearOrganizationUrlKey: string | null
-): string {
-  const trimmed = input.trim()
-  if (trimmed === '') {
-    return ''
-  }
-  const parsed = parseIssueLinkInput(trimmed, provider)
-  if (!parsed) {
-    return `raw:${provider}:${trimmed}`
-  }
-  if (parsed.provider === 'github') {
-    return `github:${parsed.number}`
-  }
-  const organizationUrlKey = parsed.organizationUrlKey ?? storedLinearOrganizationUrlKey ?? ''
-  return `linear:${parsed.identifier}:${organizationUrlKey.trim().toLowerCase()}`
-}
-
-// Why: normalized identity rather than trimmed text. Retyping the same issue in
-// another spelling — `42` to `#42`, `STA-335` to its URL — would otherwise enter
-// the displacement path and clear the title and source context of the very link
-// it re-states. A provider switch is only visible through the identity when
-// there is a value to reinterpret, which is the intent an empty field lacks.
-export function isIssueFieldDirty(
-  draft: WorktreeMetaDraft,
-  current: WorktreeMetaSnapshot
-): boolean {
-  const storedOrganizationUrlKey = current.linkedLinearIssueOrganizationUrlKey ?? null
-  return (
-    issueLinkIdentity(draft.issueInput, draft.issueProvider, storedOrganizationUrlKey) !==
-    issueLinkIdentity(current.issueInput, current.issueProvider, storedOrganizationUrlKey)
-  )
-}
-
-/** Whether the value being saved names the very issue `linkedWorkItem` already
- *  describes. Org keys only disagree when both are known: a stored link without
- *  one is not evidence of a different organization, so a URL that supplies it
- *  refines the link rather than replacing it. */
-function keepsLinkedWorkItem(
-  input: string,
-  provider: IssueLinkProvider,
-  live: WorktreeMetaLiveLinks
-): boolean {
-  const parsed = parseIssueLinkInput(input.trim(), provider)
-  if (!parsed || live.linkedWorkItemType !== 'issue') {
-    return false
-  }
-  if (parsed.provider === 'github') {
-    return live.linkedWorkItemProvider === 'github' && parsed.number === live.linkedIssue
-  }
-  if (
-    live.linkedWorkItemProvider !== 'linear' ||
-    parsed.identifier.toUpperCase() !== live.linkedLinearIssue?.trim().toUpperCase()
-  ) {
-    return false
-  }
-  const storedOrganizationUrlKey = live.linkedLinearIssueOrganizationUrlKey?.trim()
-  const nextOrganizationUrlKey = parsed.organizationUrlKey?.trim()
-  return (
-    !storedOrganizationUrlKey ||
-    !nextOrganizationUrlKey ||
-    storedOrganizationUrlKey.toLowerCase() === nextOrganizationUrlKey.toLowerCase()
-  )
-}
-
-/** Owns both provider slot families. One issue per workspace: writing one
- *  provider clears the other. Emits nothing at all unless the field changed —
- *  the dialog opens focused on Comment, so an untouched field must never
- *  destroy a link the user came here to keep. */
-function buildIssueLinkUpdates(
-  draft: WorktreeMetaDraft,
-  current: WorktreeMetaSnapshot,
-  live: WorktreeMetaLiveLinks
-): Partial<WorktreeMeta> {
-  if (!isIssueFieldDirty(draft, current)) {
-    return {}
-  }
-
-  const trimmed = draft.issueInput.trim()
-  // Why: the linked work item and its source context describe the issue being
-  // replaced. Leaving them would keep a stale title badge and mis-scope Linear
-  // reads — but only when the save names a *different* issue: a value that
-  // re-states the same one, such as a URL adding an org key, must keep its own
-  // title and SSH/runtime routing context. Narrow on purpose: `type` because the
-  // field also records the PR or MR a workspace was created from, and provider
-  // because GitLab and Jira issues have no slot in this row — displacing what it
-  // cannot display would destroy a link the user was never shown and has no
-  // other editor to restore it from.
-  const displacedWorkItem: Partial<WorktreeMeta> =
-    !keepsLinkedWorkItem(trimmed, draft.issueProvider, live) &&
-    (live.linkedWorkItemProvider === 'github' || live.linkedWorkItemProvider === 'linear') &&
-    live.linkedWorkItemType === 'issue'
-      ? { linkedWorkItem: null, linkedTaskSourceContext: null }
-      : {}
-
-  // Why: persistence gates the remote Linear capability on key presence, not
-  // value. A synthetic clear on a workspace that never held a Linear link would
-  // fail a GitHub-only save against an older runtime, citing Linear. Read live,
-  // not from the snapshot: a link added since the dialog opened would otherwise
-  // outlive a save that just promised to displace it.
-  const displacedLinear: Partial<WorktreeMeta> = live.linkedLinearIssue
-    ? LINEAR_ISSUE_LINK_CLEARED
-    : {}
-
-  if (trimmed === '') {
-    return {
-      linkedIssue: null,
-      ...displacedLinear,
-      ...displacedWorkItem
-    }
-  }
-
-  const parsed = parseIssueLinkInput(trimmed, draft.issueProvider)
-  if (!parsed) {
-    // Why: unparseable input leaves every link untouched. `canSave` already
-    // blocks this path, but the builder stays pure rather than relying on it.
-    return {}
-  }
-
-  if (parsed.provider === 'github') {
-    return {
-      linkedIssue: parsed.number,
-      ...displacedLinear,
-      ...displacedWorkItem
-    }
-  }
-
-  const linearUpdates = buildLinearIssueLinkUpdates(trimmed)
-  return linearUpdates ? { linkedIssue: null, ...linearUpdates, ...displacedWorkItem } : {}
-}
-
-function buildReviewLinkUpdate(
-  draft: WorktreeMetaDraft,
-  current: WorktreeMetaSnapshot,
-  live: WorktreeMetaLiveLinks,
-  provider: WorktreeReviewProvider
-): Partial<WorktreeMeta> {
-  const trimmed = draft.reviewInput.trim()
-  if (provider === 'github' && trimmed === current.prInput.trim()) {
-    return {}
-  }
-  if (trimmed === '') {
-    return provider === 'gitlab'
-      ? { linkedGitLabMR: null }
-      : {
-          linkedPR: null,
-          ...(typeof live.linkedPR === 'number' ? { suppressedGitHubPR: live.linkedPR } : {})
-        }
-  }
-  const number =
-    provider === 'gitlab'
-      ? parseGitLabMergeRequestNumberForMetaField(trimmed)
-      : parseGitHubWorkItemNumberForMetaField(trimmed, 'pr')
-  if (number === null) {
-    return {}
-  }
-  return provider === 'gitlab' ? { linkedGitLabMR: number } : { linkedPR: number }
-}
-
-/** Pure save-payload builder for the worktree meta dialog: empty inputs clear
- *  the link (null), unparseable inputs leave it untouched (omitted). No key is
- *  ever emitted holding `undefined` — persistence raw-spreads updates, so a
- *  present-but-undefined key erases the stored value. */
-export function buildWorktreeMetaUpdates(
-  draft: WorktreeMetaDraft,
-  current: WorktreeMetaSnapshot,
-  live: WorktreeMetaLiveLinks,
-  reviewProvider: WorktreeReviewProvider = 'github'
-): Partial<WorktreeMeta> {
-  return {
-    ...buildCommentUpdate(draft, current),
-    ...buildDisplayNameUpdate(draft, current),
-    ...buildIssueLinkUpdates(draft, current, live),
-    ...buildReviewLinkUpdate(draft, current, live, reviewProvider)
-  }
-}
diff --git a/src/renderer/src/components/sidebar/worktree-review-helpers.tsx b/src/renderer/src/components/sidebar/worktree-review-helpers.tsx
index b1d7eb6f0265..0b7e4d3c254d 100644
--- a/src/renderer/src/components/sidebar/worktree-review-helpers.tsx
+++ b/src/renderer/src/components/sidebar/worktree-review-helpers.tsx
@@ -30,22 +30,26 @@ export function getProviderName(review: WorktreeCardPrDisplay): string {
 // cards render one while a linked review is loading or its details failed) has no
 // state glyph to contradict, so it still flags problems — but never claims success,
 // since emerald would assert an open review we have not confirmed.
-function getCheckTone(review: WorktreeCardPrDisplay): string | null {
-  if (review.state && review.state !== 'open') {
-    return null
-  }
-  if (review.status === 'failure') {
+export function getReviewChecksTone(status: WorktreeCardPrDisplay['status']): string | null {
+  if (status === 'failure') {
     return 'text-rose-500/85'
   }
-  if (review.status === 'pending') {
+  if (status === 'pending') {
     return 'text-amber-500/85'
   }
-  if (review.state === 'open' && review.status === 'success') {
+  if (status === 'success') {
     return 'text-emerald-500/80'
   }
   return null
 }
 
+function getCheckTone(review: WorktreeCardPrDisplay): string | null {
+  if ((review.state && review.state !== 'open') || (!review.state && review.status === 'success')) {
+    return null
+  }
+  return getReviewChecksTone(review.status)
+}
+
 function getStateTone(state: WorktreeCardPrDisplay['state']): string {
   if (state === 'merged') {
     return 'text-purple-600/70 dark:text-purple-400/70'
diff --git a/src/renderer/src/components/sidebar/worktree-sidebar-running-children.test.ts b/src/renderer/src/components/sidebar/worktree-sidebar-running-children.test.ts
index 6bf9fa0a969a..025f6d55e8b6 100644
--- a/src/renderer/src/components/sidebar/worktree-sidebar-running-children.test.ts
+++ b/src/renderer/src/components/sidebar/worktree-sidebar-running-children.test.ts
@@ -10,11 +10,9 @@ import { buildLegacyTaskRowModels } from '../../../../shared/agent-child-row-mod
 import type { AgentChildWorkView } from '../../../../shared/agent-status-child-work-view'
 import type { AgentStatusEntry, AgentSubagentSnapshot } from '../../../../shared/agent-status-types'
 import type { TerminalTab } from '../../../../shared/terminal-tab-types'
-import {
-  buildBackgroundTaskGroups,
-  buildBackgroundTaskGroupsFromViews
-} from '@/components/native-chat/background-task-roster'
-import { structuredSessionBackgroundTasksView } from '@/components/native-chat/structured-session-background-tasks-view'
+import { buildBackgroundTaskGroupsFromViews } from '../../../../shared/background-task-roster'
+import { buildBackgroundTaskGroups } from '@/components/native-chat/background-task-roster'
+import { structuredSessionBackgroundTasksView } from '../../../../shared/structured-session-background-tasks-view'
 import { buildSubagentChildRows } from './worktree-subagent-child-rows'
 
 const NOW = 1_000_000
diff --git a/src/renderer/src/components/status-bar/ClaudeSwitcherMenu.tsx b/src/renderer/src/components/status-bar/ClaudeSwitcherMenu.tsx
index 2e159c670188..07fed72e4057 100644
--- a/src/renderer/src/components/status-bar/ClaudeSwitcherMenu.tsx
+++ b/src/renderer/src/components/status-bar/ClaudeSwitcherMenu.tsx
@@ -13,6 +13,8 @@ import {
   fetchProviderAccountsSnapshot,
   selectClaudeProviderAccount
 } from '@/runtime/runtime-provider-accounts-client'
+import { toast } from 'sonner'
+import { getClaudeAccountErrorDescription } from '../settings/accounts-pane-action-errors'
 import { translate } from '@/i18n/i18n'
 import {
   getWindowsTerminalCapabilityOwnerKey,
@@ -32,9 +34,15 @@ import {
   resolveClaudeStatusAccountState
 } from './status-bar-claude-accounts'
 import { AccountRuntimeToggle } from './StatusBarAccountControls'
-import { InlineUsageBars, InlineUsageSkeleton } from './InlineProviderUsage'
+import {
+  InlineUsageBars,
+  InlineUsageSignInAction,
+  InlineUsageSkeleton,
+  isUnavailableInactiveUsage
+} from './InlineProviderUsage'
 import { ProviderDetailsMenu } from './ProviderDetailsMenu'
 import { getClaudeAccountSyncKey } from './provider-account-sync-key'
+import { signInToClaudeAccount } from '@/lib/claude-account-sign-in'
 
 // Exported so its account-switch/reset logic is preserved for row drill-in even
 // though the footer now opens the consolidated UsageRosterPanel first.
@@ -59,6 +67,8 @@ export function ClaudeSwitcherMenu({
     activeAccountIdsByRuntime: { host: null, wsl: {} }
   })
   const [isSwitching, setIsSwitching] = useState(false)
+  const [signingInId, setSigningInId] = useState<string | null>(null)
+  const signingInRef = useRef(false)
   const mountedRef = useRef(true)
   const openSettingsPage = useAppStore((s) => s.openSettingsPage)
   const openSettingsTarget = useAppStore((s) => s.openSettingsTarget)
@@ -114,12 +124,27 @@ export function ClaudeSwitcherMenu({
     })
   }, [loadAccounts, claudeAccountSyncKey])
 
-  const handleOpenChange = useCallback((nextOpen: boolean): void => {
-    setOpen(nextOpen)
-    if (!nextOpen) {
-      setAccountsExpanded(false)
-    }
-  }, [])
+  const handleOpenChange = useCallback(
+    (nextOpen: boolean): void => {
+      setOpen(nextOpen)
+      if (!nextOpen) {
+        setAccountsExpanded(false)
+        return
+      }
+      // Why: an account that needs a sign-in is the reason to open; show its inline Sign in.
+      if (accounts.accounts.some((account) => account.needsSignIn)) {
+        setAccountsExpanded(true)
+        if (!hasActiveRuntimeEnvironment) {
+          void fetchInactiveClaudeAccountUsage()
+        }
+      }
+      // Why reload: the login each account folder holds changes without a settings change.
+      void loadAccounts().catch((error) => {
+        console.error('Failed to load Claude accounts for status bar:', error)
+      })
+    },
+    [accounts.accounts, fetchInactiveClaudeAccountUsage, hasActiveRuntimeEnvironment, loadAccounts]
+  )
 
   // Why: fetch inactive-account usage only on switcher expansion; remote-owned accounts have no local cache to fill.
   const handleAccountsExpandedToggle = useCallback((): void => {
@@ -157,6 +182,13 @@ export function ClaudeSwitcherMenu({
       }
     } catch (error) {
       console.error('Failed to switch Claude account from status bar:', error)
+      toast.error(
+        translate(
+          'auto.components.settings.AccountsPane.2743cdc0af',
+          'Claude account update failed.'
+        ),
+        { description: getClaudeAccountErrorDescription(error) }
+      )
     } finally {
       if (mountedRef.current) {
         setIsSwitching(false)
@@ -164,6 +196,25 @@ export function ClaudeSwitcherMenu({
     }
   }
 
+  const handleSignIn = async (accountId: string): Promise<void> => {
+    // Why a ref: the row and its button both sign in, and state lags a double press.
+    if (signingInRef.current) {
+      return
+    }
+    signingInRef.current = true
+    setSigningInId(accountId)
+    try {
+      if (await signInToClaudeAccount(accountId)) {
+        await loadAccounts()
+      }
+    } finally {
+      signingInRef.current = false
+      if (mountedRef.current) {
+        setSigningInId(null)
+      }
+    }
+  }
+
   const handleSelectRuntime = async (group: ClaudeStatusSwitchGroup): Promise<void> => {
     const currentKey = getCodexStatusRuntimeKey(
       normalizeClaudeStatusRuntimeTarget(accountState, toCodexStatusRuntimeTarget(claudeTarget))
@@ -258,14 +309,22 @@ export function ClaudeSwitcherMenu({
               const inactiveUsage = target.id
                 ? inactiveClaudeAccounts.find((a) => a.accountId === target.id)
                 : null
+              // Why local only: the hidden sign-in runs on this device, not a remote server.
+              const signInId = target.needsSignIn && !hasActiveRuntimeEnvironment ? target.id : null
 
               return (
                 <DropdownMenuItem
                   key={`${selectedGroup.key}:${target.id ?? 'system'}`}
-                  disabled={isSwitching || target.active}
+                  disabled={
+                    isSwitching ||
+                    signingInId !== null ||
+                    (signInId === null && (target.active || target.disabled))
+                  }
                   onSelect={(event) => {
                     event.preventDefault()
-                    if (!target.active) {
+                    if (signInId) {
+                      void handleSignIn(signInId)
+                    } else if (!target.active) {
                       void handleSelectAccount(target.id, target.runtimeTarget)
                     }
                   }}
@@ -279,9 +338,24 @@ export function ClaudeSwitcherMenu({
                         </span>
                       ) : null}
                     </div>
+                    {signInId ? (
+                      <InlineUsageSignInAction
+                        isFetching={false}
+                        isSigningIn={signingInId === signInId}
+                        disabled={isSwitching || signingInId !== null}
+                        reason={target.hint ?? undefined}
+                        onSignIn={() => void handleSignIn(signInId)}
+                      />
+                    ) : target.hint ? (
+                      <span className="text-[10px] leading-4 text-muted-foreground">
+                        {target.hint}
+                      </span>
+                    ) : null}
                     {inactiveUsage?.isFetching && !inactiveUsage.rateLimits ? (
                       <InlineUsageSkeleton />
-                    ) : inactiveUsage?.rateLimits ? (
+                    ) : inactiveUsage?.rateLimits &&
+                      // Why: the sign-in note above already says this; skip the repeat.
+                      !(signInId && isUnavailableInactiveUsage(inactiveUsage.rateLimits)) ? (
                       <InlineUsageBars
                         limits={inactiveUsage.rateLimits}
                         isFetching={inactiveUsage.isFetching}
@@ -294,8 +368,8 @@ export function ClaudeSwitcherMenu({
           </div>
           <div className="px-2 py-1.5 text-[10px] leading-4 text-muted-foreground">
             {translate(
-              'auto.components.status.bar.StatusBar.8295903d17',
-              'Restart live Claude terminals before continuing old conversations after switching.'
+              'accounts.claude.profileSwitching',
+              'Switching applies to the next Claude you start in any tab. Running sessions keep their account.'
             )}
           </div>
         </div>
diff --git a/src/renderer/src/components/status-bar/InlineProviderUsage.tsx b/src/renderer/src/components/status-bar/InlineProviderUsage.tsx
index 6e0ac21c023f..18170fd7f809 100644
--- a/src/renderer/src/components/status-bar/InlineProviderUsage.tsx
+++ b/src/renderer/src/components/status-bar/InlineProviderUsage.tsx
@@ -89,18 +89,22 @@ export function InlineUsageSignInAction({
   isSigningIn,
   disabled,
   onSignInPointerDown,
-  onSignIn
+  onSignIn,
+  reason
 }: {
   isFetching: boolean
   isSigningIn: boolean
   disabled: boolean
   onSignInPointerDown?: () => void
   onSignIn: () => void
+  /** Why it needs a sign-in; defaults to the usage it would show. */
+  reason?: string
 }): React.JSX.Element {
   return (
     <div className={`flex w-full items-center gap-2 ${isFetching ? 'animate-pulse' : ''}`}>
       <span className="min-w-0 flex-1 text-[10px] text-muted-foreground">
-        {translate('auto.components.status.bar.StatusBar.f19a63e7cd', 'Sign in to see usage')}
+        {reason ??
+          translate('auto.components.status.bar.StatusBar.f19a63e7cd', 'Sign in to see usage')}
       </span>
       <Button
         type="button"
diff --git a/src/renderer/src/components/status-bar/StatusBarProviderSegment.tsx b/src/renderer/src/components/status-bar/StatusBarProviderSegment.tsx
index f9a484ede41a..1a3cd5d9e0da 100644
--- a/src/renderer/src/components/status-bar/StatusBarProviderSegment.tsx
+++ b/src/renderer/src/components/status-bar/StatusBarProviderSegment.tsx
@@ -16,6 +16,7 @@ import {
   getProviderDisplayName,
   getProviderUsageStatusLabel
 } from './tooltip'
+import { isClaudeUsageWaitingForClaude } from './usage-error-copy'
 import { getTightestUsageSection, getUsageHeadlineSection } from './UsageRosterPanel'
 import { formatRateLimitWindowChipLabel } from '@/lib/window-label-formatter'
 import { formatUsagePercentageLabel } from './usage-percentage-label'
@@ -314,6 +315,8 @@ export function ProviderSegment({
 }): React.JSX.Element {
   const provider = p?.provider ?? 'claude'
   const statusLabel = p ? getProviderUsageStatusLabel(p) : ''
+  // Why: not a problem; Claude updates its own login the next time it runs.
+  const calm = p ? isClaudeUsageWaitingForClaude(p) : false
 
   // Idle / initial load
   if (!p || p.status === 'idle') {
@@ -351,14 +354,14 @@ export function ProviderSegment({
     return (
       <span className="inline-flex items-center gap-1 text-muted-foreground">
         <ProviderIcon provider={provider} />
-        <AlertTriangle size={11} className="text-muted-foreground/80" />
+        {!calm && <AlertTriangle size={11} className="text-muted-foreground/80" />}
         {!compact && <span className="text-[11px] font-medium">{statusLabel}</span>}
       </span>
     )
   }
 
   // Has data (ok, fetching with stale data, or error with stale data)
-  const isStale = p.status === 'error'
+  const isStale = p.status === 'error' && !calm
   const showBalance = isExtraUsageActive(p)
 
   return (
diff --git a/src/renderer/src/components/status-bar/StatusBarSurface.tsx b/src/renderer/src/components/status-bar/StatusBarSurface.tsx
index deb2c7e06417..dcd881e3dfee 100644
--- a/src/renderer/src/components/status-bar/StatusBarSurface.tsx
+++ b/src/renderer/src/components/status-bar/StatusBarSurface.tsx
@@ -9,7 +9,6 @@ import {
 } from '@/components/ui/dropdown-menu'
 import { translate } from '@/i18n/i18n'
 import { UsageRosterPanel } from './UsageRosterPanel'
-import { getUsageProviderAccountsSectionId } from './usage-provider-settings-target'
 import {
   STATUS_BAR_CONTEXT_MENU_EXEMPT_PROPS,
   shouldOpenStatusBarContextMenu
@@ -62,6 +61,7 @@ export function StatusBarSurface({
     anyFetching,
     anyVisible,
     barRef,
+    canSignInFromUsageRow,
     collapseUsage,
     collapsedUsageProviders,
     compact,
@@ -190,7 +190,7 @@ export function StatusBarSurface({
                     onRefresh={handleRefresh}
                     onOpenProvider={handleOpenProviderAccounts}
                     onSignIn={handleOpenProviderAccounts}
-                    canSignIn={(provider) => getUsageProviderAccountsSectionId(provider) !== null}
+                    canSignIn={canSignInFromUsageRow}
                     onManageAccounts={handleManageAccounts}
                     onUsageDetails={handleUsageDetails}
                     renderRow={(p, rowNode) => {
diff --git a/src/renderer/src/components/status-bar/claude-status-sign-in.test.tsx b/src/renderer/src/components/status-bar/claude-status-sign-in.test.tsx
new file mode 100644
index 000000000000..f4f70b4f1264
--- /dev/null
+++ b/src/renderer/src/components/status-bar/claude-status-sign-in.test.tsx
@@ -0,0 +1,242 @@
+// @vitest-environment happy-dom
+import { cleanup, fireEvent, render, screen, waitFor } from '@testing-library/react'
+import React from 'react'
+import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest'
+import type { GlobalSettings } from '../../../../shared/global-settings-types'
+import type {
+  ClaudeManagedAccount,
+  ClaudeRateLimitAccountsState
+} from '../../../../shared/managed-account-types'
+import type { ProviderRateLimits } from '../../../../shared/rate-limit-types'
+import { getDefaultSettings } from '../../../../shared/constants'
+
+const toastError = vi.fn()
+const fetchSettings = vi.fn(async () => {})
+const reauthenticate = vi.fn(async (_args: unknown) => snapshot())
+const selectClaudeProviderAccount = vi.fn(async () => snapshot())
+let storeSettings: GlobalSettings
+let activeRuntimeEnvironmentId: string | null = null
+let inactiveClaudeAccounts: unknown[] = []
+
+function account(id: string): ClaudeManagedAccount {
+  return {
+    id,
+    email: `${id}@example.com`,
+    authMethod: 'subscription-oauth',
+    managedAuthPath: '/unused',
+    createdAt: 1,
+    updatedAt: id === 'old' ? 2 : 1,
+    lastAuthenticatedAt: 1
+  }
+}
+
+function snapshot(): ClaudeRateLimitAccountsState {
+  return {
+    accounts: [{ ...account('old'), needsSignIn: true }, { ...account('new') }],
+    activeAccountId: 'old',
+    activeAccountIdsByRuntime: { host: 'old', wsl: {} }
+  }
+}
+
+vi.mock('sonner', () => ({ toast: { error: toastError, info: vi.fn(), success: vi.fn() } }))
+vi.mock('@/runtime/runtime-provider-accounts-client', () => ({
+  fetchProviderAccountsSnapshot: vi.fn(async () => ({
+    claude: snapshot(),
+    codex: { accounts: [], activeAccountId: null },
+    failedProviders: []
+  })),
+  selectClaudeProviderAccount
+}))
+vi.mock('@/runtime/runtime-rpc-client', () => ({ getActiveRuntimeTarget: () => null }))
+vi.mock('@/lib/windows-terminal-capabilities', () => ({
+  useWindowsTerminalCapabilities: () => ({ wslDistros: [], isLoading: false }),
+  getWindowsTerminalCapabilityOwnerKey: () => 'local'
+}))
+vi.mock('./tooltip', async (importOriginal) => ({
+  ...(await importOriginal<Record<string, unknown>>()),
+  ProviderIcon: () => null,
+  ProviderPanel: () => null
+}))
+
+// Why: Radix portals its menu behind pointer-capture the DOM shim cannot drive;
+// passthrough shells render the same tree eagerly so the real handlers run.
+vi.mock('@/components/ui/dropdown-menu', () => {
+  const passthrough =
+    (role?: string) =>
+    ({
+      children,
+      onSelect
+    }: {
+      children?: React.ReactNode
+      onSelect?: (event: { preventDefault: () => void }) => void
+    }): React.JSX.Element =>
+      React.createElement(
+        'div',
+        {
+          role,
+          onClick: onSelect ? () => onSelect({ preventDefault: () => {} }) : undefined
+        },
+        children
+      )
+  return {
+    DropdownMenu: passthrough(),
+    DropdownMenuCheckboxItem: passthrough(),
+    DropdownMenuContent: passthrough(),
+    DropdownMenuItem: passthrough('menuitem'),
+    DropdownMenuLabel: passthrough(),
+    DropdownMenuSeparator: passthrough(),
+    DropdownMenuSub: passthrough(),
+    DropdownMenuSubContent: passthrough(),
+    DropdownMenuSubTrigger: passthrough(),
+    DropdownMenuTrigger: passthrough()
+  }
+})
+
+vi.mock('../../store', () => {
+  const state = (): Record<string, unknown> => ({
+    settings: { ...storeSettings, activeRuntimeEnvironmentId },
+    runtimeEnvironments: [],
+    usagePercentageDisplay: 'used',
+    openSettingsPage: vi.fn(),
+    openSettingsTarget: vi.fn(),
+    fetchSettings,
+    recordFeatureInteraction: vi.fn(),
+    refreshClaudeRateLimitsForTarget: vi.fn(),
+    fetchInactiveClaudeAccountUsage: vi.fn(),
+    rateLimits: { inactiveClaudeAccounts, claudeTarget: { runtime: 'host', wslDistro: null } }
+  })
+  const useAppStore = (selector: (value: Record<string, unknown>) => unknown): unknown =>
+    selector(state())
+  useAppStore.getState = state
+  return { useAppStore }
+})
+
+const claudeProvider: ProviderRateLimits = {
+  provider: 'claude',
+  session: null,
+  weekly: null,
+  status: 'ok',
+  error: null,
+  updatedAt: 1
+}
+
+async function openAccounts(): Promise<void> {
+  const { ClaudeSwitcherMenu } = await import('./ClaudeSwitcherMenu')
+  render(
+    React.createElement(ClaudeSwitcherMenu, {
+      claude: claudeProvider,
+      compact: false,
+      iconOnly: false
+    })
+  )
+  // A remote server's roster arrives with the snapshot, not settings.
+  fireEvent.click(await screen.findByText('old@example.com'))
+  await waitFor(() => expect(screen.getAllByText('old@example.com').length).toBe(2))
+}
+
+describe('status bar Claude account that needs a sign-in', () => {
+  beforeEach(() => {
+    vi.clearAllMocks()
+    activeRuntimeEnvironmentId = null
+    inactiveClaudeAccounts = []
+    storeSettings = {
+      ...getDefaultSettings('/home/me'),
+      claudeManagedAccounts: [account('old'), account('new')],
+      activeClaudeManagedAccountId: 'old',
+      activeClaudeManagedAccountIdsByRuntime: { host: 'old', wsl: {} }
+    }
+    Object.defineProperty(window, 'api', {
+      configurable: true,
+      writable: true,
+      value: { claudeAccounts: { reauthenticate } }
+    })
+  })
+
+  afterEach(() => cleanup())
+
+  it('marks it and signs in to it inline, without selecting anything', async () => {
+    await openAccounts()
+    expect(screen.getByText('Sign in again to use this account')).toBeTruthy()
+    fireEvent.click(screen.getByRole('button', { name: /Sign in/ }))
+    await waitFor(() => expect(reauthenticate).toHaveBeenCalledWith({ accountId: 'old' }))
+    expect(reauthenticate).toHaveBeenCalledTimes(1)
+    expect(selectClaudeProviderAccount).not.toHaveBeenCalled()
+    await waitFor(() => expect(fetchSettings).toHaveBeenCalled())
+    expect(toastError).not.toHaveBeenCalled()
+  })
+
+  it('does not repeat its sign-in note with a usage sign-in line', async () => {
+    const unavailable = (accountId: string): unknown => ({
+      accountId,
+      isFetching: false,
+      rateLimits: { ...claudeProvider, status: 'error', error: 'Not signed in' }
+    })
+    inactiveClaudeAccounts = [unavailable('old'), unavailable('new')]
+    await openAccounts()
+    expect(screen.getByText('Sign in again to use this account')).toBeTruthy()
+    // Only the row without a sign-in note keeps the usage line.
+    expect(screen.getAllByText('Sign in to see usage')).toHaveLength(1)
+    const newRow = screen.getAllByText('new@example.com').at(-1)!.closest('[role="menuitem"]')
+    expect(newRow?.textContent).toContain('Sign in to see usage')
+  })
+
+  it('says why a failed sign-in failed', async () => {
+    reauthenticate.mockRejectedValueOnce(new Error('Claude login exited with code 1.'))
+    await openAccounts()
+    fireEvent.click(screen.getByRole('button', { name: /Sign in/ }))
+    await waitFor(() => expect(toastError).toHaveBeenCalledTimes(1))
+  })
+
+  it('keeps the account list in the usage roster when the selected account needs a sign-in', async () => {
+    const { ClaudeSwitcherMenu } = await import('./ClaudeSwitcherMenu')
+    const { UsageRosterPanel } = await import('./UsageRosterPanel')
+    const { TooltipProvider } = await import('@/components/ui/tooltip')
+    const { usageRowSignInOpensSettings } = await import('./usage-provider-settings-target')
+    const onSignIn = vi.fn()
+    const signedOut: ProviderRateLimits = {
+      ...claudeProvider,
+      status: 'error',
+      error: 'Not signed in',
+      usageMetadata: { failureKind: 'missing-credentials' }
+    }
+    render(
+      React.createElement(
+        TooltipProvider,
+        null,
+        React.createElement(UsageRosterPanel, {
+          providers: [signedOut],
+          display: 'used',
+          statusBarUsageMode: 'verbose',
+          onStatusBarUsageModeChange: () => {},
+          isRefreshing: false,
+          onRefresh: () => {},
+          onOpenProvider: () => {},
+          onSignIn,
+          canSignIn: (provider) => usageRowSignInOpensSettings(provider, storeSettings),
+          onManageAccounts: () => {},
+          onUsageDetails: () => {},
+          renderRow: (p, row) =>
+            React.createElement(ClaudeSwitcherMenu, {
+              claude: p,
+              compact: false,
+              iconOnly: false,
+              asSubmenu: true,
+              triggerContent: row
+            })
+        })
+      )
+    )
+    fireEvent.click(await screen.findByText('old@example.com'))
+    expect(await screen.findByText('Sign in again to use this account')).toBeTruthy()
+    fireEvent.click(screen.getByRole('button', { name: /Sign in/ }))
+    await waitFor(() => expect(reauthenticate).toHaveBeenCalledWith({ accountId: 'old' }))
+    expect(onSignIn).not.toHaveBeenCalled()
+  })
+
+  it('offers no sign-in on a remote server, which this device cannot sign in for', async () => {
+    activeRuntimeEnvironmentId = 'env-1'
+    await openAccounts()
+    expect(screen.queryByRole('button', { name: /Sign in/ })).toBeNull()
+    expect(screen.getByText('Sign in again to use this account')).toBeTruthy()
+  })
+})
diff --git a/src/renderer/src/components/status-bar/inline-usage-bars.test.tsx b/src/renderer/src/components/status-bar/inline-usage-bars.test.tsx
index a6b78d6f8492..98b1009da1c4 100644
--- a/src/renderer/src/components/status-bar/inline-usage-bars.test.tsx
+++ b/src/renderer/src/components/status-bar/inline-usage-bars.test.tsx
@@ -71,6 +71,22 @@ describe('InlineUsageBars', () => {
     expect(markup).toContain('42% used Fable')
   })
 
+  it('asks for a sign-in when another provider has no usage to show', async () => {
+    const { InlineUsageBars } = await import('./StatusBar')
+    const limits: ProviderRateLimits = {
+      provider: 'codex',
+      session: null,
+      weekly: null,
+      updatedAt: Date.now(),
+      error: 'Not signed in',
+      status: 'error'
+    }
+
+    const markup = renderToStaticMarkup(<InlineUsageBars limits={limits} isFetching={false} />)
+
+    expect(markup).toContain('Sign in to see usage')
+  })
+
   it('derives the collapsed session label from resetsAt (#5399)', async () => {
     const { InlineUsageBars } = await import('./StatusBar')
 
diff --git a/src/renderer/src/components/status-bar/status-bar-claude-accounts.ts b/src/renderer/src/components/status-bar/status-bar-claude-accounts.ts
index b537a2c59ebe..dc9afe666007 100644
--- a/src/renderer/src/components/status-bar/status-bar-claude-accounts.ts
+++ b/src/renderer/src/components/status-bar/status-bar-claude-accounts.ts
@@ -94,7 +94,17 @@ export function buildClaudeStatusSwitchGroups(
           id: account.id,
           label: account.email,
           active: account.id === activeId,
-          runtimeTarget: target
+          runtimeTarget: target,
+          ...(account.needsSignIn
+            ? {
+                disabled: true,
+                needsSignIn: true,
+                hint: translate(
+                  'accounts.claude.signInRequired',
+                  'Sign in again to use this account'
+                )
+              }
+            : {})
         }))
       ]
     }
@@ -137,16 +147,20 @@ export function buildClaudeStatusSwitchGroups(
 }
 
 function getClaudeStatusAccountsFromSettings(
-  settings: GlobalSettings | null | undefined
+  settings: GlobalSettings | null | undefined,
+  runtimeState: ClaudeRateLimitAccountsState
 ): ClaudeRateLimitAccountsState | null {
   if (!settings) {
     return null
   }
+  // Why: settings carry the fresh selection; only the host reads each account folder's login.
+  const read = new Map(runtimeState.accounts.map((account) => [account.id, account]))
   return {
     accounts: settings.claudeManagedAccounts
       .map((account) => ({
         id: account.id,
-        email: account.email,
+        email: read.get(account.id)?.email ?? account.email,
+        ...(read.get(account.id)?.needsSignIn ? { needsSignIn: true as const } : {}),
         managedAuthRuntime: account.managedAuthRuntime ?? 'host',
         wslDistro: account.wslDistro ?? null,
         authMethod: account.authMethod ?? 'unknown',
@@ -180,5 +194,5 @@ export function resolveClaudeStatusAccountState(
   if (settings?.activeRuntimeEnvironmentId?.trim()) {
     return runtimeState
   }
-  return getClaudeStatusAccountsFromSettings(settings) ?? runtimeState
+  return getClaudeStatusAccountsFromSettings(settings, runtimeState) ?? runtimeState
 }
diff --git a/src/renderer/src/components/status-bar/status-bar-runtime-groups.test.ts b/src/renderer/src/components/status-bar/status-bar-runtime-groups.test.ts
index c323861f85fa..fa37dc8c01b8 100644
--- a/src/renderer/src/components/status-bar/status-bar-runtime-groups.test.ts
+++ b/src/renderer/src/components/status-bar/status-bar-runtime-groups.test.ts
@@ -1,4 +1,5 @@
 import { describe, expect, it } from 'vitest'
+import { getDefaultSettings } from '../../../../shared/constants'
 import type { GlobalSettings } from '../../../../shared/global-settings-types'
 import type {
   ClaudeRateLimitAccountsState,
@@ -162,6 +163,51 @@ describe('status bar runtime switch groups', () => {
     ])
   })
 
+  it("labels Claude rows with their folder's login and keeps one needing sign-in unselectable", () => {
+    const summary = (
+      id: string,
+      email: string,
+      extra: Partial<ClaudeRateLimitAccountsState['accounts'][number]> = {}
+    ) => ({
+      id,
+      email,
+      managedAuthRuntime: 'host' as const,
+      wslDistro: null,
+      authMethod: 'subscription-oauth' as const,
+      createdAt: 1,
+      updatedAt: 1,
+      lastAuthenticatedAt: 1,
+      ...extra
+    })
+    const runtimeState: ClaudeRateLimitAccountsState = {
+      accounts: [
+        summary('legacy', 'old@example.test', { needsSignIn: true }),
+        summary('relabelled', 'now@example.test')
+      ],
+      activeAccountId: null,
+      activeAccountIdsByRuntime: { host: null, wsl: {} }
+    }
+    // Local settings carry neither; the switcher must learn both from the host.
+    const settings: GlobalSettings = {
+      ...getDefaultSettings('/tmp'),
+      claudeManagedAccounts: [
+        { ...summary('legacy', 'old@example.test'), managedAuthPath: '' },
+        { ...summary('relabelled', 'added-as@example.test'), managedAuthPath: '' }
+      ],
+      activeClaudeManagedAccountId: null,
+      activeClaudeManagedAccountIdsByRuntime: { host: null, wsl: {} }
+    }
+    const state = resolveClaudeStatusAccountState(settings, runtimeState)
+    const [host] = buildClaudeStatusSwitchGroups(state, { runtime: 'host', wslDistro: null })
+    expect(
+      host.targets.map((target) => [target.label, target.disabled ?? false, target.hint ?? null])
+    ).toEqual([
+      ['System default', false, null],
+      ['old@example.test', true, 'Sign in again to use this account'],
+      ['now@example.test', false, null]
+    ])
+  })
+
   it('keeps Claude WSL system-default available without managed Claude accounts', () => {
     const state: ClaudeRateLimitAccountsState = {
       accounts: [],
diff --git a/src/renderer/src/components/status-bar/status-bar-runtime-targets.ts b/src/renderer/src/components/status-bar/status-bar-runtime-targets.ts
index 463a4eb52904..b97f2e58afcc 100644
--- a/src/renderer/src/components/status-bar/status-bar-runtime-targets.ts
+++ b/src/renderer/src/components/status-bar/status-bar-runtime-targets.ts
@@ -27,6 +27,11 @@ export type ClaudeStatusSwitchTarget = {
   label: string
   active: boolean
   runtimeTarget: CodexStatusRuntimeTarget
+  /** Set for an account that must be signed in again (or fixed) before it can be selected. */
+  disabled?: boolean
+  /** Its folder holds no login yet; the switcher offers Sign in on it. */
+  needsSignIn?: boolean
+  hint?: string | null
 }
 
 export type ClaudeStatusSwitchGroup = {
diff --git a/src/renderer/src/components/status-bar/tooltip.test.ts b/src/renderer/src/components/status-bar/tooltip.test.ts
index 1f4508c99c67..8686be85924e 100644
--- a/src/renderer/src/components/status-bar/tooltip.test.ts
+++ b/src/renderer/src/components/status-bar/tooltip.test.ts
@@ -236,8 +236,7 @@ describe('provider usage error copy', () => {
       error:
         'Claude usage refresh is waiting for the live Claude terminal to rotate its credentials.',
       usageMetadata: {
-        failureKind: 'deferred-by-live-session',
-        deferredByLiveClaudeSession: true
+        failureKind: 'deferred-by-live-session'
       }
     })
 
@@ -256,12 +255,50 @@ describe('provider usage error copy', () => {
       }
     })
 
+    expect(getProviderUsageStatusLabel(p)).toBe('Sign-in expired')
+    expect(getProviderUsageErrorMessage(p)).toBe(
+      'Claude usage has expired. Start Claude in this account to refresh it.'
+    )
+  })
+
+  it('tells a System Default user calmly that usage updates when Claude next runs', () => {
+    const p = provider({
+      error: 'Invalid OAuth token.',
+      usageMetadata: {
+        failureKind: 'stale-token',
+        attemptedSources: ['oauth'],
+        authProvenance: 'system'
+      }
+    })
+
+    expect(getProviderUsageStatusLabel(p)).toBe('Updates when Claude runs')
+    expect(getProviderUsageErrorMessage(p)).toBe('Claude usage updates the next time Claude runs.')
+  })
+
+  it('keeps refresh copy for failure kinds only a refreshing older host reports', () => {
+    const p = provider({
+      error: 'Claude OAuth access token unavailable',
+      usageMetadata: { failureKind: 'refreshable-credentials-without-token' }
+    })
+
     expect(getProviderUsageStatusLabel(p)).toBe('Refreshing sign-in')
     expect(getProviderUsageErrorMessage(p)).toBe(
       'Claude sign-in is being refreshed. Agent sessions may still be signed in.'
     )
   })
 
+  it('tells the user a selected Claude account needs signing in again', () => {
+    const p = provider({
+      error: 'Sign in again to use this account.',
+      usageMetadata: { failureKind: 'missing-credentials' }
+    })
+
+    expect(getProviderUsageStatusLabel(p)).toBe('Sign in again')
+    expect(getProviderUsageErrorMessage(p)).toBe(
+      'The selected Claude account needs you to sign in again. Open Settings > AI Provider Accounts, or choose System default.'
+    )
+  })
+
   it('uses structured network copy for Claude usage failures', () => {
     const p = provider({
       error: 'Network error while refreshing OAuth usage: ECONNRESET',
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 95942ddb5b72..be278fc9e9fc 100644
--- a/src/renderer/src/components/status-bar/usage-error-copy.ts
+++ b/src/renderer/src/components/status-bar/usage-error-copy.ts
@@ -81,6 +81,15 @@ function getDelegatedCliRefreshProvider(
   return p.provider === 'grok' || p.provider === 'kimi' ? p.provider : null
 }
 
+/** System Default's login expired on the server: Claude refreshes it the next time it runs. */
+export function isClaudeUsageWaitingForClaude(p: ProviderRateLimits): boolean {
+  return (
+    p.provider === 'claude' &&
+    p.usageMetadata?.failureKind === 'stale-token' &&
+    p.usageMetadata.authProvenance === 'system'
+  )
+}
+
 export function getProviderUsageStatusLabel(p: ProviderRateLimits): string {
   const delegatedCliProvider = getDelegatedCliRefreshProvider(p)
   if (delegatedCliProvider === 'grok') {
@@ -91,12 +100,20 @@ export function getProviderUsageStatusLabel(p: ProviderRateLimits): string {
   }
   if (p.provider === 'claude') {
     switch (p.usageMetadata?.failureKind) {
+      // Why: only an older host, which still defers a refresh for a live session, reports this.
       case 'deferred-by-live-session':
         return translate(
           'auto.components.status.bar.tooltip.0d8d7cfe15',
           'Waiting for Claude session'
         )
+      // Why: Orca never refreshes a Claude login; only an older host that still does reports the other kinds.
       case 'stale-token':
+        return isClaudeUsageWaitingForClaude(p)
+          ? translate(
+              'auto.components.status.bar.tooltip.claude.waiting.label',
+              'Updates when Claude runs'
+            )
+          : translate('auto.components.status.bar.tooltip.claude.expired.label', 'Sign-in expired')
       case 'refreshable-credentials-without-token':
       case 'delegated-refresh-required':
         return translate('auto.components.status.bar.tooltip.1804cd8c3f', 'Refreshing sign-in')
@@ -107,7 +124,9 @@ export function getProviderUsageStatusLabel(p: ProviderRateLimits): string {
       case 'cli-unavailable':
       case 'usage-unavailable':
         return translate('auto.components.status.bar.tooltip.f8b8dbed85', 'Usage unavailable')
+      // Why: the host reports this only for a selected account whose own profile has no login.
       case 'missing-credentials':
+        return translate('accounts.claude.usageSignInLabel', 'Sign in again')
       case 'missing-scope':
       case 'no-subscription':
       case 'parse':
@@ -171,12 +190,22 @@ export function getProviderUsageErrorMessage(p: ProviderRateLimits): string {
   }
   if (p.provider === 'claude') {
     switch (p.usageMetadata?.failureKind) {
+      // Why: only an older host, which still defers a refresh for a live session, reports this.
       case 'deferred-by-live-session':
         return translate(
           'auto.components.status.bar.tooltip.3d3c9c0c1f',
           'Claude usage will refresh after the live Claude terminal rotates its credentials.'
         )
       case 'stale-token':
+        return isClaudeUsageWaitingForClaude(p)
+          ? translate(
+              'auto.components.status.bar.tooltip.claude.waiting.message',
+              'Claude usage updates the next time Claude runs.'
+            )
+          : translate(
+              'auto.components.status.bar.tooltip.claude.expired.message',
+              'Claude usage has expired. Start Claude in this account to refresh it.'
+            )
       case 'refreshable-credentials-without-token':
       case 'delegated-refresh-required':
         return translate(
@@ -195,6 +224,11 @@ export function getProviderUsageErrorMessage(p: ProviderRateLimits): string {
           'auto.components.status.bar.tooltip.cabdc2a9e0',
           'Claude sign-in credentials could not be read.'
         )
+      case 'missing-credentials':
+        return translate(
+          'accounts.claude.usageSignInMessage',
+          'The selected Claude account needs you to sign in again. Open Settings > AI Provider Accounts, or choose System default.'
+        )
       case 'server':
       case 'parse':
       case 'usage-unavailable':
@@ -203,7 +237,6 @@ export function getProviderUsageErrorMessage(p: ProviderRateLimits): string {
           'auto.components.status.bar.tooltip.a7517cccb6',
           'Claude usage is unavailable right now.'
         )
-      case 'missing-credentials':
       case 'no-subscription':
       case 'rate-limited':
       case 'unknown':
diff --git a/src/renderer/src/components/status-bar/usage-provider-settings-target.test.ts b/src/renderer/src/components/status-bar/usage-provider-settings-target.test.ts
index 074d4aeebc95..85e602794498 100644
--- a/src/renderer/src/components/status-bar/usage-provider-settings-target.test.ts
+++ b/src/renderer/src/components/status-bar/usage-provider-settings-target.test.ts
@@ -1,5 +1,9 @@
 import { describe, expect, it } from 'vitest'
-import { getUsageProviderAccountsSectionId } from './usage-provider-settings-target'
+import type { ClaudeManagedAccount } from '../../../../shared/managed-account-types'
+import {
+  getUsageProviderAccountsSectionId,
+  usageRowSignInOpensSettings
+} from './usage-provider-settings-target'
 
 describe('getUsageProviderAccountsSectionId', () => {
   it('routes providers only to settings sections that exist', () => {
@@ -18,3 +22,33 @@ describe('getUsageProviderAccountsSectionId', () => {
     expect(getUsageProviderAccountsSectionId('kimi')).toBeNull()
   })
 })
+
+describe('usageRowSignInOpensSettings', () => {
+  const account: ClaudeManagedAccount = {
+    id: 'a',
+    email: 'a@example.com',
+    authMethod: 'subscription-oauth',
+    managedAuthPath: '/unused',
+    createdAt: 1,
+    updatedAt: 1,
+    lastAuthenticatedAt: 1
+  }
+  const saved = { claudeManagedAccounts: [account] }
+
+  it('keeps the Claude menu, with its per-account Sign in, once accounts are saved', () => {
+    expect(usageRowSignInOpensSettings('claude', saved)).toBe(false)
+    expect(usageRowSignInOpensSettings('claude', { claudeManagedAccounts: [] })).toBe(true)
+    expect(usageRowSignInOpensSettings('claude', null)).toBe(true)
+    expect(usageRowSignInOpensSettings('codex', saved)).toBe(true)
+    expect(usageRowSignInOpensSettings('kimi', null)).toBe(false)
+  })
+
+  it("keeps the Settings shortcut on a remote server, whose accounts aren't local", () => {
+    expect(
+      usageRowSignInOpensSettings('claude', {
+        claudeManagedAccounts: [account],
+        activeRuntimeEnvironmentId: 'env-1'
+      })
+    ).toBe(true)
+  })
+})
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 ec9b79ca82b9..dbc81f665c62 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
@@ -1,3 +1,4 @@
+import type { GlobalSettings } from '../../../../shared/global-settings-types'
 import type { ProviderRateLimits } from '../../../../shared/rate-limit-types'
 
 export function getUsageProviderAccountsSectionId(
@@ -27,3 +28,20 @@ export function getUsageProviderAccountsSectionId(
       return 'accounts-zcode'
   }
 }
+
+/** Whether a signed-out usage row is a Sign in shortcut to Settings instead of the provider's menu. */
+export function usageRowSignInOpensSettings(
+  provider: ProviderRateLimits['provider'],
+  settings: Pick<GlobalSettings, 'activeRuntimeEnvironmentId' | 'claudeManagedAccounts'> | null
+): boolean {
+  if (getUsageProviderAccountsSectionId(provider) === null) {
+    return false
+  }
+  // Why: with saved accounts the Claude menu lists each one with its own inline Sign in.
+  // A remote server's accounts aren't in local settings, so it keeps the shortcut.
+  return !(
+    provider === 'claude' &&
+    !settings?.activeRuntimeEnvironmentId?.trim() &&
+    (settings?.claudeManagedAccounts?.length ?? 0) > 0
+  )
+}
diff --git a/src/renderer/src/components/status-bar/usage-roster-row-state.test.ts b/src/renderer/src/components/status-bar/usage-roster-row-state.test.ts
index b63a9a3ad5b1..56384ccac436 100644
--- a/src/renderer/src/components/status-bar/usage-roster-row-state.test.ts
+++ b/src/renderer/src/components/status-bar/usage-roster-row-state.test.ts
@@ -37,7 +37,7 @@ describe('getUsageRosterRowState', () => {
         }),
         false
       )
-    ).toEqual({ kind: 'error', statusLabel: 'Refreshing sign-in' })
+    ).toEqual({ kind: 'error', statusLabel: 'Sign-in expired' })
     expect(
       getUsageRosterRowState(
         provider({
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 d537eba860f5..7ed84300dc9c 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
@@ -7,7 +7,10 @@ import { normalizeUsagePercentageDisplay } from '../../../../shared/usage-percen
 import { normalizeStatusBarUsageMode } from '../../../../shared/status-bar-usage-mode'
 import { isStatusBarItemAvailable } from './status-bar-agent-gating'
 import { getVisibleUsageProvider, isUsageEmptyState } from './status-bar-provider-visibility'
-import { getUsageProviderAccountsSectionId } from './usage-provider-settings-target'
+import {
+  getUsageProviderAccountsSectionId,
+  usageRowSignInOpensSettings
+} from './usage-provider-settings-target'
 import { useStatusBarMenuFocusHandoff } from './ProviderDetailsMenu'
 import { CLOSE_ALL_CONTEXT_MENUS_EVENT } from '@/lib/close-all-context-menus'
 import { useStatusBarDensity } from './status-bar-density'
@@ -234,6 +237,8 @@ export function useStatusBarController(floatingTerminalOpen: boolean) {
     openSettingsTarget({ pane: 'accounts', repoId: null, sectionId })
     openSettingsPage()
   }
+  const canSignInFromUsageRow = (provider: ProviderRateLimits['provider']): boolean =>
+    usageRowSignInOpensSettings(provider, settings)
   const handleUsageMenuOpenChange = (nextOpen: boolean): void => {
     if (nextOpen) {
       usageMenuFocusHandoff.reset()
@@ -246,6 +251,7 @@ export function useStatusBarController(floatingTerminalOpen: boolean) {
     anyFetching,
     anyVisible,
     barRef,
+    canSignInFromUsageRow,
     collapseUsage,
     collapsedUsageProviders,
     compact,
diff --git a/src/renderer/src/components/status-bar/use-workspace-space-decision-projection.test.tsx b/src/renderer/src/components/status-bar/use-workspace-space-decision-projection.test.tsx
new file mode 100644
index 000000000000..e26a5ad60dcf
--- /dev/null
+++ b/src/renderer/src/components/status-bar/use-workspace-space-decision-projection.test.tsx
@@ -0,0 +1,304 @@
+// @vitest-environment happy-dom
+import { act, cleanup, renderHook } from '@testing-library/react'
+import { useStore } from 'zustand'
+import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest'
+import type { AppState } from '../../store/types'
+import {
+  createTestStore,
+  makeOpenFile,
+  makeTab,
+  makeWorktree
+} from '../../store/slices/store-test-helpers'
+import type { AgentStatusEntry } from '../../../../shared/agent-status-types'
+import type { WorkspaceSpaceWorktree } from '../../../../shared/workspace-space-types'
+import { resetAgentStatusEpochClockForTests } from '@/lib/agent-status-epoch-clock'
+import { useWorkspaceSpaceManagerBindings } from './use-workspace-space-manager-bindings'
+import { useWorkspaceSpaceDecisionProjection } from './use-workspace-space-decision-projection'
+
+let store: ReturnType<typeof createTestStore>
+vi.mock('../../store', () => ({
+  useAppStore: Object.assign(
+    <Result,>(selector: (state: AppState) => Result) => useStore(store, selector),
+    { getState: () => store.getState() }
+  )
+}))
+
+function row(
+  worktreeId: string,
+  executionHostId: 'local' | 'ssh:host' = 'local'
+): WorkspaceSpaceWorktree {
+  return {
+    worktreeId,
+    executionHostId,
+    repoId: 'repo',
+    repoDisplayName: 'Repo',
+    repoPath: '/repo',
+    displayName: worktreeId,
+    path: `/repo/${worktreeId}`,
+    branch: 'main',
+    isMainWorktree: false,
+    isRemote: executionHostId !== 'local',
+    isSparse: false,
+    canDelete: true,
+    lastActivityAt: 0,
+    status: 'ok',
+    error: null,
+    scannedAt: 0,
+    sizeBytes: 0,
+    reclaimableBytes: 0,
+    skippedEntryCount: 0,
+    topLevelItems: [],
+    omittedTopLevelItemCount: 0,
+    omittedTopLevelSizeBytes: 0
+  }
+}
+
+function entry(paneKey: string, overrides: Partial<AgentStatusEntry> = {}): AgentStatusEntry {
+  return {
+    paneKey,
+    state: 'working',
+    prompt: '',
+    updatedAt: Date.now(),
+    stateStartedAt: Date.now(),
+    stateHistory: [],
+    ...overrides
+  }
+}
+
+function seed(rows: WorkspaceSpaceWorktree[]) {
+  store.setState({
+    worktreesByRepo: { repo: rows.map((r) => makeWorktree({ id: r.worktreeId, repoId: 'repo' })) },
+    tabsByWorktree: Object.fromEntries(
+      rows.map((r) => [
+        r.worktreeId,
+        [makeTab({ id: `${r.worktreeId}-tab`, worktreeId: r.worktreeId })]
+      ])
+    ),
+    workspaceSpaceAnalysis: {
+      scannedAt: 1,
+      worktrees: rows,
+      repos: [],
+      totalSizeBytes: 0,
+      reclaimableBytes: 0,
+      worktreeCount: rows.length,
+      scannedWorktreeCount: rows.length,
+      unavailableWorktreeCount: 0
+    },
+    refreshGitHubForWorktreeIfStale: vi.fn(async () => {})
+  })
+}
+
+function mountProjection() {
+  return renderHook(() => useWorkspaceSpaceDecisionProjection(useWorkspaceSpaceManagerBindings()))
+}
+
+beforeEach(() => {
+  vi.useFakeTimers()
+  vi.setSystemTime(1_000_000)
+  store = createTestStore()
+  resetAgentStatusEpochClockForTests()
+})
+afterEach(() => {
+  cleanup()
+  vi.clearAllTimers()
+  vi.useRealTimers()
+  vi.restoreAllMocks()
+  resetAgentStatusEpochClockForTests()
+})
+
+describe('mounted Space decision projection', () => {
+  it('reads each owned agent instead of every global record on each title publication', () => {
+    seed(Array.from({ length: 20 }, (_, i) => row(`w${i}`)))
+    let liveProbes = 0,
+      retainedProbes = 0
+    const live: AppState['agentStatusByPaneKey'] = {}
+    const retained: AppState['retainedAgentsByPaneKey'] = {}
+    for (let i = 0; i < 10; i += 1) {
+      const paneKey = `w${i}-tab:legacy`
+      live[paneKey] = {
+        ...entry(paneKey),
+        get state(): AgentStatusEntry['state'] {
+          liveProbes += 1
+          return 'working'
+        }
+      }
+    }
+    for (let i = 0; i < 40; i += 1) {
+      const worktreeId = `w${i % 20}`
+      retained[`completed-${i}`] = {
+        entry: entry(`completed-${i}:legacy`, { state: 'done' }),
+        get worktreeId() {
+          retainedProbes += 1
+          return worktreeId
+        },
+        tab: makeTab({ id: `completed-${i}`, worktreeId }),
+        agentType: 'claude',
+        startedAt: 0
+      }
+    }
+    store.setState({ agentStatusByPaneKey: live, retainedAgentsByPaneKey: retained })
+    const view = mountProjection()
+    liveProbes = 0
+    retainedProbes = 0
+    for (let i = 0; i < 5; i += 1) {
+      act(() => store.getState().setRuntimePaneTitle('w0-tab', 0, `Ordinary command ${i}`))
+    }
+    expect(view.result.current.decisionDetailsByWorktreeId.size).toBe(20)
+    expect({ liveProbes, retainedProbes }).toEqual({ liveProbes: 50, retainedProbes: 200 })
+  })
+
+  it('updates from real status, retention, draft, tab and source-row changes', () => {
+    seed([row('w0'), row('w1')])
+    const view = mountProjection()
+    const details = () => view.result.current.decisionDetailsByWorktreeId.get('local|w0')
+    act(() =>
+      store.getState().setAgentStatus('w0-tab:legacy', {
+        agentType: 'custom-non-icon-agent',
+        state: 'working',
+        prompt: 'Generated task'
+      })
+    )
+    expect(details()?.activeAgentCount).toBe(1)
+    act(() =>
+      store.getState().setAgentStatus('w0-tab:legacy', {
+        agentType: 'custom-non-icon-agent',
+        state: 'done',
+        prompt: 'Generated task'
+      })
+    )
+    expect(details()?.activeAgentCount).toBe(0)
+    act(() =>
+      store.getState().retainAgents([
+        {
+          entry: entry('completed:legacy', { state: 'done' }),
+          worktreeId: 'w0',
+          tab: makeTab({ id: 'completed', worktreeId: 'w0' }),
+          agentType: 'claude',
+          startedAt: 0
+        }
+      ])
+    )
+    expect(details()?.completedAgentCount).toBe(1)
+    act(() => store.setState({ openFiles: [makeOpenFile({ id: 'file', worktreeId: 'w0' })] }))
+    act(() => store.getState().setEditorDraft('file', 'Changed content'))
+    expect(details()?.dirtyEditorBufferCount).toBe(1)
+    act(() => store.setState({ tabsByWorktree: { w0: [] } }))
+    expect(details()?.terminalTabCount).toBe(0)
+    act(() => store.setState({ workspaceSpaceAnalysis: null }))
+    expect(view.result.current.decisionDetailsByWorktreeId.size).toBe(0)
+  })
+
+  it('keeps special own keys and migration workspace-or-tab ownership across host collisions', () => {
+    seed([row('w0'), row('w0', 'ssh:host'), row('w1')])
+    store.setState({
+      tabsByWorktree: {
+        w0: [makeTab({ id: 'shared', worktreeId: 'w0' })],
+        w1: [makeTab({ id: 'shared', worktreeId: 'w0' })]
+      },
+      agentStatusByPaneKey: Object.fromEntries([
+        ['__proto__', entry('shared:legacy', { agentType: 'custom-non-icon-agent' })],
+        ['constructor', entry('shared:legacy')],
+        ['2', entry('wrong:legacy')],
+        ['shared:legacy', entry('other:legacy')]
+      ]),
+      migrationUnsupportedByPtyId: Object.fromEntries<
+        AppState['migrationUnsupportedByPtyId'][string]
+      >([
+        [
+          '__proto__',
+          {
+            ptyId: 'm1',
+            worktreeId: 'w0',
+            tabId: 'shared',
+            source: 'local',
+            reason: 'legacy-numeric-pane-key',
+            updatedAt: 1
+          }
+        ],
+        [
+          'missing-owner',
+          {
+            ptyId: 'm3',
+            tabId: 'shared',
+            source: 'local',
+            reason: 'legacy-numeric-pane-key',
+            updatedAt: 1
+          }
+        ],
+        [
+          'constructor',
+          {
+            ptyId: 'm2',
+            worktreeId: 'w0',
+            tabId: '',
+            paneKey: 'shared:legacy',
+            source: 'local',
+            reason: 'legacy-numeric-pane-key',
+            updatedAt: 1
+          }
+        ]
+      ]),
+      retainedAgentsByPaneKey: Object.fromEntries([
+        [
+          '__proto__',
+          {
+            entry: entry('done:legacy', { state: 'done' }),
+            worktreeId: 'w0',
+            tab: makeTab({ id: 'done', worktreeId: 'w0' }),
+            agentType: 'claude',
+            startedAt: 0
+          }
+        ],
+        [
+          'constructor',
+          {
+            entry: entry('working:legacy'),
+            worktreeId: 'w0',
+            tab: makeTab({ id: 'working', worktreeId: 'w0' }),
+            agentType: 'claude',
+            startedAt: 0
+          }
+        ]
+      ])
+    })
+    const view = mountProjection()
+    const results = view.result.current.decisionDetailsByWorktreeId
+    expect(results.get('local|w0')).toMatchObject({ activeAgentCount: 5, completedAgentCount: 1 })
+    expect(results.get('ssh:host|w0')).toMatchObject({
+      activeAgentCount: 5,
+      completedAgentCount: 1
+    })
+    expect(results.get('local|w1')).toMatchObject({ activeAgentCount: 4, completedAgentCount: 0 })
+  })
+
+  it('does not enumerate global records when there are no scan rows', () => {
+    seed([])
+    const trap = {
+      ownKeys() {
+        throw new Error('empty analysis enumerated global agent records')
+      }
+    }
+    store.setState({
+      agentStatusByPaneKey: new Proxy<AppState['agentStatusByPaneKey']>({}, trap),
+      migrationUnsupportedByPtyId: new Proxy<AppState['migrationUnsupportedByPtyId']>({}, trap),
+      retainedAgentsByPaneKey: new Proxy<AppState['retainedAgentsByPaneKey']>({}, trap)
+    })
+    expect(mountProjection().result.current.decisionDetailsByWorktreeId.size).toBe(0)
+  })
+
+  it('samples freshness on epoch changes without reusing a stale verdict', () => {
+    seed([row('w0')])
+    store.setState({ agentStatusByPaneKey: { 'w0-tab:legacy': entry('w0-tab:legacy') } })
+    const view = mountProjection()
+    expect(view.result.current.decisionDetailsByWorktreeId.get('local|w0')?.activeAgentCount).toBe(
+      1
+    )
+    act(() => {
+      vi.setSystemTime(3_000_000)
+      store.setState({ agentStatusEpoch: store.getState().agentStatusEpoch + 1 })
+    })
+    expect(view.result.current.decisionDetailsByWorktreeId.get('local|w0')?.activeAgentCount).toBe(
+      0
+    )
+  })
+})
diff --git a/src/renderer/src/components/status-bar/use-workspace-space-decision-projection.ts b/src/renderer/src/components/status-bar/use-workspace-space-decision-projection.ts
index 78519edde523..9903076842e2 100644
--- a/src/renderer/src/components/status-bar/use-workspace-space-decision-projection.ts
+++ b/src/renderer/src/components/status-bar/use-workspace-space-decision-projection.ts
@@ -1,4 +1,5 @@
 import { useCallback, useMemo } from 'react'
+import { groupWorkspaceSpaceDecisionInputs } from './workspace-space-decision-inputs'
 import { getAgentStatusEpochNow } from '@/lib/agent-status-epoch-clock'
 import {
   getWorkspaceDecisionDetails,
@@ -47,6 +48,23 @@ export function useWorkspaceSpaceDecisionProjection(bindings: WorkspaceSpaceMana
     }
     return counts
   }, [sourceRows])
+  const groupedInputs = useMemo(
+    () =>
+      groupWorkspaceSpaceDecisionInputs(sourceRows, tabsByWorktree, {
+        agentStatusByPaneKey,
+        migrationUnsupportedByPtyId,
+        retainedAgentsByPaneKey,
+        openFiles
+      }),
+    [
+      sourceRows,
+      tabsByWorktree,
+      agentStatusByPaneKey,
+      migrationUnsupportedByPtyId,
+      retainedAgentsByPaneKey,
+      openFiles
+    ]
+  )
   const decisionDetailsByWorktreeId = useMemo(() => {
     // Why: the epoch bumps when fresh hook entries cross the stale boundary so
     // delete readiness recomputes with the same wall-clock sample as the store.
@@ -77,12 +95,14 @@ export function useWorkspaceSpaceDecisionProjection(bindings: WorkspaceSpaceMana
           settings,
           activeWorktreeId,
           activeWorkspaceExecutionHostId,
+          ...groupedInputs.get(worktree.worktreeId),
           now: agentStatusNow
         })
       )
     }
     return details
   }, [
+    groupedInputs,
     activeWorktreeId,
     activeWorkspaceExecutionHostId,
     agentStatusEpoch,
diff --git a/src/renderer/src/components/status-bar/workspace-space-decision-inputs.ts b/src/renderer/src/components/status-bar/workspace-space-decision-inputs.ts
new file mode 100644
index 000000000000..bcd31cf3fb72
--- /dev/null
+++ b/src/renderer/src/components/status-bar/workspace-space-decision-inputs.ts
@@ -0,0 +1,82 @@
+import type { TerminalTab } from '../../../../shared/terminal-tab-types'
+import type { WorkspaceSpaceWorktree } from '../../../../shared/workspace-space-types'
+import type { WorkspaceDecisionInputs } from './workspace-space-decision-details'
+import { getPaneKeyTabId } from './workspace-space-presentation'
+
+type GroupedInputs = Pick<
+  WorkspaceDecisionInputs,
+  'agentStatusByPaneKey' | 'migrationUnsupportedByPtyId' | 'retainedAgentsByPaneKey' | 'openFiles'
+>
+
+type Bucket = {
+  agentStatuses: [string, WorkspaceDecisionInputs['agentStatusByPaneKey'][string]][]
+  migrations: [string, WorkspaceDecisionInputs['migrationUnsupportedByPtyId'][string]][]
+  retainedAgents: [string, WorkspaceDecisionInputs['retainedAgentsByPaneKey'][string]][]
+  openFiles: WorkspaceDecisionInputs['openFiles'][number][]
+}
+
+export function groupWorkspaceSpaceDecisionInputs(
+  rows: readonly Pick<WorkspaceSpaceWorktree, 'worktreeId'>[],
+  tabsByWorktree: Record<string, readonly TerminalTab[]>,
+  inputs: GroupedInputs
+): Map<string, GroupedInputs> {
+  const result = new Map<string, GroupedInputs>()
+  if (rows.length === 0) {
+    return result
+  }
+  const buckets = new Map<string, Bucket>()
+  const tabOwners = new Map<string, Set<string>>()
+  for (const row of rows) {
+    if (buckets.has(row.worktreeId)) {
+      continue
+    }
+    buckets.set(row.worktreeId, {
+      agentStatuses: [],
+      migrations: [],
+      retainedAgents: [],
+      openFiles: []
+    })
+    for (const tab of tabsByWorktree[row.worktreeId] ?? []) {
+      let owners = tabOwners.get(tab.id)
+      if (!owners) {
+        owners = new Set()
+        tabOwners.set(tab.id, owners)
+      }
+      owners.add(row.worktreeId)
+    }
+  }
+  for (const [key, entry] of Object.entries(inputs.agentStatusByPaneKey)) {
+    const tabId = getPaneKeyTabId(entry.paneKey || key)
+    if (!tabId) {
+      continue
+    }
+    for (const owner of tabOwners.get(tabId) ?? []) {
+      buckets.get(owner)?.agentStatuses.push([key, entry])
+    }
+  }
+  for (const [key, entry] of Object.entries(inputs.migrationUnsupportedByPtyId)) {
+    const tabId = entry.tabId ?? (entry.paneKey ? getPaneKeyTabId(entry.paneKey) : null)
+    const owners = new Set(tabId ? tabOwners.get(tabId) : undefined)
+    if (entry.worktreeId !== undefined && buckets.has(entry.worktreeId)) {
+      owners.add(entry.worktreeId)
+    }
+    for (const owner of owners) {
+      buckets.get(owner)?.migrations.push([key, entry])
+    }
+  }
+  for (const [key, entry] of Object.entries(inputs.retainedAgentsByPaneKey)) {
+    buckets.get(entry.worktreeId)?.retainedAgents.push([key, entry])
+  }
+  for (const file of inputs.openFiles) {
+    buckets.get(file.worktreeId)?.openFiles.push(file)
+  }
+  for (const [id, bucket] of buckets) {
+    result.set(id, {
+      agentStatusByPaneKey: Object.fromEntries(bucket.agentStatuses),
+      migrationUnsupportedByPtyId: Object.fromEntries(bucket.migrations),
+      retainedAgentsByPaneKey: Object.fromEntries(bucket.retainedAgents),
+      openFiles: bucket.openFiles
+    })
+  }
+  return result
+}
diff --git a/src/renderer/src/components/status-bar/workspace-space-presentation.ts b/src/renderer/src/components/status-bar/workspace-space-presentation.ts
index 5edad9ec7399..b88332e8a3f2 100644
--- a/src/renderer/src/components/status-bar/workspace-space-presentation.ts
+++ b/src/renderer/src/components/status-bar/workspace-space-presentation.ts
@@ -47,7 +47,7 @@ export type WorkspaceSpaceAgentActivityInputs = {
   now: number
 }
 
-function getPaneKeyTabId(paneKey: string): string | null {
+export function getPaneKeyTabId(paneKey: string): string | null {
   const parsed = parsePaneKey(paneKey)
   if (parsed) {
     return parsed.tabId
diff --git a/src/renderer/src/components/tab-bar/QuickLaunchButton.launch-status.test.tsx b/src/renderer/src/components/tab-bar/QuickLaunchButton.launch-status.test.tsx
index 370ca704b87b..becabddc7b83 100644
--- a/src/renderer/src/components/tab-bar/QuickLaunchButton.launch-status.test.tsx
+++ b/src/renderer/src/components/tab-bar/QuickLaunchButton.launch-status.test.tsx
@@ -48,6 +48,8 @@ vi.mock('@/i18n/i18n', () => ({
     fallback.replace('{{value0}}', values?.value0 ?? '')
 }))
 const launchMock = vi.hoisted(() => vi.fn())
+const toastError = vi.hoisted(() => vi.fn())
+vi.mock('sonner', () => ({ toast: { error: toastError, message: vi.fn(), success: vi.fn() } }))
 vi.mock('@/lib/launch-agent-in-new-tab', () => ({ launchAgentInNewTab: launchMock }))
 
 type DivProps = { disabled?: boolean; title?: string; onSelect?: () => void }
@@ -67,7 +69,7 @@ function registerLaunch(
     kind: 'first',
     requestId: `${agent}-pick`,
     blank: true,
-    stagedEntry: null
+    stagedPrompt: null
   }
 ): void {
   const sessionId = `${agent}-session`
@@ -149,7 +151,7 @@ describe('QuickLaunchAgentMenuItems launches', () => {
   it('gives each pick its own request, so a second pick opens its own chat', () => {
     launchMock.mockReset()
     launchMock.mockReturnValue({
-      surface: { kind: 'local-agent-session', tabId: 'tab-1', sessionId: 'codex-session' }
+      surface: { kind: 'host-published' }
     })
     render(
       <QuickLaunchAgentMenuItems
@@ -173,7 +175,7 @@ describe('QuickLaunchAgentMenuItems launches', () => {
   it("hands the launch's own delivery outcome to the notes menu", async () => {
     const delivery = Promise.resolve({ delivered: true, failureNotified: false })
     launchMock.mockReturnValue({
-      surface: { kind: 'local-agent-session', tabId: 'tab-1', sessionId: 'codex-session' },
+      surface: { kind: 'host-published' },
       promptDeliveryResult: delivery
     })
     const onPromptHandedOff = vi.fn()
@@ -194,6 +196,36 @@ describe('QuickLaunchAgentMenuItems launches', () => {
     await expect(onPromptHandedOff.mock.calls[0][0]).resolves.toEqual({ delivered: true })
   })
 
+  // The notes keep their text, so they are the one place that says it did not go.
+  it('tells the notes menu once why its notes did not reach the new agent', async () => {
+    launchMock.mockReturnValue({
+      surface: { kind: 'host-published' },
+      promptDeliveryResult: Promise.resolve({
+        delivered: false,
+        failureNotified: false,
+        unconfirmed: true
+      })
+    })
+    toastError.mockClear()
+
+    render(
+      <QuickLaunchAgentMenuItems
+        worktreeId={WORKTREE_ID}
+        groupId="group-1"
+        onFocusTerminal={vi.fn()}
+        prompt="review notes"
+        promptDelivery="submit-after-ready"
+        onPromptHandedOff={vi.fn()}
+      />
+    )
+    fireEvent.click(document.querySelector('[title="Launch Codex in a new terminal"]')!)
+
+    await vi.waitFor(() => expect(toastError).toHaveBeenCalledOnce())
+    expect(toastError).toHaveBeenCalledWith(expect.stringContaining("Couldn't send to"), {
+      description: expect.stringContaining("Orca couldn't confirm your message reached the agent")
+    })
+  })
+
   it('starts no agent when the menu has nothing left to send', () => {
     launchMock.mockClear()
     render(
diff --git a/src/renderer/src/components/tab-bar/QuickLaunchButton.tsx b/src/renderer/src/components/tab-bar/QuickLaunchButton.tsx
index 3a2f4a462195..3f4f490b1b1f 100644
--- a/src/renderer/src/components/tab-bar/QuickLaunchButton.tsx
+++ b/src/renderer/src/components/tab-bar/QuickLaunchButton.tsx
@@ -18,6 +18,7 @@ import {
 } from '../../../../shared/tui-agent-selection'
 import { translate } from '@/i18n/i18n'
 import { newAgentPromptOutcome } from '@/lib/new-agent-prompt-outcome'
+import { activeAgentNotesSendFailureMessage } from '@/lib/active-agent-note-send-result'
 
 export type QuickLaunchAgentMenuItemsProps = {
   worktreeId: string
@@ -146,7 +147,9 @@ function QuickLaunchAgentMenuItemsInner({
         ...(prompt !== undefined ? { prompt } : {}),
         ...(promptDelivery !== undefined ? { promptDelivery } : {}),
         ...(launchSource !== undefined ? { launchSource } : {}),
-        ...(onPromptDelivered !== undefined ? { onPromptDelivered } : {})
+        ...(onPromptDelivered !== undefined ? { onPromptDelivered } : {}),
+        // Notes keep their text until it goes out, so the new chat's composer never gets a copy.
+        ...(onPromptHandedOff ? { promptKeptByCaller: true as const } : {})
       })
       if (!result) {
         toast.error(
@@ -159,15 +162,24 @@ function QuickLaunchAgentMenuItemsInner({
         return
       }
       if (onPromptHandedOff && result.promptDeliveryResult) {
-        onPromptHandedOff(
-          newAgentPromptOutcome({
-            prompt: prompt ?? '',
-            ...(result.surface.kind === 'local-agent-session'
-              ? { sessionId: result.surface.sessionId }
-              : {}),
-            delivery: result.promptDeliveryResult
-          })
-        )
+        const outcome = newAgentPromptOutcome({ delivery: result.promptDeliveryResult })
+        onPromptHandedOff(outcome)
+        // The notes keep the text, so they say once why it did not go, as a send to a chat does.
+        void outcome.then(({ failure }) => {
+          if (failure) {
+            toast.error(
+              translate('auto.store.slices.ui.53883b7bc3', "Couldn't send to {{value0}}", {
+                value0: label
+              }),
+              {
+                description: activeAgentNotesSendFailureMessage(failure.status, {
+                  explicitTarget: true,
+                  code: failure.code
+                })
+              }
+            )
+          }
+        })
       }
       if (result.surface.kind !== 'local-terminal') {
         return
diff --git a/src/renderer/src/components/tab-bar/TabBar.os-file-drop.test.tsx b/src/renderer/src/components/tab-bar/TabBar.os-file-drop.test.tsx
new file mode 100644
index 000000000000..3aaaedcc2ee3
--- /dev/null
+++ b/src/renderer/src/components/tab-bar/TabBar.os-file-drop.test.tsx
@@ -0,0 +1,89 @@
+// @vitest-environment happy-dom
+import { act, cleanup, render, waitFor } from '@testing-library/react'
+import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest'
+import {
+  createTabBarProbeStore,
+  TAB_BAR_PROBE_PROPS,
+  tabBarRuntimeModelStubs,
+  tabBarShellStubs
+} from './use-tab-bar-runtime-model-worktree-write-probe'
+import type { TabBarProps } from './tab-bar-props'
+
+const mocks = vi.hoisted(() => ({ capture: vi.fn(), deliver: vi.fn() }))
+
+vi.mock('@/store', async () => ({ useAppStore: await createTabBarProbeStore() }))
+vi.mock('../../store', async () => ({ useAppStore: await createTabBarProbeStore() }))
+vi.mock('@/hooks/useShortcutLabel', () => tabBarRuntimeModelStubs().shortcutLabels())
+vi.mock('@/hooks/useDetectedAgents', () => tabBarRuntimeModelStubs().detectedAgents())
+vi.mock('@/hooks/useAgentDetectionTarget', () => tabBarRuntimeModelStubs().detectionTarget())
+vi.mock('@/lib/connection-context', () => tabBarRuntimeModelStubs().connectionContext())
+vi.mock('@/lib/worktree-runtime-owner', () => tabBarRuntimeModelStubs().runtimeOwner())
+vi.mock('@/runtime/runtime-rpc-client', () => tabBarRuntimeModelStubs().runtimeRpcClient())
+vi.mock('@/lib/native-chat-transcript-readability', () =>
+  tabBarRuntimeModelStubs().nativeChatReadability()
+)
+vi.mock('@/lib/client-creation-action-policy', () => tabBarRuntimeModelStubs().creationPolicy())
+vi.mock('./tab-agent-types-by-tab-id', () => tabBarRuntimeModelStubs().agentProjections())
+vi.mock('@/lib/local-preflight-context', () => tabBarRuntimeModelStubs().localPreflight())
+vi.mock('@/lib/windows-terminal-capabilities', () =>
+  tabBarRuntimeModelStubs().windowsCapabilities()
+)
+// The real surface needs the full menu model; this one only renders the strip root it is handed.
+vi.mock('./tab-bar-surface', () => ({
+  renderTabBarSurface: ({ surfaceRef }: { surfaceRef?: (node: HTMLDivElement | null) => void }) => (
+    <div ref={surfaceRef} data-testid="tab-strip">
+      <span data-testid="tab" />
+    </div>
+  )
+}))
+vi.mock('./use-tab-bar-create-menu-controller', () => ({
+  useTabBarCreateMenuController: () => ({ clearPendingNewTabMenuFocusOnUnmount: () => undefined })
+}))
+vi.mock('./use-tab-bar-item-projection', () => tabBarShellStubs().itemProjection())
+vi.mock('./tab-strip-overflow-navigation', () => tabBarShellStubs().overflowNavigation())
+vi.mock('./tab-strip-drag-scroll', () => tabBarShellStubs().dragScroll())
+vi.mock('@/lib/pane-manager/client-hosted-browser-row-state', () =>
+  tabBarShellStubs().clientHostedBrowserRows()
+)
+vi.mock('../editor/editor-dropped-file-open', () => ({
+  captureEditorFileDropOpen: mocks.capture,
+  editorGroupStillExists: () => true
+}))
+
+function dropFile(target: Element): void {
+  const transfer = { types: ['Files'], files: [new File(['x'], 'a.ts')], dropEffect: 'move' }
+  const event = new Event('drop', { bubbles: true, cancelable: true, composed: true })
+  Object.defineProperty(event, 'dataTransfer', { value: transfer })
+  Object.defineProperty(event, 'isTrusted', { value: true })
+  act(() => {
+    target.dispatchEvent(event)
+  })
+}
+
+beforeEach(async () => {
+  ;(await createTabBarProbeStore()).setState({ activeWorktreeId: 'wt-active' })
+  mocks.capture.mockImplementation(() => mocks.deliver)
+  vi.stubGlobal('api', {
+    fs: {
+      getPathForFile: (file: File) => `/Users/me/${file.name}`,
+      prepareDroppedPaths: async ({ paths }: { paths: string[] }) => ({ paths, failures: [] })
+    }
+  })
+})
+
+afterEach(() => {
+  cleanup()
+  vi.unstubAllGlobals()
+  vi.clearAllMocks()
+})
+
+describe('TabBar OS file drops', () => {
+  it("opens a file dropped on the strip in the strip's own worktree and group", async () => {
+    const { default: TabBar } = await import('./TabBar')
+    const props: TabBarProps = { ...TAB_BAR_PROBE_PROPS, tabs: [], groupId: 'group-target' }
+    const view = render(<TabBar {...props} />)
+    dropFile(view.getByTestId('tab'))
+    expect(mocks.capture).toHaveBeenCalledWith({ worktreeId: 'wt-target', groupId: 'group-target' })
+    await waitFor(() => expect(mocks.deliver).toHaveBeenCalledWith(['/Users/me/a.ts']))
+  })
+})
diff --git a/src/renderer/src/components/tab-bar/TabBar.tsx b/src/renderer/src/components/tab-bar/TabBar.tsx
index 99e22b3f29e2..198e4a08af20 100644
--- a/src/renderer/src/components/tab-bar/TabBar.tsx
+++ b/src/renderer/src/components/tab-bar/TabBar.tsx
@@ -1,4 +1,4 @@
-import React from 'react'
+import React, { useCallback } from 'react'
 import { useTabStripOverflowNavigation } from './tab-strip-overflow-navigation'
 import { useTabStripDragScrollHandlers } from './tab-strip-drag-scroll'
 import type { TabBarProps } from './tab-bar-props'
@@ -9,6 +9,7 @@ import { useTabBarItemProjection } from './use-tab-bar-item-projection'
 import { renderTabBarSurface } from './tab-bar-surface'
 import { useTabBarItemActions } from './use-tab-bar-item-actions'
 import { useActiveClientHostedBrowserRowId } from '@/lib/pane-manager/client-hosted-browser-row-state'
+import { useEditorGroupFileDropOwner } from '../editor/use-editor-group-file-drop-owner'
 
 function TabBarInner(props: TabBarProps): React.JSX.Element {
   const {
@@ -85,6 +86,15 @@ function TabBarInner(props: TabBarProps): React.JSX.Element {
     ].join('|'),
     worktreeId
   })
+  const attachFileDropOwner = useEditorGroupFileDropOwner({ worktreeId, groupId })
+  const { clearPendingNewTabMenuFocusOnUnmount } = createMenu
+  const surfaceRef = useCallback(
+    (node: HTMLDivElement | null) => {
+      clearPendingNewTabMenuFocusOnUnmount(node)
+      attachFileDropOwner(node)
+    },
+    [attachFileDropOwner, clearPendingNewTabMenuFocusOnUnmount]
+  )
   const tabStripDragScroll = useTabStripDragScrollHandlers(tabStripNavigation.scrollTabStrip, {
     start: tabStripNavigation.tabStripOverflowState.canScrollStart,
     end: tabStripNavigation.tabStripOverflowState.canScrollEnd
@@ -98,7 +108,8 @@ function TabBarInner(props: TabBarProps): React.JSX.Element {
     tabStripNavigation,
     tabStripDragScroll,
     activeClientHostedBrowserRowId,
-    itemActions
+    itemActions,
+    surfaceRef
   })
 }
 
diff --git a/src/renderer/src/components/tab-bar/tab-bar-surface.tsx b/src/renderer/src/components/tab-bar/tab-bar-surface.tsx
index 9e2cc2c5c970..123dedff1ff2 100644
--- a/src/renderer/src/components/tab-bar/tab-bar-surface.tsx
+++ b/src/renderer/src/components/tab-bar/tab-bar-surface.tsx
@@ -37,7 +37,8 @@ export function renderTabBarSurface({
   tabStripNavigation,
   tabStripDragScroll,
   activeClientHostedBrowserRowId,
-  itemActions
+  itemActions,
+  surfaceRef
 }: {
   props: TabBarProps
   runtime: TabBarRuntimeModel
@@ -47,6 +48,7 @@ export function renderTabBarSurface({
   tabStripDragScroll: ReturnType<typeof useTabStripDragScrollHandlers>
   activeClientHostedBrowserRowId: string | null
   itemActions: TabBarItemActions
+  surfaceRef: (node: HTMLDivElement | null) => void
 }): React.JSX.Element {
   const {
     worktreeId,
@@ -81,7 +83,6 @@ export function renderTabBarSurface({
     handleSelectCreateMenuOption,
     launchAgentFromNewTabEntry,
     runPendingNewTabMenuFocusAfterClose,
-    clearPendingNewTabMenuFocusOnUnmount,
     queueNewActiveTerminalFocusAfterNewTabMenuClose,
     queueTerminalTabFocusAfterNewTabMenuClose,
     queueFocusAfterNewTabMenuClose,
@@ -108,12 +109,7 @@ export function renderTabBarSurface({
   })
 
   return (
-    <div
-      ref={clearPendingNewTabMenuFocusOnUnmount}
-      className="flex items-stretch h-full overflow-hidden flex-1 min-w-0"
-      // Why: preload routes native OS drops by this marker — only the tab strip opens files in the editor, not terminal panes.
-      data-native-file-drop-target="editor"
-    >
+    <div ref={surfaceRef} className="flex items-stretch h-full overflow-hidden flex-1 min-w-0">
       {tabStripOverflowState.hasOverflow ? (
         <Tooltip>
           <TooltipTrigger asChild>
diff --git a/src/renderer/src/components/tab-group/TabGroupPanel.os-file-drop.test.tsx b/src/renderer/src/components/tab-group/TabGroupPanel.os-file-drop.test.tsx
new file mode 100644
index 000000000000..627e1c228937
--- /dev/null
+++ b/src/renderer/src/components/tab-group/TabGroupPanel.os-file-drop.test.tsx
@@ -0,0 +1,115 @@
+// @vitest-environment happy-dom
+import { useEffect, useRef } from 'react'
+import { act, cleanup, render, waitFor } from '@testing-library/react'
+import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest'
+
+const mocks = vi.hoisted(() => {
+  const state = {
+    activeWorktreeId: 'wt-active',
+    rightSidebarOpen: true,
+    sidebarOpen: true,
+    groupsByWorktree: {}
+  }
+  const useAppStore = (selector: (current: typeof state) => unknown): unknown => selector(state)
+  useAppStore.getState = () => state
+  return { capture: vi.fn(), deliver: vi.fn(), monacoSawDrop: vi.fn(), useAppStore }
+})
+vi.mock('@/store', () => ({ useAppStore: mocks.useAppStore }))
+vi.mock('../../store', () => ({ useAppStore: mocks.useAppStore }))
+vi.mock('../editor/editor-dropped-file-open', () => ({
+  captureEditorFileDropOpen: mocks.capture,
+  editorGroupStillExists: () => true
+}))
+vi.mock('../tab-bar/TabBar', () => ({ default: () => null }))
+vi.mock('../tab-bar/TabBarQuickCommandsButton', () => ({ TabBarQuickCommandsButton: () => null }))
+vi.mock('@/lib/pane-manager/client-hosted-browser-row-state', () => ({
+  useClientHostedBrowserRows: () => []
+}))
+vi.mock('./useTabGroupWorkspaceModel', () => ({
+  useTabGroupWorkspaceModel: () => ({
+    activeTab: { id: 'tab-1', entityId: 'file-1', contentType: 'editor' },
+    agentSessionItems: [],
+    browserItems: [],
+    commands: { focusGroup: () => undefined },
+    editorItems: [],
+    tabBarOrder: [],
+    terminalTabs: [],
+    groupTabs: [],
+    expandedPaneByTabId: {}
+  })
+}))
+// Stands in for Monaco, which listens for drops on its own DOM node.
+vi.mock('../editor/EditorPanel', () => ({
+  default: function FakeMonaco() {
+    const ref = useRef<HTMLDivElement>(null)
+    useEffect(() => {
+      const node = ref.current
+      node?.addEventListener('drop', mocks.monacoSawDrop)
+      node?.addEventListener('dragover', mocks.monacoSawDrop)
+      return () => {
+        node?.removeEventListener('drop', mocks.monacoSawDrop)
+        node?.removeEventListener('dragover', mocks.monacoSawDrop)
+      }
+    }, [])
+    return (
+      <div ref={ref} data-testid="monaco">
+        <textarea data-testid="monaco-input" />
+      </div>
+    )
+  }
+}))
+
+import TabGroupPanel from './TabGroupPanel'
+
+function drag(target: Element, type: 'dragover' | 'drop'): Event {
+  const transfer = { types: ['Files'], files: [new File(['x'], 'dropped.md')], dropEffect: 'move' }
+  const event = new Event(type, { bubbles: true, cancelable: true, composed: true })
+  Object.defineProperty(event, 'dataTransfer', { value: transfer })
+  Object.defineProperty(event, 'isTrusted', { value: true })
+  act(() => {
+    target.dispatchEvent(event)
+  })
+  return event
+}
+
+beforeEach(() => {
+  mocks.capture.mockImplementation(() => mocks.deliver)
+  vi.stubGlobal('api', {
+    fs: {
+      getPathForFile: (file: File) => `/Users/me/${file.name}`,
+      prepareDroppedPaths: async ({ paths }: { paths: string[] }) => ({ paths, failures: [] })
+    }
+  })
+})
+
+afterEach(() => {
+  cleanup()
+  vi.unstubAllGlobals()
+  vi.clearAllMocks()
+})
+
+describe('TabGroupPanel editor area OS file drops', () => {
+  it("opens a file dropped on the editor in this group's worktree, and Monaco never sees it", async () => {
+    const view = render(
+      <TabGroupPanel
+        groupId="group-b"
+        worktreeId="wt-b"
+        isVisible
+        isFocused={false}
+        hasSplitGroups
+        touchesLeftEdge={false}
+        touchesRightEdge={false}
+        reserveClosedExplorerToggleSpace={false}
+        reserveCollapsedSidebarHeaderSpace={false}
+      />
+    )
+    const input = await view.findByTestId('monaco-input')
+    drag(input, 'dragover')
+    const drop = drag(input, 'drop')
+
+    expect(drop.defaultPrevented).toBe(true)
+    expect(mocks.monacoSawDrop).not.toHaveBeenCalled()
+    expect(mocks.capture).toHaveBeenCalledWith({ worktreeId: 'wt-b', groupId: 'group-b' })
+    await waitFor(() => expect(mocks.deliver).toHaveBeenCalledWith(['/Users/me/dropped.md']))
+  })
+})
diff --git a/src/renderer/src/components/tab-group/TabGroupPanel.tsx b/src/renderer/src/components/tab-group/TabGroupPanel.tsx
index b7476c499ab8..94b29b544a87 100644
--- a/src/renderer/src/components/tab-group/TabGroupPanel.tsx
+++ b/src/renderer/src/components/tab-group/TabGroupPanel.tsx
@@ -24,6 +24,7 @@ import type { TabGroup } from '../../../../shared/tab-types'
 import type { ClientHostedBrowserRow } from '../../../../shared/client-hosted-browser-rows'
 import { useClientHostedBrowserRows } from '@/lib/pane-manager/client-hosted-browser-row-state'
 import { resolveClientHostedBrowserRowStripGroupId } from '../tab-bar/client-hosted-browser-row-strip-placement'
+import { useEditorGroupFileDropOwner } from '../editor/use-editor-group-file-drop-owner'
 
 const EditorPanel = lazy(() => import('../editor/EditorPanel'))
 const EMPTY_GROUPS: readonly TabGroup[] = []
@@ -117,6 +118,7 @@ export default function TabGroupPanel({
     },
     [groupId, setBodyDropRef]
   )
+  const attachEditorFileDropOwner = useEditorGroupFileDropOwner({ worktreeId, groupId })
   // 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.
@@ -380,7 +382,8 @@ export default function TabGroupPanel({
           activeTab.contentType !== 'agent-session' &&
           activeTab.contentType !== 'browser' &&
           activeTab.contentType !== 'simulator' && (
-            <div className="absolute inset-0 flex min-h-0 min-w-0">
+            // Why: a capture-phase owner, so Monaco never sees the drop and the file opens as a tab here.
+            <div ref={attachEditorFileDropOwner} className="absolute inset-0 flex min-h-0 min-w-0">
               {/* Why: split groups render editor content in a plain relative pane body, not the legacy Terminal.tsx flex column. */}
               <Suspense
                 fallback={
diff --git a/src/renderer/src/components/tab-group/workspace-tab-close-commands.floating-reclaim.test.ts b/src/renderer/src/components/tab-group/workspace-tab-close-commands.floating-reclaim.test.ts
index b0aa5da13f23..00743829fb83 100644
--- a/src/renderer/src/components/tab-group/workspace-tab-close-commands.floating-reclaim.test.ts
+++ b/src/renderer/src/components/tab-group/workspace-tab-close-commands.floating-reclaim.test.ts
@@ -33,7 +33,7 @@ vi.mock('@/store/pinned-tab-close-guard', () => ({
 
 import { dispatchWorkspaceTabCommand } from '@/lib/workspace-tab-commands'
 import { useAppStore } from '../../store'
-import { makeOpenFile } from '../../store/slices/store-test-helpers'
+import { makeOpenFile } from '../../store/slices/store-session-test-harness'
 
 const terminalTab: Tab = {
   id: 'unified-terminal',
diff --git a/src/renderer/src/components/task-page/github/Rows.tsx b/src/renderer/src/components/task-page/github/Rows.tsx
index 5894a60003ae..2597095f5ae6 100644
--- a/src/renderer/src/components/task-page/github/Rows.tsx
+++ b/src/renderer/src/components/task-page/github/Rows.tsx
@@ -70,7 +70,8 @@ export function TaskPageGitHubRows({
             allWorktrees,
             item.repoId,
             item.type,
-            item.number
+            item.number,
+            item.url
           )
           const attachedWorkspaceLabel = attachedWorkspace
             ? getWorktreeAttachmentLabel(attachedWorkspace)
diff --git a/src/renderer/src/components/terminal-pane/ClaudeOldTerminalBanner.tsx b/src/renderer/src/components/terminal-pane/ClaudeOldTerminalBanner.tsx
new file mode 100644
index 000000000000..e49d63940de3
--- /dev/null
+++ b/src/renderer/src/components/terminal-pane/ClaudeOldTerminalBanner.tsx
@@ -0,0 +1,143 @@
+import { useEffect, useState } from 'react'
+import { Button } from '@/components/ui/button'
+import { translate } from '@/i18n/i18n'
+import { useAppStore } from '@/store'
+import type { AppState } from '@/store/types'
+import { makePaneKey } from '../../../../shared/stable-pane-id'
+import { useModalReturnFocus } from '@/hooks/useModalReturnFocus'
+import { OldTerminalDialog } from './OldTerminalDialog'
+import { openTerminalBesideTab } from './open-terminal-beside-tab'
+import { PaneBannerLearnMore, PaneTopWarningBanner } from './PaneTopWarningBanner'
+
+// Why module scope: a pane remounts on tab switches, and Dismiss must hold for the app session.
+const dismissedPtyIds = new Set<string>()
+
+// Why a selection, not just saved accounts: with System default selected, this terminal already
+// matches a new one.
+function hasSelectedClaudeAccount(state: AppState): boolean {
+  const settings = state.settings
+  if (!settings || settings.claudeManagedAccounts.length === 0) {
+    return false
+  }
+  const selection = settings.activeClaudeManagedAccountIdsByRuntime
+  return Boolean(
+    selection?.host ??
+    settings.activeClaudeManagedAccountId ??
+    Object.values(selection?.wsl ?? {}).some(Boolean)
+  )
+}
+
+function useOpenedBeforeClaudeAccounts(ptyId: string, enabled: boolean): boolean {
+  const [openedBefore, setOpenedBefore] = useState(false)
+  useEffect(() => {
+    if (!enabled) {
+      return
+    }
+    let cancelled = false
+    void window.api.pty
+      .openedBeforeClaudeAccounts(ptyId)
+      .catch(() => false)
+      .then((answer) => {
+        if (!cancelled) {
+          setOpenedBefore(answer)
+        }
+      })
+    return () => {
+      cancelled = true
+      setOpenedBefore(false)
+    }
+  }, [enabled, ptyId])
+  return openedBefore
+}
+
+/** For Claude in a terminal whose shell predates per-account folders: its `claude` ignores the selection. */
+export function ClaudeOldTerminalBanner({
+  ptyId,
+  tabId,
+  leafId
+}: {
+  ptyId: string
+  tabId: string
+  leafId: string
+}): React.JSX.Element | null {
+  const paneKey = makePaneKey(tabId, leafId)
+  const [dismissed, setDismissed] = useState(() => dismissedPtyIds.has(ptyId))
+  const accountSelected = useAppStore(hasSelectedClaudeAccount)
+  // Why either signal: a typed claude is seen by the process read, or by its hooks.
+  const claudeInPane = useAppStore(
+    (state) =>
+      state.paneForegroundAgentByPaneKey[paneKey]?.agent === 'claude' ||
+      state.agentStatusByPaneKey[paneKey]?.agentType === 'claude'
+  )
+  const openedBefore = useOpenedBeforeClaudeAccounts(
+    ptyId,
+    accountSelected && claudeInPane && !dismissed
+  )
+  const [dialogOpen, setDialogOpen] = useState(false)
+  // Why: the dialog has no Radix trigger, so closing it would leave focus on document.body.
+  const { captureReturnFocus, skipReturnFocus } = useModalReturnFocus(dialogOpen)
+  if (!openedBefore && !dialogOpen) {
+    return null
+  }
+  return (
+    <>
+      {openedBefore ? (
+        <PaneTopWarningBanner
+          title={translate(
+            'terminal.claudeOldTerminalBanner.title',
+            "This terminal was opened before Orca's Claude account update, so claude here uses System default's login."
+          )}
+          body={
+            <PaneBannerLearnMore
+              onClick={() => {
+                captureReturnFocus()
+                setDialogOpen(true)
+              }}
+            />
+          }
+          primaryAction={
+            <Button
+              type="button"
+              variant="outline"
+              size="xs"
+              onClick={() => openTerminalBesideTab(tabId)}
+            >
+              {translate('terminal.paneTopBanner.openNewTerminal', 'Open new terminal')}
+            </Button>
+          }
+          onDismiss={() => {
+            dismissedPtyIds.add(ptyId)
+            setDismissed(true)
+          }}
+        />
+      ) : null}
+      <OldTerminalDialog
+        open={dialogOpen}
+        title={translate(
+          'terminal.claudeOldTerminalBanner.dialogTitle',
+          "Why claude here doesn't use the selected account"
+        )}
+        description={translate(
+          'terminal.claudeOldTerminalBanner.dialogDescription',
+          'Orca now keeps each Claude account in its own folder, and claude in a new terminal follows the account you select.'
+        )}
+        cause={translate(
+          'terminal.claudeOldTerminalBanner.dialogCause',
+          "Terminals opened before this update don't, so claude here signs in with System default's login. Open a new terminal to use the selected account."
+        )}
+        onOpenChange={(open) => {
+          if (!open) {
+            setDialogOpen(false)
+          }
+        }}
+        onOpenNewTerminal={() => {
+          // Why: a new terminal takes focus; only when none opens does focus return to this pane.
+          if (openTerminalBesideTab(tabId)) {
+            skipReturnFocus()
+          }
+          setDialogOpen(false)
+        }}
+      />
+    </>
+  )
+}
diff --git a/src/renderer/src/components/terminal-pane/CodexOldTerminalDialog.tsx b/src/renderer/src/components/terminal-pane/CodexOldTerminalDialog.tsx
deleted file mode 100644
index 60238ca38323..000000000000
--- a/src/renderer/src/components/terminal-pane/CodexOldTerminalDialog.tsx
+++ /dev/null
@@ -1,54 +0,0 @@
-import { Button } from '@/components/ui/button'
-import {
-  Dialog,
-  DialogContent,
-  DialogDescription,
-  DialogFooter,
-  DialogHeader,
-  DialogTitle
-} from '@/components/ui/dialog'
-import { translate } from '@/i18n/i18n'
-
-/** Learn more for a terminal opened before Orca gave each Codex its own server. */
-export function CodexOldTerminalDialog({
-  open,
-  onOpenChange,
-  onOpenNewTerminal
-}: {
-  open: boolean
-  onOpenChange: (open: boolean) => void
-  onOpenNewTerminal: () => void
-}): React.JSX.Element {
-  return (
-    <Dialog open={open} onOpenChange={onOpenChange}>
-      <DialogContent className="sm:max-w-md">
-        <DialogHeader>
-          <DialogTitle>
-            {translate(
-              'terminal.codexSharedServerBanner.oldTerminalDialogTitle',
-              'Why this Codex shares a server'
-            )}
-          </DialogTitle>
-          <DialogDescription>
-            {translate(
-              'terminal.codexSharedServerBanner.oldTerminalDialogRisk',
-              'Codex sessions that share a server can end together, and agent status can be wrong.'
-            )}
-          </DialogDescription>
-        </DialogHeader>
-        <p className="text-sm text-muted-foreground">
-          {translate(
-            'terminal.codexSharedServerBanner.oldTerminalDialogCause',
-            'Older terminals still share a Codex server. Open a new terminal to run Codex on a separate server.'
-          )}
-        </p>
-        {/* Why no global fix: a new terminal already runs Codex on its own server here. */}
-        <DialogFooter>
-          <Button type="button" autoFocus onClick={onOpenNewTerminal}>
-            {translate('terminal.codexSharedServerBanner.openNewTerminal', 'Open new terminal')}
-          </Button>
-        </DialogFooter>
-      </DialogContent>
-    </Dialog>
-  )
-}
diff --git a/src/renderer/src/components/terminal-pane/CodexSharedServerBanner.tsx b/src/renderer/src/components/terminal-pane/CodexSharedServerBanner.tsx
index 942647054650..01a50ea27b00 100644
--- a/src/renderer/src/components/terminal-pane/CodexSharedServerBanner.tsx
+++ b/src/renderer/src/components/terminal-pane/CodexSharedServerBanner.tsx
@@ -1,18 +1,15 @@
-import { useEffect, useLayoutEffect, useRef, useState } from 'react'
-import { TriangleAlert } from 'lucide-react'
+import { useEffect, useState } from 'react'
 import { Button } from '@/components/ui/button'
 import { translate } from '@/i18n/i18n'
 import { useAppStore } from '@/store'
 import { isCodexSharedServerWarningEnabled } from '../../../../shared/codex-terminal-server-isolation'
 import type { CodexSharedServerStatus } from '../../../../shared/codex-shared-server-command'
-import { FLOATING_TERMINAL_WORKTREE_ID } from '../../../../shared/constants'
 import { makePaneKey } from '../../../../shared/stable-pane-id'
-import { createFloatingWorkspaceTerminalTab } from '@/lib/floating-workspace-tab-creation'
-import { revealFloatingWorkspacePanel } from '@/lib/floating-workspace-panel-reveal'
-import { activateAndRevealWorkspace } from '@/lib/worktree-activation'
 import { useModalReturnFocus } from '@/hooks/useModalReturnFocus'
-import { CodexOldTerminalDialog } from './CodexOldTerminalDialog'
+import { OldTerminalDialog } from './OldTerminalDialog'
 import { CodexSharedServerFixDialog } from './CodexSharedServerFixDialog'
+import { openTerminalBesideTab } from './open-terminal-beside-tab'
+import { PaneBannerLearnMore, PaneTopWarningBanner } from './PaneTopWarningBanner'
 import { retireCodexTerminalServerIsolationNotice } from './codex-terminal-server-isolation-notice'
 
 // Why a ladder: Codex joins or starts the server a few seconds after its process appears.
@@ -70,53 +67,6 @@ function usePaneCodexSharedServerStatus(
   return status
 }
 
-/** Opens a new terminal where this tab lives; a new terminal's shell has Orca's codex wrapper. */
-function openTerminalBesideTab(terminalTabId: string): boolean {
-  const state = useAppStore.getState()
-  const tab = Object.values(state.unifiedTabsByWorktree)
-    .flat()
-    .find(
-      (candidate) => candidate.contentType === 'terminal' && candidate.entityId === terminalTabId
-    )
-  if (!tab) {
-    return false
-  }
-  if (tab.worktreeId === FLOATING_TERMINAL_WORKTREE_ID) {
-    revealFloatingWorkspacePanel(state)
-    void createFloatingWorkspaceTerminalTab(state)
-    return true
-  }
-  // Why always: Activity can show this pane behind its own view even when its workspace is active.
-  if (activateAndRevealWorkspace(tab.worktreeId) === false) {
-    return false
-  }
-  void useAppStore.getState().openNewTerminalTabInActiveWorkspace(tab.groupId)
-  return true
-}
-
-/** Reserves the banner's height at the top of its pane so the terminal refits below it. */
-function useReservePaneTopSpace(): React.RefObject<HTMLDivElement | null> {
-  const ref = useRef<HTMLDivElement>(null)
-  useLayoutEffect(() => {
-    const banner = ref.current
-    const pane = banner?.parentElement
-    if (!banner || !pane) {
-      return
-    }
-    const reserve = (): void => {
-      pane.style.setProperty('--orca-pane-top-banner-height', `${banner.offsetHeight}px`)
-    }
-    reserve()
-    const observer = new ResizeObserver(reserve)
-    observer.observe(banner)
-    return () => {
-      observer.disconnect()
-      pane.style.removeProperty('--orca-pane-top-banner-height')
-    }
-  }, [])
-  return ref
-}
-
 export function CodexSharedServerBanner({
   ptyId,
   tabId,
@@ -165,7 +115,7 @@ export function CodexSharedServerBanner({
                 'terminal.codexSharedServerBanner.openedBeforeUpdateBody',
                 'This terminal was opened before Orca started giving each Codex its own server.'
               )}{' '}
-              <LearnMoreLink onClick={() => showDialog('oldTerminal')} />
+              <PaneBannerLearnMore onClick={() => showDialog('oldTerminal')} />
             </>
           ),
           primaryAction: (
@@ -175,7 +125,7 @@ export function CodexSharedServerBanner({
               size="xs"
               onClick={() => openTerminalBesideTab(tabId)}
             >
-              {translate('terminal.codexSharedServerBanner.openNewTerminal', 'Open new terminal')}
+              {translate('terminal.paneTopBanner.openNewTerminal', 'Open new terminal')}
             </Button>
           )
         }
@@ -186,7 +136,7 @@ export function CodexSharedServerBanner({
                 'terminal.codexSharedServerBanner.body',
                 'Sessions may end unexpectedly, and agent status may be wrong.'
               )}{' '}
-              <LearnMoreLink onClick={() => showDialog('fix')} />
+              <PaneBannerLearnMore onClick={() => showDialog('fix')} />
             </>
           ),
           primaryAction: (
@@ -203,7 +153,11 @@ export function CodexSharedServerBanner({
   return (
     <>
       {status ? (
-        <CodexSharedServerBannerFrame
+        <PaneTopWarningBanner
+          title={translate(
+            'terminal.codexSharedServerBanner.title',
+            'This Codex is sharing a server with your other Codex tabs'
+          )}
           body={body}
           primaryAction={primaryAction}
           onDismiss={() => {
@@ -213,10 +167,23 @@ export function CodexSharedServerBanner({
           onDontShowAgain={() =>
             void useAppStore.getState().updateSettings({ codexSharedServerWarning: false })
           }
+          onShown={retireCodexTerminalServerIsolationNotice}
         />
       ) : null}
-      <CodexOldTerminalDialog
+      <OldTerminalDialog
         open={openDialog === 'oldTerminal'}
+        title={translate(
+          'terminal.codexSharedServerBanner.oldTerminalDialogTitle',
+          'Why this Codex shares a server'
+        )}
+        description={translate(
+          'terminal.codexSharedServerBanner.oldTerminalDialogRisk',
+          'Codex sessions that share a server can end together, and agent status can be wrong.'
+        )}
+        cause={translate(
+          'terminal.codexSharedServerBanner.oldTerminalDialogCause',
+          'Older terminals still share a Codex server. Open a new terminal to run Codex on a separate server.'
+        )}
         onOpenChange={closeDialog}
         onOpenNewTerminal={() => {
           // Why: a new terminal takes focus; only when none opens does focus return to this pane.
@@ -235,68 +202,3 @@ export function CodexSharedServerBanner({
     </>
   )
 }
-
-function LearnMoreLink({ onClick }: { onClick: () => void }): React.JSX.Element {
-  return (
-    <button
-      type="button"
-      className="text-foreground underline underline-offset-2 hover:text-foreground/80"
-      onClick={onClick}
-    >
-      {translate('terminal.codexSharedServerBanner.learnMore', 'Learn more')}
-    </button>
-  )
-}
-
-function CodexSharedServerBannerFrame({
-  body,
-  primaryAction,
-  onDismiss,
-  onDontShowAgain
-}: {
-  body: React.ReactNode
-  primaryAction: React.ReactNode
-  onDismiss: () => void
-  onDontShowAgain: () => void
-}): React.JSX.Element {
-  const ref = useReservePaneTopSpace()
-  useEffect(retireCodexTerminalServerIsolationNotice, [])
-
-  return (
-    <div
-      ref={ref}
-      role="status"
-      // Why pr-16: the pane's own split/close controls float over its top-right corner.
-      className="pane-top-banner @container border-b border-status-warning-border bg-status-warning-background py-2 pr-16 pl-3 text-xs"
-    >
-      {/* Why a container query: split panes are narrow, so actions drop below the text there.
-          Narrow and wide variants never share a property, so an unlayered utility cannot override them. */}
-      <div className="@[44rem]:flex @[44rem]:items-center @[44rem]:gap-2">
-        <div className="flex min-w-0 flex-1 items-start gap-2.5">
-          <TriangleAlert
-            className="mt-0.5 size-4 shrink-0 text-status-warning"
-            aria-hidden="true"
-          />
-          <div className="min-w-0 leading-5">
-            <p className="font-medium text-foreground">
-              {translate(
-                'terminal.codexSharedServerBanner.title',
-                'This Codex is sharing a server with your other Codex tabs'
-              )}
-            </p>
-            <p className="text-muted-foreground">{body}</p>
-          </div>
-        </div>
-        <div className="flex flex-wrap items-center gap-1 @[44rem]:shrink-0 @max-[44rem]:mt-1.5 @max-[44rem]:pl-6.5">
-          {primaryAction}
-          <Button type="button" variant="ghost" size="xs" onClick={onDontShowAgain}>
-            {translate('terminal.codexSharedServerBanner.dontShowAgain', "Don't show again")}
-          </Button>
-          <Button type="button" variant="ghost" size="xs" onClick={onDismiss}>
-            {translate('terminal.codexSharedServerBanner.dismiss', 'Dismiss')}
-          </Button>
-        </div>
-      </div>
-    </div>
-  )
-}
diff --git a/src/renderer/src/components/terminal-pane/OldTerminalDialog.tsx b/src/renderer/src/components/terminal-pane/OldTerminalDialog.tsx
new file mode 100644
index 000000000000..9665e4b5c3e8
--- /dev/null
+++ b/src/renderer/src/components/terminal-pane/OldTerminalDialog.tsx
@@ -0,0 +1,45 @@
+import { Button } from '@/components/ui/button'
+import {
+  Dialog,
+  DialogContent,
+  DialogDescription,
+  DialogFooter,
+  DialogHeader,
+  DialogTitle
+} from '@/components/ui/dialog'
+import { translate } from '@/i18n/i18n'
+
+/** Learn more for a terminal opened before an Orca update its shell does not have. */
+export function OldTerminalDialog({
+  open,
+  onOpenChange,
+  onOpenNewTerminal,
+  title,
+  description,
+  cause
+}: {
+  open: boolean
+  onOpenChange: (open: boolean) => void
+  onOpenNewTerminal: () => void
+  title: string
+  description: string
+  cause: string
+}): React.JSX.Element {
+  return (
+    <Dialog open={open} onOpenChange={onOpenChange}>
+      <DialogContent className="sm:max-w-md">
+        <DialogHeader>
+          <DialogTitle>{title}</DialogTitle>
+          <DialogDescription>{description}</DialogDescription>
+        </DialogHeader>
+        <p className="text-sm text-muted-foreground">{cause}</p>
+        {/* Why no global fix: a new terminal already has the update. */}
+        <DialogFooter>
+          <Button type="button" autoFocus onClick={onOpenNewTerminal}>
+            {translate('terminal.paneTopBanner.openNewTerminal', 'Open new terminal')}
+          </Button>
+        </DialogFooter>
+      </DialogContent>
+    </Dialog>
+  )
+}
diff --git a/src/renderer/src/components/terminal-pane/PaneTopWarningBanner.tsx b/src/renderer/src/components/terminal-pane/PaneTopWarningBanner.tsx
new file mode 100644
index 000000000000..50eb7b4179cb
--- /dev/null
+++ b/src/renderer/src/components/terminal-pane/PaneTopWarningBanner.tsx
@@ -0,0 +1,96 @@
+import { useEffect, useLayoutEffect, useRef } from 'react'
+import { TriangleAlert } from 'lucide-react'
+import { Button } from '@/components/ui/button'
+import { translate } from '@/i18n/i18n'
+
+/** Reserves the banner's height at the top of its pane so the terminal refits below it. */
+function useReservePaneTopSpace(): React.RefObject<HTMLDivElement | null> {
+  const ref = useRef<HTMLDivElement>(null)
+  useLayoutEffect(() => {
+    const banner = ref.current
+    const pane = banner?.parentElement
+    if (!banner || !pane) {
+      return
+    }
+    const reserve = (): void => {
+      pane.style.setProperty('--orca-pane-top-banner-height', `${banner.offsetHeight}px`)
+    }
+    reserve()
+    const observer = new ResizeObserver(reserve)
+    observer.observe(banner)
+    return () => {
+      observer.disconnect()
+      pane.style.removeProperty('--orca-pane-top-banner-height')
+    }
+  }, [])
+  return ref
+}
+
+export function PaneBannerLearnMore({ onClick }: { onClick: () => void }): React.JSX.Element {
+  return (
+    <button
+      type="button"
+      className="text-foreground underline underline-offset-2 hover:text-foreground/80"
+      onClick={onClick}
+    >
+      {translate('terminal.paneTopBanner.learnMore', 'Learn more')}
+    </button>
+  )
+}
+
+/** The warning strip across the top of a terminal pane, with its actions and Dismiss. */
+export function PaneTopWarningBanner({
+  title,
+  body,
+  primaryAction,
+  onDismiss,
+  onDontShowAgain,
+  onShown
+}: {
+  title: string
+  body: React.ReactNode
+  primaryAction: React.ReactNode
+  onDismiss: () => void
+  onDontShowAgain?: () => void
+  onShown?: () => void
+}): React.JSX.Element {
+  const ref = useReservePaneTopSpace()
+  useEffect(() => {
+    onShown?.()
+  }, [onShown])
+
+  return (
+    <div
+      ref={ref}
+      role="status"
+      // Why pr-16: the pane's own split/close controls float over its top-right corner.
+      className="pane-top-banner @container border-b border-status-warning-border bg-status-warning-background py-2 pr-16 pl-3 text-xs"
+    >
+      {/* Why a container query: split panes are narrow, so actions drop below the text there.
+          Narrow and wide variants never share a property, so an unlayered utility cannot override them. */}
+      <div className="@[44rem]:flex @[44rem]:items-center @[44rem]:gap-2">
+        <div className="flex min-w-0 flex-1 items-start gap-2.5">
+          <TriangleAlert
+            className="mt-0.5 size-4 shrink-0 text-status-warning"
+            aria-hidden="true"
+          />
+          <div className="min-w-0 leading-5">
+            <p className="font-medium text-foreground">{title}</p>
+            <p className="text-muted-foreground">{body}</p>
+          </div>
+        </div>
+        <div className="flex flex-wrap items-center gap-1 @[44rem]:shrink-0 @max-[44rem]:mt-1.5 @max-[44rem]:pl-6.5">
+          {primaryAction}
+          {onDontShowAgain ? (
+            <Button type="button" variant="ghost" size="xs" onClick={onDontShowAgain}>
+              {translate('terminal.paneTopBanner.dontShowAgain', "Don't show again")}
+            </Button>
+          ) : null}
+          <Button type="button" variant="ghost" size="xs" onClick={onDismiss}>
+            {translate('terminal.paneTopBanner.dismiss', 'Dismiss')}
+          </Button>
+        </div>
+      </div>
+    </div>
+  )
+}
diff --git a/src/renderer/src/components/terminal-pane/TerminalPaneFileDropOwner.tsx b/src/renderer/src/components/terminal-pane/TerminalPaneFileDropOwner.tsx
new file mode 100644
index 000000000000..1be806689931
--- /dev/null
+++ b/src/renderer/src/components/terminal-pane/TerminalPaneFileDropOwner.tsx
@@ -0,0 +1,15 @@
+import { useLayoutEffect } from 'react'
+import {
+  useTerminalPaneFileDropOwner,
+  type TerminalPaneFileDropOwnerArgs
+} from './use-terminal-pane-file-drop-owner'
+
+/** The pane manager creates the body container outside React. */
+export function TerminalPaneFileDropOwner(args: TerminalPaneFileDropOwnerArgs): null {
+  const attach = useTerminalPaneFileDropOwner(args)
+  useLayoutEffect(() => {
+    attach(args.pane.container)
+    return () => attach(null)
+  }, [attach, args.pane.container])
+  return null
+}
diff --git a/src/renderer/src/components/terminal-pane/TerminalPaneHeaderDropSurface.tsx b/src/renderer/src/components/terminal-pane/TerminalPaneHeaderDropSurface.tsx
new file mode 100644
index 000000000000..4e3e63da8578
--- /dev/null
+++ b/src/renderer/src/components/terminal-pane/TerminalPaneHeaderDropSurface.tsx
@@ -0,0 +1,46 @@
+import type { ComponentProps } from 'react'
+import { WORKSPACE_FILE_PATH_MIME, WORKSPACE_FILE_PATHS_MIME } from '@/lib/workspace-file-drag'
+import { handleInternalTerminalFileDrop } from './terminal-drop-handler'
+import {
+  useTerminalPaneFileDropOwner,
+  type TerminalPaneFileDropOwnerArgs
+} from './use-terminal-pane-file-drop-owner'
+
+export function TerminalPaneHeaderDropSurface({
+  destination,
+  ...props
+}: ComponentProps<'div'> & { destination: TerminalPaneFileDropOwnerArgs }): React.JSX.Element {
+  const attach = useTerminalPaneFileDropOwner(destination)
+  const isInternal = (types: readonly string[]) =>
+    types.includes(WORKSPACE_FILE_PATH_MIME) || types.includes(WORKSPACE_FILE_PATHS_MIME)
+  return (
+    <div
+      {...props}
+      ref={attach}
+      onDragOver={(event) => {
+        if (isInternal(event.dataTransfer.types)) {
+          event.preventDefault()
+          event.dataTransfer.dropEffect = 'copy'
+        }
+      }}
+      onDrop={(event) => {
+        if (!isInternal(event.dataTransfer.types)) {
+          return
+        }
+        event.preventDefault()
+        event.stopPropagation()
+        const manager = destination.managerRef.current
+        if (!manager) {
+          return
+        }
+        void handleInternalTerminalFileDrop({
+          ...destination,
+          manager,
+          paneTransports: destination.paneTransportsRef.current,
+          dataTransfer: event.dataTransfer,
+          paneLeafId: destination.pane.leafId
+        })
+      }}
+    />
+  )
+}
diff --git a/src/renderer/src/components/terminal-pane/TerminalPaneHeaderOverlay.test.tsx b/src/renderer/src/components/terminal-pane/TerminalPaneHeaderOverlay.test.tsx
index e9db4adc4bfd..a5444f44715f 100644
--- a/src/renderer/src/components/terminal-pane/TerminalPaneHeaderOverlay.test.tsx
+++ b/src/renderer/src/components/terminal-pane/TerminalPaneHeaderOverlay.test.tsx
@@ -9,8 +9,6 @@ import { afterEach, describe, expect, it, vi } from 'vitest'
 import type { ManagedPane, PaneManager } from '@/lib/pane-manager/pane-manager'
 import type { PtyTransport } from './pty-transport'
 import TerminalPaneHeaderOverlay from './TerminalPaneHeaderOverlay'
-import { handleTerminalFileDrop } from './terminal-drop-handler'
-import { resolveNativeFileDropPath } from '../../../../shared/native-file-drop'
 import { encodeWorkspaceFilePaths, WORKSPACE_FILE_PATHS_MIME } from '@/lib/workspace-file-drag'
 
 vi.mock('@/components/ui/tooltip', () => ({
@@ -170,6 +168,7 @@ function pressInputKey(
 }
 
 afterEach(() => {
+  vi.unstubAllGlobals()
   for (const { container, root } of mounted.splice(0)) {
     act(() => root.unmount())
     container.remove()
@@ -304,9 +303,11 @@ describe('TerminalPaneHeaderOverlay', () => {
 
 function dispatchFileDrag(target: Element, type: 'dragover' | 'drop', internal: boolean): void {
   const event = new Event(type, { bubbles: true, cancelable: true })
+  Object.defineProperty(event, 'isTrusted', { value: true })
   Object.defineProperty(event, 'dataTransfer', {
     value: {
       types: internal ? [WORKSPACE_FILE_PATHS_MIME] : ['Files'],
+      files: [new File([], 'file.txt')],
       getData: () => encodeWorkspaceFilePaths(['/repo/file.txt']),
       dropEffect: 'none'
     }
@@ -350,47 +351,18 @@ describe('terminal title drop ownership', () => {
       if (!title) {
         throw new Error('Title A did not render')
       }
-      const deliveries: Promise<void>[] = []
-      const legacyCapture = (event: Event): void => {
-        if (internal) {
-          return
+      vi.stubGlobal('api', {
+        fs: {
+          getPathForFile: () => '/repo/file.txt',
+          prepareDroppedPaths: async ({ paths }: { paths: string[] }) => ({ paths, failures: [] })
         }
-        event.preventDefault()
-        event.stopPropagation()
-        const entries = event
-          .composedPath()
-          .filter((entry): entry is HTMLElement => entry instanceof HTMLElement)
-          .map((entry) => ({
-            nativeFileDropTarget: entry.dataset.nativeFileDropTarget,
-            terminalTabId: entry.dataset.terminalTabId,
-            terminalPaneLeafId: entry.dataset.terminalPaneLeafId
-          }))
-        const resolution = resolveNativeFileDropPath(entries)
-        if (resolution?.target === 'terminal') {
-          deliveries.push(
-            handleTerminalFileDrop({
-              manager,
-              paneTransports: transports,
-              worktreeId: 'wt-1',
-              tabId: 'tab-1',
-              cwd: '/repo',
-              data: { paths: ['/repo/file.txt'], ...resolution }
-            })
-          )
+      })
+      await act(async () => {
+        if (dragover) {
+          dispatchFileDrag(title, 'dragover', internal)
         }
-      }
-      document.addEventListener('drop', legacyCapture, true)
-      try {
-        await act(async () => {
-          if (dragover) {
-            dispatchFileDrag(title, 'dragover', internal)
-          }
-          dispatchFileDrag(title, 'drop', internal)
-          await Promise.all(deliveries)
-        })
-      } finally {
-        document.removeEventListener('drop', legacyCapture, true)
-      }
+        dispatchFileDrag(title, 'drop', internal)
+      })
       expect(sends[0]).toHaveBeenCalledExactlyOnceWith('/repo/file.txt ', 'driving')
       expect(sends[1]).not.toHaveBeenCalled()
       expect(activate).not.toHaveBeenCalled()
diff --git a/src/renderer/src/components/terminal-pane/TerminalPaneHeaderOverlay.tsx b/src/renderer/src/components/terminal-pane/TerminalPaneHeaderOverlay.tsx
index f3b405f6b8e5..fef4e48ae591 100644
--- a/src/renderer/src/components/terminal-pane/TerminalPaneHeaderOverlay.tsx
+++ b/src/renderer/src/components/terminal-pane/TerminalPaneHeaderOverlay.tsx
@@ -11,10 +11,10 @@ import type { ManagedPane, PaneManager } from '@/lib/pane-manager/pane-manager'
 import { Button } from '@/components/ui/button'
 import { Tooltip, TooltipContent, TooltipTrigger } from '@/components/ui/tooltip'
 import { translate } from '@/i18n/i18n'
-import { WORKSPACE_FILE_PATH_MIME, WORKSPACE_FILE_PATHS_MIME } from '@/lib/workspace-file-drag'
 import { isImeCompositionKeyDown } from '@/lib/ime-composition-keyboard-event'
 import type { PtyTransport } from './pty-transport'
-import { handleInternalTerminalFileDrop } from './terminal-drop-handler'
+import { TerminalPaneHeaderDropSurface } from './TerminalPaneHeaderDropSurface'
+import { makePaneKey } from '../../../../shared/stable-pane-id'
 
 export type PaneTitleOverlayRect = {
   left: number
@@ -145,12 +145,11 @@ export default function TerminalPaneHeaderOverlay({
         }
 
         return (
-          <div
-            key={`pane-title-${pane.leafId}`}
+          <TerminalPaneHeaderDropSurface
+            key={makePaneKey(tabId, pane.leafId)}
+            destination={{ pane, tabId, worktreeId, cwd, managerRef, paneTransportsRef }}
             className="pane-title-bar"
-            data-native-file-drop-target="terminal"
             data-terminal-tab-id={tabId}
-            data-terminal-pane-leaf-id={pane.leafId}
             data-pane-prevent-terminal-focus=""
             {...(isActivePane ? { 'data-active-pane': '' } : {})}
             {...(isChromeless ? { 'data-chromeless': '' } : {})}
@@ -158,38 +157,6 @@ export default function TerminalPaneHeaderOverlay({
             onPointerDownCapture={
               title || isEditing ? () => onActivatePaneTitleInteraction(pane.id) : undefined
             }
-            onDragOver={(event) => {
-              if (
-                event.dataTransfer.types.includes(WORKSPACE_FILE_PATH_MIME) ||
-                event.dataTransfer.types.includes(WORKSPACE_FILE_PATHS_MIME)
-              ) {
-                event.preventDefault()
-                event.dataTransfer.dropEffect = 'copy'
-              }
-            }}
-            onDrop={(event) => {
-              if (
-                !event.dataTransfer.types.includes(WORKSPACE_FILE_PATH_MIME) &&
-                !event.dataTransfer.types.includes(WORKSPACE_FILE_PATHS_MIME)
-              ) {
-                return
-              }
-              event.preventDefault()
-              event.stopPropagation()
-              const manager = managerRef.current
-              if (!manager) {
-                return
-              }
-              void handleInternalTerminalFileDrop({
-                manager,
-                paneTransports: paneTransportsRef.current,
-                worktreeId,
-                tabId,
-                cwd,
-                dataTransfer: event.dataTransfer,
-                paneLeafId: pane.leafId
-              })
-            }}
             onContextMenuCapture={(event) => onPaneTitleContextMenu(event, pane.id)}
             style={{
               left: overlayRect.left,
@@ -407,7 +374,7 @@ export default function TerminalPaneHeaderOverlay({
                 </div>
               </>
             )}
-          </div>
+          </TerminalPaneHeaderDropSurface>
         )
       })}
     </div>
diff --git a/src/renderer/src/components/terminal-pane/TerminalPaneRuntimePortals.tsx b/src/renderer/src/components/terminal-pane/TerminalPaneRuntimePortals.tsx
index ee003a527b15..570702c3b1a0 100644
--- a/src/renderer/src/components/terminal-pane/TerminalPaneRuntimePortals.tsx
+++ b/src/renderer/src/components/terminal-pane/TerminalPaneRuntimePortals.tsx
@@ -2,6 +2,7 @@ import { createPortal } from 'react-dom'
 import { focusTerminalTabSurface } from '@/lib/focus-terminal-tab-surface'
 import CodexRestartChip from '../CodexRestartChip'
 import { CodexSharedServerBanner } from './CodexSharedServerBanner'
+import { ClaudeOldTerminalBanner } from './ClaudeOldTerminalBanner'
 import { TerminalSshReconnectOverlay } from './TerminalSshReconnectOverlay'
 import { TerminalRemoteRuntimeReconnectBanner } from './TerminalRemoteRuntimeReconnectBanner'
 import { TerminalProcessExitOverlay } from './TerminalProcessExitOverlay'
@@ -55,6 +56,12 @@ export function TerminalPaneCodexRestartPortals({
               tabId={tabId}
               leafId={pane.leafId}
             />
+            <ClaudeOldTerminalBanner
+              key={`claude-old-terminal-${pane.id}-${ptyId}`}
+              ptyId={ptyId}
+              tabId={tabId}
+              leafId={pane.leafId}
+            />
           </>,
           pane.container,
           `codex-restart-${pane.id}`
diff --git a/src/renderer/src/components/terminal-pane/TerminalPaneSurface.tsx b/src/renderer/src/components/terminal-pane/TerminalPaneSurface.tsx
index 76e5bf88d0ae..16425f3fb12d 100644
--- a/src/renderer/src/components/terminal-pane/TerminalPaneSurface.tsx
+++ b/src/renderer/src/components/terminal-pane/TerminalPaneSurface.tsx
@@ -1,4 +1,6 @@
 import { createPortal } from 'react-dom'
+import { TerminalPaneFileDropOwner } from './TerminalPaneFileDropOwner'
+import { makePaneKey } from '../../../../shared/stable-pane-id'
 import TerminalSearch from '@/components/TerminalSearch'
 import { DaemonActionDialog } from '@/components/shared/useDaemonActions'
 import { AgentSessionContinuationDialog } from '@/components/agent-session-continuation/AgentSessionContinuationDialog'
@@ -123,7 +125,6 @@ export function TerminalPaneSurface({
       <div
         ref={setContainerRef}
         className="absolute inset-0 min-h-0 min-w-0"
-        data-native-file-drop-target="terminal"
         data-terminal-tab-id={tabId}
         data-terminal-chat-view={effectiveChatViewMode && activePaneIsChatLeaf ? 'true' : undefined}
         data-terminal-layout-leaf-ids={expectedLayoutLeafIdsAttr}
@@ -165,6 +166,17 @@ export function TerminalPaneSurface({
           })
         }}
       />
+      {managedPanes.map((pane) => (
+        <TerminalPaneFileDropOwner
+          key={makePaneKey(tabId, pane.leafId)}
+          pane={pane}
+          tabId={tabId}
+          worktreeId={worktreeId}
+          cwd={cwd}
+          managerRef={managerRef}
+          paneTransportsRef={paneTransportsRef}
+        />
+      ))}
       <TerminalPaneCodexRestartPortals controller={controller} />
       <AgentLaunchPaneNoticePortal
         refusal={visibleLaunchRefusal}
diff --git a/src/renderer/src/components/terminal-pane/claude-old-terminal-banner.test.tsx b/src/renderer/src/components/terminal-pane/claude-old-terminal-banner.test.tsx
new file mode 100644
index 000000000000..cbd317a21835
--- /dev/null
+++ b/src/renderer/src/components/terminal-pane/claude-old-terminal-banner.test.tsx
@@ -0,0 +1,154 @@
+// @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 { useAppStore } from '@/store'
+import type { GlobalSettings } from '../../../../shared/global-settings-types'
+import { getDefaultSettings } from '../../../../shared/constants'
+import type { ClaudeManagedAccount } from '../../../../shared/managed-account-types'
+import { makePaneKey } from '../../../../shared/stable-pane-id'
+import { ClaudeOldTerminalBanner } from './ClaudeOldTerminalBanner'
+
+const routing = vi.hoisted(() => ({ activateAndRevealWorkspace: vi.fn(() => ({})) }))
+vi.mock('@/lib/worktree-activation', () => ({
+  activateAndRevealWorkspace: routing.activateAndRevealWorkspace
+}))
+
+globalThis.IS_REACT_ACT_ENVIRONMENT = true
+
+const TAB_ID = 'tab-1'
+const LEAF_ID = '11111111-1111-4111-8111-111111111111'
+const PANE_KEY = makePaneKey(TAB_ID, LEAF_ID)
+const TITLE = "This terminal was opened before Orca's Claude account update"
+const ACCOUNT: ClaudeManagedAccount = {
+  id: 'a',
+  email: 'a@example.test',
+  authMethod: 'subscription-oauth',
+  managedAuthPath: '/unused',
+  createdAt: 0,
+  updatedAt: 0,
+  lastAuthenticatedAt: 0
+}
+let paneElement: HTMLDivElement
+let root: Root
+let openedBeforeClaudeAccounts: ReturnType<typeof vi.fn<(id: string) => Promise<boolean>>>
+let nextPtyId = 0
+let ptyId: string
+
+class ResizeObserverStub {
+  observe(): void {}
+  disconnect(): void {}
+}
+
+function setState(settings: Partial<GlobalSettings>, agent: 'claude' | 'codex' = 'claude'): void {
+  useAppStore.setState({
+    settings: { ...getDefaultSettings('/home/me'), ...settings },
+    paneForegroundAgentByPaneKey: { [PANE_KEY]: { agent, shellForeground: false } }
+  })
+}
+
+const SELECTED = { claudeManagedAccounts: [ACCOUNT], activeClaudeManagedAccountId: 'a' }
+
+async function renderBanner(): Promise<void> {
+  await act(async () => {
+    root.render(<ClaudeOldTerminalBanner ptyId={ptyId} tabId={TAB_ID} leafId={LEAF_ID} />)
+  })
+}
+
+function button(label: string): HTMLButtonElement {
+  const match = Array.from(document.querySelectorAll('button')).find(
+    (candidate) => candidate.textContent?.trim() === label
+  )
+  if (!match) {
+    throw new Error(`missing ${label} button`)
+  }
+  return match
+}
+
+beforeEach(() => {
+  vi.stubGlobal('ResizeObserver', ResizeObserverStub)
+  useAppStore.setState(useAppStore.getInitialState(), true)
+  ptyId = `pty-${(nextPtyId += 1)}`
+  paneElement = document.createElement('div')
+  document.body.appendChild(paneElement)
+  root = createRoot(paneElement)
+  openedBeforeClaudeAccounts = vi.fn(() => Promise.resolve(true))
+  Object.defineProperty(window, 'api', {
+    configurable: true,
+    value: { pty: { openedBeforeClaudeAccounts } }
+  })
+})
+
+afterEach(() => {
+  act(() => root.unmount())
+  paneElement.remove()
+  vi.unstubAllGlobals()
+  useAppStore.setState(useAppStore.getInitialState(), true)
+})
+
+describe('ClaudeOldTerminalBanner', () => {
+  it('says Claude in an older terminal uses System default, with a new terminal and Learn more', async () => {
+    setState(SELECTED)
+    await renderBanner()
+    expect(openedBeforeClaudeAccounts).toHaveBeenCalledWith(ptyId)
+    expect(paneElement.textContent).toContain(TITLE)
+    expect(paneElement.textContent).toContain("so claude here uses System default's login.")
+    button('Open new terminal')
+    expect(() => button("Don't show again")).toThrow()
+
+    await act(async () => button('Learn more').click())
+    expect(document.body.textContent).toContain('Open a new terminal to use the selected account.')
+  })
+
+  it('opens a new terminal beside the tab from the banner', async () => {
+    const openNewTerminalTabInActiveWorkspace = vi.fn(() => Promise.resolve())
+    setState(SELECTED)
+    useAppStore.setState({
+      unifiedTabsByWorktree: {
+        'wt-1': [
+          {
+            id: 'unified-1',
+            entityId: TAB_ID,
+            groupId: 'group-2',
+            worktreeId: 'wt-1',
+            contentType: 'terminal',
+            label: 'Terminal',
+            customLabel: null,
+            color: null,
+            sortOrder: 0,
+            createdAt: 0
+          }
+        ]
+      },
+      openNewTerminalTabInActiveWorkspace
+    })
+    await renderBanner()
+    await act(async () => button('Open new terminal').click())
+    expect(openNewTerminalTabInActiveWorkspace).toHaveBeenCalledWith('group-2')
+  })
+
+  it('stays hidden for a terminal from this version, an SSH pane, or one after Dismiss', async () => {
+    setState(SELECTED)
+    openedBeforeClaudeAccounts.mockResolvedValue(false)
+    await renderBanner()
+    expect(paneElement.textContent).toBe('')
+
+    openedBeforeClaudeAccounts.mockResolvedValue(true)
+    ptyId = `pty-${(nextPtyId += 1)}`
+    await renderBanner()
+    await act(async () => button('Dismiss').click())
+    expect(paneElement.textContent).toBe('')
+  })
+
+  it('never asks without Claude in the pane or a selected account', async () => {
+    setState(SELECTED, 'codex')
+    await renderBanner()
+    setState({ claudeManagedAccounts: [ACCOUNT], activeClaudeManagedAccountId: null })
+    await renderBanner()
+    setState({ claudeManagedAccounts: [], activeClaudeManagedAccountId: 'a' })
+    await renderBanner()
+    expect(openedBeforeClaudeAccounts).not.toHaveBeenCalled()
+    expect(paneElement.textContent).toBe('')
+  })
+})
diff --git a/src/renderer/src/components/terminal-pane/codex-detached-pane-restart.test.ts b/src/renderer/src/components/terminal-pane/codex-detached-pane-restart.test.ts
index 8aea14403649..1aa4adfcd9b9 100644
--- a/src/renderer/src/components/terminal-pane/codex-detached-pane-restart.test.ts
+++ b/src/renderer/src/components/terminal-pane/codex-detached-pane-restart.test.ts
@@ -126,6 +126,8 @@ describe('codex detached pane restart executor', () => {
         initiallyHidden: true
       })
     )
+    // The leaf is in the root, so main already knows where it goes.
+    expect(vi.mocked(window.api.pty.spawn).mock.calls[0]?.[0]).not.toHaveProperty('placement')
     expect(window.api.pty.getSize).not.toHaveBeenCalled()
     expect(vi.mocked(window.api.pty.spawn).mock.calls[0]?.[0]?.env).toEqual(
       expect.objectContaining({
@@ -310,7 +312,7 @@ describe('codex detached pane restart executor', () => {
       })
     )
     expect(window.api.pty.spawn).toHaveBeenCalledExactlyOnceWith(
-      expect.objectContaining({ replacesPtyId: OLD_PTY })
+      expect.objectContaining({ replacesPtyId: OLD_PTY, placement: { kind: 'root' } })
     )
   })
 
diff --git a/src/renderer/src/components/terminal-pane/codex-detached-pane-restart.ts b/src/renderer/src/components/terminal-pane/codex-detached-pane-restart.ts
index 6c3228ae10bd..027e6ee156ab 100644
--- a/src/renderer/src/components/terminal-pane/codex-detached-pane-restart.ts
+++ b/src/renderer/src/components/terminal-pane/codex-detached-pane-restart.ts
@@ -10,7 +10,7 @@
  */
 import { isTerminalLeafId, makePaneKey } from '../../../../shared/stable-pane-id'
 import { parseWorkspaceKey } from '../../../../shared/workspace-scope'
-import type { TerminalPaneLayoutNode, TerminalTab } from '../../../../shared/terminal-tab-types'
+import type { TerminalLayoutSnapshot, TerminalTab } from '../../../../shared/terminal-tab-types'
 import type { AppState } from '@/store'
 import { useAppStore } from '@/store'
 import { getWorktreeMapFromState } from '@/store/selectors'
@@ -25,6 +25,7 @@ import {
   hasCachedWindowsTerminalCapabilities
 } from '@/lib/windows-terminal-capabilities'
 import { ptyDataHandlers, unregisterPtyDataHandlers } from './pty-dispatcher'
+import { collectLeafIds } from './terminal-pane-layout-tree'
 import { discardPreHandlerPtyState } from './pty-pre-handler-buffer'
 import { disposeParkedTerminalWatchersForPtyIds } from './terminal-parked-watcher-registry'
 
@@ -224,6 +225,9 @@ async function executeDetachedCodexPaneRestart(
     tabId: tab.id,
     leafId,
     replacesPtyId: ptyId,
+    ...(restartReplacesLayoutRoot(currentState.terminalLayoutsByTabId[tab.id], leafId)
+      ? { placement: { kind: 'root' as const } }
+      : {}),
     ...(tab.shellOverride ? { shellOverride: tab.shellOverride } : {}),
     ...(projectRuntime ? { projectRuntime } : {}),
     initiallyHidden: true
@@ -307,27 +311,23 @@ function reopenCurrentCodexRestartPrompt(located: LocatedCodexPane, replacedPtyI
   }
 }
 
-function layoutRootContainsLeaf(
-  node: TerminalPaneLayoutNode | null | undefined,
+// Why: mount replays panes from the root — a root that doesn't name this leaf
+// mints a fresh one and silently orphans the replacement PTY. Rewriting is
+// only safe when this is the tab's sole bound pane; a split keeps its root.
+function restartReplacesLayoutRoot(
+  layout: TerminalLayoutSnapshot | undefined,
   leafId: string
 ): boolean {
-  if (!node) {
-    return false
-  }
-  if (node.type === 'leaf') {
-    return node.leafId === leafId
-  }
-  return layoutRootContainsLeaf(node.first, leafId) || layoutRootContainsLeaf(node.second, leafId)
+  return (
+    !collectLeafIds(layout?.root).includes(leafId) &&
+    Object.keys(layout?.ptyIdsByLeafId ?? {}).every((id) => id === leafId)
+  )
 }
 
 function rebindCodexPaneLayoutLeaf(tabId: string, leafId: string, newPtyId: string): void {
   const store = useAppStore.getState()
   const layout = store.terminalLayoutsByTabId[tabId]
-  const boundLeafIds = Object.keys(layout?.ptyIdsByLeafId ?? {})
-  // Why: mount replays panes from the root — a root that doesn't name this leaf
-  // mints a fresh one and silently orphans the replacement PTY. Rewriting is
-  // only safe when this is the tab's sole bound pane; a split keeps its root.
-  if (!layoutRootContainsLeaf(layout?.root, leafId) && boundLeafIds.every((id) => id === leafId)) {
+  if (restartReplacesLayoutRoot(layout, leafId)) {
     store.setTabLayout(
       tabId,
       singlePaneLayoutSnapshot(leafId, newPtyId, layout?.titlesByLeafId?.[leafId] ?? null)
diff --git a/src/renderer/src/components/terminal-pane/ipc-pty-spawn-request.ts b/src/renderer/src/components/terminal-pane/ipc-pty-spawn-request.ts
index 667865deb7e1..7961fed61ec2 100644
--- a/src/renderer/src/components/terminal-pane/ipc-pty-spawn-request.ts
+++ b/src/renderer/src/components/terminal-pane/ipc-pty-spawn-request.ts
@@ -85,6 +85,7 @@ export async function spawnIpcPty(
     worktreeId,
     tabId,
     leafId,
+    placement,
     shellOverride,
     projectRuntime,
     terminalColorQueryReplies,
@@ -131,6 +132,7 @@ export async function spawnIpcPty(
     worktreeId,
     ...(tabId ? { tabId } : {}),
     ...(leafId ? { leafId } : {}),
+    ...(placement && !admittedSessionId ? { placement } : {}),
     ...(replacesPtyId ? { replacesPtyId } : {}),
     ...(shellOverride ? { shellOverride } : {}),
     ...(projectRuntime ? { projectRuntime } : {}),
diff --git a/src/renderer/src/components/terminal-pane/open-terminal-beside-tab.ts b/src/renderer/src/components/terminal-pane/open-terminal-beside-tab.ts
new file mode 100644
index 000000000000..a63aafa10b17
--- /dev/null
+++ b/src/renderer/src/components/terminal-pane/open-terminal-beside-tab.ts
@@ -0,0 +1,29 @@
+import { useAppStore } from '@/store'
+import { FLOATING_TERMINAL_WORKTREE_ID } from '../../../../shared/constants'
+import { createFloatingWorkspaceTerminalTab } from '@/lib/floating-workspace-tab-creation'
+import { revealFloatingWorkspacePanel } from '@/lib/floating-workspace-panel-reveal'
+import { activateAndRevealWorkspace } from '@/lib/worktree-activation'
+
+/** Opens a new terminal where this tab lives; a new terminal's shell has Orca's agent functions. */
+export function openTerminalBesideTab(terminalTabId: string): boolean {
+  const state = useAppStore.getState()
+  const tab = Object.values(state.unifiedTabsByWorktree)
+    .flat()
+    .find(
+      (candidate) => candidate.contentType === 'terminal' && candidate.entityId === terminalTabId
+    )
+  if (!tab) {
+    return false
+  }
+  if (tab.worktreeId === FLOATING_TERMINAL_WORKTREE_ID) {
+    revealFloatingWorkspacePanel(state)
+    void createFloatingWorkspaceTerminalTab(state)
+    return true
+  }
+  // Why always: Activity can show this pane behind its own view even when its workspace is active.
+  if (activateAndRevealWorkspace(tab.worktreeId) === false) {
+    return false
+  }
+  void useAppStore.getState().openNewTerminalTabInActiveWorkspace(tab.groupId)
+  return true
+}
diff --git a/src/renderer/src/components/terminal-pane/parked-terminal-byte-watcher.test.ts b/src/renderer/src/components/terminal-pane/parked-terminal-byte-watcher.test.ts
index 6af428cbead0..03ff9c3e1100 100644
--- a/src/renderer/src/components/terminal-pane/parked-terminal-byte-watcher.test.ts
+++ b/src/renderer/src/components/terminal-pane/parked-terminal-byte-watcher.test.ts
@@ -395,7 +395,8 @@ describe('startParkedTerminalByteWatcher', () => {
         url: 'https://github.com/orca-dev/orca/pull/421',
         number: 421,
         slug: { owner: 'orca-dev', repo: 'orca', host: 'github.com' }
-      })
+      }),
+      expect.objectContaining({ tabId: TAB_ID, ptyId: PTY_ID })
     )
     dispose()
   })
@@ -942,7 +943,8 @@ describe('startParkedTerminalByteWatcher', () => {
       expect(mockStoreState.observeTerminalGitHubPullRequestLink).toHaveBeenCalledTimes(1)
       expect(mockStoreState.observeTerminalGitHubPullRequestLink).toHaveBeenCalledWith(
         WORKTREE_ID,
-        link
+        link,
+        expect.objectContaining({ tabId: TAB_ID, ptyId: PTY_ID })
       )
       dispose()
     })
diff --git a/src/renderer/src/components/terminal-pane/parked-terminal-byte-watcher.ts b/src/renderer/src/components/terminal-pane/parked-terminal-byte-watcher.ts
index bf09f5351bd3..7ea538bfd56f 100644
--- a/src/renderer/src/components/terminal-pane/parked-terminal-byte-watcher.ts
+++ b/src/renderer/src/components/terminal-pane/parked-terminal-byte-watcher.ts
@@ -257,7 +257,12 @@ export function startParkedTerminalByteWatcher(
           onCommandCodeWorking: commandStatusPolicy.onCommandCodeWorking,
           onCommandCodeDone: commandStatusPolicy.onCommandCodeDone,
           onPrLink: (link) =>
-            useAppStore.getState().observeTerminalGitHubPullRequestLink(worktreeId, link)
+            useAppStore.getState().observeTerminalGitHubPullRequestLink(worktreeId, link, {
+              tabId,
+              paneKey,
+              ptyId,
+              executionHostId: workspaceOwner?.executionHostId ?? undefined
+            })
         },
         // Why: activation-deferred tabs can start a watcher before any pane restored the title; ordinary parked tabs avoid this IPC.
         restoreTitleOnRegister: options.restoreTitleOnRegister === true
@@ -278,7 +283,12 @@ export function startParkedTerminalByteWatcher(
     commandCodeOutputStatusDetector?.observe(data)
     if (observeTerminalGitHubPRLink) {
       for (const link of observeTerminalGitHubPRLink(data)) {
-        useAppStore.getState().observeTerminalGitHubPullRequestLink(worktreeId, link)
+        useAppStore.getState().observeTerminalGitHubPullRequestLink(worktreeId, link, {
+          tabId,
+          paneKey,
+          ptyId,
+          executionHostId: workspaceOwner?.executionHostId ?? undefined
+        })
       }
     }
   }
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 1f0935b8085b..b67bb994c51e 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
@@ -237,6 +237,18 @@ describe('connectPanePty', () => {
     expect(retain()).toBe(false)
   })
 
+  it('carries the pane placement onto its transport', async () => {
+    const { connectPanePty } = await import('./pty-connection')
+    transportFactoryQueue.push(createMockTransport())
+    const placement = { kind: 'new-tab' } as const
+    const deps = createDeps({ tabId: 'tab-placement', placement })
+
+    connectPanePty(createPane(1) as never, createManager(1) as never, deps as never)
+    await flushAsyncTicks()
+
+    expect(createdTransportOptions[0]).toMatchObject({ placement })
+  })
+
   it('fresh-spawns normally when the pane worktree is not being deleted', async () => {
     const { connectPanePty } = await import('./pty-connection')
     const transport = createMockTransport()
@@ -419,7 +431,8 @@ describe('connectPanePty', () => {
         url: 'https://github.com/acme/orca/pull/42',
         slug: { owner: 'acme', repo: 'orca', host: 'github.com' },
         number: 42
-      })
+      }),
+      expect.objectContaining({ tabId: 'tab-1' })
     )
   })
 
diff --git a/src/renderer/src/components/terminal-pane/pty-connection-main-side-effect-authority.test.ts b/src/renderer/src/components/terminal-pane/pty-connection-main-side-effect-authority.test.ts
index f96a73320a09..93d8f21918ad 100644
--- a/src/renderer/src/components/terminal-pane/pty-connection-main-side-effect-authority.test.ts
+++ b/src/renderer/src/components/terminal-pane/pty-connection-main-side-effect-authority.test.ts
@@ -413,7 +413,11 @@ describe('connectPanePty', () => {
         facts: [{ kind: 'pr-link', link }]
       })
 
-      expect(mockStoreState.observeTerminalGitHubPullRequestLink).toHaveBeenCalledWith('wt-1', link)
+      expect(mockStoreState.observeTerminalGitHubPullRequestLink).toHaveBeenCalledWith(
+        'wt-1',
+        link,
+        expect.objectContaining({ tabId: 'tab-1', ptyId: 'tab-pty' })
+      )
     })
 
     it('does not byte-scan PR links or OSC 133 — facts are the only consumer', async () => {
diff --git a/src/renderer/src/components/terminal-pane/pty-connection-types.ts b/src/renderer/src/components/terminal-pane/pty-connection-types.ts
index e22e397e0188..2e3739f9dd90 100644
--- a/src/renderer/src/components/terminal-pane/pty-connection-types.ts
+++ b/src/renderer/src/components/terminal-pane/pty-connection-types.ts
@@ -9,6 +9,7 @@ import type { EventProps } from '../../../../shared/telemetry-events'
 import type { TerminalColorSchemeMode } from '../../../../shared/terminal-color-scheme-protocol'
 import type { StartupCommandDelivery } from '../../../../shared/codex-startup-delivery'
 import type { TuiAgent } from '../../../../shared/tui-agent'
+import type { TerminalPanePlacement } from '../../../../shared/terminal-pane-placement'
 import type { SetupSplitDirection } from '../../../../shared/worktree/launch-types'
 import type {
   AgentProviderSessionMetadata,
@@ -60,6 +61,7 @@ export type PtyConnectionDeps = {
   cwd?: string
   /** Delays a fresh split's spawn without delaying its renderer pane. */
   cwdPromise?: Promise<string>
+  placement?: TerminalPanePlacement
   /** Input handed off from a predecessor mount of the same deferred split. */
   preconnectInput?: readonly PtyPreconnectInputEntry[]
   /** Captures newly retained input for a remount-safe deferred split handoff. */
diff --git a/src/renderer/src/components/terminal-pane/pty-connection/live-data-callback.ts b/src/renderer/src/components/terminal-pane/pty-connection/live-data-callback.ts
index a523576486f5..9a20b78f900f 100644
--- a/src/renderer/src/components/terminal-pane/pty-connection/live-data-callback.ts
+++ b/src/renderer/src/components/terminal-pane/pty-connection/live-data-callback.ts
@@ -1,3 +1,4 @@
+import { makePaneKey } from '../../../../../shared/stable-pane-id'
 import { useAppStore } from '@/store'
 import { takeCurrentTerminalDeliveryCredit } from '@/lib/pane-manager/terminal-delivery-credit'
 import { recordAgentHibernationPaneOutput } from '@/lib/agent-hibernation-output-activity'
@@ -64,7 +65,12 @@ export function bindLiveDataCallback(session: ConnectPanePtySession): void {
     // Why: under main side-effect authority these facts arrive via pty:sideEffect; byte-scanning here would double-fire. Remote PTYs / kill-switch-off keep this path.
     if (!session.mainSideEffectAuthority) {
       for (const link of session.observeTerminalGitHubPRLink(data)) {
-        useAppStore.getState().observeTerminalGitHubPullRequestLink(session.deps.worktreeId, link)
+        useAppStore.getState().observeTerminalGitHubPullRequestLink(session.deps.worktreeId, link, {
+          tabId: session.deps.tabId,
+          paneKey: makePaneKey(session.deps.tabId, session.pane.leafId),
+          ptyId: session.transport.getPtyId(),
+          executionHostId: session.transport.getExecutionHostId?.() ?? undefined
+        })
       }
       session.commandLifecycle.handlePtyData(data)
     }
diff --git a/src/renderer/src/components/terminal-pane/pty-connection/pty-input-recovery.ts b/src/renderer/src/components/terminal-pane/pty-connection/pty-input-recovery.ts
index aa226a3a78ee..d6f8a6de9c62 100644
--- a/src/renderer/src/components/terminal-pane/pty-connection/pty-input-recovery.ts
+++ b/src/renderer/src/components/terminal-pane/pty-connection/pty-input-recovery.ts
@@ -82,6 +82,7 @@ export function installPtyInputRecovery(session: ConnectPanePtySession): void {
     // and the main-side guard short-circuits.
     tabId: session.deps.tabId,
     leafId: session.pane.leafId,
+    ...(session.deps.placement ? { placement: session.deps.placement } : {}),
     activate: session.deps.isActiveRef.current && session.deps.isVisibleRef.current,
     ...(session.shellOverride ? { shellOverride: session.shellOverride } : {}),
     ...(session.projectRuntime ? { projectRuntime: session.projectRuntime } : {}),
diff --git a/src/renderer/src/components/terminal-pane/pty-connection/terminal-keydown-fit.ts b/src/renderer/src/components/terminal-pane/pty-connection/terminal-keydown-fit.ts
index f998a1c97fa6..46e944dd99fa 100644
--- a/src/renderer/src/components/terminal-pane/pty-connection/terminal-keydown-fit.ts
+++ b/src/renderer/src/components/terminal-pane/pty-connection/terminal-keydown-fit.ts
@@ -1,3 +1,4 @@
+import { makePaneKey } from '../../../../../shared/stable-pane-id'
 import { useAppStore } from '@/store'
 import { safeFit } from '@/lib/pane-manager/pane-tree-ops'
 import { bindPanePtyId, getFitOverrideForPty } from '@/lib/pane-manager/mobile-fit-overrides'
@@ -133,7 +134,12 @@ export function installTerminalKeydownFit(session: ConnectPanePtySession): void
         onPrLink: (link) =>
           useAppStore
             .getState()
-            .observeTerminalGitHubPullRequestLink(session.deps.worktreeId, link),
+            .observeTerminalGitHubPullRequestLink(session.deps.worktreeId, link, {
+              tabId: session.deps.tabId,
+              paneKey: makePaneKey(session.deps.tabId, session.pane.leafId),
+              ptyId: session.transport.getPtyId(),
+              executionHostId: session.transport.getExecutionHostId?.() ?? undefined
+            }),
         // Why: the Command Code settle policy stays here — the done settle
         // timer must consult the live store row (which hook events and
         // renderer seeds also write), so main only emits scrape facts.
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 4d6b0aa911b1..ca8d7a816b4a 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
@@ -306,6 +306,26 @@ describe('createIpcPtyTransport', () => {
     transport.disconnect()
   })
 
+  it('sends placement on a fresh spawn but not on a session reattach', async () => {
+    const { createIpcPtyTransport } = await import('./pty-transport')
+    const spawn = window.api.pty.spawn as unknown as ReturnType<typeof vi.fn>
+    const placement = {
+      kind: 'split',
+      parentLeafId: '11111111-1111-4111-8111-111111111111',
+      direction: 'horizontal'
+    } as const
+
+    const fresh = createIpcPtyTransport({ placement })
+    await fresh.connect({ url: '', callbacks: {} })
+    expect(spawn).toHaveBeenLastCalledWith(expect.objectContaining({ placement }))
+    fresh.disconnect()
+
+    const reattach = createIpcPtyTransport({ placement })
+    await reattach.connect({ url: '', callbacks: {}, sessionId: 'session-1' })
+    expect(spawn).toHaveBeenLastCalledWith(expect.not.objectContaining({ placement }))
+    reattach.disconnect()
+  })
+
   it('returns startup cwd fallback metadata to the connection layer', async () => {
     const { createIpcPtyTransport } = await import('./pty-transport')
     const spawn = window.api.pty.spawn as unknown as ReturnType<typeof vi.fn>
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 75e696cad922..089a3c436acc 100644
--- a/src/renderer/src/components/terminal-pane/pty-transport-types.ts
+++ b/src/renderer/src/components/terminal-pane/pty-transport-types.ts
@@ -13,6 +13,7 @@ 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 { TerminalPanePlacement } from '../../../../shared/terminal-pane-placement'
 import type { ExecutionHostId } from '../../../../shared/execution-host'
 import type { PtyDataMeta } from './pty-dispatcher'
 import type { RemoteRuntimeSnapshotOutcome } from '../../runtime/remote-runtime-terminal-multiplexer'
@@ -281,6 +282,8 @@ export type IpcPtyTransportOptions = {
   worktreeId?: string
   tabId?: string
   leafId?: string
+  /** Sent on fresh spawns only; a reattach names a PTY whose leaf main already knows. */
+  placement?: TerminalPanePlacement
   activate?: boolean
   shellOverride?: string
   projectRuntime?: ProjectExecutionRuntimeResolution
diff --git a/src/renderer/src/components/terminal-pane/terminal-agent-session-fork.test.ts b/src/renderer/src/components/terminal-pane/terminal-agent-session-fork.test.ts
index 900968b51855..ccf5a3d76295 100644
--- a/src/renderer/src/components/terminal-pane/terminal-agent-session-fork.test.ts
+++ b/src/renderer/src/components/terminal-pane/terminal-agent-session-fork.test.ts
@@ -197,20 +197,14 @@ describe('forkAgentSessionFromPane', () => {
       [`tab-1:${LEAF_ID}`]: { agentType: 'codex' }
     }
     const result = {
-      surface: {
-        kind: 'local-agent-session',
-        tabId: 'structured-agent-session-session-1',
-        sessionId: 'session-1'
-      },
+      surface: { kind: 'host-published' },
       startupPlan: {},
       pasteDraftAfterLaunch: false,
       structuredSettlement: new Promise(() => {})
     }
     mockLaunchAgentInNewTab.mockImplementationOnce(
-      (args: {
-        beforeSurfaceOpen?: (surface: { kind: 'local-agent-session'; sessionId: string }) => void
-      }) => {
-        args.beforeSurfaceOpen?.({ kind: 'local-agent-session', sessionId: 'session-1' })
+      (args: { beforeSurfaceOpen?: (surface: { kind: 'host-published' }) => void }) => {
+        args.beforeSurfaceOpen?.({ kind: 'host-published' })
         return result
       }
     )
@@ -242,20 +236,14 @@ describe('forkAgentSessionFromPane', () => {
         [`tab-1:${LEAF_ID}`]: { agentType: 'codex' }
       }
       const result = {
-        surface: {
-          kind: 'local-agent-session',
-          tabId: 'structured-agent-session-session-1',
-          sessionId: 'session-1'
-        },
+        surface: { kind: 'host-published' },
         startupPlan: {},
         pasteDraftAfterLaunch: false,
         structuredSettlement: Promise.resolve(settlement)
       }
       mockLaunchAgentInNewTab.mockImplementationOnce(
-        (args: {
-          beforeSurfaceOpen?: (surface: { kind: 'local-agent-session'; sessionId: string }) => void
-        }) => {
-          args.beforeSurfaceOpen?.({ kind: 'local-agent-session', sessionId: 'session-1' })
+        (args: { beforeSurfaceOpen?: (surface: { kind: 'host-published' }) => void }) => {
+          args.beforeSurfaceOpen?.({ kind: 'host-published' })
           return result
         }
       )
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 5c4b99deba9f..09e3670fcbfc 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
@@ -153,7 +153,8 @@ describe('handleTerminalFileDrop', () => {
       worktreeId: 'wt-1',
       tabId: 'tab-1',
       cwd: undefined,
-      data: { paths: ['/Users/me/logo.png'], target: 'terminal', paneLeafId: 'leaf-1' }
+      pane,
+      paths: ['/Users/me/logo.png']
     })
 
     expect(mocks.importExternalPathsToRuntime).toHaveBeenCalledWith(
@@ -173,7 +174,7 @@ describe('handleTerminalFileDrop', () => {
       wrapTerminalBracketedPasteText('/remote/repo/.orca/drops/logo.png'),
       'driving'
     )
-    expect(focus).toHaveBeenCalled()
+    expect(focus).not.toHaveBeenCalled()
     expect(mocks.recordTerminalUserInputForLeaf).toHaveBeenCalledWith('tab-1', 'leaf-1')
     expect(mocks.toastError).not.toHaveBeenCalled()
     expect(mocks.toastDismiss).toHaveBeenCalledWith('toast-1')
@@ -208,7 +209,8 @@ describe('handleTerminalFileDrop', () => {
       worktreeId: 'wt-1',
       tabId: 'tab-1',
       cwd: undefined,
-      data: { paths: ['/Users/me/logo.png'], target: 'terminal', paneLeafId: 'leaf-1' }
+      pane,
+      paths: ['/Users/me/logo.png']
     })
 
     expect(sendInput).not.toHaveBeenCalled()
@@ -254,7 +256,8 @@ describe('handleTerminalFileDrop', () => {
       worktreeId: 'wt-1',
       tabId: 'tab-1',
       cwd: undefined,
-      data: { paths: ['/Users/me/logo.png'], target: 'terminal', paneLeafId: 'leaf-1' }
+      pane,
+      paths: ['/Users/me/logo.png']
     })
 
     expect(mocks.importExternalPathsToRuntime).toHaveBeenCalledWith(
@@ -317,7 +320,8 @@ describe('handleTerminalFileDrop', () => {
       worktreeId: 'wt-1',
       tabId: 'tab-1',
       cwd: undefined,
-      data: { paths: ['/Users/me/spec.pdf'], target: 'terminal', paneLeafId: 'leaf-1' }
+      pane,
+      paths: ['/Users/me/spec.pdf']
     })
 
     expect(mocks.importExternalPathsToRuntime).toHaveBeenCalledWith(
@@ -359,12 +363,13 @@ describe('handleTerminalFileDrop', () => {
       worktreeId: 'wt-1',
       tabId: 'tab-1',
       cwd: undefined,
-      data: { paths: ['/Users/me/spec.pdf'], target: 'terminal', paneLeafId: 'leaf-1' }
+      pane,
+      paths: ['/Users/me/spec.pdf']
     })
 
     expect(mocks.importExternalPathsToRuntime).not.toHaveBeenCalled()
     expect(sendInput).toHaveBeenCalledWith('/Users/me/spec.pdf ', 'driving')
-    expect(focus).toHaveBeenCalled()
+    expect(focus).not.toHaveBeenCalled()
   })
 
   it('pastes Linux-readable paths for local Windows-path projects forced to WSL', async () => {
@@ -408,14 +413,11 @@ describe('handleTerminalFileDrop', () => {
       worktreeId: 'wt-1',
       tabId: 'tab-1',
       cwd: undefined,
-      data: {
-        paths: [
-          'C:\\Users\\alice\\Desktop\\notes one.txt',
-          '\\\\wsl.localhost\\Ubuntu\\home\\alice\\repo\\README.md'
-        ],
-        target: 'terminal',
-        paneLeafId: 'leaf-1'
-      }
+      pane,
+      paths: [
+        'C:\\Users\\alice\\Desktop\\notes one.txt',
+        '\\\\wsl.localhost\\Ubuntu\\home\\alice\\repo\\README.md'
+      ]
     })
 
     expect(mocks.importExternalPathsToRuntime).not.toHaveBeenCalled()
@@ -455,11 +457,8 @@ describe('handleTerminalFileDrop', () => {
       worktreeId: 'wt-1',
       tabId: 'tab-1',
       cwd: undefined,
-      data: {
-        paths: ['C:\\Users\\alice\\Desktop\\Screenshot 1.png'],
-        target: 'terminal',
-        paneLeafId: 'leaf-1'
-      }
+      pane,
+      paths: ['C:\\Users\\alice\\Desktop\\Screenshot 1.png']
     })
 
     // Why: the agent runs in Linux, so a Windows-style quote would reach it as a literal.
@@ -495,16 +494,17 @@ describe('handleTerminalFileDrop', () => {
       worktreeId: 'wt-1',
       tabId: 'tab-1',
       cwd: undefined,
-      data: { paths: ['/Users/me/spec.pdf'], target: 'terminal', paneLeafId: 'leaf-1' }
+      pane,
+      paths: ['/Users/me/spec.pdf']
     })
 
     expect(sendInputAccepted).toHaveBeenCalledWith('/Users/me/spec.pdf ', 'driving')
     expect(sendInput).not.toHaveBeenCalled()
-    expect(focus).toHaveBeenCalled()
+    expect(focus).not.toHaveBeenCalled()
     expect(mocks.recordTerminalUserInputForLeaf).toHaveBeenCalledWith('tab-1', 'leaf-1')
   })
 
-  it('pastes native file drops into the pane identified by the payload leaf id', async () => {
+  it('pastes native file drops into the pane captured by its element', async () => {
     mocks.storeState.settings = { activeRuntimeEnvironmentId: 'focused-runtime' }
     mocks.storeState.repos = [
       { id: 'repo1', connectionId: null, path: '/repo', executionHostId: 'local' }
@@ -539,13 +539,14 @@ describe('handleTerminalFileDrop', () => {
       worktreeId: 'wt-1',
       tabId: 'tab-1',
       cwd: undefined,
-      data: { paths: ['/Users/me/spec.pdf'], target: 'terminal', paneLeafId: 'leaf-target' }
+      pane: targetPane,
+      paths: ['/Users/me/spec.pdf']
     })
 
     expect(activeSendInput).not.toHaveBeenCalled()
     expect(activeFocus).not.toHaveBeenCalled()
     expect(targetSendInput).toHaveBeenCalledWith('/Users/me/spec.pdf ', 'driving')
-    expect(targetFocus).toHaveBeenCalled()
+    expect(targetFocus).not.toHaveBeenCalled()
     expect(mocks.recordTerminalUserInputForLeaf).toHaveBeenCalledWith('tab-1', 'leaf-target')
   })
 
@@ -583,14 +584,11 @@ describe('handleTerminalFileDrop', () => {
       worktreeId: 'wt-1',
       tabId: 'tab-1',
       cwd: undefined,
-      data: {
-        paths: [
-          'C:\\Users\\Name\\My Project\\file.txt',
-          '\\\\wsl.localhost\\Ubuntu-24.04\\home\\user\\repo\\README.md'
-        ],
-        target: 'terminal',
-        paneLeafId: 'leaf-1'
-      }
+      pane,
+      paths: [
+        'C:\\Users\\Name\\My Project\\file.txt',
+        '\\\\wsl.localhost\\Ubuntu-24.04\\home\\user\\repo\\README.md'
+      ]
     })
 
     expect(mocks.resolveDroppedPathsForAgent).toHaveBeenCalledWith({
@@ -604,7 +602,7 @@ describe('handleTerminalFileDrop', () => {
       ["'/mnt/c/Users/Name/My Project/file.txt' ", 'driving'],
       ['/home/user/repo/README.md ', 'driving']
     ])
-    expect(focus).toHaveBeenCalled()
+    expect(focus).not.toHaveBeenCalled()
     expect(mocks.recordTerminalUserInputForLeaf).toHaveBeenCalledWith('tab-1', 'leaf-1')
   })
 
@@ -647,11 +645,8 @@ describe('handleTerminalFileDrop', () => {
       worktreeId: 'wt-1',
       tabId: 'tab-1',
       cwd: undefined,
-      data: {
-        paths: ['C:\\Users\\Name\\My Project\\file.txt'],
-        target: 'terminal',
-        paneLeafId: 'leaf-1'
-      }
+      pane,
+      paths: ['C:\\Users\\Name\\My Project\\file.txt']
     })
 
     expect(sendInput).not.toHaveBeenCalled()
@@ -701,7 +696,8 @@ describe('handleTerminalFileDrop', () => {
       worktreeId: 'wt-1',
       tabId: 'tab-1',
       cwd: undefined,
-      data: { paths: ['C:\\Users\\Name\\A&B.txt'], target: 'terminal', paneLeafId: 'leaf-1' }
+      pane,
+      paths: ['C:\\Users\\Name\\A&B.txt']
     })
 
     expect(mocks.resolveDroppedPathsForAgent).toHaveBeenCalledWith({
@@ -713,7 +709,7 @@ describe('handleTerminalFileDrop', () => {
       expectedSshConnectionGeneration: 4
     })
     expect(sendInput).toHaveBeenCalledWith('"C:\\Remote Repo\\A&B.txt" ', 'driving')
-    expect(focus).toHaveBeenCalled()
+    expect(focus).not.toHaveBeenCalled()
     expect(mocks.recordTerminalUserInputForLeaf).toHaveBeenCalledWith('tab-1', 'leaf-1')
   })
 
@@ -754,7 +750,8 @@ describe('handleTerminalFileDrop', () => {
       worktreeId: 'wt-1',
       tabId: 'tab-1',
       cwd: undefined,
-      data: { paths: ['/Users/me/Screenshot 1.png'], target: 'terminal', paneLeafId: 'leaf-1' }
+      pane,
+      paths: ['/Users/me/Screenshot 1.png']
     })
 
     // Why: agents on Windows keep backslashes, so POSIX escaping would corrupt the path.
@@ -794,7 +791,8 @@ describe('handleTerminalFileDrop', () => {
         worktreeId: 'wt-1',
         tabId: 'tab-1',
         cwd: undefined,
-        data: { paths: ['/local/a.txt'], target: 'terminal', paneLeafId: 'leaf-1' }
+        pane,
+        paths: ['/local/a.txt']
       })
     ).resolves.toBeUndefined()
 
@@ -846,7 +844,8 @@ describe('handleTerminalFileDrop', () => {
       worktreeId: 'wt-1',
       tabId: 'tab-1',
       cwd: undefined,
-      data: { paths: ["/Users/me/it's here.txt"], target: 'terminal', paneLeafId: 'leaf-1' }
+      pane,
+      paths: ["/Users/me/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-handler.ts b/src/renderer/src/components/terminal-pane/terminal-drop-handler.ts
index eef9a6a7f846..4d84c2297085 100644
--- a/src/renderer/src/components/terminal-pane/terminal-drop-handler.ts
+++ b/src/renderer/src/components/terminal-pane/terminal-drop-handler.ts
@@ -16,11 +16,11 @@ import { resolveTerminalDropWorktreePath } from './terminal-drop-worktree-path'
 import {
   handleNativeTerminalFileDrop as handleTerminalFileDrop,
   type NativeTerminalFileDropArgs
-} from './terminal-native-file-drop'
+} from './terminal-native-file-drop-destination'
 
 export { handleTerminalFileDrop }
 
-type InternalArgs = Omit<NativeTerminalFileDropArgs, 'data'> & {
+type InternalArgs = Omit<NativeTerminalFileDropArgs, 'paths' | 'pane'> & {
   dataTransfer: Pick<DataTransfer, 'getData'>
   dropTarget?: EventTarget | null
   paneLeafId?: string
diff --git a/src/renderer/src/components/terminal-pane/terminal-drop-local-workspace.test.ts b/src/renderer/src/components/terminal-pane/terminal-drop-local-workspace.test.ts
index bb53ff4ab31b..3832b7b77688 100644
--- a/src/renderer/src/components/terminal-pane/terminal-drop-local-workspace.test.ts
+++ b/src/renderer/src/components/terminal-pane/terminal-drop-local-workspace.test.ts
@@ -60,7 +60,8 @@ describe('local terminals without catalog workspaces', () => {
       if (lane === 'native') {
         await handleTerminalFileDrop({
           ...args,
-          data: { target: 'terminal', paneLeafId: 'leaf-1', paths: ['/local/file.txt'] }
+          pane: pane,
+          paths: ['/local/file.txt']
         })
       } else {
         const result = await handleInternalTerminalFileDrop({
@@ -76,7 +77,7 @@ describe('local terminals without catalog workspaces', () => {
         expect(result).toEqual({ status: 'pasted', pathCount: 1 })
       }
       expect(sendInput).toHaveBeenCalledExactlyOnceWith('/local/file.txt ', 'driving')
-      expect(focus).toHaveBeenCalled()
+      expect(focus).toHaveBeenCalledTimes(lane === 'internal' ? 1 : 0)
       expect(mocks.importPaths).not.toHaveBeenCalled()
       expect(mocks.resolvePaths).not.toHaveBeenCalled()
     }
diff --git a/src/renderer/src/components/terminal-pane/terminal-drop-local-wsl.ts b/src/renderer/src/components/terminal-pane/terminal-drop-local-wsl.ts
new file mode 100644
index 000000000000..dfa86acbb583
--- /dev/null
+++ b/src/renderer/src/components/terminal-pane/terminal-drop-local-wsl.ts
@@ -0,0 +1,28 @@
+import { getLocalProjectExecutionRuntimeContext } from '@/lib/local-preflight-context'
+import { CLIENT_PLATFORM } from '@/lib/new-workspace'
+import type { useAppStore } from '@/store'
+import { isWindowsAbsolutePathLike } from '../../../../shared/cross-platform-path'
+import { parseWslUncPath } from '../../../../shared/wsl-paths'
+
+export function isWorktreeUsingLocalWslRuntime(
+  state: ReturnType<typeof useAppStore.getState>,
+  worktreeId: string
+): boolean {
+  const projectRuntime = getLocalProjectExecutionRuntimeContext(state, worktreeId, CLIENT_PLATFORM)
+  if (projectRuntime?.status === 'repair-required') {
+    return projectRuntime.repair.preferredRuntime.kind === 'wsl'
+  }
+  return projectRuntime?.status === 'resolved' && projectRuntime.runtime.kind === 'wsl'
+}
+
+export function toLocalWslDropPath(path: string): string {
+  const wslUnc = parseWslUncPath(path)
+  if (wslUnc) {
+    return wslUnc.linuxPath
+  }
+  if (isWindowsAbsolutePathLike(path)) {
+    const drive = path[0].toLowerCase()
+    return `/mnt/${drive}/${path.slice(3).replace(/\\/g, '/')}`
+  }
+  return path.replace(/\\/g, '/')
+}
diff --git a/src/renderer/src/components/terminal-pane/terminal-drop-pane-resolution.test.ts b/src/renderer/src/components/terminal-pane/terminal-drop-pane-resolution.test.ts
index 17fe8d02b1c9..00953e328e67 100644
--- a/src/renderer/src/components/terminal-pane/terminal-drop-pane-resolution.test.ts
+++ b/src/renderer/src/components/terminal-pane/terminal-drop-pane-resolution.test.ts
@@ -1,10 +1,7 @@
 // @vitest-environment happy-dom
 import { describe, expect, it, vi } from 'vitest'
 import type { ManagedPane, PaneManager } from '@/lib/pane-manager/pane-manager'
-import {
-  resolveInternalTerminalDropPane,
-  resolveNativeTerminalDropPane
-} from './terminal-drop-pane-resolution'
+import { resolveInternalTerminalDropPane } from './terminal-drop-pane-resolution'
 
 describe('terminal drop pane resolution', () => {
   const container = document.createElement('div')
@@ -20,12 +17,6 @@ describe('terminal drop pane resolution', () => {
   // oxlint-disable-next-line typescript/consistent-type-assertions -- SAFETY: Resolution only enumerates panes; active-pane access must stay unused.
   const manager = { getPanes: () => [pane], getActivePane } as unknown as PaneManager
 
-  it('refuses missing or stale native leaves without consulting focus', () => {
-    expect(resolveNativeTerminalDropPane(manager, undefined)).toBeNull()
-    expect(resolveNativeTerminalDropPane(manager, 'stale-leaf')).toBeNull()
-    expect(getActivePane).not.toHaveBeenCalled()
-  })
-
   it('refuses missing, outside, and stale internal destinations', () => {
     expect(resolveInternalTerminalDropPane(manager, undefined)).toBeNull()
     expect(resolveInternalTerminalDropPane(manager, document.createElement('div'))).toBeNull()
diff --git a/src/renderer/src/components/terminal-pane/terminal-drop-pane-resolution.ts b/src/renderer/src/components/terminal-pane/terminal-drop-pane-resolution.ts
index f1822b364ced..6e85dbba9a77 100644
--- a/src/renderer/src/components/terminal-pane/terminal-drop-pane-resolution.ts
+++ b/src/renderer/src/components/terminal-pane/terminal-drop-pane-resolution.ts
@@ -1,12 +1,5 @@
 import type { ManagedPane, PaneManager } from '@/lib/pane-manager/pane-manager'
 
-export function resolveNativeTerminalDropPane(
-  manager: PaneManager,
-  paneLeafId: string | undefined
-): ManagedPane | null {
-  return paneLeafId ? (manager.getPanes().find((pane) => pane.leafId === paneLeafId) ?? null) : null
-}
-
 export function resolveInternalTerminalDropPane(
   manager: PaneManager,
   dropTarget: EventTarget | null | undefined,
@@ -14,7 +7,7 @@ export function resolveInternalTerminalDropPane(
 ): ManagedPane | null {
   const panes = manager.getPanes()
   if (paneLeafId !== undefined) {
-    return resolveNativeTerminalDropPane(manager, paneLeafId)
+    return panes.find((pane) => pane.leafId === paneLeafId) ?? null
   }
   if (dropTarget) {
     const targetedPane = panes.find((pane) => paneContainsDropTarget(pane, dropTarget))
diff --git a/src/renderer/src/components/terminal-pane/terminal-drop-runtime-catalog-owner.test.ts b/src/renderer/src/components/terminal-pane/terminal-drop-runtime-catalog-owner.test.ts
index 4868e2697880..e55fdc6c39e3 100644
--- a/src/renderer/src/components/terminal-pane/terminal-drop-runtime-catalog-owner.test.ts
+++ b/src/renderer/src/components/terminal-pane/terminal-drop-runtime-catalog-owner.test.ts
@@ -107,7 +107,8 @@ async function drop(lane: string, workspaceId: string, executionHostId: Executio
   if (lane === 'native') {
     await handleTerminalFileDrop({
       ...args,
-      data: { target: 'terminal', paneLeafId: 'leaf-1', paths: ['/client/file.txt'] }
+      pane: pane,
+      paths: ['/client/file.txt']
     })
   } else {
     result = await handleInternalTerminalFileDrop({
diff --git a/src/renderer/src/components/terminal-pane/terminal-drop-target.ts b/src/renderer/src/components/terminal-pane/terminal-drop-target.ts
index 3247bb5ce7da..fc9464aaf559 100644
--- a/src/renderer/src/components/terminal-pane/terminal-drop-target.ts
+++ b/src/renderer/src/components/terminal-pane/terminal-drop-target.ts
@@ -33,9 +33,8 @@ export function getCurrentTerminalDropTransport(
   ) {
     return null
   }
-  const activePane = manager.getActivePane()
-  const paneStillMounted =
-    manager.getPanes().some((pane) => pane.id === target.paneId && pane.leafId === target.leafId) ||
-    (activePane?.id === target.paneId && activePane.leafId === target.leafId)
+  const paneStillMounted = manager
+    .getPanes()
+    .some((pane) => pane.id === target.paneId && pane.leafId === target.leafId)
   return paneStillMounted ? liveTransport : null
 }
diff --git a/src/renderer/src/components/terminal-pane/terminal-native-file-drop-destination.ts b/src/renderer/src/components/terminal-pane/terminal-native-file-drop-destination.ts
new file mode 100644
index 000000000000..c29668543b68
--- /dev/null
+++ b/src/renderer/src/components/terminal-pane/terminal-native-file-drop-destination.ts
@@ -0,0 +1,92 @@
+import { toast } from 'sonner'
+import { extractIpcErrorMessage } from '@/lib/ipc-error'
+import type { PaneManager } from '@/lib/pane-manager/pane-manager'
+import { useAppStore } from '@/store'
+import { translate } from '@/i18n/i18n'
+import type { PtyTransport } from './pty-transport'
+import { captureTerminalDropTarget, getCurrentTerminalDropTransport } from './terminal-drop-target'
+import { captureTerminalDropTransportOwner } from './terminal-drop-transport-owner'
+import { resolveTerminalDropWorktreePath } from './terminal-drop-worktree-path'
+import { isWorktreeUsingLocalWslRuntime } from './terminal-drop-local-wsl'
+import { deliverNativeTerminalFileDrop } from './terminal-native-file-drop'
+
+export type NativeTerminalFileDropArgs = {
+  manager: PaneManager
+  paneTransports: Map<number, PtyTransport>
+  worktreeId: string
+  tabId: string
+  cwd: string | undefined
+  pane: { id: number; leafId: string }
+  paths: string[]
+}
+
+/** Capture before preparation so asynchronous work cannot choose a replacement PTY. */
+export function captureNativeTerminalFileDrop(
+  args: Omit<NativeTerminalFileDropArgs, 'paths'>
+): (paths: string[]) => Promise<void> {
+  try {
+    return captureNativeTerminalFileDropDestination(args)
+  } catch (err) {
+    toast.error(extractIpcErrorMessage(err, 'Failed to drop files.'))
+    return async () => undefined
+  }
+}
+
+export async function handleNativeTerminalFileDrop(
+  args: NativeTerminalFileDropArgs
+): Promise<void> {
+  await captureNativeTerminalFileDrop(args)(args.paths)
+}
+
+function captureNativeTerminalFileDropDestination(
+  args: Omit<NativeTerminalFileDropArgs, 'paths'>
+): (paths: string[]) => Promise<void> {
+  const { manager, paneTransports, worktreeId, tabId, cwd, pane } = args
+  const transport = paneTransports.get(pane.id)
+  if (!transport) {
+    return async () => undefined
+  }
+  const dropTarget = captureTerminalDropTarget(pane, transport)
+  const state = useAppStore.getState()
+  const settings = state.settings
+  const owner = captureTerminalDropTransportOwner(transport)
+  const worktreePath = resolveTerminalDropWorktreePath(
+    worktreeId,
+    owner?.runtimeEnvironmentId ? undefined : cwd,
+    owner?.executionHostId,
+    owner?.runtimeEnvironmentId
+  )
+  if (!worktreePath) {
+    toast.error(
+      translate(
+        'auto.components.terminal.pane.terminal.drop.handler.ce8248b835',
+        'Worktree path not available.'
+      )
+    )
+    return async () => undefined
+  }
+  const localWslDrop = isWorktreeUsingLocalWslRuntime(state, worktreeId)
+  return async (paths) => {
+    if (!paths.length || !getCurrentTerminalDropTransport(manager, paneTransports, dropTarget)) {
+      return
+    }
+    try {
+      owner?.assertCurrent()
+      await deliverNativeTerminalFileDrop({
+        manager,
+        paneTransports,
+        worktreeId,
+        tabId,
+        pane,
+        dataPaths: paths,
+        dropTarget,
+        settings,
+        owner,
+        worktreePath,
+        localWslDrop
+      })
+    } catch (err) {
+      toast.error(extractIpcErrorMessage(err, 'Failed to drop files.'))
+    }
+  }
+}
diff --git a/src/renderer/src/components/terminal-pane/terminal-native-file-drop.ts b/src/renderer/src/components/terminal-pane/terminal-native-file-drop.ts
index b43305c82f0a..9bd32dbe3cc2 100644
--- a/src/renderer/src/components/terminal-pane/terminal-native-file-drop.ts
+++ b/src/renderer/src/components/terminal-pane/terminal-native-file-drop.ts
@@ -1,98 +1,53 @@
 import { toast } from 'sonner'
 import { extractIpcErrorMessage } from '@/lib/ipc-error'
-import { getLocalProjectExecutionRuntimeContext } from '@/lib/local-preflight-context'
-import { CLIENT_PLATFORM } from '@/lib/new-workspace'
 import type { PaneManager } from '@/lib/pane-manager/pane-manager'
 import { importExternalPathsToRuntime } from '@/runtime/runtime-file-client'
-import { useAppStore } from '@/store'
+import type { useAppStore } from '@/store'
 import { translate } from '@/i18n/i18n'
-import { isWindowsAbsolutePathLike } from '../../../../shared/cross-platform-path'
-import { isWslUncPath, parseWslUncPath } from '../../../../shared/wsl-paths'
+import { isWslUncPath } from '../../../../shared/wsl-paths'
 import type { PtyTransport } from './pty-transport'
 import { recordTerminalUserInputForLeaf } from './terminal-input-activity'
 import { reportTerminalDropUploadSkipsAndFailures } from './terminal-drop-upload-report'
-import { captureTerminalDropTarget, getCurrentTerminalDropTransport } from './terminal-drop-target'
+import {
+  type captureTerminalDropTarget,
+  getCurrentTerminalDropTransport
+} from './terminal-drop-target'
 import {
   getTerminalTargetShellForWorktreePath,
   isTerminalDropWindowsPathLike,
   resolveTerminalDropTargetShell
 } from './terminal-drop-shell'
 import { writeTerminalDropPathsToCapturedTarget } from './terminal-drop-path-writer'
-import { resolveNativeTerminalDropPane } from './terminal-drop-pane-resolution'
 import { getTerminalPasteSshRemotePlatform } from './terminal-paste-ssh-platform'
 import { showTerminalDropWriteFailure } from './terminal-drop-write-failure'
-import {
-  joinRuntimeTerminalDropDir,
-  resolveTerminalDropWorktreePath
-} from './terminal-drop-worktree-path'
-import { captureTerminalDropTransportOwner } from './terminal-drop-transport-owner'
+import { joinRuntimeTerminalDropDir } from './terminal-drop-worktree-path'
+import type { captureTerminalDropTransportOwner } from './terminal-drop-transport-owner'
+import { toLocalWslDropPath } from './terminal-drop-local-wsl'
 
-export type NativeTerminalFileDropArgs = {
-  manager: PaneManager
-  paneTransports: Map<number, PtyTransport>
-  worktreeId: string
-  tabId: string
-  cwd: string | undefined
-  data: { paths: string[]; target: string; tabId?: string; paneLeafId?: string }
-}
-
-/**
- * Handle a native file drop targeted at a terminal pane.
- *
- * Local worktrees: paste the local absolute path (reference-in-place; no copy
- * or IPC). SSH worktrees: upload each file into `${worktreePath}/.orca/drops`
- * and paste the remote path so the remote agent can read it. See
- * docs/terminal-drop-ssh.md.
- */
-export async function handleNativeTerminalFileDrop(
-  args: NativeTerminalFileDropArgs
-): Promise<void> {
-  try {
-    await handleNativeTerminalFileDropWithCapturedOwner(args)
-  } catch (err) {
-    // Why: native drop listeners fire-and-forget, so owner-capture failures must terminate here.
-    toast.error(extractIpcErrorMessage(err, 'Failed to drop files.'))
+export async function deliverNativeTerminalFileDrop(
+  args: NativeDropFlowArgs & {
+    settings: ReturnType<typeof useAppStore.getState>['settings']
+    owner: ReturnType<typeof captureTerminalDropTransportOwner>
+    worktreeId: string
+    localWslDrop: boolean
   }
-}
-
-async function handleNativeTerminalFileDropWithCapturedOwner(
-  args: NativeTerminalFileDropArgs
 ): Promise<void> {
-  const { manager, paneTransports, worktreeId, tabId, cwd, data } = args
-  if (data.paths.length === 0) {
-    return
-  }
-  const pane = resolveNativeTerminalDropPane(manager, data.paneLeafId)
-  if (!pane) {
-    return
-  }
-  const transport = paneTransports.get(pane.id)
-  if (!transport) {
-    return
-  }
-  const dropTarget = captureTerminalDropTarget(pane, transport)
-  const state = useAppStore.getState()
-  const settings = state.settings
-  const owner = captureTerminalDropTransportOwner(transport)
-  const worktreePath = resolveTerminalDropWorktreePath(
+  const {
+    manager,
+    paneTransports,
     worktreeId,
-    owner?.runtimeEnvironmentId ? undefined : cwd,
-    owner?.executionHostId,
-    owner?.runtimeEnvironmentId
-  )
-  if (!worktreePath) {
-    toast.error(
-      translate(
-        'auto.components.terminal.pane.terminal.drop.handler.ce8248b835',
-        'Worktree path not available.'
-      )
-    )
-    return
-  }
-
+    tabId,
+    pane,
+    dataPaths,
+    dropTarget,
+    settings,
+    owner,
+    worktreePath,
+    localWslDrop
+  } = args
   if (owner?.runtimeEnvironmentId) {
     await uploadRuntimeDropPaths({
-      dataPaths: data.paths,
+      dataPaths,
       dropTarget,
       manager,
       paneTransports,
@@ -124,11 +79,10 @@ async function handleNativeTerminalFileDropWithCapturedOwner(
     remotePlatform: getTerminalPasteSshRemotePlatform(connectionId)
   })
   const isRemote = connectionId !== null
-  const localWslDrop = !isRemote && isWorktreeUsingLocalWslRuntime(state, worktreeId)
 
   if (!isRemote) {
     await pasteLocalDropPaths({
-      dataPaths: data.paths,
+      dataPaths,
       dropTarget,
       localWslDrop,
       manager,
@@ -145,7 +99,7 @@ async function handleNativeTerminalFileDropWithCapturedOwner(
   await uploadRemoteDropPaths({
     ...owner,
     connectionId,
-    dataPaths: data.paths,
+    dataPaths,
     dropTarget,
     manager,
     paneTransports,
@@ -156,12 +110,12 @@ async function handleNativeTerminalFileDropWithCapturedOwner(
   })
 }
 
-type NativeDropFlowArgs = {
+export type NativeDropFlowArgs = {
   dataPaths: string[]
   dropTarget: ReturnType<typeof captureTerminalDropTarget>
   manager: PaneManager
   paneTransports: Map<number, PtyTransport>
-  pane: ReturnType<typeof resolveNativeTerminalDropPane> & {}
+  pane: { id: number; leafId: string }
   tabId: string
   worktreePath: string
   expectedSshTargetId?: string
@@ -302,30 +256,4 @@ async function pasteResolvedDropPaths(
   if (writeResult.sentAnyPath) {
     recordTerminalUserInputForLeaf(args.tabId, args.pane.leafId)
   }
-  if (writeResult.targetCurrent) {
-    args.pane.terminal.focus()
-  }
-}
-
-function isWorktreeUsingLocalWslRuntime(
-  state: ReturnType<typeof useAppStore.getState>,
-  worktreeId: string
-): boolean {
-  const projectRuntime = getLocalProjectExecutionRuntimeContext(state, worktreeId, CLIENT_PLATFORM)
-  if (projectRuntime?.status === 'repair-required') {
-    return projectRuntime.repair.preferredRuntime.kind === 'wsl'
-  }
-  return projectRuntime?.status === 'resolved' && projectRuntime.runtime.kind === 'wsl'
-}
-
-function toLocalWslDropPath(path: string): string {
-  const wslUnc = parseWslUncPath(path)
-  if (wslUnc) {
-    return wslUnc.linuxPath
-  }
-  if (isWindowsAbsolutePathLike(path)) {
-    const drive = path[0].toLowerCase()
-    return `/mnt/${drive}/${path.slice(3).replace(/\\/g, '/')}`
-  }
-  return path.replace(/\\/g, '/')
 }
diff --git a/src/renderer/src/components/terminal-pane/terminal-pane-element-file-drop.test.tsx b/src/renderer/src/components/terminal-pane/terminal-pane-element-file-drop.test.tsx
new file mode 100644
index 000000000000..ca79f2e1d755
--- /dev/null
+++ b/src/renderer/src/components/terminal-pane/terminal-pane-element-file-drop.test.tsx
@@ -0,0 +1,523 @@
+// @vitest-environment happy-dom
+import { act, cleanup, render } from '@testing-library/react'
+import { createPortal } from 'react-dom'
+import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest'
+import { isTerminalLeafId } from '../../../../shared/stable-pane-id'
+import { FLOATING_TERMINAL_WORKTREE_ID } from '../../../../shared/constants'
+import type { PreparedDroppedPaths } from '../../../../shared/native-file-drop-preparation'
+import type { PaneManager } from '@/lib/pane-manager/pane-manager'
+import type { ManagedPaneInternal } from '@/lib/pane-manager/pane-manager-types'
+import { collectPublicPanes, toPublicPane } from '@/lib/pane-manager/pane-public-view'
+import type { PtyTransport } from './pty-transport'
+import type { TerminalPaneController } from './use-terminal-pane-controller'
+import {
+  NativeChatPaneFileDropSurface,
+  useNativeChatPaneFileDropClaim
+} from '@/components/native-chat/NativeChatPaneFileDropSurface'
+import { TerminalPaneSurface } from './TerminalPaneSurface'
+import { installOsFileDropCancellationGuard } from '@/lib/os-file-drop-cancellation-guard'
+
+const mocks = vi.hoisted(() => ({
+  state: {
+    settings: { activeRuntimeEnvironmentId: 'focused-runtime' },
+    projects: [],
+    repos: [],
+    // oxlint-disable-next-line typescript/consistent-type-assertions -- SAFETY: Every fixture record has the declared catalog shape.
+    worktreesByRepo: {} as Record<
+      string,
+      { id: string; repoId: string; path: string; hostId: string }[]
+    >,
+    detectedWorktreesByRepo: {},
+    folderWorkspaces: [],
+    sshConnectionStates: new Map([['target', { connectionGeneration: 4, remotePlatform: 'linux' }]])
+  },
+  prepare: vi.fn(),
+  importPaths: vi.fn(),
+  resolvePaths: vi.fn(),
+  chatDrop: vi.fn(),
+  toastError: vi.fn(),
+  legacyIpc: vi.fn(),
+  editorOpen: vi.fn(),
+  // oxlint-disable-next-line typescript/consistent-type-assertions -- SAFETY: The portal target starts absent and is assigned only a fixture pane container.
+  chatPane: null as HTMLElement | null,
+  chatDisabled: false
+}))
+vi.mock('electron', () => ({
+  ipcRenderer: { on: vi.fn(), send: mocks.legacyIpc, removeListener: vi.fn() },
+  webUtils: { getPathForFile: (file: File) => `/client/${file.name}` }
+}))
+vi.mock('@/store', () => ({
+  useAppStore: Object.assign(
+    <T,>(selector: (state: typeof mocks.state) => T) => selector(mocks.state),
+    { getState: () => mocks.state }
+  )
+}))
+vi.mock('@/runtime/runtime-file-client', () => ({
+  importExternalPathsToRuntime: mocks.importPaths
+}))
+vi.mock('@/lib/new-workspace', () => ({ CLIENT_PLATFORM: 'win32' }))
+vi.mock('sonner', () => ({
+  toast: { error: mocks.toastError, loading: vi.fn(), dismiss: vi.fn(), message: vi.fn() }
+}))
+vi.mock('./terminal-input-activity', () => ({ recordTerminalUserInputForLeaf: vi.fn() }))
+vi.mock('@/components/ui/tooltip', () => ({
+  Tooltip: ({ children }: { children: React.ReactNode }) => children,
+  TooltipTrigger: ({ children }: { children: React.ReactNode }) => children,
+  TooltipContent: () => null
+}))
+vi.mock('@/components/TerminalSearch', () => ({ default: () => null }))
+vi.mock('@/components/shared/useDaemonActions', () => ({ DaemonActionDialog: () => null }))
+vi.mock('@/components/agent-session-continuation/AgentSessionContinuationDialog', () => ({
+  AgentSessionContinuationDialog: () => null
+}))
+vi.mock('./CloseTerminalDialog', () => ({ default: () => null }))
+vi.mock('./TerminalContextMenu', () => ({ default: () => null }))
+vi.mock('./TerminalErrorToast', () => ({
+  isPaneOwnerUnverifiedError: () => false,
+  TerminalErrorToast: () => null
+}))
+vi.mock('./terminal-pane-recovery', () => ({ requestTerminalPaneRecovery: vi.fn() }))
+vi.mock('./TerminalSessionStateSaveFailureDialog', () => ({
+  TerminalSessionStateSaveFailureDialog: () => null
+}))
+vi.mock('@/components/link-actions/LinkActionPopover', () => ({ LinkActionPopover: () => null }))
+vi.mock('./TerminalAgentSessionForkDialog', () => ({ TerminalAgentSessionForkDialog: () => null }))
+vi.mock('./SessionRestoredBannerPortals', () => ({ SessionRestoredBannerPortals: () => null }))
+vi.mock('./TerminalQuickCommandEditorDialog', () => ({
+  TerminalQuickCommandEditorDialog: () => null
+}))
+vi.mock('./TerminalPaneRuntimePortals', () => ({
+  TerminalPaneCodexRestartPortals: () => null,
+  TerminalPaneMobileDriverPortals: () => null,
+  TerminalPaneProcessExitPortals: () => null,
+  TerminalPaneRecoveryPortals: () => null,
+  TerminalPaneSshReconnectPortals: () => null
+}))
+
+function ChatClaim(): null {
+  useNativeChatPaneFileDropClaim({
+    disabled: mocks.chatDisabled,
+    destinationKey: 'chat-A',
+    captureExternalDrop: () => mocks.chatDrop,
+    onDragOverCapture: vi.fn(),
+    onDropCapture: vi.fn()
+  })
+  return null
+}
+vi.mock('./TerminalPaneNativeChatPortal', () => ({
+  TerminalPaneNativeChatPortal: () =>
+    mocks.chatPane &&
+    createPortal(
+      <NativeChatPaneFileDropSurface className="chat-drop">
+        <ChatClaim />
+        <span data-testid="chat-target" />
+      </NativeChatPaneFileDropSurface>,
+      mocks.chatPane
+    )
+}))
+
+function makePane(id: number): ManagedPaneInternal {
+  const leafId = `00000000-0000-4000-8000-00000000000${id}`
+  if (!isTerminalLeafId(leafId)) {
+    throw new Error('Invalid fixture leaf')
+  }
+  // oxlint-disable-next-line typescript/consistent-type-assertions -- SAFETY: The surface reads identity, DOM container, and terminal focus; add-ons are mocked out.
+  return {
+    id,
+    leafId,
+    stablePaneId: leafId,
+    container: document.createElement('div'),
+    terminal: { focus: vi.fn() }
+  } as unknown as ManagedPaneInternal
+}
+
+function mountSurface(
+  options: {
+    chat?: boolean
+    hidden?: 'display' | 'inert'
+    host?: string
+    runtime?: string
+    cwd?: string
+    worktreeId?: string
+  } = {}
+) {
+  const internalPanes = [makePane(1), makePane(2)]
+  const paneRecords = new Map(internalPanes.map((pane) => [pane.id, pane]))
+  const getPanes = () => collectPublicPanes(paneRecords, paneRecords.size)
+  const panes = getPanes()
+  const sends = panes.map(() => vi.fn(() => true))
+  const ptyIds = ['pty-A', 'pty-B']
+  const transports = new Map<number, PtyTransport>()
+  panes.forEach((pane, index) => {
+    // oxlint-disable-next-line typescript/consistent-type-assertions -- SAFETY: This fixture supplies every transport method used by file drop capture and writes.
+    transports.set(pane.id, {
+      sendInput: sends[index],
+      getPtyId: () => ptyIds[index],
+      isConnected: () => true,
+      getExecutionHostId: () => options.host ?? 'local',
+      getRuntimeEnvironmentId: () => options.runtime ?? null
+    } as unknown as PtyTransport)
+  })
+  const active = internalPanes[1]
+  // oxlint-disable-next-line typescript/consistent-type-assertions -- SAFETY: The surface and drop handlers only enumerate panes and read active identity.
+  const manager = { getPanes, getActivePane: () => toPublicPane(active) } as unknown as PaneManager
+  const divider = document.createElement('div')
+  const activate = vi.fn()
+  mocks.chatPane = options.chat ? panes[0].container : null
+  // oxlint-disable-next-line typescript/consistent-type-assertions -- SAFETY: All live surface fields are supplied; unrelated dialogs and controller operations are mocked out.
+  const controller = {
+    activePane: active,
+    managedPanes: panes,
+    managerRef: { current: manager },
+    paneTransportsRef: { current: transports },
+    tabId: 'tab-1',
+    worktreeId: options.worktreeId ?? 'wt-1',
+    cwd: options.cwd,
+    isActive: true,
+    terminalContentVisible: true,
+    hiddenStartupStyle: {},
+    terminalContainerStyle: {},
+    paneCount: 2,
+    paneTitles: { 1: 'A', 2: 'B' },
+    paneTitleOverlayRects: {
+      1: { left: 0, top: 0, width: 200 },
+      2: { left: 220, top: 0, width: 200 }
+    },
+    renamingPaneId: null,
+    renameInputRef: { current: null },
+    paneTitleBackground: 'transparent',
+    activatePaneTitleInteraction: activate,
+    contextMenu: {},
+    daemonActions: {},
+    sessionRestoredBannerPaneIds: [],
+    setContainerRef: (root: HTMLElement | null) =>
+      root?.append(panes[0].container, divider, panes[1].container)
+  } as unknown as TerminalPaneController
+  const view = render(
+    <div
+      style={options.hidden === 'display' ? { display: 'none' } : undefined}
+      inert={options.hidden === 'inert' || undefined}
+    >
+      <TerminalPaneSurface controller={controller} />
+    </div>
+  )
+  const titles = view.container.querySelectorAll('.pane-title-bar')
+  return {
+    view,
+    panes,
+    sends,
+    manager,
+    activate,
+    transports,
+    ptyIds,
+    divider,
+    title: titles[0],
+    body: panes[0].container,
+    replacePaneContainer: () => {
+      paneRecords.set(panes[0].id, {
+        ...internalPanes[0],
+        container: document.createElement('div')
+      })
+    }
+  }
+}
+
+function drop(target: Element, name = 'file.txt') {
+  const event = new Event('drop', { bubbles: true, cancelable: true, composed: true })
+  Object.defineProperty(event, 'isTrusted', { value: true })
+  Object.defineProperty(event, 'dataTransfer', {
+    value: { types: ['Files'], files: [new File([], name)], dropEffect: 'move' }
+  })
+  act(() => {
+    target.dispatchEvent(event)
+  })
+  return event
+}
+async function settle(): Promise<void> {
+  await act(async () => undefined)
+}
+
+let disposeGuard: (() => void) | undefined
+beforeEach(() => {
+  vi.clearAllMocks()
+  disposeGuard = installOsFileDropCancellationGuard()
+  mocks.legacyIpc.mockImplementation((_channel: string, payload: { target: string }) => {
+    if (payload.target === 'editor') {
+      mocks.editorOpen()
+    }
+  })
+  mocks.chatPane = null
+  mocks.chatDisabled = false
+  mocks.state.worktreesByRepo = {
+    repo: [{ id: 'wt-1', repoId: 'repo', path: '/owner/workspace', hostId: 'local' }]
+  }
+  mocks.prepare.mockImplementation(async ({ paths }: { paths: string[] }) => ({
+    paths,
+    failures: []
+  }))
+  mocks.resolvePaths.mockResolvedValue({
+    resolvedPaths: ['/host/file.txt'],
+    skipped: [],
+    failed: []
+  })
+  mocks.importPaths.mockResolvedValue({
+    results: [{ status: 'imported', destPath: '/owner/workspace/.orca/drops/file.txt' }]
+  })
+  vi.stubGlobal('api', {
+    fs: {
+      getPathForFile: (file: File) => `/client/${file.name}`,
+      prepareDroppedPaths: mocks.prepare,
+      resolveDroppedPathsForAgent: mocks.resolvePaths
+    }
+  })
+})
+afterEach(() => {
+  disposeGuard?.()
+  cleanup()
+  vi.unstubAllGlobals()
+})
+
+describe('terminal element file drops', () => {
+  it('enumerates fresh public views of the same pane identities', () => {
+    const fixture = mountSurface()
+    const first = fixture.manager.getPanes()
+    const second = fixture.manager.getPanes()
+    for (const [index, pane] of first.entries()) {
+      expect(pane).not.toBe(fixture.panes[index])
+      expect(pane).not.toBe(second[index])
+      expect(second[index]).toEqual(pane)
+      expect(pane.container).toBe(fixture.panes[index].container)
+    }
+  })
+  it.each(['title', 'body'] as const)(
+    'delivers to A from its %s while B stays active and never broadcasts',
+    async (root) => {
+      const fixture = mountSurface()
+      drop(fixture[root])
+      await settle()
+      expect(fixture.sends[0]).toHaveBeenCalledExactlyOnceWith('/client/file.txt ', 'driving')
+      expect(fixture.sends[1]).not.toHaveBeenCalled()
+      expect(fixture.panes[0].terminal.focus).not.toHaveBeenCalled()
+      expect(fixture.activate).not.toHaveBeenCalled()
+      expect(fixture.manager.getActivePane()).toEqual(fixture.panes[1])
+      expect(mocks.legacyIpc).not.toHaveBeenCalled()
+      expect(mocks.prepare).toHaveBeenCalledExactlyOnceWith({
+        paths: ['/client/file.txt'],
+        consumer: 'agent'
+      })
+    }
+  )
+  it.each(['title', 'body'] as const)(
+    'refuses a retired %s owner with the same pane and leaf IDs but a replaced container',
+    async (root) => {
+      const fixture = mountSurface()
+      fixture.replacePaneContainer()
+      expect(fixture[root].isConnected).toBe(true)
+      expect(fixture.manager.getPanes()[0]).toMatchObject({
+        id: fixture.panes[0].id,
+        leafId: fixture.panes[0].leafId
+      })
+      expect(fixture.manager.getPanes()[0].container).not.toBe(fixture.body)
+      drop(fixture[root])
+      await settle()
+      expect(mocks.prepare).not.toHaveBeenCalled()
+      expect(fixture.sends[0]).not.toHaveBeenCalled()
+      expect(fixture.sends[1]).not.toHaveBeenCalled()
+    }
+  )
+  it.each(['title', 'body'] as const)(
+    'refuses delivery from %s when its container is replaced during preparation',
+    async (root) => {
+      let finish: ((prepared: PreparedDroppedPaths) => void) | undefined
+      mocks.prepare.mockImplementationOnce(
+        () =>
+          new Promise((resolve) => {
+            finish = resolve
+          })
+      )
+      const fixture = mountSurface()
+      drop(fixture[root])
+      expect(mocks.prepare).toHaveBeenCalledOnce()
+      fixture.replacePaneContainer()
+      await act(async () => {
+        finish?.({ paths: ['/client/file.txt'], failures: [] })
+      })
+      expect(fixture.sends[0]).not.toHaveBeenCalled()
+      expect(fixture.sends[1]).not.toHaveBeenCalled()
+    }
+  )
+  it('leaves divider drops unowned', async () => {
+    const fixture = mountSurface()
+    expect(fixture.body.hasAttribute('data-os-file-drop-owner')).toBe(true)
+    expect(fixture.body.parentElement?.hasAttribute('data-os-file-drop-owner')).toBe(false)
+    const hover = new Event('dragover', { bubbles: true, cancelable: true, composed: true })
+    const transfer = { types: ['Files'], dropEffect: 'move' }
+    Object.defineProperty(hover, 'dataTransfer', { value: transfer })
+    fixture.divider.dispatchEvent(hover)
+    expect(transfer.dropEffect).toBe('none')
+    const dropped = drop(fixture.divider)
+    expect(dropped.defaultPrevented).toBe(true)
+    expect(dropped).toHaveProperty('dataTransfer.dropEffect', 'none')
+    await settle()
+    expect(mocks.prepare).not.toHaveBeenCalled()
+    expect(mocks.legacyIpc).not.toHaveBeenCalled()
+    expect(mocks.editorOpen).not.toHaveBeenCalled()
+    expect(mocks.importPaths).not.toHaveBeenCalled()
+    expect(mocks.resolvePaths).not.toHaveBeenCalled()
+    expect(mocks.toastError).not.toHaveBeenCalled()
+    expect(fixture.sends[0]).not.toHaveBeenCalled()
+    expect(fixture.sends[1]).not.toHaveBeenCalled()
+  })
+  it('refuses unowned chrome without opening, uploading, or showing a toast', async () => {
+    const fixture = mountSurface()
+    const dropped = drop(fixture.view.container)
+    await settle()
+    expect(dropped.defaultPrevented).toBe(true)
+    expect(dropped).toHaveProperty('dataTransfer.dropEffect', 'none')
+    expect(mocks.prepare).not.toHaveBeenCalled()
+    expect(mocks.legacyIpc).not.toHaveBeenCalled()
+    expect(mocks.editorOpen).not.toHaveBeenCalled()
+    expect(mocks.importPaths).not.toHaveBeenCalled()
+    expect(mocks.resolvePaths).not.toHaveBeenCalled()
+    expect(mocks.toastError).not.toHaveBeenCalled()
+    expect(fixture.sends[0]).not.toHaveBeenCalled()
+    expect(fixture.sends[1]).not.toHaveBeenCalled()
+  })
+  it('shares ordering across title and body during delayed preparation', async () => {
+    let finish: ((prepared: PreparedDroppedPaths) => void) | undefined
+    mocks.prepare.mockImplementationOnce(
+      () =>
+        new Promise((resolve) => {
+          finish = resolve
+        })
+    )
+    const fixture = mountSurface()
+    drop(fixture.title, 'first.txt')
+    drop(fixture.body, 'second.txt')
+    await settle()
+    expect(fixture.sends[0]).not.toHaveBeenCalled()
+    await act(async () => {
+      finish?.({ paths: ['/prepared/first.txt'], failures: [] })
+    })
+    expect(fixture.sends[0].mock.calls).toEqual([
+      ['/prepared/first.txt ', 'driving'],
+      ['/client/second.txt ', 'driving']
+    ])
+  })
+  it.each([false, true])(
+    'keeps nested chat drops out of terminal (disabled=%s)',
+    async (disabled) => {
+      mocks.chatDisabled = disabled
+      const fixture = mountSurface({ chat: true })
+      drop(fixture.view.getByTestId('chat-target'))
+      await settle()
+      expect(mocks.chatDrop).toHaveBeenCalledTimes(disabled ? 0 : 1)
+      expect(fixture.sends[0]).not.toHaveBeenCalled()
+      drop(fixture.body)
+      await settle()
+      expect(fixture.sends[0]).toHaveBeenCalledExactlyOnceWith('/client/file.txt ', 'driving')
+      expect(mocks.chatDrop).toHaveBeenCalledTimes(disabled ? 0 : 1)
+    }
+  )
+  it.each(['display', 'inert'] as const)('refuses hidden terminal owners (%s)', async (hidden) => {
+    const fixture = mountSurface({ hidden })
+    expect(fixture.body.hasAttribute('data-os-file-drop-owner')).toBe(true)
+    drop(fixture.title)
+    drop(fixture.body)
+    await settle()
+    expect(mocks.prepare).not.toHaveBeenCalled()
+    expect(fixture.sends[0]).not.toHaveBeenCalled()
+  })
+  it('captures the PTY before preparation and refuses a replacement', async () => {
+    let finish: ((prepared: PreparedDroppedPaths) => void) | undefined
+    mocks.prepare.mockImplementationOnce(
+      () =>
+        new Promise((resolve) => {
+          finish = resolve
+        })
+    )
+    const fixture = mountSurface()
+    drop(fixture.title)
+    fixture.ptyIds[0] = 'replacement'
+    await act(async () => {
+      finish?.({ paths: ['/client/file.txt'], failures: [] })
+    })
+    expect(fixture.sends[0]).not.toHaveBeenCalled()
+    drop(fixture.body)
+    await settle()
+    expect(fixture.sends[0]).toHaveBeenCalledOnce()
+  })
+  it('uploads through the captured runtime catalog with physical local transport', async () => {
+    mocks.state.worktreesByRepo = {
+      local: [{ id: 'wt-1', repoId: 'local', path: 'C:\\wrong', hostId: 'local' }],
+      remote: [
+        { id: 'wt-1', repoId: 'remote', path: '/owner/workspace', hostId: 'runtime:owner-runtime' }
+      ]
+    }
+    const fixture = mountSurface({ runtime: 'owner-runtime', cwd: '/wrong' })
+    drop(fixture.title)
+    await settle()
+    expect(mocks.importPaths).toHaveBeenCalledWith(
+      expect.objectContaining({
+        settings: { activeRuntimeEnvironmentId: 'owner-runtime' },
+        worktreePath: '/owner/workspace',
+        expectedExecutionHostId: 'local'
+      }),
+      ['/client/file.txt'],
+      '/owner/workspace/.orca/drops',
+      { assertCurrent: expect.any(Function) }
+    )
+    expect(fixture.sends[0]).toHaveBeenCalledExactlyOnceWith(
+      '/owner/workspace/.orca/drops/file.txt ',
+      'driving'
+    )
+  })
+  it('uploads through the captured SSH connection', async () => {
+    mocks.state.worktreesByRepo = {
+      repo: [{ id: 'wt-1', repoId: 'repo', path: '/owner/workspace', hostId: 'ssh:target' }]
+    }
+    const fixture = mountSurface({ host: 'ssh:target' })
+    drop(fixture.body)
+    await settle()
+    expect(mocks.resolvePaths).toHaveBeenCalledExactlyOnceWith({
+      paths: ['/client/file.txt'],
+      worktreePath: '/owner/workspace',
+      connectionId: 'target',
+      expectedExecutionHostId: 'ssh:target',
+      expectedSshTargetId: 'target',
+      expectedSshConnectionGeneration: 4
+    })
+    expect(fixture.sends[0]).toHaveBeenCalledExactlyOnceWith('/host/file.txt ', 'driving')
+  })
+  it('uses the existing WSL resolver for a local distro', async () => {
+    mocks.state.worktreesByRepo = {
+      repo: [
+        {
+          id: 'wt-1',
+          repoId: 'repo',
+          path: '\\\\wsl.localhost\\Ubuntu\\home\\user\\repo',
+          hostId: 'local'
+        }
+      ]
+    }
+    const fixture = mountSurface()
+    drop(fixture.body)
+    await settle()
+    expect(mocks.resolvePaths).toHaveBeenCalledExactlyOnceWith({
+      paths: ['/client/file.txt'],
+      worktreePath: '\\\\wsl.localhost\\Ubuntu\\home\\user\\repo'
+    })
+    expect(fixture.sends[0]).toHaveBeenCalledExactlyOnceWith('/host/file.txt ', 'driving')
+  })
+  it('preserves the floating terminal local cwd while another runtime is focused', async () => {
+    const fixture = mountSurface({
+      worktreeId: FLOATING_TERMINAL_WORKTREE_ID,
+      cwd: '/floating/cwd'
+    })
+    drop(fixture.title)
+    await settle()
+    expect(fixture.sends[0]).toHaveBeenCalledExactlyOnceWith('/client/file.txt ', 'driving')
+    expect(mocks.importPaths).not.toHaveBeenCalled()
+    expect(mocks.resolvePaths).not.toHaveBeenCalled()
+  })
+})
diff --git a/src/renderer/src/components/terminal-pane/terminal-pane-pane-created.ts b/src/renderer/src/components/terminal-pane/terminal-pane-pane-created.ts
index a985d39e5f2f..b19200719878 100644
--- a/src/renderer/src/components/terminal-pane/terminal-pane-pane-created.ts
+++ b/src/renderer/src/components/terminal-pane/terminal-pane-pane-created.ts
@@ -21,6 +21,7 @@ import type { PtyPreconnectInputEntry } from './pty-preconnect-input-buffer'
 import { guardParserHandler } from './terminal-parser-handler-guard'
 import { isPaneReplaying } from './replay-guard'
 import { connectPanePty } from './pty-connection'
+import { completePaneSpawnPlacement } from './terminal-pane-spawn-placement'
 import {
   createQueuedStartupConsumer,
   resolvePaneSeedCwd,
@@ -209,6 +210,15 @@ export function createTerminalPaneCreatedHandler(
         : {}),
       ...(effectiveSpawnHints?.cwd ? { cwd: effectiveSpawnHints.cwd } : {}),
       ...(effectiveSpawnHints?.cwdPromise ? { cwdPromise: effectiveSpawnHints.cwdPromise } : {}),
+      ...(effectiveSpawnHints?.placement
+        ? {
+            placement: completePaneSpawnPlacement(effectiveSpawnHints.placement, {
+              worktreeId: deps.worktreeId,
+              tabId: deps.tabId,
+              container: deps.containerRef.current
+            })
+          }
+        : {}),
       restoredPtyIdByLeafId: effectiveSpawnHints?.ptyId
         ? {
             ...ptyDeps.restoredPtyIdByLeafId,
diff --git a/src/renderer/src/components/terminal-pane/terminal-pane-spawn-placement.test.ts b/src/renderer/src/components/terminal-pane/terminal-pane-spawn-placement.test.ts
new file mode 100644
index 000000000000..eec7df33470b
--- /dev/null
+++ b/src/renderer/src/components/terminal-pane/terminal-pane-spawn-placement.test.ts
@@ -0,0 +1,101 @@
+// @vitest-environment happy-dom
+import { afterEach, describe, expect, it, vi } from 'vitest'
+import type { TerminalPanePlacement } from '../../../../shared/terminal-pane-placement'
+
+const TAB = {
+  id: 'tab-1',
+  ptyId: null,
+  worktreeId: 'wt-1',
+  title: 'Terminal 2',
+  defaultTitle: 'Terminal 2',
+  customTitle: 'Build',
+  color: '#f97316',
+  sortOrder: 1,
+  createdAt: 42,
+  shellOverride: 'wsl.exe',
+  isPinned: true
+}
+
+vi.mock('@/store', () => ({
+  useAppStore: { getState: () => ({ tabsByWorktree: { 'wt-1': [TAB] } }) }
+}))
+// Why: happy-dom has no canvas, so xterm cannot open; placement never touches the terminal.
+vi.mock('@/lib/pane-manager/pane-lifecycle', async (importOriginal) => {
+  const actual: object = await importOriginal()
+  return { ...actual, openTerminal: vi.fn() }
+})
+
+const { PaneManager } = await import('@/lib/pane-manager/pane-manager')
+const { completePaneSpawnPlacement } = await import('./terminal-pane-spawn-placement')
+
+const LEAF_A = '11111111-1111-4111-8111-111111111111'
+const LEAF_B = '22222222-2222-4222-8222-222222222222'
+
+describe('completePaneSpawnPlacement', () => {
+  const root = document.createElement('div')
+
+  afterEach(() => {
+    root.replaceChildren()
+  })
+
+  it('adds the tab creation fields to a new tab', () => {
+    const placement = completePaneSpawnPlacement(
+      { kind: 'new-tab' },
+      { worktreeId: 'wt-1', tabId: 'tab-1', container: root }
+    )
+
+    expect(placement).toEqual({
+      kind: 'new-tab',
+      row: {
+        title: 'Terminal 2',
+        defaultTitle: 'Terminal 2',
+        customTitle: 'Build',
+        color: '#f97316',
+        createdAt: 42,
+        shellOverride: 'wsl.exe'
+      }
+    })
+  })
+
+  it('leaves a new tab bare when the store no longer has it', () => {
+    expect(
+      completePaneSpawnPlacement(
+        { kind: 'new-tab' },
+        { worktreeId: 'wt-1', tabId: 'tab-gone', container: root }
+      )
+    ).toEqual({ kind: 'new-tab' })
+  })
+
+  it('adds the mounted tree after the split', () => {
+    let placement: TerminalPanePlacement | undefined
+    const manager = new PaneManager(root, {
+      linkOpenHint: () => '',
+      onPaneCreated: (_pane, hints) => {
+        placement = hints?.placement
+          ? completePaneSpawnPlacement(hints.placement, {
+              worktreeId: 'wt-1',
+              tabId: 'tab-1',
+              container: root
+            })
+          : undefined
+      }
+    })
+    const first = manager.createInitialPane({ leafId: LEAF_A })
+    manager.splitPane(first.id, 'horizontal', { leafId: LEAF_B, ratio: 0.3 })
+
+    expect(placement).toEqual({
+      kind: 'split',
+      parentLeafId: LEAF_A,
+      direction: 'horizontal',
+      ratio: 0.3,
+      proposedRoot: {
+        type: 'split',
+        direction: 'horizontal',
+        first: { type: 'leaf', leafId: LEAF_A },
+        second: { type: 'leaf', leafId: LEAF_B },
+        ratio: 0.3
+      }
+    })
+    manager.destroy()
+  })
+})
diff --git a/src/renderer/src/components/terminal-pane/terminal-pane-spawn-placement.ts b/src/renderer/src/components/terminal-pane/terminal-pane-spawn-placement.ts
new file mode 100644
index 000000000000..920e27865464
--- /dev/null
+++ b/src/renderer/src/components/terminal-pane/terminal-pane-spawn-placement.ts
@@ -0,0 +1,23 @@
+import type { TerminalPanePlacement } from '../../../../shared/terminal-pane-placement'
+import { useAppStore } from '@/store'
+import { terminalPanePlacementRow } from '@/lib/terminal-pane-placement-row'
+import { serializePaneTree } from './layout-serialization'
+
+/** Adds what only the mounted tab knows: the new tab's row, or the tree after the split. */
+export function completePaneSpawnPlacement(
+  placement: TerminalPanePlacement,
+  pane: { worktreeId: string; tabId: string; container: HTMLElement | null }
+): TerminalPanePlacement {
+  if (placement.kind === 'new-tab') {
+    const tab = useAppStore
+      .getState()
+      .tabsByWorktree[pane.worktreeId]?.find((entry) => entry.id === pane.tabId)
+    return tab ? { ...placement, row: terminalPanePlacementRow(tab) } : placement
+  }
+  if (placement.kind === 'split') {
+    const top = pane.container?.firstElementChild
+    const proposedRoot = top instanceof HTMLElement ? serializePaneTree(top) : null
+    return proposedRoot ? { ...placement, proposedRoot } : placement
+  }
+  return placement
+}
diff --git a/src/renderer/src/components/terminal-pane/use-notification-dispatch.test.ts b/src/renderer/src/components/terminal-pane/use-notification-dispatch.test.ts
index a4607978b83d..9956d34df4a0 100644
--- a/src/renderer/src/components/terminal-pane/use-notification-dispatch.test.ts
+++ b/src/renderer/src/components/terminal-pane/use-notification-dispatch.test.ts
@@ -2,7 +2,7 @@ import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest'
 import { dispatchTerminalNotification } from './use-notification-dispatch'
 import { AGENT_STATUS_STALE_AFTER_MS } from '../../../../shared/agent-status-types'
 import { buildAgentNotificationId } from '../../../../shared/agent-notification-id'
-import { makeTabGroup, makeUnifiedTab } from '@/store/slices/store-test-helpers'
+import { makeTabGroup, makeUnifiedTab } from '../../store/slices/store-session-test-harness'
 import {
   LIVE_LEAF_ID,
   PANE_KEY,
diff --git a/src/renderer/src/components/terminal-pane/use-terminal-pane-file-drop-owner.ts b/src/renderer/src/components/terminal-pane/use-terminal-pane-file-drop-owner.ts
new file mode 100644
index 000000000000..1c76473d1009
--- /dev/null
+++ b/src/renderer/src/components/terminal-pane/use-terminal-pane-file-drop-owner.ts
@@ -0,0 +1,95 @@
+import { useRef, useState, type RefObject } from 'react'
+import { toast } from 'sonner'
+import type { ManagedPane, PaneManager } from '@/lib/pane-manager/pane-manager'
+import { isElementDisplayNone } from '@/lib/pane-manager/pane-display-visibility'
+import {
+  createOsFileDropSequence,
+  useOsFileDropOwner,
+  type OsFileDropSequence
+} from '@/hooks/use-os-file-drop-owner'
+import { getNativeFileDropRejectionMessage } from '@/lib/native-file-drop-rejection-message'
+import { makePaneKey, type PaneKey } from '../../../../shared/stable-pane-id'
+import type { PtyTransport } from './pty-transport'
+import { captureNativeTerminalFileDrop } from './terminal-native-file-drop-destination'
+
+export type TerminalPaneFileDropOwnerArgs = {
+  pane: ManagedPane
+  tabId: string
+  worktreeId: string
+  cwd: string | undefined
+  managerRef: RefObject<PaneManager | null>
+  paneTransportsRef: RefObject<Map<number, PtyTransport>>
+}
+
+// Sibling title/body roots share ordering for exactly this mounted pane.
+const paneSequences = new WeakMap<HTMLElement, { paneKey: PaneKey; sequence: OsFileDropSequence }>()
+
+function sequenceForPane(pane: ManagedPane, paneKey: PaneKey): OsFileDropSequence {
+  const existing = paneSequences.get(pane.container)
+  if (existing?.paneKey === paneKey) {
+    return existing.sequence
+  }
+  const sequence = createOsFileDropSequence()
+  paneSequences.set(pane.container, { paneKey, sequence })
+  return sequence
+}
+
+function paneIsCurrent(manager: PaneManager | null, pane: ManagedPane): boolean {
+  return Boolean(
+    manager
+      ?.getPanes()
+      .some(
+        (current) =>
+          current.id === pane.id &&
+          current.leafId === pane.leafId &&
+          current.container === pane.container
+      )
+  )
+}
+
+export function useTerminalPaneFileDropOwner(
+  args: TerminalPaneFileDropOwnerArgs
+): (root: HTMLElement | null) => void {
+  const { pane, tabId, managerRef, paneTransportsRef } = args
+  const rootRef = useRef<HTMLElement | null>(null)
+  const paneKey = makePaneKey(tabId, pane.leafId)
+  const [sequence] = useState(() => sequenceForPane(pane, paneKey))
+  return useOsFileDropOwner(rootRef, {
+    consumer: 'agent',
+    sequence,
+    canAccept: () =>
+      Boolean(
+        rootRef.current?.isConnected &&
+        !rootRef.current.closest('[inert]') &&
+        !isElementDisplayNone(rootRef.current) &&
+        paneIsCurrent(managerRef.current, pane) &&
+        paneTransportsRef.current.get(pane.id)?.isConnected()
+      ),
+    captureDestination: () => {
+      const manager = managerRef.current
+      const paneTransports = paneTransportsRef.current
+      if (!manager) {
+        return undefined
+      }
+      const deliver = captureNativeTerminalFileDrop({ ...args, manager, paneTransports })
+      return async (paths: string[]) => {
+        if (
+          managerRef.current !== manager ||
+          paneTransportsRef.current !== paneTransports ||
+          makePaneKey(tabId, pane.leafId) !== paneKey ||
+          !paneIsCurrent(manager, pane)
+        ) {
+          return
+        }
+        await deliver(paths)
+      }
+    },
+    onDrop: async (prepared, { destination }) => {
+      for (const failure of prepared.failures) {
+        const message = getNativeFileDropRejectionMessage(failure)
+        toast.error(message.title, { description: message.description })
+      }
+      await destination?.(prepared.paths)
+    }
+  })
+}
diff --git a/src/renderer/src/components/terminal-pane/use-terminal-pane-global-effects-file-drop.test.ts b/src/renderer/src/components/terminal-pane/use-terminal-pane-global-effects-file-drop.test.ts
deleted file mode 100644
index 1eacf04cb3df..000000000000
--- a/src/renderer/src/components/terminal-pane/use-terminal-pane-global-effects-file-drop.test.ts
+++ /dev/null
@@ -1,252 +0,0 @@
-import type * as ReactModule from 'react'
-import type * as StoreModule from '@/store'
-import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest'
-import { useTerminalPaneGlobalEffects } from './use-terminal-pane-global-effects'
-import {
-  cleanupGlobalEffectsTestWindow,
-  installGlobalEffectsTestWindow
-} from './use-terminal-pane-global-effects-test-harness'
-
-const mocks = vi.hoisted(() => ({
-  captureScrollState: vi.fn(),
-  fitAndFocusPanes: vi.fn(),
-  fitPanes: vi.fn(),
-  focusActivePane: vi.fn(),
-  flushTerminalOutput: vi.fn(),
-  getTerminalOutputEpoch: vi.fn(() => 0),
-  handleTerminalFileDrop: vi.fn(),
-  enforceTerminalCurrentScrollIntent: vi.fn(),
-  syncTerminalScrollIntentFromViewport: vi.fn(),
-  pasteTerminalText: vi.fn(),
-  recordTerminalUserInputForLeaf: vi.fn(),
-  requestTerminalBacklogRecovery: vi.fn(),
-  restoreScrollState: vi.fn(),
-  restoreScrollStateAfterLayout: vi.fn()
-}))
-
-const reactRefState = vi.hoisted(() => ({
-  slots: [] as { current: unknown }[],
-  index: 0
-}))
-
-function beginHookRender(): void {
-  reactRefState.index = 0
-}
-
-function resetHookRefs(): void {
-  reactRefState.slots = []
-  reactRefState.index = 0
-}
-
-vi.mock('react', async (importOriginal) => {
-  const actual = await importOriginal<typeof ReactModule>()
-  return {
-    ...actual,
-    useCallback: <T extends (...args: never[]) => unknown>(callback: T) => callback,
-    useEffect: (effect: () => void | (() => void)) => {
-      effect()
-    },
-    useRef: <T>(value: T) => {
-      const index = reactRefState.index
-      reactRefState.index += 1
-      if (!reactRefState.slots[index]) {
-        reactRefState.slots[index] = { current: value }
-      }
-      return reactRefState.slots[index] as { current: T }
-    }
-  }
-})
-
-vi.mock('./pane-helpers', () => ({
-  fitAndFocusPanes: mocks.fitAndFocusPanes,
-  fitPanes: mocks.fitPanes,
-  focusActivePane: mocks.focusActivePane
-}))
-
-vi.mock('@/lib/pane-manager/pane-terminal-output-scheduler', () => ({
-  flushTerminalOutput: mocks.flushTerminalOutput,
-  requestTerminalBacklogRecovery: mocks.requestTerminalBacklogRecovery
-}))
-
-vi.mock('@/lib/pane-manager/pane-scroll', () => ({
-  captureScrollState: mocks.captureScrollState,
-  getTerminalOutputEpoch: mocks.getTerminalOutputEpoch,
-  restoreScrollState: mocks.restoreScrollState,
-  restoreScrollStateAfterLayout: mocks.restoreScrollStateAfterLayout
-}))
-
-vi.mock('@/lib/pane-manager/terminal-scroll-intent', () => ({
-  enforceTerminalCurrentScrollIntent: mocks.enforceTerminalCurrentScrollIntent,
-  syncTerminalScrollIntentFromViewport: mocks.syncTerminalScrollIntentFromViewport
-}))
-
-vi.mock('./terminal-drop-handler', () => ({
-  handleTerminalFileDrop: mocks.handleTerminalFileDrop
-}))
-
-vi.mock('./terminal-bracketed-paste', () => ({
-  BRACKETED_PASTE_END: '\u001b[201~',
-  BRACKETED_PASTE_START: '\u001b[200~',
-  pasteTerminalText: mocks.pasteTerminalText,
-  sanitizeTerminalPasteText: (text: string) => text.split('\u001b').join('\u241b')
-}))
-
-vi.mock('./terminal-input-activity', () => ({
-  recordTerminalUserInputForLeaf: mocks.recordTerminalUserInputForLeaf
-}))
-
-// Why: this suite invokes the hook outside a real React render (the react mock
-// above runs effects synchronously and manages refs by hand), so a reactive
-// useAppStore(selector) call would throw an "Invalid hook call". Read the
-// current snapshot synchronously instead; getState/setState stay real so tests
-// can seed terminalLayoutsByTabId.
-vi.mock('@/store', async (importOriginal) => {
-  const actual = await importOriginal<typeof StoreModule>()
-  const realHook = actual.useAppStore
-  const testHook = ((selector?: (state: ReturnType<typeof realHook.getState>) => unknown) =>
-    selector ? selector(realHook.getState()) : realHook.getState()) as typeof realHook
-  Object.assign(testHook, realHook)
-  return { ...actual, useAppStore: testHook }
-})
-
-type DropCallback = (data: {
-  paths: string[]
-  target: string
-  tabId?: string
-  paneLeafId?: string
-}) => void
-
-function useMountForFileDrop(
-  options: {
-    tabId?: string
-    worktreeId?: string
-    cwd?: string
-    isActive?: boolean
-    isVisible?: boolean
-    isWorktreeActive?: boolean
-    isSyncFitEnabled?: boolean
-    paneCount?: number
-  } = {}
-): {
-  onFileDrop: DropCallback
-  manager: {
-    getPanes: ReturnType<typeof vi.fn>
-    resumeRendering: ReturnType<typeof vi.fn>
-    resetWebglTextureAtlases: ReturnType<typeof vi.fn>
-    scheduleRevealRepaint: ReturnType<typeof vi.fn>
-    scheduleRevealPresent: ReturnType<typeof vi.fn>
-    suspendRendering: ReturnType<typeof vi.fn>
-    getActivePane: ReturnType<typeof vi.fn>
-    fitAllRevealedPanes: ReturnType<typeof vi.fn>
-  }
-  paneTransports: Map<number, never>
-} {
-  let onFileDrop: DropCallback = () => {
-    throw new Error('onFileDrop callback was not registered')
-  }
-  window.api.ui.onFileDrop = vi.fn((callback) => {
-    onFileDrop = callback
-    return vi.fn()
-  })
-  const manager = {
-    getPanes: vi.fn(() => []),
-    resumeRendering: vi.fn(),
-    resetWebglTextureAtlases: vi.fn(),
-    scheduleRevealRepaint: vi.fn(),
-    scheduleRevealPresent: vi.fn(),
-    suspendRendering: vi.fn(),
-    getActivePane: vi.fn(() => null),
-    fitAllRevealedPanes: vi.fn()
-  }
-  const paneTransports = new Map<number, never>()
-
-  beginHookRender()
-  useTerminalPaneGlobalEffects({
-    tabId: options.tabId ?? 'tab-1',
-    worktreeId: options.worktreeId ?? 'wt-1',
-    cwd: options.cwd,
-    isActive: options.isActive ?? true,
-    isVisible: options.isVisible ?? true,
-    isWorktreeActive: options.isWorktreeActive ?? options.isVisible ?? true,
-    isSyncFitEnabled: options.isSyncFitEnabled ?? options.isVisible ?? true,
-    paneCount: options.paneCount ?? 0,
-    managerRef: { current: manager as never },
-    containerRef: { current: null },
-    paneTransportsRef: { current: paneTransports },
-    isActiveRef: { current: false },
-    isVisibleRef: { current: false },
-    toggleExpandPane: vi.fn()
-  })
-
-  return { onFileDrop, manager, paneTransports }
-}
-
-describe('useTerminalPaneGlobalEffects', () => {
-  beforeEach(() => {
-    resetHookRefs()
-    vi.clearAllMocks()
-    installGlobalEffectsTestWindow()
-  })
-
-  afterEach(() => {
-    vi.useRealTimers()
-    vi.unstubAllGlobals()
-    cleanupGlobalEffectsTestWindow()
-  })
-
-  it('ignores terminal file drops for another terminal tab', () => {
-    const { onFileDrop } = useMountForFileDrop()
-
-    onFileDrop({ paths: ['/tmp/image.png'], target: 'terminal', tabId: 'tab-2' })
-
-    expect(mocks.handleTerminalFileDrop).not.toHaveBeenCalled()
-  })
-
-  it('handles terminal file drops for the matching terminal tab', () => {
-    const { onFileDrop, manager, paneTransports } = useMountForFileDrop({
-      cwd: '/worktree'
-    })
-
-    const data = {
-      paths: ['/tmp/image.png'],
-      target: 'terminal',
-      tabId: 'tab-1',
-      paneLeafId: 'leaf-1'
-    }
-    onFileDrop(data)
-
-    expect(mocks.handleTerminalFileDrop).toHaveBeenCalledWith({
-      manager,
-      paneTransports,
-      worktreeId: 'wt-1',
-      tabId: 'tab-1',
-      cwd: '/worktree',
-      data
-    })
-  })
-
-  it('refuses terminal file drops without a terminal tab id even in the active tab', () => {
-    const { onFileDrop } = useMountForFileDrop()
-
-    const data = { paths: ['/tmp/image.png'], target: 'terminal' }
-    onFileDrop(data)
-
-    expect(mocks.handleTerminalFileDrop).not.toHaveBeenCalled()
-  })
-
-  it('handles terminal file drops for visible unfocused split-group terminals', () => {
-    const { onFileDrop } = useMountForFileDrop({ isActive: false, isVisible: true })
-
-    onFileDrop({ paths: ['/tmp/image.png'], target: 'terminal', tabId: 'tab-1' })
-
-    expect(mocks.handleTerminalFileDrop).toHaveBeenCalledTimes(1)
-  })
-
-  it('ignores legacy terminal file drops in visible unfocused split-group terminals', () => {
-    const { onFileDrop } = useMountForFileDrop({ isActive: false, isVisible: true })
-
-    onFileDrop({ paths: ['/tmp/image.png'], target: 'terminal' })
-
-    expect(mocks.handleTerminalFileDrop).not.toHaveBeenCalled()
-  })
-})
diff --git a/src/renderer/src/components/terminal-pane/use-terminal-pane-global-effects-test-harness.ts b/src/renderer/src/components/terminal-pane/use-terminal-pane-global-effects-test-harness.ts
index 7d1337ac5619..64ae9bcadca1 100644
--- a/src/renderer/src/components/terminal-pane/use-terminal-pane-global-effects-test-harness.ts
+++ b/src/renderer/src/components/terminal-pane/use-terminal-pane-global-effects-test-harness.ts
@@ -17,9 +17,7 @@ export function installGlobalEffectsTestWindow(): void {
     addEventListener: vi.fn(),
     removeEventListener: vi.fn(),
     api: {
-      ui: {
-        onFileDrop: vi.fn(() => vi.fn())
-      },
+      ui: {},
       pty: {
         setActiveRendererPty: vi.fn()
       }
diff --git a/src/renderer/src/components/terminal-pane/use-terminal-pane-global-effects.ts b/src/renderer/src/components/terminal-pane/use-terminal-pane-global-effects.ts
index 909b40f7e8c8..ee8b1cb19ec4 100644
--- a/src/renderer/src/components/terminal-pane/use-terminal-pane-global-effects.ts
+++ b/src/renderer/src/components/terminal-pane/use-terminal-pane-global-effects.ts
@@ -9,7 +9,6 @@ import {
 import type { PaneManager } from '@/lib/pane-manager/pane-manager'
 import type { PtyTransport } from './pty-transport'
 import type { IDisposable } from '@xterm/xterm'
-import { handleTerminalFileDrop } from './terminal-drop-handler'
 import { handleFocusTerminalPaneDetail } from './focus-terminal-pane-event'
 import { surfaceStaleAgentRow } from './stale-agent-row'
 import { useAppStore } from '@/store'
@@ -66,7 +65,6 @@ function reportRendererPtyVisibility(
 export function useTerminalPaneGlobalEffects({
   tabId,
   worktreeId,
-  cwd,
   isActive,
   isVisible,
   isChatViewMode = false,
@@ -83,8 +81,6 @@ export function useTerminalPaneGlobalEffects({
 }: UseTerminalPaneGlobalEffectsArgs): void {
   const worktreeIdRef = useRef(worktreeId)
   worktreeIdRef.current = worktreeId
-  const cwdRef = useRef(cwd)
-  cwdRef.current = cwd
   // Starts true so the first render with isVisible=false triggers a
   // suspendRendering(). Background worktrees that mount hidden would
   // otherwise leak WebGL contexts — openTerminal() unconditionally creates
@@ -267,32 +263,4 @@ export function useTerminalPaneGlobalEffects({
     managerRef,
     paneTransportsRef
   })
-
-  // Why: visible, unfocused terminals receive drops only when the payload names their tab.
-  useEffect(() => {
-    if (!isActive && !isVisible) {
-      return
-    }
-    return window.api.ui.onFileDrop((data) => {
-      if (data.target !== 'terminal' || data.tabId !== tabId) {
-        return
-      }
-      const manager = managerRef.current
-      if (!manager) {
-        return
-      }
-      const wtId = worktreeIdRef.current
-      if (!wtId) {
-        return
-      }
-      void handleTerminalFileDrop({
-        manager,
-        paneTransports: paneTransportsRef.current,
-        worktreeId: wtId,
-        tabId,
-        cwd: cwdRef.current,
-        data
-      })
-    })
-  }, [isActive, isVisible, managerRef, paneTransportsRef, tabId])
 }
diff --git a/src/renderer/src/components/terminal/initial-terminal-admission-wait.test.tsx b/src/renderer/src/components/terminal/initial-terminal-admission-wait.test.tsx
new file mode 100644
index 000000000000..fdc3b6222028
--- /dev/null
+++ b/src/renderer/src/components/terminal/initial-terminal-admission-wait.test.tsx
@@ -0,0 +1,193 @@
+// @vitest-environment happy-dom
+import { act, createElement } from 'react'
+import { createRoot, type Root } from 'react-dom/client'
+import { afterEach, describe, expect, it, vi } from 'vitest'
+
+const mocks = vi.hoisted(() => {
+  const answers: ((support: unknown) => void)[] = []
+  return {
+    gate: vi.fn(),
+    createTab: vi.fn(),
+    createUnifiedTab: vi.fn(),
+    begin: vi.fn(),
+    answers
+  }
+})
+
+vi.mock('@/store', () => ({
+  useAppStore: Object.assign(() => 'none', {
+    getState: () => ({
+      activeWorktreeId: 'wt-1',
+      tabsByWorktree: {},
+      closedTerminalTabTombstonesByTabId: {},
+      unifiedTabsByWorktree: {},
+      activeGroupIdByWorktree: {},
+      createUnifiedTab: mocks.createUnifiedTab,
+      setActiveTabType: vi.fn()
+    })
+  })
+}))
+vi.mock('@/lib/worktree-agent-activation-gate', () => ({ gateWorktreeAgentActivation: mocks.gate }))
+vi.mock('@/lib/resume-sleeping-agent-session', () => ({
+  resumeSleepingAgentSessionsForWorktree: vi.fn()
+}))
+vi.mock('@/lib/workspace-terminal-host-authority', () => ({
+  createWorkspaceTerminalHostAuthoritySelector: () => () => 'none'
+}))
+vi.mock('../terminal-pane/terminal-parked-tab-watchers', () => ({
+  pruneParkedTerminalWatchers: vi.fn(),
+  terminalWatcherLiveWorkspaceIds: () => new Set(),
+  syncParkedTerminalTabWatchersForWorkspaces: vi.fn(),
+  disposeAllParkedTerminalWatchers: vi.fn()
+}))
+vi.mock('@/runtime/structured-agent-session-client', () => ({
+  callStructuredAgentSession: (_target: unknown, method: string) =>
+    method === 'agentSession.createSupport'
+      ? new Promise((resolve) => mocks.answers.push(resolve))
+      : new Promise(() => undefined)
+}))
+
+import { useTerminalWatcherEffects } from '../use-terminal-watcher-effects'
+import { beginStructuredAgentSessionProvisionalLaunch } from '@/lib/structured-agent-session-provisional-tab'
+import { isEmptyWorkspaceDefaultSurfacePending } from '@/lib/empty-workspace-default-surface-claims'
+import type { AgentSessionLaunchPlan } from '@/lib/agent-session-launch-plan'
+import type { Tab } from '../../../../shared/tab-types'
+
+Object.assign(globalThis, { IS_REACT_ACT_ENVIRONMENT: true })
+let root: Root | undefined
+
+afterEach(async () => {
+  await act(async () => root?.unmount())
+  root = undefined
+  mocks.answers.length = 0
+  vi.clearAllMocks()
+})
+
+function Watcher(): null {
+  useTerminalWatcherEffects({
+    activeWorktreeId: 'wt-1',
+    workspaceSessionReady: true,
+    terminalStartupRestorationReady: true,
+    hydrationSucceeded: false,
+    workspaceSurfaceIds: [],
+    tabsByWorktree: {},
+    createTab: mocks.createTab,
+    reconcileWorktreeTabModel: () => ({ renderableTabCount: 0, activeRenderableTabId: null }),
+    activationDeferredMountTabIdsByWorktreeRef: { current: new Map() },
+    activeTabId: null,
+    activeTabIdByWorktree: {},
+    activeView: 'terminal',
+    activityTerminalPortals: [],
+    anyMountedWorktreeHasLayout: false,
+    backgroundMountRevision: 0,
+    effectiveParkedTerminalWorktreeIds: new Set(),
+    evictionExemptTerminalTabIds: new Set(),
+    getEffectiveLayoutForWorktree: () => undefined,
+    groupsByWorktree: {},
+    measurableBackgroundWorktreeIdsRef: { current: new Set() },
+    mountedWorktreeIdsRef: { current: new Set() },
+    pairedRuntimeParkingEnvironmentIds: new Set(),
+    pendingStartupByTabId: {},
+    renderedActiveWorktreeId: 'wt-1',
+    startupTerminalTabHold: null,
+    terminalParkingEnabled: false,
+    terminalProviderSnapshotCapabilityRevision: 0,
+    terminalSshParkingEnabled: false,
+    terminalTitleSnapshotAuthorityEnabled: false
+  })
+  return null
+}
+
+function localChatPlan(): AgentSessionLaunchPlan {
+  mocks.begin.mockReturnValue({
+    sessionId: 'claude_1',
+    executionHostId: 'local',
+    settlement: new Promise(() => undefined),
+    cancel: vi.fn()
+  })
+  mocks.createUnifiedTab.mockImplementation(
+    (worktreeId: string, _type: string, tab: Partial<Tab>) => ({
+      ...tab,
+      worktreeId
+    })
+  )
+  // oxlint-disable-next-line typescript/consistent-type-assertions -- SAFETY: begin() is the only member this path calls.
+  return {
+    route: 'structured-native-chat',
+    requestId: 'request-1',
+    agent: 'claude',
+    worktreeId: 'wt-1',
+    executionHostId: 'local',
+    begin: mocks.begin,
+    launch: vi.fn()
+  } as unknown as AgentSessionLaunchPlan
+}
+
+function gateAnsweredLater(): {
+  gate: Promise<'empty'>
+  finish: () => void
+} {
+  let finish!: () => void
+  const gate = new Promise<'empty'>((resolve) => {
+    finish = () => resolve('empty')
+  })
+  mocks.gate.mockReturnValue(gate)
+  return { gate, finish }
+}
+
+// While this machine decides, a passive first-terminal seeder used to put "Terminal 1" beside the
+// chat, since no launch record exists until the host answers.
+describe('a local chat launch waiting on its host', () => {
+  it('keeps a watched create free of a stray shell until its chat opens', async () => {
+    const { finish } = gateAnsweredLater()
+    // A watched create reveals the workspace, then waits for this machine's answer.
+    beginStructuredAgentSessionProvisionalLaunch({
+      plan: localChatPlan(),
+      hooks: {},
+      beforeOpen: () => true
+    })
+    expect(isEmptyWorkspaceDefaultSurfacePending('wt-1')).toBe(true)
+
+    root = createRoot(document.createElement('div'))
+    await act(async () => root?.render(createElement(Watcher)))
+    await act(async () => finish())
+    expect(mocks.createTab).not.toHaveBeenCalled()
+
+    await act(async () => mocks.answers[0]?.({ supported: true }))
+    expect(mocks.createUnifiedTab).toHaveBeenCalledOnce()
+    expect(mocks.createTab).not.toHaveBeenCalled()
+  })
+
+  it("keeps an empty workspace's default chat free of a shell seeded by the shared gate", async () => {
+    const { gate, finish } = gateAnsweredLater()
+    // The activation's reseed attaches first and opens the default agent as a chat.
+    void gate.then(() =>
+      beginStructuredAgentSessionProvisionalLaunch({ plan: localChatPlan(), hooks: {} })
+    )
+    root = createRoot(document.createElement('div'))
+    // The watcher shares that in-flight gate and runs right after the reseed.
+    await act(async () => root?.render(createElement(Watcher)))
+    await act(async () => finish())
+    expect(mocks.begin).not.toHaveBeenCalled()
+    expect(mocks.createTab).not.toHaveBeenCalled()
+
+    await act(async () => mocks.answers[0]?.({ supported: true }))
+    expect(mocks.createUnifiedTab).toHaveBeenCalledOnce()
+    expect(mocks.createTab).not.toHaveBeenCalled()
+  })
+
+  it('stops owning the surface once the host has answered and its surface opened', async () => {
+    const onHostDeclined = vi.fn(() => ({ opened: true }))
+    const launch = beginStructuredAgentSessionProvisionalLaunch({
+      plan: localChatPlan(),
+      hooks: {},
+      onHostDeclined
+    })
+    expect(isEmptyWorkspaceDefaultSurfacePending('wt-1')).toBe(true)
+
+    await act(async () => mocks.answers[0]?.({ supported: false }))
+    await expect(launch?.settlement).resolves.toEqual({ kind: 'terminal' })
+    expect(onHostDeclined).toHaveBeenCalledOnce()
+    expect(isEmptyWorkspaceDefaultSurfacePending('wt-1')).toBe(false)
+  })
+})
diff --git a/src/renderer/src/components/terminal/terminal-provider-snapshot-bound-pty-ids.test.ts b/src/renderer/src/components/terminal/terminal-provider-snapshot-bound-pty-ids.test.ts
index eba9359990a7..ad6f7de8714b 100644
--- a/src/renderer/src/components/terminal/terminal-provider-snapshot-bound-pty-ids.test.ts
+++ b/src/renderer/src/components/terminal/terminal-provider-snapshot-bound-pty-ids.test.ts
@@ -2,7 +2,8 @@
 import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest'
 import type * as SnapshotCapabilityModule from './terminal-provider-snapshot-capability'
 import type { TerminalLayoutSnapshot } from '../../../../shared/terminal-tab-types'
-import { makeTab, makeWorktree } from '@/store/slices/store-test-helpers'
+import { makeTab } from '../../store/slices/store-session-test-harness'
+import { makeWorktree } from '../../store/slices/worktrees-slice-test-fixtures'
 
 const { collectPtyIds } = vi.hoisted(() => ({ collectPtyIds: vi.fn() }))
 
diff --git a/src/renderer/src/components/ui/accordion.tsx b/src/renderer/src/components/ui/accordion.tsx
index c5ed9d31348e..993b40010fa2 100644
--- a/src/renderer/src/components/ui/accordion.tsx
+++ b/src/renderer/src/components/ui/accordion.tsx
@@ -2,7 +2,7 @@
 
 import * as React from 'react'
 import { ChevronDown } from 'lucide-react'
-import { Accordion as AccordionPrimitive } from 'radix-ui'
+import * as AccordionPrimitive from 'radix-ui/accordion'
 
 import { cn } from '@/lib/utils'
 
diff --git a/src/renderer/src/components/ui/badge.tsx b/src/renderer/src/components/ui/badge.tsx
index 2d2d0027e5c9..25b701f014f3 100644
--- a/src/renderer/src/components/ui/badge.tsx
+++ b/src/renderer/src/components/ui/badge.tsx
@@ -1,6 +1,6 @@
 import * as React from 'react'
 import { cva, type VariantProps } from 'class-variance-authority'
-import { Slot } from 'radix-ui'
+import * as Slot from 'radix-ui/slot'
 
 import { cn } from '@/lib/utils'
 
diff --git a/src/renderer/src/components/ui/button.tsx b/src/renderer/src/components/ui/button.tsx
index 016cd15341ab..0d46fe49255c 100644
--- a/src/renderer/src/components/ui/button.tsx
+++ b/src/renderer/src/components/ui/button.tsx
@@ -1,6 +1,6 @@
 import * as React from 'react'
 import { cva, type VariantProps } from 'class-variance-authority'
-import { Slot } from 'radix-ui'
+import * as Slot from 'radix-ui/slot'
 
 import { cn } from '@/lib/utils'
 
diff --git a/src/renderer/src/components/ui/checkbox.tsx b/src/renderer/src/components/ui/checkbox.tsx
index 2e9e53e55e76..415332c0c9b4 100644
--- a/src/renderer/src/components/ui/checkbox.tsx
+++ b/src/renderer/src/components/ui/checkbox.tsx
@@ -2,7 +2,7 @@
 
 import * as React from 'react'
 import { CheckIcon, MinusIcon } from 'lucide-react'
-import { Checkbox as CheckboxPrimitive } from 'radix-ui'
+import * as CheckboxPrimitive from 'radix-ui/checkbox'
 
 import { cn } from '@/lib/utils'
 
diff --git a/src/renderer/src/components/ui/collapsible.tsx b/src/renderer/src/components/ui/collapsible.tsx
index d441988a90f8..fbd5f1d7794d 100644
--- a/src/renderer/src/components/ui/collapsible.tsx
+++ b/src/renderer/src/components/ui/collapsible.tsx
@@ -3,7 +3,7 @@
 import * as React from 'react'
 import { cva, type VariantProps } from 'class-variance-authority'
 import { cn } from '@/lib/utils'
-import { Collapsible as CollapsiblePrimitive } from 'radix-ui'
+import * as CollapsiblePrimitive from 'radix-ui/collapsible'
 
 function Collapsible({
   ...props
@@ -36,10 +36,30 @@ function CollapsibleTrigger({
   )
 }
 
+const collapsibleContentVariants = cva('', {
+  variants: {
+    animation: {
+      none: '',
+      // Grows and shrinks with its content, so what follows moves with it instead of jumping.
+      height: 'collapsible-height-content'
+    }
+  },
+  defaultVariants: { animation: 'none' }
+})
+
 function CollapsibleContent({
+  className,
+  animation,
   ...props
-}: React.ComponentProps<typeof CollapsiblePrimitive.Content>): React.JSX.Element {
-  return <CollapsiblePrimitive.Content data-slot="collapsible-content" {...props} />
+}: React.ComponentProps<typeof CollapsiblePrimitive.Content> &
+  VariantProps<typeof collapsibleContentVariants>): React.JSX.Element {
+  return (
+    <CollapsiblePrimitive.Content
+      data-slot="collapsible-content"
+      className={cn(collapsibleContentVariants({ animation }), className)}
+      {...props}
+    />
+  )
 }
 
 export { Collapsible, CollapsibleTrigger, CollapsibleContent }
diff --git a/src/renderer/src/components/ui/command.tsx b/src/renderer/src/components/ui/command.tsx
index 3ed78d03d477..97237799c1f4 100644
--- a/src/renderer/src/components/ui/command.tsx
+++ b/src/renderer/src/components/ui/command.tsx
@@ -4,18 +4,33 @@ import * as React from 'react'
 import { cva, type VariantProps } from 'class-variance-authority'
 import { Command as CommandPrimitive } from 'cmdk'
 import { SearchIcon } from 'lucide-react'
-import { Dialog as DialogPrimitive } from 'radix-ui'
+import * as DialogPrimitive from 'radix-ui/dialog'
 
 import { cn } from '@/lib/utils'
 import { handleImeOverlayEscape } from '@/lib/ime-overlay-escape'
 import { useImeTextFieldProps } from '@/lib/ime-text-field'
 
-function Command({ className, ...props }: React.ComponentProps<typeof CommandPrimitive>) {
+const commandSurfaceVariants = cva('', {
+  variants: {
+    surface: {
+      default: 'bg-popover text-popover-foreground',
+      inline: 'bg-transparent text-foreground'
+    }
+  },
+  defaultVariants: { surface: 'default' }
+})
+
+function Command({
+  className,
+  surface,
+  ...props
+}: React.ComponentProps<typeof CommandPrimitive> & VariantProps<typeof commandSurfaceVariants>) {
   return (
     <CommandPrimitive
       data-slot="command"
       className={cn(
-        'flex h-full w-full flex-col overflow-hidden rounded-md bg-popover text-popover-foreground',
+        'flex h-full w-full flex-col overflow-hidden rounded-md',
+        commandSurfaceVariants({ surface }),
         className
       )}
       {...props}
@@ -92,26 +107,35 @@ function CommandDialog({
   )
 }
 
+const commandInputVariants = cva('flex items-center bg-muted/30 px-3 py-1', {
+  variants: {
+    variant: {
+      default: 'border-b border-border',
+      framed: 'rounded-md border border-input'
+    }
+  },
+  defaultVariants: { variant: 'default' }
+})
+
 function CommandInput({
   className,
+  variant,
   wrapperClassName,
   iconClassName,
   trailing,
   ref,
   ...props
-}: React.ComponentProps<typeof CommandPrimitive.Input> & {
-  wrapperClassName?: string
-  iconClassName?: string
-  /** Rendered after the field, inside the input frame (e.g. a filter control). */
-  trailing?: React.ReactNode
-}) {
+}: React.ComponentProps<typeof CommandPrimitive.Input> &
+  VariantProps<typeof commandInputVariants> & {
+    wrapperClassName?: string
+    iconClassName?: string
+    /** Rendered after the field, inside the input frame (e.g. a filter control). */
+    trailing?: React.ReactNode
+  }) {
   const imeProps = useImeTextFieldProps<HTMLInputElement>(props)
   return (
     <div
-      className={cn(
-        'flex items-center border-b border-border bg-muted/30 px-3 py-1',
-        wrapperClassName
-      )}
+      className={cn(commandInputVariants({ variant }), wrapperClassName)}
       data-cmdk-input-wrapper=""
     >
       <SearchIcon className={cn('mr-2 h-4 w-4 shrink-0 opacity-50', iconClassName)} />
diff --git a/src/renderer/src/components/ui/context-menu.tsx b/src/renderer/src/components/ui/context-menu.tsx
index 5fa36fe1ebe0..c57948cde042 100644
--- a/src/renderer/src/components/ui/context-menu.tsx
+++ b/src/renderer/src/components/ui/context-menu.tsx
@@ -1,6 +1,6 @@
 import * as React from 'react'
 import { ChevronRightIcon, CircleIcon } from 'lucide-react'
-import { ContextMenu as ContextMenuPrimitive } from 'radix-ui'
+import * as ContextMenuPrimitive from 'radix-ui/context-menu'
 
 import { cn } from '@/lib/utils'
 import { handleImeOverlayEscape } from '@/lib/ime-overlay-escape'
diff --git a/src/renderer/src/components/ui/dialog.tsx b/src/renderer/src/components/ui/dialog.tsx
index f996d91b1b6a..5a74593bda1d 100644
--- a/src/renderer/src/components/ui/dialog.tsx
+++ b/src/renderer/src/components/ui/dialog.tsx
@@ -2,7 +2,7 @@
 
 import * as React from 'react'
 import { XIcon } from 'lucide-react'
-import { Dialog as DialogPrimitive } from 'radix-ui'
+import * as DialogPrimitive from 'radix-ui/dialog'
 
 import { cn } from '@/lib/utils'
 import { handleImeOverlayEscape } from '@/lib/ime-overlay-escape'
diff --git a/src/renderer/src/components/ui/dropdown-menu.tsx b/src/renderer/src/components/ui/dropdown-menu.tsx
index 7026c397c043..c02282d8abb1 100644
--- a/src/renderer/src/components/ui/dropdown-menu.tsx
+++ b/src/renderer/src/components/ui/dropdown-menu.tsx
@@ -1,6 +1,6 @@
 import * as React from 'react'
 import { CheckIcon, ChevronRightIcon, CircleIcon } from 'lucide-react'
-import { DropdownMenu as DropdownMenuPrimitive } from 'radix-ui'
+import * as DropdownMenuPrimitive from 'radix-ui/dropdown-menu'
 
 import { cn } from '@/lib/utils'
 import { handleImeOverlayEscape } from '@/lib/ime-overlay-escape'
diff --git a/src/renderer/src/components/ui/hover-card.tsx b/src/renderer/src/components/ui/hover-card.tsx
index c9ee04f500da..3c00c4b26c42 100644
--- a/src/renderer/src/components/ui/hover-card.tsx
+++ b/src/renderer/src/components/ui/hover-card.tsx
@@ -1,7 +1,8 @@
 'use client'
 
 import * as React from 'react'
-import { HoverCard as HoverCardPrimitive } from 'radix-ui'
+import * as HoverCardPrimitive from 'radix-ui/hover-card'
+import { cva, type VariantProps } from 'class-variance-authority'
 
 import { cn } from '@/lib/utils'
 
@@ -13,12 +14,25 @@ function HoverCardTrigger({ ...props }: React.ComponentProps<typeof HoverCardPri
   return <HoverCardPrimitive.Trigger data-slot="hover-card-trigger" {...props} />
 }
 
+const hoverCardContentVariants = cva('', {
+  variants: {
+    variant: {
+      default: 'w-64 p-4',
+      'workspace-details':
+        'w-[360px] max-w-[calc(100vw-2rem)] max-h-[28rem] overflow-y-auto p-3 text-xs scrollbar-sleek'
+    }
+  },
+  defaultVariants: { variant: 'default' }
+})
+
 function HoverCardContent({
   className,
+  variant,
   align = 'center',
   sideOffset = 4,
   ...props
-}: React.ComponentProps<typeof HoverCardPrimitive.Content>) {
+}: React.ComponentProps<typeof HoverCardPrimitive.Content> &
+  VariantProps<typeof hoverCardContentVariants>) {
   return (
     <HoverCardPrimitive.Portal data-slot="hover-card-portal">
       <HoverCardPrimitive.Content
@@ -31,7 +45,8 @@ function HoverCardContent({
         // dark canvas (#171717 vs #0a0a0a, ~3% white lift) with a near-
         // invisible border.
         className={cn(
-          'z-50 w-64 origin-(--radix-hover-card-content-transform-origin) rounded-md border border-black/14 bg-[rgba(255,255,255,0.82)] p-4 text-popover-foreground shadow-[0_16px_36px_rgba(0,0,0,0.24),inset_0_1px_0_rgba(255,255,255,0.14)] backdrop-blur-2xl outline-hidden dark:border-white/14 dark:bg-[rgba(0,0,0,0.72)] dark:shadow-[0_20px_44px_rgba(0,0,0,0.42),inset_0_1px_0_rgba(255,255,255,0.04)] data-[side=bottom]:slide-in-from-top-2 data-[side=left]:slide-in-from-right-2 data-[side=right]:slide-in-from-left-2 data-[side=top]:slide-in-from-bottom-2 data-[state=closed]:animate-out data-[state=closed]:fade-out-0 data-[state=closed]:zoom-out-95 data-[state=open]:animate-in data-[state=open]:fade-in-0 data-[state=open]:zoom-in-95',
+          'z-50 origin-(--radix-hover-card-content-transform-origin) rounded-md border border-black/14 bg-[rgba(255,255,255,0.82)] text-popover-foreground shadow-[0_16px_36px_rgba(0,0,0,0.24),inset_0_1px_0_rgba(255,255,255,0.14)] backdrop-blur-2xl outline-hidden dark:border-white/14 dark:bg-[rgba(0,0,0,0.72)] dark:shadow-[0_20px_44px_rgba(0,0,0,0.42),inset_0_1px_0_rgba(255,255,255,0.04)] data-[side=bottom]:slide-in-from-top-2 data-[side=left]:slide-in-from-right-2 data-[side=right]:slide-in-from-left-2 data-[side=top]:slide-in-from-bottom-2 data-[state=closed]:animate-out data-[state=closed]:fade-out-0 data-[state=closed]:zoom-out-95 data-[state=open]:animate-in data-[state=open]:fade-in-0 data-[state=open]:zoom-in-95',
+          hoverCardContentVariants({ variant }),
           className
         )}
         {...props}
diff --git a/src/renderer/src/components/ui/label.tsx b/src/renderer/src/components/ui/label.tsx
index b1feae487943..27a52a924550 100644
--- a/src/renderer/src/components/ui/label.tsx
+++ b/src/renderer/src/components/ui/label.tsx
@@ -1,7 +1,7 @@
 'use client'
 
 import * as React from 'react'
-import { Label as LabelPrimitive } from 'radix-ui'
+import * as LabelPrimitive from 'radix-ui/label'
 
 import { cn } from '@/lib/utils'
 
diff --git a/src/renderer/src/components/ui/popover.tsx b/src/renderer/src/components/ui/popover.tsx
index 1652805a59bb..2f5ed292b462 100644
--- a/src/renderer/src/components/ui/popover.tsx
+++ b/src/renderer/src/components/ui/popover.tsx
@@ -1,7 +1,7 @@
 'use client'
 
 import * as React from 'react'
-import { Popover as PopoverPrimitive } from 'radix-ui'
+import * as PopoverPrimitive from 'radix-ui/popover'
 
 import { cn } from '@/lib/utils'
 import { handleImeOverlayEscape } from '@/lib/ime-overlay-escape'
diff --git a/src/renderer/src/components/ui/progress.tsx b/src/renderer/src/components/ui/progress.tsx
index 06175fb40e46..ed239b53ce7a 100644
--- a/src/renderer/src/components/ui/progress.tsx
+++ b/src/renderer/src/components/ui/progress.tsx
@@ -1,5 +1,5 @@
 import * as React from 'react'
-import { Progress as ProgressPrimitive } from 'radix-ui'
+import * as ProgressPrimitive from 'radix-ui/progress'
 
 import { cn } from '@/lib/utils'
 
diff --git a/src/renderer/src/components/ui/scroll-area.tsx b/src/renderer/src/components/ui/scroll-area.tsx
index c3e412099536..6017b8610621 100644
--- a/src/renderer/src/components/ui/scroll-area.tsx
+++ b/src/renderer/src/components/ui/scroll-area.tsx
@@ -1,5 +1,5 @@
 import * as React from 'react'
-import { ScrollArea as ScrollAreaPrimitive } from 'radix-ui'
+import * as ScrollAreaPrimitive from 'radix-ui/scroll-area'
 
 import { cn } from '@/lib/utils'
 
diff --git a/src/renderer/src/components/ui/select.tsx b/src/renderer/src/components/ui/select.tsx
index a27f230538d5..aebaf6f2228d 100644
--- a/src/renderer/src/components/ui/select.tsx
+++ b/src/renderer/src/components/ui/select.tsx
@@ -2,7 +2,7 @@
 
 import * as React from 'react'
 import { CheckIcon, ChevronDownIcon, ChevronUpIcon } from 'lucide-react'
-import { Select as SelectPrimitive } from 'radix-ui'
+import * as SelectPrimitive from 'radix-ui/select'
 
 import { cn } from '@/lib/utils'
 
diff --git a/src/renderer/src/components/ui/separator.tsx b/src/renderer/src/components/ui/separator.tsx
index 84f76bb9d0ee..5375486a3025 100644
--- a/src/renderer/src/components/ui/separator.tsx
+++ b/src/renderer/src/components/ui/separator.tsx
@@ -1,5 +1,5 @@
 import * as React from 'react'
-import { Separator as SeparatorPrimitive } from 'radix-ui'
+import * as SeparatorPrimitive from 'radix-ui/separator'
 
 import { cn } from '@/lib/utils'
 
diff --git a/src/renderer/src/components/ui/sheet.tsx b/src/renderer/src/components/ui/sheet.tsx
index 26199a56a33a..ec179062dd55 100644
--- a/src/renderer/src/components/ui/sheet.tsx
+++ b/src/renderer/src/components/ui/sheet.tsx
@@ -2,7 +2,7 @@
 
 import * as React from 'react'
 import { XIcon } from 'lucide-react'
-import { Dialog as SheetPrimitive } from 'radix-ui'
+import * as SheetPrimitive from 'radix-ui/dialog'
 import { cva, type VariantProps } from 'class-variance-authority'
 
 import { cn } from '@/lib/utils'
diff --git a/src/renderer/src/components/ui/slider.tsx b/src/renderer/src/components/ui/slider.tsx
index c1e6a70c7f2a..78672dbc1ea5 100644
--- a/src/renderer/src/components/ui/slider.tsx
+++ b/src/renderer/src/components/ui/slider.tsx
@@ -1,5 +1,5 @@
 import * as React from 'react'
-import { Slider as SliderPrimitive } from 'radix-ui'
+import * as SliderPrimitive from 'radix-ui/slider'
 
 import { cn } from '@/lib/utils'
 
diff --git a/src/renderer/src/components/ui/switch.tsx b/src/renderer/src/components/ui/switch.tsx
index 5213b703e73d..fdf1a31666fc 100644
--- a/src/renderer/src/components/ui/switch.tsx
+++ b/src/renderer/src/components/ui/switch.tsx
@@ -1,5 +1,5 @@
 import * as React from 'react'
-import { Switch as SwitchPrimitive } from 'radix-ui'
+import * as SwitchPrimitive from 'radix-ui/switch'
 
 import { cn } from '@/lib/utils'
 
diff --git a/src/renderer/src/components/ui/tabs.tsx b/src/renderer/src/components/ui/tabs.tsx
index 626a94f4554d..41d21ca6e96a 100644
--- a/src/renderer/src/components/ui/tabs.tsx
+++ b/src/renderer/src/components/ui/tabs.tsx
@@ -2,7 +2,7 @@
 
 import * as React from 'react'
 import { cva, type VariantProps } from 'class-variance-authority'
-import { Tabs as TabsPrimitive } from 'radix-ui'
+import * as TabsPrimitive from 'radix-ui/tabs'
 
 import { cn } from '@/lib/utils'
 
diff --git a/src/renderer/src/components/ui/toggle-group.tsx b/src/renderer/src/components/ui/toggle-group.tsx
index c8821237b4f0..41144a6ca900 100644
--- a/src/renderer/src/components/ui/toggle-group.tsx
+++ b/src/renderer/src/components/ui/toggle-group.tsx
@@ -2,7 +2,7 @@
 
 import * as React from 'react'
 import type { VariantProps } from 'class-variance-authority'
-import { ToggleGroup as ToggleGroupPrimitive } from 'radix-ui'
+import * as ToggleGroupPrimitive from 'radix-ui/toggle-group'
 
 import { cn } from '@/lib/utils'
 import { toggleVariants } from '@/components/ui/toggle'
diff --git a/src/renderer/src/components/ui/toggle.tsx b/src/renderer/src/components/ui/toggle.tsx
index efd54a62db3d..591668f735de 100644
--- a/src/renderer/src/components/ui/toggle.tsx
+++ b/src/renderer/src/components/ui/toggle.tsx
@@ -1,6 +1,6 @@
 import * as React from 'react'
 import { cva, type VariantProps } from 'class-variance-authority'
-import { Toggle as TogglePrimitive } from 'radix-ui'
+import * as TogglePrimitive from 'radix-ui/toggle'
 
 import { cn } from '@/lib/utils'
 
diff --git a/src/renderer/src/components/ui/tooltip.tsx b/src/renderer/src/components/ui/tooltip.tsx
index 72c4d1cbebb5..222d8c447237 100644
--- a/src/renderer/src/components/ui/tooltip.tsx
+++ b/src/renderer/src/components/ui/tooltip.tsx
@@ -1,5 +1,5 @@
 import * as React from 'react'
-import { Tooltip as TooltipPrimitive } from 'radix-ui'
+import * as TooltipPrimitive from 'radix-ui/tooltip'
 
 import { cn } from '@/lib/utils'
 
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 5e2cb6f2aab5..7373643b90c0 100644
--- a/src/renderer/src/components/use-task-page-workspace-actions.ts
+++ b/src/renderer/src/components/use-task-page-workspace-actions.ts
@@ -54,7 +54,8 @@ export function useTaskPageWorkspaceActions(model: TaskPageSearchActionsModel) {
         useAppStore.getState().allWorktrees(),
         item.repoId,
         item.type,
-        item.number
+        item.number,
+        item.url
       )
       if (!currentAttached) {
         handleUseWorkItem(item)
diff --git a/src/renderer/src/components/workspace-cleanup/workspace-cleanup-scanned-host-confirmation-removal.test.tsx b/src/renderer/src/components/workspace-cleanup/workspace-cleanup-scanned-host-confirmation-removal.test.tsx
index eb69b692334d..7b2934b8e829 100644
--- a/src/renderer/src/components/workspace-cleanup/workspace-cleanup-scanned-host-confirmation-removal.test.tsx
+++ b/src/renderer/src/components/workspace-cleanup/workspace-cleanup-scanned-host-confirmation-removal.test.tsx
@@ -43,7 +43,7 @@ vi.mock('../../../../main/providers/ssh-git-dispatch', () => ({
 vi.mock('sonner', () => ({ toast: { error: vi.fn(), success: vi.fn(), warning: vi.fn() } }))
 
 import { useAppStore } from '@/store'
-import { makeWorktree } from '@/store/slices/store-test-helpers'
+import { makeWorktree } from '../../store/slices/worktrees-slice-test-fixtures'
 import { resetAuthoritativelyRemovedWorktreeMemoryForTests } from '@/store/slices/worktrees'
 import { useWorkspaceCleanupRemoval } from './use-workspace-cleanup-removal'
 
diff --git a/src/renderer/src/components/worktree-jump-palette-create-worktree.ts b/src/renderer/src/components/worktree-jump-palette-create-worktree.ts
index 463c4f4f6aa2..b04a341f5811 100644
--- a/src/renderer/src/components/worktree-jump-palette-create-worktree.ts
+++ b/src/renderer/src/components/worktree-jump-palette-create-worktree.ts
@@ -1,3 +1,6 @@
+import { worktreeMatchesGitHubNumber } from '@/lib/github-work-item-workspace-attachment'
+import { getPaletteWorktreeExecutionHostId } from '@/lib/palette-repo-resolution'
+import { findRepoForHost } from '@/store/slices/repo-host-identity'
 import { parseGitHubIssueOrPRLink, parseGitHubIssueOrPRNumber } from '@/lib/github-links'
 import {
   getLinkedWorkItemSuggestedName,
@@ -211,7 +214,14 @@ export function createWorktreeJumpPaletteWorktreeHandler({
       const matches = allWorktrees.filter(
         (worktree) =>
           !worktree.isArchived &&
-          (worktree.linkedIssue === ghNumber || worktree.linkedPR === ghNumber)
+          worktreeMatchesGitHubNumber(
+            worktree,
+            ghNumber,
+            findRepoForHost(state.repos, worktree.repoId, {
+              hostId: getPaletteWorktreeExecutionHostId(worktree),
+              settings: state.settings
+            }) ?? undefined
+          )
       )
       const activeMatch =
         matches.find((worktree) => worktree.repoId === state.activeRepoId) ?? matches[0]
diff --git a/src/renderer/src/hooks/automation-dispatch-completion.ts b/src/renderer/src/hooks/automation-dispatch-completion.ts
index a68b4d4c336f..aa8d9bdc4ac3 100644
--- a/src/renderer/src/hooks/automation-dispatch-completion.ts
+++ b/src/renderer/src/hooks/automation-dispatch-completion.ts
@@ -23,6 +23,12 @@ import { createAutomationRunSessionPersistence } from './automation-run-session-
 
 type MarkDispatchResult = (result: AutomationDispatchResult) => Promise<void>
 
+
+// Why a helper: the persisted run error keeps upstream's untranslated exit text in one place.
+function automationProcessExitError(code: number): string {
+  return `Automation process exited with code ${code}.`
+}
+
 export function createAutomationDispatchCompletion(args: {
   run: AutomationRun
   worktree: Worktree
@@ -97,7 +103,7 @@ export function createAutomationDispatchCompletion(args: {
     pendingExitCode !== null && isProvenProcessExit(pendingExitCode) && pendingExitCode !== 0
       ? {
           status: 'dispatch_failed',
-          error: `Automation process exited with code ${pendingExitCode}.`
+          error: automationProcessExitError(pendingExitCode)
         }
       : automationAgentCompletionResult(row)
   const finishCompletionResult = async (
@@ -164,7 +170,7 @@ export function createAutomationDispatchCompletion(args: {
         ? readCompletionResult()
         : {
             status: 'dispatch_failed' as const,
-            error: `Automation process exited with code ${code}.`
+            error: automationProcessExitError(code)
           }
     await persistCompletionResult(result, providerSessionId)
     await finishCompletionResult(providerSessionId, result)
diff --git a/src/renderer/src/hooks/composer-drop-owner.test.ts b/src/renderer/src/hooks/composer-drop-owner.test.ts
deleted file mode 100644
index fe95275b90ba..000000000000
--- a/src/renderer/src/hooks/composer-drop-owner.test.ts
+++ /dev/null
@@ -1,13 +0,0 @@
-import { describe, expect, it } from 'vitest'
-import { isCurrentComposerDropOwner } from './composer-drop-owner'
-
-describe('composer drop owner', () => {
-  it('keeps the top mounted composer as the only drop owner', () => {
-    const page = Symbol('page')
-    const modal = Symbol('modal')
-
-    expect(isCurrentComposerDropOwner([page], page)).toBe(true)
-    expect(isCurrentComposerDropOwner([page, modal], page)).toBe(false)
-    expect(isCurrentComposerDropOwner([page, modal], modal)).toBe(true)
-  })
-})
diff --git a/src/renderer/src/hooks/composer-drop-owner.ts b/src/renderer/src/hooks/composer-drop-owner.ts
deleted file mode 100644
index f4896aea5079..000000000000
--- a/src/renderer/src/hooks/composer-drop-owner.ts
+++ /dev/null
@@ -1,8 +0,0 @@
-export type ComposerDropOwner = symbol
-
-export function isCurrentComposerDropOwner(
-  ownerStack: readonly ComposerDropOwner[],
-  owner: ComposerDropOwner
-): boolean {
-  return ownerStack.at(-1) === owner
-}
diff --git a/src/renderer/src/hooks/composer-state/attachment-drop-failure.test.tsx b/src/renderer/src/hooks/composer-state/attachment-drop-failure.test.tsx
index 31900f8202dc..40dd50686b4b 100644
--- a/src/renderer/src/hooks/composer-state/attachment-drop-failure.test.tsx
+++ b/src/renderer/src/hooks/composer-state/attachment-drop-failure.test.tsx
@@ -14,7 +14,6 @@ vi.mock('@/store', () => ({
 vi.mock('@/runtime/runtime-file-client', () => ({
   importExternalPathsToRuntime: (...args: unknown[]) => mocks.importExternalPaths(...args)
 }))
-vi.mock('./composer-drop-listener', () => ({ useComposerDropListener: vi.fn() }))
 
 import { useAttachmentDropState } from './attachment-drop-state'
 
diff --git a/src/renderer/src/hooks/composer-state/attachment-drop-lifetime.test.tsx b/src/renderer/src/hooks/composer-state/attachment-drop-lifetime.test.tsx
index 6709b5e76f34..049cecacffce 100644
--- a/src/renderer/src/hooks/composer-state/attachment-drop-lifetime.test.tsx
+++ b/src/renderer/src/hooks/composer-state/attachment-drop-lifetime.test.tsx
@@ -3,7 +3,6 @@
 import { act, cleanup, renderHook } from '@testing-library/react'
 import { createRef, StrictMode } from 'react'
 import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest'
-import type { NativeFileDropPayload } from '../../../../shared/native-file-drop'
 import { useAttachmentDropState } from './attachment-drop-state'
 
 const mocks = vi.hoisted(() => ({ toastError: vi.fn() }))
@@ -11,7 +10,6 @@ vi.mock('sonner', () => ({ toast: { error: mocks.toastError } }))
 vi.mock('@/store', () => ({ useAppStore: { getState: () => ({}) } }))
 vi.mock('@/runtime/runtime-file-client', () => ({ importExternalPathsToRuntime: vi.fn() }))
 
-const listeners = new Set<(data: NativeFileDropPayload) => void>()
 const stat = vi.fn(async (_input: { filePath: string }) => ({ isDirectory: false }))
 let originalApi: PropertyDescriptor | undefined
 
@@ -36,12 +34,6 @@ function renderDrop(strict = false) {
   return { ...hook, attach, prompt }
 }
 
-function nativeDrop(paths: string[]): void {
-  for (const listener of listeners) {
-    listener({ target: 'composer', paths })
-  }
-}
-
 beforeEach(() => {
   vi.clearAllMocks()
   stat.mockReset().mockResolvedValue({ isDirectory: false })
@@ -49,20 +41,13 @@ beforeEach(() => {
   Object.defineProperty(window, 'api', {
     configurable: true,
     value: {
-      fs: { stat },
-      ui: {
-        onFileDrop: (listener: (data: NativeFileDropPayload) => void) => {
-          listeners.add(listener)
-          return () => listeners.delete(listener)
-        }
-      }
+      fs: { stat }
     }
   })
 })
 
 afterEach(() => {
   cleanup()
-  expect(listeners.size).toBe(0)
   if (originalApi) {
     Object.defineProperty(window, 'api', originalApi)
   } else {
@@ -149,72 +134,41 @@ describe('local composer drop lifetime', () => {
   })
 })
 
-describe('native composer ownership during a local drop', () => {
-  it.each([false, true])(
-    'stops after actual listener cleanup (Strict Mode: %s)',
-    async (strict) => {
-      const gate = Promise.withResolvers<void>()
-      holdStat(gate.promise)
-      const hook = renderDrop(strict)
-      act(() => nativeDrop(['/drop/one', '/drop/two']))
-      await vi.waitFor(() => expect(stat).toHaveBeenCalledOnce())
-      hook.unmount()
-      expect(listeners.size).toBe(0)
-      await act(async () => gate.resolve())
-
-      expect(stat).toHaveBeenCalledOnce()
-      expect(hook.attach).not.toHaveBeenCalled()
-    }
-  )
-
-  it('continues while temporarily covered and applies if ownership returns', async () => {
-    const first = Promise.withResolvers<void>()
-    const second = Promise.withResolvers<void>()
-    holdStat(first.promise)
-    holdStat(second.promise)
-    const older = renderDrop()
-    act(() => nativeDrop(['/drop/one', '/drop/two']))
+describe('native composer destination lifetime', () => {
+  it.each([false, true])('stops after unmount (Strict Mode: %s)', async (strict) => {
+    const gate = Promise.withResolvers<void>()
+    holdStat(gate.promise)
+    const hook = renderDrop(strict)
+    const pending = hook.result.current.applyNativeDrop(['/drop/one', '/drop/two'], () => true)
     await vi.waitFor(() => expect(stat).toHaveBeenCalledOnce())
-    const newer = renderDrop()
-    await act(async () => first.resolve())
-    expect(stat).toHaveBeenCalledTimes(2)
-    expect(older.attach).not.toHaveBeenCalled()
-    newer.unmount()
-    await act(async () => second.resolve())
-
-    expect(older.attach).toHaveBeenCalledOnce()
-    expect(newer.attach).not.toHaveBeenCalled()
+    hook.unmount()
+    await act(async () => gate.resolve())
+    await pending
+    expect(stat).toHaveBeenCalledOnce()
+    expect(hook.attach).not.toHaveBeenCalled()
   })
-
-  it('withholds a completed drop while a newer owner remains mounted', async () => {
+  it('keeps the original destination when a newer composer mounts', async () => {
     const gate = Promise.withResolvers<void>()
     holdStat(gate.promise)
     const older = renderDrop()
-    act(() => nativeDrop(['/drop/one', '/drop/two']))
+    const pending = older.result.current.applyNativeDrop(['/drop/one'], () => true)
     await vi.waitFor(() => expect(stat).toHaveBeenCalledOnce())
     const newer = renderDrop()
     await act(async () => gate.resolve())
-
-    expect(stat).toHaveBeenCalledTimes(2)
-    expect(older.attach).not.toHaveBeenCalled()
+    await pending
+    expect(older.attach).toHaveBeenCalledOnce()
     expect(newer.attach).not.toHaveBeenCalled()
   })
-
-  it('does not revive an old batch when another composer mounts', async () => {
+  it('withholds a completed drop when its destination changes', async () => {
     const gate = Promise.withResolvers<void>()
     holdStat(gate.promise)
-    const older = renderDrop()
-    act(() => nativeDrop(['/drop/old-one', '/drop/old-two']))
+    const hook = renderDrop()
+    let current = true
+    const pending = hook.result.current.applyNativeDrop(['/drop/one'], () => current)
     await vi.waitFor(() => expect(stat).toHaveBeenCalledOnce())
-    older.unmount()
-    const newer = renderDrop()
-    await act(async () => {
-      nativeDrop(['/drop/new'])
-      gate.resolve()
-    })
-
-    expect(stat.mock.calls.map(([input]) => input.filePath)).toEqual(['/drop/old-one', '/drop/new'])
-    expect(older.attach).not.toHaveBeenCalled()
-    expect(newer.attach).toHaveBeenCalledOnce()
+    current = false
+    await act(async () => gate.resolve())
+    await pending
+    expect(hook.attach).not.toHaveBeenCalled()
   })
 })
diff --git a/src/renderer/src/hooks/composer-state/attachment-drop-state.ts b/src/renderer/src/hooks/composer-state/attachment-drop-state.ts
index 3358a7e028e1..eb8b2c990c9e 100644
--- a/src/renderer/src/hooks/composer-state/attachment-drop-state.ts
+++ b/src/renderer/src/hooks/composer-state/attachment-drop-state.ts
@@ -29,7 +29,6 @@ import {
 } from '../composer-drop-result'
 import { applyComposerNativeFileDrop } from '../composer-native-file-drop'
 import { useMountedRef } from '../useMountedRef'
-import { useComposerDropListener } from './composer-drop-listener'
 import { userNamedFileAccess } from '@/lib/local-file-access'
 
 // Local drops bypass the runtime importer's skip classification.
@@ -250,8 +249,8 @@ export function useAttachmentDropState(input: AttachmentDropStateInput) {
   )
 
   const applyNativeDrop = useCallback(
-    (paths: string[], isCurrentOwner: () => boolean): void => {
-      void applyComposerNativeFileDrop({
+    (paths: string[], isCurrentOwner: () => boolean): Promise<void> => {
+      return applyComposerNativeFileDrop({
         paths,
         isCurrentOwner,
         uploadPaths: (sourcePaths) =>
@@ -279,14 +278,13 @@ export function useAttachmentDropState(input: AttachmentDropStateInput) {
       uploadComposerPaths
     ]
   )
-  // Why: native OS file drops relay via the preload bridge; only the most recently mounted composer applies them.
-  useComposerDropListener(applyNativeDrop)
 
   return {
     addComposerAttachments,
     insertComposerFolderPaths,
     uploadComposerPaths,
     handleAddAttachment,
-    applyLocalComposerDrop
+    applyLocalComposerDrop,
+    applyNativeDrop
   }
 }
diff --git a/src/renderer/src/hooks/composer-state/composer-attachment-drop-state.ts b/src/renderer/src/hooks/composer-state/composer-attachment-drop-state.ts
new file mode 100644
index 000000000000..c80cad12b2f8
--- /dev/null
+++ b/src/renderer/src/hooks/composer-state/composer-attachment-drop-state.ts
@@ -0,0 +1,24 @@
+import type { ComposerTargetState } from './composer-target-state-contract'
+import { resolveComposerAttachmentTarget } from './composer-attachment-target'
+import { useAttachmentDropState } from './attachment-drop-state'
+
+export function useComposerAttachmentDropState(target: ComposerTargetState) {
+  const destination = resolveComposerAttachmentTarget({
+    selectedProjectGroup: target.initialTargetState.selectedProjectGroup,
+    selectedRepoPath: target.asyncComposerState.selectedRepoPath,
+    selectedRepoExecutionHostId: target.runtimeTargetSelection.selectedRepoExecutionHostId,
+    selectedRepoSettings: target.runtimeTargetSelection.selectedRepoSettings,
+    connectionId: target.workspaceIdentityState.connectionId
+  })
+  return useAttachmentDropState({
+    agentPromptRef: target.asyncComposerState.agentPromptRef,
+    cancelPromptCaretFrame: target.providerRuntimeSync.cancelPromptCaretFrame,
+    connectionId: destination.connectionId,
+    promptCaretFrameRef: target.asyncComposerState.promptCaretFrameRef,
+    promptTextareaRef: target.asyncComposerState.promptTextareaRef,
+    selectedRepoPath: destination.path ?? undefined,
+    selectedRepoSettings: destination.settings,
+    setAgentPrompt: target.sourceContextState.setAgentPrompt,
+    setAttachmentPaths: target.sourceContextState.setAttachmentPaths
+  })
+}
diff --git a/src/renderer/src/hooks/composer-state/composer-attachment-target.test.ts b/src/renderer/src/hooks/composer-state/composer-attachment-target.test.ts
new file mode 100644
index 000000000000..f9d8973f5e50
--- /dev/null
+++ b/src/renderer/src/hooks/composer-state/composer-attachment-target.test.ts
@@ -0,0 +1,96 @@
+import { describe, expect, it } from 'vitest'
+import type { ProjectGroup } from '../../../../shared/project-group-types'
+import { resolveComposerAttachmentTarget } from './composer-attachment-target'
+
+const group: ProjectGroup = {
+  id: 'folder-project',
+  name: 'Project',
+  parentPath: '/folder',
+  parentGroupId: null,
+  createdFrom: 'manual',
+  tabOrder: 0,
+  isCollapsed: false,
+  color: null,
+  createdAt: 0,
+  updatedAt: 0
+}
+const selected = {
+  selectedProjectGroup: null,
+  selectedRepoPath: '/repo',
+  selectedRepoExecutionHostId: 'local' as const,
+  selectedRepoSettings: { activeRuntimeEnvironmentId: 'focused-runtime' },
+  connectionId: null
+}
+describe('composer attachment destination', () => {
+  it('uses the selected local host even when a runtime is focused', () => {
+    expect(resolveComposerAttachmentTarget(selected)).toEqual({
+      hostId: 'local',
+      path: '/repo',
+      connectionId: null,
+      settings: { activeRuntimeEnvironmentId: null }
+    })
+  })
+  it('uses the selected runtime without borrowing the focused runtime', () => {
+    expect(
+      resolveComposerAttachmentTarget({
+        ...selected,
+        selectedRepoExecutionHostId: 'runtime:selected'
+      }).settings.activeRuntimeEnvironmentId
+    ).toBe('selected')
+  })
+  it('uses a folder project path and recorded SSH host', () => {
+    expect(
+      resolveComposerAttachmentTarget({
+        ...selected,
+        selectedRepoPath: undefined,
+        selectedProjectGroup: { ...group, connectionId: 'ssh-a' }
+      })
+    ).toEqual({
+      hostId: 'ssh:ssh-a',
+      path: '/folder',
+      connectionId: 'ssh-a',
+      settings: { activeRuntimeEnvironmentId: null }
+    })
+  })
+  it('uses a folder project runtime owner', () => {
+    expect(
+      resolveComposerAttachmentTarget({
+        ...selected,
+        selectedRepoPath: undefined,
+        selectedProjectGroup: { ...group, executionHostId: 'runtime:folder-host' }
+      })
+    ).toEqual({
+      hostId: 'runtime:folder-host',
+      path: '/folder',
+      connectionId: null,
+      settings: { activeRuntimeEnvironmentId: 'folder-host' }
+    })
+  })
+  it.each(['/folder/source-repo', '/outside/source-repo'])(
+    'keeps folder attachments in the project when the task source is %s',
+    (sourcePath) => {
+      expect(
+        resolveComposerAttachmentTarget({
+          ...selected,
+          selectedRepoPath: sourcePath,
+          selectedProjectGroup: { ...group, connectionId: 'ssh-a' }
+        }).path
+      ).toBe('/folder')
+    }
+  )
+  it('keeps the folder destination unchanged when the task source repository changes', () => {
+    const input = { ...selected, selectedProjectGroup: { ...group, connectionId: 'ssh-a' } }
+    expect(
+      resolveComposerAttachmentTarget({ ...input, selectedRepoPath: '/folder/first' })
+    ).toEqual(resolveComposerAttachmentTarget({ ...input, selectedRepoPath: '/outside/second' }))
+  })
+  it('keeps a missing selection unresolved', () => {
+    expect(
+      resolveComposerAttachmentTarget({
+        ...selected,
+        selectedRepoPath: undefined,
+        selectedRepoExecutionHostId: null
+      }).hostId
+    ).toBeNull()
+  })
+})
diff --git a/src/renderer/src/hooks/composer-state/composer-attachment-target.ts b/src/renderer/src/hooks/composer-state/composer-attachment-target.ts
new file mode 100644
index 000000000000..5a147f9ee7c5
--- /dev/null
+++ b/src/renderer/src/hooks/composer-state/composer-attachment-target.ts
@@ -0,0 +1,30 @@
+import { getRepoExecutionHostId, parseExecutionHostId } from '../../../../shared/execution-host'
+import type { ComposerModel } from './composer-model'
+
+type TargetInput = Pick<
+  ComposerModel,
+  | 'selectedProjectGroup'
+  | 'selectedRepoPath'
+  | 'selectedRepoExecutionHostId'
+  | 'selectedRepoSettings'
+  | 'connectionId'
+>
+
+export function resolveComposerAttachmentTarget(input: TargetInput) {
+  const group = input.selectedProjectGroup
+  const hostId = group ? getRepoExecutionHostId(group) : input.selectedRepoExecutionHostId
+  const host = parseExecutionHostId(hostId)
+  return {
+    hostId,
+    path: group ? group.parentPath : (input.selectedRepoPath ?? null),
+    connectionId: group
+      ? host?.kind === 'runtime'
+        ? null
+        : (group.connectionId ?? null)
+      : input.connectionId,
+    settings: {
+      ...input.selectedRepoSettings,
+      activeRuntimeEnvironmentId: host?.kind === 'runtime' ? host.environmentId : null
+    }
+  }
+}
diff --git a/src/renderer/src/hooks/composer-state/composer-card-contract.ts b/src/renderer/src/hooks/composer-state/composer-card-contract.ts
index 64ef15be23f5..bbd084be6bfb 100644
--- a/src/renderer/src/hooks/composer-state/composer-card-contract.ts
+++ b/src/renderer/src/hooks/composer-state/composer-card-contract.ts
@@ -86,6 +86,7 @@ export type ComposerCardActionProps = {
   onAgentPromptChange: ComposerModel['setAgentPrompt']
   linkedOnlyTemplatePreview: string | null
   getAttachmentLabel: (pathValue: string) => string
+  onNativeFileDrop?: ComposerModel['applyNativeDrop']
   onAddAttachment: () => void
   onRemoveAttachment: (pathValue: string) => void
   onRemoveLinkedWorkItem: ComposerModel['handleRemoveLinkedWorkItem']
diff --git a/src/renderer/src/hooks/composer-state/composer-card-props.ts b/src/renderer/src/hooks/composer-state/composer-card-props.ts
index a5a2fb7bd664..4584bec2a5fa 100644
--- a/src/renderer/src/hooks/composer-state/composer-card-props.ts
+++ b/src/renderer/src/hooks/composer-state/composer-card-props.ts
@@ -1,9 +1,11 @@
+import { resolveComposerAttachmentTarget } from './composer-attachment-target'
 import { getAttachmentLabel } from '@/lib/new-workspace'
 import { getQuickComposerCreateDisabled } from '@/lib/new-workspace-create-gates'
 import type { ComposerModel } from './composer-model'
 import type { ComposerCardActionProps, ComposerCardSourceProps } from './composer-card-contract'
 
 export function buildComposerCardProps(state: ComposerModel) {
+  const attachmentTarget = resolveComposerAttachmentTarget(state)
   const {
     advancedOpen,
     agentPrompt,
@@ -78,7 +80,6 @@ export function buildComposerCardProps(state: ComposerModel) {
     selectedProjectHostSetupId,
     selectedProjectId,
     selectedRepo,
-    selectedRepoExecutionHostId,
     selectedRepoConnectInProgress,
     selectedRepoConnectionId,
     selectedRepoGitHubSourceContext,
@@ -152,7 +153,7 @@ export function buildComposerCardProps(state: ComposerModel) {
     onBranchNameOverrideChange: isProjectGroupTarget ? () => {} : handleBranchNameOverrideChange,
     parentWorktreeId: isProjectGroupTarget ? null : parentWorktreeId,
     onParentWorktreeIdChange: isProjectGroupTarget ? () => {} : setParentWorktreeId,
-    selectedRepoExecutionHostId: isProjectGroupTarget ? null : selectedRepoExecutionHostId,
+    selectedRepoExecutionHostId: attachmentTarget.hostId,
     selectedRepoProjectId: isProjectGroupTarget ? null : selectedRepoProjectId,
     onSmartGitHubItemSelect: handleSmartGitHubItemSelect,
     onSmartGitLabItemSelect: handleSmartGitLabItemSelect,
@@ -181,6 +182,8 @@ export function buildComposerCardProps(state: ComposerModel) {
     linkedOnlyTemplatePreview: shouldApplyLinkedOnlyTemplate ? linkedOnlyTemplatePrompt : null,
     attachmentPaths,
     getAttachmentLabel,
+    // Quick create has no attachment display or launch-prompt destination.
+    onNativeFileDrop: undefined,
     onAddAttachment: () => void handleAddAttachment(),
     onRemoveAttachment: (pathValue) =>
       setAttachmentPaths((current) => current.filter((currentPath) => currentPath !== pathValue)),
@@ -210,7 +213,7 @@ export function buildComposerCardProps(state: ComposerModel) {
     onBaseBranchMrSelect: isProjectGroupTarget ? () => {} : handleBaseBranchMrSelect,
     baseBranchLinkedPrNumber:
       linkedWorkItem?.type === 'pr' && baseBranch ? linkedWorkItem.number : null,
-    selectedRepoPath: isProjectGroupTarget ? null : (selectedRepo?.path ?? null),
+    selectedRepoPath: attachmentTarget.path,
     selectedRepoIsRemote: isProjectGroupTarget
       ? folderTargetIsRemote
       : Boolean(selectedRepo?.connectionId),
diff --git a/src/renderer/src/hooks/composer-state/composer-drop-listener.test.ts b/src/renderer/src/hooks/composer-state/composer-drop-listener.test.ts
deleted file mode 100644
index eea389815cf3..000000000000
--- a/src/renderer/src/hooks/composer-state/composer-drop-listener.test.ts
+++ /dev/null
@@ -1,63 +0,0 @@
-// @vitest-environment happy-dom
-
-import { act, renderHook } from '@testing-library/react'
-import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest'
-import { useComposerDropListener } from './composer-drop-listener'
-import type { NativeFileDropPayload } from '../../../../shared/native-file-drop'
-
-let originalApiDescriptor: PropertyDescriptor | undefined
-
-beforeEach(() => {
-  originalApiDescriptor = Object.getOwnPropertyDescriptor(window, 'api')
-  const ui = {
-    onFileDrop: vi.fn<Window['api']['ui']['onFileDrop']>()
-  } satisfies Pick<Window['api']['ui'], 'onFileDrop'>
-  Object.defineProperty(window, 'api', {
-    configurable: true,
-    value: { ui }
-  })
-})
-
-afterEach(() => {
-  vi.restoreAllMocks()
-  if (originalApiDescriptor) {
-    Object.defineProperty(window, 'api', originalApiDescriptor)
-  } else {
-    Reflect.deleteProperty(window, 'api')
-  }
-})
-
-describe('useComposerDropListener', () => {
-  it('routes to the newest composer and restores the previous owner after cleanup', () => {
-    const listeners: ((data: NativeFileDropPayload) => void)[] = []
-    const unsubscribes: (() => void)[] = []
-    vi.spyOn(window.api.ui, 'onFileDrop').mockImplementation((listener) => {
-      listeners.push(listener)
-      const unsubscribe = vi.fn()
-      unsubscribes.push(unsubscribe)
-      return unsubscribe
-    })
-    const firstApply = vi.fn()
-    const secondApply = vi.fn()
-    const first = renderHook(() => useComposerDropListener(firstApply))
-    const second = renderHook(() => useComposerDropListener(secondApply))
-
-    act(() => {
-      for (const listener of listeners) {
-        listener({ target: 'composer', paths: ['/tmp/newest.txt'] })
-      }
-    })
-    expect(firstApply).not.toHaveBeenCalled()
-    expect(secondApply).toHaveBeenCalledTimes(1)
-
-    second.unmount()
-    expect(unsubscribes[1]).toHaveBeenCalledTimes(1)
-    act(() => {
-      listeners[0]({ target: 'composer', paths: ['/tmp/restored.txt'] })
-    })
-    expect(firstApply).toHaveBeenCalledTimes(1)
-
-    first.unmount()
-    expect(unsubscribes[0]).toHaveBeenCalledTimes(1)
-  })
-})
diff --git a/src/renderer/src/hooks/composer-state/composer-drop-listener.ts b/src/renderer/src/hooks/composer-state/composer-drop-listener.ts
deleted file mode 100644
index 8c57e26d4f82..000000000000
--- a/src/renderer/src/hooks/composer-state/composer-drop-listener.ts
+++ /dev/null
@@ -1,41 +0,0 @@
-import { useEffect, useRef } from 'react'
-import { isCurrentComposerDropOwner } from '../composer-drop-owner'
-
-const composerDropStack: symbol[] = []
-
-export function useComposerDropListener(
-  applyDrop: (paths: string[], isCurrentOwner: () => boolean) => void
-): void {
-  const applyDropRef = useRef(applyDrop)
-  useEffect(() => {
-    applyDropRef.current = applyDrop
-  }, [applyDrop])
-  const instanceIdRef = useRef<symbol>(undefined!)
-  instanceIdRef.current ??= Symbol('composer')
-
-  useEffect(() => {
-    const instanceId = instanceIdRef.current
-    composerDropStack.push(instanceId)
-    const unsubscribe = window.api.ui.onFileDrop((data) => {
-      if (
-        data.target !== 'composer' ||
-        // Why: a scoped payload belongs to the pane composer that published that
-        // scope key; this stack only owns drops from unscoped composers.
-        data.scopeKey !== undefined ||
-        !isCurrentComposerDropOwner(composerDropStack, instanceId)
-      ) {
-        return
-      }
-      const isCurrentOwner = (): boolean =>
-        isCurrentComposerDropOwner(composerDropStack, instanceId)
-      applyDropRef.current(data.paths, isCurrentOwner)
-    })
-    return () => {
-      unsubscribe()
-      const index = composerDropStack.lastIndexOf(instanceId)
-      if (index !== -1) {
-        composerDropStack.splice(index, 1)
-      }
-    }
-  }, [])
-}
diff --git a/src/renderer/src/hooks/composer-state/composer-source-model.ts b/src/renderer/src/hooks/composer-state/composer-source-model.ts
index bab47484826f..1ecef7848792 100644
--- a/src/renderer/src/hooks/composer-state/composer-source-model.ts
+++ b/src/renderer/src/hooks/composer-state/composer-source-model.ts
@@ -7,7 +7,7 @@ import type { LinearIssue } from '../../../../shared/linear/issue-types'
 import type { SparsePreset } from '../../../../shared/worktree/create-types'
 import type { GlobalSettings } from '../../../../shared/global-settings-types'
 import type { PendingSmartGitHubSubmitResolution } from './source-selection-decisions'
-import type { SmartWorkspaceNameSelection } from '@/components/new-workspace/SmartWorkspaceNameField'
+import type { SmartWorkspaceNameSelection } from '@/components/new-workspace/smart-workspace-name-field-model'
 export type ComposerSourceModel = {
   addComposerAttachments: (paths: string[]) => void
   applyLinkedGitLabWorkItem: (item: GitLabWorkItem) => void
@@ -15,6 +15,7 @@ export type ComposerSourceModel = {
     item: GitHubWorkItem,
     options?: { preserveBranchNameOverride?: boolean | undefined }
   ) => void
+  applyNativeDrop: (paths: string[], isCurrentOwner: () => boolean) => Promise<void>
   applyLocalComposerDrop: (paths: string[], canApply?: () => boolean) => Promise<void>
   canPrefetchSelectedRepoWorkItems: boolean
   folderCreateDisabled: boolean
diff --git a/src/renderer/src/hooks/composer-state/composer-source-state-contract.ts b/src/renderer/src/hooks/composer-state/composer-source-state-contract.ts
index e4b95c140cfc..10206c9d40ba 100644
--- a/src/renderer/src/hooks/composer-state/composer-source-state-contract.ts
+++ b/src/renderer/src/hooks/composer-state/composer-source-state-contract.ts
@@ -16,6 +16,7 @@ export type ComposerSourceState = {
     | 'uploadComposerPaths'
     | 'handleAddAttachment'
     | 'applyLocalComposerDrop'
+    | 'applyNativeDrop'
   >
   targetChangeActions: Pick<
     ComposerModel,
diff --git a/src/renderer/src/hooks/composer-state/composer-source-state.ts b/src/renderer/src/hooks/composer-state/composer-source-state.ts
index 4cda33be903b..5199f2d4efbf 100644
--- a/src/renderer/src/hooks/composer-state/composer-source-state.ts
+++ b/src/renderer/src/hooks/composer-state/composer-source-state.ts
@@ -2,7 +2,7 @@ import type { ComposerTargetState } from './composer-target-state-contract'
 import type { ComposerExternalSyncState } from './composer-external-sync-contract'
 import type { ComposerSourceState } from './composer-source-state-contract'
 import { useSourceIdentityActions } from './source-identity-actions'
-import { useAttachmentDropState } from './attachment-drop-state'
+import { useComposerAttachmentDropState } from './composer-attachment-drop-state'
 import { useTargetChangeActions } from './target-change-actions'
 import { useProjectTargetActions } from './project-target-actions'
 import { useBranchStartPointActions } from './branch-start-point-actions'
@@ -49,17 +49,7 @@ export function useComposerSourceState(
     smartGitHubPrStartPointSelectionRef:
       target.asyncComposerState.smartGitHubPrStartPointSelectionRef
   })
-  const attachmentDropState = useAttachmentDropState({
-    agentPromptRef: target.asyncComposerState.agentPromptRef,
-    cancelPromptCaretFrame: target.providerRuntimeSync.cancelPromptCaretFrame,
-    connectionId: target.workspaceIdentityState.connectionId,
-    promptCaretFrameRef: target.asyncComposerState.promptCaretFrameRef,
-    promptTextareaRef: target.asyncComposerState.promptTextareaRef,
-    selectedRepoPath: target.asyncComposerState.selectedRepoPath,
-    selectedRepoSettings: target.runtimeTargetSelection.selectedRepoSettings,
-    setAgentPrompt: target.sourceContextState.setAgentPrompt,
-    setAttachmentPaths: target.sourceContextState.setAttachmentPaths
-  })
+  const attachmentDropState = useComposerAttachmentDropState(target)
   const targetChangeActions = useTargetChangeActions({
     baseBranch: target.workspaceIdentityState.baseBranch,
     branchAutoNameRef: target.asyncComposerState.branchAutoNameRef,
diff --git a/src/renderer/src/hooks/composer-state/identity-model.ts b/src/renderer/src/hooks/composer-state/identity-model.ts
index b207d3ed88b6..be289c4e1377 100644
--- a/src/renderer/src/hooks/composer-state/identity-model.ts
+++ b/src/renderer/src/hooks/composer-state/identity-model.ts
@@ -1,7 +1,7 @@
 import type * as React from 'react'
 import type { TuiAgent } from '../../../../shared/tui-agent'
 import type { GitPushTarget } from '../../../../shared/worktree/types'
-import type { SmartNameMode } from '@/components/new-workspace/smart-workspace-source-results'
+import type { SmartNameMode } from '../../../../shared/new-workspace/smart-workspace-source-results'
 
 export type ComposerIdentityModel = {
   linkedIssue: string
diff --git a/src/renderer/src/hooks/composer-state/issue-source-actions.ts b/src/renderer/src/hooks/composer-state/issue-source-actions.ts
index 64a6cf54e9a9..58df16c9cc03 100644
--- a/src/renderer/src/hooks/composer-state/issue-source-actions.ts
+++ b/src/renderer/src/hooks/composer-state/issue-source-actions.ts
@@ -54,7 +54,7 @@ import {
   buildWorkspaceSourceSelection,
   shouldApplyWorkspaceSourceAutoName
 } from '../../../../shared/new-workspace/workspace-source'
-import type { SmartWorkspaceNameSelection } from '@/components/new-workspace/SmartWorkspaceNameField'
+import type { SmartWorkspaceNameSelection } from '@/components/new-workspace/smart-workspace-name-field-model'
 import type { TaskSourceContext } from '../../../../shared/task-source-context'
 
 export function useIssueSourceActions(input: IssueSourceActionsInput) {
diff --git a/src/renderer/src/hooks/composer-state/workspace-identity-state.ts b/src/renderer/src/hooks/composer-state/workspace-identity-state.ts
index b31878ccb964..37606e8cd7f3 100644
--- a/src/renderer/src/hooks/composer-state/workspace-identity-state.ts
+++ b/src/renderer/src/hooks/composer-state/workspace-identity-state.ts
@@ -20,7 +20,7 @@ import { getLinkedWorkItemProvider, isGitLabIssueUrl } from '@/lib/new-workspace
 import {
   type SmartNameMode,
   isBlockingJiraUrlIntent
-} from '@/components/new-workspace/smart-workspace-source-results'
+} from '../../../../shared/new-workspace/smart-workspace-source-results'
 import type { GitPushTarget } from '../../../../shared/worktree/types'
 import type { TuiAgent } from '../../../../shared/tui-agent'
 import { filterEnabledTuiAgents, isTuiAgentEnabled } from '../../../../shared/tui-agent-selection'
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 29ddc098726e..0d616577e364 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
@@ -111,8 +111,10 @@ export function registerTerminalUiRoutingIpcBridge(unsubs: (() => void)[]): void
   unsubs.push(window.api.ui.onSplitTerminal(routeRuntimeTerminalSplitRequest))
 
   unsubs.push(
-    window.api.ui.onRenameTerminal(({ tabId, title }) => {
-      useAppStore.getState().setTabCustomTitle(tabId, title)
+    window.api.ui.onRenameTerminal(({ tabId, title, recordInteraction }) => {
+      useAppStore
+        .getState()
+        .setTabCustomTitle(tabId, title, recordInteraction === false ? { recordInteraction } : {})
     })
   )
 
diff --git a/src/renderer/src/hooks/settings-navigation-interface-sections.ts b/src/renderer/src/hooks/settings-navigation-interface-sections.ts
index ca538b877711..8adfb8b0c8fd 100644
--- a/src/renderer/src/hooks/settings-navigation-interface-sections.ts
+++ b/src/renderer/src/hooks/settings-navigation-interface-sections.ts
@@ -1,6 +1,7 @@
 import { getAppearancePaneSearchEntries } from '@/components/settings/appearance-search'
 import { getChatAppearanceSearchEntries } from '@/components/settings/chat-appearance-search'
 import { getChatNamingSearchEntry } from '@/components/settings/chat-naming-search'
+import { getChatInlineVisualsSearchEntry } from '@/components/settings/chat-inline-visuals-search'
 import { getInputPaneSearchEntries } from '@/components/settings/input-search'
 import { getNotificationsPaneSearchEntries } from '@/components/settings/notifications-search'
 import { getShortcutsPaneSearchEntries } from '@/components/settings/shortcuts-search'
@@ -42,12 +43,14 @@ export function buildInterfaceSettingsSections({
             title: translate('settings.appearance.chat.title', 'Chat'),
             description: translate(
               'settings.chat.description',
-              'Choose how chats look and get their names.'
+              'Choose how chats look and behave.'
             ),
             icon: MessageSquare,
             searchEntries: [
               ...getChatAppearanceSearchEntries(),
-              ...(showDesktopOnlySettings ? [getChatNamingSearchEntry()] : [])
+              ...(showDesktopOnlySettings
+                ? [getChatNamingSearchEntry(), getChatInlineVisualsSearchEntry()]
+                : [])
             ],
             group: 'interface'
           }
diff --git a/src/renderer/src/hooks/use-os-file-drop-owner.test.tsx b/src/renderer/src/hooks/use-os-file-drop-owner.test.tsx
index efab76d59970..6d3af4731c7c 100644
--- a/src/renderer/src/hooks/use-os-file-drop-owner.test.tsx
+++ b/src/renderer/src/hooks/use-os-file-drop-owner.test.tsx
@@ -33,12 +33,14 @@ function Owner<Destination = undefined>({
   canAccept,
   sequence,
   captureDestination,
+  isDestinationLive,
   children
 }: {
   onDrop: DropHandler<Destination>
   canAccept?: boolean
   sequence?: OsFileDropSequence
   captureDestination?: (event: DragEvent) => Destination
+  isDestinationLive?: (context: { destination?: Destination }) => boolean
   children?: React.ReactNode
 }): React.JSX.Element {
   const ownerElementRef = useRef<HTMLElement | null>(null)
@@ -48,7 +50,8 @@ function Owner<Destination = undefined>({
     onDrop,
     canAccept,
     sequence: sequence ?? ownSequence,
-    captureDestination
+    captureDestination,
+    isDestinationLive
   }
   const ownerRef = useOsFileDropOwner(ownerElementRef, options)
   return (
@@ -102,6 +105,15 @@ afterEach(() => {
 })
 
 describe('useOsFileDropOwner', () => {
+  it('claims a trusted refused drop without reading file paths', () => {
+    const onDrop = vi.fn()
+    const view = render(<Owner onDrop={onDrop} canAccept={false} />)
+    drag(view.getByTestId('owner'), 'drop')
+    expect(getPathForFile).not.toHaveBeenCalled()
+    expect(onDrop).not.toHaveBeenCalled()
+    drag(view.getByTestId('owner'), 'drop', undefined, { trusted: false })
+    expect(onDrop).not.toHaveBeenCalled()
+  })
   it('registers the root with a callback ref and delivers one prepared drop to the nearest owner', async () => {
     const outerDrop = vi.fn<DropHandler>()
     const innerDrop = vi.fn<DropHandler>()
@@ -354,6 +366,50 @@ describe('useOsFileDropOwner', () => {
     expect(onDrop).not.toHaveBeenCalled()
   })
 
+  it.each([true, false])(
+    'uses destination liveness (%s) after the root detaches and keeps failures',
+    async (live) => {
+      const onDrop = vi.fn<DropHandler<string>>()
+      let finish: ((prepared: PreparedDroppedPaths) => void) | undefined
+      prepareDroppedPaths.mockImplementationOnce(
+        () =>
+          new Promise((resolve) => {
+            finish = resolve
+          })
+      )
+      const isDestinationLive = vi.fn(() => live)
+      const view = render(
+        <Owner
+          onDrop={onDrop}
+          captureDestination={() => 'group-b'}
+          isDestinationLive={isDestinationLive}
+        />
+      )
+      drag(view.getByTestId('owner'), 'drop')
+      view.unmount()
+      await act(async () => {
+        finish?.({
+          paths: ['/dropped/a.txt'],
+          failures: [
+            { target: 'rejected', reason: 'unresolved-paths', pathCount: 1, byteLength: 0 }
+          ]
+        })
+      })
+      expect(isDestinationLive).toHaveBeenCalledWith(
+        expect.objectContaining({ destination: 'group-b' })
+      )
+      expect(onDrop).toHaveBeenCalledExactlyOnceWith(
+        {
+          paths: live ? ['/dropped/a.txt'] : [],
+          failures: [
+            { target: 'rejected', reason: 'unresolved-paths', pathCount: 1, byteLength: 0 }
+          ]
+        },
+        expect.objectContaining({ destination: 'group-b' })
+      )
+    }
+  )
+
   it('orders sibling roots through preparation and asynchronous application while independent owners progress', async () => {
     let finishPreparation: ((prepared: PreparedDroppedPaths) => void) | undefined
     let finishApplication: (() => void) | undefined
diff --git a/src/renderer/src/hooks/use-os-file-drop-owner.ts b/src/renderer/src/hooks/use-os-file-drop-owner.ts
index f69d6d9f85f1..9a279b4063de 100644
--- a/src/renderer/src/hooks/use-os-file-drop-owner.ts
+++ b/src/renderer/src/hooks/use-os-file-drop-owner.ts
@@ -27,8 +27,10 @@ type OsFileDropContext<Destination> = {
 type OsFileDropOwnerOptions<Destination> = {
   consumer: DroppedPathConsumer
   sequence: OsFileDropSequence
-  canAccept?: boolean
+  canAccept?: boolean | ((event: DragEvent) => boolean)
   captureDestination?: (event: DragEvent) => Destination
+  /** Replaces root liveness for paths; preparation failures still reach onDrop. */
+  isDestinationLive?: (context: OsFileDropContext<Destination>) => boolean
   onDrop: (
     prepared: PreparedDroppedPaths,
     context: OsFileDropContext<Destination>
@@ -76,6 +78,10 @@ export function useOsFileDropOwner<Destination = undefined>(
       }
 
       let attached = true
+      const canAccept = (event: DragEvent): boolean => {
+        const availability = optionsRef.current.canAccept
+        return typeof availability === 'function' ? availability(event) : availability !== false
+      }
 
       const onDragOver = (event: DragEvent): void => {
         if (!hasOsFileDragTypes(event.dataTransfer?.types) || !isNearestOwner(root, event)) {
@@ -84,7 +90,7 @@ export function useOsFileDropOwner<Destination = undefined>(
         event.preventDefault()
         event.stopPropagation()
         if (event.dataTransfer) {
-          event.dataTransfer.dropEffect = optionsRef.current.canAccept === false ? 'none' : 'copy'
+          event.dataTransfer.dropEffect = canAccept(event) ? 'copy' : 'none'
         }
       }
 
@@ -94,11 +100,20 @@ export function useOsFileDropOwner<Destination = undefined>(
         }
         event.preventDefault()
         event.stopPropagation()
-        if (!event.isTrusted || optionsRef.current.canAccept === false) {
+        if (!event.isTrusted) {
+          return
+        }
+        if (!canAccept(event)) {
           return
         }
 
-        const { consumer, sequence, onDrop: deliver, captureDestination } = optionsRef.current
+        const {
+          consumer,
+          sequence,
+          onDrop: deliver,
+          captureDestination,
+          isDestinationLive
+        } = optionsRef.current
         const context: OsFileDropContext<Destination> = { target: event.target }
         if (captureDestination) {
           context.destination = captureDestination(event)
@@ -109,8 +124,13 @@ export function useOsFileDropOwner<Destination = undefined>(
           sequence.deliveryTail = sequence.deliveryTail
             .then(async () => {
               const result = await prepared
-              if (attached) {
-                await deliver(result, context)
+              if (isDestinationLive || attached) {
+                await deliver(
+                  isDestinationLive && !isDestinationLive(context)
+                    ? { ...result, paths: [] }
+                    : result,
+                  context
+                )
               }
             })
             .catch((error: unknown) => console.error('OS file drop owner callback failed', error))
diff --git a/src/renderer/src/hooks/useAutoAckViewedAgent.away.test.ts b/src/renderer/src/hooks/useAutoAckViewedAgent.away.test.ts
index 0f5cadb1e907..7370ef6b57fc 100644
--- a/src/renderer/src/hooks/useAutoAckViewedAgent.away.test.ts
+++ b/src/renderer/src/hooks/useAutoAckViewedAgent.away.test.ts
@@ -3,7 +3,7 @@ import { act, cleanup, renderHook, waitFor } from '@testing-library/react'
 import { afterEach, beforeEach, expect, it, vi } from 'vitest'
 import { useAutoAckViewedAgent } from './useAutoAckViewedAgent'
 import { useAppStore } from '../store'
-import { makeTab, makeTabGroup, makeUnifiedTab } from '../store/slices/store-test-helpers'
+import { makeTab, makeTabGroup, makeUnifiedTab } from '../store/slices/store-session-test-harness'
 import { makePaneKey } from '../../../shared/stable-pane-id'
 import { createNotificationsApi } from '../web/preload-api/web-notifications-api'
 
diff --git a/src/renderer/src/hooks/useAutoAckViewedAgent.clock-skew.test.ts b/src/renderer/src/hooks/useAutoAckViewedAgent.clock-skew.test.ts
index c90e8119f057..1640edd0b27f 100644
--- a/src/renderer/src/hooks/useAutoAckViewedAgent.clock-skew.test.ts
+++ b/src/renderer/src/hooks/useAutoAckViewedAgent.clock-skew.test.ts
@@ -5,7 +5,7 @@ import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest'
 import type * as AgentAutoAckPresence from './agent-auto-ack-presence'
 import { useAutoAckViewedAgent } from './useAutoAckViewedAgent'
 import { useAppStore } from '../store'
-import { makeTab, makeTabGroup, makeUnifiedTab } from '../store/slices/store-test-helpers'
+import { makeTab, makeTabGroup, makeUnifiedTab } from '../store/slices/store-session-test-harness'
 import { makePaneKey } from '../../../shared/stable-pane-id'
 import type { AgentStatusEntry } from '../../../shared/agent-status-types'
 
diff --git a/src/renderer/src/hooks/useAutoAckViewedAgent.floating-panel.test.ts b/src/renderer/src/hooks/useAutoAckViewedAgent.floating-panel.test.ts
index 47a56b338a27..4622f63ef825 100644
--- a/src/renderer/src/hooks/useAutoAckViewedAgent.floating-panel.test.ts
+++ b/src/renderer/src/hooks/useAutoAckViewedAgent.floating-panel.test.ts
@@ -6,7 +6,7 @@ import type * as AgentAutoAckPresence from './agent-auto-ack-presence'
 import { useAutoAckViewedAgent } from './useAutoAckViewedAgent'
 import { useAppStore } from '../store'
 import { selectFloatingWorkspaceHasUnread } from '../store/selectors'
-import { makeTab, makeTabGroup, makeUnifiedTab } from '../store/slices/store-test-helpers'
+import { makeTab, makeTabGroup, makeUnifiedTab } from '../store/slices/store-session-test-harness'
 import { FLOATING_TERMINAL_WORKTREE_ID, getDefaultSettings } from '../../../shared/constants'
 import { makePaneKey } from '../../../shared/stable-pane-id'
 
diff --git a/src/renderer/src/hooks/useAutoAckViewedAgent.focus-group.test.ts b/src/renderer/src/hooks/useAutoAckViewedAgent.focus-group.test.ts
index a2a71dd440cf..402b1e0f9dad 100644
--- a/src/renderer/src/hooks/useAutoAckViewedAgent.focus-group.test.ts
+++ b/src/renderer/src/hooks/useAutoAckViewedAgent.focus-group.test.ts
@@ -5,7 +5,7 @@ import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest'
 import type * as AgentAutoAckPresence from './agent-auto-ack-presence'
 import { useAutoAckViewedAgent } from './useAutoAckViewedAgent'
 import { useAppStore } from '../store'
-import { makeTab, makeTabGroup, makeUnifiedTab } from '../store/slices/store-test-helpers'
+import { makeTab, makeTabGroup, makeUnifiedTab } from '../store/slices/store-session-test-harness'
 import { structuredAgentSessionPaneKey } from '../../../shared/structured-agent-session-projection'
 
 vi.mock('./agent-auto-ack-presence', async (importOriginal) => ({
diff --git a/src/renderer/src/hooks/useComposerState.integration.test.ts b/src/renderer/src/hooks/useComposerState.integration.test.ts
index 318aad599cad..6b1103c67a0b 100644
--- a/src/renderer/src/hooks/useComposerState.integration.test.ts
+++ b/src/renderer/src/hooks/useComposerState.integration.test.ts
@@ -11,15 +11,12 @@ let originalApiDescriptor: PropertyDescriptor | undefined
 
 beforeEach(() => {
   originalApiDescriptor = Object.getOwnPropertyDescriptor(window, 'api')
-  const ui = {
-    onFileDrop: vi.fn<Window['api']['ui']['onFileDrop']>()
-  } satisfies Pick<Window['api']['ui'], 'onFileDrop'>
   const preflight = {
     detectAgents: vi.fn<Window['api']['preflight']['detectAgents']>().mockResolvedValue([])
   } satisfies Pick<Window['api']['preflight'], 'detectAgents'>
   Object.defineProperty(window, 'api', {
     configurable: true,
-    value: { preflight, ui }
+    value: { preflight }
   })
 })
 
@@ -70,13 +67,6 @@ describe('useComposerState integrated lifecycle', () => {
       worktreesByRepo: {},
       sparsePresetsByRepo: {}
     })
-    const unsubscribes: ReturnType<typeof vi.fn>[] = []
-    vi.spyOn(window.api.ui, 'onFileDrop').mockImplementation(() => {
-      const unsubscribe = vi.fn()
-      unsubscribes.push(unsubscribe)
-      return unsubscribe
-    })
-
     const first = renderHook(() => useComposerState({ initialName: 'first', persistDraft: false }))
     const second = renderHook(() =>
       useComposerState({ initialName: 'second', persistDraft: false })
@@ -88,12 +78,10 @@ describe('useComposerState integrated lifecycle', () => {
     expect(first.result.current.cardProps.onParentWorktreeIdChange).toBeTypeOf('function')
     act(() => first.result.current.cardProps.onParentWorktreeIdChange('repo-1::/parent'))
     expect(first.result.current.cardProps.parentWorktreeId).toBe('repo-1::/parent')
-    expect(window.api.ui.onFileDrop).toHaveBeenCalledTimes(2)
+    expect(first.result.current.cardProps.onNativeFileDrop).toBeUndefined()
+    expect(second.result.current.cardProps.onNativeFileDrop).toBeUndefined()
 
     second.unmount()
     first.unmount()
-    expect(unsubscribes).toHaveLength(2)
-    expect(unsubscribes[0]).toHaveBeenCalledTimes(1)
-    expect(unsubscribes[1]).toHaveBeenCalledTimes(1)
   })
 })
diff --git a/src/renderer/src/hooks/useGlobalFileDrop.ts b/src/renderer/src/hooks/useGlobalFileDrop.ts
deleted file mode 100644
index 18f01ad0ff7c..000000000000
--- a/src/renderer/src/hooks/useGlobalFileDrop.ts
+++ /dev/null
@@ -1,259 +0,0 @@
-import { useEffect } from 'react'
-import { toast } from 'sonner'
-import { detectLanguage } from '@/lib/language-detect'
-import { isPathInsideWorktree, toWorktreeRelativePath } from '@/lib/terminal-links'
-import { useAppStore } from '@/store'
-import { getConnectionId } from '@/lib/connection-context'
-import { joinPath } from '@/lib/path'
-import { getRuntimeEnvironmentIdForWorktree } from '@/lib/worktree-runtime-owner'
-import {
-  importExternalPathsToRuntime,
-  type RuntimeFileOperationArgs
-} from '@/runtime/runtime-file-client'
-import type { GlobalSettings } from '../../../shared/global-settings-types'
-import { translate } from '@/i18n/i18n'
-import type { WorktreeRuntimeOwnerState } from '@/lib/worktree-runtime-owner'
-import {
-  NATIVE_FILE_DROP_MAX_PATHS,
-  type NativeFileDropRejectedPayload
-} from '../../../shared/native-file-drop'
-import { captureWorktreeSshMutationExpectation } from '@/lib/ssh-mutation-expectation'
-import { describeDropTempCopyFailure } from '@/lib/drop-temp-copy-failure-copy'
-import { statUserOpenedPath } from '@/lib/user-opened-local-path'
-
-export function getEditorFileDropSettingsForWorktree(
-  store: WorktreeRuntimeOwnerState,
-  worktreeId: string
-): Pick<GlobalSettings, 'activeRuntimeEnvironmentId'> {
-  const runtimeEnvironmentId = getRuntimeEnvironmentIdForWorktree(store, worktreeId)
-  // Why: OS drops target the selected worktree. Use that worktree's host owner
-  // so a focused runtime cannot hijack local/SSH editor drops.
-  return {
-    ...store.settings,
-    activeRuntimeEnvironmentId: runtimeEnvironmentId
-  }
-}
-
-export function shouldUploadRemoteEditorFileDrop(
-  settings: Pick<GlobalSettings, 'activeRuntimeEnvironmentId'> | null | undefined,
-  connectionId: string | null | undefined
-): boolean {
-  return Boolean(settings?.activeRuntimeEnvironmentId?.trim() || connectionId?.trim())
-}
-
-export function getEditorFileDropOperationContext(
-  store: WorktreeRuntimeOwnerState,
-  worktreeId: string,
-  worktreePath: string | null | undefined,
-  connectionId: string | undefined
-): RuntimeFileOperationArgs {
-  return {
-    settings: getEditorFileDropSettingsForWorktree(store, worktreeId),
-    worktreeId,
-    worktreePath,
-    connectionId
-  }
-}
-
-export function useGlobalFileDrop(): void {
-  useEffect(() => {
-    return window.api.ui.onFileDrop((data) => {
-      if (data.target === 'rejected') {
-        showNativeFileDropRejection(data)
-        return
-      }
-
-      if (data.target !== 'editor') {
-        return
-      }
-
-      const store = useAppStore.getState()
-      const activeWorktreeId = store.activeWorktreeId
-      if (!activeWorktreeId) {
-        return
-      }
-
-      const activeWorktree = store.getKnownWorktreeById(activeWorktreeId)
-      const worktreePath = activeWorktree?.path
-      const connectionId = getConnectionId(activeWorktreeId) ?? undefined
-      let fileContext: RuntimeFileOperationArgs
-      try {
-        fileContext = {
-          ...getEditorFileDropOperationContext(store, activeWorktreeId, worktreePath, connectionId),
-          ...captureWorktreeSshMutationExpectation(store, activeWorktreeId)
-        }
-      } catch {
-        toast.error(
-          translate(
-            'auto.hooks.useGlobalFileDrop.ownerChanged',
-            "Couldn't verify which host owns this workspace. Try again after it reconnects."
-          )
-        )
-        return
-      }
-      const dropSettings = fileContext.settings
-      const runtimeEnvironmentId = dropSettings?.activeRuntimeEnvironmentId ?? null
-      if (shouldUploadRemoteEditorFileDrop(dropSettings, connectionId)) {
-        if (!worktreePath) {
-          toast.error(
-            translate(
-              'auto.hooks.useGlobalFileDrop.245faa95b9',
-              'No remote workspace path is available for dropped files.'
-            )
-          )
-          return
-        }
-        void (async () => {
-          try {
-            // Why: OS file drops provide client-local paths. Remote runtime and
-            // SSH editors must upload into the server worktree before opening.
-            const destinationDir = joinPath(worktreePath, '.orca/drops')
-            const { results } = await importExternalPathsToRuntime(
-              fileContext,
-              data.paths,
-              destinationDir,
-              { ensureDestinationDir: true }
-            )
-            const imported = results.filter((result) => result.status === 'imported')
-            for (const result of imported) {
-              if (result.kind === 'directory') {
-                continue
-              }
-              const maybeRelative = toWorktreeRelativePath(result.destPath, worktreePath)
-              store.setActiveTabType('editor', activeWorktreeId)
-              store.openFile(
-                {
-                  filePath: result.destPath,
-                  relativePath: maybeRelative ?? result.destPath,
-                  worktreeId: activeWorktreeId,
-                  runtimeEnvironmentId: runtimeEnvironmentId ?? undefined,
-                  language: detectLanguage(result.destPath),
-                  mode: 'edit'
-                },
-                { suppressActiveRuntimeFallback: runtimeEnvironmentId === null }
-              )
-            }
-            if (results.some((result) => result.status !== 'imported')) {
-              toast.error(
-                translate(
-                  'auto.hooks.useGlobalFileDrop.d720e2f855',
-                  'Some dropped files could not be uploaded.'
-                )
-              )
-            }
-          } catch {
-            toast.error(
-              translate(
-                'auto.hooks.useGlobalFileDrop.38c9f034ff',
-                'Failed to upload dropped files.'
-              )
-            )
-          }
-        })()
-        return
-      }
-
-      // Why: the relay payload now sends all paths in one gesture-scoped event.
-      // Loop over every dropped file so multi-file editor drops still open
-      // each file, matching the prior per-path behavior.
-      for (const filePath of data.paths) {
-        void (async () => {
-          try {
-            const stat = await statUserOpenedPath(fileContext, filePath)
-            if (stat.isDirectory) {
-              return
-            }
-
-            let relativePath = filePath
-            // Why: a project link out of the project keeps its absolute path, so it reads as
-            // user-named instead of being refused as a project file.
-            if (
-              worktreePath &&
-              !stat.escapesWorktree &&
-              isPathInsideWorktree(filePath, worktreePath)
-            ) {
-              const maybeRelative = toWorktreeRelativePath(filePath, worktreePath)
-              if (maybeRelative !== null && maybeRelative.length > 0) {
-                relativePath = maybeRelative
-              }
-            }
-
-            // Why: the preload bridge already proved this OS drop landed on the
-            // tab-strip editor target. Keeping the editor-open path centralized
-            // here avoids the regression where CLI drops were all coerced into
-            // editor tabs once the renderer lost the original drop surface.
-            store.setActiveTabType('editor', activeWorktreeId)
-            store.openFile({
-              filePath,
-              relativePath,
-              worktreeId: activeWorktreeId,
-              language: detectLanguage(filePath),
-              mode: 'edit'
-            })
-          } catch {
-            // Ignore files that cannot be stat'd.
-          }
-        })()
-      }
-    })
-  }, [])
-}
-
-function showNativeFileDropRejection(data: NativeFileDropRejectedPayload): void {
-  const message = getNativeFileDropRejectionMessage(data)
-  toast.error(message.title, { description: message.description })
-}
-
-export function getNativeFileDropRejectionMessage(data: NativeFileDropRejectedPayload): {
-  description: string
-  title: string
-} {
-  if (data.reason === 'temp-copy-failed') {
-    return {
-      description: describeDropTempCopyFailure(data.commonReason),
-      title: translate(
-        'auto.hooks.useGlobalFileDrop.nativeDropTempCopyFailed',
-        "Orca couldn't copy {{count}} dropped files.",
-        { count: data.pathCount }
-      )
-    }
-  }
-
-  if (data.reason === 'unresolved-paths') {
-    return {
-      description: translate(
-        'auto.hooks.useGlobalFileDrop.nativeDropUnresolvedPathsDescription',
-        'Save them to disk first, then drop the saved files.'
-      ),
-      title: translate(
-        'auto.hooks.useGlobalFileDrop.nativeDropUnresolvedPaths',
-        "Orca couldn't read a path for the dropped files."
-      )
-    }
-  }
-
-  if (data.reason === 'too-many-paths') {
-    return {
-      description: translate(
-        'auto.hooks.useGlobalFileDrop.nativeDropTooManyPathsDescription',
-        'Drop {{value0}} or fewer files at a time.',
-        { value0: NATIVE_FILE_DROP_MAX_PATHS }
-      ),
-      title: translate(
-        'auto.hooks.useGlobalFileDrop.nativeDropTooManyPaths',
-        'Drop contains too many files.'
-      )
-    }
-  }
-
-  return {
-    description: translate(
-      'auto.hooks.useGlobalFileDrop.nativeDropPathsTooLargeDescription',
-      'Drop fewer files or use a shorter path list.'
-    ),
-    title: translate(
-      'auto.hooks.useGlobalFileDrop.nativeDropPathsTooLarge',
-      'Drop path list is too large.'
-    )
-  }
-}
diff --git a/src/renderer/src/hooks/useUnreadDockBadge.test.ts b/src/renderer/src/hooks/useUnreadDockBadge.test.ts
index 5dd6cb5aa8a3..6a6cb15cabb2 100644
--- a/src/renderer/src/hooks/useUnreadDockBadge.test.ts
+++ b/src/renderer/src/hooks/useUnreadDockBadge.test.ts
@@ -3,8 +3,8 @@
 import { act, cleanup, renderHook } from '@testing-library/react'
 import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest'
 import type * as UnreadBadgeCountModule from '@/lib/unread-badge-count'
-import { makeFolderWorkspace } from '@/store/slices/worktrees-slice-test-fixtures'
-import { makeTab, makeWorktree } from '@/store/slices/store-test-helpers'
+import { makeFolderWorkspace, makeWorktree } from '@/store/slices/worktrees-slice-test-fixtures'
+import { makeTab } from '../store/slices/store-session-test-harness'
 import { FLOATING_TERMINAL_WORKTREE_ID, getDefaultSettings } from '../../../shared/constants'
 
 const { getUnreadBadgeCount } = vi.hoisted(() => ({ getUnreadBadgeCount: vi.fn() }))
diff --git a/src/renderer/src/i18n/en-runtime-required.json b/src/renderer/src/i18n/en-runtime-required.json
index d96043c107ea..6f9a8682a11b 100644
--- a/src/renderer/src/i18n/en-runtime-required.json
+++ b/src/renderer/src/i18n/en-runtime-required.json
@@ -2114,6 +2114,22 @@
           "34f733dda2": "Go to Worktree",
           "3e5f66564e": "Workspace unavailable"
         },
+        "WorktreeIssueLinkField": {
+          "0a7a2c6efd": "Not a GitHub issue number or issue URL.",
+          "161b2d053a": "Open linked issue",
+          "25852bfc59": "Linear",
+          "269198eeda": "Couldn't open that issue. Check the number and your GitHub connection.",
+          "2c245ac134": "Saving unlinks {{link}} — a workspace tracks one issue.",
+          "5b440069e6": "GitHub",
+          "662ae142f8": "Issue #, or a GitHub or Linear URL",
+          "72486800ff": "Saving unlinks {{first}} and {{second}} — a workspace tracks one issue.",
+          "929c98d05a": "Issue provider",
+          "964d9bc00a": "Not a Linear issue key or linear.app issue URL.",
+          "ad78f9bee2": "Issue",
+          "d4785f9954": "Issue links are set when a folder workspace is created and can't be changed here yet.",
+          "d8c8a30d1f": "Couldn't open that issue. Check the identifier and your Linear connection.",
+          "f047887705": "Paste a GitHub or Linear URL, or enter a number. Leave blank to remove the link."
+        },
         "WorktreeList": {
           "2ca6e29a3c": "repo",
           "45fbfe0335": "rename",
@@ -2124,10 +2140,23 @@
         },
         "WorktreeMetaDialog": {
           "029ea5ec57": "Open GitHub issue",
+          "077a4f7b5c": "PR # or GitHub URL",
+          "1b91db7e14": "GH PR",
+          "382fd11a3e": "Edit Worktree Details",
+          "459ad7f650": "Only changes the name shown in the sidebar — the folder on disk stays the same. Leave blank to use the branch or folder name.",
+          "5ae06f40fd": "Paste a pull request URL, or enter a number. Leave blank to remove the link.",
           "645fa4a0fd": "GH Issue",
           "65770ad0f0": "Edit GitHub links and notes for this workspace.",
           "741279e7b7": "Issue # or GitHub URL",
-          "7c454be4c5": "Paste an issue URL, or enter a number. Leave blank to remove the link."
+          "7c454be4c5": "Paste an issue URL, or enter a number. Leave blank to remove the link.",
+          "7f0be5e9a6": "Supports **markdown** — bold, lists, `code`, links. Press Enter or",
+          "9c1d1e9b71": "Comment",
+          "a0d191b7a7": "Edit issue links, pull request links, and notes for this workspace.",
+          "b48c271d39": "to save, Shift+Enter for a new line.",
+          "gitlabDescription": "Edit issue links, merge request links, and notes for this workspace.",
+          "gitlabHelp": "Paste a merge request URL, or enter a number. Leave blank to remove the link.",
+          "gitlabMR": "GitLab MR",
+          "gitlabPlaceholder": "MR ! or GitLab URL"
         },
         "WorktreeOpenInMenu": {
           "3ec372b664": "file-manager"
@@ -2180,6 +2209,10 @@
               }
             }
           }
+        },
+        "worktreeIssueDisplacement": {
+          "3f61c0a8d2": "Linear {{value}}",
+          "9c4b7e1f60": "GitHub #{{value}}"
         }
       },
       "skills": {
@@ -2857,10 +2890,12 @@
           "faa8fb83dd": "Save or close unsaved editor tabs before switching servers."
         },
         "worktrees": {
+          "19db0085fb": "Local branch deleted",
           "2b0afc7f14": "Could not keep local {{value0}} up to date",
           "34a03a6565": "Keep {{value0}} up to date",
           "4a18052018": "Local {{value0}} is behind {{value1}}",
           "4e6496f3d2": "{{value0}} deleted, branch kept",
+          "5a58e03a26": "Deleted \"{{value0}}\".",
           "670864ab52": "Keeping local {{value0}} up to date",
           "889487d8bb": "Dismiss",
           "d1d78a7baa": "Git could not safely delete branch \"{{value0}}\"{{value1}}, so Orca kept it to avoid losing local commits.",
@@ -2889,12 +2924,58 @@
         "awaitingUnnamed": "Awaiting user input",
         "questionCount": "{{value0}} questions"
       },
+      "backgroundTasks": {
+        "agent": "Background agent",
+        "command": "Background command",
+        "countAgentsMany": "{{value0}} agents",
+        "countAgentsOne": "1 agent",
+        "countMonitorsMany": "{{value0}} monitors",
+        "countMonitorsOne": "1 monitor",
+        "countShellCommandOne": "1 shell command",
+        "countShellMany": "{{value0}} shells",
+        "countShellOne": "1 shell",
+        "countTasksMany": "{{value0}} tasks",
+        "countTasksOne": "1 task",
+        "countWorkflowsMany": "{{value0}} workflows",
+        "countWorkflowsOne": "1 workflow",
+        "detailsUnavailable": "Task details are unavailable for this session.",
+        "groupAgents": "Agents",
+        "groupMonitors": "Monitors",
+        "groupShell": "Shell",
+        "groupTasks": "Tasks",
+        "groupWorkflows": "Workflows",
+        "headerTotal": "{{value0}} background tasks",
+        "monitor": "Background monitor",
+        "monitoring": "Monitoring background tasks",
+        "reasonBlocked": "failed",
+        "reasonWaiting": "needs approval",
+        "stateBlocked": "blocked",
+        "stateBlockedCount": "{{value0}} blocked",
+        "stateDone": "done",
+        "stateDoneCount": "{{value0}} done",
+        "stateIdle": "stopped",
+        "stateIdleCount": "{{value0}} stopped",
+        "stateMonitoring": "monitoring",
+        "stateMonitoringCount": "{{value0}} monitoring",
+        "stateUnverifiable": "status unavailable",
+        "stateUnverifiableCount": "{{value0}} with status unavailable",
+        "stateWaiting": "waiting",
+        "stateWaitingCount": "{{value0}} waiting",
+        "stateWorking": "working",
+        "stateWorkingCount": "{{value0}} working",
+        "stop": "Stop",
+        "stopAll": "Stop background tasks",
+        "stopTask": "Stop {{value0}}",
+        "task": "Background task",
+        "workflow": "Background workflow"
+      },
       "composer": {
         "effort": "Effort",
         "imageUnsupported": "Image paste is not supported for this agent."
       },
       "failureWords": {
         "accountSwitchInProgress": "A Claude account switch is in progress. Try again after it finishes.",
+        "agentCommandNotRunnable": "{{agent}}'s Command in Settings → Agents must be a program path or name Orca can find, with no arguments or variables. Change it or reset it.",
         "answerUnconfirmed": "Your answer was recorded but the agent did not confirm it.",
         "argumentsMissingValue": "Saved Arguments need a value for {{option}}.",
         "argumentsMultipleValues": "Saved Arguments give {{option}} more than one value.",
@@ -2918,6 +2999,8 @@
         "chooseClaudeAccount": "Choose or add one in Claude Accounts settings.",
         "chooseClaudeAccountThenRunCommand": "Choose or add one in Claude Accounts settings, then run /{{command}} again.",
         "chooseClaudeAccountThenSend": "Choose or add one in Claude Accounts settings, then send your message again.",
+        "claudeAccountFolderMissing": "The selected Claude account's folder is missing. Sign in to it again or choose another account.",
+        "claudeAccountSetupFailed": "The selected Claude account could not be set up. Try again or choose another account.",
         "commandRefused": "This command didn't run.",
         "commandRefusedTryAgain": "This command didn't run. Try it again.",
         "compactionFailed": "Compaction failed.",
@@ -2927,6 +3010,7 @@
         "couldNotStart": "{{agent}} couldn't start.",
         "editSavedArguments": "Edit them in Settings > Agents > Arguments.",
         "emptyMessage": "This message is empty, so it was not sent.",
+        "historyInOtherAccount": "This chat's history is in another Claude account. Switch back to that account to continue it.",
         "historyTooLarge": "This conversation's history is too large to restore here.",
         "hostFault": "Orca ran into a problem, so this didn't go through.",
         "hostFaultTryAgain": "Orca ran into a problem, so this didn't go through. Try again.",
@@ -2935,14 +3019,11 @@
         "launchFolderMissing": "The folder this chat ran in no longer exists. Restore it to continue this chat.",
         "managedAccountEnvOverride": "This Claude launch sets its own Anthropic sign-in variables. Remove them to use a managed Claude account.",
         "managedAccountUnsupported": "While a Claude account is added in WSL, Claude chats need a Windows Claude account.",
-        "historyInOtherAccount": "This chat's history is in another Claude account. Switch back to that account to continue it.",
-        "agentCommandNotRunnable": "{{agent}}'s Command in Settings → Agents must be a program path or name Orca can find, with no arguments or variables. Change it or reset it.",
         "noTurnToStop": "{{agent}} had no turn running to stop.",
         "notDelivered": "This message was not delivered.",
         "notDeliveredSendAgain": "This message was not delivered. Send it again to continue.",
         "notSignedIn": "{{agent}} is not signed in for the selected account.",
         "previousExitUnverifiable": "Couldn't stop {{agent}} from before.",
-        "sessionNotRestored": "{{agent}} couldn't reopen its earlier session, so this chat continues in a new one. {{agent}} doesn't remember the earlier messages.",
         "providerExitedRejection": "{{agent}} stopped before this message was sent.",
         "providerExitedRow": "{{agent}} stopped while this response was in progress. You can continue in this conversation.",
         "providerRateLimited": "{{agent}} is rate-limited and retrying.",
@@ -2958,6 +3039,7 @@
         "runCommandAgain": "Run /{{command}} again.",
         "sendAgainToTryOnceMore": "Send your message again to try once more.",
         "sendToTryAgain": "Send your message to try again.",
+        "sessionNotRestored": "{{agent}} couldn't reopen its earlier session, so this chat continues in a new one. {{agent}} doesn't remember the earlier messages.",
         "signInFirst": "Sign in first.",
         "signInThenRunCommand": "Sign in, then run /{{command}} again.",
         "signInThenSend": "Sign in, then send your message again.",
@@ -3005,6 +3087,26 @@
         "workedFor": "Worked for {{value0}}",
         "workingFor": "Working for {{value0}}"
       },
+      "subagents": {
+        "ranN": "Ran {{value0}} subagents",
+        "ranOne": "Ran 1 subagent",
+        "startedN": "Kicked off {{value0}} subagents",
+        "startedOne": "Kicked off 1 subagent",
+        "state": {
+          "completed": "completed",
+          "failed": "failed",
+          "failedCount": "{{value0}} failed",
+          "idle": "idle",
+          "idleCount": "{{value0}} idle",
+          "stopped": "stopped",
+          "stoppedCount": "{{value0}} stopped",
+          "unverifiable": "status unavailable",
+          "unverifiableCount": "{{value0}} with status unavailable",
+          "working": "working",
+          "workingCount": "{{value0}} working"
+        },
+        "tokens": "{{value0}} tokens"
+      },
       "tool": {
         "countN": "{{value0}} tool calls",
         "countOne": "1 tool call",
@@ -3029,6 +3131,7 @@
         "agentRefused": "The agent turned this down.",
         "agentStarting": "The agent is still starting.",
         "answerFirst": "Answer the question or approval first.",
+        "attachmentExpired": "This attachment expired.",
         "backgroundTasksRunning": "Background tasks are still running.",
         "cannotRunHere": "Orca can't run this agent in a chat here.",
         "capacity": "Orca has received too many requests in the last day.",
@@ -3061,6 +3164,7 @@
         "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.",
+        "reattachFile": "Remove it and attach it again.",
         "recordFailed": "Orca couldn't save this to the chat's history.",
         "recordUnreadable": "Orca couldn't read this chat's saved state.",
         "reopenChat": "Reopen the chat to check again.",
diff --git a/src/renderer/src/i18n/locales/en.json b/src/renderer/src/i18n/locales/en.json
index 794e68b70db9..6eb0709fb9de 100644
--- a/src/renderer/src/i18n/locales/en.json
+++ b/src/renderer/src/i18n/locales/en.json
@@ -177,7 +177,7 @@
   },
   "settings": {
     "chat": {
-      "description": "Choose how chats look and get their names.",
+      "description": "Choose how chats look and behave.",
       "names": {
         "title": "Chat names",
         "description": "Use an agent to name new chats from their first message. Without a generated name, chats stay Claude Chat or Codex Chat.",
@@ -319,7 +319,10 @@
       "fileExplorer": "file explorer"
     },
     "followSymlinkedDirectories": "Follow symlinked directories",
-    "followSymlinkedDirectoriesDescription": "Search linked folders in Quick Open and expand local linked folders in File Explorer."
+    "followSymlinkedDirectoriesDescription": "Search linked folders in Quick Open and expand local linked folders in File Explorer.",
+    "accounts": {
+      "claudeRemoveFolder": "Orca deletes this account's Claude folder and its sign-in from this computer. Chat history shared with System default stays. If it is selected, the next Claude you start uses System default."
+    }
   },
   "menu": {
     "checkForUpdates": "Check for Updates...",
@@ -2135,7 +2138,17 @@
         "activitySubagentOne": "Subagent running: {{value0}}",
         "activitySubagentMany": "{{value0}} subagents running",
         "activityMonitorOne": "Monitoring: {{value0}}",
-        "activityMonitorMany": "Monitoring {{value0}} background tasks"
+        "activityMonitorMany": "Monitoring {{value0}} background tasks",
+        "selectWorkspace": "Select all chats in {{value0}}",
+        "workspaceSelectedCount": "{{value0}} of {{value1}}",
+        "selectAll": "Select all chats",
+        "selectAllLabel": "Select all",
+        "selectedCount": "{{value0}} of {{value1}} selected",
+        "selectProject": "Select all chats in {{value0}}",
+        "collapseNode": "Collapse {{value0}}",
+        "expandNode": "Expand {{value0}}",
+        "selectMachine": "Select all chats on {{value0}}",
+        "sshHost": "SSH"
       },
       "StarNagCard": {
         "92b0f9d921": "is authenticated and try again.",
@@ -3937,7 +3950,6 @@
             "54e8d6bb2d": "Fable",
             "d79c3362c4": "5h",
             "a79c64f87e": "Fable",
-            "8295903d17": "Restart live Claude terminals before continuing old conversations after switching.",
             "c98ea88392": "No other accounts",
             "9332ba8684": "Switch to",
             "d450654fa2": "Claude Account",
@@ -4200,6 +4212,16 @@
                 "message": "Run cursor-agent login in a terminal on the computer running Orca, then retry usage."
               },
               "plan": "Plan"
+            },
+            "claude": {
+              "waiting": {
+                "label": "Updates when Claude runs",
+                "message": "Claude usage updates the next time Claude runs."
+              },
+              "expired": {
+                "label": "Sign-in expired",
+                "message": "Claude usage has expired. Start Claude in this account to refresh it."
+              }
             }
           },
           "SshTargetStatusRow": {
@@ -6732,7 +6754,6 @@
         "AccountsPane": {
           "c2d2751587": "Remove Account",
           "dbb9626ed1": "Cancel",
-          "854ebbcc45": "Orca will delete the managed Claude auth for this saved account. If it is currently active, Orca falls back to the system default Claude login.",
           "63843e37e2": "Remove Claude Account?",
           "380a7736cc": "Removing this account permanently deletes its managed Codex home, including all Codex session history and MCP logins stored inside. This cannot be undone. If the account is currently active, Orca falls back to the system default Codex login.",
           "0d47394635": "Remove Codex Account?",
@@ -6784,12 +6805,10 @@
           "3fe7862418": "No managed Claude accounts for {{value0}}. Orca will use that environment's system default Claude login until you add one here.",
           "3455cf43fa": "Claude login.",
           "fcc4093fc1": "Use your current {{value0}} Codex login.",
-          "79e484c3b2": "Optional account switcher for the shared Claude auth files.",
           "8bbfd74556": "Claude Accounts",
           "72b36ea174": "Optional. Orca can use your normal Claude login; add accounts only if you want quick switching without moving chat sessions.",
           "26ef4b55be": "Claude",
           "2743cdc0af": "Claude account update failed.",
-          "b15ce90870": "{{value0}} -> {{value1}}. Restart live Claude terminals before continuing old sessions.",
           "f921d32606": "Claude account updated.",
           "5bf8764953": "Codex account update failed.",
           "9baf45d071": "This device",
@@ -15171,11 +15190,11 @@
                 "d90d2e1f6d": "Track session and weekly usage.",
                 "8919321417": "Codex sign-in failed.",
                 "c7b90c140b": "Codex account added.",
-                "4e71d72912": "Claude sign-in failed.",
                 "9ddeb558f9": "Claude account added.",
                 "29d0653961": "Sign in",
                 "945865332e": "Signing in",
-                "accountStatusUnknown": "Account status unknown"
+                "accountStatusUnknown": "Account status unknown",
+                "4e71d72912": "Claude sign-in failed."
               },
               "UsagePage": {
                 "64265cb295": "29% used 5h",
@@ -17852,11 +17871,6 @@
       },
       "native": {
         "chat": {
-          "NativeChatStructuredSession": {
-            "1f772bb5d0": "Message delivery is unconfirmed.",
-            "93ef441197": "Message was not sent.",
-            "a5e7f14068": "Retry"
-          },
           "NativeChatLaunchRetry": {
             "failed": "Chat could not be started.",
             "unknown": "Chat connection could not be confirmed.",
@@ -18076,6 +18090,8 @@
         "managedAccountUnsupported": "While a Claude account is added in WSL, Claude chats need a Windows Claude account.",
         "launchFolderMissing": "The folder this chat ran in no longer exists. Restore it to continue this chat.",
         "historyInOtherAccount": "This chat's history is in another Claude account. Switch back to that account to continue it.",
+        "claudeAccountFolderMissing": "The selected Claude account's folder is missing. Sign in to it again or choose another account.",
+        "claudeAccountSetupFailed": "The selected Claude account could not be set up. Try again or choose another account.",
         "agentCommandNotRunnable": "{{agent}}'s Command in Settings → Agents must be a program path or name Orca can find, with no arguments or variables. Change it or reset it.",
         "chooseClaudeAccount": "Choose or add one in Claude Accounts settings.",
         "chooseClaudeAccountThenRunCommand": "Choose or add one in Claude Accounts settings, then run /{{command}} again.",
@@ -18160,6 +18176,8 @@
         "cannotRunHere": "Orca can't run this agent in a chat here.",
         "unreachable": "Orca couldn't reach the agent.",
         "recordFailed": "Orca couldn't save this to the chat's history.",
+        "attachmentExpired": "This attachment expired.",
+        "reattachFile": "Remove it and attach it again.",
         "conversationCleared": "This conversation has been cleared.",
         "openCurrentConversation": "Open the current conversation to continue.",
         "clearUnfinished": "The last /clear didn't finish.",
@@ -18213,6 +18231,7 @@
       },
       "receipt": {
         "unavailable": "Selected answer unavailable",
+        "emptyAnswer": "Empty answer",
         "cancelled": "Cancelled",
         "resolved": "Resolved",
         "resolver": "Answered on {{device}}",
@@ -18224,9 +18243,13 @@
         "plan": "Plan",
         "historyRepaired": "Part of this chat's history couldn't be loaded.",
         "historyItemTooLarge": "This part of the chat was too large to show.",
-        "stoppedBeforeStart": "Stopped before the agent started",
+        "stoppedBeforeStart": "Stopped manually",
         "dismiss": "Dismiss",
-        "copyError": "Copy error"
+        "copyError": "Copy error",
+        "orcaStopUpdate": "Orca on {{machine}} restarted for an update while this response was in progress.",
+        "orcaStopQuit": "Orca on {{machine}} was closed while this response was in progress.",
+        "orcaStopCrash": "Orca on {{machine}} stopped unexpectedly while this response was in progress.",
+        "orcaStopCanContinue": "You can continue in this conversation."
       },
       "composer": {
         "imageUnsupported": "Image paste is not supported for this agent.",
@@ -18257,6 +18280,9 @@
         "skillScopeBuiltIn": "Built-in",
         "skillScopePlugin": "Plugin",
         "localAttachmentUnsupported": "Local attachments are not available for remote sessions.",
+        "attachFailed": "Couldn't attach {{files}}.",
+        "attachFailedBecause": "Couldn't attach {{files}}. {{reason}}",
+        "uploadingFile": "Uploading {{name}}…",
         "removeAttachment": "Remove attachment",
         "pastedImageLabel": "Pasted image",
         "draftNotSaved": "This draft couldn't be saved yet. Orca keeps trying.",
@@ -18631,9 +18657,18 @@
         "orcaSessionIdTooltip": "Orca's ID for this chat, separate from the agent CLI's own session ID. Agents use it to refer to each other through Orca."
       },
       "dismissDeliveryNotice": "Dismiss",
+      "addSelectionToChat": "Add to chat",
       "messageNotSent": "Message not sent",
       "deliveryUnconfirmed": "Delivery unconfirmed — check chat before retrying",
       "messageSending": "Sending…",
+      "userMessage": {
+        "showFull": "Show full message",
+        "showLess": "Show less"
+      },
+      "visualUnavailable": "Visualization unavailable",
+      "visualLoading": "Loading visualization",
+      "visualOpenInSidebar": "Open in sidebar",
+      "visualClose": "Close visualization",
       "queuedMessages": {
         "behindReturnedHold": "Waiting — a message ahead needs attention",
         "awaitingAnswerHold": "Waiting for your answer",
@@ -18650,10 +18685,8 @@
         "editAlreadySent": "Already sent — your text is still in the composer.",
         "withdrawnHold": "Stopped before it was sent",
         "pausedSendFailed": "Couldn't send — press Send to retry.",
-        "pausedKept": "Not sent yet — press Send to send it.",
         "paused": "Paused",
         "queuePausedStopped": "Queue paused because you interrupted",
-        "queuePausedCleared": "Queue paused after you cleared the conversation",
         "queuePaused": "Queue paused",
         "resume": "Resume",
         "sendConfirmTitle": "Send message?",
@@ -18674,6 +18707,14 @@
         "offline": "{{hostName}} is offline",
         "reconnecting": "{{hostName}} is reconnecting…",
         "reconnect": "Reconnect"
+      },
+      "interruptedContinue": {
+        "continue": "Continue",
+        "failed": "Couldn't continue this chat. Try again, or send a message.",
+        "explanation": "Continue, and the agent first checks whether its last step finished."
+      },
+      "claudeSignIn": {
+        "signingIn": "Signing in…"
       }
     },
     "tab": {
@@ -19015,12 +19056,22 @@
       },
       "nativeChat": {
         "queueFollowUpsTitle": "Queue follow-ups",
+        "inlineVisualsTitle": "Inline visuals",
+        "inlineVisualsCopy": "Let the agent show charts, diagrams and mockups inside its replies. Applies to newly started chats.",
+        "inlineVisualsToggleLabel": "Toggle inline visuals",
         "queueFollowUpsCopy": "Messages you send while the agent is working wait as cards you can steer, edit, or delete. Messages with images send right away.",
         "queueFollowUpsToggleLabel": "Toggle queue follow-ups"
       }
     },
     "agentChildRow": {
       "ended": "Ended"
+    },
+    "markdown-callout": {
+      "note": "Note",
+      "tip": "Tip",
+      "important": "Important",
+      "warning": "Warning",
+      "caution": "Caution"
     }
   },
   "dashboardPopout": {
@@ -19366,9 +19417,6 @@
       "oldTerminalDialogRisk": "Codex sessions that share a server can end together, and agent status can be wrong.",
       "oldTerminalDialogCause": "Older terminals still share a Codex server. Open a new terminal to run Codex on a separate server.",
       "fix": "Fix",
-      "openNewTerminal": "Open new terminal",
-      "dontShowAgain": "Don't show again",
-      "dismiss": "Dismiss",
       "dialogTitle": "Give each Codex tab its own server",
       "dialogDescription": "Codex sessions started directly in a terminal share one background server. Orca keeps the Codex sessions it starts separate. When sessions share a server, closing one can end the others, and agent status can be wrong.",
       "copy": "Copy",
@@ -19379,7 +19427,6 @@
       "step2Title": "Stop the running shared server",
       "undo": "To undo, run codex features enable daemon_auto_start.",
       "step2Warning": "Closes any open Codex sessions that share the server",
-      "learnMore": "Learn more",
       "turnOff": "Turn off",
       "turningOff": "Turning off…",
       "turnedOff": "Turned off",
@@ -19395,6 +19442,18 @@
     },
     "paneMove": {
       "failed": "Couldn't move the pane to a new tab."
+    },
+    "claudeOldTerminalBanner": {
+      "title": "This terminal was opened before Orca's Claude account update, so claude here uses System default's login.",
+      "dialogTitle": "Why claude here doesn't use the selected account",
+      "dialogDescription": "Orca now keeps each Claude account in its own folder, and claude in a new terminal follows the account you select.",
+      "dialogCause": "Terminals opened before this update don't, so claude here signs in with System default's login. Open a new terminal to use the selected account."
+    },
+    "paneTopBanner": {
+      "openNewTerminal": "Open new terminal",
+      "learnMore": "Learn more",
+      "dontShowAgain": "Don't show again",
+      "dismiss": "Dismiss"
     }
   },
   "fileExplorer": {
@@ -19485,6 +19544,24 @@
         "accounts": "accounts"
       }
     },
+    "claude": {
+      "added": "Account added. Select it to use it for the next Claude you start.",
+      "nextLaunch": "{{value0}} → {{value1}}. The next Claude you start uses it. Running sessions keep their account.",
+      "profileSwitching": "Switching applies to the next Claude you start in any tab. Running sessions keep their account.",
+      "systemDefaultNamed": "System default: {{value0}}",
+      "systemDefaultIsSaved": "System default is signed in as {{value0}}, which is also a saved account. An earlier Orca version may have copied that login there. If it is not your own login, select System default and run claude /login.",
+      "systemDefaultIsSavedDismiss": "Dismiss",
+      "signInRequired": "Sign in again to use this account",
+      "signInAgain": "Sign in again",
+      "usageSignInLabel": "Sign in again",
+      "usageSignInMessage": "The selected Claude account needs you to sign in again. Open Settings > AI Provider Accounts, or choose System default.",
+      "signIn": "Sign in",
+      "signInNotice": {
+        "title": "Finish setting up your Claude accounts",
+        "description": "Sign in to each saved account once and you're ready to switch anytime.",
+        "action": "Sign in to {{value0}}"
+      }
+    },
     "managedData": {
       "description": "Add accounts by running this command in a terminal on the Orca host. Selection applies to new explicit agent launches on that host; direct SSH relay and Windows-hosted WSL launches use their own credentials.",
       "copied": "Copied",
@@ -19503,6 +19580,12 @@
   "fileSearch": {
     "failed": "Search failed. Try again."
   },
+  "workspaceDeletion": {
+    "preferenceSaveFailed": "Could not save deletion preference",
+    "alwaysForceDelete": "Always force delete",
+    "moreActions": "More force delete options",
+    "alwaysForceDeleteTooltip": "Applies to all future workspace deletions."
+  },
   "worktree": {
     "nestedRemoval": {
       "refreshFailed": "Could not refresh the workspace list",
@@ -19544,5 +19627,80 @@
     "unavailable": "Unable to play this media file. The file may be unavailable or use an unsupported codec.",
     "openFailed": "Could not open this file in the default app.",
     "openDefault": "Open in Default App"
+  },
+  "workspace": {
+    "links": {
+      "foreignReview": "This review belongs to another repository. Add reviews from this workspace’s repository.",
+      "repositoryLoading": "Repository identity is still loading. Try again once it is available.",
+      "duplicate": "This link is already attached.",
+      "title": "Linked work",
+      "count": "{{count}} linked",
+      "empty": "Keep every review and task for this workspace together.",
+      "reviews": "Reviews",
+      "tasks": "Issues & tasks",
+      "openItem": "Open {{label}}",
+      "open": "Open link",
+      "unlinkItem": "Unlink {{label}}",
+      "unlink": "Unlink from workspace",
+      "show": "Show {{count}} linked reviews and tasks",
+      "manage": "Manage links…",
+      "details": "Workspace details",
+      "description": "Attach reviews and tasks, and keep notes for this workspace.",
+      "commentHelp": "Markdown supported. Enter or {{shortcut}} to save · Shift+Enter for a new line.",
+      "kind": {
+        "github_pr": "GitHub PR",
+        "github_issue": "GitHub issue",
+        "linear_task": "Linear task",
+        "gitlab_mr": "GitLab MR",
+        "gitlab_issue": "GitLab issue",
+        "jira_task_url": "Jira task (URL)",
+        "bitbucket_pr": "Bitbucket PR",
+        "azure_devops_pr": "Azure DevOps PR",
+        "gitea_pr": "Gitea PR"
+      },
+      "mrReference": "MR !{{number}}",
+      "prReference": "PR #{{number}}",
+      "issueReference": "Issue #{{number}}",
+      "foreignIssue": "This issue belongs to another repository. Add issues from this workspace’s repository.",
+      "linkedResult": "Linked",
+      "addReference": "Add reference",
+      "searchLabel": "Search references",
+      "searchReferences": "Search reviews and tasks, or paste a link",
+      "noReferences": "No matching references. Try a title, number, or URL.",
+      "addItem": "Add {{label}}",
+      "referenceType": "Reference type",
+      "clearSearch": "Clear search",
+      "inlineSearchHint": "Select a result to attach it.",
+      "nameHelp": "Shown in the sidebar. The folder name stays the same.",
+      "notes": "Notes",
+      "addNotes": "Add notes",
+      "notesOptional": "Optional · Markdown",
+      "saveHint": "Changes apply when you save",
+      "terminal": "Terminal",
+      "seenIn": "Seen in {{label}}",
+      "unavailableTab": "Tab unavailable",
+      "sessions": "Sessions & terminals",
+      "jiraModeRequired": "Select Smart or Jira to load this issue.",
+      "linearModeRequired": "Select Smart or Linear to load this issue.",
+      "loadingLinear": "Loading Linear issue…",
+      "linearConnectRequired": "Connect Linear in Settings to link this issue.",
+      "linearReadFailed": "Couldn’t load this Linear issue. Check the URL and connected workspace.",
+      "retrySource": "Retry",
+      "lastKnownStatus": "Last known status",
+      "reviewTarget": "Target: {{branch}}",
+      "reviewUrlRequired": "Paste the review URL to verify its repository and provider.",
+      "stackSummary": "{{count}} linked: {{references}}",
+      "sessionsForItem": "Sessions & terminals for {{label}} · {{count}}",
+      "checksFailed": "Failed",
+      "checksPending": "Pending",
+      "checksPassing": "Passing",
+      "checksUnknown": "Unknown",
+      "checksNeutral": "Neutral",
+      "allReviewChecks": "Reviews: {{count}} · Checks: {{status}}"
+    },
+    "attachments": {
+      "updateRuntime": "Update the remote runtime to change workspace links",
+      "updateRuntimeSafely": "Update the remote runtime to safely change workspace links"
+    }
   }
 }
diff --git a/src/renderer/src/i18n/locales/es.json b/src/renderer/src/i18n/locales/es.json
index 58d1093c381d..0d9dbc894d27 100644
--- a/src/renderer/src/i18n/locales/es.json
+++ b/src/renderer/src/i18n/locales/es.json
@@ -146,7 +146,15 @@
         "title": "Avisar cuando una pestaña de Codex comparte un servidor",
         "description": "Muestra un aviso en un Codex que usted mismo inició cuando comparte un servidor con otras pestañas, porque su estado de agente puede ser incorrecto."
       }
-    }
+    },
+    "followSymlinkedDirectoriesKeywords": {
+      "symlink": "enlace simbólico",
+      "linkedFolder": "carpeta enlazada",
+      "quickOpen": "apertura rápida",
+      "fileExplorer": "explorador de archivos"
+    },
+    "followSymlinkedDirectories": "Seguir directorios con enlaces simbólicos",
+    "followSymlinkedDirectoriesDescription": "Busca carpetas enlazadas en Apertura rápida y expande las carpetas enlazadas locales en el Explorador de archivos."
   },
   "menu": {
     "checkForUpdates": "Buscar actualizaciones...",
@@ -1168,6 +1176,11 @@
             }
           }
         }
+      },
+      "ipcEvents": {
+        "sshManagedServer": {
+          "refusedBlocked": "Este host SSH no pudo moverse a un servidor Orca gestionado. Hosts SSH en Ajustes muestra por qué."
+        }
       }
     },
     "components": {
@@ -3154,7 +3167,9 @@
             "42b283ecfc": "Orca no pudo volver a conectar de manera segura esta terminal porque el host no pudo verificar su sesión guardada. Orca dejó la sesión guardada sin cambios. Haga clic en Reintentar para intentar volver a conectarse ahora. Si aún no puede volver a conectarse, abra una nueva terminal.",
             "e16012e31e": "El demonio de terminal propietario de esta sesión salió, por lo que no se pudo recuperar la sesión y su desplazamiento hacia atrás. Abra una nueva terminal para continuar.",
             "sessionUnavailable": "Orca no pudo volver a conectarse a la sesión de terminal de este panel en el host. Abra una nueva terminal para continuar.",
-            "sourceRestoring": "Reconectando este terminal: se está restableciendo su salida. La sesión aún está en marcha."
+            "sourceRestoring": "Reconectando este terminal: se está restableciendo su salida. La sesión aún está en marcha.",
+            "heldByPreviousRelay": "Este terminal sigue ejecutándose en el host con la versión anterior de Orca, a la que esta versión no puede conectarse. Sigue ejecutándose hasta que salga. Abre un terminal nuevo para seguir trabajando aquí.",
+            "ownerHostMismatch": "La sesión guardada de este terminal pertenece a otra conexión de host, así que Orca no puede reconectarlo aquí. Abre un terminal nuevo para continuar."
           },
           "TerminalProcessExitOverlay": {
             "capacityTitle": "Se alcanzó el límite de consolas de Git Bash",
@@ -3724,7 +3739,6 @@
             "54e8d6bb2d": "Fable",
             "d79c3362c4": "5h",
             "a79c64f87e": "Fable",
-            "8295903d17": "Reinicia los terminales Claude activos antes de continuar conversaciones antiguas después de cambiar.",
             "c98ea88392": "Ninguna otra cuenta",
             "9332ba8684": "Cambiar a",
             "d450654fa2": "Cuenta de Claude",
@@ -6500,7 +6514,6 @@
         "AccountsPane": {
           "c2d2751587": "Eliminar cuenta",
           "dbb9626ed1": "Cancelar",
-          "854ebbcc45": "Orca eliminará la autenticación de Claude gestionada para esta cuenta guardada. Si está activa actualmente, Orca volverá al login predeterminado de Claude del sistema.",
           "63843e37e2": "¿Eliminar la cuenta de Claude?",
           "380a7736cc": "Eliminar esta cuenta borra permanentemente su home de Codex gestionado, incluido todo el historial de sesiones de Codex y los inicios de sesión de MCP almacenados dentro. Esto no se puede deshacer. Si la cuenta está activa, Orca vuelve al login predeterminado de Codex del sistema.",
           "0d47394635": "¿Eliminar cuenta de Codex?",
@@ -6548,12 +6561,10 @@
           "3fe7862418": "No hay cuentas de Claude gestionadas para {{value0}}. Orca usará el login predeterminado de Claude del sistema de ese entorno hasta que agregues una aquí.",
           "3455cf43fa": "Login de Claude.",
           "fcc4093fc1": "Usa tu login actual de Codex de {{value0}}.",
-          "79e484c3b2": "Switcher de cuenta opcional para los archivos de autenticación compartidos de Claude.",
           "8bbfd74556": "Cuentas de Claude",
           "72b36ea174": "Opcional. Orca puede usar tu login normal de Claude; agrega cuentas solo si quieres cambiar rápido sin mover sesiones de chat.",
           "26ef4b55be": "Claude",
           "2743cdc0af": "Error al actualizar la cuenta de Claude.",
-          "b15ce90870": "{{value0}} -> {{value1}}. Reinicia los terminales Claude activos antes de continuar sesiones antiguas.",
           "f921d32606": "Cuenta Claude actualizada.",
           "5bf8764953": "Error al actualizar la cuenta del Codex.",
           "9baf45d071": "Este dispositivo",
@@ -7219,7 +7230,7 @@
             "shellEnvToggleLabel": "Alternar el uso del entorno de tu shell",
             "resumeCopy": "Cuando Orca se cierra o instala una actualización, los chats que estaban trabajando se reanudan automáticamente al volver a abrir Orca.",
             "structuredTitle": "Utilice el chat nativo estructurado actualizado",
-            "structuredCopy": "Abra nuevos agentes como chats estructurados cuando sea posible. Si está desactivado, los abre en el chat respaldado por la terminal. Los chats que ya existen permanecen como están.",
+            "structuredCopy": "Abre nuevos agentes como chats estructurados cuando sea posible. Si está desactivado, los abre en el chat respaldado por la terminal. Los chats que ya existen permanecen como están.",
             "structuredScope": "Se ejecuta en esta máquina y en servidores Orca emparejados que ejecutan una versión que lo admita; los servidores más antiguos mantienen el chat de terminal. Los hosts WSL y SSH continúan usando el chat de terminal.",
             "structuredToggleLabel": "Alternar chat nativo estructurado actualizado",
             "resumeTitle": "Reanudar los chats de trabajo automáticamente después de reiniciar",
@@ -8353,8 +8364,8 @@
           "3c88ec55d6": "No se encontraron configuraciones para \"",
           "c7ad095d96": "Cargando ajustes...",
           "acc7bbdefd": "Presiona ESC de nuevo para salir de ajustes",
-          "43b68e10f0": "Hay cambios de IA sin guardar. Se descartarán al salir.",
-          "17bdee4ff1": "¿Descartar los cambios de IA sin guardar?",
+          "43b68e10f0": "Hay ajustes de IA sin guardar. Se descartarán al salir.",
+          "17bdee4ff1": "¿Descartar los ajustes de IA sin guardar?",
           "084d8fac5b": "Privacidad y seguridad",
           "23931df7e8": "Hosts remotos",
           "mobile_group": "Móvil",
@@ -12321,6 +12332,154 @@
         },
         "UnsealedCredentialNotice": {
           "body": "{{credential}} se almacena sin cifrar: este sistema no tiene ningún conjunto de claves del sistema operativo que Orca pueda usar. Cualquiera que pueda leer su disco o una copia de seguridad del mismo puede leer la credencial. Instale y desbloquee gnome-keyring o kwallet, luego guárdelo nuevamente para sellarlo."
+        },
+        "managedServers": {
+          "row": {
+            "notRunning": "No está en ejecución",
+            "refresh": "Actualizar estado",
+            "migration": "Migración: {{phase}}",
+            "update": "Actualizar",
+            "rollback": "Revertir",
+            "recover": "Recuperar",
+            "cancelStop": "Cancelar detención",
+            "confirmStop": "Detener y eliminar el servidor",
+            "keep": "Mantener en ejecución",
+            "stop": "Detener…",
+            "deferredVersion": "Actualización a {{version}} aplazada.",
+            "confirmRestore": "Restaurar instantánea y reiniciar",
+            "keepState": "Conservar estado",
+            "statusUnknown": "Estado desconocido",
+            "checking": "Comprobando…"
+          },
+          "title": "Servidores gestionados",
+          "description": "Orca instala y ejecuta un servidor en un host SSH vacío y lo mantiene actualizado.",
+          "deploy": {
+            "host": "Host SSH",
+            "hostPlaceholder": "Elige un host SSH vacío",
+            "name": "Nombre del servidor",
+            "submit": "Desplegar servidor",
+            "running": "Desplegando…"
+          },
+          "pending": {
+            "resume": "Reanudar"
+          },
+          "access": {
+            "title": "Acceso SSH para servidores emparejados",
+            "linked": "{{name}} por SSH",
+            "unlink": "Dejar de usar SSH",
+            "target": "Conectar a través del host SSH",
+            "port": "Puerto del servidor",
+            "link": "Usar SSH",
+            "linking": "Conectando…"
+          },
+          "search": {
+            "title": "Servidores gestionados",
+            "keywordSsh": "ssh"
+          },
+          "phase": {
+            "fenced": "Host bloqueado",
+            "staged": "Copia preparada",
+            "committed": "Copia confirmada",
+            "retired": "Finalizado"
+          },
+          "recovery": {
+            "activate": "Se interrumpió una actualización",
+            "rollback": "Se interrumpió una reversión",
+            "decommission": "Se interrumpió una detención"
+          },
+          "terminals": {
+            "unknown": "Terminales en ejecución: desconocido",
+            "count": "Terminales en ejecución: {{count}}"
+          },
+          "blocker": {
+            "notFound": "El host SSH ya no existe.",
+            "owned": "Este host SSH ya pertenece a un servidor gestionado.",
+            "catalog": "Los proyectos de este host aún no se pueden mover.",
+            "terminals": "Los terminales de este host siguen en ejecución ({{count}}). Ciérralos primero.",
+            "portForwards": "Los reenvíos de puertos guardados se quedan con el host SSH.",
+            "dependents": "Estado que aún no se puede mover: {{kinds}}.",
+            "unverifiable": "Orca no pudo leer la información guardada sobre {{sources}}, así que no puede determinar qué se movería."
+          },
+          "kind": {
+            "portForward": "reenvíos de puertos",
+            "terminalLease": "terminales",
+            "terminalRecovery": "registros de recuperación de terminales",
+            "workspaceSession": "pestañas abiertas y diseño",
+            "worktreeMetadata": "detalles del worktree",
+            "worktreeLineage": "historial de worktrees",
+            "workspaceLineage": "historial de espacios de trabajo",
+            "sparsePreset": "presets de sparse checkout",
+            "retiredWorktreeName": "nombres de worktrees retirados",
+            "automation": "automatizaciones",
+            "automationRun": "ejecuciones de automatización",
+            "mobileTabSelection": "selecciones de pestañas móviles",
+            "uiRouting": "ajustes de barra lateral y filtros"
+          },
+          "loadFailed": "Orca no pudo cargar los hosts SSH ni los movimientos sin terminar. Vuelve a abrir Ajustes e inténtalo de nuevo.",
+          "outcome": {
+            "live": "No se hizo: los terminales de este servidor siguen en ejecución. Ciérralos e inténtalo de nuevo.",
+            "unverifiable": "No se hizo: Orca no pudo confirmar qué se ejecuta en este servidor. Inténtalo de nuevo cuando el host esté disponible.",
+            "migration": "No se hizo: un movimiento a este servidor quedó sin terminar. Reanúdalo primero.",
+            "deferred": "Aún no se hizo: el servidor no está listo para esto. Inténtalo más tarde.",
+            "failed": "Orca no pudo completar esto en el servidor. Inténtalo de nuevo."
+          }
+        },
+        "sshHostServer": {
+          "sourceChanged": "Se modificó en una versión anterior de Orca: ejecuta el relé hasta que se mueva de nuevo a su servidor gestionado.",
+          "unavailable": "Ejecuta el relé: un servidor Orca gestionado no puede ejecutarse en este host ({{reason}}).",
+          "tunnelUnavailable": "Ejecuta el relé: el servidor SSH de este host no permite el reenvío de puertos y Orca tampoco pudo alcanzar un servidor gestionado a través de la sesión SSH.",
+          "deploying": "Configurando un servidor Orca gestionado…",
+          "converting": "Moviendo los proyectos de este host a su servidor Orca gestionado…",
+          "connecting": "Conectando al servidor Orca gestionado…",
+          "updating": "Actualizando el servidor gestionado…",
+          "starting": "Iniciando el servidor gestionado…",
+          "notServing": "El servidor Orca gestionado no está en ejecución y no se pudo iniciar.",
+          "hostNewer": "Ejecuta un servidor Orca gestionado de una versión más reciente de Orca; conserva esa versión.",
+          "terminalsLive": "Ejecuta el relé hasta que se cierren sus {{count}} terminales abiertos y luego se mueve a un servidor gestionado.",
+          "terminalsLive_one": "Ejecuta el relé hasta que se cierre su {{count}} terminal abierto y luego se mueve a un servidor gestionado.",
+          "terminalsLive_other": "Ejecuta el relé hasta que se cierren sus {{count}} terminales abiertos y luego se mueve a un servidor gestionado.",
+          "terminalsUnverifiable": "Ejecuta el relé: Orca no pudo confirmar que sus terminales estén cerrados. Se moverá en una conexión posterior.",
+          "retry": "Ejecuta el relé en esta sesión; se moverá a un servidor gestionado en una conexión posterior.",
+          "failureDetails": "Detalles",
+          "unavailableUnknown": "Ejecuta el relé: un servidor Orca gestionado no puede ejecutarse en este host.",
+          "cause": {
+            "unsupportedHost": "Orca no tiene una compilación de servidor para este sistema",
+            "artifactsUnavailable": "esta compilación de Orca no incluye el servidor",
+            "libcUnidentified": "Orca no pudo identificar las bibliotecas del sistema del host",
+            "runtimeSelfTest": "el runtime del servidor no superó su autocomprobación",
+            "securitySoftware": "el software de seguridad modificó el runtime del servidor",
+            "nativePreflight": "al host le faltan bibliotecas del sistema que el servidor necesita"
+          },
+          "updateDeferredLater": "Ejecuta un servidor Orca gestionado; se actualizará en una conexión posterior.",
+          "updateFailedPrevious": "Ejecuta un servidor Orca gestionado en su versión anterior; no se pudo actualizar.",
+          "terminalsLiveUncounted": "Ejecuta el relé hasta que se cierren sus terminales abiertos y luego se mueve a un servidor gestionado.",
+          "refusedBlocked": "No se movió a un servidor gestionado: algo en este host impide el movimiento.",
+          "terminalsElsewhere": "Ejecuta el relé mientras siguen en ejecución {{count}} terminales que otro escritorio o sesión de Orca abrió en este host.",
+          "terminalsElsewhere_one": "Ejecuta el relé mientras sigue en ejecución {{count}} terminal que otro escritorio o sesión de Orca abrió en este host.",
+          "terminalsElsewhere_other": "Ejecuta el relé mientras siguen en ejecución {{count}} terminales que otro escritorio o sesión de Orca abrió en este host.",
+          "terminalsElsewhereUncounted": "Ejecuta el relé mientras siguen en ejecución terminales que otro escritorio o sesión de Orca abrió en este host."
+        },
+        "deltaMove": {
+          "action": "Mover los proyectos nuevos…",
+          "title": "Mover los proyectos nuevos",
+          "description": "Una versión anterior de Orca modificó este host después de que se moviera a su servidor gestionado. Esto agrega al servidor lo que creó; nunca sobrescribe lo que el servidor ya tiene.",
+          "added": "Agregado al servidor",
+          "nothingNew": "No hay nada nuevo que agregar.",
+          "notReflected": "Modificado o eliminado en la versión anterior; el servidor conserva su propia copia",
+          "cancel": "Cancelar",
+          "confirm": "Mover los proyectos nuevos",
+          "kind": {
+            "repository": "Repositorio {{name}}",
+            "folder": "Carpeta {{name}}",
+            "group": "Grupo de proyectos {{name}}"
+          }
+        },
+        "keepServer": {
+          "action": "Conservar la versión del servidor…",
+          "title": "Conservar la versión del servidor",
+          "description": "Este host vuelve a su servidor gestionado tal como está. Lo que la versión anterior de Orca agregó o cambió aquí no se mueve; permanece solo en los ajustes guardados de esta computadora hasta que se limpien.",
+          "cancel": "Cancelar",
+          "confirm": "Conservar la versión del servidor"
         }
       },
       "right": {
@@ -14779,7 +14938,6 @@
                 "d90d2e1f6d": "Controla el uso por sesión y semanal.",
                 "8919321417": "Error al iniciar sesión en Codex.",
                 "c7b90c140b": "Cuenta de Codex agregada.",
-                "4e71d72912": "Error al iniciar sesión en Claude.",
                 "9ddeb558f9": "Cuenta de Claude agregada.",
                 "29d0653961": "Iniciar sesión",
                 "945865332e": "Iniciando sesión",
@@ -15761,6 +15919,9 @@
         "richMarkdownImageInsertionFeedback": {
           "importedFileKept": "Inserción de imagen cancelada porque el destino cambió. El archivo importado se conservó.",
           "destinationChanged": "Inserción de imagen cancelada porque el destino cambió. Inténtalo de nuevo."
+        },
+        "useMarkdownDocuments": {
+          "listFailed": "No se pudo obtener la lista de documentos Markdown."
         }
       },
       "diff": {
@@ -17435,7 +17596,17 @@
         "selectAgent": "Reanudar {{value0}} chat \"{{value1}}\" en {{value2}}",
         "resumeSelected": "Reanudar {{value0}} chats",
         "resumeSelectedOne": "Reanudar 1 chat",
-        "dismissAll": "Descartar todo"
+        "dismissAll": "Descartar todo",
+        "selectWorkspace": "Seleccionar todos los chats en {{value0}}",
+        "workspaceSelectedCount": "{{value0}} de {{value1}}",
+        "selectAll": "Seleccionar todos los chats",
+        "selectAllLabel": "Seleccionar todo",
+        "selectedCount": "{{value0}} de {{value1}} seleccionados",
+        "selectProject": "Seleccionar todos los chats en {{value0}}",
+        "collapseNode": "Contraer {{value0}}",
+        "expandNode": "Expandir {{value0}}",
+        "selectMachine": "Seleccionar todos los chats en {{value0}}",
+        "sshHost": "SSH"
       },
       "NativeChatResumeOutcomeRow": {
         "openChat": "Abrir chat",
@@ -17470,11 +17641,6 @@
       },
       "native": {
         "chat": {
-          "NativeChatStructuredSession": {
-            "a5e7f14068": "Reintentar",
-            "1f772bb5d0": "La entrega del mensaje no está confirmada.",
-            "93ef441197": "El mensaje no se envió."
-          },
           "NativeChatLaunchRetry": {
             "retry": "Reintentar",
             "failed": "No se pudo iniciar el chat.",
@@ -17589,6 +17755,28 @@
         "connecting": "Conectando…",
         "reconnect": "Reconectar",
         "retry": "Reintentar"
+      },
+      "managedServerMove": {
+        "offer": "Mueve {{host}} a un servidor Orca gestionado para conexiones más fiables. Sus {{count}} terminales abiertos se reiniciarán.",
+        "offer_one": "Mueve {{host}} a un servidor Orca gestionado para conexiones más fiables. Su {{count}} terminal abierto se reiniciará.",
+        "offer_other": "Mueve {{host}} a un servidor Orca gestionado para conexiones más fiables. Sus {{count}} terminales abiertos se reiniciarán.",
+        "moved": "{{host}} ahora ejecuta un servidor Orca gestionado.",
+        "refusedLive": "No se movió: {{count}} terminales en {{host}} siguen en ejecución.",
+        "refusedLive_one": "No se movió: {{count}} terminal en {{host}} sigue en ejecución.",
+        "refusedLive_other": "No se movió: {{count}} terminales en {{host}} siguen en ejecución.",
+        "refusedUnverifiable": "No se movió: Orca no pudo confirmar que {{count}} terminales en {{host}} se detuvieran.",
+        "refusedUnverifiable_one": "No se movió: Orca no pudo confirmar que {{count}} terminal en {{host}} se detuviera.",
+        "refusedUnverifiable_other": "No se movió: Orca no pudo confirmar que {{count}} terminales en {{host}} se detuvieran.",
+        "stayed": "{{host}} sigue ejecutando el relé. Hosts SSH en Ajustes muestra por qué.",
+        "failed": "No se pudo mover {{host}}: {{reason}}",
+        "running": "Moviendo {{host}} a un servidor Orca gestionado…",
+        "title": "Mover a un servidor gestionado",
+        "confirm": "Mover",
+        "notNow": "Ahora no",
+        "close": "Cerrar",
+        "offerUncounted": "Mueve {{host}} a un servidor Orca gestionado para conexiones más fiables. Sus terminales abiertos se reiniciarán.",
+        "refusedUnverifiableUncounted": "No se movió: Orca no pudo confirmar que los terminales en {{host}} se detuvieran.",
+        "retry": "Inténtalo de nuevo"
       }
     },
     "main": {
@@ -17634,6 +17822,8 @@
         "managedAccountUnsupported": "Mientras haya una cuenta de Claude agregada en WSL, los chats de Claude necesitan una cuenta de Claude de Windows.",
         "launchFolderMissing": "La carpeta en la que se ejecutaba este chat ya no existe. Restáurela para continuar este chat.",
         "historyInOtherAccount": "El historial de este chat está en otra cuenta de Claude. Vuelva a esa cuenta para continuarlo.",
+        "claudeAccountFolderMissing": "Falta la carpeta de la cuenta de Claude seleccionada. Vuelva a iniciar sesión en ella o elija otra cuenta.",
+        "claudeAccountSetupFailed": "No se pudo configurar la cuenta de Claude seleccionada. Vuelva a intentarlo o elija otra cuenta.",
         "agentCommandNotRunnable": "{{agent}}: el Comando en Ajustes → Agentes debe ser la ruta o el nombre de un programa que Orca pueda encontrar, sin argumentos ni variables. Cámbielo o restablézcalo con Reiniciar.",
         "chooseClaudeAccount": "Elija o agregue una en la configuración de Cuentas de Claude.",
         "chooseClaudeAccountThenRunCommand": "Elija o agregue una en la configuración de Cuentas de Claude y vuelva a ejecutar /{{command}}.",
@@ -17717,6 +17907,8 @@
         "cannotRunHere": "Orca no puede ejecutar este agente en un chat aquí.",
         "unreachable": "Orca no pudo comunicarse con el agente.",
         "recordFailed": "Orca no pudo guardar esto en el historial del chat.",
+        "attachmentExpired": "Este archivo adjunto caducó.",
+        "reattachFile": "Quítelo y vuelva a adjuntarlo.",
         "conversationCleared": "Esta conversación se borró.",
         "openCurrentConversation": "Abra la conversación actual para continuar.",
         "clearUnfinished": "El último /clear no terminó.",
@@ -17760,6 +17952,9 @@
         "stopDictation": "Detener dictado",
         "noSkills": "Sin habilidades coincidentes",
         "localAttachmentUnsupported": "Los archivos adjuntos locales no están disponibles para sesiones remotas.",
+        "attachFailed": "No se pudo adjuntar {{files}}.",
+        "attachFailedBecause": "No se pudo adjuntar {{files}}. {{reason}}",
+        "uploadingFile": "Subiendo {{name}}…",
         "removeAttachment": "Quitar archivo adjunto",
         "pastedImageLabel": "Imagen pegada",
         "copyImage": "Copiar imagen",
@@ -18009,9 +18204,14 @@
         "estimated": "Estimado a partir de la última respuesta."
       },
       "dismissDeliveryNotice": "Descartar",
+      "addSelectionToChat": "Añadir al chat",
       "messageNotSent": "Mensaje no enviado",
       "deliveryUnconfirmed": "Entrega sin confirmar — revisa el chat antes de reintentar",
       "messageSending": "Enviando…",
+      "userMessage": {
+        "showFull": "Mostrar mensaje completo",
+        "showLess": "Mostrar menos"
+      },
       "subagents": {
         "unnamed": "Subagente",
         "state": {
@@ -18049,10 +18249,8 @@
         "turnOffQueueing": "Desactivar la cola",
         "withdrawnHold": "Detenido antes de enviarse",
         "pausedSendFailed": "No se pudo enviar. Pulsa Enviar para reintentar.",
-        "pausedKept": "Aún no se ha enviado. Pulsa Enviar para enviarlo.",
         "paused": "En pausa",
         "queuePausedStopped": "Cola en pausa porque interrumpiste",
-        "queuePausedCleared": "Cola en pausa después de que borraste la conversación",
         "queuePaused": "Cola en pausa",
         "resume": "Reanudar",
         "sendConfirmTitle": "¿Enviar mensaje?",
@@ -18068,6 +18266,7 @@
       "receipt": {
         "cancelled": "Cancelado",
         "unavailable": "Respuesta seleccionada no disponible",
+        "emptyAnswer": "Respuesta vacía",
         "resolved": "Resuelto",
         "resolver": "Respondido en {{device}}",
         "cancelledBy": "Cancelado en {{device}}"
@@ -18146,9 +18345,13 @@
         "plan": "Plan",
         "historyRepaired": "No se pudo cargar parte del historial de este chat.",
         "historyItemTooLarge": "Esta parte del chat era demasiado grande para mostrarla.",
-        "stoppedBeforeStart": "Detenido antes de que el agente empezara",
+        "stoppedBeforeStart": "Detenido manualmente",
         "dismiss": "Descartar",
-        "copyError": "Copiar error"
+        "copyError": "Copiar error",
+        "orcaStopUpdate": "Orca en {{machine}} se reinició para actualizarse mientras esta respuesta estaba en curso.",
+        "orcaStopQuit": "Orca en {{machine}} se cerró mientras esta respuesta estaba en curso.",
+        "orcaStopCrash": "Orca en {{machine}} se detuvo inesperadamente mientras esta respuesta estaba en curso.",
+        "orcaStopCanContinue": "Puedes continuar en esta conversación."
       },
       "providerFrame": {
         "byteLength": "{{value0}} bytes"
@@ -18204,7 +18407,37 @@
         "offline": "{{hostName}} está sin conexión",
         "reconnecting": "{{hostName}} se está reconectando…",
         "reconnect": "Reconectar"
-      }
+      },
+      "interruptedContinue": {
+        "continue": "Continuar",
+        "failed": "No se pudo continuar este chat. Inténtalo de nuevo o envía un mensaje.",
+        "explanation": "Continúa y el agente comprobará primero si su último paso terminó."
+      },
+      "rewind": {
+        "unsupported": "Este chat no puede volver a un mensaje anterior.",
+        "historyNotPaginated": "Este chat de Codex más antiguo no puede volver a un mensaje anterior. Inicia un chat nuevo para usar Rebobinar hasta aquí.",
+        "busy": "Disponible cuando el agente esté inactivo y nada en este chat esté esperándote.",
+        "staleEpoch": "La conversación cambió. Revisa los últimos mensajes e inténtalo de nuevo.",
+        "invalidTarget": "La conversación no puede volver a este mensaje. No se cambió nada.",
+        "historyLimit": "Esta conversación es demasiado larga para retroceder en ella. No se cambió nada.",
+        "providerRefused": "El agente no pudo volver a este mensaje.",
+        "proofMismatch": "El historial del agente no coincidía con este chat. Revisa la conversación antes de continuar.",
+        "outcomeUnknown": "Orca no pudo confirmar si la conversación volvió a un mensaje anterior. Lo comprobará antes de enviar tu próximo mensaje.",
+        "outcomeUnknownReturned": "Orca no pudo confirmar si la conversación volvió a este mensaje. Tu mensaje está de nuevo en el compositor y Orca comprobará la conversación antes de enviar tu próximo mensaje.",
+        "timeout": "El chat no se actualizó después de volver a este mensaje. Vuelve a abrirlo para ver lo más reciente.",
+        "refused": "Orca no pudo volver a este mensaje. Revisa la conversación antes de continuar.",
+        "unavailable": "Espera a que el chat termine de conectarse.",
+        "pending": "Espera a que la conversación vuelva al mensaje anterior.",
+        "title": "¿Rebobinar hasta aquí?",
+        "confirmation": "¿Descartar este mensaje y todo lo que viene después? El mensaje vuelve al compositor para que puedas editarlo y reenviarlo. Los cambios de archivos en disco se conservan.",
+        "confirm": "Rebobinar",
+        "cancel": "Cancelar",
+        "action": "Rebobinar hasta aquí"
+      },
+      "visualUnavailable": "Visualización no disponible",
+      "visualLoading": "Cargando visualización",
+      "visualOpenInSidebar": "Abrir en la barra lateral",
+      "visualClose": "Cerrar visualización"
     },
     "tab": {
       "bar": {
@@ -18596,6 +18829,13 @@
       "label": "Asignado",
       "automatic": "Automático",
       "assignToMe": "Asignármelo ({{name}})"
+    },
+    "markdown-callout": {
+      "note": "Nota",
+      "tip": "Consejo",
+      "important": "Importante",
+      "warning": "Advertencia",
+      "caution": "Precaución"
     }
   },
   "dashboardPopout": {
@@ -19129,7 +19369,6 @@
     },
     "codexSharedServerBanner": {
       "fix": "Solucionar",
-      "dismiss": "Descartar",
       "copied": "Copiado",
       "done": "Hecho",
       "cancel": "Cancelar",
@@ -19140,8 +19379,6 @@
       "oldTerminalDialogTitle": "Por qué este Codex comparte un servidor",
       "oldTerminalDialogRisk": "Las sesiones de Codex que comparten un servidor pueden terminar juntas, y el estado del agente puede ser incorrecto.",
       "oldTerminalDialogCause": "Los terminales antiguos aún comparten un servidor de Codex. Abre un terminal nuevo para ejecutar Codex en un servidor aparte.",
-      "openNewTerminal": "Abrir terminal nuevo",
-      "dontShowAgain": "No volver a mostrar",
       "dialogTitle": "Dar a cada pestaña de Codex su propio servidor",
       "dialogDescription": "Las sesiones de Codex iniciadas directamente en un terminal comparten un servidor en segundo plano. Orca mantiene separadas las sesiones de Codex que inicia. Cuando las sesiones comparten un servidor, cerrar una puede terminar con las demás, y el estado del agente puede ser incorrecto.",
       "copy": "Copiar",
@@ -19150,7 +19387,6 @@
       "step2Title": "Detener el servidor compartido en ejecución",
       "undo": "Para deshacerlo, ejecuta codex features enable daemon_auto_start.",
       "step2Warning": "Cierra cualquier sesión de Codex abierta que comparta el servidor",
-      "learnMore": "Más información",
       "turnOff": "Desactivar",
       "turningOff": "Desactivando…",
       "turnedOff": "Desactivado",
@@ -19170,10 +19406,20 @@
     "codexSharedSettingsNotice": {
       "title": "Codex en Orca ahora usa ~/.codex",
       "description": "Codex puede volver a pedir que confíes en carpetas o apruebes comandos. Vuelve a agregar los servidores MCP que agregaste solo en Orca."
+    },
+    "paneMove": {
+      "failed": "No se pudo mover el panel a una pestaña nueva."
+    },
+    "paneTopBanner": {
+      "openNewTerminal": "Abrir terminal nuevo",
+      "learnMore": "Más información",
+      "dontShowAgain": "No volver a mostrar",
+      "dismiss": "Descartar"
     }
   },
   "quickOpen": {
-    "moreMatchesAvailable": "Puede haber más coincidencias disponibles. Refina tu búsqueda para acotar los resultados."
+    "moreMatchesAvailable": "Puede haber más coincidencias disponibles. Refina tu búsqueda para acotar los resultados.",
+    "recentValidationFailed": "No se pudieron comprobar los archivos recientes: {{error}}"
   },
   "checksPanel": {
     "unlinked": {
@@ -19259,5 +19505,25 @@
     "unavailable": "No se puede reproducir este archivo multimedia. El archivo puede no estar disponible o usar un códec no compatible.",
     "openFailed": "No se pudo abrir el archivo en la aplicación predeterminada.",
     "openDefault": "Abrir en la aplicación predeterminada"
+  },
+  "projectBoard": {
+    "noColumnField": "Esta vista de tablero no tiene un campo de selección única ni de iteración para agrupar, así que Orca muestra los elementos en una lista.",
+    "noField": "Sin {{field}}"
+  },
+  "projectBoardCard": {
+    "restrictedItem": "Elemento restringido",
+    "itemLabel": "{{number}} — {{title}}"
+  },
+  "projectViews": {
+    "layout": {
+      "board": "Tablero"
+    },
+    "unsupported": {
+      "switchLayout": "Cambia a una vista de Tabla, Tablero o Hoja de ruta para trabajar con este proyecto en Orca.",
+      "description": "Orca representa vistas de proyectos de tabla, tablero y hoja de ruta. Esta vista usa un diseño que aún no puede representar."
+    }
+  },
+  "projectField": {
+    "updateFailed": "No se pudo actualizar el campo del proyecto"
   }
 }
diff --git a/src/renderer/src/i18n/locales/fr.json b/src/renderer/src/i18n/locales/fr.json
index fed2489a0976..bff6bd16604e 100644
--- a/src/renderer/src/i18n/locales/fr.json
+++ b/src/renderer/src/i18n/locales/fr.json
@@ -247,7 +247,15 @@
         "title": "Avertir lorsqu'un onglet Codex partage un serveur",
         "description": "Affiche un avis sur un Codex que vous avez démarré vous-même lorsqu'il partage un serveur avec d'autres onglets, car son statut d'agent peut être erroné."
       }
-    }
+    },
+    "followSymlinkedDirectoriesKeywords": {
+      "symlink": "lien symbolique",
+      "linkedFolder": "dossier lié",
+      "quickOpen": "ouverture rapide",
+      "fileExplorer": "explorateur de fichiers"
+    },
+    "followSymlinkedDirectories": "Suivre les dossiers liés symboliquement",
+    "followSymlinkedDirectoriesDescription": "Recherchez les dossiers liés dans Quick Open et développez les dossiers liés locaux dans l'Explorateur de fichiers."
   },
   "menu": {
     "checkForUpdates": "Rechercher les mises à jour...",
@@ -1269,6 +1277,11 @@
             }
           }
         }
+      },
+      "ipcEvents": {
+        "sshManagedServer": {
+          "refusedBlocked": "Cet hôte SSH n'a pas pu basculer vers un serveur Orca géré. La section Hôtes SSH des Paramètres en indique la raison."
+        }
       }
     },
     "components": {
@@ -3259,7 +3272,8 @@
             "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é.",
             "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."
+            "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.",
+            "ownerHostMismatch": "La session enregistrée de ce terminal appartient à une autre connexion d'hôte : Orca ne peut donc pas le rattacher ici. Ouvrez un nouveau terminal pour continuer."
           },
           "TerminalProcessExitOverlay": {
             "capacityTitle": "Limite de consoles Git Bash atteinte",
@@ -3821,7 +3835,6 @@
             "54e8d6bb2d": "Fable",
             "d79c3362c4": "5 h",
             "a79c64f87e": "Fable",
-            "8295903d17": "Redémarrez les terminaux Claude actifs avant de reprendre d'anciennes conversations après un changement de compte.",
             "c98ea88392": "Aucun autre compte",
             "9332ba8684": "Basculer vers",
             "d450654fa2": "Compte Claude",
@@ -6597,7 +6610,6 @@
         "AccountsPane": {
           "c2d2751587": "Supprimer le compte",
           "dbb9626ed1": "Annuler",
-          "854ebbcc45": "Orca supprimera l'authentification Claude gérée pour ce compte enregistré. S'il est actuellement actif, Orca revient à la connexion Claude par défaut du système.",
           "63843e37e2": "Supprimer le compte Claude ?",
           "380a7736cc": "La suppression de ce compte efface définitivement son home Codex géré, y compris tout l'historique de sessions Codex et les connexions MCP stockés dedans. Cette action est irréversible. Si le compte est actuellement actif, Orca revient à la connexion Codex par défaut du système.",
           "0d47394635": "Supprimer le compte Codex ?",
@@ -6645,12 +6657,10 @@
           "3fe7862418": "Aucun compte Claude géré pour {{value0}}. Orca utilisera la connexion Claude par défaut du système de cet environnement jusqu'à ce que vous en ajoutiez un ici.",
           "3455cf43fa": " Claude.",
           "fcc4093fc1": "Utilisez votre connexion Codex {{value0}} actuelle.",
-          "79e484c3b2": "Sélecteur de comptes facultatif pour les fichiers d'authentification Claude partagés.",
           "8bbfd74556": "Comptes Claude",
           "72b36ea174": "Facultatif. Orca peut utiliser votre connexion Claude habituelle ; ajoutez des comptes seulement si vous voulez changer rapidement sans déplacer les sessions de chat.",
           "26ef4b55be": "Claude",
           "2743cdc0af": "Échec de la mise à jour du compte Claude.",
-          "b15ce90870": "{{value0}} -> {{value1}}. Redémarrez les terminaux Claude actifs avant de poursuivre les anciennes sessions.",
           "f921d32606": "Compte Claude mis à jour.",
           "5bf8764953": "Échec de la mise à jour du compte Codex.",
           "9baf45d071": "Cet appareil",
@@ -8470,8 +8480,8 @@
           "3c88ec55d6": "Aucun paramètre trouvé pour \"",
           "c7ad095d96": "Chargement des paramètres...",
           "acc7bbdefd": "Appuyez à nouveau sur ESC pour quitter les paramètres",
-          "43b68e10f0": "Des modifications IA ne sont pas enregistrées. Elles seront abandonnées en quittant.",
-          "17bdee4ff1": "Abandonner les modifications IA non enregistrées ?",
+          "43b68e10f0": "Des paramètres IA ne sont pas enregistrés. Ils seront abandonnés en quittant.",
+          "17bdee4ff1": "Abandonner les paramètres IA non enregistrés ?",
           "084d8fac5b": "Confidentialité et sécurité",
           "23931df7e8": "Hôtes distants",
           "mobile_group": "Mobile",
@@ -12391,6 +12401,154 @@
           "hostOnly": "Modifiez le site du plan et la clé API dans l'application de bureau sur l'ordinateur exécutant Orca.",
           "detailsUnavailable": "Les détails des informations d'identification du plan ne sont lisibles que sur l'ordinateur exécutant Orca.",
           "siteUnavailable": "Site du plan d'hébergement indisponible"
+        },
+        "managedServers": {
+          "row": {
+            "notRunning": "Non démarré",
+            "refresh": "Actualiser le statut",
+            "migration": "Migration : {{phase}}",
+            "update": "Mettre à jour",
+            "rollback": "Revenir en arrière",
+            "recover": "Récupérer",
+            "cancelStop": "Annuler l'arrêt",
+            "confirmStop": "Arrêter et supprimer le serveur",
+            "keep": "Laisser en marche",
+            "stop": "Arrêter…",
+            "deferredVersion": "Mise à jour vers {{version}} reportée.",
+            "confirmRestore": "Restaurer l'instantané et redémarrer",
+            "keepState": "Conserver l'état",
+            "statusUnknown": "Statut inconnu",
+            "checking": "Vérification…"
+          },
+          "title": "Serveurs gérés",
+          "description": "Orca installe et exécute un serveur sur un hôte SSH vide, et le maintient à jour.",
+          "deploy": {
+            "host": "Hôte SSH",
+            "hostPlaceholder": "Choisissez un hôte SSH vide",
+            "name": "Nom du serveur",
+            "submit": "Déployer le serveur",
+            "running": "Déploiement…"
+          },
+          "pending": {
+            "resume": "Reprendre"
+          },
+          "access": {
+            "title": "Accès SSH pour les serveurs appairés",
+            "linked": "{{name}} via SSH",
+            "unlink": "Cesser d'utiliser SSH",
+            "target": "Passer par un hôte SSH",
+            "port": "Port du serveur",
+            "link": "Utiliser SSH",
+            "linking": "Connexion…"
+          },
+          "search": {
+            "title": "Serveurs gérés",
+            "keywordSsh": "ssh"
+          },
+          "phase": {
+            "fenced": "Hôte verrouillé",
+            "staged": "Copie préparée",
+            "committed": "Copie validée",
+            "retired": "Terminé"
+          },
+          "recovery": {
+            "activate": "Une mise à jour a été interrompue",
+            "rollback": "Un retour en arrière a été interrompu",
+            "decommission": "Un arrêt a été interrompu"
+          },
+          "terminals": {
+            "unknown": "Terminaux en cours : inconnu",
+            "count": "Terminaux en cours : {{count}}"
+          },
+          "blocker": {
+            "notFound": "L'hôte SSH n'existe plus.",
+            "owned": "Cet hôte SSH appartient déjà à un serveur géré.",
+            "catalog": "Les projets de cet hôte ne peuvent pas encore être déplacés.",
+            "terminals": "Des terminaux sont encore en cours sur cet hôte ({{count}}). Fermez-les d'abord.",
+            "portForwards": "Les redirections de port enregistrées restent liées à l'hôte SSH.",
+            "dependents": "État qui ne peut pas encore être déplacé : {{kinds}}.",
+            "unverifiable": "Orca n'a pas pu lire les données enregistrées pour {{sources}}, il ne peut donc pas déterminer ce qui serait déplacé."
+          },
+          "kind": {
+            "portForward": "redirections de port",
+            "terminalLease": "terminaux",
+            "terminalRecovery": "enregistrements de récupération de terminaux",
+            "workspaceSession": "onglets ouverts et disposition",
+            "worktreeMetadata": "détails de worktree",
+            "worktreeLineage": "historique des worktrees",
+            "workspaceLineage": "historique des espaces de travail",
+            "sparsePreset": "préréglages de sparse checkout",
+            "retiredWorktreeName": "noms de worktrees retirés",
+            "automation": "automatisations",
+            "automationRun": "exécutions d'automatisations",
+            "mobileTabSelection": "sélections d'onglets mobiles",
+            "uiRouting": "paramètres de barre latérale et de filtres"
+          },
+          "loadFailed": "Orca n'a pas pu charger les hôtes SSH et les déplacements inachevés. Rouvrez les Paramètres pour réessayer.",
+          "outcome": {
+            "live": "Non effectué : des terminaux sont encore en cours sur ce serveur. Fermez-les et réessayez.",
+            "unverifiable": "Non effectué : Orca n'a pas pu confirmer ce qui tourne sur ce serveur. Réessayez lorsque l'hôte est joignable.",
+            "migration": "Non effectué : un déplacement vers ce serveur est inachevé. Reprenez-le d'abord.",
+            "deferred": "Pas encore effectué : le serveur n'est pas prêt pour cela. Réessayez plus tard.",
+            "failed": "Orca n'a pas pu terminer cette action sur le serveur. Réessayez."
+          }
+        },
+        "sshHostServer": {
+          "sourceChanged": "Modifié sur une version plus ancienne d'Orca : exécute le relais jusqu'à ce qu'il soit de nouveau déplacé vers son serveur géré.",
+          "unavailable": "Exécute le relais : un serveur Orca géré ne peut pas s'exécuter sur cet hôte ({{reason}}).",
+          "tunnelUnavailable": "Exécute le relais : le serveur SSH de cet hôte n'autorise pas les redirections de port, et Orca n'a pas non plus pu atteindre un serveur géré via la session SSH.",
+          "deploying": "Configuration d'un serveur Orca géré…",
+          "converting": "Déplacement des projets de cet hôte vers son serveur Orca géré…",
+          "connecting": "Connexion au serveur Orca géré…",
+          "updating": "Mise à jour du serveur géré…",
+          "starting": "Démarrage du serveur géré…",
+          "notServing": "Le serveur Orca géré n'est pas démarré et n'a pas pu être démarré.",
+          "hostNewer": "Exécute un serveur Orca géré issu d'une version plus récente d'Orca ; il conserve cette version.",
+          "terminalsLive": "Exécute le relais jusqu'à la fermeture de ses {{count}} terminaux ouverts, puis bascule vers un serveur géré.",
+          "terminalsLive_one": "Exécute le relais jusqu'à la fermeture de son {{count}} terminal ouvert, puis bascule vers un serveur géré.",
+          "terminalsLive_other": "Exécute le relais jusqu'à la fermeture de ses {{count}} terminaux ouverts, puis bascule vers un serveur géré.",
+          "terminalsUnverifiable": "Exécute le relais : Orca n'a pas pu confirmer que ses terminaux sont fermés. Il bascule lors d'une prochaine connexion.",
+          "retry": "Exécute le relais pour cette session ; il bascule vers un serveur géré lors d'une prochaine connexion.",
+          "failureDetails": "Détails",
+          "unavailableUnknown": "Exécute le relais : un serveur Orca géré ne peut pas s'exécuter sur cet hôte.",
+          "cause": {
+            "unsupportedHost": "Orca n'a pas de build de serveur pour ce système",
+            "artifactsUnavailable": "cette version d'Orca n'inclut pas le serveur",
+            "libcUnidentified": "Orca n'a pas pu identifier les bibliothèques système de l'hôte",
+            "runtimeSelfTest": "le runtime du serveur a échoué à son auto-test",
+            "securitySoftware": "un logiciel de sécurité a modifié le runtime du serveur",
+            "nativePreflight": "il manque à l'hôte des bibliothèques système dont le serveur a besoin"
+          },
+          "updateDeferredLater": "Exécute un serveur Orca géré ; il se met à jour lors d'une prochaine connexion.",
+          "updateFailedPrevious": "Exécute un serveur Orca géré sur sa version précédente ; sa mise à jour a échoué.",
+          "terminalsLiveUncounted": "Exécute le relais jusqu'à la fermeture de ses terminaux ouverts, puis bascule vers un serveur géré.",
+          "refusedBlocked": "Non basculé vers un serveur géré : un élément de cet hôte bloque le déplacement.",
+          "terminalsElsewhere": "Exécute le relais tant que {{count}} terminaux ouverts sur cet hôte par un autre bureau ou une autre session Orca sont en cours.",
+          "terminalsElsewhere_one": "Exécute le relais tant que {{count}} terminal ouvert sur cet hôte par un autre bureau ou une autre session Orca est en cours.",
+          "terminalsElsewhere_other": "Exécute le relais tant que {{count}} terminaux ouverts sur cet hôte par un autre bureau ou une autre session Orca sont en cours.",
+          "terminalsElsewhereUncounted": "Exécute le relais tant que des terminaux ouverts sur cet hôte par un autre bureau ou une autre session Orca sont en cours."
+        },
+        "deltaMove": {
+          "action": "Déplacer les nouveaux projets…",
+          "title": "Déplacer les nouveaux projets",
+          "description": "Une version plus ancienne d'Orca a modifié cet hôte après son déplacement vers son serveur géré. Cela ajoute au serveur ce qu'elle a créé ; rien n'est jamais fusionné par-dessus ce que le serveur contient déjà.",
+          "added": "Ajouté au serveur",
+          "nothingNew": "Rien de nouveau à ajouter.",
+          "notReflected": "Modifié ou supprimé sur la version plus ancienne ; le serveur conserve sa propre copie",
+          "cancel": "Annuler",
+          "confirm": "Déplacer les nouveaux projets",
+          "kind": {
+            "repository": "Dépôt {{name}}",
+            "folder": "Dossier {{name}}",
+            "group": "Groupe de projets {{name}}"
+          }
+        },
+        "keepServer": {
+          "action": "Conserver la version du serveur…",
+          "title": "Conserver la version du serveur",
+          "description": "Cet hôte revient à son serveur géré tel quel. Ce que la version plus ancienne d'Orca a ajouté ou modifié ici n'est pas déplacé ; cela reste uniquement dans les paramètres enregistrés de cet ordinateur jusqu'à leur nettoyage.",
+          "cancel": "Annuler",
+          "confirm": "Conserver la version du serveur"
         }
       },
       "right": {
@@ -14840,7 +14998,6 @@
                 "d90d2e1f6d": "Suivez l'utilisation par session et par semaine.",
                 "8919321417": "Échec de la connexion Codex.",
                 "c7b90c140b": "Compte Codex ajouté.",
-                "4e71d72912": "Échec de la connexion Claude.",
                 "9ddeb558f9": "Compte Claude ajouté.",
                 "29d0653961": "Se connecter",
                 "945865332e": "Connexion en cours",
@@ -15806,6 +15963,9 @@
         "richMarkdownImageInsertionFeedback": {
           "importedFileKept": "Insertion d'image annulée car la destination a changé. Le fichier importé a été conservé.",
           "destinationChanged": "Insertion d'image annulée car la destination a changé. Essayer à nouveau."
+        },
+        "useMarkdownDocuments": {
+          "listFailed": "Impossible de lister les documents Markdown."
         }
       },
       "diff": {
@@ -17495,7 +17655,17 @@
         "activitySubagentOne": "Sous-agent en cours : {{value0}}",
         "activitySubagentMany": "{{value0}} sous-agents en cours",
         "activityMonitorOne": "Surveillance : {{value0}}",
-        "activityMonitorMany": "Surveillance de {{value0}} tâches en arrière-plan"
+        "activityMonitorMany": "Surveillance de {{value0}} tâches en arrière-plan",
+        "selectWorkspace": "Sélectionner toutes les discussions dans {{value0}}",
+        "workspaceSelectedCount": "{{value0}} sur {{value1}}",
+        "selectAll": "Sélectionner toutes les discussions",
+        "selectAllLabel": "Tout sélectionner",
+        "selectedCount": "{{value0}} sur {{value1}} sélectionnées",
+        "selectProject": "Sélectionner toutes les discussions dans {{value0}}",
+        "collapseNode": "Réduire {{value0}}",
+        "expandNode": "Développer {{value0}}",
+        "selectMachine": "Sélectionner toutes les discussions sur {{value0}}",
+        "sshHost": "SSH"
       },
       "linear-issue-attribute-filter-coverage-notice": {
         "statusPartialTeamCoverage": "Filtrage des statuts des équipes {{value0}} sur {{value1}} : les problèmes des équipes restantes ne sont pas inclus.",
@@ -17511,11 +17681,6 @@
       },
       "native": {
         "chat": {
-          "NativeChatStructuredSession": {
-            "1f772bb5d0": "La livraison du message n'est pas confirmée.",
-            "93ef441197": "Le message n'a pas été envoyé.",
-            "a5e7f14068": "Réessayer"
-          },
           "NativeChatLaunchRetry": {
             "failed": "Le chat n'a pas pu démarrer.",
             "unknown": "La connexion au chat n'a pas pu être confirmée.",
@@ -17630,6 +17795,28 @@
         "retry": "Réessayer",
         "connect": "Se connecter",
         "connecting": "Connexion…"
+      },
+      "managedServerMove": {
+        "offer": "Déplacez {{host}} vers un serveur Orca géré pour des connexions plus fiables. Ses {{count}} terminaux ouverts redémarreront.",
+        "offer_one": "Déplacez {{host}} vers un serveur Orca géré pour des connexions plus fiables. Son {{count}} terminal ouvert redémarrera.",
+        "offer_other": "Déplacez {{host}} vers un serveur Orca géré pour des connexions plus fiables. Ses {{count}} terminaux ouverts redémarreront.",
+        "moved": "{{host}} exécute désormais un serveur Orca géré.",
+        "refusedLive": "Non déplacé : {{count}} terminaux sur {{host}} sont encore en cours.",
+        "refusedLive_one": "Non déplacé : {{count}} terminal sur {{host}} est encore en cours.",
+        "refusedLive_other": "Non déplacé : {{count}} terminaux sur {{host}} sont encore en cours.",
+        "refusedUnverifiable": "Non déplacé : Orca n'a pas pu confirmer que {{count}} terminaux sur {{host}} se sont arrêtés.",
+        "refusedUnverifiable_one": "Non déplacé : Orca n'a pas pu confirmer que {{count}} terminal sur {{host}} s'est arrêté.",
+        "refusedUnverifiable_other": "Non déplacé : Orca n'a pas pu confirmer que {{count}} terminaux sur {{host}} se sont arrêtés.",
+        "stayed": "{{host}} exécute toujours le relais. La section Hôtes SSH des Paramètres en indique la raison.",
+        "failed": "Impossible de déplacer {{host}} : {{reason}}",
+        "running": "Déplacement de {{host}} vers un serveur Orca géré…",
+        "title": "Déplacer vers un serveur géré",
+        "confirm": "Déplacer",
+        "notNow": "Pas maintenant",
+        "close": "Fermer",
+        "offerUncounted": "Déplacez {{host}} vers un serveur Orca géré pour des connexions plus fiables. Ses terminaux ouverts redémarreront.",
+        "refusedUnverifiableUncounted": "Non déplacé : Orca n'a pas pu confirmer que les terminaux sur {{host}} se sont arrêtés.",
+        "retry": "Réessayer"
       }
     },
     "main": {
@@ -17675,6 +17862,8 @@
         "managedAccountUnsupported": "Tant qu'un compte Claude est ajouté dans WSL, les chats Claude nécessitent un compte Claude Windows.",
         "launchFolderMissing": "Le dossier dans lequel ce chat s'exécutait n'existe plus. Restaurez-le pour poursuivre ce chat.",
         "historyInOtherAccount": "L'historique de ce chat se trouve dans un autre compte Claude. Revenez à ce compte pour le poursuivre.",
+        "claudeAccountFolderMissing": "Le dossier du compte Claude sélectionné est introuvable. Reconnectez-vous à ce compte ou choisissez-en un autre.",
+        "claudeAccountSetupFailed": "Le compte Claude sélectionné n'a pas pu être configuré. Réessayez ou choisissez un autre compte.",
         "agentCommandNotRunnable": "{{agent}} : la Commande dans Paramètres → Agents doit être le chemin ou le nom d'un programme qu'Orca peut trouver, sans arguments ni variables. Modifiez-la ou réinitialisez-la.",
         "chooseClaudeAccount": "Choisissez-en un ou ajoutez-en un dans les paramètres Comptes Claude.",
         "chooseClaudeAccountThenRunCommand": "Choisissez-en un ou ajoutez-en un dans les paramètres Comptes Claude, puis relancez /{{command}}.",
@@ -17758,6 +17947,8 @@
         "cannotRunHere": "Orca ne peut pas exécuter cet agent dans un chat ici.",
         "unreachable": "Orca n'a pas pu joindre l'agent.",
         "recordFailed": "Orca n'a pas pu enregistrer ceci dans l'historique du chat.",
+        "attachmentExpired": "Cette pièce jointe a expiré.",
+        "reattachFile": "Retirez-la et joignez-la à nouveau.",
         "conversationCleared": "Cette conversation a été effacée.",
         "openCurrentConversation": "Ouvrez la conversation actuelle pour continuer.",
         "clearUnfinished": "Le dernier /clear ne s'est pas terminé.",
@@ -17816,6 +18007,9 @@
         "skillScopeBuiltIn": "Intégrée",
         "skillScopePlugin": "Plugin",
         "localAttachmentUnsupported": "Les pièces jointes locales ne sont pas disponibles pour les sessions distantes.",
+        "attachFailed": "Impossible de joindre {{files}}.",
+        "attachFailedBecause": "Impossible de joindre {{files}}. {{reason}}",
+        "uploadingFile": "Envoi de {{name}}…",
         "removeAttachment": "Retirer la pièce jointe",
         "pastedImageLabel": "Image collée",
         "draftNotSaved": "Ce brouillon n'a pas encore pu être enregistré. Orca continue d'essayer.",
@@ -18063,6 +18257,7 @@
       },
       "receipt": {
         "unavailable": "Réponse sélectionnée indisponible",
+        "emptyAnswer": "Réponse vide",
         "cancelled": "Annulé",
         "resolved": "Résolu",
         "resolver": "Répondu le {{device}}",
@@ -18074,9 +18269,13 @@
         "plan": "Plan",
         "historyRepaired": "Une partie de l'historique de ce chat n'a pas pu être chargée.",
         "historyItemTooLarge": "Cette partie du chat était trop volumineuse pour être affichée.",
-        "stoppedBeforeStart": "Arrêté avant le démarrage de l'agent",
+        "stoppedBeforeStart": "Arrêté manuellement",
         "dismiss": "Ignorer",
-        "copyError": "Copier l'erreur"
+        "copyError": "Copier l'erreur",
+        "orcaStopUpdate": "Orca sur {{machine}} a redémarré pour une mise à jour pendant que cette réponse était en cours.",
+        "orcaStopQuit": "Orca sur {{machine}} a été fermé pendant que cette réponse était en cours.",
+        "orcaStopCrash": "Orca sur {{machine}} s'est arrêté de manière inattendue pendant que cette réponse était en cours.",
+        "orcaStopCanContinue": "Vous pouvez continuer dans cette conversation."
       },
       "providerFrame": {
         "byteLength": "{{value0}} octets"
@@ -18202,9 +18401,14 @@
         "estimated": "Estimation basée sur la dernière réponse."
       },
       "dismissDeliveryNotice": "Ignorer",
+      "addSelectionToChat": "Ajouter au chat",
       "messageNotSent": "Message non envoyé",
       "deliveryUnconfirmed": "Livraison non confirmée — vérifiez le chat avant de réessayer",
       "messageSending": "Envoi…",
+      "userMessage": {
+        "showFull": "Afficher le message complet",
+        "showLess": "Afficher moins"
+      },
       "queuedMessages": {
         "alreadySent": "Ce message a déjà été envoyé.",
         "editAlreadySent": "Déjà envoyé — votre texte reste dans la zone de saisie.",
@@ -18221,10 +18425,8 @@
         "turnOffQueueing": "Désactiver la file d'attente",
         "withdrawnHold": "Arrêté avant l'envoi",
         "pausedSendFailed": "Envoi impossible. Appuyez sur Envoyer pour réessayer.",
-        "pausedKept": "Pas encore envoyé. Appuyez sur Envoyer pour l'envoyer.",
         "paused": "En pause",
         "queuePausedStopped": "File d'attente en pause, car vous avez interrompu",
-        "queuePausedCleared": "File d'attente en pause après l'effacement de la conversation",
         "queuePaused": "File d'attente en pause",
         "resume": "Reprendre",
         "sendConfirmTitle": "Envoyer le message ?",
@@ -18245,7 +18447,37 @@
         "offline": "{{hostName}} est hors ligne",
         "reconnecting": "{{hostName}} se reconnecte…",
         "reconnect": "Reconnecter"
-      }
+      },
+      "interruptedContinue": {
+        "continue": "Continuer",
+        "failed": "Impossible de poursuivre cette conversation. Réessayez ou envoyez un message.",
+        "explanation": "Continuez, et l'agent vérifiera d'abord si sa dernière étape s'est terminée."
+      },
+      "rewind": {
+        "unsupported": "Ce chat ne peut pas revenir à un message antérieur.",
+        "historyNotPaginated": "Ce chat Codex plus ancien ne peut pas revenir à un message antérieur. Démarrez un nouveau chat pour utiliser « Revenir ici ».",
+        "busy": "Disponible une fois que l'agent est inactif et que plus rien dans ce chat n'attend votre action.",
+        "staleEpoch": "La conversation a changé. Examinez les derniers messages et réessayez.",
+        "invalidTarget": "La conversation ne peut pas revenir à ce message. Rien n'a été modifié.",
+        "historyLimit": "Cette conversation est trop longue pour y revenir. Rien n'a été modifié.",
+        "providerRefused": "L'agent n'a pas pu revenir à ce message.",
+        "proofMismatch": "L'historique de l'agent ne correspondait pas à ce chat. Vérifiez la conversation avant de continuer.",
+        "outcomeUnknown": "Orca n'a pas pu confirmer si la conversation est revenue à un message antérieur. Orca vérifie la conversation avant l'envoi de votre prochain message.",
+        "outcomeUnknownReturned": "Orca n'a pas pu confirmer si la conversation est revenue à ce message. Votre message est de retour dans le composer, et Orca vérifie la conversation avant l'envoi de votre prochain message.",
+        "timeout": "Le chat ne s'est pas actualisé après le retour à ce message. Rouvrez-le pour voir les derniers échanges.",
+        "refused": "Orca n'a pas pu revenir à ce message. Vérifiez la conversation avant de continuer.",
+        "unavailable": "Attendez que le chat finisse de se connecter.",
+        "pending": "Attendez que la conversation revienne au message antérieur.",
+        "title": "Revenir ici ?",
+        "confirmation": "Abandonner ce message et tout ce qui suit ? Le message revient dans le composer pour que vous puissiez le modifier et le renvoyer. Les modifications de fichiers sur le disque sont conservées.",
+        "confirm": "Revenir",
+        "cancel": "Annuler",
+        "action": "Revenir ici"
+      },
+      "visualUnavailable": "Visualisation indisponible",
+      "visualLoading": "Chargement de la visualisation",
+      "visualOpenInSidebar": "Ouvrir dans la barre latérale",
+      "visualClose": "Fermer la visualisation"
     },
     "tab": {
       "bar": {
@@ -18637,6 +18869,13 @@
       "label": "Assigné",
       "automatic": "Automatique",
       "assignToMe": "M'assigner ({{name}})"
+    },
+    "markdown-callout": {
+      "note": "Remarque",
+      "tip": "Conseil",
+      "important": "Important",
+      "warning": "Avertissement",
+      "caution": "Attention"
     }
   },
   "dashboardPopout": {
@@ -18805,7 +19044,8 @@
     }
   },
   "quickOpen": {
-    "moreMatchesAvailable": "D'autres correspondances sont peut-être disponibles. Affinez votre recherche pour réduire les résultats."
+    "moreMatchesAvailable": "D'autres correspondances sont peut-être disponibles. Affinez votre recherche pour réduire les résultats.",
+    "recentValidationFailed": "Impossible de vérifier les fichiers récents : {{error}}"
   },
   "notifications": {
     "agentStatus": {
@@ -19115,9 +19355,6 @@
       "oldTerminalDialogRisk": "Les sessions Codex qui partagent un serveur peuvent se terminer ensemble et le statut de l'agent peut être erroné.",
       "oldTerminalDialogCause": "Les terminaux plus anciens partagent toujours un serveur Codex. Ouvrez un nouveau terminal pour exécuter Codex sur un serveur distinct.",
       "fix": "Réparer",
-      "openNewTerminal": "Ouvrir un nouveau terminal",
-      "dontShowAgain": "Ne plus montrer",
-      "dismiss": "Rejeter",
       "dialogTitle": "Donnez à chaque onglet du Codex son propre serveur",
       "dialogDescription": "Les sessions Codex démarrées directement dans un terminal partagent un serveur en arrière-plan. Orca conserve les sessions Codex qu'il démarre séparément. Lorsque des sessions partagent un serveur, la fermeture de l'une peut mettre fin aux autres et le statut de l'agent peut être erroné.",
       "copy": "Copie",
@@ -19128,7 +19365,6 @@
       "step2Title": "Arrêtez le serveur partagé en cours d'exécution",
       "undo": "Pour annuler, exécutez codex features enable daemon_auto_start.",
       "step2Warning": "Ferme toutes les sessions Codex ouvertes qui partagent le serveur",
-      "learnMore": "Apprendre encore plus",
       "turnOff": "Éteindre",
       "turningOff": "Éteindre…",
       "turnedOff": "Éteint",
@@ -19141,6 +19377,15 @@
       "confirmStopDescription": "Cela ferme toutes les sessions Codex ouvertes qui le partagent, y compris celles en dehors d'Orca.",
       "cancel": "Annuler",
       "runs": "Fonctionne"
+    },
+    "paneMove": {
+      "failed": "Impossible de déplacer le volet vers un nouvel onglet."
+    },
+    "paneTopBanner": {
+      "openNewTerminal": "Ouvrir un nouveau terminal",
+      "learnMore": "Apprendre encore plus",
+      "dontShowAgain": "Ne plus montrer",
+      "dismiss": "Rejeter"
     }
   },
   "fileSearch": {
@@ -19199,5 +19444,25 @@
     "unavailable": "Impossible de lire ce fichier multimédia. Le fichier peut être indisponible ou utiliser un codec non pris en charge.",
     "openFailed": "Impossible d’ouvrir ce fichier dans l’application par défaut.",
     "openDefault": "Ouvrir dans l’application par défaut"
+  },
+  "projectBoard": {
+    "noColumnField": "Cette vue Board n'a pas de champ à sélection unique ni d'itération pour regrouper les éléments ; Orca les affiche donc sous forme de liste.",
+    "noField": "Aucun {{field}}"
+  },
+  "projectBoardCard": {
+    "restrictedItem": "Élément restreint",
+    "itemLabel": "{{number}} — {{title}}"
+  },
+  "projectViews": {
+    "layout": {
+      "board": "Board"
+    },
+    "unsupported": {
+      "switchLayout": "Basculez vers une vue Tableau, Board ou Feuille de route pour travailler avec ce projet dans Orca.",
+      "description": "Orca affiche les vues de projet de type Tableau, Board et Feuille de route. Cette vue utilise une mise en page qu'Orca ne peut pas encore restituer."
+    }
+  },
+  "projectField": {
+    "updateFailed": "Échec de la mise à jour du champ du projet"
   }
 }
diff --git a/src/renderer/src/i18n/locales/ja.json b/src/renderer/src/i18n/locales/ja.json
index 8ce083ad6f4e..75a76187c8b0 100644
--- a/src/renderer/src/i18n/locales/ja.json
+++ b/src/renderer/src/i18n/locales/ja.json
@@ -146,7 +146,15 @@
         "title": "Codex タブがサーバーを共有する場合に警告する",
         "description": "自分で開始した Codex が他のタブとサーバーを共有している場合、Agent のステータスが間違っている可能性があるため、その Codex に関する通知が表示されます。"
       }
-    }
+    },
+    "followSymlinkedDirectoriesKeywords": {
+      "symlink": "シンボリックリンク",
+      "linkedFolder": "リンクされたフォルダー",
+      "quickOpen": "クイックオープン",
+      "fileExplorer": "ファイルエクスプローラー"
+    },
+    "followSymlinkedDirectories": "シンボリックリンクされたディレクトリをたどる",
+    "followSymlinkedDirectoriesDescription": "クイックオープンでリンクされたフォルダーを検索し、ファイルエクスプローラーでローカルのリンクされたフォルダーを展開します。"
   },
   "menu": {
     "checkForUpdates": "アップデートを確認…",
@@ -1168,6 +1176,11 @@
             }
           }
         }
+      },
+      "ipcEvents": {
+        "sshManagedServer": {
+          "refusedBlocked": "この SSH ホストを管理対象の Orca サーバーに移動できませんでした。理由は設定の [SSH ホスト] で確認できます。"
+        }
       }
     },
     "components": {
@@ -3154,7 +3167,8 @@
             "heldByPreviousRelay": "このターミナルは以前のバージョンの Orca のもとでホスト上でまだ実行中ですが、このバージョンからは接続できません。終了するまで実行され続けます。ここで作業を続けるには新しいターミナルを開いてください。",
             "sourceRestoring": "このターミナルを再接続しています — その出力が再確立されています。セッションはまだ実行中です。",
             "ptyAllocationLimit": "システムはこれ以上 pty デバイスを割り当てられません。Orca または他のプログラムで使っていないターミナルをいくつか閉じてから、もう一度お試しください。",
-            "terminalProcessLimit": "システムはこれ以上ターミナルプロセスを起動できません。使っていないターミナルを閉じるか、不要なプロセスを終了してから、もう一度お試しください。"
+            "terminalProcessLimit": "システムはこれ以上ターミナルプロセスを起動できません。使っていないターミナルを閉じるか、不要なプロセスを終了してから、もう一度お試しください。",
+            "ownerHostMismatch": "このターミナルの保存済みセッションは別のホスト接続に属しているため、Orca はここで再接続できません。続行するには、新規ターミナルを開いてください。"
           },
           "TerminalProcessExitOverlay": {
             "capacityTitle": "Git Bash のコンソール上限に達しました",
@@ -3724,7 +3738,6 @@
             "54e8d6bb2d": "Fable",
             "d79c3362c4": "5時間",
             "a79c64f87e": "Fable",
-            "8295903d17": "切り替え後に古い会話を続ける前に、ライブ Claude ターミナルを再起動します。",
             "c98ea88392": "他のアカウントはありません",
             "9332ba8684": "切り替え先",
             "d450654fa2": "Claude アカウント",
@@ -6477,7 +6490,6 @@
         "AccountsPane": {
           "c2d2751587": "アカウントの削除",
           "dbb9626ed1": "キャンセル",
-          "854ebbcc45": "Orca は、この保存されたアカウントの管理対象 Claude 認証を削除します。現在アクティブな場合、Orca はシステムのデフォルトの Claude ログインに戻ります。",
           "63843e37e2": "Claude アカウントを削除しますか?",
           "380a7736cc": "このアカウントを削除すると、管理対象の Codex ホームと、その中に保存されているすべての Codex セッション履歴および MCP ログインが完全に削除されます。この操作は元に戻せません。アカウントが現在アクティブな場合、Orca はシステムのデフォルトの Codex ログインに戻ります。",
           "0d47394635": "Codex アカウントを削除しますか?",
@@ -6525,12 +6537,10 @@
           "3fe7862418": "{{value0}} の管理対象 Claude アカウントはありません。ここで追加するまで、Orca はその環境のシステムデフォルトの Claude ログインを使用します。",
           "3455cf43fa": "Claude のログイン。",
           "fcc4093fc1": "現在の {{value0}} Codex ログインを使用します。",
-          "79e484c3b2": "共有 Claude 認証ファイル用のオプションのアカウントスイッチャー。",
           "8bbfd74556": "Claude アカウント",
           "72b36ea174": "任意。Orca は通常の Claude ログインを使用できます。チャットセッションを移さずにすばやく切り替えたい場合にのみ、アカウントを追加してください。",
           "26ef4b55be": "Claude",
           "2743cdc0af": "Claude アカウントの更新に失敗しました。",
-          "b15ce90870": "{{value0}} -> {{value1}}。古いセッションを続行する前に、ライブ Claude ターミナルを再起動します。",
           "f921d32606": "Claude アカウントが更新されました。",
           "5bf8764953": "Codex アカウントの更新に失敗しました。",
           "9baf45d071": "このデバイス",
@@ -8349,7 +8359,7 @@
           "3c88ec55d6": "検索条件に一致する設定が見つかりませんでした:「",
           "c7ad095d96": "設定を読み込んでいます…",
           "acc7bbdefd": "もう一度 ESC を押して設定を終了します",
-          "43b68e10f0": "未保存の AI 設定があります。移動すると変更は破棄されます。",
+          "43b68e10f0": "未保存の AI 設定があります。離れると破棄されます。",
           "17bdee4ff1": "未保存の AI 設定を破棄しますか？",
           "084d8fac5b": "プライバシーとセキュリティ",
           "23931df7e8": "リモートホスト",
@@ -12286,6 +12296,154 @@
           "hostOnly": "Orca を実行しているコンピュータ上のデスクトップアプリでプランサイトと API キーを変更します。",
           "detailsUnavailable": "プランの認証情報の詳細は、Orca を実行しているコンピュータでのみ読み取ることができます。",
           "siteUnavailable": "ホストプランサイトが利用できない"
+        },
+        "managedServers": {
+          "row": {
+            "notRunning": "実行していません",
+            "refresh": "ステータスを更新",
+            "migration": "移行: {{phase}}",
+            "update": "更新",
+            "rollback": "ロールバック",
+            "recover": "回復",
+            "cancelStop": "停止をキャンセル",
+            "confirmStop": "サーバーを停止して削除",
+            "keep": "実行を継続",
+            "stop": "停止…",
+            "deferredVersion": "{{version}} への更新は延期されました。",
+            "confirmRestore": "スナップショットを復元して再起動",
+            "keepState": "状態を保持",
+            "statusUnknown": "ステータス不明",
+            "checking": "確認中…"
+          },
+          "title": "管理対象サーバー",
+          "description": "Orca は空の SSH ホストにサーバーをインストールして実行し、最新の状態に保ちます。",
+          "deploy": {
+            "host": "SSH ホスト",
+            "hostPlaceholder": "空の SSH ホストを選択",
+            "name": "サーバー名",
+            "submit": "サーバーをデプロイ",
+            "running": "デプロイ中…"
+          },
+          "pending": {
+            "resume": "再開"
+          },
+          "access": {
+            "title": "ペアリングされたサーバーの SSH アクセス",
+            "linked": "{{name}}（SSH 経由）",
+            "unlink": "SSH の使用を停止",
+            "target": "SSH ホスト経由で接続",
+            "port": "サーバーポート",
+            "link": "SSH を使用",
+            "linking": "接続中…"
+          },
+          "search": {
+            "title": "管理対象サーバー",
+            "keywordSsh": "ssh"
+          },
+          "phase": {
+            "fenced": "ホストのロック完了",
+            "staged": "コピーのステージング完了",
+            "committed": "コピーのコミット完了",
+            "retired": "完了"
+          },
+          "recovery": {
+            "activate": "更新が中断されました",
+            "rollback": "ロールバックが中断されました",
+            "decommission": "停止が中断されました"
+          },
+          "terminals": {
+            "unknown": "実行中のターミナル: 不明",
+            "count": "実行中のターミナル: {{count}}"
+          },
+          "blocker": {
+            "notFound": "SSH ホストが存在しません。",
+            "owned": "この SSH ホストはすでに管理対象サーバーに属しています。",
+            "catalog": "このホスト上のプロジェクトはまだ移動できません。",
+            "terminals": "このホスト上のターミナルがまだ実行中です（{{count}}）。先に閉じてください。",
+            "portForwards": "保存済みのポート転送は SSH ホストに残ります。",
+            "dependents": "まだ移動できない状態: {{kinds}}。",
+            "unverifiable": "Orca は保存済みの {{sources}} を読み取れなかったため、何が移動するかを判別できません。"
+          },
+          "kind": {
+            "portForward": "ポート転送",
+            "terminalLease": "ターミナル",
+            "terminalRecovery": "ターミナル回復記録",
+            "workspaceSession": "開いているタブとレイアウト",
+            "worktreeMetadata": "ワークツリーの詳細",
+            "worktreeLineage": "ワークツリーの履歴",
+            "workspaceLineage": "ワークスペースの履歴",
+            "sparsePreset": "スパースチェックアウトプリセット",
+            "retiredWorktreeName": "廃止されたワークツリー名",
+            "automation": "オートメーション",
+            "automationRun": "オートメーション実行",
+            "mobileTabSelection": "モバイルのタブ選択",
+            "uiRouting": "サイドバーとフィルターの設定"
+          },
+          "loadFailed": "Orca は SSH ホストと未完了の移動を読み込めませんでした。設定を開き直して、もう一度お試しください。",
+          "outcome": {
+            "live": "未完了: このサーバー上のターミナルがまだ実行中です。閉じてから、もう一度お試しください。",
+            "unverifiable": "未完了: Orca はこのサーバーで何が実行中かを確認できませんでした。ホストに到達できるときに、もう一度お試しください。",
+            "migration": "未完了: このサーバーへの移動が終わっていません。先に再開してください。",
+            "deferred": "まだ未完了です: サーバーはこの操作の準備ができていません。しばらくしてから、もう一度お試しください。",
+            "failed": "Orca はサーバー上でこれを完了できませんでした。もう一度お試しください。"
+          }
+        },
+        "sshHostServer": {
+          "sourceChanged": "古い Orca で変更されました: 管理対象サーバーに再び移動されるまでリレーを実行します。",
+          "unavailable": "リレーを実行します: このホストでは管理対象の Orca サーバーを実行できません（{{reason}}）。",
+          "tunnelUnavailable": "リレーを実行します: このホストの SSH サーバーがポート転送を許可しておらず、Orca は SSH セッション経由でも管理対象サーバーに到達できませんでした。",
+          "deploying": "管理対象の Orca サーバーをセットアップ中…",
+          "converting": "このホストのプロジェクトを管理対象の Orca サーバーに移動中…",
+          "connecting": "管理対象の Orca サーバーに接続中…",
+          "updating": "管理対象サーバーを更新中…",
+          "starting": "管理対象サーバーを起動中…",
+          "notServing": "管理対象の Orca サーバーが実行されておらず、起動できませんでした。",
+          "hostNewer": "より上位バージョンの Orca で管理対象 Orca サーバーを実行しています。そのバージョンが維持されます。",
+          "terminalsLive": "開いている {{count}} 個のターミナルが閉じられるまでリレーを実行し、その後、管理対象サーバーに移動します。",
+          "terminalsLive_one": "開いている {{count}} 個のターミナルが閉じられるまでリレーを実行し、その後、管理対象サーバーに移動します。",
+          "terminalsLive_other": "開いている {{count}} 個のターミナルが閉じられるまでリレーを実行し、その後、管理対象サーバーに移動します。",
+          "terminalsUnverifiable": "リレーを実行します: Orca はターミナルが閉じられたことを確認できませんでした。次回の接続時に移動します。",
+          "retry": "このセッションではリレーを実行します。次回の接続時に管理対象サーバーに移動します。",
+          "failureDetails": "詳細",
+          "unavailableUnknown": "リレーを実行します: このホストでは管理対象の Orca サーバーを実行できません。",
+          "cause": {
+            "unsupportedHost": "Orca にはこのシステム用のサーバービルドがありません",
+            "artifactsUnavailable": "この Orca ビルドにはサーバーが含まれていません",
+            "libcUnidentified": "Orca はホストのシステムライブラリを特定できませんでした",
+            "runtimeSelfTest": "サーバーのランタイムが自己テストに失敗しました",
+            "securitySoftware": "セキュリティソフトウェアがサーバーのランタイムを変更しました",
+            "nativePreflight": "ホストにサーバーが必要とするシステムライブラリがありません"
+          },
+          "updateDeferredLater": "管理対象の Orca サーバーを実行しています。次回の接続時に更新されます。",
+          "updateFailedPrevious": "管理対象の Orca サーバーを以前のバージョンで実行しています。更新に失敗しました。",
+          "terminalsLiveUncounted": "開いているターミナルが閉じられるまでリレーを実行し、その後、管理対象サーバーに移動します。",
+          "refusedBlocked": "管理対象サーバーに移動されませんでした: このホスト上の何かが移動を妨げています。",
+          "terminalsElsewhere": "別の Orca デスクトップまたはセッションがこのホストで開いた {{count}} 個のターミナルが実行中である間は、リレーを実行します。",
+          "terminalsElsewhere_one": "別の Orca デスクトップまたはセッションがこのホストで開いた {{count}} 個のターミナルが実行中である間は、リレーを実行します。",
+          "terminalsElsewhere_other": "別の Orca デスクトップまたはセッションがこのホストで開いた {{count}} 個のターミナルが実行中である間は、リレーを実行します。",
+          "terminalsElsewhereUncounted": "別の Orca デスクトップまたはセッションがこのホストで開いたターミナルが実行中である間は、リレーを実行します。"
+        },
+        "deltaMove": {
+          "action": "新規プロジェクトを移動…",
+          "title": "新規プロジェクトを移動",
+          "description": "このホストは、管理対象サーバーに移動したあとに古いバージョンの Orca によって変更されました。これは作成されたものをサーバーに追加するもので、サーバーにすでにあるものをマージして上書きすることはありません。",
+          "added": "サーバーに追加されました",
+          "nothingNew": "新規に追加するものはありません。",
+          "notReflected": "古いバージョンで変更または削除されました。サーバーは自身のコピーを保持します",
+          "cancel": "キャンセル",
+          "confirm": "新規プロジェクトを移動",
+          "kind": {
+            "repository": "リポジトリ {{name}}",
+            "folder": "フォルダー {{name}}",
+            "group": "プロジェクトグループ {{name}}"
+          }
+        },
+        "keepServer": {
+          "action": "サーバーのバージョンを保持…",
+          "title": "サーバーのバージョンを保持",
+          "description": "このホストはそのまま管理対象サーバーに戻ります。古いバージョンの Orca がここに追加または変更したものは移動されず、クリーンアップされるまでこのコンピュータの保存済み設定にのみ残ります。",
+          "cancel": "キャンセル",
+          "confirm": "サーバーのバージョンを保持"
         }
       },
       "right": {
@@ -14735,7 +14893,6 @@
                 "d90d2e1f6d": "セッションと毎週の使用状況を追跡します。",
                 "8919321417": "Codex のサインインに失敗しました。",
                 "c7b90c140b": "Codex アカウントが追加されました。",
-                "4e71d72912": "Claude のサインインに失敗しました。",
                 "9ddeb558f9": "Claude アカウントが追加されました。",
                 "29d0653961": "サインイン",
                 "945865332e": "サインインする",
@@ -15701,6 +15858,9 @@
         "richMarkdownImageInsertionFeedback": {
           "importedFileKept": "宛先が変更されたため、画像の挿入はキャンセルされました。インポートされたファイルは保持されました。",
           "destinationChanged": "宛先が変更されたため、画像の挿入はキャンセルされました。再試行。"
+        },
+        "useMarkdownDocuments": {
+          "listFailed": "Markdown ドキュメントを一覧表示できませんでした。"
         }
       },
       "diff": {
@@ -17379,7 +17539,17 @@
         "activitySubagentOne": "サブ Agent 実行中: {{value0}}",
         "activitySubagentMany": "{{value0}} 個のサブ Agent が実行中",
         "activityMonitorOne": "監視中: {{value0}}",
-        "activityMonitorMany": "{{value0}} 個のバックグラウンドタスクを監視中"
+        "activityMonitorMany": "{{value0}} 個のバックグラウンドタスクを監視中",
+        "selectWorkspace": "{{value0}} のチャットをすべて選択",
+        "workspaceSelectedCount": "{{value0}}/{{value1}}",
+        "selectAll": "すべてのチャットを選択",
+        "selectAllLabel": "すべて選択",
+        "selectedCount": "{{value1}} 件中 {{value0}} 件を選択",
+        "selectProject": "{{value0}} のチャットをすべて選択",
+        "collapseNode": "{{value0}} を折りたたむ",
+        "expandNode": "{{value0}} を展開します",
+        "selectMachine": "{{value0}} のチャットをすべて選択",
+        "sshHost": "SSH"
       },
       "linear-issue-attribute-filter-coverage-notice": {
         "statusPartialTeamCoverage": "{{value0}}/{{value1}} チームステータスをフィルタリングしています。残りのチームからの問題は含まれません。",
@@ -17417,11 +17587,6 @@
       },
       "native": {
         "chat": {
-          "NativeChatStructuredSession": {
-            "1f772bb5d0": "メッセージの配信は未確認です。",
-            "93ef441197": "メッセージは送信されませんでした。",
-            "a5e7f14068": "再試行"
-          },
           "NativeChatLaunchRetry": {
             "failed": "チャットを開始できませんでした。",
             "unknown": "チャット接続が確認できませんでした。",
@@ -17529,6 +17694,28 @@
         "connecting": "接続中…",
         "reconnect": "再接続",
         "retry": "再試行"
+      },
+      "managedServerMove": {
+        "offer": "接続の信頼性を高めるため、{{host}} を管理対象の Orca サーバーに移動します。開いている {{count}} 個のターミナルが再起動します。",
+        "offer_one": "接続の信頼性を高めるため、{{host}} を管理対象の Orca サーバーに移動します。開いている {{count}} 個のターミナルが再起動します。",
+        "offer_other": "接続の信頼性を高めるため、{{host}} を管理対象の Orca サーバーに移動します。開いている {{count}} 個のターミナルが再起動します。",
+        "moved": "{{host}} は管理対象の Orca サーバーを実行するようになりました。",
+        "refusedLive": "移動されませんでした: {{host}} 上の {{count}} 個のターミナルがまだ実行中です。",
+        "refusedLive_one": "移動されませんでした: {{host}} 上の {{count}} 個のターミナルがまだ実行中です。",
+        "refusedLive_other": "移動されませんでした: {{host}} 上の {{count}} 個のターミナルがまだ実行中です。",
+        "refusedUnverifiable": "移動されませんでした: {{host}} 上の {{count}} 個のターミナルが停止したことを Orca が確認できませんでした。",
+        "refusedUnverifiable_one": "移動されませんでした: {{host}} 上の {{count}} 個のターミナルが停止したことを Orca が確認できませんでした。",
+        "refusedUnverifiable_other": "移動されませんでした: {{host}} 上の {{count}} 個のターミナルが停止したことを Orca が確認できませんでした。",
+        "stayed": "{{host}} はリレーを実行したままです。理由は設定の [SSH ホスト] で確認できます。",
+        "failed": "{{host}} を移動できませんでした: {{reason}}",
+        "running": "{{host}} を管理対象の Orca サーバーに移動中…",
+        "title": "管理対象サーバーに移動",
+        "confirm": "移動",
+        "notNow": "後で",
+        "close": "閉じる",
+        "offerUncounted": "接続の信頼性を高めるため、{{host}} を管理対象の Orca サーバーに移動します。開いているターミナルが再起動します。",
+        "refusedUnverifiableUncounted": "移動されませんでした: {{host}} 上のターミナルが停止したことを Orca が確認できませんでした。",
+        "retry": "再試行"
       }
     },
     "main": {
@@ -17609,6 +17796,8 @@
         "managedAccountUnsupported": "WSL に Claude アカウントが追加されている間、Claude チャットには Windows の Claude アカウントが必要です。",
         "launchFolderMissing": "このチャットが実行されていたフォルダーは存在しなくなりました。このチャットを続けるには、フォルダーを復元してください。",
         "historyInOtherAccount": "このチャットの履歴は別の Claude アカウントにあります。続けるには、そのアカウントに切り替えてください。",
+        "claudeAccountFolderMissing": "選択した Claude アカウントのフォルダーが見つかりません。もう一度サインインするか、別のアカウントを選択してください。",
+        "claudeAccountSetupFailed": "選択した Claude アカウントを設定できませんでした。もう一度試すか、別のアカウントを選択してください。",
         "agentCommandNotRunnable": "[設定] → [Agent] にある {{agent}} の [コマンド] には、Orca が見つけられるプログラムのパスまたは名前を、引数や変数なしで指定する必要があります。変更するか、[リセット] してください。",
         "chooseClaudeAccount": "Claude アカウントの設定で選択または追加してください。",
         "chooseClaudeAccountThenRunCommand": "Claude アカウントの設定で選択または追加してから、/{{command}} をもう一度実行してください。",
@@ -17692,6 +17881,8 @@
         "cannotRunHere": "Orca はここでこの Agent をチャットで実行できません。",
         "unreachable": "Orca は Agent に接続できませんでした。",
         "recordFailed": "Orca はこれをチャットの履歴に保存できませんでした。",
+        "attachmentExpired": "この添付ファイルは期限切れです。",
+        "reattachFile": "削除してから、もう一度添付してください。",
         "conversationCleared": "この会話はクリアされました。",
         "openCurrentConversation": "続けるには、現在の会話を開いてください。",
         "clearUnfinished": "前回の /clear は完了しませんでした。",
@@ -17735,6 +17926,9 @@
         "stopDictation": "ディクテーションを停止する",
         "noSkills": "一致するスキルがありません",
         "localAttachmentUnsupported": "ローカル添付ファイルはリモートセッションでは使用できません。",
+        "attachFailed": "{{files}} を添付できませんでした。",
+        "attachFailedBecause": "{{files}} を添付できませんでした。{{reason}}",
+        "uploadingFile": "{{name}} をアップロードしています…",
         "removeAttachment": "添付ファイルを削除する",
         "pastedImageLabel": "貼り付けた画像",
         "draftNotSaved": "この下書きはまだ保存できていません。Orca は保存を再試行し続けます。",
@@ -17997,6 +18191,7 @@
       },
       "receipt": {
         "unavailable": "選択した回答は利用できません",
+        "emptyAnswer": "空の回答",
         "cancelled": "キャンセル",
         "resolved": "解決済み",
         "resolver": "{{device}} に回答しました",
@@ -18008,9 +18203,13 @@
         "plan": "プラン",
         "historyRepaired": "このチャットの履歴の一部を読み込めませんでした。",
         "historyItemTooLarge": "チャットのこの部分は大きすぎるため表示できません。",
-        "stoppedBeforeStart": "Agent の開始前に停止しました",
+        "stoppedBeforeStart": "手動で停止しました",
         "dismiss": "閉じる",
-        "copyError": "エラーをコピー"
+        "copyError": "エラーをコピー",
+        "orcaStopUpdate": "この応答の途中で、{{machine}} の Orca がアップデートのため再起動しました。",
+        "orcaStopQuit": "この応答の途中で、{{machine}} の Orca が終了しました。",
+        "orcaStopCrash": "この応答の途中で、{{machine}} の Orca が予期せず停止しました。",
+        "orcaStopCanContinue": "この会話で続行できます。"
       },
       "providerFrame": {
         "byteLength": "{{value0}}バイト"
@@ -18136,9 +18335,14 @@
         "estimated": "最後の応答から推定。"
       },
       "dismissDeliveryNotice": "閉じる",
+      "addSelectionToChat": "チャットに追加",
       "messageNotSent": "メッセージは送信されませんでした",
       "deliveryUnconfirmed": "配信を確認できません — 再試行する前にチャットを確認してください",
       "messageSending": "送信中…",
+      "userMessage": {
+        "showFull": "メッセージ全体を表示",
+        "showLess": "折りたたむ"
+      },
       "queuedMessages": {
         "alreadySent": "このメッセージはすでに送信されています。",
         "editAlreadySent": "すでに送信されています — テキストは入力欄に残っています。",
@@ -18155,10 +18359,8 @@
         "turnOffQueueing": "キューへの追加をオフにする",
         "withdrawnHold": "送信前に停止されました",
         "pausedSendFailed": "送信できませんでした。「送信」を押して再試行してください。",
-        "pausedKept": "まだ送信されていません。「送信」を押すと送信されます。",
         "paused": "一時停止中",
         "queuePausedStopped": "中断したため、キューを一時停止しました",
-        "queuePausedCleared": "会話を消去したため、キューを一時停止しました",
         "queuePaused": "キューは一時停止中です",
         "resume": "再開",
         "sendConfirmTitle": "メッセージを送信しますか？",
@@ -18179,7 +18381,37 @@
         "offline": "{{hostName}} はオフラインです",
         "reconnecting": "{{hostName}} に再接続しています…",
         "reconnect": "再接続"
-      }
+      },
+      "interruptedContinue": {
+        "continue": "続行",
+        "failed": "このチャットを続行できませんでした。もう一度試すか、メッセージを送信してください。",
+        "explanation": "続行すると、Agent はまず最後の手順が完了したかどうかを確認します。"
+      },
+      "rewind": {
+        "unsupported": "このチャットは以前のメッセージに戻れません。",
+        "historyNotPaginated": "この古い Codex チャットは以前のメッセージに戻れません。「ここに巻き戻す」を使用するには、新規チャットを開始してください。",
+        "busy": "Agent がアイドル状態になり、このチャットであなたの対応を待つものがなくなると利用できます。",
+        "staleEpoch": "会話が変更されました。最新のメッセージを確認して、もう一度お試しください。",
+        "invalidTarget": "会話をこのメッセージに戻すことはできません。何も変更されていません。",
+        "historyLimit": "この会話は長すぎて巻き戻せません。何も変更されていません。",
+        "providerRefused": "Agent はこのメッセージに戻れませんでした。",
+        "proofMismatch": "Agent の履歴がこのチャットと一致しませんでした。続行する前に会話を確認してください。",
+        "outcomeUnknown": "Orca は会話が以前のメッセージに戻ったかどうかを確認できませんでした。次のメッセージが送信される前に確認します。",
+        "outcomeUnknownReturned": "Orca は会話がこのメッセージに戻ったかどうかを確認できませんでした。メッセージは入力欄に戻っており、次のメッセージが送信される前に Orca が会話を確認します。",
+        "timeout": "このメッセージに戻った後、チャットが更新されませんでした。最新の内容を確認するには、開き直してください。",
+        "refused": "Orca はこのメッセージに戻れませんでした。続行する前に会話を確認してください。",
+        "unavailable": "チャットの接続が完了するまでお待ちください。",
+        "pending": "会話が以前のメッセージに戻るまでお待ちください。",
+        "title": "ここに巻き戻しますか?",
+        "confirmation": "このメッセージとそれ以降をすべて破棄しますか? メッセージは入力欄に戻り、編集して再送信できます。ディスク上のファイルの変更は保持されます。",
+        "confirm": "巻き戻す",
+        "cancel": "キャンセル",
+        "action": "ここに巻き戻す"
+      },
+      "visualUnavailable": "ビジュアライゼーションを利用できません",
+      "visualLoading": "ビジュアライゼーションを読み込み中",
+      "visualOpenInSidebar": "サイドバーで開く",
+      "visualClose": "ビジュアライゼーションを閉じる"
     },
     "tab": {
       "bar": {
@@ -18536,6 +18768,13 @@
       "label": "担当者",
       "automatic": "自動",
       "assignToMe": "自分に割り当てる（{{name}}）"
+    },
+    "markdown-callout": {
+      "note": "メモ",
+      "tip": "ヒント",
+      "important": "重要",
+      "warning": "警告",
+      "caution": "注意"
     }
   },
   "dashboardPopout": {
@@ -18857,7 +19096,8 @@
     }
   },
   "quickOpen": {
-    "moreMatchesAvailable": "さらに多くの一致が利用可能になる可能性があります。検索を絞り込んで結果を絞り込みます。"
+    "moreMatchesAvailable": "さらに多くの一致が利用可能になる可能性があります。検索を絞り込んで結果を絞り込みます。",
+    "recentValidationFailed": "最近のファイルを確認できませんでした: {{error}}"
   },
   "checksPanel": {
     "unlinked": {
@@ -19115,9 +19355,6 @@
       "oldTerminalDialogRisk": "サーバーを共有する Codex セッションが同時に終了する可能性があり、Agent のステータスが間違っている可能性があります。",
       "oldTerminalDialogCause": "古いターミナルは依然として Codex サーバーを共有しています。新規ターミナルを開いて、別のサーバーで Codex を実行します。",
       "fix": "修理",
-      "openNewTerminal": "新規ターミナルを開く",
-      "dontShowAgain": "二度と表示しないでください",
-      "dismiss": "閉じる",
       "dialogTitle": "各 Codex タブに独自のサーバーを与える",
       "dialogDescription": "ターミナルで直接開始された Codex セッションは、1 つのバックグラウンドサーバーを共有します。 Orca は、開始する Codex セッションを個別に保持します。セッションがサーバーを共有している場合、1 つを閉じると他のセッションも終了し、Agent のステータスが不正になる可能性があります。",
       "copy": "コピー",
@@ -19128,7 +19365,6 @@
       "step2Title": "稼働中の共有サーバーを停止します",
       "undo": "元に戻すには、codex features enable daemon_auto_start を実行します。",
       "step2Warning": "サーバーを共有している開いている Codex セッションをすべて閉じます。",
-      "learnMore": "詳しく見る",
       "turnOff": "消す",
       "turningOff": "オフにしています…",
       "turnedOff": "オフになっています",
@@ -19141,6 +19377,15 @@
       "confirmStopDescription": "これにより、Orca 外部のものも含め、それを共有している開いている Codex セッションがすべて閉じられます。",
       "cancel": "キャンセル",
       "runs": "走る"
+    },
+    "paneMove": {
+      "failed": "ペインを新規タブに移動できませんでした。"
+    },
+    "paneTopBanner": {
+      "openNewTerminal": "新規ターミナルを開く",
+      "learnMore": "詳しく見る",
+      "dontShowAgain": "二度と表示しないでください",
+      "dismiss": "閉じる"
     }
   },
   "fileSearch": {
@@ -19199,5 +19444,25 @@
     "unavailable": "このメディアファイルを再生できません。ファイルが利用できないか、コーデックが対応していない可能性があります。",
     "openFailed": "既定のアプリでファイルを開けませんでした。",
     "openDefault": "既定のアプリで開く"
+  },
+  "projectBoard": {
+    "noColumnField": "このボードビューにはグループ化に使える単一選択フィールドまたは反復フィールドがないため、代わりに Orca が項目を一覧表示します。",
+    "noField": "{{field}} なし"
+  },
+  "projectBoardCard": {
+    "restrictedItem": "制限された項目",
+    "itemLabel": "{{number}} — {{title}}"
+  },
+  "projectViews": {
+    "layout": {
+      "board": "ボード"
+    },
+    "unsupported": {
+      "switchLayout": "Orca でこのプロジェクトを操作するには、テーブル、ボード、またはロードマップビューに切り替えます。",
+      "description": "Orca はテーブル、ボード、ロードマップのプロジェクトビューをレンダリングします。このビューは、まだレンダリングできないレイアウトを使用しています。"
+    }
+  },
+  "projectField": {
+    "updateFailed": "プロジェクトフィールドを更新できませんでした"
   }
 }
diff --git a/src/renderer/src/i18n/locales/ko.json b/src/renderer/src/i18n/locales/ko.json
index d6222905cf21..9a44b566ddfa 100644
--- a/src/renderer/src/i18n/locales/ko.json
+++ b/src/renderer/src/i18n/locales/ko.json
@@ -146,7 +146,15 @@
         "title": "Codex 탭이 서버를 공유할 때 경고",
         "description": "에이전트 상태가 잘못되었을 수 있으므로 서버를 다른 탭과 공유할 때 직접 시작한 Codex에 대한 알림을 표시합니다."
       }
-    }
+    },
+    "followSymlinkedDirectoriesKeywords": {
+      "symlink": "심볼릭 링크",
+      "linkedFolder": "연결된 폴더",
+      "quickOpen": "Quick Open",
+      "fileExplorer": "파일 탐색기"
+    },
+    "followSymlinkedDirectories": "심볼릭 링크 디렉터리 따라가기",
+    "followSymlinkedDirectoriesDescription": "Quick Open에서 연결된 폴더를 검색하고 파일 탐색기에서 로컬 연결 폴더를 펼칩니다."
   },
   "menu": {
     "checkForUpdates": "업데이트 확인...",
@@ -1168,6 +1176,11 @@
             }
           }
         }
+      },
+      "ipcEvents": {
+        "sshManagedServer": {
+          "refusedBlocked": "이 SSH 호스트는 관리형 Orca 서버로 이동할 수 없습니다. 이유는 설정의 SSH 호스트에서 확인할 수 있습니다."
+        }
       }
     },
     "components": {
@@ -3154,7 +3167,8 @@
             "heldByPreviousRelay": "이 터미널은 이전 버전의 Orca에서 호스트에서 계속 실행 중이며, 이 버전에서는 연결할 수 없습니다. 종료될 때까지 계속 실행됩니다. 여기서 계속 작업하려면 새 터미널을 여세요.",
             "sourceRestoring": "이 터미널을 다시 연결하는 중 - 출력이 다시 설정되고 있습니다. 세션이 아직 실행 중입니다.",
             "ptyAllocationLimit": "시스템에서 더 이상 pty 장치를 할당할 수 없습니다. Orca 또는 다른 프로그램에서 사용하지 않는 터미널을 몇 개 닫은 후 다시 시도하세요.",
-            "terminalProcessLimit": "시스템에서 터미널 프로세스를 더 시작할 수 없습니다. 사용하지 않는 터미널을 닫거나 불필요한 프로세스를 종료한 후 다시 시도하세요."
+            "terminalProcessLimit": "시스템에서 터미널 프로세스를 더 시작할 수 없습니다. 사용하지 않는 터미널을 닫거나 불필요한 프로세스를 종료한 후 다시 시도하세요.",
+            "ownerHostMismatch": "이 터미널의 저장된 세션은 다른 호스트 연결에 속해 있어 Orca가 여기에서 다시 연결할 수 없습니다. 계속하려면 새 터미널을 여세요."
           },
           "TerminalProcessExitOverlay": {
             "capacityTitle": "Git Bash 콘솔 한도에 도달했습니다",
@@ -3724,7 +3738,6 @@
             "54e8d6bb2d": "Fable",
             "d79c3362c4": "5h",
             "a79c64f87e": "Fable",
-            "8295903d17": "전환 후 이전 대화를 계속하려면 활성 Claude terminal을 다시 시작하세요.",
             "c98ea88392": "다른 계정 없음",
             "9332ba8684": "다음으로 전환",
             "d450654fa2": "Claude 계정",
@@ -6477,7 +6490,6 @@
         "AccountsPane": {
           "c2d2751587": "계정 삭제",
           "dbb9626ed1": "취소",
-          "854ebbcc45": "Orca는 저장된 계정에 대해 관리되는 Claude 인증을 삭제합니다. 현재 활성화된 경우 Orca는 시스템 기본 Claude 로그인으로 대체됩니다.",
           "63843e37e2": "Claude 계정을 삭제하시겠습니까?",
           "380a7736cc": "이 계정을 제거하면 관리되는 Codex 홈과 그 안에 저장된 모든 Codex 세션 기록 및 MCP 로그인이 영구적으로 삭제됩니다. 이 작업은 실행 취소할 수 없습니다. 계정이 현재 활성 상태인 경우 Orca는 시스템 기본 Codex 로그인으로 전환됩니다.",
           "0d47394635": "Codex 계정을 제거하시겠습니까?",
@@ -6525,12 +6537,10 @@
           "3fe7862418": "{{value0}}에 대한 관리된 Claude 계정이 없습니다. Orca는 여기에 추가할 때까지 해당 환경의 시스템 기본 Claude 로그인을 사용합니다.",
           "3455cf43fa": "Claude 로그인.",
           "fcc4093fc1": "현재 {{value0}} Codex 로그인을 사용하세요.",
-          "79e484c3b2": "공유 Claude 인증 파일에 대한 선택적 계정 전환기입니다.",
           "8bbfd74556": "Claude 계정",
           "72b36ea174": "선택 사항. Orca는 일반적인 Claude 로그인을 사용할 수 있습니다. 채팅 세션을 이동하지 않고 빠르게 전환하려는 경우에만 계정을 추가하세요.",
           "26ef4b55be": "Claude",
           "2743cdc0af": "Claude 계정 업데이트에 실패했습니다.",
-          "b15ce90870": "{{value0}} -> {{value1}}. 이전 세션을 계속하기 전에 실행 중인 Claude terminals을 다시 시작하세요.",
           "f921d32606": "Claude 계정이 업데이트되었습니다.",
           "5bf8764953": "Codex 계정 업데이트에 실패했습니다.",
           "9baf45d071": "이 기기",
@@ -8312,7 +8322,7 @@
           "3c88ec55d6": "\"에 대한 설정을 찾을 수 없습니다.",
           "c7ad095d96": "설정 로드 중...",
           "acc7bbdefd": "설정을 종료하려면 ESC를 다시 누르세요.",
-          "43b68e10f0": "저장하지 않은 AI 설정이 있습니다. 나가면 변경 사항이 버려집니다.",
+          "43b68e10f0": "저장하지 않은 AI 설정이 있습니다. 나가면 해당 설정이 버려집니다.",
           "17bdee4ff1": "저장하지 않은 AI 설정을 버리시겠습니까?",
           "084d8fac5b": "개인 정보 보호 및 보안",
           "23931df7e8": "원격 호스트",
@@ -12286,6 +12296,154 @@
           "hostOnly": "ORCA를 실행하는 컴퓨터의 데스크톱 앱에서 요금제 사이트 및 API 키를 변경합니다.",
           "detailsUnavailable": "플랜 자격 증명 세부 정보는 ORCA를 실행하는 컴퓨터에서만 읽을 수 있습니다.",
           "siteUnavailable": "호스트 요금제 사이트 이용 불가"
+        },
+        "managedServers": {
+          "row": {
+            "notRunning": "실행 중이 아님",
+            "refresh": "상태 새로 고침",
+            "migration": "마이그레이션: {{phase}}",
+            "update": "업데이트",
+            "rollback": "롤백",
+            "recover": "복구",
+            "cancelStop": "중지 취소",
+            "confirmStop": "서버 중지 및 제거",
+            "keep": "계속 실행",
+            "stop": "중지…",
+            "deferredVersion": "{{version}}(으)로의 업데이트가 보류되었습니다.",
+            "confirmRestore": "스냅샷 복원 및 다시 시작",
+            "keepState": "상태 유지",
+            "statusUnknown": "상태 알 수 없음",
+            "checking": "확인 중…"
+          },
+          "title": "관리형 서버",
+          "description": "Orca는 빈 SSH 호스트에 서버를 설치하고 실행하며 최신 상태로 유지합니다.",
+          "deploy": {
+            "host": "SSH 호스트",
+            "hostPlaceholder": "빈 SSH 호스트를 선택하세요",
+            "name": "서버 이름",
+            "submit": "서버 배포",
+            "running": "배포 중…"
+          },
+          "pending": {
+            "resume": "재개"
+          },
+          "access": {
+            "title": "페어링된 서버의 SSH 액세스",
+            "linked": "SSH를 통한 {{name}}",
+            "unlink": "SSH 사용 중지",
+            "target": "SSH 호스트를 통해 연결",
+            "port": "서버 포트",
+            "link": "SSH 사용",
+            "linking": "연결 중…"
+          },
+          "search": {
+            "title": "관리형 서버",
+            "keywordSsh": "ssh"
+          },
+          "phase": {
+            "fenced": "호스트 잠김",
+            "staged": "복사 준비됨",
+            "committed": "복사 확정됨",
+            "retired": "완료"
+          },
+          "recovery": {
+            "activate": "업데이트가 중단되었습니다",
+            "rollback": "롤백이 중단되었습니다",
+            "decommission": "중지가 중단되었습니다"
+          },
+          "terminals": {
+            "unknown": "실행 중인 터미널: 알 수 없음",
+            "count": "실행 중인 터미널: {{count}}"
+          },
+          "blocker": {
+            "notFound": "SSH 호스트가 사라졌습니다.",
+            "owned": "이 SSH 호스트는 이미 관리형 서버에 속해 있습니다.",
+            "catalog": "이 호스트의 프로젝트는 아직 이동할 수 없습니다.",
+            "terminals": "이 호스트의 터미널이 아직 실행 중입니다({{count}}개). 먼저 닫으세요.",
+            "portForwards": "저장된 포트 포워딩은 SSH 호스트에 그대로 남습니다.",
+            "dependents": "아직 이동할 수 없는 상태: {{kinds}}.",
+            "unverifiable": "Orca가 저장된 {{sources}}을(를) 읽을 수 없어 무엇이 이동할지 판단할 수 없습니다."
+          },
+          "kind": {
+            "portForward": "포트 포워딩",
+            "terminalLease": "터미널",
+            "terminalRecovery": "터미널 복구 기록",
+            "workspaceSession": "열린 탭과 레이아웃",
+            "worktreeMetadata": "워크트리 세부 정보",
+            "worktreeLineage": "워크트리 기록",
+            "workspaceLineage": "워크스페이스 기록",
+            "sparsePreset": "스파스 체크아웃 사전 설정",
+            "retiredWorktreeName": "종료된 워크트리 이름",
+            "automation": "자동화",
+            "automationRun": "자동화 실행",
+            "mobileTabSelection": "모바일 탭 선택",
+            "uiRouting": "사이드바 및 필터 설정"
+          },
+          "loadFailed": "Orca가 SSH 호스트와 미완료 이동을 불러오지 못했습니다. 설정을 다시 열어 시도하세요.",
+          "outcome": {
+            "live": "완료되지 않음: 이 서버의 터미널이 아직 실행 중입니다. 닫고 다시 시도하세요.",
+            "unverifiable": "완료되지 않음: Orca가 이 서버에서 무엇이 실행 중인지 확인하지 못했습니다. 호스트에 연결할 수 있을 때 다시 시도하세요.",
+            "migration": "완료되지 않음: 이 서버로의 이동이 끝나지 않았습니다. 먼저 재개하세요.",
+            "deferred": "아직 완료되지 않음: 서버가 아직 준비되지 않았습니다. 나중에 다시 시도하세요.",
+            "failed": "Orca가 서버에서 이 작업을 완료하지 못했습니다. 다시 시도하세요."
+          }
+        },
+        "sshHostServer": {
+          "sourceChanged": "이전 Orca에서 변경됨: 관리형 서버로 다시 이동할 때까지 릴레이를 실행합니다.",
+          "unavailable": "릴레이를 실행합니다: 이 호스트에서는 관리형 Orca 서버를 실행할 수 없습니다({{reason}}).",
+          "tunnelUnavailable": "릴레이를 실행합니다: 이 호스트의 SSH 서버가 포트 포워딩을 허용하지 않으며, Orca도 SSH 세션을 통해 관리형 서버에 연결할 수 없었습니다.",
+          "deploying": "관리형 Orca 서버 설정 중…",
+          "converting": "이 호스트의 프로젝트를 관리형 Orca 서버로 이동하는 중…",
+          "connecting": "관리형 Orca 서버에 연결 중…",
+          "updating": "관리형 서버 업데이트 중…",
+          "starting": "관리형 서버 시작 중…",
+          "notServing": "관리형 Orca 서버가 실행 중이 아니며 시작할 수도 없었습니다.",
+          "hostNewer": "더 새로운 Orca의 관리형 Orca 서버를 실행합니다. 해당 버전을 유지합니다.",
+          "terminalsLive": "열린 터미널 {{count}}개가 닫힐 때까지 릴레이를 실행한 다음 관리형 서버로 이동합니다.",
+          "terminalsLive_one": "열린 터미널 {{count}}개가 닫힐 때까지 릴레이를 실행한 다음 관리형 서버로 이동합니다.",
+          "terminalsLive_other": "열린 터미널 {{count}}개가 닫힐 때까지 릴레이를 실행한 다음 관리형 서버로 이동합니다.",
+          "terminalsUnverifiable": "릴레이를 실행합니다: Orca가 터미널이 닫혔는지 확인하지 못했습니다. 다음 연결 시 이동합니다.",
+          "retry": "이 세션에서는 릴레이를 실행합니다. 다음 연결 시 관리형 서버로 이동합니다.",
+          "failureDetails": "세부 정보",
+          "unavailableUnknown": "릴레이를 실행합니다: 이 호스트에서는 관리형 Orca 서버를 실행할 수 없습니다.",
+          "cause": {
+            "unsupportedHost": "Orca에는 이 시스템용 서버 빌드가 없습니다",
+            "artifactsUnavailable": "이 Orca 빌드에는 서버가 포함되어 있지 않습니다",
+            "libcUnidentified": "Orca가 호스트의 시스템 라이브러리를 식별하지 못했습니다",
+            "runtimeSelfTest": "서버 런타임이 자체 테스트에 실패했습니다",
+            "securitySoftware": "보안 소프트웨어가 서버 런타임을 변경했습니다",
+            "nativePreflight": "호스트에 서버에 필요한 시스템 라이브러리가 없습니다"
+          },
+          "updateDeferredLater": "관리형 Orca 서버를 실행합니다. 다음 연결 시 업데이트됩니다.",
+          "updateFailedPrevious": "관리형 Orca 서버를 이전 버전으로 실행합니다. 업데이트에 실패했습니다.",
+          "terminalsLiveUncounted": "열린 터미널이 닫힐 때까지 릴레이를 실행한 다음 관리형 서버로 이동합니다.",
+          "refusedBlocked": "관리형 서버로 이동하지 않음: 이 호스트의 무언가가 이동을 막고 있습니다.",
+          "terminalsElsewhere": "다른 Orca 데스크톱 또는 세션이 이 호스트에서 연 터미널 {{count}}개가 실행되는 동안 릴레이를 실행합니다.",
+          "terminalsElsewhere_one": "다른 Orca 데스크톱 또는 세션이 이 호스트에서 연 터미널 {{count}}개가 실행되는 동안 릴레이를 실행합니다.",
+          "terminalsElsewhere_other": "다른 Orca 데스크톱 또는 세션이 이 호스트에서 연 터미널 {{count}}개가 실행되는 동안 릴레이를 실행합니다.",
+          "terminalsElsewhereUncounted": "다른 Orca 데스크톱 또는 세션이 이 호스트에서 연 터미널이 실행되는 동안 릴레이를 실행합니다."
+        },
+        "deltaMove": {
+          "action": "새 프로젝트 이동…",
+          "title": "새 프로젝트 이동",
+          "description": "이전 버전의 Orca가 이 호스트가 관리형 서버로 이동한 뒤에 변경했습니다. 생성된 항목을 서버에 추가하며, 서버에 이미 있는 내용 위에 병합하지는 않습니다.",
+          "added": "서버에 추가됨",
+          "nothingNew": "추가할 새 항목이 없습니다.",
+          "notReflected": "이전 버전에서 변경되거나 제거됨. 서버는 자체 복사본을 유지합니다.",
+          "cancel": "취소",
+          "confirm": "새 프로젝트 이동",
+          "kind": {
+            "repository": "저장소 {{name}}",
+            "folder": "폴더 {{name}}",
+            "group": "프로젝트 그룹 {{name}}"
+          }
+        },
+        "keepServer": {
+          "action": "서버 버전 유지…",
+          "title": "서버 버전 유지",
+          "description": "이 호스트는 현재 상태 그대로 관리형 서버로 돌아갑니다. 이전 버전의 Orca가 여기에서 추가하거나 변경한 내용은 이동되지 않으며, 정리될 때까지 이 컴퓨터의 저장된 설정에만 남습니다.",
+          "cancel": "취소",
+          "confirm": "서버 버전 유지"
         }
       },
       "right": {
@@ -14735,7 +14893,6 @@
                 "d90d2e1f6d": "세션 및 주간 사용량을 추적합니다.",
                 "8919321417": "Codex 로그인에 실패했습니다.",
                 "c7b90c140b": "Codex 계정이 추가되었습니다.",
-                "4e71d72912": "Claude 로그인에 실패했습니다.",
                 "9ddeb558f9": "Claude 계정이 추가되었습니다.",
                 "29d0653961": "로그인",
                 "945865332e": "로그인 중",
@@ -15701,6 +15858,9 @@
         "richMarkdownImageInsertionFeedback": {
           "importedFileKept": "목적지가 변경되어 이미지 삽입이 취소되었습니다. 가져온 파일이 보관되었습니다.",
           "destinationChanged": "목적지가 변경되어 이미지 삽입이 취소되었습니다. 다시 시도하십시오."
+        },
+        "useMarkdownDocuments": {
+          "listFailed": "Markdown 문서를 나열하지 못했습니다."
         }
       },
       "diff": {
@@ -17379,7 +17539,17 @@
         "activitySubagentOne": "하위 에이전트 실행 중: {{value0}}",
         "activitySubagentMany": "하위 에이전트 {{value0}}개 실행 중",
         "activityMonitorOne": "모니터링 중: {{value0}}",
-        "activityMonitorMany": "백그라운드 작업 {{value0}}개 모니터링 중"
+        "activityMonitorMany": "백그라운드 작업 {{value0}}개 모니터링 중",
+        "selectWorkspace": "{{value0}}의 채팅 모두 선택",
+        "workspaceSelectedCount": "{{value0}}/{{value1}}",
+        "selectAll": "모든 채팅 선택",
+        "selectAllLabel": "모두 선택",
+        "selectedCount": "{{value1}}개 중 {{value0}}개 선택됨",
+        "selectProject": "{{value0}}의 채팅 모두 선택",
+        "collapseNode": "{{value0}} 접기",
+        "expandNode": "{{value0}} 확장",
+        "selectMachine": "{{value0}}의 채팅 모두 선택",
+        "sshHost": "SSH"
       },
       "linear-issue-attribute-filter-coverage-notice": {
         "statusPartialTeamCoverage": "{{value1}} 팀 상태 중 {{value0}} 필터링 중 - 나머지 팀의 문제는 포함되지 않습니다.",
@@ -17417,11 +17587,6 @@
       },
       "native": {
         "chat": {
-          "NativeChatStructuredSession": {
-            "1f772bb5d0": "메시지 전달이 확인되지 않았습니다.",
-            "93ef441197": "메시지가 전송되지 않았습니다.",
-            "a5e7f14068": "다시 시도"
-          },
           "NativeChatLaunchRetry": {
             "failed": "채팅을 시작할 수 없습니다.",
             "unknown": "채팅 연결을 확인할 수 없습니다.",
@@ -17529,6 +17694,28 @@
         "connecting": "연결 중…",
         "reconnect": "다시 연결",
         "retry": "재시도"
+      },
+      "managedServerMove": {
+        "offer": "더 안정적인 연결을 위해 {{host}}을(를) 관리형 Orca 서버로 이동합니다. 열린 터미널 {{count}}개가 다시 시작됩니다.",
+        "offer_one": "더 안정적인 연결을 위해 {{host}}을(를) 관리형 Orca 서버로 이동합니다. 열린 터미널 {{count}}개가 다시 시작됩니다.",
+        "offer_other": "더 안정적인 연결을 위해 {{host}}을(를) 관리형 Orca 서버로 이동합니다. 열린 터미널 {{count}}개가 다시 시작됩니다.",
+        "moved": "{{host}}이(가) 이제 관리형 Orca 서버를 실행합니다.",
+        "refusedLive": "이동하지 않음: {{host}}의 터미널 {{count}}개가 아직 실행 중입니다.",
+        "refusedLive_one": "이동하지 않음: {{host}}의 터미널 {{count}}개가 아직 실행 중입니다.",
+        "refusedLive_other": "이동하지 않음: {{host}}의 터미널 {{count}}개가 아직 실행 중입니다.",
+        "refusedUnverifiable": "이동하지 않음: Orca가 {{host}}의 터미널 {{count}}개가 중지되었는지 확인하지 못했습니다.",
+        "refusedUnverifiable_one": "이동하지 않음: Orca가 {{host}}의 터미널 {{count}}개가 중지되었는지 확인하지 못했습니다.",
+        "refusedUnverifiable_other": "이동하지 않음: Orca가 {{host}}의 터미널 {{count}}개가 중지되었는지 확인하지 못했습니다.",
+        "stayed": "{{host}}은(는) 여전히 릴레이를 실행합니다. 이유는 설정의 SSH 호스트에서 확인할 수 있습니다.",
+        "failed": "{{host}}을(를) 이동하지 못했습니다: {{reason}}",
+        "running": "{{host}}을(를) 관리형 Orca 서버로 이동하는 중…",
+        "title": "관리형 서버로 이동",
+        "confirm": "이동",
+        "notNow": "나중에",
+        "close": "닫기",
+        "offerUncounted": "더 안정적인 연결을 위해 {{host}}을(를) 관리형 Orca 서버로 이동합니다. 열린 터미널이 다시 시작됩니다.",
+        "refusedUnverifiableUncounted": "이동하지 않음: Orca가 {{host}}의 터미널이 중지되었는지 확인하지 못했습니다.",
+        "retry": "다시 시도"
       }
     },
     "main": {
@@ -17609,6 +17796,8 @@
         "managedAccountUnsupported": "WSL에 Claude 계정이 추가되어 있는 동안에는 Claude 채팅에 Windows Claude 계정이 필요합니다.",
         "launchFolderMissing": "이 채팅이 실행되던 폴더가 더 이상 존재하지 않습니다. 이 채팅을 계속하려면 폴더를 복원하세요.",
         "historyInOtherAccount": "이 채팅의 기록은 다른 Claude 계정에 있습니다. 계속하려면 해당 계정으로 다시 전환하세요.",
+        "claudeAccountFolderMissing": "선택한 Claude 계정의 폴더가 없습니다. 다시 로그인하거나 다른 계정을 선택하세요.",
+        "claudeAccountSetupFailed": "선택한 Claude 계정을 설정할 수 없습니다. 다시 시도하거나 다른 계정을 선택하세요.",
         "agentCommandNotRunnable": "{{agent}}의 설정 → 에이전트 → 명령은 Orca가 찾을 수 있는 프로그램 경로나 이름이어야 하며, 인수나 변수를 포함할 수 없습니다. 변경하거나 재설정하세요.",
         "chooseClaudeAccount": "Claude 계정 설정에서 선택하거나 추가하세요.",
         "chooseClaudeAccountThenRunCommand": "Claude 계정 설정에서 선택하거나 추가한 다음 /{{command}}을(를) 다시 실행하세요.",
@@ -17692,6 +17881,8 @@
         "cannotRunHere": "Orca는 여기에서 이 에이전트를 채팅으로 실행할 수 없습니다.",
         "unreachable": "Orca가 에이전트에 연결하지 못했습니다.",
         "recordFailed": "Orca가 이 내용을 채팅 기록에 저장하지 못했습니다.",
+        "attachmentExpired": "이 첨부 파일이 만료되었습니다.",
+        "reattachFile": "제거한 후 다시 첨부하세요.",
         "conversationCleared": "이 대화는 지워졌습니다.",
         "openCurrentConversation": "계속하려면 현재 대화를 여세요.",
         "clearUnfinished": "마지막 /clear가 완료되지 않았습니다.",
@@ -17735,6 +17926,9 @@
         "stopDictation": "받아쓰기 중지",
         "noSkills": "어울리는 스킬 없음",
         "localAttachmentUnsupported": "원격 세션에는 로컬 첨부 파일을 사용할 수 없습니다.",
+        "attachFailed": "{{files}}을(를) 첨부할 수 없습니다.",
+        "attachFailedBecause": "{{files}}을(를) 첨부할 수 없습니다. {{reason}}",
+        "uploadingFile": "{{name}} 업로드 중…",
         "removeAttachment": "첨부파일 삭제",
         "pastedImageLabel": "붙여넣은 이미지",
         "draftNotSaved": "이 초안을 아직 저장하지 못했습니다. Orca가 계속 다시 시도합니다.",
@@ -17997,6 +18191,7 @@
       },
       "receipt": {
         "unavailable": "선택한 답변을 사용할 수 없습니다.",
+        "emptyAnswer": "빈 답변",
         "cancelled": "취소",
         "resolved": "해결됨",
         "resolver": "{{device}}에 답변됨",
@@ -18008,9 +18203,13 @@
         "plan": "계획",
         "historyRepaired": "이 채팅 기록의 일부를 불러올 수 없습니다.",
         "historyItemTooLarge": "채팅의 이 부분은 너무 커서 표시할 수 없습니다.",
-        "stoppedBeforeStart": "에이전트가 시작되기 전에 중지됨",
+        "stoppedBeforeStart": "수동으로 중지됨",
         "dismiss": "닫기",
-        "copyError": "오류 복사"
+        "copyError": "오류 복사",
+        "orcaStopUpdate": "이 응답이 진행되는 동안 {{machine}}의 Orca가 업데이트를 위해 다시 시작되었습니다.",
+        "orcaStopQuit": "이 응답이 진행되는 동안 {{machine}}의 Orca가 종료되었습니다.",
+        "orcaStopCrash": "이 응답이 진행되는 동안 {{machine}}의 Orca가 예기치 않게 중지되었습니다.",
+        "orcaStopCanContinue": "이 대화에서 계속할 수 있습니다."
       },
       "providerFrame": {
         "byteLength": "{{value0}}바이트"
@@ -18136,9 +18335,14 @@
         "estimated": "마지막 응답 기준 추정치입니다."
       },
       "dismissDeliveryNotice": "닫기",
+      "addSelectionToChat": "채팅에 추가",
       "messageNotSent": "메시지가 전송되지 않음",
       "deliveryUnconfirmed": "전달 확인 안 됨 — 다시 시도하기 전에 채팅을 확인하세요",
       "messageSending": "전송 중…",
+      "userMessage": {
+        "showFull": "전체 메시지 표시",
+        "showLess": "접기"
+      },
       "queuedMessages": {
         "alreadySent": "이 메시지는 이미 전송되었습니다.",
         "editAlreadySent": "이미 전송되었습니다 — 텍스트는 입력창에 남아 있습니다.",
@@ -18155,10 +18359,8 @@
         "turnOffQueueing": "대기열 사용 안 함",
         "withdrawnHold": "전송 전에 중지됨",
         "pausedSendFailed": "보낼 수 없습니다. 보내기를 눌러 다시 시도하세요.",
-        "pausedKept": "아직 보내지 않았습니다. 보내기를 눌러 보내세요.",
         "paused": "일시 중지됨",
         "queuePausedStopped": "중단했기 때문에 대기열이 일시 중지되었습니다",
-        "queuePausedCleared": "대화를 지워서 대기열이 일시 중지되었습니다",
         "queuePaused": "대기열이 일시 중지되었습니다",
         "resume": "재개",
         "sendConfirmTitle": "메시지를 보낼까요?",
@@ -18179,7 +18381,37 @@
         "offline": "{{hostName}}이(가) 오프라인입니다",
         "reconnecting": "{{hostName}}에 다시 연결하는 중…",
         "reconnect": "다시 연결"
-      }
+      },
+      "interruptedContinue": {
+        "continue": "계속",
+        "failed": "이 채팅을 계속할 수 없습니다. 다시 시도하거나 메시지를 보내세요.",
+        "explanation": "계속하면 에이전트가 먼저 마지막 단계가 완료되었는지 확인합니다."
+      },
+      "rewind": {
+        "unsupported": "이 채팅은 이전 메시지로 돌아갈 수 없습니다.",
+        "historyNotPaginated": "이 오래된 Codex 채팅은 이전 메시지로 돌아갈 수 없습니다. 여기로 되감기를 사용하려면 새 채팅을 시작하세요.",
+        "busy": "에이전트가 유휴 상태이고 이 채팅에서 사용자를 기다리는 항목이 없으면 사용할 수 있습니다.",
+        "staleEpoch": "대화가 변경되었습니다. 최신 메시지를 확인하고 다시 시도하세요.",
+        "invalidTarget": "대화가 이 메시지로 돌아갈 수 없습니다. 변경된 내용은 없습니다.",
+        "historyLimit": "이 대화는 너무 길어 되돌아갈 수 없습니다. 변경된 내용은 없습니다.",
+        "providerRefused": "에이전트가 이 메시지로 돌아갈 수 없었습니다.",
+        "proofMismatch": "에이전트의 기록이 이 채팅과 일치하지 않았습니다. 계속하기 전에 대화를 확인하세요.",
+        "outcomeUnknown": "Orca가 대화가 이전 메시지로 돌아갔는지 확인하지 못했습니다. 다음 메시지가 전송되기 전에 확인합니다.",
+        "outcomeUnknownReturned": "Orca가 대화가 이 메시지로 돌아갔는지 확인하지 못했습니다. 메시지가 입력창으로 돌아왔으며, Orca는 다음 메시지가 전송되기 전에 대화를 확인합니다.",
+        "timeout": "이 메시지로 돌아간 후 채팅이 업데이트되지 않았습니다. 최신 내용을 보려면 다시 열세요.",
+        "refused": "Orca가 이 메시지로 돌아갈 수 없었습니다. 계속하기 전에 대화를 확인하세요.",
+        "unavailable": "채팅 연결이 완료될 때까지 기다리세요.",
+        "pending": "대화가 이전 메시지로 돌아갈 때까지 기다리세요.",
+        "title": "여기로 되감을까요?",
+        "confirmation": "이 메시지와 그 이후의 모든 내용을 버릴까요? 메시지가 입력창으로 돌아와 편집하고 다시 보낼 수 있습니다. 디스크의 파일 변경 사항은 유지됩니다.",
+        "confirm": "되감기",
+        "cancel": "취소",
+        "action": "여기로 되감기"
+      },
+      "visualUnavailable": "시각화를 사용할 수 없습니다",
+      "visualLoading": "시각화 로드 중",
+      "visualOpenInSidebar": "사이드바에서 열기",
+      "visualClose": "시각화 닫기"
     },
     "tab": {
       "bar": {
@@ -18536,6 +18768,13 @@
       "label": "담당자",
       "automatic": "자동",
       "assignToMe": "나에게 할당 ({{name}})"
+    },
+    "markdown-callout": {
+      "note": "참고",
+      "tip": "팁",
+      "important": "중요",
+      "warning": "경고",
+      "caution": "주의"
     }
   },
   "dashboardPopout": {
@@ -18857,7 +19096,8 @@
     }
   },
   "quickOpen": {
-    "moreMatchesAvailable": "더 많은 일치 항목을 사용할 수 있습니다. 검색 결과를 좁히려면 검색을 구체화하세요."
+    "moreMatchesAvailable": "더 많은 일치 항목을 사용할 수 있습니다. 검색 결과를 좁히려면 검색을 구체화하세요.",
+    "recentValidationFailed": "최근 파일을 확인할 수 없습니다: {{error}}"
   },
   "checksPanel": {
     "unlinked": {
@@ -19115,9 +19355,6 @@
       "oldTerminalDialogRisk": "서버를 공유하는 Codex 세션은 함께 종료될 수 있으며 에이전트 상태가 잘못될 수 있습니다.",
       "oldTerminalDialogCause": "이전 터미널은 여전히 Codex 서버를 공유합니다. 새 터미널을 열어 별도의 서버에서 Codex를 실행합니다.",
       "fix": "자물쇠",
-      "openNewTerminal": "새 터미널 열기",
-      "dontShowAgain": "다시 보지 않기",
-      "dismiss": "닫기",
       "dialogTitle": "각 Codex 탭에 자체 서버를 제공합니다",
       "dialogDescription": "Codex 세션은 터미널 공유 백그라운드 서버에서 직접 시작되었습니다. ORCA는 시작되는 Codex 세션을 별도로 유지합니다. 세션이 서버를 공유할 때 서버를 닫으면 다른 세션이 종료될 수 있으며 에이전트 상태가 잘못될 수 있습니다.",
       "copy": "복사",
@@ -19128,7 +19365,6 @@
       "step2Title": "실행 중인 공유 서버 중지",
       "undo": "되돌리려면 codex features enable daemon_auto_start를 실행하세요.",
       "step2Warning": "서버를 공유하는 열려 있는 Codex 세션을 닫습니다.",
-      "learnMore": "자세히 알아보기",
       "turnOff": "끄기",
       "turningOff": "끄는 중...",
       "turnedOff": "껐어요",
@@ -19141,6 +19377,15 @@
       "confirmStopDescription": "이는 ORCA 외부 세션을 포함하여 이를 공유하는 모든 공개 Codex 세션을 종료합니다.",
       "cancel": "취소",
       "runs": "Runs"
+    },
+    "paneMove": {
+      "failed": "분할 창을 새 탭으로 이동할 수 없습니다."
+    },
+    "paneTopBanner": {
+      "openNewTerminal": "새 터미널 열기",
+      "learnMore": "자세히 알아보기",
+      "dontShowAgain": "다시 보지 않기",
+      "dismiss": "닫기"
     }
   },
   "fileSearch": {
@@ -19199,5 +19444,25 @@
     "unavailable": "미디어 파일을 재생할 수 없습니다. 파일을 사용할 수 없거나 지원하지 않는 코덱일 수 있습니다.",
     "openFailed": "기본 앱에서 파일을 열 수 없습니다.",
     "openDefault": "기본 앱에서 열기"
+  },
+  "projectBoard": {
+    "noColumnField": "이 보드 보기에는 그룹화할 단일 선택 또는 반복 필드가 없어 Orca가 대신 항목을 나열합니다.",
+    "noField": "{{field}} 없음"
+  },
+  "projectBoardCard": {
+    "restrictedItem": "제한된 항목",
+    "itemLabel": "{{number}} — {{title}}"
+  },
+  "projectViews": {
+    "layout": {
+      "board": "보드"
+    },
+    "unsupported": {
+      "switchLayout": "Orca에서 이 프로젝트로 작업하려면 테이블, 보드 또는 로드맵 보기로 전환하세요.",
+      "description": "Orca는 테이블, 보드, 로드맵 프로젝트 보기를 렌더링합니다. 이 보기는 아직 렌더링할 수 없는 레이아웃을 사용합니다."
+    }
+  },
+  "projectField": {
+    "updateFailed": "프로젝트 필드를 업데이트하지 못했습니다"
   }
 }
diff --git a/src/renderer/src/i18n/locales/zh.json b/src/renderer/src/i18n/locales/zh.json
index 7823ad670091..b9e2096a89f9 100644
--- a/src/renderer/src/i18n/locales/zh.json
+++ b/src/renderer/src/i18n/locales/zh.json
@@ -146,7 +146,15 @@
         "title": "当 Codex 选项卡共享服务器时发出警告",
         "description": "当您自己启动的 Codex 与其他选项卡共享服务器时，在您自己启动的 Codex 上显示一条通知，因为它的智能体状态可能是错误的。"
       }
-    }
+    },
+    "followSymlinkedDirectoriesKeywords": {
+      "symlink": "符号链接",
+      "linkedFolder": "链接文件夹",
+      "quickOpen": "快速打开",
+      "fileExplorer": "文件资源管理器"
+    },
+    "followSymlinkedDirectories": "跟随符号链接目录",
+    "followSymlinkedDirectoriesDescription": "在快速打开中搜索链接文件夹，并在文件资源管理器中展开本地链接文件夹。"
   },
   "menu": {
     "checkForUpdates": "检查更新...",
@@ -1168,6 +1176,11 @@
             }
           }
         }
+      },
+      "ipcEvents": {
+        "sshManagedServer": {
+          "refusedBlocked": "此 SSH 主机无法迁移到受管的 Orca 服务器。设置中的“SSH 主机”会显示原因。"
+        }
       }
     },
     "components": {
@@ -3154,7 +3167,8 @@
             "heldByPreviousRelay": "该终端仍在主机上以先前版本的 Orca 运行，当前版本无法连接到它。它会一直运行直到退出。请打开新终端以继续在此工作。",
             "sourceRestoring": "重新连接该终端 — 正在重新建立其输出。会话仍在进行。",
             "ptyAllocationLimit": "系统无法再分配 pty 设备。请在 Orca 或其他程序中关闭一些不用的终端，然后重试。",
-            "terminalProcessLimit": "系统无法再启动终端进程。请关闭不用的终端或退出不用的进程，然后重试。"
+            "terminalProcessLimit": "系统无法再启动终端进程。请关闭不用的终端或退出不用的进程，然后重试。",
+            "ownerHostMismatch": "此终端保存的会话属于另一个主机连接，因此 Orca 无法在此重新附加它。请打开新终端以继续。"
           },
           "TerminalProcessExitOverlay": {
             "capacityTitle": "已达到 Git Bash 控制台上限",
@@ -3724,7 +3738,6 @@
             "54e8d6bb2d": "Fable",
             "d79c3362c4": "5小时",
             "a79c64f87e": "Fable",
-            "8295903d17": "切换后继续旧对话之前，请重新启动实时 Claude 终端。",
             "c98ea88392": "没有其他账户",
             "9332ba8684": "切换到",
             "d450654fa2": "Claude 账户",
@@ -6477,7 +6490,6 @@
         "AccountsPane": {
           "c2d2751587": "删除账户",
           "dbb9626ed1": "取消",
-          "854ebbcc45": "Orca 将删除此已保存账户的托管 Claude 身份验证。如果当前处于活动状态，Orca 将回退到系统默认的 Claude 登录名。",
           "63843e37e2": "删除 Claude 账户？",
           "380a7736cc": "移除此账户会永久删除其托管的 Codex 主目录，包括其中存储的所有 Codex 会话历史记录和 MCP 登录信息。此操作无法撤销。如果该账户当前处于活动状态，Orca 将回退到系统默认的 Codex 登录。",
           "0d47394635": "删除 Codex 账户？",
@@ -6525,12 +6537,10 @@
           "3fe7862418": "{{value0}} 没有受管理的 Claude 账户。Orca 将使用该环境的系统默认 Claude 登录，直到您在此处添加一个。",
           "3455cf43fa": "Claude 登录。",
           "fcc4093fc1": "使用您当前 {{value0}} Codex 登录名。",
-          "79e484c3b2": "用于共享 Claude 身份验证文件的可选账户切换器。",
           "8bbfd74556": "Claude 账户",
           "72b36ea174": "可选。Orca 可使用系统默认 Claude 登录；仅当你需要快速切换且不想迁移聊天会话时才添加账户。",
           "26ef4b55be": "Claude",
           "2743cdc0af": "Claude 账户更新失败。",
-          "b15ce90870": "{{value0}} -> {{value1}}。在继续旧会话之前重新启动实时 Claude 终端。",
           "f921d32606": "Claude 账户已更新。",
           "5bf8764953": "Codex 账户更新失败。",
           "9baf45d071": "当前设备",
@@ -8312,7 +8322,7 @@
           "3c88ec55d6": "找不到“的设置",
           "c7ad095d96": "正在加载设置...",
           "acc7bbdefd": "再按一次 ESC 退出设置",
-          "43b68e10f0": "你有未保存的 AI 设置。离开后这些更改将被放弃。",
+          "43b68e10f0": "你有未保存的 AI 设置。离开后这些设置将被放弃。",
           "17bdee4ff1": "放弃未保存的 AI 设置？",
           "084d8fac5b": "隐私与安全",
           "23931df7e8": "远程主机",
@@ -12286,6 +12296,154 @@
         },
         "UnsealedCredentialNotice": {
           "body": "{{credential}} 未加密存储 — 该系统没有 Orca 可以使用的操作系统密钥环。任何可以读取您的磁盘或其备份的人都可以读取该凭据。安装并解锁 gnome-keyring 或 kwallet，然后再次保存以密封它。"
+        },
+        "managedServers": {
+          "row": {
+            "notRunning": "未运行",
+            "refresh": "刷新状态",
+            "migration": "迁移：{{phase}}",
+            "update": "更新",
+            "rollback": "回滚",
+            "recover": "恢复",
+            "cancelStop": "取消停止",
+            "confirmStop": "停止并移除服务器",
+            "keep": "保持运行",
+            "stop": "停止…",
+            "deferredVersion": "已推迟更新到 {{version}}。",
+            "confirmRestore": "恢复快照并重新启动",
+            "keepState": "保留状态",
+            "statusUnknown": "状态未知",
+            "checking": "正在检查…"
+          },
+          "title": "受管服务器",
+          "description": "Orca 会在空的 SSH 主机上安装并运行服务器，并使其保持最新。",
+          "deploy": {
+            "host": "SSH 主机",
+            "hostPlaceholder": "选择一个空的 SSH 主机",
+            "name": "服务器名称",
+            "submit": "部署服务器",
+            "running": "正在部署…"
+          },
+          "pending": {
+            "resume": "继续"
+          },
+          "access": {
+            "title": "配对服务器的 SSH 访问",
+            "linked": "{{name}}（通过 SSH）",
+            "unlink": "停止使用 SSH",
+            "target": "通过 SSH 主机访问",
+            "port": "服务器端口",
+            "link": "使用 SSH",
+            "linking": "正在连接…"
+          },
+          "search": {
+            "title": "受管服务器",
+            "keywordSsh": "ssh"
+          },
+          "phase": {
+            "fenced": "主机已锁定",
+            "staged": "副本已暂存",
+            "committed": "副本已提交",
+            "retired": "已完成"
+          },
+          "recovery": {
+            "activate": "更新已中断",
+            "rollback": "回滚已中断",
+            "decommission": "停止已中断"
+          },
+          "terminals": {
+            "unknown": "正在运行的终端：未知",
+            "count": "正在运行的终端：{{count}}"
+          },
+          "blocker": {
+            "notFound": "该 SSH 主机已不存在。",
+            "owned": "此 SSH 主机已属于一个受管服务器。",
+            "catalog": "此主机上的项目尚无法迁移。",
+            "terminals": "此主机上的终端仍在运行（{{count}}）。请先关闭它们。",
+            "portForwards": "已保存的端口转发会保留在 SSH 主机上。",
+            "dependents": "尚无法迁移的状态：{{kinds}}。",
+            "unverifiable": "Orca 无法读取其保存的 {{sources}}，因此无法确定将迁移哪些内容。"
+          },
+          "kind": {
+            "portForward": "端口转发",
+            "terminalLease": "终端",
+            "terminalRecovery": "终端恢复记录",
+            "workspaceSession": "打开的选项卡和布局",
+            "worktreeMetadata": "工作树详情",
+            "worktreeLineage": "工作树历史",
+            "workspaceLineage": "工作区历史",
+            "sparsePreset": "稀疏检出预设",
+            "retiredWorktreeName": "已停用工作树名称",
+            "automation": "自动化",
+            "automationRun": "自动化运行记录",
+            "mobileTabSelection": "移动端选项卡选择",
+            "uiRouting": "侧边栏和筛选设置"
+          },
+          "loadFailed": "Orca 无法加载 SSH 主机和未完成的迁移。请重新打开设置以重试。",
+          "outcome": {
+            "live": "未完成：此服务器上的终端仍在运行。请关闭它们后重试。",
+            "unverifiable": "未完成：Orca 无法确认此服务器上正在运行什么。请在主机可访问时重试。",
+            "migration": "未完成：迁移到此服务器的操作尚未完成。请先继续该操作。",
+            "deferred": "尚未完成：服务器尚未准备好执行此操作。请稍后重试。",
+            "failed": "Orca 无法在服务器上完成此操作。请重试。"
+          }
+        },
+        "sshHostServer": {
+          "sourceChanged": "在较旧版本的 Orca 上发生了更改：会持续运行中继，直到再次迁移到其受管服务器。",
+          "unavailable": "运行中继：此主机上无法运行受管的 Orca 服务器（{{reason}}）。",
+          "tunnelUnavailable": "运行中继：此主机的 SSH 服务器不允许端口转发，Orca 也无法通过 SSH 会话连接到受管服务器。",
+          "deploying": "正在设置受管的 Orca 服务器…",
+          "converting": "正在将此主机的项目迁移到其受管的 Orca 服务器…",
+          "connecting": "正在连接到受管的 Orca 服务器…",
+          "updating": "正在更新受管服务器…",
+          "starting": "正在启动受管服务器…",
+          "notServing": "受管的 Orca 服务器未运行，且无法启动。",
+          "hostNewer": "运行来自较新版本 Orca 的受管 Orca 服务器；它会保留该版本。",
+          "terminalsLive": "在其 {{count}} 个打开的终端全部关闭前运行中继，然后迁移到受管服务器。",
+          "terminalsLive_one": "在其 {{count}} 个打开的终端关闭前运行中继，然后迁移到受管服务器。",
+          "terminalsLive_other": "在其 {{count}} 个打开的终端全部关闭前运行中继，然后迁移到受管服务器。",
+          "terminalsUnverifiable": "运行中继：Orca 无法确认其终端已关闭。它会在下次连接时迁移。",
+          "retry": "本次会话运行中继；它会在下次连接时迁移到受管服务器。",
+          "failureDetails": "详情",
+          "unavailableUnknown": "运行中继：此主机上无法运行受管的 Orca 服务器。",
+          "cause": {
+            "unsupportedHost": "Orca 没有适用于此系统的服务器构建",
+            "artifactsUnavailable": "此 Orca 构建不包含该服务器",
+            "libcUnidentified": "Orca 无法识别主机的系统库",
+            "runtimeSelfTest": "服务器的运行时未通过自检",
+            "securitySoftware": "安全软件更改了服务器的运行时",
+            "nativePreflight": "主机缺少服务器所需的系统库"
+          },
+          "updateDeferredLater": "运行受管的 Orca 服务器；它会在下次连接时更新。",
+          "updateFailedPrevious": "在其先前版本上运行受管的 Orca 服务器；更新失败。",
+          "terminalsLiveUncounted": "在其打开的终端全部关闭前运行中继，然后迁移到受管服务器。",
+          "refusedBlocked": "未迁移到受管服务器：此主机上的某些因素阻止了迁移。",
+          "terminalsElsewhere": "当另一台 Orca 桌面端或会话在此主机上打开的 {{count}} 个终端仍在运行时，会运行中继。",
+          "terminalsElsewhere_one": "当另一台 Orca 桌面端或会话在此主机上打开的 {{count}} 个终端仍在运行时，会运行中继。",
+          "terminalsElsewhere_other": "当另一台 Orca 桌面端或会话在此主机上打开的 {{count}} 个终端仍在运行时，会运行中继。",
+          "terminalsElsewhereUncounted": "当另一台 Orca 桌面端或会话在此主机上打开的终端仍在运行时，会运行中继。"
+        },
+        "deltaMove": {
+          "action": "迁移新项目…",
+          "title": "迁移新项目",
+          "description": "较旧版本的 Orca 在此主机迁移到其受管服务器后对其进行了更改。这会将它所创建的内容添加到服务器；绝不会覆盖服务器已有的内容。",
+          "added": "已添加到服务器",
+          "nothingNew": "没有可添加的新内容。",
+          "notReflected": "在较旧版本上已更改或移除；服务器会保留自己的副本",
+          "cancel": "取消",
+          "confirm": "迁移新项目",
+          "kind": {
+            "repository": "仓库 {{name}}",
+            "folder": "文件夹 {{name}}",
+            "group": "项目组 {{name}}"
+          }
+        },
+        "keepServer": {
+          "action": "保留服务器的版本…",
+          "title": "保留服务器的版本",
+          "description": "此主机将按原样恢复为使用其受管服务器。较旧版本的 Orca 在此处添加或更改的内容不会被迁移；它们只会保留在这台电脑保存的设置中，直到被清理。",
+          "cancel": "取消",
+          "confirm": "保留服务器的版本"
         }
       },
       "right": {
@@ -14735,7 +14893,6 @@
                 "d90d2e1f6d": "跟踪会话和每周使用情况。",
                 "8919321417": "Codex 登录失败。",
                 "c7b90c140b": "添加了 Codex 账户。",
-                "4e71d72912": "Claude 登录失败。",
                 "9ddeb558f9": "已添加 Claude 账户。",
                 "29d0653961": "登入",
                 "945865332e": "登录",
@@ -15701,6 +15858,9 @@
         "richMarkdownImageInsertionFeedback": {
           "importedFileKept": "由于目的地更改，图像插入被取消。导入的文件被保留。",
           "destinationChanged": "由于目的地更改，图像插入被取消。再试一次。"
+        },
+        "useMarkdownDocuments": {
+          "listFailed": "无法列出 Markdown 文档。"
         }
       },
       "diff": {
@@ -17379,7 +17539,17 @@
         "activitySubagentOne": "子智能体运行中：{{value0}}",
         "activitySubagentMany": "{{value0}} 个子智能体运行中",
         "activityMonitorOne": "正在监控：{{value0}}",
-        "activityMonitorMany": "正在监控 {{value0}} 个后台任务"
+        "activityMonitorMany": "正在监控 {{value0}} 个后台任务",
+        "selectWorkspace": "选择 {{value0}} 中的全部聊天",
+        "workspaceSelectedCount": "{{value0}}/{{value1}}",
+        "selectAll": "选择全部聊天",
+        "selectAllLabel": "选择全部",
+        "selectedCount": "已选择 {{value0}}/{{value1}}",
+        "selectProject": "选择 {{value0}} 中的全部聊天",
+        "collapseNode": "折叠 {{value0}}",
+        "expandNode": "展开 {{value0}}",
+        "selectMachine": "选择 {{value0}} 上的全部聊天",
+        "sshHost": "SSH"
       },
       "linear-issue-attribute-filter-coverage-notice": {
         "statusPartialTeamCoverage": "过滤 {{value1}} 团队状态中的 {{value0}} — 不包括其余团队的问题。",
@@ -17417,11 +17587,6 @@
       },
       "native": {
         "chat": {
-          "NativeChatStructuredSession": {
-            "1f772bb5d0": "消息传递未经确认。",
-            "93ef441197": "消息未发送。",
-            "a5e7f14068": "重试"
-          },
           "NativeChatLaunchRetry": {
             "failed": "无法开始聊天。",
             "unknown": "无法确认聊天连接。",
@@ -17529,6 +17694,28 @@
         "connecting": "正在连接…",
         "reconnect": "重新连接",
         "retry": "重试"
+      },
+      "managedServerMove": {
+        "offer": "将 {{host}} 迁移到受管的 Orca 服务器以获得更可靠的连接。其 {{count}} 个打开的终端将重新启动。",
+        "offer_one": "将 {{host}} 迁移到受管的 Orca 服务器以获得更可靠的连接。其 {{count}} 个打开的终端将重新启动。",
+        "offer_other": "将 {{host}} 迁移到受管的 Orca 服务器以获得更可靠的连接。其 {{count}} 个打开的终端将重新启动。",
+        "moved": "{{host}} 现在运行受管的 Orca 服务器。",
+        "refusedLive": "未迁移：{{host}} 上的 {{count}} 个终端仍在运行。",
+        "refusedLive_one": "未迁移：{{host}} 上的 {{count}} 个终端仍在运行。",
+        "refusedLive_other": "未迁移：{{host}} 上的 {{count}} 个终端仍在运行。",
+        "refusedUnverifiable": "未迁移：Orca 无法确认 {{host}} 上的 {{count}} 个终端已停止。",
+        "refusedUnverifiable_one": "未迁移：Orca 无法确认 {{host}} 上的 {{count}} 个终端已停止。",
+        "refusedUnverifiable_other": "未迁移：Orca 无法确认 {{host}} 上的 {{count}} 个终端已停止。",
+        "stayed": "{{host}} 仍在运行中继。设置中的“SSH 主机”会显示原因。",
+        "failed": "无法迁移 {{host}}：{{reason}}",
+        "running": "正在将 {{host}} 迁移到受管的 Orca 服务器…",
+        "title": "迁移到受管服务器",
+        "confirm": "迁移",
+        "notNow": "暂不",
+        "close": "关闭",
+        "offerUncounted": "将 {{host}} 迁移到受管的 Orca 服务器以获得更可靠的连接。其打开的终端将重新启动。",
+        "refusedUnverifiableUncounted": "未迁移：Orca 无法确认 {{host}} 上的终端已停止。",
+        "retry": "重试"
       }
     },
     "main": {
@@ -17574,6 +17761,8 @@
         "managedAccountUnsupported": "当 WSL 中添加了 Claude 账户时，Claude 聊天需要 Windows Claude 账户。",
         "launchFolderMissing": "此聊天运行所在的文件夹已不存在。请恢复该文件夹以继续此聊天。",
         "historyInOtherAccount": "此聊天的历史记录位于另一个 Claude 账户中。请切换回该账户以继续此聊天。",
+        "claudeAccountFolderMissing": "所选 Claude 账户的文件夹不存在。请重新登录该账户或选择其他账户。",
+        "claudeAccountSetupFailed": "无法设置所选 Claude 账户。请重试或选择其他账户。",
         "agentCommandNotRunnable": "{{agent}} 在设置 → 智能体中的命令必须是 Orca 能找到的程序路径或名称，且不能包含参数或变量。请修改或重置。",
         "chooseClaudeAccount": "请在 Claude 账户设置中选择或添加一个。",
         "chooseClaudeAccountThenRunCommand": "请在 Claude 账户设置中选择或添加一个，然后重新运行 /{{command}}。",
@@ -17657,6 +17846,8 @@
         "cannotRunHere": "Orca 无法在此处以聊天方式运行此智能体。",
         "unreachable": "Orca 无法连接到智能体。",
         "recordFailed": "Orca 无法将此内容保存到聊天历史记录中。",
+        "attachmentExpired": "此附件已过期。",
+        "reattachFile": "请将其移除后重新附加。",
         "conversationCleared": "此对话已被清除。",
         "openCurrentConversation": "请打开当前对话以继续。",
         "clearUnfinished": "上一次 /clear 未完成。",
@@ -17700,6 +17891,9 @@
         "stopDictation": "停止听写",
         "noSkills": "没有匹配的技能",
         "localAttachmentUnsupported": "远程会话不支持本地附件。",
+        "attachFailed": "无法附加 {{files}}。",
+        "attachFailedBecause": "无法附加 {{files}}。{{reason}}",
+        "uploadingFile": "正在上传 {{name}}…",
         "removeAttachment": "移除附件",
         "pastedImageLabel": "粘贴的图片",
         "draftNotSaved": "此草稿尚未保存成功。Orca 会继续尝试。",
@@ -17962,6 +18156,7 @@
       },
       "receipt": {
         "unavailable": "所选答案不可用",
+        "emptyAnswer": "空回答",
         "cancelled": "取消",
         "resolved": "已解决",
         "resolver": "回复于 {{device}}",
@@ -17973,9 +18168,13 @@
         "plan": "计划",
         "historyRepaired": "此聊天的部分历史记录无法加载。",
         "historyItemTooLarge": "聊天的这一部分过大，无法显示。",
-        "stoppedBeforeStart": "在智能体开始前已停止",
+        "stoppedBeforeStart": "已手动停止",
         "dismiss": "关闭",
-        "copyError": "复制错误"
+        "copyError": "复制错误",
+        "orcaStopUpdate": "此回复进行期间，{{machine}} 上的 Orca 为更新而重新启动。",
+        "orcaStopQuit": "此回复进行期间，{{machine}} 上的 Orca 已关闭。",
+        "orcaStopCrash": "此回复进行期间，{{machine}} 上的 Orca 意外停止。",
+        "orcaStopCanContinue": "你可以在此对话中继续。"
       },
       "providerFrame": {
         "byteLength": "{{value0}} 字节"
@@ -18101,9 +18300,14 @@
         "estimated": "根据上一次响应的估算值。"
       },
       "dismissDeliveryNotice": "关闭",
+      "addSelectionToChat": "添加到聊天",
       "messageNotSent": "消息未发送",
       "deliveryUnconfirmed": "无法确认送达 — 重试前请检查聊天",
       "messageSending": "正在发送…",
+      "userMessage": {
+        "showFull": "显示完整消息",
+        "showLess": "收起"
+      },
       "queuedMessages": {
         "alreadySent": "此消息已发送。",
         "editAlreadySent": "已发送 — 你的文本仍在输入框中。",
@@ -18120,10 +18324,8 @@
         "turnOffQueueing": "关闭排队",
         "withdrawnHold": "在发送前已停止",
         "pausedSendFailed": "无法发送。点按发送以重试。",
-        "pausedKept": "尚未发送。点按发送即可发送。",
         "paused": "已暂停",
         "queuePausedStopped": "因你中断了操作，队列已暂停",
-        "queuePausedCleared": "清除对话后，队列已暂停",
         "queuePaused": "队列已暂停",
         "resume": "继续",
         "sendConfirmTitle": "发送消息？",
@@ -18144,7 +18346,37 @@
         "offline": "{{hostName}} 已离线",
         "reconnecting": "正在重新连接 {{hostName}}…",
         "reconnect": "重新连接"
-      }
+      },
+      "interruptedContinue": {
+        "continue": "继续",
+        "failed": "无法继续此聊天。请重试，或发送一条消息。",
+        "explanation": "继续后，代理会先检查其上一步是否已完成。"
+      },
+      "rewind": {
+        "unsupported": "此聊天无法返回到更早的消息。",
+        "historyNotPaginated": "此旧版 Codex 聊天无法返回到更早的消息。请开始新聊天以使用“回溯到此处”。",
+        "busy": "当智能体空闲且此聊天中没有等待您处理的内容时可用。",
+        "staleEpoch": "对话已发生变化。请查看最新消息后重试。",
+        "invalidTarget": "对话无法返回到此消息。未做任何更改。",
+        "historyLimit": "此对话过长，无法回溯。未做任何更改。",
+        "providerRefused": "智能体无法返回到此消息。",
+        "proofMismatch": "智能体的历史记录与此聊天不匹配。请在继续前检查对话。",
+        "outcomeUnknown": "Orca 无法确认对话是否已返回到更早的消息。它会在发送您的下一条消息前进行检查。",
+        "outcomeUnknownReturned": "Orca 无法确认对话是否已返回到此消息。您的消息已回到输入框中，Orca 会在发送您的下一条消息前检查对话。",
+        "timeout": "返回到此消息后聊天未更新。请重新打开以查看最新内容。",
+        "refused": "Orca 无法返回到此消息。请在继续前检查对话。",
+        "unavailable": "请等待聊天完成连接。",
+        "pending": "请等待对话回溯到更早的消息。",
+        "title": "回溯到此处？",
+        "confirmation": "要丢弃此消息及其之后的所有内容吗？该消息会返回到输入框，以便您编辑并重新发送。磁盘上的文件更改会保留。",
+        "confirm": "回溯",
+        "cancel": "取消",
+        "action": "回溯到此处"
+      },
+      "visualUnavailable": "可视化不可用",
+      "visualLoading": "正在加载可视化",
+      "visualOpenInSidebar": "在侧边栏中打开",
+      "visualClose": "关闭可视化"
     },
     "tab": {
       "bar": {
@@ -18536,6 +18768,13 @@
       "label": "负责人",
       "automatic": "自动",
       "assignToMe": "分配给我（{{name}}）"
+    },
+    "markdown-callout": {
+      "note": "备注",
+      "tip": "提示",
+      "important": "重要",
+      "warning": "警告",
+      "caution": "注意"
     }
   },
   "dashboardPopout": {
@@ -18857,7 +19096,8 @@
     }
   },
   "quickOpen": {
-    "moreMatchesAvailable": "可能会有更多比赛。优化您的搜索以缩小结果范围。"
+    "moreMatchesAvailable": "可能会有更多比赛。优化您的搜索以缩小结果范围。",
+    "recentValidationFailed": "无法检查最近的文件：{{error}}"
   },
   "checksPanel": {
     "unlinked": {
@@ -19115,9 +19355,6 @@
       "oldTerminalDialogRisk": "共享服务器的 Codex 会话可能会一起结束，并且智能体状态可能会错误。",
       "oldTerminalDialogCause": "较旧的终端仍然共享 Codex 服务器。打开一个新终端以在单独的服务器上运行 Codex。",
       "fix": "使固定",
-      "openNewTerminal": "打开新终端",
-      "dontShowAgain": "不再显示",
-      "dismiss": "关闭",
       "dialogTitle": "为每个 Codex 选项卡提供自己的服务器",
       "dialogDescription": "Codex 会话直接在共享一台后台服务器的终端中启动。 Orca 将其启动的 Codex 会话分开保存。当会话共享一台服务器时，关闭一个服务器可能会结束其他服务器，并且智能体状态可能会错误。",
       "copy": "复制",
@@ -19128,7 +19365,6 @@
       "step2Title": "停止正在运行的共享服务器",
       "undo": "要撤消，请运行 codex features enable daemon_auto_start。",
       "step2Warning": "关闭共享服务器的所有打开的 Codex 会话",
-      "learnMore": "了解更多",
       "turnOff": "关",
       "turningOff": "正在关闭…",
       "turnedOff": "已关闭",
@@ -19141,6 +19377,15 @@
       "confirmStopDescription": "这将关闭所有共享它的开放 Codex 会话，包括 Orca 之外的会话。",
       "cancel": "取消",
       "runs": "跑步"
+    },
+    "paneMove": {
+      "failed": "无法将窗格移动到新选项卡。"
+    },
+    "paneTopBanner": {
+      "openNewTerminal": "打开新终端",
+      "learnMore": "了解更多",
+      "dontShowAgain": "不再显示",
+      "dismiss": "关闭"
     }
   },
   "fileSearch": {
@@ -19199,5 +19444,25 @@
     "unavailable": "无法播放此媒体文件。文件可能不可用或使用了不支持的编解码器。",
     "openFailed": "无法在默认应用中打开此文件。",
     "openDefault": "在默认应用中打开"
+  },
+  "projectBoard": {
+    "noColumnField": "此看板视图没有可用于分组的单选或迭代字段，因此 Orca 改为列出各项。",
+    "noField": "无 {{field}}"
+  },
+  "projectBoardCard": {
+    "restrictedItem": "受限项",
+    "itemLabel": "{{number}} — {{title}}"
+  },
+  "projectViews": {
+    "layout": {
+      "board": "看板"
+    },
+    "unsupported": {
+      "switchLayout": "切换到表格、看板或路线图视图以在 Orca 中处理此项目。",
+      "description": "Orca 可渲染表格、看板和路线图项目视图。此视图使用的布局尚无法渲染。"
+    }
+  },
+  "projectField": {
+    "updateFailed": "无法更新项目字段"
   }
 }
diff --git a/src/renderer/src/lib/active-agent-note-send-diagnostics.ts b/src/renderer/src/lib/active-agent-note-send-diagnostics.ts
index 155dec17e067..281467834007 100644
--- a/src/renderer/src/lib/active-agent-note-send-diagnostics.ts
+++ b/src/renderer/src/lib/active-agent-note-send-diagnostics.ts
@@ -78,5 +78,7 @@ function codeForStatus(
       return 'terminal-send-refused'
     case 'partial-submit-failed':
       return 'submit-send-error'
+    case 'unconfirmed':
+      return 'runtime-unverifiable'
   }
 }
diff --git a/src/renderer/src/lib/active-agent-note-send-result.ts b/src/renderer/src/lib/active-agent-note-send-result.ts
index 30bb4515a5e1..d8b0d0b171b7 100644
--- a/src/renderer/src/lib/active-agent-note-send-result.ts
+++ b/src/renderer/src/lib/active-agent-note-send-result.ts
@@ -1,3 +1,5 @@
+import { agentSessionWriteNoticeEnglish } from '../../../shared/agent-session-refusal-notice'
+
 export type ActiveAgentNotesSendStatus =
   | 'sent'
   | 'empty'
@@ -8,6 +10,8 @@ export type ActiveAgentNotesSendStatus =
   | 'not-ready'
   | 'not-writable'
   | 'partial-submit-failed'
+  /** Sent, but nobody could confirm the agent got it: the host may hold it. */
+  | 'unconfirmed'
 
 export type ActiveAgentNotesSendFailureCode =
   | 'empty'
@@ -33,7 +37,7 @@ export type ActiveAgentNotesSendFailureCode =
   | 'submit-send-error'
   | 'runtime-unverifiable'
   | 'runtime-timeout'
-  | 'session-outbox-unsaved'
+  | 'session-send-refused'
 
 export type ActiveAgentNotesSendResult = {
   status: ActiveAgentNotesSendStatus
@@ -77,6 +81,9 @@ export function activeAgentNotesSendFailureMessage(
         ? 'The notes may already be pasted in the selected terminal, but Orca could not submit them.'
         : 'The notes may already be pasted in the active terminal, but Orca could not submit them.'
       break
+    case 'unconfirmed':
+      message = agentSessionWriteNoticeEnglish(['sendOutcomeLost'])
+      break
     case 'sent':
       message = ''
       break
diff --git a/src/renderer/src/lib/agent-launch-caller-routing.test.ts b/src/renderer/src/lib/agent-launch-caller-routing.test.ts
index 553bea2aa058..fb79b9c746a1 100644
--- a/src/renderer/src/lib/agent-launch-caller-routing.test.ts
+++ b/src/renderer/src/lib/agent-launch-caller-routing.test.ts
@@ -13,12 +13,11 @@ import {
 } from './agent-launch-caller-profiles-test-harness'
 import { createLaunchFunnelStore, resetLaunchFunnelStore } from './agent-launch-funnel-test-harness'
 
-import type * as PairedAdmissionModule from './structured-agent-session-paired-admission'
+import type * as LaunchAdmissionModule from './structured-agent-session-launch-admission'
 const store = createLaunchFunnelStore()
 const mockIsWebRuntimeSessionActive = vi.fn(() => false)
 const mockLaunchAgentInWebHostTab = vi.fn()
-const mockLaunchAgentInStructuredNewTab = vi.fn()
-const mockBeginPairedStructuredLaunch = vi.fn()
+const mockBeginHostAdmittedStructuredLaunch = vi.fn()
 const mockCreateSupport = vi.fn()
 const mockHostCapabilities = vi.fn<() => readonly string[] | null>(() => [])
 const mockExecutionHostId = vi.fn(() => 'local')
@@ -60,13 +59,11 @@ vi.mock('@/runtime/structured-agent-session-client', () => ({
   callStructuredAgentSession: (_target: unknown, method: string) =>
     method === 'agentSession.createSupport' ? mockCreateSupport() : new Promise(() => undefined)
 }))
-vi.mock('sonner', () => ({ toast: { info: vi.fn(), error: vi.fn(), success: vi.fn() } }))
-vi.mock('@/lib/structured-agent-session-paired-admission', async (importOriginal) => ({
-  ...(await importOriginal<typeof PairedAdmissionModule>()),
-  beginPairedStructuredLaunch: mockBeginPairedStructuredLaunch
-}))
-vi.mock('@/lib/launch-agent-in-new-tab-structured', () => ({
-  launchAgentInStructuredNewTab: mockLaunchAgentInStructuredNewTab
+const { mockToastInfo } = vi.hoisted(() => ({ mockToastInfo: vi.fn() }))
+vi.mock('sonner', () => ({ toast: { info: mockToastInfo, error: vi.fn(), success: vi.fn() } }))
+vi.mock('@/lib/structured-agent-session-launch-admission', async (importOriginal) => ({
+  ...(await importOriginal<typeof LaunchAdmissionModule>()),
+  beginHostAdmittedStructuredLaunch: mockBeginHostAdmittedStructuredLaunch
 }))
 vi.mock('@/runtime/local-runtime-capabilities', () => ({
   readLocalRuntimeCapabilitiesOrUnknown: () => mockHostCapabilities()
@@ -88,6 +85,15 @@ const CHAT_DEFAULT_SETTINGS = {
 
 const cases = callerProfileCases()
 
+async function useActualAdmission(): Promise<void> {
+  const actual = await vi.importActual<typeof LaunchAdmissionModule>(
+    './structured-agent-session-launch-admission'
+  )
+  mockBeginHostAdmittedStructuredLaunch.mockImplementationOnce(
+    actual.beginHostAdmittedStructuredLaunch
+  )
+}
+
 async function launch(profile: AgentLaunchCallerProfile) {
   const { launchAgentInNewTab } = await import('./launch-agent-in-new-tab')
   return launchAgentInNewTab({ requestId: 'request-1', ...profile.args })
@@ -101,10 +107,11 @@ describe('agent launch caller routing', () => {
     mockExecutionHostId.mockReturnValue('local')
     serverReports(null)
     mockHostCapabilities.mockReturnValue([STRUCTURED_AGENT_SESSION_RUNTIME_CAPABILITY])
-    mockLaunchAgentInStructuredNewTab.mockReturnValue({
-      sessionId: 'session-1',
-      tabId: 'tab-structured',
-      structuredSettlement: Promise.resolve({ kind: 'structured' })
+    mockBeginHostAdmittedStructuredLaunch.mockReturnValue({
+      sessionId: null,
+      tab: null,
+      settlement: new Promise(() => undefined),
+      cancel: vi.fn()
     })
     mockLaunchAgentInWebHostTab.mockResolvedValue({ delivered: true, failureNotified: false })
   })
@@ -114,7 +121,7 @@ describe('agent launch caller routing', () => {
 
     expect(result?.surface.kind).toBe('local-terminal')
     expect(store.createTab).toHaveBeenCalledTimes(1)
-    expect(mockLaunchAgentInStructuredNewTab).not.toHaveBeenCalled()
+    expect(mockBeginHostAdmittedStructuredLaunch).not.toHaveBeenCalled()
     expect(mockLaunchAgentInWebHostTab).not.toHaveBeenCalled()
   })
 
@@ -147,34 +154,29 @@ describe('agent launch caller routing', () => {
       // Why: a caller-named cwd is a process shape only a PTY produces, so that profile is
       // structurally barred rather than merely unconfigured and stays terminal with the default on.
       const structurallyBarred = profile.id === 'session-continuation'
-      expect(result?.surface.kind).toBe(
-        structurallyBarred ? 'local-terminal' : 'local-agent-session'
-      )
+      expect(result?.surface.kind).toBe(structurallyBarred ? 'local-terminal' : 'host-published')
     }
   )
 
   it.each(cases)(
-    'reports the structured session identity to %s when it routes structured',
+    'asks this machine to admit the chat %s routes structured before any of it opens',
     async (_id, profile) => {
       store.settings = { ...store.settings, ...CHAT_DEFAULT_SETTINGS }
 
       const result = await launch(profile)
 
-      if (result?.surface.kind !== 'local-agent-session') {
-        expect(mockLaunchAgentInStructuredNewTab).not.toHaveBeenCalled()
+      if (result?.surface.kind !== 'host-published') {
+        expect(mockBeginHostAdmittedStructuredLaunch).not.toHaveBeenCalled()
         return
       }
-      expect(result.surface).toEqual({
-        kind: 'local-agent-session',
-        tabId: 'tab-structured',
-        sessionId: 'session-1'
-      })
       expect(result.pasteDraftAfterLaunch).toBe(false)
       expect(store.createTab).not.toHaveBeenCalled()
-      // Placement is the one launch input that does ride to the structured executor, as a target
-      // group rather than anything on a wire.
-      expect(mockLaunchAgentInStructuredNewTab.mock.calls[0]?.[0]?.targetGroupId).toBe(
-        profile.args.groupId
+      expect(mockBeginHostAdmittedStructuredLaunch).toHaveBeenCalledWith(
+        expect.objectContaining({
+          worktreeId: profile.args.worktreeId,
+          executionHostId: 'local',
+          target: { kind: 'local' }
+        })
       )
     }
   )
@@ -191,13 +193,6 @@ describe('agent launch caller routing', () => {
     ])
     const { launchAgentInNewTab } = await import('./launch-agent-in-new-tab')
 
-    mockBeginPairedStructuredLaunch.mockReturnValueOnce({
-      sessionId: null,
-      tab: null,
-      settlement: new Promise(() => undefined),
-      cancel: vi.fn()
-    })
-
     const result = launchAgentInNewTab({
       requestId: 'request-2',
       agent: 'claude',
@@ -206,8 +201,9 @@ describe('agent launch caller routing', () => {
 
     // The server admits the chat before any of it exists here, so the surface is the host's.
     expect(result?.surface.kind).toBe('host-published')
-    expect(mockBeginPairedStructuredLaunch).toHaveBeenCalledTimes(1)
-    expect(mockLaunchAgentInStructuredNewTab).not.toHaveBeenCalled()
+    expect(mockBeginHostAdmittedStructuredLaunch).toHaveBeenCalledExactlyOnceWith(
+      expect.objectContaining({ target: { kind: 'environment', environmentId: 'web-runtime' } })
+    )
     expect(mockLaunchAgentInWebHostTab).not.toHaveBeenCalled()
   })
 
@@ -221,10 +217,7 @@ describe('agent launch caller routing', () => {
       STRUCTURED_AGENT_SESSION_RUNTIME_CAPABILITY,
       STRUCTURED_AGENT_SESSION_CLIENT_LAUNCH_MODE_CAPABILITY
     ])
-    const actual = await vi.importActual<typeof PairedAdmissionModule>(
-      './structured-agent-session-paired-admission'
-    )
-    mockBeginPairedStructuredLaunch.mockImplementationOnce(actual.beginPairedStructuredLaunch)
+    await useActualAdmission()
     mockCreateSupport.mockResolvedValue({ supported: false, reason: 'wsl' })
     const { launchAgentInNewTab } = await import('./launch-agent-in-new-tab')
 
@@ -253,7 +246,67 @@ describe('agent launch caller routing', () => {
         agentArgs: '--model sonnet'
       })
     )
-    expect(mockLaunchAgentInStructuredNewTab).not.toHaveBeenCalled()
+    expect(store.createTab).not.toHaveBeenCalled()
+  })
+
+  // Before, a local chat opened first and this machine's "no" left it failed, with a Retry that
+  // failed the same way and no terminal.
+  it("runs the caller's own launch as a local terminal when this machine declines the chat", async () => {
+    store.settings = { ...store.settings, ...CHAT_DEFAULT_SETTINGS }
+    await useActualAdmission()
+    mockCreateSupport.mockResolvedValue({ supported: false, reason: 'wsl' })
+    const { launchAgentInNewTab } = await import('./launch-agent-in-new-tab')
+
+    const result = launchAgentInNewTab({
+      requestId: 'request-10',
+      agent: 'claude',
+      worktreeId: 'wt-1',
+      groupId: 'group-1',
+      prompt: 'fix the flaky test',
+      promptDelivery: 'submit-after-ready',
+      agentArgs: '--model sonnet'
+    })
+
+    expect(result?.surface).toEqual({ kind: 'host-published' })
+    expect(store.createTab).not.toHaveBeenCalled()
+    await expect(result?.structuredSettlement).resolves.toEqual({ kind: 'terminal' })
+    expect(store.createTab).toHaveBeenCalledOnce()
+    expect(store.createTab.mock.calls[0]?.slice(0, 2)).toEqual(['wt-1', 'group-1'])
+    expect(store.queueTabStartupCommand).toHaveBeenCalledOnce()
+    expect(store.queueTabStartupCommand.mock.calls[0]?.[1]?.command).toBe(
+      "claude '--model' 'sonnet'"
+    )
+    // The typed prompt goes to that terminal once, and the caller hears it arrived.
+    await expect(result?.promptDeliveryResult).resolves.toEqual({
+      delivered: true,
+      failureNotified: false
+    })
+    const { pasteDraftWhenAgentReady } = await import('@/lib/agent-paste-draft')
+    expect(pasteDraftWhenAgentReady).toHaveBeenCalledOnce()
+    expect(pasteDraftWhenAgentReady).toHaveBeenCalledWith(
+      expect.objectContaining({ content: 'fix the flaky test' })
+    )
+    // On this machine the terminal opening is the answer; no notice names a server.
+    expect(mockToastInfo).not.toHaveBeenCalled()
+    expect(mockLaunchAgentInWebHostTab).not.toHaveBeenCalled()
+  })
+
+  it("opens the caller's own fallback, not the agent's terminal, when it names one", async () => {
+    store.settings = { ...store.settings, ...CHAT_DEFAULT_SETTINGS }
+    await useActualAdmission()
+    mockCreateSupport.mockResolvedValue({ supported: false })
+    const onStructuredHostDeclined = vi.fn(() => ({ opened: true }))
+    const { launchAgentInNewTab } = await import('./launch-agent-in-new-tab')
+
+    const result = launchAgentInNewTab({
+      requestId: 'request-11',
+      agent: 'claude',
+      worktreeId: 'wt-1',
+      onStructuredHostDeclined
+    })
+
+    await expect(result?.structuredSettlement).resolves.toEqual({ kind: 'terminal' })
+    expect(onStructuredHostDeclined).toHaveBeenCalledOnce()
     expect(store.createTab).not.toHaveBeenCalled()
   })
 
@@ -271,7 +324,7 @@ describe('agent launch caller routing', () => {
     })
 
     expect(result?.surface).toEqual({ kind: 'host-published' })
-    expect(mockLaunchAgentInStructuredNewTab).not.toHaveBeenCalled()
+    expect(mockBeginHostAdmittedStructuredLaunch).not.toHaveBeenCalled()
   })
 
   it('aborts a terminal open when beforeSurfaceOpen refuses', async () => {
@@ -308,28 +361,22 @@ describe('agent launch caller routing', () => {
     expect(mockLaunchAgentInWebHostTab).not.toHaveBeenCalled()
   })
 
-  it('hands the structured branch a session-scoped refusal hook', async () => {
+  it('aborts a structured open before its host is asked when beforeSurfaceOpen refuses', async () => {
     store.settings = { ...store.settings, ...CHAT_DEFAULT_SETTINGS }
     const beforeSurfaceOpen = vi.fn(() => false)
     const { launchAgentInNewTab } = await import('./launch-agent-in-new-tab')
 
-    launchAgentInNewTab({
+    const result = launchAgentInNewTab({
       requestId: 'request-7',
       agent: 'codex',
       worktreeId: 'wt-1',
       beforeSurfaceOpen
     })
 
-    // Why: the structured route cannot name its surface before the session id exists, so the
-    // funnel wraps the caller's hook and the structured executor decides when to ask.
-    const beforeOpen = mockLaunchAgentInStructuredNewTab.mock.calls[0]?.[0]?.beforeOpen
-    expect(typeof beforeOpen).toBe('function')
-    expect(beforeSurfaceOpen).not.toHaveBeenCalled()
-    expect(beforeOpen('session-7')).toBe(false)
-    expect(beforeSurfaceOpen).toHaveBeenCalledExactlyOnceWith({
-      kind: 'local-agent-session',
-      sessionId: 'session-7'
-    })
+    expect(result).toBeNull()
+    expect(beforeSurfaceOpen).toHaveBeenCalledExactlyOnceWith({ kind: 'host-published' })
+    expect(mockBeginHostAdmittedStructuredLaunch).not.toHaveBeenCalled()
+    expect(mockCreateSupport).not.toHaveBeenCalled()
   })
 
   it('opens the terminal when beforeSurfaceOpen returns undefined rather than false', async () => {
diff --git a/src/renderer/src/lib/agent-launch-route-registered-agents.test.ts b/src/renderer/src/lib/agent-launch-route-registered-agents.test.ts
index db5024bbb897..0a8c0bf005d8 100644
--- a/src/renderer/src/lib/agent-launch-route-registered-agents.test.ts
+++ b/src/renderer/src/lib/agent-launch-route-registered-agents.test.ts
@@ -1,10 +1,11 @@
-import { beforeEach, describe, expect, it, vi } from 'vitest'
+import { afterEach, beforeEach, describe, expect, it, vi, type MockInstance } from 'vitest'
 import {
   STRUCTURED_AGENT_SESSION_CLIENT_LAUNCH_MODE_CAPABILITY,
   STRUCTURED_AGENT_SESSION_REGISTERED_AGENTS_RUNTIME_CAPABILITY,
   STRUCTURED_AGENT_SESSION_RUNTIME_CAPABILITY,
   type RuntimeCapability
 } from '../../../shared/protocol-version'
+import type { GlobalSettings } from '../../../shared/global-settings-types'
 import type { RuntimeEnvironmentStatus } from '../../../shared/runtime-host-status'
 import type { TuiAgent } from '../../../shared/tui-agent'
 
@@ -68,8 +69,11 @@ function pairedStatus(runtimeId: string): RuntimeEnvironmentStatus {
   }
 }
 
+type RouteSettings = Partial<typeof SETTINGS> &
+  Partial<Pick<GlobalSettings, 'agentCmdOverrides' | 'agentDefaultEnv'>>
+
 function store(
-  overrides: { settings?: Partial<typeof SETTINGS>; runtimeId?: string } = {}
+  overrides: { settings?: RouteSettings; runtimeId?: string } = {}
 ): AgentLaunchRouteStore {
   const state = {
     settings: { ...SETTINGS, ...overrides.settings },
@@ -134,3 +138,58 @@ describe('structured launch of a host-registered agent', () => {
     )
   })
 })
+
+describe('OpenCode with its Command and environment set (live QA run 5)', () => {
+  const LISTS_OPENCODE = {
+    agents: [...LISTS_GROK.agents, { agent: 'opencode', capabilities: {} }]
+  }
+  // The rig's settings: a private binary named twice, which must not decide the surface.
+  const withOverrides = (): AgentLaunchRouteStore =>
+    store({
+      settings: {
+        agentCmdOverrides: { opencode: '/rig/oc-prefix/bin/opencode' },
+        agentDefaultEnv: { opencode: { PATH: '/rig/oc-prefix/bin:/usr/bin:/bin' } }
+      }
+    })
+  let warn: MockInstance<typeof console.warn>
+  beforeEach(() => {
+    warn = vi.spyOn(console, 'warn').mockImplementation(() => {})
+  })
+  afterEach(() => {
+    warn.mockRestore()
+  })
+
+  it('opens a chat once the local host listed OpenCode', async () => {
+    mocks.callRuntimeRpc.mockResolvedValue(LISTS_OPENCODE)
+    await loadHostStructuredAgents('local', REGISTERED, null)
+
+    expect(routeFor(withOverrides(), 'opencode')).toBe('structured-native-chat')
+  })
+
+  it('says why it opened the terminal chat and asks the host again after a failed startup read', async () => {
+    mocks.callRuntimeRpc.mockRejectedValueOnce(new Error('host not ready'))
+    await loadHostStructuredAgents('local', REGISTERED, null)
+    mocks.callRuntimeRpc.mockResolvedValue(LISTS_OPENCODE)
+
+    // What run 5 saw: the terminal-backed "OpenCode" chat, and no version check on the host.
+    expect(routeFor(withOverrides(), 'opencode')).toBe('legacy-native-chat')
+    expect(warn).toHaveBeenCalledWith(
+      '[agent-launch-route] opencode opens legacy-native-chat: agent-without-structured-session ' +
+        '(host local, host agents not learned, host capabilities known)'
+    )
+    await vi.waitFor(() => expect(mocks.callRuntimeRpc).toHaveBeenCalledTimes(2))
+    // The next launch reads the list the re-ask learned.
+    await vi.waitFor(() =>
+      expect(routeFor(withOverrides(), 'opencode')).toBe('structured-native-chat')
+    )
+  })
+
+  it('names the settings default when new agent tabs do not open as chats', () => {
+    expect(routeFor(store({ settings: { openAgentTabsInChatByDefault: false } }), 'opencode')).toBe(
+      'terminal-tui'
+    )
+    expect(warn).toHaveBeenCalledWith(
+      expect.stringContaining('opencode opens terminal-tui: new-tabs-default-to-terminal')
+    )
+  })
+})
diff --git a/src/renderer/src/lib/agent-launch-routing.ts b/src/renderer/src/lib/agent-launch-routing.ts
index eaeda98dcbc4..93bc37ecb520 100644
--- a/src/renderer/src/lib/agent-launch-routing.ts
+++ b/src/renderer/src/lib/agent-launch-routing.ts
@@ -2,7 +2,8 @@ import type { GlobalSettings } from '../../../shared/global-settings-types'
 import type { ProjectExecutionRuntimeResolution } from '../../../shared/project-execution-runtime'
 import {
   prefersStructuredNativeChatByDefault,
-  resolveStructuredNativeChatSupport
+  resolveStructuredNativeChatSupport,
+  type StructuredNativeChatBlocker
 } from '../../../shared/structured-native-chat-launch-route'
 import type { TuiAgent } from '../../../shared/tui-agent'
 import type { WorkspaceLaunchKind } from '../../../shared/workspace-launch-kind'
@@ -70,15 +71,38 @@ export function structuredAgentLaunchSupported(
 ): boolean {
   return (
     input.settings?.experimentalStructuredNativeChat === true &&
-    resolveStructuredNativeChatSupport({
-      agent: input.agent,
-      executionHostId: input.executionHostId,
-      hostCapabilities: input.hostCapabilities,
-      ...(input.clientCapabilities ? { clientCapabilities: input.clientCapabilities } : {}),
-      workspaceKind: input.workspaceKind,
-      projectRuntime: input.projectRuntime,
-      startsOutsideWorkspaceRoot: input.startsOutsideWorkspaceRoot,
-      ...(input.hostStructuredAgents ? { hostStructuredAgents: input.hostStructuredAgents } : {})
-    }).supported
+    structuredAgentLaunchSupport(input).supported
   )
 }
+
+function structuredAgentLaunchSupport(input: Omit<AgentLaunchRoutingInput, 'launchText'>) {
+  return resolveStructuredNativeChatSupport({
+    agent: input.agent,
+    executionHostId: input.executionHostId,
+    hostCapabilities: input.hostCapabilities,
+    ...(input.clientCapabilities ? { clientCapabilities: input.clientCapabilities } : {}),
+    workspaceKind: input.workspaceKind,
+    projectRuntime: input.projectRuntime,
+    startsOutsideWorkspaceRoot: input.startsOutsideWorkspaceRoot,
+    ...(input.hostStructuredAgents ? { hostStructuredAgents: input.hostStructuredAgents } : {})
+  })
+}
+
+/** Why a launch with structured chat turned on did not route to it; null when it did, or when
+ *  structured chat is off. Diagnostics only: the route itself is `resolveAgentLaunchRoute`. */
+export function structuredAgentLaunchDowngrade(
+  input: AgentLaunchRoutingInput,
+  route: AgentLaunchRoute
+): StructuredNativeChatBlocker | 'new-tabs-default-to-terminal' | null {
+  if (
+    route === 'structured-native-chat' ||
+    input.settings?.experimentalStructuredNativeChat !== true
+  ) {
+    return null
+  }
+  if (!prefersStructuredNativeChatByDefault(input.settings)) {
+    return 'new-tabs-default-to-terminal'
+  }
+  const support = structuredAgentLaunchSupport(input)
+  return support.supported ? null : support.blocker
+}
diff --git a/src/renderer/src/lib/agent-message-send.test.ts b/src/renderer/src/lib/agent-message-send.test.ts
new file mode 100644
index 000000000000..3178004d797d
--- /dev/null
+++ b/src/renderer/src/lib/agent-message-send.test.ts
@@ -0,0 +1,111 @@
+import { beforeEach, expect, it, vi } from 'vitest'
+
+const mocks = vi.hoisted(() => {
+  const launch: { lifecycle: string | null } = { lifecycle: null }
+  return {
+    send: vi.fn(),
+    relaunch: vi.fn((): Promise<{ delivered: boolean; unconfirmed?: true }> | null => null),
+    launch
+  }
+})
+
+vi.mock('@/store', () => ({
+  useAppStore: {
+    getState: () => ({
+      unifiedTabsByWorktree: {
+        'wt-1': [{ contentType: 'agent-session', entityId: 'session-1' }]
+      }
+    })
+  }
+}))
+vi.mock('@/runtime/structured-agent-session-owner', () => ({
+  structuredAgentSessionTargetForTab: () => ({ kind: 'local' })
+}))
+vi.mock('./structured-agent-session-launch-message', () => ({
+  relaunchFailedStructuredAgentSessionWithMessage: mocks.relaunch
+}))
+vi.mock('./structured-agent-session-launch-registry', () => ({
+  getStructuredAgentSessionLaunchLifecycle: () => mocks.launch.lifecycle
+}))
+vi.mock('./active-agent-note-send', () => ({ sendNotesToActiveAgentSession: vi.fn() }))
+vi.mock('@/components/native-chat/structured-agent-session-message-sender', () => ({
+  sendStructuredAgentSessionMessage: mocks.send
+}))
+
+import { sendMessageToAgent } from './agent-message-send'
+import { activeAgentNotesSendFailureMessage } from './active-agent-note-send-result'
+
+function sendNotes() {
+  return sendMessageToAgent({
+    worktreeId: 'wt-1',
+    target: { kind: 'structured-session', sessionId: 'session-1' },
+    prompt: 'the notes'
+  })
+}
+
+beforeEach(() => {
+  mocks.send.mockReset()
+  mocks.relaunch.mockClear()
+  mocks.launch.lifecycle = null
+})
+
+// Notes clear only when their message is recorded; any other end keeps them with the caller.
+it.each([
+  ['recorded', { status: 'sent' }],
+  ['returned', { status: 'not-writable', code: 'session-send-refused' }],
+  // The host may hold it: the notes stay, worded as unconfirmed, never as refused.
+  ['unconfirmed', { status: 'unconfirmed', code: 'runtime-unverifiable' }],
+  ['dropped', { status: 'not-writable', code: 'session-send-refused' }]
+] as const)('reports notes whose message was %s', async (outcome, result) => {
+  mocks.send.mockReturnValue({ clientMessageId: 'm', outcome: Promise.resolve(outcome) })
+  await expect(sendNotes()).resolves.toEqual(result)
+  expect(mocks.send).toHaveBeenCalledWith(
+    expect.objectContaining({ sessionId: 'session-1', text: 'the notes', callerKeepsText: true })
+  )
+})
+
+it('words unconfirmed notes as the chat does', () => {
+  expect(activeAgentNotesSendFailureMessage('unconfirmed', { explicitTarget: true })).toBe(
+    "Orca couldn't confirm your message reached the agent. Check the chat, then send it again if needed."
+  )
+})
+
+it('keeps the notes while the chat has a send out', async () => {
+  mocks.send.mockReturnValue(null)
+  await expect(sendNotes()).resolves.toEqual({
+    status: 'not-ready',
+    code: 'session-send-refused'
+  })
+})
+
+it.each(['pending', 'visibility-unknown'])(
+  'keeps the notes while the chat is %s',
+  async (lifecycle) => {
+    mocks.launch.lifecycle = lifecycle
+    await expect(sendNotes()).resolves.toEqual({
+      status: 'not-ready',
+      code: 'session-send-refused'
+    })
+    expect(mocks.send).not.toHaveBeenCalled()
+  }
+)
+
+// The notes ride the restart of a chat whose start failed, and stay with their sender meanwhile.
+it('restarts a failed chat with the notes as its first message', async () => {
+  mocks.launch.lifecycle = 'failed'
+  mocks.relaunch.mockReturnValue(Promise.resolve({ delivered: true }))
+  await expect(sendNotes()).resolves.toEqual({ status: 'sent' })
+  expect(mocks.relaunch).toHaveBeenCalledWith('wt-1', 'session-1', 'the notes', {
+    callerKeepsText: true
+  })
+  expect(mocks.send).not.toHaveBeenCalled()
+})
+
+it('says a restart that carried the notes could not be confirmed, never that it refused them', async () => {
+  mocks.launch.lifecycle = 'failed'
+  mocks.relaunch.mockReturnValue(Promise.resolve({ delivered: false, unconfirmed: true }))
+  await expect(sendNotes()).resolves.toEqual({
+    status: 'unconfirmed',
+    code: 'runtime-unverifiable'
+  })
+})
diff --git a/src/renderer/src/lib/agent-message-send.ts b/src/renderer/src/lib/agent-message-send.ts
index 03f92bc22f16..b6c247caa3dc 100644
--- a/src/renderer/src/lib/agent-message-send.ts
+++ b/src/renderer/src/lib/agent-message-send.ts
@@ -1,8 +1,11 @@
 import type { ActiveAgentNotesSendResult } from './active-agent-note-send-result'
 import type { AgentMessageTarget } from './agent-message-target'
 import { sendNotesToActiveAgentSession } from './active-agent-note-send'
-import { relaunchFailedStructuredAgentSessionForMessage } from './structured-agent-session-launch'
-import { appendStructuredAgentSessionOutboxMessage } from '@/components/native-chat/structured-agent-session-outbox-storage'
+import { relaunchFailedStructuredAgentSessionWithMessage } from './structured-agent-session-launch-message'
+import { getStructuredAgentSessionLaunchLifecycle } from './structured-agent-session-launch-registry'
+import { sendStructuredAgentSessionMessage } from '@/components/native-chat/structured-agent-session-message-sender'
+import { structuredAgentSessionTargetForTab } from '@/runtime/structured-agent-session-owner'
+import { useAppStore } from '@/store'
 
 export type { AgentMessageTarget } from './agent-message-target'
 
@@ -24,11 +27,51 @@ export async function sendMessageToAgent(args: {
       noteTarget: { tabId: target.tabId, leafId: target.leafId }
     })
   }
-  // Why: queued on the chat's own outbox, as its composer does, so the message shows in the
-  // chat and a failed send stays there with Retry. The open chat delivers it.
-  if (!appendStructuredAgentSessionOutboxMessage(target.sessionId, prompt)) {
-    return { status: 'not-writable', code: 'session-outbox-unsaved' }
+  const state = useAppStore.getState()
+  const tab = (state.unifiedTabsByWorktree[worktreeId] ?? []).find(
+    (candidate) =>
+      candidate.contentType === 'agent-session' && candidate.entityId === target.sessionId
+  )
+  const runtime = tab ? structuredAgentSessionTargetForTab(state, tab) : null
+  if (!runtime) {
+    return { status: 'not-writable', code: 'session-send-refused' }
   }
-  relaunchFailedStructuredAgentSessionForMessage(worktreeId, target.sessionId)
-  return { status: 'sent' }
+  const lifecycle = getStructuredAgentSessionLaunchLifecycle(worktreeId, target.sessionId)
+  // A chat still starting takes no send yet: the notes wait, as its composer would.
+  if (lifecycle === 'pending' || lifecycle === 'visibility-unknown') {
+    return { status: 'not-ready', code: 'session-send-refused' }
+  }
+  // A failed start restarts, with the notes as its first message.
+  const relaunched = relaunchFailedStructuredAgentSessionWithMessage(
+    worktreeId,
+    target.sessionId,
+    prompt,
+    { callerKeepsText: true }
+  )
+  if (relaunched) {
+    const result = await relaunched
+    return result.delivered
+      ? { status: 'sent' }
+      : result.unconfirmed
+        ? { status: 'unconfirmed', code: 'runtime-unverifiable' }
+        : { status: 'not-writable', code: 'session-send-refused' }
+  }
+  // Sent as its composer would, so it shows in the chat; reported only once the host answers.
+  const sent = sendStructuredAgentSessionMessage({
+    sessionId: target.sessionId,
+    target: runtime,
+    text: prompt,
+    callerKeepsText: true
+  })
+  // The chat's own send is still out: the notes wait, as its composer would.
+  if (!sent) {
+    return { status: 'not-ready', code: 'session-send-refused' }
+  }
+  // Anything else leaves the text with the caller, which keeps its notes.
+  const outcome = await sent.outcome
+  return outcome === 'recorded'
+    ? { status: 'sent' }
+    : outcome === 'unconfirmed'
+      ? { status: 'unconfirmed', code: 'runtime-unverifiable' }
+      : { status: 'not-writable', code: 'session-send-refused' }
 }
diff --git a/src/renderer/src/lib/agent-session-launch-plan.test.ts b/src/renderer/src/lib/agent-session-launch-plan.test.ts
index b2088bdbe3b9..7d7ce15a2217 100644
--- a/src/renderer/src/lib/agent-session-launch-plan.test.ts
+++ b/src/renderer/src/lib/agent-session-launch-plan.test.ts
@@ -13,7 +13,8 @@ vi.mock('@/lib/agent-launch-route-input', () => ({
 }))
 vi.mock('@/lib/agent-launch-routing', () => ({
   resolveAgentLaunchRoute: mocks.resolveAgentLaunchRoute,
-  structuredAgentLaunchSupported: mocks.structuredAgentLaunchSupported
+  structuredAgentLaunchSupported: mocks.structuredAgentLaunchSupported,
+  structuredAgentLaunchDowngrade: () => null
 }))
 vi.mock('@/lib/structured-agent-launch-settlement', () => ({
   beginStructuredAgentLaunchSettlement: mocks.beginStructuredAgentLaunchSettlement
diff --git a/src/renderer/src/lib/agent-session-launch-plan.ts b/src/renderer/src/lib/agent-session-launch-plan.ts
index 375198226b7a..25a247ca4e39 100644
--- a/src/renderer/src/lib/agent-session-launch-plan.ts
+++ b/src/renderer/src/lib/agent-session-launch-plan.ts
@@ -1,6 +1,7 @@
 import type { StructuredAgentSessionResumeSource } from '../../../shared/structured-agent-session-create'
 import type { TuiAgent } from '../../../shared/tui-agent'
 import { parseExecutionHostId, type ExecutionHostId } from '../../../shared/execution-host'
+import { STRUCTURED_AGENT_SESSION_REGISTERED_AGENTS_RUNTIME_CAPABILITY } from '../../../shared/protocol-version'
 import { toast } from 'sonner'
 import { translate } from '@/i18n/i18n'
 import { StructuredAgentSessionOwnerUnresolvedError } from '@/lib/launch-structured-agent-session'
@@ -11,6 +12,7 @@ import {
 } from '@/lib/agent-launch-route-input'
 import {
   resolveAgentLaunchRoute,
+  structuredAgentLaunchDowngrade,
   structuredAgentLaunchSupported,
   type AgentLaunchRoute,
   type AgentLaunchRoutingInput
@@ -24,12 +26,16 @@ import {
 } from '@/lib/structured-agent-launch-settlement'
 import type { StructuredAgentLaunchOptions } from '@/lib/structured-agent-session-launch'
 import type { AgentLaunchRequestId } from '@/lib/agent-launch-request-id'
+import { relearnHostStructuredAgents } from '@/runtime/host-structured-agents'
+import { awaitLocalRuntimeCapabilities } from '@/runtime/local-runtime-capabilities'
 
 export type AgentSessionLaunchRequest = AgentLaunchRouteArgs & {
   /** The user action this launch serves, minted where that action is handled. */
   requestId: AgentLaunchRequestId
   resumeFrom?: StructuredAgentSessionResumeSource
   onPromptDelivered?: () => void
+  /** The caller keeps the prompt's text if it does not go out (notes), so no composer gets it. */
+  promptKeptByCaller?: true
 }
 
 /**
@@ -49,6 +55,7 @@ export type AgentSessionLaunchVerdict = {
   promptDelivery?: NativeChatLaunchPromptDelivery
   resumeFrom?: StructuredAgentSessionResumeSource
   onPromptDelivered?: () => void
+  promptKeptByCaller?: true
 }
 
 export type AgentSessionStructuredFeasibilityRequest = AgentLaunchRouteArgs & {
@@ -88,6 +95,7 @@ function structuredLaunchOptions(verdict: AgentSessionLaunchVerdict): Structured
     ...(verdict.promptDelivery ? { promptDelivery: verdict.promptDelivery } : {}),
     ...(verdict.resumeFrom ? { resumeFrom: verdict.resumeFrom } : {}),
     ...(verdict.onPromptDelivered ? { onPromptDelivered: verdict.onPromptDelivered } : {}),
+    ...(verdict.promptKeptByCaller ? { promptKeptByCaller: true as const } : {}),
     ...(verdict.executionHostId ? { executionHostId: verdict.executionHostId } : {})
   }
 }
@@ -167,6 +175,99 @@ export function resolveAgentSessionLaunchRoute(
   return resolveAgentLaunchRoute(buildAgentLaunchRouteInput(store, request))
 }
 
+/** Says in the console why a launch with structured chat on opens a terminal, and asks again a
+ *  host whose agent list was never learned, so the next launch can open its chat. */
+function reportStructuredLaunchDowngrade(
+  store: AgentLaunchRouteStore,
+  input: AgentLaunchRoutingInput,
+  route: AgentLaunchRoute
+): void {
+  const downgrade = structuredAgentLaunchDowngrade(input, route)
+  if (!downgrade) {
+    return
+  }
+  console.warn(
+    `[agent-launch-route] ${input.agent} opens ${route}: ${downgrade} (host ${input.executionHostId}, ` +
+      `host agents ${input.hostStructuredAgents ? 'listed' : 'not learned'}, ` +
+      `host capabilities ${input.hostCapabilities ? 'known' : 'unknown'})`
+  )
+  if (downgrade === 'agent-without-structured-session' && !input.hostStructuredAgents) {
+    // Bookkeeping: a failed re-ask never touches this launch.
+    relearnHostStructuredAgents(
+      input.executionHostId,
+      input.hostCapabilities,
+      store.runtimeStatusByEnvironmentId
+    ).catch((error: unknown) => {
+      console.warn('[agent-launch-route] could not ask the host for its agents again', error)
+    })
+  }
+}
+
+/** What a launch's chat route is waiting to hear from its host, if anything: the host's agent
+ *  list, or this computer's runtime capabilities while startup is still answering. */
+function structuredRouteAwaits(
+  input: AgentLaunchRoutingInput
+): 'host-agents' | 'local-capabilities' | null {
+  const downgrade = structuredAgentLaunchDowngrade(input, resolveAgentLaunchRoute(input))
+  if (
+    downgrade === 'agent-without-structured-session' &&
+    !input.hostStructuredAgents &&
+    // A host that does not publish its agents has no list to wait for.
+    input.hostCapabilities?.includes(
+      STRUCTURED_AGENT_SESSION_REGISTERED_AGENTS_RUNTIME_CAPABILITY
+    ) !== false
+  ) {
+    return 'host-agents'
+  }
+  return downgrade === 'runtime-capability-unknown' &&
+    parseExecutionHostId(input.executionHostId)?.kind === 'local'
+    ? 'local-capabilities'
+    : null
+}
+
+/** When a launch's chat route waits only on its host's answer (the agent list, or this
+ *  computer's runtime capabilities during a slow startup), asks for it and resolves once it came
+ *  or after `waitMs`, whichever is first; null when the route waits on neither. The caller then
+ *  decides the route again. */
+export function awaitStructuredRouteHostAnswer(
+  store: AgentLaunchRouteStore,
+  request: AgentLaunchRouteArgs,
+  waitMs: number
+): Promise<void> | null {
+  const input = buildAgentLaunchRouteInput(store, request)
+  const awaits = structuredRouteAwaits(input)
+  if (!awaits) {
+    return null
+  }
+  let stopCapabilitiesWait = (): void => {}
+  const ask = async (): Promise<void> => {
+    let capabilities = input.hostCapabilities
+    // Either route may be missing this computer's capabilities: wait for the probe that lands
+    // them, since one that failed at startup answers null at once.
+    if (capabilities === null && parseExecutionHostId(input.executionHostId)?.kind === 'local') {
+      const wait = awaitLocalRuntimeCapabilities()
+      stopCapabilitiesWait = wait.stop
+      capabilities = await wait.known
+    }
+    await relearnHostStructuredAgents(
+      input.executionHostId,
+      capabilities,
+      store.runtimeStatusByEnvironmentId
+    )
+  }
+  let timer: ReturnType<typeof setTimeout> | undefined
+  const answered = ask().catch((error: unknown) => {
+    console.warn('[agent-launch-route] could not ask the host', error)
+  })
+  const deadline = new Promise<void>((resolve) => {
+    timer = setTimeout(resolve, waitMs)
+  })
+  return Promise.race([answered, deadline]).finally(() => {
+    clearTimeout(timer)
+    stopCapabilitiesWait()
+  })
+}
+
 /** The one place a launch route is decided. Delivery mode is fixed here too, so the settle loop
  *  later receives exactly the prompt and mode the route was decided on. */
 export function planAgentSessionLaunch(
@@ -175,6 +276,7 @@ export function planAgentSessionLaunch(
 ): AgentSessionLaunchPlan {
   const input = buildAgentLaunchRouteInput(store, request)
   const route = resolveAgentLaunchRoute(input)
+  reportStructuredLaunchDowngrade(store, input, route)
   const executionHostId =
     route === 'structured-native-chat' ? parseExecutionHostId(input.executionHostId)?.id : undefined
   return adoptAgentSessionLaunchVerdict({
@@ -186,6 +288,7 @@ export function planAgentSessionLaunch(
     ...(request.prompt !== undefined ? { prompt: request.prompt } : {}),
     ...(request.promptDelivery ? { promptDelivery: request.promptDelivery } : {}),
     ...(request.resumeFrom ? { resumeFrom: request.resumeFrom } : {}),
-    ...(request.onPromptDelivered ? { onPromptDelivered: request.onPromptDelivered } : {})
+    ...(request.onPromptDelivered ? { onPromptDelivered: request.onPromptDelivered } : {}),
+    ...(request.promptKeptByCaller ? { promptKeptByCaller: true as const } : {})
   })
 }
diff --git a/src/renderer/src/lib/background-pane-exit-output.ts b/src/renderer/src/lib/background-pane-exit-output.ts
new file mode 100644
index 000000000000..5d077313bf1e
--- /dev/null
+++ b/src/renderer/src/lib/background-pane-exit-output.ts
@@ -0,0 +1,46 @@
+import {
+  registerEagerPtyBuffer,
+  type EagerPtyHandle
+} from '@/components/terminal-pane/pty-dispatcher'
+import { useAppStore } from '@/store'
+
+function persistExitedPaneOutput(tabId: string, leafId: string, output: string): void {
+  const store = useAppStore.getState()
+  const layout = store.terminalLayoutsByTabId[tabId]
+  if (!layout) {
+    return
+  }
+  const { ptyIdsByLeafId: existingPtyIds, buffersByLeafId: existingBuffers, ...rest } = layout
+  const nextPtyIds = { ...existingPtyIds }
+  delete nextPtyIds[leafId]
+  const trimmedOutput = output.trim() ? output : ''
+  store.setTabLayout(tabId, {
+    ...rest,
+    ...(Object.keys(nextPtyIds).length > 0 ? { ptyIdsByLeafId: nextPtyIds } : {}),
+    ...(trimmedOutput
+      ? {
+          buffersByLeafId: {
+            ...existingBuffers,
+            [leafId]: output
+          }
+        }
+      : existingBuffers
+        ? { buffersByLeafId: existingBuffers }
+        : {})
+  })
+}
+
+// Why the incarnation: a relay-recycled id can hold the previous owner's exit, and draining that
+// into this handler tears the pane down seconds after it launched.
+export function registerBackgroundPaneBuffer(
+  tabId: string,
+  leafId: string,
+  pane: { ptyId: string; incarnationId?: string }
+): void {
+  let eagerBuffer: EagerPtyHandle | null = null
+  const onExit = (exitPtyId: string): void => {
+    persistExitedPaneOutput(tabId, leafId, eagerBuffer?.flush() ?? '')
+    useAppStore.getState().clearTabPtyId(tabId, exitPtyId)
+  }
+  eagerBuffer = registerEagerPtyBuffer(pane.ptyId, onExit, pane.incarnationId)
+}
diff --git a/src/renderer/src/lib/claude-account-sign-in-notice.test.ts b/src/renderer/src/lib/claude-account-sign-in-notice.test.ts
new file mode 100644
index 000000000000..d4515b47a60f
--- /dev/null
+++ b/src/renderer/src/lib/claude-account-sign-in-notice.test.ts
@@ -0,0 +1,111 @@
+// @vitest-environment happy-dom
+
+import { act } from 'react'
+import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest'
+import type {
+  ClaudeManagedAccountSummary,
+  ClaudeRateLimitAccountsState
+} from '../../../shared/managed-account-types'
+import {
+  mountHook,
+  noticeTestStore,
+  setNoticeState,
+  unmountHooks
+} from '../components/terminal-pane/codex-notice-test-harness'
+import { useClaudeAccountSignInNotice } from './claude-account-sign-in-notice'
+
+const { toastInfo, toastError } = vi.hoisted(() => ({ toastInfo: vi.fn(), toastError: vi.fn() }))
+vi.mock('sonner', () => ({ toast: { info: toastInfo, error: toastError } }))
+vi.mock('@/store', () => import('../components/terminal-pane/codex-notice-test-harness'))
+
+function account(id: string, needsSignIn = false): ClaudeManagedAccountSummary {
+  return {
+    id,
+    email: `${id}@example.test`,
+    authMethod: 'subscription-oauth',
+    createdAt: 0,
+    updatedAt: 0,
+    lastAuthenticatedAt: 0,
+    ...(needsSignIn ? { needsSignIn: true as const } : {})
+  }
+}
+
+let state: ClaudeRateLimitAccountsState
+const list = vi.fn(() => Promise.resolve(state))
+const reauthenticate = vi.fn(() => Promise.resolve(state))
+const fetchSettings = vi.fn(() => Promise.resolve())
+
+async function settle(): Promise<void> {
+  await act(async () => {
+    await Promise.resolve()
+  })
+}
+
+beforeEach(() => {
+  vi.clearAllMocks()
+  state = {
+    accounts: [account('a', true), account('b', true)],
+    activeAccountId: 'b',
+    activeAccountIdsByRuntime: { host: 'b', wsl: {} }
+  }
+  vi.stubGlobal('api', { claudeAccounts: { list, reauthenticate } })
+  noticeTestStore.setState(
+    {
+      claudeAccountSignInNoticeSeen: true,
+      markClaudeAccountSignInNoticeSeen: () =>
+        noticeTestStore.setState({ claudeAccountSignInNoticeSeen: true }),
+      fetchSettings
+    },
+    true
+  )
+})
+
+afterEach(() => {
+  unmountHooks()
+  vi.unstubAllGlobals()
+})
+
+describe('useClaudeAccountSignInNotice', () => {
+  it('waits for the persisted flag, then shows once with Sign in for the selected account', async () => {
+    await mountHook(useClaudeAccountSignInNotice)
+    expect(list).not.toHaveBeenCalled()
+
+    await setNoticeState({ claudeAccountSignInNoticeSeen: false })
+    await settle()
+    expect(noticeTestStore.getState().claudeAccountSignInNoticeSeen).toBe(true)
+    expect(toastInfo).toHaveBeenCalledTimes(1)
+    const [title, options] = toastInfo.mock.calls[0]
+    expect(title).toBe('Finish setting up your Claude accounts')
+    expect(options).toMatchObject({
+      description: "Sign in to each saved account once and you're ready to switch anytime.",
+      duration: Infinity,
+      action: { label: 'Sign in to b@example.test' }
+    })
+
+    await act(async () => options.action.onClick())
+    await settle()
+    expect(reauthenticate).toHaveBeenCalledWith({ accountId: 'b' })
+    expect(fetchSettings).toHaveBeenCalled()
+  })
+
+  it('signs in to the first account needing it when the selected one does not', async () => {
+    state.accounts = [account('a'), account('b', true)]
+    state.activeAccountIdsByRuntime = { host: 'a', wsl: {} }
+    await mountHook(useClaudeAccountSignInNotice)
+    await setNoticeState({ claudeAccountSignInNoticeSeen: false })
+    await settle()
+    await act(async () => toastInfo.mock.calls[0][1].action.onClick())
+    await settle()
+    expect(reauthenticate).toHaveBeenCalledWith({ accountId: 'b' })
+  })
+
+  it('never shows without an account that needs a sign-in, and never asks again', async () => {
+    state.accounts = [account('a')]
+    await mountHook(useClaudeAccountSignInNotice)
+    await setNoticeState({ claudeAccountSignInNoticeSeen: false })
+    await settle()
+    expect(toastInfo).not.toHaveBeenCalled()
+    expect(noticeTestStore.getState().claudeAccountSignInNoticeSeen).toBe(true)
+    expect(list).toHaveBeenCalledTimes(1)
+  })
+})
diff --git a/src/renderer/src/lib/claude-account-sign-in-notice.ts b/src/renderer/src/lib/claude-account-sign-in-notice.ts
new file mode 100644
index 000000000000..f1892652aa92
--- /dev/null
+++ b/src/renderer/src/lib/claude-account-sign-in-notice.ts
@@ -0,0 +1,63 @@
+import { useEffect } from 'react'
+import { toast } from 'sonner'
+import { translate } from '@/i18n/i18n'
+import { useAppStore } from '@/store'
+import type { ClaudeManagedAccountSummary } from '../../../shared/managed-account-types'
+import { isPairedWebClientWindow } from '@/lib/desktop-window-chrome'
+import { claudeAccountToSignIn, signInToClaudeAccount } from './claude-account-sign-in'
+
+const NOTICE_TOAST_ID = 'claude-account-sign-in-notice'
+
+function showClaudeAccountSignInNotice(account: ClaudeManagedAccountSummary): void {
+  toast.info(
+    translate('accounts.claude.signInNotice.title', 'Finish setting up your Claude accounts'),
+    {
+      // Why a stable id: a late sync that resets the flag can't stack a second toast.
+      id: NOTICE_TOAST_ID,
+      description: translate(
+        'accounts.claude.signInNotice.description',
+        "Sign in to each saved account once and you're ready to switch anytime."
+      ),
+      // Why no timeout: it is marked seen before showing, so an auto-close would lose it for good.
+      duration: Infinity,
+      action: {
+        label: translate('accounts.claude.signInNotice.action', 'Sign in to {{value0}}', {
+          value0: account.email
+        }),
+        onClick: () => void signInToClaudeAccount(account.id)
+      }
+    }
+  )
+}
+
+/** Once, on the first launch after the update: only when a saved account still needs a sign-in. */
+export function useClaudeAccountSignInNotice(): void {
+  // Why no hydration check: the flag defaults to true until the persisted value arrives.
+  const seen = useAppStore((s) => s.claudeAccountSignInNoticeSeen)
+
+  useEffect(() => {
+    // Why skip paired web clients: the accounts are the host's, whose own window shows this.
+    if (seen || isPairedWebClientWindow()) {
+      return
+    }
+    let cancelled = false
+    void window.api.claudeAccounts
+      .list()
+      .then((state) => {
+        if (cancelled) {
+          return
+        }
+        // Why mark either way: the update happened once; a later sign-out is not this news.
+        useAppStore.getState().markClaudeAccountSignInNoticeSeen()
+        const accountId = claudeAccountToSignIn(state)
+        const account = state.accounts.find((candidate) => candidate.id === accountId)
+        if (account) {
+          showClaudeAccountSignInNotice(account)
+        }
+      })
+      .catch((error: unknown) => console.warn('[claude-accounts] Sign-in notice skipped:', error))
+    return () => {
+      cancelled = true
+    }
+  }, [seen])
+}
diff --git a/src/renderer/src/lib/claude-account-sign-in.ts b/src/renderer/src/lib/claude-account-sign-in.ts
new file mode 100644
index 000000000000..fb17da8744c9
--- /dev/null
+++ b/src/renderer/src/lib/claude-account-sign-in.ts
@@ -0,0 +1,37 @@
+import { toast } from 'sonner'
+import { translate } from '@/i18n/i18n'
+import { useAppStore } from '@/store'
+import type { ClaudeRateLimitAccountsState } from '../../../shared/managed-account-types'
+import {
+  getClaudeAccountErrorDescription,
+  isClaudeAccountCancellation
+} from '@/components/settings/accounts-pane-action-errors'
+
+/** The selected account when it needs a sign-in, else the first saved account that does. */
+export function claudeAccountToSignIn(state: ClaudeRateLimitAccountsState): string | null {
+  const needing = state.accounts.filter((account) => account.needsSignIn)
+  const selected = state.activeAccountIdsByRuntime?.host ?? state.activeAccountId
+  return (needing.find((account) => account.id === selected) ?? needing[0])?.id ?? null
+}
+
+/** Settings' Sign in again: a hidden `claude auth login` into the account's own folder. True once
+ *  signed in; a failure says why in a toast, and a cancel says nothing. */
+export async function signInToClaudeAccount(accountId: string): Promise<boolean> {
+  try {
+    await window.api.claudeAccounts.reauthenticate({ accountId })
+    // Why: the account rows other surfaces read come from settings, which the sign-in rewrote.
+    await useAppStore.getState().fetchSettings()
+    return true
+  } catch (error) {
+    if (!isClaudeAccountCancellation(error)) {
+      toast.error(
+        translate(
+          'auto.components.settings.AccountsPane.2743cdc0af',
+          'Claude account update failed.'
+        ),
+        { description: getClaudeAccountErrorDescription(error) }
+      )
+    }
+    return false
+  }
+}
diff --git a/src/renderer/src/lib/editor-file-operation-owner.ts b/src/renderer/src/lib/editor-file-operation-owner.ts
index a1805976d51a..b05d7dd6a8f3 100644
--- a/src/renderer/src/lib/editor-file-operation-owner.ts
+++ b/src/renderer/src/lib/editor-file-operation-owner.ts
@@ -9,6 +9,7 @@ import {
   type WorktreeOperationGenerationSnapshot
 } from './worktree-operation-generation'
 import {
+  getFloatingWorkspaceOperationRoute,
   resolveExplicitWorktreeOperationRouteResult,
   resolveWorktreeOperationRoute,
   settingsForWorktreeOperationRoute,
@@ -56,20 +57,19 @@ export function captureEditorFileOperationProvenance(
       : 'legacy'
   const hintedRuntimeEnvironmentId = ownerHint?.trim() || null
   const route =
-    worktreeId === FLOATING_TERMINAL_WORKTREE_ID
-      ? { executionHostId: 'local' as const, runtimeEnvironmentId: null }
-      : explicitResolution.kind === 'resolved'
-        ? explicitResolution.route
-        : explicitResolution.kind === 'ambiguous'
-          ? null
-          : ownerHintProvided && worktreeIsPublished
-            ? {
-                executionHostId: hintedRuntimeEnvironmentId
-                  ? (`runtime:${encodeURIComponent(hintedRuntimeEnvironmentId)}` as const)
-                  : ('local' as const),
-                runtimeEnvironmentId: hintedRuntimeEnvironmentId
-              }
-            : resolveEditorOwnerRoute(state, worktreeId)
+    getFloatingWorkspaceOperationRoute(worktreeId) ??
+    (explicitResolution.kind === 'resolved'
+      ? explicitResolution.route
+      : explicitResolution.kind === 'ambiguous'
+        ? null
+        : ownerHintProvided && worktreeIsPublished
+          ? {
+              executionHostId: hintedRuntimeEnvironmentId
+                ? (`runtime:${encodeURIComponent(hintedRuntimeEnvironmentId)}` as const)
+                : ('local' as const),
+              runtimeEnvironmentId: hintedRuntimeEnvironmentId
+            }
+          : resolveEditorOwnerRoute(state, worktreeId))
   if (!route || (ownerHintProvided && (ownerHint?.trim() || null) !== route.runtimeEnvironmentId)) {
     throw new Error(OWNER_CHANGED_MESSAGE)
   }
@@ -128,8 +128,9 @@ function resolveCurrentEditorRoute(
   worktreeId: string,
   provenance: EditorFileOperationProvenance
 ): WorktreeOperationRoute | null {
-  if (worktreeId === FLOATING_TERMINAL_WORKTREE_ID) {
-    return { executionHostId: 'local', runtimeEnvironmentId: null }
+  const floatingRoute = getFloatingWorkspaceOperationRoute(worktreeId)
+  if (floatingRoute) {
+    return floatingRoute
   }
   const explicitResolution = resolveExplicitWorktreeOperationRouteResult(state, worktreeId)
   if (explicitResolution.kind === 'resolved') {
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
index e3ad93eb3db4..78ba58e4eaf8 100644
--- a/src/renderer/src/lib/empty-workspace-default-agent-chat.test.ts
+++ b/src/renderer/src/lib/empty-workspace-default-agent-chat.test.ts
@@ -11,7 +11,8 @@ import {
 const mocks = vi.hoisted(() => ({
   launchAgentInNewTab: vi.fn(),
   planAgentSessionLaunch: vi.fn(),
-  detectionTargetKey: vi.fn<() => string | undefined>()
+  detectionTargetKey: vi.fn<() => string | undefined>(),
+  seedShell: vi.fn(() => true)
 }))
 
 vi.mock('@/lib/launch-agent-in-new-tab', () => ({
@@ -45,7 +46,7 @@ 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' }
+    surface: { kind: 'host-published' }
   })
 })
 
@@ -59,23 +60,38 @@ describe('openDefaultAgentChatInEmptyWorkspace', () => {
   it('launches the default agent as a chat', () => {
     seedSettings({})
 
-    expect(openDefaultAgentChatInEmptyWorkspace('wt-1')).toEqual({ primaryTabId: 'chat-tab' })
+    // The chat's tab opens once its host admits it, so none is primary yet.
+    expect(openDefaultAgentChatInEmptyWorkspace('wt-1', mocks.seedShell)).toEqual({
+      primaryTabId: null
+    })
     expect(mocks.launchAgentInNewTab).toHaveBeenCalledWith(
       expect.objectContaining({ agent: 'codex', worktreeId: 'wt-1', pendingActivationSpawn: true })
     )
   })
 
+  // The function's promise: no agent nobody asked for. A "no" seeds the shell it would have.
+  it("seeds a plain shell, not the agent's terminal, when the host declines the chat", () => {
+    seedSettings({})
+
+    openDefaultAgentChatInEmptyWorkspace('wt-1', mocks.seedShell)
+    const onDeclined = mocks.launchAgentInNewTab.mock.calls[0]?.[0]?.onStructuredHostDeclined
+
+    expect(mocks.seedShell).not.toHaveBeenCalled()
+    expect(onDeclined()).toEqual({ opened: true })
+    expect(mocks.seedShell).toHaveBeenCalledOnce()
+  })
+
   it('does nothing unless new agent tabs open as chat', () => {
     seedSettings({ openAgentTabsInChatByDefault: false })
 
-    expect(openDefaultAgentChatInEmptyWorkspace('wt-1')).toBeNull()
+    expect(openDefaultAgentChatInEmptyWorkspace('wt-1', mocks.seedShell)).toBeNull()
     expect(mocks.launchAgentInNewTab).not.toHaveBeenCalled()
   })
 
   it('respects a Blank Terminal default agent', () => {
     seedSettings({ defaultTuiAgent: 'blank' })
 
-    expect(openDefaultAgentChatInEmptyWorkspace('wt-1')).toBeNull()
+    expect(openDefaultAgentChatInEmptyWorkspace('wt-1', mocks.seedShell)).toBeNull()
     expect(mocks.launchAgentInNewTab).not.toHaveBeenCalled()
   })
 
@@ -83,7 +99,7 @@ describe('openDefaultAgentChatInEmptyWorkspace', () => {
     seedSettings({})
     mocks.planAgentSessionLaunch.mockReturnValue({ route: 'terminal-tui' })
 
-    expect(openDefaultAgentChatInEmptyWorkspace('wt-1')).toBeNull()
+    expect(openDefaultAgentChatInEmptyWorkspace('wt-1', mocks.seedShell)).toBeNull()
     expect(mocks.launchAgentInNewTab).not.toHaveBeenCalled()
   })
 
@@ -92,7 +108,7 @@ describe('openDefaultAgentChatInEmptyWorkspace', () => {
     mocks.detectionTargetKey.mockReturnValue('ssh:conn-1')
     useAppStore.setState({ remoteDetectedAgentIds: { 'conn-1': ['claude'] } })
 
-    openDefaultAgentChatInEmptyWorkspace('wt-1')
+    openDefaultAgentChatInEmptyWorkspace('wt-1', mocks.seedShell)
 
     expect(mocks.launchAgentInNewTab).toHaveBeenCalledWith(
       expect.objectContaining({ agent: 'claude' })
@@ -104,7 +120,7 @@ describe('openDefaultAgentChatInEmptyWorkspace', () => {
     mocks.detectionTargetKey.mockReturnValue(undefined)
 
     expect(emptyWorkspaceDefaultChatAwaitsDetection('wt-1')).toBe(false)
-    expect(openDefaultAgentChatInEmptyWorkspace('wt-1')).toBeNull()
+    expect(openDefaultAgentChatInEmptyWorkspace('wt-1', mocks.seedShell)).toBeNull()
     expect(mocks.launchAgentInNewTab).not.toHaveBeenCalled()
   })
 })
diff --git a/src/renderer/src/lib/empty-workspace-default-agent-chat.ts b/src/renderer/src/lib/empty-workspace-default-agent-chat.ts
index 9bd44e4a2f26..79612829b713 100644
--- a/src/renderer/src/lib/empty-workspace-default-agent-chat.ts
+++ b/src/renderer/src/lib/empty-workspace-default-agent-chat.ts
@@ -74,10 +74,12 @@ export async function loadEmptyWorkspaceDefaultChatDetection(worktreeId: string)
 
 /**
  * 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.
+ * chat instead of a bare shell. Null means nothing opened and the caller seeds the shell; so does
+ * `seedShell` when the host declines the chat, since nobody asked for the agent's terminal.
  */
 export function openDefaultAgentChatInEmptyWorkspace(
-  worktreeId: string
+  worktreeId: string,
+  seedShell: () => boolean
 ): { primaryTabId: string | null } | null {
   const state = useAppStore.getState()
   const target = defaultChatDetectionTarget(state, worktreeId)
@@ -107,7 +109,8 @@ export function openDefaultAgentChatInEmptyWorkspace(
     worktreeId,
     launchSource: 'unknown',
     agentSessionLaunchPlan,
-    pendingActivationSpawn: true
+    pendingActivationSpawn: true,
+    onStructuredHostDeclined: () => ({ opened: seedShell() })
   })
   if (!result) {
     return null
diff --git a/src/renderer/src/lib/empty-workspace-default-surface-claims.ts b/src/renderer/src/lib/empty-workspace-default-surface-claims.ts
index 61a989e6bfc0..b01c2572c290 100644
--- a/src/renderer/src/lib/empty-workspace-default-surface-claims.ts
+++ b/src/renderer/src/lib/empty-workspace-default-surface-claims.ts
@@ -1,9 +1,33 @@
 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.
+// Why: while a gated reseed waits on agent detection, or a chat launch waits on its host's answer,
+// that wait owns the workspace's first surface; any other seeder landing in it would put a shell
+// beside the chat about to open.
+// Why the intent: the detection wait seeds for the latest activation, so a later one must not be
+// dropped. A launch's wait replays nothing: its own answer opens the surface.
 const pendingIntentByWorkspace = new Map<string, GatedEmptyWorkspaceReseedIntent>()
+const launchWaitCountByWorkspace = new Map<string, number>()
+
+/** Holds the first surface for a chat launch until its host answers; the release is idempotent. */
+export function holdEmptyWorkspaceDefaultSurfaceForLaunch(workspaceKey: string): () => void {
+  launchWaitCountByWorkspace.set(
+    workspaceKey,
+    (launchWaitCountByWorkspace.get(workspaceKey) ?? 0) + 1
+  )
+  let released = false
+  return () => {
+    if (released) {
+      return
+    }
+    released = true
+    const remaining = (launchWaitCountByWorkspace.get(workspaceKey) ?? 1) - 1
+    if (remaining > 0) {
+      launchWaitCountByWorkspace.set(workspaceKey, remaining)
+    } else {
+      launchWaitCountByWorkspace.delete(workspaceKey)
+    }
+  }
+}
 
 /** Records this activation's intent; false when a wait already pending now carries it instead. */
 export function claimEmptyWorkspaceDefaultSurface(
@@ -25,5 +49,5 @@ export function releaseEmptyWorkspaceDefaultSurface(
 }
 
 export function isEmptyWorkspaceDefaultSurfacePending(workspaceKey: string): boolean {
-  return pendingIntentByWorkspace.has(workspaceKey)
+  return pendingIntentByWorkspace.has(workspaceKey) || launchWaitCountByWorkspace.has(workspaceKey)
 }
diff --git a/src/renderer/src/lib/fix-checks-agent-launch.ts b/src/renderer/src/lib/fix-checks-agent-launch.ts
index 5f6131566f41..daa59baad3dd 100644
--- a/src/renderer/src/lib/fix-checks-agent-launch.ts
+++ b/src/renderer/src/lib/fix-checks-agent-launch.ts
@@ -141,7 +141,12 @@ export async function startFixChecksAgent(args: StartFixChecksAgentArgs): Promis
   const attachedWorkspace =
     args.worktreeId || !args.item
       ? null
-      : findGithubPrWorkspaceAttachment(store.allWorktrees(), args.repoId, args.item.number)
+      : findGithubPrWorkspaceAttachment(
+          store.allWorktrees(),
+          args.repoId,
+          args.item.number,
+          args.item.url
+        )
   const targetWorktreeId = args.worktreeId ?? attachedWorkspace?.id ?? null
   if (targetWorktreeId) {
     const targetWorktree = store.allWorktrees().find((worktree) => worktree.id === targetWorktreeId)
diff --git a/src/renderer/src/lib/github-work-item-source-lookup.test.ts b/src/renderer/src/lib/github-work-item-source-lookup.test.ts
index 432401ce3e50..1abfc34cff54 100644
--- a/src/renderer/src/lib/github-work-item-source-lookup.test.ts
+++ b/src/renderer/src/lib/github-work-item-source-lookup.test.ts
@@ -1,7 +1,10 @@
 import { beforeEach, describe, expect, it, vi } from 'vitest'
 import { callRuntimeRpc } from '@/runtime/runtime-rpc-client'
 import type * as RuntimeRpcClient from '@/runtime/runtime-rpc-client'
-import { lookupGitHubWorkItemDetailsForSource } from './github-work-item-source-lookup'
+import {
+  lookupGitHubWorkItemDetailsForSource,
+  lookupGitHubWorkItemByOwnerRepoForSource
+} from './github-work-item-source-lookup'
 import type { TaskSourceContext } from '../../../shared/task-source-context'
 
 vi.mock('@/runtime/runtime-rpc-client', async () => {
@@ -26,12 +29,69 @@ describe('GitHub source lookup routing', () => {
     vi.stubGlobal('window', {
       api: {
         gh: {
-          workItemDetails: vi.fn()
+          workItemDetails: vi.fn(),
+          workItemByOwnerRepo: vi.fn().mockResolvedValue(null)
         }
       }
     })
   })
 
+  it.each(['local', 'ssh:build-box'] as const)(
+    'forwards %s source identity to exact repository IPC',
+    async (hostId) => {
+      const sourceContext: TaskSourceContext = { ...runtimeSourceContext, hostId, repoId: 'repo' }
+      await lookupGitHubWorkItemByOwnerRepoForSource({
+        repoPath: '/repo',
+        repoId: 'repo',
+        sourceContext,
+        owner: 'acme',
+        repo: 'orca',
+        host: 'github.com',
+        number: 42,
+        type: 'pr'
+      })
+      expect(window.api.gh.workItemByOwnerRepo).toHaveBeenCalledWith({
+        repoPath: '/repo',
+        repoId: 'repo',
+        sourceContext,
+        owner: 'acme',
+        repo: 'orca',
+        host: 'github.com',
+        number: 42,
+        type: 'pr'
+      })
+      expect(callRuntimeRpc).not.toHaveBeenCalled()
+    }
+  )
+
+  it('routes exact repository lookup to its source runtime instead of local IPC', async () => {
+    vi.mocked(callRuntimeRpc).mockResolvedValue(null)
+    await lookupGitHubWorkItemByOwnerRepoForSource({
+      repoPath: '/repo',
+      repoId: 'renderer-repo',
+      sourceContext: runtimeSourceContext,
+      owner: 'acme',
+      repo: 'orca',
+      host: 'github.com',
+      number: 42,
+      type: 'pr'
+    })
+    expect(callRuntimeRpc).toHaveBeenCalledWith(
+      { kind: 'environment', environmentId: 'env-1' },
+      'github.workItemByOwnerRepo',
+      {
+        repo: 'runtime-repo',
+        owner: 'acme',
+        ownerRepo: 'orca',
+        host: 'github.com',
+        number: 42,
+        type: 'pr'
+      },
+      { timeoutMs: 30_000 }
+    )
+    expect(window.api.gh.workItemByOwnerRepo).not.toHaveBeenCalled()
+  })
+
   it('routes runtime-owned GitHub details through runtime RPC', async () => {
     vi.mocked(callRuntimeRpc).mockResolvedValue(null)
 
diff --git a/src/renderer/src/lib/github-work-item-source-lookup.ts b/src/renderer/src/lib/github-work-item-source-lookup.ts
index da9e37757674..32cb64a505ff 100644
--- a/src/renderer/src/lib/github-work-item-source-lookup.ts
+++ b/src/renderer/src/lib/github-work-item-source-lookup.ts
@@ -83,6 +83,7 @@ export async function lookupGitHubWorkItemByOwnerRepoForSource(
       : await window.api.gh.workItemByOwnerRepo({
           repoPath: args.repoPath,
           repoId: args.repoId,
+          sourceContext: args.sourceContext,
           owner: args.owner,
           repo: args.repo,
           ...(args.host ? { host: args.host } : {}),
diff --git a/src/renderer/src/lib/github-work-item-workspace-attachment.test.ts b/src/renderer/src/lib/github-work-item-workspace-attachment.test.ts
index c3d3870f8033..dcc704a0453c 100644
--- a/src/renderer/src/lib/github-work-item-workspace-attachment.test.ts
+++ b/src/renderer/src/lib/github-work-item-workspace-attachment.test.ts
@@ -94,3 +94,49 @@ describe('GitHub work-item workspace attachment', () => {
     expect(findGithubIssueWorkspaceAttachment([gitlabOnly], 'repo-1', 42)).toBeNull()
   })
 })
+
+describe('multiple GitHub attachments', () => {
+  it('finds secondary reviews and issues', () => {
+    const attached = worktree({
+      linkedPR: 1,
+      linkedIssue: 2,
+      linkedItems: [
+        { provider: 'github', type: 'pr', number: 3 },
+        { provider: 'github', type: 'issue', number: 4 }
+      ]
+    })
+    expect(findGithubPrWorkspaceAttachment([attached], attached.repoId, 3)).toBe(attached)
+    expect(findGithubIssueWorkspaceAttachment([attached], attached.repoId, 4)).toBe(attached)
+  })
+})
+
+describe('GitHub attachment repository scope', () => {
+  it('matches a foreign task by URL across workspace repositories', () => {
+    const attached = worktree({
+      linkedItems: [
+        {
+          provider: 'github',
+          type: 'issue',
+          number: 42,
+          url: 'https://github.com/foreign/project/issues/42'
+        }
+      ]
+    })
+    expect(
+      findGithubIssueWorkspaceAttachment(
+        [attached],
+        'foreign-repo',
+        42,
+        'https://github.com/foreign/project/issues/42'
+      )
+    ).toBe(attached)
+    expect(
+      findGithubIssueWorkspaceAttachment(
+        [attached],
+        'repo-1',
+        42,
+        'https://github.com/current/project/issues/42'
+      )
+    ).toBeNull()
+  })
+})
diff --git a/src/renderer/src/lib/host-mirror-handle-gap-snapshot-lifetime.test.ts b/src/renderer/src/lib/host-mirror-handle-gap-snapshot-lifetime.test.ts
index a07d79121970..bad549e81af5 100644
--- a/src/renderer/src/lib/host-mirror-handle-gap-snapshot-lifetime.test.ts
+++ b/src/renderer/src/lib/host-mirror-handle-gap-snapshot-lifetime.test.ts
@@ -1,6 +1,6 @@
 import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest'
 import { useAppStore, type AppState } from '@/store'
-import { makeTab } from '@/store/slices/store-test-helpers'
+import { makeTab } from '../store/slices/store-session-test-harness'
 import {
   clearRuntimeEnvironmentConnectionGenerationsForTests,
   setRuntimeEnvironmentConnectionGenerationForTests
diff --git a/src/renderer/src/lib/hosted-review-repo-read.ts b/src/renderer/src/lib/hosted-review-repo-read.ts
new file mode 100644
index 000000000000..710b61a04d4f
--- /dev/null
+++ b/src/renderer/src/lib/hosted-review-repo-read.ts
@@ -0,0 +1,26 @@
+import { callRuntimeRpc, getActiveRuntimeTarget } from '@/runtime/runtime-rpc-client'
+import { settingsForHostedReviewRepoOwner } from '@/store/slices/hosted-review-cache-state'
+import type { AppState } from '@/store/types'
+import { getRepoExecutionHostId } from '../../../shared/execution-host'
+import type { HostedReviewForBranchArgs, HostedReviewInfo } from '../../../shared/hosted-review'
+import type { Repo } from '../../../shared/repo-types'
+
+export function readHostedReviewForRepo(
+  repo: Repo,
+  settings: AppState['settings'],
+  query: Omit<HostedReviewForBranchArgs, 'repoPath' | 'repoId' | 'repoOwnerExecutionHostId'>
+): Promise<HostedReviewInfo | null> {
+  const args = { ...query, repoPath: repo.path, repoId: repo.id }
+  const target = getActiveRuntimeTarget(settingsForHostedReviewRepoOwner(settings, repo))
+  return target.kind === 'environment'
+    ? callRuntimeRpc<HostedReviewInfo | null>(
+        target,
+        'hostedReview.forBranch',
+        { repo: repo.id, ...args },
+        { timeoutMs: 30_000 }
+      )
+    : window.api.hostedReview.forBranch({
+        ...args,
+        repoOwnerExecutionHostId: getRepoExecutionHostId(repo)
+      })
+}
diff --git a/src/renderer/src/lib/launch-agent-background-session.test.ts b/src/renderer/src/lib/launch-agent-background-session.test.ts
index 23606a83776e..d665133b910d 100644
--- a/src/renderer/src/lib/launch-agent-background-session.test.ts
+++ b/src/renderer/src/lib/launch-agent-background-session.test.ts
@@ -129,7 +129,8 @@ describe('launchAgentBackgroundSession', () => {
         }),
         connectionId: null,
         worktreeId: 'wt-1',
-        tabId
+        tabId,
+        placement: { kind: 'new-tab', row: { customTitle: 'Nightly audit' } }
       })
     )
     const paneKey = expectStableAgentBackgroundPaneSpawn(mockSpawn)
diff --git a/src/renderer/src/lib/launch-agent-background-session.ts b/src/renderer/src/lib/launch-agent-background-session.ts
index eb7c2620ea32..98c73760655c 100644
--- a/src/renderer/src/lib/launch-agent-background-session.ts
+++ b/src/renderer/src/lib/launch-agent-background-session.ts
@@ -192,6 +192,8 @@ export async function launchAgentBackgroundSession(
         worktreeId,
         tabId: reservedTabId,
         leafId,
+        // Why no launchAgent: the adopted tab is created without one, and the row must match it.
+        placement: { kind: 'new-tab', ...(title ? { row: { customTitle: title } } : {}) },
         telemetry: {
           agent_kind: tuiAgentToAgentKind(agent),
           launch_source: launchSource ?? 'unknown',
diff --git a/src/renderer/src/lib/launch-agent-in-new-tab-host-agents.test.ts b/src/renderer/src/lib/launch-agent-in-new-tab-host-agents.test.ts
new file mode 100644
index 000000000000..9e23b70db3c6
--- /dev/null
+++ b/src/renderer/src/lib/launch-agent-in-new-tab-host-agents.test.ts
@@ -0,0 +1,243 @@
+import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest'
+import {
+  STRUCTURED_AGENT_SESSION_CLIENT_LAUNCH_MODE_CAPABILITY,
+  STRUCTURED_AGENT_SESSION_REGISTERED_AGENTS_RUNTIME_CAPABILITY,
+  STRUCTURED_AGENT_SESSION_RUNTIME_CAPABILITY,
+  type RuntimeCapability
+} from '../../../shared/protocol-version'
+
+const REGISTERED: RuntimeCapability[] = [
+  STRUCTURED_AGENT_SESSION_RUNTIME_CAPABILITY,
+  STRUCTURED_AGENT_SESSION_CLIENT_LAUNCH_MODE_CAPABILITY,
+  STRUCTURED_AGENT_SESSION_REGISTERED_AGENTS_RUNTIME_CAPABILITY
+]
+const SETTINGS = {
+  experimentalNativeChat: true,
+  openAgentTabsInChatByDefault: true,
+  experimentalStructuredNativeChat: true
+}
+
+const mocks = vi.hoisted(() => {
+  const state: { current: Record<string, unknown> } = { current: {} }
+  return { callRuntimeRpc: vi.fn(), state }
+})
+
+vi.mock('@/store', () => ({ useAppStore: { getState: () => mocks.state.current } }))
+vi.mock('@/lib/worktree-runtime-owner', () => ({ getExecutionHostIdForWorktree: vi.fn() }))
+vi.mock('@/lib/local-preflight-context', () => ({
+  getLocalProjectExecutionRuntimeContext: vi.fn(),
+  getLocalRepoProjectExecutionRuntimeContext: vi.fn()
+}))
+vi.mock('@/lib/web-client-location', () => ({ isWebClientLocation: () => false }))
+vi.mock('@/runtime/runtime-rpc-client', () => ({ callRuntimeRpc: mocks.callRuntimeRpc }))
+vi.mock('@/lib/structured-agent-launch-settlement', () => ({}))
+
+import { resetHostStructuredAgentsForTests } from '@/runtime/host-structured-agents'
+import {
+  refreshLocalRuntimeCapabilities,
+  setLocalRuntimeCapabilitiesForTests
+} from '@/runtime/local-runtime-capabilities'
+import type { LaunchAgentInNewTabArgs } from './launch-agent-in-new-tab'
+import type { AgentLaunchRouteArgs } from './agent-launch-route-input'
+import {
+  HOST_ANSWER_WAIT_MS,
+  launchOnceHostAnswered,
+  routeNewTabLaunch
+} from './launch-agent-in-new-tab-host-agents'
+
+const LISTS_OPENCODE = {
+  agents: ['claude', 'codex', 'opencode'].map((agent) => ({ agent, capabilities: {} }))
+}
+const request: AgentLaunchRouteArgs = {
+  agent: 'opencode',
+  workspace: { kind: 'git-worktree', repoId: 'repo-1' }
+}
+const args: LaunchAgentInNewTabArgs = {
+  requestId: 'request-1',
+  agent: 'opencode',
+  worktreeId: 'wt-1'
+}
+// oxlint-disable-next-line typescript/consistent-type-assertions -- SAFETY: the wait path only hands the startup plan back to its caller; nothing here reads its fields.
+const startupPlan = { launchCommand: 'opencode' } as never
+
+function storeWithSettings(settings: Record<string, unknown>) {
+  mocks.state.current = {
+    settings,
+    runtimeStatusByEnvironmentId: new Map(),
+    worktreesByRepo: {},
+    folderWorkspaces: []
+  }
+  // oxlint-disable-next-line typescript/consistent-type-assertions -- SAFETY: the route builder reads only the settings, host statuses and workspace rows set here; a missing member reads as absent.
+  return mocks.state.current as never
+}
+
+/** Stands in for the launcher re-entered with the plan decided after the wait. */
+function fakeRelaunch() {
+  return vi.fn((relaunched: LaunchAgentInNewTabArgs) => ({
+    surface: { kind: 'host-published' as const },
+    startupPlan,
+    pasteDraftAfterLaunch: false,
+    structuredSettlement: Promise.resolve(
+      relaunched.agentSessionLaunchPlan?.route === 'structured-native-chat'
+        ? { kind: 'structured' as const, sessionId: 'session-1' }
+        : { kind: 'cancelled' as const, sessionId: null }
+    )
+  }))
+}
+
+beforeEach(() => {
+  resetHostStructuredAgentsForTests()
+  mocks.callRuntimeRpc.mockReset().mockResolvedValue(LISTS_OPENCODE)
+  setLocalRuntimeCapabilitiesForTests(REGISTERED)
+  vi.spyOn(console, 'warn').mockImplementation(() => {})
+})
+afterEach(() => {
+  vi.useRealTimers()
+  vi.restoreAllMocks()
+  vi.unstubAllGlobals()
+})
+
+describe('a new tab whose chat route waits on the host agent list', () => {
+  it('opens the chat on the first launch once the host lists the agent', async () => {
+    const store = storeWithSettings(SETTINGS)
+    const route = routeNewTabLaunch(store, args, request)
+    if (!('awaited' in route)) {
+      throw new Error('expected the launch to wait for the host agent list')
+    }
+    const relaunch = fakeRelaunch()
+
+    const result = launchOnceHostAnswered(route, args, startupPlan, relaunch)
+
+    expect(result?.surface).toEqual({ kind: 'host-published' })
+    expect(relaunch).not.toHaveBeenCalled()
+    await expect(result?.structuredSettlement).resolves.toEqual({
+      kind: 'structured',
+      sessionId: 'session-1'
+    })
+    expect(relaunch.mock.calls[0]?.[0]).toMatchObject({
+      requestId: undefined,
+      agentSessionLaunchPlan: { route: 'structured-native-chat', requestId: 'request-1' }
+    })
+  })
+
+  it('decides without the list once the bounded wait runs out', async () => {
+    vi.useFakeTimers()
+    mocks.callRuntimeRpc.mockReturnValue(new Promise(() => {}))
+    const store = storeWithSettings(SETTINGS)
+    const route = routeNewTabLaunch(store, args, request)
+    if (!('awaited' in route)) {
+      throw new Error('expected the launch to wait for the host agent list')
+    }
+    const relaunch = vi.fn((_relaunched: LaunchAgentInNewTabArgs) => ({
+      surface: { kind: 'local-terminal' as const, tabId: 'tab-1' },
+      startupPlan,
+      pasteDraftAfterLaunch: false
+    }))
+
+    const result = launchOnceHostAnswered(route, args, startupPlan, relaunch)
+    await vi.advanceTimersByTimeAsync(HOST_ANSWER_WAIT_MS - 1)
+    expect(relaunch).not.toHaveBeenCalled()
+    await vi.advanceTimersByTimeAsync(1)
+
+    await expect(result?.structuredSettlement).resolves.toEqual({ kind: 'terminal' })
+    expect(relaunch.mock.calls[0]?.[0]).toMatchObject({
+      agentSessionLaunchPlan: { route: 'legacy-native-chat' }
+    })
+  })
+
+  it('does not wait once the list is learned, or when structured chat is off', async () => {
+    const store = storeWithSettings(SETTINGS)
+    const first = routeNewTabLaunch(store, args, request)
+    if ('awaited' in first) {
+      await first.awaited
+    }
+
+    expect(routeNewTabLaunch(store, args, request)).toMatchObject({
+      plan: { route: 'structured-native-chat' }
+    })
+    expect(
+      routeNewTabLaunch(
+        storeWithSettings({ ...SETTINGS, experimentalStructuredNativeChat: false }),
+        args,
+        request
+      )
+    ).toMatchObject({ plan: { route: 'legacy-native-chat' } })
+  })
+})
+
+describe("a new tab during startup, before this computer's runtime answered", () => {
+  // No window bridge here, so the startup probe fails and answers null at once: the rig's case.
+  function startupProbeFailed(): void {
+    setLocalRuntimeCapabilitiesForTests(null)
+  }
+
+  /** A later probe (any reader's) lands the capabilities. */
+  async function capabilitiesLand(): Promise<void> {
+    vi.stubGlobal('window', {
+      api: { runtime: { getStatus: async () => ({ capabilities: REGISTERED }) } }
+    })
+    await refreshLocalRuntimeCapabilities()
+  }
+
+  function awaitingRoute(agent: 'claude' | 'opencode') {
+    startupProbeFailed()
+    const route = routeNewTabLaunch(
+      storeWithSettings(SETTINGS),
+      { ...args, agent },
+      { ...request, agent }
+    )
+    if (!('awaited' in route)) {
+      throw new Error('expected the launch to wait for the runtime capabilities')
+    }
+    return route
+  }
+
+  it.each(['claude', 'opencode'] as const)(
+    'opens the %s chat when the capabilities arrive within the wait, after a failed probe',
+    async (agent) => {
+      const route = awaitingRoute(agent)
+      const relaunch = fakeRelaunch()
+
+      const result = launchOnceHostAnswered(route, { ...args, agent }, startupPlan, relaunch)
+      // The failed probe has answered; the launch is still waiting for one that lands.
+      await new Promise((resolve) => setTimeout(resolve, 20))
+      expect(relaunch).not.toHaveBeenCalled()
+      await capabilitiesLand()
+
+      await expect(result?.structuredSettlement).resolves.toEqual({
+        kind: 'structured',
+        sessionId: 'session-1'
+      })
+      expect(relaunch.mock.calls[0]?.[0]).toMatchObject({
+        agentSessionLaunchPlan: { route: 'structured-native-chat' }
+      })
+    }
+  )
+
+  it('opens the terminal chat after the cap when they never arrive, and says why', async () => {
+    vi.useFakeTimers()
+    const route = awaitingRoute('claude')
+    const relaunch = fakeRelaunch()
+
+    const result = launchOnceHostAnswered(
+      route,
+      { ...args, agent: 'claude' },
+      startupPlan,
+      relaunch
+    )
+    await vi.advanceTimersByTimeAsync(HOST_ANSWER_WAIT_MS - 1)
+    expect(relaunch).not.toHaveBeenCalled()
+    await vi.advanceTimersByTimeAsync(1)
+
+    await expect(result?.structuredSettlement).resolves.toEqual({
+      kind: 'cancelled',
+      sessionId: null
+    })
+    expect(relaunch.mock.calls[0]?.[0].agentSessionLaunchPlan?.route).not.toBe(
+      'structured-native-chat'
+    )
+    expect(console.warn).toHaveBeenCalledWith(
+      expect.stringContaining('claude opens legacy-native-chat: runtime-capability-unknown')
+    )
+  })
+})
diff --git a/src/renderer/src/lib/launch-agent-in-new-tab-host-agents.ts b/src/renderer/src/lib/launch-agent-in-new-tab-host-agents.ts
new file mode 100644
index 000000000000..b78f34856d44
--- /dev/null
+++ b/src/renderer/src/lib/launch-agent-in-new-tab-host-agents.ts
@@ -0,0 +1,91 @@
+import { useAppStore } from '@/store'
+import type { AgentStartupPlan } from '@/lib/tui-agent-startup'
+import {
+  awaitStructuredRouteHostAnswer,
+  planAgentSessionLaunch,
+  type AgentSessionLaunchPlan,
+  type AgentSessionLaunchRequest
+} from '@/lib/agent-session-launch-plan'
+import type { StructuredAgentLaunchSettlement } from '@/lib/structured-agent-launch-settlement'
+import type { StructuredPromptDeliveryResult } from '@/lib/structured-agent-session-launch-prompt'
+import type {
+  LaunchAgentInNewTabArgs,
+  LaunchAgentInNewTabResult
+} from '@/lib/launch-agent-in-new-tab'
+
+/** How long a new tab waits for its host's answer before deciding without it; the same bound a
+ *  local chat's admission waits. */
+export const HOST_ANSWER_WAIT_MS = 3_000
+
+const DELIVERED: StructuredPromptDeliveryResult = { delivered: true, failureNotified: false }
+const NOT_DELIVERED: StructuredPromptDeliveryResult = { delivered: false, failureNotified: false }
+
+type AwaitingHostAnswer = { awaited: Promise<void>; replan: () => AgentSessionLaunchPlan }
+
+/** The new tab's route: the caller's own plan, a plan decided now, or, when the chat route waits
+ *  only on the host's agent list or this computer's runtime capabilities, the wait for them and
+ *  the plan decided after. */
+export function routeNewTabLaunch(
+  store: Parameters<typeof planAgentSessionLaunch>[0],
+  args: LaunchAgentInNewTabArgs,
+  request: Omit<AgentSessionLaunchRequest, 'requestId'>
+): { plan: AgentSessionLaunchPlan | undefined } | AwaitingHostAnswer {
+  const { requestId } = args
+  if (requestId === undefined) {
+    return { plan: args.agentSessionLaunchPlan }
+  }
+  const awaited = awaitStructuredRouteHostAnswer(store, request, HOST_ANSWER_WAIT_MS)
+  return awaited
+    ? {
+        awaited,
+        replan: () => planAgentSessionLaunch(useAppStore.getState(), { requestId, ...request })
+      }
+    : { plan: planAgentSessionLaunch(store, { requestId, ...request }) }
+}
+
+/**
+ * Opens nothing until the host answered or the wait ran out, then launches on the route decided
+ * with what is known: the chat, or the terminal. The first launch after startup is not sent to the
+ * terminal by an answer that was still loading.
+ */
+export function launchOnceHostAnswered(
+  route: AwaitingHostAnswer,
+  args: LaunchAgentInNewTabArgs,
+  startupPlan: AgentStartupPlan,
+  relaunch: (args: LaunchAgentInNewTabArgs) => LaunchAgentInNewTabResult
+): LaunchAgentInNewTabResult {
+  if (args.beforeSurfaceOpen?.({ kind: 'host-published' }) === false) {
+    return null
+  }
+  const opened = route.awaited.then(() =>
+    relaunch({
+      ...args,
+      beforeSurfaceOpen: undefined,
+      requestId: undefined,
+      agentSessionLaunchPlan: route.replan()
+    })
+  )
+  const structuredSettlement = opened.then(
+    (result): Promise<StructuredAgentLaunchSettlement> | StructuredAgentLaunchSettlement =>
+      !result
+        ? { kind: 'cancelled', sessionId: null }
+        : (result.structuredSettlement ?? { kind: 'terminal' }),
+    (error: unknown): StructuredAgentLaunchSettlement => ({ kind: 'failed', error })
+  )
+  const deliversPrompt =
+    Boolean(args.prompt?.trim()) && (args.promptDelivery ?? 'auto-submit') !== 'draft'
+  return {
+    surface: { kind: 'host-published' },
+    startupPlan,
+    pasteDraftAfterLaunch: false,
+    structuredSettlement,
+    ...(deliversPrompt
+      ? {
+          promptDeliveryResult: opened.then(
+            (result) => (result ? (result.promptDeliveryResult ?? DELIVERED) : NOT_DELIVERED),
+            () => NOT_DELIVERED
+          )
+        }
+      : {})
+  }
+}
diff --git a/src/renderer/src/lib/launch-agent-in-new-tab-placement.test.ts b/src/renderer/src/lib/launch-agent-in-new-tab-placement.test.ts
index d44efdc93514..a2c203ac25ab 100644
--- a/src/renderer/src/lib/launch-agent-in-new-tab-placement.test.ts
+++ b/src/renderer/src/lib/launch-agent-in-new-tab-placement.test.ts
@@ -2,6 +2,7 @@
 // launch-agent-in-new-tab.test.ts to keep both files within the lines budget.
 
 import { beforeEach, describe, expect, it, vi } from 'vitest'
+import { setLocalRuntimeCapabilitiesForTests } from '@/runtime/local-runtime-capabilities'
 import { FLOATING_TERMINAL_WORKTREE_ID } from '../../../shared/constants'
 
 const mockCreateTab = vi.fn()
@@ -87,6 +88,8 @@ vi.mock('@/components/native-chat/native-chat-session-option-cache', () => ({
 describe('launchAgentInNewTab terminal tab activation', () => {
   beforeEach(() => {
     vi.clearAllMocks()
+    // The local runtime has answered (without structured support), so no launch waits on it.
+    setLocalRuntimeCapabilitiesForTests([])
     store.settings = placementSettings()
     mockCreateTab.mockReturnValue({ id: 'tab-1' })
   })
diff --git a/src/renderer/src/lib/launch-agent-in-new-tab-structured-route.ts b/src/renderer/src/lib/launch-agent-in-new-tab-structured-route.ts
index b5ca43f6f563..46d12f15db18 100644
--- a/src/renderer/src/lib/launch-agent-in-new-tab-structured-route.ts
+++ b/src/renderer/src/lib/launch-agent-in-new-tab-structured-route.ts
@@ -3,13 +3,10 @@ import {
   type AgentSessionLaunchPlan
 } from '@/lib/agent-session-launch-plan'
 import type { AgentLaunchSurface, LaunchAgentInNewTabArgs } from '@/lib/launch-agent-in-new-tab'
-import { launchAgentInStructuredNewTab } from '@/lib/launch-agent-in-new-tab-structured'
 import type { StructuredAgentLaunchSettlement } from '@/lib/structured-agent-launch-settlement'
 import type { StructuredPromptDeliveryResult } from '@/lib/structured-agent-session-launch-prompt'
-import {
-  beginStructuredAgentSessionProvisionalLaunch,
-  structuredLaunchPairedOwner
-} from '@/lib/structured-agent-session-provisional-tab'
+import type { StructuredLaunchTerminal } from '@/lib/structured-agent-session-launch-admission'
+import { beginStructuredAgentSessionProvisionalLaunch } from '@/lib/structured-agent-session-provisional-tab'
 
 type StructuredFromNewTab = {
   surface: AgentLaunchSurface
@@ -19,57 +16,33 @@ type StructuredFromNewTab = {
 }
 
 /**
- * The new-tab launcher's structured route. A local chat opens at once. A paired server admits the
- * chat before any of it exists here, so its surface is the host's, as for every paired launch, and
- * its "no" runs the caller's own launch as a terminal.
+ * The new-tab launcher's structured route. The owning host, this machine or a paired server,
+ * admits the chat before any of it exists here, so its surface is the host's, and its "no" runs
+ * the caller's own launch as a terminal unless the caller names what opens instead.
  */
 export function launchStructuredAgentFromNewTab(args: {
   plan: AgentSessionLaunchPlan
   worktreeId: string
   groupId?: string
   beforeSurfaceOpen?: LaunchAgentInNewTabArgs['beforeSurfaceOpen']
+  onHostDeclined?: () => StructuredLaunchTerminal
   openTerminal: (terminalPlan: AgentSessionLaunchPlan) => {
     promptDeliveryResult?: Promise<StructuredPromptDeliveryResult>
   } | null
 }): StructuredFromNewTab | null {
   const { plan, beforeSurfaceOpen } = args
-  const paired = structuredLaunchPairedOwner(plan, args.worktreeId)
-  if (!paired) {
-    const structured = launchAgentInStructuredNewTab({
-      plan,
-      ...(beforeSurfaceOpen
-        ? {
-            beforeOpen: (sessionId?: string) =>
-              sessionId === undefined ||
-              beforeSurfaceOpen({ kind: 'local-agent-session', sessionId })
-          }
-        : {}),
-      ...(args.groupId ? { targetGroupId: args.groupId } : {})
-    })
-    return (
-      structured && {
-        surface: {
-          kind: 'local-agent-session',
-          tabId: structured.tabId,
-          sessionId: structured.sessionId
-        },
-        pasteDraftAfterLaunch: false,
-        structuredSettlement: structured.structuredSettlement,
-        ...(structured.promptDeliveryResult
-          ? { promptDeliveryResult: structured.promptDeliveryResult }
-          : {})
-      }
-    )
-  }
   if (beforeSurfaceOpen?.({ kind: 'host-published' }) === false) {
     return null
   }
   const launch = beginStructuredAgentSessionProvisionalLaunch({
     plan,
     hooks: {},
-    target: { worktreeId: args.worktreeId, executionHostId: paired.executionHostId },
+    target: { worktreeId: args.worktreeId },
     ...(args.groupId ? { targetGroupId: args.groupId } : {}),
     onHostDeclined: () => {
+      if (args.onHostDeclined) {
+        return args.onHostDeclined()
+      }
       const terminal = args.openTerminal(
         adoptAgentSessionLaunchVerdict({
           route: 'terminal-tui',
diff --git a/src/renderer/src/lib/launch-agent-in-new-tab-structured.test.ts b/src/renderer/src/lib/launch-agent-in-new-tab-structured.test.ts
deleted file mode 100644
index 1505ca3e99b4..000000000000
--- a/src/renderer/src/lib/launch-agent-in-new-tab-structured.test.ts
+++ /dev/null
@@ -1,102 +0,0 @@
-import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest'
-import type { StructuredAgentLaunchSettlement } from './structured-agent-launch-settlement'
-
-type BeginArgs = {
-  plan: unknown
-  targetGroupId?: string
-  beforeOpen?: (sessionId: string) => boolean | void
-}
-type Launch = {
-  sessionId: string
-  tab: { id: string }
-  settlement: Promise<StructuredAgentLaunchSettlement>
-  promptDeliveryResult?: Promise<{ delivered: boolean; failureNotified: boolean }>
-}
-
-const mocks = vi.hoisted(() => ({
-  beginStructuredAgentSessionProvisionalLaunch: vi.fn<(args: BeginArgs) => Launch | null>()
-}))
-
-vi.mock('@/lib/structured-agent-session-provisional-tab', () => ({
-  beginStructuredAgentSessionProvisionalLaunch: mocks.beginStructuredAgentSessionProvisionalLaunch
-}))
-
-import { adoptAgentSessionLaunchVerdict } from './agent-session-launch-plan'
-import { launchAgentInStructuredNewTab } from './launch-agent-in-new-tab-structured'
-
-type Delivery = 'auto-submit' | 'submit-after-ready' | 'draft'
-const structuredPlan = (prompt: string, promptDelivery: Delivery) =>
-  adoptAgentSessionLaunchVerdict({
-    requestId: 'request-1',
-    route: 'structured-native-chat',
-    agent: 'codex',
-    worktreeId: 'wt-1',
-    prompt,
-    promptDelivery
-  })
-
-describe('launchAgentInStructuredNewTab', () => {
-  let consoleError: ReturnType<typeof vi.spyOn>
-
-  beforeEach(() => {
-    vi.clearAllMocks()
-    consoleError = vi.spyOn(console, 'error').mockImplementation(() => {})
-    mocks.beginStructuredAgentSessionProvisionalLaunch.mockImplementation(() => ({
-      sessionId: 'session-1',
-      tab: { id: 'agent-session:session-1' },
-      settlement: Promise.resolve({ kind: 'structured', sessionId: 'session-1' })
-    }))
-  })
-
-  afterEach(() => consoleError.mockRestore())
-
-  it('returns the usable chat surface immediately and settles in the background', async () => {
-    const result = launchAgentInStructuredNewTab({
-      plan: structuredPlan('Fix it', 'submit-after-ready'),
-      targetGroupId: 'group-1'
-    })
-
-    expect(result).toMatchObject({ sessionId: 'session-1', tabId: 'agent-session:session-1' })
-    expect(mocks.beginStructuredAgentSessionProvisionalLaunch).toHaveBeenCalledWith(
-      expect.objectContaining({ plan: expect.anything(), targetGroupId: 'group-1', hooks: {} })
-    )
-    await expect(result?.structuredSettlement).resolves.toEqual({
-      kind: 'structured',
-      sessionId: 'session-1'
-    })
-    expect(consoleError).not.toHaveBeenCalled()
-  })
-
-  it('reports failed settlement without opening a terminal fallback', async () => {
-    const error = new Error('boom')
-    mocks.beginStructuredAgentSessionProvisionalLaunch.mockReturnValue({
-      sessionId: 'session-1',
-      tab: { id: 'agent-session:session-1' },
-      settlement: Promise.resolve({ kind: 'failed', error })
-    })
-
-    const result = launchAgentInStructuredNewTab({ plan: structuredPlan('Fix it', 'auto-submit') })
-
-    await expect(result?.structuredSettlement).resolves.toEqual({ kind: 'failed', error })
-    expect(consoleError).toHaveBeenCalledWith('Structured agent launch failed', error)
-  })
-
-  it('returns null when the route cannot begin', () => {
-    mocks.beginStructuredAgentSessionProvisionalLaunch.mockReturnValue(null)
-    expect(
-      launchAgentInStructuredNewTab({ plan: structuredPlan('Fix it', 'auto-submit') })
-    ).toBeNull()
-  })
-
-  it('does not expose a delivery promise for drafts', () => {
-    mocks.beginStructuredAgentSessionProvisionalLaunch.mockReturnValue({
-      sessionId: 'session-1',
-      tab: { id: 'agent-session:session-1' },
-      settlement: Promise.resolve({ kind: 'structured', sessionId: 'session-1' }),
-      promptDeliveryResult: Promise.resolve({ delivered: true, failureNotified: false })
-    })
-
-    const result = launchAgentInStructuredNewTab({ plan: structuredPlan('Fix it', 'draft') })
-    expect(result?.promptDeliveryResult).toBeUndefined()
-  })
-})
diff --git a/src/renderer/src/lib/launch-agent-in-new-tab-structured.ts b/src/renderer/src/lib/launch-agent-in-new-tab-structured.ts
deleted file mode 100644
index 6dca43140bd3..000000000000
--- a/src/renderer/src/lib/launch-agent-in-new-tab-structured.ts
+++ /dev/null
@@ -1,54 +0,0 @@
-import type { AgentSessionLaunchPlan } from '@/lib/agent-session-launch-plan'
-import type { StructuredAgentLaunchSettlement } from '@/lib/structured-agent-launch-settlement'
-import type { StructuredPromptDeliveryResult } from '@/lib/structured-agent-session-launch-prompt'
-import { beginStructuredAgentSessionProvisionalLaunch } from '@/lib/structured-agent-session-provisional-tab'
-
-export type StructuredNewTabLaunchArgs = {
-  /** Planned on the structured route with an already-trimmed prompt; empty means no prompt. */
-  plan: AgentSessionLaunchPlan
-  targetGroupId?: string
-  /** Lets a workspace reveal itself after ID allocation but before tab ownership. */
-  beforeOpen?: (sessionId?: string) => boolean | void
-}
-
-export type StructuredNewTabLaunch = {
-  sessionId: string
-  tabId: string
-  structuredSettlement: Promise<StructuredAgentLaunchSettlement>
-  promptDeliveryResult?: Promise<StructuredPromptDeliveryResult>
-}
-
-/**
- * The new-tab launcher's structured branch. Returns synchronously so `launchAgentInNewTab` keeps
- * its signature; the settlement carries what the structured launch actually did.
- */
-export function launchAgentInStructuredNewTab(
-  args: StructuredNewTabLaunchArgs
-): StructuredNewTabLaunch | null {
-  const launch = beginStructuredAgentSessionProvisionalLaunch({
-    plan: args.plan,
-    hooks: {},
-    ...(args.beforeOpen ? { beforeOpen: args.beforeOpen } : {}),
-    ...(args.targetGroupId ? { targetGroupId: args.targetGroupId } : {})
-  })
-  // The new-tab launcher sends a paired server's launch through admission itself.
-  if (!launch?.tab) {
-    launch?.cancel()
-    return null
-  }
-  const structuredSettlement = launch.settlement
-  void structuredSettlement.then((settlement) => {
-    if (settlement.kind === 'failed') {
-      console.error('Structured agent launch failed', settlement.error)
-    }
-  })
-  return {
-    sessionId: launch.sessionId,
-    tabId: launch.tab.id,
-    structuredSettlement,
-    // Why: draft mode has no delivery event; the composer owns the text until the user sends it.
-    ...(launch.promptDeliveryResult && args.plan.promptDelivery !== 'draft'
-      ? { promptDeliveryResult: launch.promptDeliveryResult }
-      : {})
-  }
-}
diff --git a/src/renderer/src/lib/launch-agent-in-new-tab.test.ts b/src/renderer/src/lib/launch-agent-in-new-tab.test.ts
index f9c41da3ef01..e9ad2fba3731 100644
--- a/src/renderer/src/lib/launch-agent-in-new-tab.test.ts
+++ b/src/renderer/src/lib/launch-agent-in-new-tab.test.ts
@@ -1,4 +1,5 @@
 import { beforeEach, describe, expect, it, vi } from 'vitest'
+import { setLocalRuntimeCapabilitiesForTests } from '@/runtime/local-runtime-capabilities'
 import { toAppSshPtyId } from '../../../shared/ssh-pty-id'
 import { FLOATING_TERMINAL_WORKTREE_ID } from '../../../shared/constants'
 
@@ -154,6 +155,8 @@ const COMMAND_CODE_CLICK = {
 describe('launchAgentInNewTab', () => {
   beforeEach(() => {
     vi.clearAllMocks()
+    // The local runtime has answered (without structured support), so no launch waits on it.
+    setLocalRuntimeCapabilitiesForTests([])
     mockIsWebRuntimeSessionActive.mockReturnValue(false)
     mockCreateWebRuntimeSessionTerminal.mockResolvedValue({ status: 'created' })
     mockCreateWebRuntimeAgentSessionTerminalWithLaunchDraft.mockResolvedValue({ status: 'created' })
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 9fa639d00eda..97e5b1071e95 100644
--- a/src/renderer/src/lib/launch-agent-in-new-tab.ts
+++ b/src/renderer/src/lib/launch-agent-in-new-tab.ts
@@ -26,11 +26,13 @@ import { resolveInitialNativeChatSessionOptions } from '@/components/native-chat
 import { seedNativeChatAppliedSessionOptions } from '@/components/native-chat/native-chat-session-option-cache'
 import { launchStructuredAgentFromNewTab } from '@/lib/launch-agent-in-new-tab-structured-route'
 import type { StructuredAgentLaunchSettlement } from '@/lib/structured-agent-launch-settlement'
+import type { StructuredLaunchTerminal } from '@/lib/structured-agent-session-launch-admission'
 import { workspaceKindForWorktreeId } from '@/lib/agent-launch-route-input'
+import type { AgentSessionLaunchPlan } from '@/lib/agent-session-launch-plan'
 import {
-  planAgentSessionLaunch,
-  type AgentSessionLaunchPlan
-} from '@/lib/agent-session-launch-plan'
+  launchOnceHostAnswered,
+  routeNewTabLaunch
+} from '@/lib/launch-agent-in-new-tab-host-agents'
 import type { AgentLaunchRequestId } from '@/lib/agent-launch-request-id'
 
 /** The user action this launch serves: minted where that action is handled, or carried by the
@@ -63,6 +65,8 @@ export type LaunchAgentInNewTabArgs = LaunchAgentInNewTabRequest & {
   launchPlatform?: NodeJS.Platform
   /** Called after the prompt is actually delivered to the agent input path. */
   onPromptDelivered?: () => void
+  /** The caller keeps the prompt's text if it does not go out (notes), so no composer gets it. */
+  promptKeptByCaller?: true
   /**
    * Called before `onPromptDelivered` when the paste was written without ever observing the
    * agent's composer, so the launch cannot claim the prompt arrived. Fires only on the
@@ -75,16 +79,15 @@ export type LaunchAgentInNewTabArgs = LaunchAgentInNewTabRequest & {
   pendingActivationSpawn?: boolean
   /** Lets a workspace reveal itself before the selected surface opens. */
   beforeSurfaceOpen?: (
-    surface:
-      | { kind: 'local-terminal' }
-      | { kind: 'local-agent-session'; sessionId: string }
-      | { kind: 'host-published' }
+    surface: { kind: 'local-terminal' } | { kind: 'host-published' }
   ) => boolean | void
+  /** Opens instead of this agent's terminal when the host declines its structured chat. */
+  onStructuredHostDeclined?: () => StructuredLaunchTerminal
 }
 
+/** `host-published`: the surface opens once its host answers, a structured chat's included. */
 export type AgentLaunchSurface =
   | { kind: 'local-terminal'; tabId: string }
-  | { kind: 'local-agent-session'; tabId: string; sessionId: string }
   | { kind: 'host-published' }
 
 export type LaunchAgentInNewTabResult = {
@@ -181,26 +184,28 @@ function launchAgentInNewTabInternal(args: LaunchAgentInNewTabArgs): LaunchAgent
 
   // Why first: a structured chat is created on whichever runtime owns the workspace, a paired
   // server included, so only a non-structured route falls through to the host-published terminal.
-  const plan =
-    args.requestId === undefined
-      ? args.agentSessionLaunchPlan
-      : planAgentSessionLaunch(store, {
-          requestId: args.requestId,
-          agent,
-          workspace: { kind: workspaceKind, worktreeId },
-          prompt: trimmedPrompt,
-          promptDelivery: viewModePromptDelivery,
-          tuiCustomization: { cwd: initialCwd },
-          initialSessionOptions: startupPlan.sessionOptions,
-          onPromptDelivered
-        })
+  const route = routeNewTabLaunch(store, args, {
+    agent,
+    workspace: { kind: workspaceKind, worktreeId },
+    prompt: trimmedPrompt,
+    promptDelivery: viewModePromptDelivery,
+    tuiCustomization: { cwd: initialCwd },
+    initialSessionOptions: startupPlan.sessionOptions,
+    onPromptDelivered,
+    ...(args.promptKeptByCaller ? { promptKeptByCaller: true as const } : {})
+  })
+  if ('awaited' in route) {
+    return launchOnceHostAnswered(route, args, startupPlan, launchAgentInNewTabInternal)
+  }
+  const { plan } = route
   if (plan?.route === 'structured-native-chat') {
     const structured = launchStructuredAgentFromNewTab({
       plan,
       worktreeId,
       ...(groupId ? { groupId } : {}),
       ...(beforeSurfaceOpen ? { beforeSurfaceOpen } : {}),
-      // A paired server's "no" opens this same launch as a terminal, with the caller's arguments.
+      ...(args.onStructuredHostDeclined ? { onHostDeclined: args.onStructuredHostDeclined } : {}),
+      // The host's "no" opens this same launch as a terminal, with the caller's arguments.
       openTerminal: (terminalPlan) =>
         launchAgentInNewTabInternal({
           ...args,
diff --git a/src/renderer/src/lib/launch-agent-structured-chat-guard.test.ts b/src/renderer/src/lib/launch-agent-structured-chat-guard.test.ts
index 64d748ec858e..2d909918b444 100644
--- a/src/renderer/src/lib/launch-agent-structured-chat-guard.test.ts
+++ b/src/renderer/src/lib/launch-agent-structured-chat-guard.test.ts
@@ -38,6 +38,7 @@ const mockLaunchStructuredCodexSession = vi.fn()
 const mockRefreshLocalStructuredSessionTabs = vi.fn()
 const mockToastError = vi.fn()
 const mockCallStructuredAgentSession = vi.fn()
+const mockCreateSupport = vi.fn()
 const STRUCTURED_HOST_CAPABILITIES = ['agent-session.structured.v1']
 let hostCapabilities: readonly string[] | null = STRUCTURED_HOST_CAPABILITIES
 
@@ -160,7 +161,10 @@ vi.mock('@/runtime/local-structured-session-tabs-sync', () => ({
   LOCAL_STRUCTURED_SESSION_OWNER: 'local-structured-session'
 }))
 vi.mock('@/runtime/local-runtime-capabilities', () => ({
-  readLocalRuntimeCapabilitiesOrUnknown: () => hostCapabilities
+  readLocalRuntimeCapabilitiesOrUnknown: () => hostCapabilities,
+  ensureLocalRuntimeCapabilities: async () => hostCapabilities,
+  // A launch made before the runtime answered hears back that it supports no structured chat.
+  awaitLocalRuntimeCapabilities: () => ({ known: Promise.resolve([]), stop: () => {} })
 }))
 vi.mock('@/lib/worktree-runtime-owner', () => ({
   getExecutionHostIdForWorktree: () =>
@@ -168,7 +172,10 @@ vi.mock('@/lib/worktree-runtime-owner', () => ({
   getRuntimeEnvironmentIdForWorktree: () => null
 }))
 vi.mock('@/runtime/structured-agent-session-client', () => ({
-  callStructuredAgentSession: mockCallStructuredAgentSession
+  callStructuredAgentSession: (target: unknown, method: string, params: unknown) =>
+    method === 'agentSession.createSupport'
+      ? mockCreateSupport()
+      : mockCallStructuredAgentSession(target, method, params)
 }))
 
 /** Structured adoption creates the tab in terminal mode and flips it to chat once
@@ -237,6 +244,7 @@ describe('structured chat adoption guard on the launch path', () => {
         tabs: [{ type: 'agent-session', sessionId: 'codex-session-1' }]
       }
     ])
+    mockCreateSupport.mockResolvedValue({ supported: true })
     mockToastError.mockReset()
     hostCapabilities = STRUCTURED_HOST_CAPABILITIES
     store.settings.openAgentTabsInChatByDefault = true
@@ -262,15 +270,13 @@ describe('structured chat adoption guard on the launch path', () => {
       worktreeId: 'wt-1'
     })
 
+    // This machine admits the chat before any of it opens, so the surface is its answer.
     expect(result).toMatchObject({
-      surface: {
-        kind: 'local-agent-session',
-        tabId: 'structured-agent-session-codex-session-1',
-        sessionId: 'codex-session-1'
-      },
+      surface: { kind: 'host-published' },
       pasteDraftAfterLaunch: false
     })
-    expect(shouldQueueTerminalFocusAfterMenuClose(result!)).toBe(false)
+    expect(mockCreateStructuredCodexSessionLaunchIntent).not.toHaveBeenCalled()
+    expect(shouldQueueTerminalFocusAfterMenuClose(result!)).toBe(true)
     await expect(result?.structuredSettlement).resolves.toEqual({
       kind: 'structured',
       sessionId: 'codex-session-1'
@@ -306,9 +312,8 @@ describe('structured chat adoption guard on the launch path', () => {
       worktreeId: 'wt-1'
     })
 
-    expect(result).toMatchObject({
-      surface: { kind: 'local-agent-session', sessionId: 'codex-session-1' }
-    })
+    expect(result).toMatchObject({ surface: { kind: 'host-published' } })
+    await result?.structuredSettlement
     expect(mockCreateStructuredCodexSessionLaunchIntent).toHaveBeenCalledWith(
       'wt-1',
       'codex',
@@ -328,9 +333,8 @@ describe('structured chat adoption guard on the launch path', () => {
       worktreeId: 'wt-1'
     })
 
-    expect(result).toMatchObject({
-      surface: { kind: 'local-agent-session', sessionId: 'codex-session-1' }
-    })
+    expect(result).toMatchObject({ surface: { kind: 'host-published' } })
+    await result?.structuredSettlement
     expect(mockCreateStructuredCodexSessionLaunchIntent).toHaveBeenCalledWith(
       'wt-1',
       'claude',
@@ -341,6 +345,40 @@ describe('structured chat adoption guard on the launch path', () => {
     expect(mockCreateTab).not.toHaveBeenCalled()
   })
 
+  // A Claude account bound to WSL is one such "no". Before, the chat opened first and was left
+  // failed, with a Retry that failed the same way.
+  it('opens the terminal, and no chat, when this machine declines the chat', async () => {
+    store.unifiedTabsByWorktree = {}
+    mockCreateSupport.mockResolvedValue({ supported: false, reason: 'wsl' })
+    const { launchAgentInNewTab } = await import('./launch-agent-in-new-tab')
+
+    const result = launchAgentInNewTab({
+      requestId: 'request-declined',
+      agent: 'claude',
+      worktreeId: 'wt-1',
+      prompt: 'start this task',
+      promptDelivery: 'submit-after-ready'
+    })
+
+    expect(mockCreateTab).not.toHaveBeenCalled()
+    await expect(result?.structuredSettlement).resolves.toEqual({ kind: 'terminal' })
+    await expect(result?.promptDeliveryResult).resolves.toEqual({
+      delivered: true,
+      failureNotified: false
+    })
+    expect(mockCreateTab).toHaveBeenCalledOnce()
+    expect(mockPasteDraftWhenAgentReady).toHaveBeenCalledOnce()
+    expect(mockPasteDraftWhenAgentReady).toHaveBeenCalledWith(
+      expect.objectContaining({ content: 'start this task' })
+    )
+    // Nothing of a chat was committed: no launch, intent, tab, or message about it.
+    expect(mockCreateStructuredCodexSessionLaunchIntent).not.toHaveBeenCalled()
+    expect(mockLaunchStructuredCodexSession).not.toHaveBeenCalled()
+    expect(mockCreateUnifiedTab).not.toHaveBeenCalled()
+    expect(localStorage.length).toBe(0)
+    expect(mockToastError).not.toHaveBeenCalled()
+  })
+
   it('keeps a native-chat agent with no structured adapter on the terminal-backed path', async () => {
     const { launchAgentInNewTab } = await import('./launch-agent-in-new-tab')
 
@@ -356,8 +394,12 @@ describe('structured chat adoption guard on the launch path', () => {
       hostCapabilities = capabilities
       const { launchAgentInNewTab } = await import('./launch-agent-in-new-tab')
 
-      launchAgentInNewTab({ requestId: 'request-5', agent: 'claude', worktreeId: 'wt-1' })
-      launchAgentInNewTab({ requestId: 'request-6', agent: 'codex', worktreeId: 'wt-1' })
+      const launches = [
+        launchAgentInNewTab({ requestId: 'request-5', agent: 'claude', worktreeId: 'wt-1' }),
+        launchAgentInNewTab({ requestId: 'request-6', agent: 'codex', worktreeId: 'wt-1' })
+      ]
+      // With no answer yet, each launch waits (bounded) for the runtime before opening its terminal.
+      await Promise.all(launches.map((launch) => launch?.structuredSettlement))
 
       expect(mockCreateStructuredCodexSessionLaunchIntent).not.toHaveBeenCalled()
       expect(mockCreateTab).toHaveBeenCalledTimes(2)
@@ -400,7 +442,7 @@ describe('structured chat adoption guard on the launch path', () => {
     })
 
     expect(result).toMatchObject({
-      surface: { kind: 'local-agent-session', sessionId: 'codex-session-1' },
+      surface: { kind: 'host-published' },
       pasteDraftAfterLaunch: false
     })
     await expect(result?.structuredSettlement).resolves.toEqual({
@@ -462,9 +504,12 @@ describe('structured chat adoption guard on the launch path', () => {
       worktreeId: 'wt-1'
     })
 
-    expect(first).toMatchObject({ surface: { kind: 'local-agent-session' } })
-    expect(second).toMatchObject({ surface: { kind: 'local-agent-session' } })
+    expect(first).toMatchObject({ surface: { kind: 'host-published' } })
+    expect(second).toMatchObject({ surface: { kind: 'host-published' } })
+    await vi.waitFor(() => expect(mockLaunchStructuredCodexSession).toHaveBeenCalledOnce())
+    await new Promise((resolve) => setTimeout(resolve, 0))
     expect(mockLaunchStructuredCodexSession).toHaveBeenCalledTimes(1)
+    expect(mockCreateStructuredCodexSessionLaunchIntent).toHaveBeenCalledTimes(1)
     resolveLaunch({ sessionId: 'codex-session-1', fence: 1 })
   })
 
@@ -484,6 +529,8 @@ describe('structured chat adoption guard on the launch path', () => {
     await vi.waitFor(() => expect(mockRefreshLocalStructuredSessionTabs).toHaveBeenCalledTimes(1))
 
     launchAgentInNewTab({ requestId: 'double-click', agent: 'codex', worktreeId: 'wt-1' })
+    await vi.waitFor(() => expect(mockCreateSupport).toHaveBeenCalledTimes(2))
+    await new Promise((resolve) => setTimeout(resolve, 0))
 
     expect(mockLaunchStructuredCodexSession).toHaveBeenCalledTimes(1)
     store.unifiedTabsByWorktree['wt-1'] = [
@@ -591,9 +638,7 @@ describe('structured chat adoption guard on the launch path', () => {
       prompt: 'start this task'
     })
 
-    expect(result).toMatchObject({
-      surface: { kind: 'local-agent-session', sessionId: 'codex-session-1' }
-    })
+    expect(result).toMatchObject({ surface: { kind: 'host-published' } })
     await expect(result?.promptDeliveryResult).resolves.toEqual({
       delivered: true,
       failureNotified: false
@@ -601,7 +646,7 @@ describe('structured chat adoption guard on the launch path', () => {
     expect(mockCreateTab).not.toHaveBeenCalled()
   })
 
-  it('leaves a refused structured prompt queued for an explicit retry', async () => {
+  it("puts a refused structured prompt in the new chat's composer", async () => {
     mockCallStructuredAgentSession.mockResolvedValueOnce({
       ok: false,
       refusal: { code: 'agent_session_busy', message: 'busy' }
@@ -618,7 +663,8 @@ describe('structured chat adoption guard on the launch path', () => {
 
     await expect(result?.promptDeliveryResult).resolves.toEqual({
       delivered: false,
-      failureNotified: false
+      failureNotified: false,
+      inComposer: true
     })
     expect(mockCreateTab).not.toHaveBeenCalled()
   })
diff --git a/src/renderer/src/lib/launch-structured-agent-session.ts b/src/renderer/src/lib/launch-structured-agent-session.ts
index 11625fd8161f..6f95d73d0ed0 100644
--- a/src/renderer/src/lib/launch-structured-agent-session.ts
+++ b/src/renderer/src/lib/launch-structured-agent-session.ts
@@ -248,7 +248,8 @@ async function requireHostCreateSupport(
       readAgentSessionErrorRefusal(support.error)
     )
   }
-  if (support.kind === 'declined') {
+  // A workspace the host still cannot resolve is refused here, as before; Retry asks again.
+  if (support.kind === 'declined' || support.kind === 'workspace-unresolved') {
     abandonStructuredAgentSessionLaunchIntent(intent)
     throw new StructuredAgentSessionCreateRefusalError(
       'structured_agent_session_unsupported',
diff --git a/src/renderer/src/lib/launch-work-item-direct-agent-routing.ts b/src/renderer/src/lib/launch-work-item-direct-agent-routing.ts
index 20b02593adbe..b1a0ac294fc2 100644
--- a/src/renderer/src/lib/launch-work-item-direct-agent-routing.ts
+++ b/src/renderer/src/lib/launch-work-item-direct-agent-routing.ts
@@ -7,7 +7,7 @@ import type { AgentSessionLaunchPlan } from '@/lib/agent-session-launch-plan'
 import { isNativeChatTranscriptLocalReadable } from '@/lib/native-chat-transcript-readability'
 import { resolveSourceControlLaunchPlatform } from '@/lib/source-control-launch-platform'
 import { beginStructuredAgentSessionProvisionalLaunch } from '@/lib/structured-agent-session-provisional-tab'
-import type { DeclinedStructuredLaunchTerminalOptions } from '@/lib/structured-agent-session-paired-admission'
+import type { DeclinedStructuredLaunchTerminalOptions } from '@/lib/structured-agent-session-launch-admission'
 
 export function buildDirectWorkItemStartup(args: {
   agent: TuiAgent | null
@@ -83,7 +83,7 @@ export function beginDirectWorkItemStructuredLaunch(args: {
   plan: AgentSessionLaunchPlan | null
   primaryTabId: string | null
   beforeOpen: (sessionId?: string) => boolean | void
-  /** The terminal launch a paired server's "no" falls back to, carrying the caller's own CLI args. */
+  /** The terminal launch the host's "no" falls back to, carrying the caller's own CLI args. */
   declinedTerminal?: DeclinedStructuredLaunchTerminalOptions
 }): {
   completed: boolean
diff --git a/src/renderer/src/lib/launch-worktree-background-terminals.test.ts b/src/renderer/src/lib/launch-worktree-background-terminals.test.ts
index ea463464751e..88ab463e60d7 100644
--- a/src/renderer/src/lib/launch-worktree-background-terminals.test.ts
+++ b/src/renderer/src/lib/launch-worktree-background-terminals.test.ts
@@ -87,6 +87,16 @@ describe('launchWorktreeBackgroundTerminals', () => {
       state.tabsByWorktree['wt-1'].push(tab)
       return tab
     })
+    // Placement reads the row back from the store, so title and color writes must land there.
+    const patchTab = (tabId: string, patch: { customTitle?: string; color?: string }): void => {
+      state.tabsByWorktree['wt-1'] = state.tabsByWorktree['wt-1'].map((tab) =>
+        tab.id === tabId ? { ...tab, ...patch } : tab
+      )
+    }
+    mockSetTabCustomTitle.mockImplementation((tabId: string, customTitle: string) =>
+      patchTab(tabId, { customTitle })
+    )
+    mockSetTabColor.mockImplementation((tabId: string, color: string) => patchTab(tabId, { color }))
     mockCloseTab.mockImplementation((tabId: string) => {
       state.tabsByWorktree['wt-1'] = state.tabsByWorktree['wt-1'].filter((tab) => tab.id !== tabId)
     })
@@ -136,7 +146,11 @@ describe('launchWorktreeBackgroundTerminals', () => {
         connectionId: null,
         worktreeId: 'wt-1',
         tabId: 'tab-1',
-        leafId: '00000000-0000-4000-8000-000000000001'
+        leafId: '00000000-0000-4000-8000-000000000001',
+        placement: {
+          kind: 'new-tab',
+          row: expect.objectContaining({ customTitle: 'Dev', color: '#f97316' })
+        }
       })
     )
     expect(mockSpawn).toHaveBeenNthCalledWith(
@@ -145,7 +159,8 @@ describe('launchWorktreeBackgroundTerminals', () => {
         command: 'bash /tmp/setup.sh',
         env: expect.objectContaining({ ORCA_WORKTREE_PATH: '/repo/worktree' }),
         tabId: 'tab-2',
-        leafId: '00000000-0000-4000-8000-000000000002'
+        leafId: '00000000-0000-4000-8000-000000000002',
+        placement: { kind: 'new-tab', row: expect.objectContaining({ customTitle: 'Setup' }) }
       })
     )
     expect(mockUpdateTabPtyId).toHaveBeenCalledWith('tab-1', 'pty-1')
@@ -168,7 +183,8 @@ describe('launchWorktreeBackgroundTerminals', () => {
       1,
       expect.objectContaining({
         tabId: 'tab-1',
-        leafId: '00000000-0000-4000-8000-000000000001'
+        leafId: '00000000-0000-4000-8000-000000000001',
+        placement: { kind: 'new-tab', row: expect.any(Object) }
       })
     )
     expect(mockSpawn.mock.calls[0]?.[0]).not.toHaveProperty('command')
@@ -177,7 +193,18 @@ describe('launchWorktreeBackgroundTerminals', () => {
       expect.objectContaining({
         command: 'bash /tmp/setup.sh',
         tabId: 'tab-1',
-        leafId: '00000000-0000-4000-8000-000000000002'
+        leafId: '00000000-0000-4000-8000-000000000002',
+        placement: {
+          kind: 'split',
+          parentLeafId: '00000000-0000-4000-8000-000000000001',
+          direction: 'horizontal',
+          proposedRoot: {
+            type: 'split',
+            direction: 'horizontal',
+            first: { type: 'leaf', leafId: '00000000-0000-4000-8000-000000000001' },
+            second: { type: 'leaf', leafId: '00000000-0000-4000-8000-000000000002' }
+          }
+        }
       })
     )
     expect(mockSetTabLayout).toHaveBeenLastCalledWith(
diff --git a/src/renderer/src/lib/launch-worktree-background-terminals.ts b/src/renderer/src/lib/launch-worktree-background-terminals.ts
index 791504d6948a..b5b31b5f97c8 100644
--- a/src/renderer/src/lib/launch-worktree-background-terminals.ts
+++ b/src/renderer/src/lib/launch-worktree-background-terminals.ts
@@ -1,12 +1,10 @@
-import {
-  registerEagerPtyBuffer,
-  type EagerPtyHandle
-} from '@/components/terminal-pane/pty-dispatcher'
 import { createBrowserUuid } from '@/lib/browser-uuid'
 import { getSettingsForWorktreeRuntimeOwner } from '@/lib/worktree-runtime-owner'
 import { getActiveRuntimeTarget } from '@/runtime/runtime-rpc-client'
 import { singlePaneLayoutSnapshot } from '@/store/slices/terminal-helpers'
 import { retireUnownedTerminal } from '@/lib/retire-unowned-background-terminal'
+import { registerBackgroundPaneBuffer } from '@/lib/background-pane-exit-output'
+import { terminalPanePlacementRow } from '@/lib/terminal-pane-placement-row'
 import { useAppStore } from '@/store'
 import { translate } from '@/i18n/i18n'
 import { makePaneKey } from '../../../shared/stable-pane-id'
@@ -14,7 +12,11 @@ import {
   buildSetupRunnerCommand,
   getSetupRunnerCommandPlatformForPath
 } from '../../../shared/setup-runner-command'
-import type { TerminalLayoutSnapshot } from '../../../shared/terminal-tab-types'
+import type {
+  TerminalLayoutSnapshot,
+  TerminalPaneLayoutNode
+} from '../../../shared/terminal-tab-types'
+import type { TerminalPanePlacement } from '../../../shared/terminal-pane-placement'
 import type {
   WorktreeDefaultTabsLaunch,
   WorktreeSetupLaunch
@@ -62,6 +64,19 @@ function buildPaneEnv(
   }
 }
 
+function buildSplitRoot(
+  firstLeafId: string,
+  secondLeafId: string,
+  direction: 'horizontal' | 'vertical'
+): TerminalPaneLayoutNode {
+  return {
+    type: 'split',
+    direction,
+    first: { type: 'leaf', leafId: firstLeafId },
+    second: { type: 'leaf', leafId: secondLeafId }
+  }
+}
+
 function buildSplitLayout(
   first: BackgroundPane,
   second: BackgroundPane,
@@ -69,12 +84,7 @@ function buildSplitLayout(
   secondTitle: string
 ): TerminalLayoutSnapshot {
   return {
-    root: {
-      type: 'split',
-      direction,
-      first: { type: 'leaf', leafId: first.leafId },
-      second: { type: 'leaf', leafId: second.leafId }
-    },
+    root: buildSplitRoot(first.leafId, second.leafId, direction),
     activeLeafId: first.leafId,
     expandedLeafId: null,
     ptyIdsByLeafId: {
@@ -87,43 +97,6 @@ function buildSplitLayout(
   }
 }
 
-function persistExitedPaneOutput(tabId: string, leafId: string, output: string): void {
-  const store = useAppStore.getState()
-  const layout = store.terminalLayoutsByTabId[tabId]
-  if (!layout) {
-    return
-  }
-  const { ptyIdsByLeafId: existingPtyIds, buffersByLeafId: existingBuffers, ...rest } = layout
-  const nextPtyIds = { ...existingPtyIds }
-  delete nextPtyIds[leafId]
-  const trimmedOutput = output.trim() ? output : ''
-  store.setTabLayout(tabId, {
-    ...rest,
-    ...(Object.keys(nextPtyIds).length > 0 ? { ptyIdsByLeafId: nextPtyIds } : {}),
-    ...(trimmedOutput
-      ? {
-          buffersByLeafId: {
-            ...existingBuffers,
-            [leafId]: output
-          }
-        }
-      : existingBuffers
-        ? { buffersByLeafId: existingBuffers }
-        : {})
-  })
-}
-
-// Why the incarnation: a relay-recycled id can hold the previous owner's exit, and draining that
-// into this handler tears the pane down seconds after it launched.
-function registerBackgroundPaneBuffer(tabId: string, leafId: string, pane: SpawnedPane): void {
-  let eagerBuffer: EagerPtyHandle | null = null
-  const onExit = (exitPtyId: string): void => {
-    persistExitedPaneOutput(tabId, leafId, eagerBuffer?.flush() ?? '')
-    useAppStore.getState().clearTabPtyId(tabId, exitPtyId)
-  }
-  eagerBuffer = registerEagerPtyBuffer(pane.ptyId, onExit, pane.incarnationId)
-}
-
 function buildSetupCommand(setup: WorktreeSetupLaunch): string {
   // Why: background setup tabs can launch later, so they must reuse the same shell chosen when the runner was written.
   return buildSetupRunnerCommand(
@@ -141,6 +114,7 @@ async function spawnPane(args: {
   connectionId: string | null
   tabId: string
   leafId: string
+  placement: TerminalPanePlacement
   command?: string
   env?: Record<string, string>
 }): Promise<SpawnedPane> {
@@ -153,7 +127,8 @@ async function spawnPane(args: {
     connectionId: args.connectionId,
     worktreeId: args.worktree.id,
     tabId: args.tabId,
-    leafId: args.leafId
+    leafId: args.leafId,
+    placement: args.placement
   })
   return {
     ptyId: result.id,
@@ -180,6 +155,8 @@ async function createBackgroundTab(args: {
 
   const leafId = createBrowserUuid()
   store.setTabLayout(tab.id, singlePaneLayoutSnapshot(leafId))
+  const created =
+    useAppStore.getState().tabsByWorktree[args.worktree.id]?.find(({ id }) => id === tab.id) ?? tab
   let pane: SpawnedPane
   try {
     pane = await spawnPane({
@@ -187,6 +164,7 @@ async function createBackgroundTab(args: {
       connectionId: args.connectionId,
       tabId: tab.id,
       leafId,
+      placement: { kind: 'new-tab', row: terminalPanePlacementRow(created) },
       command: args.launch.command,
       env: args.launch.env
     })
@@ -223,6 +201,12 @@ async function addSetupSplit(args: {
     connectionId: args.connectionId,
     tabId: args.tab.tabId,
     leafId: setupLeafId,
+    placement: {
+      kind: 'split',
+      parentLeafId: args.tab.primary.leafId,
+      direction: args.direction,
+      proposedRoot: buildSplitRoot(args.tab.primary.leafId, setupLeafId, args.direction)
+    },
     command: buildSetupCommand(args.setup),
     env: args.setup.envVars
   })
diff --git a/src/renderer/src/lib/linear-issue-workspace-attachment.test.ts b/src/renderer/src/lib/linear-issue-workspace-attachment.test.ts
index 2273b6a267a0..546e1b38bde7 100644
--- a/src/renderer/src/lib/linear-issue-workspace-attachment.test.ts
+++ b/src/renderer/src/lib/linear-issue-workspace-attachment.test.ts
@@ -181,3 +181,33 @@ describe('Linear issue workspace attachment', () => {
     expect(findLinearIssueWorkspaceAttachmentInIndex(index, { identifier: 'STA-9999' })).toBeNull()
   })
 })
+
+describe('multiple Linear attachments', () => {
+  it('indexes secondary identifiers and keeps organization scope', () => {
+    const attached = worktree({
+      linkedLinearIssue: 'STA-1',
+      linkedItems: [
+        {
+          provider: 'linear',
+          type: 'issue',
+          number: 0,
+          identifier: 'STA-2',
+          linearOrganizationUrlKey: 'acme'
+        }
+      ]
+    })
+    const index = buildLinearIssueWorkspaceAttachmentIndex([attached])
+    expect(
+      findLinearIssueWorkspaceAttachmentInIndex(index, {
+        identifier: 'STA-2',
+        url: 'https://linear.app/acme/issue/STA-2'
+      })
+    ).toBe(attached)
+    expect(
+      findLinearIssueWorkspaceAttachmentInIndex(index, {
+        identifier: 'STA-2',
+        url: 'https://linear.app/other/issue/STA-2'
+      })
+    ).toBeNull()
+  })
+})
diff --git a/src/renderer/src/lib/linear-issue-workspace-attachment.ts b/src/renderer/src/lib/linear-issue-workspace-attachment.ts
index d9a9472b1dc0..cda559960c6b 100644
--- a/src/renderer/src/lib/linear-issue-workspace-attachment.ts
+++ b/src/renderer/src/lib/linear-issue-workspace-attachment.ts
@@ -1,4 +1,5 @@
 import type { LinearIssue } from '../../../shared/linear/issue-types'
+import { getWorkspaceAttachments } from '../../../shared/workspace-attachments'
 import type { Worktree } from '../../../shared/worktree/types'
 import {
   getLinearOrganizationUrlKeyFromIssueUrl,
@@ -53,12 +54,24 @@ function findScopedAttachment(
   let best: Worktree | null = null
   let bestScore = -1
   for (const worktree of candidates) {
-    const score = scopeMatchScore({
-      issueWorkspaceId: issue.workspaceId,
-      worktreeWorkspaceId: worktree.linkedLinearIssueWorkspaceId,
-      issueOrganizationUrlKey,
-      worktreeOrganizationUrlKey: worktree.linkedLinearIssueOrganizationUrlKey
-    })
+    const identifier = normalizeLinearIdentifier(issue.identifier)
+    const scores = getWorkspaceAttachments(worktree)
+      .filter(
+        (item) =>
+          item.provider === 'linear' &&
+          normalizeLinearIdentifier(item.identifier ?? item.linearIdentifier) === identifier
+      )
+      .map((item) =>
+        scopeMatchScore({
+          issueWorkspaceId: issue.workspaceId,
+          worktreeWorkspaceId: item.linearWorkspaceId,
+          issueOrganizationUrlKey,
+          worktreeOrganizationUrlKey:
+            item.linearOrganizationUrlKey ?? getLinearOrganizationUrlKeyFromIssueUrl(item.url)
+        })
+      )
+      .filter((score): score is number => score !== null)
+    const score = scores.length ? Math.max(...scores) : null
     if (
       score != null &&
       (score > bestScore ||
@@ -83,7 +96,12 @@ export function findLinearIssueWorkspaceAttachment(
   return findScopedAttachment(
     worktrees.filter(
       (worktree) =>
-        !worktree.isArchived && normalizeLinearIdentifier(worktree.linkedLinearIssue) === identifier
+        !worktree.isArchived &&
+        getWorkspaceAttachments(worktree).some(
+          (item) =>
+            item.provider === 'linear' &&
+            normalizeLinearIdentifier(item.identifier ?? item.linearIdentifier) === identifier
+        )
     ),
     issue
   )
@@ -99,15 +117,21 @@ export function buildLinearIssueWorkspaceAttachmentIndex(
     if (worktree.isArchived) {
       continue
     }
-    const identifier = normalizeLinearIdentifier(worktree.linkedLinearIssue)
-    if (!identifier) {
-      continue
-    }
-    const bucket = index.get(identifier)
-    if (bucket) {
-      bucket.push(worktree)
-    } else {
-      index.set(identifier, [worktree])
+    const identifiers = new Set(
+      getWorkspaceAttachments(worktree)
+        .filter((item) => item.provider === 'linear')
+        .map((item) => normalizeLinearIdentifier(item.identifier ?? item.linearIdentifier))
+    )
+    for (const identifier of identifiers) {
+      if (!identifier) {
+        continue
+      }
+      const bucket = index.get(identifier)
+      if (bucket) {
+        bucket.push(worktree)
+      } else {
+        index.set(identifier, [worktree])
+      }
     }
   }
   return index
diff --git a/src/renderer/src/lib/local-file-access.test.ts b/src/renderer/src/lib/local-file-access.test.ts
index 5d850256cb30..37c3d7db6250 100644
--- a/src/renderer/src/lib/local-file-access.test.ts
+++ b/src/renderer/src/lib/local-file-access.test.ts
@@ -227,6 +227,7 @@ const DOCUMENT_FOLDER_ACCESS_BUILDERS = [
 
 const USER_NAMED_TAB_OPENERS = [
   'components/browser-pane/navigate/navigate-browser-page-url.ts',
+  'components/editor/editor-dropped-file-open.ts',
   'components/editor/markdown-preview-link-actions.ts',
   'components/floating-terminal/use-floating-terminal-create-actions.ts',
   'components/quick-open-file-navigation.ts',
@@ -236,7 +237,6 @@ const USER_NAMED_TAB_OPENERS = [
   'components/settings/KeybindingsFileActions.tsx',
   'components/tab-bar/tab-create-entry-absolute-file.ts',
   'components/terminal-pane/terminal-file-open-routing.ts',
-  'hooks/useGlobalFileDrop.ts',
   'lib/floating-workspace-tab-creation.ts',
   'lib/open-document-in-floating-workspace.ts',
   'store/slices/editor/actions/markdown-link-action.ts'
diff --git a/src/renderer/src/lib/native-file-drop-rejection-message.test.ts b/src/renderer/src/lib/native-file-drop-rejection-message.test.ts
new file mode 100644
index 000000000000..cf317851ef85
--- /dev/null
+++ b/src/renderer/src/lib/native-file-drop-rejection-message.test.ts
@@ -0,0 +1,64 @@
+import { describe, expect, it } from 'vitest'
+import { getNativeFileDropRejectionMessage } from './native-file-drop-rejection-message'
+
+describe('getNativeFileDropRejectionMessage', () => {
+  it('formats metadata-only rejection messages for oversized native drops', () => {
+    expect(
+      getNativeFileDropRejectionMessage({
+        byteLength: 0,
+        pathCount: 999,
+        reason: 'too-many-paths',
+        target: 'rejected'
+      })
+    ).toEqual({
+      description: 'Drop 256 or fewer files at a time.',
+      title: 'Drop contains too many files.'
+    })
+
+    const message = getNativeFileDropRejectionMessage({
+      byteLength: 300_000,
+      pathCount: 2,
+      reason: 'paths-too-large',
+      target: 'rejected'
+    })
+    expect(message).toEqual({
+      description: 'Drop fewer files or use a shorter path list.',
+      title: 'Drop path list is too large.'
+    })
+    expect(JSON.stringify(message)).not.toContain('secret')
+  })
+
+  it('explains drag-temp files main could not copy, using their shared reason', () => {
+    const rejection = { byteLength: 0, reason: 'temp-copy-failed', target: 'rejected' } as const
+    expect(
+      getNativeFileDropRejectionMessage({
+        ...rejection,
+        pathCount: 1,
+        commonReason: 'permission-denied'
+      })
+    ).toEqual({ description: 'Permission denied.', title: "Orca couldn't copy 1 dropped file." })
+    expect(
+      getNativeFileDropRejectionMessage({ ...rejection, pathCount: 2, commonReason: 'timed-out' })
+    ).toEqual({
+      description: 'Copying took too long. Try the drop again.',
+      title: "Orca couldn't copy 2 dropped files."
+    })
+    expect(getNativeFileDropRejectionMessage({ ...rejection, pathCount: 2 }).description).toBe(
+      'Try the drop again.'
+    )
+  })
+
+  it('names the drop whose file items carried no readable path (#15782)', () => {
+    expect(
+      getNativeFileDropRejectionMessage({
+        byteLength: 0,
+        pathCount: 2,
+        reason: 'unresolved-paths',
+        target: 'rejected'
+      })
+    ).toEqual({
+      description: 'Save them to disk first, then drop the saved files.',
+      title: "Orca couldn't read a path for the dropped files."
+    })
+  })
+})
diff --git a/src/renderer/src/lib/native-file-drop-rejection-message.ts b/src/renderer/src/lib/native-file-drop-rejection-message.ts
new file mode 100644
index 000000000000..9fef5bdb53ca
--- /dev/null
+++ b/src/renderer/src/lib/native-file-drop-rejection-message.ts
@@ -0,0 +1,60 @@
+import { translate } from '@/i18n/i18n'
+import {
+  NATIVE_FILE_DROP_MAX_PATHS,
+  type NativeFileDropRejectedPayload
+} from '../../../shared/native-file-drop'
+import { describeDropTempCopyFailure } from './drop-temp-copy-failure-copy'
+
+export function getNativeFileDropRejectionMessage(data: NativeFileDropRejectedPayload): {
+  description: string
+  title: string
+} {
+  if (data.reason === 'temp-copy-failed') {
+    return {
+      description: describeDropTempCopyFailure(data.commonReason),
+      title: translate(
+        'auto.hooks.useGlobalFileDrop.nativeDropTempCopyFailed',
+        "Orca couldn't copy {{count}} dropped files.",
+        { count: data.pathCount }
+      )
+    }
+  }
+
+  if (data.reason === 'unresolved-paths') {
+    return {
+      description: translate(
+        'auto.hooks.useGlobalFileDrop.nativeDropUnresolvedPathsDescription',
+        'Save them to disk first, then drop the saved files.'
+      ),
+      title: translate(
+        'auto.hooks.useGlobalFileDrop.nativeDropUnresolvedPaths',
+        "Orca couldn't read a path for the dropped files."
+      )
+    }
+  }
+
+  if (data.reason === 'too-many-paths') {
+    return {
+      description: translate(
+        'auto.hooks.useGlobalFileDrop.nativeDropTooManyPathsDescription',
+        'Drop {{value0}} or fewer files at a time.',
+        { value0: NATIVE_FILE_DROP_MAX_PATHS }
+      ),
+      title: translate(
+        'auto.hooks.useGlobalFileDrop.nativeDropTooManyPaths',
+        'Drop contains too many files.'
+      )
+    }
+  }
+
+  return {
+    description: translate(
+      'auto.hooks.useGlobalFileDrop.nativeDropPathsTooLargeDescription',
+      'Drop fewer files or use a shorter path list.'
+    ),
+    title: translate(
+      'auto.hooks.useGlobalFileDrop.nativeDropPathsTooLarge',
+      'Drop path list is too large.'
+    )
+  }
+}
diff --git a/src/renderer/src/lib/new-agent-prompt-outcome.test.ts b/src/renderer/src/lib/new-agent-prompt-outcome.test.ts
index 3430019ee2b1..15c64725ddfd 100644
--- a/src/renderer/src/lib/new-agent-prompt-outcome.test.ts
+++ b/src/renderer/src/lib/new-agent-prompt-outcome.test.ts
@@ -5,7 +5,7 @@ import type { RuntimeMobileSessionTabsResult } from '../../../shared/runtime-ses
 import type { StructuredAgentSessionLaunchIntent } from '@/lib/launch-structured-agent-session'
 
 const mocks = vi.hoisted(() => ({
-  callStructuredAgentSession: vi.fn(),
+  callRuntimeRpc: vi.fn(),
   createIntent: vi.fn(),
   launch: vi.fn()
 }))
@@ -28,8 +28,15 @@ vi.mock('@/runtime/local-structured-session-tabs-sync', () => ({
   refreshLocalStructuredSessionTabs: vi.fn()
 }))
 
+vi.mock('@/runtime/runtime-rpc-client', () => ({
+  callRuntimeRpc: mocks.callRuntimeRpc,
+  ensureRuntimeEnvironmentCompatible: vi.fn(async () => undefined)
+}))
+
 vi.mock('@/runtime/structured-agent-session-client', () => ({
-  callStructuredAgentSession: mocks.callStructuredAgentSession
+  // Sends reach the runtime RPC through this wrapper, as in the app.
+  callStructuredAgentSession: (target: unknown, method: string, params?: unknown) =>
+    mocks.callRuntimeRpc(target, method, params)
 }))
 
 vi.mock('@/store', () => ({
@@ -52,10 +59,12 @@ vi.mock('@/lib/agent-catalog', () => ({
 
 import { StructuredAgentSessionCreateRefusalError } from '@/lib/launch-structured-agent-session'
 import { refreshLocalStructuredSessionTabs } from '@/runtime/local-structured-session-tabs-sync'
+import { resetStructuredAgentSessionSendsForTests } from '@/components/native-chat/structured-agent-session-message-sender'
 import {
-  mutateStructuredAgentSessionLaunchPrompt,
-  readOutbox
-} from '@/components/native-chat/structured-agent-session-outbox-storage'
+  clearNativeChatDraftCacheForTests,
+  readNativeChatDraftCache
+} from '@/components/native-chat/native-chat-draft-cache'
+import { structuredAgentSessionDraftScopeKey } from '@/components/native-chat/native-chat-composer-draft-store'
 import {
   cancelStructuredAgentLaunch,
   getStructuredAgentSessionLaunchLifecycle,
@@ -124,25 +133,27 @@ async function settle(): Promise<void> {
 const chat = launchIntent('session-notes')
 
 /** What the notes menu does with a "New agent" pick: the launch, then the hold on its outcome. */
-function sendNotesToNewAgent(options: { paired?: boolean } = {}) {
+function sendNotesToNewAgent() {
   const onDelivered = vi.fn()
   const launch = startStructuredAgentLaunch(WORKTREE_ID, 'codex', {
     requestId: 'request-1',
     prompt: NOTES,
-    promptDelivery: 'submit-after-ready'
+    promptDelivery: 'submit-after-ready',
+    // The notes keep their text until it goes out, as the notes menu's launch says.
+    promptKeptByCaller: true
   })
   holdNotesForSend(
     ['note-a'],
-    newAgentPromptOutcome({
-      prompt: NOTES,
-      ...(options.paired ? {} : { sessionId: launch.sessionId }),
-      delivery: launch.promptDeliveryResult!
-    }),
+    newAgentPromptOutcome({ delivery: launch.promptDeliveryResult! }),
     onDelivered
   )
   return { launch, onDelivered }
 }
 
+function sentMessages(): unknown[] {
+  return mocks.callRuntimeRpc.mock.calls.filter(([, method]) => method === 'agentSession.send')
+}
+
 /** A start the host refused outright: the chat shows it failed, with Retry. */
 async function failTheStart(): Promise<void> {
   await settle()
@@ -156,9 +167,11 @@ describe('notes sent to a new agent', () => {
     resetStructuredAgentLaunchPersistenceForTests()
     resetStructuredAgentLaunchRegistryForTests()
     resetNotesInFlightForTests()
+    resetStructuredAgentSessionSendsForTests()
+    clearNativeChatDraftCacheForTests()
     mocks.createIntent.mockReturnValue(chat)
     vi.mocked(refreshLocalStructuredSessionTabs).mockResolvedValue([published(chat.sessionId)])
-    mocks.callStructuredAgentSession.mockResolvedValue({
+    mocks.callRuntimeRpc.mockResolvedValue({
       ok: true,
       value: { submission: { dispatchState: 'accepted' } }
     })
@@ -169,37 +182,62 @@ describe('notes sent to a new agent', () => {
     const { onDelivered } = sendNotesToNewAgent()
     expect(isNoteInFlight('note-a')).toBe(true)
 
-    await settle()
-
-    expect(onDelivered).toHaveBeenCalledOnce()
+    await vi.waitFor(() => expect(onDelivered).toHaveBeenCalledOnce())
     expect(isNoteInFlight('note-a')).toBe(false)
   })
 
-  it('stay held, not resendable, while a failed chat keeps them for its Retry', async () => {
+  // One owner of the text: the notes keep it until it goes out, so the new chat's composer never
+  // gets a copy to send a second time.
+  it("come back to the shelf, never into the new chat's composer, when the host refuses them", async () => {
+    mocks.launch.mockResolvedValue({ sessionId: chat.sessionId, fence: 1 })
+    mocks.callRuntimeRpc.mockResolvedValue({
+      ok: false,
+      refusal: { code: 'agent_session_checkpoint_stale', message: 'stale' }
+    })
+    const { onDelivered } = sendNotesToNewAgent()
+
+    await vi.waitFor(() => expect(isNoteInFlight('note-a')).toBe(false))
+    expect(onDelivered).not.toHaveBeenCalled()
+    expect(readNativeChatDraftCache(structuredAgentSessionDraftScopeKey(chat.sessionId))).toBe('')
+  })
+
+  // The notes own the text, so they are the one place that says it did not go.
+  it('report the refusal once, as a send to a chat does', async () => {
+    mocks.launch.mockResolvedValue({ sessionId: chat.sessionId, fence: 1 })
+    mocks.callRuntimeRpc.mockResolvedValue({
+      ok: false,
+      refusal: { code: 'agent_session_checkpoint_stale', message: 'stale' }
+    })
+    const { launch } = sendNotesToNewAgent()
+    await expect(
+      newAgentPromptOutcome({ delivery: launch.promptDeliveryResult! })
+    ).resolves.toEqual({
+      delivered: false,
+      failure: { status: 'not-writable', code: 'session-send-refused' }
+    })
+  })
+
+  it("come back to the shelf when the start fails, and only there, not in that chat's composer", async () => {
     mocks.launch.mockRejectedValue(new StructuredAgentSessionCreateRefusalError('unsupported'))
     const { onDelivered } = sendNotesToNewAgent()
     await failTheStart()
 
-    expect(readOutbox(chat.sessionId)).toHaveLength(1)
-    expect(isNoteInFlight('note-a')).toBe(true)
+    expect(isNoteInFlight('note-a')).toBe(false)
     expect(onDelivered).not.toHaveBeenCalled()
+    expect(readNativeChatDraftCache(structuredAgentSessionDraftScopeKey(chat.sessionId))).toBe('')
+    expect(sentMessages()).toHaveLength(0)
   })
 
-  it("leave the shelf when that chat's Retry delivers them", async () => {
+  it("are not sent again by that chat's Retry", async () => {
     mocks.launch.mockRejectedValueOnce(new StructuredAgentSessionCreateRefusalError('unsupported'))
-    const { onDelivered } = sendNotesToNewAgent()
+    sendNotesToNewAgent()
     await failTheStart()
     mocks.launch.mockResolvedValue({ sessionId: chat.sessionId, fence: 1 })
 
     expect(retryStructuredAgentSessionLaunch(WORKTREE_ID, chat.sessionId)).toBe(true)
     await settle()
-    // The open chat's own send accepts the staged prompt, as every dispatch does.
-    const [entry] = readOutbox(chat.sessionId)
-    mutateStructuredAgentSessionLaunchPrompt(chat.sessionId, entry.clientMessageId, () => null)
-    await settle()
 
-    expect(onDelivered).toHaveBeenCalledOnce()
-    expect(isNoteInFlight('note-a')).toBe(false)
+    expect(sentMessages()).toHaveLength(0)
   })
 
   it('come back to the shelf when the failed chat is closed', async () => {
@@ -224,12 +262,40 @@ describe('notes sent to a new agent', () => {
     expect(isNoteInFlight('note-a')).toBe(false)
     expect(onDelivered).not.toHaveBeenCalled()
   })
+})
 
-  it("stay held by a paired server's failed chat, found once its start settles", async () => {
-    mocks.launch.mockRejectedValue(new StructuredAgentSessionCreateRefusalError('unsupported'))
-    sendNotesToNewAgent({ paired: true })
-    await failTheStart()
+describe('why notes sent to a new agent did not go', () => {
+  it.each([
+    [
+      'nobody could confirm it',
+      { delivered: false, failureNotified: false, unconfirmed: true as const },
+      { status: 'unconfirmed', code: 'runtime-unverifiable' }
+    ],
+    [
+      "the chat's one send was taken",
+      { delivered: false, failureNotified: false, busy: true as const },
+      { status: 'not-ready', code: 'session-send-refused' }
+    ],
+    [
+      'the host refused it',
+      { delivered: false, failureNotified: false },
+      { status: 'not-writable', code: 'session-send-refused' }
+    ]
+  ])('says so once when %s', async (_why, result, failure) => {
+    await expect(newAgentPromptOutcome({ delivery: Promise.resolve(result) })).resolves.toEqual({
+      delivered: false,
+      failure
+    })
+  })
 
-    expect(isNoteInFlight('note-a')).toBe(true)
+  it('leaves a failure the new chat already shows to that chat', async () => {
+    await expect(
+      newAgentPromptOutcome({
+        delivery: Promise.resolve({ delivered: false, failureNotified: true })
+      })
+    ).resolves.toEqual({ delivered: false })
+    await expect(
+      newAgentPromptOutcome({ delivery: Promise.reject(new Error('start failed')) })
+    ).resolves.toEqual({ delivered: false })
   })
 })
diff --git a/src/renderer/src/lib/new-agent-prompt-outcome.ts b/src/renderer/src/lib/new-agent-prompt-outcome.ts
index 8fff9022213c..d33c7cccb933 100644
--- a/src/renderer/src/lib/new-agent-prompt-outcome.ts
+++ b/src/renderer/src/lib/new-agent-prompt-outcome.ts
@@ -1,62 +1,36 @@
-import type { StructuredAgentSessionOutboxEntry } from '../../../shared/structured-agent-session-outbox'
-import { getStructuredAgentSessionOutbox } from '@/components/native-chat/structured-agent-session-outbox-storage'
-import { watchStructuredAgentSessionOutboxEntry } from '@/components/native-chat/structured-agent-session-outbox-entry-watch'
-import { structuredLaunchStates } from './structured-agent-session-launch-registry'
+import type { ActiveAgentNotesSendResult } from './active-agent-note-send-result'
+import type { StructuredPromptDeliveryResult } from './structured-agent-session-launch-prompt'
 
-export type NewAgentPromptOutcome = { delivered: boolean }
+/** `delivered`: the notes' text reached the new chat, sent or waiting in its composer, so the notes
+ *  let go of it. `failure`: why it did not, for the one report the notes' sender makes; absent
+ *  when the chat already shows it (a start that failed, a cancelled launch). */
+export type NewAgentPromptOutcome = { delivered: boolean; failure?: ActiveAgentNotesSendResult }
 
-function stagedLaunchPrompt(
-  sessionId: string,
-  text: string
-): StructuredAgentSessionOutboxEntry | undefined {
-  return getStructuredAgentSessionOutbox(sessionId).findLast(
-    (entry) =>
-      entry.source === 'launch' &&
-      entry.body.blocks.some((block) => block.type === 'text' && block.text === text)
-  )
-}
-
-/** A failed or unconfirmed chat keeps its prompt staged for its own Retry or re-check. */
-function stagedInAnyLaunch(text: string): StructuredAgentSessionOutboxEntry | undefined {
-  let found: StructuredAgentSessionOutboxEntry | undefined
-  for (const state of structuredLaunchStates()) {
-    found = stagedLaunchPrompt(state.intent.sessionId, text) ?? found
+function notesFailure(
+  result: Pick<StructuredPromptDeliveryResult, 'unconfirmed' | 'busy'>
+): ActiveAgentNotesSendResult {
+  if (result.unconfirmed) {
+    return { status: 'unconfirmed', code: 'runtime-unverifiable' }
   }
-  return found
+  return result.busy
+    ? { status: 'not-ready', code: 'session-send-refused' }
+    : { status: 'not-writable', code: 'session-send-refused' }
 }
 
-function outcomeOf(entry: StructuredAgentSessionOutboxEntry): Promise<NewAgentPromptOutcome> {
-  return new Promise((resolve) => {
-    watchStructuredAgentSessionOutboxEntry(entry, (removal) =>
-      resolve({ delivered: removal === 'spent' })
-    )
-  })
-}
-
-/**
- * Settles once a new agent's prompt is sent on (delivered) or thrown away with its chat. A chat's
- * staged prompt is the authority, so a Retry or re-check that sends it later still counts, and a
- * failed start does not hand the text back while that chat still holds it.
- */
+/** Settles once a new agent's prompt reached its host or its composer, or did not: a start that
+ *  failed shows its own failure in the new chat. */
 export function newAgentPromptOutcome(args: {
-  prompt: string
-  sessionId?: string
-  delivery: Promise<{ delivered: boolean }>
+  delivery: Promise<
+    Pick<StructuredPromptDeliveryResult, 'delivered'> & Partial<StructuredPromptDeliveryResult>
+  >
 }): Promise<NewAgentPromptOutcome> {
-  const text = args.prompt.trim()
-  const staged = args.sessionId ? stagedLaunchPrompt(args.sessionId, text) : undefined
-  if (staged) {
-    return outcomeOf(staged)
-  }
-  // A paired server's chat exists only once it is admitted, so look again after the start.
-  const afterStart = (
-    delivered: boolean
-  ): Promise<NewAgentPromptOutcome> | NewAgentPromptOutcome => {
-    const kept = delivered ? undefined : stagedInAnyLaunch(text)
-    return kept ? outcomeOf(kept) : { delivered }
-  }
   return args.delivery.then(
-    (result) => afterStart(result.delivered),
-    () => afterStart(false)
+    (result) =>
+      result.delivered || result.inComposer
+        ? { delivered: true }
+        : result.failureNotified
+          ? { delivered: false }
+          : { delivered: false, failure: notesFailure(result) },
+    () => ({ delivered: false })
   )
 }
diff --git a/src/renderer/src/lib/open-document-in-floating-workspace.ts b/src/renderer/src/lib/open-document-in-floating-workspace.ts
index 2236dc81e3b5..36a4a5904a83 100644
--- a/src/renderer/src/lib/open-document-in-floating-workspace.ts
+++ b/src/renderer/src/lib/open-document-in-floating-workspace.ts
@@ -11,7 +11,7 @@ import { detectLanguage } from './language-detect'
  */
 export function openDocumentInFloatingWorkspace(
   openFile: EditorFilesSlice['openFile'],
-  document: FileDocument,
+  document: Pick<FileDocument, 'filePath' | 'relativePath'>,
   options: { targetGroupId?: string } = {}
 ): string {
   return openFile(
diff --git a/src/renderer/src/lib/os-file-drop-preload-integration.test.tsx b/src/renderer/src/lib/os-file-drop-preload-integration.test.tsx
index b337007865ab..10e52caf4424 100644
--- a/src/renderer/src/lib/os-file-drop-preload-integration.test.tsx
+++ b/src/renderer/src/lib/os-file-drop-preload-integration.test.tsx
@@ -16,7 +16,6 @@ vi.mock('electron', () => ({
   webUtils: { getPathForFile: electron.getPathForFile }
 }))
 
-import { installNativeFileDropHandlers } from '../../../preload/preload-runtime-support'
 import { createOsFileDropSequence, useOsFileDropOwner } from '../hooks/use-os-file-drop-owner'
 import { installOsFileDropCancellationGuard } from './os-file-drop-cancellation-guard'
 
@@ -25,11 +24,9 @@ const prepareDroppedPaths = vi.fn(
 )
 
 function OwnerProbe({
-  onDrop,
-  legacyChild = false
+  onDrop
 }: {
   onDrop: (prepared: PreparedDroppedPaths) => void
-  legacyChild?: boolean
 }): React.JSX.Element {
   const ownerElementRef = useRef<HTMLElement | null>(null)
   const [sequence] = useState(createOsFileDropSequence)
@@ -40,10 +37,7 @@ function OwnerProbe({
   })
   return (
     <div ref={attach}>
-      <span
-        data-testid="target"
-        data-native-file-drop-target={legacyChild ? 'composer' : undefined}
-      />
+      <span data-testid="target" />
     </div>
   )
 }
@@ -71,8 +65,15 @@ function drag(
 
 let disposeGuard: (() => void) | null = null
 
-beforeAll(() => {
-  installNativeFileDropHandlers()
+beforeAll(async () => {
+  // Exercise the stacked base's preload setup when replaying this regression.
+  const preload = await import('../../../preload/preload-runtime-support')
+  if (
+    'installNativeFileDropHandlers' in preload &&
+    typeof preload.installNativeFileDropHandlers === 'function'
+  ) {
+    preload.installNativeFileDropHandlers()
+  }
 })
 
 beforeEach(() => {
@@ -92,20 +93,23 @@ afterEach(() => {
 })
 
 describe('preload and renderer file drop guard', () => {
-  it('preserves preload copy acceptance and one IPC delivery on unmarked chrome', () => {
+  it('refuses unowned chrome without opening, uploading, or showing a toast', async () => {
     const target = document.createElement('div')
     document.body.append(target)
     const hover = drag(target, 'dragover')
     expect(hover.event.defaultPrevented).toBe(true)
-    expect(hover.transfer.dropEffect).toBe('copy')
+    expect(hover.transfer.dropEffect).toBe('none')
 
-    drag(target, 'drop')
-    expect(electron.send).toHaveBeenCalledOnce()
-    expect(electron.send.mock.calls[0][0]).toBe('terminal:file-dropped-from-preload')
+    const dropped = drag(target, 'drop')
+    await act(async () => undefined)
+    expect(dropped.event.defaultPrevented).toBe(true)
+    expect(dropped.transfer.dropEffect).toBe('none')
+    expect(electron.send).not.toHaveBeenCalled()
+    expect(electron.getPathForFile).not.toHaveBeenCalled()
     expect(prepareDroppedPaths).not.toHaveBeenCalled()
   })
 
-  it('lets a migrated owner claim the real event and keep the copy cursor', async () => {
+  it('lets a registered owner claim the real event and keep the copy cursor', async () => {
     const onDrop = vi.fn()
     const view = render(<OwnerProbe onDrop={onDrop} />)
     const target = view.getByTestId('target')
@@ -123,16 +127,4 @@ describe('preload and renderer file drop guard', () => {
       failures: []
     })
   })
-
-  it('keeps a legacy child as a barrier inside a migrated owner', () => {
-    const onDrop = vi.fn()
-    const view = render(<OwnerProbe onDrop={onDrop} legacyChild />)
-    const target = view.getByTestId('target')
-    const hover = drag(target, 'dragover')
-    expect(hover.transfer.dropEffect).toBe('copy')
-    drag(target, 'drop')
-    expect(electron.send).toHaveBeenCalledOnce()
-    expect(prepareDroppedPaths).not.toHaveBeenCalled()
-    expect(onDrop).not.toHaveBeenCalled()
-  })
 })
diff --git a/src/renderer/src/lib/pane-manager/pane-display-visibility.ts b/src/renderer/src/lib/pane-manager/pane-display-visibility.ts
index 7c7fc7f637b1..6a0746d7053b 100644
--- a/src/renderer/src/lib/pane-manager/pane-display-visibility.ts
+++ b/src/renderer/src/lib/pane-manager/pane-display-visibility.ts
@@ -2,6 +2,10 @@ import type { ManagedPane, ManagedPaneInternal } from './pane-manager-types'
 
 export function isManagedPaneDisplayNone(pane: ManagedPane): boolean {
   const element = (pane as ManagedPaneInternal).xtermContainer ?? pane.container
+  return isElementDisplayNone(element)
+}
+
+export function isElementDisplayNone(element: HTMLElement | null | undefined): boolean {
   const view = element?.ownerDocument?.defaultView
   if (!element || !view) {
     return false
diff --git a/src/renderer/src/lib/pane-manager/pane-manager-pane-creation.ts b/src/renderer/src/lib/pane-manager/pane-manager-pane-creation.ts
index 129685726da4..b86a28fe054f 100644
--- a/src/renderer/src/lib/pane-manager/pane-manager-pane-creation.ts
+++ b/src/renderer/src/lib/pane-manager/pane-manager-pane-creation.ts
@@ -30,7 +30,7 @@ export function createInitialManagedPane(
     focusPanePreservingOverlays(pane)
   }
 
-  host.publishPaneCreated(pane)
+  host.publishPaneCreated(pane, { placement: { kind: 'new-tab' } })
   return toPublicPane(pane)
 }
 
diff --git a/src/renderer/src/lib/pane-manager/pane-manager-spawn-placement.test.ts b/src/renderer/src/lib/pane-manager/pane-manager-spawn-placement.test.ts
new file mode 100644
index 000000000000..348cbb1e5a9b
--- /dev/null
+++ b/src/renderer/src/lib/pane-manager/pane-manager-spawn-placement.test.ts
@@ -0,0 +1,95 @@
+// @vitest-environment happy-dom
+import { afterEach, beforeEach, describe, expect, it, vi, type Mock } from 'vitest'
+import type { PaneManagerOptions } from './pane-manager-types'
+import { serializePaneTree } from '@/components/terminal-pane/layout-serialization'
+
+// Why: happy-dom has no canvas, so xterm cannot open; placement never touches the terminal.
+vi.mock('./pane-lifecycle', async (importOriginal) => {
+  const actual: object = await importOriginal()
+  return { ...actual, openTerminal: vi.fn() }
+})
+
+const { PaneManager } = await import('./pane-manager')
+
+const LEAF_A = '11111111-1111-4111-8111-111111111111'
+const LEAF_B = '22222222-2222-4222-8222-222222222222'
+const LEAF_C = '33333333-3333-4333-8333-333333333333'
+
+describe('PaneManager spawn placement hints', () => {
+  let root: HTMLDivElement
+  let onPaneCreated: Mock<NonNullable<PaneManagerOptions['onPaneCreated']>>
+  let manager: InstanceType<typeof PaneManager>
+
+  beforeEach(() => {
+    vi.stubGlobal('requestAnimationFrame', () => 1)
+    vi.stubGlobal('cancelAnimationFrame', () => {})
+    root = document.createElement('div')
+    document.body.appendChild(root)
+    onPaneCreated = vi.fn()
+    manager = new PaneManager(root, { linkOpenHint: () => '', onPaneCreated })
+  })
+
+  afterEach(() => {
+    manager.destroy()
+    root.remove()
+    vi.unstubAllGlobals()
+  })
+
+  it('marks a tab first pane as a new tab', () => {
+    const pane = manager.createInitialPane({ leafId: LEAF_A })
+
+    expect(onPaneCreated).toHaveBeenCalledExactlyOnceWith(
+      expect.objectContaining({ id: pane.id, leafId: LEAF_A }),
+      { placement: { kind: 'new-tab' } }
+    )
+  })
+
+  it('names the split pane and direction alongside the other spawn hints', () => {
+    const first = manager.createInitialPane({ leafId: LEAF_A })
+    onPaneCreated.mockClear()
+
+    manager.splitPane(first.id, 'horizontal', { leafId: LEAF_B, cwd: '/repo/app' })
+
+    expect(onPaneCreated).toHaveBeenCalledExactlyOnceWith(
+      expect.objectContaining({ leafId: LEAF_B }),
+      {
+        cwd: '/repo/app',
+        placement: { kind: 'split', parentLeafId: LEAF_A, direction: 'horizontal' }
+      }
+    )
+  })
+
+  it('publishes a split placed before a mounted subtree with its final order', () => {
+    const first = manager.createInitialPane({ leafId: LEAF_A })
+    manager.splitPane(first.id, 'vertical', { leafId: LEAF_B })
+    const treesAtCreation: unknown[] = []
+    onPaneCreated.mockReset().mockImplementation(() => {
+      const top = root.firstElementChild
+      treesAtCreation.push(top instanceof HTMLElement ? serializePaneTree(top) : null)
+    })
+
+    manager.splitPaneAroundLeafIds([LEAF_A, LEAF_B], first.id, 'horizontal', {
+      leafId: LEAF_C,
+      placement: 'before'
+    })
+
+    expect(onPaneCreated).toHaveBeenCalledExactlyOnceWith(
+      expect.objectContaining({ leafId: LEAF_C }),
+      { placement: { kind: 'split', parentLeafId: LEAF_A, direction: 'horizontal' } }
+    )
+    // The pane-created handler serializes proposedRoot from the DOM, so the order must be final then.
+    expect(treesAtCreation).toEqual([
+      {
+        type: 'split',
+        direction: 'horizontal',
+        first: { type: 'leaf', leafId: LEAF_C },
+        second: {
+          type: 'split',
+          direction: 'vertical',
+          first: { type: 'leaf', leafId: LEAF_A },
+          second: { type: 'leaf', leafId: LEAF_B }
+        }
+      }
+    ])
+  })
+})
diff --git a/src/renderer/src/lib/pane-manager/pane-manager-types.ts b/src/renderer/src/lib/pane-manager/pane-manager-types.ts
index 80531b7fecf7..30fe50108445 100644
--- a/src/renderer/src/lib/pane-manager/pane-manager-types.ts
+++ b/src/renderer/src/lib/pane-manager/pane-manager-types.ts
@@ -9,6 +9,7 @@ import type { WebglAddon } from '@xterm/addon-webgl'
 import type { SerializeAddon } from '@xterm/addon-serialize'
 import type { GlobalSettings } from '../../../../shared/global-settings-types'
 import type { TerminalLeafId } from '../../../../shared/stable-pane-id'
+import type { TerminalPanePlacement } from '../../../../shared/terminal-pane-placement'
 import type { PaneLayoutEditIntent } from '../../../../shared/rpc-contract/session-tabs-schemas-params'
 import type { TerminalWebglAutoDecision } from './terminal-webgl-auto-policy'
 
@@ -26,9 +27,11 @@ export type PaneSpawnHints = {
   cwd?: string
   cwdPromise?: Promise<string>
   ptyId?: string
+  /** Where the pane's leaf sits; main reads it only for a leaf it does not know yet. */
+  placement?: TerminalPanePlacement
 }
 
-export type PaneSplitOptions = PaneSpawnHints & {
+export type PaneSplitOptions = Omit<PaneSpawnHints, 'placement'> & {
   ratio?: number
   leafId?: string
 }
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 93c4a67f97b7..d335ce829a46 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
@@ -72,7 +72,7 @@ describe.each(['initial', 'active'] as const)('%s pane focus', (operation) => {
   function focus(f: ReturnType<typeof fixture>, requested = true) {
     if (operation === 'initial') {
       createInitialManagedPane(f.host, { focus: requested })
-      expect(f.publishPaneCreated).toHaveBeenCalledWith(f.pane)
+      expect(f.publishPaneCreated).toHaveBeenCalledWith(f.pane, { placement: { kind: 'new-tab' } })
     } else {
       f.root.append(f.container)
       f.manager.setActivePane(f.pane.id, { focus: requested })
diff --git a/src/renderer/src/lib/pane-manager/pane-split-close.test.ts b/src/renderer/src/lib/pane-manager/pane-split-close.test.ts
index 098c5eb2c15e..cd3b728cd24d 100644
--- a/src/renderer/src/lib/pane-manager/pane-split-close.test.ts
+++ b/src/renderer/src/lib/pane-manager/pane-split-close.test.ts
@@ -156,7 +156,10 @@ describe('splitManagedPane', () => {
     expect(result?.id).toBe(newPane.id)
     expect(setActivePaneId).toHaveBeenCalledWith(newPane.id)
     expect(newPane.terminal.focus).toHaveBeenCalledOnce()
-    expect(publishPaneCreated).toHaveBeenCalledWith(newPane, { cwdPromise })
+    expect(publishPaneCreated).toHaveBeenCalledWith(newPane, {
+      cwdPromise,
+      placement: { kind: 'split', parentLeafId: existingPane.leafId, direction: 'vertical' }
+    })
   })
 
   it('prepares every pane under a moved mounted subtree for split reparenting', () => {
@@ -213,7 +216,7 @@ describe('splitManagedPane', () => {
       newPane.container,
       true,
       expect.anything(),
-      undefined
+      { ratio: undefined, newPaneFirst: undefined }
     )
     expect(scheduleSplitScrollRestore).toHaveBeenCalledTimes(2)
     expect(scheduleSplitScrollRestore).toHaveBeenNthCalledWith(
diff --git a/src/renderer/src/lib/pane-manager/pane-split-close.ts b/src/renderer/src/lib/pane-manager/pane-split-close.ts
index 37ccf92b385d..6cf53fe9a2df 100644
--- a/src/renderer/src/lib/pane-manager/pane-split-close.ts
+++ b/src/renderer/src/lib/pane-manager/pane-split-close.ts
@@ -34,6 +34,8 @@ type SplitManagedPaneArgs = {
   direction: 'vertical' | 'horizontal'
   opts?: PaneSplitOptions
   sourceContainer?: HTMLElement
+  /** Before publishing, so the pane-created tree already has the final order. */
+  newPaneFirst?: boolean
   panes: Map<number, ManagedPaneInternal>
   root: HTMLElement
   styleOptions: PaneStyleOptions
@@ -65,9 +67,12 @@ export function splitManagedPane(args: SplitManagedPaneArgs): ManagedPane | null
 
   const movedPaneStates = prepareMovedPanesForSplit(existingContainer, existing, args.panes)
 
-  wrapInSplit(existingContainer, newPane.container, isVertical, divider, args.opts)
+  wrapInSplit(existingContainer, newPane.container, isVertical, divider, {
+    ratio: args.opts?.ratio,
+    newPaneFirst: args.newPaneFirst
+  })
   args.setActivePaneId(newPane.id)
-  openSplitPane(args, newPane, args.opts?.cwd)
+  openSplitPane(args, newPane, existing.leafId, args.opts?.cwd)
 
   for (const movedPaneState of movedPaneStates) {
     scheduleSplitScrollRestore(
@@ -139,6 +144,7 @@ function findManagedPanesInContainer(
 function openSplitPane(
   args: SplitManagedPaneArgs,
   newPane: ManagedPaneInternal,
+  parentLeafId: string,
   cwd?: string
 ): void {
   openTerminal(newPane, {
@@ -151,12 +157,17 @@ function openSplitPane(
   updateMultiPaneState(args.getDragCallbacks())
   // Why: forward one-shot spawn/adoption hints so the new pane inherits the
   // source cwd for local splits or attaches a runtime-spawned PTY for web splits.
-  const spawnHints = {
+  args.publishPaneCreated(newPane, {
     ...(cwd ? { cwd } : {}),
     ...(args.opts?.cwdPromise ? { cwdPromise: args.opts.cwdPromise } : {}),
-    ...(args.opts?.ptyId ? { ptyId: args.opts.ptyId } : {})
-  }
-  args.publishPaneCreated(newPane, Object.keys(spawnHints).length > 0 ? spawnHints : undefined)
+    ...(args.opts?.ptyId ? { ptyId: args.opts.ptyId } : {}),
+    placement: {
+      kind: 'split',
+      parentLeafId,
+      direction: args.direction,
+      ...(args.opts?.ratio !== undefined ? { ratio: args.opts.ratio } : {})
+    }
+  })
   args.managerOptions.onLayoutChanged?.()
 }
 
diff --git a/src/renderer/src/lib/pane-manager/pane-subtree-split.ts b/src/renderer/src/lib/pane-manager/pane-subtree-split.ts
index 37e75cfd3e64..e6be21fae506 100644
--- a/src/renderer/src/lib/pane-manager/pane-subtree-split.ts
+++ b/src/renderer/src/lib/pane-manager/pane-subtree-split.ts
@@ -47,11 +47,12 @@ export function splitPaneAroundMountedSubtree(
   if (!sourceContainer) {
     return null
   }
-  const createdPane = splitManagedPane({
+  return splitManagedPane({
     paneId: args.fallbackPaneId,
     direction: args.direction,
     opts: args.opts,
     sourceContainer,
+    newPaneFirst: args.opts?.placement === 'before',
     panes: args.panes,
     root: args.root,
     styleOptions: args.styleOptions,
@@ -63,15 +64,6 @@ export function splitPaneAroundMountedSubtree(
     setActivePaneId: args.setActivePaneId,
     isDestroyed: args.isDestroyed
   })
-  if (!createdPane || args.opts?.placement !== 'before') {
-    return createdPane
-  }
-
-  const createdInternal = args.panes.get(createdPane.id)
-  if (createdInternal) {
-    placeCreatedPaneBeforeSource(sourceContainer, createdInternal.container)
-  }
-  return createdPane
 }
 
 function findMountedSubtreeContainer(
@@ -125,23 +117,3 @@ function setsEqual(left: ReadonlySet<string>, right: ReadonlySet<string>): boole
   }
   return true
 }
-
-function placeCreatedPaneBeforeSource(
-  sourceContainer: HTMLElement,
-  createdContainer: HTMLElement
-): boolean {
-  const split = createdContainer.parentElement
-  if (!split || sourceContainer.parentElement !== split) {
-    return false
-  }
-  const divider = Array.from(split.children).find(
-    (child): child is HTMLElement =>
-      child instanceof HTMLElement && child.classList.contains('pane-divider')
-  )
-  if (!divider) {
-    return false
-  }
-
-  split.replaceChildren(createdContainer, divider, sourceContainer)
-  return true
-}
diff --git a/src/renderer/src/lib/pane-manager/pane-tree-ops.ts b/src/renderer/src/lib/pane-manager/pane-tree-ops.ts
index 778adfb6c15e..6b435177d2b0 100644
--- a/src/renderer/src/lib/pane-manager/pane-tree-ops.ts
+++ b/src/renderer/src/lib/pane-manager/pane-tree-ops.ts
@@ -245,14 +245,14 @@ export function removeDividers(parent: HTMLElement): void {
 
 /**
  * Create a flex split wrapper that replaces `existingContainer` in the DOM,
- * then places [existing] [divider] [new] inside it.
+ * then places [existing] [divider] [new] inside it ([new] first when `newPaneFirst`).
  */
 export function wrapInSplit(
   existingContainer: HTMLElement,
   newContainer: HTMLElement,
   isVertical: boolean,
   divider: HTMLElement,
-  opts?: { ratio?: number }
+  opts?: { ratio?: number; newPaneFirst?: boolean }
 ): void {
   const parent = existingContainer.parentElement
   if (!parent) {
@@ -292,7 +292,9 @@ export function wrapInSplit(
 
   // Replace existing with split in the DOM, then build children
   parent.replaceChild(split, existingContainer)
-  split.appendChild(existingContainer)
-  split.appendChild(divider)
-  split.appendChild(newContainer)
+  if (opts?.newPaneFirst) {
+    split.append(newContainer, divider, existingContainer)
+  } else {
+    split.append(existingContainer, divider, newContainer)
+  }
 }
diff --git a/src/renderer/src/lib/remark-github-callouts.ts b/src/renderer/src/lib/remark-github-callouts.ts
new file mode 100644
index 000000000000..79e6345c3bd3
--- /dev/null
+++ b/src/renderer/src/lib/remark-github-callouts.ts
@@ -0,0 +1,62 @@
+import type { Blockquote, Nodes, Root } from 'mdast'
+
+const GITHUB_CALLOUT_KINDS = ['note', 'tip', 'important', 'warning', 'caution'] as const
+export type GitHubCalloutKind = (typeof GITHUB_CALLOUT_KINDS)[number]
+
+// rehype-sanitize allowlist entry for <blockquote>; without it the attribute is stripped.
+export const GITHUB_CALLOUT_SANITIZE_ATTRIBUTE: [string, ...string[]] = [
+  'dataCallout',
+  ...GITHUB_CALLOUT_KINDS
+]
+
+// GitHub only reads a marker that has its line to itself: `> [!NOTE] aside` stays a quote.
+const GITHUB_CALLOUT_MARKER = /^\[!([a-z]+)\](?:\r?\n|$)/i
+
+export function readGitHubCalloutKind(value: unknown): GitHubCalloutKind | null {
+  return GITHUB_CALLOUT_KINDS.find((kind) => kind === value) ?? null
+}
+
+function markGitHubCallout(node: Blockquote): void {
+  const paragraph = node.children[0]
+  if (paragraph?.type !== 'paragraph') {
+    return
+  }
+  const text = paragraph.children[0]
+  if (text?.type !== 'text') {
+    return
+  }
+  const match = GITHUB_CALLOUT_MARKER.exec(text.value)
+  const kind = readGitHubCalloutKind(match?.[1]?.toLowerCase())
+  if (!match || !kind) {
+    return
+  }
+
+  const remainder = text.value.slice(match[0].length)
+  if (remainder) {
+    text.value = remainder
+  } else if (match[0].endsWith('\n') || paragraph.children.length === 1) {
+    paragraph.children.shift()
+    if (paragraph.children.length === 0) {
+      node.children.shift()
+    }
+  } else {
+    // `[!NOTE]*aside*`: an inline sibling shares the marker's line.
+    return
+  }
+
+  node.data = { ...node.data, hProperties: { ...node.data?.hProperties, dataCallout: kind } }
+}
+
+function visitGitHubCallouts(node: Nodes): void {
+  if ('children' in node) {
+    node.children.forEach(visitGitHubCallouts)
+  }
+  if (node.type === 'blockquote') {
+    markGitHubCallout(node)
+  }
+}
+
+// Why: must run before remark-breaks, which splits the marker's newline into a break node.
+export function remarkGitHubCallouts(): (tree: Root) => void {
+  return visitGitHubCallouts
+}
diff --git a/src/renderer/src/lib/remote-workspace-drop-test-fixtures.ts b/src/renderer/src/lib/remote-workspace-drop-test-fixtures.ts
new file mode 100644
index 000000000000..9c4d79df251f
--- /dev/null
+++ b/src/renderer/src/lib/remote-workspace-drop-test-fixtures.ts
@@ -0,0 +1,59 @@
+import { useAppStore } from '@/store'
+import { makeWorktree } from '@/store/slices/worktrees-slice-test-fixtures'
+import { getDefaultSettings } from '../../../shared/constants'
+import type { Repo } from '../../../shared/repo-types'
+import type { TabGroup } from '../../../shared/tab-types'
+
+export const SSH_WORKTREE_PATH = '/home/me/wt-ssh'
+export const RUNTIME_WORKTREE_PATH = '/srv/wt-runtime'
+
+function repo(id: string, owner: Pick<Repo, 'connectionId' | 'executionHostId'>): Repo {
+  return { id, path: `/${id}`, displayName: id, badgeColor: '#000', addedAt: 0, ...owner }
+}
+
+function group(id: string, worktreeId: string): TabGroup {
+  return { id, worktreeId, activeTabId: null, tabOrder: [] }
+}
+
+export function sshConnectionStatesAt(
+  generation: number
+): ReturnType<typeof useAppStore.getState>['sshConnectionStates'] {
+  return new Map([
+    [
+      'ssh-1',
+      {
+        targetId: 'ssh-1',
+        status: 'connected',
+        error: null,
+        reconnectAttempt: 0,
+        connectionGeneration: generation
+      }
+    ]
+  ])
+}
+
+/**
+ * Seeds an SSH workspace (`wt-ssh`) and a runtime-owned one (`wt-runtime`) while
+ * another workspace is active and a different runtime is focused.
+ */
+export function seedRemoteDropWorkspaces(): void {
+  useAppStore.setState({
+    activeWorktreeId: 'wt-a',
+    settings: { ...getDefaultSettings('/home/me'), activeRuntimeEnvironmentId: 'focused-runtime' },
+    repos: [
+      repo('repo-ssh', { connectionId: 'ssh-1', executionHostId: 'ssh:ssh-1' }),
+      repo('repo-rt', { connectionId: null, executionHostId: 'runtime:owner-runtime' })
+    ],
+    worktreesByRepo: {
+      'repo-ssh': [makeWorktree({ id: 'wt-ssh', repoId: 'repo-ssh', path: SSH_WORKTREE_PATH })],
+      'repo-rt': [
+        makeWorktree({ id: 'wt-runtime', repoId: 'repo-rt', path: RUNTIME_WORKTREE_PATH })
+      ]
+    },
+    sshConnectionStates: sshConnectionStatesAt(3),
+    groupsByWorktree: {
+      'wt-ssh': [group('group-ssh', 'wt-ssh')],
+      'wt-runtime': [group('group-runtime', 'wt-runtime')]
+    }
+  })
+}
diff --git a/src/renderer/src/lib/resume-sleeping-agent-session-direct-ssh-hydration-gap.test.ts b/src/renderer/src/lib/resume-sleeping-agent-session-direct-ssh-hydration-gap.test.ts
index 0b9404d1da48..7919124e93c2 100644
--- a/src/renderer/src/lib/resume-sleeping-agent-session-direct-ssh-hydration-gap.test.ts
+++ b/src/renderer/src/lib/resume-sleeping-agent-session-direct-ssh-hydration-gap.test.ts
@@ -13,7 +13,7 @@
 import { afterEach, describe, expect, it, vi } from 'vitest'
 import type { SleepingAgentSessionRecord } from '../../../shared/agent-session-resume'
 import { useAppStore } from '@/store'
-import { makeWorktree } from '@/store/slices/store-test-helpers'
+import { makeWorktree } from '../store/slices/worktrees-slice-test-fixtures'
 import { resumeSleepingAgentSessionsForWorktree } from './resume-sleeping-agent-session'
 
 const initialAppStoreState = useAppStore.getState()
diff --git a/src/renderer/src/lib/resume-sleeping-agent-session-execution-host-scope.test.ts b/src/renderer/src/lib/resume-sleeping-agent-session-execution-host-scope.test.ts
index 54b5459a8cf5..c25dab229647 100644
--- a/src/renderer/src/lib/resume-sleeping-agent-session-execution-host-scope.test.ts
+++ b/src/renderer/src/lib/resume-sleeping-agent-session-execution-host-scope.test.ts
@@ -17,7 +17,7 @@ import { afterEach, describe, expect, it } from 'vitest'
 import type { SleepingAgentSessionRecord } from '../../../shared/agent-session-resume'
 import type { ExecutionHostId } from '../../../shared/execution-host'
 import { useAppStore } from '@/store'
-import { makeWorktree, TEST_REPO } from '@/store/slices/store-test-helpers'
+import { makeWorktree, TEST_REPO } from '../store/slices/worktrees-slice-test-fixtures'
 import { resumeSleepingAgentSessionsForWorktree } from './resume-sleeping-agent-session'
 import {
   agentResumeOriginNamesAnotherExecutionHost,
diff --git a/src/renderer/src/lib/run-quick-command-in-new-tab.test.ts b/src/renderer/src/lib/run-quick-command-in-new-tab.test.ts
index f6f850ff0ef6..0a9056796a90 100644
--- a/src/renderer/src/lib/run-quick-command-in-new-tab.test.ts
+++ b/src/renderer/src/lib/run-quick-command-in-new-tab.test.ts
@@ -245,13 +245,7 @@ describe('runQuickCommandInNewTab', () => {
   })
 
   it('records history while a structured agent quick command publishes asynchronously', () => {
-    mocks.launchAgentInNewTab.mockReturnValue({
-      surface: {
-        kind: 'local-agent-session',
-        tabId: 'agent-session:codex-session-1',
-        sessionId: 'codex-session-1'
-      }
-    })
+    mocks.launchAgentInNewTab.mockReturnValue({ surface: { kind: 'host-published' } })
 
     const result = runQuickCommandInNewTab({
       command: {
@@ -266,7 +260,8 @@ describe('runQuickCommandInNewTab', () => {
       historyId: 'runtime:local\u0000agent-review'
     })
 
-    expect(result).toEqual({ tabId: 'agent-session:codex-session-1' })
+    // The chat opens once its host admits it, so there is no tab to hand back yet.
+    expect(result).toBeNull()
     expect(mockState.setRecentQuickCommandForGroup).toHaveBeenCalledWith(
       'group-1',
       'runtime:local\u0000agent-review'
@@ -274,13 +269,7 @@ describe('runQuickCommandInNewTab', () => {
   })
 
   it('uses the active group for structured history when the caller has no group', () => {
-    mocks.launchAgentInNewTab.mockReturnValue({
-      surface: {
-        kind: 'local-agent-session',
-        tabId: 'agent-session:codex-session-1',
-        sessionId: 'codex-session-1'
-      }
-    })
+    mocks.launchAgentInNewTab.mockReturnValue({ surface: { kind: 'host-published' } })
     mockState.activeGroupIdByWorktree['repo::worktree'] = 'active-group'
 
     runQuickCommandInNewTab({
diff --git a/src/renderer/src/lib/run-quick-command-in-new-tab.ts b/src/renderer/src/lib/run-quick-command-in-new-tab.ts
index 99a709c40b0b..4228060d58a8 100644
--- a/src/renderer/src/lib/run-quick-command-in-new-tab.ts
+++ b/src/renderer/src/lib/run-quick-command-in-new-tab.ts
@@ -77,10 +77,7 @@ export function runQuickCommandInNewTab({
       launchSource: 'quick_command',
       quickCommandLabel: command.label
     })
-    if (
-      result?.surface.kind === 'local-terminal' ||
-      result?.surface.kind === 'local-agent-session'
-    ) {
+    if (result?.surface.kind === 'local-terminal') {
       const launchedGroupId = resolveQuickCommandGroupId(worktreeId, result.surface.tabId, groupId)
       if (launchedGroupId) {
         useAppStore.getState().setRecentQuickCommandForGroup(launchedGroupId, historyId)
diff --git a/src/renderer/src/lib/setup-split-activation-single-owner.test.ts b/src/renderer/src/lib/setup-split-activation-single-owner.test.ts
new file mode 100644
index 000000000000..0ac2a9d5f647
--- /dev/null
+++ b/src/renderer/src/lib/setup-split-activation-single-owner.test.ts
@@ -0,0 +1,284 @@
+import path from 'node:path'
+import { afterEach, describe, expect, it, vi } from 'vitest'
+import type { AppState } from '@/store'
+import { useAppStore } from '@/store'
+import { registerTerminalPresentationIpcBridge } from '@/hooks/ipc-events/terminal-presentation-ipc-bridge'
+import { getDefaultSettings } from '../../../shared/constants'
+import type { RuntimeTerminalSummary } from '../../../shared/runtime-types'
+import type { TerminalPaneLayoutNode } from '../../../shared/terminal-tab-types'
+import { activateAndRevealWorktree } from './worktree-activation'
+import { gateWorktreeAgentActivation } from './worktree-agent-activation-gate'
+import { makeCreatedAgentWorktree as makeWorktree } from './worktree-activation-created-agent-test-state'
+
+/**
+ * STA-9417, converted from the natural repro: a host-created worktree whose setup script runs in a
+ * split of the (unmounted) primary tab, then the first activation of that worktree. When main's
+ * split reveal does not reach the window, the activation sweep mints a second tab for the setup
+ * PTY, so two saved panes own one terminal and one of them freezes.
+ */
+
+const initialState = useAppStore.getState()
+const TAB_B = 'b3f1c1de-5e0f-4a51-9d0c-7a8e2a9f6b11'
+const PRIMARY_LEAF = '11111111-1111-4111-8111-111111111111'
+const SETUP_LEAF = '22222222-2222-4222-8222-222222222222'
+
+type CreateTerminalListener = Parameters<Window['api']['ui']['onCreateTerminal']>[0]
+
+function baseState(): Partial<AppState> {
+  const worktree = makeWorktree()
+  return {
+    repos: [
+      {
+        id: worktree.repoId,
+        path: path.join(path.sep, 'workspace', 'repo'),
+        displayName: 'repo',
+        badgeColor: '#000000',
+        addedAt: 0
+      }
+    ],
+    worktreesByRepo: { [worktree.repoId]: [worktree] },
+    activeRepoId: worktree.repoId,
+    activeView: 'terminal',
+    workspaceSessionReady: true,
+    terminalStartupRestorationReady: true,
+    tabsByWorktree: {},
+    ptyIdsByTabId: {},
+    unifiedTabsByWorktree: {},
+    groupsByWorktree: {},
+    layoutByWorktree: {},
+    activeGroupIdByWorktree: {},
+    terminalLayoutsByTabId: {},
+    openFiles: [],
+    browserTabsByWorktree: {},
+    activeFileIdByWorktree: {},
+    activeBrowserTabIdByWorktree: {},
+    activeTabTypeByWorktree: {},
+    activeTabIdByWorktree: {},
+    tabBarOrderByWorktree: {},
+    pendingStartupByTabId: {},
+    automaticAgentResumeClaimsByTabId: {},
+    agentStatusByPaneKey: {},
+    sleepingAgentSessionsByPaneKey: {},
+    settings: {
+      ...getDefaultSettings(path.join(path.sep, 'home')),
+      agentCmdOverrides: {},
+      defaultTuiAgent: 'codex',
+      setupScriptLaunchMode: 'split-vertical'
+    },
+    markWorktreeVisited: vi.fn(),
+    recordWorktreeVisit: vi.fn(),
+    refreshGitHubForWorktreeIfStale: vi.fn(),
+    revealWorktreeInSidebar: vi.fn()
+  }
+}
+
+/** The host's census: both panes are unmounted, so it reports them unowned with their record. */
+function orphanRow(ptyId: string, leafId: string): RuntimeTerminalSummary {
+  const worktree = makeWorktree()
+  return {
+    handle: `handle-${leafId}`,
+    ptyId,
+    orphaned: true,
+    recordedPaneKey: `${TAB_B}:${leafId}`,
+    worktreeId: worktree.id,
+    worktreePath: worktree.path,
+    branch: worktree.branch ?? 'main',
+    tabId: `pty:${ptyId}`,
+    leafId: `pty:${ptyId}`,
+    title: 'Terminal',
+    connected: true,
+    writable: true,
+    lastOutputAt: null,
+    preview: ''
+  }
+}
+
+function stubHost(
+  primaryPtyId: string,
+  setupPtyId: string
+): { reveal: () => CreateTerminalListener } {
+  const worktree = makeWorktree()
+  let listener: CreateTerminalListener | undefined
+  const runtimeCall = vi.fn(async ({ method }: { method: string }) => {
+    if (method === 'session.tabs.list') {
+      return {
+        ok: true,
+        result: {
+          worktree: worktree.id,
+          publicationEpoch: 'sta-9417',
+          snapshotVersion: 1,
+          activeGroupId: null,
+          activeTabId: null,
+          activeTabType: null,
+          tabs: []
+        }
+      }
+    }
+    if (method === 'terminal.list') {
+      return {
+        ok: true,
+        result: {
+          terminals: [orphanRow(primaryPtyId, PRIMARY_LEAF), orphanRow(setupPtyId, SETUP_LEAF)],
+          truncated: false,
+          hostScope: { hostIds: ['local'], omittedHostIds: [] }
+        }
+      }
+    }
+    throw new Error(`Unexpected runtime method: ${method}`)
+  })
+  const listSessions = vi.fn(async () =>
+    [primaryPtyId, setupPtyId].map((id) => ({
+      id,
+      cwd: worktree.path,
+      title: 'Terminal',
+      agentOwnership: 'absent' as const
+    }))
+  )
+  vi.stubGlobal('window', {
+    api: {
+      runtime: { call: runtimeCall },
+      pty: { listSessions },
+      ui: {
+        onCreateTerminal: (next: CreateTerminalListener) => {
+          listener = next
+          return () => {}
+        },
+        onRequestTerminalTabMount: () => () => {},
+        replyTerminalCreate: vi.fn()
+      }
+    },
+    dispatchEvent: vi.fn()
+  })
+  return {
+    reveal: () => {
+      if (!listener) {
+        throw new Error('presentation bridge did not register')
+      }
+      return listener
+    }
+  }
+}
+
+/** Main's background reveal of the primary terminal: the tab exists here but never mounted. */
+function seedRevealedPrimaryTab(worktreeId: string, primaryPtyId: string): void {
+  useAppStore.getState().createTab(worktreeId, undefined, undefined, {
+    id: TAB_B,
+    initialLeafId: PRIMARY_LEAF,
+    initialPtyId: primaryPtyId,
+    activate: false,
+    recordInteraction: false
+  })
+}
+
+function leafIdsInOrder(node: TerminalPaneLayoutNode | null): string[] {
+  if (!node) {
+    return []
+  }
+  return node.type === 'leaf'
+    ? [node.leafId]
+    : [...leafIdsInOrder(node.first), ...leafIdsInOrder(node.second)]
+}
+
+function setupSplitReveal(
+  requestId: string,
+  worktreeId: string,
+  setupPtyId: string
+): Parameters<CreateTerminalListener>[0] {
+  return {
+    requestId,
+    worktreeId,
+    ptyId: setupPtyId,
+    activate: false,
+    surfaceOwner: false,
+    tabId: TAB_B,
+    leafId: SETUP_LEAF,
+    splitFromLeafId: PRIMARY_LEAF,
+    splitDirection: 'vertical'
+  }
+}
+
+/** ptyId → every tab:leaf in the worktree that holds it. */
+function ownersByPty(worktreeId: string): Map<string, string[]> {
+  const state = useAppStore.getState()
+  const owners = new Map<string, string[]>()
+  for (const tab of state.tabsByWorktree[worktreeId] ?? []) {
+    const layout = state.terminalLayoutsByTabId[tab.id]
+    for (const leafId of leafIdsInOrder(layout?.root ?? null)) {
+      const ptyId = layout?.ptyIdsByLeafId?.[leafId]
+      if (ptyId) {
+        owners.set(ptyId, [...(owners.get(ptyId) ?? []), `${tab.id}:${leafId}`])
+      }
+    }
+  }
+  return owners
+}
+
+/** The sidebar click, then the first-activation sweep the terminal watcher runs (STA-9417 step 2). */
+async function activateFirstTime(worktreeId: string): Promise<void> {
+  activateAndRevealWorktree(worktreeId)
+  await expect(gateWorktreeAgentActivation(worktreeId)).resolves.toBe('adopted')
+}
+
+afterEach(() => {
+  vi.restoreAllMocks()
+  vi.unstubAllGlobals()
+  useAppStore.setState(initialState, true)
+})
+
+describe('STA-9417: setup split of an unmounted tab, then first activation', () => {
+  async function runScenario(revealSplit: boolean): Promise<void> {
+    const worktree = makeWorktree()
+    const primaryPtyId = `${worktree.id}@@primary`
+    const setupPtyId = `${worktree.id}@@setup`
+    useAppStore.setState(baseState())
+    const host = stubHost(primaryPtyId, setupPtyId)
+    registerTerminalPresentationIpcBridge([])
+    seedRevealedPrimaryTab(worktree.id, primaryPtyId)
+
+    if (revealSplit) {
+      host.reveal()(setupSplitReveal('reveal-setup-split', worktree.id, setupPtyId))
+    }
+    await activateFirstTime(worktree.id)
+
+    const tabs = useAppStore.getState().tabsByWorktree[worktree.id] ?? []
+    expect(tabs.map((tab) => tab.id)).toEqual([TAB_B])
+    expect(Object.fromEntries(ownersByPty(worktree.id))).toEqual({
+      [primaryPtyId]: [`${TAB_B}:${PRIMARY_LEAF}`],
+      [setupPtyId]: [`${TAB_B}:${SETUP_LEAF}`]
+    })
+  }
+
+  it('ends with one tab and one owner per terminal when main reveals the split', async () => {
+    await runScenario(true)
+  })
+
+  // STA-9417: fails until the mirror refactor (B2-4) pushes main's split before the sweep runs.
+  it.fails('ends with one tab and one owner per terminal when the split reveal never arrives', async () => {
+    await runScenario(false)
+  })
+
+  // STA-9417: fails until the mirror refactor (B2-4); the odd runs mint the duplicate.
+  it.fails('stays duplicate-free across 8 create-then-activate cycles, with or without the reveal', async () => {
+    let duplicates = 0
+    for (let run = 0; run < 8; run++) {
+      const worktree = makeWorktree()
+      const primaryPtyId = `${worktree.id}@@primary-${run}`
+      const setupPtyId = `${worktree.id}@@setup-${run}`
+      useAppStore.setState(initialState, true)
+      useAppStore.setState(baseState())
+      const host = stubHost(primaryPtyId, setupPtyId)
+      registerTerminalPresentationIpcBridge([])
+      seedRevealedPrimaryTab(worktree.id, primaryPtyId)
+      // Odd runs lose the reveal, as the natural repro did.
+      if (run % 2 === 0) {
+        host.reveal()(setupSplitReveal(`reveal-${run}`, worktree.id, setupPtyId))
+      }
+      await activateFirstTime(worktree.id)
+      duplicates += [...ownersByPty(worktree.id).values()].filter(
+        (owners) => owners.length > 1
+      ).length
+      duplicates += (useAppStore.getState().tabsByWorktree[worktree.id] ?? []).length - 1
+    }
+    expect(duplicates).toBe(0)
+  })
+})
diff --git a/src/renderer/src/lib/ssh-failed-target-sleeping-agent-resume.test.ts b/src/renderer/src/lib/ssh-failed-target-sleeping-agent-resume.test.ts
index 1232681d980f..e35e46fc908c 100644
--- a/src/renderer/src/lib/ssh-failed-target-sleeping-agent-resume.test.ts
+++ b/src/renderer/src/lib/ssh-failed-target-sleeping-agent-resume.test.ts
@@ -11,7 +11,7 @@ import { afterEach, describe, expect, it, vi } from 'vitest'
 import type { SleepingAgentSessionRecord } from '../../../shared/agent-session-resume'
 import type { TerminalTab } from '../../../shared/terminal-tab-types'
 import { useAppStore } from '@/store'
-import { makeWorktree } from '@/store/slices/store-test-helpers'
+import { makeWorktree } from '../store/slices/worktrees-slice-test-fixtures'
 import { resolveWorkspaceTerminalHostAuthority } from './workspace-terminal-host-authority'
 import { resumeSleepingAgentSessionsForWorktree } from './resume-sleeping-agent-session'
 
diff --git a/src/renderer/src/lib/ssh-mutation-expectation.test.ts b/src/renderer/src/lib/ssh-mutation-expectation.test.ts
index 9e7036cba8aa..b50620102878 100644
--- a/src/renderer/src/lib/ssh-mutation-expectation.test.ts
+++ b/src/renderer/src/lib/ssh-mutation-expectation.test.ts
@@ -1,6 +1,11 @@
 import { describe, expect, it } from 'vitest'
 import type { AppState } from '@/store/types'
-import { captureDirectSshMutationExpectation } from './ssh-mutation-expectation'
+import { useAppStore } from '@/store'
+import { FLOATING_TERMINAL_WORKTREE_ID, getDefaultSettings } from '../../../shared/constants'
+import {
+  captureDirectSshMutationExpectation,
+  captureWorktreeSshMutationExpectation
+} from './ssh-mutation-expectation'
 
 function stateWithGenerations(): Pick<AppState, 'sshConnectionStates' | 'sshStateByEnvironment'> {
   return {
@@ -66,3 +71,16 @@ describe('captureDirectSshMutationExpectation', () => {
     ).toThrow("Couldn't verify the SSH connection")
   })
 })
+
+describe('captureWorktreeSshMutationExpectation', () => {
+  it('treats the floating workspace as local even while a runtime is focused', () => {
+    useAppStore.setState({
+      settings: { ...getDefaultSettings('/home/me'), activeRuntimeEnvironmentId: 'hub-1' },
+      repos: [],
+      worktreesByRepo: {}
+    })
+    expect(
+      captureWorktreeSshMutationExpectation(useAppStore.getState(), FLOATING_TERMINAL_WORKTREE_ID)
+    ).toEqual({ expectedExecutionHostId: 'local' })
+  })
+})
diff --git a/src/renderer/src/lib/ssh-mutation-expectation.ts b/src/renderer/src/lib/ssh-mutation-expectation.ts
index 4aeddf8bf1d1..26f22242ac41 100644
--- a/src/renderer/src/lib/ssh-mutation-expectation.ts
+++ b/src/renderer/src/lib/ssh-mutation-expectation.ts
@@ -1,7 +1,10 @@
 import type { SshMutationExpectation } from '../../../shared/ssh-types'
 import type { AppState } from '@/store/types'
 import { parseExecutionHostId, toSshExecutionHostId } from '../../../shared/execution-host'
-import { resolveWorktreeOperationRoute } from './worktree-operation-route'
+import {
+  getFloatingWorkspaceOperationRoute,
+  resolveWorktreeOperationRoute
+} from './worktree-operation-route'
 
 const SSH_OWNER_CHANGED_MESSAGE =
   "Couldn't verify the SSH connection. Reconnect the host and try again."
@@ -38,7 +41,9 @@ export function captureWorktreeSshMutationExpectation(
   state: AppState,
   worktreeId: string
 ): SshMutationExpectation & { expectedExecutionHostId: 'local' | `ssh:${string}` } {
-  const route = resolveWorktreeOperationRoute(state, worktreeId)
+  const route =
+    getFloatingWorkspaceOperationRoute(worktreeId) ??
+    resolveWorktreeOperationRoute(state, worktreeId)
   const host = parseExecutionHostId(route?.executionHostId)
   if (host?.kind === 'local' || host?.kind === 'runtime') {
     return { expectedExecutionHostId: 'local' }
diff --git a/src/renderer/src/lib/structured-agent-session-empty-chat-reuse.test.ts b/src/renderer/src/lib/structured-agent-session-empty-chat-reuse.test.ts
index 004de247a849..fd503624ad15 100644
--- a/src/renderer/src/lib/structured-agent-session-empty-chat-reuse.test.ts
+++ b/src/renderer/src/lib/structured-agent-session-empty-chat-reuse.test.ts
@@ -5,11 +5,12 @@ import type { RuntimeMobileSessionTabsResult } from '../../../shared/runtime-ses
 import type { Tab, TabGroup } from '../../../shared/tab-types'
 import type { AgentSessionStatusSummary } from '../../../shared/agent-session-wire'
 import type { StructuredAgentSessionLaunchIntent } from '@/lib/launch-structured-agent-session'
+import type * as LaunchAdmissionModule from './structured-agent-session-launch-admission'
 
 const mocks = vi.hoisted(() => ({
   createIntent: vi.fn(),
   launch: vi.fn(),
-  callStructuredAgentSession: vi.fn(),
+  callRuntimeRpc: vi.fn(),
   refreshTabs: vi.fn(),
   activateTab: vi.fn(),
   focusGroup: vi.fn(),
@@ -58,11 +59,22 @@ vi.mock('@/lib/launch-structured-agent-session', () => {
     StructuredAgentSessionOwnerUnresolvedError
   }
 })
+// Reuse is decided where an admitted launch opens its chat; here this machine admits at once.
+vi.mock('@/lib/structured-agent-session-launch-admission', async (importOriginal) => ({
+  ...(await importOriginal<typeof LaunchAdmissionModule>()),
+  beginHostAdmittedStructuredLaunch: (args: { openAdmitted: () => unknown }) => args.openAdmitted()
+}))
 vi.mock('@/runtime/local-structured-session-tabs-sync', () => ({
   refreshLocalStructuredSessionTabs: mocks.refreshTabs
 }))
 vi.mock('@/runtime/structured-agent-session-client', () => ({
-  callStructuredAgentSession: mocks.callStructuredAgentSession
+  // Sends reach the runtime RPC through this wrapper, as in the app.
+  callStructuredAgentSession: (target: unknown, method: string, params?: unknown) =>
+    mocks.callRuntimeRpc(target, method, params)
+}))
+vi.mock('@/runtime/runtime-rpc-client', () => ({
+  callRuntimeRpc: mocks.callRuntimeRpc,
+  ensureRuntimeEnvironmentCompatible: vi.fn(async () => undefined)
 }))
 vi.mock('@/runtime/structured-agent-session-status-feed', () => ({
   getStructuredAgentSessionStatusFeed: () => ({
@@ -104,9 +116,9 @@ vi.mock('@/store', () => ({
 }))
 
 import {
-  appendStructuredAgentSessionOutboxMessage,
-  readOutbox
-} from '@/components/native-chat/structured-agent-session-outbox-storage'
+  resetStructuredAgentSessionSendsForTests,
+  sendStructuredAgentSessionMessage
+} from '@/components/native-chat/structured-agent-session-message-sender'
 import {
   appendNativeChatAttachmentCache,
   clearNativeChatAttachmentCacheForTests
@@ -130,6 +142,10 @@ import {
   type StructuredAgentSessionProvisionalLaunch
 } from './structured-agent-session-provisional-tab'
 import { getStructuredAgentSessionLaunchLifecycle } from './structured-agent-session-launch'
+import {
+  discardStructuredLaunchPrompts,
+  hasStagedStructuredLaunchPrompt
+} from './structured-agent-session-launch-prompt'
 import { resetStructuredAgentLaunchPersistenceForTests } from './structured-agent-session-launch-persistence'
 import { resetStructuredAgentLaunchRegistryForTests } from './structured-agent-session-launch-registry'
 
@@ -232,6 +248,10 @@ beforeEach(() => {
   clearNativeChatAttachmentCacheForTests()
   resetStructuredAgentLaunchPersistenceForTests()
   resetStructuredAgentLaunchRegistryForTests()
+  resetStructuredAgentSessionSendsForTests()
+  for (const sessionId of ['session-first', 'session-second', 'session-third']) {
+    discardStructuredLaunchPrompts(sessionId)
+  }
   mocks.statusBySession.clear()
   mocks.liveSessions.clear()
   store.state = emptyStoreState()
@@ -243,7 +263,7 @@ beforeEach(() => {
     Promise.resolve({ sessionId: intent.sessionId, fence: 1 })
   )
   mocks.refreshTabs.mockResolvedValue(published(first.sessionId, second.sessionId))
-  mocks.callStructuredAgentSession.mockResolvedValue({
+  mocks.callRuntimeRpc.mockResolvedValue({
     ok: true,
     value: { submission: { dispatchState: 'accepted' } }
   })
@@ -328,7 +348,13 @@ describe('a second "new chat" with no text', () => {
   it('opens a new chat when the starting chat has a message queued', () => {
     mocks.launch.mockImplementation(() => new Promise(() => undefined))
     const firstPick = pick('plus-pick-1')
-    appendStructuredAgentSessionOutboxMessage(firstPick.sessionId, 'my own question')
+    // The chat is not up yet, so its user's own send is still waiting on it.
+    mocks.callRuntimeRpc.mockImplementation(() => new Promise(() => undefined))
+    sendStructuredAgentSessionMessage({
+      sessionId: firstPick.sessionId,
+      target: { kind: 'local' },
+      text: 'my own question'
+    })
 
     expect(pick('plus-pick-2').sessionId).toBe(second.sessionId)
   })
@@ -472,10 +498,8 @@ describe('a "new chat" with text', () => {
       )?.groupId
     ).toBe('group-right')
     expect(mocks.focusGroup).not.toHaveBeenCalled()
-    expect(readOutbox(blank.sessionId)).toEqual([])
-    expect(readOutbox(second.sessionId).map((entry) => entry.body.blocks)).toEqual([
-      [{ type: 'text', text: 'review notes' }]
-    ])
+    expect(hasStagedStructuredLaunchPrompt(blank.sessionId)).toBe(false)
+    expect(hasStagedStructuredLaunchPrompt(second.sessionId)).toBe(true)
   })
 
   it('takes an empty chat starting in its own split', () => {
@@ -493,7 +517,7 @@ describe('a "new chat" with text', () => {
     writeNativeChatDraftCache(structuredAgentSessionDraftScopeKey(blank.sessionId), 'my words')
 
     expect(pick('notes-send', { prompt: 'review notes' }).sessionId).toBe(second.sessionId)
-    expect(readOutbox(blank.sessionId)).toEqual([])
+    expect(hasStagedStructuredLaunchPrompt(blank.sessionId)).toBe(false)
   })
 
   it('never takes over or reuses a chat whose saved draft holds text or only an image', async () => {
@@ -504,7 +528,7 @@ describe('a "new chat" with text', () => {
     await hydrateNativeChatComposerDrafts()
     const taken = pick('notes-send', { prompt: 'review notes' })
     expect(taken.sessionId).not.toBe(typed.sessionId)
-    expect(readOutbox(typed.sessionId)).toEqual([])
+    expect(hasStagedStructuredLaunchPrompt(typed.sessionId)).toBe(false)
 
     appendNativeChatAttachmentCache(structuredAgentSessionDraftScopeKey(taken.sessionId), [
       { id: 'shot', path: '/tmp/shot.png' }
diff --git a/src/renderer/src/lib/structured-agent-session-host-admission.ts b/src/renderer/src/lib/structured-agent-session-host-admission.ts
index 97b1467888db..b09be516ef7e 100644
--- a/src/renderer/src/lib/structured-agent-session-host-admission.ts
+++ b/src/renderer/src/lib/structured-agent-session-host-admission.ts
@@ -32,16 +32,18 @@ export type StructuredLaunchAdmission =
   | { kind: 'admitted'; seedOptions?: Readonly<Record<string, string>> }
   | { kind: 'declined' }
   | { kind: 'unreachable' }
+  /** The host still could not resolve the workspace after the retries: not yet, rather than no. */
+  | { kind: 'workspace-unresolved' }
 
 export type HostCreateSupport =
-  | { kind: 'admitted'; seedOptions?: Readonly<Record<string, string>> }
-  | { kind: 'declined' }
+  | Exclude<StructuredLaunchAdmission, { kind: 'unreachable' }>
   | { kind: 'unreachable'; code: string; message: string; error: unknown }
 
 /**
  * Whether the executing host supports creating this session, retrying only while the host cannot
  * yet resolve the worktree. "Could not answer" and "answered no" are different states and only the
- * second is a verdict. Each call is bounded by the runtime RPC client's own timeout.
+ * second is a verdict. A paired server's call is bounded by the runtime RPC client's timeout; this
+ * machine's call has none.
  */
 export async function askHostCreateSupport(
   target: RuntimeClientTarget,
@@ -61,12 +63,11 @@ export async function askHostCreateSupport(
       const seedOptions = parseStructuredLaunchSeedOptions(support.seedOptions)
       return seedOptions ? { kind: 'admitted', seedOptions } : { kind: 'admitted' }
     } catch (error) {
-      const retryDelayMs = CREATE_SUPPORT_RETRY_DELAYS_MS[attempt]
-      if (retryDelayMs === undefined) {
-        // A selector that never appears is a definitive refusal.
-        return { kind: 'declined' }
-      }
       if (hasRuntimeRpcErrorCode(error, SELECTOR_NOT_RESOLVABLE_CODE)) {
+        const retryDelayMs = CREATE_SUPPORT_RETRY_DELAYS_MS[attempt]
+        if (retryDelayMs === undefined) {
+          return { kind: 'workspace-unresolved' }
+        }
         await delay(retryDelayMs)
         continue
       }
@@ -80,12 +81,30 @@ export async function askHostCreateSupport(
   }
 }
 
+/** How long a launch on this machine waits for its answer before anything shows. Past it the
+ *  launch treats the host as unable to answer, and the chat's own create keeps asking. */
+export const LOCAL_ADMISSION_WAIT_MS = 3_000
+
 /** Asks a host to admit a chat before the client commits any of it. */
 export async function admitStructuredLaunchOnHost(
   target: RuntimeClientTarget,
   worktree: string,
   agent: TuiAgent
 ): Promise<StructuredLaunchAdmission> {
-  const support = await askHostCreateSupport(target, worktree, agent)
-  return support.kind === 'unreachable' ? { kind: 'unreachable' } : support
+  const asked = askHostCreateSupport(target, worktree, agent).then(
+    (support): StructuredLaunchAdmission =>
+      support.kind === 'unreachable' ? { kind: 'unreachable' } : support
+  )
+  if (target.kind !== 'local') {
+    return asked
+  }
+  let timer: ReturnType<typeof setTimeout> | undefined
+  const timedOut = new Promise<StructuredLaunchAdmission>((resolve) => {
+    timer = setTimeout(() => resolve({ kind: 'unreachable' }), LOCAL_ADMISSION_WAIT_MS)
+  })
+  try {
+    return await Promise.race([asked, timedOut])
+  } finally {
+    clearTimeout(timer)
+  }
 }
diff --git a/src/renderer/src/lib/structured-agent-session-paired-admission.test.ts b/src/renderer/src/lib/structured-agent-session-launch-admission.test.ts
similarity index 55%
rename from src/renderer/src/lib/structured-agent-session-paired-admission.test.ts
rename to src/renderer/src/lib/structured-agent-session-launch-admission.test.ts
index a8df010234f2..2cdb6dbe5012 100644
--- a/src/renderer/src/lib/structured-agent-session-paired-admission.test.ts
+++ b/src/renderer/src/lib/structured-agent-session-launch-admission.test.ts
@@ -32,11 +32,15 @@ import { resumeAiVaultSessionInNewChat } from '@/components/right-sidebar/ai-vau
 import { getStructuredAgentLaunchStatus } from './structured-agent-session-launch-status'
 import { getStructuredAgentSessionLaunchSelection } from './structured-agent-session-launch-options'
 import { peekWebSessionFocusIntent } from '@/runtime/web-session-focus-intent'
+import { LOCAL_ADMISSION_WAIT_MS } from './structured-agent-session-host-admission'
+import { structuredAgentSessionFocusOwner } from '@/runtime/structured-agent-session-owner'
 
 const WORKTREE = 'repo-1::/srv/app'
 const INITIAL_SETTINGS = useAppStore.getState().settings
 
-function pairedPlan(overrides: { resumeFrom?: { providerSessionId: string } } = {}) {
+function pairedPlan(
+  overrides: { resumeFrom?: { providerSessionId: string }; executionHostId?: 'local' } = {}
+) {
   return adoptAgentSessionLaunchVerdict({
     requestId: 'request-1',
     route: 'structured-native-chat',
@@ -49,12 +53,17 @@ function pairedPlan(overrides: { resumeFrom?: { providerSessionId: string } } =
   })
 }
 
+const localPlan = () => pairedPlan({ executionHostId: 'local' })
+
 /** Nothing of a chat exists on this machine: no tab, launch, record, queued prompt or intent. */
 function expectNoChatCommitted(): void {
   expect(useAppStore.getState().unifiedTabsByWorktree[WORKTREE] ?? []).toEqual([])
   expect(getStructuredAgentLaunchStatus(WORKTREE, 'claude')).toBe('idle')
   expect(Object.keys(localStorage)).toEqual([])
   expect(peekWebSessionFocusIntent({ environmentId: 'server-1' }, WORKTREE)).toBeNull()
+  expect(
+    peekWebSessionFocusIntent(structuredAgentSessionFocusOwner({ kind: 'local' }), WORKTREE)
+  ).toBeNull()
 }
 
 beforeEach(() => {
@@ -220,3 +229,178 @@ describe('a structured chat launch on a paired server', () => {
     launch?.cancel()
   })
 })
+
+// The same ask, of this machine's own runtime: a Claude account bound to WSL is one "no" it gives.
+describe('a structured chat launch on this machine', () => {
+  it('opens only the terminal when this machine declines, without a notice', async () => {
+    mocks.createSupport.mockResolvedValue({ supported: false, reason: 'wsl' })
+    const onHostDeclined = vi.fn(() => ({
+      opened: true,
+      promptDeliveryResult: Promise.resolve({ delivered: true, failureNotified: false })
+    }))
+    const reveal = vi.fn()
+
+    const launch = beginStructuredAgentSessionProvisionalLaunch({
+      plan: localPlan(),
+      hooks: {},
+      beforeOpen: reveal,
+      onHostDeclined
+    })
+
+    expect(launch?.tab).toBeNull()
+    expect(reveal).toHaveBeenCalledOnce()
+    await expect(launch?.settlement).resolves.toEqual({ kind: 'terminal' })
+    await expect(launch?.promptDeliveryResult).resolves.toEqual({
+      delivered: true,
+      failureNotified: false
+    })
+    expect(onHostDeclined).toHaveBeenCalledExactlyOnceWith({ kind: 'local' })
+    expect(mocks.toastInfo).not.toHaveBeenCalled()
+    expect(mocks.toastError).not.toHaveBeenCalled()
+    expectNoChatCommitted()
+  })
+
+  it("opens a new agent tab's terminal with the typed prompt when the caller names none", async () => {
+    mocks.createSupport.mockResolvedValue({ supported: false })
+    mocks.launchAgentInNewTab.mockReturnValue({ surface: { kind: 'local-terminal', tabId: 't' } })
+
+    const launch = beginStructuredAgentSessionProvisionalLaunch({
+      plan: localPlan(),
+      hooks: {},
+      targetGroupId: 'group-1',
+      declinedTerminal: { agentArgs: '--model opus' }
+    })
+
+    await expect(launch?.settlement).resolves.toEqual({ kind: 'terminal' })
+    expect(mocks.launchAgentInNewTab).toHaveBeenCalledExactlyOnceWith(
+      expect.objectContaining({
+        agent: 'claude',
+        worktreeId: WORKTREE,
+        groupId: 'group-1',
+        prompt: 'fix the flaky test',
+        agentArgs: '--model opus',
+        agentSessionLaunchPlan: expect.objectContaining({ route: 'terminal-tui' })
+      })
+    )
+    expectNoChatCommitted()
+  })
+
+  it('opens nothing when the launch is abandoned before this machine answers', async () => {
+    let answer!: (support: { supported: boolean }) => void
+    mocks.createSupport.mockReturnValue(new Promise((resolve) => (answer = resolve)))
+    const onHostDeclined = vi.fn()
+
+    const launch = beginStructuredAgentSessionProvisionalLaunch({
+      plan: localPlan(),
+      hooks: {},
+      onHostDeclined
+    })
+    launch?.cancel()
+    answer({ supported: false })
+
+    await expect(launch?.settlement).resolves.toEqual({ kind: 'cancelled', sessionId: null })
+    await expect(launch?.promptDeliveryResult).resolves.toEqual({
+      delivered: false,
+      failureNotified: false
+    })
+    expect(onHostDeclined).not.toHaveBeenCalled()
+    expectNoChatCommitted()
+  })
+
+  it('opens the chat once this machine admits it', async () => {
+    mocks.createSupport.mockResolvedValue({ supported: true })
+
+    const launch = beginStructuredAgentSessionProvisionalLaunch({
+      plan: localPlan(),
+      hooks: {},
+      onHostDeclined: vi.fn()
+    })
+
+    expect(useAppStore.getState().unifiedTabsByWorktree[WORKTREE] ?? []).toEqual([])
+    await vi.waitFor(() =>
+      expect(useAppStore.getState().unifiedTabsByWorktree[WORKTREE]).toEqual([
+        expect.objectContaining({ contentType: 'agent-session', executionHostId: 'local' })
+      ])
+    )
+    launch?.cancel()
+  })
+
+  // This machine has no connection to lose: the chat opens, and its own start reports a failure.
+  it('opens the chat without a notice when this machine cannot answer the ask', async () => {
+    mocks.createSupport.mockRejectedValue(new Error('runtime not ready'))
+    const onHostDeclined = vi.fn()
+
+    const launch = beginStructuredAgentSessionProvisionalLaunch({
+      plan: localPlan(),
+      hooks: {},
+      onHostDeclined
+    })
+
+    await vi.waitFor(() =>
+      expect(useAppStore.getState().unifiedTabsByWorktree[WORKTREE]).toHaveLength(1)
+    )
+    expect(onHostDeclined).not.toHaveBeenCalled()
+    expect(mocks.toastError).not.toHaveBeenCalled()
+    launch?.cancel()
+  })
+
+  // Not resolvable yet is not a "no": the chat opens and its own create asks again, as before.
+  it('opens the chat, not a terminal, when this machine cannot resolve a new workspace yet', async () => {
+    mocks.createSupport.mockRejectedValue(new Error('selector_not_found'))
+    const onHostDeclined = vi.fn()
+
+    const launch = beginStructuredAgentSessionProvisionalLaunch({
+      plan: localPlan(),
+      hooks: {},
+      onHostDeclined
+    })
+
+    await vi.waitFor(
+      () => expect(useAppStore.getState().unifiedTabsByWorktree[WORKTREE]).toHaveLength(1),
+      { timeout: 3_000 }
+    )
+    expect(onHostDeclined).not.toHaveBeenCalled()
+    launch?.cancel()
+  })
+
+  // The click must never wait without end: past the bound the chat opens and reports for itself.
+  it('opens the chat once the wait for this machine passes its bound', async () => {
+    vi.useFakeTimers({ toFake: ['setTimeout', 'clearTimeout'] })
+    try {
+      mocks.createSupport.mockReturnValue(new Promise(() => undefined))
+      const onHostDeclined = vi.fn()
+
+      const launch = beginStructuredAgentSessionProvisionalLaunch({
+        plan: localPlan(),
+        hooks: {},
+        onHostDeclined
+      })
+      await vi.advanceTimersByTimeAsync(LOCAL_ADMISSION_WAIT_MS - 1)
+      expect(useAppStore.getState().unifiedTabsByWorktree[WORKTREE] ?? []).toEqual([])
+
+      await vi.advanceTimersByTimeAsync(1)
+      expect(useAppStore.getState().unifiedTabsByWorktree[WORKTREE]).toHaveLength(1)
+      expect(onHostDeclined).not.toHaveBeenCalled()
+      expect(mocks.toastError).not.toHaveBeenCalled()
+      launch?.cancel()
+    } finally {
+      vi.useRealTimers()
+    }
+  })
+})
+
+describe('a paired server that cannot resolve a new workspace yet', () => {
+  it('keeps its terminal fallback, as before', async () => {
+    mocks.createSupport.mockRejectedValue(new Error('selector_not_found'))
+    const onHostDeclined = vi.fn(() => ({ opened: true }))
+
+    const launch = beginStructuredAgentSessionProvisionalLaunch({
+      plan: pairedPlan(),
+      hooks: {},
+      onHostDeclined
+    })
+
+    await expect(launch?.settlement).resolves.toEqual({ kind: 'terminal' })
+    expect(onHostDeclined).toHaveBeenCalledOnce()
+  })
+})
diff --git a/src/renderer/src/lib/structured-agent-session-paired-admission.ts b/src/renderer/src/lib/structured-agent-session-launch-admission.ts
similarity index 61%
rename from src/renderer/src/lib/structured-agent-session-paired-admission.ts
rename to src/renderer/src/lib/structured-agent-session-launch-admission.ts
index 59ccbc792521..3d55f8ee71cc 100644
--- a/src/renderer/src/lib/structured-agent-session-paired-admission.ts
+++ b/src/renderer/src/lib/structured-agent-session-launch-admission.ts
@@ -8,7 +8,11 @@ import {
   adoptAgentSessionLaunchVerdict,
   type AgentSessionLaunchPlan
 } from '@/lib/agent-session-launch-plan'
-import { admitStructuredLaunchOnHost } from '@/lib/structured-agent-session-host-admission'
+import {
+  admitStructuredLaunchOnHost,
+  type StructuredLaunchAdmission
+} from '@/lib/structured-agent-session-host-admission'
+import { holdEmptyWorkspaceDefaultSurfaceForLaunch } from '@/lib/empty-workspace-default-surface-claims'
 import { StructuredAgentSessionCreateRefusalError } from '@/lib/structured-agent-session-launch-errors'
 import { structuredAgentLabel } from '@/lib/structured-agent-session-launch-label'
 import type {
@@ -26,8 +30,8 @@ export type StructuredLaunchTerminal = {
   promptDeliveryResult?: Promise<StructuredPromptDeliveryResult>
 }
 
-/** A chat launch on a paired server. Nothing of it exists here until the server admits it. */
-export type PairedStructuredLaunch = {
+/** A chat launch its owning host has not admitted yet. Nothing of it exists here until it does. */
+export type HostAdmittedStructuredLaunch = {
   sessionId: null
   tab: null
   settlement: Promise<StructuredAgentLaunchSettlement>
@@ -106,6 +110,7 @@ export async function openDeclinedStructuredLaunchTerminal(args: {
     ...(args.plan.prompt ? { prompt: args.plan.prompt } : {}),
     ...(args.plan.promptDelivery ? { promptDelivery: args.plan.promptDelivery } : {}),
     ...(args.plan.onPromptDelivered ? { onPromptDelivered: args.plan.onPromptDelivered } : {}),
+    ...(args.plan.promptKeptByCaller ? { promptKeptByCaller: true as const } : {}),
     agentSessionLaunchPlan: adoptAgentSessionLaunchVerdict({
       route: 'terminal-tui',
       requestId: args.plan.requestId,
@@ -120,12 +125,13 @@ export async function openDeclinedStructuredLaunchTerminal(args: {
 }
 
 /**
- * Asks the paired server that would run a chat before committing any of it here: no tab, launch
- * record, queued prompt or focus intent exists until it answers. Admitted opens the chat as a local
- * launch would; declined opens the caller's terminal with a notice (a resume, which has no terminal
- * equivalent, fails); unreachable opens nothing and says so. There is nothing to undo either way.
+ * Asks the host that would run a chat, this machine or a paired server, before committing any of it
+ * here: no tab, launch record, queued prompt or focus intent exists until it answers. Admitted opens
+ * the chat; declined opens the caller's terminal (a resume, which has no terminal equivalent,
+ * fails); an unreachable server opens nothing and says so. There is nothing to undo either way.
+ * This machine's "can't answer" or "not resolvable yet" opens the chat, whose own create reports.
  */
-export function beginPairedStructuredLaunch(args: {
+export function beginHostAdmittedStructuredLaunch(args: {
   plan: AgentSessionLaunchPlan & { agent: TuiAgent }
   hooks: StructuredAgentLaunchHooks
   worktreeId: string
@@ -134,9 +140,13 @@ export function beginPairedStructuredLaunch(args: {
   /** Commits the admitted chat: the local launch path, told which host admitted it and the saved
    *  selection that host said create will seed. */
   openAdmitted: (seedOptions?: Readonly<Record<string, string>>) => AdmittedLaunch | null
-  onHostDeclined: () => Promise<StructuredLaunchTerminal> | StructuredLaunchTerminal
-}): PairedStructuredLaunch {
+  /** Told which host declined, since where its terminal opens can depend on it. */
+  onHostDeclined: (
+    target: RuntimeClientTarget
+  ) => Promise<StructuredLaunchTerminal> | StructuredLaunchTerminal
+}): HostAdmittedStructuredLaunch {
   const { plan } = args
+  const paired = args.target.kind === 'environment'
   let cancelled = false
   let admitted: AdmittedLaunch | null = null
   const isCancelled = (): boolean => cancelled || args.hooks.signal?.aborted === true
@@ -147,52 +157,72 @@ export function beginPairedStructuredLaunch(args: {
         resolveDelivery = resolve
       })
     : undefined
+  // Released once the surface that answers the launch has opened, or nothing will.
+  const releaseHold = holdEmptyWorkspaceDefaultSurfaceForLaunch(args.worktreeId)
   const settlement = (async (): Promise<StructuredAgentLaunchSettlement> => {
-    const admission = await admitStructuredLaunchOnHost(
-      args.target,
-      toRuntimeWorktreeSelector(args.worktreeId),
-      plan.agent
-    )
-    if (isCancelled()) {
-      resolveDelivery(NOT_DELIVERED)
-      return { kind: 'cancelled', sessionId: null }
-    }
-    if (admission.kind === 'unreachable') {
-      notifyHostUnreachable(plan.agent, args.executionHostId)
-      resolveDelivery({ delivered: false, failureNotified: true })
-      return {
-        kind: 'failed',
-        error: new Error('structured chat host unreachable'),
-        notified: true
-      }
-    }
-    if (admission.kind === 'declined') {
-      if (plan.resumeFrom) {
+    try {
+      const asked = await admitStructuredLaunchOnHost(
+        args.target,
+        toRuntimeWorktreeSelector(args.worktreeId),
+        plan.agent
+      )
+      if (isCancelled()) {
         resolveDelivery(NOT_DELIVERED)
+        return { kind: 'cancelled', sessionId: null }
+      }
+      // A server that cannot resolve the workspace yet keeps its terminal fallback; this machine has
+      // no connection to lose, so its "can't answer" leaves the report to the chat's own create.
+      const admission: StructuredLaunchAdmission =
+        asked.kind !== 'workspace-unresolved'
+          ? asked
+          : paired
+            ? { kind: 'declined' }
+            : { kind: 'unreachable' }
+      if (admission.kind === 'unreachable' && paired) {
+        notifyHostUnreachable(plan.agent, args.executionHostId)
+        resolveDelivery({ delivered: false, failureNotified: true })
         return {
           kind: 'failed',
-          error: new StructuredAgentSessionCreateRefusalError(
-            'structured_agent_session_unsupported'
-          )
+          error: new Error('structured chat host unreachable'),
+          notified: true
         }
       }
-      notifyHostDeclined(plan.agent)
-      const terminal = await args.onHostDeclined()
-      void (
-        terminal.promptDeliveryResult ??
-        Promise.resolve(terminal.opened ? DELIVERED : NOT_DELIVERED)
-      ).then(resolveDelivery, () => resolveDelivery(NOT_DELIVERED))
-      return terminal.opened ? { kind: 'terminal' } : { kind: 'cancelled', sessionId: null }
-    }
-    admitted = args.openAdmitted(admission.seedOptions)
-    if (!admitted) {
-      resolveDelivery(NOT_DELIVERED)
-      return { kind: 'cancelled', sessionId: null }
+      if (admission.kind === 'declined') {
+        if (plan.resumeFrom) {
+          resolveDelivery(NOT_DELIVERED)
+          return {
+            kind: 'failed',
+            error: new StructuredAgentSessionCreateRefusalError(
+              'structured_agent_session_unsupported'
+            )
+          }
+        }
+        // The notice explains a server's refusal; on this machine the terminal opening is the answer.
+        if (paired) {
+          notifyHostDeclined(plan.agent)
+        }
+        const terminal = await args.onHostDeclined(args.target)
+        void (
+          terminal.promptDeliveryResult ??
+          Promise.resolve(terminal.opened ? DELIVERED : NOT_DELIVERED)
+        ).then(resolveDelivery, () => resolveDelivery(NOT_DELIVERED))
+        return terminal.opened ? { kind: 'terminal' } : { kind: 'cancelled', sessionId: null }
+      }
+      admitted = args.openAdmitted(
+        admission.kind === 'admitted' ? admission.seedOptions : undefined
+      )
+      if (!admitted) {
+        resolveDelivery(NOT_DELIVERED)
+        return { kind: 'cancelled', sessionId: null }
+      }
+      void (admitted.promptDeliveryResult ?? Promise.resolve(DELIVERED)).then(resolveDelivery, () =>
+        resolveDelivery(NOT_DELIVERED)
+      )
+      // Not awaited: the hold ends when the chat opens, not when it settles.
+      return admitted.settlement
+    } finally {
+      releaseHold()
     }
-    void (admitted.promptDeliveryResult ?? Promise.resolve(DELIVERED)).then(resolveDelivery, () =>
-      resolveDelivery(NOT_DELIVERED)
-    )
-    return admitted.settlement
   })().catch((error: unknown): StructuredAgentLaunchSettlement => {
     resolveDelivery(NOT_DELIVERED)
     return { kind: 'failed', error }
diff --git a/src/renderer/src/lib/structured-agent-session-launch-after-failure.test.ts b/src/renderer/src/lib/structured-agent-session-launch-after-failure.test.ts
index e048d02da04a..5452dccfa102 100644
--- a/src/renderer/src/lib/structured-agent-session-launch-after-failure.test.ts
+++ b/src/renderer/src/lib/structured-agent-session-launch-after-failure.test.ts
@@ -7,6 +7,7 @@ import type { StructuredAgentSessionLaunchIntent } from '@/lib/launch-structured
 const mocks = vi.hoisted(() => ({
   abandonIntent: vi.fn(),
   callStructuredAgentSession: vi.fn(),
+  callRuntimeRpc: vi.fn(),
   createIntent: vi.fn(),
   retryIntent: vi.fn(),
   restoreIntent: vi.fn(),
@@ -34,7 +35,16 @@ vi.mock('@/runtime/local-structured-session-tabs-sync', () => ({
 }))
 
 vi.mock('@/runtime/structured-agent-session-client', () => ({
-  callStructuredAgentSession: mocks.callStructuredAgentSession
+  // Sends reach the runtime RPC through this wrapper, as in the app; reads stay on this mock.
+  callStructuredAgentSession: (target: unknown, method: string, params?: unknown) =>
+    method === 'agentSession.send'
+      ? mocks.callRuntimeRpc(target, method, params)
+      : mocks.callStructuredAgentSession(target, method, params)
+}))
+
+vi.mock('@/runtime/runtime-rpc-client', () => ({
+  callRuntimeRpc: mocks.callRuntimeRpc,
+  ensureRuntimeEnvironmentCompatible: vi.fn(async () => undefined)
 }))
 
 vi.mock('@/store', () => ({
@@ -66,7 +76,17 @@ import {
   retryStructuredAgentSessionLaunch,
   startStructuredAgentLaunch
 } from './structured-agent-session-launch'
-import { readOutbox } from '@/components/native-chat/structured-agent-session-outbox-storage'
+import {
+  resetStructuredAgentSessionSendsForTests,
+  sendStructuredAgentSessionMessage
+} from '@/components/native-chat/structured-agent-session-message-sender'
+import { getStructuredAgentSessionPendingSends } from '@/components/native-chat/structured-agent-session-pending-sends'
+import { relaunchFailedStructuredAgentSessionWithMessage } from './structured-agent-session-launch-message'
+import {
+  clearNativeChatDraftCacheForTests,
+  readNativeChatDraftCache
+} from '@/components/native-chat/native-chat-draft-cache'
+import { structuredAgentSessionDraftScopeKey } from '@/components/native-chat/native-chat-composer-draft-store'
 import { resetStructuredAgentLaunchPersistenceForTests } from './structured-agent-session-launch-persistence'
 import { resetStructuredAgentLaunchRegistryForTests } from './structured-agent-session-launch-registry'
 
@@ -136,6 +156,8 @@ describe('a new launch after a failed one', () => {
     localStorage.clear()
     resetStructuredAgentLaunchPersistenceForTests()
     resetStructuredAgentLaunchRegistryForTests()
+    resetStructuredAgentSessionSendsForTests()
+    clearNativeChatDraftCacheForTests()
     mocks.retryIntent.mockImplementation((intent: StructuredAgentSessionLaunchIntent) => ({
       ...intent,
       params: {
@@ -149,9 +171,9 @@ describe('a new launch after a failed one', () => {
     vi.mocked(refreshLocalStructuredSessionTabs).mockResolvedValue([
       publishedSnapshot(failed.sessionId, fresh.sessionId)
     ])
-    mocks.callStructuredAgentSession.mockResolvedValue({
+    mocks.callStructuredAgentSession.mockResolvedValue({ ok: true, page: { fence: 1 } })
+    mocks.callRuntimeRpc.mockResolvedValue({
       ok: true,
-      page: { fence: 1 },
       value: { submission: { dispatchState: 'accepted' } }
     })
   })
@@ -175,7 +197,7 @@ describe('a new launch after a failed one', () => {
       failureNotified: false
     })
     expect(mocks.retryIntent).not.toHaveBeenCalled()
-    expect(mocks.callStructuredAgentSession).toHaveBeenCalledWith(
+    expect(mocks.callRuntimeRpc).toHaveBeenCalledWith(
       { kind: 'local' },
       'agentSession.send',
       expect.objectContaining({
@@ -183,13 +205,11 @@ describe('a new launch after a failed one', () => {
         body: expect.objectContaining({ blocks: [{ type: 'text', text: 'review notes' }] })
       })
     )
-    // The failed chat keeps its own preserved prompt for its own Retry.
+    // The failed chat keeps its own prompt, in its own composer.
     expect(getStructuredAgentSessionLaunchLifecycle(WORKTREE_ID, failed.sessionId)).toBe('failed')
-    expect(readOutbox(failed.sessionId)).toEqual([
-      expect.objectContaining({
-        body: expect.objectContaining({ blocks: [{ type: 'text', text: 'first task' }] })
-      })
-    ])
+    expect(readNativeChatDraftCache(structuredAgentSessionDraftScopeKey(failed.sessionId))).toBe(
+      'first task'
+    )
   })
 
   it('retries the failed chat beside an in-flight new launch without taking it over', async () => {
@@ -259,3 +279,91 @@ describe('a new launch after a failed one', () => {
     ).toBe(fresh.sessionId)
   })
 })
+
+// A message sent into a chat whose start failed rides the restart, held until the chat exists.
+describe('a message sent to a chat whose start failed', () => {
+  beforeEach(() => {
+    vi.resetAllMocks()
+    localStorage.clear()
+    resetStructuredAgentLaunchPersistenceForTests()
+    resetStructuredAgentLaunchRegistryForTests()
+    resetStructuredAgentSessionSendsForTests()
+    clearNativeChatDraftCacheForTests()
+    mocks.retryIntent.mockImplementation((intent: StructuredAgentSessionLaunchIntent) => intent)
+    vi.mocked(refreshLocalStructuredSessionTabs).mockResolvedValue([
+      publishedSnapshot(failed.sessionId)
+    ])
+    mocks.callRuntimeRpc.mockResolvedValue({
+      ok: true,
+      value: { submission: { dispatchState: 'accepted' } }
+    })
+  })
+
+  async function failThenTakeComposerText(): Promise<void> {
+    await refuseFirstLaunch()
+    // The failed start's own prompt waits in the composer; the person sends from there.
+    clearNativeChatDraftCacheForTests()
+  }
+
+  it('restarts the chat and delivers the message once it publishes, never before', async () => {
+    await failThenTakeComposerText()
+    let publish = (_receipt: Receipt): void => {}
+    mocks.launch.mockReturnValueOnce(new Promise<Receipt>((resolve) => (publish = resolve)))
+
+    const delivery = relaunchFailedStructuredAgentSessionWithMessage(
+      WORKTREE_ID,
+      failed.sessionId,
+      'restart and say hi'
+    )
+    expect(delivery).not.toBeNull()
+    expect(mocks.retryIntent).toHaveBeenCalledOnce()
+    // Held in the chat's one send slot, drawn as sending; nothing typed meanwhile goes first.
+    expect(getStructuredAgentSessionPendingSends(failed.sessionId).map((e) => e.phase)).toEqual([
+      'sending'
+    ])
+    expect(
+      sendStructuredAgentSessionMessage({
+        sessionId: failed.sessionId,
+        target: { kind: 'local' },
+        text: 'typed meanwhile'
+      })
+    ).toBeNull()
+    expect(mocks.callRuntimeRpc).not.toHaveBeenCalled()
+
+    publish({ sessionId: failed.sessionId, fence: 1 })
+    await expect(delivery).resolves.toEqual({ delivered: true, failureNotified: false })
+    expect(mocks.callRuntimeRpc).toHaveBeenCalledOnce()
+    expect(mocks.callRuntimeRpc).toHaveBeenCalledWith(
+      { kind: 'local' },
+      'agentSession.send',
+      expect.objectContaining({
+        body: expect.objectContaining({ blocks: [{ type: 'text', text: 'restart and say hi' }] })
+      })
+    )
+  })
+
+  it('puts the message back in the composer when the restart fails again', async () => {
+    await failThenTakeComposerText()
+    mocks.launch.mockRejectedValueOnce(new StructuredAgentSessionCreateRefusalError('unsupported'))
+
+    const delivery = relaunchFailedStructuredAgentSessionWithMessage(
+      WORKTREE_ID,
+      failed.sessionId,
+      'still there?'
+    )
+    await expect(delivery).resolves.toEqual({ delivered: false, failureNotified: true })
+    await flushLaunchSettlement()
+    expect(getStructuredAgentSessionLaunchLifecycle(WORKTREE_ID, failed.sessionId)).toBe('failed')
+    expect(readNativeChatDraftCache(structuredAgentSessionDraftScopeKey(failed.sessionId))).toBe(
+      'still there?'
+    )
+    expect(getStructuredAgentSessionPendingSends(failed.sessionId)).toEqual([])
+    expect(mocks.callRuntimeRpc).not.toHaveBeenCalled()
+  })
+
+  it('does nothing for a chat whose start has not failed', () => {
+    expect(
+      relaunchFailedStructuredAgentSessionWithMessage(WORKTREE_ID, 'session-unknown', 'hi')
+    ).toBeNull()
+  })
+})
diff --git a/src/renderer/src/lib/structured-agent-session-launch-callers.ts b/src/renderer/src/lib/structured-agent-session-launch-callers.ts
index c2c3cc5ce6c0..0c1e2bb5c037 100644
--- a/src/renderer/src/lib/structured-agent-session-launch-callers.ts
+++ b/src/renderer/src/lib/structured-agent-session-launch-callers.ts
@@ -1,6 +1,8 @@
 import { settleStructuredAgentLaunchPrompt } from '@/lib/structured-agent-session-launch-prompt'
-import type { StructuredPromptDeliveryResult } from '@/lib/structured-agent-session-launch-prompt'
-import type { StructuredAgentSessionOutboxEntry } from '../../../shared/structured-agent-session-outbox'
+import type {
+  StagedStructuredLaunchPrompt,
+  StructuredPromptDeliveryResult
+} from '@/lib/structured-agent-session-launch-prompt'
 import type { StructuredAgentSessionResumeSource } from '../../../shared/structured-agent-session-create'
 import type { RuntimeClientTarget } from '@/runtime/runtime-client-target'
 import type { ExecutionHostId } from '../../../shared/execution-host'
@@ -13,6 +15,8 @@ export type StructuredAgentLaunchOptions = {
   prompt?: string
   promptDelivery?: 'auto-submit' | 'submit-after-ready' | 'draft'
   onPromptDelivered?: () => void
+  /** The caller keeps the prompt's text if it does not go out (notes), so no composer gets it. */
+  promptKeptByCaller?: true
   /** Adopt an existing provider conversation instead of starting a fresh one. Part of the launch's
    *  identity, not a preference — see `launchIdentity`. */
   resumeFrom?: StructuredAgentSessionResumeSource
@@ -67,7 +71,7 @@ export function addStructuredLaunchCaller(args: {
   launchResult: Promise<{ sessionId: string; fence: number }>
   target: RuntimeClientTarget
   options: StructuredAgentLaunchOptions
-  stagedEntry: StructuredAgentSessionOutboxEntry | null
+  stagedPrompt: StagedStructuredLaunchPrompt | null
 }): StructuredLaunchCaller {
   const caller: StructuredLaunchCaller = {}
   args.group.entries.add(caller)
@@ -75,7 +79,7 @@ export function addStructuredLaunchCaller(args: {
     launchResult: args.launchResult,
     target: args.target,
     options: args.options,
-    stagedEntry: args.stagedEntry
+    stagedPrompt: args.stagedPrompt
   })
   caller.promptDeliveryResult = promptDeliveryResult?.catch(() => ({
     delivered: false,
diff --git a/src/renderer/src/lib/structured-agent-session-launch-cancellation.test.ts b/src/renderer/src/lib/structured-agent-session-launch-cancellation.test.ts
index 7ed9b0b4ec03..55af37761bd8 100644
--- a/src/renderer/src/lib/structured-agent-session-launch-cancellation.test.ts
+++ b/src/renderer/src/lib/structured-agent-session-launch-cancellation.test.ts
@@ -82,7 +82,7 @@ describe('structured launch cancellation retirement', () => {
       promptDelivery: 'auto-submit',
       callers: {
         outcome: 'pending',
-        attempt: { kind: 'first', requestId: 'plus-pick', blank: true, stagedEntry: null },
+        attempt: { kind: 'first', requestId: 'plus-pick', blank: true, stagedPrompt: null },
         entries: new Set(),
         promptDeliveryResults: new Set(),
         onSettled: () => undefined
@@ -162,7 +162,7 @@ describe('structured launch cancellation retirement', () => {
       promptDelivery: 'auto-submit',
       callers: {
         outcome: 'pending',
-        attempt: { kind: 'first', requestId: 'plus-pick', blank: true, stagedEntry: null },
+        attempt: { kind: 'first', requestId: 'plus-pick', blank: true, stagedPrompt: null },
         entries: new Set(),
         promptDeliveryResults: new Set(),
         onSettled: () => undefined
diff --git a/src/renderer/src/lib/structured-agent-session-launch-close-race.test.ts b/src/renderer/src/lib/structured-agent-session-launch-close-race.test.ts
index a696ea5abb5f..acd00b82cab4 100644
--- a/src/renderer/src/lib/structured-agent-session-launch-close-race.test.ts
+++ b/src/renderer/src/lib/structured-agent-session-launch-close-race.test.ts
@@ -9,6 +9,7 @@ import type { StructuredAgentSessionLaunchIntent } from '@/lib/launch-structured
 const mocks = vi.hoisted(() => ({
   abandonIntent: vi.fn(),
   callStructuredAgentSession: vi.fn(),
+  callRuntimeRpc: vi.fn(),
   createIntent: vi.fn(),
   retryIntent: vi.fn(),
   restoreIntent: vi.fn(),
@@ -53,6 +54,11 @@ vi.mock('@/runtime/structured-agent-session-client', () => ({
   callStructuredAgentSession: mocks.callStructuredAgentSession
 }))
 
+vi.mock('@/runtime/runtime-rpc-client', () => ({
+  callRuntimeRpc: mocks.callRuntimeRpc,
+  ensureRuntimeEnvironmentCompatible: vi.fn(async () => undefined)
+}))
+
 vi.mock('@/store', () => ({
   useAppStore: {
     getState: () => ({
@@ -88,7 +94,13 @@ import {
   hasStructuredAgentSessionLaunchCancellationTombstone,
   startStructuredAgentLaunch
 } from './structured-agent-session-launch'
-import { readOutbox } from '@/components/native-chat/structured-agent-session-outbox-storage'
+import { resetStructuredAgentSessionSendsForTests } from '@/components/native-chat/structured-agent-session-message-sender'
+import {
+  clearNativeChatDraftCacheForTests,
+  readNativeChatDraftCache
+} from '@/components/native-chat/native-chat-draft-cache'
+import { structuredAgentSessionDraftScopeKey } from '@/components/native-chat/native-chat-composer-draft-store'
+import { hasStagedStructuredLaunchPrompt } from './structured-agent-session-launch-prompt'
 import { resetStructuredAgentLaunchPersistenceForTests } from './structured-agent-session-launch-persistence'
 import { resetStructuredAgentLaunchRegistryForTests } from './structured-agent-session-launch-registry'
 
@@ -127,6 +139,8 @@ describe('a close that races a structured launch', () => {
     localStorage.clear()
     resetStructuredAgentLaunchPersistenceForTests()
     resetStructuredAgentLaunchRegistryForTests()
+    resetStructuredAgentSessionSendsForTests()
+    clearNativeChatDraftCacheForTests()
     mocks.rendererTabs = {}
     mocks.listeners.clear()
     mocks.createIntent.mockImplementation((worktreeId: string, agent: 'claude' | 'codex') => {
@@ -147,6 +161,10 @@ describe('a close that races a structured launch', () => {
       ok: true,
       page: { fence: 1 }
     })
+    mocks.callRuntimeRpc.mockResolvedValue({
+      ok: true,
+      value: { submission: { dispatchState: 'accepted' } }
+    })
   })
 
   it('cancels a close-racing launch without retrying or toasting', async () => {
@@ -196,12 +214,16 @@ describe('a close that races a structured launch', () => {
       prompt: 'first prompt'
     })
     await vi.waitFor(() => expect(refreshLocalStructuredSessionTabs).toHaveBeenCalledOnce())
-    expect(readOutbox(intent.sessionId)).toHaveLength(1)
+    expect(hasStagedStructuredLaunchPrompt(intent.sessionId)).toBe(true)
 
     expect(cancelStructuredAgentLaunch(worktreeId, intent.sessionId)).toBe(true)
-    expect(readOutbox(intent.sessionId)).toEqual([])
+    expect(hasStagedStructuredLaunchPrompt(intent.sessionId)).toBe(false)
     resolveRefresh([])
     await flushLaunchSettlement()
+
+    // Neither sent nor given back to the closed chat's composer.
+    expect(mocks.callRuntimeRpc).not.toHaveBeenCalled()
+    expect(readNativeChatDraftCache(structuredAgentSessionDraftScopeKey(intent.sessionId))).toBe('')
   })
 
   it('suppresses a close that races the retry verification catch', async () => {
diff --git a/src/renderer/src/lib/structured-agent-session-launch-different-request.test.ts b/src/renderer/src/lib/structured-agent-session-launch-different-request.test.ts
index 338e5ec8ad69..3af0c1d4d4c2 100644
--- a/src/renderer/src/lib/structured-agent-session-launch-different-request.test.ts
+++ b/src/renderer/src/lib/structured-agent-session-launch-different-request.test.ts
@@ -6,7 +6,7 @@ import type { StructuredAgentSessionLaunchIntent } from '@/lib/launch-structured
 
 const mocks = vi.hoisted(() => ({
   abandonIntent: vi.fn(),
-  callStructuredAgentSession: vi.fn(),
+  callRuntimeRpc: vi.fn(),
   createIntent: vi.fn(),
   retryIntent: vi.fn(),
   restoreIntent: vi.fn(),
@@ -34,7 +34,14 @@ vi.mock('@/runtime/local-structured-session-tabs-sync', () => ({
 }))
 
 vi.mock('@/runtime/structured-agent-session-client', () => ({
-  callStructuredAgentSession: mocks.callStructuredAgentSession
+  // Sends reach the runtime RPC through this wrapper, as in the app.
+  callStructuredAgentSession: (target: unknown, method: string, params?: unknown) =>
+    mocks.callRuntimeRpc(target, method, params)
+}))
+
+vi.mock('@/runtime/runtime-rpc-client', () => ({
+  callRuntimeRpc: mocks.callRuntimeRpc,
+  ensureRuntimeEnvironmentCompatible: vi.fn(async () => undefined)
 }))
 
 vi.mock('@/store', () => ({
@@ -59,9 +66,10 @@ vi.mock('@/lib/agent-catalog', () => ({
 
 import { refreshLocalStructuredSessionTabs } from '@/runtime/local-structured-session-tabs-sync'
 import {
-  appendStructuredAgentSessionOutboxMessage,
-  readOutbox
-} from '@/components/native-chat/structured-agent-session-outbox-storage'
+  resetStructuredAgentSessionSendsForTests,
+  sendStructuredAgentSessionMessage
+} from '@/components/native-chat/structured-agent-session-message-sender'
+import { getStructuredAgentSessionPendingSends } from '@/components/native-chat/structured-agent-session-pending-sends'
 import {
   clearNativeChatDraftCacheForTests,
   readNativeChatDraftCache,
@@ -73,6 +81,10 @@ import {
   getStructuredAgentSessionLaunchLifecycle,
   startStructuredAgentLaunch
 } from './structured-agent-session-launch'
+import {
+  discardStructuredLaunchPrompts,
+  hasStagedStructuredLaunchPrompt
+} from './structured-agent-session-launch-prompt'
 import { resetStructuredAgentLaunchPersistenceForTests } from './structured-agent-session-launch-persistence'
 import { resetStructuredAgentLaunchRegistryForTests } from './structured-agent-session-launch-registry'
 
@@ -120,9 +132,18 @@ function publishedSnapshot(...sessionIds: string[]): RuntimeMobileSessionTabsRes
 const first = launchIntent('session-first')
 const second = launchIntent('session-second')
 
+/** Clears what earlier tests' launches still hold in memory under these chats. */
+function resetSends(): void {
+  resetStructuredAgentSessionSendsForTests()
+  clearNativeChatDraftCacheForTests()
+  for (const sessionId of ['session-first', 'session-second', 'session-third']) {
+    discardStructuredLaunchPrompts(sessionId)
+  }
+}
+
 /** Every `agentSession.send` as [session, text]. */
 function sends(): [string, string][] {
-  return mocks.callStructuredAgentSession.mock.calls
+  return mocks.callRuntimeRpc.mock.calls
     .filter((call) => call[1] === 'agentSession.send')
     .map((call) => [call[2].envelope.sessionId, call[2].body.blocks[0].text])
 }
@@ -135,6 +156,7 @@ describe('a different action while the first chat is still starting', () => {
     localStorage.clear()
     resetStructuredAgentLaunchPersistenceForTests()
     resetStructuredAgentLaunchRegistryForTests()
+    resetSends()
     mocks.createIntent.mockReturnValueOnce(first).mockReturnValueOnce(second)
     mocks.launch.mockImplementation((intent: StructuredAgentSessionLaunchIntent) =>
       intent.sessionId === first.sessionId
@@ -144,7 +166,7 @@ describe('a different action while the first chat is still starting', () => {
     vi.mocked(refreshLocalStructuredSessionTabs).mockResolvedValue([
       publishedSnapshot(first.sessionId, second.sessionId)
     ])
-    mocks.callStructuredAgentSession.mockResolvedValue({
+    mocks.callRuntimeRpc.mockResolvedValue({
       ok: true,
       value: { submission: { dispatchState: 'accepted' } }
     })
@@ -180,7 +202,7 @@ describe('a different action while the first chat is still starting', () => {
 
   it('opens a new chat with its own text while the first chat is still sending its text', async () => {
     let resolveFirstSend!: (result: unknown) => void
-    mocks.callStructuredAgentSession.mockImplementationOnce(
+    mocks.callRuntimeRpc.mockImplementationOnce(
       () => new Promise((resolve) => (resolveFirstSend = resolve))
     )
     const checkA = startStructuredAgentLaunch(WORKTREE_ID, 'codex', {
@@ -249,11 +271,12 @@ describe('one action delivered twice while its chat is still starting', () => {
     localStorage.clear()
     resetStructuredAgentLaunchPersistenceForTests()
     resetStructuredAgentLaunchRegistryForTests()
+    resetSends()
     mocks.createIntent.mockReturnValueOnce(first).mockReturnValueOnce(second)
     vi.mocked(refreshLocalStructuredSessionTabs).mockResolvedValue([
       publishedSnapshot(first.sessionId, second.sessionId)
     ])
-    mocks.callStructuredAgentSession.mockResolvedValue({
+    mocks.callRuntimeRpc.mockResolvedValue({
       ok: true,
       value: { submission: { dispatchState: 'accepted' } }
     })
@@ -331,7 +354,7 @@ describe('one action delivered twice while its chat is still starting', () => {
       })
     }
     expect(sends()).toEqual([[first.sessionId, 'Fix check A (logs at 10:00)']])
-    expect(readOutbox(first.sessionId)).toEqual([])
+    expect(hasStagedStructuredLaunchPrompt(first.sessionId)).toBe(false)
   })
 
   it('seeds a repeated draft once', () => {
@@ -373,9 +396,11 @@ describe('one action delivered twice while its chat is still starting', () => {
 
     expect(reclick.sessionId).toBe(second.sessionId)
     expect(getStructuredAgentSessionLaunchLifecycle(WORKTREE_ID, first.sessionId)).toBe('failed')
-    expect(readOutbox(second.sessionId).map((entry) => entry.body.blocks)).toEqual([
-      [{ type: 'text', text: 'Fix check A' }]
-    ])
+    expect(hasStagedStructuredLaunchPrompt(second.sessionId)).toBe(true)
+    // The failed chat's text waits in its own composer.
+    expect(readNativeChatDraftCache(structuredAgentSessionDraftScopeKey(first.sessionId))).toBe(
+      'Fix check A'
+    )
   })
 })
 
@@ -393,6 +418,7 @@ describe('an empty chat still starting', () => {
     localStorage.clear()
     resetStructuredAgentLaunchPersistenceForTests()
     resetStructuredAgentLaunchRegistryForTests()
+    resetSends()
     mocks.createIntent
       .mockReturnValueOnce(first)
       .mockReturnValueOnce(second)
@@ -406,7 +432,7 @@ describe('an empty chat still starting', () => {
     vi.mocked(refreshLocalStructuredSessionTabs).mockResolvedValue([
       publishedSnapshot(first.sessionId, second.sessionId, third.sessionId)
     ])
-    mocks.callStructuredAgentSession.mockResolvedValue({
+    mocks.callRuntimeRpc.mockResolvedValue({
       ok: true,
       value: { submission: { dispatchState: 'accepted' } }
     })
@@ -500,7 +526,17 @@ describe('an empty chat still starting', () => {
 
   it('leaves a chat its user already sent into to them, and opens a new chat for the notes', async () => {
     const blank = startStructuredAgentLaunch(WORKTREE_ID, 'codex', { requestId: 'plus-pick' })
-    appendStructuredAgentSessionOutboxMessage(blank.sessionId, 'my own question')
+    // The chat is not up yet, so its user's own send is still waiting on it.
+    mocks.callRuntimeRpc.mockImplementation((_target, method) =>
+      method === 'agentSession.history'
+        ? new Promise(() => undefined)
+        : Promise.resolve({ ok: true, value: { submission: { dispatchState: 'accepted' } } })
+    )
+    sendStructuredAgentSessionMessage({
+      sessionId: blank.sessionId,
+      target: { kind: 'local' },
+      text: 'my own question'
+    })
 
     const notes = startStructuredAgentLaunch(WORKTREE_ID, 'codex', notesSend)
 
@@ -510,9 +546,9 @@ describe('an empty chat still starting', () => {
       failureNotified: false
     })
     expect(sends()).toEqual([[second.sessionId, 'review notes']])
-    expect(readOutbox(blank.sessionId).map((entry) => entry.body.blocks)).toEqual([
-      [{ type: 'text', text: 'my own question' }]
-    ])
+    expect(
+      getStructuredAgentSessionPendingSends(blank.sessionId).map((entry) => entry.body.blocks)
+    ).toEqual([[{ type: 'text', text: 'my own question' }]])
   })
 
   it('leaves a chat its user is typing into to them, and opens a new chat for the notes', async () => {
@@ -528,35 +564,8 @@ describe('an empty chat still starting', () => {
       delivered: true,
       failureNotified: false
     })
-    expect(readOutbox(blank.sessionId)).toEqual([])
+    expect(getStructuredAgentSessionPendingSends(blank.sessionId)).toEqual([])
+    expect(hasStagedStructuredLaunchPrompt(blank.sessionId)).toBe(false)
     expect(readNativeChatDraftCache(paneKey)).toBe('half a question')
   })
-
-  it('opens a new chat that shows the failure when the claiming text cannot be saved', async () => {
-    const blank = startStructuredAgentLaunch(WORKTREE_ID, 'codex', { requestId: 'plus-pick' })
-    const storageFailure = vi.spyOn(localStorage, 'setItem').mockImplementation(() => {
-      throw new Error('storage unavailable')
-    })
-    const notes = startStructuredAgentLaunch(WORKTREE_ID, 'codex', notesSend)
-    storageFailure.mockRestore()
-
-    // The new chat fails with its Retry line, the failure the caller is told was shown.
-    expect(notes.sessionId).toBe(second.sessionId)
-    await expect(notes.launchResult).rejects.toBeInstanceOf(
-      StructuredAgentSessionCreateRefusalError
-    )
-    await expect(notes.promptDeliveryResult).resolves.toEqual({
-      delivered: false,
-      failureNotified: true
-    })
-    expect(getStructuredAgentSessionLaunchLifecycle(WORKTREE_ID, second.sessionId)).toBe('failed')
-    // No claim was recorded: the empty chat is still the pick's, and still claimable.
-    expect(
-      startStructuredAgentLaunch(WORKTREE_ID, 'codex', { requestId: 'plus-pick' }).sessionId
-    ).toBe(blank.sessionId)
-    expect(
-      startStructuredAgentLaunch(WORKTREE_ID, 'codex', { ...notesSend, requestId: 'notes-retry' })
-        .sessionId
-    ).toBe(blank.sessionId)
-  })
 })
diff --git a/src/renderer/src/lib/structured-agent-session-launch-empty-chat.ts b/src/renderer/src/lib/structured-agent-session-launch-empty-chat.ts
index fb2fd2f9e414..b90c1112ca0c 100644
--- a/src/renderer/src/lib/structured-agent-session-launch-empty-chat.ts
+++ b/src/renderer/src/lib/structured-agent-session-launch-empty-chat.ts
@@ -1,4 +1,5 @@
-import { getStructuredAgentSessionOutbox } from '@/components/native-chat/structured-agent-session-outbox-storage'
+import { getStructuredAgentSessionPendingSends } from '@/components/native-chat/structured-agent-session-pending-sends'
+import { hasStagedStructuredLaunchPrompt } from './structured-agent-session-launch-prompt'
 import { readNativeChatDraftCache } from '@/components/native-chat/native-chat-draft-cache'
 // The draft store, not the composer hook: the launch must not load the composer (a store cycle).
 import {
@@ -15,7 +16,8 @@ export function isStructuredLaunchChatEmpty(sessionId: string): boolean {
   const scopeKey = structuredAgentSessionDraftScopeKey(sessionId)
   return (
     !isNativeChatComposerDraftLoadPending() &&
-    getStructuredAgentSessionOutbox(sessionId).length === 0 &&
+    getStructuredAgentSessionPendingSends(sessionId).length === 0 &&
+    !hasStagedStructuredLaunchPrompt(sessionId) &&
     readNativeChatDraftCache(scopeKey).trim() === '' &&
     readNativeChatComposerDraft(scopeKey).images.length === 0
   )
diff --git a/src/renderer/src/lib/structured-agent-session-launch-join-delivery.test.ts b/src/renderer/src/lib/structured-agent-session-launch-join-delivery.test.ts
index a810264db667..4b8cff4a0f79 100644
--- a/src/renderer/src/lib/structured-agent-session-launch-join-delivery.test.ts
+++ b/src/renderer/src/lib/structured-agent-session-launch-join-delivery.test.ts
@@ -7,6 +7,7 @@ import type * as RecoveryModule from '@/lib/structured-agent-session-launch-reco
 const mocks = vi.hoisted(() => ({
   abandonIntent: vi.fn(),
   callStructuredAgentSession: vi.fn(),
+  callRuntimeRpc: vi.fn(),
   createIntent: vi.fn(),
   launch: vi.fn(),
   seedDraft: vi.fn(),
@@ -42,6 +43,11 @@ vi.mock('@/runtime/structured-agent-session-client', () => ({
   callStructuredAgentSession: mocks.callStructuredAgentSession
 }))
 
+vi.mock('@/runtime/runtime-rpc-client', () => ({
+  callRuntimeRpc: mocks.callRuntimeRpc,
+  ensureRuntimeEnvironmentCompatible: vi.fn(async () => undefined)
+}))
+
 vi.mock('@/store', () => ({
   useAppStore: {
     getState: () => ({
@@ -73,7 +79,7 @@ import {
   startStructuredAgentLaunch,
   type StructuredAgentLaunchOptions
 } from './structured-agent-session-launch'
-import { readOutbox } from '@/components/native-chat/structured-agent-session-outbox-storage'
+import { hasStagedStructuredLaunchPrompt } from './structured-agent-session-launch-prompt'
 
 function launchIntent(worktreeId: string, sessionId: string): StructuredAgentSessionLaunchIntent {
   return {
@@ -129,6 +135,10 @@ describe('coalesced launch delivery mode', () => {
     mocks.rendererTabs = {}
     mocks.listeners.clear()
     mocks.callStructuredAgentSession.mockResolvedValue({ ok: true, page: { fence: 1 } })
+    mocks.callRuntimeRpc.mockResolvedValue({
+      ok: true,
+      value: { submission: { dispatchState: 'accepted' } }
+    })
   })
 
   async function coalesce(args: {
@@ -173,11 +183,11 @@ describe('coalesced launch delivery mode', () => {
     })
 
     // Why: an unset established mode must not read as submit; the joiner never consented to send.
-    expect(readOutbox(intent.sessionId)).toEqual([])
+    expect(hasStagedStructuredLaunchPrompt(intent.sessionId)).toBe(false)
     expect(joiner.promptDeliveryResult).toBeUndefined()
-    expect(
-      mocks.callStructuredAgentSession.mock.calls.some((call) => call[1] === 'agentSession.send')
-    ).toBe(false)
+    expect(mocks.callRuntimeRpc.mock.calls.some((call) => call[1] === 'agentSession.send')).toBe(
+      false
+    )
     expect(mocks.seedDraft).toHaveBeenLastCalledWith(
       expect.objectContaining({
         tabId: 'structured-agent-session-unset-delivery-session',
diff --git a/src/renderer/src/lib/structured-agent-session-launch-message.ts b/src/renderer/src/lib/structured-agent-session-launch-message.ts
new file mode 100644
index 000000000000..e31de65c8a85
--- /dev/null
+++ b/src/renderer/src/lib/structured-agent-session-launch-message.ts
@@ -0,0 +1,41 @@
+// A message sent to a chat whose start failed: it restarts the chat and goes as the restart's first
+// message, holding the chat's one send slot from now until the chat exists, as a launch prompt does.
+
+import { addStructuredLaunchCaller } from './structured-agent-session-launch-callers'
+import {
+  stageStructuredLaunchPrompt,
+  type StructuredPromptDeliveryResult
+} from './structured-agent-session-launch-prompt'
+import {
+  getStructuredAgentSessionLaunchLifecycle,
+  getStructuredLaunchStateBySessionId
+} from './structured-agent-session-launch-registry'
+import { retryStructuredAgentSessionLaunch } from './structured-agent-session-launch'
+import { newAgentLaunchRequestId } from './agent-launch-request-id'
+
+/** Null when the chat's start has not failed, or its restart could not begin. */
+export function relaunchFailedStructuredAgentSessionWithMessage(
+  worktreeId: string,
+  sessionId: string,
+  text: string,
+  options: { callerKeepsText?: true } = {}
+): Promise<StructuredPromptDeliveryResult> | null {
+  if (
+    getStructuredAgentSessionLaunchLifecycle(worktreeId, sessionId) !== 'failed' ||
+    !retryStructuredAgentSessionLaunch(worktreeId, sessionId)
+  ) {
+    return null
+  }
+  const state = getStructuredLaunchStateBySessionId(sessionId)
+  if (!state) {
+    return null
+  }
+  const caller = addStructuredLaunchCaller({
+    group: state.callers,
+    launchResult: state.promise,
+    target: state.intent.target,
+    options: { requestId: newAgentLaunchRequestId(), prompt: text },
+    stagedPrompt: stageStructuredLaunchPrompt(sessionId, text, options)
+  })
+  return caller.promptDeliveryResult ?? null
+}
diff --git a/src/renderer/src/lib/structured-agent-session-launch-prompt-stop.test.ts b/src/renderer/src/lib/structured-agent-session-launch-prompt-stop.test.ts
new file mode 100644
index 000000000000..df96ac036f35
--- /dev/null
+++ b/src/renderer/src/lib/structured-agent-session-launch-prompt-stop.test.ts
@@ -0,0 +1,196 @@
+// @vitest-environment happy-dom
+// A Stop pressed while a new chat starts, through the chat's own Stop control.
+
+import { beforeEach, describe, expect, it, vi } from 'vitest'
+
+const mocks = vi.hoisted(() => ({ call: vi.fn() }))
+
+vi.mock('@/runtime/runtime-rpc-client', () => ({
+  callRuntimeRpc: mocks.call,
+  ensureRuntimeEnvironmentCompatible: vi.fn(async () => undefined)
+}))
+
+vi.mock('@/runtime/structured-agent-session-client', () => ({
+  callStructuredAgentSession: (target: unknown, method: string, params?: unknown) =>
+    mocks.call(target, method, params)
+}))
+
+import {
+  resetStructuredAgentSessionSendsForTests,
+  stopStructuredAgentSessionSends
+} from '@/components/native-chat/structured-agent-session-message-sender'
+import {
+  clearNativeChatDraftCacheForTests,
+  readNativeChatDraftCache,
+  subscribeToNativeChatDraftAppend
+} from '@/components/native-chat/native-chat-draft-cache'
+import { structuredAgentSessionDraftScopeKey } from '@/components/native-chat/native-chat-composer-draft-store'
+import {
+  getStructuredAgentSessionPendingSends,
+  getStructuredAgentSessionSendNotice,
+  structuredAgentSessionSendOut
+} from '@/components/native-chat/structured-agent-session-pending-sends'
+import { structuredAgentSessionStopControl } from '@/components/native-chat/structured-agent-session-stop-control'
+import {
+  discardStructuredLaunchPrompts,
+  hasStagedStructuredLaunchPrompt,
+  settleStructuredAgentLaunchPrompt,
+  stageStructuredLaunchPrompt,
+  takeBackStructuredLaunchPrompts
+} from './structured-agent-session-launch-prompt'
+import { newAgentPromptOutcome } from './new-agent-prompt-outcome'
+
+const SESSION = 'session-1'
+const target = { kind: 'local' } as const
+
+function accepted(clientMessageId: string) {
+  return {
+    ok: true,
+    replayed: false,
+    fence: 1,
+    cursor: { epoch: 'epoch-1', sequence: 1 },
+    value: {
+      clientMessageId,
+      submission: {
+        clientMessageId,
+        fence: 1,
+        payloadFingerprint: 'fingerprint',
+        dispatchState: 'accepted',
+        providerItemId: null,
+        reason: null,
+        submittedAt: 1,
+        resolvedAt: null
+      }
+    }
+  }
+}
+
+const sends = () => mocks.call.mock.calls.filter(([, method]) => method === 'agentSession.send')
+const draft = () => readNativeChatDraftCache(structuredAgentSessionDraftScopeKey(SESSION))
+
+async function flush(): Promise<void> {
+  for (let i = 0; i < 20; i++) {
+    await Promise.resolve()
+  }
+}
+
+/** A launch whose chat publishes only when the test says so. */
+function launchFor(text: string, options: { callerKeepsText?: true } = {}) {
+  let publish: () => void = () => {}
+  const launchResult = new Promise<{ sessionId: string; fence: number }>((resolve) => {
+    publish = () => resolve({ sessionId: SESSION, fence: 1 })
+  })
+  const settled = settleStructuredAgentLaunchPrompt({
+    launchResult,
+    target,
+    options: { prompt: text },
+    stagedPrompt: stageStructuredLaunchPrompt(SESSION, text, options)
+  })
+  if (!settled) {
+    throw new Error('expected a delivery for an auto-submitted prompt')
+  }
+  return { settled, publish }
+}
+
+/** The chat's Stop while its host has not published it to this view. */
+function unpublishedStop(stopSends = () => stopStructuredAgentSessionSends(SESSION)) {
+  const hostStop = vi.fn(async () => null)
+  const control = structuredAgentSessionStopControl({
+    published: false,
+    host: { stopsConversation: true, stop: hostStop },
+    transportState: { turnId: null, isWorking: false },
+    sends: {
+      sending: getStructuredAgentSessionPendingSends(SESSION).some(
+        (entry) => entry.phase === 'sending'
+      ),
+      stopSends,
+      takeBackLaunchText: () => takeBackStructuredLaunchPrompts(SESSION)
+    }
+  })
+  return { control, hostStop }
+}
+
+describe('Stop before a new chat is published', () => {
+  beforeEach(() => {
+    vi.clearAllMocks()
+    localStorage.clear()
+    resetStructuredAgentSessionSendsForTests()
+    clearNativeChatDraftCacheForTests()
+    discardStructuredLaunchPrompts(SESSION)
+    mocks.call.mockImplementation(async (_target, _method, params) =>
+      accepted(params.envelope.clientOperationId)
+    )
+  })
+
+  it("leaves a notes launch's text with its notes, frees the chat, and never sends it", async () => {
+    const launch = launchFor('note text', { callerKeepsText: true })
+    const outcome = newAgentPromptOutcome({ delivery: launch.settled })
+    const { control, hostStop } = unpublishedStop()
+
+    expect(control.canStop).toBe(true)
+    await control.stop()
+    launch.publish()
+
+    await expect(launch.settled).resolves.toEqual({ delivered: false, failureNotified: true })
+    // Not delivered and no failure to report: the notes keep their text, with no toast.
+    await expect(outcome).resolves.toEqual({ delivered: false })
+    await flush()
+    expect(draft()).toBe('')
+    expect(sends()).toHaveLength(0)
+    expect(hostStop).not.toHaveBeenCalled()
+    expect(structuredAgentSessionSendOut(SESSION)).toBe(false)
+    expect(hasStagedStructuredLaunchPrompt(SESSION)).toBe(false)
+  })
+
+  it("leaves a launch whose request is already out to settle from the host's answer", async () => {
+    let answer: () => void = () => {}
+    mocks.call.mockImplementation(
+      (_target, _method, params) =>
+        new Promise((resolve) => {
+          answer = () => resolve(accepted(params.envelope.clientOperationId))
+        })
+    )
+    const launch = launchFor('hi')
+    launch.publish()
+    await flush()
+    expect(sends()).toHaveLength(1)
+    const { control } = unpublishedStop()
+
+    expect(control.canStop).toBe(true)
+    await control.stop()
+    expect(draft()).toBe('')
+
+    answer()
+    await expect(launch.settled).resolves.toMatchObject({ delivered: true })
+    expect(draft()).toBe('')
+    expect(sends()).toHaveLength(1)
+  })
+
+  // Bookkeeping never gates a Stop: a draft write that throws is reported, and the Stop goes on.
+  it("still stops the chat's sends and says so when putting the text back throws", async () => {
+    const report = vi.spyOn(console, 'error').mockImplementation(() => {})
+    const unsubscribe = subscribeToNativeChatDraftAppend(
+      structuredAgentSessionDraftScopeKey(SESSION),
+      () => {
+        throw new Error('draft listener failed')
+      }
+    )
+    const launch = launchFor('hello')
+    const stopSends = vi.fn(() => stopStructuredAgentSessionSends(SESSION))
+    const { control } = unpublishedStop(stopSends)
+
+    await expect(control.stop()).resolves.toBeNull()
+    unsubscribe()
+    launch.publish()
+
+    expect(stopSends).toHaveBeenCalledTimes(1)
+    expect(getStructuredAgentSessionSendNotice(SESSION)).toContain("Couldn't save your message.")
+    expect(report).toHaveBeenCalledTimes(1)
+    await expect(launch.settled).resolves.toEqual({ delivered: false, failureNotified: true })
+    await flush()
+    expect(sends()).toHaveLength(0)
+    expect(structuredAgentSessionSendOut(SESSION)).toBe(false)
+    expect(hasStagedStructuredLaunchPrompt(SESSION)).toBe(false)
+    report.mockRestore()
+  })
+})
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 41732df5e69b..c538b9ced5e6 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,93 +1,322 @@
 // @vitest-environment happy-dom
 
 import { beforeEach, describe, expect, it, vi } from 'vitest'
-import {
-  enqueueStructuredAgentSessionLaunchPrompt,
-  mutateStructuredAgentSessionLaunchPrompt
-} from '@/components/native-chat/structured-agent-session-outbox-storage'
 
 const mocks = vi.hoisted(() => ({ call: vi.fn() }))
 
+vi.mock('@/runtime/runtime-rpc-client', () => ({
+  callRuntimeRpc: mocks.call,
+  ensureRuntimeEnvironmentCompatible: vi.fn(async () => undefined)
+}))
+
 vi.mock('@/runtime/structured-agent-session-client', () => ({
-  callStructuredAgentSession: mocks.call
+  // Sends reach the runtime RPC through this wrapper, as in the app.
+  callStructuredAgentSession: (target: unknown, method: string, params?: unknown) =>
+    mocks.call(target, method, params)
 }))
 
-import { settleStructuredAgentLaunchPrompt } from './structured-agent-session-launch-prompt'
+import {
+  resetStructuredAgentSessionSendsForTests,
+  sendStructuredAgentSessionMessage,
+  settleStructuredAgentSessionSendsFromJournal
+} from '@/components/native-chat/structured-agent-session-message-sender'
+import {
+  clearNativeChatDraftCacheForTests,
+  readNativeChatDraftCache
+} from '@/components/native-chat/native-chat-draft-cache'
+import { structuredAgentSessionDraftScopeKey } from '@/components/native-chat/native-chat-composer-draft-store'
+import {
+  getStructuredAgentSessionPendingSends,
+  subscribeToStructuredAgentSessionPendingSends
+} from '@/components/native-chat/structured-agent-session-pending-sends'
+import {
+  discardStructuredLaunchPrompts,
+  hasStagedStructuredLaunchPrompt,
+  settleStructuredAgentLaunchPrompt,
+  stageStructuredLaunchPrompt,
+  takeBackStructuredLaunchPrompts
+} from './structured-agent-session-launch-prompt'
+
+const SESSION = 'session-1'
+const target = { kind: 'local' } as const
+
+function accepted(clientMessageId: string) {
+  return {
+    ok: true,
+    replayed: false,
+    fence: 1,
+    cursor: { epoch: 'epoch-1', sequence: 1 },
+    value: {
+      clientMessageId,
+      submission: {
+        clientMessageId,
+        fence: 1,
+        payloadFingerprint: 'fingerprint',
+        dispatchState: 'accepted',
+        providerItemId: null,
+        reason: null,
+        submittedAt: 1,
+        resolvedAt: null
+      }
+    }
+  }
+}
+
+function sends(): unknown[][] {
+  return mocks.call.mock.calls.filter(([, method]) => method === 'agentSession.send')
+}
+
+function pendingTexts(): string[] {
+  return getStructuredAgentSessionPendingSends(SESSION).map(
+    (entry) =>
+      `${entry.body.blocks.map((block) => (block.type === 'text' ? block.text : '')).join('')}:${entry.phase}`
+  )
+}
+
+function draft(): string {
+  return readNativeChatDraftCache(structuredAgentSessionDraftScopeKey(SESSION))
+}
 
 describe('settleStructuredAgentLaunchPrompt', () => {
   beforeEach(() => {
     vi.clearAllMocks()
     localStorage.clear()
-    vi.spyOn(globalThis.crypto, 'randomUUID').mockReturnValue(
-      '11111111-1111-4111-8111-111111111111'
+    resetStructuredAgentSessionSendsForTests()
+    clearNativeChatDraftCacheForTests()
+    discardStructuredLaunchPrompts(SESSION)
+    mocks.call.mockImplementation(async (_target, _method, params) =>
+      accepted(params.envelope.clientOperationId)
     )
   })
 
-  it('reports an admitted launch prompt delivered while retaining it for the provider echo', async () => {
-    const stagedEntry = enqueueStructuredAgentSessionLaunchPrompt('session-1', 'review this')
+  it('sends the prompt once after the launch publishes, under its receipt fence', async () => {
+    const stagedPrompt = stageStructuredLaunchPrompt(SESSION, 'review this')
     const onPromptDelivered = vi.fn()
-    mocks.call.mockResolvedValue({
-      ok: true,
-      replayed: false,
-      fence: 1,
-      cursor: { epoch: 'epoch-1', sequence: 1 },
-      value: {
-        clientMessageId: stagedEntry!.clientMessageId,
-        submission: {
-          clientMessageId: stagedEntry!.clientMessageId,
-          fence: 1,
-          payloadFingerprint: 'fingerprint',
-          dispatchState: 'pending',
-          providerItemId: null,
-          reason: null,
-          submittedAt: 1,
-          resolvedAt: null
-        }
-      }
-    })
 
     await expect(
       settleStructuredAgentLaunchPrompt({
-        launchResult: Promise.resolve({ sessionId: 'session-1', fence: 1 }),
-        target: { kind: 'local' },
+        launchResult: Promise.resolve({ sessionId: SESSION, fence: 7 }),
+        target,
         options: { prompt: 'review this', onPromptDelivered },
-        stagedEntry
+        stagedPrompt
       })
     ).resolves.toEqual({ delivered: true, failureNotified: false })
 
     expect(onPromptDelivered).toHaveBeenCalledOnce()
-    const persisted = JSON.parse(localStorage.getItem(localStorage.key(0)!) ?? '[]') as {
-      state: string
-    }[]
-    expect(persisted).toMatchObject([{ state: 'dispatching' }])
+    // The receipt's fence is known, so no history read precedes the send.
+    expect(mocks.call.mock.calls.map(([, method]) => method)).toEqual(['agentSession.send'])
+    expect(sends()[0]?.[2]).toMatchObject({
+      envelope: { sessionId: SESSION, expectedRuntimeFence: 7 },
+      body: { blocks: [{ type: 'text', text: 'review this' }] }
+    })
+    expect(hasStagedStructuredLaunchPrompt(SESSION)).toBe(false)
   })
 
-  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' }
+  it('shares one send between every caller waiting on the same staged prompt', async () => {
+    const stagedPrompt = stageStructuredLaunchPrompt(SESSION, 'review this')
+    const launchResult = Promise.resolve({ sessionId: SESSION, fence: 1 })
+    const settle = () =>
+      settleStructuredAgentLaunchPrompt({
+        launchResult,
+        target,
+        options: { prompt: 'review this' },
+        stagedPrompt
       })
-    )
+
+    const results = await Promise.all([settle(), settle()])
+
+    expect(results).toEqual([
+      { delivered: true, failureNotified: false },
+      { delivered: true, failureNotified: false }
+    ])
+    expect(sends()).toHaveLength(1)
+  })
+
+  it("puts the prompt in the chat's composer when the launch fails, and rethrows", async () => {
+    const stagedPrompt = stageStructuredLaunchPrompt(SESSION, 'review this')
+    const failure = new Error('create refused')
+
+    await expect(
+      settleStructuredAgentLaunchPrompt({
+        launchResult: Promise.reject(failure),
+        target,
+        options: { prompt: 'review this' },
+        stagedPrompt
+      })
+    ).rejects.toBe(failure)
+
+    expect(draft()).toBe('review this')
+    expect(sends()).toHaveLength(0)
+    expect(hasStagedStructuredLaunchPrompt(SESSION)).toBe(false)
+  })
+
+  it('neither sends nor gives back a prompt whose launch was cancelled', async () => {
+    const stagedPrompt = stageStructuredLaunchPrompt(SESSION, 'review this')
+    discardStructuredLaunchPrompts(SESSION)
+
+    await expect(
+      settleStructuredAgentLaunchPrompt({
+        launchResult: Promise.resolve({ sessionId: SESSION, fence: 1 }),
+        target,
+        options: { prompt: 'review this' },
+        stagedPrompt
+      })
+    ).resolves.toEqual({ delivered: false, failureNotified: true })
+    await expect(
+      settleStructuredAgentLaunchPrompt({
+        launchResult: Promise.reject(new Error('cancelled')),
+        target,
+        options: { prompt: 'review this' },
+        stagedPrompt
+      })
+    ).rejects.toThrow('cancelled')
+
+    expect(sends()).toHaveLength(0)
+    expect(draft()).toBe('')
+  })
+
+  it('gives a Stop before the chat is published its prompt back, and never sends it', async () => {
+    const stagedPrompt = stageStructuredLaunchPrompt(SESSION, 'review this')
+    let publish: (receipt: { sessionId: string; fence: number }) => void = () => {}
+    const settled = settleStructuredAgentLaunchPrompt({
+      launchResult: new Promise((resolve) => {
+        publish = resolve
+      }),
+      target,
+      options: { prompt: 'review this' },
+      stagedPrompt
+    })
+    expect(pendingTexts()).toEqual(['review this:sending'])
+
+    takeBackStructuredLaunchPrompts(SESSION)
+    publish({ sessionId: SESSION, fence: 1 })
+
+    await expect(settled).resolves.toEqual({ delivered: false, failureNotified: true })
+    expect(draft()).toBe('review this')
+    expect(pendingTexts()).toEqual([])
+    expect(sends()).toHaveLength(0)
+    expect(hasStagedStructuredLaunchPrompt(SESSION)).toBe(false)
+  })
+
+  it('reports a prompt the host refused as not delivered, with its text back in the composer', async () => {
+    const stagedPrompt = stageStructuredLaunchPrompt(SESSION, 'review this')
+    const onPromptDelivered = vi.fn()
     mocks.call.mockResolvedValue({
       ok: false,
       refusal: { code: 'agent_session_checkpoint_stale', message: 'stale' }
     })
 
-    await settleStructuredAgentLaunchPrompt({
-      launchResult: Promise.resolve({ sessionId: 'session-1', fence: 1 }),
-      target: { kind: 'local' },
+    await expect(
+      settleStructuredAgentLaunchPrompt({
+        launchResult: Promise.resolve({ sessionId: SESSION, fence: 1 }),
+        target,
+        options: { prompt: 'review this', onPromptDelivered },
+        stagedPrompt
+      })
+    ).resolves.toEqual({ delivered: false, failureNotified: false, inComposer: true })
+
+    expect(onPromptDelivered).not.toHaveBeenCalled()
+    expect(draft()).toBe('review this')
+  })
+
+  // The launch prompt is the chat's first message: drawn as sending from the click, nothing typed
+  // while the chat starts goes out ahead of it, and it goes out once the chat exists.
+  it('holds the chat for its prompt from the click, then sends that prompt first, once', async () => {
+    const stagedPrompt = stageStructuredLaunchPrompt(SESSION, 'review this')
+    expect(pendingTexts()).toEqual(['review this:sending'])
+    expect(
+      sendStructuredAgentSessionMessage({ sessionId: SESSION, target, text: 'typed meanwhile' })
+    ).toBeNull()
+    expect(sends()).toHaveLength(0)
+
+    let receive = (_receipt: { sessionId: string; fence: number }): void => {}
+    const settled = settleStructuredAgentLaunchPrompt({
+      launchResult: new Promise((resolve) => (receive = resolve)),
+      target,
       options: { prompt: 'review this' },
-      stagedEntry
+      stagedPrompt
     })
+    receive({ sessionId: SESSION, fence: 1 })
+    await expect(settled).resolves.toEqual({ delivered: true, failureNotified: false })
+    expect(sends()).toHaveLength(1)
+    expect(JSON.stringify(sends()[0])).toContain('review this')
+    expect(
+      sendStructuredAgentSessionMessage({ sessionId: SESSION, target, text: 'typed after' })
+    ).not.toBeNull()
+  })
 
-    const persisted: unknown = JSON.parse(localStorage.getItem(localStorage.key(0)!) ?? '[]')
-    expect(persisted).toHaveLength(1)
-    expect(persisted).not.toContainEqual(
-      expect.objectContaining({ lastFailure: expect.anything() })
+  it('gives the chat back its send slot when the launch is cancelled, sending nothing', () => {
+    stageStructuredLaunchPrompt(SESSION, 'review this')
+    discardStructuredLaunchPrompts(SESSION)
+    expect(pendingTexts()).toEqual([])
+    expect(sends()).toHaveLength(0)
+  })
+
+  // Once sent, the prompt's entry is the sender's: what it keeps after settling stays.
+  it('leaves in the chat a launch prompt the host recorded and a Stop then withdrew', async () => {
+    const stagedPrompt = stageStructuredLaunchPrompt(SESSION, 'review this')
+    mocks.call.mockImplementation(async (_target, _method, params) => {
+      const answer = accepted(params.envelope.clientOperationId)
+      answer.value.submission.dispatchState = 'pending'
+      return answer
+    })
+    await expect(
+      settleStructuredAgentLaunchPrompt({
+        launchResult: Promise.resolve({ sessionId: SESSION, fence: 1 }),
+        target,
+        options: { prompt: 'review this' },
+        stagedPrompt
+      })
+    ).resolves.toEqual({ delivered: true, failureNotified: false })
+    const promptId: string = mocks.call.mock.calls.find(
+      ([, method]) => method === 'agentSession.send'
+    )?.[2].envelope.clientOperationId
+
+    settleStructuredAgentSessionSendsFromJournal(
+      SESSION,
+      [
+        {
+          clientMessageId: promptId,
+          fence: 1,
+          payloadFingerprint: 'fingerprint',
+          dispatchState: 'rejected',
+          providerItemId: null,
+          reason: null,
+          rejection: { kind: 'cancelled' },
+          submittedAt: 1,
+          resolvedAt: 2
+        }
+      ],
+      []
     )
+    // The host's row draws it, with its stop row; the composer is left alone.
+    expect(draft()).toBe('')
+    expect(pendingTexts()).toEqual([])
+  })
+
+  it("keeps an open chat drawing its launch prompt until the prompt's row arrives", async () => {
+    const stop = subscribeToStructuredAgentSessionPendingSends(SESSION, () => {})
+    const stagedPrompt = stageStructuredLaunchPrompt(SESSION, 'review this')
+    await expect(
+      settleStructuredAgentLaunchPrompt({
+        launchResult: Promise.resolve({ sessionId: SESSION, fence: 1 }),
+        target,
+        options: { prompt: 'review this' },
+        stagedPrompt
+      })
+    ).resolves.toEqual({ delivered: true, failureNotified: false })
+    expect(pendingTexts()).toEqual(['review this:recorded'])
+    stop()
+  })
+
+  it('reports nothing for a draft, which the composer adopts instead', () => {
+    expect(
+      settleStructuredAgentLaunchPrompt({
+        launchResult: Promise.resolve({ sessionId: SESSION, fence: 1 }),
+        target,
+        options: { prompt: 'review this', promptDelivery: 'draft' },
+        stagedPrompt: null
+      })
+    ).toBeUndefined()
   })
 })
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 9540c844ab3b..0a5cd692c45a 100644
--- a/src/renderer/src/lib/structured-agent-session-launch-prompt.ts
+++ b/src/renderer/src/lib/structured-agent-session-launch-prompt.ts
@@ -1,26 +1,29 @@
-import type {
-  AgentSessionMutationResult,
-  AgentSessionSendResult
-} from '../../../shared/agent-session-wire'
+import { structuredAgentSessionSendBody } from '../../../shared/structured-agent-session-send-mutation'
+import { handBackStructuredAgentSessionMessage } from '@/components/native-chat/structured-agent-session-message-hand-back'
 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,
-  type StructuredAgentSessionLaunchPromptMutation
-} from '@/components/native-chat/structured-agent-session-outbox-storage'
-import { callStructuredAgentSession } from '@/runtime/structured-agent-session-client'
+  dropStructuredAgentSessionSends,
+  reserveStructuredAgentSessionSend,
+  sendStructuredAgentSessionMessage,
+  type StructuredAgentSessionReservedSend
+} from '@/components/native-chat/structured-agent-session-message-sender'
+import { noteStructuredAgentSessionFence } from '@/components/native-chat/structured-agent-session-send-attempt'
+import { publishStructuredAgentSessionSends } from '@/components/native-chat/structured-agent-session-pending-sends'
+import { agentSessionWriteNoticeText } from '@/components/native-chat/agent-session-write-notice-text'
 import type { RuntimeClientTarget } from '@/runtime/runtime-client-target'
-import { createBrowserUuid } from '@/lib/browser-uuid'
 
 export type StructuredPromptDeliveryResult = {
   delivered: boolean
   failureNotified: boolean
+  /** Not sent, and waiting in the new chat's composer, which now owns the text. */
+  inComposer?: true
+  /** Nobody could confirm it went: the host may hold it. */
+  unconfirmed?: true
+  /** Another send of the chat held its one slot, so this one never went. */
+  busy?: true
+}
+
+type StagedDelivery = Omit<StructuredPromptDeliveryResult, 'inComposer' | 'failureNotified'> & {
+  inComposer: boolean
 }
 
 export type StructuredLaunchPromptOptions = {
@@ -31,153 +34,196 @@ export type StructuredLaunchPromptOptions = {
 
 type LaunchReceipt = { sessionId: string; fence: number }
 
-type SharedDispatchStart = {
-  promise: Promise<boolean>
-  started: boolean
+/** A launch's text, held in memory from the click until its chat exists, then sent once: every
+ *  caller waiting on it shares the one send. From the click it holds the chat's one send slot, drawn
+ *  as sending, so nothing typed meanwhile goes out ahead of it. */
+export type StagedStructuredLaunchPrompt = {
+  sessionId: string
+  text: string
+  slot: StructuredAgentSessionReservedSend | null
+  /** Its sender keeps the text if it comes back (notes), instead of the chat's composer. */
+  callerKeepsText?: true
+  delivery?: Promise<StagedDelivery>
+  /** Its launch was cancelled: never sent, never given back. */
+  discarded?: true
+  /** Settles once it is discarded, so its callers need not wait on a create that may never end. */
+  whenDiscarded: Promise<void>
+  discard: () => void
 }
 
-// A provisional chat can mount before its launch settlement runs. Both paths own the same
-// persisted entry, so share the in-flight admission by operation id instead of issuing two RPCs.
-const inFlightDispatches = new Map<string, Promise<boolean>>()
-
-function dispatchKey(sessionId: string, clientMessageId: string, fence: number): string {
-  return `${sessionId}:${clientMessageId}:${fence}`
-}
+const staged = new Map<string, Set<StagedStructuredLaunchPrompt>>()
 
-export function getStructuredAgentLaunchPromptDispatch(
+export function stageStructuredLaunchPrompt(
   sessionId: string,
-  clientMessageId: string,
-  fence?: number
-): Promise<boolean> | undefined {
-  if (fence !== undefined) {
-    return inFlightDispatches.get(dispatchKey(sessionId, clientMessageId, fence))
+  text: string,
+  options: { callerKeepsText?: true } = {}
+): StagedStructuredLaunchPrompt {
+  let discard = (): void => {}
+  const whenDiscarded = new Promise<void>((resolve) => {
+    discard = resolve
+  })
+  const prompt: StagedStructuredLaunchPrompt = {
+    sessionId,
+    text,
+    slot: reserveStructuredAgentSessionSend({ sessionId, text, ...options }),
+    ...options,
+    whenDiscarded,
+    discard
   }
-  const prefix = `${sessionId}:${clientMessageId}:`
-  for (const [key, promise] of inFlightDispatches) {
-    if (key.startsWith(prefix)) {
-      return promise
-    }
+  const forSession = staged.get(sessionId) ?? new Set()
+  forSession.add(prompt)
+  staged.set(sessionId, forSession)
+  return prompt
+}
+
+function unstage(prompt: StagedStructuredLaunchPrompt): void {
+  prompt.slot?.release()
+  const forSession = staged.get(prompt.sessionId)
+  forSession?.delete(prompt)
+  if (forSession?.size === 0) {
+    staged.delete(prompt.sessionId)
   }
-  return undefined
 }
 
-export function shareStructuredAgentLaunchPromptDispatch(
-  sessionId: string,
-  clientMessageId: string,
-  fence: number,
-  start: () => Promise<boolean>
-): SharedDispatchStart {
-  const key = dispatchKey(sessionId, clientMessageId, fence)
-  const existing = inFlightDispatches.get(key)
-  if (existing) {
-    return { promise: existing, started: false }
+/** The launch was cancelled: what it staged is dropped with its chat. */
+export function discardStructuredLaunchPrompts(sessionId: string): void {
+  for (const prompt of staged.get(sessionId) ?? []) {
+    prompt.slot?.release()
+    prompt.discarded = true
+    prompt.discard()
   }
-  const promise = Promise.resolve().then(start)
-  inFlightDispatches.set(key, promise)
-  const clear = (): void => {
-    if (inFlightDispatches.get(key) === promise) {
-      inFlightDispatches.delete(key)
+  staged.delete(sessionId)
+}
+
+/** The chat is closing or its launch was cancelled: nothing it was sending goes out any more. */
+export function discardStructuredAgentSessionChatSends(sessionId: string): void {
+  discardStructuredLaunchPrompts(sessionId)
+  dropStructuredAgentSessionSends(sessionId)
+}
+
+/** A Stop before the chat is published: text its launch has not sent goes back to the composer,
+ *  never sent. The start itself goes on. */
+export function takeBackStructuredLaunchPrompts(sessionId: string): void {
+  for (const prompt of staged.get(sessionId) ?? []) {
+    if (prompt.delivery) {
+      continue
     }
+    unstage(prompt)
+    prompt.discarded = true
+    handBackStagedPrompt(prompt)
+    prompt.discard()
   }
-  void promise.then(clear, clear)
-  return { promise, started: true }
 }
 
-function mutateEntry(
-  entry: StructuredAgentSessionOutboxEntry,
-  update: StructuredAgentSessionLaunchPromptMutation,
-  options: { onlyIfSaved?: boolean } = {}
-): boolean {
-  return mutateStructuredAgentSessionLaunchPrompt(
-    entry.sessionId,
-    entry.clientMessageId,
-    update,
-    options
-  )
+/** Whether a launch still holds text for this chat that has not reached its host. */
+export function hasStagedStructuredLaunchPrompt(sessionId: string): boolean {
+  return (staged.get(sessionId)?.size ?? 0) > 0
 }
 
-async function dispatchStructuredLaunchPrompt(
-  entry: StructuredAgentSessionOutboxEntry,
-  receipt: LaunchReceipt,
-  target: RuntimeClientTarget
-): Promise<boolean> {
-  // Why: an unsaved stage must leave the entry queued; a held 'dispatching' copy is never drained.
-  if (
-    !mutateEntry(
-      entry,
-      (current) => stageStructuredAgentSessionOutboxEntryForSend(current, Date.now()),
-      { onlyIfSaved: true }
-    )
-  ) {
+/** Puts a launch's text in its chat's composer, unless its sender keeps it. True when it did; a
+ *  draft write that throws is reported in the chat instead, and never stops its caller. */
+function handBackStagedPrompt(prompt: StagedStructuredLaunchPrompt): boolean {
+  if (prompt.callerKeepsText) {
     return false
   }
   try {
-    const result = await callStructuredAgentSession<
-      AgentSessionMutationResult<AgentSessionSendResult>
-    >(target, 'agentSession.send', structuredAgentSessionSendRequest(entry, receipt.fence))
-    if (!result.ok) {
-      mutateEntry(entry, (current) =>
-        requeueStructuredAgentSessionSendRefusal(
-          current,
-          agentSessionRefusalFailure(result.refusal),
-          () => createStructuredAgentSessionOperationId(createBrowserUuid),
-          entry.lastAttemptAt !== null
-        )
-      )
-      return false
-    }
-    if ('queued' in result.value) {
-      // The host holds the draft; the outbox entry is spent.
-      mutateEntry(entry, () => null)
-      return true
-    }
-    const dispatchState = result.value.submission.dispatchState
-    mutateEntry(entry, (current) =>
-      dispatchState === 'accepted'
-        ? null
-        : {
-            ...current,
-            state:
-              dispatchState === 'unknown'
-                ? 'unconfirmed'
-                : dispatchState === 'pending'
-                  ? 'dispatching'
-                  : 'queued'
-          }
+    handBackStructuredAgentSessionMessage(
+      prompt.sessionId,
+      `launch-${prompt.sessionId}`,
+      structuredAgentSessionSendBody(prompt.text, [])
+    )
+    return true
+  } catch (error) {
+    console.error(
+      '[native-chat-send] a launch message could not be put back in the composer',
+      error
     )
-    return dispatchState === 'accepted' || dispatchState === 'pending'
-  } catch {
-    mutateEntry(entry, (current) => ({ ...current, state: 'unconfirmed' }))
+    publishStructuredAgentSessionSends(prompt.sessionId, {
+      notice: agentSessionWriteNoticeText(['messageNotSaved'])
+    })
     return false
   }
 }
 
+function sendStagedPrompt(
+  prompt: StagedStructuredLaunchPrompt,
+  receipt: LaunchReceipt,
+  target: RuntimeClientTarget
+): Promise<StagedDelivery> {
+  prompt.delivery ??= (async () => {
+    noteStructuredAgentSessionFence(prompt.sessionId, receipt.fence)
+    const sent =
+      prompt.slot?.send(target) ??
+      sendStructuredAgentSessionMessage({ sessionId: prompt.sessionId, target, text: prompt.text })
+    if (!sent) {
+      // Another send of the chat holds its slot: the launch text waits in the composer instead.
+      unstage(prompt)
+      return { delivered: false, inComposer: handBackStagedPrompt(prompt), busy: true }
+    }
+    try {
+      const outcome = await sent.outcome
+      return {
+        delivered: outcome === 'recorded',
+        inComposer:
+          !prompt.callerKeepsText && (outcome === 'returned' || outcome === 'unconfirmed'),
+        ...(outcome === 'unconfirmed' ? { unconfirmed: true as const } : {})
+      }
+    } finally {
+      unstage(prompt)
+    }
+  })()
+  return prompt.delivery
+}
+
 export function settleStructuredAgentLaunchPrompt(args: {
   launchResult: Promise<LaunchReceipt>
   target: RuntimeClientTarget
   options: StructuredLaunchPromptOptions
-  stagedEntry: StructuredAgentSessionOutboxEntry | null
+  stagedPrompt: StagedStructuredLaunchPrompt | null
 }): Promise<StructuredPromptDeliveryResult> | undefined {
   // Why: a draft has no delivery event — the composer adopts it and the user sends it — so
   // `onPromptDelivered` never fires and no result is reported.
   if (args.options.promptDelivery === 'draft' || !args.options.prompt?.trim()) {
     return undefined
   }
-  return args.launchResult.then(async (receipt) => {
-    if (!args.stagedEntry) {
-      return { delivered: false, failureNotified: true }
-    }
-    const entry = args.stagedEntry
-    const dispatch = shareStructuredAgentLaunchPromptDispatch(
-      entry.sessionId,
-      entry.clientMessageId,
-      receipt.fence,
-      () => dispatchStructuredLaunchPrompt(entry, receipt, args.target)
-    )
-    const delivered = await dispatch.promise
-    if (delivered) {
-      args.options.onPromptDelivered?.()
+  const prompt = args.stagedPrompt
+  const settled = args.launchResult.then(
+    async (receipt) => {
+      if (!prompt || prompt.discarded) {
+        return { delivered: false, failureNotified: true }
+      }
+      const { delivered, inComposer, unconfirmed, busy } = await sendStagedPrompt(
+        prompt,
+        receipt,
+        args.target
+      )
+      if (delivered) {
+        args.options.onPromptDelivered?.()
+      }
+      return {
+        delivered,
+        failureNotified: false,
+        ...(inComposer ? { inComposer: true as const } : {}),
+        ...(unconfirmed ? { unconfirmed } : {}),
+        ...(busy ? { busy } : {})
+      }
+    },
+    (error: unknown) => {
+      // The chat never started: its text waits in the chat's composer for the person's own Send.
+      if (prompt && !prompt.discarded && !prompt.delivery) {
+        unstage(prompt)
+        prompt.discarded = true
+        handBackStagedPrompt(prompt)
+      }
+      throw error
     }
-    return { delivered, failureNotified: false }
-  })
+  )
+  if (!prompt || prompt.delivery) {
+    return settled
+  }
+  const cancelled = prompt.whenDiscarded.then((): StructuredPromptDeliveryResult => ({
+    delivered: false,
+    failureNotified: true
+  }))
+  return Promise.race([settled, cancelled])
 }
diff --git a/src/renderer/src/lib/structured-agent-session-launch-request.ts b/src/renderer/src/lib/structured-agent-session-launch-request.ts
index f200b81d7adb..8bdc013db761 100644
--- a/src/renderer/src/lib/structured-agent-session-launch-request.ts
+++ b/src/renderer/src/lib/structured-agent-session-launch-request.ts
@@ -1,4 +1,4 @@
-import type { StructuredAgentSessionOutboxEntry } from '../../../shared/structured-agent-session-outbox'
+import type { StagedStructuredLaunchPrompt } from './structured-agent-session-launch-prompt'
 import type { AgentLaunchRequestId } from './agent-launch-request-id'
 
 /** What a new start brings: the user action it serves, whether it carries text, and the tab group
@@ -17,7 +17,7 @@ export type StructuredLaunchAttempt =
       requestId: AgentLaunchRequestId
       /** The request carried no text: the chat is blank until something claims it. */
       blank: boolean
-      stagedEntry: StructuredAgentSessionOutboxEntry | null
+      stagedPrompt: StagedStructuredLaunchPrompt | null
     }
   | { kind: 'retry' }
 
diff --git a/src/renderer/src/lib/structured-agent-session-launch.test.ts b/src/renderer/src/lib/structured-agent-session-launch.test.ts
index 5e5e8f0b3e41..db0905cef9c2 100644
--- a/src/renderer/src/lib/structured-agent-session-launch.test.ts
+++ b/src/renderer/src/lib/structured-agent-session-launch.test.ts
@@ -9,6 +9,7 @@ import type { StructuredAgentSessionLaunchIntent } from '@/lib/launch-structured
 const mocks = vi.hoisted(() => ({
   abandonIntent: vi.fn(),
   callStructuredAgentSession: vi.fn(),
+  callRuntimeRpc: vi.fn(),
   createIntent: vi.fn(),
   retryIntent: vi.fn(),
   restoreIntent: vi.fn(),
@@ -50,7 +51,16 @@ vi.mock('@/runtime/local-structured-session-tabs-sync', () => ({
 }))
 
 vi.mock('@/runtime/structured-agent-session-client', () => ({
-  callStructuredAgentSession: mocks.callStructuredAgentSession
+  // Sends reach the runtime RPC through this wrapper, as in the app; reads stay on this mock.
+  callStructuredAgentSession: (target: unknown, method: string, params?: unknown) =>
+    method === 'agentSession.send'
+      ? mocks.callRuntimeRpc(target, method, params)
+      : mocks.callStructuredAgentSession(target, method, params)
+}))
+
+vi.mock('@/runtime/runtime-rpc-client', () => ({
+  callRuntimeRpc: mocks.callRuntimeRpc,
+  ensureRuntimeEnvironmentCompatible: vi.fn(async () => undefined)
 }))
 
 vi.mock('@/store', () => ({
@@ -91,7 +101,13 @@ import {
   retryStructuredAgentSessionLaunch,
   startStructuredAgentLaunch
 } from './structured-agent-session-launch'
-import { readOutbox } from '@/components/native-chat/structured-agent-session-outbox-storage'
+import { resetStructuredAgentSessionSendsForTests } from '@/components/native-chat/structured-agent-session-message-sender'
+import {
+  clearNativeChatDraftCacheForTests,
+  readNativeChatDraftCache
+} from '@/components/native-chat/native-chat-draft-cache'
+import { structuredAgentSessionDraftScopeKey } from '@/components/native-chat/native-chat-composer-draft-store'
+import { hasStagedStructuredLaunchPrompt } from './structured-agent-session-launch-prompt'
 import { resetStructuredAgentLaunchPersistenceForTests } from './structured-agent-session-launch-persistence'
 import { resetStructuredAgentLaunchRegistryForTests } from './structured-agent-session-launch-registry'
 import { getStructuredAgentSessionLaunchSelection } from './structured-agent-session-launch-options'
@@ -140,6 +156,14 @@ function publishedSnapshot(worktreeId: string, sessionId: string): RuntimeMobile
   }
 }
 
+function sends(): unknown[][] {
+  return mocks.callRuntimeRpc.mock.calls.filter((call) => call[1] === 'agentSession.send')
+}
+
+function composerDraft(sessionId: string): string {
+  return readNativeChatDraftCache(structuredAgentSessionDraftScopeKey(sessionId))
+}
+
 async function flushLaunchSettlement(): Promise<void> {
   for (let i = 0; i < 20; i += 1) {
     await Promise.resolve()
@@ -152,6 +176,8 @@ describe('startStructuredAgentLaunch', () => {
     localStorage.clear()
     resetStructuredAgentLaunchPersistenceForTests()
     resetStructuredAgentLaunchRegistryForTests()
+    resetStructuredAgentSessionSendsForTests()
+    clearNativeChatDraftCacheForTests()
     mocks.rendererTabs = {}
     mocks.listeners.clear()
     mocks.createIntent.mockImplementation((worktreeId: string, agent: 'claude' | 'codex') => {
@@ -172,6 +198,10 @@ describe('startStructuredAgentLaunch', () => {
       ok: true,
       page: { fence: 1 }
     })
+    mocks.callRuntimeRpc.mockResolvedValue({
+      ok: true,
+      value: { submission: { dispatchState: 'accepted' } }
+    })
   })
 
   it('keeps launch drafts in the composer without staging or sending a turn', async () => {
@@ -196,11 +226,9 @@ describe('startStructuredAgentLaunch', () => {
       text: 'PR #19423 — review this change',
       createdAt: expect.any(Number)
     })
-    expect(readOutbox(intent.sessionId)).toEqual([])
+    expect(hasStagedStructuredLaunchPrompt(intent.sessionId)).toBe(false)
     expect(launch.promptDeliveryResult).toBeUndefined()
-    expect(
-      mocks.callStructuredAgentSession.mock.calls.some((call) => call[1] === 'agentSession.send')
-    ).toBe(false)
+    expect(sends()).toHaveLength(0)
   })
 
   it('seeds a draft longer than the terminal mirror cap under the projected tab id', async () => {
@@ -226,7 +254,7 @@ describe('startStructuredAgentLaunch', () => {
       text: sixtyLineDraft,
       createdAt: expect.any(Number)
     })
-    expect(readOutbox(intent.sessionId)).toEqual([])
+    expect(hasStagedStructuredLaunchPrompt(intent.sessionId)).toBe(false)
   })
 
   it('preserves the draft seed when the launch is definitively refused', async () => {
@@ -445,10 +473,6 @@ describe('startStructuredAgentLaunch', () => {
       publishedSnapshot(worktreeId, intent.sessionId)
     ])
 
-    mocks.callStructuredAgentSession.mockResolvedValue({
-      ok: true,
-      value: { submission: { dispatchState: 'accepted' } }
-    })
     const first = startStructuredAgentLaunch(worktreeId, 'codex', {
       requestId: 'double-click',
       prompt: 'second prompt'
@@ -468,11 +492,9 @@ describe('startStructuredAgentLaunch', () => {
     await flushLaunchSettlement()
 
     expect(second.sessionId).toBe(first.sessionId)
-    expect(
-      mocks.callStructuredAgentSession.mock.calls.filter((call) => call[1] === 'agentSession.send')
-    ).toHaveLength(1)
+    expect(sends()).toHaveLength(1)
 
-    expect(mocks.callStructuredAgentSession).toHaveBeenCalledWith(
+    expect(mocks.callRuntimeRpc).toHaveBeenCalledWith(
       { kind: 'local' },
       'agentSession.send',
       expect.objectContaining({
@@ -494,7 +516,7 @@ describe('startStructuredAgentLaunch', () => {
       publishedSnapshot(worktreeId, intent.sessionId)
     ])
     // Every send waits, so a second send of the repeated text would show up below.
-    mocks.callStructuredAgentSession.mockImplementation(
+    mocks.callRuntimeRpc.mockImplementation(
       () => new Promise((resolve) => pendingSends.push(resolve))
     )
 
@@ -507,7 +529,7 @@ describe('startStructuredAgentLaunch', () => {
       prompt: 'second prompt'
     })
     resolveLaunch({ sessionId: intent.sessionId, fence: 1 })
-    await vi.waitFor(() => expect(mocks.callStructuredAgentSession).toHaveBeenCalledOnce())
+    await vi.waitFor(() => expect(mocks.callRuntimeRpc).toHaveBeenCalledOnce())
 
     const whileSending = startStructuredAgentLaunch(worktreeId, 'codex', {
       requestId: 'double-click',
@@ -526,7 +548,7 @@ describe('startStructuredAgentLaunch', () => {
         failureNotified: false
       })
     }
-    expect(mocks.callStructuredAgentSession).toHaveBeenCalledOnce()
+    expect(mocks.callRuntimeRpc).toHaveBeenCalledOnce()
   })
 
   it('opens a new chat for a new start while an earlier outcome is unknown', async () => {
@@ -549,11 +571,10 @@ describe('startStructuredAgentLaunch', () => {
 
     expect(mocks.createIntent).toHaveBeenCalledTimes(2)
     expect(second.sessionId).not.toBe(intent.sessionId)
-    expect(readOutbox(second.sessionId)).toEqual([
-      expect.objectContaining({
-        body: expect.objectContaining({ blocks: [{ type: 'text', text: 'second prompt' }] })
-      })
-    ])
+    await expect(second.launchResult).rejects.toThrow('offline')
+    // Each start's text waits in its own chat's composer.
+    expect(composerDraft(second.sessionId)).toBe('second prompt')
+    expect(composerDraft(intent.sessionId)).toBe('first prompt')
   })
 
   it('reconciles a host commit when the create reply is lost', async () => {
@@ -640,7 +661,7 @@ describe('startStructuredAgentLaunch', () => {
     expect(toast.error).not.toHaveBeenCalled()
   })
 
-  it('reuses the queued prompt without a second delivery after unknown recovery', async () => {
+  it("keeps the prompt in the chat's composer, unsent, through an unknown outcome's recovery", async () => {
     const worktreeId = 'wt-unknown-prompt-retry'
     const intent = launchIntent(worktreeId)
     mocks.createIntent.mockReturnValueOnce(intent)
@@ -662,16 +683,8 @@ describe('startStructuredAgentLaunch', () => {
     await flushLaunchSettlement()
     expect(getStructuredAgentSessionLaunchLifecycle(worktreeId, intent.sessionId)).toBeNull()
 
-    expect(readOutbox(intent.sessionId)).toEqual([
-      expect.objectContaining({
-        body: expect.objectContaining({ blocks: [{ type: 'text', text: 'only once' }] })
-      })
-    ])
-    expect(mocks.callStructuredAgentSession).not.toHaveBeenCalledWith(
-      { kind: 'local' },
-      'agentSession.send',
-      expect.anything()
-    )
+    expect(composerDraft(intent.sessionId)).toBe('only once')
+    expect(sends()).toHaveLength(0)
   })
 
   it('keeps a post-attach unknown outcome reserved for reconciliation', async () => {
@@ -783,32 +796,6 @@ describe('startStructuredAgentLaunch', () => {
     expect(mocks.retryIntent).toHaveBeenCalledWith(intent)
   })
 
-  it('preserves the launch identity when durable prompt staging refuses', async () => {
-    const worktreeId = 'wt-stage-refused'
-    const intent = launchIntent(worktreeId)
-    mocks.createIntent.mockReturnValueOnce(intent)
-    const storageFailure = vi.spyOn(localStorage, 'setItem').mockImplementationOnce(() => {
-      throw new Error('storage unavailable')
-    })
-
-    const result = startStructuredAgentLaunch(worktreeId, 'codex', {
-      requestId: 'request-30',
-      prompt: 'start this task'
-    })
-
-    await expect(result.launchResult).rejects.toBeInstanceOf(
-      StructuredAgentSessionCreateRefusalError
-    )
-    await expect(result.promptDeliveryResult).resolves.toEqual({
-      delivered: false,
-      failureNotified: true
-    })
-    expect(mocks.launch).not.toHaveBeenCalled()
-    expect(mocks.abandonIntent).not.toHaveBeenCalled()
-    expect(getStructuredAgentSessionLaunchLifecycle(worktreeId, intent.sessionId)).toBe('failed')
-    storageFailure.mockRestore()
-  })
-
   it("reports a repeated request's prompt as undelivered to both callers after refusal", async () => {
     const worktreeId = 'wt-refused-coalesced-prompts'
     const intent = launchIntent(worktreeId)
@@ -826,7 +813,7 @@ describe('startStructuredAgentLaunch', () => {
       requestId: 'double-click',
       prompt: 'first prompt'
     })
-    expect(readOutbox(intent.sessionId)).toHaveLength(1)
+    expect(hasStagedStructuredLaunchPrompt(intent.sessionId)).toBe(true)
 
     rejectLaunch(new StructuredAgentSessionCreateRefusalError('unsupported'))
     await expect(first.launchResult).rejects.toBeInstanceOf(
@@ -840,7 +827,9 @@ describe('startStructuredAgentLaunch', () => {
       delivered: false,
       failureNotified: true
     })
-    expect(readOutbox(intent.sessionId)).toHaveLength(1)
+    // The one staged text goes back to the chat's composer once.
+    expect(composerDraft(intent.sessionId)).toBe('first prompt')
+    expect(hasStagedStructuredLaunchPrompt(intent.sessionId)).toBe(false)
   })
 
   it('keeps a drafted chat out of a second action that sends the same text', async () => {
@@ -855,10 +844,6 @@ describe('startStructuredAgentLaunch', () => {
       publishedSnapshot(worktreeId, drafted.sessionId),
       publishedSnapshot(worktreeId, sent.sessionId)
     ])
-    mocks.callStructuredAgentSession.mockResolvedValue({
-      ok: true,
-      value: { submission: { dispatchState: 'accepted' } }
-    })
 
     startStructuredAgentLaunch(worktreeId, 'codex', {
       requestId: 'continue-click',
@@ -877,7 +862,10 @@ describe('startStructuredAgentLaunch', () => {
       delivered: true,
       failureNotified: false
     })
-    expect(readOutbox(drafted.sessionId)).toEqual([])
+    expect(hasStagedStructuredLaunchPrompt(drafted.sessionId)).toBe(false)
+    expect(sends().map((call) => call[2])).toEqual([
+      expect.objectContaining({ envelope: expect.objectContaining({ sessionId: sent.sessionId }) })
+    ])
     expect(mocks.seedDraft).toHaveBeenCalledOnce()
     expect(mocks.seedDraft).toHaveBeenCalledWith(
       expect.objectContaining({
diff --git a/src/renderer/src/lib/structured-agent-session-launch.ts b/src/renderer/src/lib/structured-agent-session-launch.ts
index 917a2fba29f9..50a352ce92ea 100644
--- a/src/renderer/src/lib/structured-agent-session-launch.ts
+++ b/src/renderer/src/lib/structured-agent-session-launch.ts
@@ -1,16 +1,14 @@
 import type { TuiAgent } from '../../../shared/tui-agent'
 import type { ExecutionHostId } from '../../../shared/execution-host'
-import { structuredAgentLabel } from '@/lib/structured-agent-session-launch-label'
 import {
   abandonStructuredAgentSessionLaunchIntent,
   createStructuredAgentSessionLaunchIntent,
-  retryStructuredAgentSessionLaunchIntent,
-  StructuredAgentSessionCreateRefusalError
+  retryStructuredAgentSessionLaunchIntent
 } from '@/lib/launch-structured-agent-session'
 import {
-  discardStructuredAgentSessionLaunchOutbox,
-  enqueueStructuredAgentSessionLaunchPrompt
-} from '@/components/native-chat/structured-agent-session-outbox-storage'
+  discardStructuredAgentSessionChatSends,
+  stageStructuredLaunchPrompt
+} from '@/lib/structured-agent-session-launch-prompt'
 import {
   launchAndReconcile,
   reconcileUnknownLaunch,
@@ -80,8 +78,8 @@ export type StructuredAgentLaunchResult = {
   releaseCallerAfterUnknownOutcome: () => boolean
 }
 
-/** What the outbox must carry: a draft goes to the composer seed instead. */
-function outboxPromptText(options: StructuredAgentLaunchOptions): string {
+/** What the launch sends: a draft goes to the composer seed instead. */
+function launchPromptText(options: StructuredAgentLaunchOptions): string {
   return options.promptDelivery === 'draft' ? '' : (options.prompt?.trim() ?? '')
 }
 
@@ -156,6 +154,10 @@ function restartStructuredLaunchState(state: StructuredLaunchState): void {
   notifyStructuredLaunchListeners()
 }
 
+function promptOwner(options: StructuredAgentLaunchOptions): { callerKeepsText?: true } {
+  return options.promptKeptByCaller ? { callerKeepsText: true } : {}
+}
+
 function joinStructuredLaunchState(
   existing: StructuredLaunchState,
   agent: TuiAgent,
@@ -171,28 +173,24 @@ function joinStructuredLaunchState(
     options,
     claim ? options.promptDelivery : existing.promptDelivery
   )
-  // Why: an unconfirmed launch keeps its draft/outbox, so a recheck must not stage it twice.
-  const text = retrying || repeat ? '' : outboxPromptText(joined)
+  // Why: an unconfirmed launch keeps its draft or staged text, so a recheck must not stage it twice.
+  const text = retrying || repeat ? '' : launchPromptText(joined)
   const stagedPrompt = text
-    ? enqueueStructuredAgentSessionLaunchPrompt(existing.intent.sessionId, text)
-    : (repeat?.stagedEntry ?? null)
-  // An unstaged claim stays unclaimed: the new launch it falls to reports the failure.
-  if (claim && text && !stagedPrompt) {
-    return undefined
-  }
+    ? stageStructuredLaunchPrompt(existing.intent.sessionId, text, promptOwner(options))
+    : (repeat?.stagedPrompt ?? null)
   if (retrying) {
     restartStructuredLaunchState(existing)
   }
   if (claim) {
     existing.promptDelivery = options.promptDelivery
-    Object.assign(claim, { requestId: request.id, blank: false, stagedEntry: stagedPrompt })
+    Object.assign(claim, { requestId: request.id, blank: false, stagedPrompt })
   }
   if (!retrying && !repeat) {
     launchDraft.seedStructuredAgentLaunchDraft(existing.intent.sessionId, agent, joined)
   }
   // A re-delivery waits on the text its action staged, if any, and never stages its own.
   const { prompt: _retryPrompt, ...joinedWithoutPrompt } = joined
-  const callerOptions = retrying || (repeat && !repeat.stagedEntry) ? joinedWithoutPrompt : joined
+  const callerOptions = retrying || (repeat && !repeat.stagedPrompt) ? joinedWithoutPrompt : joined
   return {
     state: existing,
     caller: addStructuredLaunchCaller({
@@ -200,7 +198,7 @@ function joinStructuredLaunchState(
       launchResult: existing.promise,
       target: existing.intent.target,
       options: callerOptions,
-      stagedEntry: stagedPrompt
+      stagedPrompt
     })
   }
 }
@@ -225,16 +223,16 @@ function structuredAgentLaunchState(
     options.resumeFrom,
     options.hostSeedOptions
   )
-  const text = outboxPromptText(options)
+  const text = launchPromptText(options)
   const stagedPrompt = text
-    ? enqueueStructuredAgentSessionLaunchPrompt(intent.sessionId, text)
+    ? stageStructuredLaunchPrompt(intent.sessionId, text, promptOwner(options))
     : null
   launchDraft.seedStructuredAgentLaunchDraft(intent.sessionId, agent, options)
   const callers = createStructuredLaunchCallerGroup({
     kind: 'first',
     requestId: request.id,
     blank: !request.hasText,
-    stagedEntry: stagedPrompt
+    stagedPrompt
   })
   const state: StructuredLaunchState = {
     identity,
@@ -249,20 +247,13 @@ function structuredAgentLaunchState(
   }
   state.onHostSeed = (seedOptions) => adoptPairedHostSeed(state, seedOptions)
   callers.onSettled = () => maybeCleanupLaunchState(state)
-  state.promise =
-    text && !stagedPrompt
-      ? Promise.reject(
-          new StructuredAgentSessionCreateRefusalError(
-            `Could not durably stage the ${structuredAgentLabel(agent)} launch prompt.`
-          )
-        )
-      : publishWithHeldOptions(state, launchAndReconcile(state))
+  state.promise = publishWithHeldOptions(state, launchAndReconcile(state))
   const caller = addStructuredLaunchCaller({
     group: state.callers,
     launchResult: state.promise,
     target: state.intent.target,
     options,
-    stagedEntry: stagedPrompt
+    stagedPrompt
   })
   setStructuredLaunchState(state)
   notifyStructuredLaunchListeners()
@@ -279,7 +270,7 @@ export function cancelStructuredAgentLaunch(worktreeId: string, sessionId: strin
     return false
   }
   markStructuredAgentSessionLaunchCancelled(worktreeId, sessionId, state.intent.executionHostId)
-  discardStructuredAgentSessionLaunchOutbox(state.intent.sessionId)
+  discardStructuredAgentSessionChatSends(state.intent.sessionId)
   launchDraft.clearStructuredAgentLaunchDraft(state.intent.sessionId)
   abandonStructuredAgentSessionLaunchIntent(state.intent)
   notifyStructuredLaunchListeners()
@@ -317,8 +308,8 @@ export function retryStructuredAgentSessionLaunch(worktreeId: string, sessionId:
   return true
 }
 
-/** A message queued on a chat whose start never published relaunches it; the message goes out on
- *  publish. Shared by the chat's composer and by messages sent from elsewhere. */
+/** A message sent to a chat whose start never published relaunches it. Shared by the chat's
+ *  composer and by messages sent from elsewhere. */
 export function relaunchFailedStructuredAgentSessionForMessage(
   worktreeId: string,
   sessionId: string
diff --git a/src/renderer/src/lib/structured-agent-session-provisional-tab.test.ts b/src/renderer/src/lib/structured-agent-session-provisional-tab.test.ts
index e5a75c237438..87bbac89df74 100644
--- a/src/renderer/src/lib/structured-agent-session-provisional-tab.test.ts
+++ b/src/renderer/src/lib/structured-agent-session-provisional-tab.test.ts
@@ -4,7 +4,8 @@ import type { AgentSessionLaunchPlan } from './agent-session-launch-plan'
 import type { StructuredAgentLaunchSettlement } from './structured-agent-launch-settlement'
 
 const mocks = vi.hoisted(() => ({
-  createUnifiedTab: vi.fn()
+  createUnifiedTab: vi.fn(),
+  createSupport: vi.fn()
 }))
 
 vi.mock('@/store', () => ({
@@ -17,6 +18,10 @@ vi.mock('@/store', () => ({
     })
   }
 }))
+vi.mock('@/runtime/structured-agent-session-client', () => ({
+  callStructuredAgentSession: (_target: unknown, method: string) =>
+    method === 'agentSession.createSupport' ? mocks.createSupport() : new Promise(() => undefined)
+}))
 
 import { beginStructuredAgentSessionProvisionalLaunch } from './structured-agent-session-provisional-tab'
 
@@ -26,9 +31,10 @@ function planSettlingAs(settlement: StructuredAgentLaunchSettlement): AgentSessi
     route: 'structured-native-chat',
     agent: 'claude',
     worktreeId: 'wt-1',
+    executionHostId: 'local',
     begin: () => ({
       sessionId: 'claude_1',
-      executionHostId: 'runtime:server-1',
+      executionHostId: 'local',
       settlement: Promise.resolve(settlement),
       cancel: vi.fn()
     }),
@@ -41,19 +47,25 @@ beforeEach(() => {
   mocks.createUnifiedTab.mockImplementation(
     (worktreeId: string, _type: string, tab: Partial<Tab>) => ({ ...tab, worktreeId })
   )
+  mocks.createSupport.mockResolvedValue({ supported: true })
 })
 
 describe('a provisional structured chat tab', () => {
-  it('carries the host the launch was sent to', () => {
-    beginStructuredAgentSessionProvisionalLaunch({
+  it('opens once this machine admits the chat, in the caller group, on the host it was sent to', async () => {
+    const launch = beginStructuredAgentSessionProvisionalLaunch({
       plan: planSettlingAs({ kind: 'structured', sessionId: 'claude_1' }),
-      hooks: {}
+      hooks: {},
+      targetGroupId: 'group-2'
     })
 
+    expect(launch?.tab).toBeNull()
+    expect(mocks.createUnifiedTab).not.toHaveBeenCalled()
+    await expect(launch?.settlement).resolves.toEqual({ kind: 'structured', sessionId: 'claude_1' })
+    expect(mocks.createSupport).toHaveBeenCalledOnce()
     expect(mocks.createUnifiedTab).toHaveBeenCalledWith(
       'wt-1',
       'agent-session',
-      expect.objectContaining({ executionHostId: 'runtime:server-1' })
+      expect.objectContaining({ executionHostId: 'local', targetGroupId: 'group-2' })
     )
   })
 })
diff --git a/src/renderer/src/lib/structured-agent-session-provisional-tab.ts b/src/renderer/src/lib/structured-agent-session-provisional-tab.ts
index 1992833170d2..28d56571f516 100644
--- a/src/renderer/src/lib/structured-agent-session-provisional-tab.ts
+++ b/src/renderer/src/lib/structured-agent-session-provisional-tab.ts
@@ -13,12 +13,12 @@ import { useAppStore } from '@/store'
 import type { ExecutionHostId } from '../../../shared/execution-host'
 import type { TuiAgent } from '../../../shared/tui-agent'
 import {
-  beginPairedStructuredLaunch,
+  beginHostAdmittedStructuredLaunch,
   openDeclinedStructuredLaunchTerminal,
   type DeclinedStructuredLaunchTerminalOptions,
-  type PairedStructuredLaunch,
+  type HostAdmittedStructuredLaunch,
   type StructuredLaunchTerminal
-} from '@/lib/structured-agent-session-paired-admission'
+} from '@/lib/structured-agent-session-launch-admission'
 import {
   resolveStructuredAgentSessionOwner,
   structuredAgentSessionTargetForHost
@@ -27,10 +27,10 @@ import type { RuntimeClientTarget } from '@/runtime/runtime-client-target'
 
 type LocalProvisionalLaunch = StructuredAgentLaunchHandle & { tab: Tab }
 
-/** A local chat has its tab at once; a paired server's has none until the server admits it. */
+/** A chat's tab opens once its host admits it; a launch with no host to ask takes the direct path. */
 export type StructuredAgentSessionProvisionalLaunch =
   | LocalProvisionalLaunch
-  | PairedStructuredLaunch
+  | HostAdmittedStructuredLaunch
 
 export function openStructuredAgentSessionProvisionalTab(args: {
   worktreeId: string
@@ -72,8 +72,8 @@ export function openStructuredAgentSessionProvisionalTab(args: {
   return tab
 }
 
-/** The paired server a structured launch would run on, which admits the chat before it exists. */
-export function structuredLaunchPairedOwner(
+/** The host a structured launch would run on, which admits the chat before it exists. */
+export function structuredLaunchOwner(
   plan: Pick<AgentSessionLaunchPlan, 'route' | 'executionHostId'>,
   worktreeId: string,
   target?: AgentSessionLaunchTarget
@@ -86,9 +86,7 @@ export function structuredLaunchPairedOwner(
     plan.executionHostId ??
     resolveStructuredAgentSessionOwner(useAppStore.getState(), worktreeId)
   const hostTarget = structuredAgentSessionTargetForHost(executionHostId)
-  return executionHostId && hostTarget?.kind === 'environment'
-    ? { executionHostId, target: hostTarget }
-    : null
+  return executionHostId && hostTarget ? { executionHostId, target: hostTarget } : null
 }
 
 type ProvisionalLaunchArgs = {
@@ -97,40 +95,43 @@ type ProvisionalLaunchArgs = {
   target?: AgentSessionLaunchTarget
   targetGroupId?: string
   activate?: boolean
-  /** Lets workspace flows reveal before the chat's tab is owned; a paired launch reveals before its
-   *  server is asked, when no session id exists yet. */
+  /** Lets workspace flows reveal before the chat's tab is owned: before its host is asked, when no
+   *  session id exists yet. */
   beforeOpen?: (sessionId?: string) => boolean | void
-  /** The terminal a paired server's "no" opens; a caller without one gets a new agent tab's. */
-  onHostDeclined?: () => Promise<StructuredLaunchTerminal> | StructuredLaunchTerminal
+  /** The terminal the host's "no" opens; a caller without one gets a new agent tab's. */
+  onHostDeclined?: (
+    target: RuntimeClientTarget
+  ) => Promise<StructuredLaunchTerminal> | StructuredLaunchTerminal
   /** What that default terminal carries from the caller, e.g. a recipe's saved CLI arguments. */
   declinedTerminal?: DeclinedStructuredLaunchTerminalOptions
 }
 
-/** Binds the launch to a chat tab: at once locally, after the server admits it on a paired host. */
+/** Binds the launch to a chat tab once its host, this machine included, admits the chat. */
 export function beginStructuredAgentSessionProvisionalLaunch(
   args: ProvisionalLaunchArgs
 ): StructuredAgentSessionProvisionalLaunch | null {
   const worktreeId = args.target?.worktreeId ?? args.plan.worktreeId
-  const paired = worktreeId ? structuredLaunchPairedOwner(args.plan, worktreeId, args.target) : null
-  if (!paired || !worktreeId) {
+  const owner = worktreeId ? structuredLaunchOwner(args.plan, worktreeId, args.target) : null
+  if (!owner || !worktreeId) {
+    // No host to ask: the launch path refuses it with its own message.
     return beginLocalProvisionalLaunch(args)
   }
   if (args.beforeOpen?.() === false) {
     return null
   }
-  return beginPairedStructuredLaunch({
+  return beginHostAdmittedStructuredLaunch({
     plan: args.plan,
     hooks: args.hooks,
     worktreeId,
-    executionHostId: paired.executionHostId,
-    target: paired.target,
+    executionHostId: owner.executionHostId,
+    target: owner.target,
     openAdmitted: (seedOptions) =>
       beginLocalProvisionalLaunch({
         ...args,
         target: {
           ...args.target,
           worktreeId,
-          executionHostId: paired.executionHostId,
+          executionHostId: owner.executionHostId,
           ...(seedOptions ? { seedOptions } : {})
         },
         beforeOpen: undefined
diff --git a/src/renderer/src/lib/terminal-pane-placement-row.ts b/src/renderer/src/lib/terminal-pane-placement-row.ts
new file mode 100644
index 000000000000..53ae435a200d
--- /dev/null
+++ b/src/renderer/src/lib/terminal-pane-placement-row.ts
@@ -0,0 +1,29 @@
+import type { TerminalPaneNewTabRow } from '../../../shared/terminal-pane-placement'
+import type { TerminalTab } from '../../../shared/terminal-tab-types'
+
+export function terminalPanePlacementRow(tab: TerminalTab): TerminalPaneNewTabRow {
+  const {
+    title,
+    defaultTitle,
+    customTitle,
+    color,
+    createdAt,
+    startupCwd,
+    shellOverride,
+    quickCommandLabel,
+    launchAgent,
+    viewMode
+  } = tab
+  return {
+    title,
+    defaultTitle,
+    customTitle,
+    color,
+    createdAt,
+    startupCwd,
+    shellOverride,
+    quickCommandLabel,
+    launchAgent,
+    viewMode
+  }
+}
diff --git a/src/renderer/src/lib/unread-badge-count-migration.test.ts b/src/renderer/src/lib/unread-badge-count-migration.test.ts
index b8ebb7a3fc23..0ab73125f83e 100644
--- a/src/renderer/src/lib/unread-badge-count-migration.test.ts
+++ b/src/renderer/src/lib/unread-badge-count-migration.test.ts
@@ -1,5 +1,6 @@
 import { describe, expect, it } from 'vitest'
-import { makeTab, makeWorktree, TEST_REPO } from '@/store/slices/store-test-helpers'
+import { makeTab } from '../store/slices/store-session-test-harness'
+import { makeWorktree, TEST_REPO } from '../store/slices/worktrees-slice-test-fixtures'
 import { makeFolderWorkspace } from '@/store/slices/worktrees-slice-test-fixtures'
 import type { ProjectGroup } from '../../../shared/project-group-types'
 import { getUnreadBadgeCount, type UnreadBadgeCountSources } from './unread-badge-count'
diff --git a/src/renderer/src/lib/unread-badge-count.test.ts b/src/renderer/src/lib/unread-badge-count.test.ts
index 87a9980497ef..b3e718b0f7ef 100644
--- a/src/renderer/src/lib/unread-badge-count.test.ts
+++ b/src/renderer/src/lib/unread-badge-count.test.ts
@@ -1,5 +1,6 @@
 import { describe, expect, it } from 'vitest'
-import { makeTab, makeWorktree, TEST_REPO } from '@/store/slices/store-test-helpers'
+import { makeTab } from '../store/slices/store-session-test-harness'
+import { makeWorktree, TEST_REPO } from '../store/slices/worktrees-slice-test-fixtures'
 import { makeFolderWorkspace } from '@/store/slices/worktrees-slice-test-fixtures'
 import type { ProjectGroup } from '../../../shared/project-group-types'
 import type { Worktree } from '../../../shared/worktree/types'
diff --git a/src/renderer/src/lib/workspace-attachment-terminal-origin.test.ts b/src/renderer/src/lib/workspace-attachment-terminal-origin.test.ts
new file mode 100644
index 000000000000..33a170027f72
--- /dev/null
+++ b/src/renderer/src/lib/workspace-attachment-terminal-origin.test.ts
@@ -0,0 +1,93 @@
+import { describe, expect, it } from 'vitest'
+import type { AppState } from '@/store/types'
+import { makeTerminalTab } from '../store/slices/worktrees-slice-test-fixtures'
+import { singlePaneLayoutSnapshot } from '../store/slices/terminal-helpers'
+import { makePaneKey } from '../../../shared/stable-pane-id'
+import { getWorkspaceAttachmentTerminalOrigin } from './workspace-attachment-terminal-origin'
+
+const workspaceId = 'repo::/feature'
+const leaf = '11111111-1111-4111-8111-111111111111'
+const otherLeaf = '22222222-2222-4222-8222-222222222222'
+const context = { tabId: 'tab', paneKey: makePaneKey('tab', leaf), ptyId: 'pty' }
+function state(): Pick<
+  AppState,
+  'tabsByWorktree' | 'terminalLayoutsByTabId' | 'agentStatusByPaneKey'
+> {
+  return {
+    tabsByWorktree: {
+      [workspaceId]: [makeTerminalTab({ id: 'tab', worktreeId: workspaceId, ptyId: 'pty' })]
+    },
+    terminalLayoutsByTabId: { tab: singlePaneLayoutSnapshot(leaf, 'pty') },
+    agentStatusByPaneKey: {
+      [context.paneKey]: {
+        state: 'working',
+        prompt: '',
+        updatedAt: 1,
+        stateStartedAt: 1,
+        paneKey: context.paneKey,
+        stateHistory: [],
+        worktreeId: workspaceId,
+        terminalHandle: 'pty',
+        agentType: 'codex',
+        providerSession: { id: 'provider-session', key: 'session_id' }
+      }
+    }
+  }
+}
+describe('reference evidence terminal identity', () => {
+  it('records the currently bound provider session', () => {
+    expect(getWorkspaceAttachmentTerminalOrigin(state(), workspaceId, context, 'local')).toEqual(
+      expect.objectContaining({
+        tabId: 'tab',
+        paneKey: context.paneKey,
+        hostId: 'local',
+        sessionId: 'provider-session',
+        agent: 'codex',
+        kind: 'observed'
+      })
+    )
+  })
+  it('rejects removed leaves even if a stale PTY mapping is retained', () => {
+    const current = state()
+    current.terminalLayoutsByTabId.tab = {
+      ...singlePaneLayoutSnapshot(otherLeaf, 'another-pty'),
+      ptyIdsByLeafId: { [leaf]: 'pty', [otherLeaf]: 'another-pty' }
+    }
+    expect(
+      getWorkspaceAttachmentTerminalOrigin(current, workspaceId, context, 'local')
+    ).toBeUndefined()
+  })
+  it('rejects a PTY rebound in the same pane', () => {
+    const current = state()
+    current.terminalLayoutsByTabId.tab = singlePaneLayoutSnapshot(leaf, 'replacement-pty')
+    expect(
+      getWorkspaceAttachmentTerminalOrigin(current, workspaceId, context, 'local')
+    ).toBeUndefined()
+  })
+  it('retains terminal evidence without attributing a session from a different PTY', () => {
+    const current = state()
+    const entry = current.agentStatusByPaneKey[context.paneKey]
+    if (!entry) {
+      throw new Error('Expected source session')
+    }
+    entry.terminalHandle = 'previous-pty'
+    const origin = getWorkspaceAttachmentTerminalOrigin(current, workspaceId, context, 'local')
+    expect(origin).toMatchObject({ tabId: 'tab', kind: 'observed' })
+    expect(origin?.sessionId).toBeUndefined()
+    expect(origin?.agent).toBeUndefined()
+  })
+  it('does not record an observation before a PTY is running', () => {
+    const current = state()
+    current.terminalLayoutsByTabId.tab = singlePaneLayoutSnapshot(leaf)
+    current.tabsByWorktree[workspaceId][0].ptyId = null
+    current.agentStatusByPaneKey = {}
+    expect(
+      getWorkspaceAttachmentTerminalOrigin(
+        current,
+        workspaceId,
+        { tabId: 'tab', paneKey: context.paneKey },
+        'local'
+      )
+    ).toBeUndefined()
+  })
+})
diff --git a/src/renderer/src/lib/workspace-attachment-terminal-origin.ts b/src/renderer/src/lib/workspace-attachment-terminal-origin.ts
new file mode 100644
index 000000000000..d6c5acfa252c
--- /dev/null
+++ b/src/renderer/src/lib/workspace-attachment-terminal-origin.ts
@@ -0,0 +1,51 @@
+import type { AppState } from '@/store/types'
+import type { ExecutionHostId } from '../../../shared/execution-host'
+import type { WorkspaceAttachmentOrigin } from '../../../shared/worktree/types'
+import { parsePaneKey } from '../../../shared/stable-pane-id'
+import { terminalLayoutContainsLeaf } from '../../../shared/workspace-session-pane-ownership'
+
+export type WorkspaceReferenceTerminalContext = {
+  tabId: string
+  paneKey: string
+  ptyId?: string | null
+  executionHostId?: ExecutionHostId
+}
+
+export function getWorkspaceAttachmentTerminalOrigin(
+  state: Pick<AppState, 'tabsByWorktree' | 'agentStatusByPaneKey' | 'terminalLayoutsByTabId'>,
+  worktreeId: string,
+  context: WorkspaceReferenceTerminalContext,
+  hostId: ExecutionHostId | undefined
+): WorkspaceAttachmentOrigin | undefined {
+  const tab = state.tabsByWorktree?.[worktreeId]?.find(
+    (candidate) => candidate.id === context.tabId
+  )
+  const pane = parsePaneKey(context.paneKey)
+  const layout = state.terminalLayoutsByTabId?.[context.tabId]
+  if (!tab || !pane || pane.tabId !== tab.id || !layout) {
+    return undefined
+  }
+  if (!terminalLayoutContainsLeaf(layout.root, pane.leafId)) {
+    return undefined
+  }
+  const ptyId =
+    layout.ptyIdsByLeafId?.[pane.leafId] ?? (layout.root?.type === 'leaf' ? tab.ptyId : null)
+  if (!context.ptyId || context.ptyId !== ptyId) {
+    return undefined
+  }
+  const entry = state.agentStatusByPaneKey?.[context.paneKey]
+  const matchingEntry =
+    (entry?.worktreeId && entry.worktreeId !== worktreeId) ||
+    (entry?.terminalHandle && entry.terminalHandle !== ptyId)
+      ? undefined
+      : entry
+  return {
+    kind: 'observed',
+    tabId: tab.id,
+    paneKey: context.paneKey,
+    ...(hostId ? { hostId } : {}),
+    label: tab.customTitle || tab.defaultTitle || tab.title,
+    ...(matchingEntry?.agentType ? { agent: matchingEntry.agentType } : {}),
+    ...(matchingEntry?.providerSession?.id ? { sessionId: matchingEntry.providerSession.id } : {})
+  }
+}
diff --git a/src/renderer/src/lib/workspace-session-host-hydration.ts b/src/renderer/src/lib/workspace-session-host-hydration.ts
index ddf0f8033863..9852dd563859 100644
--- a/src/renderer/src/lib/workspace-session-host-hydration.ts
+++ b/src/renderer/src/lib/workspace-session-host-hydration.ts
@@ -222,6 +222,7 @@ export async function fetchWorkspaceSessionWithRuntimeHostOwners(
   for (const [hostId, slice] of sshPartitions) {
     const adoption = adoptStrandedHostPartitionSession(session, slice, {
       contestedSessionKeys: attribution.contestedSessionKeys,
+      ownedSessionKeys: attribution.ownedSessionKeysByHostId.get(hostId),
       foreignSessionKeys: unownedSessionKeys(
         session,
         attribution.contestedSessionKeys,
@@ -289,12 +290,11 @@ function sshPartitionCatalogAttribution(
   repos: readonly Pick<Repo, 'id' | 'connectionId' | 'executionHostId'>[],
   sshPartitions: readonly (readonly [ExecutionHostId, WorkspaceSessionState | null])[],
   mergedContested: ReadonlySet<string>
-): {
-  contestedSessionKeys: Set<string>
-  foreignSessionKeysByHostId: Map<ExecutionHostId, Set<string>>
-} {
+) {
   const contestedSessionKeys = new Set(mergedContested)
   const foreignSessionKeysByHostId = new Map<ExecutionHostId, Set<string>>()
+  // Ids the catalog resolves to the ssh partition that names them.
+  const ownedSessionKeysByHostId = new Map<ExecutionHostId, Set<string>>()
   const repoLookup = createRepoRowExecutionHostLookup(repos)
   const ownedByHostId = new Map<ExecutionHostId, Set<string>>()
   for (const [hostId, slice] of sshPartitions) {
@@ -303,6 +303,7 @@ function sshPartitionCatalogAttribution(
     }
     const foreign = new Set<string>()
     const owned = new Set<string>()
+    const catalogOwned = new Set<string>()
     for (const workspaceId of workspaceIdsNamedByPartition(slice)) {
       // A folder key carries no repo id at all, and `getRepoIdFromWorktreeId` hands back the whole
       // key rather than nothing, so the catalog would be asked about `folder:<uuid>` and answer
@@ -317,7 +318,9 @@ function sshPartitionCatalogAttribution(
         foreign.add(workspaceId)
         continue
       }
-      if (resolution?.kind === 'unresolved' && resolution.reason === 'ambiguous') {
+      if (resolution?.kind === 'resolved') {
+        catalogOwned.add(workspaceId)
+      } else if (resolution?.reason === 'ambiguous') {
         contestedSessionKeys.add(workspaceId)
       }
       owned.add(workspaceId)
@@ -326,6 +329,7 @@ function sshPartitionCatalogAttribution(
       foreignSessionKeysByHostId.set(hostId, foreign)
     }
     ownedByHostId.set(hostId, owned)
+    ownedSessionKeysByHostId.set(hostId, catalogOwned)
   }
   // Why co-presence is asked only of the ids left after the catalog has spoken: one partition
   // holding residue the catalog attributes elsewhere is a single owner plus a leftover, not a
@@ -333,7 +337,7 @@ function sshPartitionCatalogAttribution(
   for (const workspaceId of sessionKeysHeldByMultiplePartitionSets([...ownedByHostId.values()])) {
     contestedSessionKeys.add(workspaceId)
   }
-  return { contestedSessionKeys, foreignSessionKeysByHostId }
+  return { contestedSessionKeys, foreignSessionKeysByHostId, ownedSessionKeysByHostId }
 }
 
 /** Ids that appear in more than one of these per-partition sets. */
diff --git a/src/renderer/src/lib/workspace-session-ssh-partition-ownership.test.ts b/src/renderer/src/lib/workspace-session-ssh-partition-ownership.test.ts
index 371b4f2b77b6..26a3545f2295 100644
--- a/src/renderer/src/lib/workspace-session-ssh-partition-ownership.test.ts
+++ b/src/renderer/src/lib/workspace-session-ssh-partition-ownership.test.ts
@@ -344,3 +344,29 @@ describe('a bare workspace id two partitions both hold', () => {
     expect(read.contestedPrimaryHostBySessionKey?.[WORKTREE_ID]).toBe(OTHER_SSH_HOST_ID)
   })
 })
+
+describe('a stray local copy beside a leftover in another ssh partition', () => {
+  const REPO_ID = 'repo-remote'
+  const WORKTREE_ID = `${REPO_ID}::/remote/checkout/feature`
+
+  // Both sort orders, since partitions are read in sorted host-id order.
+  it.each([
+    [TARGET_ID, OTHER_SSH_HOST_ID],
+    [OTHER_TARGET_ID, SSH_HOST_ID]
+  ])('keeps the rows of the partition the catalog names (owner %s)', async (owner, leftover) => {
+    const read = await fetchWorkspaceSessionWithRuntimeHostOwners(
+      partitionedApi({
+        local: session({ tabsByWorktree: { [WORKTREE_ID]: [tab('tab-local', WORKTREE_ID)] } }),
+        [`ssh:${owner}`]: session({
+          tabsByWorktree: { [WORKTREE_ID]: [tab('tab-live', WORKTREE_ID)] }
+        }),
+        [leftover]: session({
+          tabsByWorktree: { [WORKTREE_ID]: [tab('tab-leftover', WORKTREE_ID)] }
+        })
+      }),
+      [{ id: REPO_ID, connectionId: owner, executionHostId: null }]
+    )
+
+    expect(read.session.tabsByWorktree[WORKTREE_ID]?.map((entry) => entry.id)).toEqual(['tab-live'])
+  })
+})
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 13cc1baf5078..f803b6f17d2f 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
@@ -23,6 +23,7 @@ import type { WorkspaceSessionState } from '../../../shared/workspace-session-st
 import { shouldAutoCreateInitialTerminal } from '@/components/terminal/initial-terminal'
 import { mergeDirectSshRemoteWorkspaceSession } from '../hooks/remote-workspace-session-merge'
 import { fetchWorkspaceSessionWithRuntimeHostOwners } from './workspace-session-host-hydration'
+import { worktreeWorkspaceKey } from '../../../shared/workspace-scope'
 
 const TARGET_ID = 'target-1'
 const SSH_HOST_ID: ExecutionHostId = `ssh:${TARGET_ID}`
@@ -121,25 +122,159 @@ describe('ssh host partition hydration', () => {
     ).toBe('session-1')
   })
 
-  it('leaves a workspace the local partition already holds tabs for untouched', async () => {
-    // The other direction of the same rule, and the reason adoption is only gap-filling: merging
-    // into a populated row would re-add tabs the user had closed on every launch.
+  it('ignores a stray local copy of a workspace the catalog places on the ssh target', async () => {
+    // `local` rows for an SSH workspace are residue (#23390, #25616). Keeping them restored tabs
+    // the user had closed and dropped the live ones the SSH partition holds.
     const read = await fetchWorkspaceSessionWithRuntimeHostOwners(
       partitionedApi(strandedPartitions([tab('tab-runtime')], [tab('tab-local')])),
       repos
     )
 
+    expect(read.session.tabsByWorktree[WORKTREE_ID]?.map((entry) => entry.id)).toEqual([
+      'tab-runtime'
+    ])
+    expect(read.session.activeTabIdByWorktree?.[WORKTREE_ID]).toBe('tab-runtime')
+    expect(read.contestedPrimaryHostBySessionKey[WORKTREE_ID]).toBe(SSH_HOST_ID)
+  })
+
+  it('keeps the ssh partition agent-resume records beside a stray local copy', async () => {
+    const partitions = strandedPartitions([tab('tab-runtime')], [tab('tab-local')])
+    partitions[SSH_HOST_ID] = session({
+      ...partitions[SSH_HOST_ID],
+      sleepingAgentSessionsByPaneKey: {
+        'tab-runtime:leaf-1': {
+          paneKey: 'tab-runtime:leaf-1',
+          worktreeId: WORKTREE_ID,
+          tabId: 'tab-runtime',
+          agent: 'claude',
+          providerSession: { key: 'session_id', id: 'session-1' },
+          prompt: 'resume me',
+          state: 'done',
+          capturedAt: 5,
+          updatedAt: 5
+        } satisfies SleepingAgentSessionRecord
+      }
+    })
+
+    const read = await fetchWorkspaceSessionWithRuntimeHostOwners(partitionedApi(partitions), repos)
+
+    expect(Object.keys(read.session.sleepingAgentSessionsByPaneKey ?? {})).toEqual([
+      'tab-runtime:leaf-1'
+    ])
+  })
+
+  it('keeps local tabs when the ssh partition names the workspace but holds no tabs', async () => {
+    const read = await fetchWorkspaceSessionWithRuntimeHostOwners(
+      partitionedApi(strandedPartitions([], [tab('tab-local')])),
+      repos
+    )
+
     expect(read.session.tabsByWorktree[WORKTREE_ID]?.map((entry) => entry.id)).toEqual([
       'tab-local'
     ])
   })
 
-  it("leaves that workspace's other rows alone as well", async () => {
+  it('ignores a stray local copy when the ssh partition keys its tabs by workspace key', async () => {
+    const partitions = strandedPartitions([tab('tab-runtime')], [tab('tab-local')])
+    partitions[SSH_HOST_ID] = session({
+      tabsByWorktree: { [worktreeWorkspaceKey(WORKTREE_ID)]: [tab('tab-runtime')] }
+    })
+
+    const read = await fetchWorkspaceSessionWithRuntimeHostOwners(partitionedApi(partitions), repos)
+
+    expect(
+      Object.values(read.session.tabsByWorktree)
+        .flat()
+        .map((entry) => entry.id)
+    ).toEqual(['tab-runtime'])
+  })
+
+  it("replaces a stray local copy's records for a tab id the ssh partition shares", async () => {
+    // Relay reattach copied tab ids into `local`, so the stale and live rows can share a key.
+    const partitions = strandedPartitions([tab('tab-shared')], [tab('tab-shared')])
+    const layout = (activeLeafId: string) => ({ root: null, activeLeafId, expandedLeafId: null })
+    partitions.local = session({
+      ...partitions.local,
+      terminalLayoutsByTabId: { 'tab-shared': layout('leaf-stale') }
+    })
+    partitions[SSH_HOST_ID] = session({
+      ...partitions[SSH_HOST_ID],
+      terminalLayoutsByTabId: { 'tab-shared': layout('leaf-live') }
+    })
+
+    const read = await fetchWorkspaceSessionWithRuntimeHostOwners(partitionedApi(partitions), repos)
+
+    expect(read.session.terminalLayoutsByTabId?.['tab-shared']?.activeLeafId).toBe('leaf-live')
+  })
+
+  it("keeps a stray local copy's unsaved draft beside the ssh partition's open files", async () => {
+    const openFile = (relativePath: string, dirtyDraftContent?: string) => ({
+      filePath: `${WORKTREE_PATH}/${relativePath}`,
+      relativePath,
+      worktreeId: WORKTREE_ID,
+      language: 'typescript',
+      ...(dirtyDraftContent === undefined ? {} : { dirtyDraftContent })
+    })
+    const partitions = strandedPartitions([tab('tab-runtime')], [tab('tab-local')])
+    partitions.local = session({
+      ...partitions.local,
+      openFilesByWorktree: { [WORKTREE_ID]: [openFile('src/main.ts', 'unsaved work')] }
+    })
+    partitions[SSH_HOST_ID] = session({
+      ...partitions[SSH_HOST_ID],
+      openFilesByWorktree: { [WORKTREE_ID]: [openFile('src/live.ts')] }
+    })
+
+    const read = await fetchWorkspaceSessionWithRuntimeHostOwners(partitionedApi(partitions), repos)
+
+    expect(read.session.tabsByWorktree[WORKTREE_ID]?.map((entry) => entry.id)).toEqual([
+      'tab-runtime'
+    ])
+    expect(
+      read.session.openFilesByWorktree?.[WORKTREE_ID]?.map((file) => [
+        file.relativePath,
+        file.dirtyDraftContent
+      ])
+    ).toEqual([
+      ['src/live.ts', undefined],
+      ['src/main.ts', 'unsaved work']
+    ])
+  })
+
+  it("keeps a stray local copy's unsaved draft over the ssh partition's clean entry", async () => {
+    const file = {
+      filePath: `${WORKTREE_PATH}/src/main.ts`,
+      relativePath: 'src/main.ts',
+      worktreeId: WORKTREE_ID,
+      language: 'typescript'
+    }
+    const partitions = strandedPartitions([tab('tab-runtime')], [tab('tab-local')])
+    partitions.local = session({
+      ...partitions.local,
+      openFilesByWorktree: { [WORKTREE_ID]: [{ ...file, dirtyDraftContent: 'unsaved work' }] }
+    })
+    partitions[SSH_HOST_ID] = session({
+      ...partitions[SSH_HOST_ID],
+      openFilesByWorktree: { [WORKTREE_ID]: [file] }
+    })
+
+    const read = await fetchWorkspaceSessionWithRuntimeHostOwners(partitionedApi(partitions), repos)
+
+    expect(
+      read.session.openFilesByWorktree?.[WORKTREE_ID]?.map((entry) => entry.dirtyDraftContent)
+    ).toEqual(['unsaved work'])
+  })
+
+  it('leaves a populated local copy alone when the catalog cannot name its owner', async () => {
+    // Without a repo row the local copy may be the live one, so the gap-filling rule still applies.
     const read = await fetchWorkspaceSessionWithRuntimeHostOwners(
       partitionedApi(strandedPartitions([tab('tab-runtime')], [tab('tab-local')])),
-      repos
+      []
     )
 
+    expect(read.session.tabsByWorktree[WORKTREE_ID]?.map((entry) => entry.id)).toEqual([
+      'tab-local'
+    ])
     expect(read.session.activeTabIdByWorktree?.[WORKTREE_ID]).toBeUndefined()
   })
 
@@ -313,9 +448,10 @@ describe('ssh host partition rows the host has nothing for', () => {
     )
   })
 
-  it('still adopts a populated host row over the base leftovers', async () => {
+  it('still adopts a populated host row over the base leftovers, keeping only their drafts', async () => {
     // The other side of the same rule: the guard must be about the host having nothing, not about
-    // the base having something, or adoption stops repairing the split it exists for.
+    // the base having something, or adoption stops repairing the split it exists for. An unsaved
+    // draft the host row lacks is the one leftover kept, since nothing else can recover it.
     const partitions = emptyHostRowsOverBaseDraft(false)
     partitions[SSH_HOST_ID] = session({
       ...partitions[SSH_HOST_ID],
@@ -335,7 +471,7 @@ describe('ssh host partition rows the host has nothing for', () => {
 
     expect(
       read.session.openFilesByWorktree?.[WORKTREE_ID]?.map((file) => file.relativePath)
-    ).toEqual(['src/host.ts'])
+    ).toEqual(['src/host.ts', 'src/main.ts'])
   })
 
   it('adopts the layout of a tab the host slice names only in unifiedTabs', async () => {
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
index ae956cabd216..22665ff65277 100644
--- a/src/renderer/src/lib/worktree-activation-default-agent-chat.test.ts
+++ b/src/renderer/src/lib/worktree-activation-default-agent-chat.test.ts
@@ -113,11 +113,34 @@ describe('empty workspace seeding with a default agent chat', () => {
       { seedUserDefaultSurface: true }
     )
 
-    expect(defaultChat.open).toHaveBeenCalledWith('wt-1')
+    expect(defaultChat.open).toHaveBeenCalledWith('wt-1', expect.any(Function))
     expect(primaryTabId).toBe('chat-tab')
     expect(createTab).not.toHaveBeenCalled()
   })
 
+  // A host's "no" to the chat seeds the shell this workspace would have had, not the agent's TUI.
+  it('seeds the plain shell when the host declines the default chat', () => {
+    defaultChat.open.mockImplementation((_worktreeId: string, seedShell: () => boolean) => {
+      seedShell()
+      return { primaryTabId: null }
+    })
+    const createTab = vi.fn(() => ({ id: 'shell-tab' }))
+    const store = createMockStore({ createTab })
+
+    ensureWorktreeHasInitialTerminal(store, 'wt-1', undefined, undefined, undefined, undefined, {
+      seedUserDefaultSurface: true
+    })
+
+    expect(defaultChat.open).toHaveBeenCalledOnce()
+    expect(createTab).toHaveBeenCalledOnce()
+    expect(createTab).toHaveBeenCalledWith(
+      'wt-1',
+      undefined,
+      undefined,
+      expect.not.objectContaining({ launchAgent: expect.anything() })
+    )
+  })
+
   it('falls back to a shell when no chat can open', () => {
     defaultChat.open.mockReturnValue(null)
     const createTab = vi.fn(() => ({ id: 'shell-tab' }))
@@ -156,7 +179,7 @@ describe('empty workspace seeding with a default agent chat', () => {
 
     activateAndRevealWorktree(worktree.id, { ...USER_OPEN, notifyHostRuntime: false })
 
-    expect(defaultChat.open).toHaveBeenCalledWith(worktree.id)
+    expect(defaultChat.open).toHaveBeenCalledWith(worktree.id, expect.any(Function))
   })
 
   it('back/forward navigation asks for the default surface', () => {
@@ -170,7 +193,7 @@ describe('empty workspace seeding with a default agent chat', () => {
 
     useAppStore.getState().goBackWorktree()
 
-    expect(defaultChat.open).toHaveBeenCalledWith(worktree.id)
+    expect(defaultChat.open).toHaveBeenCalledWith(worktree.id, expect.any(Function))
   })
 
   // Why: CLI/phone creates, fallbacks after a failed agent launch, and the move after a delete
@@ -203,7 +226,7 @@ describe('the gated reseed that seeds an empty workspace in Electron', () => {
     expect(result === false ? 'failed' : result.primaryTabId).toBeNull()
     await gate.mock.results[0]?.value
 
-    expect(defaultChat.open).toHaveBeenCalledWith(worktree.id)
+    expect(defaultChat.open).toHaveBeenCalledWith(worktree.id, expect.any(Function))
     expect(tabCount(worktree.id)).toBe(0)
   })
 
@@ -227,7 +250,7 @@ describe('the gated reseed that seeds an empty workspace in Electron', () => {
     activateAndRevealFolderWorkspace(FOLDER_ID, { ...USER_OPEN, executionHostId: 'local' })
     await gate.mock.results[0]?.value
 
-    expect(defaultChat.open).toHaveBeenCalledWith(FOLDER_KEY)
+    expect(defaultChat.open).toHaveBeenCalledWith(FOLDER_KEY, expect.any(Function))
     expect(tabCount(FOLDER_KEY)).toBe(0)
   })
 
diff --git a/src/renderer/src/lib/worktree-activation-launch-awaiting-host.test.ts b/src/renderer/src/lib/worktree-activation-launch-awaiting-host.test.ts
new file mode 100644
index 000000000000..6749ba5a5ddd
--- /dev/null
+++ b/src/renderer/src/lib/worktree-activation-launch-awaiting-host.test.ts
@@ -0,0 +1,66 @@
+import { afterEach, expect, it, vi } from 'vitest'
+
+const admit = vi.hoisted(() => vi.fn())
+vi.mock('sonner', () => ({ toast: { info: vi.fn(), error: vi.fn() } }))
+vi.mock('@/lib/structured-agent-session-host-admission', () => ({
+  admitStructuredLaunchOnHost: admit
+}))
+
+import { useAppStore } from '@/store'
+import { activateAndRevealWorktree } from './worktree-activation'
+import * as activationGate from './worktree-agent-activation-gate'
+import {
+  makeCreatedAgentWorktree as makeWorktree,
+  seedEmptyActivatableWorktree
+} from './worktree-activation-created-agent-test-state'
+import { registerWorktreeActivationReset } from './worktree-activation-test-harness'
+import { beginHostAdmittedStructuredLaunch } from './structured-agent-session-launch-admission'
+import { adoptAgentSessionLaunchVerdict } from './agent-session-launch-plan'
+import { LOCAL_EXECUTION_HOST_ID } from '../../../shared/execution-host'
+
+const initial = useAppStore.getState()
+registerWorktreeActivationReset()
+afterEach(() => {
+  vi.unstubAllGlobals()
+  vi.restoreAllMocks()
+  useAppStore.setState(initial, true)
+})
+
+// Clicking the still-empty workspace while its chat waits on this machine used to seed
+// "Terminal 1" beside the chat, through the activation's reseed rather than the watcher.
+it('does not seed a shell when the workspace is re-activated while its chat waits on its host', async () => {
+  const worktree = makeWorktree()
+  seedEmptyActivatableWorktree(worktree)
+  vi.stubGlobal('window', { api: { runtime: { call: vi.fn() }, pty: { listSessions: vi.fn() } } })
+  const gate = vi.spyOn(activationGate, 'gateWorktreeAgentActivation').mockResolvedValue('empty')
+  let answer!: (admission: { kind: 'admitted' }) => void
+  admit.mockReturnValue(new Promise((resolve) => (answer = resolve)))
+  const openAdmitted = vi.fn(() => ({ settlement: new Promise<never>(() => {}), cancel: vi.fn() }))
+  beginHostAdmittedStructuredLaunch({
+    plan: {
+      ...adoptAgentSessionLaunchVerdict({
+        route: 'structured-native-chat',
+        requestId: 'request-1',
+        agent: 'claude',
+        worktreeId: worktree.id
+      }),
+      agent: 'claude'
+    },
+    hooks: {},
+    worktreeId: worktree.id,
+    executionHostId: LOCAL_EXECUTION_HOST_ID,
+    target: { kind: 'local' },
+    openAdmitted,
+    onHostDeclined: () => ({ opened: true })
+  })
+
+  activateAndRevealWorktree(worktree.id, { notifyHostRuntime: false })
+  await gate.mock.results[0]?.value
+  await new Promise((resolve) => setTimeout(resolve, 0))
+  expect(useAppStore.getState().tabsByWorktree[worktree.id] ?? []).toEqual([])
+
+  answer({ kind: 'admitted' })
+  await vi.waitFor(() => expect(openAdmitted).toHaveBeenCalledOnce())
+  expect(useAppStore.getState().tabsByWorktree[worktree.id] ?? []).toEqual([])
+  expect(admit).toHaveBeenCalledOnce()
+})
diff --git a/src/renderer/src/lib/worktree-creation-structured-session-paired-decline.test.ts b/src/renderer/src/lib/worktree-creation-structured-session-host-decline.test.ts
similarity index 63%
rename from src/renderer/src/lib/worktree-creation-structured-session-paired-decline.test.ts
rename to src/renderer/src/lib/worktree-creation-structured-session-host-decline.test.ts
index f1c903aab89d..82426c322b3a 100644
--- a/src/renderer/src/lib/worktree-creation-structured-session-paired-decline.test.ts
+++ b/src/renderer/src/lib/worktree-creation-structured-session-host-decline.test.ts
@@ -20,8 +20,12 @@ import { launchStructuredWorktreeSession } from './worktree-creation-structured-
 
 const initial = useAppStore.getState()
 
-function worktree(name: string): Worktree {
+function worktree(name: string, host: 'paired' | 'local' = 'paired'): Worktree {
   const worktreePath = path.join('workspace', name)
+  const owner: Pick<Worktree, 'hostId' | 'runtimeOwnerEnvironmentId'> =
+    host === 'paired'
+      ? { hostId: 'runtime:server-1', runtimeOwnerEnvironmentId: 'server-1' }
+      : { hostId: 'local' }
   return {
     id: `repo-1::${worktreePath}`,
     repoId: 'repo-1',
@@ -41,8 +45,7 @@ function worktree(name: string): Worktree {
     sortOrder: 0,
     lastActivityAt: 0,
     createdWithAgent: 'claude',
-    hostId: 'runtime:server-1',
-    runtimeOwnerEnvironmentId: 'server-1'
+    ...owner
   }
 }
 
@@ -123,3 +126,60 @@ describe('a background worktree create whose paired server declines the chat', (
     expect(useAppStore.getState().activeWorktreeId).toBe(OTHER.id)
   })
 })
+
+const LOCAL_OTHER = worktree('local-other', 'local')
+const LOCAL_CREATED = worktree('local-created', 'local')
+
+function seedThisMachine(): void {
+  useAppStore.setState({
+    repos: [
+      {
+        id: 'repo-1',
+        path: path.join('workspace', 'repo'),
+        displayName: 'repo',
+        badgeColor: '#000',
+        addedAt: 0
+      }
+    ],
+    worktreesByRepo: { 'repo-1': [LOCAL_OTHER, LOCAL_CREATED] },
+    tabsByWorktree: {},
+    ptyIdsByTabId: {},
+    // oxlint-disable-next-line typescript/consistent-type-assertions -- SAFETY: the launch only checks the creation is still pending.
+    pendingWorktreeCreations: { 'creation-1': {} as never },
+    settings: getDefaultSettings(path.join('workspace', '.orca')),
+    // The user moved to another workspace while the create ran.
+    activeWorktreeId: LOCAL_OTHER.id
+  })
+}
+
+describe('a background worktree create whose own machine declines the chat', () => {
+  it("opens the request's agent terminal in place, with no chat, leaving the user where they are", async () => {
+    mocks.createSupport.mockResolvedValue({ supported: false, reason: 'wsl' })
+    seedThisMachine()
+
+    await launchStructuredWorktreeSession({
+      creationId: 'creation-1',
+      request: REQUEST,
+      agentLaunchRoute: 'structured-native-chat',
+      worktreeId: LOCAL_CREATED.id,
+      shouldActivateOnCompletion: false,
+      activation: false,
+      primaryTabId: null
+    })
+
+    await vi.waitFor(() =>
+      expect(useAppStore.getState().tabsByWorktree[LOCAL_CREATED.id]).toHaveLength(1)
+    )
+    const state = useAppStore.getState()
+    const tab = state.tabsByWorktree[LOCAL_CREATED.id]![0]!
+    expect(state.pendingStartupByTabId[tab.id]).toMatchObject({
+      command: "claude --model opus 'fix the flaky test'"
+    })
+    expect(
+      (state.unifiedTabsByWorktree[LOCAL_CREATED.id] ?? []).filter(
+        (candidate) => candidate.contentType === 'agent-session'
+      )
+    ).toEqual([])
+    expect(state.activeWorktreeId).toBe(LOCAL_OTHER.id)
+  })
+})
diff --git a/src/renderer/src/lib/worktree-creation-structured-session.ts b/src/renderer/src/lib/worktree-creation-structured-session.ts
index 9cc64b670176..d9cb4a07d0b0 100644
--- a/src/renderer/src/lib/worktree-creation-structured-session.ts
+++ b/src/renderer/src/lib/worktree-creation-structured-session.ts
@@ -4,9 +4,12 @@ import { adoptAgentSessionLaunchVerdict } from '@/lib/agent-session-launch-plan'
 import type { AgentLaunchRoute } from '@/lib/agent-launch-routing'
 import type { WorktreeCreationRequest } from '@/lib/pending-worktree-creation'
 import { beginStructuredAgentSessionProvisionalLaunch } from '@/lib/structured-agent-session-provisional-tab'
-import type { StructuredLaunchTerminal } from '@/lib/structured-agent-session-paired-admission'
+import type { StructuredLaunchTerminal } from '@/lib/structured-agent-session-launch-admission'
 import { buildWorktreeCreationStartupOpt } from '@/lib/worktree-creation-flow-startup'
 import { ensureWebRuntimeWorktreeTerminalAfterWake } from '@/lib/web-runtime-worktree-terminal-after-wake'
+import { ensureWorktreeHasInitialTerminal } from '@/lib/worktree-initial-terminal-seeding'
+import { mountCreatedWorktreeStartupTabsInBackground } from '@/lib/worktree-creation-background-mount'
+import type { RuntimeClientTarget } from '@/runtime/runtime-client-target'
 
 export type WorktreeCreationStructuredSessionResult = {
   accepted: boolean
@@ -27,19 +30,38 @@ type LaunchStructuredWorktreeSessionArgs = {
 }
 
 /**
- * A paired server's "no" to a create the user moved away from opens the agent terminal the way a
+ * The host's "no" to a create the user moved away from opens the agent terminal the way a
  * background terminal create does: in place, without selecting the workspace (#23974). A create the
  * user is still watching keeps the default, which opens it as a new agent tab there.
  */
 function openBackgroundDeclinedTerminal(
-  args: LaunchStructuredWorktreeSessionArgs
+  args: LaunchStructuredWorktreeSessionArgs,
+  host: RuntimeClientTarget
 ): StructuredLaunchTerminal {
-  ensureWebRuntimeWorktreeTerminalAfterWake(args.worktreeId, {
-    startup: buildWorktreeCreationStartupOpt(args.request, false),
-    agent: args.request.agent,
-    activate: false
-  })
-  return { opened: true }
+  const startup = buildWorktreeCreationStartupOpt(args.request, false)
+  if (host.kind === 'environment') {
+    ensureWebRuntimeWorktreeTerminalAfterWake(args.worktreeId, {
+      startup,
+      agent: args.request.agent,
+      activate: false
+    })
+    return { opened: true }
+  }
+  if (!startup) {
+    return { opened: false }
+  }
+  // This machine seeds the agent terminal itself; a background workspace mounts it without showing it.
+  const tabId = ensureWorktreeHasInitialTerminal(
+    useAppStore.getState(),
+    args.worktreeId,
+    startup,
+    undefined,
+    undefined,
+    undefined,
+    { activateCreatedTabs: false, createNewTerminalForStartup: true }
+  )
+  mountCreatedWorktreeStartupTabsInBackground(args.worktreeId)
+  return { opened: tabId !== null }
 }
 
 export async function launchStructuredWorktreeSession(
@@ -83,7 +105,7 @@ export async function launchStructuredWorktreeSession(
       activate: args.shouldActivateOnCompletion,
       ...(args.shouldActivateOnCompletion
         ? {}
-        : { onHostDeclined: () => openBackgroundDeclinedTerminal(args) }),
+        : { onHostDeclined: (host) => openBackgroundDeclinedTerminal(args, host) }),
       beforeOpen: () => {
         // Why: cancellation can arrive through the launch signal while reveal is running, before
         // the pending-creation store snapshot has caught up.
diff --git a/src/renderer/src/lib/worktree-initial-terminal-seeding.ts b/src/renderer/src/lib/worktree-initial-terminal-seeding.ts
index feb01ef0b9b5..3bb5a28c4200 100644
--- a/src/renderer/src/lib/worktree-initial-terminal-seeding.ts
+++ b/src/renderer/src/lib/worktree-initial-terminal-seeding.ts
@@ -231,7 +231,20 @@ export function ensureWorktreeHasInitialTerminal(
     !hasExplicitLaunchWork &&
     opts.activateCreatedTabs !== false
   ) {
-    const defaultChat = openDefaultAgentChatInEmptyWorkspace(worktreeId)
+    // A host's "no" to the chat seeds what this same call would have without the default chat.
+    const defaultChat = openDefaultAgentChatInEmptyWorkspace(
+      worktreeId,
+      () =>
+        ensureWorktreeHasInitialTerminal(
+          store,
+          worktreeId,
+          startup,
+          setup,
+          issueCommand,
+          defaultTabs,
+          { ...opts, seedUserDefaultSurface: false }
+        ) !== null
+    )
     if (defaultChat) {
       return defaultChat.primaryTabId
     }
diff --git a/src/renderer/src/lib/worktree-operation-route.ts b/src/renderer/src/lib/worktree-operation-route.ts
index dae8d77ddbe6..a321d2412aa9 100644
--- a/src/renderer/src/lib/worktree-operation-route.ts
+++ b/src/renderer/src/lib/worktree-operation-route.ts
@@ -5,6 +5,7 @@ import {
   type ExecutionHostId
 } from '../../../shared/execution-host'
 import { parseWorkspaceKey } from '../../../shared/workspace-scope'
+import { FLOATING_TERMINAL_WORKTREE_ID } from '../../../shared/constants'
 import { getRepoIdFromWorktreeId } from '@/store/slices/worktree-helpers'
 import { resolveExactWorktreeRoute } from './worktree-owner-route'
 import {
@@ -26,6 +27,15 @@ export type WorktreeOperationRoute = {
   runtimeEnvironmentId: string | null
 }
 
+/** The floating workspace has no host record; its files always live on this machine. */
+export function getFloatingWorkspaceOperationRoute(
+  worktreeId: string
+): WorktreeOperationRoute | null {
+  return worktreeId === FLOATING_TERMINAL_WORKTREE_ID
+    ? { executionHostId: LOCAL_EXECUTION_HOST_ID, runtimeEnvironmentId: null }
+    : null
+}
+
 export type WorktreeOperationRouteResolution =
   | { kind: 'resolved'; route: WorktreeOperationRoute }
   | { kind: 'ambiguous' }
diff --git a/src/renderer/src/lib/worktree-palette-attachment-urls.test.ts b/src/renderer/src/lib/worktree-palette-attachment-urls.test.ts
new file mode 100644
index 000000000000..a9b8424e7061
--- /dev/null
+++ b/src/renderer/src/lib/worktree-palette-attachment-urls.test.ts
@@ -0,0 +1,83 @@
+import { worktreeMatchesGitHubNumber } from './github-work-item-workspace-attachment'
+import { describe, expect, it } from 'vitest'
+import type { Worktree } from '../../../shared/worktree/types'
+import {
+  referenceWorkspace,
+  referenceRepo
+} from '@/components/sidebar/workspace-reference-fixtures.test-support'
+import {
+  matchWorktreePaletteTaskUrl,
+  parseCmdJTaskSourceUrl
+} from './worktree-palette-task-url-match'
+
+describe('multiple workspace task attachments', () => {
+  it.each([
+    { provider: 'github', type: 'pr', number: 42, url: 'https://github.com/acme/orca/pull/42' },
+    {
+      provider: 'gitlab',
+      type: 'mr',
+      number: 42,
+      url: 'https://gitlab.com/team/orca/-/merge_requests/42'
+    },
+    {
+      provider: 'linear',
+      type: 'issue',
+      number: 0,
+      identifier: 'STA-42',
+      url: 'https://linear.app/acme/issue/STA-42/title'
+    },
+    {
+      provider: 'jira',
+      type: 'issue',
+      number: 0,
+      identifier: 'STA-42',
+      url: 'https://acme.atlassian.net/browse/STA-42'
+    }
+  ] as const)('matches secondary $provider links by their full URL', (attachment) => {
+    const intent = parseCmdJTaskSourceUrl(attachment.url)
+    if (!intent) {
+      throw new Error('Fixture URL should parse')
+    }
+    const worktree = { ...referenceWorkspace, linkedPR: 1, linkedItems: [attachment] }
+    expect(matchWorktreePaletteTaskUrl({ worktree, intent })).not.toBeNull()
+  })
+  it('does not match a same-number review in another repository', () => {
+    const intent = parseCmdJTaskSourceUrl('https://github.com/other/project/pull/42')
+    if (!intent) {
+      throw new Error('Fixture URL should parse')
+    }
+    const worktree: Worktree = {
+      ...referenceWorkspace,
+      linkedItems: [
+        { provider: 'github', type: 'pr', number: 42, url: 'https://github.com/acme/orca/pull/42' }
+      ]
+    }
+    expect(matchWorktreePaletteTaskUrl({ worktree, intent })).toBeNull()
+  })
+})
+
+describe('bare GitHub number activation', () => {
+  it.each([
+    { repoId: 'foreign' },
+    { url: 'https://github.com/foreign/project/pull/42' },
+    { repoId: 'repo', url: 'https://github.com/foreign/project/issues/42' },
+    { url: 'https://github.example.com/acme/orca/pull/42' }
+  ])('rejects foreign references even without a repo id: %j', (scope) => {
+    const worktree: Worktree = {
+      ...referenceWorkspace,
+      linkedItems: [{ provider: 'github', type: 'pr', number: 42, ...scope }]
+    }
+    expect(worktreeMatchesGitHubNumber(worktree, 42, referenceRepo)).toBe(false)
+  })
+  it('matches secondary local references and legacy bare numbers', () => {
+    const worktree: Worktree = {
+      ...referenceWorkspace,
+      linkedItems: [
+        { provider: 'github', type: 'pr', number: 42, url: 'https://github.com/acme/orca/pull/42' }
+      ]
+    }
+    expect(worktreeMatchesGitHubNumber(worktree, 42, referenceRepo)).toBe(true)
+    expect(worktreeMatchesGitHubNumber(referenceWorkspace, 7, referenceRepo)).toBe(true)
+    expect(worktreeMatchesGitHubNumber(worktree, 42, undefined)).toBe(false)
+  })
+})
diff --git a/src/renderer/src/lib/worktree-palette-document.ts b/src/renderer/src/lib/worktree-palette-document.ts
index 8efa20fba222..0fa5c7c1dee9 100644
--- a/src/renderer/src/lib/worktree-palette-document.ts
+++ b/src/renderer/src/lib/worktree-palette-document.ts
@@ -3,6 +3,7 @@ import { issueCacheKey as getIssueCacheKey } from '@/store/github/cache-identity
 import { buildPaletteDocument, type PaletteDocument } from './palette-match/palette-document'
 import type { PaletteComposedEvidence } from './palette-match/evidence-composer'
 import {
+  buildWorktreeAttachmentEvidence,
   buildWorktreeAutomationEvidence,
   buildWorktreeCommentEvidence,
   buildWorktreeIssueEvidence,
@@ -17,6 +18,8 @@ import {
 } from './worktree-default-display-name'
 import type { HostedReviewInfo } from '../../../shared/hosted-review'
 import type { Repo } from '../../../shared/repo-types'
+import { getWorkspaceAttachments } from '../../../shared/workspace-attachments'
+import { getWorkspaceAttachmentKey } from '../../../shared/workspace-attachment-normalization'
 import type { Worktree } from '../../../shared/worktree/types'
 import { isGitHubPRSuppressed } from '../../../shared/worktree/github-pr-suppression'
 import {
@@ -129,6 +132,10 @@ function buildEvidence(
       number: worktree.linkedIssue,
       title: resolveIssueTitle(worktree, repo, sources)
     }),
+    ...getWorkspaceAttachments({ linkedItems: worktree.linkedItems }).map((item) => {
+      const evidence = buildWorktreeAttachmentEvidence(item)
+      return evidence ? { ...evidence, id: `attachment:${getWorkspaceAttachmentKey(item)}` } : null
+    }),
     ...ports.map((port) => buildWorktreePortEvidence(port))
   ]
   return units.filter((unit): unit is PaletteComposedEvidence => unit !== null)
diff --git a/src/renderer/src/lib/worktree-palette-evidence.ts b/src/renderer/src/lib/worktree-palette-evidence.ts
index 5a667bff16c5..951083fd61e2 100644
--- a/src/renderer/src/lib/worktree-palette-evidence.ts
+++ b/src/renderer/src/lib/worktree-palette-evidence.ts
@@ -5,7 +5,7 @@ import {
 import { extractWorktreePaletteCommentSnippet } from './worktree-palette-comment-snippet'
 import type { MatchRange } from './palette-match/normalized-text'
 import type { HostedReviewInfo } from '../../../shared/hosted-review'
-import type { Worktree } from '../../../shared/worktree/types'
+import type { WorkspaceAttachment, Worktree } from '../../../shared/worktree/types'
 
 /** Chip label kinds the worktree row can render for a supporting-evidence unit. */
 export type PaletteSupportingKind =
@@ -201,3 +201,28 @@ export function buildWorktreePortEvidence(
     ]
   })
 }
+
+export function buildWorktreeAttachmentEvidence(
+  item: WorkspaceAttachment
+): PaletteComposedEvidence | null {
+  if (item.type !== 'issue' && item.provider !== 'linear' && item.provider !== 'jira') {
+    return buildWorktreeReviewEvidence({
+      provider: item.provider,
+      number: item.number,
+      title: item.title
+    })
+  }
+  if (item.provider === 'github' || item.provider === 'gitlab') {
+    return buildWorktreeIssueEvidence(item)
+  }
+  const identifier = item.identifier ?? item.linearIdentifier ?? item.jiraIdentifier ?? ''
+  return composePaletteEvidence({
+    id: `task:${identifier}`,
+    kind: 'task',
+    accessibilityLabel: 'Linked task',
+    parts: [
+      { key: 'identifier', text: identifier, profile: 'identifier', identifier: { kind: 'key' } },
+      { key: 'title', text: item.title ?? '', profile: 'prose' }
+    ]
+  })
+}
diff --git a/src/renderer/src/lib/worktree-palette-gitlab-url-match.ts b/src/renderer/src/lib/worktree-palette-gitlab-url-match.ts
index f606ba395667..fd0e0fa25b94 100644
--- a/src/renderer/src/lib/worktree-palette-gitlab-url-match.ts
+++ b/src/renderer/src/lib/worktree-palette-gitlab-url-match.ts
@@ -10,6 +10,7 @@ import {
   type ProjectSlug
 } from '../../../shared/new-workspace/gitlab-links'
 import type { Repo } from '../../../shared/repo-types'
+import { getWorkspaceAttachments } from '../../../shared/workspace-attachments'
 import type { Worktree } from '../../../shared/worktree/types'
 
 export type GitLabIssueOrMRLink = NonNullable<ReturnType<typeof parseGitLabIssueOrMRLink>>
@@ -61,39 +62,26 @@ export function worktreeMatchesGitLabUrl(
   repo: Repo | undefined,
   review: HostedReviewInfo | null | undefined
 ): boolean {
-  const linkedUrl = worktree.linkedWorkItem?.url
-    ? parseGitLabIssueOrMRLink(worktree.linkedWorkItem.url)
-    : null
-  if (linkedUrl && gitLabLinksEqual(linkedUrl, link)) {
-    return true
-  }
-
+  const attachments = getWorkspaceAttachments(worktree).filter((item) => item.provider === 'gitlab')
+  const attached = attachments.some((item) => {
+    const itemUrl = item.url ? parseGitLabIssueOrMRLink(item.url) : null
+    if (itemUrl) {
+      return gitLabLinksEqual(itemUrl, link)
+    }
+    return (
+      item.type === link.type &&
+      item.number === link.number &&
+      repoMatchesGitLabSlug(repo, link.slug) !== false
+    )
+  })
   const reviewUrl =
     review?.provider === 'gitlab' && review.url ? parseGitLabIssueOrMRLink(review.url) : null
-  if (reviewUrl && gitLabLinksEqual(reviewUrl, link)) {
-    return true
-  }
-
-  const linkedItem = worktree.linkedWorkItem
-  const linkedItemMatches =
-    linkedItem?.provider === 'gitlab' &&
-    linkedItem.type === link.type &&
-    linkedItem.number === link.number
-  const numberMatches =
-    linkedItemMatches ||
-    (link.type === 'mr'
-      ? worktree.linkedGitLabMR === link.number
-      : worktree.linkedGitLabIssue === link.number)
-  if (!numberMatches) {
-    return false
-  }
-
-  // Why: iids are per-project, so a bare number only survives when the repo remote agrees.
-  const repoMatch = repoMatchesGitLabSlug(repo, link.slug)
-  if (repoMatch !== 'unknown') {
-    return repoMatch
-  }
-  // Identity unresolvable: stay permissive unless the stored URL names the same type+number in a
-  // different project, which is a contradiction rather than a plausible cross-project reference.
-  return !(linkedUrl && linkedUrl.type === link.type && linkedUrl.number === link.number)
+  const legacyItem = worktree.linkedWorkItem
+  const legacyNumberMatch =
+    !legacyItem?.url &&
+    legacyItem?.provider === 'gitlab' &&
+    legacyItem.type === link.type &&
+    legacyItem.number === link.number &&
+    repoMatchesGitLabSlug(repo, link.slug) !== false
+  return attached || legacyNumberMatch || Boolean(reviewUrl && gitLabLinksEqual(reviewUrl, link))
 }
diff --git a/src/renderer/src/lib/worktree-palette-search.test.ts b/src/renderer/src/lib/worktree-palette-search.test.ts
index f7d28483a36e..44afd6fb360e 100644
--- a/src/renderer/src/lib/worktree-palette-search.test.ts
+++ b/src/renderer/src/lib/worktree-palette-search.test.ts
@@ -543,3 +543,25 @@ describe('worktree-palette-search', () => {
     ).toHaveLength(1)
   })
 })
+
+describe('secondary workspace attachments in palette search', () => {
+  it('searches the number, identifier, and title of secondary links', () => {
+    const worktree = makeWorktree({
+      linkedPR: 1,
+      linkedItems: [
+        { provider: 'github', type: 'pr', number: 42, title: 'Secondary payment review' },
+        {
+          provider: 'linear',
+          type: 'issue',
+          number: 0,
+          identifier: 'STA-84',
+          title: 'Secondary payment task'
+        }
+      ]
+    })
+    const repoMap = new Map<string, Repo>()
+    expect(searchWorktrees([worktree], '#42', repoMap)).toHaveLength(1)
+    expect(searchWorktrees([worktree], 'STA-84', repoMap)).toHaveLength(1)
+    expect(searchWorktrees([worktree], 'payment', repoMap)).toHaveLength(1)
+  })
+})
diff --git a/src/renderer/src/lib/worktree-palette-task-url-match.ts b/src/renderer/src/lib/worktree-palette-task-url-match.ts
index 2e433bf5f59b..36ad2cc5c412 100644
--- a/src/renderer/src/lib/worktree-palette-task-url-match.ts
+++ b/src/renderer/src/lib/worktree-palette-task-url-match.ts
@@ -15,6 +15,7 @@ import { parseGitLabIssueOrMRLink } from '../../../shared/new-workspace/gitlab-l
 import { parseJiraIssueUrl, type ParsedJiraIssueUrl } from '../../../shared/jira-issue-url'
 import { parseLinearIssueUrlIntent, type LinearIssueUrlIntent } from '../../../shared/linear/links'
 import type { Repo } from '../../../shared/repo-types'
+import { getWorkspaceAttachments } from '../../../shared/workspace-attachments'
 import type { Worktree } from '../../../shared/worktree/types'
 import { normalizeLinearIdentifier } from './linear-issue-workspace-attachment'
 import {
@@ -202,74 +203,66 @@ function worktreeMatchesGitHubUrl(
   repo: Repo | undefined,
   review: HostedReviewInfo | null | undefined
 ): boolean {
-  const linkedUrl = worktree.linkedWorkItem?.url
-    ? parseGitHubIssueOrPRLink(worktree.linkedWorkItem.url)
-    : null
-  if (linkedUrl && githubLinksEqual(linkedUrl, link)) {
-    return true
-  }
-
+  const attachments = getWorkspaceAttachments(worktree).filter((item) => item.provider === 'github')
+  const attachmentMatch = attachments.some((item) => {
+    const itemUrl = item.url ? parseGitHubIssueOrPRLink(item.url) : null
+    if (itemUrl) {
+      return githubLinksEqual(itemUrl, link)
+    }
+    return (
+      item.type === link.type &&
+      item.number === link.number &&
+      repoMatchesGitHubSlug(repo, link.slug) !== false
+    )
+  })
   const reviewUrl = review?.url ? parseGitHubIssueOrPRLink(review.url) : null
-  if (reviewUrl && githubLinksEqual(reviewUrl, link)) {
-    return true
-  }
-
-  const linkedItem = worktree.linkedWorkItem
-  const linkedItemMatches =
-    linkedItem?.provider === 'github' &&
-    linkedItem.type === link.type &&
-    linkedItem.number === link.number
-  const numberMatches =
-    linkedItemMatches ||
-    (link.type === 'pr' ? worktree.linkedPR === link.number : worktree.linkedIssue === link.number)
-  if (!numberMatches) {
-    return false
-  }
-
-  return repoMatchesGitHubSlug(repo, link.slug) !== false
+  const legacyItem = worktree.linkedWorkItem
+  const legacyNumberMatch =
+    !legacyItem?.url &&
+    legacyItem?.provider === 'github' &&
+    legacyItem.type === link.type &&
+    legacyItem.number === link.number &&
+    repoMatchesGitHubSlug(repo, link.slug) !== false
+  return (
+    attachmentMatch || legacyNumberMatch || Boolean(reviewUrl && githubLinksEqual(reviewUrl, link))
+  )
 }
 
 function worktreeMatchesLinearUrl(worktree: Worktree, intent: LinearIssueUrlIntent): boolean {
   const identifier = normalizeLinearIdentifier(intent.identifier)
-  const linkedIdentifier =
-    normalizeLinearIdentifier(worktree.linkedLinearIssue) ??
-    normalizeLinearIdentifier(worktree.linkedWorkItem?.linearIdentifier)
-  if (!identifier || linkedIdentifier !== identifier) {
-    const linkedUrl = worktree.linkedWorkItem?.url
-      ? parseLinearIssueUrlIntent(worktree.linkedWorkItem.url)
-      : null
-    if (
-      !linkedUrl ||
-      linkedUrl.identifier !== intent.identifier ||
-      linkedUrl.organizationUrlKey.toLowerCase() !== intent.organizationUrlKey.toLowerCase()
-    ) {
+  return getWorkspaceAttachments(worktree).some((item) => {
+    if (item.provider !== 'linear') {
       return false
     }
-  }
-
-  const worktreeOrg = worktree.linkedLinearIssueOrganizationUrlKey?.trim().toLowerCase()
-  if (worktreeOrg && worktreeOrg !== intent.organizationUrlKey.toLowerCase()) {
-    return false
-  }
-  return true
+    const linkedUrl = item.url ? parseLinearIssueUrlIntent(item.url) : null
+    const linkedIdentifier = normalizeLinearIdentifier(
+      item.identifier ?? item.linearIdentifier ?? linkedUrl?.identifier
+    )
+    if (!identifier || linkedIdentifier !== identifier) {
+      return false
+    }
+    const org = (item.linearOrganizationUrlKey ?? linkedUrl?.organizationUrlKey)
+      ?.trim()
+      .toLowerCase()
+    return !org || org === intent.organizationUrlKey.toLowerCase()
+  })
 }
 
 function worktreeMatchesJiraUrl(worktree: Worktree, parsed: ParsedJiraIssueUrl): boolean {
-  const linkedUrl = worktree.linkedWorkItem?.url
-    ? parseJiraIssueUrl(worktree.linkedWorkItem.url)
-    : null
-  // Why url first: issue keys are per-project, not per-tenant, so two Jira sites
-  // routinely both have a PROJ-123. The stored URL is the only tenant evidence
-  // here, so where it exists it decides — matching on the bare identifier would
-  // jump to another tenant's worktree.
-  if (linkedUrl) {
-    return (
-      linkedUrl.issueKey === parsed.issueKey &&
-      linkedUrl.origin === parsed.origin &&
-      linkedUrl.sitePath === parsed.sitePath
-    )
-  }
-  return worktree.linkedWorkItem?.jiraIdentifier?.toUpperCase() === parsed.issueKey
+  return getWorkspaceAttachments(worktree).some((item) => {
+    if (item.provider !== 'jira') {
+      return false
+    }
+    const linkedUrl = item.url ? parseJiraIssueUrl(item.url) : null
+    if (linkedUrl) {
+      return (
+        linkedUrl.issueKey === parsed.issueKey &&
+        linkedUrl.origin === parsed.origin &&
+        linkedUrl.sitePath === parsed.sitePath
+      )
+    }
+    return (item.identifier ?? item.jiraIdentifier)?.toUpperCase() === parsed.issueKey
+  })
 }
 
 export function matchWorktreePaletteTaskUrl(args: {
diff --git a/src/renderer/src/lib/worktree-runtime-owner.test.ts b/src/renderer/src/lib/worktree-runtime-owner.test.ts
index 02ea0682e6b4..557a5c16b1a7 100644
--- a/src/renderer/src/lib/worktree-runtime-owner.test.ts
+++ b/src/renderer/src/lib/worktree-runtime-owner.test.ts
@@ -50,10 +50,25 @@ describe('getSettingsForWorktreeRuntimeOwner', () => {
   })
 
   it('keeps the synthetic floating workspace local while a runtime is focused', () => {
-    expect(getSettingsForWorktreeRuntimeOwner(state, FLOATING_TERMINAL_WORKTREE_ID)).toEqual({
+    const floatingState: WorktreeRuntimeOwnerState = {
+      ...state,
+      activeWorktreeId: FLOATING_TERMINAL_WORKTREE_ID,
+      activeWorkspaceExecutionHostId: 'runtime:focused-env'
+    }
+    expect(
+      getSettingsForWorktreeRuntimeOwner(floatingState, FLOATING_TERMINAL_WORKTREE_ID)
+    ).toEqual({
       activeRuntimeEnvironmentId: null
     })
-    expect(getExecutionHostIdForWorktree(state, FLOATING_TERMINAL_WORKTREE_ID)).toBe('local')
+    expect(
+      getRuntimeEnvironmentIdForWorktree(floatingState, FLOATING_TERMINAL_WORKTREE_ID)
+    ).toBeNull()
+    expect(getKnownExecutionHostIdForWorktree(floatingState, FLOATING_TERMINAL_WORKTREE_ID)).toBe(
+      'local'
+    )
+    expect(getExecutionHostIdForWorktree(floatingState, FLOATING_TERMINAL_WORKTREE_ID)).toBe(
+      'local'
+    )
   })
 
   it('routes folder workspaces to their project group runtime owner', () => {
diff --git a/src/renderer/src/lib/worktree-runtime-owner.ts b/src/renderer/src/lib/worktree-runtime-owner.ts
index 091cf246a9f3..7156aa834037 100644
--- a/src/renderer/src/lib/worktree-runtime-owner.ts
+++ b/src/renderer/src/lib/worktree-runtime-owner.ts
@@ -3,7 +3,6 @@ import type { ExecutionHostId } from '../../../shared/execution-host'
 import type { GlobalSettings } from '../../../shared/global-settings-types'
 import type { Worktree } from '../../../shared/worktree/types'
 import { parseWorkspaceKey } from '../../../shared/workspace-scope'
-import { FLOATING_TERMINAL_WORKTREE_ID } from '../../../shared/constants'
 import { getRepoIdFromWorktreeId } from '@/store/slices/worktree-helpers'
 import {
   findIndexedRepoOwner as findRepoRecord,
@@ -20,6 +19,7 @@ import {
   getRuntimeEnvironmentIdForFolderWorkspace
 } from './folder-workspace-runtime-owner'
 import {
+  getFloatingWorkspaceOperationRoute,
   resolveActiveWorkspaceRoute,
   resolveExplicitWorktreeOperationRouteResult,
   resolveWorktreeOperationRouteResult
@@ -63,8 +63,9 @@ export function getRuntimeEnvironmentIdForWorktree(
   if (!worktreeId) {
     return null
   }
-  if (worktreeId === FLOATING_TERMINAL_WORKTREE_ID) {
-    return null
+  const floatingRoute = getFloatingWorkspaceOperationRoute(worktreeId)
+  if (floatingRoute) {
+    return floatingRoute.runtimeEnvironmentId
   }
   const activeRoute = resolveActiveWorkspaceRoute(state, worktreeId)
   if (activeRoute) {
@@ -181,8 +182,9 @@ export function getKnownExecutionHostIdForWorktree(
   if (!worktreeId) {
     return 'local'
   }
-  if (worktreeId === FLOATING_TERMINAL_WORKTREE_ID) {
-    return 'local'
+  const floatingRoute = getFloatingWorkspaceOperationRoute(worktreeId)
+  if (floatingRoute) {
+    return floatingRoute.executionHostId
   }
   const activeHostId = getActiveWorkspaceExecutionHostId(state, worktreeId)
   if (activeHostId) {
diff --git a/src/renderer/src/runtime/host-structured-agents-sync.ts b/src/renderer/src/runtime/host-structured-agents-sync.ts
index f755b065db96..79db61d7e5a6 100644
--- a/src/renderer/src/runtime/host-structured-agents-sync.ts
+++ b/src/renderer/src/runtime/host-structured-agents-sync.ts
@@ -3,12 +3,19 @@ import { LOCAL_EXECUTION_HOST_ID, toRuntimeExecutionHostId } from '../../../shar
 import { lastVerifiedRuntimeStatus } from '../../../shared/runtime-host-status'
 import { useAppStore } from '@/store'
 import type { AppState } from '@/store/types'
-import { loadHostStructuredAgents, retainHostStructuredAgents } from './host-structured-agents'
-import { ensureLocalRuntimeCapabilities } from './local-runtime-capabilities'
+import {
+  loadHostStructuredAgents,
+  readHostStructuredAgentsForRuntime,
+  retainHostStructuredAgents
+} from './host-structured-agents'
+import {
+  ensureLocalRuntimeCapabilities,
+  subscribeLocalRuntimeCapabilitiesKnown
+} from './local-runtime-capabilities'
 import { localStructuredChatsInUse } from './local-structured-chats'
 
-// Why gated: asking a host for its agents installs its structured host, which a profile that never
-// uses structured chat must not pay for; only with chats in use can a launch route to one.
+// Why gated: a host older than this build installs its structured host to answer, which a profile
+// that never uses structured chat must not pay for; only with chats in use can a launch route to one.
 function structuredChatSettingOn(state: Pick<AppState, 'settings'>): boolean {
   return state.settings?.experimentalStructuredNativeChat === true
 }
@@ -38,14 +45,21 @@ function syncPairedHosts(statuses: AppState['runtimeStatusByEnvironmentId']): vo
 }
 
 /** Reads each host's registered agents once its status says it publishes them and structured chat
- *  is in use, and again when a paired host's runtime changes. Returns the unsubscribe. */
+ *  is in use, and again when a paired host's runtime changes. The local host is read when the chat
+ *  setting turns on and whenever its capabilities land, so a read made before they were known is
+ *  made again. Returns the unsubscribe. */
 export function installHostStructuredAgentsSync(): () => void {
   const initial = useAppStore.getState()
   void syncLocalHost(initial.settings)
   if (structuredChatSettingOn(initial)) {
     syncPairedHosts(initial.runtimeStatusByEnvironmentId)
   }
-  return useAppStore.subscribe((state, previousState) => {
+  const stopLocal = subscribeLocalRuntimeCapabilitiesKnown(() => {
+    if (!readHostStructuredAgentsForRuntime(LOCAL_EXECUTION_HOST_ID, null)) {
+      void syncLocalHost(useAppStore.getState().settings)
+    }
+  })
+  const stopStore = useAppStore.subscribe((state, previousState) => {
     const on = structuredChatSettingOn(state)
     const turnedOn = on && !structuredChatSettingOn(previousState)
     if (turnedOn) {
@@ -59,6 +73,10 @@ export function installHostStructuredAgentsSync(): () => void {
       syncPairedHosts(state.runtimeStatusByEnvironmentId)
     }
   })
+  return () => {
+    stopLocal()
+    stopStore()
+  }
 }
 
 export function useHostStructuredAgentsSync(): void {
diff --git a/src/renderer/src/runtime/host-structured-agents.test.ts b/src/renderer/src/runtime/host-structured-agents.test.ts
index 41166e2c0e98..63ec2c2dd88a 100644
--- a/src/renderer/src/runtime/host-structured-agents.test.ts
+++ b/src/renderer/src/runtime/host-structured-agents.test.ts
@@ -20,6 +20,7 @@ const mocks = vi.hoisted(() => {
   return {
     callRuntimeRpc: vi.fn(),
     ensureLocalRuntimeCapabilities: vi.fn(),
+    capabilitiesKnown: new Set<(capabilities: readonly string[]) => void>(),
     state,
     listeners: new Set<(state: StoreState, previous: StoreState) => void>()
   }
@@ -27,7 +28,11 @@ const mocks = vi.hoisted(() => {
 
 vi.mock('./runtime-rpc-client', () => ({ callRuntimeRpc: mocks.callRuntimeRpc }))
 vi.mock('./local-runtime-capabilities', () => ({
-  ensureLocalRuntimeCapabilities: mocks.ensureLocalRuntimeCapabilities
+  ensureLocalRuntimeCapabilities: mocks.ensureLocalRuntimeCapabilities,
+  subscribeLocalRuntimeCapabilitiesKnown: (listener: (capabilities: readonly string[]) => void) => {
+    mocks.capabilitiesKnown.add(listener)
+    return () => mocks.capabilitiesKnown.delete(listener)
+  }
 }))
 vi.mock('./local-structured-chats', () => ({
   localStructuredChatsInUse: async (settings: StoreState['settings']) =>
@@ -95,6 +100,7 @@ beforeEach(() => {
   resetHostStructuredAgentsForTests()
   mocks.state = { runtimeStatusByEnvironmentId: new Map(), settings: ON }
   mocks.listeners.clear()
+  mocks.capabilitiesKnown.clear()
   mocks.callRuntimeRpc.mockReset().mockResolvedValue(GROK_LIST)
   mocks.ensureLocalRuntimeCapabilities.mockReset().mockResolvedValue(REGISTERED)
 })
@@ -176,6 +182,19 @@ describe('host structured agents', () => {
     await vi.waitFor(() => expect(agentIds('runtime:env-1')).toEqual(['claude', 'grok']))
   })
 
+  it("reads the local host's agents once its capabilities land, when startup asked too early", async () => {
+    mocks.ensureLocalRuntimeCapabilities.mockResolvedValue(null)
+    uninstall = installHostStructuredAgentsSync()
+    await Promise.resolve()
+    await Promise.resolve()
+    expect(mocks.callRuntimeRpc).not.toHaveBeenCalled()
+
+    mocks.ensureLocalRuntimeCapabilities.mockResolvedValue(REGISTERED)
+    mocks.capabilitiesKnown.forEach((listener) => listener(REGISTERED))
+
+    await vi.waitFor(() => expect(agentIds('local')).toEqual(['claude', 'grok']))
+  })
+
   it('leaves a host unlearned when its reply is not an agent list', async () => {
     mocks.callRuntimeRpc.mockResolvedValue({ unexpected: true })
     uninstall = installHostStructuredAgentsSync()
diff --git a/src/renderer/src/runtime/host-structured-agents.ts b/src/renderer/src/runtime/host-structured-agents.ts
index 4196adff0336..cd290e66a5d4 100644
--- a/src/renderer/src/runtime/host-structured-agents.ts
+++ b/src/renderer/src/runtime/host-structured-agents.ts
@@ -7,6 +7,7 @@ import { parseExecutionHostId } from '../../../shared/execution-host'
 import { STRUCTURED_AGENT_SESSION_REGISTERED_AGENTS_RUNTIME_CAPABILITY } from '../../../shared/protocol-version'
 import { lastVerifiedRuntimeStatus } from '../../../shared/runtime-host-status'
 import type { RuntimeEnvironmentStatus } from '../../../shared/runtime-host-status'
+import { ensureLocalRuntimeCapabilities } from './local-runtime-capabilities'
 import { callRuntimeRpc } from './runtime-rpc-client'
 
 /**
@@ -117,6 +118,25 @@ export function loadHostStructuredAgents(
   return read
 }
 
+/** Asks a host again when a launch found its agents unlearned. The startup read runs once per
+ *  runtime, so without this a read that failed, or was skipped while the local runtime's
+ *  capabilities were unknown, kept that host's agents off the chat route for the whole session. */
+export async function relearnHostStructuredAgents(
+  executionHostId: string,
+  hostCapabilities: readonly string[] | null | undefined,
+  statuses: HostStructuredAgentsStatuses
+): Promise<void> {
+  const runtimeId = currentRuntimeId(executionHostId, statuses)
+  if (runtimeId === undefined || readHostStructuredAgentsForRuntime(executionHostId, runtimeId)) {
+    return
+  }
+  const capabilities =
+    runtimeId === null && !hostCapabilities
+      ? await ensureLocalRuntimeCapabilities()
+      : hostCapabilities
+  await loadHostStructuredAgents(executionHostId, capabilities, runtimeId)
+}
+
 /** Drops hosts no longer paired; a stale runtime is already ignored by the reader. */
 export function retainHostStructuredAgents(executionHostIds: ReadonlySet<string>): void {
   let removed = false
diff --git a/src/renderer/src/runtime/local-runtime-capabilities.ts b/src/renderer/src/runtime/local-runtime-capabilities.ts
index f4c83880503b..39ff41d84ffc 100644
--- a/src/renderer/src/runtime/local-runtime-capabilities.ts
+++ b/src/renderer/src/runtime/local-runtime-capabilities.ts
@@ -4,6 +4,18 @@ import type { RuntimeCapability } from '../../../shared/protocol-version'
 // different answers, and a caller that routes on them must be able to tell them apart.
 let localRuntimeCapabilities: readonly RuntimeCapability[] | null = null
 let refreshPromise: Promise<readonly RuntimeCapability[]> | null = null
+const knownListeners = new Set<(capabilities: readonly RuntimeCapability[]) => void>()
+
+/** Called each time a probe lands an answer, so work that needs the capabilities runs when they
+ *  become known instead of being skipped while they were not. Returns the unsubscribe. */
+export function subscribeLocalRuntimeCapabilitiesKnown(
+  listener: (capabilities: readonly RuntimeCapability[]) => void
+): () => void {
+  knownListeners.add(listener)
+  return () => {
+    knownListeners.delete(listener)
+  }
+}
 
 export function readLocalRuntimeCapabilities(): readonly RuntimeCapability[] {
   return localRuntimeCapabilities ?? []
@@ -34,6 +46,27 @@ export async function ensureLocalRuntimeCapabilities(): Promise<
   return localRuntimeCapabilities
 }
 
+/** Resolves with the capabilities once a probe lands them, probing once now; a failed probe does
+ *  not end the wait, since the next probe anyone makes still answers it. `stop` drops the wait. */
+export function awaitLocalRuntimeCapabilities(): {
+  known: Promise<readonly RuntimeCapability[]>
+  stop: () => void
+} {
+  let stop = (): void => {}
+  const known = new Promise<readonly RuntimeCapability[]>((resolve) => {
+    if (localRuntimeCapabilities !== null) {
+      resolve(localRuntimeCapabilities)
+      return
+    }
+    stop = subscribeLocalRuntimeCapabilitiesKnown((capabilities) => {
+      stop()
+      resolve(capabilities)
+    })
+    void refreshLocalRuntimeCapabilities()
+  })
+  return { known, stop: () => stop() }
+}
+
 /** `refreshLocalRuntimeCapabilities` is not `async`, so a missing or broken preload bridge would
  *  throw synchronously out of it instead of settling into the unknown state its catch owns. */
 function startLocalRuntimeCapabilityProbe(): ReturnType<typeof window.api.runtime.getStatus> {
@@ -47,8 +80,10 @@ function startLocalRuntimeCapabilityProbe(): ReturnType<typeof window.api.runtim
 export function refreshLocalRuntimeCapabilities(): Promise<readonly RuntimeCapability[]> {
   refreshPromise ??= startLocalRuntimeCapabilityProbe()
     .then((status) => {
-      localRuntimeCapabilities = [...(status.capabilities ?? [])]
-      return localRuntimeCapabilities
+      const capabilities = [...(status.capabilities ?? [])]
+      localRuntimeCapabilities = capabilities
+      knownListeners.forEach((listener) => listener(capabilities))
+      return capabilities
     })
     .catch(() => {
       // Stays unknown rather than becoming an empty (== unsupported) list: a failed probe
diff --git a/src/renderer/src/runtime/paired-host-structured-launch-bookkeeping.test.ts b/src/renderer/src/runtime/paired-host-structured-launch-bookkeeping.test.ts
index b52c92ef5ac0..cf94a9cd989b 100644
--- a/src/renderer/src/runtime/paired-host-structured-launch-bookkeeping.test.ts
+++ b/src/renderer/src/runtime/paired-host-structured-launch-bookkeeping.test.ts
@@ -11,8 +11,8 @@ const mocks = vi.hoisted(() => ({
     vi.fn<(target: RuntimeClientTarget, method: string, params?: unknown) => Promise<unknown>>()
 }))
 
-vi.mock('@/components/native-chat/structured-agent-session-outbox-storage', () => ({
-  discardStructuredAgentSessionLaunchOutbox: vi.fn()
+vi.mock('@/lib/structured-agent-session-launch-prompt', () => ({
+  discardStructuredAgentSessionChatSends: vi.fn()
 }))
 vi.mock('./structured-agent-session-close', () => ({
   closeStructuredAgentSession: mocks.closeSession
diff --git a/src/renderer/src/runtime/runtime-file-client.test.ts b/src/renderer/src/runtime/runtime-file-client.test.ts
index 8c7e336fc2de..7f2cd70ca5cd 100644
--- a/src/renderer/src/runtime/runtime-file-client.test.ts
+++ b/src/renderer/src/runtime/runtime-file-client.test.ts
@@ -513,6 +513,35 @@ describe('runtime file client', () => {
     expect(runtimeEnvironmentCall).not.toHaveBeenCalled()
   })
 
+  // A chat attachment lives in the paired server's store, outside every worktree.
+  it.each([
+    { worktreeId: 'wt-1', worktreePath: '/remote/repo' },
+    { worktreeId: null, worktreePath: null }
+  ])('reads a stored chat attachment back through its server ($worktreeId)', async (owner) => {
+    runtimeEnvironmentCall.mockResolvedValue({
+      id: 'rpc-1',
+      ok: true,
+      result: { content: 'base64', isBinary: true, isImage: true, mimeType: 'image/png' },
+      _meta: { runtimeId: 'remote-runtime' }
+    })
+    const storedPath = '/srv/orca/agent-session-attachments/abc/u1/shot.png'
+
+    await expect(
+      readRuntimeFilePreview(
+        { settings: { activeRuntimeEnvironmentId: 'env-1' }, ...owner },
+        storedPath
+      )
+    ).resolves.toMatchObject({ content: 'base64', mimeType: 'image/png' })
+
+    expect(runtimeEnvironmentCall).toHaveBeenCalledWith({
+      selector: 'env-1',
+      method: 'agentSessionAttachment.read',
+      params: { path: storedPath },
+      timeoutMs: 15_000
+    })
+    expect(fsReadFile).not.toHaveBeenCalled()
+  })
+
   it('routes root directory reads with an empty relative path', async () => {
     runtimeEnvironmentCall.mockResolvedValue({
       id: 'rpc-1',
diff --git a/src/renderer/src/runtime/runtime-file-read-client.ts b/src/renderer/src/runtime/runtime-file-read-client.ts
index f05599752912..3cd9943fa40e 100644
--- a/src/renderer/src/runtime/runtime-file-read-client.ts
+++ b/src/renderer/src/runtime/runtime-file-read-client.ts
@@ -17,6 +17,7 @@ import {
   hasRemoteRuntimeOwner
 } from './runtime-file-routing'
 import { toRuntimeWorktreeSelector } from './runtime-worktree-selector'
+import { isAgentSessionAttachmentStorePath } from '../../../shared/agent-session-attachments'
 import type { LocalFileAccess } from '../../../shared/local-file-access'
 
 const REMOTE_DOWNLOAD_CHUNK_BYTES = 384 * 1024
@@ -99,6 +100,21 @@ export async function readRuntimeFilePreview(
     context.expectedExternalSshTargetId
   )
   const remoteArgs = getRemoteFileArgs(context, filePath)
+  const runtimeTarget = getActiveRuntimeTarget(context.settings)
+  // A chat attachment lives in the paired server's store, outside every worktree; that server
+  // reads it back itself (an older one answers method_not_found, and the preview falls back).
+  if (
+    !remoteArgs &&
+    runtimeTarget.kind === 'environment' &&
+    isAgentSessionAttachmentStorePath(filePath)
+  ) {
+    return callRuntimeRpc<RuntimeFilePreviewResult>(
+      runtimeTarget,
+      'agentSessionAttachment.read',
+      { path: filePath },
+      { timeoutMs: 15_000 }
+    )
+  }
   if (!remoteArgs) {
     if (hasRemoteRuntimeOwner(context)) {
       throw new Error('Remote file is outside the owning runtime worktree')
diff --git a/src/renderer/src/runtime/runtime-workspace-attachment-capabilities.ts b/src/renderer/src/runtime/runtime-workspace-attachment-capabilities.ts
new file mode 100644
index 000000000000..3f8702205c3f
--- /dev/null
+++ b/src/renderer/src/runtime/runtime-workspace-attachment-capabilities.ts
@@ -0,0 +1,36 @@
+import type { WorkspaceAttachment } from '../../../shared/worktree/types'
+import {
+  WORKTREE_LINKED_ITEMS_RUNTIME_CAPABILITY,
+  WORKTREE_LINKED_ITEMS_DELTA_RUNTIME_CAPABILITY
+} from '../../../shared/workspace-attachment-capabilities'
+import { assertRuntimeEnvironmentCapability, type RuntimeClientTarget } from './runtime-rpc-client'
+import { translate } from '@/i18n/i18n'
+
+export async function assertWorkspaceAttachmentWriteCapability(
+  target: RuntimeClientTarget,
+  updates: { linkedItems?: WorkspaceAttachment[]; linkedItemsBase?: WorkspaceAttachment[] }
+): Promise<void> {
+  if (target.kind !== 'environment') {
+    return
+  }
+  if (updates.linkedItemsBase !== undefined) {
+    await assertRuntimeEnvironmentCapability(
+      target.environmentId,
+      WORKTREE_LINKED_ITEMS_DELTA_RUNTIME_CAPABILITY,
+      translate(
+        'workspace.attachments.updateRuntimeSafely',
+        'Update the remote runtime to safely change workspace links'
+      )
+    )
+  }
+  if (updates.linkedItems !== undefined) {
+    await assertRuntimeEnvironmentCapability(
+      target.environmentId,
+      WORKTREE_LINKED_ITEMS_RUNTIME_CAPABILITY,
+      translate(
+        'workspace.attachments.updateRuntime',
+        'Update the remote runtime to change workspace links'
+      )
+    )
+  }
+}
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
deleted file mode 100644
index acdfdbb03233..000000000000
--- a/src/renderer/src/runtime/structured-agent-session-accepted-send-capability.test.tsx
+++ /dev/null
@@ -1,51 +0,0 @@
-// @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
deleted file mode 100644
index f90e50fcaa22..000000000000
--- a/src/renderer/src/runtime/structured-agent-session-accepted-send-capability.ts
+++ /dev/null
@@ -1,49 +0,0 @@
-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 and
- * dropping that send's answer. An older host restarts the agent inside the send, so a new fence is
- * its only word that a send it never answered may land with the new owner. A send it refused was
- * shown as not sent and waits for its Retry, as on every host. A host that accepts first records
- * every send before it starts anything, so a moved fence means nothing there.
- */
-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-client.ts b/src/renderer/src/runtime/structured-agent-session-client.ts
index 36329cad3b7c..1b7fb4db53e2 100644
--- a/src/renderer/src/runtime/structured-agent-session-client.ts
+++ b/src/renderer/src/runtime/structured-agent-session-client.ts
@@ -7,6 +7,7 @@ import type {
 } from '../../../shared/agent-session-wire'
 import { getRuntimeEnvironmentRevision } from './runtime-environment-revision'
 import type { AgentSessionConversationOutline } from '../../../shared/agent-session-conversation-outline'
+import { AGENT_SESSION_CONVERSATION_COMMAND_TIMEOUT_MS } from '../../../shared/agent-session-conversation-command'
 import {
   AGENT_SESSION_ATTENTION_ACK_RUNTIME_CAPABILITY,
   AGENT_SESSION_CONVERSATION_OUTLINE_RUNTIME_CAPABILITY,
@@ -89,7 +90,7 @@ export async function readStructuredAgentSessionConversationOutline(
 }
 
 const STRUCTURED_AGENT_SESSION_METHOD_TIMEOUT_MS: ReadonlyMap<string, number> = new Map([
-  ['agentSession.conversationCommand', 195_000],
+  ['agentSession.conversationCommand', AGENT_SESSION_CONVERSATION_COMMAND_TIMEOUT_MS],
   // The host may start an agent at rest before rewinding it, as it does for a command.
   ['agentSession.rewind', 195_000],
   // A waiting catalog read lasts as long as the host's listing: Claude's is 60 s, after up to 15 s
@@ -100,7 +101,9 @@ const STRUCTURED_AGENT_SESSION_METHOD_TIMEOUT_MS: ReadonlyMap<string, number> =
 export async function callStructuredAgentSession<TResult>(
   target: RuntimeClientTarget,
   method: string,
-  params?: unknown
+  params?: unknown,
+  /** For a caller that checked the remote host's compatibility itself, just before. */
+  options: { skipCompatibilityCheck?: true } = {}
 ): Promise<TResult> {
   if (
     method === 'agentSession.rewind' &&
@@ -113,9 +116,12 @@ export async function callStructuredAgentSession<TResult>(
     throw new Error('Rewinding requires a newer Orca server. Update the server and try again.')
   }
   const timeoutMs = STRUCTURED_AGENT_SESSION_METHOD_TIMEOUT_MS.get(method)
-  return timeoutMs === undefined
+  return timeoutMs === undefined && !options.skipCompatibilityCheck
     ? callRuntimeRpc<TResult>(target, method, params)
-    : callRuntimeRpc<TResult>(target, method, params, { timeoutMs })
+    : callRuntimeRpc<TResult>(target, method, params, {
+        ...(timeoutMs === undefined ? {} : { timeoutMs }),
+        ...options
+      })
 }
 
 async function subscribeStructuredAgentSessionMethod<TEvent>(
diff --git a/src/renderer/src/runtime/structured-agent-session-host-capability.ts b/src/renderer/src/runtime/structured-agent-session-host-capability.ts
index 0de74130a3e3..0f91cb82586f 100644
--- a/src/renderer/src/runtime/structured-agent-session-host-capability.ts
+++ b/src/renderer/src/runtime/structured-agent-session-host-capability.ts
@@ -108,8 +108,7 @@ export function useStructuredAgentSessionHostQueuesMessages(target: RuntimeClien
   return useStructuredAgentSessionHostQueuesMessagesState(target) === 'supported'
 }
 
-/** Three-state, for the outbox: only `supported` lets a first attempt ask to be queued, and only
- *  `unsupported` drops the field from a replay; `unknown` holds nothing back. */
+/** Three-state: only `supported` lets a send ask to be queued; `unknown` holds nothing back. */
 export function useStructuredAgentSessionHostQueuesMessagesState(
   target: RuntimeClientTarget
 ): StructuredAgentSessionHostCapabilityState {
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 e0c9c562b780..57f96f63aba9 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
@@ -8,6 +8,7 @@ const mocks = vi.hoisted(() => ({
   callRuntime:
     vi.fn<(target: RuntimeClientTarget, method: string, params?: unknown) => Promise<unknown>>(),
   discardOutbox: vi.fn<(sessionId: string) => void>(),
+  stopSends: vi.fn<(sessionId: string) => void>(),
   hasTombstone: vi.fn<(worktreeId: string, sessionId: string) => boolean>(),
   markCancelled:
     vi.fn<(worktreeId: string, sessionId: string, executionHostId: string) => boolean>()
@@ -17,8 +18,11 @@ vi.mock('@/lib/structured-agent-session-launch-registry', () => ({
   hasStructuredAgentSessionLaunchCancellationTombstone: mocks.hasTombstone,
   markStructuredAgentSessionLaunchCancelled: mocks.markCancelled
 }))
-vi.mock('@/components/native-chat/structured-agent-session-outbox-storage', () => ({
-  discardStructuredAgentSessionLaunchOutbox: mocks.discardOutbox
+vi.mock('@/lib/structured-agent-session-launch-prompt', () => ({
+  discardStructuredAgentSessionChatSends: mocks.discardOutbox
+}))
+vi.mock('@/components/native-chat/structured-agent-session-message-sender', () => ({
+  stopStructuredAgentSessionSends: mocks.stopSends
 }))
 vi.mock('./structured-agent-session-close', () => ({
   closeStructuredAgentSession: mocks.closeSession
@@ -90,10 +94,24 @@ describe('structured agent session tab retirement', () => {
     })
     expect(mocks.markCancelled).toHaveBeenCalledWith('wt-1', 'session-1', 'local')
     expect(mocks.discardOutbox).toHaveBeenCalledWith('session-1')
+    expect(mocks.stopSends).not.toHaveBeenCalled()
     await vi.waitFor(() => expect(mocks.callRuntime).toHaveBeenCalled())
     expect(mocks.closeSession).toHaveBeenCalledWith(target, 'session-1')
   })
 
+  // Withdrawn, as a Stop does: nothing more goes out, and nothing is dropped.
+  it("never drops a published chat's sends when its tab closes", async () => {
+    beginStructuredAgentSessionTabClose({
+      target,
+      worktreeId: 'wt-1',
+      sessionId: 'session-1',
+      provisional: false
+    })
+    expect(mocks.discardOutbox).not.toHaveBeenCalled()
+    expect(mocks.stopSends).toHaveBeenCalledWith('session-1')
+    await vi.waitFor(() => expect(mocks.closeSession).toHaveBeenCalledWith(target, 'session-1'))
+  })
+
   it('suppresses and retires a late cancelled publication', async () => {
     mocks.hasTombstone.mockReturnValue(true)
     const result = suppressCancelledStructuredSessionTabs(snapshot(), target)
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 86e475684802..93779ae87b9c 100644
--- a/src/renderer/src/runtime/structured-agent-session-tab-retirement.ts
+++ b/src/renderer/src/runtime/structured-agent-session-tab-retirement.ts
@@ -8,7 +8,8 @@ import {
   markStructuredAgentSessionLaunchCancelled
 } from '@/lib/structured-agent-session-launch-registry'
 import { toRuntimeExecutionHostId } from '../../../shared/execution-host'
-import { discardStructuredAgentSessionLaunchOutbox } from '@/components/native-chat/structured-agent-session-outbox-storage'
+import { discardStructuredAgentSessionChatSends } from '@/lib/structured-agent-session-launch-prompt'
+import { stopStructuredAgentSessionSends } from '@/components/native-chat/structured-agent-session-message-sender'
 import { closeStructuredAgentSession } from './structured-agent-session-close'
 import { withLocalSessionTabCloseOwner } from './local-session-tab-close-owner'
 import { executionHostIdForStructuredTarget } from './structured-agent-session-owner'
@@ -75,8 +76,12 @@ export function beginStructuredAgentSessionTabClose(args: {
       args.sessionId,
       executionHostIdForStructuredTarget(args.target)
     )
+    discardStructuredAgentSessionChatSends(args.sessionId)
+  } else {
+    // Nothing more goes out, and nothing is dropped: one on its way settles from its answer, and
+    // the rest goes back to the conversation's draft.
+    stopStructuredAgentSessionSends(args.sessionId)
   }
-  discardStructuredAgentSessionLaunchOutbox(args.sessionId)
   retireStructuredAgentSessionTab(args)
 }
 
diff --git a/src/renderer/src/runtime/use-runtime-session-mirror-environment-key.test.ts b/src/renderer/src/runtime/use-runtime-session-mirror-environment-key.test.ts
index 344016acf4d3..2069bb85bdcd 100644
--- a/src/renderer/src/runtime/use-runtime-session-mirror-environment-key.test.ts
+++ b/src/renderer/src/runtime/use-runtime-session-mirror-environment-key.test.ts
@@ -7,7 +7,7 @@ import { getDefaultSettings } from '../../../shared/constants'
 import type { ProjectGroup } from '../../../shared/project-group-types'
 import type { Repo } from '../../../shared/repo-types'
 import type * as RuntimeSessionMirrorTargetsModule from '@/lib/runtime-session-mirror-targets'
-import { makeWorktree } from '@/store/slices/store-test-helpers'
+import { makeWorktree } from '../store/slices/worktrees-slice-test-fixtures'
 
 const { getMirrorTargets } = vi.hoisted(() => ({ getMirrorTargets: vi.fn() }))
 
diff --git a/src/renderer/src/store/folder-workspaces/folder-workspace-mutations.ts b/src/renderer/src/store/folder-workspaces/folder-workspace-mutations.ts
index 5f7b5de7a0c5..cfef51e4716d 100644
--- a/src/renderer/src/store/folder-workspaces/folder-workspace-mutations.ts
+++ b/src/renderer/src/store/folder-workspaces/folder-workspace-mutations.ts
@@ -1,3 +1,5 @@
+import { assertWorkspaceAttachmentWriteCapability } from '../../runtime/runtime-workspace-attachment-capabilities'
+import { getWorkspaceAttachments } from '../../../../shared/workspace-attachments'
 import type { StateCreator } from 'zustand'
 import type { AppState } from '../types'
 import type { FolderWorkspace } from '../../../../shared/folder-workspace-types'
@@ -68,6 +70,7 @@ export function createFolderWorkspaceMutationActions(
         const target = getActiveRuntimeTarget(
           getFolderWorkspacePathStatusRouteSettings(options, get().settings)
         )
+        await assertWorkspaceAttachmentWriteCapability(target, args)
         if (
           target.kind === 'environment' &&
           (args.linkedTask?.provider === 'jira' ||
@@ -115,7 +118,8 @@ export function createFolderWorkspaceMutationActions(
         (state.activeWorktreeId === folderWorkspaceKey(folderWorkspaceId)
           ? (state.activeWorkspaceExecutionHostId ?? undefined)
           : undefined)
-      if (!findFolderWorkspaceOwner(state, folderWorkspaceId, executionHostId)) {
+      const existingWorkspace = findFolderWorkspaceOwner(state, folderWorkspaceId, executionHostId)
+      if (!existingWorkspace) {
         return false
       }
       const runtimeEnvironmentId = getRuntimeEnvironmentIdForFolderWorkspace(
@@ -126,7 +130,29 @@ export function createFolderWorkspaceMutationActions(
       // Why: owner-scoped mutations must not follow whichever runtime happens to be focused.
       const target = getActiveRuntimeTarget({ activeRuntimeEnvironmentId: runtimeEnvironmentId })
       const ownerHostId = executionHostId ?? getRuntimeTargetHostId(target)
+      const sourceWorkspace = state.folderWorkspaces.find(
+        (workspace) =>
+          workspace.id === folderWorkspaceId &&
+          getFolderWorkspaceHostId(workspace, state.projectGroups) === ownerHostId
+      )
+      if (
+        updates.linkedItems !== undefined &&
+        updates.linkedItemsBase === undefined &&
+        sourceWorkspace
+      ) {
+        updates = {
+          ...updates,
+          linkedItemsBase: getWorkspaceAttachments({
+            linkedItems: sourceWorkspace.linkedItems,
+            linkedWorkItem: sourceWorkspace.linkedTask,
+            linkedTaskSourceContext: sourceWorkspace.linkedTaskSourceContext
+          })
+        }
+      }
       const updateIdentity = getFolderWorkspaceUpdateIdentity(ownerHostId, folderWorkspaceId)
+      if (target.kind === 'environment' && updates.linkedItems !== undefined) {
+        await assertWorkspaceAttachmentWriteCapability(target, updates)
+      }
       // Why: same gate as folderWorkspace.create — an older paired runtime would drop the Jira link silently.
       if (
         target.kind === 'environment' &&
@@ -168,8 +194,11 @@ export function createFolderWorkspaceMutationActions(
           })
           return false
         }
-        if (updates.diffComments !== undefined && updated.diffComments === undefined) {
-          // Why: older paired runtimes strip this optional field; reconcile instead of showing an unsaved note.
+        if (
+          (updates.diffComments !== undefined && updated.diffComments === undefined) ||
+          (updates.linkedItems !== undefined && updated.linkedItems === undefined)
+        ) {
+          // Older hosts can strip optional fields; reconcile instead of reporting an unsaved edit.
           await reconcileFailedFolderWorkspaceUpdate({
             target,
             folderWorkspaceId,
diff --git a/src/renderer/src/store/folder-workspaces/folder-workspace-routing.ts b/src/renderer/src/store/folder-workspaces/folder-workspace-routing.ts
index eeee9e13dcfb..b5151bb65cf8 100644
--- a/src/renderer/src/store/folder-workspaces/folder-workspace-routing.ts
+++ b/src/renderer/src/store/folder-workspaces/folder-workspace-routing.ts
@@ -53,6 +53,9 @@ export function mergeFolderWorkspaceUpdateResponse(
   }
   const next = { ...current }
   for (const field of fields) {
+    if (field === 'linkedItemsBase' || field === 'linkedItemsSelectionChanged') {
+      continue
+    }
     // Why: coalesced activity can land an older response after later local bumps.
     if (field === 'lastActivityAt') {
       next.lastActivityAt = Math.max(current.lastActivityAt, updated.lastActivityAt)
diff --git a/src/renderer/src/store/github/visible-hosted-review-refresh-scheduler.test.ts b/src/renderer/src/store/github/visible-hosted-review-refresh-scheduler.test.ts
index a020347895d3..6feded76e872 100644
--- a/src/renderer/src/store/github/visible-hosted-review-refresh-scheduler.test.ts
+++ b/src/renderer/src/store/github/visible-hosted-review-refresh-scheduler.test.ts
@@ -40,6 +40,45 @@ describe('visible hosted review scheduler', () => {
     vi.useRealTimers()
   })
 
+  it.each(['remove', 'hide', 'dispose'])(
+    'aborts abandoned demand on %s without releasing native work early',
+    async (action) => {
+      const signals: (AbortSignal | undefined)[] = []
+      const finish: ((value: boolean) => void)[] = []
+      const row = target({
+        fetchedAt: null,
+        refresh: vi.fn((_force, signal) => {
+          signals.push(signal)
+          return new Promise<boolean>((resolve) => finish.push(resolve))
+        })
+      })
+      const scheduler = setup([row])
+      expect(signals[0]?.aborted).toBe(false)
+      if (action === 'remove') {
+        scheduler.update([])
+      } else if (action === 'hide') {
+        scheduler.setVisible(false)
+      } else {
+        scheduler.dispose()
+      }
+      expect(signals[0]?.aborted).toBe(true)
+      if (action !== 'dispose') {
+        scheduler.update([row])
+        scheduler.setVisible(true)
+        await vi.advanceTimersByTimeAsync(10_000)
+        expect(row.refresh).toHaveBeenCalledTimes(1)
+      }
+      finish[0](false)
+      await vi.advanceTimersByTimeAsync(0)
+      if (action !== 'dispose') {
+        expect(row.refresh).toHaveBeenCalledTimes(2)
+        expect(signals[1]?.aborted).toBe(false)
+        finish[1](true)
+        await vi.advanceTimersByTimeAsync(0)
+      }
+    }
+  )
+
   it('paces selected and other branches independently with one timer', async () => {
     const selected = target({ key: 'selected', intervalMs: 60_000, selected: true })
     const other = target()
@@ -51,8 +90,8 @@ describe('visible hosted review scheduler', () => {
     await vi.advanceTimersByTimeAsync(60_000)
     expect(selected.refresh).toHaveBeenCalledTimes(2)
     expect(other.refresh).toHaveBeenCalledTimes(1)
-    expect(selected.refresh).toHaveBeenCalledWith(false)
-    expect(other.refresh).toHaveBeenCalledWith(false)
+    expect(selected.refresh).toHaveBeenCalledWith(false, expect.any(AbortSignal))
+    expect(other.refresh).toHaveBeenCalledWith(false, expect.any(AbortSignal))
   })
 
   it('starts no hidden or offscreen requests and removes timers on disposal', async () => {
@@ -65,7 +104,7 @@ describe('visible hosted review scheduler', () => {
     scheduler.setVisible(true)
     await vi.advanceTimersByTimeAsync(0)
     expect(row.refresh).toHaveBeenCalledTimes(1)
-    expect(row.refresh).toHaveBeenCalledWith(true)
+    expect(row.refresh).toHaveBeenCalledWith(true, expect.any(AbortSignal))
     scheduler.setVisible(false)
     expect(vi.getTimerCount()).toBe(0)
     scheduler.update([])
@@ -149,7 +188,7 @@ describe('visible hosted review scheduler', () => {
       expect(row.refresh).toHaveBeenCalledTimes(calls)
       await vi.advanceTimersByTimeAsync(1)
       expect(row.refresh).toHaveBeenCalledTimes(calls + 1)
-      expect(row.refresh).toHaveBeenLastCalledWith(true)
+      expect(row.refresh).toHaveBeenLastCalledWith(true, expect.any(AbortSignal))
     }
   })
 
diff --git a/src/renderer/src/store/github/visible-hosted-review-refresh-scheduler.ts b/src/renderer/src/store/github/visible-hosted-review-refresh-scheduler.ts
index c0b8d6c2c76f..d081967614e0 100644
--- a/src/renderer/src/store/github/visible-hosted-review-refresh-scheduler.ts
+++ b/src/renderer/src/store/github/visible-hosted-review-refresh-scheduler.ts
@@ -7,7 +7,7 @@ export type VisibleHostedReviewRefreshTarget = {
   fetchedAt: number | null
   intervalMs: number | null
   selected: boolean
-  refresh: (force?: boolean) => Promise<boolean>
+  refresh: (force?: boolean, signal?: AbortSignal) => Promise<boolean>
 }
 
 type Entry = {
@@ -39,7 +39,10 @@ function discoveryIdentityChanged(
 export function createVisibleHostedReviewRefreshScheduler() {
   const entries = new Map<string, Entry>()
   const recent = new Map<string, Entry>()
-  const inFlight = new Map<string, VisibleHostedReviewRefreshTarget>()
+  const inFlight = new Map<
+    string,
+    { target: VisibleHostedReviewRefreshTarget; controller: AbortController }
+  >()
   let timer: ReturnType<typeof setTimeout> | null = null
   let visible = false
   let disposed = false
@@ -83,13 +86,17 @@ export function createVisibleHostedReviewRefreshScheduler() {
     target: VisibleHostedReviewRefreshTarget,
     succeeded: boolean
   ): void => {
+    const cancelled = inFlight.get(key)?.controller.signal.aborted
+    inFlight.get(key)?.controller.abort()
     inFlight.delete(key)
     if (disposed) {
       return
     }
     const entry = entries.get(key) ?? recent.get(key)
     if (entry && entry.lastAttemptAt === startedAt) {
-      if (!succeeded || !discoveryIdentityChanged(target, entry.target)) {
+      if (cancelled) {
+        entry.discovery = true
+      } else if (!succeeded || !discoveryIdentityChanged(target, entry.target)) {
         entry.discovery = false
         entry.failures = succeeded ? 0 : entry.failures + 1
         entry.retryAt = succeeded
@@ -130,9 +137,10 @@ export function createVisibleHostedReviewRefreshScheduler() {
       entry.lastAttemptAt = now
       entry.discovery = false
       const startedTarget = entry.target
-      inFlight.set(key, startedTarget)
+      const controller = new AbortController()
+      inFlight.set(key, { target: startedTarget, controller })
       try {
-        void entry.target.refresh(force).then(
+        void entry.target.refresh(force, controller.signal).then(
           (succeeded) => finish(key, now, startedTarget, succeeded),
           () => finish(key, now, startedTarget, false)
         )
@@ -163,6 +171,7 @@ export function createVisibleHostedReviewRefreshScheduler() {
       const keep = new Set(targets.map((target) => target.key))
       for (const [key, entry] of entries) {
         if (!keep.has(key)) {
+          inFlight.get(key)?.controller.abort()
           entries.delete(key)
           remember(key, entry)
         }
@@ -191,7 +200,7 @@ export function createVisibleHostedReviewRefreshScheduler() {
         } else if (
           (target.fetchedAt ?? -Infinity) > (entry.target.fetchedAt ?? -Infinity) &&
           (!inFlight.has(target.key) ||
-            !discoveryIdentityChanged(inFlight.get(target.key) ?? target, target))
+            !discoveryIdentityChanged(inFlight.get(target.key)?.target ?? target, target))
         ) {
           entry.failures = 0
           entry.retryAt = null
@@ -206,6 +215,11 @@ export function createVisibleHostedReviewRefreshScheduler() {
         return
       }
       visible = next
+      if (!visible) {
+        for (const request of inFlight.values()) {
+          request.controller.abort()
+        }
+      }
       if (visible) {
         for (const entry of entries.values()) {
           if (
@@ -220,6 +234,9 @@ export function createVisibleHostedReviewRefreshScheduler() {
     },
     dispose(): void {
       disposed = true
+      for (const request of inFlight.values()) {
+        request.controller.abort()
+      }
       clearTimer()
       entries.clear()
       recent.clear()
diff --git a/src/renderer/src/store/github/visible-hosted-review-refresh-targets.test.ts b/src/renderer/src/store/github/visible-hosted-review-refresh-targets.test.ts
index fdde17237c6b..aa9f9046fb03 100644
--- a/src/renderer/src/store/github/visible-hosted-review-refresh-targets.test.ts
+++ b/src/renderer/src/store/github/visible-hosted-review-refresh-targets.test.ts
@@ -1,4 +1,5 @@
 import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest'
+import type { AppState } from '../types'
 import type { Repo } from '../../../../shared/repo-types'
 import type { HostedReviewInfo } from '../../../../shared/hosted-review'
 import { createGlobalSettingsFixture } from '../../../../shared/global-settings-test-fixture'
@@ -390,6 +391,45 @@ describe('visible hosted review refresh targets', () => {
     ).toEqual([])
   })
 
+  it.each<Partial<AppState>>([
+    { activeWorkspaceExecutionHostId: 'ssh:other' },
+    { visibleWorkspaceHostIds: ['local'] },
+    { workspaceHostScope: 'local' }
+  ])('updates reference demand when owner visibility changes: %j', (patch) => {
+    const store = setup()
+    const previous = store.getState()
+    const next = { ...previous, ...patch }
+    expect(visibleHostedReviewRefreshInputsChanged(next, previous)).toBe(true)
+  })
+
+  it('does not send a colliding runtime owner through the legacy unqualified GitHub action', () => {
+    const first: Repo = {
+      ...repo,
+      executionHostId: 'runtime:first',
+      gitRemoteIdentity: {
+        canonicalKey: 'github.com/acme/orca',
+        remoteName: 'origin',
+        remoteUrl: 'https://github.com/acme/orca.git'
+      }
+    }
+    const second: Repo = { ...first, executionHostId: 'runtime:second' }
+    const store = setup(first)
+    store.setState({
+      repos: [first, second],
+      activeWorktreeId: worktree.id,
+      activeWorkspaceExecutionHostId: 'runtime:second',
+      worktreesByRepo: {
+        first: [{ ...worktree, hostId: 'runtime:first' }],
+        second: [{ ...worktree, hostId: 'runtime:second' }]
+      }
+    })
+    expect(
+      getVisibleHostedReviewRefreshTargets(store.getState(), store.getState, { selectedOnly: true })
+    ).toEqual([])
+    expect(mockApi.gh.prForBranch).not.toHaveBeenCalled()
+    expect(runtimeEnvironmentCall).not.toHaveBeenCalled()
+  })
+
   it('lets normal hosted-review refreshes share the host cache but forces discovery', async () => {
     const store = setup()
     await targets(store)[0].refresh(false)
diff --git a/src/renderer/src/store/github/visible-hosted-review-refresh-targets.ts b/src/renderer/src/store/github/visible-hosted-review-refresh-targets.ts
index 240d3e684c1b..e860c8ae8fb2 100644
--- a/src/renderer/src/store/github/visible-hosted-review-refresh-targets.ts
+++ b/src/renderer/src/store/github/visible-hosted-review-refresh-targets.ts
@@ -3,13 +3,78 @@ import {
   getHostedReviewCacheKey,
   linkedReviewHintKey
 } from '../slices/hosted-review-cache-identity'
-import { getRepoExecutionHostId } from '../../../../shared/execution-host'
+import {
+  getRepoExecutionHostId,
+  getSettingsFocusedExecutionHostId
+} from '../../../../shared/execution-host'
 import { reviewRefreshIntervalMs } from '../../../../shared/review-refresh-policy'
-import { buildPRRefreshCandidate, findWorktreeById } from './worktree-refresh'
+import {
+  buildPRRefreshCandidate,
+  getWorktreeLookupIndex,
+  findWorktreeById
+} from './worktree-refresh'
+import { findIndexedDetectedWorktrees } from '@/lib/worktree-runtime-owner-index'
+import { findKnownWorktreeById } from '../slices/worktrees/listing/detected-worktree-meta'
+import { findRepoForHost } from '../slices/repo-host-identity'
+import { getGitHubRepoLookupIndex } from '../slices/github-repo-lookup-index'
 import { getPRRefreshRuntimeRepoTarget } from './repository-routing'
 import type { VisibleHostedReviewRefreshTarget } from './visible-hosted-review-refresh-scheduler'
 import { shouldCoordinateVisibleGitHubReview } from './visible-hosted-review-refresh-ownership'
 
+export function* getVisibleHostedReviewWorkspaces(
+  state: AppState,
+  options?: { selectedOnly?: boolean }
+) {
+  const visibleHosts =
+    state.visibleWorkspaceHostIds ??
+    (state.workspaceHostScope && state.workspaceHostScope !== 'all'
+      ? [state.workspaceHostScope]
+      : null)
+  for (const id of state.visibleReviewWorktreeIds) {
+    const owners = new Set(getWorktreeLookupIndex(state).byId.get(id)?.owners)
+    for (const detected of findIndexedDetectedWorktrees(state.detectedWorktreesByRepo, id)) {
+      const workspace = findKnownWorktreeById(state, id, detected.hostId ?? 'local')
+      if (workspace) {
+        owners.add(workspace)
+      }
+    }
+    for (const worktree of owners) {
+      if (worktree.isArchived || worktree.isBare) {
+        continue
+      }
+      const repo = findRepoForHost(state.repos, worktree.repoId, {
+        hostId: worktree.hostId,
+        settings: state.settings
+      })
+      if (!repo) {
+        continue
+      }
+      const candidate = buildPRRefreshCandidate(state, worktree, undefined, repo)
+      if (
+        !candidate ||
+        candidate.repoKind !== 'git' ||
+        (candidate.connectionId && candidate.connectionState !== 'connected')
+      ) {
+        continue
+      }
+      const hostId = getRepoExecutionHostId(repo)
+      const activeHost = state.activeWorkspaceExecutionHostId
+      const selected =
+        id === state.activeWorktreeId &&
+        (activeHost
+          ? hostId === activeHost
+          : owners.size === 1 || hostId === getSettingsFocusedExecutionHostId(state.settings))
+      if (
+        (options?.selectedOnly && !selected) ||
+        (!selected && visibleHosts && !visibleHosts.includes(hostId))
+      ) {
+        continue
+      }
+      yield { worktree, repo, candidate, selected }
+    }
+  }
+}
+
 export function getVisibleHostedReviewRefreshTargets(
   state: AppState,
   getState: () => AppState,
@@ -17,24 +82,12 @@ export function getVisibleHostedReviewRefreshTargets(
 ): VisibleHostedReviewRefreshTarget[] {
   const targets = new Map<string, VisibleHostedReviewRefreshTarget>()
   const revisions = new Map<string, Map<string, string>>()
-  for (const id of state.visibleReviewWorktreeIds) {
-    if (options?.selectedOnly && id !== state.activeWorktreeId) {
-      continue
-    }
-    const worktree = findWorktreeById(state, id)
-    if (!worktree || worktree.isArchived || worktree.isBare || !worktree.branch) {
-      continue
-    }
-    const candidate = buildPRRefreshCandidate(state, worktree)
-    if (
-      !candidate ||
-      candidate.repoKind !== 'git' ||
-      !candidate.branch ||
-      candidate.branch === 'HEAD'
-    ) {
-      continue
-    }
-    if (candidate.connectionId && candidate.connectionState !== 'connected') {
+  for (const { worktree, repo, candidate, selected } of getVisibleHostedReviewWorkspaces(
+    state,
+    options
+  )) {
+    const id = worktree.id
+    if (!candidate.branch || candidate.branch === 'HEAD') {
       continue
     }
     const key = getHostedReviewCacheKey(
@@ -61,12 +114,18 @@ export function getVisibleHostedReviewRefreshTargets(
       hints.linkedAzureDevOpsPR != null ||
       hints.linkedGiteaPR != null ||
       (hostedEntry?.data != null && hostedEntry.data.provider !== 'github')
+    // The legacy GitHub action still resolves bare IDs; never pass it another owner's candidate.
+    if (
+      getGitHubRepoLookupIndex(state.repos).findById(repo.id) !== repo ||
+      findWorktreeById(state, worktree.id) !== worktree
+    ) {
+      continue
+    }
     const knownGitHub = shouldCoordinateVisibleGitHubReview(state, worktree, candidate)
     const runtime = knownGitHub ? getPRRefreshRuntimeRepoTarget(state, candidate) : null
     if (knownGitHub && !runtime) {
       continue
     }
-    const selected = id === state.activeWorktreeId
     const usePR =
       knownGitHub &&
       prEntry !== undefined &&
@@ -147,11 +206,21 @@ export function visibleHostedReviewRefreshInputsChanged(
   return (
     state.visibleReviewWorktreeIds !== previous.visibleReviewWorktreeIds ||
     state.activeWorktreeId !== previous.activeWorktreeId ||
+    state.activeWorkspaceExecutionHostId !== previous.activeWorkspaceExecutionHostId ||
+    state.visibleWorkspaceHostIds !== previous.visibleWorkspaceHostIds ||
+    state.workspaceHostScope !== previous.workspaceHostScope ||
     state.worktreesByRepo !== previous.worktreesByRepo ||
+    state.detectedWorktreesByRepo !== previous.detectedWorktreesByRepo ||
     state.repos !== previous.repos ||
     state.settings !== previous.settings ||
     state.sshConnectionStates !== previous.sshConnectionStates ||
     state.prCache !== previous.prCache ||
-    state.hostedReviewCache !== previous.hostedReviewCache
+    state.hostedReviewCache !== previous.hostedReviewCache ||
+    state.tabsByWorktree !== previous.tabsByWorktree ||
+    state.ptyIdsByTabId !== previous.ptyIdsByTabId ||
+    state.browserTabsByWorktree !== previous.browserTabsByWorktree ||
+    state.unifiedTabsByWorktree !== previous.unifiedTabsByWorktree ||
+    state.agentStatusByPaneKey !== previous.agentStatusByPaneKey ||
+    state.agentStatusEpoch !== previous.agentStatusEpoch
   )
 }
diff --git a/src/renderer/src/store/github/worktree-refresh.ts b/src/renderer/src/store/github/worktree-refresh.ts
index 4168bd50c4ac..8588803741e7 100644
--- a/src/renderer/src/store/github/worktree-refresh.ts
+++ b/src/renderer/src/store/github/worktree-refresh.ts
@@ -20,6 +20,7 @@ export function findWorktreeById(state: AppState, worktreeId: string): Worktree
 }
 
 type WorktreeLookupEntry = {
+  owners: Worktree[]
   first: Worktree
   unique: Worktree | null
 }
@@ -39,9 +40,10 @@ export function buildWorktreeLookupIndex(state: AppState): WorktreeLookupIndex {
       const worktreeId = worktree.id
       const existing = byId.get(worktreeId)
       if (existing) {
+        existing.owners.push(worktree)
         existing.unique = null
       } else {
-        byId.set(worktreeId, { first: worktree, unique: worktree })
+        byId.set(worktreeId, { owners: [worktree], first: worktree, unique: worktree })
       }
     }
   }
diff --git a/src/renderer/src/store/repos/repo-state.ts b/src/renderer/src/store/repos/repo-state.ts
index 356db14d9c6d..16cf707b122e 100644
--- a/src/renderer/src/store/repos/repo-state.ts
+++ b/src/renderer/src/store/repos/repo-state.ts
@@ -1,3 +1,4 @@
+import type { WorkspaceAttachmentMutation } from '../../../../shared/workspace-attachment-mutation'
 import type { GhAccountBinding } from '../../../../shared/github/account-binding'
 import type { SshRepoReadoption } from '../../../../shared/ssh-types'
 import type { FolderWorkspace } from '../../../../shared/folder-workspace-types'
@@ -67,6 +68,7 @@ export type FolderWorkspaceUpdates = Partial<
     | 'name'
     | 'folderPath'
     | 'linkedTask'
+    | 'linkedItems'
     | 'linkedTaskSourceContext'
     | 'comment'
     | 'isArchived'
@@ -81,7 +83,8 @@ export type FolderWorkspaceUpdates = Partial<
     | 'lastActivityAt'
     | 'diffComments'
   >
->
+> &
+  WorkspaceAttachmentMutation
 
 export type NestedRepoScanControls = {
   scanId?: string
@@ -206,6 +209,7 @@ export type RepoSlice = {
       folderPath?: string | null
       connectionId?: string | null
       linkedTask?: FolderWorkspace['linkedTask']
+      linkedItems?: FolderWorkspace['linkedItems']
       linkedTaskSourceContext?: FolderWorkspace['linkedTaskSourceContext']
       createdWithAgent?: FolderWorkspace['createdWithAgent']
       pendingFirstAgentMessageRename?: boolean
diff --git a/src/renderer/src/store/slices/editor-tab-host-ownership.test.ts b/src/renderer/src/store/slices/editor-tab-host-ownership.test.ts
index 20ef622011de..1125330db6ab 100644
--- a/src/renderer/src/store/slices/editor-tab-host-ownership.test.ts
+++ b/src/renderer/src/store/slices/editor-tab-host-ownership.test.ts
@@ -1,6 +1,6 @@
 import { describe, expect, it } from 'vitest'
 import { createEditorTabsStore } from './editor-slice-test-harness'
-import { makeWorktree, TEST_REPO } from './store-test-helpers'
+import { makeWorktree, TEST_REPO } from './worktrees-slice-test-fixtures'
 import { getDefaultSettings } from '../../../../shared/constants'
 import {
   assertEditorFileOperationCurrent,
diff --git a/src/renderer/src/store/slices/editor/actions/right-sidebar-state.ts b/src/renderer/src/store/slices/editor/actions/right-sidebar-state.ts
index 42ba6b88bd9b..10c3d9f749ad 100644
--- a/src/renderer/src/store/slices/editor/actions/right-sidebar-state.ts
+++ b/src/renderer/src/store/slices/editor/actions/right-sidebar-state.ts
@@ -5,6 +5,31 @@ import type {
   RightSidebarExplorerView
 } from '../../../../../../shared/ui-chrome-types'
 import { defaultFileSearchState } from '../search/file-search-state'
+import type { RuntimeClientTarget } from '../../../../runtime/runtime-client-target'
+
+/** A chat visual shown in place of the active tab. Identity only, never the HTML. */
+export type RightSidebarVisualRoute = {
+  target: RuntimeClientTarget
+  sessionId: string
+  messageId: string
+  file: string
+  title: string | null
+  /** The chat tab and workspace that own it; the panel closes once either is gone or left. */
+  tabId: string
+  worktreeId: string
+}
+
+/**
+ * In memory only: never persisted or mirrored to other clients. Shown while no later tab route was
+ * requested, so picking any tab returns the sidebar to it without clearing this explicitly.
+ */
+export type RightSidebarVisualState = RightSidebarVisualRoute & {
+  routeRequestId: number
+  /** The sidebar was closed before the visual opened it; closing the visual closes it again. */
+  reopenedSidebar: boolean
+  /** The sidebar's width while it shows the visual; the stored width is left untouched. */
+  width: number | null
+}
 
 export type RightSidebarState = {
   rightSidebarOpen: boolean
@@ -16,6 +41,7 @@ export type RightSidebarState = {
   aiVaultSearchFocusRequested: boolean
   rightSidebarTabByWorktree: Record<string, ActiveRightSidebarTab>
   rightSidebarExplorerViewByWorktree: Record<string, RightSidebarExplorerView>
+  rightSidebarVisual: RightSidebarVisualState | null
   activityBarPosition: ActivityBarPosition
   toggleRightSidebar: () => void
   setRightSidebarOpen: (open: boolean) => void
@@ -29,6 +55,9 @@ export type RightSidebarState = {
   }) => void
   showAiVaultSearch: () => void
   clearAiVaultSearchFocusRequest: () => void
+  openRightSidebarVisual: (route: RightSidebarVisualRoute) => void
+  closeRightSidebarVisual: () => void
+  setRightSidebarVisualWidth: (width: number) => void
   setActivityBarPosition: (position: ActivityBarPosition) => void
 }
 
@@ -42,9 +71,15 @@ export function createRightSidebarState(set: EditorSet, _get: EditorGet): RightS
     aiVaultSearchFocusRequested: false,
     rightSidebarTabByWorktree: {},
     rightSidebarExplorerViewByWorktree: {},
+    rightSidebarVisual: null,
     activityBarPosition: 'top',
-    toggleRightSidebar: () => set((s) => ({ rightSidebarOpen: !s.rightSidebarOpen })),
-    setRightSidebarOpen: (open) => set({ rightSidebarOpen: open }),
+    toggleRightSidebar: () =>
+      set((s) => ({
+        rightSidebarOpen: !s.rightSidebarOpen,
+        ...(s.rightSidebarOpen ? { rightSidebarVisual: null } : {})
+      })),
+    setRightSidebarOpen: (open) =>
+      set({ rightSidebarOpen: open, ...(open ? {} : { rightSidebarVisual: null }) }),
     setRightSidebarWidth: (width) => set({ rightSidebarWidth: width }),
     setRightSidebarTab: (tab) =>
       set((s) => ({
@@ -138,6 +173,44 @@ export function createRightSidebarState(set: EditorSet, _get: EditorGet): RightS
         aiVaultSearchFocusRequested: true
       })),
     clearAiVaultSearchFocusRequest: () => set({ aiVaultSearchFocusRequested: false }),
+    openRightSidebarVisual: (route) =>
+      set((s) => {
+        const current = selectVisibleRightSidebarVisual(s)
+        return {
+          rightSidebarOpen: true,
+          rightSidebarVisual: {
+            ...route,
+            routeRequestId: s.rightSidebarRouteRequestId,
+            reopenedSidebar: current ? current.reopenedSidebar : !s.rightSidebarOpen,
+            width: current?.width ?? null
+          }
+        }
+      }),
+    closeRightSidebarVisual: () =>
+      set((s) => ({
+        rightSidebarVisual: null,
+        ...(selectVisibleRightSidebarVisual(s)?.reopenedSidebar ? { rightSidebarOpen: false } : {})
+      })),
+    setRightSidebarVisualWidth: (width) =>
+      set((s) => {
+        const visual = selectVisibleRightSidebarVisual(s)
+        return visual ? { rightSidebarVisual: { ...visual, width } } : {}
+      }),
     setActivityBarPosition: (position) => set({ activityBarPosition: position })
   }
 }
+
+/** The visual the sidebar shows now, or null once a tab route superseded it or it was closed. */
+export function selectVisibleRightSidebarVisual(
+  state: Pick<
+    RightSidebarState,
+    'rightSidebarVisual' | 'rightSidebarRouteRequestId' | 'rightSidebarOpen'
+  >
+): RightSidebarVisualState | null {
+  const visual = state.rightSidebarVisual
+  return visual &&
+    state.rightSidebarOpen &&
+    visual.routeRequestId === state.rightSidebarRouteRequestId
+    ? visual
+    : null
+}
diff --git a/src/renderer/src/store/slices/editor/actions/right-sidebar-visual-state.test.ts b/src/renderer/src/store/slices/editor/actions/right-sidebar-visual-state.test.ts
new file mode 100644
index 000000000000..3fb4b08b69b4
--- /dev/null
+++ b/src/renderer/src/store/slices/editor/actions/right-sidebar-visual-state.test.ts
@@ -0,0 +1,96 @@
+import { describe, expect, it } from 'vitest'
+import {
+  createRightSidebarState,
+  selectVisibleRightSidebarVisual,
+  type RightSidebarState,
+  type RightSidebarVisualRoute
+} from './right-sidebar-state'
+import { rightSidebarVisualWidth } from '../../../../components/right-sidebar/right-sidebar-width'
+
+type Harness = RightSidebarState & { activeWorktreeId: string | null }
+
+function harness(): { state: () => Harness } {
+  // oxlint-disable-next-line typescript/consistent-type-assertions -- SAFETY: filled by the slice on the next line before any read.
+  let state = { activeWorktreeId: 'wt-1' } as Harness
+  const set = (update: Partial<Harness> | ((current: Harness) => Partial<Harness>)): void => {
+    state = { ...state, ...(typeof update === 'function' ? update(state) : update) }
+  }
+  // oxlint-disable-next-line typescript/consistent-type-assertions -- SAFETY: the slice only reads and writes the fields this harness holds.
+  Object.assign(state, createRightSidebarState(set as never, (() => state) as never))
+  return { state: () => state }
+}
+
+const route: RightSidebarVisualRoute = {
+  target: { kind: 'local' },
+  sessionId: 'session-alpha',
+  messageId: 'message-1',
+  file: 'chart.html',
+  title: 'Chart',
+  tabId: 'tab-1',
+  worktreeId: 'wt-1'
+}
+
+describe('right sidebar visual route', () => {
+  it('opens the sidebar on the visual and closes it again when it had been closed', () => {
+    const { state } = harness()
+    expect(state().rightSidebarOpen).toBe(false)
+    state().openRightSidebarVisual(route)
+    expect(state().rightSidebarOpen).toBe(true)
+    expect(selectVisibleRightSidebarVisual(state())).toMatchObject({ file: 'chart.html' })
+    state().closeRightSidebarVisual()
+    expect(selectVisibleRightSidebarVisual(state())).toBeNull()
+    expect(state().rightSidebarOpen).toBe(false)
+  })
+
+  it('returns to the open sidebar it replaced', () => {
+    const { state } = harness()
+    state().setRightSidebarOpen(true)
+    state().setRightSidebarTab('source-control')
+    state().openRightSidebarVisual(route)
+    state().closeRightSidebarVisual()
+    expect(state().rightSidebarOpen).toBe(true)
+    expect(state().rightSidebarTab).toBe('source-control')
+  })
+
+  it('gives way to any tab the user picks, without being cleared explicitly', () => {
+    const { state } = harness()
+    state().openRightSidebarVisual(route)
+    state().setRightSidebarTab('checks')
+    expect(selectVisibleRightSidebarVisual(state())).toBeNull()
+    expect(state().rightSidebarTab).toBe('checks')
+  })
+
+  it('is dropped when the sidebar closes', () => {
+    const { state } = harness()
+    state().openRightSidebarVisual(route)
+    state().toggleRightSidebar()
+    expect(state().rightSidebarVisual).toBeNull()
+    state().toggleRightSidebar()
+    expect(selectVisibleRightSidebarVisual(state())).toBeNull()
+  })
+
+  it('widens while shown without touching the stored width, and keeps a resize to itself', () => {
+    const { state } = harness()
+    state().setRightSidebarWidth(300)
+    state().openRightSidebarVisual(route)
+    const visual = selectVisibleRightSidebarVisual(state())
+    expect(rightSidebarVisualWidth(state().rightSidebarWidth, visual?.width ?? null)).toBe(720)
+    state().setRightSidebarVisualWidth(900)
+    expect(selectVisibleRightSidebarVisual(state())?.width).toBe(900)
+    expect(state().rightSidebarWidth).toBe(300)
+    state().closeRightSidebarVisual()
+    expect(state().rightSidebarWidth).toBe(300)
+  })
+
+  it('keeps a wider stored width and the reopen bookkeeping when switching visuals', () => {
+    const { state } = harness()
+    state().setRightSidebarWidth(1000)
+    state().openRightSidebarVisual(route)
+    expect(rightSidebarVisualWidth(1000, null)).toBe(1000)
+    state().openRightSidebarVisual({ ...route, file: 'other.html' })
+    expect(selectVisibleRightSidebarVisual(state())).toMatchObject({
+      file: 'other.html',
+      reopenedSidebar: true
+    })
+  })
+})
diff --git a/src/renderer/src/store/slices/folder-workspace-owner-routed-mutations.test.ts b/src/renderer/src/store/slices/folder-workspace-owner-routed-mutations.test.ts
index 911f0acfb602..6ba887087361 100644
--- a/src/renderer/src/store/slices/folder-workspace-owner-routed-mutations.test.ts
+++ b/src/renderer/src/store/slices/folder-workspace-owner-routed-mutations.test.ts
@@ -1,3 +1,8 @@
+import { createGlobalSettingsFixture } from '../../../../shared/global-settings-test-fixture'
+import {
+  WORKTREE_LINKED_ITEMS_RUNTIME_CAPABILITY,
+  WORKSPACE_ATTACHMENT_RUNTIME_CAPABILITIES
+} from '../../../../shared/workspace-attachment-capabilities'
 import { beforeEach, describe, expect, it, vi } from 'vitest'
 import type { FolderWorkspace } from '../../../../shared/folder-workspace-types'
 import type { ProjectGroup } from '../../../../shared/project-group-types'
@@ -70,6 +75,82 @@ beforeEach(() => {
 })
 
 describe('folder workspace owner-routed mutations', () => {
+  it.each([true, false])(
+    'keeps legacy folder task link=%s compatible with an older host',
+    async (link) => {
+      const folderWorkspace = makeFolderWorkspace({ executionHostId: 'runtime:env-owner' })
+      const linkedTask = link
+        ? {
+            provider: 'github' as const,
+            type: 'issue' as const,
+            number: 9,
+            title: 'Existing task',
+            url: 'https://github.com/acme/orca/issues/9',
+            repoId: 'repo'
+          }
+        : null
+      runtimeEnvironmentTransportCall.mockImplementation((args: RuntimeEnvironmentCallRequest) => {
+        const status = createCompatibleRuntimeStatusResponseIfNeeded(args)
+        return status?.ok
+          ? {
+              ...status,
+              result: {
+                ...status.result,
+                capabilities: status.result.capabilities?.filter(
+                  (capability) =>
+                    !WORKSPACE_ATTACHMENT_RUNTIME_CAPABILITIES.some((item) => item === capability)
+                )
+              }
+            }
+          : runtimeEnvironmentCall(args)
+      })
+      runtimeEnvironmentCall.mockResolvedValue({
+        id: 'folder-write',
+        ok: true,
+        result: { folderWorkspace: { ...folderWorkspace, linkedTask, updatedAt: 2 } }
+      })
+      const store = createTestStore()
+      store.setState({
+        projectGroups: [{ ...projectGroup, executionHostId: 'runtime:env-owner' }],
+        folderWorkspaces: [folderWorkspace]
+      })
+      await expect(
+        store.getState().updateWorktreeMeta(
+          folderWorkspaceKey(folderWorkspace.id),
+          {
+            linkedWorkItem: linkedTask
+          },
+          { executionHostId: 'runtime:env-owner' }
+        )
+      ).resolves.toEqual({ ok: true })
+      expect(runtimeEnvironmentCall).toHaveBeenCalledWith(
+        expect.objectContaining({
+          method: 'folderWorkspace.update',
+          params: {
+            folderWorkspaceId: folderWorkspace.id,
+            updates: { linkedTask }
+          }
+        })
+      )
+    }
+  )
+
+  it('reports failure when the host drops an attachment collection', async () => {
+    const folderWorkspace = makeFolderWorkspace()
+    folderWorkspacesUpdate.mockResolvedValue(folderWorkspace)
+    folderWorkspacesList.mockResolvedValue([folderWorkspace])
+    const store = createTestStore()
+    store.setState({
+      projectGroups: [{ ...projectGroup, executionHostId: 'local' }],
+      folderWorkspaces: [folderWorkspace]
+    })
+    const result = await store.getState().updateFolderWorkspace(folderWorkspace.id, {
+      linkedItems: [{ provider: 'linear', type: 'issue', number: 0, identifier: 'ENG-42' }]
+    })
+    expect(result).toBe(false)
+    expect(store.getState().folderWorkspaces[0]?.linkedItems).toBeUndefined()
+  })
+
   it('persists manual rank through the shared batch metadata boundary', async () => {
     const folderWorkspace = makeFolderWorkspace()
     folderWorkspacesUpdate.mockResolvedValue({ ...folderWorkspace, manualOrder: 9000 })
@@ -522,4 +603,24 @@ describe('folder workspace owner-routed mutations', () => {
     })
     expect(store.getState().folderWorkspaces).toEqual([localFolder])
   })
+  it('refuses collection creation before an old runtime strips attachments', async () => {
+    runtimeEnvironmentTransportCall.mockImplementation((args: RuntimeEnvironmentCallRequest) => {
+      const status = createCompatibleRuntimeStatusResponseIfNeeded(args)
+      if (status?.ok) {
+        status.result.capabilities = (status.result.capabilities ?? []).filter(
+          (capability) => capability !== WORKTREE_LINKED_ITEMS_RUNTIME_CAPABILITY
+        )
+        return status
+      }
+      return runtimeEnvironmentCall(args)
+    })
+    const store = createTestStore()
+    store.setState({
+      settings: createGlobalSettingsFixture({ activeRuntimeEnvironmentId: 'env-old' })
+    })
+    await expect(
+      store.getState().createFolderWorkspace({ projectGroupId: projectGroup.id, linkedItems: [] })
+    ).rejects.toThrow('Update the remote runtime')
+    expect(runtimeEnvironmentCall).not.toHaveBeenCalled()
+  })
 })
diff --git a/src/renderer/src/store/slices/hosted-review-cache-state.ts b/src/renderer/src/store/slices/hosted-review-cache-state.ts
index f7a52802a209..c4be9da838f1 100644
--- a/src/renderer/src/store/slices/hosted-review-cache-state.ts
+++ b/src/renderer/src/store/slices/hosted-review-cache-state.ts
@@ -12,12 +12,15 @@ import type { AppState } from '../types'
 export type HostedReviewCacheEntry<T> = {
   data: T | null
   fetchedAt: number
+  stale?: boolean
   linkedReviewHintKey?: string
   branchLookupGitHubPRNumber?: number
 }
 export type HostedReviewCache = Record<string, HostedReviewCacheEntry<HostedReviewInfo>>
 
 export type HostedReviewFetchOptions = {
+  /** Source-qualified exact lookup; does not replace the branch’s selected review. */
+  exactReviewKey?: string
   force?: boolean
   repoId?: string
   admissionTier?: 'interactive' | 'status' | 'background'
diff --git a/src/renderer/src/store/slices/hosted-review.ts b/src/renderer/src/store/slices/hosted-review.ts
index d5f142736ea3..255b29879ac7 100644
--- a/src/renderer/src/store/slices/hosted-review.ts
+++ b/src/renderer/src/store/slices/hosted-review.ts
@@ -161,15 +161,17 @@ export const createHostedReviewSlice: StateCreator<AppState, [], [], HostedRevie
     }
     const ownerSettings = settingsForHostedReviewRepoOwner(get().settings, repo)
     const target = getActiveRuntimeTarget(ownerSettings)
-    const cacheKey = getHostedReviewCacheKey(
-      repoPath,
-      branch,
-      ownerSettings,
-      options?.repoId ?? repo?.id,
-      repo?.connectionId,
-      repo?.executionHostId,
-      repo !== undefined
-    )
+    const cacheKey =
+      options?.exactReviewKey ??
+      getHostedReviewCacheKey(
+        repoPath,
+        branch,
+        ownerSettings,
+        options?.repoId ?? repo?.id,
+        repo?.connectionId,
+        repo?.executionHostId,
+        repo !== undefined
+      )
     const cached = get().hostedReviewCache[cacheKey]
     const hintKey = linkedReviewHintKey(options)
     const requestKey = hostedReviewRequestKey(cacheKey, hintKey)
@@ -190,8 +192,16 @@ export const createHostedReviewSlice: StateCreator<AppState, [], [], HostedRevie
     const startRequest = (): Promise<HostedReviewInfo | null> => {
       const generation = nextLookupGeneration()
       const requestStartedAt = Date.now()
-      const requestStartedEntry = get().hostedReviewCache[cacheKey]
       requestGenerations.set(cacheKey, generation)
+      if (options?.exactReviewKey && cached) {
+        set((state) => ({
+          hostedReviewCache: {
+            ...state.hostedReviewCache,
+            [cacheKey]: { ...cached, stale: true }
+          }
+        }))
+      }
+      const requestStartedEntry = get().hostedReviewCache[cacheKey]
       const request = (async () => {
         try {
           const args = hostedReviewBranchLookupArgs(branch, options)
@@ -225,15 +235,17 @@ export const createHostedReviewSlice: StateCreator<AppState, [], [], HostedRevie
                 return state
               }
               const currentPRCache = state.prCache ?? {}
-              const prCache = clearHostedReviewConflictingPrCache({
-                cache: currentPRCache,
-                review,
-                repoPath,
-                repoId: options?.repoId ?? repo?.id,
-                branch,
-                settings: ownerSettings,
-                repo
-              })
+              const prCache = options?.exactReviewKey
+                ? currentPRCache
+                : clearHostedReviewConflictingPrCache({
+                    cache: currentPRCache,
+                    review,
+                    repoPath,
+                    repoId: options?.repoId ?? repo?.id,
+                    branch,
+                    settings: ownerSettings,
+                    repo
+                  })
               return {
                 ...(prCache === currentPRCache ? {} : { prCache }),
                 hostedReviewCache: withHostedReviewCacheEntry(state.hostedReviewCache, cacheKey, {
diff --git a/src/renderer/src/store/slices/linear-source-context-cache-scope.test.ts b/src/renderer/src/store/slices/linear-source-context-cache-scope.test.ts
index 08ed1248b196..98123ca4cec5 100644
--- a/src/renderer/src/store/slices/linear-source-context-cache-scope.test.ts
+++ b/src/renderer/src/store/slices/linear-source-context-cache-scope.test.ts
@@ -138,6 +138,60 @@ describe('createLinearSlice caching', () => {
     ).toBeNull()
   })
 
+  it('uses source-selected workspaces for searches, lists, and matching cache reads', async () => {
+    const store = createTestStore()
+    store.setState({
+      linearStatus: { connected: true, viewer: null, selectedWorkspaceId: 'focused-workspace' }
+    })
+    const sourceContext = linearSourceContext('source-runtime', 'source-workspace')
+    const options = { sourceContext, workspaceId: 'source-workspace' }
+    linearSearchIssues.mockResolvedValue([issue('SOURCE-1')])
+    linearListIssues.mockResolvedValue({ items: [issue('SOURCE-2')] })
+    await store.getState().searchLinearIssues('query', 12, options)
+    await store.getState().listLinearIssues({ kind: 'list', limit: 12 }, options)
+    expect(linearSearchIssues).toHaveBeenCalledWith(sourceContext, 'query', 12, 'source-workspace')
+    expect(linearListIssues).toHaveBeenCalledWith(
+      sourceContext,
+      'assigned',
+      12,
+      'source-workspace',
+      undefined
+    )
+    expect(
+      store.getState().getCachedLinearIssues({ kind: 'search', query: 'query', limit: 12 }, options)
+    ).toMatchObject([{ id: 'SOURCE-1' }])
+    expect(
+      store.getState().getCachedLinearIssues({ kind: 'list', limit: 12 }, options)
+    ).toMatchObject({ items: [{ id: 'SOURCE-2' }] })
+    store.getState().prefetchLinearIssues({ kind: 'search', query: 'query', limit: 12 }, options)
+    expect(linearSearchIssues).toHaveBeenCalledTimes(1)
+    expect(
+      store
+        .getState()
+        .getCachedLinearIssues({ kind: 'search', query: 'query', limit: 12 }, { sourceContext })
+    ).toBeNull()
+  })
+
+  it('distinguishes explicit default, all, and inherited focused workspace selections', async () => {
+    const store = createTestStore()
+    store.setState({
+      linearStatus: { connected: true, viewer: null, selectedWorkspaceId: 'focused-workspace' }
+    })
+    const sourceContext = linearSourceContext('source-runtime')
+    linearSearchIssues.mockResolvedValue([])
+    await store.getState().searchLinearIssues('query', 12, { sourceContext, workspaceId: null })
+    await store.getState().searchLinearIssues('query', 12, { sourceContext, workspaceId: 'all' })
+    await store
+      .getState()
+      .searchLinearIssues('query', 12, { sourceContext, workspaceId: undefined })
+    expect(linearSearchIssues.mock.calls.map((args) => args[3])).toEqual([
+      null,
+      'all',
+      'focused-workspace'
+    ])
+    expect(Object.keys(store.getState().linearSearchCache)).toHaveLength(3)
+  })
+
   it('scopes cached Linear teams, projects, and views to the explicit source context', async () => {
     const store = createTestStore()
     store.setState({
@@ -308,4 +362,18 @@ describe('createLinearSlice caching', () => {
         ?.title
     ).toBe('Remote title')
   })
+  it('does not reuse an unscoped issue detail for an explicit source', async () => {
+    const store = createTestStore()
+    const sourceContext = linearSourceContext('source-runtime', 'source-workspace')
+    store.setState({
+      linearIssueCache: {
+        'same-id': { data: { ...issue('same-id'), title: 'Wrong source' }, fetchedAt: Date.now() }
+      }
+    })
+    linearGetIssue.mockResolvedValueOnce({ ...issue('same-id'), title: 'Correct source' })
+    await expect(
+      store.getState().fetchLinearIssue('same-id', 'source-workspace', { sourceContext })
+    ).resolves.toMatchObject({ title: 'Correct source' })
+    expect(linearGetIssue).toHaveBeenCalledWith(sourceContext, 'same-id', 'source-workspace')
+  })
 })
diff --git a/src/renderer/src/store/slices/linear/linear-cache.ts b/src/renderer/src/store/slices/linear/linear-cache.ts
index f77f96f70f23..b9b41036d36e 100644
--- a/src/renderer/src/store/slices/linear/linear-cache.ts
+++ b/src/renderer/src/store/slices/linear/linear-cache.ts
@@ -68,8 +68,12 @@ export function workspaceErrorMessage(error: unknown): string {
 }
 
 export function getSelectedWorkspaceId(
-  status: LinearConnectionStatus
+  status: LinearConnectionStatus,
+  options?: { workspaceId?: LinearWorkspaceSelection | null }
 ): LinearWorkspaceSelection | null {
+  if (options?.workspaceId !== undefined) {
+    return options.workspaceId
+  }
   return status.selectedWorkspaceId ?? status.activeWorkspaceId ?? null
 }
 
diff --git a/src/renderer/src/store/slices/linear/linear-issue-cache-actions.ts b/src/renderer/src/store/slices/linear/linear-issue-cache-actions.ts
index 32c3116aaac3..fa4bf0fa235d 100644
--- a/src/renderer/src/store/slices/linear/linear-issue-cache-actions.ts
+++ b/src/renderer/src/store/slices/linear/linear-issue-cache-actions.ts
@@ -31,7 +31,7 @@ export function createLinearIssueCacheActions(
   return {
     getCachedLinearIssues: (args: LinearIssueReadArgs, options) => {
       const scope = getLinearReadScope(get().settings, options?.sourceContext)
-      const workspaceId = getSelectedWorkspaceId(get().linearStatus)
+      const workspaceId = getSelectedWorkspaceId(get().linearStatus, options)
       if (args.kind === 'search') {
         const cacheKey = scopedLinearCacheKey(
           scope,
@@ -51,7 +51,7 @@ export function createLinearIssueCacheActions(
     prefetchLinearIssues: (args: LinearIssueReadArgs, options?: LinearFetchOptions) => {
       const scope = getLinearReadScope(get().settings, options?.sourceContext)
       const { contextKey } = scope
-      const workspaceId = getSelectedWorkspaceId(get().linearStatus)
+      const workspaceId = getSelectedWorkspaceId(get().linearStatus, options)
       if (args.kind === 'search') {
         const limit = args.limit ?? 20
         const cacheKey = scopedLinearCacheKey(
diff --git a/src/renderer/src/store/slices/linear/linear-issue-detail-actions.ts b/src/renderer/src/store/slices/linear/linear-issue-detail-actions.ts
index 94b4f3fde073..f2826509f459 100644
--- a/src/renderer/src/store/slices/linear/linear-issue-detail-actions.ts
+++ b/src/renderer/src/store/slices/linear/linear-issue-detail-actions.ts
@@ -39,7 +39,9 @@ export function createLinearIssueDetailActions(
       const scope = getLinearReadScope(get().settings, options?.sourceContext)
       const { contextKey } = scope
       const issueCacheKey = scopedLinearCacheKey(scope, `${workspaceId ?? 'selected'}::${id}`)
-      const cached = get().linearIssueCache[issueCacheKey] ?? get().linearIssueCache[id]
+      const cached =
+        get().linearIssueCache[issueCacheKey] ??
+        (scope.explicitSource ? undefined : get().linearIssueCache[id])
       if (isFresh(cached)) {
         return cached.data
       }
diff --git a/src/renderer/src/store/slices/linear/linear-issue-list-actions.ts b/src/renderer/src/store/slices/linear/linear-issue-list-actions.ts
index 20fdd8b70c4f..8c715265ae82 100644
--- a/src/renderer/src/store/slices/linear/linear-issue-list-actions.ts
+++ b/src/renderer/src/store/slices/linear/linear-issue-list-actions.ts
@@ -47,7 +47,7 @@ export function createLinearIssueListActions(
     searchLinearIssues: async (query: string, limit = 20, options?: LinearFetchOptions) => {
       const scope = getLinearReadScope(get().settings, options?.sourceContext)
       const { contextKey } = scope
-      const workspaceId = getSelectedWorkspaceId(get().linearStatus)
+      const workspaceId = getSelectedWorkspaceId(get().linearStatus, options)
       const cacheKey = scopedLinearCacheKey(scope, linearSearchCacheKey(workspaceId, query, limit))
       const cached = get().linearSearchCache[cacheKey]
       if (!options?.force && isFresh(cached)) {
@@ -92,6 +92,7 @@ export function createLinearIssueListActions(
         .catch((error) => {
           console.warn('[linear] searchLinearIssues failed:', error)
           if (
+            !(scope.explicitSource && options?.workspaceId !== undefined) &&
             (isIntegrationCredentialDecryptionError(error) || looksLikeAuthError(error)) &&
             canWriteLinearReadResult(
               contextKey,
@@ -113,6 +114,7 @@ export function createLinearIssueListActions(
             inflightSearchRequests.delete(cacheKey)
           }
           if (
+            !(scope.explicitSource && options?.workspaceId !== undefined) &&
             shouldRefreshStatusAfterRead(workspaceId, get().linearStatus) &&
             canWriteLinearReadResult(
               contextKey,
@@ -140,7 +142,7 @@ export function createLinearIssueListActions(
     listLinearIssues: async (args: LinearIssueListReadArgs, options?: LinearFetchOptions) => {
       const scope = getLinearReadScope(get().settings, options?.sourceContext)
       const { contextKey } = scope
-      const workspaceId = getSelectedWorkspaceId(get().linearStatus)
+      const workspaceId = getSelectedWorkspaceId(get().linearStatus, options)
       const filter = args.filter ?? 'assigned'
       const effectiveLimit = clampLinearIssueListLimit(args.limit)
       const attributeFilter = normalizeListAttributeFilter(args.attributeFilter)
@@ -202,6 +204,7 @@ export function createLinearIssueListActions(
             throw error
           }
           if (
+            !(scope.explicitSource && options?.workspaceId !== undefined) &&
             (isIntegrationCredentialDecryptionError(error) || looksLikeAuthError(error)) &&
             canWriteLinearReadResult(
               contextKey,
@@ -223,6 +226,7 @@ export function createLinearIssueListActions(
             inflightListRequests.delete(cacheKey)
           }
           if (
+            !(scope.explicitSource && options?.workspaceId !== undefined) &&
             shouldRefreshStatusAfterRead(workspaceId, get().linearStatus) &&
             canWriteLinearReadResult(
               contextKey,
diff --git a/src/renderer/src/store/slices/linear/linear-slice-contract.ts b/src/renderer/src/store/slices/linear/linear-slice-contract.ts
index 3c87fdf30902..aff0802c99f5 100644
--- a/src/renderer/src/store/slices/linear/linear-slice-contract.ts
+++ b/src/renderer/src/store/slices/linear/linear-slice-contract.ts
@@ -29,7 +29,11 @@ export type LinearIssueReadArgs =
   | { kind: 'search'; query: string; limit?: number }
   | LinearIssueListReadArgs
 
-export type LinearFetchOptions = { force?: boolean; sourceContext?: TaskSourceContext | null }
+export type LinearFetchOptions = {
+  force?: boolean
+  sourceContext?: TaskSourceContext | null
+  workspaceId?: LinearWorkspaceSelection | null
+}
 export type LinearPatchOptions = { sourceContext?: TaskSourceContext | null }
 
 export type LinearSlice = {
@@ -73,7 +77,7 @@ export type LinearSlice = {
   ) => Promise<LinearIssue | null>
   getCachedLinearIssues: (
     args: LinearIssueReadArgs,
-    options?: Pick<LinearFetchOptions, 'sourceContext'>
+    options?: Pick<LinearFetchOptions, 'sourceContext' | 'workspaceId'>
   ) => LinearIssue[] | LinearCollectionResult<LinearIssue> | null
   prefetchLinearIssues: (args: LinearIssueReadArgs, options?: LinearFetchOptions) => void
   searchLinearIssues: (
diff --git a/src/renderer/src/store/slices/native-chat-launch-draft-teardown.test.ts b/src/renderer/src/store/slices/native-chat-launch-draft-teardown.test.ts
index 915ef64300e6..ca3c982eeace 100644
--- a/src/renderer/src/store/slices/native-chat-launch-draft-teardown.test.ts
+++ b/src/renderer/src/store/slices/native-chat-launch-draft-teardown.test.ts
@@ -51,6 +51,10 @@ import {
   structuredAgentSessionDraftScopeKey,
   updateNativeChatComposerDraft
 } from '@/components/native-chat/native-chat-composer-draft-store'
+import {
+  addNativeChatPendingAttachment,
+  settleNativeChatPendingAttachment
+} from '@/components/native-chat/native-chat-pending-attachment-cache'
 
 const WT1 = 'repo1::/path/wt1'
 const WT2 = 'repo1::/path/wt2'
@@ -190,6 +194,23 @@ describe('nativeChatLaunchDraftByTabId teardown', () => {
     expect(readNativeChatComposerDraft(`${TAB2}:leaf-a`).text).toBe('kept')
   })
 
+  it('a user tab close drops the uploads still on their way in that tab’s panes only', () => {
+    const store = createTestStore()
+    seedDrafts(store)
+    for (const scopeKey of [`${TAB1}:leaf-b`, `${TAB2}:leaf-b`]) {
+      addNativeChatPendingAttachment(scopeKey, { id: scopeKey, path: '', pending: true })
+    }
+
+    store.getState().closeTab(TAB2, { reason: 'pty-exit' })
+    store.getState().closeTab(TAB1)
+
+    const settled = [`${TAB1}:leaf-b`, `${TAB2}:leaf-b`].map((scopeKey) =>
+      settleNativeChatPendingAttachment(scopeKey, scopeKey, '/store/a.png')
+    )
+    expect(settled).toEqual([false, true])
+    expect(readNativeChatComposerDraft(`${TAB1}:leaf-b`).images).toEqual([])
+  })
+
   function seedStructuredChat(store: ReturnType<typeof createTestStore>) {
     const chat = makeUnifiedTab({
       id: 'chat-tab',
diff --git a/src/renderer/src/store/slices/new-markdown.test.ts b/src/renderer/src/store/slices/new-markdown.test.ts
index ae859be50777..982f804b6cbf 100644
--- a/src/renderer/src/store/slices/new-markdown.test.ts
+++ b/src/renderer/src/store/slices/new-markdown.test.ts
@@ -4,7 +4,7 @@ import { createEditorSlice } from './editor'
 import type { AppState } from '../types'
 import type { BrowserTab } from '../../../../shared/browser-workspace-types'
 import type { Tab, TabContentType, TabGroup } from '../../../../shared/tab-types'
-import { makeTab } from './store-test-helpers'
+import { makeTab } from './store-session-test-harness'
 
 function createEditorStore(overrides?: Partial<AppState>): StoreApi<AppState> {
   // eslint-disable-next-line @typescript-eslint/no-explicit-any
diff --git a/src/renderer/src/store/slices/store-session-test-harness.ts b/src/renderer/src/store/slices/store-session-test-harness.ts
index 6ef35f6360ed..0a1f08266b72 100644
--- a/src/renderer/src/store/slices/store-session-test-harness.ts
+++ b/src/renderer/src/store/slices/store-session-test-harness.ts
@@ -1,5 +1,9 @@
 import { vi, type Mock } from 'vitest'
 import type { BrowserTab } from '../../../../shared/browser-workspace-types'
+import type { Tab, TabGroup } from '../../../../shared/tab-types'
+import type { TerminalLayoutSnapshot, TerminalTab } from '../../../../shared/terminal-tab-types'
+import type { OpenFile } from './editor'
+import { translate } from '@/i18n/i18n'
 
 /** Shape shared by the Claude/Codex/OpenCode usage-scanner namespaces. */
 type UsageScannerMocks = {
@@ -128,3 +132,59 @@ export function makeBrowserTab(
     ...overrides
   }
 }
+
+export function makeTab(
+  overrides: Partial<TerminalTab> & { id: string; worktreeId: string }
+): TerminalTab {
+  return {
+    ptyId: null,
+    title: translate('auto.store.slices.store.test.helpers.b9a8117c33', 'Terminal 1'),
+    customTitle: null,
+    color: null,
+    sortOrder: 0,
+    createdAt: Date.now(),
+    ...overrides
+  }
+}
+
+export function makeLayout(): TerminalLayoutSnapshot {
+  return { root: null, activeLeafId: null, expandedLeafId: null }
+}
+
+export function makeOpenFile(
+  overrides: Partial<OpenFile> & { id: string; worktreeId: string }
+): OpenFile {
+  return {
+    filePath: overrides.id,
+    relativePath: 'file.ts',
+    language: 'typescript',
+    isDirty: false,
+    mode: 'edit',
+    ...overrides
+  }
+}
+
+export function makeUnifiedTab(
+  overrides: Partial<Tab> & { id: string; worktreeId: string; groupId: string }
+): Tab {
+  return {
+    entityId: overrides.id,
+    contentType: 'terminal',
+    label: translate('auto.store.slices.store.test.helpers.b9a8117c33', 'Terminal 1'),
+    customLabel: null,
+    color: null,
+    sortOrder: 0,
+    createdAt: Date.now(),
+    ...overrides
+  }
+}
+
+export function makeTabGroup(
+  overrides: Partial<TabGroup> & { id: string; worktreeId: string }
+): TabGroup {
+  return {
+    activeTabId: null,
+    tabOrder: [],
+    ...overrides
+  }
+}
diff --git a/src/renderer/src/store/slices/store-test-helpers.ts b/src/renderer/src/store/slices/store-test-helpers.ts
index 259eda1c10b6..abc8f0fdaa06 100644
--- a/src/renderer/src/store/slices/store-test-helpers.ts
+++ b/src/renderer/src/store/slices/store-test-helpers.ts
@@ -1,9 +1,6 @@
 import { create } from 'zustand'
 import type { AppState } from '../types'
-import type { Tab, TabGroup } from '../../../../shared/tab-types'
-import type { TerminalLayoutSnapshot, TerminalTab } from '../../../../shared/terminal-tab-types'
 import type { Worktree } from '../../../../shared/worktree/types'
-import type { OpenFile } from './editor'
 import { createRepoSlice } from './repos'
 import { createSparsePresetsSlice } from './sparse-presets'
 import { createWorktreeSlice } from './worktrees'
@@ -52,15 +49,16 @@ import { createTaskCreationDraftsSlice } from './task-creation-drafts'
 import { createRemoteServerUpdatesSlice } from './remote-server-updates'
 import { createTerminalQuickCommandHostsSlice } from './terminal-quick-command-hosts'
 import { createStructuredSessionLaunchDirectorySlice } from './structured-session-launch-directories'
-import { translate } from '@/i18n/i18n'
-
-export const TEST_REPO = {
-  id: 'repo1',
-  path: '/repo1',
-  displayName: 'Repo 1',
-  badgeColor: '#000',
-  addedAt: 0
-}
+import '@/i18n/i18n'
+import { makeWorktree, TEST_REPO } from './worktrees-slice-test-fixtures'
+export { makeWorktree, TEST_REPO } from './worktrees-slice-test-fixtures'
+export {
+  makeTab,
+  makeLayout,
+  makeOpenFile,
+  makeUnifiedTab,
+  makeTabGroup
+} from './store-session-test-harness'
 
 export function createTestStore() {
   return create<AppState>()((...a) => ({
@@ -126,31 +124,6 @@ export function seedStore(
   })
 }
 
-export function makeWorktree(
-  overrides: Partial<Worktree> & { id: string; repoId: string }
-): Worktree {
-  return {
-    path: '/tmp/wt',
-    head: 'abc123',
-    branch: 'refs/heads/feature',
-    isBare: false,
-    isMainWorktree: false,
-    displayName: 'feature',
-    comment: '',
-    linkedIssue: null,
-    linkedPR: null,
-    linkedLinearIssue: null,
-    linkedGitLabMR: null,
-    linkedGitLabIssue: null,
-    isArchived: false,
-    isUnread: false,
-    isPinned: false,
-    sortOrder: 0,
-    lastActivityAt: 0,
-    ...overrides
-  }
-}
-
 export function makeRuntimeOwnedWorktree(
   overrides: Partial<Worktree> & { id: string; repoId: string },
   runtimeEnvironmentId = 'runtime-1'
@@ -161,59 +134,3 @@ export function makeRuntimeOwnedWorktree(
     runtimeOwnerEnvironmentId: runtimeEnvironmentId
   })
 }
-
-export function makeTab(
-  overrides: Partial<TerminalTab> & { id: string; worktreeId: string }
-): TerminalTab {
-  return {
-    ptyId: null,
-    title: translate('auto.store.slices.store.test.helpers.b9a8117c33', 'Terminal 1'),
-    customTitle: null,
-    color: null,
-    sortOrder: 0,
-    createdAt: Date.now(),
-    ...overrides
-  }
-}
-
-export function makeLayout(): TerminalLayoutSnapshot {
-  return { root: null, activeLeafId: null, expandedLeafId: null }
-}
-
-export function makeOpenFile(
-  overrides: Partial<OpenFile> & { id: string; worktreeId: string }
-): OpenFile {
-  return {
-    filePath: overrides.id,
-    relativePath: 'file.ts',
-    language: 'typescript',
-    isDirty: false,
-    mode: 'edit',
-    ...overrides
-  }
-}
-
-export function makeUnifiedTab(
-  overrides: Partial<Tab> & { id: string; worktreeId: string; groupId: string }
-): Tab {
-  return {
-    entityId: overrides.id,
-    contentType: 'terminal',
-    label: translate('auto.store.slices.store.test.helpers.b9a8117c33', 'Terminal 1'),
-    customLabel: null,
-    color: null,
-    sortOrder: 0,
-    createdAt: Date.now(),
-    ...overrides
-  }
-}
-
-export function makeTabGroup(
-  overrides: Partial<TabGroup> & { id: string; worktreeId: string }
-): TabGroup {
-  return {
-    activeTabId: null,
-    tabOrder: [],
-    ...overrides
-  }
-}
diff --git a/src/renderer/src/store/slices/ui-agent-send-target.test.ts b/src/renderer/src/store/slices/ui-agent-send-target.test.ts
index 071d83ff1cc6..b36bbcb554c5 100644
--- a/src/renderer/src/store/slices/ui-agent-send-target.test.ts
+++ b/src/renderer/src/store/slices/ui-agent-send-target.test.ts
@@ -10,8 +10,10 @@ import { createUIStore } from './ui-slice-test-harness'
 
 const mocks = vi.hoisted(() => ({
   sendNotesToActiveAgentSession: vi.fn(),
-  appendStructuredAgentSessionOutboxMessage: vi.fn(),
-  relaunchFailedStructuredAgentSessionForMessage: vi.fn(),
+  sendStructuredAgentSessionMessage: vi.fn(),
+  relaunchFailedStructuredAgentSessionWithMessage: vi.fn(
+    (): Promise<{ delivered: boolean }> | null => null
+  ),
   track: vi.fn(),
   toastMessage: vi.fn(),
   toastSuccess: vi.fn(),
@@ -26,13 +28,26 @@ vi.mock('@/lib/active-agent-note-send', () => ({
   sendNotesToActiveAgentSession: mocks.sendNotesToActiveAgentSession
 }))
 
-vi.mock('@/components/native-chat/structured-agent-session-outbox-storage', () => ({
-  appendStructuredAgentSessionOutboxMessage: mocks.appendStructuredAgentSessionOutboxMessage
+vi.mock('@/components/native-chat/structured-agent-session-message-sender', () => ({
+  sendStructuredAgentSessionMessage: mocks.sendStructuredAgentSessionMessage
+}))
+// The chat's tab names its host; the send only needs to find one.
+vi.mock('@/store', () => ({
+  useAppStore: {
+    getState: () => ({
+      unifiedTabsByWorktree: {
+        'wt-1': [{ contentType: 'agent-session', entityId: 'claude_1', worktreeId: 'wt-1' }]
+      }
+    })
+  }
+}))
+vi.mock('@/runtime/structured-agent-session-owner', () => ({
+  structuredAgentSessionTargetForTab: () => ({ kind: 'local' })
 }))
 
-vi.mock('@/lib/structured-agent-session-launch', () => ({
-  relaunchFailedStructuredAgentSessionForMessage:
-    mocks.relaunchFailedStructuredAgentSessionForMessage
+vi.mock('@/lib/structured-agent-session-launch-message', () => ({
+  relaunchFailedStructuredAgentSessionWithMessage:
+    mocks.relaunchFailedStructuredAgentSessionWithMessage
 }))
 
 vi.mock('@/lib/telemetry', () => ({
@@ -55,9 +70,12 @@ afterEach(() => {
 beforeEach(() => {
   mocks.sendNotesToActiveAgentSession.mockReset()
   mocks.sendNotesToActiveAgentSession.mockResolvedValue({ status: 'sent' })
-  mocks.appendStructuredAgentSessionOutboxMessage.mockReset()
-  mocks.appendStructuredAgentSessionOutboxMessage.mockReturnValue({ clientMessageId: 'queued' })
-  mocks.relaunchFailedStructuredAgentSessionForMessage.mockReset()
+  mocks.sendStructuredAgentSessionMessage.mockReset()
+  mocks.sendStructuredAgentSessionMessage.mockReturnValue({
+    clientMessageId: 'sent',
+    outcome: Promise.resolve('recorded')
+  })
+  mocks.relaunchFailedStructuredAgentSessionWithMessage.mockClear()
   mocks.track.mockReset()
   mocks.toastMessage.mockReset()
   mocks.toastSuccess.mockReset()
@@ -411,13 +429,17 @@ describe('createUISlice agent send target mode', () => {
 
     await expect(store.getState().sendPromptToSidebarAgentTarget(chatPaneKey)).resolves.toBe(true)
 
-    expect(mocks.appendStructuredAgentSessionOutboxMessage).toHaveBeenCalledWith(
-      'claude_1',
-      'Review this'
-    )
-    expect(mocks.relaunchFailedStructuredAgentSessionForMessage).toHaveBeenCalledWith(
+    expect(mocks.sendStructuredAgentSessionMessage).toHaveBeenCalledWith({
+      sessionId: 'claude_1',
+      target: { kind: 'local' },
+      text: 'Review this',
+      callerKeepsText: true
+    })
+    expect(mocks.relaunchFailedStructuredAgentSessionWithMessage).toHaveBeenCalledWith(
       worktreeId,
-      'claude_1'
+      'claude_1',
+      'Review this',
+      { callerKeepsText: true }
     )
     expect(mocks.sendNotesToActiveAgentSession).not.toHaveBeenCalled()
     expect(onPromptDelivered).toHaveBeenCalledTimes(1)
diff --git a/src/renderer/src/store/slices/ui-notice-dismissals.test.ts b/src/renderer/src/store/slices/ui-notice-dismissals.test.ts
index a69a18999c52..96d80d064d3c 100644
--- a/src/renderer/src/store/slices/ui-notice-dismissals.test.ts
+++ b/src/renderer/src/store/slices/ui-notice-dismissals.test.ts
@@ -264,6 +264,19 @@ describe('createUISlice Codex shared-settings notice', () => {
   })
 })
 
+describe('createUISlice Claude account sign-in notice', () => {
+  it('counts as seen until hydration, then follows the persisted flag, and persists marking', () => {
+    vi.stubGlobal('window', { api: { ui: { set: vi.fn(() => Promise.resolve()) } } })
+    const store = createUIStore()
+    expect(store.getState().claudeAccountSignInNoticeSeen).toBe(true)
+    store.getState().hydratePersistedUI(makePersistedUI({}))
+    expect(store.getState().claudeAccountSignInNoticeSeen).toBe(false)
+    store.getState().markClaudeAccountSignInNoticeSeen()
+    expect(store.getState().claudeAccountSignInNoticeSeen).toBe(true)
+    expect(window.api.ui.set).toHaveBeenCalledWith({ claudeAccountSignInNoticeSeen: true })
+  })
+})
+
 describe('createUISlice clearOsc52ClipboardDefaultOnNotice', () => {
   it('restores the armed notice from persisted UI', () => {
     const store = createUIStore()
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 6ec88e1e4f36..d8ea7fe00046 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
@@ -118,4 +118,6 @@ export type UISliceContextual = {
   markCodexTerminalServerIsolationNoticeSeen: () => void
   codexSharedSettingsNoticeSeen: boolean
   markCodexSharedSettingsNoticeSeen: () => void
+  claudeAccountSignInNoticeSeen: boolean
+  markClaudeAccountSignInNoticeSeen: () => 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 9df5868597d3..9b13b85a7142 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
@@ -245,6 +245,7 @@ export function createUiHydrationActions(set: UISliceSet, _get: UISliceGet): Par
           codexTerminalServerIsolationNoticeSeen:
             ui.codexTerminalServerIsolationNoticeSeen === true,
           codexSharedSettingsNoticeSeen: ui.codexSharedSettingsNoticeSeen === true,
+          claudeAccountSignInNoticeSeen: ui.claudeAccountSignInNoticeSeen === true,
           ...hydrateAgentReadState(ui),
           workspaceCleanupDismissals: sanitizeWorkspaceCleanupDismissals(
             ui.workspaceCleanup?.dismissals
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 1e1c25573a27..41f3cf4f35b0 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
@@ -157,6 +157,15 @@ export function createUiTrustActions(set: UISliceSet, _get: UISliceGet): Partial
         }
         window.api.ui.set({ codexSharedSettingsNoticeSeen: true }).catch(console.error)
         return { codexSharedSettingsNoticeSeen: true }
+      }),
+    claudeAccountSignInNoticeSeen: true,
+    markClaudeAccountSignInNoticeSeen: () =>
+      set((s) => {
+        if (s.claudeAccountSignInNoticeSeen) {
+          return s
+        }
+        window.api.ui.set({ claudeAccountSignInNoticeSeen: true }).catch(console.error)
+        return { claudeAccountSignInNoticeSeen: true }
       })
   }
 }
diff --git a/src/renderer/src/store/slices/workspace-chat-draft-removal.test.ts b/src/renderer/src/store/slices/workspace-chat-draft-removal.test.ts
index 0f81e7f6c573..bac3dc738cd6 100644
--- a/src/renderer/src/store/slices/workspace-chat-draft-removal.test.ts
+++ b/src/renderer/src/store/slices/workspace-chat-draft-removal.test.ts
@@ -43,11 +43,17 @@ import {
 } from './store-test-helpers'
 import {
   clearNativeChatComposerDraftsForTests,
+  hydrateNativeChatComposerDrafts,
   readNativeChatComposerDraft,
   setNativeChatComposerDraftOwnerResolver,
   structuredAgentSessionDraftScopeKey,
   updateNativeChatComposerDraft
 } from '@/components/native-chat/native-chat-composer-draft-store'
+import {
+  addNativeChatPendingAttachment,
+  clearNativeChatPendingAttachmentsForTests,
+  settleNativeChatPendingAttachment
+} from '@/components/native-chat/native-chat-pending-attachment-cache'
 import { resolveNativeChatDraftOwner } from '@/lib/native-chat-draft-owner'
 
 const WT1 = 'repo1::/path/wt1'
@@ -102,12 +108,75 @@ function draftTexts(): string[] {
   return [CHAT, PANE, OTHER].map((key) => readNativeChatComposerDraft(key).text)
 }
 
+/** A pasted image still uploading in each scope; its chip's id is the scope's. */
+function pasteStillUploading(...scopeKeys: string[]): void {
+  for (const scopeKey of scopeKeys) {
+    addNativeChatPendingAttachment(scopeKey, { id: scopeKey, path: '', pending: true })
+  }
+}
+
+/** Each upload completes, as one does after its composer is gone; answers which scopes it reached. */
+function uploadsComplete(...scopeKeys: string[]): string[] {
+  return scopeKeys.filter((scopeKey) =>
+    settleNativeChatPendingAttachment(scopeKey, scopeKey, `/store/${scopeKey}.png`)
+  )
+}
+
+function draftImageCount(scopeKey: string): number {
+  return readNativeChatComposerDraft(scopeKey).images.length
+}
+
+function trackDraftOwners(store: ReturnType<typeof createTestStore>): void {
+  setNativeChatComposerDraftOwnerResolver((scopeKey) =>
+    resolveNativeChatDraftOwner(store.getState(), scopeKey)
+  )
+}
+
+const FOLDER: FolderWorkspace = {
+  id: 'folder-1',
+  projectGroupId: 'group-a',
+  name: 'Folder',
+  folderPath: '/workspace/folder',
+  linkedTask: null,
+  comment: '',
+  isArchived: false,
+  isUnread: false,
+  isPinned: false,
+  sortOrder: 1,
+  lastActivityAt: 0,
+  createdAt: 1,
+  updatedAt: 1
+}
+
+function seedFolderWorkspace(store: ReturnType<typeof createTestStore>): void {
+  store.setState({
+    projectGroups: [
+      {
+        id: 'group-a',
+        name: 'A',
+        parentPath: '/workspace',
+        parentGroupId: null,
+        createdFrom: 'manual',
+        tabOrder: 0,
+        isCollapsed: false,
+        color: null,
+        createdAt: 1,
+        updatedAt: 1,
+        executionHostId: 'local'
+      }
+    ],
+    folderWorkspaces: [FOLDER]
+  })
+  seedWorkspace(store, folderWorkspaceKey(FOLDER.id))
+}
+
 describe('workspace chat drafts on removal', () => {
   beforeEach(() => {
     vi.clearAllMocks()
     mockApi.worktrees.remove.mockResolvedValue(undefined)
     mockApi.repos.remove.mockResolvedValue(undefined)
     clearNativeChatComposerDraftsForTests()
+    clearNativeChatPendingAttachmentsForTests()
   })
 
   it('removing a worktree deletes its drafts even when a listing purge lands mid-removal', async () => {
@@ -223,45 +292,94 @@ describe('workspace chat drafts on removal', () => {
   })
 
   it('deleting a folder workspace deletes its drafts', async () => {
-    const folder: FolderWorkspace = {
-      id: 'folder-1',
-      projectGroupId: 'group-a',
-      name: 'Folder',
-      folderPath: '/workspace/folder',
-      linkedTask: null,
-      comment: '',
-      isArchived: false,
-      isUnread: false,
-      isPinned: false,
-      sortOrder: 1,
-      lastActivityAt: 0,
-      createdAt: 1,
-      updatedAt: 1
-    }
     mockApi.folderWorkspaces.delete.mockResolvedValue(true)
     const store = createTestStore()
-    store.setState({
-      projectGroups: [
-        {
-          id: 'group-a',
-          name: 'A',
-          parentPath: '/workspace',
-          parentGroupId: null,
-          createdFrom: 'manual',
-          tabOrder: 0,
-          isCollapsed: false,
-          color: null,
-          createdAt: 1,
-          updatedAt: 1,
-          executionHostId: 'local'
-        }
-      ],
-      folderWorkspaces: [folder]
-    })
-    seedWorkspace(store, folderWorkspaceKey(folder.id))
+    seedFolderWorkspace(store)
+
+    await expect(store.getState().deleteFolderWorkspace(FOLDER.id)).resolves.toBe(true)
+
+    expect(draftTexts()).toEqual(['', '', 'other'])
+  })
+
+  it('a paste still uploading when its folder workspace is deleted never writes a draft back', async () => {
+    mockApi.folderWorkspaces.delete.mockResolvedValue(true)
+    const store = createTestStore()
+    seedFolderWorkspace(store)
+    trackDraftOwners(store)
+    pasteStillUploading(CHAT, PANE, OTHER)
 
-    await expect(store.getState().deleteFolderWorkspace(folder.id)).resolves.toBe(true)
+    await expect(store.getState().deleteFolderWorkspace(FOLDER.id)).resolves.toBe(true)
 
+    expect(uploadsComplete(CHAT, PANE, OTHER)).toEqual([OTHER])
+    expect([CHAT, PANE, OTHER].map(draftImageCount)).toEqual([0, 0, 1])
     expect(draftTexts()).toEqual(['', '', 'other'])
   })
+
+  it('drops the uploads of its open chats and panes even when no owner was named', async () => {
+    const store = createTestStore()
+    seedWorktree(store)
+    pasteStillUploading(CHAT, PANE, OTHER)
+
+    await store.getState().removeWorktree({ id: WT1, executionHostId: null }, true)
+
+    expect(uploadsComplete(CHAT, PANE, OTHER)).toEqual([OTHER])
+    expect([CHAT, PANE, OTHER].map(draftImageCount)).toEqual([0, 0, 1])
+  })
+
+  it('drops the upload of a chat whose tab closed while it was still on its way', async () => {
+    const store = createTestStore()
+    seedWorktree(store)
+    trackDraftOwners(store)
+    pasteStillUploading(CHAT)
+    store.getState().closeUnifiedTab('chat-tab')
+
+    await store.getState().removeWorktree({ id: WT1, executionHostId: null }, true)
+
+    expect(uploadsComplete(CHAT)).toEqual([])
+    expect(draftImageCount(CHAT)).toBe(0)
+  })
+
+  it('deletes a draft an upload wrote after its chat’s tab closed, by the owner it began in', async () => {
+    const store = createTestStore()
+    seedWorktree(store)
+    trackDraftOwners(store)
+    const later = structuredAgentSessionDraftScopeKey('session-later')
+    seedStore(store, {
+      unifiedTabsByWorktree: {
+        [WT1]: [
+          ...(store.getState().unifiedTabsByWorktree[WT1] ?? []),
+          makeUnifiedTab({
+            id: 'later-tab',
+            entityId: 'session-later',
+            contentType: 'agent-session',
+            worktreeId: WT1,
+            groupId: 'group-1'
+          })
+        ]
+      }
+    })
+    // As at startup: the saved drafts have loaded before any upload settles.
+    await hydrateNativeChatComposerDrafts()
+    pasteStillUploading(later)
+    store.getState().closeUnifiedTab('later-tab')
+    expect(uploadsComplete(later)).toEqual([later])
+
+    await store.getState().removeWorktree({ id: WT1, executionHostId: null }, true)
+
+    expect(draftImageCount(later)).toBe(0)
+  })
+
+  it('a removal the host refuses keeps the uploads, which still reach their drafts', async () => {
+    vi.spyOn(console, 'warn').mockImplementation(() => {})
+    const store = createTestStore()
+    seedWorktree(store)
+    trackDraftOwners(store)
+    pasteStillUploading(CHAT, PANE)
+    mockApi.worktrees.remove.mockRejectedValue(new Error('Permission denied'))
+
+    await store.getState().removeWorktree({ id: WT1, executionHostId: null }, true)
+
+    expect(uploadsComplete(CHAT, PANE)).toEqual([CHAT, PANE])
+    expect([CHAT, PANE].map(draftImageCount)).toEqual([1, 1])
+  })
 })
diff --git a/src/renderer/src/store/slices/worktree-helpers.ts b/src/renderer/src/store/slices/worktree-helpers.ts
index f3027919befd..62bdba586cf2 100644
--- a/src/renderer/src/store/slices/worktree-helpers.ts
+++ b/src/renderer/src/store/slices/worktree-helpers.ts
@@ -1,3 +1,5 @@
+import type { WorkspaceAttachmentMutation } from '../../../../shared/workspace-attachment-mutation'
+import type { WorkspaceReferenceTerminalContext } from '@/lib/workspace-attachment-terminal-origin'
 import type { CreateWorktreeCallOptions } from './worktrees/create/worktree-create-payload'
 import type { WorktreeCatalogVersion } from '../../../../shared/worktree/catalog-version'
 import type { WorkspaceKey } from '../../../../shared/folder-workspace-types'
@@ -265,7 +267,7 @@ export type WorktreeSlice = {
    *  the user is waiting on should read the result and say what went wrong. */
   updateWorktreeMeta: (
     worktreeId: string,
-    updates: Partial<WorktreeMeta>,
+    updates: Partial<WorktreeMeta> & WorkspaceAttachmentMutation,
     options?: WorktreeMetaUpdateOptions
   ) => Promise<{ ok: true } | { ok: false; error: string }>
   ensureHostedReviewPushTarget: (worktreeId: string) => Promise<void>
@@ -277,7 +279,11 @@ export type WorktreeSlice = {
    */
   setWorktreesPinnedAndReveal: (worktreeIds: readonly string[], isPinned: boolean) => void
   markWorktreeUnread: (worktreeId: string) => void
-  observeTerminalGitHubPullRequestLink: (worktreeId: string, link: TerminalGitHubPRLink) => void
+  observeTerminalGitHubPullRequestLink: (
+    worktreeId: string,
+    link: TerminalGitHubPRLink,
+    context?: WorkspaceReferenceTerminalContext
+  ) => void
   /** Clear the worktree's unread dot. Called on user interaction with any
    *  terminal pane inside the worktree (keystroke, click) — matches
    *  ghostty's "show until interact" model. Persists isUnread=false. */
diff --git a/src/renderer/src/store/slices/worktree-meta-update-application.ts b/src/renderer/src/store/slices/worktree-meta-update-application.ts
index 07627b6ffc4d..9fff8118fca3 100644
--- a/src/renderer/src/store/slices/worktree-meta-update-application.ts
+++ b/src/renderer/src/store/slices/worktree-meta-update-application.ts
@@ -4,6 +4,7 @@ import type { Worktree } from '../../../../shared/worktree/types'
 import type { ExecutionHostId } from '../../../../shared/execution-host'
 import { worktreeRowMatchesMetaHost } from './worktrees/listing/worktree-meta-host-match'
 import { branchName } from '@/lib/git-utils'
+import { normalizeWorkspaceAttachmentUpdate } from '../../../../shared/workspace-attachments'
 
 type RequiredKey<T> = { [K in keyof T]-?: undefined extends T[K] ? never : K }[keyof T]
 
@@ -60,7 +61,7 @@ export function applyWorktreeUpdates(
     }
 
     changed = true
-    const next = { ...worktree, ...updates }
+    const next = { ...worktree, ...normalizeWorkspaceAttachmentUpdate(worktree, updates) }
     if (updates.displayNameIsPinned !== undefined) {
       next.displayNameMode = updates.displayNameIsPinned ? 'fixed' : 'automatic'
       if (updates.displayNameIsPinned === false && !updates.displayName?.trim()) {
diff --git a/src/renderer/src/store/slices/worktrees-always-force-delete.test.ts b/src/renderer/src/store/slices/worktrees-always-force-delete.test.ts
new file mode 100644
index 000000000000..ebe52c37af81
--- /dev/null
+++ b/src/renderer/src/store/slices/worktrees-always-force-delete.test.ts
@@ -0,0 +1,117 @@
+import { beforeEach, expect, it, vi } from 'vitest'
+import { getDefaultSettings } from '../../../../shared/constants'
+import { makeWorktree } from './worktrees-slice-test-fixtures'
+import {
+  createTestStore,
+  mockApi,
+  resetRemoteRuntimeMocks,
+  resetWorktreeSliceModuleMemory,
+  runtimeEnvironmentCall
+} from './worktrees-slice-test-harness'
+
+beforeEach(() => {
+  vi.clearAllMocks()
+  resetWorktreeSliceModuleMemory()
+  resetRemoteRuntimeMocks()
+  mockApi.worktrees.remove.mockResolvedValue({})
+  runtimeEnvironmentCall.mockResolvedValue({
+    id: 'rpc-rm',
+    ok: true,
+    result: {},
+    _meta: { runtimeId: 'runtime-remote' }
+  })
+})
+
+it.each([undefined, false, true])(
+  'uses the saved force-delete preference for local deletion: %s',
+  async (enabled) => {
+    const store = createTestStore()
+    const wt = makeWorktree({ id: 'repo1::/path/wt1', repoId: 'repo1' })
+    store.setState({
+      settings: { ...getDefaultSettings('/home/test'), alwaysForceDeleteWorktrees: enabled },
+      worktreesByRepo: { [wt.repoId]: [wt] }
+    })
+
+    expect(
+      await store.getState().removeWorktree({ id: wt.id, executionHostId: null }, false)
+    ).toEqual({ ok: true })
+    expect(mockApi.worktrees.remove).toHaveBeenCalledWith(
+      expect.objectContaining({
+        worktreeId: wt.id,
+        force: enabled === true,
+        allowUnverifiedPtyStop: enabled === true,
+        allowFailedArchiveHook: false
+      })
+    )
+  }
+)
+
+it('applies the preference through the existing remote removal flags', async () => {
+  const store = createTestStore()
+  const wt = makeWorktree({
+    id: 'repo1::/path/wt1',
+    repoId: 'repo1',
+    hostId: 'runtime:env-1',
+    runtimeOwnerEnvironmentId: 'env-1'
+  })
+  store.setState({
+    settings: {
+      ...getDefaultSettings('/home/test'),
+      activeRuntimeEnvironmentId: 'different-focused-hub',
+      alwaysForceDeleteWorktrees: true
+    },
+    worktreesByRepo: { [wt.repoId]: [wt] }
+  })
+
+  expect(
+    await store.getState().removeWorktree({ id: wt.id, executionHostId: 'runtime:env-1' }, false)
+  ).toEqual({ ok: true })
+  expect(runtimeEnvironmentCall).toHaveBeenCalledWith(
+    expect.objectContaining({
+      selector: 'env-1',
+      method: 'worktree.rm',
+      params: expect.objectContaining({
+        worktree: `id:${wt.id}`,
+        force: true,
+        allowUnverifiedPtyStop: true,
+        runHooks: true
+      })
+    })
+  )
+  expect(mockApi.worktrees.remove).not.toHaveBeenCalled()
+})
+
+it('still reports a failed forced removal instead of treating the workspace as deleted', async () => {
+  mockApi.worktrees.remove.mockRejectedValue(new Error('Workspace is locked'))
+  const store = createTestStore()
+  const wt = makeWorktree({ id: 'repo1::/path/wt1', repoId: 'repo1' })
+  store.setState({
+    settings: { ...getDefaultSettings('/home/test'), alwaysForceDeleteWorktrees: true },
+    worktreesByRepo: { [wt.repoId]: [wt] }
+  })
+
+  expect(
+    await store.getState().removeWorktree({ id: wt.id, executionHostId: null }, false)
+  ).toEqual({ ok: false, error: 'Workspace is locked' })
+  expect(store.getState().worktreesByRepo[wt.repoId]).toEqual([wt])
+})
+
+it('keeps forgetting a disconnected workspace metadata-only when the preference is enabled', async () => {
+  const store = createTestStore()
+  const wt = makeWorktree({ id: 'repo1::/path/wt1', repoId: 'repo1', hostId: 'ssh:offline' })
+  store.setState({
+    settings: { ...getDefaultSettings('/home/test'), alwaysForceDeleteWorktrees: true },
+    worktreesByRepo: { [wt.repoId]: [wt] }
+  })
+
+  expect(
+    await store.getState().removeWorktree({ id: wt.id, executionHostId: 'ssh:offline' }, false, {
+      mode: 'forget-local'
+    })
+  ).toEqual({ ok: true })
+  expect(mockApi.worktrees.forgetLocal).toHaveBeenCalledWith(
+    expect.objectContaining({ worktreeId: wt.id })
+  )
+  expect(mockApi.worktrees.remove).not.toHaveBeenCalled()
+  expect(runtimeEnvironmentCall).not.toHaveBeenCalled()
+})
diff --git a/src/renderer/src/store/slices/worktrees-linked-review-push-target.test.ts b/src/renderer/src/store/slices/worktrees-linked-review-push-target.test.ts
index e086b2461353..61279218ef75 100644
--- a/src/renderer/src/store/slices/worktrees-linked-review-push-target.test.ts
+++ b/src/renderer/src/store/slices/worktrees-linked-review-push-target.test.ts
@@ -35,6 +35,43 @@ describe('worktree remote runtime mutations', () => {
     resetRemoteRuntimeMocks()
   })
 
+  it('preserves a concurrent review selection while an attachment lookup is pending', async () => {
+    const store = createTestStore()
+    const wt = makeWorktree({ id: 'repo1::/path/wt1', repoId: 'repo1', path: '/path/wt1' })
+    const firstLookup = Promise.withResolvers<{
+      baseBranch: string
+      pushTarget: { remoteName: string; branchName: string }
+    }>()
+    mockApi.worktrees.resolvePrBase.mockReturnValueOnce(firstLookup.promise)
+    store.setState({
+      repos: [
+        { id: 'repo1', path: '/repo1', displayName: 'Repo 1', badgeColor: '#000', addedAt: 0 }
+      ],
+      worktreesByRepo: { repo1: [wt] }
+    })
+    const pending = store.getState().updateWorktreeMeta(wt.id, {
+      linkedItems: [{ provider: 'github', type: 'pr', number: 1 }]
+    })
+    const currentTarget = { remoteName: 'origin', branchName: 'pr-2' }
+    await store.getState().updateWorktreeMeta(wt.id, { linkedPR: 2, pushTarget: currentTarget })
+    firstLookup.resolve({
+      baseBranch: 'origin/pr-1',
+      pushTarget: { remoteName: 'origin', branchName: 'pr-1' }
+    })
+    expect(await pending).toEqual({ ok: true })
+    expect(store.getState().worktreesByRepo.repo1[0]).toMatchObject({
+      linkedPR: 2,
+      pushTarget: currentTarget,
+      linkedItems: [
+        { provider: 'github', type: 'pr', number: 2 },
+        { provider: 'github', type: 'pr', number: 1 }
+      ]
+    })
+    const lastWrite = mockApi.worktrees.updateMeta.mock.lastCall?.[0].updates
+    expect(lastWrite?.linkedPR).toBe(2)
+    expect(lastWrite).not.toHaveProperty('pushTarget')
+  })
+
   it('resolves and persists a push target when manually linking a GitHub PR', async () => {
     const store = createTestStore()
     const pushTarget = { remoteName: 'origin', branchName: 'bot/pr-bug-scan-2504' }
@@ -71,7 +108,7 @@ describe('worktree remote runtime mutations', () => {
     expect(mockApi.worktrees.updateMeta).toHaveBeenCalledWith({
       worktreeId: wt.id,
       executionHostId: wt.hostId ?? 'local',
-      updates: { linkedPR: 2548, suppressedGitHubPR: null, pushTarget }
+      updates: expect.objectContaining({ linkedPR: 2548, suppressedGitHubPR: null, pushTarget })
     })
     expect(store.getState().worktreesByRepo.repo1[0]?.pushTarget).toEqual(pushTarget)
     expect(store.getState().worktreesByRepo.repo1[0]?.suppressedGitHubPR).toBeNull()
@@ -98,7 +135,7 @@ describe('worktree remote runtime mutations', () => {
     expect(mockApi.worktrees.updateMeta).toHaveBeenCalledWith({
       worktreeId: wt.id,
       executionHostId: wt.hostId ?? 'local',
-      updates: { linkedPR: null, pushTarget: undefined }
+      updates: expect.objectContaining({ linkedPR: null, pushTarget: undefined })
     })
     expect(store.getState().worktreesByRepo.repo1[0]?.pushTarget).toBeUndefined()
   })
@@ -129,7 +166,7 @@ describe('worktree remote runtime mutations', () => {
     expect(mockApi.worktrees.updateMeta).toHaveBeenCalledWith({
       worktreeId: wt.id,
       executionHostId: wt.hostId ?? 'local',
-      updates: { linkedPR: null, pushTarget: undefined }
+      updates: expect.objectContaining({ linkedPR: null, pushTarget: undefined })
     })
     expect(store.getState().worktreesByRepo.repo1[0]).toMatchObject({
       linkedPR: null,
@@ -137,7 +174,7 @@ describe('worktree remote runtime mutations', () => {
     })
   })
 
-  it('clears an older GitHub link and target when replacing it with a GitLab MR', async () => {
+  it('switches the selected review to GitLab and clears the previous push target', async () => {
     const store = createTestStore()
     const oldPushTarget = { remoteName: 'fork', branchName: 'owner/old-pr' }
     const newPushTarget = { remoteName: 'upstream', branchName: 'owner/new-mr' }
@@ -162,7 +199,10 @@ describe('worktree remote runtime mutations', () => {
     expect(mockApi.worktrees.updateMeta).toHaveBeenCalledWith({
       worktreeId: wt.id,
       executionHostId: wt.hostId ?? 'local',
-      updates: { linkedGitLabMR: 42, linkedPR: null, pushTarget: undefined }
+      updates: expect.objectContaining({
+        linkedGitLabMR: 42,
+        pushTarget: undefined
+      })
     })
     expect(store.getState().worktreesByRepo.repo1[0]).toMatchObject({
       linkedPR: null,
@@ -195,7 +235,7 @@ describe('worktree remote runtime mutations', () => {
     expect(mockApi.worktrees.updateMeta).toHaveBeenCalledWith({
       worktreeId: wt.id,
       executionHostId: wt.hostId ?? 'local',
-      updates: { pushTarget: newPushTarget }
+      updates: expect.objectContaining({ pushTarget: newPushTarget })
     })
     expect(store.getState().worktreesByRepo.repo1[0]?.pushTarget).toEqual(newPushTarget)
   })
@@ -238,23 +278,27 @@ describe('worktree remote runtime mutations', () => {
 
     await store.getState().updateWorktreeMeta(wt.id, { linkedPR: 2548 })
 
-    expect(runtimeEnvironmentCall).toHaveBeenCalledWith({
-      selector: 'owner-env',
-      method: 'worktree.resolvePrBase',
-      params: { repo: 'repo1', prNumber: 2548 },
-      timeoutMs: 30_000
-    })
-    expect(runtimeEnvironmentCall).toHaveBeenCalledWith({
-      selector: 'owner-env',
-      method: 'worktree.set',
-      params: {
-        worktree: `id:${wt.id}`,
-        linkedPR: 2548,
-        suppressedGitHubPR: null,
-        pushTarget
-      },
-      timeoutMs: 15_000
-    })
+    expect(runtimeEnvironmentCall).toHaveBeenCalledWith(
+      expect.objectContaining({
+        selector: 'owner-env',
+        method: 'worktree.resolvePrBase',
+        params: expect.objectContaining({ repo: 'repo1', prNumber: 2548 }),
+        timeoutMs: 30_000
+      })
+    )
+    expect(runtimeEnvironmentCall).toHaveBeenCalledWith(
+      expect.objectContaining({
+        selector: 'owner-env',
+        method: 'worktree.set',
+        params: expect.objectContaining({
+          worktree: `id:${wt.id}`,
+          linkedPR: 2548,
+          suppressedGitHubPR: null,
+          pushTarget
+        }),
+        timeoutMs: 15_000
+      })
+    )
     expect(mockApi.worktrees.resolvePrBase).not.toHaveBeenCalled()
     expect(mockApi.worktrees.updateMeta).not.toHaveBeenCalled()
     expect(store.getState().worktreesByRepo.repo1[0]?.pushTarget).toEqual(pushTarget)
@@ -292,12 +336,18 @@ describe('worktree remote runtime mutations', () => {
 
     await store.getState().updateWorktreeMeta(wt.id, { linkedPR: null })
 
-    expect(runtimeEnvironmentCall).toHaveBeenCalledWith({
-      selector: 'owner-env',
-      method: 'worktree.set',
-      params: { worktree: `id:${wt.id}`, linkedPR: null, pushTarget: null },
-      timeoutMs: 15_000
-    })
+    expect(runtimeEnvironmentCall).toHaveBeenCalledWith(
+      expect.objectContaining({
+        selector: 'owner-env',
+        method: 'worktree.set',
+        params: expect.objectContaining({
+          worktree: `id:${wt.id}`,
+          linkedPR: null,
+          pushTarget: null
+        }),
+        timeoutMs: 15_000
+      })
+    )
     expect(mockApi.worktrees.updateMeta).not.toHaveBeenCalled()
     expect(store.getState().worktreesByRepo.repo1[0]?.pushTarget).toBeUndefined()
   })
@@ -317,7 +367,7 @@ describe('worktree remote runtime mutations', () => {
     expect(mockApi.worktrees.updateMeta).toHaveBeenCalledWith({
       worktreeId: wt.id,
       executionHostId: wt.hostId ?? 'local',
-      updates: { linkedPR: 0 }
+      updates: expect.objectContaining({ linkedPR: 0 })
     })
   })
 
@@ -343,7 +393,7 @@ describe('worktree remote runtime mutations', () => {
     expect(mockApi.worktrees.updateMeta).toHaveBeenCalledWith({
       worktreeId: wt.id,
       executionHostId: wt.hostId ?? 'local',
-      updates: { linkedPR: 2548, suppressedGitHubPR: null }
+      updates: expect.objectContaining({ linkedPR: 2548, suppressedGitHubPR: null })
     })
   })
 
@@ -376,7 +426,7 @@ describe('worktree remote runtime mutations', () => {
     expect(mockApi.worktrees.updateMeta).toHaveBeenCalledWith({
       worktreeId: wt.id,
       executionHostId: wt.hostId ?? 'local',
-      updates: { linkedPR: 2548, suppressedGitHubPR: null, pushTarget }
+      updates: expect.objectContaining({ linkedPR: 2548, suppressedGitHubPR: null, pushTarget })
     })
     expect(store.getState().worktreesByRepo.repo1[0]?.pushTarget).toEqual(pushTarget)
   })
@@ -413,7 +463,7 @@ describe('worktree remote runtime mutations', () => {
     expect(mockApi.worktrees.updateMeta).toHaveBeenCalledWith({
       worktreeId: wt.id,
       executionHostId: wt.hostId ?? 'local',
-      updates: { pushTarget }
+      updates: expect.objectContaining({ pushTarget })
     })
     expect(store.getState().worktreesByRepo.repo1[0]?.pushTarget).toEqual(pushTarget)
   })
@@ -456,18 +506,22 @@ describe('worktree remote runtime mutations', () => {
 
     await store.getState().ensureHostedReviewPushTarget(wt.id)
 
-    expect(runtimeEnvironmentCall).toHaveBeenCalledWith({
-      selector: 'env-1',
-      method: 'worktree.resolvePrBase',
-      params: { repo: 'repo1', prNumber: 5571 },
-      timeoutMs: 30_000
-    })
-    expect(runtimeEnvironmentCall).toHaveBeenCalledWith({
-      selector: 'env-1',
-      method: 'worktree.set',
-      params: { worktree: `id:${wt.id}`, pushTarget },
-      timeoutMs: 15_000
-    })
+    expect(runtimeEnvironmentCall).toHaveBeenCalledWith(
+      expect.objectContaining({
+        selector: 'env-1',
+        method: 'worktree.resolvePrBase',
+        params: expect.objectContaining({ repo: 'repo1', prNumber: 5571 }),
+        timeoutMs: 30_000
+      })
+    )
+    expect(runtimeEnvironmentCall).toHaveBeenCalledWith(
+      expect.objectContaining({
+        selector: 'env-1',
+        method: 'worktree.set',
+        params: expect.objectContaining({ worktree: `id:${wt.id}`, pushTarget }),
+        timeoutMs: 15_000
+      })
+    )
     expect(mockApi.worktrees.resolvePrBase).not.toHaveBeenCalled()
     expect(mockApi.worktrees.updateMeta).not.toHaveBeenCalled()
     expect(store.getState().worktreesByRepo.repo1[0]?.pushTarget).toEqual(pushTarget)
@@ -512,18 +566,22 @@ describe('worktree remote runtime mutations', () => {
 
     await store.getState().ensureHostedReviewPushTarget(wt.id)
 
-    expect(runtimeEnvironmentCall).toHaveBeenCalledWith({
-      selector: 'owner-env',
-      method: 'worktree.resolvePrBase',
-      params: { repo: 'repo1', prNumber: 5571 },
-      timeoutMs: 30_000
-    })
-    expect(runtimeEnvironmentCall).toHaveBeenCalledWith({
-      selector: 'owner-env',
-      method: 'worktree.set',
-      params: { worktree: `id:${wt.id}`, pushTarget },
-      timeoutMs: 15_000
-    })
+    expect(runtimeEnvironmentCall).toHaveBeenCalledWith(
+      expect.objectContaining({
+        selector: 'owner-env',
+        method: 'worktree.resolvePrBase',
+        params: expect.objectContaining({ repo: 'repo1', prNumber: 5571 }),
+        timeoutMs: 30_000
+      })
+    )
+    expect(runtimeEnvironmentCall).toHaveBeenCalledWith(
+      expect.objectContaining({
+        selector: 'owner-env',
+        method: 'worktree.set',
+        params: expect.objectContaining({ worktree: `id:${wt.id}`, pushTarget }),
+        timeoutMs: 15_000
+      })
+    )
     expect(mockApi.worktrees.resolvePrBase).not.toHaveBeenCalled()
     expect(mockApi.worktrees.updateMeta).not.toHaveBeenCalled()
     expect(store.getState().worktreesByRepo.repo1[0]?.pushTarget).toEqual(pushTarget)
@@ -567,7 +625,7 @@ describe('worktree remote runtime mutations', () => {
     expect(mockApi.worktrees.updateMeta).toHaveBeenCalledWith({
       worktreeId: wt.id,
       executionHostId: wt.hostId ?? 'local',
-      updates: { pushTarget }
+      updates: expect.objectContaining({ pushTarget })
     })
     expect(runtimeEnvironmentCall).not.toHaveBeenCalled()
     expect(store.getState().worktreesByRepo['repo-ssh'][0]?.pushTarget).toEqual(pushTarget)
@@ -729,12 +787,14 @@ describe('worktree remote runtime mutations', () => {
 
     await store.getState().ensureHostedReviewPushTarget(worktreeId)
 
-    expect(runtimeEnvironmentCall).toHaveBeenCalledWith({
-      selector: 'hub-a',
-      method: 'worktree.resolvePrBase',
-      params: { repo: 'repo-shared', prNumber: 123 },
-      timeoutMs: 30_000
-    })
+    expect(runtimeEnvironmentCall).toHaveBeenCalledWith(
+      expect.objectContaining({
+        selector: 'hub-a',
+        method: 'worktree.resolvePrBase',
+        params: expect.objectContaining({ repo: 'repo-shared', prNumber: 123 }),
+        timeoutMs: 30_000
+      })
+    )
     expect(store.getState().worktreesByRepo['repo-shared'][0]?.pushTarget).toEqual(pushTarget)
   })
 
@@ -767,7 +827,7 @@ describe('worktree remote runtime mutations', () => {
     expect(mockApi.worktrees.updateMeta).toHaveBeenCalledWith({
       worktreeId: wt.id,
       executionHostId: wt.hostId ?? 'local',
-      updates: { pushTarget }
+      updates: expect.objectContaining({ pushTarget })
     })
     expect(store.getState().worktreesByRepo.repo1[0]?.pushTarget).toEqual(pushTarget)
   })
diff --git a/src/renderer/src/store/slices/worktrees-multiple-attachments.test.ts b/src/renderer/src/store/slices/worktrees-multiple-attachments.test.ts
new file mode 100644
index 000000000000..61aa6fc2c12f
--- /dev/null
+++ b/src/renderer/src/store/slices/worktrees-multiple-attachments.test.ts
@@ -0,0 +1,115 @@
+import { beforeEach, describe, expect, it, vi } from 'vitest'
+import {
+  getWorkspaceAttachments,
+  normalizeWorkspaceAttachmentUpdate
+} from '../../../../shared/workspace-attachments'
+import { folderWorkspaceKey } from '../../../../shared/workspace-scope'
+import { makeFolderWorkspace, makeWorktree } from './worktrees-slice-test-fixtures'
+import {
+  createTestStore,
+  mockApi,
+  resetRemoteRuntimeMocks,
+  resetWorktreeSliceModuleMemory
+} from './worktrees-slice-test-harness'
+
+beforeEach(() => {
+  vi.clearAllMocks()
+  resetRemoteRuntimeMocks()
+  resetWorktreeSliceModuleMemory()
+})
+
+describe('workspace attachment collections', () => {
+  it('retains earlier reviews locally while persisting a compatible scalar mutation', async () => {
+    const store = createTestStore()
+    const wt = makeWorktree({ id: 'repo1::/work', repoId: 'repo1', linkedPR: 42 })
+    store.setState({ worktreesByRepo: { repo1: [wt] } })
+    await store.getState().updateWorktreeMeta(wt.id, { linkedGitLabMR: 7 })
+    const saved = store.getState().worktreesByRepo.repo1[0]
+    expect(saved.linkedPR).toBeNull()
+    expect(saved.linkedGitLabMR).toBe(7)
+    expect(getWorkspaceAttachments(saved)).toEqual([
+      { provider: 'github', type: 'pr', number: 42 },
+      { provider: 'gitlab', type: 'mr', number: 7 }
+    ])
+    expect(mockApi.worktrees.updateMeta).toHaveBeenCalledWith(
+      expect.objectContaining({
+        updates: expect.objectContaining({ linkedGitLabMR: 7 })
+      })
+    )
+    const updates = mockApi.worktrees.updateMeta.mock.lastCall?.[0].updates
+    expect(updates).not.toHaveProperty('linkedItems')
+    expect(updates).not.toHaveProperty('linkedItemsBase')
+    expect(updates).not.toHaveProperty('linkedPR')
+    const persisted = normalizeWorkspaceAttachmentUpdate(wt, updates ?? {})
+    expect(persisted.linkedItems).toEqual(saved.linkedItems)
+    expect(persisted.linkedPR).toBeNull()
+    expect(persisted.linkedGitLabMR).toBe(7)
+  })
+
+  it('carries the editor snapshot unchanged through optimistic state and host persistence', async () => {
+    const store = createTestStore()
+    const base = [1, 2].map((number) => ({ provider: 'github', type: 'pr', number }) as const)
+    const peer = { provider: 'github', type: 'pr', number: 3 } as const
+    const wt = makeWorktree({
+      id: 'repo1::/work',
+      repoId: 'repo1',
+      linkedPR: 2,
+      linkedItems: [...base, peer]
+    })
+    store.setState({ worktreesByRepo: { repo1: [wt] } })
+    await store
+      .getState()
+      .updateWorktreeMeta(wt.id, { linkedItemsBase: base, linkedItems: [base[1]] })
+    expect(store.getState().worktreesByRepo.repo1[0].linkedItems).toEqual([base[1], peer])
+    const write = mockApi.worktrees.updateMeta.mock.lastCall?.[0].updates
+    expect(write).toMatchObject({ linkedItemsBase: base, linkedItems: [base[1]] })
+    // A peer can remove its addition after our optimistic merge but before the host write.
+    expect(
+      normalizeWorkspaceAttachmentUpdate({ linkedItems: base }, write ?? {}).linkedItems
+    ).toEqual([base[1]])
+  })
+
+  it('removes a secondary review without disturbing the active review or task', async () => {
+    const store = createTestStore()
+    const wt = makeWorktree({
+      id: 'repo1::/work',
+      repoId: 'repo1',
+      linkedPR: 42,
+      linkedIssue: 9,
+      linkedItems: [
+        { provider: 'github', type: 'pr', number: 42 },
+        { provider: 'github', type: 'pr', number: 43 },
+        { provider: 'github', type: 'issue', number: 9 }
+      ]
+    })
+    store.setState({ worktreesByRepo: { repo1: [wt] } })
+    await store.getState().updateWorktreeMeta(wt.id, {
+      linkedItems: wt.linkedItems?.filter((item) => item.number !== 43)
+    })
+    expect(store.getState().worktreesByRepo.repo1[0]).toMatchObject({
+      linkedPR: 42,
+      linkedIssue: 9
+    })
+    expect(getWorkspaceAttachments(store.getState().worktreesByRepo.repo1[0])).toHaveLength(2)
+  })
+
+  it('routes folder links to the owning folder update instead of dropping them', async () => {
+    const store = createTestStore()
+    const folder = makeFolderWorkspace()
+    const updateFolderWorkspace = vi.fn().mockResolvedValue(true)
+    store.setState({ folderWorkspaces: [folder], updateFolderWorkspace })
+    const linkedItems = [
+      { provider: 'linear', type: 'issue', number: 0, identifier: 'ENG-42' }
+    ] as const
+    const result = await store.getState().updateWorktreeMeta(folderWorkspaceKey(folder.id), {
+      linkedItems: [...linkedItems]
+    })
+    expect(result).toEqual({ ok: true })
+    expect(updateFolderWorkspace).toHaveBeenCalledWith(
+      folder.id,
+      expect.objectContaining({ linkedItems }),
+      { executionHostId: 'local' }
+    )
+    expect(mockApi.worktrees.updateMeta).not.toHaveBeenCalled()
+  })
+})
diff --git a/src/renderer/src/store/slices/worktrees-slice-test-fixtures.ts b/src/renderer/src/store/slices/worktrees-slice-test-fixtures.ts
index 9202984481d7..748739942326 100644
--- a/src/renderer/src/store/slices/worktrees-slice-test-fixtures.ts
+++ b/src/renderer/src/store/slices/worktrees-slice-test-fixtures.ts
@@ -4,6 +4,14 @@ import type { TerminalTab } from '../../../../shared/terminal-tab-types'
 import type { WorkspaceLineage, WorktreeLineage } from '../../../../shared/worktree/lineage-types'
 import type { Worktree } from '../../../../shared/worktree/types'
 
+export const TEST_REPO = {
+  id: 'repo1',
+  path: '/repo1',
+  displayName: 'Repo 1',
+  badgeColor: '#000',
+  addedAt: 0
+}
+
 export function makeWorktree(
   overrides: Partial<Worktree> & { id: string; repoId: string }
 ): Worktree {
diff --git a/src/renderer/src/store/slices/worktrees-terminal-pr-exact-observation.test.ts b/src/renderer/src/store/slices/worktrees-terminal-pr-exact-observation.test.ts
new file mode 100644
index 000000000000..559b35dfeae5
--- /dev/null
+++ b/src/renderer/src/store/slices/worktrees-terminal-pr-exact-observation.test.ts
@@ -0,0 +1,153 @@
+import { beforeEach, expect, it, vi } from 'vitest'
+import type { GitHubWorkItem } from '../../../../shared/github/work-item-types'
+import type { HostedReviewInfo } from '../../../../shared/hosted-review'
+import { getWorkspaceAttachments } from '../../../../shared/workspace-attachments'
+import { makeWorktree } from './worktrees-slice-test-fixtures'
+import {
+  createTestStore,
+  resetRemoteRuntimeMocks,
+  resetWorktreeSliceModuleMemory
+} from './worktrees-slice-test-harness'
+
+const { exactLookup } = vi.hoisted(() => ({ exactLookup: vi.fn() }))
+vi.mock('@/lib/github-work-item-source-lookup', () => ({
+  lookupGitHubWorkItemByOwnerRepoForSource: exactLookup
+}))
+const url = 'https://github.com/acme/orca/pull/42'
+const link = { number: 42, url, slug: { owner: 'acme', repo: 'orca' } }
+const secondary: GitHubWorkItem = {
+  id: '42',
+  repoId: 'repo',
+  type: 'pr',
+  number: 42,
+  title: 'Release target',
+  url,
+  state: 'open',
+  branchName: 'feature',
+  headSha: 'abc123',
+  baseRefName: 'release',
+  labels: [],
+  updatedAt: '2026-01-01',
+  author: null
+}
+function setup() {
+  const store = createTestStore()
+  const workspace = makeWorktree({ id: 'repo::/worktree', repoId: 'repo', linkedPR: null })
+  const firstBranchReview: HostedReviewInfo = {
+    provider: 'github',
+    number: 7,
+    title: 'First branch PR',
+    state: 'open',
+    status: 'success',
+    url: 'https://github.com/acme/orca/pull/7',
+    mergeable: 'MERGEABLE',
+    updatedAt: '2026-01-01'
+  }
+  const branchLookup = vi.fn().mockResolvedValue(firstBranchReview)
+  Object.defineProperty(window.api, 'hostedReview', {
+    configurable: true,
+    value: { forBranch: branchLookup }
+  })
+  store.setState({
+    repos: [{ id: 'repo', path: '/repo', displayName: 'Orca', addedAt: 0, badgeColor: '' }],
+    worktreesByRepo: { repo: [workspace] }
+  })
+  return { store, workspace, branchLookup }
+}
+async function flush() {
+  for (let index = 0; index < 30; index++) {
+    await Promise.resolve()
+  }
+}
+beforeEach(() => {
+  vi.clearAllMocks()
+  resetRemoteRuntimeMocks()
+  resetWorktreeSliceModuleMemory()
+  exactLookup.mockReset().mockResolvedValue(secondary)
+})
+
+it('confirms a second PR by exact source and head when branch discovery would return only its first PR', async () => {
+  const { store, workspace, branchLookup } = setup()
+  store.getState().observeTerminalGitHubPullRequestLink(workspace.id, link)
+  await flush()
+  expect(getWorkspaceAttachments(store.getState().worktreesByRepo.repo[0])).toMatchObject([
+    { provider: 'github', type: 'pr', number: 42 }
+  ])
+  expect(branchLookup).not.toHaveBeenCalled()
+  expect(exactLookup).toHaveBeenCalledWith(
+    expect.objectContaining({
+      owner: 'acme',
+      repo: 'orca',
+      host: 'github.com',
+      number: 42,
+      type: 'pr',
+      sourceContext: expect.objectContaining({ hostId: 'local', repoId: 'repo' })
+    })
+  )
+})
+
+it.each([
+  { type: 'issue' as const },
+  { number: 99 },
+  { url: 'https://github.com/foreign/repo/pull/42' },
+  { branchName: 'unrelated' },
+  { headSha: 'other-head' }
+])(
+  'rejects contradictory exact evidence without using an implicit fallback: %j',
+  async (change) => {
+    const { store, workspace, branchLookup } = setup()
+    exactLookup.mockResolvedValue({ ...secondary, ...change })
+    store.getState().observeTerminalGitHubPullRequestLink(workspace.id, link)
+    await flush()
+    expect(getWorkspaceAttachments(store.getState().worktreesByRepo.repo[0])).toEqual([])
+    expect(branchLookup).not.toHaveBeenCalled()
+  }
+)
+
+it('does not attach a source rejected by the configured-remote exact lookup', async () => {
+  const { store, workspace, branchLookup } = setup()
+  exactLookup.mockResolvedValue(null)
+  store.getState().observeTerminalGitHubPullRequestLink(workspace.id, link)
+  await flush()
+  expect(getWorkspaceAttachments(store.getState().worktreesByRepo.repo[0])).toEqual([])
+  expect(branchLookup).toHaveBeenCalledTimes(1)
+})
+
+it.each([false, true])(
+  'checks a saved push branch and its late replacement=%s',
+  async (replace) => {
+    const { store, workspace, branchLookup } = setup()
+    const pending = Promise.withResolvers<GitHubWorkItem | null>()
+    exactLookup.mockReturnValue(pending.promise)
+    const saved = {
+      ...workspace,
+      branch: 'refs/heads/local-copy',
+      pushTarget: { remoteName: 'origin', branchName: 'feature' }
+    }
+    store.setState({ worktreesByRepo: { repo: [saved] } })
+    store.getState().observeTerminalGitHubPullRequestLink(workspace.id, link)
+    if (replace) {
+      store.setState({
+        worktreesByRepo: {
+          repo: [{ ...saved, pushTarget: { remoteName: 'origin', branchName: 'replacement' } }]
+        }
+      })
+    }
+    pending.resolve(secondary)
+    await flush()
+    expect(getWorkspaceAttachments(store.getState().worktreesByRepo.repo[0])).toHaveLength(
+      replace ? 0 : 1
+    )
+    expect(branchLookup).not.toHaveBeenCalled()
+  }
+)
+
+it('retains branch confirmation on an older host without exact head evidence', async () => {
+  const { store, workspace, branchLookup } = setup()
+  exactLookup.mockResolvedValue({ ...secondary, headSha: undefined })
+  branchLookup.mockResolvedValue({ provider: 'github', number: 42, url })
+  store.getState().observeTerminalGitHubPullRequestLink(workspace.id, link)
+  await flush()
+  expect(getWorkspaceAttachments(store.getState().worktreesByRepo.repo[0])).toHaveLength(1)
+  expect(branchLookup).toHaveBeenCalledTimes(1)
+})
diff --git a/src/renderer/src/store/slices/worktrees-terminal-pr-url-linking.test.ts b/src/renderer/src/store/slices/worktrees-terminal-pr-url-linking.test.ts
index add4b84c598c..c81255c596c0 100644
--- a/src/renderer/src/store/slices/worktrees-terminal-pr-url-linking.test.ts
+++ b/src/renderer/src/store/slices/worktrees-terminal-pr-url-linking.test.ts
@@ -1,6 +1,7 @@
 import { beforeEach, describe, expect, it, vi } from 'vitest'
-import type { AppState } from '../types'
+import type { HostedReviewInfo, HostedReviewForBranchArgs } from '../../../../shared/hosted-review'
 import { makeWorktree } from './worktrees-slice-test-fixtures'
+import { getWorkspaceAttachments } from '../../../../shared/workspace-attachments'
 import {
   createTestStore,
   mockApi,
@@ -8,6 +9,26 @@ import {
   resetWorktreeSliceModuleMemory
 } from './worktrees-slice-test-harness'
 
+function installReviewRead() {
+  const read = vi.fn<(args: HostedReviewForBranchArgs) => Promise<HostedReviewInfo | null>>()
+  Object.defineProperty(window.api, 'hostedReview', {
+    configurable: true,
+    value: { forBranch: read }
+  })
+  return read
+}
+
+const confirmedReview = (number: number): HostedReviewInfo => ({
+  provider: 'github',
+  number,
+  title: 'Confirmed',
+  state: 'open',
+  status: 'success',
+  mergeable: 'MERGEABLE',
+  url: `https://github.com/acme/orca/pull/${number}`,
+  updatedAt: '2026-01-01'
+})
+
 const requestWorktreeBaseFallbackNotice = vi.hoisted(() => vi.fn())
 
 vi.mock('sonner', () => ({
@@ -34,7 +55,7 @@ describe('worktree remote runtime mutations', () => {
 
   it('waits for branch confirmation before linking a terminal PR URL for a known push target', async () => {
     const store = createTestStore()
-    const fetchPRForBranch = vi.fn().mockResolvedValue({ number: 42 })
+    const readHostedReview = installReviewRead().mockResolvedValue(confirmedReview(42))
     const wt = makeWorktree({
       id: 'repo1::/path/wt1',
       repoId: 'repo1',
@@ -50,9 +71,8 @@ describe('worktree remote runtime mutations', () => {
       repos: [
         { id: 'repo1', path: '/repos/orca', displayName: 'orca', badgeColor: '#000', addedAt: 0 }
       ],
-      worktreesByRepo: { repo1: [wt] },
-      fetchPRForBranch
-    } as unknown as Partial<AppState>)
+      worktreesByRepo: { repo1: [wt] }
+    })
 
     store.getState().observeTerminalGitHubPullRequestLink(wt.id, {
       url: 'https://github.com/acme/orca/pull/42',
@@ -63,29 +83,39 @@ describe('worktree remote runtime mutations', () => {
     expect(store.getState().worktreesByRepo.repo1[0]?.linkedPR).toBeNull()
     expect(mockApi.worktrees.resolvePrBase).not.toHaveBeenCalled()
     expect(mockApi.worktrees.updateMeta).not.toHaveBeenCalled()
-    expect(fetchPRForBranch).toHaveBeenCalledWith('/repos/orca', 'feature/pr-link', {
+    await vi.waitFor(() => expect(readHostedReview).toHaveBeenCalled())
+    expect(readHostedReview).toHaveBeenCalledWith({
+      repoPath: '/repos/orca',
+      branch: 'feature/pr-link',
       force: true,
       repoId: 'repo1',
-      worktreeId: wt.id,
-      linkedPRNumber: null,
-      fallbackPRNumber: null,
-      fallbackPRSource: 'explicit',
-      reason: 'active'
+      active: true,
+      repoOwnerExecutionHostId: 'local',
+      currentHeadOid: wt.head,
+      linkedGitHubPR: null,
+      linkedGitLabMR: null,
+      linkedBitbucketPR: null,
+      linkedAzureDevOpsPR: null,
+      linkedGiteaPR: null
     })
-    for (let i = 0; i < 6; i++) {
+    for (let i = 0; i < 20; i++) {
       await Promise.resolve()
     }
 
     expect(mockApi.worktrees.updateMeta).toHaveBeenCalledWith({
       worktreeId: wt.id,
       executionHostId: 'local',
-      updates: { linkedPR: 42, suppressedGitHubPR: null }
+      updates: expect.objectContaining({
+        linkedItems: [{ provider: 'github', type: 'pr', number: 42 }],
+        linkedPR: 42,
+        suppressedGitHubPR: null
+      })
     })
   })
 
   it('ignores a terminal URL matching current GitHub PR suppression', () => {
     const store = createTestStore()
-    const fetchPRForBranch = vi.fn().mockResolvedValue({ number: 42 })
+    const readHostedReview = installReviewRead().mockResolvedValue(confirmedReview(42))
     const wt = makeWorktree({
       id: 'repo1::/path/wt1',
       repoId: 'repo1',
@@ -98,9 +128,8 @@ describe('worktree remote runtime mutations', () => {
       repos: [
         { id: 'repo1', path: '/repos/orca', displayName: 'orca', badgeColor: '#000', addedAt: 0 }
       ],
-      worktreesByRepo: { repo1: [wt] },
-      fetchPRForBranch
-    } as unknown as Partial<AppState>)
+      worktreesByRepo: { repo1: [wt] }
+    })
 
     store.getState().observeTerminalGitHubPullRequestLink(wt.id, {
       url: 'https://github.com/acme/orca/pull/42',
@@ -108,13 +137,13 @@ describe('worktree remote runtime mutations', () => {
       number: 42
     })
 
-    expect(fetchPRForBranch).not.toHaveBeenCalled()
+    expect(readHostedReview).not.toHaveBeenCalled()
     expect(mockApi.worktrees.updateMeta).not.toHaveBeenCalled()
   })
 
   it('allows terminal observation of a different PR than the suppressed one', async () => {
     const store = createTestStore()
-    const fetchPRForBranch = vi.fn().mockResolvedValue({ number: 43 })
+    installReviewRead().mockResolvedValue(confirmedReview(43))
     const wt = makeWorktree({
       id: 'repo1::/path/wt1',
       repoId: 'repo1',
@@ -131,32 +160,35 @@ describe('worktree remote runtime mutations', () => {
       repos: [
         { id: 'repo1', path: '/repos/orca', displayName: 'orca', badgeColor: '#000', addedAt: 0 }
       ],
-      worktreesByRepo: { repo1: [wt] },
-      fetchPRForBranch
-    } as unknown as Partial<AppState>)
+      worktreesByRepo: { repo1: [wt] }
+    })
 
     store.getState().observeTerminalGitHubPullRequestLink(wt.id, {
       url: 'https://github.com/acme/orca/pull/43',
       slug: { owner: 'acme', repo: 'orca' },
       number: 43
     })
-    for (let i = 0; i < 6; i++) {
+    for (let i = 0; i < 20; i++) {
       await Promise.resolve()
     }
 
     expect(mockApi.worktrees.updateMeta).toHaveBeenCalledWith({
       worktreeId: wt.id,
       executionHostId: 'local',
-      updates: { linkedPR: 43, suppressedGitHubPR: null }
+      updates: expect.objectContaining({
+        linkedItems: [{ provider: 'github', type: 'pr', number: 43 }],
+        linkedPR: 43,
+        suppressedGitHubPR: null
+      })
     })
   })
 
   it('rechecks GitHub PR suppression after branch confirmation resolves', async () => {
     const store = createTestStore()
-    let resolveLookup: (value: { number: number } | null) => void = () => {}
-    const fetchPRForBranch = vi.fn(
+    let resolveLookup: (value: HostedReviewInfo | null) => void = () => {}
+    installReviewRead().mockImplementation(
       () =>
-        new Promise<{ number: number } | null>((resolve) => {
+        new Promise<HostedReviewInfo | null>((resolve) => {
           resolveLookup = resolve
         })
     )
@@ -175,23 +207,25 @@ describe('worktree remote runtime mutations', () => {
       repos: [
         { id: 'repo1', path: '/repos/orca', displayName: 'orca', badgeColor: '#000', addedAt: 0 }
       ],
-      worktreesByRepo: { repo1: [wt] },
-      fetchPRForBranch
-    } as unknown as Partial<AppState>)
+      worktreesByRepo: { repo1: [wt] }
+    })
 
     store.getState().observeTerminalGitHubPullRequestLink(wt.id, {
       url: 'https://github.com/acme/orca/pull/42',
       slug: { owner: 'acme', repo: 'orca' },
       number: 42
     })
+    for (let i = 0; i < 20; i++) {
+      await Promise.resolve()
+    }
     store.setState({
       worktreesByRepo: {
         repo1: [{ ...wt, linkedPR: null, suppressedGitHubPR: 42 }]
       }
-    } as Partial<AppState>)
+    })
 
-    resolveLookup({ number: 42 })
-    for (let i = 0; i < 6; i++) {
+    resolveLookup(confirmedReview(42))
+    for (let i = 0; i < 20; i++) {
       await Promise.resolve()
     }
 
@@ -200,7 +234,7 @@ describe('worktree remote runtime mutations', () => {
 
   it('waits for branch confirmation before linking a same-repo terminal PR URL', async () => {
     const store = createTestStore()
-    const fetchPRForBranch = vi.fn().mockResolvedValue({ number: 42 })
+    const readHostedReview = installReviewRead().mockResolvedValue(confirmedReview(42))
     const wt = makeWorktree({
       id: 'repo1::/path/wt1',
       repoId: 'repo1',
@@ -215,9 +249,8 @@ describe('worktree remote runtime mutations', () => {
       repos: [
         { id: 'repo1', path: '/repos/orca', displayName: 'orca', badgeColor: '#000', addedAt: 0 }
       ],
-      worktreesByRepo: { repo1: [wt] },
-      fetchPRForBranch
-    } as unknown as Partial<AppState>)
+      worktreesByRepo: { repo1: [wt] }
+    })
 
     store.getState().observeTerminalGitHubPullRequestLink(wt.id, {
       url: 'https://github.com/acme/orca/pull/42',
@@ -226,32 +259,42 @@ describe('worktree remote runtime mutations', () => {
     })
 
     expect(store.getState().worktreesByRepo.repo1[0]?.linkedPR).toBeNull()
-    expect(fetchPRForBranch).toHaveBeenCalledWith('/repos/orca', 'feature/pr-link', {
+    await vi.waitFor(() => expect(readHostedReview).toHaveBeenCalled())
+    expect(readHostedReview).toHaveBeenCalledWith({
+      repoPath: '/repos/orca',
+      branch: 'feature/pr-link',
       force: true,
       repoId: 'repo1',
-      worktreeId: wt.id,
-      linkedPRNumber: null,
-      fallbackPRNumber: null,
-      fallbackPRSource: 'explicit',
-      reason: 'active'
+      active: true,
+      repoOwnerExecutionHostId: 'local',
+      currentHeadOid: wt.head,
+      linkedGitHubPR: null,
+      linkedGitLabMR: null,
+      linkedBitbucketPR: null,
+      linkedAzureDevOpsPR: null,
+      linkedGiteaPR: null
     })
-    for (let i = 0; i < 6; i++) {
+    for (let i = 0; i < 20; i++) {
       await Promise.resolve()
     }
 
     expect(mockApi.worktrees.updateMeta).toHaveBeenCalledWith({
       worktreeId: wt.id,
       executionHostId: 'local',
-      updates: { linkedPR: 42, suppressedGitHubPR: null }
+      updates: expect.objectContaining({
+        linkedItems: [{ provider: 'github', type: 'pr', number: 42 }],
+        linkedPR: 42,
+        suppressedGitHubPR: null
+      })
     })
   })
 
-  it('does not persist a terminal PR URL when the linked PR changes before branch confirmation resolves', async () => {
+  it('preserves a manual primary while appending a PR confirmed after the selection changes', async () => {
     const store = createTestStore()
-    let resolveLookup: (value: { number: number } | null) => void = () => {}
-    const fetchPRForBranch = vi.fn(
+    let resolveLookup: (value: HostedReviewInfo | null) => void = () => {}
+    installReviewRead().mockImplementation(
       () =>
-        new Promise<{ number: number } | null>((resolve) => {
+        new Promise<HostedReviewInfo | null>((resolve) => {
           resolveLookup = resolve
         })
     )
@@ -269,9 +312,8 @@ describe('worktree remote runtime mutations', () => {
       repos: [
         { id: 'repo1', path: '/repos/orca', displayName: 'orca', badgeColor: '#000', addedAt: 0 }
       ],
-      worktreesByRepo: { repo1: [wt] },
-      fetchPRForBranch
-    } as unknown as Partial<AppState>)
+      worktreesByRepo: { repo1: [wt] }
+    })
 
     store.getState().observeTerminalGitHubPullRequestLink(wt.id, {
       url: 'https://github.com/acme/orca/pull/42',
@@ -279,23 +321,29 @@ describe('worktree remote runtime mutations', () => {
       number: 42
     })
     expect(mockApi.worktrees.updateMeta).not.toHaveBeenCalled()
+    for (let i = 0; i < 20; i++) {
+      await Promise.resolve()
+    }
 
     store.setState({
       worktreesByRepo: { repo1: [{ ...wt, linkedPR: 7 }] }
-    } as Partial<AppState>)
+    })
 
-    resolveLookup({ number: 42 })
-    for (let i = 0; i < 6; i++) {
+    resolveLookup(confirmedReview(42))
+    for (let i = 0; i < 20; i++) {
       await Promise.resolve()
     }
 
     expect(store.getState().worktreesByRepo.repo1[0]?.linkedPR).toBe(7)
-    expect(mockApi.worktrees.updateMeta).not.toHaveBeenCalled()
+    expect(
+      getWorkspaceAttachments(store.getState().worktreesByRepo.repo1[0]).map((item) => item.number)
+    ).toEqual([7, 42])
+    expect(mockApi.worktrees.updateMeta).toHaveBeenCalled()
   })
 
-  it('does not persist a terminal PR URL when the linked PR changes while push target lookup resolves', async () => {
+  it('appends a confirmed PR without overwriting a primary changed during push target lookup', async () => {
     const store = createTestStore()
-    const fetchPRForBranch = vi.fn().mockResolvedValue({ number: 42 })
+    installReviewRead().mockResolvedValue(confirmedReview(42))
     let resolvePushTarget: (value: {
       baseBranch: string
       pushTarget: { remoteName: string; branchName: string }
@@ -319,9 +367,8 @@ describe('worktree remote runtime mutations', () => {
       repos: [
         { id: 'repo1', path: '/repos/orca', displayName: 'orca', badgeColor: '#000', addedAt: 0 }
       ],
-      worktreesByRepo: { repo1: [wt] },
-      fetchPRForBranch
-    } as unknown as Partial<AppState>)
+      worktreesByRepo: { repo1: [wt] }
+    })
 
     store.getState().observeTerminalGitHubPullRequestLink(wt.id, {
       url: 'https://github.com/acme/orca/pull/42',
@@ -329,7 +376,7 @@ describe('worktree remote runtime mutations', () => {
       number: 42
     })
 
-    for (let i = 0; i < 6; i++) {
+    for (let i = 0; i < 20; i++) {
       await Promise.resolve()
     }
 
@@ -340,23 +387,26 @@ describe('worktree remote runtime mutations', () => {
 
     store.setState({
       worktreesByRepo: { repo1: [{ ...wt, linkedPR: 7 }] }
-    } as Partial<AppState>)
+    })
 
     resolvePushTarget({
       baseBranch: 'main',
       pushTarget: { remoteName: 'origin', branchName: 'feature/pr-link' }
     })
-    for (let i = 0; i < 6; i++) {
+    for (let i = 0; i < 20; i++) {
       await Promise.resolve()
     }
 
     expect(store.getState().worktreesByRepo.repo1[0]?.linkedPR).toBe(7)
-    expect(mockApi.worktrees.updateMeta).not.toHaveBeenCalled()
+    expect(
+      getWorkspaceAttachments(store.getState().worktreesByRepo.repo1[0]).map((item) => item.number)
+    ).toEqual([7, 42])
+    expect(mockApi.worktrees.updateMeta).toHaveBeenCalled()
   })
 
   it('does not link an arbitrary same-repo terminal PR URL for a known push target when lookup misses', async () => {
     const store = createTestStore()
-    const fetchPRForBranch = vi.fn().mockResolvedValue(null)
+    installReviewRead().mockResolvedValue(null)
     const wt = makeWorktree({
       id: 'repo1::/path/wt1',
       repoId: 'repo1',
@@ -372,9 +422,8 @@ describe('worktree remote runtime mutations', () => {
       repos: [
         { id: 'repo1', path: '/repos/orca', displayName: 'orca', badgeColor: '#000', addedAt: 0 }
       ],
-      worktreesByRepo: { repo1: [wt] },
-      fetchPRForBranch
-    } as unknown as Partial<AppState>)
+      worktreesByRepo: { repo1: [wt] }
+    })
 
     store.getState().observeTerminalGitHubPullRequestLink(wt.id, {
       url: 'https://github.com/acme/orca/pull/1',
@@ -382,7 +431,7 @@ describe('worktree remote runtime mutations', () => {
       number: 1
     })
 
-    for (let i = 0; i < 6; i++) {
+    for (let i = 0; i < 20; i++) {
       await Promise.resolve()
     }
 
@@ -393,9 +442,9 @@ describe('worktree remote runtime mutations', () => {
     })
   })
 
-  it('uses branch confirmation before linking a differently named terminal PR URL', async () => {
+  it('rejects a same-number branch result for a different repository URL', async () => {
     const store = createTestStore()
-    const fetchPRForBranch = vi.fn().mockResolvedValue({ number: 42 })
+    const readHostedReview = installReviewRead().mockResolvedValue(confirmedReview(42))
     const wt = makeWorktree({
       id: 'repo1::/path/wt1',
       repoId: 'repo1',
@@ -407,9 +456,8 @@ describe('worktree remote runtime mutations', () => {
       repos: [
         { id: 'repo1', path: '/repos/orca', displayName: 'orca', badgeColor: '#000', addedAt: 0 }
       ],
-      worktreesByRepo: { repo1: [wt] },
-      fetchPRForBranch
-    } as unknown as Partial<AppState>)
+      worktreesByRepo: { repo1: [wt] }
+    })
 
     store.getState().observeTerminalGitHubPullRequestLink(wt.id, {
       url: 'https://github.com/acme/docs/pull/42',
@@ -418,24 +466,26 @@ describe('worktree remote runtime mutations', () => {
     })
 
     expect(store.getState().worktreesByRepo.repo1[0]?.linkedPR).toBeNull()
-    expect(fetchPRForBranch).toHaveBeenCalledWith('/repos/orca', 'feature/pr-link', {
+    await vi.waitFor(() => expect(readHostedReview).toHaveBeenCalled())
+    expect(readHostedReview).toHaveBeenCalledWith({
+      repoPath: '/repos/orca',
+      branch: 'feature/pr-link',
       force: true,
       repoId: 'repo1',
-      worktreeId: wt.id,
-      linkedPRNumber: null,
-      fallbackPRNumber: null,
-      fallbackPRSource: 'explicit',
-      reason: 'active'
+      active: true,
+      repoOwnerExecutionHostId: 'local',
+      currentHeadOid: wt.head,
+      linkedGitHubPR: null,
+      linkedGitLabMR: null,
+      linkedBitbucketPR: null,
+      linkedAzureDevOpsPR: null,
+      linkedGiteaPR: null
     })
 
-    for (let i = 0; i < 6; i++) {
+    for (let i = 0; i < 20; i++) {
       await Promise.resolve()
     }
 
-    expect(mockApi.worktrees.updateMeta).toHaveBeenCalledWith({
-      worktreeId: wt.id,
-      executionHostId: 'local',
-      updates: { linkedPR: 42, suppressedGitHubPR: null }
-    })
+    expect(mockApi.worktrees.updateMeta).not.toHaveBeenCalled()
   })
 })
diff --git a/src/renderer/src/store/slices/worktrees-terminal-reference-origins.test.ts b/src/renderer/src/store/slices/worktrees-terminal-reference-origins.test.ts
new file mode 100644
index 000000000000..9317695c46ad
--- /dev/null
+++ b/src/renderer/src/store/slices/worktrees-terminal-reference-origins.test.ts
@@ -0,0 +1,375 @@
+import type { HostedReviewInfo, HostedReviewForBranchArgs } from '../../../../shared/hosted-review'
+import { singlePaneLayoutSnapshot } from './terminal-helpers'
+import { beforeEach, describe, expect, it, vi } from 'vitest'
+import { makeTerminalTab, makeWorktree } from './worktrees-slice-test-fixtures'
+import {
+  createTestStore,
+  resetRemoteRuntimeMocks,
+  resetWorktreeSliceModuleMemory
+} from './worktrees-slice-test-harness'
+import { getWorkspaceAttachments } from '../../../../shared/workspace-attachments'
+import { makePaneKey } from '../../../../shared/stable-pane-id'
+
+function installReviewRead() {
+  const read = vi.fn<(args: HostedReviewForBranchArgs) => Promise<HostedReviewInfo | null>>()
+  Object.defineProperty(window.api, 'hostedReview', {
+    configurable: true,
+    value: { forBranch: read }
+  })
+  return read
+}
+
+const worktreeId = 'repo1::/path/wt1'
+const url = 'https://github.com/acme/orca/pull/42'
+const link = { url, slug: { owner: 'acme', repo: 'orca' }, number: 42 }
+const leaf = '11111111-1111-4111-8111-111111111111'
+const flush = async () => {
+  for (let i = 0; i < 20; i++) {
+    await Promise.resolve()
+  }
+}
+function setup() {
+  const store = createTestStore()
+  const readHostedReview = installReviewRead().mockResolvedValue({
+    provider: 'github',
+    number: 42,
+    title: 'Second PR',
+    state: 'open',
+    url,
+    status: 'success',
+    updatedAt: '2026-01-01',
+    mergeable: 'MERGEABLE'
+  })
+  store.setState({
+    repos: [
+      { id: 'repo1', path: '/repos/orca', displayName: 'orca', badgeColor: '#000', addedAt: 0 }
+    ],
+    worktreesByRepo: {
+      repo1: [
+        makeWorktree({
+          id: worktreeId,
+          repoId: 'repo1',
+          linkedPR: 7,
+          pushTarget: { remoteName: 'origin', branchName: 'feature' },
+          linkedItems: [{ provider: 'github', type: 'pr', number: 7 }]
+        })
+      ]
+    },
+    tabsByWorktree: {
+      [worktreeId]: [
+        makeTerminalTab({ id: 'tab-1', worktreeId, ptyId: 'pty-tab-1' }),
+        makeTerminalTab({ id: 'tab-2', worktreeId, ptyId: 'pty-tab-2' })
+      ]
+    },
+    terminalLayoutsByTabId: {
+      'tab-1': singlePaneLayoutSnapshot(leaf, 'pty-tab-1'),
+      'tab-2': singlePaneLayoutSnapshot(leaf, 'pty-tab-2')
+    },
+    ptyIdsByTabId: { 'tab-1': ['pty-tab-1'], 'tab-2': ['pty-tab-2'] },
+    agentStatusByPaneKey: {}
+  })
+  return { store, readHostedReview }
+}
+const context = (tabId: string) => ({
+  tabId,
+  paneKey: makePaneKey(tabId, leaf),
+  ptyId: `pty-${tabId}`,
+  executionHostId: 'local' as const
+})
+beforeEach(() => {
+  vi.clearAllMocks()
+  resetRemoteRuntimeMocks()
+  resetWorktreeSliceModuleMemory()
+})
+describe('terminal reference evidence', () => {
+  it('retains independently confirmed concurrent PRs when the first becomes the primary', async () => {
+    const { store, readHostedReview } = setup()
+    const initial = store.getState().worktreesByRepo.repo1[0]
+    store.setState({
+      worktreesByRepo: { repo1: [{ ...initial, linkedPR: null, linkedItems: [] }] }
+    })
+    const first = Promise.withResolvers<HostedReviewInfo | null>()
+    const second = Promise.withResolvers<HostedReviewInfo | null>()
+    readHostedReview.mockReturnValueOnce(first.promise).mockReturnValueOnce(second.promise)
+    store.getState().observeTerminalGitHubPullRequestLink(worktreeId, link, context('tab-1'))
+    store.getState().observeTerminalGitHubPullRequestLink(
+      worktreeId,
+      {
+        ...link,
+        number: 43,
+        url: 'https://github.com/acme/orca/pull/43'
+      },
+      context('tab-2')
+    )
+    const review: HostedReviewInfo = {
+      provider: 'github',
+      number: 42,
+      title: 'Confirmed',
+      state: 'open',
+      url,
+      status: 'success',
+      mergeable: 'MERGEABLE',
+      updatedAt: '2026-01-01'
+    }
+    first.resolve(review)
+    await flush()
+    expect(store.getState().worktreesByRepo.repo1[0].linkedPR).toBe(42)
+    second.resolve({ ...review, number: 43, url: 'https://github.com/acme/orca/pull/43' })
+    await flush()
+    const current = store.getState().worktreesByRepo.repo1[0]
+    expect(current.linkedPR).toBe(42)
+    expect(
+      getWorkspaceAttachments(current).map((item) => [item.number, item.origins?.[0].tabId])
+    ).toEqual([
+      [42, 'tab-1'],
+      [43, 'tab-2']
+    ])
+  })
+
+  it('confirms a secondary review without publishing it into the primary branch cache', async () => {
+    const { store } = setup()
+    const workspace = store.getState().worktreesByRepo.repo1[0]
+    const fetchHostedReviewForBranch = vi.fn()
+    const primary: HostedReviewInfo = {
+      provider: 'github',
+      number: 7,
+      title: 'Primary',
+      state: 'open',
+      url: 'https://github.com/acme/orca/pull/7',
+      status: 'failure',
+      mergeable: 'MERGEABLE',
+      updatedAt: '2026-01-01'
+    }
+    const hostedReviewCache = {
+      'local::repo1::feature': { data: primary, fetchedAt: Date.now() }
+    }
+    store.setState({
+      fetchHostedReviewForBranch,
+      hostedReviewCache,
+      worktreesByRepo: {
+        repo1: [
+          {
+            ...workspace,
+            linkedGitLabMR: null,
+            linkedBitbucketPR: null,
+            linkedAzureDevOpsPR: null,
+            linkedGiteaPR: null,
+            linkedItems: [
+              ...getWorkspaceAttachments(workspace),
+              {
+                provider: 'github',
+                type: 'pr',
+                number: 42
+              }
+            ]
+          }
+        ]
+      }
+    })
+    store.getState().observeTerminalGitHubPullRequestLink(worktreeId, link, context('tab-1'))
+    await flush()
+    expect(fetchHostedReviewForBranch).not.toHaveBeenCalled()
+    expect(store.getState().hostedReviewCache).toBe(hostedReviewCache)
+    expect(
+      getWorkspaceAttachments(store.getState().worktreesByRepo.repo1[0])[1].origins?.[0].tabId
+    ).toBe('tab-1')
+  })
+  it('confirms on the terminal owner when another host has the same repository ID', async () => {
+    const { store } = setup()
+    const repo = store.getState().repos[0]
+    const readHostedReview = installReviewRead().mockResolvedValue({
+      provider: 'github',
+      number: 42,
+      title: 'Confirmed',
+      state: 'open',
+      url,
+      status: 'success',
+      mergeable: 'MERGEABLE',
+      updatedAt: '2026-01-01'
+    })
+    store.setState({
+      repos: [{ ...repo, executionHostId: 'runtime:other' }, repo]
+    })
+    store.getState().observeTerminalGitHubPullRequestLink(worktreeId, link, context('tab-1'))
+    await flush()
+    expect(readHostedReview).toHaveBeenCalledWith(
+      expect.objectContaining({
+        repoPath: repo.path,
+        repoId: repo.id,
+        repoOwnerExecutionHostId: 'local'
+      })
+    )
+    expect(getWorkspaceAttachments(store.getState().worktreesByRepo.repo1[0])[1].origins).toEqual([
+      expect.objectContaining({ hostId: 'local', tabId: 'tab-1' })
+    ])
+  })
+  it('confirms a number-only secondary attachment without requiring it to be the primary review', async () => {
+    const { store } = setup()
+    const workspace = store.getState().worktreesByRepo.repo1[0]
+    const readHostedReview = installReviewRead().mockResolvedValue({
+      provider: 'github',
+      number: 42,
+      title: 'Secondary',
+      state: 'open',
+      url,
+      status: 'success',
+      mergeable: 'MERGEABLE',
+      updatedAt: '2026-01-01'
+    })
+    store.setState({
+      worktreesByRepo: {
+        repo1: [
+          {
+            ...workspace,
+            linkedItems: [
+              ...getWorkspaceAttachments(workspace),
+              {
+                provider: 'github',
+                type: 'pr',
+                number: 42
+              }
+            ]
+          }
+        ]
+      }
+    })
+    store.getState().observeTerminalGitHubPullRequestLink(worktreeId, link, context('tab-1'))
+    await flush()
+    expect(readHostedReview).toHaveBeenCalledWith(expect.objectContaining({ linkedGitHubPR: 42 }))
+    const current = store.getState().worktreesByRepo.repo1[0]
+    expect(current.linkedPR).toBe(7)
+    expect(getWorkspaceAttachments(current)[1].origins?.[0].tabId).toBe('tab-1')
+  })
+  it('rejects a different provider returned by owner-scoped branch confirmation', async () => {
+    const { store } = setup()
+    installReviewRead().mockResolvedValue({
+      provider: 'gitlab',
+      number: 42,
+      title: 'Other provider',
+      state: 'open',
+      url,
+      status: 'success',
+      mergeable: 'MERGEABLE',
+      updatedAt: '2026-01-01'
+    })
+    store.getState().observeTerminalGitHubPullRequestLink(worktreeId, link, context('tab-1'))
+    await flush()
+    expect(getWorkspaceAttachments(store.getState().worktreesByRepo.repo1[0])).toHaveLength(1)
+  })
+  it('adds a second confirmed PR without changing which review is used for checks', async () => {
+    const { store } = setup()
+    store.getState().observeTerminalGitHubPullRequestLink(worktreeId, link, context('tab-1'))
+    await flush()
+    const workspace = store.getState().worktreesByRepo.repo1[0]
+    expect(workspace.linkedPR).toBe(7)
+    expect(getWorkspaceAttachments(workspace).map((item) => item.number)).toEqual([7, 42])
+    expect(getWorkspaceAttachments(workspace)[1].origins).toEqual([
+      expect.objectContaining({ kind: 'observed', tabId: 'tab-1', hostId: 'local' })
+    ])
+  })
+  it('records two terminals for one PR and keeps repeated evidence deduplicated', async () => {
+    const { store, readHostedReview } = setup()
+    for (const tabId of ['tab-1', 'tab-2', 'tab-2']) {
+      store.getState().observeTerminalGitHubPullRequestLink(worktreeId, link, context(tabId))
+      await flush()
+    }
+    expect(
+      getWorkspaceAttachments(store.getState().worktreesByRepo.repo1[0])[1].origins?.map(
+        (origin) => origin.tabId
+      )
+    ).toEqual(['tab-1', 'tab-2'])
+    expect(readHostedReview.mock.calls.filter(([args]) => args.active === true)).toHaveLength(1)
+  })
+  it('does not associate a same-number PR from a different repository', async () => {
+    const { store } = setup()
+    store
+      .getState()
+      .observeTerminalGitHubPullRequestLink(
+        worktreeId,
+        { ...link, url: 'https://github.com/other/repo/pull/42' },
+        context('tab-1')
+      )
+    await flush()
+    expect(getWorkspaceAttachments(store.getState().worktreesByRepo.repo1[0])).toHaveLength(1)
+  })
+  it('does not write after a failed confirmation', async () => {
+    const { store, readHostedReview } = setup()
+    readHostedReview.mockRejectedValue(new Error('Offline'))
+    const warning = vi.spyOn(console, 'warn').mockImplementation(() => {})
+    store.getState().observeTerminalGitHubPullRequestLink(worktreeId, link, context('tab-1'))
+    await flush()
+    expect(getWorkspaceAttachments(store.getState().worktreesByRepo.repo1[0])).toHaveLength(1)
+    expect(warning).toHaveBeenCalled()
+    warning.mockRestore()
+  })
+  it('ignores a stale PTY even when its caller supplies an execution host', async () => {
+    const { store, readHostedReview } = setup()
+    store.getState().observeTerminalGitHubPullRequestLink(worktreeId, link, {
+      ...context('tab-1'),
+      ptyId: 'old-pty'
+    })
+    await flush()
+    expect(readHostedReview).not.toHaveBeenCalled()
+  })
+  it('does not attribute a delayed confirmation after the pane is rebound', async () => {
+    const { store, readHostedReview } = setup()
+    let complete: (value: Awaited<ReturnType<typeof readHostedReview>>) => void = () => {}
+    readHostedReview.mockImplementation(
+      () =>
+        new Promise((resolve) => {
+          complete = resolve
+        })
+    )
+    store.getState().observeTerminalGitHubPullRequestLink(worktreeId, link, context('tab-1'))
+    await flush()
+    store.setState({
+      terminalLayoutsByTabId: { 'tab-1': singlePaneLayoutSnapshot(leaf, 'replacement-pty') }
+    })
+    complete({
+      provider: 'github',
+      number: 42,
+      title: 'Second PR',
+      state: 'open',
+      url,
+      status: 'success',
+      updatedAt: '2026-01-01',
+      mergeable: 'MERGEABLE'
+    })
+    await flush()
+    expect(getWorkspaceAttachments(store.getState().worktreesByRepo.repo1[0])).toHaveLength(1)
+  })
+  it('keeps a pending observation when only the terminal label changes', async () => {
+    const { store, readHostedReview } = setup()
+    const confirmed = await readHostedReview({ repoPath: '/repo', branch: 'branch' })
+    let complete: (value: typeof confirmed) => void = () => {}
+    readHostedReview.mockImplementationOnce(
+      () =>
+        new Promise((resolve) => {
+          complete = resolve
+        })
+    )
+    store.getState().observeTerminalGitHubPullRequestLink(worktreeId, link, context('tab-1'))
+    await flush()
+    store.setState({
+      tabsByWorktree: {
+        [worktreeId]: store
+          .getState()
+          .tabsByWorktree[worktreeId].map((tab) => ({ ...tab, customTitle: 'Renamed' }))
+      }
+    })
+    complete(confirmed)
+    await flush()
+    expect(
+      getWorkspaceAttachments(store.getState().worktreesByRepo.repo1[0]).map((item) => item.number)
+    ).toEqual([7, 42])
+  })
+  it('rejects an explicit host that disagrees with the PTY owner', async () => {
+    const { store, readHostedReview } = setup()
+    store.getState().observeTerminalGitHubPullRequestLink(worktreeId, link, {
+      ...context('tab-1'),
+      executionHostId: 'ssh:other'
+    })
+    await flush()
+    expect(readHostedReview).not.toHaveBeenCalled()
+  })
+})
diff --git a/src/renderer/src/store/slices/worktrees-terminal-reference-source-race.test.ts b/src/renderer/src/store/slices/worktrees-terminal-reference-source-race.test.ts
new file mode 100644
index 000000000000..a07d78a52b33
--- /dev/null
+++ b/src/renderer/src/store/slices/worktrees-terminal-reference-source-race.test.ts
@@ -0,0 +1,119 @@
+import { beforeEach, expect, it, vi } from 'vitest'
+import type { HostedReviewInfo } from '../../../../shared/hosted-review'
+import type { Repo } from '../../../../shared/repo-types'
+import { bumpProviderRuntimeSessionGeneration } from '@/lib/provider-runtime-context'
+import { makeWorktree } from './worktrees-slice-test-fixtures'
+import {
+  createTestStore,
+  mockApi,
+  resetRemoteRuntimeMocks,
+  resetWorktreeSliceModuleMemory
+} from './worktrees-slice-test-harness'
+
+beforeEach(() => {
+  vi.clearAllMocks()
+  resetRemoteRuntimeMocks()
+  resetWorktreeSliceModuleMemory()
+})
+
+it.each([
+  'remote',
+  'account',
+  'path',
+  'removed',
+  'instance',
+  'head',
+  'credentials',
+  'label'
+] as const)('rechecks %s before persisting delayed terminal confirmation', async (change) => {
+  const store = createTestStore()
+  const workspace = makeWorktree({ id: 'repo::/worktree', repoId: 'repo', linkedPR: null })
+  const repo: Repo = {
+    id: 'repo',
+    path: '/repo',
+    displayName: 'Orca',
+    addedAt: 0,
+    badgeColor: '',
+    gitRemoteIdentity: {
+      canonicalKey: 'github.com/acme/orca',
+      remoteName: 'origin',
+      remoteUrl: 'https://github.com/acme/orca.git'
+    }
+  }
+  const review: HostedReviewInfo = {
+    provider: 'github',
+    number: 42,
+    title: 'Review',
+    url: 'https://github.com/acme/orca/pull/42',
+    state: 'open',
+    status: 'success',
+    mergeable: 'MERGEABLE',
+    updatedAt: '2026-01-01'
+  }
+  const pending = Promise.withResolvers<HostedReviewInfo | null>()
+  Object.defineProperty(window.api, 'hostedReview', {
+    configurable: true,
+    value: { forBranch: vi.fn(() => pending.promise) }
+  })
+  store.setState({ repos: [repo], worktreesByRepo: { repo: [workspace] } })
+  store.getState().observeTerminalGitHubPullRequestLink(workspace.id, {
+    number: 42,
+    url: review.url,
+    slug: { owner: 'acme', repo: 'orca' }
+  })
+  store.setState({
+    repos:
+      change === 'removed'
+        ? []
+        : [
+            {
+              ...repo,
+              ...(change === 'remote'
+                ? {
+                    gitRemoteIdentity: {
+                      ...repo.gitRemoteIdentity,
+                      canonicalKey: 'github.com/other/repo',
+                      remoteName: 'origin',
+                      remoteUrl: 'https://github.com/other/repo.git'
+                    }
+                  }
+                : {}),
+              ...(change === 'account'
+                ? { ghAccount: { host: 'github.com', user: 'another-user' } }
+                : {}),
+              ...(change === 'path' ? { path: '/replacement-repo' } : {}),
+              ...(change === 'label' ? { displayName: 'Renamed' } : {})
+            }
+          ],
+    worktreesByRepo: {
+      repo: [
+        {
+          ...workspace,
+          ...(change === 'head' ? { head: 'new-head' } : {}),
+          ...(change === 'instance'
+            ? {
+                identity: {
+                  key: 'wt2:local:replacement',
+                  executionHostId: 'local' as const,
+                  instanceId: 'replacement'
+                }
+              }
+            : {})
+        }
+      ]
+    }
+  })
+  if (change === 'credentials') {
+    bumpProviderRuntimeSessionGeneration()
+  }
+  pending.resolve(review)
+  for (let i = 0; i < 20; i++) {
+    await Promise.resolve()
+  }
+  if (change === 'label') {
+    expect(mockApi.worktrees.updateMeta).toHaveBeenCalled()
+  } else {
+    expect(mockApi.worktrees.updateMeta).not.toHaveBeenCalled()
+    expect(store.getState().worktreesByRepo.repo[0].linkedPR).toBeNull()
+  }
+})
diff --git a/src/renderer/src/store/slices/worktrees.ts b/src/renderer/src/store/slices/worktrees.ts
index 330d27e7bb2d..873bb72253a4 100644
--- a/src/renderer/src/store/slices/worktrees.ts
+++ b/src/renderer/src/store/slices/worktrees.ts
@@ -1,3 +1,4 @@
+import { createObserveTerminalGitHubPullRequestLink } from './worktrees/session/worktree-terminal-reference'
 import type { StateCreator } from 'zustand'
 import type { AppState } from '../types'
 import type { WorktreeSlice } from './worktree-helpers'
@@ -37,8 +38,7 @@ import { createSetWorktreesPinnedAndReveal } from './worktrees/session/worktree-
 import {
   createBumpWorktreeActivity,
   createClearWorktreeUnread,
-  createMarkWorktreeUnread,
-  createObserveTerminalGitHubPullRequestLink
+  createMarkWorktreeUnread
 } from './worktrees/session/worktree-unread-activity'
 import {
   createMarkWorktreeVisited,
@@ -101,7 +101,7 @@ export const createWorktreeSlice: StateCreator<AppState, [], [], WorktreeSlice>
   updateWorktreesMeta: createUpdateWorktreesMeta(set, get),
   setWorktreesPinnedAndReveal: createSetWorktreesPinnedAndReveal(set, get),
   markWorktreeUnread: createMarkWorktreeUnread(set, get),
-  observeTerminalGitHubPullRequestLink: createObserveTerminalGitHubPullRequestLink(set, get),
+  observeTerminalGitHubPullRequestLink: createObserveTerminalGitHubPullRequestLink(get),
   clearWorktreeUnread: createClearWorktreeUnread(set, get),
   bumpWorktreeActivity: createBumpWorktreeActivity(set, get),
   markWorktreeVisited: createMarkWorktreeVisited(set, get),
diff --git a/src/renderer/src/store/slices/worktrees/listing/detected-worktree-meta.ts b/src/renderer/src/store/slices/worktrees/listing/detected-worktree-meta.ts
index 8ec8f96d1091..16a5728131be 100644
--- a/src/renderer/src/store/slices/worktrees/listing/detected-worktree-meta.ts
+++ b/src/renderer/src/store/slices/worktrees/listing/detected-worktree-meta.ts
@@ -1,3 +1,4 @@
+import type { WorkspaceAttachmentMutation } from '../../../../../../shared/workspace-attachment-mutation'
 import type { AppState } from '../../../types'
 import type { FolderWorkspace } from '../../../../../../shared/folder-workspace-types'
 import type { WorktreeMeta } from '../../../../../../shared/worktree/meta-types'
@@ -28,6 +29,7 @@ let floatingWorkspaceWorktreeCache: { path: string; worktree: Worktree } | null
 
 import { worktreeRowMatchesMetaHost } from './worktree-meta-host-match'
 import { branchName } from '@/lib/git-utils'
+import { normalizeWorkspaceAttachmentUpdate } from '../../../../../../shared/workspace-attachments'
 
 export function applyDetectedWorktreeUpdates(
   detectedWorktreesByRepo: AppState['detectedWorktreesByRepo'],
@@ -48,7 +50,7 @@ export function applyDetectedWorktreeUpdates(
       }
       repoChanged = true
       changed = true
-      const next = { ...worktree, ...updates }
+      const next = { ...worktree, ...normalizeWorkspaceAttachmentUpdate(worktree, updates) }
       if (updates.displayNameIsPinned !== undefined) {
         next.displayNameMode = updates.displayNameIsPinned ? 'fixed' : 'automatic'
         if (updates.displayNameIsPinned === false && !updates.displayName?.trim()) {
@@ -146,84 +148,45 @@ export function findKnownWorktreeById(
 }
 
 export function getFolderWorkspaceMetaUpdates(
-  updates: Partial<WorktreeMeta>
-): Partial<
-  Pick<
-    FolderWorkspace,
-    | 'name'
-    | 'comment'
-    | 'isArchived'
-    | 'isUnread'
-    | 'isPinned'
-    | 'sortOrder'
-    | 'manualOrder'
-    | 'lastActivityAt'
-    | 'workspaceStatus'
-    | 'createdWithAgent'
-    | 'pendingFirstAgentMessageRename'
-    | 'firstAgentMessageRenameError'
-    | 'diffComments'
-  >
-> {
-  const next: Partial<
-    Pick<
-      FolderWorkspace,
-      | 'name'
-      | 'comment'
-      | 'isArchived'
-      | 'isUnread'
-      | 'isPinned'
-      | 'sortOrder'
-      | 'manualOrder'
-      | 'lastActivityAt'
-      | 'workspaceStatus'
-      | 'createdWithAgent'
-      | 'pendingFirstAgentMessageRename'
-      | 'firstAgentMessageRenameError'
-      | 'diffComments'
-    >
-  > = {}
+  updates: Partial<WorktreeMeta> & WorkspaceAttachmentMutation
+) {
+  const next: Partial<FolderWorkspace> & WorkspaceAttachmentMutation = Object.fromEntries(
+    (
+      [
+        'comment',
+        'isArchived',
+        'isUnread',
+        'isPinned',
+        'sortOrder',
+        'manualOrder',
+        'lastActivityAt',
+        'workspaceStatus',
+        'createdWithAgent',
+        'pendingFirstAgentMessageRename',
+        'firstAgentMessageRenameError',
+        'diffComments',
+        'linkedItems',
+        'linkedItemsBase',
+        'linkedItemsSelectionChanged',
+        'linkedTaskSourceContext'
+      ] as const
+    )
+      .filter((field) => updates[field] !== undefined)
+      .map((field) => [field, updates[field]])
+  )
   if (updates.displayName !== undefined) {
     next.name = updates.displayName
-    next.pendingFirstAgentMessageRename = false
-    next.firstAgentMessageRenameError = null
+    next.pendingFirstAgentMessageRename = updates.pendingFirstAgentMessageRename ?? false
+    next.firstAgentMessageRenameError =
+      updates.firstAgentMessageRenameError === undefined
+        ? null
+        : updates.firstAgentMessageRenameError
   }
-  if (updates.comment !== undefined) {
-    next.comment = updates.comment
+  if (updates.comment !== undefined && updates.lastActivityAt === undefined) {
     next.lastActivityAt = Date.now()
   }
-  if (updates.isArchived !== undefined) {
-    next.isArchived = updates.isArchived
-  }
-  if (updates.isUnread !== undefined) {
-    next.isUnread = updates.isUnread
-  }
-  if (updates.isPinned !== undefined) {
-    next.isPinned = updates.isPinned
-  }
-  if (updates.sortOrder !== undefined) {
-    next.sortOrder = updates.sortOrder
-  }
-  if (updates.manualOrder !== undefined) {
-    next.manualOrder = updates.manualOrder
-  }
-  if (updates.lastActivityAt !== undefined) {
-    next.lastActivityAt = updates.lastActivityAt
-  }
-  if (updates.workspaceStatus !== undefined) {
-    next.workspaceStatus = updates.workspaceStatus
-  }
-  if (updates.createdWithAgent !== undefined) {
-    next.createdWithAgent = updates.createdWithAgent
-  }
-  if (updates.pendingFirstAgentMessageRename !== undefined) {
-    next.pendingFirstAgentMessageRename = updates.pendingFirstAgentMessageRename
-  }
-  if (updates.firstAgentMessageRenameError !== undefined) {
-    next.firstAgentMessageRenameError = updates.firstAgentMessageRenameError
-  }
-  if (updates.diffComments !== undefined) {
-    next.diffComments = updates.diffComments
+  if (updates.linkedWorkItem !== undefined) {
+    next.linkedTask = updates.linkedWorkItem
   }
   return next
 }
diff --git a/src/renderer/src/store/slices/worktrees/metadata/hosted-review-link-mutation.ts b/src/renderer/src/store/slices/worktrees/metadata/hosted-review-link-mutation.ts
index 35464523ba55..f50a9818ad09 100644
--- a/src/renderer/src/store/slices/worktrees/metadata/hosted-review-link-mutation.ts
+++ b/src/renderer/src/store/slices/worktrees/metadata/hosted-review-link-mutation.ts
@@ -2,7 +2,6 @@ import type { StateCreator } from 'zustand'
 import type { AppState } from '../../../types'
 import type { WorktreeSlice } from '../../worktree-helpers'
 import { applyWorktreeUpdates } from '../../worktree-helpers'
-import { isPositiveHostedReviewNumber } from '../../../../../../shared/hosted-review'
 import { branchName } from '@/lib/git-utils'
 import type { Worktree } from '../../../../../../shared/worktree/types'
 import type { WorktreeMeta } from '../../../../../../shared/worktree/meta-types'
@@ -274,37 +273,6 @@ export function applyHostedReviewLinkClear(
   })
 }
 
-export function getPositiveHostedReviewLinkUpdateKey(
-  updates: Partial<WorktreeMeta>
-): HostedReviewLinkKey | null {
-  for (const key of HOSTED_REVIEW_LINK_KEYS) {
-    if (isPositiveHostedReviewNumber(updates[key])) {
-      return key
-    }
-  }
-  return null
-}
-
-export function clearOlderHostedReviewLinksForReplacement(
-  updates: Partial<WorktreeMeta>,
-  existingWorktree: Worktree
-): Partial<WorktreeMeta> {
-  const replacementKey = getPositiveHostedReviewLinkUpdateKey(updates)
-  if (!replacementKey) {
-    return updates
-  }
-  let normalized = updates
-  for (const key of HOSTED_REVIEW_LINK_KEYS) {
-    if (key === replacementKey || existingWorktree[key] == null) {
-      continue
-    }
-    // Why: one branch pushes to one hosted-review head; stale provider links would win the target lookup after replacement.
-    normalized = normalized === updates ? { ...updates } : normalized
-    normalized[key] = null
-  }
-  return normalized
-}
-
 export function getHostedReviewLinkForMetaRefresh(
   updates: Partial<WorktreeMeta>,
   existingWorktree: Worktree | undefined,
diff --git a/src/renderer/src/store/slices/worktrees/metadata/hosted-review-link-update-normalization.ts b/src/renderer/src/store/slices/worktrees/metadata/hosted-review-link-update-normalization.ts
deleted file mode 100644
index 227c3fd964fa..000000000000
--- a/src/renderer/src/store/slices/worktrees/metadata/hosted-review-link-update-normalization.ts
+++ /dev/null
@@ -1,14 +0,0 @@
-import { normalizeGitHubPRSuppressionUpdate } from '../../../../../../shared/worktree/github-pr-suppression'
-import type { WorktreeMeta } from '../../../../../../shared/worktree/meta-types'
-import type { Worktree } from '../../../../../../shared/worktree/types'
-import { clearOlderHostedReviewLinksForReplacement } from './hosted-review-link-mutation'
-
-export function normalizeHostedReviewLinkReplacementUpdates(
-  updates: Partial<WorktreeMeta>,
-  existingWorktree?: Worktree
-): Partial<WorktreeMeta> {
-  const replacementUpdates = existingWorktree
-    ? clearOlderHostedReviewLinksForReplacement(updates, existingWorktree)
-    : updates
-  return normalizeGitHubPRSuppressionUpdate(replacementUpdates)
-}
diff --git a/src/renderer/src/store/slices/worktrees/metadata/update-worktree-meta.ts b/src/renderer/src/store/slices/worktrees/metadata/update-worktree-meta.ts
index 414a2ef206ad..de6eed0b05c4 100644
--- a/src/renderer/src/store/slices/worktrees/metadata/update-worktree-meta.ts
+++ b/src/renderer/src/store/slices/worktrees/metadata/update-worktree-meta.ts
@@ -1,3 +1,13 @@
+import {
+  hasExplicitWorkspaceReviewSelection,
+  getWorkspaceReviewPersistenceUpdates,
+  getWorkspaceReviewRefreshHints
+} from './workspace-attachment-review-selection'
+import {
+  getWorkspaceAttachments,
+  normalizeWorkspaceAttachmentUpdate
+} from '../../../../../../shared/workspace-attachments'
+import { normalizeGitHubPRSuppressionUpdate } from '../../../../../../shared/worktree/github-pr-suppression'
 import type { WorktreeSlice } from '../../worktree-helpers'
 import type { WorktreeSliceGet, WorktreeSliceSet } from '../listing/worktree-slice-types'
 import { translate } from '@/i18n/i18n'
@@ -14,11 +24,9 @@ import {
 } from '../listing/detected-worktree-meta'
 import {
   bumpHostedReviewLinkMutationGeneration,
-  getHostedReviewLinkForMetaRefresh,
   hasChangedHostedReviewLinkUpdates,
   hasHostedReviewLinkUpdates
 } from './hosted-review-link-mutation'
-import { normalizeHostedReviewLinkReplacementUpdates } from './hosted-review-link-update-normalization'
 import {
   getHostedReviewPushTargetLookup,
   resolveGitHubReviewPushTarget
@@ -46,9 +54,19 @@ export function createUpdateWorktreeMeta(
     if (shouldApplyUpdate && !shouldApplyUpdate(existingWorktree)) {
       return { ok: true }
     }
+    const mutationUpdates =
+      updates.linkedItems === undefined
+        ? updates
+        : {
+            ...updates,
+            linkedItems: updates.linkedItems,
+            linkedItemsBase: updates.linkedItemsBase ?? getWorkspaceAttachments(existingWorktree),
+            linkedItemsSelectionChanged:
+              updates.linkedItemsSelectionChanged ?? hasExplicitWorkspaceReviewSelection(updates)
+          }
     const workspaceScope = parseWorkspaceKey(worktreeId)
     if (workspaceScope?.type === 'folder') {
-      const folderUpdates = getFolderWorkspaceMetaUpdates(updates)
+      const folderUpdates = getFolderWorkspaceMetaUpdates(mutationUpdates)
       if (Object.keys(folderUpdates).length === 0) {
         return { ok: true }
       }
@@ -57,7 +75,8 @@ export function createUpdateWorktreeMeta(
         // reporting ok would show the dialog a save that silently undid itself.
         const updated = await get().updateFolderWorkspace(
           workspaceScope.folderWorkspaceId,
-          folderUpdates
+          folderUpdates,
+          { executionHostId }
         )
         return updated
           ? { ok: true }
@@ -73,7 +92,7 @@ export function createUpdateWorktreeMeta(
         return { ok: false, error: err instanceof Error ? err.message : String(err) }
       }
     }
-    const normalizedUpdates = normalizeHostedReviewLinkReplacementUpdates(updates, existingWorktree)
+    let normalizedUpdates = normalizeWorkspaceAttachmentUpdate(existingWorktree, mutationUpdates)
     // Why: manual PR linking supplies only the number; resolve the head branch so Push targets the review branch.
     const linkedPrForPushTarget = isPositiveHostedReviewNumber(normalizedUpdates.linkedPR)
       ? normalizedUpdates.linkedPR
@@ -94,23 +113,28 @@ export function createUpdateWorktreeMeta(
             linkedPrForPushTarget
           )
         : undefined
-    const existingHostedReviewPushTargetLookup = existingWorktree
-      ? getHostedReviewPushTargetLookup(existingWorktree)
+    const worktreeForUpdate = get().getKnownWorktreeById(worktreeId, executionHostId)
+    if (shouldApplyUpdate && !shouldApplyUpdate(worktreeForUpdate)) {
+      return { ok: true }
+    }
+    normalizedUpdates = normalizeGitHubPRSuppressionUpdate(
+      normalizeWorkspaceAttachmentUpdate(worktreeForUpdate, mutationUpdates)
+    )
+    const currentResolvedPushTarget =
+      normalizedUpdates.linkedPR === linkedPrForPushTarget ? resolvedPushTarget : undefined
+    const existingHostedReviewPushTargetLookup = worktreeForUpdate
+      ? getHostedReviewPushTargetLookup(worktreeForUpdate)
       : null
-    const nextHostedReviewPushTargetLookup = existingWorktree
-      ? getHostedReviewPushTargetLookup({ ...existingWorktree, ...normalizedUpdates })
+    const nextHostedReviewPushTargetLookup = worktreeForUpdate
+      ? getHostedReviewPushTargetLookup({ ...worktreeForUpdate, ...normalizedUpdates })
       : null
-    // Why: a pushTarget derived from a linked review must not keep steering pushes after it's unlinked or replaced.
+    // A lookup can finish after another editor changes the selected review.
     const shouldClearStaleHostedReviewPushTarget =
-      Boolean(existingWorktree?.pushTarget) &&
+      Boolean(worktreeForUpdate?.pushTarget) &&
       normalizedUpdates.pushTarget === undefined &&
-      resolvedPushTarget === undefined &&
+      currentResolvedPushTarget === undefined &&
       existingHostedReviewPushTargetLookup !== null &&
       existingHostedReviewPushTargetLookup.key !== nextHostedReviewPushTargetLookup?.key
-    const worktreeForUpdate = get().getKnownWorktreeById(worktreeId, executionHostId)
-    if (shouldApplyUpdate && !shouldApplyUpdate(worktreeForUpdate)) {
-      return { ok: true }
-    }
     const shouldRefreshHostedReview = Boolean(
       worktreeForUpdate && hasChangedHostedReviewLinkUpdates(normalizedUpdates, worktreeForUpdate)
     )
@@ -127,8 +151,8 @@ export function createUpdateWorktreeMeta(
       'displayName' in normalizedUpdates
         ? { displayNameIsPinned: displayNameUpdatePinsLabel(normalizedUpdates.displayName) }
         : {}
-    const targetEnriched = resolvedPushTarget
-      ? { ...normalizedUpdates, ...displayNameProvenance, pushTarget: resolvedPushTarget }
+    const targetEnriched = currentResolvedPushTarget
+      ? { ...normalizedUpdates, ...displayNameProvenance, pushTarget: currentResolvedPushTarget }
       : shouldClearStaleHostedReviewPushTarget
         ? { ...normalizedUpdates, ...displayNameProvenance, pushTarget: undefined }
         : { ...normalizedUpdates, ...displayNameProvenance }
@@ -249,7 +273,7 @@ export function createUpdateWorktreeMeta(
       await persistWorktreeMeta(
         settingsForWorktreeOwner(get(), worktreeId, executionHostId),
         worktreeId,
-        enriched,
+        getWorkspaceReviewPersistenceUpdates(mutationUpdates, enriched),
         executionHostId ?? existingWorktree?.hostId,
         worktreeForUpdate?.identity?.key
       )
@@ -263,31 +287,7 @@ export function createUpdateWorktreeMeta(
         void get().fetchHostedReviewForBranch(reviewRepo.path, reviewBranch, {
           repoId: reviewRepo.id,
           repoOwnerExecutionHostId: executionHostId ?? worktreeForUpdate?.hostId,
-          linkedGitHubPR: getHostedReviewLinkForMetaRefresh(
-            targetEnriched,
-            worktreeForUpdate,
-            'linkedPR'
-          ),
-          linkedGitLabMR: getHostedReviewLinkForMetaRefresh(
-            targetEnriched,
-            worktreeForUpdate,
-            'linkedGitLabMR'
-          ),
-          linkedBitbucketPR: getHostedReviewLinkForMetaRefresh(
-            targetEnriched,
-            worktreeForUpdate,
-            'linkedBitbucketPR'
-          ),
-          linkedAzureDevOpsPR: getHostedReviewLinkForMetaRefresh(
-            targetEnriched,
-            worktreeForUpdate,
-            'linkedAzureDevOpsPR'
-          ),
-          linkedGiteaPR: getHostedReviewLinkForMetaRefresh(
-            targetEnriched,
-            worktreeForUpdate,
-            'linkedGiteaPR'
-          ),
+          ...getWorkspaceReviewRefreshHints(targetEnriched, worktreeForUpdate),
           force: true
         })
       }
diff --git a/src/renderer/src/store/slices/worktrees/metadata/workspace-attachment-review-selection.ts b/src/renderer/src/store/slices/worktrees/metadata/workspace-attachment-review-selection.ts
new file mode 100644
index 000000000000..8327a8cd5992
--- /dev/null
+++ b/src/renderer/src/store/slices/worktrees/metadata/workspace-attachment-review-selection.ts
@@ -0,0 +1,55 @@
+import type { WorkspaceAttachmentMutation } from '../../../../../../shared/workspace-attachment-mutation'
+import type { WorktreeMeta } from '../../../../../../shared/worktree/meta-types'
+import type { Worktree } from '../../../../../../shared/worktree/types'
+import { getHostedReviewLinkForMetaRefresh } from './hosted-review-link-mutation'
+
+const REVIEW_SLOTS = [
+  'linkedPR',
+  'linkedGitLabMR',
+  'linkedBitbucketPR',
+  'linkedAzureDevOpsPR',
+  'linkedGiteaPR'
+] as const
+
+export function hasExplicitWorkspaceReviewSelection(updates: Partial<WorktreeMeta>): boolean {
+  return (
+    REVIEW_SLOTS.some((slot) => typeof updates[slot] === 'number' && updates[slot] > 0) ||
+    REVIEW_SLOTS.every((slot) => updates[slot] === null)
+  )
+}
+
+export function getWorkspaceReviewRefreshHints(
+  updates: Partial<WorktreeMeta>,
+  workspace: Worktree | undefined
+) {
+  return {
+    linkedGitHubPR: getHostedReviewLinkForMetaRefresh(updates, workspace, 'linkedPR'),
+    linkedGitLabMR: getHostedReviewLinkForMetaRefresh(updates, workspace, 'linkedGitLabMR'),
+    linkedBitbucketPR: getHostedReviewLinkForMetaRefresh(updates, workspace, 'linkedBitbucketPR'),
+    linkedAzureDevOpsPR: getHostedReviewLinkForMetaRefresh(
+      updates,
+      workspace,
+      'linkedAzureDevOpsPR'
+    ),
+    linkedGiteaPR: getHostedReviewLinkForMetaRefresh(updates, workspace, 'linkedGiteaPR')
+  }
+}
+
+export function getWorkspaceReviewPersistenceUpdates(
+  mutation: Partial<WorktreeMeta> & WorkspaceAttachmentMutation,
+  normalized: Partial<WorktreeMeta>
+): Partial<WorktreeMeta> & WorkspaceAttachmentMutation {
+  // Keep the original delta; generated review slots guard its derived push target on the host.
+  return {
+    ...mutation,
+    ...Object.fromEntries(
+      Object.entries(normalized).filter(
+        ([key]) =>
+          !key.startsWith('linked') ||
+          (mutation.linkedItems !== undefined &&
+            REVIEW_SLOTS.some((slot) => slot === key) &&
+            !(key in mutation))
+      )
+    )
+  }
+}
diff --git a/src/renderer/src/store/slices/worktrees/metadata/worktree-meta-persist.test.ts b/src/renderer/src/store/slices/worktrees/metadata/worktree-meta-persist.test.ts
index 0094c026a395..c928e88e6fef 100644
--- a/src/renderer/src/store/slices/worktrees/metadata/worktree-meta-persist.test.ts
+++ b/src/renderer/src/store/slices/worktrees/metadata/worktree-meta-persist.test.ts
@@ -1,7 +1,13 @@
 import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest'
 import type { RuntimeClientTarget } from '../../../../runtime/runtime-rpc-client'
 import { WORKTREE_GITHUB_PR_SUPPRESSION_RUNTIME_CAPABILITY } from '../../../../../../shared/protocol-version'
+import {
+  WORKTREE_LINKED_ITEMS_RUNTIME_CAPABILITY,
+  WORKTREE_LINKED_ITEMS_DELTA_RUNTIME_CAPABILITY
+} from '../../../../../../shared/workspace-attachment-capabilities'
 import { persistWorktreeMeta } from './worktree-meta-persist'
+import { createGlobalSettingsFixture } from '../../../../../../shared/global-settings-test-fixture'
+import { normalizeWorkspaceAttachmentUpdate } from '../../../../../../shared/workspace-attachments'
 
 const mocks = vi.hoisted(() => ({
   assertCapability: vi.fn(),
@@ -33,6 +39,50 @@ describe('persistWorktreeMeta GitHub PR suppression compatibility', () => {
     vi.unstubAllGlobals()
   })
 
+  it.each([
+    { linkedPR: 42 },
+    { linkedPR: null },
+    { linkedGitLabMR: 7 },
+    { linkedGitLabMR: null },
+    { linkedIssue: 9 },
+    { linkedIssue: null }
+  ])('does not require a collection capability for scalar writes: %j', async (updates) => {
+    mocks.assertCapability.mockRejectedValue(new Error('collection unsupported'))
+    await persistWorktreeMeta(createGlobalSettingsFixture(), 'repo::/feature', updates)
+    expect(mocks.assertCapability).not.toHaveBeenCalled()
+    expect(mocks.callRuntimeRpc).toHaveBeenCalledWith(
+      mocks.target,
+      'worktree.set',
+      { worktree: 'id:repo::/feature', ...updates },
+      { timeoutMs: 15_000 }
+    )
+  })
+
+  it.each([true, false])(
+    'keeps review selection exclusive when collection support is %s',
+    async (supportsCollections) => {
+      mocks.supportsCapability.mockResolvedValue(supportsCollections)
+      await persistWorktreeMeta(createGlobalSettingsFixture(), 'repo::/feature', {
+        linkedGitLabMR: 7
+      })
+      const wire = mocks.callRuntimeRpc.mock.lastCall?.[2]
+      expect(wire).not.toHaveProperty('linkedItems')
+      expect(wire).not.toHaveProperty('linkedItemsBase')
+      const saved = supportsCollections
+        ? normalizeWorkspaceAttachmentUpdate({ linkedPR: 42 }, wire)
+        : { linkedPR: 42, ...wire }
+      expect(saved).toMatchObject({ linkedPR: null, linkedGitLabMR: 7 })
+      if (supportsCollections) {
+        expect(wire).not.toHaveProperty('linkedPR')
+        expect(saved.linkedItems).toEqual([
+          { provider: 'github', type: 'pr', number: 42 },
+          { provider: 'gitlab', type: 'mr', number: 7 }
+        ])
+      }
+      expect(mocks.assertCapability).not.toHaveBeenCalled()
+    }
+  )
+
   it('requires host support before sending a positive suppression write', async () => {
     mocks.assertCapability.mockRejectedValue(new Error('update required'))
 
@@ -48,6 +98,35 @@ describe('persistWorktreeMeta GitHub PR suppression compatibility', () => {
     expect(mocks.callRuntimeRpc).not.toHaveBeenCalled()
   })
 
+  it('rejects attachment writes before an older host can silently drop them', async () => {
+    mocks.assertCapability.mockRejectedValue(new Error('update required'))
+    await expect(
+      persistWorktreeMeta(createGlobalSettingsFixture(), 'repo::/feature', { linkedItems: [] })
+    ).rejects.toThrow('update required')
+    expect(mocks.assertCapability).toHaveBeenCalledWith(
+      'env-1',
+      WORKTREE_LINKED_ITEMS_RUNTIME_CAPABILITY,
+      'Update the remote runtime to change workspace links'
+    )
+    expect(mocks.callRuntimeRpc).not.toHaveBeenCalled()
+  })
+
+  it('sends the complete collection to a capable host', async () => {
+    const linkedItems = [
+      { provider: 'github', type: 'pr', number: 42 },
+      { provider: 'gitlab', type: 'mr', number: 7 }
+    ] as const
+    await persistWorktreeMeta(createGlobalSettingsFixture(), 'repo::/feature', {
+      linkedItems: [...linkedItems]
+    })
+    expect(mocks.callRuntimeRpc).toHaveBeenCalledWith(
+      mocks.target,
+      'worktree.set',
+      { worktree: 'id:repo::/feature', linkedItems },
+      { timeoutMs: 15_000 }
+    )
+  })
+
   it('sends positive suppression writes to capable hosts', async () => {
     await persistWorktreeMeta({} as never, 'repo::/feature', { suppressedGitHubPR: 42 })
 
@@ -70,7 +149,14 @@ describe('persistWorktreeMeta GitHub PR suppression compatibility', () => {
     expect(mocks.callRuntimeRpc).toHaveBeenCalledWith(
       mocks.target,
       'worktree.set',
-      { worktree: 'id:repo::/feature', linkedPR: 42 },
+      {
+        worktree: 'id:repo::/feature',
+        linkedPR: 42,
+        linkedGitLabMR: null,
+        linkedBitbucketPR: null,
+        linkedAzureDevOpsPR: null,
+        linkedGiteaPR: null
+      },
       { timeoutMs: 15_000 }
     )
   })
@@ -108,4 +194,37 @@ describe('persistWorktreeMeta GitHub PR suppression compatibility', () => {
     })
     expect(mocks.assertCapability).not.toHaveBeenCalled()
   })
+  it('gates and forwards the atomic collection snapshot', async () => {
+    await persistWorktreeMeta(createGlobalSettingsFixture(), 'repo::/feature', {
+      linkedItems: [],
+      linkedItemsBase: [],
+      linkedItemsSelectionChanged: false
+    })
+    expect(mocks.assertCapability).toHaveBeenCalledWith(
+      'env-1',
+      WORKTREE_LINKED_ITEMS_DELTA_RUNTIME_CAPABILITY,
+      'Update the remote runtime to safely change workspace links'
+    )
+    expect(mocks.callRuntimeRpc).toHaveBeenCalledWith(
+      mocks.target,
+      'worktree.set',
+      {
+        worktree: 'id:repo::/feature',
+        linkedItems: [],
+        linkedItemsBase: [],
+        linkedItemsSelectionChanged: false
+      },
+      { timeoutMs: 15_000 }
+    )
+    mocks.callRuntimeRpc.mockClear()
+    mocks.assertCapability.mockRejectedValue(new Error('atomic support required'))
+    await expect(
+      persistWorktreeMeta(createGlobalSettingsFixture(), 'repo::/feature', {
+        linkedItems: [],
+        linkedItemsBase: [],
+        linkedItemsSelectionChanged: false
+      })
+    ).rejects.toThrow('atomic support required')
+    expect(mocks.callRuntimeRpc).not.toHaveBeenCalled()
+  })
 })
diff --git a/src/renderer/src/store/slices/worktrees/metadata/worktree-meta-persist.ts b/src/renderer/src/store/slices/worktrees/metadata/worktree-meta-persist.ts
index 61114f5b320f..6c9e9cef5275 100644
--- a/src/renderer/src/store/slices/worktrees/metadata/worktree-meta-persist.ts
+++ b/src/renderer/src/store/slices/worktrees/metadata/worktree-meta-persist.ts
@@ -1,3 +1,7 @@
+import { assertWorkspaceAttachmentWriteCapability } from '../../../../runtime/runtime-workspace-attachment-capabilities'
+import type { WorkspaceAttachmentMutation } from '../../../../../../shared/workspace-attachment-mutation'
+import { getLegacyWorkspaceReviewSelectionUpdates } from '../../../../../../shared/workspace-attachment-legacy'
+import { WORKTREE_LINKED_ITEMS_RUNTIME_CAPABILITY } from '../../../../../../shared/workspace-attachment-capabilities'
 import {
   assertRuntimeEnvironmentCapability,
   callRuntimeRpc,
@@ -51,7 +55,7 @@ export function isDisplayNamePersistencePending(
 export function persistWorktreeMeta(
   settings: AppState['settings'],
   worktreeId: string,
-  updates: Partial<WorktreeMeta>,
+  updates: Partial<WorktreeMeta> & WorkspaceAttachmentMutation,
   executionHostId?: ExecutionHostId,
   identityKey?: string
 ): Promise<void> {
@@ -80,7 +84,7 @@ export function persistWorktreeMeta(
 async function persistWorktreeMetaUntracked(
   settings: AppState['settings'],
   worktreeId: string,
-  updates: Partial<WorktreeMeta>,
+  updates: Partial<WorktreeMeta> & WorkspaceAttachmentMutation,
   executionHostId?: ExecutionHostId,
   identityKey?: string
 ): Promise<void> {
@@ -89,10 +93,11 @@ async function persistWorktreeMetaUntracked(
     await window.api.worktrees.updateMeta({
       worktreeId,
       ...(executionHostId ? { executionHostId } : {}),
-      updates
+      updates: updates
     })
     return
   }
+  await assertWorkspaceAttachmentWriteCapability(target, updates)
   // Why: `worktree.set` parses in strip mode, so an older runtime drops the key
   // and applies the rest. Both gates key off presence, not value — a dropped
   // *clear* strands a stale link that the Issue row then hides.
@@ -122,6 +127,17 @@ async function persistWorktreeMetaUntracked(
     )
   }
   let compatibleUpdates = updates
+  const legacySelection = getLegacyWorkspaceReviewSelectionUpdates(updates)
+  if (
+    legacySelection !== updates &&
+    target.kind === 'environment' &&
+    !(await runtimeEnvironmentSupportsCapability(
+      target.environmentId,
+      WORKTREE_LINKED_ITEMS_RUNTIME_CAPABILITY
+    ))
+  ) {
+    compatibleUpdates = legacySelection
+  }
   if (target.kind === 'environment' && 'suppressedGitHubPR' in updates) {
     if (typeof updates.suppressedGitHubPR === 'number' && updates.suppressedGitHubPR > 0) {
       await assertRuntimeEnvironmentCapability(
@@ -139,7 +155,7 @@ async function persistWorktreeMetaUntracked(
         WORKTREE_GITHUB_PR_SUPPRESSION_RUNTIME_CAPABILITY
       ))
     ) {
-      const olderHostUpdates = { ...updates }
+      const olderHostUpdates = { ...compatibleUpdates }
       delete olderHostUpdates.suppressedGitHubPR
       compatibleUpdates = olderHostUpdates
     }
diff --git a/src/renderer/src/store/slices/worktrees/session/worktree-terminal-reference.ts b/src/renderer/src/store/slices/worktrees/session/worktree-terminal-reference.ts
new file mode 100644
index 000000000000..31c130dc9c7f
--- /dev/null
+++ b/src/renderer/src/store/slices/worktrees/session/worktree-terminal-reference.ts
@@ -0,0 +1,227 @@
+import type { Repo } from '../../../../../../shared/repo-types'
+import {
+  getRepoExecutionHostId,
+  parseExecutionHostId
+} from '../../../../../../shared/execution-host'
+import { getProviderRuntimeContextKey } from '@/lib/provider-runtime-context'
+import { getRuntimeEnvironmentRevision } from '@/runtime/runtime-environment-revision'
+import type { WorktreeSlice } from '../../worktree-helpers'
+import type { WorktreeSliceGet } from '../listing/worktree-slice-types'
+import { branchName } from '@/lib/git-utils'
+import { resolveTerminalNotificationOwner } from '@/attention/notification-subject-owner'
+import { getWorkspaceAttachmentTerminalOrigin } from '@/lib/workspace-attachment-terminal-origin'
+import { getWorkspaceAttachments } from '../../../../../../shared/workspace-attachments'
+import { getWorkspaceAttachmentKey } from '../../../../../../shared/workspace-attachment-normalization'
+import {
+  getWorkspaceAttachmentOriginKey,
+  mergeWorkspaceAttachmentOrigins
+} from '../../../../../../shared/workspace-attachment-origins'
+import { isGitHubPRSuppressed } from '../../../../../../shared/worktree/github-pr-suppression'
+import type { WorkspaceAttachment, Worktree } from '../../../../../../shared/worktree/types'
+import { findKnownWorktreeById } from '../listing/detected-worktree-meta'
+import { findRepoForHost } from '../../repo-host-identity'
+import { readHostedReviewForRepo } from '@/lib/hosted-review-repo-read'
+import { lookupGitHubWorkItemByOwnerRepoForSource } from '@/lib/github-work-item-source-lookup'
+import { buildTaskSourceContextFromRepo } from '../../../../../../shared/task-source-context'
+
+function terminalReviewSourceKey(repo: Repo | null | undefined): string {
+  const host = repo && parseExecutionHostId(getRepoExecutionHostId(repo))
+  return JSON.stringify([
+    repo?.id,
+    repo?.path,
+    host?.id,
+    repo?.connectionId,
+    repo?.gitRemoteIdentity?.canonicalKey,
+    repo?.ghAccount,
+    getProviderRuntimeContextKey(null),
+    host?.kind === 'runtime' ? getRuntimeEnvironmentRevision(host.environmentId) : null
+  ])
+}
+
+export function createObserveTerminalGitHubPullRequestLink(
+  get: WorktreeSliceGet
+): WorktreeSlice['observeTerminalGitHubPullRequestLink'] {
+  const pending = new Set<string>()
+  return (worktreeId, link, context) => {
+    const state = get()
+    const owner = context ? resolveTerminalNotificationOwner(state, worktreeId, context) : null
+    const hostId = owner?.executionHostId ?? undefined
+    if (context && (!hostId || (context.executionHostId && context.executionHostId !== hostId))) {
+      return
+    }
+    const worktree = findKnownWorktreeById(state, worktreeId, hostId)
+    if (
+      !worktree ||
+      worktree.isBare ||
+      worktree.isArchived ||
+      isGitHubPRSuppressed(worktree, link.number)
+    ) {
+      return
+    }
+    const repo = findRepoForHost(state.repos, worktree.repoId, {
+      hostId: hostId ?? worktree.hostId,
+      settings: state.settings
+    })
+    if (!repo || (repo.kind && repo.kind !== 'git')) {
+      return
+    }
+    const sourceKey = terminalReviewSourceKey(repo)
+    const branch = branchName(worktree.branch)
+    let confirmedPushBranch: string | undefined
+    const origin = context
+      ? getWorkspaceAttachmentTerminalOrigin(state, worktreeId, context, hostId)
+      : undefined
+    if (context && !origin) {
+      return
+    }
+    const contextIsCurrent = (): boolean => {
+      if (!context) {
+        return true
+      }
+      const latest = get()
+      const latestOwner = resolveTerminalNotificationOwner(latest, worktreeId, context)
+      const latestOrigin = getWorkspaceAttachmentTerminalOrigin(latest, worktreeId, context, hostId)
+      return (
+        latestOwner?.executionHostId === hostId &&
+        Boolean(
+          latestOrigin &&
+          origin &&
+          getWorkspaceAttachmentOriginKey(latestOrigin) === getWorkspaceAttachmentOriginKey(origin)
+        )
+      )
+    }
+    const linked = getWorkspaceAttachments(worktree).find(
+      (item) =>
+        item.provider === 'github' &&
+        item.type === 'pr' &&
+        item.number === link.number &&
+        (!item.url || item.url === link.url)
+    )
+    const requestKey = JSON.stringify([hostId, worktreeId, link.url, origin])
+    if (pending.has(requestKey)) {
+      return
+    }
+    const stillEligible = (current: Worktree | undefined): boolean =>
+      Boolean(
+        current &&
+        contextIsCurrent() &&
+        !current.isArchived &&
+        !current.isBare &&
+        current.identity?.key === worktree.identity?.key &&
+        current.head === worktree.head &&
+        terminalReviewSourceKey(
+          findRepoForHost(get().repos, current.repoId, {
+            hostId: hostId ?? current.hostId,
+            settings: get().settings
+          })
+        ) === sourceKey &&
+        current.branch === worktree.branch &&
+        (!confirmedPushBranch || current.pushTarget?.branchName === confirmedPushBranch) &&
+        !isGitHubPRSuppressed(current, link.number)
+      )
+    const persist = async (): Promise<void> => {
+      const current = findKnownWorktreeById(get(), worktreeId, hostId)
+      if (!stillEligible(current)) {
+        return
+      }
+      const items = getWorkspaceAttachments(current)
+      const prior = items.find(
+        (item) =>
+          item.provider === 'github' &&
+          item.type === 'pr' &&
+          item.number === link.number &&
+          (!item.url || item.url === link.url)
+      )
+      if (linked && !prior) {
+        return
+      }
+      if (!origin && prior) {
+        return
+      }
+      const attachment: WorkspaceAttachment = {
+        ...(prior ?? { provider: 'github', type: 'pr', number: link.number }),
+        ...(origin
+          ? { url: link.url, origins: mergeWorkspaceAttachmentOrigins(prior?.origins, [origin]) }
+          : {})
+      }
+      if (prior && JSON.stringify(prior) === JSON.stringify(attachment)) {
+        return
+      }
+      const linkedItems = prior
+        ? items.map((item) =>
+            getWorkspaceAttachmentKey(item) === getWorkspaceAttachmentKey(prior) ? attachment : item
+          )
+        : [...items, attachment]
+      await get().updateWorktreeMeta(
+        worktreeId,
+        { linkedItems },
+        { executionHostId: hostId, shouldApply: stillEligible }
+      )
+    }
+    if (linked?.url === link.url && origin) {
+      pending.add(requestKey)
+      void persist()
+        .catch((error) => console.warn('Could not record reference terminal', error))
+        .finally(() => pending.delete(requestKey))
+      return
+    }
+    pending.add(requestKey)
+    const confirm = async (): Promise<boolean> => {
+      if (!linked) {
+        const exact = await lookupGitHubWorkItemByOwnerRepoForSource({
+          repoPath: repo.path,
+          repoId: repo.id,
+          sourceContext: buildTaskSourceContextFromRepo({
+            provider: 'github',
+            projectId: repo.id,
+            repo
+          }),
+          owner: link.slug.owner,
+          repo: link.slug.repo,
+          host: new URL(link.url).hostname,
+          number: link.number,
+          type: 'pr'
+        }).catch(() => null)
+        if (exact) {
+          const headBranch = exact.branchName?.trim()
+          const headMatches =
+            headBranch === branch || headBranch === worktree.pushTarget?.branchName
+          if (
+            exact.type !== 'pr' ||
+            exact.number !== link.number ||
+            exact.url !== link.url ||
+            (headBranch && !headMatches) ||
+            (exact.headSha && exact.headSha !== worktree.head)
+          ) {
+            return false
+          }
+          if (headBranch && exact.headSha && worktree.head) {
+            confirmedPushBranch = headBranch === branch ? undefined : headBranch
+            return true
+          }
+        }
+      }
+      // Older hosts may omit exact head evidence; retain their branch-confirmation path.
+      const pr = await readHostedReviewForRepo(repo, state.settings, {
+        branch,
+        force: true,
+        active: true,
+        currentHeadOid: worktree.head,
+        linkedGitHubPR: linked ? link.number : null,
+        linkedGitLabMR: null,
+        linkedBitbucketPR: null,
+        linkedAzureDevOpsPR: null,
+        linkedGiteaPR: null
+      })
+      return pr?.provider === 'github' && pr.number === link.number && pr.url === link.url
+    }
+    void confirm()
+      .then(async (confirmed) => {
+        if (confirmed) {
+          await persist()
+        }
+      })
+      .catch((error) => console.warn('Could not confirm terminal reference', error))
+      .finally(() => pending.delete(requestKey))
+  }
+}
diff --git a/src/renderer/src/store/slices/worktrees/session/worktree-unread-activity.ts b/src/renderer/src/store/slices/worktrees/session/worktree-unread-activity.ts
index bea375b8292b..fc8515ab5c3e 100644
--- a/src/renderer/src/store/slices/worktrees/session/worktree-unread-activity.ts
+++ b/src/renderer/src/store/slices/worktrees/session/worktree-unread-activity.ts
@@ -2,8 +2,6 @@ import type { WorktreeSlice } from '../../worktree-helpers'
 import type { WorktreeSliceGet, WorktreeSliceSet } from '../listing/worktree-slice-types'
 import { parseWorkspaceKey } from '../../../../../../shared/workspace-scope'
 import { applyWorktreeUpdates, getRepoIdFromWorktreeId } from '../../worktree-helpers'
-import { branchName } from '@/lib/git-utils'
-import { refreshHostedReviewCard } from '../../hosted-review-card-refresh'
 import {
   applyDetectedWorktreeUpdates,
   findKnownWorktreeById
@@ -16,7 +14,6 @@ import {
 } from '../listing/worktree-owner-settings'
 import { persistWorktreeMeta } from '../metadata/worktree-meta-persist'
 import { isRuntimeSelectorNotFoundError } from '../listing/runtime-worktree-rpc-errors'
-import { isGitHubPRSuppressed } from '../../../../../../shared/worktree/github-pr-suppression'
 
 export function createMarkWorktreeUnread(
   set: WorktreeSliceSet,
@@ -97,78 +94,6 @@ export function createMarkWorktreeUnread(
   }
 }
 
-export function createObserveTerminalGitHubPullRequestLink(
-  _set: WorktreeSliceSet,
-  get: WorktreeSliceGet
-): WorktreeSlice['observeTerminalGitHubPullRequestLink'] {
-  return (worktreeId, link) => {
-    const state = get()
-    const worktree = findKnownWorktreeById(state, worktreeId)
-    if (!worktree || worktree.isBare || worktree.isArchived) {
-      return
-    }
-    const repo = state.repos.find((candidate) => candidate.id === worktree.repoId)
-    if (!repo || (repo.kind && repo.kind !== 'git')) {
-      return
-    }
-    if (
-      isGitHubPRSuppressed(worktree, link.number) ||
-      (typeof worktree.linkedPR === 'number' && worktree.linkedPR !== link.number)
-    ) {
-      return
-    }
-
-    const branch = branchName(worktree.branch)
-    const alreadyLinked = worktree.linkedPR === link.number
-
-    const fetchPRForBranch = get().fetchPRForBranch
-    if (typeof fetchPRForBranch === 'function') {
-      void fetchPRForBranch(repo.path, branch, {
-        force: true,
-        repoId: repo.id,
-        worktreeId,
-        linkedPRNumber: alreadyLinked ? link.number : null,
-        fallbackPRNumber: null,
-        fallbackPRSource: alreadyLinked ? null : 'explicit',
-        reason: 'active'
-      }).then((pr) => {
-        if (!alreadyLinked && pr?.number === link.number) {
-          // Why: terminal output can carry arbitrary PR URLs (docs/agents/logs).
-          // Persist only after branch lookup confirms it and the user hasn't picked another PR mid-flight.
-          void get().updateWorktreeMeta(
-            worktreeId,
-            { linkedPR: link.number },
-            {
-              shouldApply: (currentWorktree) =>
-                Boolean(
-                  currentWorktree &&
-                  !currentWorktree.isBare &&
-                  !currentWorktree.isArchived &&
-                  !isGitHubPRSuppressed(currentWorktree, link.number) &&
-                  (currentWorktree.linkedPR == null || currentWorktree.linkedPR === link.number)
-                )
-            }
-          )
-        }
-      })
-      return
-    }
-
-    const fetchHostedReviewForBranch = get().fetchHostedReviewForBranch
-    if (typeof fetchHostedReviewForBranch === 'function') {
-      // Why: full app stores have fetchPRForBranch (syncs the hosted-review cache); this is only a slice-test fallback.
-      void refreshHostedReviewCard(fetchHostedReviewForBranch, {
-        repoPath: repo.path,
-        repoId: repo.id,
-        branch,
-        linkedGitHubPR: alreadyLinked ? link.number : null,
-        fallbackGitHubPR: null,
-        linkedGitLabMR: worktree.linkedGitLabMR ?? null
-      })
-    }
-  }
-}
-
 export function createClearWorktreeUnread(
   set: WorktreeSliceSet,
   get: WorktreeSliceGet
diff --git a/src/renderer/src/store/slices/worktrees/teardown/force-delete-preserved-branch.ts b/src/renderer/src/store/slices/worktrees/teardown/force-delete-preserved-branch.ts
index 5875371035bf..18b66df9f46e 100644
--- a/src/renderer/src/store/slices/worktrees/teardown/force-delete-preserved-branch.ts
+++ b/src/renderer/src/store/slices/worktrees/teardown/force-delete-preserved-branch.ts
@@ -86,15 +86,6 @@ export function createForceDeletePreservedBranch(
             },
             { timeoutMs: 15_000 }
           ))
-      if (options?.suppressToast !== true) {
-        toast.success(translate('auto.store.slices.worktrees.19db0085fb', 'Local branch deleted'), {
-          description: translate(
-            'auto.store.slices.worktrees.5a58e03a26',
-            'Deleted "{{value0}}".',
-            { value0: branchName }
-          )
-        })
-      }
       preservedBranchRuntimeTargetByCleanupKey.delete(
         retainedTarget ? preservedBranchCleanupKey(retainedTarget.cleanup) : requestedCleanupKey
       )
diff --git a/src/renderer/src/store/slices/worktrees/teardown/remove-worktree.ts b/src/renderer/src/store/slices/worktrees/teardown/remove-worktree.ts
index 626aeacc2bfa..1ad559bfe420 100644
--- a/src/renderer/src/store/slices/worktrees/teardown/remove-worktree.ts
+++ b/src/renderer/src/store/slices/worktrees/teardown/remove-worktree.ts
@@ -42,6 +42,7 @@ import { clearSessionCommitDraftForWorktree } from '@/lib/source-control-commit-
 import { dispatchWorktreeRemoval } from './dispatch-worktree-removal'
 import { tearDownRemovedWorktreeRendererState } from './removed-worktree-renderer-teardown'
 import { captureWorktreeStateBeforeRemoval } from './worktree-state-before-removal'
+import { resolveWorktreeRemovalPreference } from './worktree-removal-preference'
 
 export function createRemoveWorktree(
   set: WorktreeSliceSet,
@@ -49,7 +50,7 @@ export function createRemoveWorktree(
 ): WorktreeSlice['removeWorktree'] {
   return async (removalTarget, force, options) => {
     const worktreeId = removalTarget.id
-    const forgetLocalOnly = options?.mode === 'forget-local'
+    const policy = resolveWorktreeRemovalPreference(get().settings, force, options)
     // Why (STA-4343): this is the ONE chokepoint every delete entry point shares,
     // so host qualification is enforced here rather than at any single caller — a
     // guard bolted onto the sidebar would drift from the cleanup dialog's. The
@@ -60,7 +61,7 @@ export function createRemoveWorktree(
       get,
       worktreeId,
       requiredExecutionHostId,
-      forgetLocalOnly,
+      policy.forgetLocalOnly,
       options?.ignoreWorkspaceCleanupScanSurvivors === true
     )
     if (!start.ok) {
@@ -94,7 +95,7 @@ export function createRemoveWorktree(
     try {
       // Why: forget-local touches no remote, so there's no archive hook to run or trust prompt needed.
       // Why `get`: same-repo local deletes start together, and one approval must cover the rest.
-      const skipArchive = forgetLocalOnly
+      const skipArchive = policy.forgetLocalOnly
         ? true
         : (await ensureHooksConfirmed(
             get,
@@ -110,7 +111,7 @@ export function createRemoveWorktree(
         requiredExecutionHostId
       )
       const beforeRemoval = captureWorktreeStateBeforeRemoval(get(), worktreeId, hostId)
-      if (!forgetLocalOnly) {
+      if (!policy.forgetLocalOnly) {
         removalGenerationGuard?.assertCurrent()
       }
       // Why: forget-local clears Orca's records via local IPC regardless of host — the remote is gone or unreachable.
@@ -121,28 +122,28 @@ export function createRemoveWorktree(
             ? { ...get().settings, activeRuntimeEnvironmentId: null }
             : { activeRuntimeEnvironmentId: null }
       )
-      const unprovableRemoteRouting = forgetLocalOnly
+      const unprovableRemoteRouting = policy.forgetLocalOnly
         ? null
         : refuseUnprovableRemoteHostRouting(get, worktreeId, target.kind)
       if (unprovableRemoteRouting) {
         throw new Error(unprovableRemoteRouting)
       }
       let removalResult: RemoveWorktreeResult
-      let snapshotPruneHandledByLocalMain = forgetLocalOnly || target.kind === 'local'
+      let snapshotPruneHandledByLocalMain = policy.forgetLocalOnly || target.kind === 'local'
       try {
         removalResult = await dispatchWorktreeRemoval({
           worktreeId,
           hostId,
-          force,
+          force: policy.force,
           skipArchive,
           get,
           target,
-          options,
+          options: policy.options,
           assertCurrent: () => removalGenerationGuard?.assertCurrent()
         })
       } catch (error) {
         if (
-          !forgetLocalOnly &&
+          !policy.forgetLocalOnly &&
           target.kind !== 'local' &&
           (isRuntimeRepoNotFoundError(error) || isRuntimeSelectorNotFoundError(error))
         ) {
@@ -305,8 +306,8 @@ export function createRemoveWorktree(
       const error = readIpcErrorDetail(err) ?? (err instanceof Error ? err.message : String(err))
       const forceDeleteReason = classifyWorktreeForceDeleteReason(
         error,
-        force,
-        options?.allowUnverifiedPtyStop === true
+        policy.force,
+        policy.options?.allowUnverifiedPtyStop === true
       )
       const locked = isLockedWorktreeRemovalError(error)
       // Why (#19334): the refusal is the only failure a retry can clear by waiving rather than by
diff --git a/src/renderer/src/store/slices/worktrees/teardown/removed-worktree-chat-drafts.ts b/src/renderer/src/store/slices/worktrees/teardown/removed-worktree-chat-drafts.ts
index 14ae90b6e746..2579a1322f29 100644
--- a/src/renderer/src/store/slices/worktrees/teardown/removed-worktree-chat-drafts.ts
+++ b/src/renderer/src/store/slices/worktrees/teardown/removed-worktree-chat-drafts.ts
@@ -7,6 +7,11 @@ import {
   deleteNativeChatComposerDraftsOwnedBy,
   structuredAgentSessionDraftScopeKey
 } from '@/components/native-chat/native-chat-composer-draft-store'
+import {
+  clearNativeChatPendingAttachments,
+  dropNativeChatPendingAttachmentsForTab,
+  dropNativeChatPendingAttachmentsOwnedBy
+} from '@/components/native-chat/native-chat-pending-attachment-cache'
 
 /** Which unsent chat drafts a workspace owns: every draft that recorded it as its owner, open and
  *  closed chats alike, plus its open tabs' conversation keys and terminal tab ids (each tab's pane
@@ -47,15 +52,19 @@ export function captureWorkspaceChatDraftKeys(
   return { owners, conversations, terminalTabIds }
 }
 
-/** Only after the delete succeeded: a refused or failed one keeps the drafts. */
+/** Only after the delete succeeded: a refused or failed one keeps the drafts. Chips still on their
+ *  way go too, or one settling later would write a draft back that nothing could delete. */
 export function deleteWorkspaceChatDrafts(keys: WorkspaceChatDraftKeys): void {
   for (const owner of keys.owners) {
     deleteNativeChatComposerDraftsOwnedBy(owner)
+    dropNativeChatPendingAttachmentsOwnedBy(owner)
   }
   for (const key of keys.conversations) {
     deleteNativeChatComposerDraft(key)
+    clearNativeChatPendingAttachments(key)
   }
   for (const tabId of keys.terminalTabIds) {
     deleteNativeChatComposerDraftsForTab(tabId)
+    dropNativeChatPendingAttachmentsForTab(tabId)
   }
 }
diff --git a/src/renderer/src/store/slices/worktrees/teardown/worktree-purge-state.ts b/src/renderer/src/store/slices/worktrees/teardown/worktree-purge-state.ts
index 26f86df28100..39552a15a3e5 100644
--- a/src/renderer/src/store/slices/worktrees/teardown/worktree-purge-state.ts
+++ b/src/renderer/src/store/slices/worktrees/teardown/worktree-purge-state.ts
@@ -15,7 +15,7 @@ import {
   shouldRetainStructuredAgentSessionLaunchTab,
   structuredLaunchStates
 } from '@/lib/structured-agent-session-launch-registry'
-import { discardStructuredAgentSessionLaunchOutbox } from '@/components/native-chat/structured-agent-session-outbox-storage'
+import { discardStructuredAgentSessionChatSends } from '@/lib/structured-agent-session-launch-prompt'
 import { clearWebSessionFocusIntentIfMatches } from '@/runtime/web-session-focus-intent'
 import {
   structuredAgentSessionFocusOwner,
@@ -44,7 +44,7 @@ export function buildWorktreePurgeState(
         launch.intent.sessionId,
         launch.intent.executionHostId
       )
-      discardStructuredAgentSessionLaunchOutbox(launch.intent.sessionId)
+      discardStructuredAgentSessionChatSends(launch.intent.sessionId)
       clearWebSessionFocusIntentIfMatches(
         structuredAgentSessionFocusOwner(launch.intent.target),
         worktreeId,
@@ -67,7 +67,7 @@ export function buildWorktreePurgeState(
         shouldRetainStructuredAgentSessionLaunchTab(worktreeId, tab.entityId)
       ) {
         markStructuredAgentSessionLaunchCancelledSilently(worktreeId, tab.entityId, owner)
-        discardStructuredAgentSessionLaunchOutbox(tab.entityId)
+        discardStructuredAgentSessionChatSends(tab.entityId)
         clearWebSessionFocusIntentIfMatches(
           structuredAgentSessionFocusOwner(target),
           worktreeId,
diff --git a/src/renderer/src/store/slices/worktrees/teardown/worktree-removal-preference.ts b/src/renderer/src/store/slices/worktrees/teardown/worktree-removal-preference.ts
new file mode 100644
index 000000000000..0e3bfe5af9fb
--- /dev/null
+++ b/src/renderer/src/store/slices/worktrees/teardown/worktree-removal-preference.ts
@@ -0,0 +1,20 @@
+import type { GlobalSettings } from '../../../../../../shared/global-settings-types'
+import type { RemoveWorktreeOptions } from '../../worktree-removal-options'
+
+export function resolveWorktreeRemovalPreference(
+  settings: GlobalSettings | null,
+  force: boolean | undefined,
+  options: RemoveWorktreeOptions | undefined
+): {
+  forgetLocalOnly: boolean
+  force: boolean | undefined
+  options: RemoveWorktreeOptions | undefined
+} {
+  const forgetLocalOnly = options?.mode === 'forget-local'
+  const alwaysForceDelete = !forgetLocalOnly && settings?.alwaysForceDeleteWorktrees === true
+  return {
+    forgetLocalOnly,
+    force: alwaysForceDelete || force,
+    options: alwaysForceDelete ? { ...options, allowUnverifiedPtyStop: true } : options
+  }
+}
diff --git a/src/renderer/src/store/terminals/terminal-exited-pane-liveness.test.ts b/src/renderer/src/store/terminals/terminal-exited-pane-liveness.test.ts
new file mode 100644
index 000000000000..141d3141b641
--- /dev/null
+++ b/src/renderer/src/store/terminals/terminal-exited-pane-liveness.test.ts
@@ -0,0 +1,76 @@
+import { describe, expect, it, vi } from 'vitest'
+import type { TerminalLayoutSnapshot } from '../../../../shared/terminal-tab-types'
+import { tabHasLivePty } from '@/lib/tab-has-live-pty'
+import { createTestStore, makeTab, makeWorktree } from '../slices/store-test-helpers'
+import { createStoreSessionMockApi } from '../slices/store-session-test-harness'
+
+vi.mock('sonner', () => ({ toast: { info: vi.fn(), success: vi.fn(), error: vi.fn() } }))
+
+createStoreSessionMockApi()
+
+// "Is this pane running" reads the liveness map; an exit leaves the pane's layout binding in place
+// for its one stale reattach. The mirror refactor keeps this split: liveness stays in the window,
+// the binding becomes main's.
+
+const WORKTREE = 'repo1::/path/wt1'
+const LEFT = '11111111-1111-4111-8111-111111111111'
+const RIGHT = '22222222-2222-4222-8222-222222222222'
+
+function splitLayout(): TerminalLayoutSnapshot {
+  return {
+    root: {
+      type: 'split',
+      direction: 'vertical',
+      first: { type: 'leaf', leafId: LEFT },
+      second: { type: 'leaf', leafId: RIGHT }
+    },
+    activeLeafId: LEFT,
+    expandedLeafId: null,
+    ptyIdsByLeafId: { [LEFT]: 'pty-left', [RIGHT]: 'pty-right' }
+  }
+}
+
+function storeWithSplitTab() {
+  const store = createTestStore()
+  store.setState({
+    repos: [{ id: 'repo1', path: '/repo1', displayName: 'Repo 1', badgeColor: '#000', addedAt: 0 }],
+    worktreesByRepo: {
+      repo1: [makeWorktree({ id: WORKTREE, repoId: 'repo1', path: '/path/wt1', hostId: 'local' })]
+    },
+    tabsByWorktree: {
+      [WORKTREE]: [makeTab({ id: 'tab-1', worktreeId: WORKTREE, ptyId: 'pty-right' })]
+    },
+    ptyIdsByTabId: { 'tab-1': ['pty-left', 'pty-right'] },
+    terminalLayoutsByTabId: { 'tab-1': splitLayout() }
+  })
+  return store
+}
+
+describe('exited pane in a split', () => {
+  it('drops only the exited PTY from liveness and keeps every layout binding', () => {
+    const store = storeWithSplitTab()
+
+    // Ctrl-D in the left pane.
+    store.getState().clearTabPtyId('tab-1', 'pty-left')
+
+    const state = store.getState()
+    expect(state.ptyIdsByTabId['tab-1']).toEqual(['pty-right'])
+    expect(tabHasLivePty(state.ptyIdsByTabId, 'tab-1')).toBe(true)
+    expect(state.terminalLayoutsByTabId['tab-1']).toEqual(splitLayout())
+  })
+
+  it('reads the tab as not running once both panes exit, with the bindings still saved', () => {
+    const store = storeWithSplitTab()
+
+    store.getState().clearTabPtyId('tab-1', 'pty-left')
+    store.getState().clearTabPtyId('tab-1', 'pty-right')
+
+    const state = store.getState()
+    expect(tabHasLivePty(state.ptyIdsByTabId, 'tab-1')).toBe(false)
+    expect(state.tabsByWorktree[WORKTREE]?.[0]?.ptyId).toBeNull()
+    expect(state.terminalLayoutsByTabId['tab-1']?.ptyIdsByLeafId).toEqual({
+      [LEFT]: 'pty-left',
+      [RIGHT]: 'pty-right'
+    })
+  })
+})
diff --git a/src/renderer/src/store/terminals/terminal-tab-close.ts b/src/renderer/src/store/terminals/terminal-tab-close.ts
index 82586bbefdc6..8b16669d7f9d 100644
--- a/src/renderer/src/store/terminals/terminal-tab-close.ts
+++ b/src/renderer/src/store/terminals/terminal-tab-close.ts
@@ -20,6 +20,7 @@ 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'
 import { deleteNativeChatComposerDraftsForTab } from '@/components/native-chat/native-chat-composer-draft-store'
+import { dropNativeChatPendingAttachmentsForTab } from '@/components/native-chat/native-chat-pending-attachment-cache'
 import { noteAgentLaunchPaneClosedByUser } from '@/lib/agent-launch-pane-closes'
 
 export function createTerminalTabCloseActions(
@@ -272,6 +273,7 @@ export function createTerminalTabCloseActions(
       // workspace is removed in Orca; drafts have no budget that retires them.
       if (closeReason === 'user') {
         deleteNativeChatComposerDraftsForTab(tabId)
+        dropNativeChatPendingAttachmentsForTab(tabId)
       }
       // 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)
diff --git a/src/renderer/src/web/preload-api/web-agent-session-attachment-upload.test.ts b/src/renderer/src/web/preload-api/web-agent-session-attachment-upload.test.ts
new file mode 100644
index 000000000000..4b1e6b56af93
--- /dev/null
+++ b/src/renderer/src/web/preload-api/web-agent-session-attachment-upload.test.ts
@@ -0,0 +1,81 @@
+import { beforeEach, describe, expect, it, vi } from 'vitest'
+
+type TestEnvironment = { id: string; createdAt: number; pairingRevision?: number }
+
+const mocks = vi.hoisted(() => {
+  const activeEnvironment: TestEnvironment = { id: 'env-1', createdAt: 1, pairingRevision: 7 }
+  return { callEnvironmentEnvelope: vi.fn(), activeEnvironment }
+})
+
+vi.mock('./web-runtime-calls', () => ({ callEnvironmentEnvelope: mocks.callEnvironmentEnvelope }))
+vi.mock('./web-runtime-session', () => ({
+  resolveEnvironment: (selector: string) => {
+    if (selector !== mocks.activeEnvironment.id) {
+      throw new Error(`Unknown Orca runtime environment: ${selector}`)
+    }
+    return mocks.activeEnvironment
+  }
+}))
+vi.mock('@/lib/browser-uuid', () => ({ createBrowserUuid: () => 'uuid-1' }))
+
+import { saveClipboardImageAsWebAgentSessionAttachment } from './web-agent-session-attachment-upload'
+
+const target = {
+  environmentId: 'env-1',
+  sessionId: 'session-1',
+  expectedEnvironmentPairingRevision: 7,
+  expectedEnvironmentRuntimeId: 'runtime-a'
+}
+
+function reply(result: unknown, runtimeId = 'runtime-a') {
+  return { id: 'r', ok: true, result, _meta: { runtimeId } }
+}
+
+beforeEach(() => {
+  mocks.callEnvironmentEnvelope.mockReset()
+  mocks.activeEnvironment = { id: 'env-1', createdAt: 1, pairingRevision: 7 }
+})
+
+describe('saveClipboardImageAsWebAgentSessionAttachment', () => {
+  it('uploads to the server the paste was meant for and returns its stored path', async () => {
+    mocks.callEnvironmentEnvelope.mockImplementation(async (_env: string, method: string) =>
+      method === 'agentSessionAttachment.uploadStart'
+        ? reply({ uploadId: 'u1' })
+        : method === 'agentSessionAttachment.uploadCommit'
+          ? reply({ path: '/srv/agent-session-attachments/u1/p.png', name: 'p.png', byteLength: 3 })
+          : reply({ receivedBytes: 3 })
+    )
+    await expect(
+      saveClipboardImageAsWebAgentSessionAttachment(Buffer.from('png').toString('base64'), target)
+    ).resolves.toBe('/srv/agent-session-attachments/u1/p.png')
+    for (const call of mocks.callEnvironmentEnvelope.mock.calls) {
+      expect(call[0]).toBe('env-1')
+    }
+  })
+
+  it('stops when a different server process answers, storing nothing more', async () => {
+    mocks.callEnvironmentEnvelope.mockResolvedValue(reply({ uploadId: 'u1' }, 'runtime-b'))
+    await expect(
+      saveClipboardImageAsWebAgentSessionAttachment(Buffer.from('png').toString('base64'), target)
+    ).rejects.toThrow('paired Orca server changed')
+    expect(mocks.callEnvironmentEnvelope).toHaveBeenCalledTimes(1)
+  })
+
+  it('refuses before uploading once the server was re-paired', async () => {
+    mocks.activeEnvironment = { id: 'env-1', createdAt: 1, pairingRevision: 8 }
+    await expect(
+      saveClipboardImageAsWebAgentSessionAttachment(Buffer.from('png').toString('base64'), target)
+    ).rejects.toThrow('paired Orca server changed')
+    expect(mocks.callEnvironmentEnvelope).not.toHaveBeenCalled()
+  })
+
+  it('refuses when the paste was meant for a server this client no longer pairs with', async () => {
+    await expect(
+      saveClipboardImageAsWebAgentSessionAttachment(Buffer.from('png').toString('base64'), {
+        ...target,
+        environmentId: 'env-other'
+      })
+    ).rejects.toThrow('Unknown Orca runtime environment')
+    expect(mocks.callEnvironmentEnvelope).not.toHaveBeenCalled()
+  })
+})
diff --git a/src/renderer/src/web/preload-api/web-agent-session-attachment-upload.ts b/src/renderer/src/web/preload-api/web-agent-session-attachment-upload.ts
new file mode 100644
index 000000000000..b32c0bc63405
--- /dev/null
+++ b/src/renderer/src/web/preload-api/web-agent-session-attachment-upload.ts
@@ -0,0 +1,89 @@
+import {
+  AGENT_SESSION_ATTACHMENT_CHUNK_BASE64_CHARS,
+  agentSessionPastedImageName,
+  type AgentSessionAttachmentUploadCommitResult,
+  type AgentSessionAttachmentUploadTarget
+} from '../../../../shared/agent-session-attachments'
+import { callEnvironmentEnvelope } from './web-runtime-calls'
+import { resolveEnvironment } from './web-runtime-session'
+import { createBrowserUuid } from '@/lib/browser-uuid'
+
+const ATTACHMENT_CALL_TIMEOUT_MS = 30_000
+const SERVER_CHANGED = 'The paired Orca server changed while the request was in progress.'
+
+/** Every call goes to the server the paste was meant for, as its desktop counterpart does: a
+ *  re-pair or a replaced server process ends the upload instead of storing it elsewhere. */
+async function callPinned<TResult>(
+  target: AgentSessionAttachmentUploadTarget,
+  method: string,
+  params: unknown
+): Promise<TResult> {
+  const environment = resolveEnvironment(target.environmentId)
+  if (
+    target.expectedEnvironmentPairingRevision !== undefined &&
+    (environment.pairingRevision ?? environment.createdAt) !==
+      target.expectedEnvironmentPairingRevision
+  ) {
+    throw new Error(SERVER_CHANGED)
+  }
+  const response = await callEnvironmentEnvelope<TResult>(
+    environment.id,
+    method,
+    params,
+    ATTACHMENT_CALL_TIMEOUT_MS
+  )
+  // A failure may come from this side and name no server process; a success always names one.
+  const runtimeId = response._meta?.runtimeId ?? null
+  if ((response.ok || runtimeId !== null) && runtimeId !== target.expectedEnvironmentRuntimeId) {
+    throw new Error(SERVER_CHANGED)
+  }
+  if (!response.ok) {
+    throw new Error(response.error.message || response.error.code)
+  }
+  return response.result
+}
+
+/** The browser client's paste into a structured chat: the same store the desktop client uses. */
+export async function saveClipboardImageAsWebAgentSessionAttachment(
+  contentBase64: string,
+  target: AgentSessionAttachmentUploadTarget
+): Promise<string> {
+  const padding = contentBase64.endsWith('==') ? 2 : contentBase64.endsWith('=') ? 1 : 0
+  const byteLength = (contentBase64.length / 4) * 3 - padding
+  const { uploadId } = await callPinned<{ uploadId: string }>(
+    target,
+    'agentSessionAttachment.uploadStart',
+    {
+      sessionId: target.sessionId,
+      name: agentSessionPastedImageName(Date.now(), createBrowserUuid()),
+      byteLength
+    }
+  )
+  try {
+    // Chunks are a multiple of 4 base64 characters, so each starts on a byte boundary.
+    for (
+      let charOffset = 0;
+      charOffset < Math.max(contentBase64.length, 1);
+      charOffset += AGENT_SESSION_ATTACHMENT_CHUNK_BASE64_CHARS
+    ) {
+      await callPinned(target, 'agentSessionAttachment.uploadAppend', {
+        uploadId,
+        offset: (charOffset / 4) * 3,
+        contentBase64: contentBase64.slice(
+          charOffset,
+          charOffset + AGENT_SESSION_ATTACHMENT_CHUNK_BASE64_CHARS
+        )
+      })
+    }
+    const stored = await callPinned<AgentSessionAttachmentUploadCommitResult>(
+      target,
+      'agentSessionAttachment.uploadCommit',
+      { uploadId }
+    )
+    return stored.path
+  } catch (error) {
+    // Only to the same server: an abort a re-pair refuses is left to that server's idle expiry.
+    await callPinned(target, 'agentSessionAttachment.uploadAbort', { uploadId }).catch(() => {})
+    throw error
+  }
+}
diff --git a/src/renderer/src/web/preload-api/web-filesystem-api.ts b/src/renderer/src/web/preload-api/web-filesystem-api.ts
index ec7c0a7e1798..e11ac26b0eb1 100644
--- a/src/renderer/src/web/preload-api/web-filesystem-api.ts
+++ b/src/renderer/src/web/preload-api/web-filesystem-api.ts
@@ -168,6 +168,7 @@ export function createFileApi(): NonNullable<Partial<PreloadApi>['fs']> {
       throw new Error('Uploading local files is not supported in the web client')
     },
     resolveDroppedPathsForAgent: async () => ({ resolvedPaths: [], skipped: [], failed: [] }),
+    uploadPathsToAgentSessionAttachments: async () => ({ uploaded: [], skipped: [], failed: [] }),
     watchWorktree: () => Promise.resolve(),
     unwatchWorktree: () => Promise.resolve(),
     onFsChanged: () => noopUnsubscribe
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 fcd16fab1754..97212f496e1c 100644
--- a/src/renderer/src/web/preload-api/web-terminal-api.ts
+++ b/src/renderer/src/web/preload-api/web-terminal-api.ts
@@ -44,6 +44,7 @@ export function createPtyApi(): NonNullable<Partial<PreloadApi>['pty']> {
     isCodexOnSharedServer: () => Promise.resolve({ joined: false }),
     disableCodexSharedServerAutoStart: () => Promise.resolve(false),
     stopCodexSharedServer: () => Promise.resolve(false),
+    openedBeforeClaudeAccounts: () => Promise.resolve(false),
     getCwd: () => Promise.resolve('~'),
     getSize: () => Promise.resolve(null),
     listSessions: () => Promise.resolve([]),
diff --git a/src/renderer/src/web/preload-api/web-ui-api.ts b/src/renderer/src/web/preload-api/web-ui-api.ts
index b015e1647b4e..9ac0c927e7dc 100644
--- a/src/renderer/src/web/preload-api/web-ui-api.ts
+++ b/src/renderer/src/web/preload-api/web-ui-api.ts
@@ -1,3 +1,5 @@
+import type { AgentSessionAttachmentClipboardTarget } from '../../../../shared/agent-session-attachments'
+import { saveClipboardImageAsWebAgentSessionAttachment } from './web-agent-session-attachment-upload'
 import { createWebExplorerRootSync } from './web-explorer-root-sync'
 import type { PreloadApi } from '../../../../preload/api-types'
 import { assertClipboardTextWithinLimitWithYield } from '../../../../shared/clipboard-text'
@@ -149,6 +151,7 @@ export function createWebUiApi(): NonNullable<Partial<PreloadApi>['ui']> {
     saveClipboardImageAsTempFile: async (args?: {
       connectionId?: string | null
       runtimeEnvironmentId?: string | null
+      agentSessionAttachment?: AgentSessionAttachmentClipboardTarget
     }) => {
       if (!requireActiveEnvironmentOrNull()) {
         return null
@@ -157,6 +160,15 @@ export function createWebUiApi(): NonNullable<Partial<PreloadApi>['ui']> {
       if (!contentBase64) {
         return null
       }
+      if (args?.agentSessionAttachment) {
+        if (!args.runtimeEnvironmentId) {
+          throw new Error('A chat attachment needs the server the chat runs on.')
+        }
+        return saveClipboardImageAsWebAgentSessionAttachment(contentBase64, {
+          ...args.agentSessionAttachment,
+          environmentId: args.runtimeEnvironmentId
+        })
+      }
       return saveClipboardImageAsTempFileInRuntime(contentBase64, args)
     },
     clipboardHasImage,
@@ -270,7 +282,6 @@ export function createWebUiApi(): NonNullable<Partial<PreloadApi>['ui']> {
     onTerminalZoom: () => noopUnsubscribe,
     // Why: a paired web client has no OS sleep signal; occlusion-driven visibilitychange already covers wake recovery.
     onSystemResumed: () => noopUnsubscribe,
-    onFileDrop: () => noopUnsubscribe,
     syncTrafficLights: () => {},
     setMarkdownEditorFocused: () => {},
     setRichMarkdownContextMenuTarget: () => {},
diff --git a/src/renderer/src/web/preload-api/web-worktree-attachment-mutations.test.ts b/src/renderer/src/web/preload-api/web-worktree-attachment-mutations.test.ts
new file mode 100644
index 000000000000..d8d8ec140bdd
--- /dev/null
+++ b/src/renderer/src/web/preload-api/web-worktree-attachment-mutations.test.ts
@@ -0,0 +1,106 @@
+import { beforeEach, describe, expect, it, vi } from 'vitest'
+import {
+  WORKTREE_LINKED_ITEMS_DELTA_RUNTIME_CAPABILITY,
+  WORKTREE_LINKED_ITEMS_RUNTIME_CAPABILITY
+} from '../../../../shared/workspace-attachment-capabilities'
+import { createWorktreesApi } from './web-worktrees-api'
+
+const mocks = vi.hoisted(() => ({ status: vi.fn(), call: vi.fn(), assertEnvironment: vi.fn() }))
+vi.mock('@/i18n/i18n', () => ({ translate: (_key: string, fallback: string) => fallback }))
+vi.mock('./web-runtime-calls', () => ({
+  getRemoteRuntimeStatus: mocks.status,
+  callRuntimeResultWithOwner: mocks.call,
+  callRuntimeResult: vi.fn(),
+  withRuntimeWorktreeOwner: (row: unknown) => row
+}))
+vi.mock('./web-runtime-session', () => ({
+  invalidateRuntimeWorktreeCaches: vi.fn(),
+  requireActiveEnvironment: () => ({ id: 'env' }),
+  assertActiveEnvironment: mocks.assertEnvironment
+}))
+vi.mock('./web-runtime-worktree-catalog', () => ({
+  WEB_RUNTIME_WORKTREE_LIST_LIMIT: 500,
+  callRuntimeDetectedWorktrees: vi.fn(),
+  listAllRuntimeWorktrees: vi.fn()
+}))
+
+beforeEach(() => {
+  vi.clearAllMocks()
+  mocks.call.mockResolvedValue({ result: { worktree: { id: 'wt' } }, hostId: 'runtime:env' })
+})
+
+describe('paired web attachment mutation compatibility', () => {
+  it.each([{ linkedPR: null }, { linkedIssue: 9 }, { linkedIssue: null }])(
+    'forwards legacy scalar writes without a collection capability: %j',
+    async (updates) => {
+      mocks.status.mockResolvedValue({ capabilities: [] })
+      await createWorktreesApi().updateMeta({ worktreeId: 'wt', updates })
+      expect(mocks.status).not.toHaveBeenCalled()
+      expect(mocks.call).toHaveBeenCalledWith('worktree.set', { worktree: 'id:wt', ...updates })
+    }
+  )
+  it.each([true, false])(
+    'shapes positive review selection for collection support %s',
+    async (supported) => {
+      mocks.status.mockResolvedValue({
+        capabilities: supported ? [WORKTREE_LINKED_ITEMS_RUNTIME_CAPABILITY] : []
+      })
+      await createWorktreesApi().updateMeta({ worktreeId: 'wt', updates: { linkedGitLabMR: 7 } })
+      expect(mocks.call).toHaveBeenCalledWith('worktree.set', {
+        worktree: 'id:wt',
+        linkedGitLabMR: 7,
+        ...(supported
+          ? {}
+          : {
+              linkedPR: null,
+              linkedBitbucketPR: null,
+              linkedAzureDevOpsPR: null,
+              linkedGiteaPR: null
+            })
+      })
+      expect(mocks.assertEnvironment).toHaveBeenCalledWith('env')
+    }
+  )
+  it('does not send a scalar selection to a different host after capability discovery', async () => {
+    mocks.status.mockResolvedValue({ capabilities: [] })
+    mocks.assertEnvironment.mockImplementationOnce(() => {
+      throw new Error('host changed')
+    })
+    await expect(
+      createWorktreesApi().updateMeta({ worktreeId: 'wt', updates: { linkedPR: 42 } })
+    ).rejects.toThrow('host changed')
+    expect(mocks.call).not.toHaveBeenCalled()
+  })
+  it('refuses an atomic update when the paired host only supports collection replacement', async () => {
+    mocks.status.mockResolvedValue({ capabilities: [WORKTREE_LINKED_ITEMS_RUNTIME_CAPABILITY] })
+    const updates = { linkedItems: [], linkedItemsBase: [] }
+    await expect(createWorktreesApi().updateMeta({ worktreeId: 'wt', updates })).rejects.toThrow(
+      'Update the remote runtime'
+    )
+    expect(mocks.call).not.toHaveBeenCalled()
+  })
+  it('forwards the snapshot to a capable paired host', async () => {
+    mocks.status.mockResolvedValue({
+      capabilities: [
+        WORKTREE_LINKED_ITEMS_RUNTIME_CAPABILITY,
+        WORKTREE_LINKED_ITEMS_DELTA_RUNTIME_CAPABILITY
+      ]
+    })
+    const updates = { linkedItems: [], linkedItemsBase: [], linkedItemsSelectionChanged: false }
+    await createWorktreesApi().updateMeta({ worktreeId: 'wt', updates })
+    expect(mocks.assertEnvironment).toHaveBeenCalledWith('env')
+    expect(mocks.call).toHaveBeenCalledWith('worktree.set', { worktree: 'id:wt', ...updates })
+  })
+  it('gates creation and forwards its collection', async () => {
+    const args = { repoId: 'repo', name: 'Work', baseBranch: 'main', linkedItems: [] }
+    mocks.status.mockResolvedValue({ capabilities: [] })
+    await expect(createWorktreesApi().create(args)).rejects.toThrow('Update the remote runtime')
+    expect(mocks.call).not.toHaveBeenCalled()
+    mocks.status.mockResolvedValue({ capabilities: [WORKTREE_LINKED_ITEMS_RUNTIME_CAPABILITY] })
+    await createWorktreesApi().create(args)
+    expect(mocks.call).toHaveBeenCalledWith(
+      'worktree.create',
+      expect.objectContaining({ linkedItems: [] })
+    )
+  })
+})
diff --git a/src/renderer/src/web/preload-api/web-worktrees-api.ts b/src/renderer/src/web/preload-api/web-worktrees-api.ts
index ee626b187547..1eacab680064 100644
--- a/src/renderer/src/web/preload-api/web-worktrees-api.ts
+++ b/src/renderer/src/web/preload-api/web-worktrees-api.ts
@@ -1,3 +1,10 @@
+import type { Worktree, WorkspaceAttachment } from '../../../../shared/worktree/types'
+import type { WorkspaceAttachmentMutation } from '../../../../shared/workspace-attachment-mutation'
+import { getLegacyWorkspaceReviewSelectionUpdates } from '../../../../shared/workspace-attachment-legacy'
+import {
+  WORKTREE_LINKED_ITEMS_RUNTIME_CAPABILITY,
+  WORKTREE_LINKED_ITEMS_DELTA_RUNTIME_CAPABILITY
+} from '../../../../shared/workspace-attachment-capabilities'
 import type { PreloadApi } from '../../../../preload/api-types'
 import type {
   ForceDeleteWorktreeBranchResult,
@@ -6,21 +13,26 @@ import type {
 import type { WorkspaceLineage, WorktreeLineage } from '../../../../shared/worktree/lineage-types'
 import { readRetiredNameRegistryForRepo } from '../../../../shared/worktree/retired-name-cache'
 import { EMPTY_RETIRED_NAME_REGISTRY } from '../../../../shared/worktree/retired-name-registry'
-import type { Worktree } from '../../../../shared/worktree/types'
 import { worktreeRemovalReplyTimeoutMs } from '../../../../shared/worktree/archive-hook-removal-gate'
 import { toRuntimeWorktreeSelector } from '../../runtime/runtime-worktree-selector'
 import {
+  getRemoteRuntimeStatus,
   callRuntimeResult,
   callRuntimeResultWithOwner,
   withRuntimeWorktreeOwner
 } from './web-runtime-calls'
-import { invalidateRuntimeWorktreeCaches } from './web-runtime-session'
+import {
+  invalidateRuntimeWorktreeCaches,
+  requireActiveEnvironment,
+  assertActiveEnvironment
+} from './web-runtime-session'
 import {
   WEB_RUNTIME_WORKTREE_LIST_LIMIT,
   callRuntimeDetectedWorktrees,
   listAllRuntimeWorktrees
 } from './web-runtime-worktree-catalog'
 import { noopUnsubscribe } from './web-storage'
+import { translate } from '@/i18n/i18n'
 
 export function createWorktreesApi(): NonNullable<Partial<PreloadApi>['worktrees']> {
   return {
@@ -48,6 +60,9 @@ export function createWorktreesApi(): NonNullable<Partial<PreloadApi>['worktrees
     listDetected: async ({ repoId }) => callRuntimeDetectedWorktrees(repoId),
     listAll: () => listAllRuntimeWorktrees(),
     create: async (args) => {
+      if (args.linkedItems !== undefined) {
+        await assertAttachmentWriteSupported(args)
+      }
       invalidateRuntimeWorktreeCaches()
       const owned = await callRuntimeResultWithOwner<{ worktree: Worktree }>('worktree.create', {
         repo: args.repoId,
@@ -60,6 +75,7 @@ export function createWorktreesApi(): NonNullable<Partial<PreloadApi>['worktrees
         branchNameOverride: args.branchNameOverride,
         linkedIssue: args.linkedIssue,
         linkedPR: args.linkedPR,
+        ...(args.linkedItems !== undefined ? { linkedItems: args.linkedItems } : {}),
         linkedLinearIssue: args.linkedLinearIssue,
         linkedLinearIssueWorkspaceId: args.linkedLinearIssueWorkspaceId,
         linkedLinearIssueOrganizationUrlKey: args.linkedLinearIssueOrganizationUrlKey,
@@ -157,6 +173,18 @@ export function createWorktreesApi(): NonNullable<Partial<PreloadApi>['worktrees
         ...(hostId ? { hostId } : {})
       }),
     updateMeta: async ({ worktreeId, updates }) => {
+      if (updates.linkedItems !== undefined) {
+        await assertAttachmentWriteSupported(updates)
+      }
+      const legacySelection = getLegacyWorkspaceReviewSelectionUpdates(updates)
+      if (legacySelection !== updates) {
+        const environmentId = requireActiveEnvironment().id
+        const status = await getRemoteRuntimeStatus()
+        assertActiveEnvironment(environmentId)
+        if (!status.capabilities?.includes(WORKTREE_LINKED_ITEMS_RUNTIME_CAPABILITY)) {
+          updates = legacySelection
+        }
+      }
       const rpcUpdates =
         Object.hasOwn(updates, 'pushTarget') && updates.pushTarget === undefined
           ? { ...updates, pushTarget: null }
@@ -195,3 +223,23 @@ export function createWorktreesApi(): NonNullable<Partial<PreloadApi>['worktrees
     onRemoteBranchConflict: () => noopUnsubscribe
   }
 }
+
+async function assertAttachmentWriteSupported(
+  updates: { linkedItems?: WorkspaceAttachment[] } & WorkspaceAttachmentMutation
+): Promise<void> {
+  const environmentId = requireActiveEnvironment().id
+  const status = await getRemoteRuntimeStatus()
+  assertActiveEnvironment(environmentId)
+  if (
+    !status.capabilities?.includes(WORKTREE_LINKED_ITEMS_RUNTIME_CAPABILITY) ||
+    (updates.linkedItemsBase !== undefined &&
+      !status.capabilities?.includes(WORKTREE_LINKED_ITEMS_DELTA_RUNTIME_CAPABILITY))
+  ) {
+    throw new Error(
+      translate(
+        'workspace.attachments.updateRuntimeSafely',
+        'Update the remote runtime to safely change workspace links'
+      )
+    )
+  }
+}
diff --git a/src/renderer/src/web/web-preload-api-composition.test.ts b/src/renderer/src/web/web-preload-api-composition.test.ts
index 2e67ca4391c7..c09c1336dc70 100644
--- a/src/renderer/src/web/web-preload-api-composition.test.ts
+++ b/src/renderer/src/web/web-preload-api-composition.test.ts
@@ -80,6 +80,7 @@ describe('web preload API composition', () => {
       'telemetryGetConsentState',
       'telemetryAcknowledgeBanner'
     ])
+    expect('onFileDrop' in globals.window.api.ui).toBe(false)
     expect(Object.keys(globals.window.api.projects)).toEqual([])
     const projects: Record<string, unknown> = globals.window.api.projects
     expect(projects.then).toBeUndefined()
diff --git a/src/shared/agent-child-row-lead-trail.ts b/src/shared/agent-child-row-lead-trail.ts
new file mode 100644
index 000000000000..c889f04a5125
--- /dev/null
+++ b/src/shared/agent-child-row-lead-trail.ts
@@ -0,0 +1,26 @@
+// How a child row's one line reads, for every surface that words it in its own language: the name
+// (or the state when the child reported none), and which of name and detail leads.
+
+import type { AgentChildRowModel } from './agent-child-row-model'
+import type { AgentChildDisplayState } from './agent-status-child-work-display'
+
+/** The row's name, or its state's words when the child reported none. */
+export function agentChildRowName(
+  row: Pick<AgentChildRowModel, 'name' | 'displayState'>,
+  stateLabel: (state: AgentChildDisplayState) => string
+): string {
+  return row.name.trim() || stateLabel(row.displayState)
+}
+
+/** A row's one line from its name and detail words; '' trail when there is nothing more to say. */
+export function agentChildRowLeadTrail(
+  row: Pick<AgentChildRowModel, 'displayState'>,
+  name: string,
+  detail: string
+): { lead: string; trail: string } {
+  // 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/shared/agent-child-row-stream-context.ts b/src/shared/agent-child-row-stream-context.ts
new file mode 100644
index 000000000000..750687f3d43f
--- /dev/null
+++ b/src/shared/agent-child-row-stream-context.ts
@@ -0,0 +1,18 @@
+import type { AgentChildRowContext } from './agent-child-row-model'
+
+/** The context a structured session's own stream gives the children it publishes, for a reader
+ *  holding no status row for that session (the phone). The host owns the session, so its evidence
+ *  never ages out (as a host-owned row's does not); only losing the stream makes a live claim
+ *  unverifiable. `hostClockOffsetMs` is reader clock minus host clock. No parent clock: the stream
+ *  publishes child views or the task roster, never the `subagents` snapshot that reads one. */
+export function agentChildRowContextForSessionStream(
+  streamLive: boolean,
+  hostClockOffsetMs: number
+): AgentChildRowContext {
+  return {
+    parentEvidenceFresh: true,
+    transportObservation: streamLive ? 'live' : 'unverifiable',
+    parentObservedAt: 0,
+    hostClockOffsetMs
+  }
+}
diff --git a/src/shared/agent-session-account-home.test.ts b/src/shared/agent-session-account-home.test.ts
index 1986ae112d31..bb3778c80e6f 100644
--- a/src/shared/agent-session-account-home.test.ts
+++ b/src/shared/agent-session-account-home.test.ts
@@ -1,5 +1,8 @@
 import { describe, expect, it } from 'vitest'
-import { agentSessionAccountHome } from './agent-session-account-home'
+import {
+  agentSessionAccountHome,
+  agentSessionAccountHomesEqual
+} from './agent-session-account-home'
 import { isPersistedAgentSessionRecord } from './agent-session-record'
 import { agentSessionRecordFixture } from './agent-session-record.test-fixture'
 import { encodeAgentSessionRecord } from './agent-session-record-stored-form'
@@ -25,4 +28,36 @@ describe('agent session account home', () => {
       expect(withVariable(malformed)).toBe(false)
     }
   })
+
+  it('validates tagged OpenCode locators, keeping ones a newer build added fields to', () => {
+    const record = encodeAgentSessionRecord(agentSessionRecordFixture())
+    const managed = {
+      kind: 'opencode',
+      locator: { kind: 'managed', managedProfileId: '123e4567-e89b-42d3-a456-426614174000' }
+    } as const
+    const unmanaged = { kind: 'opencode', locator: { kind: 'unmanaged' } } as const
+    expect(isPersistedAgentSessionRecord({ ...record, accountHome: managed })).toBe(true)
+    expect(isPersistedAgentSessionRecord({ ...record, accountHome: unmanaged })).toBe(true)
+    expect(agentSessionAccountHomesEqual(managed, unmanaged)).toBe(false)
+    expect(agentSessionAccountHomesEqual(managed, { ...managed })).toBe(true)
+    expect(agentSessionAccountHomesEqual(unmanaged, { ...unmanaged })).toBe(true)
+    expect(
+      isPersistedAgentSessionRecord({
+        ...record,
+        accountHome: { ...managed, path: '/fake/home' }
+      })
+    ).toBe(true)
+    expect(
+      isPersistedAgentSessionRecord({
+        ...record,
+        accountHome: { ...unmanaged, locator: { ...unmanaged.locator, channel: 'beta' } }
+      })
+    ).toBe(true)
+    expect(
+      isPersistedAgentSessionRecord({
+        ...record,
+        accountHome: { ...unmanaged, locator: { kind: 'detached' } }
+      })
+    ).toBe(false)
+  })
 })
diff --git a/src/shared/agent-session-account-home.ts b/src/shared/agent-session-account-home.ts
index f33f70347583..21698ef182a9 100644
--- a/src/shared/agent-session-account-home.ts
+++ b/src/shared/agent-session-account-home.ts
@@ -1,26 +1,132 @@
-/**
- * The account an agent session is pinned to: the agent's config directory, and the environment
- * variable that points the agent at it.
- *
- * The variable is the agent's own (Claude reads `CLAUDE_CONFIG_DIR`, Codex `CODEX_HOME`), declared
- * by its definition, so a record stores it beside the path. Stored values are exactly what older
- * builds wrote and read.
- */
+/** Durable account binding: existing single-directory records or OpenCode's data context. */
 
 import type { AgentSessionStoredAgent } from './agent-session-stored-agent'
 
 /** Account root pinned at launch by the account selector, so a resume cannot drift to another login. */
-export type AgentSessionAccountHome = {
+export type LegacyAgentSessionAccountHome = {
   /** Environment variable naming the agent's config directory. */
   variable: string
   /** Host-resolved absolute path in the execution host's own path syntax. */
   path: string
 }
 
+export type OpenCodeAccountLocator =
+  | { kind: 'managed'; managedProfileId: string }
+  // The user's own environment, read at every launch.
+  | { kind: 'unmanaged' }
+
+export type OpenCodeAgentSessionAccountHome = {
+  kind: 'opencode'
+  locator: OpenCodeAccountLocator
+}
+
+export type AgentSessionAccountHome =
+  | LegacyAgentSessionAccountHome
+  | OpenCodeAgentSessionAccountHome
+
+export function isLegacyAgentSessionAccountHome(
+  home: AgentSessionAccountHome
+): home is LegacyAgentSessionAccountHome {
+  return !('kind' in home)
+}
+
+export function requireLegacyAgentSessionAccountHome(
+  home: AgentSessionAccountHome
+): LegacyAgentSessionAccountHome {
+  if (!isLegacyAgentSessionAccountHome(home)) {
+    throw new Error('Expected a single-directory agent account binding.')
+  }
+  return home
+}
+
+export function agentSessionAccountHomesEqual(
+  left: AgentSessionAccountHome,
+  right: AgentSessionAccountHome
+): boolean {
+  if (isLegacyAgentSessionAccountHome(left)) {
+    return (
+      isLegacyAgentSessionAccountHome(right) &&
+      left.variable === right.variable &&
+      left.path === right.path
+    )
+  }
+  if (isLegacyAgentSessionAccountHome(right)) {
+    return false
+  }
+  if (left.locator.kind === 'managed') {
+    return (
+      right.locator.kind === 'managed' &&
+      left.locator.managedProfileId === right.locator.managedProfileId
+    )
+  }
+  return right.locator.kind === 'unmanaged'
+}
+
 /** The account home of `agent` at `path`. */
 export function agentSessionAccountHome(
-  agent: Pick<AgentSessionStoredAgent, 'accountHomeVariable'>,
+  agent: { accountHomeVariable: string },
   path: string
-): AgentSessionAccountHome {
+): LegacyAgentSessionAccountHome {
   return { variable: agent.accountHomeVariable, path }
 }
+
+/** Whether `home` is the kind of account `agent` pins: its own directory variable, or its locator
+ *  kind. It becomes the child's environment, so a record pinning another agent's kind never starts. */
+export function agentPinsAccountHome(
+  agent: AgentSessionStoredAgent,
+  home: AgentSessionAccountHome
+): boolean {
+  return isLegacyAgentSessionAccountHome(home)
+    ? agent.accountHomeVariable !== undefined && home.variable === agent.accountHomeVariable
+    : agent.accountLocatorKind === home.kind
+}
+
+function isBoundedAccountString(value: unknown, max: number): value is string {
+  return (
+    typeof value === 'string' &&
+    value.length > 0 &&
+    value.length <= max &&
+    !value.includes('\u0000')
+  )
+}
+
+const ENVIRONMENT_VARIABLE_NAME = /^[A-Za-z_][A-Za-z0-9_]{0,127}$/
+export const MAX_PATH_LENGTH = 4096
+const PROFILE_ID = /^[0-9a-f]{8}-[0-9a-f]{4}-[1-8][0-9a-f]{3}-[89ab][0-9a-f]{3}-[0-9a-f]{12}$/i
+
+/** Shape only: whether the variable is the one the record's agent pins is a launch-time question
+ *  (`agentDrivesSession`), so an agent that renames its variable never hides its chats. Fields a
+ *  newer build adds are ignored, so its records stay readable here. */
+export function isAgentSessionAccountHome(value: unknown): value is AgentSessionAccountHome {
+  if (typeof value !== 'object' || value === null || Array.isArray(value)) {
+    return false
+  }
+  if (!('kind' in value)) {
+    return (
+      'variable' in value &&
+      typeof value.variable === 'string' &&
+      ENVIRONMENT_VARIABLE_NAME.test(value.variable) &&
+      'path' in value &&
+      isBoundedAccountString(value.path, MAX_PATH_LENGTH)
+    )
+  }
+  if (
+    value.kind !== 'opencode' ||
+    !('locator' in value) ||
+    typeof value.locator !== 'object' ||
+    value.locator === null ||
+    Array.isArray(value.locator) ||
+    !('kind' in value.locator)
+  ) {
+    return false
+  }
+  const locator = value.locator
+  if (locator.kind === 'managed') {
+    return (
+      'managedProfileId' in locator &&
+      typeof locator.managedProfileId === 'string' &&
+      PROFILE_ID.test(locator.managedProfileId)
+    )
+  }
+  return locator.kind === 'unmanaged'
+}
diff --git a/src/shared/agent-session-attachments.test.ts b/src/shared/agent-session-attachments.test.ts
new file mode 100644
index 000000000000..c48b8964c18d
--- /dev/null
+++ b/src/shared/agent-session-attachments.test.ts
@@ -0,0 +1,35 @@
+import { describe, expect, it } from 'vitest'
+import {
+  AGENT_SESSION_ATTACHMENT_NAME_MAX_BYTES,
+  sanitizeAgentSessionAttachmentName
+} from './agent-session-attachments'
+
+const bytes = (text: string): number => new TextEncoder().encode(text).byteLength
+
+describe('sanitizeAgentSessionAttachmentName', () => {
+  it('keeps only the last path segment', () => {
+    expect(sanitizeAgentSessionAttachmentName('../../etc/passwd')).toBe('passwd')
+    expect(sanitizeAgentSessionAttachmentName('C:\\Users\\me\\shot.png')).toBe('shot.png')
+  })
+
+  it('caps a long name in UTF-8 bytes on whole characters, keeping its extension', () => {
+    const name = sanitizeAgentSessionAttachmentName(`${'图'.repeat(120)}.pdf`)
+    expect(bytes(name)).toBeLessThanOrEqual(AGENT_SESSION_ATTACHMENT_NAME_MAX_BYTES)
+    expect(name.endsWith('.pdf')).toBe(true)
+    expect(name).not.toContain('\uFFFD')
+  })
+
+  it('never ends in a dot or space, even where the cut lands on one', () => {
+    // No short extension to keep, so the cut falls inside the name, right after a dot.
+    const long = `${'a'.repeat(AGENT_SESSION_ATTACHMENT_NAME_MAX_BYTES - 1)}.${'b'.repeat(30)}`
+    const name = sanitizeAgentSessionAttachmentName(long)
+    expect(name).toBe('a'.repeat(AGENT_SESSION_ATTACHMENT_NAME_MAX_BYTES - 1))
+    expect(sanitizeAgentSessionAttachmentName('notes. .')).toBe('notes')
+  })
+
+  it('renames what Windows reserves for devices', () => {
+    expect(sanitizeAgentSessionAttachmentName('CON')).toBe('_CON')
+    expect(sanitizeAgentSessionAttachmentName('nul.tar.gz')).toBe('_nul.tar.gz')
+    expect(sanitizeAgentSessionAttachmentName('console.log')).toBe('console.log')
+  })
+})
diff --git a/src/shared/agent-session-attachments.ts b/src/shared/agent-session-attachments.ts
new file mode 100644
index 000000000000..d2fabcabd0e0
--- /dev/null
+++ b/src/shared/agent-session-attachments.ts
@@ -0,0 +1,114 @@
+// Files a client attaches to a structured chat on a paired Orca server: the client uploads the
+// bytes, the server keeps them in a store it owns, and the agent only ever sees the server path.
+
+import type { ImportSkipReason } from './filesystem-import-result-types'
+
+/** Directory name of the server's store, under its userData. Also how a client recognizes a
+ *  stored attachment's path without a round trip. */
+export const AGENT_SESSION_ATTACHMENTS_DIR_NAME = 'agent-session-attachments'
+
+export const AGENT_SESSION_ATTACHMENT_MAX_BYTES = 50 * 1024 * 1024
+
+/** 384 KiB of bytes is 512 KiB of base64 on the wire, the same frame size file imports use. */
+export const AGENT_SESSION_ATTACHMENT_CHUNK_BYTES = 384 * 1024
+
+export const AGENT_SESSION_ATTACHMENT_CHUNK_BASE64_CHARS =
+  (AGENT_SESSION_ATTACHMENT_CHUNK_BYTES / 3) * 4
+
+export const AGENT_SESSION_ATTACHMENT_NAME_MAX_BYTES = 200
+
+export type AgentSessionAttachmentUploadStartResult = { uploadId: string }
+export type AgentSessionAttachmentUploadCommitResult = {
+  path: string
+  name: string
+  byteLength: number
+}
+
+/** Whether `filePath` names a file in some server's attachment store. Only routes a preview read;
+ *  the server re-checks the real path before reading anything. */
+export function isAgentSessionAttachmentStorePath(filePath: string): boolean {
+  return filePath.split(/[\\/]/).includes(AGENT_SESSION_ATTACHMENTS_DIR_NAME)
+}
+
+// Windows refuses these as a file's name whatever its extension, and drops trailing dots and spaces.
+const WINDOWS_DEVICE_NAME =
+  /^(con|prn|aux|nul|com[0-9\u00b9\u00b2\u00b3]|lpt[0-9\u00b9\u00b2\u00b3])$/i
+
+function utf8ByteLength(text: string): number {
+  return new TextEncoder().encode(text).byteLength
+}
+
+/** Whole characters from the start of `text` that fit in `maxBytes` of UTF-8. */
+function truncateUtf8(text: string, maxBytes: number): string {
+  let kept = ''
+  let bytes = 0
+  for (const character of text) {
+    bytes += utf8ByteLength(character)
+    if (bytes > maxBytes) {
+      break
+    }
+    kept += character
+  }
+  return kept
+}
+
+/**
+ * A stored file keeps the user's file name, since agents read meaning into names and extensions.
+ * Only the last path segment survives, without control characters or separators, short enough in
+ * bytes for every server's file system and never a name Windows reserves.
+ */
+export function sanitizeAgentSessionAttachmentName(name: string): string {
+  const leaf = name.split(/[\\/]/).findLast((part) => part.length > 0) ?? ''
+  // eslint-disable-next-line no-control-regex -- stripping control characters is the point
+  const cleaned = leaf.replace(/[\u0000-\u001f\u007f<>:"|?*]/g, '_').trim()
+  let visible = cleaned.replace(/^\.+/, '').replace(/[. ]+$/, '')
+  if (visible.length === 0) {
+    return 'attachment'
+  }
+  const firstDot = visible.indexOf('.')
+  if (WINDOWS_DEVICE_NAME.test(firstDot > 0 ? visible.slice(0, firstDot) : visible)) {
+    visible = `_${visible}`
+  }
+  if (utf8ByteLength(visible) <= AGENT_SESSION_ATTACHMENT_NAME_MAX_BYTES) {
+    return visible
+  }
+  const extensionAt = visible.lastIndexOf('.')
+  const extension =
+    extensionAt > 0 && utf8ByteLength(visible.slice(extensionAt)) <= 16
+      ? visible.slice(extensionAt)
+      : ''
+  const stem = visible.slice(0, visible.length - extension.length)
+  const truncated =
+    truncateUtf8(stem, AGENT_SESSION_ATTACHMENT_NAME_MAX_BYTES - utf8ByteLength(extension)) +
+    extension
+  // Cutting can expose a trailing dot or space, which Windows drops from a name.
+  return truncated.replace(/[. ]+$/, '') || 'attachment'
+}
+
+/** Pins an upload to the server the attachment was meant for: every call re-checks the pairing,
+ *  and every chunk the server process, so a re-pair or a replaced server aborts the upload. */
+export type AgentSessionAttachmentUploadTarget = {
+  environmentId: string
+  sessionId: string
+  expectedEnvironmentPairingRevision?: number
+  expectedEnvironmentRuntimeId: string
+}
+
+export type AgentSessionAttachmentPathUploadResult = {
+  /** Input order; `path` is where the server stored the file. */
+  uploaded: { sourcePath: string; path: string }[]
+  skipped: { sourcePath: string; reason: ImportSkipReason }[]
+  failed: { sourcePath: string; reason: string }[]
+}
+
+/** Asks a clipboard image save to land in the chat's attachment store on the paired server named
+ *  by the save's `runtimeEnvironmentId`, instead of that server's temp directory. */
+export type AgentSessionAttachmentClipboardTarget = Omit<
+  AgentSessionAttachmentUploadTarget,
+  'environmentId'
+>
+
+/** `orca-paste-…png`, the name every pasted image gets, so it reads as "Pasted image". */
+export function agentSessionPastedImageName(now: number, unique: string): string {
+  return `orca-paste-${now}-${unique}.png`
+}
diff --git a/src/shared/agent-session-continue-interrupted-capability.ts b/src/shared/agent-session-continue-interrupted-capability.ts
new file mode 100644
index 000000000000..359e4c5ad12f
--- /dev/null
+++ b/src/shared/agent-session-continue-interrupted-capability.ts
@@ -0,0 +1,7 @@
+// Split out of protocol-version.ts, which lists it in RUNTIME_CAPABILITIES. Import it from here.
+
+// Why: a client may call `agentSession.continueInterrupted` (Continue on a reply an Orca stop cut
+// off) only on a host that has it; an older host also writes no row naming that stop, so a client
+// never offers Continue there.
+export const AGENT_SESSION_CONTINUE_INTERRUPTED_RUNTIME_CAPABILITY =
+  'agent-session.continue-interrupted.v1' as const
diff --git a/src/shared/agent-session-conversation-command.ts b/src/shared/agent-session-conversation-command.ts
index 2aba1790ad84..d1e5a2671fad 100644
--- a/src/shared/agent-session-conversation-command.ts
+++ b/src/shared/agent-session-conversation-command.ts
@@ -3,6 +3,9 @@ import type { AgentSessionFailureSentence } from './agent-session-failure-words'
 
 export type AgentSessionConversationCommand = 'clear' | 'compact'
 
+/** How long a client waits for a conversation command: the host may first start an agent at rest. */
+export const AGENT_SESSION_CONVERSATION_COMMAND_TIMEOUT_MS = 195_000
+
 export type AgentSessionConversationCommandResult = {
   command: AgentSessionConversationCommand
   state: 'completed' | 'unknown'
diff --git a/src/shared/agent-session-conversation-outline.ts b/src/shared/agent-session-conversation-outline.ts
index aff03ba79353..89063e5fbfab 100644
--- a/src/shared/agent-session-conversation-outline.ts
+++ b/src/shared/agent-session-conversation-outline.ts
@@ -11,12 +11,14 @@ import type {
   AgentJournalRenderItem,
   AgentJournalSubmission
 } from './agent-session-journal-types'
-import type { NativeChatBlock } from './native-chat-types'
+import type { NativeChatBlock, NativeChatMessage } from './native-chat-types'
 import { deriveNativeChatRowContent, nativeChatRowRendersContent } from './native-chat-row-content'
+import { iterateProcessOutputLines } from './process-output-field-scanner'
 import { agentJournalSubmissionKey } from './agent-session-journal-item-key'
 import { dispatchWasWithdrawn } from './structured-agent-session-dispatch-rejection'
 import { projectStructuredAgentSessionMessages } from './structured-agent-session-message-projection'
 import { projectNativeChatTranscriptMessages } from './native-chat-transcript-projection'
+import { nativeChatTurnMembership } from './native-chat-turn-membership'
 
 /** Previews are cut on the host: the rail clamps to two lines, so a whole prompt
  *  would cross the wire only to be hidden. */
@@ -31,6 +33,12 @@ export type AgentSessionConversationOutlineEntry = {
    *  message is images only, or when the host dropped previews to fit the reply. */
   preview: string
   imageCount: number
+  /** The message that opened this one's turn, when this one did not: a steer sent
+   *  into a running turn. Absent from a host that predates the field. */
+  turnKey?: string
+  /** What the agent answered, as preview prose. Absent when it said nothing, from a
+   *  host that predates the field, or when the host dropped replies to fit. */
+  reply?: string
 }
 
 export type AgentSessionConversationOutline = {
@@ -65,6 +73,79 @@ export function nativeChatUserMessagePreview(
   return preview
 }
 
+const replies = new WeakMap<readonly NativeChatBlock[], string>()
+
+/** An assistant message as preview prose: fenced code, rules and markdown markers
+ *  dropped, cut to the preview cap. */
+function assistantReplyProse(blocks: readonly NativeChatBlock[]): string {
+  const cached = replies.get(blocks)
+  if (cached !== undefined) {
+    return cached
+  }
+  const lines: string[] = []
+  let length = 0
+  let fenced = false
+  // Lazily, stopping at the cap: a reply can be many thousands of lines.
+  for (const raw of iterateProcessOutputLines(deriveNativeChatRowContent(blocks).markdown)) {
+    const line = raw.trim()
+    if (line.startsWith('```')) {
+      fenced = !fenced
+      continue
+    }
+    if (fenced) {
+      continue
+    }
+    const plain = line
+      .replace(/^(?:[#>]+|[-*+]|\d+[.)])\s+/, '')
+      .replace(/\*\*|`/g, '')
+      .replace(/\s+/g, ' ')
+      .trim()
+    if (!/[\p{L}\p{N}]/u.test(plain)) {
+      continue
+    }
+    lines.push(plain)
+    length += plain.length + 1
+    if (length > AGENT_SESSION_OUTLINE_PREVIEW_MAX_CHARS) {
+      break
+    }
+  }
+  const prose = truncateOutlinePreview(lines.join(' '), AGENT_SESSION_OUTLINE_PREVIEW_MAX_CHARS)
+  replies.set(blocks, prose)
+  return prose
+}
+
+/** What the agent answered each turn with, by turn key: the prose of the turn's
+ *  last assistant row that has any. Turns are the transcript's own (`turnKeys` from
+ *  `nativeChatTurnMembership`), so a steer or a queued prompt cannot cut a reply
+ *  short. `only` limits the read to one turn. */
+export function nativeChatTurnReplyPreviews(
+  messages: readonly Pick<NativeChatMessage, 'role' | 'blocks'>[],
+  turnKeys: readonly (string | undefined)[],
+  only?: string
+): Map<string, string> {
+  const replies = new Map<string, string>()
+  // Newest first, so a long agentic turn reads one message, not every aside before it.
+  for (let index = messages.length - 1; index >= 0; index -= 1) {
+    const turnKey = turnKeys[index]
+    if (
+      turnKey === undefined ||
+      (only !== undefined && turnKey !== only) ||
+      messages[index].role !== 'assistant' ||
+      replies.has(turnKey)
+    ) {
+      continue
+    }
+    const prose = assistantReplyProse(messages[index].blocks)
+    if (prose.length > 0) {
+      replies.set(turnKey, prose)
+      if (only !== undefined) {
+        break
+      }
+    }
+  }
+  return replies
+}
+
 /** Cuts on a code-point boundary so a clipped emoji never leaves a lone surrogate. */
 export function truncateOutlinePreview(text: string, maxChars: number): string {
   if (text.length <= maxChars) {
@@ -100,7 +181,9 @@ export function projectAgentSessionConversationOutline(
     // Unchanged on the wire: a desktop's rejected rows tick once their page is loaded.
     projectStructuredAgentSessionMessages(items, [], submissions, { rejectedInPlace: false })
   )
-  for (const message of transcript) {
+  const { turnKeys } = nativeChatTurnMembership(transcript, { items, submissions })
+  const replies = nativeChatTurnReplyPreviews(transcript, turnKeys)
+  for (const [index, message] of transcript.entries()) {
     const sequence = sequences.get(message.id)
     if (
       sequence === undefined ||
@@ -111,11 +194,15 @@ export function projectAgentSessionConversationOutline(
       continue
     }
     const preview = nativeChatUserMessagePreview(message.blocks)
+    const turnKey = turnKeys[index]
+    const reply = turnKey === undefined ? undefined : replies.get(turnKey)
     entries.push({
       itemId: message.id,
       sequence,
       preview: preview.text,
-      imageCount: preview.imageCount
+      imageCount: preview.imageCount,
+      ...(turnKey === undefined || turnKey === message.id ? {} : { turnKey }),
+      ...(reply === undefined ? {} : { reply })
     })
   }
   return entries
diff --git a/src/shared/agent-session-failure-copy.ts b/src/shared/agent-session-failure-copy.ts
index b0b872b61b33..10da640f9541 100644
--- a/src/shared/agent-session-failure-copy.ts
+++ b/src/shared/agent-session-failure-copy.ts
@@ -1,6 +1,11 @@
 // The pieces every failure sentence is made of, in English. The host fills them in as they are;
 // desktop translates each piece whole with this as its fallback, so the two never differ.
 
+import {
+  CLAUDE_PROFILE_MISSING_MESSAGE,
+  CLAUDE_PROFILE_SETUP_FAILED_MESSAGE
+} from './claude-profile-routing'
+
 /** 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.'
@@ -39,6 +44,8 @@ export const AGENT_SESSION_FAILURE_COPY = {
     'The folder this chat ran in no longer exists. Restore it to continue this chat.',
   historyInOtherAccount:
     "This chat's history is in another Claude account. Switch back to that account to continue it.",
+  claudeAccountFolderMissing: CLAUDE_PROFILE_MISSING_MESSAGE,
+  claudeAccountSetupFailed: CLAUDE_PROFILE_SETUP_FAILED_MESSAGE,
   agentCommandNotRunnable:
     "{{agent}}'s Command in Settings → Agents must be a program path or name Orca can find, with no arguments or variables. Change it or reset it.",
   chooseClaudeAccount: 'Choose or add one in Claude Accounts settings.',
diff --git a/src/shared/agent-session-failure-words.ts b/src/shared/agent-session-failure-words.ts
index b797cf353cbe..946e775639c9 100644
--- a/src/shared/agent-session-failure-words.ts
+++ b/src/shared/agent-session-failure-words.ts
@@ -221,6 +221,8 @@ const FAILURE_SENTENCES = {
   accountSwitchInProgress: (_context, _fact, _surface, say) => say('accountSwitchInProgress'),
   launchFolderMissing: (_context, _fact, _surface, say) => say('launchFolderMissing'),
   historyInOtherAccount: (_context, _fact, _surface, say) => say('historyInOtherAccount'),
+  claudeAccountFolderMissing: (_context, _fact, _surface, say) => say('claudeAccountFolderMissing'),
+  claudeAccountSetupFailed: (_context, _fact, _surface, say) => say('claudeAccountSetupFailed'),
   agentCommandNotRunnable: (context, _fact, _surface, say) =>
     say('agentCommandNotRunnable', agent(say, context)),
   managedAccountUnsupported: (context, _fact, _surface, say) =>
diff --git a/src/shared/agent-session-failure.ts b/src/shared/agent-session-failure.ts
index a703fc356052..cca1b1c9b27a 100644
--- a/src/shared/agent-session-failure.ts
+++ b/src/shared/agent-session-failure.ts
@@ -31,6 +31,8 @@ export const AGENT_SESSION_FAILURE_KINDS = [
   'managedAccountUnsupported',
   'launchFolderMissing',
   'historyInOtherAccount',
+  'claudeAccountFolderMissing',
+  'claudeAccountSetupFailed',
   'agentCommandNotRunnable',
   'providerExited',
   'restartFailed',
diff --git a/src/shared/agent-session-journal-schemas.ts b/src/shared/agent-session-journal-schemas.ts
index 3cbb259af36e..e7dd3c2a8b14 100644
--- a/src/shared/agent-session-journal-schemas.ts
+++ b/src/shared/agent-session-journal-schemas.ts
@@ -136,13 +136,21 @@ const PromptOption = z.object({
   description: z.string().optional()
 })
 
+const FreeTextInput = z.object({
+  allowEmpty: z.boolean().optional(),
+  multiline: z.boolean().optional(),
+  initialValue: z.string().optional(),
+  placeholder: z.string().optional()
+})
+
 const Question = z.object({
   id: z.string(),
   question: z.string(),
   header: z.string().optional(),
   multiSelect: z.boolean(),
   options: z.array(PromptOption),
-  freeTextQuestionId: z.string().optional()
+  freeTextQuestionId: z.string().optional(),
+  freeTextInput: FreeTextInput.optional()
 })
 
 const Resolution = z.object({
@@ -236,6 +244,7 @@ const KnownItemBody = z.discriminatedUnion('kind', [
     options: z.array(PromptOption),
     questions: z.array(Question).optional(),
     freeTextQuestionId: z.string().optional(),
+    freeTextInput: FreeTextInput.optional(),
     resolution: Resolution
   }),
   z.object({
@@ -246,7 +255,8 @@ const KnownItemBody = z.discriminatedUnion('kind', [
     turnLifecycle: z.object(TurnLifecycleFields).optional(),
     providerFrame: ProviderFrame.optional(),
     threadGoal: AgentJournalThreadGoalStateSchema.optional(),
-    failure: AgentSessionFailureFactSchema.optional()
+    failure: AgentSessionFailureFactSchema.optional(),
+    orcaStop: z.object({ cause: z.string().min(1) }).optional()
   }),
   z.object({
     kind: z.literal('turn'),
diff --git a/src/shared/agent-session-journal-types.ts b/src/shared/agent-session-journal-types.ts
index c335e2f857f0..2ad0cc921acb 100644
--- a/src/shared/agent-session-journal-types.ts
+++ b/src/shared/agent-session-journal-types.ts
@@ -180,6 +180,13 @@ export type AgentJournalPromptOption = {
   description?: string
 }
 
+export type AgentJournalFreeTextInput = {
+  allowEmpty?: boolean
+  multiline?: boolean
+  initialValue?: string
+  placeholder?: string
+}
+
 export type AgentJournalQuestion = {
   id: string
   question: string
@@ -188,6 +195,7 @@ export type AgentJournalQuestion = {
   options: AgentJournalPromptOption[]
   /** Present when the provider accepts an answer outside the offered options. */
   freeTextQuestionId?: string
+  freeTextInput?: AgentJournalFreeTextInput
 }
 
 export type AgentJournalApprovalMatchedAskRule = {
@@ -236,6 +244,7 @@ export type AgentJournalQuestionItem = {
   questions?: AgentJournalQuestion[]
   /** Present when the provider accepts an answer outside the offered options. */
   freeTextQuestionId?: string
+  freeTextInput?: AgentJournalFreeTextInput
   resolution: AgentJournalResolution
 }
 
@@ -326,6 +335,9 @@ type AgentJournalStatusItemFields = {
   }
   /** Present on thread-goal transitions; absent on rows from older hosts. */
   threadGoal?: AgentJournalThreadGoalState
+  /** On the row about a reply Orca's own stop cut off: why Orca stopped. Its cause is open (a newer
+   *  host may name one this build does not know), so read it with `readAgentSessionOrcaStop`. */
+  orcaStop?: { cause: string }
 }
 
 /** A status row that reports no failure; its text is its writer's own. */
diff --git a/src/shared/agent-session-orca-stop.ts b/src/shared/agent-session-orca-stop.ts
new file mode 100644
index 000000000000..f3d452826486
--- /dev/null
+++ b/src/shared/agent-session-orca-stop.ts
@@ -0,0 +1,20 @@
+// Why the Orca running a chat stopped in the middle of a reply: a quit, an update, or a crash. The
+// host states it on its row about the cut turn (`orcaStop`); a client names it, and offers Continue.
+// Open on the wire: a cause this build does not know reads as none, and the row keeps its words.
+
+export const AGENT_SESSION_ORCA_STOP_CAUSES = ['update', 'quit', 'crash'] as const
+/** The row's presentation, so a client that re-words host rows it can't name passes it through. */
+export const AGENT_SESSION_ORCA_STOP_PRESENTATION = 'orca-stop'
+export type AgentSessionOrcaStopCause = (typeof AGENT_SESSION_ORCA_STOP_CAUSES)[number]
+export type AgentSessionOrcaStop = { cause: AgentSessionOrcaStopCause }
+
+export function isAgentSessionOrcaStopCause(value: unknown): value is AgentSessionOrcaStopCause {
+  return AGENT_SESSION_ORCA_STOP_CAUSES.some((cause) => cause === value)
+}
+
+/** The stop a row states, when this build knows its cause. */
+export function readAgentSessionOrcaStop(value: unknown): AgentSessionOrcaStop | undefined {
+  const cause =
+    typeof value === 'object' && value !== null && 'cause' in value ? value.cause : undefined
+  return isAgentSessionOrcaStopCause(cause) ? { cause } : undefined
+}
diff --git a/src/shared/agent-session-question-answer.ts b/src/shared/agent-session-question-answer.ts
index 08374adc3d52..43868c7937b5 100644
--- a/src/shared/agent-session-question-answer.ts
+++ b/src/shared/agent-session-question-answer.ts
@@ -24,7 +24,10 @@ export type AgentSessionPromptResponse =
 
 /** The questions an item asks: its grouped list, or the item itself as one question. */
 export function agentSessionPromptQuestions(
-  body: Pick<AgentJournalQuestionItem, 'question' | 'options' | 'questions' | 'freeTextQuestionId'>
+  body: Pick<
+    AgentJournalQuestionItem,
+    'question' | 'options' | 'questions' | 'freeTextQuestionId' | 'freeTextInput'
+  >
 ): AgentJournalQuestion[] {
   if (body.questions) {
     return body.questions
@@ -35,7 +38,8 @@ export function agentSessionPromptQuestions(
       question: body.question,
       options: body.options,
       multiSelect: false,
-      ...(body.freeTextQuestionId ? { freeTextQuestionId: body.freeTextQuestionId } : {})
+      ...(body.freeTextQuestionId ? { freeTextQuestionId: body.freeTextQuestionId } : {}),
+      ...(body.freeTextInput ? { freeTextInput: body.freeTextInput } : {})
     }
   ]
 }
@@ -66,7 +70,7 @@ function decodeLegacyFreeTextAnswer(
  * predate structured answers take it as `optionId`, and older clients render receipts from it.
  */
 export function legacyAgentSessionSelectedOptionId(
-  body: Pick<AgentJournalQuestionItem, 'questions'>,
+  body: Pick<AgentJournalQuestionItem, 'questions' | 'freeTextInput'>,
   answers: readonly AgentSessionQuestionAnswer[]
 ): string | null {
   if (body.questions) {
@@ -76,15 +80,21 @@ export function legacyAgentSessionSelectedOptionId(
   if (!answer || answers.length !== 1) {
     return null
   }
-  const other = answer.other?.trim()
+  const other = body.freeTextInput?.allowEmpty ? answer.other : answer.other?.trim()
   return (
-    answer.optionIds[0] ?? (other ? encodeLegacyFreeTextAnswer(answer.questionId, other) : null)
+    answer.optionIds[0] ??
+    (other !== undefined && (other.length > 0 || body.freeTextInput?.allowEmpty)
+      ? encodeLegacyFreeTextAnswer(answer.questionId, other)
+      : null)
   )
 }
 
 /** Reads an answer an older client packed into `optionId`. */
 export function legacyAgentSessionQuestionAnswers(
-  body: Pick<AgentJournalQuestionItem, 'question' | 'options' | 'questions' | 'freeTextQuestionId'>,
+  body: Pick<
+    AgentJournalQuestionItem,
+    'question' | 'options' | 'questions' | 'freeTextQuestionId' | 'freeTextInput'
+  >,
   optionId: string
 ): AgentSessionQuestionAnswer[] | null {
   const grouped = body.questions ? decodeAgentSessionQuestionAnswers(optionId) : null
@@ -102,7 +112,7 @@ export function legacyAgentSessionQuestionAnswers(
   const freeText = decodeLegacyFreeTextAnswer(optionId)
   return body.freeTextQuestionId &&
     freeText?.questionId === body.freeTextQuestionId &&
-    freeText.answer.trim().length > 0
+    (freeText.answer.trim().length > 0 || body.freeTextInput?.allowEmpty === true)
     ? [{ questionId, optionIds: [], other: freeText.answer }]
     : null
 }
@@ -174,11 +184,13 @@ export function isValidAgentSessionQuestionAnswers(
     if (answer.optionIds.some((optionId) => !offered.has(optionId))) {
       return false
     }
-    const other = answer.other?.trim() ?? ''
-    if (other && !question.freeTextQuestionId) {
+    const hasOther =
+      answer.other !== undefined &&
+      (question.freeTextInput?.allowEmpty === true || answer.other.trim().length > 0)
+    if (hasOther && !question.freeTextQuestionId) {
       return false
     }
-    const answerCount = answer.optionIds.length + (other ? 1 : 0)
+    const answerCount = answer.optionIds.length + (hasOther ? 1 : 0)
     return answerCount > 0 && (question.multiSelect || answerCount === 1)
   })
 }
diff --git a/src/shared/agent-session-question-free-text.test.ts b/src/shared/agent-session-question-free-text.test.ts
new file mode 100644
index 000000000000..8037bc38c240
--- /dev/null
+++ b/src/shared/agent-session-question-free-text.test.ts
@@ -0,0 +1,53 @@
+import { describe, expect, it } from 'vitest'
+import {
+  agentSessionPromptQuestions,
+  isValidAgentSessionQuestionAnswers,
+  legacyAgentSessionQuestionAnswers,
+  legacyAgentSessionSelectedOptionId
+} from './agent-session-question-answer'
+
+describe('provider free-text question metadata', () => {
+  const body = {
+    question: 'Edit the text',
+    options: [],
+    freeTextQuestionId: 'editor:1',
+    freeTextInput: { allowEmpty: true, multiline: true, initialValue: 'first\nsecond' }
+  }
+
+  it.each(['', '  ', ' first\nsecond\u2028third\u2029fourth '])(
+    'preserves the exact answer %j across the older wire form',
+    (other) => {
+      const answers = [{ questionId: 'editor:1', optionIds: [], other }]
+      const encoded = legacyAgentSessionSelectedOptionId(body, answers)
+      expect(encoded).not.toBeNull()
+      expect(legacyAgentSessionQuestionAnswers(body, encoded!)).toEqual(answers)
+      expect(isValidAgentSessionQuestionAnswers(agentSessionPromptQuestions(body), answers)).toBe(
+        true
+      )
+    }
+  )
+
+  it('requires an explicitly supplied answer even when empty is allowed', () => {
+    expect(
+      isValidAgentSessionQuestionAnswers(agentSessionPromptQuestions(body), [
+        { questionId: 'editor:1', optionIds: [] }
+      ])
+    ).toBe(false)
+    expect(legacyAgentSessionQuestionAnswers(body, 'another:')).toBeNull()
+  })
+
+  it('keeps the previous empty-answer rejection when metadata is absent', () => {
+    const legacy = {
+      question: 'Provide text',
+      options: [],
+      freeTextQuestionId: 'q1',
+      freeTextInput: undefined
+    }
+    const answers = [{ questionId: 'q1', optionIds: [], other: '  ' }]
+    expect(isValidAgentSessionQuestionAnswers(agentSessionPromptQuestions(legacy), answers)).toBe(
+      false
+    )
+    expect(legacyAgentSessionSelectedOptionId(legacy, answers)).toBeNull()
+    expect(legacyAgentSessionQuestionAnswers(legacy, 'q1:')).toBeNull()
+  })
+})
diff --git a/src/shared/agent-session-queued-message-wire.ts b/src/shared/agent-session-queued-message-wire.ts
index a1df60b85f6f..d10d263aa024 100644
--- a/src/shared/agent-session-queued-message-wire.ts
+++ b/src/shared/agent-session-queued-message-wire.ts
@@ -7,21 +7,15 @@ import type { AgentJournalMessageItem } from './agent-session-journal-types'
 /** The draft could not be converted into a send; an explicit Send retries it. */
 export const QUEUED_MESSAGE_PAUSED_SEND_FAILED = 'send_failed' as const
 
-/** A person's message the host accepted and never handed over before a restart or a close of the
- *  chat. It waits for the person's own Send; the cards behind it still send, as past a failed one. */
-export const QUEUED_MESSAGE_PAUSED_KEPT = 'kept' as const
+export type AgentSessionQueuedMessagePausedReason = typeof QUEUED_MESSAGE_PAUSED_SEND_FAILED
 
-export type AgentSessionQueuedMessagePausedReason =
-  | typeof QUEUED_MESSAGE_PAUSED_SEND_FAILED
-  | typeof QUEUED_MESSAGE_PAUSED_KEPT
-
-/** The whole queue is paused and sends nothing on its own: 'stopped' — the user
- *  interrupted ("Queue paused because you interrupted") — or 'cleared' — a /clear
- *  carried the cards into a fresh conversation. Resume (`agentSession.queuedMessagesResume`),
- *  or any turn starting, lifts it; Send-now on one card sends that card and leaves the
- *  rest paused until its turn starts. A client treats an unknown reason as a
- *  plain pause, so a newer host can add one. */
-export type AgentSessionQueuePause = { reason: 'stopped' | 'cleared' }
+/** The whole queue is paused and sends nothing on its own: 'stopped' — the user interrupted
+ *  ("Queue paused because you interrupted"). Resume (`agentSession.queuedMessagesResume`), or any
+ *  turn starting, lifts it; Send-now on one card sends that card and leaves the rest paused until
+ *  its turn starts. A /clear or a reopen also holds cards until the chat's next turn, but nothing
+ *  runs then, so neither is published. A client treats an unknown reason as a plain pause, so a
+ *  newer host can add one. */
+export type AgentSessionQueuePause = { reason: 'stopped' }
 
 /** What rides beside a frame's `queuedMessages`, published together with the list. */
 export type AgentSessionQueuePublicationFields = {
@@ -44,12 +38,11 @@ export type AgentSessionQueuedMessage = {
   position: number
   body: AgentJournalMessageItem
   state: 'waiting' | 'returned'
-  /** This one card is held, whatever the queue's pause: its conversion failed, or the host kept it. */
+  /** This one card is held, whatever the queue's pause: its conversion failed. */
   paused?: true
-  /** Why it is held, as a marker the client localizes: 'send_failed' ("couldn't
-   *  send") or 'kept' (accepted, never sent); only an explicit Send releases either. A client
-   *  must treat an unknown marker as a plain hold, so a newer host can add one. The queue-level
-   *  pause is `queuePause`, published beside the list. */
+  /** Why it is held, as a marker the client localizes: 'send_failed' ("couldn't send"); only an
+   *  explicit Send releases it. A client must treat an unknown marker as a plain hold, so a newer
+   *  host can add one. The queue-level pause is `queuePause`, published beside the list. */
   pausedReason?: AgentSessionQueuedMessagePausedReason
   /** A returned card's refusal: the `reason` and `rejection` pair its submission settled with.
    *  Only a failure returns a card; a draft a Stop or restart took back waits again. Clients classify it from `returnedRejection` (falling back to `returnedReason` when a host
diff --git a/src/shared/agent-session-record.ts b/src/shared/agent-session-record.ts
index 395fff13adf6..c228335a6264 100644
--- a/src/shared/agent-session-record.ts
+++ b/src/shared/agent-session-record.ts
@@ -28,7 +28,11 @@ import {
   isAgentSessionProviderHandleInNamespace,
   isStructuredAgentId
 } from './agent-session-provider-handle-encoding'
-import type { AgentSessionAccountHome } from './agent-session-account-home'
+import {
+  isAgentSessionAccountHome,
+  MAX_PATH_LENGTH,
+  type AgentSessionAccountHome
+} from './agent-session-account-home'
 
 export type { AgentSessionAccountHome } from './agent-session-account-home'
 
@@ -71,6 +75,9 @@ export type AgentSessionProcessIdentity = {
   pid: number
   processStartTimeMs: number | null
   spawnToken: string
+  /** The Orca runtime that started this process and holds its transport, stamped when the owner is
+   *  recorded; absent on owners older builds recorded. */
+  runtime?: string
 }
 
 export type AgentSessionJournalCheckpoint = { epoch: number; sequence: number }
@@ -93,6 +100,11 @@ export type AgentSessionDeathEvidence = {
    *  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
+  /** How the Orca runtime that held the owner ended, when the owner died with it: the quit or
+   *  update it had begun, else 'crash'. Absent when a provider died on its own while Orca ran, and
+   *  whenever that cannot be told. A string, since a newer build may write a cause this one does
+   *  not know; read it with `isAgentSessionOrcaStopCause`. */
+  runtimeEnd?: string
 }
 
 export type AgentSessionLease = {
@@ -163,7 +175,6 @@ export type AgentSessionOptionsReplacement = {
 const MAX_ID_LENGTH = 512
 /** A death evidence's `detail` past this fails a load, so whoever writes one cuts it here. */
 export const MAX_AGENT_SESSION_DEATH_DETAIL_CHARS = MAX_ID_LENGTH
-const MAX_PATH_LENGTH = 4096
 const MAX_LAUNCH_ENV_ENTRIES = 256
 const MAX_LAUNCH_ENV_VALUE_LENGTH = 65_536
 const SESSION_ID_PATTERN = /^[A-Za-z0-9_-]{8,128}$/
@@ -228,23 +239,8 @@ export function isAgentSessionProcessIdentity(
     (identity.processStartTimeMs === null ||
       (Number.isSafeInteger(identity.processStartTimeMs) &&
         (identity.processStartTimeMs as number) >= 0)) &&
-    isBoundedString(identity.spawnToken, MAX_ID_LENGTH)
-  )
-}
-
-const ENVIRONMENT_VARIABLE_NAME = /^[A-Za-z_][A-Za-z0-9_]{0,127}$/
-
-/** Shape only: whether the variable is the one the record's agent pins is a launch-time question
- *  (`agentDrivesSession`), so an agent that renames its variable never hides its chats. */
-function isAgentSessionAccountHome(value: unknown): value is AgentSessionAccountHome {
-  if (typeof value !== 'object' || value === null) {
-    return false
-  }
-  const home = value as Partial<AgentSessionAccountHome>
-  return (
-    typeof home.variable === 'string' &&
-    ENVIRONMENT_VARIABLE_NAME.test(home.variable) &&
-    isBoundedString(home.path, MAX_PATH_LENGTH)
+    isBoundedString(identity.spawnToken, MAX_ID_LENGTH) &&
+    (identity.runtime === undefined || isBoundedString(identity.runtime, MAX_ID_LENGTH))
   )
 }
 
@@ -296,7 +292,7 @@ function isAgentSessionDeathEvidence(value: unknown): value is AgentSessionDeath
     return false
   }
   const evidence = value as Partial<AgentSessionDeathEvidence>
-  const { observedAt, lastProvenAliveAt, ownerFence } = evidence
+  const { observedAt, lastProvenAliveAt, ownerFence, runtimeEnd } = evidence
   return (
     (evidence.kind === 'exit-observed' ||
       evidence.kind === 'pid-absent' ||
@@ -309,7 +305,8 @@ function isAgentSessionDeathEvidence(value: unknown): value is AgentSessionDeath
     (lastProvenAliveAt === undefined ||
       (Number.isSafeInteger(lastProvenAliveAt) &&
         lastProvenAliveAt >= 0 &&
-        lastProvenAliveAt <= observedAt))
+        lastProvenAliveAt <= observedAt)) &&
+    (runtimeEnd === undefined || isBoundedString(runtimeEnd, MAX_ID_LENGTH))
   )
 }
 
diff --git a/src/shared/agent-session-refusal-details.ts b/src/shared/agent-session-refusal-details.ts
index 90cff98dd605..f27b9c5737e8 100644
--- a/src/shared/agent-session-refusal-details.ts
+++ b/src/shared/agent-session-refusal-details.ts
@@ -26,6 +26,8 @@ export const AGENT_SESSION_REFUSAL_REASONS = {
     'messageIdReused',
     'operationRefusedEarlier',
     'journalWriteFailed',
+    /** The message names a chat attachment the host no longer stores. */
+    'attachmentExpired',
     // The conversation's state
     'conversationCleared',
     /** Older hosts only: a /clear that never committed; its replacement may not exist. */
@@ -59,6 +61,10 @@ export const AGENT_SESSION_REFUSAL_REASONS = {
     'launchFolderMissing',
     /** The chat's transcript is in a Claude account other than the selected one. */
     'historyInOtherAccount',
+    /** The selected Claude account's folder is gone. */
+    'claudeAccountFolderMissing',
+    /** The selected Claude account's folder could not be set up. */
+    'claudeAccountSetupFailed',
     /** Settings → Agents → Command names no program this host can run. */
     'agentCommandNotRunnable',
     /** The agent started, then Orca could not open the chat's conversation for it. */
diff --git a/src/shared/agent-session-refusal-notice.test.ts b/src/shared/agent-session-refusal-notice.test.ts
index 1501453361fe..43ed3c6706a5 100644
--- a/src/shared/agent-session-refusal-notice.test.ts
+++ b/src/shared/agent-session-refusal-notice.test.ts
@@ -32,7 +32,7 @@ import {
   DISPATCH_REJECTED_QUEUE_FULL,
   DISPATCH_REJECTED_WRITE_FAILED
 } from './structured-agent-session-dispatch-rejection'
-import { structuredAgentSessionRejectionParts } from './structured-agent-session-send-disposition'
+import { structuredAgentSessionRejectionParts } from './structured-agent-session-rejection-words'
 
 const WRITES: AgentSessionWriteKind[] = [
   'read-history',
diff --git a/src/shared/agent-session-refusal-notice.ts b/src/shared/agent-session-refusal-notice.ts
index e978a1c026b9..593e7e9d3a51 100644
--- a/src/shared/agent-session-refusal-notice.ts
+++ b/src/shared/agent-session-refusal-notice.ts
@@ -181,6 +181,19 @@ export function agentSessionWriteNoticeParts(
   return [notDone]
 }
 
+/** A send nobody can confirm: the host's own reason first when it gave one, never "not sent". */
+export function agentSessionUnconfirmedSendParts(
+  thrownRefusal: AgentSessionWriteFailure | null | undefined
+): AgentSessionWriteNoticePart[] {
+  const cause = thrownRefusal
+    ? agentSessionWriteNoticeParts(thrownRefusal, 'composer-send').filter(
+        (part) =>
+          part !== 'notDoneSend' && part !== 'tryAgainComposerSend' && part !== 'outcomeUnknown'
+      )
+    : []
+  return [...cause, 'sendOutcomeLost']
+}
+
 export function agentSessionWriteNoticeEnglish(
   parts: readonly AgentSessionWriteNoticePart[]
 ): string {
diff --git a/src/shared/agent-session-refusal-reason-words.ts b/src/shared/agent-session-refusal-reason-words.ts
index 9206ffd7a25c..797ca2ddf99b 100644
--- a/src/shared/agent-session-refusal-reason-words.ts
+++ b/src/shared/agent-session-refusal-reason-words.ts
@@ -66,6 +66,7 @@ const REASON_WORDS = {
     // Settled under that id, so the control's retry goes out under a new one.
     operationRefusedEarlier: codeWords('retry'),
     journalWriteFailed: causeWords('recordFailed', 'retry'),
+    attachmentExpired: causeWords('attachmentExpired', 'actFirst', 'reattachFile'),
     conversationCleared: causeWords(
       'conversationCleared',
       'goElsewhere',
@@ -98,6 +99,8 @@ const REASON_WORDS = {
     managedAccountUnsupported: { fact: 'managedAccountUnsupported', action: 'actFirst' },
     launchFolderMissing: { fact: 'launchFolderMissing', action: 'actFirst' },
     historyInOtherAccount: { fact: 'historyInOtherAccount', action: 'actFirst' },
+    claudeAccountFolderMissing: { fact: 'claudeAccountFolderMissing', action: 'actFirst' },
+    claudeAccountSetupFailed: { fact: 'claudeAccountSetupFailed', action: 'retry' },
     agentCommandNotRunnable: { fact: 'agentCommandNotRunnable', action: 'actFirst' },
     attachFailed: codeWords('retry')
   },
diff --git a/src/shared/agent-session-refusal-retry.test.ts b/src/shared/agent-session-refusal-retry.test.ts
index 79020e5695f0..3814da644892 100644
--- a/src/shared/agent-session-refusal-retry.test.ts
+++ b/src/shared/agent-session-refusal-retry.test.ts
@@ -1,91 +1,16 @@
 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 {
-  createStructuredAgentSessionOutboxEntry,
-  requeueStructuredAgentSessionSendRefusal
-} from './structured-agent-session-outbox'
-import {
-  admitStructuredAgentSessionOutboxEntry,
-  structuredAgentSessionEntryHeldForRetry
-} from './structured-agent-session-outbox-admission'
-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('holds the message for its Retry after an exited refusal, and sends later ones past it', () => {
-    const later = createStructuredAgentSessionOutboxEntry({
-      clientMessageId: 'message-3',
-      sessionId: 'session-1',
-      text: 'after',
-      attachments: [],
-      queuedAt: 2
-    })
-    const disposition = disposeStructuredAgentSessionSendResult({
-      entries: [entry, later],
-      entry,
-      result: {
-        ok: false,
-        refusal: {
-          code: 'agent_session_ownership_unknown',
-          message: 'x',
-          details: { reason: 'ownerUnproven', ownerVerdict: 'exited' }
-        }
-      },
-      createOperationId: () => 'message-2'
-    })
-    expect(disposition.entries[0]).toMatchObject({ clientMessageId: 'message-2', state: 'queued' })
-    expect(structuredAgentSessionEntryHeldForRetry(disposition.entries[0]!)).toBe(true)
-    expect(admitStructuredAgentSessionOutboxEntry(disposition.entries)).toMatchObject({
-      state: 'dispatch',
-      entry: { clientMessageId: 'message-3' }
-    })
   })
 
   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' })
     }
   )
 
diff --git a/src/shared/agent-session-stored-agent.ts b/src/shared/agent-session-stored-agent.ts
index a500a604de7c..1e18d960c85f 100644
--- a/src/shared/agent-session-stored-agent.ts
+++ b/src/shared/agent-session-stored-agent.ts
@@ -8,6 +8,16 @@ export type AgentSessionStoredAgent = {
   agent: string
   /** The protocol whose id space this agent's provider handles live in. */
   handleTransport: AgentSessionProviderTransport
-  /** Environment variable naming the agent's config directory, pinned as the record's account home. */
-  accountHomeVariable: string
-}
+} & (
+  | {
+      /** Environment variable naming the agent's config directory, pinned as the record's account home. */
+      accountHomeVariable: string
+      accountLocatorKind?: never
+    }
+  | {
+      /** The agent's account is more than one directory: its records pin a tagged locator of this
+       *  kind instead (`AgentSessionAccountHome`). */
+      accountLocatorKind: 'opencode'
+      accountHomeVariable?: never
+    }
+)
diff --git a/src/shared/agent-session-write-notice-copy.ts b/src/shared/agent-session-write-notice-copy.ts
index 3796de6eaf05..3e0e3277c036 100644
--- a/src/shared/agent-session-write-notice-copy.ts
+++ b/src/shared/agent-session-write-notice-copy.ts
@@ -44,6 +44,8 @@ export const AGENT_SESSION_WRITE_NOTICE_COPY = {
   cannotRunHere: "Orca can't run this agent in a chat here.",
   unreachable: "Orca couldn't reach the agent.",
   recordFailed: "Orca couldn't save this to the chat's history.",
+  attachmentExpired: 'This attachment expired.',
+  reattachFile: 'Remove it and attach it again.',
   conversationCleared: 'This conversation has been cleared.',
   openCurrentConversation: 'Open the current conversation to continue.',
   clearUnfinished: "The last /clear didn't finish.",
diff --git a/src/shared/background-task-copy.ts b/src/shared/background-task-copy.ts
new file mode 100644
index 000000000000..9d5f7fac4f6b
--- /dev/null
+++ b/src/shared/background-task-copy.ts
@@ -0,0 +1,68 @@
+// The words of the background-tasks strip, in English. Desktop translates each piece whole with
+// this as its fallback; mobile says it as is, so the two never word one roster differently.
+
+export const BACKGROUND_TASK_COPY = {
+  monitoring: 'Monitoring background tasks',
+  stop: 'Stop',
+  stopTask: 'Stop {{value0}}',
+  stopAll: 'Stop background tasks',
+  agent: 'Background agent',
+  workflow: 'Background workflow',
+  command: 'Background command',
+  monitor: 'Background monitor',
+  task: 'Background task',
+  detailsUnavailable: 'Task details are unavailable for this session.',
+  countAgentsOne: '1 agent',
+  countAgentsMany: '{{value0}} agents',
+  countShellOne: '1 shell',
+  countShellMany: '{{value0}} shells',
+  countShellCommandOne: '1 shell command',
+  countMonitorsOne: '1 monitor',
+  countMonitorsMany: '{{value0}} monitors',
+  countWorkflowsOne: '1 workflow',
+  countWorkflowsMany: '{{value0}} workflows',
+  countTasksOne: '1 task',
+  countTasksMany: '{{value0}} tasks',
+  headerTotal: '{{value0}} background tasks',
+  stateWorking: 'working',
+  stateWorkingCount: '{{value0}} working',
+  stateMonitoring: 'monitoring',
+  stateMonitoringCount: '{{value0}} monitoring',
+  stateWaiting: 'waiting',
+  stateWaitingCount: '{{value0}} waiting',
+  stateBlocked: 'blocked',
+  stateBlockedCount: '{{value0}} blocked',
+  stateDone: 'done',
+  stateDoneCount: '{{value0}} done',
+  stateIdle: 'stopped',
+  stateIdleCount: '{{value0}} stopped',
+  // Settled unknown or out of contact: claims neither an exit nor a coming update.
+  stateUnverifiable: 'status unavailable',
+  // After a count, "status unavailable" needs a "with".
+  stateUnverifiableCount: '{{value0}} with status unavailable',
+  reasonWaiting: 'needs approval',
+  reasonBlocked: 'failed',
+  groupAgents: 'Agents',
+  groupShell: 'Shell',
+  groupMonitors: 'Monitors',
+  groupWorkflows: 'Workflows',
+  groupTasks: 'Tasks'
+} as const
+
+export type BackgroundTaskCopyId = keyof typeof BACKGROUND_TASK_COPY
+
+/** What a piece's `{{value0}}` stands for: a count, or a phrase already said. */
+export type BackgroundTaskCopyValues = { value0: string | number }
+
+/** One piece in the reader's language, its placeholder filled. */
+export type BackgroundTaskSay = (
+  id: BackgroundTaskCopyId,
+  values?: BackgroundTaskCopyValues
+) => string
+
+/** Any surface without translations. */
+export const sayBackgroundTaskEnglish: BackgroundTaskSay = (id, values) =>
+  values === undefined
+    ? BACKGROUND_TASK_COPY[id]
+    : // A replacer function, so a task's own `$&` is never read as a pattern.
+      BACKGROUND_TASK_COPY[id].replaceAll('{{value0}}', () => String(values.value0))
diff --git a/src/shared/background-task-header-content.ts b/src/shared/background-task-header-content.ts
new file mode 100644
index 000000000000..b112d5fb0323
--- /dev/null
+++ b/src/shared/background-task-header-content.ts
@@ -0,0 +1,159 @@
+// The background-tasks strip HEADER: the one line that speaks for the whole
+// roster while the strip is collapsed. Counting and phrasing only — grouping,
+// row state and the state vocabulary live in `background-task-roster.ts`.
+
+import type {
+  AgentSessionBackgroundTask,
+  AgentSessionBackgroundTaskRunState
+} from './agent-session-background-task-wire'
+import type { BackgroundTaskSay } from './background-task-copy'
+import {
+  backgroundTaskCountedState,
+  backgroundTaskElapsedLabel,
+  backgroundTaskStateReason,
+  backgroundTaskStateWord,
+  type BackgroundTaskGroup
+} from './background-task-roster'
+
+type TaskKind = AgentSessionBackgroundTask['kind']
+type RunState = AgentSessionBackgroundTaskRunState
+
+/** Below this strip width (in root-font units; 16 px each where a surface has no root font) the
+ *  header drops a breakdown across several kinds for an honest total. A single kind keeps its state
+ *  forms ("2 agents waiting — needs approval"): they are one segment and fit. Measured on the strip
+ *  itself, so a narrow split pane behaves like a narrow window. */
+export const NARROW_BACKGROUND_TASKS_STRIP_REM = 24
+
+function kindCountLabel(kind: TaskKind, count: number, say: BackgroundTaskSay): string {
+  const value = { value0: count }
+  switch (kind) {
+    case 'agent':
+      return count === 1 ? say('countAgentsOne') : say('countAgentsMany', value)
+    case 'command':
+      return count === 1 ? say('countShellOne') : say('countShellMany', value)
+    case 'monitor':
+      return count === 1 ? say('countMonitorsOne') : say('countMonitorsMany', value)
+    case 'workflow':
+      return count === 1 ? say('countWorkflowsOne') : say('countWorkflowsMany', value)
+    case 'unknown':
+      return count === 1 ? say('countTasksOne') : say('countTasksMany', value)
+  }
+}
+
+/** How many kind segments the header may enumerate before an honest total
+ *  replaces the breakdown entirely — never a partial enumeration. */
+const HEADER_SEGMENT_CAP = 3
+
+/** Done comes last but must be present: the headline counts settled rows too,
+ *  so omitting it made the breakdown contradict its own count. */
+const HEADER_STATE_ORDER: readonly RunState[] = [
+  'working',
+  'monitoring',
+  'waiting',
+  'blocked',
+  'unverifiable',
+  'idle',
+  'done'
+]
+
+const ATTENTION_STATES: ReadonlySet<RunState> = new Set(['waiting', 'unverifiable', 'blocked'])
+
+export type BackgroundTasksHeaderSegment = {
+  text: string
+  /** The kind this segment counts, so the renderer can lead it with that kind's
+   *  icon. Null when the segment spans kinds (the collapsed total), which no
+   *  single icon can stand for. */
+  kind: TaskKind | null
+}
+
+export type BackgroundTasksHeaderContent = {
+  /** Emphasised segments, joined with a muted separator by the renderer. */
+  segments: BackgroundTasksHeaderSegment[]
+  /** Muted " — …" tail; null when the segments say everything. */
+  detail: string | null
+}
+
+/** Every variant in the signed-off mock, plus the overflow and narrow forms. Narrow replaces
+ *  only a breakdown across kinds; one kind reads the same at every width. Any lossy form
+ *  (fallback or total) leaves the detail reachable — the strip stays expandable regardless of
+ *  task count. */
+export function backgroundTasksHeaderContent(
+  groups: readonly BackgroundTaskGroup[],
+  options: { narrow: boolean; now: number },
+  say: BackgroundTaskSay
+): BackgroundTasksHeaderContent {
+  const all = groups.flatMap((group) => group.tasks)
+  if (all.length === 0) {
+    return { segments: [], detail: say('monitoring') }
+  }
+  if (groups.length > HEADER_SEGMENT_CAP || (options.narrow && groups.length > 1)) {
+    return {
+      segments: [{ text: say('headerTotal', { value0: all.length }), kind: null }],
+      detail: null
+    }
+  }
+  if (groups.length > 1) {
+    return {
+      segments: groups.map((group) => ({
+        text: kindCountLabel(group.kind, group.tasks.length, say),
+        kind: group.kind
+      })),
+      detail: null
+    }
+  }
+  const group = groups[0]
+  const count = group.tasks.length
+  const uniformState = group.tasks.every((entry) => entry.state === group.tasks[0].state)
+    ? group.tasks[0].state
+    : null
+  if (uniformState && ATTENTION_STATES.has(uniformState)) {
+    return {
+      segments: [
+        {
+          text: backgroundTaskCountedState(
+            kindCountLabel(group.kind, count, say),
+            uniformState,
+            say
+          ),
+          kind: group.kind
+        }
+      ],
+      detail: backgroundTaskStateReason(uniformState, say)
+    }
+  }
+  if (count === 1) {
+    const entry = group.tasks[0]
+    const subject =
+      group.kind === 'command' ? say('countShellCommandOne') : kindCountLabel(group.kind, 1, say)
+    // A still-growing clock on finished work would lie, exactly as on the row.
+    const elapsed =
+      group.kind === 'command' && !entry.row.settled
+        ? backgroundTaskElapsedLabel(entry.row.firstObservedAt, options.now)
+        : null
+    return {
+      segments: [{ text: subject, kind: group.kind }],
+      detail: elapsed ?? backgroundTaskStateWord(entry.state, say)
+    }
+  }
+  const stateCounts = HEADER_STATE_ORDER.map((state) => ({
+    state,
+    count: group.tasks.filter((entry) => entry.state === state).length
+  })).filter((entry) => entry.count > 0)
+  return {
+    segments: [{ text: kindCountLabel(group.kind, count, say), kind: group.kind }],
+    // Done is accounted for in the muted detail but never earns its own emphasised
+    // segment: a finished sibling claims no colour above the composer.
+    detail:
+      stateCounts.length > 0
+        ? stateCounts
+            .map((entry) => backgroundTaskCountedState(entry.count, entry.state, say))
+            .join(', ')
+        : null
+  }
+}
+
+/** The header as one line, for an accessibility label. */
+export function backgroundTasksHeaderText(header: BackgroundTasksHeaderContent): string {
+  const segments = header.segments.map((segment) => segment.text).join(' · ')
+  return `${segments}${header.detail ? `${header.segments.length > 0 ? ' — ' : ''}${header.detail}` : ''}`
+}
diff --git a/src/renderer/src/components/native-chat/background-task-roster.test.ts b/src/shared/background-task-roster.test.ts
similarity index 72%
rename from src/renderer/src/components/native-chat/background-task-roster.test.ts
rename to src/shared/background-task-roster.test.ts
index 804bd68bcb51..57a9095b0dc6 100644
--- a/src/renderer/src/components/native-chat/background-task-roster.test.ts
+++ b/src/shared/background-task-roster.test.ts
@@ -1,13 +1,34 @@
 import { describe, expect, it } from 'vitest'
-import type { AgentSessionBackgroundTask } from '../../../../shared/agent-session-wire'
-import { backgroundTasksHeaderContent } from './background-task-header-content'
+import type { AgentSessionBackgroundTask } from './agent-session-wire'
+import type { AgentChildWorkView } from './agent-status-child-work-view'
+import { sayBackgroundTaskEnglish as say } from './background-task-copy'
+import { backgroundTasksHeaderContent as headerContent } from './background-task-header-content'
 import {
-  backgroundTaskCountedState,
-  buildBackgroundTaskGroups,
+  backgroundTaskCountedState as countedState,
+  backgroundTaskRowMeta,
+  backgroundTaskRowStopId,
+  backgroundTasksStripTicks,
+  buildBackgroundTaskGroups as buildGroups,
+  buildBackgroundTaskGroupsFromViews,
   formatBackgroundTaskTokens,
-  resolveBackgroundTaskName
+  resolveBackgroundTaskName as resolveName,
+  type BackgroundTaskGroup
 } from './background-task-roster'
 
+const buildBackgroundTaskGroups = (
+  tasks: AgentSessionBackgroundTask[],
+  settled: AgentSessionBackgroundTask[]
+) => buildGroups(tasks, settled, say)
+const backgroundTaskCountedState = (
+  counted: string | number,
+  state: Parameters<typeof countedState>[1]
+) => countedState(counted, state, say)
+const resolveBackgroundTaskName = (task: AgentSessionBackgroundTask) => resolveName(task, say)
+const backgroundTasksHeaderContent = (
+  groups: BackgroundTaskGroup[],
+  options: { narrow: boolean; now: number }
+) => headerContent(groups, options, say)
+
 const NOW = 1_000_000
 
 function agent(
@@ -101,11 +122,21 @@ describe('backgroundTasksHeaderContent', () => {
     ).toEqual({ segments: [{ text: '7 background tasks', kind: null }], detail: null })
   })
 
-  it('falls back to the total on a narrow strip', () => {
+  it('totals a breakdown across kinds on a narrow strip', () => {
     expect(
       header([agent('a'), { id: 's', kind: 'command', state: 'working', startedAt: NOW }], [], true)
     ).toEqual({ segments: [{ text: '2 background tasks', kind: null }], detail: null })
-    // A single task stays named: the short form fits.
+  })
+
+  it('keeps one kind in its state forms on a narrow strip', () => {
+    // The attention state a reader must see survives the narrow width.
+    expect(
+      header([agent('a', { state: 'waiting' }), agent('b', { state: 'waiting' })], [], true)
+    ).toEqual({ segments: [{ text: '2 agents waiting', kind: 'agent' }], detail: 'needs approval' })
+    expect(header([agent('a'), agent('b', { state: 'waiting' })], [], true)).toEqual({
+      segments: [{ text: '2 agents', kind: 'agent' }],
+      detail: '1 working, 1 waiting'
+    })
     expect(header([agent('a')], [], true)).toEqual({
       segments: [{ text: '1 agent', kind: 'agent' }],
       detail: 'working'
@@ -266,3 +297,51 @@ describe('resumed tasks from mixed-version hosts', () => {
     ])
   })
 })
+
+function view(id: string, overrides: Partial<AgentChildWorkView> = {}): AgentChildWorkView {
+  return {
+    id,
+    providerId: `provider-${id}`,
+    kind: 'agent',
+    state: 'working',
+    membership: 'live',
+    firstObservedAt: NOW - 60_000,
+    observedAt: NOW,
+    stoppable: true,
+    invocation: { invocationId: `spawn-${id}`, generation: 1 },
+    ...overrides
+  }
+}
+
+describe('backgroundTasksStripTicks', () => {
+  it('ticks only while the list is open or the header times one live shell', () => {
+    const agents = buildBackgroundTaskGroups([agent('a'), agent('b')], [])
+    expect(backgroundTasksStripTicks(agents, false)).toBe(false)
+    expect(backgroundTasksStripTicks(agents, true)).toBe(true)
+    const shell = buildBackgroundTaskGroups(
+      [{ id: 's', kind: 'command', state: 'working', startedAt: NOW }],
+      []
+    )
+    expect(backgroundTasksStripTicks(shell, false)).toBe(true)
+  })
+
+  it('never wakes for finished work', () => {
+    const settled = buildBackgroundTaskGroups([], [agent('a', { state: 'done' })])
+    expect(backgroundTasksStripTicks(settled, true)).toBe(false)
+  })
+})
+
+describe('background task row meta and Stop', () => {
+  it('reads tokens then elapsed', () => {
+    const [group] = buildBackgroundTaskGroups([agent('a', { totalTokens: 18_130 })], [])
+    expect(backgroundTaskRowMeta(group.tasks[0].row, NOW)).toBe('18.1k · 1m 0s')
+  })
+
+  it('offers Stop only for a live row the host can target', () => {
+    const [group] = buildBackgroundTaskGroupsFromViews([view('a'), view('b', { stoppable: false })])
+    const [a, b] = group.tasks.map((entry) => entry.row)
+    expect(backgroundTaskRowStopId(a, true)).toBe('provider-a')
+    expect(backgroundTaskRowStopId(a, false)).toBeNull()
+    expect(backgroundTaskRowStopId(b, true)).toBeNull()
+  })
+})
diff --git a/src/shared/background-task-roster.ts b/src/shared/background-task-roster.ts
new file mode 100644
index 000000000000..0fcd1d04fddf
--- /dev/null
+++ b/src/shared/background-task-roster.ts
@@ -0,0 +1,264 @@
+// Grouping, naming, and state words for the background-tasks strip. Pure functions over the wire
+// roster so every surface (desktop strip, phone strip) groups and words one roster the same way;
+// each passes its own `say` for the words.
+
+import type {
+  AgentSessionBackgroundTask,
+  AgentSessionBackgroundTaskRunState
+} from './agent-session-background-task-wire'
+import type { BackgroundTaskSay } from './background-task-copy'
+import {
+  buildAgentChildRowModels,
+  buildLegacyTaskRowModels,
+  usableAgentChildLabel,
+  type AgentChildRowContext,
+  type AgentChildRowModel
+} from './agent-child-row-model'
+import { agentChildRunStateFor } from './agent-status-child-work-display'
+import type { AgentChildWorkView } from './agent-status-child-work-view'
+import { formatNativeChatDuration } from './native-chat-turn-status'
+
+type TaskKind = AgentSessionBackgroundTask['kind']
+type RunState = AgentSessionBackgroundTaskRunState
+
+export type BackgroundRosterTask = {
+  /** 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
+}
+
+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']
+
+export function backgroundTaskKindLabel(kind: TaskKind, say: BackgroundTaskSay): string {
+  switch (kind) {
+    case 'agent':
+      return say('agent')
+    case 'workflow':
+      return say('workflow')
+    case 'command':
+      return say('command')
+    case 'monitor':
+      return say('monitor')
+    case 'unknown':
+      return say('task')
+  }
+}
+
+/** 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,
+  say: BackgroundTaskSay
+): string {
+  return (
+    usableAgentChildLabel(task.description) ??
+    usableAgentChildLabel(task.name) ??
+    backgroundTaskKindLabel(task.kind, say)
+  )
+}
+
+/** 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)
+}
+
+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[],
+  say: BackgroundTaskSay
+): BackgroundTaskGroup[] {
+  // 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, say) }
+    )
+  )
+}
+
+// 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, say: BackgroundTaskSay): string {
+  switch (state) {
+    case 'working':
+      return say('stateWorking')
+    case 'monitoring':
+      return say('stateMonitoring')
+    case 'waiting':
+      return say('stateWaiting')
+    case 'blocked':
+      return say('stateBlocked')
+    case 'done':
+      return say('stateDone')
+    case 'idle':
+      return say('stateIdle')
+    case 'unverifiable':
+      return say('stateUnverifiable')
+  }
+}
+
+/** The reason line for an attention state, per the signed-off mock. */
+export function backgroundTaskStateReason(state: RunState, say: BackgroundTaskSay): string | null {
+  switch (state) {
+    case 'waiting':
+      return say('reasonWaiting')
+    case 'blocked':
+      return say('reasonBlocked')
+    case 'working':
+    case 'monitoring':
+    case 'done':
+    case 'idle':
+    case 'unverifiable':
+      // `unverifiable`'s state word already says it.
+      return null
+  }
+}
+
+/** A count and its state ("2 agents waiting"), one whole sentence per state so a language can
+ *  agree the state with the count. */
+export function backgroundTaskCountedState(
+  counted: string | number,
+  state: RunState,
+  say: BackgroundTaskSay
+): string {
+  const value = { value0: counted }
+  switch (state) {
+    case 'working':
+      return say('stateWorkingCount', value)
+    case 'monitoring':
+      return say('stateMonitoringCount', value)
+    case 'waiting':
+      return say('stateWaitingCount', value)
+    case 'blocked':
+      return say('stateBlockedCount', value)
+    case 'done':
+      return say('stateDoneCount', value)
+    case 'idle':
+      return say('stateIdleCount', value)
+    case 'unverifiable':
+      return say('stateUnverifiableCount', value)
+  }
+}
+
+export function backgroundTaskGroupLabel(kind: TaskKind, say: BackgroundTaskSay): string {
+  switch (kind) {
+    case 'agent':
+      return say('groupAgents')
+    case 'command':
+      return say('groupShell')
+    case 'monitor':
+      return say('groupMonitors')
+    case 'workflow':
+      return say('groupWorkflows')
+    case 'unknown':
+      return say('groupTasks')
+  }
+}
+
+function tokenScaleText(value: number): string {
+  return Number.isInteger(value) ? value.toFixed(0) : value.toFixed(1)
+}
+
+/** Compact token meta per the mock ("18.2k"). Locale-neutral on purpose:
+ *  it sits in a mono meta slot beside elapsed, like other technical literals. */
+export function formatBackgroundTaskTokens(totalTokens: number): string {
+  if (totalTokens < 1_000) {
+    return String(totalTokens)
+  }
+  // Round before picking the unit, or 999_950 renders as "1000k" instead of "1m".
+  const thousands = Math.round(totalTokens / 100) / 10
+  return thousands < 1_000
+    ? `${tokenScaleText(thousands)}k`
+    : `${tokenScaleText(Math.round(totalTokens / 100_000) / 10)}m`
+}
+
+export function backgroundTaskElapsedLabel(startedAt: number, now: number): string | null {
+  if (startedAt <= 0) {
+    return null
+  }
+  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
+}
+
+function rowsTick(rows: readonly AgentChildRowModel[]): boolean {
+  return rows.some((row) => backgroundTaskRowTicks(row) || rowsTick(row.owned))
+}
+
+/** Whether the strip needs a 1 Hz clock: some live row's elapsed moves, and it shows, because the
+ *  list is open or the collapsed header times one live shell. Finished work never wakes it. */
+export function backgroundTasksStripTicks(
+  groups: readonly BackgroundTaskGroup[],
+  expanded: boolean
+): boolean {
+  const singleLiveCommand =
+    groups.length === 1 && groups[0].kind === 'command' && groups[0].tasks.length === 1
+  const ticks = groups.some((group) => rowsTick(group.tasks.map((entry) => entry.row)))
+  return ticks && (expanded || singleLiveCommand)
+}
+
+/** 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
+}
+
+/** The row's meta slot: tokens, then elapsed. '' when it has neither. */
+export function backgroundTaskRowMeta(row: AgentChildRowModel, now: number): string {
+  return [
+    row.totalTokens !== undefined ? formatBackgroundTaskTokens(row.totalTokens) : null,
+    backgroundTaskRowElapsedLabel(row, now)
+  ]
+    .filter((part): part is string => part !== null)
+    .join(' · ')
+}
+
+/** The provider id a row's Stop targets, or null when the row offers none. Only an explicit `false`
+ *  withholds it: a Stop on a row the host cannot target resolves to an empty list and silently
+ *  reports nothing cancelled. */
+export function backgroundTaskRowStopId(
+  row: AgentChildRowModel,
+  supportsTaskStop: boolean
+): string | null {
+  return !row.settled && supportsTaskStop && row.canStop ? (row.providerId ?? null) : null
+}
diff --git a/src/shared/claude-profile-activation-contract.test.ts b/src/shared/claude-profile-activation-contract.test.ts
new file mode 100644
index 000000000000..17cc204304b4
--- /dev/null
+++ b/src/shared/claude-profile-activation-contract.test.ts
@@ -0,0 +1,18 @@
+import { expect, it } from 'vitest'
+import { CLAUDE_SIGN_IN_RUNTIME_CAPABILITY, RUNTIME_CAPABILITIES } from './protocol-version'
+import {
+  buildWslInteractiveLoginShellCommand,
+  buildWslLoginShellCommand
+} from './wsl-login-shell-command'
+import { getFishClaudeShellFunction } from './claude-shell-function'
+
+it('advertises the Claude sign-in the CLI needs before it starts a login', () => {
+  expect([...RUNTIME_CAPABILITIES]).toContain(CLAUDE_SIGN_IN_RUNTIME_CAPABILITY)
+})
+
+it('gives a WSL fish pane the account function, and leaves other WSL commands alone', () => {
+  const pane = buildWslInteractiveLoginShellCommand()
+  expect(pane).toContain('"$_orca_wsl_shell" -l -C')
+  expect(getFishClaudeShellFunction()).toContain('ORCA_CLAUDE_PROFILE_POINTER')
+  expect(buildWslLoginShellCommand('true')).not.toContain('fish')
+})
diff --git a/src/shared/claude-profile-routing.ts b/src/shared/claude-profile-routing.ts
index cf4f915bddaf..6b1294f236f7 100644
--- a/src/shared/claude-profile-routing.ts
+++ b/src/shared/claude-profile-routing.ts
@@ -1,7 +1,14 @@
-/** Step 4 enables this only after the credential writers have been removed. */
-export function claudeProfileRoutingEnabled(): boolean {
-  return false
-}
-
 /** The pane's path to the which-account file the `claude` shell function re-reads on every launch. */
 export const CLAUDE_PROFILE_POINTER_ENV = 'ORCA_CLAUDE_PROFILE_POINTER'
+
+/** Set beside every CLAUDE_CONFIG_DIR Orca injects, so its own value never reads as the user's. */
+export const CLAUDE_INJECTED_CONFIG_DIR_ENV = 'ORCA_CLAUDE_INJECTED_CONFIG_DIR'
+
+/** The user's own CLAUDE_CONFIG_DIR an injected value replaced; System default restores it. */
+export const CLAUDE_USER_CONFIG_DIR_ENV = 'ORCA_CLAUDE_USER_CONFIG_DIR'
+
+export const CLAUDE_PROFILE_MISSING_MESSAGE =
+  "The selected Claude account's folder is missing. Sign in to it again or choose another account."
+
+export const CLAUDE_PROFILE_SETUP_FAILED_MESSAGE =
+  'The selected Claude account could not be set up. Try again or choose another account.'
diff --git a/src/shared/claude-shell-function.test.ts b/src/shared/claude-shell-function.test.ts
index dee5b3dc5f57..f45c1f884642 100644
--- a/src/shared/claude-shell-function.test.ts
+++ b/src/shared/claude-shell-function.test.ts
@@ -1,14 +1,16 @@
-import type * as ProfileRouting from './claude-profile-routing'
 import { spawnSync } from 'node:child_process'
-import { chmodSync, existsSync, mkdirSync, mkdtempSync, rmSync, writeFileSync } from 'node:fs'
+import {
+  chmodSync,
+  existsSync,
+  mkdirSync,
+  mkdtempSync,
+  rmSync,
+  statSync,
+  writeFileSync
+} from 'node:fs'
 import { tmpdir } from 'node:os'
 import { join } from 'node:path'
-import { afterEach, describe, expect, it, vi } from 'vitest'
-const gate = vi.hoisted(() => ({ enabled: true }))
-vi.mock('./claude-profile-routing', async (original) => ({
-  ...(await original<typeof ProfileRouting>()),
-  claudeProfileRoutingEnabled: () => gate.enabled
-}))
+import { afterEach, describe, expect, it } from 'vitest'
 import {
   getPosixClaudeShellFunction,
   getFishClaudeShellFunction,
@@ -20,7 +22,6 @@ const FISH = ['/opt/homebrew/bin/fish', '/usr/local/bin/fish', '/usr/bin/fish'].
 const SHELLS = [...POSIX_SHELLS, ...(FISH ? [FISH] : [])]
 const roots: string[] = []
 afterEach(() => {
-  gate.enabled = true
   roots.splice(0).forEach((root) => rmSync(root, { recursive: true, force: true }))
 })
 function fixture() {
@@ -63,6 +64,8 @@ function fixture() {
       { encoding: 'utf8', cwd: root }
     )
     expect(result.status).not.toBe(97)
+    // Orca prints nothing into a terminal; the fake claude writes only to stdout.
+    expect(result.stderr).toBe('')
     return result
   }
   return { a, b, pointer, run }
@@ -91,6 +94,22 @@ describe.each(SHELLS)('the claude function in %s', (shell) => {
     expect(f.run(shell, injected(f.a)).stdout).toBe('HOME=default KEY=fake TWIN=none\n')
   })
 
+  it('restores the user’s own value Orca replaced when switched back to System default', () => {
+    const f = fixture()
+    const own = ['ORCA_CLAUDE_USER_CONFIG_DIR=/user/own']
+    writeFileSync(f.pointer, f.a)
+    const account = f.run(shell, [...injected(f.a), ...own])
+    expect(account.stdout).toBe(`HOME=${f.a} KEY=none TWIN=${f.a}\n`)
+    writeFileSync(f.pointer, '')
+    const restored = f.run(shell, [...injected(f.a), ...own])
+    expect(restored.stdout).toBe('HOME=/user/own KEY=fake TWIN=none\n')
+    // An rc export still wins, and a value the user unset stays unset.
+    const rc = ['CLAUDE_CONFIG_DIR=/rc/own', `ORCA_CLAUDE_INJECTED_CONFIG_DIR=${f.a}`, ...own]
+    expect(f.run(shell, rc).stdout).toBe(`HOME=/rc/own KEY=fake TWIN=${f.a}\n`)
+    const unset = f.run(shell, [`ORCA_CLAUDE_INJECTED_CONFIG_DIR=${f.a}`, ...own])
+    expect(unset.stdout).toBe('HOME=default KEY=fake TWIN=none\n')
+  })
+
   it('reads a WSL pane’s home-relative pointer against $HOME', () => {
     const f = fixture()
     writeFileSync(f.pointer, f.a)
@@ -98,16 +117,37 @@ describe.each(SHELLS)('the claude function in %s', (shell) => {
     expect(relative.stdout).toBe(`HOME=${f.a} KEY=none TWIN=${f.a}\n`)
   })
 
-  it('refuses a selected account whose folder is missing', () => {
+  it('creates a missing account folder and runs Claude in it, printing nothing', () => {
+    const f = fixture()
+    // A pre-update account: nothing of its folder exists yet.
+    const fresh = join(f.a, 'claude-profiles', 'id', 'home')
+    writeFileSync(f.pointer, fresh)
+    const result = f.run(shell)
+    expect(result.stdout).toBe(`HOME=${fresh} KEY=none TWIN=${fresh}\n`)
+    expect(result.status).toBe(23)
+    expect(existsSync(fresh)).toBe(true)
+    // Same mode as Orca's own setup: the folder will hold a login.
+    expect(statSync(fresh).mode & 0o777).toBe(0o700)
+  })
+
+  it('still runs Claude only in the selected folder when that folder cannot be created', () => {
+    const f = fixture()
+    const blocked = join(f.a, 'file', 'home')
+    writeFileSync(join(f.a, 'file'), '')
+    writeFileSync(f.pointer, blocked)
+    expect(f.run(shell).stdout).toBe(`HOME=${blocked} KEY=none TWIN=${blocked}\n`)
+  })
+
+  it('runs nothing for a pointer that names no absolute folder', () => {
     const f = fixture()
-    writeFileSync(f.pointer, join(f.a, 'gone'))
+    writeFileSync(f.pointer, 'not-a-folder')
     const result = f.run(shell)
     expect(result.status).toBe(1)
     expect(result.stdout).toBe('')
-    expect(result.stderr).toContain('folder is missing')
+    expect(existsSync(join(f.a, '..', 'not-a-folder'))).toBe(false)
   })
 
-  it('lets the user’s own CLAUDE_CONFIG_DIR win and says so when an account is selected', () => {
+  it('lets the user’s own CLAUDE_CONFIG_DIR win silently when an account is selected', () => {
     const f = fixture()
     const own = f.run(shell, ['CLAUDE_CONFIG_DIR=/user/own'])
     expect(own.stdout).toBe('HOME=/user/own KEY=fake TWIN=none\n')
@@ -115,19 +155,10 @@ describe.each(SHELLS)('the claude function in %s', (shell) => {
     writeFileSync(f.pointer, f.a)
     const overridden = f.run(shell, ['CLAUDE_CONFIG_DIR=/user/own'])
     expect(overridden.stdout).toBe('HOME=/user/own KEY=fake TWIN=none\n')
-    expect(overridden.stderr).toContain('not used here')
+    expect(overridden.stderr).toBe('')
   })
 })
 
-it('emits nothing while routing is off', () => {
-  gate.enabled = false
-  expect([
-    getPosixClaudeShellFunction(),
-    getFishClaudeShellFunction(),
-    getPowerShellClaudeShellFunction()
-  ]).toEqual(['', '', ''])
-})
-
 it('restores PowerShell process env without creating empty variables', () => {
   const script = getPowerShellClaudeShellFunction()
   expect(script.startsWith('\n$orcaClaudeCommand = Get-Command claude')).toBe(true)
@@ -136,8 +167,32 @@ it('restores PowerShell process env without creating empty variables', () => {
   expect(script).not.toMatch(/SetEnvironmentVariable\([^)]*,\s*(\$null|''|"")\s*,/)
 })
 
+it('prints no Orca text from the PowerShell function and creates a missing account folder', () => {
+  const script = getPowerShellClaudeShellFunction()
+  expect(script).not.toMatch(/Write-(Host|Output|Warning)|\bthrow\b|Orca:/)
+  // The shell's or Claude's own failure (claude missing, a throwing claude.ps1) still surfaces.
+  expect(script.match(/Write-Error/g)).toHaveLength(1)
+  expect(script).toContain(
+    '} catch { $global:LASTEXITCODE = 1; Write-Error $_ -ErrorAction Continue }'
+  )
+  expect(script).toContain(
+    'if (-not [IO.Directory]::Exists($orcaClaudeHome)) { $null = New-Item -ItemType Directory -Path $orcaClaudeHome -Force -ErrorAction SilentlyContinue }'
+  )
+  expect(script).toContain('-not [IO.Path]::IsPathRooted($orcaClaudeHome)')
+})
+
 it('trims the PowerShell pointer read as POSIX command substitution does', () => {
   expect(getPowerShellClaudeShellFunction()).toContain(
     '[IO.File]::ReadAllText($env:ORCA_CLAUDE_PROFILE_POINTER).TrimEnd()'
   )
 })
+
+it('restores the user’s own value on PowerShell System default rather than removing it', () => {
+  const script = getPowerShellClaudeShellFunction()
+  expect(script).toContain(
+    'if ($env:CLAUDE_CONFIG_DIR -and $env:ORCA_CLAUDE_USER_CONFIG_DIR) { $env:CLAUDE_CONFIG_DIR = $env:ORCA_CLAUDE_USER_CONFIG_DIR }'
+  )
+  expect(script).not.toContain(
+    'Remove-Item Env:CLAUDE_CONFIG_DIR, Env:ORCA_CLAUDE_INJECTED_CONFIG_DIR'
+  )
+})
diff --git a/src/shared/claude-shell-function.ts b/src/shared/claude-shell-function.ts
index abb3b97b3685..2cb7307b2573 100644
--- a/src/shared/claude-shell-function.ts
+++ b/src/shared/claude-shell-function.ts
@@ -1,24 +1,19 @@
-import { claudeProfileRoutingEnabled } from './claude-profile-routing'
 const authHeaderWords = 'authorization|x-api-key|api-key|bearer'
 const posixAuthHeaderPattern = authHeaderWords
   .split('|')
   .map((word) => `*${word.replace(/[a-z]/g, (letter) => `[${letter}${letter.toUpperCase()}]`)}*`)
   .join('|')
-const OVERRIDE_NOTE =
-  'Orca: CLAUDE_CONFIG_DIR is set in this shell, so the Claude account selected in Orca is not used here.'
-const MISSING_NOTE =
-  "Orca: the selected Claude account's folder is missing. Sign in to it again or choose another account."
 
 /**
  * `claude` re-reads the which-account file on every launch, so a switch reaches open terminals
  * (superset's wrapper rule). Defined only in a pane Orca routed (pointer env set) where `claude` is
- * a real executable. A missing or empty file is System default; a CLAUDE_CONFIG_DIR the user set,
- * as opposed to Orca's twin-marked value, wins.
+ * a real executable. A missing or empty file is System default, which restores the user's own value
+ * Orca's replaced; a CLAUDE_CONFIG_DIR the user set, as opposed to Orca's twin-marked value, wins.
+ * Prints nothing: an account folder with no login is created, and Claude's own first run signs in
+ * there. A pointer that names no absolute folder (never written by Orca) runs nothing, since any
+ * fallback would be another account.
  */
 export function getPosixClaudeShellFunction(): string {
-  if (!claudeProfileRoutingEnabled()) {
-    return ''
-  }
   return `__orca_claude_binary="$(unalias claude 2>/dev/null || :; command -v claude 2>/dev/null || :)"
 if [[ -n "\${ORCA_CLAUDE_PROFILE_POINTER:-}" && -n "\${__orca_claude_binary:-}" && -x "\${__orca_claude_binary}" ]]; then
   function claude {
@@ -27,13 +22,18 @@ if [[ -n "\${ORCA_CLAUDE_PROFILE_POINTER:-}" && -n "\${__orca_claude_binary:-}"
     case "$__orca_claude_pointer" in '~/'*) __orca_claude_pointer="\${HOME:-}/\${__orca_claude_pointer#??}" ;; esac
     __orca_claude_home="$(cat "$__orca_claude_pointer" 2>/dev/null || :)"
     if [ -n "\${CLAUDE_CONFIG_DIR:-}" ] && [ "$CLAUDE_CONFIG_DIR" != "\${ORCA_CLAUDE_INJECTED_CONFIG_DIR:-}" ]; then
-      [ -z "$__orca_claude_home" ] || [ "$__orca_claude_home" = "$CLAUDE_CONFIG_DIR" ] || printf '%s\\n' '${OVERRIDE_NOTE}' >&2
       command claude "$@"; return
     fi
+    # Why: Orca's value replaced the user's own at spawn, so System default restores theirs.
+    if [ -z "$__orca_claude_home" ] && [ -n "\${CLAUDE_CONFIG_DIR:-}" ] && [ -n "\${ORCA_CLAUDE_USER_CONFIG_DIR:-}" ]; then
+      ( unset ORCA_CLAUDE_INJECTED_CONFIG_DIR; export CLAUDE_CONFIG_DIR="$ORCA_CLAUDE_USER_CONFIG_DIR"; command claude "$@" ); return
+    fi
     if [ -z "$__orca_claude_home" ]; then
       ( unset CLAUDE_CONFIG_DIR ORCA_CLAUDE_INJECTED_CONFIG_DIR; command claude "$@" ); return
     fi
-    if [ ! -d "$__orca_claude_home" ]; then printf '%s\\n' "${MISSING_NOTE}" >&2; return 1; fi
+    case "$__orca_claude_home" in /*|[A-Za-z]:*) ;; *) return 1 ;; esac
+    # Why -m 700: matches the folder Orca's setup creates; a credentials folder stays private.
+    [ -d "$__orca_claude_home" ] || mkdir -p -m 700 -- "$__orca_claude_home" 2>/dev/null
     ( unset ANTHROPIC_API_KEY ANTHROPIC_AUTH_TOKEN CLAUDE_CODE_OAUTH_TOKEN AWS_BEARER_TOKEN_BEDROCK; case "\${ANTHROPIC_CUSTOM_HEADERS:-}" in ${posixAuthHeaderPattern}) unset ANTHROPIC_CUSTOM_HEADERS ;; esac; export CLAUDE_CONFIG_DIR="$__orca_claude_home" ORCA_CLAUDE_INJECTED_CONFIG_DIR="$__orca_claude_home"; command claude "$@" )
   }
 fi
@@ -43,9 +43,6 @@ unset __orca_claude_binary
 
 /** Leading newline: the codex fragment it follows ends without one. */
 export function getFishClaudeShellFunction(): string {
-  if (!claudeProfileRoutingEnabled()) {
-    return ''
-  }
   return `
 set -l __orca_claude_type (type -t claude 2>/dev/null)
 if test -n "$ORCA_CLAUDE_PROFILE_POINTER"; and test "$__orca_claude_type" = file
@@ -54,19 +51,21 @@ if test -n "$ORCA_CLAUDE_PROFILE_POINTER"; and test "$__orca_claude_type" = file
     set -l pointer (string replace -r '^~/' "$HOME/" -- "$ORCA_CLAUDE_PROFILE_POINTER")
     set -l profile (cat "$pointer" 2>/dev/null)
     if test -n "$CLAUDE_CONFIG_DIR"; and test "$CLAUDE_CONFIG_DIR" != "$ORCA_CLAUDE_INJECTED_CONFIG_DIR"
-      if test -n "$profile"; and test "$profile" != "$CLAUDE_CONFIG_DIR"
-        echo '${OVERRIDE_NOTE}' >&2
-      end
       command claude $argv
       return $status
     end
+    if test -z "$profile"; and test -n "$CLAUDE_CONFIG_DIR"; and test -n "$ORCA_CLAUDE_USER_CONFIG_DIR"
+      env -u ORCA_CLAUDE_INJECTED_CONFIG_DIR CLAUDE_CONFIG_DIR="$ORCA_CLAUDE_USER_CONFIG_DIR" claude $argv
+      return $status
+    end
     if test -z "$profile"
       env -u CLAUDE_CONFIG_DIR -u ORCA_CLAUDE_INJECTED_CONFIG_DIR claude $argv
       return $status
     end
-    if not test -d "$profile"
-      echo "${MISSING_NOTE}" >&2; return 1
+    if not string match -qr '^(/|[A-Za-z]:)' -- "$profile"
+      return 1
     end
+    test -d "$profile"; or mkdir -p -m 700 -- "$profile" 2>/dev/null
     set -l headers
     if string match -irq '${authHeaderWords}' -- "$ANTHROPIC_CUSTOM_HEADERS"
       set headers -u ANTHROPIC_CUSTOM_HEADERS
@@ -80,9 +79,6 @@ set -e __orca_claude_type
 
 /** Leading newline: the codex fragment it follows ends without one. */
 export function getPowerShellClaudeShellFunction(): string {
-  if (!claudeProfileRoutingEnabled()) {
-    return ''
-  }
   return `
 $orcaClaudeCommand = Get-Command claude -ErrorAction SilentlyContinue | Select-Object -First 1
 if ($env:ORCA_CLAUDE_PROFILE_POINTER -and $orcaClaudeCommand -and
@@ -97,12 +93,16 @@ function Global:claude {
             $orcaClaudeHome = [IO.File]::ReadAllText($env:ORCA_CLAUDE_PROFILE_POINTER).TrimEnd()
         }
         if ($env:CLAUDE_CONFIG_DIR -and $env:CLAUDE_CONFIG_DIR -ne $env:ORCA_CLAUDE_INJECTED_CONFIG_DIR) {
-            if ($orcaClaudeHome -and $orcaClaudeHome -ne $env:CLAUDE_CONFIG_DIR) { [Console]::Error.WriteLine('${OVERRIDE_NOTE}') }
+            # The user's own value wins.
         } elseif (-not $orcaClaudeHome) {
-            Remove-Item Env:CLAUDE_CONFIG_DIR, Env:ORCA_CLAUDE_INJECTED_CONFIG_DIR -ErrorAction SilentlyContinue
-        } elseif (-not [IO.Directory]::Exists($orcaClaudeHome)) {
-            throw "${MISSING_NOTE}"
+            Remove-Item Env:ORCA_CLAUDE_INJECTED_CONFIG_DIR -ErrorAction SilentlyContinue
+            if ($env:CLAUDE_CONFIG_DIR -and $env:ORCA_CLAUDE_USER_CONFIG_DIR) { $env:CLAUDE_CONFIG_DIR = $env:ORCA_CLAUDE_USER_CONFIG_DIR }
+            else { Remove-Item Env:CLAUDE_CONFIG_DIR -ErrorAction SilentlyContinue }
+        } elseif (-not [IO.Path]::IsPathRooted($orcaClaudeHome)) {
+            $global:LASTEXITCODE = 1
+            return
         } else {
+            if (-not [IO.Directory]::Exists($orcaClaudeHome)) { $null = New-Item -ItemType Directory -Path $orcaClaudeHome -Force -ErrorAction SilentlyContinue }
             foreach ($name in $names) {
                 if ($name -ne 'ANTHROPIC_CUSTOM_HEADERS' -or $env:ANTHROPIC_CUSTOM_HEADERS -match '${authHeaderWords}') { Remove-Item -LiteralPath "Env:$name" -ErrorAction SilentlyContinue }
             }
diff --git a/src/shared/constants.ts b/src/shared/constants.ts
index c8dd827af047..8a2d57e3ab60 100644
--- a/src/shared/constants.ts
+++ b/src/shared/constants.ts
@@ -176,7 +176,6 @@ export function getDefaultPersistedState(homedir: string): PersistedState {
     deletedSshConfigAliases: [],
     sshRemotePtyLeases: [],
     sshPtyConsumerRecoveries: [],
-    claudeLivePtySessionIds: [],
     migrationUnsupportedPtyEntries: [],
     legacyPaneKeyAliasEntries: [],
     automations: [],
diff --git a/src/shared/default-global-settings.ts b/src/shared/default-global-settings.ts
index 3e8bb8abbca3..be9ee19ab216 100644
--- a/src/shared/default-global-settings.ts
+++ b/src/shared/default-global-settings.ts
@@ -137,6 +137,7 @@ export function buildDefaultSettings(args: {
     experimentalStructuredNativeChat: false,
     nativeChatResumeWorkOnRestart: false,
     nativeChatQueueFollowUps: true,
+    nativeChatInlineVisuals: true,
     nativeChatInheritShellEnvironment: true,
     nativeChatShellEnvironmentVariables: [],
     nativeChatSessionOptions: {},
@@ -200,6 +201,7 @@ export function buildDefaultSettings(args: {
     devPluginPaths: [],
     claudeAgentTeamsDefaultDisabledMigrated: true,
     skipDeleteWorktreeConfirm: false,
+    alwaysForceDeleteWorktrees: false,
     skipCloseTerminalWithRunningProcessConfirm: false,
     skipDeleteAutomationConfirm: false,
     skipDeleteArtifactConfirm: false,
diff --git a/src/shared/diff-comment-schema.ts b/src/shared/diff-comment-schema.ts
index 369dda682c63..873f5d793b72 100644
--- a/src/shared/diff-comment-schema.ts
+++ b/src/shared/diff-comment-schema.ts
@@ -1,5 +1,24 @@
 import { z } from 'zod'
 
+export const MobileDiffReviewSchema = z.object({
+  version: z.literal(1),
+  updatedAt: z.number().finite().optional(),
+  completedAt: z.number().finite().optional(),
+  files: z.record(
+    z.string(),
+    z.object({
+      key: z.string(),
+      filePath: z.string(),
+      oldPath: z.string().optional(),
+      scope: z.enum(['unstaged', 'staged', 'branch']),
+      lastOpenedAt: z.number().finite().optional(),
+      lastSeenDiffIdentity: z.string().optional(),
+      reviewedAt: z.number().finite().optional(),
+      reviewDiffIdentity: z.string().optional()
+    })
+  )
+})
+
 export const DiffCommentSchema = z.object({
   id: z.string(),
   worktreeId: z.string(),
diff --git a/src/shared/electron-remote-runtime-client-capabilities.ts b/src/shared/electron-remote-runtime-client-capabilities.ts
index 17bdebceb79c..83e502aba091 100644
--- a/src/shared/electron-remote-runtime-client-capabilities.ts
+++ b/src/shared/electron-remote-runtime-client-capabilities.ts
@@ -5,6 +5,7 @@ import {
   BROWSER_CLIENT_PAGE_METADATA_RUNTIME_CAPABILITY,
   CLAUDE_STRUCTURED_AGENT_SESSION_RUNTIME_CAPABILITY,
   NATIVE_REMOTE_RUNTIME_CLIENT_CAPABILITIES,
+  PI_STRUCTURED_DIALOGS_RUNTIME_CAPABILITY,
   SESSION_TABS_RETIREMENT_PROOF_DELTA_RUNTIME_CAPABILITY,
   STRUCTURED_AGENT_SESSION_CLIENT_LAUNCH_MODE_CAPABILITY,
   STRUCTURED_AGENT_SESSION_REGISTERED_AGENTS_RUNTIME_CAPABILITY,
@@ -23,6 +24,7 @@ export const ELECTRON_REMOTE_RUNTIME_CLIENT_CAPABILITIES = [
   CLAUDE_STRUCTURED_AGENT_SESSION_RUNTIME_CAPABILITY,
   // Same renderer: it reads each host's `agentSession.agents` and renders any agent listed there.
   STRUCTURED_AGENT_SESSION_REGISTERED_AGENTS_RUNTIME_CAPABILITY,
+  PI_STRUCTURED_DIALOGS_RUNTIME_CAPABILITY,
   // The desktop picks each launch's mode from its own settings before asking the host.
   STRUCTURED_AGENT_SESSION_CLIENT_LAUNCH_MODE_CAPABILITY,
   BROWSER_CLIENT_HOST_RUNTIME_CAPABILITY,
diff --git a/src/shared/folder-workspace-types.ts b/src/shared/folder-workspace-types.ts
index 81e8dcf9f98f..fcf2e96fd196 100644
--- a/src/shared/folder-workspace-types.ts
+++ b/src/shared/folder-workspace-types.ts
@@ -5,6 +5,7 @@ import type { DiffComment } from './diff-comment-types'
 import type {
   WorkspaceCreatorProvenance,
   WorkspaceLinkedItem,
+  WorkspaceAttachment,
   WorkspaceStatus
 } from './worktree/types'
 
@@ -26,6 +27,7 @@ export type FolderWorkspace = {
   /** Authenticated client that created this workspace. Missing means unknown legacy origin. */
   creatorProvenance?: WorkspaceCreatorProvenance
   linkedTask: WorkspaceLinkedItem | null
+  linkedItems?: WorkspaceAttachment[]
   linkedTaskSourceContext?: TaskSourceContext | null
   comment: string
   isArchived: boolean
diff --git a/src/shared/folder-workspace-worktree.test.ts b/src/shared/folder-workspace-worktree.test.ts
index d259d180acb5..70e64e0e342f 100644
--- a/src/shared/folder-workspace-worktree.test.ts
+++ b/src/shared/folder-workspace-worktree.test.ts
@@ -1,5 +1,7 @@
 import { describe, expect, it } from 'vitest'
 import type { FolderWorkspace } from './folder-workspace-types'
+import type { WorkspaceAttachment } from './worktree/types'
+import { getWorkspaceAttachments } from './workspace-attachments'
 import {
   folderWorkspaceRepoId,
   folderWorkspaceToWorktree,
@@ -28,6 +30,25 @@ function makeFolderWorkspace(overrides: Partial<FolderWorkspace> = {}): FolderWo
 }
 
 describe('folderWorkspaceToWorktree', () => {
+  it('preserves multiple attachments and projects a bare Linear task without enabling review checks', () => {
+    const linkedItems: WorkspaceAttachment[] = [
+      { provider: 'github', type: 'pr', number: 7 },
+      {
+        provider: 'linear',
+        type: 'issue',
+        number: 0,
+        identifier: 'APP-42',
+        linearOrganizationUrlKey: 'acme'
+      },
+      { provider: 'github', type: 'issue', number: 8 }
+    ]
+    const worktree = folderWorkspaceToWorktree(makeFolderWorkspace({ linkedItems }))
+    expect(worktree.linkedItems).toEqual(linkedItems)
+    expect(getWorkspaceAttachments(worktree)).toHaveLength(3)
+    expect(worktree.linkedLinearIssue).toBe('APP-42')
+    expect(worktree.linkedLinearIssueOrganizationUrlKey).toBe('acme')
+    expect(worktree.linkedPR).toBeNull()
+  })
   it('projects attached issue tasks without creating linked PR metadata', () => {
     const githubIssue = folderWorkspaceToWorktree(
       makeFolderWorkspace({
diff --git a/src/shared/folder-workspace-worktree.ts b/src/shared/folder-workspace-worktree.ts
index 7aec035dc6c6..38b6e18d1fe4 100644
--- a/src/shared/folder-workspace-worktree.ts
+++ b/src/shared/folder-workspace-worktree.ts
@@ -3,6 +3,8 @@ import type { Worktree } from './worktree/types'
 import { folderWorkspaceKey } from './workspace-scope'
 import { parseExecutionHostId, toSshExecutionHostId } from './execution-host'
 import { normalizeWorkspaceCreatorProvenance } from './workspace-creator-provenance'
+import { getWorkspaceAttachments } from './workspace-attachments'
+import { normalizeWorkspaceAttachment } from './workspace-attachment-normalization'
 
 /**
  * A folder workspace has no git repo, so its synthetic `Worktree` borrows the `repoId` slot to
@@ -28,6 +30,11 @@ export function projectGroupIdFromRepoId(repoId: string | null | undefined): str
 
 export function folderWorkspaceToWorktree(folderWorkspace: FolderWorkspace): Worktree {
   const linkedTask = folderWorkspace.linkedTask
+  const selectedTask = linkedTask
+    ? normalizeWorkspaceAttachment(linkedTask)
+    : getWorkspaceAttachments({
+        linkedItems: folderWorkspace.linkedItems
+      }).find((item) => item.type === 'issue')
   const creatorProvenance = normalizeWorkspaceCreatorProvenance(folderWorkspace.creatorProvenance)
   const hostId =
     folderWorkspace.executionHostId ??
@@ -40,17 +47,30 @@ export function folderWorkspaceToWorktree(folderWorkspace: FolderWorkspace): Wor
     displayName: folderWorkspace.name,
     comment: folderWorkspace.comment,
     linkedIssue:
-      linkedTask?.provider === 'github' && linkedTask.type === 'issue' ? linkedTask.number : null,
+      selectedTask?.provider === 'github' && selectedTask.type === 'issue'
+        ? selectedTask.number
+        : null,
     linkedPR: null,
     linkedLinearIssue:
-      linkedTask?.provider === 'linear' ? (linkedTask.linearIdentifier ?? null) : null,
+      selectedTask?.provider === 'linear'
+        ? (selectedTask.identifier ?? selectedTask.linearIdentifier ?? null)
+        : null,
+    linkedLinearIssueWorkspaceId:
+      selectedTask?.provider === 'linear' ? (selectedTask.linearWorkspaceId ?? null) : null,
+    linkedLinearIssueOrganizationUrlKey:
+      selectedTask?.provider === 'linear' ? (selectedTask.linearOrganizationUrlKey ?? null) : null,
     linkedGitLabMR: null,
     linkedGitLabIssue:
-      linkedTask?.provider === 'gitlab' && linkedTask.type === 'issue' ? linkedTask.number : null,
+      selectedTask?.provider === 'gitlab' && selectedTask.type === 'issue'
+        ? selectedTask.number
+        : null,
     linkedBitbucketPR: null,
     linkedAzureDevOpsPR: null,
     linkedGiteaPR: null,
     linkedWorkItem: linkedTask,
+    ...(folderWorkspace.linkedItems !== undefined
+      ? { linkedItems: folderWorkspace.linkedItems }
+      : {}),
     linkedTaskSourceContext: folderWorkspace.linkedTaskSourceContext ?? null,
     isArchived: folderWorkspace.isArchived,
     isUnread: folderWorkspace.isUnread,
diff --git a/src/shared/folder-workspaces.ts b/src/shared/folder-workspaces.ts
index 32617981912f..87485d45d10b 100644
--- a/src/shared/folder-workspaces.ts
+++ b/src/shared/folder-workspaces.ts
@@ -5,6 +5,7 @@ import { normalizeStoredTaskSourceContext } from './task-source-context'
 import { normalizeWorkspaceLinkedItem } from './workspace-linked-item'
 import { isWorkspaceLinkedItemSourceContextMatch } from './workspace-linked-item-source-context'
 import { normalizeWorkspaceCreatorProvenance } from './workspace-creator-provenance'
+import { getWorkspaceAttachments } from './workspace-attachments'
 
 export function normalizeFolderWorkspaceName(
   name: string | null | undefined,
@@ -73,6 +74,15 @@ export function normalizeFolderWorkspaces(
             : (group?.connectionId ?? null),
       ...(creatorProvenance ? { creatorProvenance } : {}),
       linkedTask,
+      ...(raw.linkedItems !== undefined
+        ? {
+            linkedItems: getWorkspaceAttachments({
+              linkedItems: raw.linkedItems,
+              linkedWorkItem: linkedTask,
+              linkedTaskSourceContext
+            })
+          }
+        : {}),
       linkedTaskSourceContext: isWorkspaceLinkedItemSourceContextMatch(
         linkedTask,
         linkedTaskSourceContext
diff --git a/src/shared/github-work-item-workspace-attachment.ts b/src/shared/github-work-item-workspace-attachment.ts
index ac1d8462e49c..86d0b96cb3ae 100644
--- a/src/shared/github-work-item-workspace-attachment.ts
+++ b/src/shared/github-work-item-workspace-attachment.ts
@@ -1,4 +1,10 @@
+import type { Repo } from './repo-types'
+import { normalizeGitRemoteUrl } from './git-remote-identity'
+import { getWorkspaceAttachmentUrlScope } from './workspace-attachment-normalization'
+import { parseGitHubIssueOrPRLink } from './github/links'
+import { githubRepoIdentityKey } from './github/repository-identity-key'
 import type { GitHubWorkItem } from './github/work-item-types'
+import { getWorkspaceAttachments } from './workspace-attachments'
 import type { Worktree } from './worktree/types'
 
 type GitHubWorkItemType = GitHubWorkItem['type']
@@ -7,19 +13,33 @@ export function findGithubWorkItemWorkspaceAttachment(
   worktrees: readonly Worktree[],
   repoId: string | null | undefined,
   type: GitHubWorkItemType,
-  number: number
+  number: number,
+  sourceUrl?: string
 ): Worktree | null {
   if (!repoId) {
     return null
   }
 
+  const source = sourceUrl ? parseGitHubIssueOrPRLink(sourceUrl) : null
   return (
     worktrees.find((worktree) => {
-      if (worktree.repoId !== repoId || worktree.isArchived) {
+      if (worktree.isArchived) {
         return false
       }
 
-      return type === 'pr' ? worktree.linkedPR === number : worktree.linkedIssue === number
+      return getWorkspaceAttachments(worktree).some((item) => {
+        if (item.provider !== 'github' || item.type !== type || item.number !== number) {
+          return false
+        }
+        const linked = item.url ? parseGitHubIssueOrPRLink(item.url) : null
+        if (source && linked) {
+          return githubRepoIdentityKey(source.slug) === githubRepoIdentityKey(linked.slug)
+        }
+        if (linked && !source) {
+          return item.repoId === repoId && worktree.repoId === repoId
+        }
+        return worktree.repoId === repoId && (!item.repoId || item.repoId === repoId)
+      })
     }) ?? null
   )
 }
@@ -27,15 +47,42 @@ export function findGithubWorkItemWorkspaceAttachment(
 export function findGithubPrWorkspaceAttachment(
   worktrees: readonly Worktree[],
   repoId: string | null | undefined,
-  prNumber: number
+  prNumber: number,
+  sourceUrl?: string
 ): Worktree | null {
-  return findGithubWorkItemWorkspaceAttachment(worktrees, repoId, 'pr', prNumber)
+  return findGithubWorkItemWorkspaceAttachment(worktrees, repoId, 'pr', prNumber, sourceUrl)
 }
 
 export function findGithubIssueWorkspaceAttachment(
   worktrees: readonly Worktree[],
   repoId: string | null | undefined,
-  issueNumber: number
+  issueNumber: number,
+  sourceUrl?: string
 ): Worktree | null {
-  return findGithubWorkItemWorkspaceAttachment(worktrees, repoId, 'issue', issueNumber)
+  return findGithubWorkItemWorkspaceAttachment(worktrees, repoId, 'issue', issueNumber, sourceUrl)
+}
+
+export function worktreeMatchesGitHubNumber(
+  worktree: Worktree,
+  number: number,
+  repo: Repo | undefined
+): boolean {
+  return getWorkspaceAttachments(worktree).some((item) => {
+    if (item.provider !== 'github' || item.number !== number) {
+      return false
+    }
+    if (item.repoId && item.repoId !== worktree.repoId) {
+      return false
+    }
+    if (item.taskSourceContext?.repoId && item.taskSourceContext.repoId !== worktree.repoId) {
+      return false
+    }
+    if (!item.url) {
+      return true
+    }
+    const remoteKey = repo?.gitRemoteIdentity?.canonicalKey
+    return Boolean(
+      remoteKey && normalizeGitRemoteUrl(getWorkspaceAttachmentUrlScope(item)) === remoteKey
+    )
+  })
 }
diff --git a/src/shared/global-settings-types.ts b/src/shared/global-settings-types.ts
index d7a51e53fbe4..a8661a51689d 100644
--- a/src/shared/global-settings-types.ts
+++ b/src/shared/global-settings-types.ts
@@ -228,6 +228,8 @@ export type GlobalSettings = NativeChatGlobalSettings & {
   /** Chat-wide: hold a mid-turn send as an editable queued draft that goes when the turn ends
    *  (capable hosts only). Absent = on; off keeps mid-turn sends immediate. */
   nativeChatQueueFollowUps?: boolean
+  /** Teach newly started native chats to create inline visuals; absent means on. */
+  nativeChatInlineVisuals?: boolean
   /** Structured chat only: Codex/Claude children inherit the whole login-shell environment.
    *  Off passes only `nativeChatShellEnvironmentVariables` (plus a PATH/locale baseline). */
   nativeChatInheritShellEnvironment?: boolean
@@ -318,6 +320,8 @@ export type GlobalSettings = NativeChatGlobalSettings & {
   claudeManagedAccounts: ClaudeManagedAccount[]
   activeClaudeManagedAccountId: string | null
   activeClaudeManagedAccountIdsByRuntime?: ClaudeManagedAccountRuntimeSelection
+  /** Dismissed the "System default may hold a copied login" notice in Settings > Accounts. */
+  claudeCopiedSystemDefaultNoticeDismissed?: boolean
   /** Per-worktree shell history so ArrowUp doesn't surface other worktrees' commands (a HISTFILE for
    *  bash/zsh, a `fish_history` session name for fish). Defaults to true. */
   terminalScopeHistoryByWorktree: boolean
@@ -359,6 +363,8 @@ export type GlobalSettings = NativeChatGlobalSettings & {
   claudeAgentTeamsDefaultDisabledMigrated?: boolean
   /** Why: worktree deletion is destructive (rm -rf of the working dir), so confirm by default. */
   skipDeleteWorktreeConfirm: boolean
+  /** Opt-in: workspace deletion discards changes and may waive terminal-stop verification. */
+  alwaysForceDeleteWorktrees?: boolean
   /** Why: closing a terminal with child processes kills foreground work; keep this skip separate from other confirmations. */
   skipCloseTerminalWithRunningProcessConfirm: boolean
   /** Why: deleting an automation also deletes its run history; keep this skip separate from worktree deletion. */
diff --git a/src/shared/local-build-compatibility-contract.json b/src/shared/local-build-compatibility-contract.json
index bfebe8c975c2..626bd5c2b986 100644
--- a/src/shared/local-build-compatibility-contract.json
+++ b/src/shared/local-build-compatibility-contract.json
@@ -3,9 +3,9 @@
   "appId": "com.stablyai.orca",
   "stateSchemaVersion": 1,
   "readableStateSchemaVersions": [1],
-  "daemonProtocolVersion": 41,
+  "daemonProtocolVersion": 42,
   "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, 37, 38, 39, 40, 41
+    27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42
   ]
 }
diff --git a/src/shared/local-build-compatibility-contract.ts b/src/shared/local-build-compatibility-contract.ts
index afda2d8f2275..e7e6c827ea37 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.stablyai.orca',
   stateSchemaVersion: 1,
   readableStateSchemaVersions: [1],
-  daemonProtocolVersion: 41,
+  daemonProtocolVersion: 42,
   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, 37, 38, 39, 40, 41
+    27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42
   ]
 } as const
diff --git a/src/shared/managed-account-types.ts b/src/shared/managed-account-types.ts
index a4f7c272ac62..6f9cc642ce7e 100644
--- a/src/shared/managed-account-types.ts
+++ b/src/shared/managed-account-types.ts
@@ -95,12 +95,33 @@ export type ClaudeManagedAccountSummary = {
   createdAt: number
   updatedAt: number
   lastAuthenticatedAt: number
+  /** Its folder holds no login yet, e.g. an account saved by an older Orca; it needs a sign-in. */
+  needsSignIn?: true
+}
+
+/** A sign-in to a new account folder, or to a saved account's own when `accountId` is given. */
+export type ClaudeSignInRequest = {
+  accountId?: string
+  runtime?: 'host' | 'wsl'
+  wslDistro?: string | null
+}
+
+/** A sign-in in progress: `configDir` is the CLAUDE_CONFIG_DIR `claude auth login` runs against. */
+export type ClaudeAccountSignIn = {
+  accountId: string
+  configDir: string
+  runtime?: 'host' | 'wsl'
+  wslDistro?: string | null
 }
 
 export type ClaudeRateLimitAccountsState = {
   accounts: ClaudeManagedAccountSummary[]
   activeAccountId: string | null
   activeAccountIdsByRuntime?: ClaudeManagedAccountRuntimeSelection
+  /** The login System default holds, when the host can read it and accounts exist. */
+  systemDefaultEmail?: string
+  /** An older Orca's copy-based switching once wrote an account's login into System default. */
+  systemDefaultMayBeCopied?: boolean
 }
 
 export type ClaudeManagedAccountRuntimeSelection = {
diff --git a/src/shared/native-chat-orca-stop-cut.test.ts b/src/shared/native-chat-orca-stop-cut.test.ts
new file mode 100644
index 000000000000..728b4a0d50aa
--- /dev/null
+++ b/src/shared/native-chat-orca-stop-cut.test.ts
@@ -0,0 +1,160 @@
+import { describe, expect, it } from 'vitest'
+import { agentSessionFailureFact } from './agent-session-failure'
+import { agentSessionFailureWords } from './agent-session-failure-words'
+import { readAgentSessionOrcaStop } from './agent-session-orca-stop'
+import { agentJournalItemKey } from './agent-session-journal-item-key'
+import type { AgentJournalRenderItem, AgentJournalTurnOutcome } from './agent-session-journal-types'
+import { withNativeChatCutTurnNotices } from './native-chat-cut-turn-notice'
+import {
+  latestNativeChatOrcaStopCut,
+  orcaShutdownRowClientMessageId
+} from './native-chat-orca-stop-cut'
+
+const LEGACY_TEXT =
+  'Codex stopped while this response was in progress. You can continue in this conversation.'
+
+const turnId = agentJournalItemKey({ provider: 'codex', threadId: 't', turnId: 'cut', ordinal: 1 })
+
+function userMessage(sequence: number): AgentJournalRenderItem {
+  return {
+    itemId: agentJournalItemKey({ provider: 'orca', clientMessageId: `user-${sequence}` }),
+    revision: 1,
+    sequence,
+    observedAt: sequence,
+    body: { kind: 'message', role: 'user', blocks: [{ type: 'text', text: 'go' }] }
+  }
+}
+
+function cutTurn(outcome?: AgentJournalTurnOutcome): AgentJournalRenderItem {
+  return {
+    itemId: turnId,
+    revision: 2,
+    sequence: 2,
+    observedAt: 2,
+    body: {
+      kind: 'turn',
+      turnId: 'cut',
+      state: 'interrupted',
+      startedAt: 1,
+      completedAt: 5,
+      ...(outcome ? { outcome } : {})
+    }
+  }
+}
+
+/** The host's row, as a host this build or a newer one writes it: today's words and fact, and the
+ *  cause beside them. */
+function stopRow(orcaStop: { cause: string } | undefined, scoped = true): AgentJournalRenderItem {
+  return {
+    itemId: agentJournalItemKey({
+      provider: 'orca',
+      clientMessageId: orcaShutdownRowClientMessageId('session-1', 3, 'gen-1')
+    }),
+    revision: 1,
+    sequence: 3,
+    observedAt: 6,
+    body: {
+      kind: 'status',
+      ...agentSessionFailureWords(agentSessionFailureFact('providerExited'), {
+        agentName: 'Codex',
+        surface: 'row'
+      }),
+      tone: 'error',
+      ...(orcaStop === undefined ? {} : { orcaStop })
+    },
+    ...(scoped ? { turnScope: { kind: 'turn' as const, turnItemId: turnId } } : {})
+  }
+}
+
+const update = { cause: 'update' }
+
+describe('the cause on a stopped row', () => {
+  it('is read when known and dropped when a newer host names one this build does not know', () => {
+    expect(readAgentSessionOrcaStop(update)).toEqual({ cause: 'update' })
+    expect(readAgentSessionOrcaStop({ cause: 'power-loss' })).toBeUndefined()
+  })
+
+  it("rides beside today's sentence, so a client that reads no cause prints the same row", () => {
+    expect(stopRow(update).body).toMatchObject({ text: LEGACY_TEXT, tone: 'error' })
+  })
+})
+
+describe('a client that predates the cause', () => {
+  it("reads the host row as the cut turn's one explanation and adds none of its own", () => {
+    const items = [userMessage(1), cutTurn(), stopRow(update)]
+    const read = withNativeChatCutTurnNotices(items, { agentName: 'Codex' })
+    expect(read).toBe(items)
+    expect(read.filter((item) => item.body.kind === 'status')).toHaveLength(1)
+  })
+})
+
+describe('the cut Continue answers', () => {
+  it('is the latest turn when an Orca stop cut it and nothing was sent since', () => {
+    expect(latestNativeChatOrcaStopCut([userMessage(1), cutTurn(), stopRow(update)], [])).toEqual({
+      turnItemId: turnId,
+      cause: 'update'
+    })
+  })
+
+  it('is gone once a message follows the cut', () => {
+    expect(
+      latestNativeChatOrcaStopCut([userMessage(1), cutTurn(), stopRow(update), userMessage(4)], [])
+    ).toBeNull()
+  })
+
+  it('stays for a steer the cut turn took, which asked for nothing new', () => {
+    const steer: AgentJournalRenderItem = {
+      ...userMessage(4),
+      turnScope: { kind: 'turn', turnItemId: turnId }
+    }
+    expect(
+      latestNativeChatOrcaStopCut([userMessage(1), cutTurn(), stopRow(update), steer], [])
+    ).toEqual({ turnItemId: turnId, cause: 'update' })
+  })
+
+  it('stays across a conversation command run after the cut, and its turn', () => {
+    const command: AgentJournalRenderItem = {
+      ...userMessage(4),
+      body: {
+        kind: 'message',
+        role: 'user',
+        blocks: [{ type: 'text', text: '/context' }],
+        command: { name: 'context' }
+      }
+    }
+    const commandTurn: AgentJournalRenderItem = {
+      itemId: agentJournalItemKey({ provider: 'codex', threadId: 't', turnId: 'cmd', ordinal: 1 }),
+      revision: 1,
+      sequence: 5,
+      observedAt: 7,
+      body: {
+        kind: 'turn',
+        turnId: 'cmd',
+        state: 'completed',
+        outcome: 'success',
+        userItemId: command.itemId
+      }
+    }
+    expect(
+      latestNativeChatOrcaStopCut(
+        [userMessage(1), cutTurn(), stopRow(update), command, commandTurn],
+        []
+      )
+    ).toEqual({ turnItemId: turnId, cause: 'update' })
+  })
+
+  it('is gone while a send is on its way', () => {
+    expect(
+      latestNativeChatOrcaStopCut(
+        [userMessage(1), cutTurn(), stopRow(update)],
+        [{ dispatchState: 'pending' }]
+      )
+    ).toBeNull()
+  })
+
+  it("is none for a stop with no Orca cause, a person's Stop, or an unscoped row", () => {
+    expect(latestNativeChatOrcaStopCut([cutTurn(), stopRow(undefined)], [])).toBeNull()
+    expect(latestNativeChatOrcaStopCut([cutTurn('cancellation'), stopRow(update)], [])).toBeNull()
+    expect(latestNativeChatOrcaStopCut([cutTurn(), stopRow(update, false)], [])).toBeNull()
+  })
+})
diff --git a/src/shared/native-chat-orca-stop-cut.ts b/src/shared/native-chat-orca-stop-cut.ts
new file mode 100644
index 000000000000..cab5825ea6e1
--- /dev/null
+++ b/src/shared/native-chat-orca-stop-cut.ts
@@ -0,0 +1,88 @@
+// A reply cut off because the Orca running the chat stopped (an update, a quit, a crash), as the
+// host's row about it says, and whether the chat is still sitting on that cut. Derived from the
+// journal each time, never stored: the client shows Continue from it, and the host re-checks it
+// under the session lock before Continue sends anything.
+
+import { readAgentSessionOrcaStop, type AgentSessionOrcaStopCause } from './agent-session-orca-stop'
+import { isRootAgentJournalItem } from './agent-session-journal-producer'
+import type { AgentJournalRenderItem, AgentJournalSubmission } from './agent-session-journal-types'
+import { STALE_SESSION_ROW_PREFIX } from './agent-session-stop-row-identity'
+import { readAgentJournalTurn, readAgentJournalTurnOutcome } from './agent-session-turn-record'
+import { agentTurnVerdict } from './agent-turn-outcome'
+import { structuredAgentSessionCommandTurnItemIds } from './structured-agent-session-command-entry'
+import { isStructuredAgentSessionNonRequestRow } from './structured-agent-session-latest-request'
+
+/** The row a quit or update writes for the turn it cut, keyed by the child the quit stopped, so a
+ *  retried stop of that child writes no second row. The prefix is one older clients already read
+ *  as explaining a cut turn, so they add no row of their own beside it. */
+export function orcaShutdownRowClientMessageId(
+  sessionId: string,
+  fence: number,
+  generation: string
+): string {
+  return `${STALE_SESSION_ROW_PREFIX}${sessionId}:shutdown-${fence}-${generation}`
+}
+
+/** Why Orca stopped, from a status row the host wrote about it; null for any other row. */
+export function orcaStopCauseOfRow(item: AgentJournalRenderItem): AgentSessionOrcaStopCause | null {
+  return item.body.kind === 'status'
+    ? (readAgentSessionOrcaStop(item.body.orcaStop)?.cause ?? null)
+    : null
+}
+
+export type NativeChatOrcaStopCut = {
+  turnItemId: string
+  cause: AgentSessionOrcaStopCause
+}
+
+/**
+ * The latest root turn, when an Orca stop cut it and nothing was sent since: no request after it,
+ * and no send still on its way. A steer into that turn or a conversation command asks for nothing
+ * new (`isStructuredAgentSessionNonRequestRow`). Null otherwise.
+ */
+export function latestNativeChatOrcaStopCut(
+  items: readonly AgentJournalRenderItem[],
+  submissions: readonly Pick<AgentJournalSubmission, 'dispatchState'>[]
+): NativeChatOrcaStopCut | null {
+  if (submissions.some((submission) => submission.dispatchState === 'pending')) {
+    return null
+  }
+  const commandTurns = structuredAgentSessionCommandTurnItemIds(items)
+  let turnIndex = -1
+  for (let index = items.length - 1; index >= 0; index -= 1) {
+    const item = items[index]!
+    if (
+      !isRootAgentJournalItem(item) ||
+      isStructuredAgentSessionNonRequestRow(item, commandTurns)
+    ) {
+      continue
+    }
+    if (item.body.kind === 'message' && item.body.role === 'user') {
+      return null
+    }
+    if (readAgentJournalTurn(item.body)) {
+      turnIndex = index
+      break
+    }
+  }
+  const turnItem = items[turnIndex]
+  const turn = turnItem ? readAgentJournalTurn(turnItem.body) : null
+  if (
+    !turnItem ||
+    !turn ||
+    agentTurnVerdict({ state: turn.state, outcome: readAgentJournalTurnOutcome(turn) }) !==
+      'interruption'
+  ) {
+    return null
+  }
+  for (const item of items) {
+    const cause =
+      item.turnScope?.kind === 'turn' && item.turnScope.turnItemId === turnItem.itemId
+        ? orcaStopCauseOfRow(item)
+        : null
+    if (cause) {
+      return { turnItemId: turnItem.itemId, cause }
+    }
+  }
+  return null
+}
diff --git a/src/shared/native-chat-question-auto-advance.ts b/src/shared/native-chat-question-auto-advance.ts
new file mode 100644
index 000000000000..d69edc00699f
--- /dev/null
+++ b/src/shared/native-chat-question-auto-advance.ts
@@ -0,0 +1,2 @@
+// Long enough to see the row turn chosen, short enough to read as one motion.
+export const NATIVE_CHAT_QUESTION_AUTO_ADVANCE_MS = 200
diff --git a/src/shared/native-chat-row-content.ts b/src/shared/native-chat-row-content.ts
index 08a864948201..7a5ae611d3ea 100644
--- a/src/shared/native-chat-row-content.ts
+++ b/src/shared/native-chat-row-content.ts
@@ -8,7 +8,7 @@
 
 import { backgroundTaskBlocks, claimBackgroundTaskTwins } from './native-chat-background-task-row'
 import { isWordlessProviderFrameBlock } from './native-chat-provider-frame-summary'
-import { isSubagentGroupFallbackText, subagentGroupBlocks } from './native-chat-subagent-summary'
+import { isReplacedSubagentGroupTwin, subagentGroupBlocks } from './native-chat-subagent-summary'
 import {
   isBackgroundTaskBlock,
   isSubagentGroupBlock,
@@ -42,7 +42,7 @@ function derive(blocks: readonly NativeChatBlock[]) {
             !isSubagentGroupBlock(block) &&
             !isBackgroundTaskBlock(block) &&
             !taskTwins.twinTextIndexes.has(index) &&
-            !(groups.length > 0 && block.type === 'text' && isSubagentGroupFallbackText(block.text))
+            !isReplacedSubagentGroupTwin(block, groups.length > 0)
         )
   return {
     prose,
diff --git a/src/shared/native-chat-stopped-before-start.ts b/src/shared/native-chat-stopped-before-start.ts
index 5b2b6c1fdc21..e5d6e2be5b42 100644
--- a/src/shared/native-chat-stopped-before-start.ts
+++ b/src/shared/native-chat-stopped-before-start.ts
@@ -18,7 +18,7 @@ import type { NativeChatBlock, NativeChatMessage } from './native-chat-types'
 /** The row after a send a Stop took back before the agent started it; a client words it by this. */
 export const NATIVE_CHAT_STOPPED_BEFORE_START_PRESENTATION = 'stopped-before-start'
 /** Its words where a client has no catalog of its own (the phone). */
-export const NATIVE_CHAT_STOPPED_BEFORE_START_TEXT = 'Stopped before the agent started'
+export const NATIVE_CHAT_STOPPED_BEFORE_START_TEXT = 'Stopped manually'
 
 /** That row: it outlives any turn it sits in, as the send it follows does. */
 export function isStoppedBeforeStartBlock(block: NativeChatBlock): boolean {
diff --git a/src/shared/native-chat-subagent-group-header.test.ts b/src/shared/native-chat-subagent-group-header.test.ts
new file mode 100644
index 000000000000..e67073fa006e
--- /dev/null
+++ b/src/shared/native-chat-subagent-group-header.test.ts
@@ -0,0 +1,82 @@
+import { describe, expect, it } from 'vitest'
+import {
+  formatSubagentTokens,
+  nativeChatSubagentGroupHeader,
+  sayNativeChatSubagentGroupEnglish as say
+} from './native-chat-subagent-group-header'
+import type { NativeChatSubagentEntry, NativeChatSubagentState } from './native-chat-types'
+
+function child(
+  id: string,
+  state: NativeChatSubagentState,
+  extra: Partial<NativeChatSubagentEntry> = {}
+): NativeChatSubagentEntry {
+  return { id, label: id, state, ...extra }
+}
+
+describe('nativeChatSubagentGroupHeader', () => {
+  it('counts working children while the group runs', () => {
+    const header = nativeChatSubagentGroupHeader(
+      [child('a', 'working', { startedAt: 1_000 }), child('b', 'working', { startedAt: 2_000 })],
+      say
+    )
+    expect(header).toMatchObject({
+      working: true,
+      headline: 'Kicked off 2 subagents',
+      verdictState: 'working',
+      verdict: '2 working',
+      alert: null,
+      clockStartedAt: 1_000,
+      tokens: null
+    })
+  })
+
+  it('reports a failed sibling before the rest settle', () => {
+    const header = nativeChatSubagentGroupHeader(
+      [child('a', 'working'), child('b', 'failed', { settledAt: 5 })],
+      say
+    )
+    expect(header).toMatchObject({ alertState: 'failed', alert: '1 failed' })
+  })
+
+  it('settles to the worst verdict, the run length and the tokens', () => {
+    const header = nativeChatSubagentGroupHeader(
+      [
+        child('a', 'completed', { startedAt: 0, settledAt: 60_000, tokens: 9_000 }),
+        child('b', 'completed', { startedAt: 0, settledAt: 62_000, tokens: 3_000 })
+      ],
+      say
+    )
+    expect(header).toMatchObject({
+      working: false,
+      headline: 'Ran 2 subagents',
+      verdict: 'completed',
+      clockStartedAt: 0,
+      settledAt: 62_000,
+      tokens: '12k tokens'
+    })
+  })
+
+  it('stops the clock when a settled child has no stamp', () => {
+    const header = nativeChatSubagentGroupHeader(
+      [child('a', 'unverifiable', { startedAt: 0 })],
+      say
+    )
+    expect(header).toMatchObject({ verdict: 'status unavailable', clockStartedAt: null })
+  })
+
+  it('reads a single child as a bare word', () => {
+    expect(nativeChatSubagentGroupHeader([child('a', 'working')], say)).toMatchObject({
+      headline: 'Kicked off 1 subagent',
+      verdict: 'working'
+    })
+  })
+})
+
+describe('formatSubagentTokens', () => {
+  it('shows scale', () => {
+    expect(formatSubagentTokens(950)).toBe('950')
+    expect(formatSubagentTokens(12_340)).toBe('12.3k')
+    expect(formatSubagentTokens(2_000_000)).toBe('2M')
+  })
+})
diff --git a/src/shared/native-chat-subagent-group-header.ts b/src/shared/native-chat-subagent-group-header.ts
new file mode 100644
index 000000000000..f4bc4f813b91
--- /dev/null
+++ b/src/shared/native-chat-subagent-group-header.ts
@@ -0,0 +1,160 @@
+// One spawn group's header line — headline, verdict, alert, clock and tokens — decided once for
+// every transcript that draws a roster row (desktop and the phone). Each passes its own `say`.
+
+import { normalizeSubagentState, summarizeSubagentGroup } from './native-chat-subagent-summary'
+import type { NativeChatSubagentEntry, NativeChatSubagentState } from './native-chat-types'
+
+export const NATIVE_CHAT_SUBAGENT_GROUP_COPY = {
+  stateCompleted: 'completed',
+  stateWorking: 'working',
+  stateIdle: 'idle',
+  stateFailed: 'failed',
+  stateStopped: 'stopped',
+  stateUnverifiable: 'status unavailable',
+  stateWorkingCount: '{{value0}} working',
+  stateIdleCount: '{{value0}} idle',
+  stateFailedCount: '{{value0}} failed',
+  stateStoppedCount: '{{value0}} stopped',
+  stateUnverifiableCount: '{{value0}} with status unavailable',
+  startedOne: 'Kicked off 1 subagent',
+  startedN: 'Kicked off {{value0}} subagents',
+  ranOne: 'Ran 1 subagent',
+  ranN: 'Ran {{value0}} subagents',
+  tokens: '{{value0}} tokens'
+} as const
+
+export type NativeChatSubagentGroupCopyId = keyof typeof NATIVE_CHAT_SUBAGENT_GROUP_COPY
+
+export type NativeChatSubagentGroupSay = (
+  id: NativeChatSubagentGroupCopyId,
+  values?: { value0: string | number }
+) => string
+
+/** Any surface without translations. */
+export const sayNativeChatSubagentGroupEnglish: NativeChatSubagentGroupSay = (id, values) =>
+  values === undefined
+    ? NATIVE_CHAT_SUBAGENT_GROUP_COPY[id]
+    : NATIVE_CHAT_SUBAGENT_GROUP_COPY[id].replaceAll('{{value0}}', () => String(values.value0))
+
+/** Compact token counts: the row shows scale, not an exact ledger. */
+export function formatSubagentTokens(tokens: number): string {
+  if (tokens < 1_000) {
+    return String(Math.round(tokens))
+  }
+  const scaled = tokens < 1_000_000 ? tokens / 1_000 : tokens / 1_000_000
+  const suffix = tokens < 1_000_000 ? 'k' : 'M'
+  return `${scaled.toFixed(1).replace(/\.0$/, '')}${suffix}`
+}
+
+/** The group's one-line verdict. A single-child group reads as a bare word; any
+ *  larger group always carries the count, because "working" alone would not say
+ *  how many of the children it covers. `completed` never takes one: every child
+ *  finishing is the whole group finishing. */
+export function subagentStateLabel(
+  state: NativeChatSubagentState,
+  count: number,
+  groupTotal: number,
+  say: NativeChatSubagentGroupSay
+): string {
+  if (state === 'completed') {
+    return say('stateCompleted')
+  }
+  if (groupTotal <= 1) {
+    switch (state) {
+      case 'working':
+        return say('stateWorking')
+      case 'idle':
+        return say('stateIdle')
+      case 'failed':
+        return say('stateFailed')
+      case 'stopped':
+        return say('stateStopped')
+      case 'unverifiable':
+        return say('stateUnverifiable')
+    }
+  }
+  const value = { value0: count }
+  switch (state) {
+    case 'working':
+      return say('stateWorkingCount', value)
+    case 'idle':
+      return say('stateIdleCount', value)
+    case 'failed':
+      return say('stateFailedCount', value)
+    case 'stopped':
+      return say('stateStoppedCount', value)
+    case 'unverifiable':
+      return say('stateUnverifiableCount', value)
+  }
+}
+
+export type NativeChatSubagentGroupHeader = {
+  total: number
+  working: boolean
+  /** "Kicked off 2 subagents" while any child works, else "Ran 2 subagents". */
+  headline: string
+  verdictState: NativeChatSubagentState
+  verdict: string
+  /** An adverse outcome already recorded while siblings still work; null otherwise. */
+  alertState: NativeChatSubagentState | null
+  alert: string | null
+  /** Where the elapsed clock starts; null when the run length is unknown. */
+  clockStartedAt: number | null
+  settledAt: number | null
+  /** "12k tokens", or null when no child reported any. */
+  tokens: string | null
+}
+
+export function nativeChatSubagentGroupHeader(
+  agents: readonly NativeChatSubagentEntry[],
+  say: NativeChatSubagentGroupSay
+): NativeChatSubagentGroupHeader {
+  const summary = summarizeSubagentGroup(agents)
+  const working = summary.working > 0
+  const headline = working
+    ? summary.total === 1
+      ? say('startedOne')
+      : say('startedN', { value0: summary.total })
+    : summary.total === 1
+      ? say('ranOne')
+      : say('ranN', { value0: summary.total })
+  const verdictState: NativeChatSubagentState = working
+    ? 'working'
+    : (summary.settledState ?? 'idle')
+  const verdict = working
+    ? subagentStateLabel('working', summary.working, summary.total, say)
+    : subagentStateLabel(verdictState, summary.settledCount, summary.total, say)
+  // A child that already failed must not wait for its siblings to be readable.
+  const alertState = working ? summary.adverseState : null
+  const alert =
+    alertState === null
+      ? null
+      : subagentStateLabel(alertState, summary.adverseCount, summary.total, say)
+  // A child settled with no terminal stamp — swept by the reopen, or given the
+  // provider's verdict after that — stopped being observable at an unknown
+  // moment. Measuring to `now` would report the time since the host died as how
+  // long the child ran, on a row that is not even counting. A sibling's stamp is
+  // no better: in a mixed group it would present that sibling's duration as the
+  // group's while a child's run length is still unknown.
+  const runLengthUnknown = agents.some(
+    (agent) =>
+      normalizeSubagentState(agent.state) !== 'working' && typeof agent.settledAt !== 'number'
+  )
+  const clockStartedAt =
+    !runLengthUnknown && (working || summary.settledAt !== null) ? summary.clockStartedAt : null
+  return {
+    total: summary.total,
+    working,
+    headline,
+    verdictState,
+    verdict,
+    alertState,
+    alert,
+    clockStartedAt,
+    settledAt: summary.settledAt,
+    tokens:
+      summary.tokens !== null
+        ? say('tokens', { value0: formatSubagentTokens(summary.tokens) })
+        : null
+  }
+}
diff --git a/src/shared/native-chat-subagent-summary.test.ts b/src/shared/native-chat-subagent-summary.test.ts
index 3d9df178a086..fefdef664f64 100644
--- a/src/shared/native-chat-subagent-summary.test.ts
+++ b/src/shared/native-chat-subagent-summary.test.ts
@@ -4,7 +4,8 @@ import {
   isTerminalSubagentState,
   normalizeSubagentState,
   subagentGroupFallbackText,
-  summarizeSubagentGroup
+  summarizeSubagentGroup,
+  withoutSubagentGroupTwins
 } from './native-chat-subagent-summary'
 import type { NativeChatSubagentEntry } from './native-chat-types'
 
@@ -293,3 +294,16 @@ describe('isSubagentGroupFallbackText', () => {
     }
   })
 })
+
+describe('withoutSubagentGroupTwins', () => {
+  const twin = { type: 'text' as const, text: 'Ran 1 subagent' }
+  const prose = { type: 'text' as const, text: 'Delegating the review.' }
+
+  it('drops the twin only beside a group that draws', () => {
+    const group = { type: 'subagent-group' as const, groupId: 'g', agents: [agent({})] }
+    expect(withoutSubagentGroupTwins([twin, prose, group])).toEqual([prose, group])
+    const childless = { type: 'subagent-group' as const, groupId: 'g', agents: [] }
+    expect(withoutSubagentGroupTwins([twin, childless])).toEqual([twin, childless])
+    expect(withoutSubagentGroupTwins([twin])).toEqual([twin])
+  })
+})
diff --git a/src/shared/native-chat-subagent-summary.ts b/src/shared/native-chat-subagent-summary.ts
index 9206db07729c..81601d2ba808 100644
--- a/src/shared/native-chat-subagent-summary.ts
+++ b/src/shared/native-chat-subagent-summary.ts
@@ -1,11 +1,11 @@
 // One spawn group's roster → the numbers a single flat row needs.
 //
-// Shared because the producer and the desktop transcript must agree on what
-// "N working" means: the producer uses the same terminal predicate the renderer
-// does, so a state that reads terminal here latches terminal there. Mobile has
-// no roster renderer — it shows only the write-time-frozen fallback sentence,
-// which is why that sentence is built from this same summary, and why the
-// sentence itself may claim nothing that a later reader cannot still verify.
+// Shared because the producer and every transcript (desktop and the phone) must
+// agree on what "N working" means: the producer uses the same terminal predicate
+// the renderers do, so a state that reads terminal here latches terminal there.
+// A client without the block type shows only the write-time-frozen fallback
+// sentence, which is why that sentence is built from this same summary, and why
+// the sentence itself may claim nothing that a later reader cannot still verify.
 
 import {
   isSubagentGroupBlock,
@@ -198,6 +198,19 @@ export function subagentGroupBlocks(
   )
 }
 
+/** Whether `block` is the text twin of a roster the row draws (`drawsGroup`, from
+ *  `subagentGroupBlocks`): only a drawn roster replaces its sentence, and real text beside a group
+ *  is never matched. The one twin rule every transcript applies. */
+export function isReplacedSubagentGroupTwin(block: NativeChatBlock, drawsGroup: boolean): boolean {
+  return drawsGroup && block.type === 'text' && isSubagentGroupFallbackText(block.text)
+}
+
+/** The row's blocks less any roster twin a drawn group replaces. */
+export function withoutSubagentGroupTwins(blocks: readonly NativeChatBlock[]): NativeChatBlock[] {
+  const drawsGroup = subagentGroupBlocks(blocks).length > 0
+  return blocks.filter((block) => !isReplacedSubagentGroupTwin(block, drawsGroup))
+}
+
 /** Plain-text stand-in for the roster, frozen into the journal at write time for
  *  clients without the block type.
  *
diff --git a/src/shared/native-chat-tool-pairing.ts b/src/shared/native-chat-tool-pairing.ts
index 490008927c13..5db9e30fa247 100644
--- a/src/shared/native-chat-tool-pairing.ts
+++ b/src/shared/native-chat-tool-pairing.ts
@@ -28,11 +28,6 @@ export type NativeChatToolPairing = {
   pairedResults: ReadonlySet<NativeChatBlock>
 }
 
-export const NO_NATIVE_CHAT_TOOL_PAIRING: NativeChatToolPairing = {
-  resultByCall: new Map(),
-  pairedResults: new Set()
-}
-
 /** The desktop run's view of `pairToolBlocks`, so every reader of a run pairs with one loop. */
 export function pairNativeChatToolResults(
   blocks: readonly NativeChatBlock[]
diff --git a/src/shared/native-chat-transcript-projection.ts b/src/shared/native-chat-transcript-projection.ts
index 3ab78007edb0..8833d6c83040 100644
--- a/src/shared/native-chat-transcript-projection.ts
+++ b/src/shared/native-chat-transcript-projection.ts
@@ -41,7 +41,7 @@ export function compareNativeChatMessagesByTime(
 
 /** 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
+ *  earlier one. A row not in the journal yet — a send still on its way — 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(
diff --git a/src/shared/native-chat-turn-fold.test.ts b/src/shared/native-chat-turn-fold.test.ts
index ef35a3074f59..c652240db184 100644
--- a/src/shared/native-chat-turn-fold.test.ts
+++ b/src/shared/native-chat-turn-fold.test.ts
@@ -13,7 +13,7 @@ function row(overrides: Partial<NativeChatTurnFoldRow> = {}): NativeChatTurnFold
     draws: true,
     outlivesTurn: false,
     reportsFailure: false,
-    reportsCompaction: false,
+    explainsTurn: false,
     ...overrides
   }
 }
@@ -214,9 +214,9 @@ describe('nativeChatTurnFold', () => {
     const rows = [
       row({ role: 'user' }),
       row(),
-      row({ role: 'system', reportsCompaction: true }),
+      row({ role: 'system', explainsTurn: true }),
       row(),
-      row({ role: 'system', reportsCompaction: true })
+      row({ role: 'system', explainsTurn: true })
     ]
     const { foldedRows } = nativeChatTurnFold({
       rows,
diff --git a/src/shared/native-chat-turn-fold.ts b/src/shared/native-chat-turn-fold.ts
index fdb7af00b476..59687f3d789a 100644
--- a/src/shared/native-chat-turn-fold.ts
+++ b/src/shared/native-chat-turn-fold.ts
@@ -27,9 +27,10 @@ export type NativeChatTurnFoldRow = {
   /** Whether a system row reports a failure. It competes with prose to be the
    *  turn's answer, so a turn that failed shows the error as its end. */
   reportsFailure: boolean
-  /** Whether the row reports a compaction's result. It never folds: hiding it
-   *  would leave the turn's status as the only trace the context was rewritten. */
-  reportsCompaction: boolean
+  /** Whether the row explains what became of the turn: a compaction's result, or
+   *  that the response was interrupted. It never folds: hiding it would leave the
+   *  turn's status as the only trace of it. */
+  explainsTurn: boolean
 }
 
 export type NativeChatTurnFold = {
@@ -87,13 +88,14 @@ export function nativeChatTurnFold({
   for (const [index, row] of rows.entries()) {
     const { turnKey } = row
     // Outside the fold by construction: the reader's own message anchors the
-    // turn, a roster or background-task row outlives it, and a compaction report explains it.
+    // turn, a roster or background-task row outlives it, and a compaction report or interruption
+    // notice explains it.
     if (
       turnKey === undefined ||
       row.role === 'user' ||
       !row.draws ||
       row.outlivesTurn ||
-      row.reportsCompaction ||
+      row.explainsTurn ||
       !settledTurnKeys.has(turnKey)
     ) {
       continue
diff --git a/src/shared/native-chat-types.ts b/src/shared/native-chat-types.ts
index 3f93a97ad3b6..40487d018133 100644
--- a/src/shared/native-chat-types.ts
+++ b/src/shared/native-chat-types.ts
@@ -11,6 +11,7 @@ import type {
   AgentSessionBackgroundTaskRunState
 } from './agent-session-background-task-wire'
 import type { AgentSessionTokenUsage } from './agent-session-context-usage'
+import type { AgentSessionOrcaStop } from './agent-session-orca-stop'
 import type { AgentSessionFailureFact } from './agent-session-failure'
 import type {
   AgentJournalMessageSendMode,
@@ -63,6 +64,8 @@ export type NativeChatTextBlock = {
   }
   /** On a status line that reports a failure: what failed, typed. */
   failure?: AgentSessionFailureFact
+  /** On the line about a reply Orca's own stop cut off: why, and the turn it cut. */
+  orcaStop?: AgentSessionOrcaStop & { turnItemId?: string }
 }
 
 /** A tool invocation by the agent. `input` is the (already-serialized) tool
diff --git a/src/shared/native-chat-visual-directive.test.ts b/src/shared/native-chat-visual-directive.test.ts
new file mode 100644
index 000000000000..c440511e66df
--- /dev/null
+++ b/src/shared/native-chat-visual-directive.test.ts
@@ -0,0 +1,221 @@
+import { describe, expect, it } from 'vitest'
+import {
+  NATIVE_CHAT_VISUAL_DIRECTIVE_MAX_LINE_LENGTH,
+  NATIVE_CHAT_VISUAL_FILE_MAX_LENGTH,
+  NATIVE_CHAT_VISUAL_TITLE_MAX_LENGTH,
+  isNativeChatVisualFileName,
+  isPendingNativeChatVisualDirectiveTail,
+  parseNativeChatVisualDirectiveLine,
+  withoutNativeChatVisualDirectiveLines,
+  withoutPendingNativeChatVisualDirectiveTail
+} from './native-chat-visual-directive'
+
+describe('parseNativeChatVisualDirectiveLine', () => {
+  it('parses file and title', () => {
+    expect(
+      parseNativeChatVisualDirectiveLine(
+        '::orca-visual{file="usage-3f2a.html" title="Usage by day"}'
+      )
+    ).toEqual({ file: 'usage-3f2a.html', title: 'Usage by day' })
+  })
+
+  it('treats title as optional and trims it', () => {
+    expect(parseNativeChatVisualDirectiveLine('::orca-visual{file="a.html"}')).toEqual({
+      file: 'a.html',
+      title: null
+    })
+    expect(parseNativeChatVisualDirectiveLine('::orca-visual{file="a.html" title="  "}')).toEqual({
+      file: 'a.html',
+      title: null
+    })
+  })
+
+  it('accepts attributes in any order, with spaces and tabs around them', () => {
+    expect(
+      parseNativeChatVisualDirectiveLine('::orca-visual{ \ttitle="T"   file="a.html"\t }')
+    ).toEqual({ file: 'a.html', title: 'T' })
+  })
+
+  it('accepts up to 3 leading spaces, trailing whitespace, and CRLF or LF endings', () => {
+    expect(parseNativeChatVisualDirectiveLine('   ::orca-visual{file="a.html"}  \t\r\n')).toEqual({
+      file: 'a.html',
+      title: null
+    })
+    expect(parseNativeChatVisualDirectiveLine('::orca-visual{file="a.html"}\n')).not.toBeNull()
+    expect(parseNativeChatVisualDirectiveLine('    ::orca-visual{file="a.html"}')).toBeNull()
+    expect(parseNativeChatVisualDirectiveLine('\t::orca-visual{file="a.html"}')).toBeNull()
+  })
+
+  it('ignores unknown attributes but refuses a repeated one', () => {
+    expect(parseNativeChatVisualDirectiveLine('::orca-visual{file="a.html" height="300"}')).toEqual(
+      { file: 'a.html', title: null }
+    )
+    expect(
+      parseNativeChatVisualDirectiveLine('::orca-visual{file="a.html" file="b.html"}')
+    ).toBeNull()
+    expect(
+      parseNativeChatVisualDirectiveLine('::orca-visual{file="a.html" title="x" title="y"}')
+    ).toBeNull()
+  })
+
+  it('keeps braces and markdown characters in a title verbatim', () => {
+    expect(
+      parseNativeChatVisualDirectiveLine(
+        '::orca-visual{file="a.html" title="Cost {USD} *by* <team>"}'
+      )
+    ).toEqual({ file: 'a.html', title: 'Cost {USD} *by* <team>' })
+  })
+
+  it.each([
+    ['missing file', '::orca-visual{title="T"}'],
+    ['empty braces', '::orca-visual{}'],
+    ['no braces', '::orca-visual'],
+    ['unclosed', '::orca-visual{file="a.html"'],
+    ['text after the line', '::orca-visual{file="a.html"} see above'],
+    ['text before the marker', 'Chart: ::orca-visual{file="a.html"}'],
+    ['wrong case', '::Orca-Visual{file="a.html"}'],
+    ['single quotes', "::orca-visual{file='a.html'}"],
+    ['unquoted value', '::orca-visual{file=a.html}'],
+    ['escaped quote', '::orca-visual{file="a.html" title="say \\"hi\\""}'],
+    ['backslash', '::orca-visual{file="a.html" title="a\\b"}'],
+    ['control character', '::orca-visual{file="a.html" title="a\u0007b"}'],
+    ['attributes glued together', '::orca-visual{file="a.html"title="T"}'],
+    ['uppercase key', '::orca-visual{FILE="a.html"}'],
+    ['embedded newline', '::orca-visual{file="a.html"\ntitle="T"}'],
+    ['three colons', ':::orca-visual{file="a.html"}']
+  ])('refuses %s', (_name, line) => {
+    expect(parseNativeChatVisualDirectiveLine(line)).toBeNull()
+  })
+
+  it('refuses lines and titles past their length caps', () => {
+    const title = 'x'.repeat(NATIVE_CHAT_VISUAL_TITLE_MAX_LENGTH)
+    expect(
+      parseNativeChatVisualDirectiveLine(`::orca-visual{file="a.html" title="${title}"}`)
+    ).not.toBeNull()
+    expect(
+      parseNativeChatVisualDirectiveLine(`::orca-visual{file="a.html" title="${title}x"}`)
+    ).toBeNull()
+    const padding = ' '.repeat(NATIVE_CHAT_VISUAL_DIRECTIVE_MAX_LINE_LENGTH)
+    expect(parseNativeChatVisualDirectiveLine(`::orca-visual{file="a.html"}${padding}`)).toBeNull()
+  })
+})
+
+describe('isNativeChatVisualFileName', () => {
+  it.each(['a.html', 'usage-chart_3f2a.html', 'A1.b.html', '0.html'])('accepts %s', (name) => {
+    expect(isNativeChatVisualFileName(name)).toBe(true)
+  })
+
+  it.each([
+    ['empty', ''],
+    ['no extension', 'chart'],
+    ['other extension', 'chart.htm'],
+    ['uppercase extension', 'chart.HTML'],
+    ['markdown', 'chart.md'],
+    ['directory', 'sub/chart.html'],
+    ['backslash directory', 'sub\\chart.html'],
+    ['parent', '../chart.html'],
+    ['double dot inside', 'a..html'],
+    ['leading dot', '.chart.html'],
+    ['leading dash', '-chart.html'],
+    ['absolute posix', '/tmp/chart.html'],
+    ['drive', 'C:chart.html'],
+    ['unc', '\\\\server\\share\\chart.html'],
+    ['alternate stream', 'chart.html:stream'],
+    ['space', 'my chart.html'],
+    ['unicode', 'grafik-ä.html'],
+    ['device name', 'con.html'],
+    ['device name with dots', 'NUL.tar.html'],
+    ['com port', 'COM1.html'],
+    ['superscript com port', 'com¹.html'],
+    ['too long', `${'a'.repeat(NATIVE_CHAT_VISUAL_FILE_MAX_LENGTH - 4)}.html`]
+  ])('refuses %s', (_name, name) => {
+    expect(isNativeChatVisualFileName(name)).toBe(false)
+  })
+
+  it('accepts a name exactly at the length cap', () => {
+    expect(
+      isNativeChatVisualFileName(`${'a'.repeat(NATIVE_CHAT_VISUAL_FILE_MAX_LENGTH - 5)}.html`)
+    ).toBe(true)
+  })
+})
+
+describe('streaming tail', () => {
+  it.each([
+    ':',
+    '::',
+    '::orca',
+    '::orca-visual{',
+    '::orca-visual{file="a.ht',
+    '  ::orca-visual{file="a.html"}'
+  ])('holds back %j', (line) => {
+    expect(isPendingNativeChatVisualDirectiveTail(line)).toBe(true)
+  })
+
+  it.each([
+    '',
+    '   ',
+    'Here is a chart:',
+    '::other',
+    '::orca-visualx',
+    '    ::orca-visual{',
+    '- ::orca'
+  ])('does not hold back %j', (line) => {
+    expect(isPendingNativeChatVisualDirectiveTail(line)).toBe(false)
+  })
+
+  it('drops only the pending final line', () => {
+    expect(withoutPendingNativeChatVisualDirectiveTail('Intro\n::orca-visual{file="a')).toBe(
+      'Intro\n'
+    )
+    expect(withoutPendingNativeChatVisualDirectiveTail('::orca-vis')).toBe('')
+    expect(withoutPendingNativeChatVisualDirectiveTail('Intro\nMore text')).toBe('Intro\nMore text')
+    // A finished line (followed by a newline) is no longer the tail.
+    expect(withoutPendingNativeChatVisualDirectiveTail('::orca-visual{file="a.html"}\n')).toBe(
+      '::orca-visual{file="a.html"}\n'
+    )
+  })
+})
+
+describe('withoutNativeChatVisualDirectiveLines', () => {
+  const LINE = '::orca-visual{file="usage.html" title="Usage"}'
+
+  it('drops visual lines and the blank lines they leave behind', () => {
+    expect(withoutNativeChatVisualDirectiveLines(`Here it is.\n\n${LINE}\n\nTuesday peaked.`)).toBe(
+      'Here it is.\n\nTuesday peaked.'
+    )
+    expect(withoutNativeChatVisualDirectiveLines(`Intro\r\n${LINE}\r\n`)).toBe('Intro')
+    expect(withoutNativeChatVisualDirectiveLines(LINE)).toBe('')
+  })
+
+  it('keeps the line inside fenced code and anything that is not a whole directive line', () => {
+    const fenced = `\`\`\`\n${LINE}\n\`\`\`\nafter`
+    expect(withoutNativeChatVisualDirectiveLines(fenced)).toBe(fenced)
+    const tilde = `~~~~\n${LINE}\n~~~\nstill code\n~~~~`
+    expect(withoutNativeChatVisualDirectiveLines(tilde)).toBe(tilde)
+    expect(withoutNativeChatVisualDirectiveLines(`> ${LINE}`)).toBe(`> ${LINE}`)
+    expect(withoutNativeChatVisualDirectiveLines(`See ${LINE}`)).toBe(`See ${LINE}`)
+  })
+
+  it('follows CommonMark fence rules: no info string on a closer, no backtick in an opener', () => {
+    // ```js inside a block does not close it, so the visual line is still code.
+    const notClosed = `\`\`\`\n\`\`\`js\n${LINE}\n\`\`\``
+    expect(withoutNativeChatVisualDirectiveLines(notClosed)).toBe(notClosed)
+    // Inline triple backticks open no fence, so a later visual line is still dropped.
+    expect(withoutNativeChatVisualDirectiveLines(`Use \`\`\`a\`\`\` inline\n${LINE}`)).toBe(
+      'Use ```a``` inline'
+    )
+  })
+
+  it('leaves code blocks and indentation as written for a copy', () => {
+    const code = '```\na\n\n\n\nb\n```'
+    expect(withoutNativeChatVisualDirectiveLines(`${code}\n\n${LINE}`)).toBe(code)
+    expect(withoutNativeChatVisualDirectiveLines(`    code\npara\n${LINE}`)).toBe('    code\npara')
+    expect(withoutNativeChatVisualDirectiveLines(`${LINE}\n\nText`)).toBe('Text')
+  })
+
+  it('returns text without a marker untouched', () => {
+    expect(withoutNativeChatVisualDirectiveLines('  plain\n\n\n text  ')).toBe(
+      '  plain\n\n\n text  '
+    )
+  })
+})
diff --git a/src/shared/native-chat-visual-directive.ts b/src/shared/native-chat-visual-directive.ts
new file mode 100644
index 000000000000..ce6f9f69e3fe
--- /dev/null
+++ b/src/shared/native-chat-visual-directive.ts
@@ -0,0 +1,218 @@
+// The one grammar for a native-chat visual: an assistant reply line naming an HTML file in that
+// chat's visuals folder. Desktop/web (a markdown syntax extension) and mobile both parse with it.
+//
+//   ::orca-visual{file="usage-chart-3f2a.html" title="Usage by day"}
+//
+// - The line may carry up to 3 leading spaces and any trailing spaces/tabs; a trailing CR is
+//   ignored. Nothing else may share the line.
+// - Attributes are `key="value"`, separated by spaces/tabs. Values have no escapes: they cannot
+//   contain `"`, `\`, or control characters. Keys are lowercase ASCII letters.
+// - `file` is required. `title` is optional. A repeated key refuses the line. Other keys are
+//   ignored, so a newer agent's extra attribute still renders on this viewer.
+// - The name is case-sensitive.
+
+export const NATIVE_CHAT_VISUAL_DIRECTIVE_MARKER = '::orca-visual{'
+
+/** Longest line the grammar considers. Bounds parsing and the streaming-tail check. */
+export const NATIVE_CHAT_VISUAL_DIRECTIVE_MAX_LINE_LENGTH = 512
+export const NATIVE_CHAT_VISUAL_FILE_MAX_LENGTH = 128
+export const NATIVE_CHAT_VISUAL_TITLE_MAX_LENGTH = 120
+
+/**
+ * Directives one reply may mount; later ones show as text. Each visual runs author script in its
+ * own frame (lazily mounted, at most 512 KiB), so this bounds one reply's live frames and memory
+ * while leaving room for a reply that compares a few charts.
+ */
+export const NATIVE_CHAT_VISUAL_MAX_PER_MESSAGE = 8
+
+/** Largest visual file, in UTF-8 bytes. The execution host enforces it in a bounded read. */
+export const NATIVE_CHAT_VISUAL_MAX_BYTES = 512 * 1024
+
+export type NativeChatVisualDirective = {
+  file: string
+  title: string | null
+}
+
+const FILE_NAME_PATTERN = /^[A-Za-z0-9][A-Za-z0-9._-]*\.html$/
+// Why: Windows maps these base names to devices whatever the extension.
+const WINDOWS_DEVICE_BASE_NAME = /^(?:con|prn|aux|nul|com[0-9¹²³]|lpt[0-9¹²³]|conin\$|conout\$)$/i
+const ATTRIBUTE_PATTERN = /^([a-z]+)="([^"]*)"/
+const LINE_SPACE = /^[ \t]*/
+
+/**
+ * A single file name inside the chat's visuals folder: no directories, separators, `..`, drive,
+ * UNC, device or stream forms, ending in `.html`.
+ */
+export function isNativeChatVisualFileName(name: string): boolean {
+  if (
+    name.length === 0 ||
+    name.length > NATIVE_CHAT_VISUAL_FILE_MAX_LENGTH ||
+    !FILE_NAME_PATTERN.test(name) ||
+    name.includes('..')
+  ) {
+    return false
+  }
+  const baseName = name.slice(0, name.indexOf('.'))
+  return !WINDOWS_DEVICE_BASE_NAME.test(baseName)
+}
+
+function isPlainAttributeValue(value: string): boolean {
+  for (let index = 0; index < value.length; index += 1) {
+    const code = value.charCodeAt(index)
+    if (code < 0x20 || code === 0x7f || code === 0x5c) {
+      return false
+    }
+  }
+  return true
+}
+
+function stripLineEnding(line: string): string {
+  if (line.endsWith('\r\n')) {
+    return line.slice(0, -2)
+  }
+  return line.endsWith('\n') || line.endsWith('\r') ? line.slice(0, -1) : line
+}
+
+function leadingSpaceCount(line: string): number {
+  let count = 0
+  while (line[count] === ' ') {
+    count += 1
+  }
+  return count
+}
+
+function parseAttributes(body: string): Map<string, string> | null {
+  const attributes = new Map<string, string>()
+  let rest = body.replace(LINE_SPACE, '')
+  while (rest.length > 0) {
+    const match = ATTRIBUTE_PATTERN.exec(rest)
+    if (!match) {
+      return null
+    }
+    const [whole, key, value] = match
+    if (attributes.has(key) || !isPlainAttributeValue(value)) {
+      return null
+    }
+    attributes.set(key, value)
+    rest = rest.slice(whole.length)
+    const separator = LINE_SPACE.exec(rest)?.[0] ?? ''
+    if (rest.length > 0 && separator.length === 0) {
+      return null
+    }
+    rest = rest.slice(separator.length)
+  }
+  return attributes
+}
+
+/** The directive a whole line spells, or null when the line is anything else. */
+export function parseNativeChatVisualDirectiveLine(
+  rawLine: string
+): NativeChatVisualDirective | null {
+  const line = stripLineEnding(rawLine)
+  if (line.length > NATIVE_CHAT_VISUAL_DIRECTIVE_MAX_LINE_LENGTH || /[\r\n]/.test(line)) {
+    return null
+  }
+  const indent = leadingSpaceCount(line)
+  if (indent > 3 || !line.startsWith(NATIVE_CHAT_VISUAL_DIRECTIVE_MARKER, indent)) {
+    return null
+  }
+  const trimmedEnd = line.replace(/[ \t]+$/, '')
+  if (!trimmedEnd.endsWith('}')) {
+    return null
+  }
+  const body = trimmedEnd.slice(indent + NATIVE_CHAT_VISUAL_DIRECTIVE_MARKER.length, -1)
+  const attributes = parseAttributes(body)
+  const file = attributes?.get('file')
+  if (!attributes || file === undefined || !isNativeChatVisualFileName(file)) {
+    return null
+  }
+  const title = attributes.get('title')?.trim() ?? ''
+  if (title.length > NATIVE_CHAT_VISUAL_TITLE_MAX_LENGTH) {
+    return null
+  }
+  return { file, title: title.length > 0 ? title : null }
+}
+
+/**
+ * Whether the final, still-growing line of a streaming reply may yet become a directive, so the
+ * viewer holds it back instead of flashing raw syntax. A complete-looking line counts too: the
+ * agent may still append to it. Only a streaming tail may be held; a finished reply shows it.
+ */
+export function isPendingNativeChatVisualDirectiveTail(lastLine: string): boolean {
+  const line = stripLineEnding(lastLine)
+  if (line.length === 0 || line.length > NATIVE_CHAT_VISUAL_DIRECTIVE_MAX_LINE_LENGTH) {
+    return false
+  }
+  const indent = leadingSpaceCount(line)
+  if (indent > 3 || indent === line.length) {
+    return false
+  }
+  const rest = line.slice(indent)
+  if (rest.length <= NATIVE_CHAT_VISUAL_DIRECTIVE_MARKER.length) {
+    return NATIVE_CHAT_VISUAL_DIRECTIVE_MARKER.startsWith(rest)
+  }
+  return rest.startsWith(NATIVE_CHAT_VISUAL_DIRECTIVE_MARKER) && !/[\r\n]/.test(rest)
+}
+
+/** Drops a pending directive tail (see above) from streaming reply text. */
+export function withoutPendingNativeChatVisualDirectiveTail(text: string): string {
+  const lineStart = text.lastIndexOf('\n') + 1
+  return isPendingNativeChatVisualDirectiveTail(text.slice(lineStart))
+    ? text.slice(0, lineStart)
+    : text
+}
+
+// CommonMark fences: a backtick opener's info string has no backtick; a closer has no info string.
+const FENCE_OPEN = /^ {0,3}(`{3,}(?=[^`]*$)|~{3,})/
+const FENCE_CLOSE = /^ {0,3}(`{3,}|~{3,})[ \t]*$/
+
+/**
+ * Reply text for plain-text surfaces (a sidebar row, a notification, a copy): the visual lines are
+ * dropped, since only the transcript can show them. Lines inside fenced code stay, as the transcript
+ * shows them too, and everything else keeps its spacing and indentation.
+ */
+export function withoutNativeChatVisualDirectiveLines(text: string): string {
+  if (!text.includes(NATIVE_CHAT_VISUAL_DIRECTIVE_MARKER)) {
+    return text
+  }
+  let fence: string | null = null
+  let skipBlank = false
+  const kept: string[] = []
+  for (const line of text.split('\n')) {
+    const bare = line.replace(/\r$/, '')
+    const blank = bare.trim().length === 0
+    if (skipBlank && blank) {
+      // The blank line that separated a removed visual from what follows.
+      skipBlank = false
+      continue
+    }
+    skipBlank = false
+    if (fence) {
+      const closer = FENCE_CLOSE.exec(bare)?.[1]
+      if (closer && closer[0] === fence[0] && closer.length >= fence.length) {
+        fence = null
+      }
+      kept.push(line)
+      continue
+    }
+    const opener = FENCE_OPEN.exec(bare)?.[1]
+    if (opener) {
+      fence = opener
+      kept.push(line)
+      continue
+    }
+    if (parseNativeChatVisualDirectiveLine(line)) {
+      // Drop one blank neighbour too, so the gap closes; every other line keeps its spacing.
+      const previous = kept.at(-1)
+      skipBlank = previous === undefined || previous.replace(/\r$/, '').trim().length === 0
+      continue
+    }
+    kept.push(line)
+  }
+  // Only blank lines the removal left at the very start or end go; indentation is kept.
+  return kept
+    .join('\n')
+    .replace(/^(?:[ \t]*\r?\n)+/, '')
+    .replace(/(?:\r?\n[ \t]*)+$/, '')
+    .replace(/\r$/, '')
+}
diff --git a/src/shared/native-chat-visual-height-governor.test.ts b/src/shared/native-chat-visual-height-governor.test.ts
new file mode 100644
index 000000000000..35967c0d48bc
--- /dev/null
+++ b/src/shared/native-chat-visual-height-governor.test.ts
@@ -0,0 +1,65 @@
+import { describe, expect, it } from 'vitest'
+import { createNativeChatVisualHeightGovernor } from './native-chat-visual-height-governor'
+
+describe('createNativeChatVisualHeightGovernor', () => {
+  it('applies clamped changes and ignores repeats', () => {
+    const governor = createNativeChatVisualHeightGovernor()
+    expect(governor.decide(300, 0)).toEqual({ kind: 'apply', height: 300 })
+    expect(governor.decide(300.2, 10)).toEqual({ kind: 'ignore' })
+    expect(governor.decide(5, 20)).toEqual({ kind: 'apply', height: 80 })
+    expect(governor.decide(50_000, 30)).toEqual({ kind: 'apply', height: 2000 })
+  })
+
+  it('defers changes past the per-second budget instead of dropping the last one', () => {
+    const governor = createNativeChatVisualHeightGovernor()
+    let now = 0
+    for (let index = 0; index < 20; index += 1) {
+      // Alternate shrinking and growing in large steps so no runaway is detected.
+      expect(governor.decide(index % 2 === 0 ? 200 : 900, now).kind).toBe('apply')
+      now += 10
+    }
+    expect(governor.decide(500, now)).toEqual({ kind: 'defer', retryInMs: 1_000 - now })
+    expect(governor.decide(500, 1_000)).toEqual({ kind: 'apply', height: 500 })
+  })
+
+  it('stops growth that only follows the frame (100vh plus a margin) but still lets it shrink', () => {
+    const governor = createNativeChatVisualHeightGovernor()
+    let height = 200
+    let now = 0
+    governor.decide(height, now)
+    const applied: number[] = []
+    for (let index = 0; index < 30; index += 1) {
+      height += 16
+      now += 50
+      const decision = governor.decide(height, now)
+      if (decision.kind === 'apply') {
+        applied.push(decision.height)
+      }
+    }
+    expect(applied.length).toBeLessThan(12)
+    const frozenAt = applied.at(-1) ?? 200
+    expect(governor.decide(frozenAt + 16, now + 2_000)).toEqual({ kind: 'ignore' })
+    expect(governor.decide(150, now + 3_000)).toEqual({ kind: 'apply', height: 150 })
+  })
+
+  it('lets a page grow in steps as slow images and fonts arrive', () => {
+    const governor = createNativeChatVisualHeightGovernor()
+    expect(governor.decide(200, 0).kind).toBe('apply')
+    expect(governor.decide(240, 800).kind).toBe('apply')
+    expect(governor.decide(280, 1_600).kind).toBe('apply')
+    expect(governor.decide(600, 1_650).kind).toBe('apply')
+  })
+
+  it('lets an animated expansion finish, whose steps vary frame to frame', () => {
+    const governor = createNativeChatVisualHeightGovernor()
+    let height = 200
+    let now = 0
+    governor.decide(height, now)
+    const steps = [3, 9, 15, 20, 24, 26, 26, 24, 20, 15, 9, 5, 3, 2]
+    for (const step of steps) {
+      height += step
+      now += 16
+      expect(governor.decide(height, now)).toEqual({ kind: 'apply', height })
+    }
+  })
+})
diff --git a/src/shared/native-chat-visual-height-governor.ts b/src/shared/native-chat-visual-height-governor.ts
new file mode 100644
index 000000000000..a8514509c087
--- /dev/null
+++ b/src/shared/native-chat-visual-height-governor.ts
@@ -0,0 +1,69 @@
+import { clampNativeChatVisualHeight } from './native-chat-visual-shell'
+
+const WINDOW_MS = 1_000
+const MAX_CHANGES_PER_WINDOW = 20
+// A page sized from the frame (100vh plus a margin) grows by the same small step on every report;
+// an animated expansion grows by varying steps and is left alone.
+const RUNAWAY_STEP_PX = 64
+const RUNAWAY_STEP_TOLERANCE_PX = 1
+const RUNAWAY_GAP_MS = 500
+const RUNAWAY_STREAK = 10
+
+export type NativeChatVisualHeightDecision =
+  | { kind: 'apply'; height: number }
+  | { kind: 'defer'; retryInMs: number }
+  | { kind: 'ignore' }
+
+/**
+ * Turns a visual's reported heights into frame heights: clamped, rate-limited, and frozen against
+ * further growth once the page is plainly growing because the frame grew (the same small step, again
+ * and again). Shrinking stays allowed.
+ */
+export function createNativeChatVisualHeightGovernor(): {
+  decide: (reported: number, now: number) => NativeChatVisualHeightDecision
+} {
+  let applied: number | null = null
+  let windowStart = 0
+  let changes = 0
+  let lastGrowthAt = -Infinity
+  let lastStep = 0
+  let streak = 0
+  let growthFrozen = false
+
+  return {
+    decide(reported, now) {
+      const height = clampNativeChatVisualHeight(reported)
+      if (height === applied) {
+        return { kind: 'ignore' }
+      }
+      const grows = applied !== null && height > applied
+      if (grows && growthFrozen) {
+        return { kind: 'ignore' }
+      }
+      if (now - windowStart >= WINDOW_MS) {
+        windowStart = now
+        changes = 0
+      }
+      if (changes >= MAX_CHANGES_PER_WINDOW) {
+        return { kind: 'defer', retryInMs: windowStart + WINDOW_MS - now }
+      }
+      if (grows && applied !== null) {
+        const step = height - applied
+        const sameSmallStep =
+          step <= RUNAWAY_STEP_PX && Math.abs(step - lastStep) <= RUNAWAY_STEP_TOLERANCE_PX
+        streak = sameSmallStep && now - lastGrowthAt < RUNAWAY_GAP_MS ? streak + 1 : 0
+        lastGrowthAt = now
+        lastStep = step
+        if (streak >= RUNAWAY_STREAK) {
+          growthFrozen = true
+          return { kind: 'ignore' }
+        }
+      } else {
+        streak = 0
+      }
+      changes += 1
+      applied = height
+      return { kind: 'apply', height }
+    }
+  }
+}
diff --git a/src/shared/native-chat-visual-shell.test.ts b/src/shared/native-chat-visual-shell.test.ts
new file mode 100644
index 000000000000..7a69001e8e77
--- /dev/null
+++ b/src/shared/native-chat-visual-shell.test.ts
@@ -0,0 +1,161 @@
+import { describe, expect, it } from 'vitest'
+import {
+  NATIVE_CHAT_VISUAL_CSP,
+  NATIVE_CHAT_VISUAL_MAX_HEIGHT,
+  NATIVE_CHAT_VISUAL_MIN_HEIGHT,
+  NATIVE_CHAT_VISUAL_OPEN_LINK_TYPE,
+  NATIVE_CHAT_VISUAL_SIZE_TYPE,
+  NATIVE_CHAT_VISUAL_THEME_TYPE,
+  buildNativeChatVisualDocument,
+  clampNativeChatVisualHeight,
+  nativeChatVisualThemeCss,
+  nativeChatVisualThemeMessage,
+  readNativeChatVisualFrameMessage
+} from './native-chat-visual-shell'
+
+const theme = {
+  colorScheme: 'dark' as const,
+  tokens: { '--background': 'oklch(0.2 0 0)', '--chart-1': '#123456' }
+}
+
+function directives(): Map<string, string> {
+  return new Map(
+    NATIVE_CHAT_VISUAL_CSP.split(';').map((part) => {
+      const [name, ...values] = part.trim().split(/\s+/)
+      return [name, values.join(' ')]
+    })
+  )
+}
+
+describe('NATIVE_CHAT_VISUAL_CSP', () => {
+  it('denies by default and closes every channel a chart does not need', () => {
+    const policy = directives()
+    expect(policy.get('default-src')).toBe("'none'")
+    for (const name of [
+      'connect-src',
+      'frame-src',
+      'child-src',
+      'worker-src',
+      'object-src',
+      'media-src',
+      'manifest-src',
+      'form-action',
+      'base-uri'
+    ]) {
+      expect(policy.get(name)).toBe("'none'")
+    }
+  })
+
+  it('allows assets only inline, from data/blob, or from the pinned CDNs, and never eval', () => {
+    const policy = directives()
+    for (const name of ['script-src', 'style-src']) {
+      expect(policy.get(name)).toContain("'unsafe-inline'")
+      expect(policy.get(name)).not.toContain("'unsafe-eval'")
+      expect(policy.get(name)).not.toContain('*')
+    }
+    expect(policy.get('img-src')).toBe(
+      'data: blob: https://cdn.jsdelivr.net https://unpkg.com https://cdnjs.cloudflare.com https://esm.sh https://fonts.googleapis.com https://fonts.gstatic.com'
+    )
+  })
+})
+
+describe('buildNativeChatVisualDocument', () => {
+  const html = '<!doctype html><html><head><title>x</title></head><body><p>hi</p></body></html>'
+  const document = buildNativeChatVisualDocument({ html, channel: 'abc123', theme })
+
+  it('puts the CSP before anything the visual wrote', () => {
+    const cspAt = document.indexOf('http-equiv="Content-Security-Policy"')
+    expect(cspAt).toBeGreaterThan(0)
+    expect(cspAt).toBeLessThan(document.indexOf('<title>x</title>'))
+    expect(cspAt).toBeLessThan(document.indexOf('<script>'))
+    expect(document.endsWith(html)).toBe(true)
+  })
+
+  it('paints the theme before the visual and carries the channel in the bootstrap', () => {
+    expect(document).toContain('<html class="dark">')
+    expect(document).toContain('--background:oklch(0.2 0 0)')
+    expect(document).toContain('"channel":"abc123"')
+  })
+
+  it('checks the theme message comes from the host window', () => {
+    expect(document).toContain('event.source !== host')
+  })
+})
+
+describe('nativeChatVisualThemeCss', () => {
+  it('drops structural characters and invalid names so a value cannot escape the rule', () => {
+    const css = nativeChatVisualThemeCss({
+      colorScheme: 'light',
+      tokens: {
+        '--background': 'red;}</style><script>alert(1)</script>',
+        'not-a-token': 'blue',
+        '--Upper': 'green'
+      }
+    })
+    expect(css).not.toContain('</style>')
+    expect(css).not.toContain('}<')
+    expect(css).not.toContain('not-a-token')
+    expect(css).not.toContain('--Upper')
+    expect(css.startsWith(':root{color-scheme:light')).toBe(true)
+  })
+
+  it('builds the live theme message on the same channel', () => {
+    expect(nativeChatVisualThemeMessage(theme, 'abc')).toMatchObject({
+      type: NATIVE_CHAT_VISUAL_THEME_TYPE,
+      channel: 'abc',
+      colorScheme: 'dark'
+    })
+  })
+})
+
+describe('readNativeChatVisualFrameMessage', () => {
+  it('accepts a finite size and an http(s) link on its own channel', () => {
+    expect(
+      readNativeChatVisualFrameMessage(
+        { type: NATIVE_CHAT_VISUAL_SIZE_TYPE, channel: 'c', height: 321.5 },
+        'c'
+      )
+    ).toEqual({ kind: 'size', height: 321.5 })
+    expect(
+      readNativeChatVisualFrameMessage(
+        { type: NATIVE_CHAT_VISUAL_OPEN_LINK_TYPE, channel: 'c', url: 'https://example.com/a b' },
+        'c'
+      )
+    ).toEqual({ kind: 'open-link', url: 'https://example.com/a%20b' })
+  })
+
+  it.each([
+    ['another channel', { type: NATIVE_CHAT_VISUAL_SIZE_TYPE, channel: 'x', height: 10 }],
+    ['no channel', { type: NATIVE_CHAT_VISUAL_SIZE_TYPE, height: 10 }],
+    ['NaN height', { type: NATIVE_CHAT_VISUAL_SIZE_TYPE, channel: 'c', height: Number.NaN }],
+    ['infinite height', { type: NATIVE_CHAT_VISUAL_SIZE_TYPE, channel: 'c', height: Infinity }],
+    ['negative height', { type: NATIVE_CHAT_VISUAL_SIZE_TYPE, channel: 'c', height: -5 }],
+    ['string height', { type: NATIVE_CHAT_VISUAL_SIZE_TYPE, channel: 'c', height: '50' }],
+    [
+      'javascript link',
+      { type: NATIVE_CHAT_VISUAL_OPEN_LINK_TYPE, channel: 'c', url: 'javascript:alert(1)' }
+    ],
+    ['file link', { type: NATIVE_CHAT_VISUAL_OPEN_LINK_TYPE, channel: 'c', url: 'file:///etc' }],
+    [
+      'overlong link',
+      {
+        type: NATIVE_CHAT_VISUAL_OPEN_LINK_TYPE,
+        channel: 'c',
+        url: `https://example.com/${'a'.repeat(3000)}`
+      }
+    ],
+    ['unknown type', { type: 'orca-panel-action', channel: 'c' }],
+    ['a string', 'orca-visual-size'],
+    ['null', null]
+  ])('refuses %s', (_name, data) => {
+    expect(readNativeChatVisualFrameMessage(data, 'c')).toBeNull()
+  })
+})
+
+describe('clampNativeChatVisualHeight', () => {
+  it('keeps heights in range', () => {
+    expect(clampNativeChatVisualHeight(1)).toBe(NATIVE_CHAT_VISUAL_MIN_HEIGHT)
+    expect(clampNativeChatVisualHeight(99_999)).toBe(NATIVE_CHAT_VISUAL_MAX_HEIGHT)
+    expect(clampNativeChatVisualHeight(300.4)).toBe(300)
+  })
+})
diff --git a/src/shared/native-chat-visual-shell.ts b/src/shared/native-chat-visual-shell.ts
new file mode 100644
index 000000000000..6df2531d6eef
--- /dev/null
+++ b/src/shared/native-chat-visual-shell.ts
@@ -0,0 +1,261 @@
+import { PANEL_DESIGN_TOKEN_ALLOWLIST } from './plugins/plugin-panel-shell'
+
+/**
+ * The document wrapped around an agent-written chat visual before it enters its sandboxed frame.
+ * Same placement rule as the plugin panel shell: the CSP meta parses before any visual markup, so
+ * nothing later in the document can loosen it, and the visual's own <html>/<head> merge into ours.
+ *
+ * Network: scripts, styles, fonts and images may load from a pinned set of public CDNs; nothing may
+ * fetch, open sockets, frame, or submit. A page can still encode data in a request to an allowed
+ * CDN — an accepted, disclosed risk, not a guarantee that no data leaves.
+ *
+ * Electron-free string builder: desktop, the web client and mobile build the same document.
+ */
+
+export const NATIVE_CHAT_VISUAL_CDN_ORIGINS = [
+  'https://cdn.jsdelivr.net',
+  'https://unpkg.com',
+  'https://cdnjs.cloudflare.com',
+  'https://esm.sh',
+  'https://fonts.googleapis.com',
+  'https://fonts.gstatic.com'
+] as const
+
+const ASSET_SOURCES = `'unsafe-inline' data: blob: ${NATIVE_CHAT_VISUAL_CDN_ORIGINS.join(' ')}`
+const MEDIA_SOURCES = `data: blob: ${NATIVE_CHAT_VISUAL_CDN_ORIGINS.join(' ')}`
+
+export const NATIVE_CHAT_VISUAL_CSP = [
+  "default-src 'none'",
+  `script-src ${ASSET_SOURCES}`,
+  `style-src ${ASSET_SOURCES}`,
+  `font-src ${MEDIA_SOURCES}`,
+  `img-src ${MEDIA_SOURCES}`,
+  "connect-src 'none'",
+  "frame-src 'none'",
+  "child-src 'none'",
+  "worker-src 'none'",
+  "object-src 'none'",
+  "media-src 'none'",
+  "manifest-src 'none'",
+  "form-action 'none'",
+  "base-uri 'none'"
+].join('; ')
+
+/** Frame names carry this prefix so the main process registers them before content runs. */
+export const NATIVE_CHAT_VISUAL_FRAME_NAME_PREFIX = 'orca-chat-visual:'
+
+export const NATIVE_CHAT_VISUAL_SIZE_TYPE = 'orca-visual-size'
+export const NATIVE_CHAT_VISUAL_OPEN_LINK_TYPE = 'orca-visual-open-link'
+export const NATIVE_CHAT_VISUAL_THEME_TYPE = 'orca-visual-theme'
+
+export const NATIVE_CHAT_VISUAL_MIN_HEIGHT = 80
+export const NATIVE_CHAT_VISUAL_MAX_HEIGHT = 2000
+const MAX_LINK_LENGTH = 2048
+
+/** Theme variables a visual may style against: the plugin panel set plus the chart series. */
+export const NATIVE_CHAT_VISUAL_THEME_TOKENS = [
+  ...PANEL_DESIGN_TOKEN_ALLOWLIST,
+  '--chart-1',
+  '--chart-2',
+  '--chart-3',
+  '--chart-4',
+  '--chart-5',
+  '--font-sans',
+  '--font-mono'
+] as const
+
+export type NativeChatVisualTheme = {
+  colorScheme: 'light' | 'dark'
+  tokens: Readonly<Record<string, string>>
+}
+
+const TOKEN_NAME_PATTERN = /^--[a-z0-9-]+$/
+
+/** Token values land inside a <style> block, so structural characters are stripped. */
+function sanitizeTokenValue(value: string): string {
+  return value.replaceAll(/[{}<>;\\]/g, '').trim()
+}
+
+export function nativeChatVisualThemeCss(theme: NativeChatVisualTheme): string {
+  const declarations = [`color-scheme:${theme.colorScheme === 'dark' ? 'dark' : 'light'}`]
+  for (const [name, value] of Object.entries(theme.tokens)) {
+    const clean = sanitizeTokenValue(value)
+    if (TOKEN_NAME_PATTERN.test(name) && clean.length > 0) {
+      declarations.push(`${name}:${clean}`)
+    }
+  }
+  return `:root{${declarations.join(';')}}`
+}
+
+// A visual sits in the reply on the thread's own background; its scrollbar stays hidden because the
+// frame grows to fit it. The visual's own CSS comes later and wins.
+const BASE_CSS =
+  'html{background:var(--background);color:var(--foreground);font-family:var(--font-sans);' +
+  'font-size:14px;line-height:1.5;scrollbar-width:none}html::-webkit-scrollbar{display:none}' +
+  'body{margin:0}code,pre,kbd,samp{font-family:var(--font-mono)}'
+
+function bootstrapScript(channel: string): string {
+  const constants = JSON.stringify({
+    channel,
+    size: NATIVE_CHAT_VISUAL_SIZE_TYPE,
+    link: NATIVE_CHAT_VISUAL_OPEN_LINK_TYPE,
+    theme: NATIVE_CHAT_VISUAL_THEME_TYPE
+  })
+  // Plain ES5 so it runs before, and independent of, anything the visual loads.
+  return `(function () {
+'use strict'
+var C = ${constants}
+var host = window.parent
+function send(message) {
+  message.channel = C.channel
+  try { host.postMessage(message, '*') } catch (_) {}
+}
+// Containment: a visual is a document, never a browsing context. The host also refuses navigation.
+if (window.navigation && typeof window.navigation.addEventListener === 'function') {
+  window.navigation.addEventListener('navigate', function (event) {
+    if (!event.hashChange && event.cancelable) event.preventDefault()
+  })
+}
+try { Object.defineProperty(window, 'open', { value: function () { return null }, writable: false, configurable: false }) }
+catch (_) { try { window.open = function () { return null } } catch (_) {} }
+document.addEventListener('click', function (event) {
+  var node = event.target
+  while (node && node.nodeType !== 1) node = node.parentNode
+  var anchor = node && node.closest ? node.closest('a[href]') : null
+  if (!anchor) return
+  var href = anchor.getAttribute('href') || ''
+  if (href.charAt(0) === '#') return
+  event.preventDefault()
+  if (!event.isTrusted) return
+  var url
+  try { url = new URL(href, document.baseURI) } catch (_) { return }
+  if (url.protocol === 'http:' || url.protocol === 'https:') send({ type: C.link, url: url.href })
+}, true)
+document.addEventListener('submit', function (event) { event.preventDefault() }, true)
+// Theme: only the host window may restyle the visual.
+var themeStyle = document.getElementById('orca-visual-theme')
+window.addEventListener('message', function (event) {
+  var data = event.data
+  if (event.source !== host || !data || data.type !== C.theme || data.channel !== C.channel) return
+  if (typeof data.css !== 'string' || !themeStyle) return
+  themeStyle.textContent = data.css
+  document.documentElement.classList.toggle('dark', data.colorScheme === 'dark')
+})
+// Height: report the document's own height whenever layout changes; the host fits the frame.
+var reported = -1
+var pending = false
+function measure() {
+  pending = false
+  var height = document.documentElement.getBoundingClientRect().height
+  var body = document.body
+  // A page pinned to the frame (html/body height 100%) overflows its body instead of growing it;
+  // add only what overflows, so a padded full-height body does not grow the frame by itself.
+  if (body && body.scrollHeight > body.clientHeight) height += body.scrollHeight - body.clientHeight
+  height = Math.ceil(height)
+  if (height !== reported && height > 0) {
+    reported = height
+    send({ type: C.size, height: height })
+  }
+}
+function schedule() {
+  if (pending) return
+  pending = true
+  if (typeof requestAnimationFrame === 'function') requestAnimationFrame(measure)
+  else setTimeout(measure, 16)
+}
+if (typeof ResizeObserver === 'function') {
+  var observer = new ResizeObserver(schedule)
+  observer.observe(document.documentElement)
+  document.addEventListener('DOMContentLoaded', function () { if (document.body) observer.observe(document.body) })
+}
+// Content that overflows a fixed-size body changes no observed box, so watch the content too.
+if (typeof MutationObserver === 'function') {
+  document.addEventListener('DOMContentLoaded', function () {
+    if (document.body) new MutationObserver(schedule).observe(document.body, { childList: true, subtree: true, characterData: true, attributes: true })
+  })
+}
+document.addEventListener('DOMContentLoaded', schedule)
+window.addEventListener('load', schedule)
+if (document.fonts && document.fonts.ready) document.fonts.ready.then(schedule)
+})()`
+}
+
+/**
+ * The full srcdoc for one visual. `channel` is unique per built document and rides on every message
+ * the shell sends, so the host can tell this document's messages from anything else.
+ */
+export function buildNativeChatVisualDocument(args: {
+  html: string
+  channel: string
+  theme: NativeChatVisualTheme
+}): string {
+  const scheme = args.theme.colorScheme === 'dark' ? 'dark' : 'light'
+  return `<!doctype html>
+<html class="${scheme}">
+<head>
+<meta charset="utf-8">
+<meta http-equiv="Content-Security-Policy" content="${NATIVE_CHAT_VISUAL_CSP}">
+<meta name="viewport" content="width=device-width, initial-scale=1">
+<style id="orca-visual-theme">${nativeChatVisualThemeCss(args.theme)}</style>
+<style>${BASE_CSS}</style>
+<script>${bootstrapScript(args.channel)}</script>
+</head>
+${args.html}`
+}
+
+export type NativeChatVisualFrameMessage =
+  | { kind: 'size'; height: number }
+  | { kind: 'open-link'; url: string }
+
+/** A message from a visual's shell, validated; null for anything else. */
+export function readNativeChatVisualFrameMessage(
+  data: unknown,
+  channel: string
+): NativeChatVisualFrameMessage | null {
+  if (typeof data !== 'object' || data === null) {
+    return null
+  }
+  if (!('channel' in data) || data.channel !== channel || !('type' in data)) {
+    return null
+  }
+  if (data.type === NATIVE_CHAT_VISUAL_SIZE_TYPE) {
+    const height = 'height' in data ? data.height : undefined
+    return typeof height === 'number' && Number.isFinite(height) && height > 0
+      ? { kind: 'size', height }
+      : null
+  }
+  if (data.type === NATIVE_CHAT_VISUAL_OPEN_LINK_TYPE) {
+    const url = 'url' in data ? data.url : undefined
+    if (typeof url !== 'string' || url.length > MAX_LINK_LENGTH) {
+      return null
+    }
+    try {
+      const parsed = new URL(url)
+      return parsed.protocol === 'http:' || parsed.protocol === 'https:'
+        ? { kind: 'open-link', url: parsed.href }
+        : null
+    } catch {
+      return null
+    }
+  }
+  return null
+}
+
+export function clampNativeChatVisualHeight(height: number): number {
+  return Math.min(
+    NATIVE_CHAT_VISUAL_MAX_HEIGHT,
+    Math.max(NATIVE_CHAT_VISUAL_MIN_HEIGHT, Math.round(height))
+  )
+}
+
+export function nativeChatVisualThemeMessage(
+  theme: NativeChatVisualTheme,
+  channel: string
+): { type: string; channel: string; css: string; colorScheme: 'light' | 'dark' } {
+  return {
+    type: NATIVE_CHAT_VISUAL_THEME_TYPE,
+    channel,
+    css: nativeChatVisualThemeCss(theme),
+    colorScheme: theme.colorScheme
+  }
+}
diff --git a/src/shared/native-file-drop.test.ts b/src/shared/native-file-drop.test.ts
index 20adac920881..0b9fd1213adc 100644
--- a/src/shared/native-file-drop.test.ts
+++ b/src/shared/native-file-drop.test.ts
@@ -2,14 +2,10 @@ import { describe, expect, it } from 'vitest'
 import {
   NATIVE_FILE_DROP_MAX_PATH_BYTES,
   NATIVE_FILE_DROP_MAX_PATHS,
-  NATIVE_FILE_DROP_TARGET,
   ORCA_INTERNAL_FILE_DRAG_TYPE,
-  createNativeFileDropPayload,
   createRejectedNativeFileDropPayload,
   hasNativeFileDragTypes,
-  isNativeFileDropPayload,
-  validateNativeFileDropPaths,
-  resolveNativeFileDropPath
+  validateNativeFileDropPaths
 } from './native-file-drop'
 
 describe('hasNativeFileDragTypes', () => {
@@ -24,67 +20,6 @@ describe('hasNativeFileDragTypes', () => {
   })
 })
 
-describe('resolveNativeFileDropPath', () => {
-  it('routes drops on the left sidebar to the add-project surface', () => {
-    expect(
-      resolveNativeFileDropPath([{ nativeFileDropTarget: NATIVE_FILE_DROP_TARGET.projectSidebar }])
-    ).toEqual({ target: NATIVE_FILE_DROP_TARGET.projectSidebar })
-  })
-
-  it('preserves terminal tab and pane routing for native file drops', () => {
-    expect(
-      resolveNativeFileDropPath([
-        {
-          terminalPaneLeafId: 'leaf-1'
-        },
-        {
-          nativeFileDropTarget: NATIVE_FILE_DROP_TARGET.terminal,
-          terminalTabId: 'tab-1'
-        }
-      ])
-    ).toEqual({
-      target: NATIVE_FILE_DROP_TARGET.terminal,
-      tabId: 'tab-1',
-      paneLeafId: 'leaf-1'
-    })
-  })
-
-  it('carries the innermost composer scope key and omits an absent one', () => {
-    expect(
-      resolveNativeFileDropPath([
-        { composerScopeKey: 'pane-inner' },
-        {
-          nativeFileDropTarget: NATIVE_FILE_DROP_TARGET.composer,
-          composerScopeKey: 'pane-outer'
-        }
-      ])
-    ).toEqual({ target: NATIVE_FILE_DROP_TARGET.composer, scopeKey: 'pane-inner' })
-
-    expect(
-      resolveNativeFileDropPath([{ nativeFileDropTarget: NATIVE_FILE_DROP_TARGET.composer }])
-    ).toEqual({ target: NATIVE_FILE_DROP_TARGET.composer })
-  })
-
-  it('uses the nearest file-explorer destination and fails closed without one', () => {
-    expect(
-      resolveNativeFileDropPath([
-        { nativeFileDropDir: '/repo/src' },
-        {
-          nativeFileDropTarget: NATIVE_FILE_DROP_TARGET.fileExplorer,
-          nativeFileDropDir: '/repo'
-        }
-      ])
-    ).toEqual({
-      target: NATIVE_FILE_DROP_TARGET.fileExplorer,
-      destinationDir: '/repo/src'
-    })
-
-    expect(
-      resolveNativeFileDropPath([{ nativeFileDropTarget: NATIVE_FILE_DROP_TARGET.fileExplorer }])
-    ).toEqual({ target: 'rejected' })
-  })
-})
-
 describe('validateNativeFileDropPaths', () => {
   it('rejects native drops by file count before path byte accounting is needed', () => {
     const paths = Array.from({ length: NATIVE_FILE_DROP_MAX_PATHS + 1 }, (_value, index) =>
@@ -133,209 +68,22 @@ describe('validateNativeFileDropPaths', () => {
       status: 'rejected'
     })
   })
-})
-
-describe('createNativeFileDropPayload', () => {
-  it('preserves terminal tab and pane routing in accepted payloads', () => {
-    expect(
-      createNativeFileDropPayload(
-        { target: NATIVE_FILE_DROP_TARGET.terminal, tabId: 'tab-1', paneLeafId: 'leaf-1' },
-        ['/tmp/a']
-      )
-    ).toEqual({
-      paneLeafId: 'leaf-1',
-      paths: ['/tmp/a'],
-      tabId: 'tab-1',
-      target: NATIVE_FILE_DROP_TARGET.terminal
-    })
-  })
-
-  it('preserves file explorer destination routing in accepted payloads', () => {
-    expect(
-      createNativeFileDropPayload(
-        { target: NATIVE_FILE_DROP_TARGET.fileExplorer, destinationDir: '/repo/src' },
-        ['/tmp/a']
-      )
-    ).toEqual({
-      destinationDir: '/repo/src',
-      paths: ['/tmp/a'],
-      target: NATIVE_FILE_DROP_TARGET.fileExplorer
-    })
-  })
-
-  it('preserves composer scope routing and omits an absent scope key', () => {
-    expect(
-      createNativeFileDropPayload(
-        { target: NATIVE_FILE_DROP_TARGET.composer, scopeKey: 'pane-1' },
-        ['/tmp/a']
-      )
-    ).toEqual({ paths: ['/tmp/a'], scopeKey: 'pane-1', target: NATIVE_FILE_DROP_TARGET.composer })
-    expect(
-      createNativeFileDropPayload({ target: NATIVE_FILE_DROP_TARGET.composer }, ['/tmp/a'])
-    ).toEqual({ paths: ['/tmp/a'], target: NATIVE_FILE_DROP_TARGET.composer })
-  })
-
-  it('falls back to editor for unmarked drops and fails closed for rejected targets', () => {
-    expect(createNativeFileDropPayload(null, ['/tmp/a'])).toEqual({
-      paths: ['/tmp/a'],
-      target: NATIVE_FILE_DROP_TARGET.editor
-    })
-    expect(createNativeFileDropPayload({ target: 'rejected' }, ['/tmp/a'])).toBeNull()
-  })
-
-  it('returns metadata-only rejected payloads for oversized path lists', () => {
-    const payload = createNativeFileDropPayload(null, [
-      'C:\\Users\\alice\\',
-      'a'.repeat(NATIVE_FILE_DROP_MAX_PATH_BYTES)
-    ])
-
-    expect(payload).toEqual({
-      byteLength: NATIVE_FILE_DROP_MAX_PATH_BYTES + 1,
-      pathCount: 2,
-      reason: 'paths-too-large',
-      target: 'rejected'
-    })
-    expect(JSON.stringify(payload)).not.toContain('alice')
-  })
-})
 
-describe('isNativeFileDropPayload', () => {
-  it('accepts bounded native file-drop payload shapes', () => {
-    expect(
-      isNativeFileDropPayload({
-        paths: ['/tmp/a'],
-        target: NATIVE_FILE_DROP_TARGET.editor
-      })
-    ).toBe(true)
+  it('enforces file count and byte limits at their boundaries', () => {
     expect(
-      isNativeFileDropPayload({
-        destinationDir: '/repo/src',
-        paths: ['/tmp/a'],
-        target: NATIVE_FILE_DROP_TARGET.fileExplorer
-      })
-    ).toBe(true)
-    expect(
-      isNativeFileDropPayload({
-        paneLeafId: 'leaf-1',
-        paths: ['/tmp/a'],
-        tabId: 'tab-1',
-        target: NATIVE_FILE_DROP_TARGET.terminal
-      })
-    ).toBe(true)
-    expect(
-      isNativeFileDropPayload({
-        byteLength: 0,
-        pathCount: NATIVE_FILE_DROP_MAX_PATHS + 1,
-        reason: 'too-many-paths',
-        target: 'rejected'
-      })
-    ).toBe(true)
-    expect(
-      isNativeFileDropPayload({
-        byteLength: 0,
-        pathCount: 1,
-        reason: 'temp-copy-failed',
-        target: 'rejected',
-        commonReason: 'permission-denied'
-      })
-    ).toBe(true)
-
+      validateNativeFileDropPaths(Array.from({ length: NATIVE_FILE_DROP_MAX_PATHS }, () => '/a'))
+        .status
+    ).toBe('accepted')
     expect(
-      isNativeFileDropPayload({
-        paths: ['/tmp/a'],
-        scopeKey: 'pane-1',
-        target: NATIVE_FILE_DROP_TARGET.composer
-      })
-    ).toBe(true)
-  })
-
-  it('rejects malformed or unbounded native file-drop payloads', () => {
-    expect(isNativeFileDropPayload(null)).toBe(false)
-    expect(isNativeFileDropPayload({ paths: ['/tmp/a'], target: 'browser' })).toBe(false)
-    expect(
-      isNativeFileDropPayload({
-        paths: ['/tmp/a'],
-        target: NATIVE_FILE_DROP_TARGET.fileExplorer
-      })
-    ).toBe(false)
-    expect(
-      isNativeFileDropPayload({
-        paths: ['/tmp/a'],
-        tabId: 42,
-        target: NATIVE_FILE_DROP_TARGET.terminal
-      })
-    ).toBe(false)
-    expect(
-      isNativeFileDropPayload({
-        paths: ['/tmp/a'],
-        scopeKey: 42,
-        target: NATIVE_FILE_DROP_TARGET.composer
-      })
-    ).toBe(false)
-    expect(
-      isNativeFileDropPayload({
-        paths: Array.from({ length: NATIVE_FILE_DROP_MAX_PATHS + 1 }, () => '/tmp/a'),
-        target: NATIVE_FILE_DROP_TARGET.editor
-      })
-    ).toBe(false)
-    expect(
-      isNativeFileDropPayload({
-        paths: ['a'.repeat(NATIVE_FILE_DROP_MAX_PATH_BYTES + 1)],
-        target: NATIVE_FILE_DROP_TARGET.editor
-      })
-    ).toBe(false)
-    expect(
-      isNativeFileDropPayload({
-        byteLength: 0,
-        pathCount: 1,
-        reason: 'contains-secret-path',
-        target: 'rejected'
-      })
-    ).toBe(false)
-    // commonReason is rendered in a toast, so only known tokens may cross.
-    for (const commonReason of [{ text: 'x' }, 'Raw English failure text']) {
-      expect(
-        isNativeFileDropPayload({
-          byteLength: 0,
-          pathCount: 1,
-          reason: 'temp-copy-failed',
-          target: 'rejected',
-          commonReason
-        })
-      ).toBe(false)
-    }
-  })
-
-  it('enforces native file-drop count and byte limits at their boundaries', () => {
-    expect(
-      isNativeFileDropPayload({
-        paths: Array.from(
-          { length: NATIVE_FILE_DROP_MAX_PATHS },
-          (_value, index) => `/tmp/${index}`
-        ),
-        target: NATIVE_FILE_DROP_TARGET.editor
-      })
-    ).toBe(true)
-    expect(
-      isNativeFileDropPayload({
-        paths: Array.from(
-          { length: NATIVE_FILE_DROP_MAX_PATHS + 1 },
-          (_value, index) => `/tmp/${index}`
-        ),
-        target: NATIVE_FILE_DROP_TARGET.editor
-      })
-    ).toBe(false)
-    expect(
-      isNativeFileDropPayload({
-        paths: ['a'.repeat(NATIVE_FILE_DROP_MAX_PATH_BYTES)],
-        target: NATIVE_FILE_DROP_TARGET.editor
-      })
-    ).toBe(true)
+      validateNativeFileDropPaths(
+        Array.from({ length: NATIVE_FILE_DROP_MAX_PATHS + 1 }, () => '/a')
+      ).status
+    ).toBe('rejected')
+    expect(validateNativeFileDropPaths(['a'.repeat(NATIVE_FILE_DROP_MAX_PATH_BYTES)]).status).toBe(
+      'accepted'
+    )
     expect(
-      isNativeFileDropPayload({
-        paths: ['a'.repeat(NATIVE_FILE_DROP_MAX_PATH_BYTES + 1)],
-        target: NATIVE_FILE_DROP_TARGET.editor
-      })
-    ).toBe(false)
+      validateNativeFileDropPaths(['a'.repeat(NATIVE_FILE_DROP_MAX_PATH_BYTES + 1)]).status
+    ).toBe('rejected')
   })
 })
diff --git a/src/shared/native-file-drop.ts b/src/shared/native-file-drop.ts
index 8d7b44be08a6..fb19aa03eaf3 100644
--- a/src/shared/native-file-drop.ts
+++ b/src/shared/native-file-drop.ts
@@ -5,39 +5,6 @@ export const ORCA_INTERNAL_FILE_DRAG_TYPE = 'text/x-orca-file-path'
 export const NATIVE_FILE_DROP_MAX_PATHS = 256
 export const NATIVE_FILE_DROP_MAX_PATH_BYTES = 256 * 1024
 
-export const NATIVE_FILE_DROP_TARGET = {
-  editor: 'editor',
-  terminal: 'terminal',
-  composer: 'composer',
-  fileExplorer: 'file-explorer',
-  projectSidebar: 'project-sidebar'
-} as const
-
-export type NativeDropResolution =
-  | { target: typeof NATIVE_FILE_DROP_TARGET.editor }
-  | { target: typeof NATIVE_FILE_DROP_TARGET.terminal; tabId?: string; paneLeafId?: string }
-  | { target: typeof NATIVE_FILE_DROP_TARGET.composer; scopeKey?: string }
-  | { target: typeof NATIVE_FILE_DROP_TARGET.fileExplorer; destinationDir: string }
-  | { target: typeof NATIVE_FILE_DROP_TARGET.projectSidebar }
-  | { target: 'rejected' }
-
-export type NativeFileDropPayload =
-  | { paths: string[]; target: typeof NATIVE_FILE_DROP_TARGET.editor }
-  | {
-      paths: string[]
-      target: typeof NATIVE_FILE_DROP_TARGET.terminal
-      tabId?: string
-      paneLeafId?: string
-    }
-  | { paths: string[]; target: typeof NATIVE_FILE_DROP_TARGET.composer; scopeKey?: string }
-  | {
-      paths: string[]
-      target: typeof NATIVE_FILE_DROP_TARGET.fileExplorer
-      destinationDir: string
-    }
-  | { paths: string[]; target: typeof NATIVE_FILE_DROP_TARGET.projectSidebar }
-  | NativeFileDropRejectedPayload
-
 export type NativeFileDropRejectedPayload = {
   byteLength: number
   pathCount: number
@@ -76,14 +43,6 @@ export type NativeFileDropRejectionReason =
   | 'unresolved-paths'
   | 'temp-copy-failed'
 
-export type NativeFileDropPathEntry = {
-  nativeFileDropTarget?: string
-  nativeFileDropDir?: string
-  composerScopeKey?: string
-  terminalTabId?: string
-  terminalPaneLeafId?: string
-}
-
 export type NativeFileDropPathValidation =
   | { byteLength: number; pathCount: number; status: 'accepted' }
   | {
@@ -93,39 +52,6 @@ export type NativeFileDropPathValidation =
       status: 'rejected'
     }
 
-function isNativeFileDropRejectedReason(
-  reason: unknown
-): reason is NativeFileDropRejectedPayload['reason'] {
-  return (
-    reason === 'paths-too-large' ||
-    reason === 'too-many-paths' ||
-    reason === 'unresolved-paths' ||
-    reason === 'temp-copy-failed'
-  )
-}
-
-function isNativeFileDropCopyFailureReason(
-  reason: unknown
-): reason is NativeFileDropCopyFailureReason {
-  return NATIVE_FILE_DROP_COPY_FAILURE_REASONS.some((known) => known === reason)
-}
-
-function isNativeFileDropTarget(target: unknown): target is NativeFileDropPayload['target'] {
-  return Object.values(NATIVE_FILE_DROP_TARGET).includes(target as never) || target === 'rejected'
-}
-
-function isOptionalNativeFileDropString(value: unknown): value is string | undefined {
-  return value === undefined || typeof value === 'string'
-}
-
-function isNativeFileDropPathList(value: unknown): value is string[] {
-  return Array.isArray(value) && value.every((path) => typeof path === 'string')
-}
-
-function isNonNegativeFiniteNumber(value: unknown): value is number {
-  return typeof value === 'number' && Number.isFinite(value) && value >= 0
-}
-
 function getDataTransferTypes(
   types: Iterable<string> | ArrayLike<string> | null | undefined
 ): string[] {
@@ -139,52 +65,6 @@ export function hasNativeFileDragTypes(
   return values.includes('Files') && !values.includes(ORCA_INTERNAL_FILE_DRAG_TYPE)
 }
 
-export function resolveNativeFileDropPath(
-  path: readonly NativeFileDropPathEntry[]
-): NativeDropResolution | null {
-  let foundExplorer = false
-  let destinationDir: string | undefined
-  let terminalPaneLeafId: string | undefined
-  let composerScopeKey: string | undefined
-
-  for (const entry of path) {
-    terminalPaneLeafId ??= entry.terminalPaneLeafId
-    composerScopeKey ??= entry.composerScopeKey
-    const target = entry.nativeFileDropTarget
-    if (target === NATIVE_FILE_DROP_TARGET.terminal) {
-      return { target, tabId: entry.terminalTabId, paneLeafId: terminalPaneLeafId }
-    }
-    if (target === NATIVE_FILE_DROP_TARGET.composer) {
-      // Composer drops fan out window-wide, so carry the receiving composer's
-      // scope key the way a terminal drop carries its pane leaf id.
-      return { target, ...(composerScopeKey ? { scopeKey: composerScopeKey } : {}) }
-    }
-    if (target === NATIVE_FILE_DROP_TARGET.editor) {
-      return { target }
-    }
-    if (target === NATIVE_FILE_DROP_TARGET.projectSidebar) {
-      return { target }
-    }
-    if (target === NATIVE_FILE_DROP_TARGET.fileExplorer) {
-      foundExplorer = true
-    }
-
-    // Pick the nearest (innermost) destination directory marker.
-    if (destinationDir === undefined && entry.nativeFileDropDir) {
-      destinationDir = entry.nativeFileDropDir
-    }
-  }
-
-  if (foundExplorer) {
-    if (!destinationDir) {
-      return { target: 'rejected' }
-    }
-    return { target: NATIVE_FILE_DROP_TARGET.fileExplorer, destinationDir }
-  }
-
-  return null
-}
-
 export function validateNativeFileDropPaths(
   paths: readonly string[],
   options: {
@@ -233,90 +113,3 @@ export function createRejectedNativeFileDropPayload(
     target: 'rejected'
   }
 }
-
-export function createNativeFileDropPayload(
-  resolution: NativeDropResolution | null,
-  paths: readonly string[]
-): NativeFileDropPayload | null {
-  const validation = validateNativeFileDropPaths(paths)
-  if (validation.status === 'rejected') {
-    return createRejectedNativeFileDropPayload(validation)
-  }
-
-  if (resolution?.target === 'rejected') {
-    return null
-  }
-
-  if (resolution?.target === NATIVE_FILE_DROP_TARGET.fileExplorer) {
-    return {
-      paths: [...paths],
-      target: NATIVE_FILE_DROP_TARGET.fileExplorer,
-      destinationDir: resolution.destinationDir
-    }
-  }
-
-  if (resolution?.target === NATIVE_FILE_DROP_TARGET.composer) {
-    return {
-      paths: [...paths],
-      target: resolution.target,
-      ...(resolution.scopeKey ? { scopeKey: resolution.scopeKey } : {})
-    }
-  }
-
-  const target = resolution?.target ?? NATIVE_FILE_DROP_TARGET.editor
-  if (resolution?.target === NATIVE_FILE_DROP_TARGET.terminal) {
-    return {
-      paths: [...paths],
-      target: resolution.target,
-      ...(resolution.tabId ? { tabId: resolution.tabId } : {}),
-      ...(resolution.paneLeafId ? { paneLeafId: resolution.paneLeafId } : {})
-    }
-  }
-
-  return { paths: [...paths], target }
-}
-
-export function isNativeFileDropPayload(value: unknown): value is NativeFileDropPayload {
-  if (!value || typeof value !== 'object') {
-    return false
-  }
-  const payload = value as Record<string, unknown>
-  const { target } = payload
-  if (!isNativeFileDropTarget(target)) {
-    return false
-  }
-
-  if (target === 'rejected') {
-    return (
-      isNonNegativeFiniteNumber(payload.byteLength) &&
-      isNonNegativeFiniteNumber(payload.pathCount) &&
-      isNativeFileDropRejectedReason(payload.reason) &&
-      (payload.commonReason === undefined ||
-        isNativeFileDropCopyFailureReason(payload.commonReason))
-    )
-  }
-
-  if (!isNativeFileDropPathList(payload.paths)) {
-    return false
-  }
-  if (validateNativeFileDropPaths(payload.paths).status !== 'accepted') {
-    return false
-  }
-
-  if (target === NATIVE_FILE_DROP_TARGET.terminal) {
-    return (
-      isOptionalNativeFileDropString(payload.tabId) &&
-      isOptionalNativeFileDropString(payload.paneLeafId)
-    )
-  }
-  if (target === NATIVE_FILE_DROP_TARGET.fileExplorer) {
-    return typeof payload.destinationDir === 'string'
-  }
-  if (target === NATIVE_FILE_DROP_TARGET.composer) {
-    return isOptionalNativeFileDropString(payload.scopeKey)
-  }
-
-  return (
-    target === NATIVE_FILE_DROP_TARGET.editor || target === NATIVE_FILE_DROP_TARGET.projectSidebar
-  )
-}
diff --git a/src/shared/orcad-artifacts.ts b/src/shared/orcad-artifacts.ts
index d169cbe8c92b..33b3e963c913 100644
--- a/src/shared/orcad-artifacts.ts
+++ b/src/shared/orcad-artifacts.ts
@@ -100,6 +100,8 @@ export const ORCAD_EMOJI_SHORTCODE_DATASET =
   'node_modules/emojibase-data/en/shortcodes/emojibase.json'
 
 export const ORCAD_VERSION = '0.1.0'
+export const ORCAD_LAUNCHER_FILENAME = 'orcad.js'
+export const ORCAD_SERVER_ENTRY_FILENAME = 'orcad-server.js'
 
 // Equals FOREIGN_SQLITE_READER_ENTRY_FILENAME; that module is not loadable under type stripping.
 export const ORCAD_FOREIGN_SQLITE_READER_ENTRY = 'foreign-sqlite-reader-entry.js'
@@ -140,6 +142,12 @@ export const ORCAD_RIPGREP_LICENSE_ARTIFACTS = [
   'ripgrep/licenses/UNLICENSE'
 ] as const
 
+/** The skill plugin native-chat agents load by path; mirrors resources/native-chat-visuals. */
+export const ORCAD_NATIVE_CHAT_VISUALS_ARTIFACTS = [
+  'native-chat-visuals/.claude-plugin/plugin.json',
+  'native-chat-visuals/skills/orca-chat-visuals/SKILL.md'
+] as const
+
 export type OrcadArtifact = {
   filename: string
   /**
@@ -151,7 +159,8 @@ export type OrcadArtifact = {
 }
 
 export const ORCAD_ARTIFACTS: readonly OrcadArtifact[] = [
-  { filename: 'orcad.js' },
+  { filename: ORCAD_LAUNCHER_FILENAME },
+  { filename: ORCAD_SERVER_ENTRY_FILENAME },
   // Forked so a native @parcel/watcher fault kills the child, not the server.
   { filename: 'parcel-watcher-process-entry.js' },
   // Forked so PTYs outlive the runtime process; its absence makes every restart destructive.
@@ -169,7 +178,8 @@ export const ORCAD_ARTIFACTS: readonly OrcadArtifact[] = [
   { filename: ORCAD_PARCEL_WATCHER_NATIVE },
   { filename: ORCAD_EMOJI_SHORTCODE_DATASET },
   ...ORCAD_NODE_PTY_JS_ARTIFACTS.map((filename) => ({ filename })),
-  ...ORCAD_RIPGREP_LICENSE_ARTIFACTS.map((filename) => ({ filename }))
+  ...ORCAD_RIPGREP_LICENSE_ARTIFACTS.map((filename) => ({ filename })),
+  ...ORCAD_NATIVE_CHAT_VISUALS_ARTIFACTS.map((filename) => ({ filename }))
 ]
 
 /** Written after the artifacts, so it is never an input to its own hash. */
diff --git a/src/shared/orcad-build-identity.test.ts b/src/shared/orcad-build-identity.test.ts
new file mode 100644
index 000000000000..88cb6ed1bed4
--- /dev/null
+++ b/src/shared/orcad-build-identity.test.ts
@@ -0,0 +1,34 @@
+import { createHash } from 'node:crypto'
+import { mkdtempSync, rmSync, writeFileSync } from 'node:fs'
+import { tmpdir } from 'node:os'
+import { join } from 'node:path'
+import { afterEach, beforeEach, expect, it } from 'vitest'
+import { hashOrcadLauncher } from './orcad-build-identity'
+
+let directory = ''
+beforeEach(() => {
+  directory = mkdtempSync(join(tmpdir(), 'orca-entry-identity-'))
+})
+afterEach(() => {
+  rmSync(directory, { recursive: true, force: true })
+})
+
+it('preserves an older single-entry build identity for rollback', () => {
+  const entry = join(directory, 'orcad.js')
+  writeFileSync(entry, 'old-server')
+  expect(hashOrcadLauncher(entry)).toBe(
+    createHash('sha256').update('old-server').digest('hex').slice(0, 16)
+  )
+})
+
+it('keeps the launcher hash older clients expect for both split entry paths', () => {
+  const launcher = join(directory, 'orcad.js')
+  const server = join(directory, 'orcad-server.js')
+  writeFileSync(launcher, 'launcher-a')
+  writeFileSync(server, 'server-a')
+  const first = hashOrcadLauncher(launcher)
+  expect(hashOrcadLauncher(server)).toBe(first)
+  expect(first).toBe(createHash('sha256').update('launcher-a').digest('hex').slice(0, 16))
+  writeFileSync(launcher, 'launcher-b')
+  expect(hashOrcadLauncher(server)).not.toBe(first)
+})
diff --git a/src/shared/orcad-build-identity.ts b/src/shared/orcad-build-identity.ts
new file mode 100644
index 000000000000..e449408b3116
--- /dev/null
+++ b/src/shared/orcad-build-identity.ts
@@ -0,0 +1,19 @@
+import { createHash } from 'node:crypto'
+import { readFileSync, realpathSync } from 'node:fs'
+import { basename, dirname, join } from 'node:path'
+import { ORCAD_LAUNCHER_FILENAME, ORCAD_SERVER_ENTRY_FILENAME } from './orcad-artifacts'
+
+export const ORCAD_BUILD_HASH_LENGTH = 16
+
+/** The launcher embeds its server digest, keeping the hash older clients calculate. */
+export function hashOrcadLauncher(entryPath: string): string {
+  const entry = realpathSync(entryPath)
+  const launcher =
+    basename(entry) === ORCAD_SERVER_ENTRY_FILENAME
+      ? join(dirname(entry), ORCAD_LAUNCHER_FILENAME)
+      : entry
+  return createHash('sha256')
+    .update(readFileSync(launcher))
+    .digest('hex')
+    .slice(0, ORCAD_BUILD_HASH_LENGTH)
+}
diff --git a/src/shared/persisted-state-types.ts b/src/shared/persisted-state-types.ts
index c1f1b6de7275..b874b17f87af 100644
--- a/src/shared/persisted-state-types.ts
+++ b/src/shared/persisted-state-types.ts
@@ -108,8 +108,6 @@ export type PersistedState = {
   sshRemotePtyLeases: SshRemotePtyLease[]
   /** Main-owned authenticated relay recovery records; never expose through renderer settings APIs. */
   sshPtyConsumerRecoveries?: SshPtyConsumerRecovery[]
-  /** Live local Claude daemon session ids; seeds the live-PTY gate so early OAuth refresh can't rotate the single-use refresh token out from under a running daemon. */
-  claudeLivePtySessionIds?: string[]
   migrationUnsupportedPtyEntries: MigrationUnsupportedPtyEntry[]
   legacyPaneKeyAliasEntries: LegacyPaneKeyAliasEntry[]
   automations: Automation[]
diff --git a/src/shared/persisted-ui-state-types.ts b/src/shared/persisted-ui-state-types.ts
index ecd514295333..12e27144908d 100644
--- a/src/shared/persisted-ui-state-types.ts
+++ b/src/shared/persisted-ui-state-types.ts
@@ -179,6 +179,8 @@ export type PersistedUIState = {
   codexTerminalServerIsolationNoticeSeen?: boolean
   /** Windows one-shot toast for Codex moving onto ~/.codex; set when shown, so absent means not yet seen. */
   codexSharedSettingsNoticeSeen?: boolean
+  /** One-shot toast asking for one sign-in to each Claude account saved before per-account folders. */
+  claudeAccountSignInNoticeSeen?: boolean
   /** URL for new browser tabs; null = blank tab. */
   browserDefaultUrl?: string | null
   browserDefaultSearchEngine?: 'google' | 'duckduckgo' | 'bing' | 'kagi' | null
diff --git a/src/shared/protocol-version.ts b/src/shared/protocol-version.ts
index 6f1f90000f94..8a6241225e17 100644
--- a/src/shared/protocol-version.ts
+++ b/src/shared/protocol-version.ts
@@ -1,8 +1,10 @@
+import { WORKSPACE_ATTACHMENT_RUNTIME_CAPABILITIES } from './workspace-attachment-capabilities'
 import { STRUCTURED_AGENT_SESSION_SURFACE_RUNTIME_CAPABILITIES } from './structured-agent-session-surface-capabilities'
 export {
   STRUCTURED_AGENT_SESSION_HOLD_RUNTIME_CAPABILITY,
   STRUCTURED_AGENT_SESSION_REVEAL_RUNTIME_CAPABILITY,
   STRUCTURED_AGENT_SESSION_REGISTERED_AGENTS_RUNTIME_CAPABILITY,
+  PI_STRUCTURED_DIALOGS_RUNTIME_CAPABILITY,
   STRUCTURED_AGENT_SESSION_RESUME_HISTORY_RUNTIME_CAPABILITY
 } from './structured-agent-session-surface-capabilities'
 import { AGENT_SESSION_ATTENTION_RUNTIME_CAPABILITIES } from './agent-session-attention-capabilities'
@@ -28,6 +30,7 @@ export {
 } from './orchestration-runtime-capabilities'
 import { AGENT_SESSION_RESUME_RUNTIME_CAPABILITIES } from './agent-session-resume-runtime-capabilities'
 import { QODER_OWNED_TERMINAL_CREATE_CAPABILITY } from './qoder-terminal-create-capability'
+import { AGENT_SESSION_CONTINUE_INTERRUPTED_RUNTIME_CAPABILITY } from './agent-session-continue-interrupted-capability'
 import { ORCAD_RUNTIME_CAPABILITIES } from './orcad-runtime-capabilities'
 export {
   AGENT_SESSION_CURSOR_RESUME_RUNTIME_CAPABILITY,
@@ -55,11 +58,8 @@ import {
   SKILL_MANAGEMENT_CAPABILITY,
   SKILL_UPLOAD_CAPABILITY
 } from './skill-install-capability'
-export { SKILL_INSTALL_RESULT_V2_CAPABILITY } from './skill-install-capability'
-import {
-  AGENT_LAUNCH_RUNTIME_CAPABILITIES,
-  AGENT_LAUNCH_RUNTIME_CAPABILITY
-} from './agent-launch-runtime-capability'
+import { AGENT_LAUNCH_RUNTIME_CAPABILITY } from './agent-launch-runtime-capability'
+import { FORK_TERMINAL_AND_AGENT_LAUNCH_RUNTIME_CAPABILITIES } from './terminal-navigation-runtime-capabilities'
 
 // Why: declares the Orca runtime RPC compatibility contract. Desktop,
 // headless server, CLI, and mobile builds may drift in app version, but
@@ -137,11 +137,6 @@ export const BROWSER_NETWORK_EXECUTION_HOSTS_RUNTIME_CAPABILITY =
 // floor-taking input. Mobile must not forward replies unless advertised.
 export const TERMINAL_QUERY_REPLY_INPUT_RUNTIME_CAPABILITY =
   'terminal.query-reply-input.v1' as const
-export const TERMINAL_ORIGINATING_PANE_NAVIGATION_RUNTIME_CAPABILITY =
-  'terminal.originating-pane-navigation.v1' as const
-export const TERMINAL_QUESTION_ANSWER_RUNTIME_CAPABILITY = 'terminal.question-answer.v1' as const
-export const TERMINAL_SESSION_NAVIGATION_RUNTIME_CAPABILITY =
-  'terminal.session-navigation.v1' as const
 // Why: without this, prompt request IDs and waitSubmitMs are stripped and a retry would resend raw input.
 export const TERMINAL_PROMPT_DELIVERY_RUNTIME_CAPABILITY = 'terminal.prompt-delivery.v1' as const
 // Why: paired clients may unmount xterm only when the host can return a
@@ -168,6 +163,8 @@ export const WORKTREE_ARCHIVE_FAILURE_BLOCKING_RUNTIME_CAPABILITY =
   'worktree.archive-failure-blocking.v1' as const
 export const CODEX_RESET_CREDIT_RUNTIME_CAPABILITY = 'accounts.codex-reset-credit.v1' as const
 export const ACCOUNT_IMPORT_RUNTIME_CAPABILITY = 'accounts.import-host-credentials.v1' as const
+// Why: `orca account add claude` signs in to an account folder the host creates first.
+export const CLAUDE_SIGN_IN_RUNTIME_CAPABILITY = 'accounts.claude-sign-in.v1' as const
 export const ANTIGRAVITY_ACCOUNTS_RUNTIME_CAPABILITY = 'accounts.antigravity-native.v1' as const
 export const DATA_ACCOUNT_RUNTIME_CAPABILITY = 'accounts.managed-data-profiles.v1' as const
 // Why: older hosts cannot reconcile terminal.create's mutation after losing the reply, so clients may only retry unknown outcomes when advertised.
@@ -275,6 +272,10 @@ export const AGENT_SESSION_BACKGROUND_TASK_STOP_CAPABILITY =
 // `answers` to an older host; they fall back to the answer packed into `optionId`.
 export const AGENT_SESSION_QUESTION_ANSWERS_RUNTIME_CAPABILITY =
   'agent-session.question-answers.v1' as const
+// Why: a structured chat on a paired server stores attached files on that server
+// (agentSessionAttachment.*); an older server has no store, so clients must refuse
+// the attach rather than hand the agent a path from this machine.
+export const AGENT_SESSION_ATTACHMENTS_RUNTIME_CAPABILITY = 'agent-session.attachments.v1' as const
 // Why: the host now publishes rows for work that is live inside a turn, and such
 // a row carries `stoppable: false` because no targeted stop can reach it. A
 // reader that predates the field draws a per-row Stop on every row it is given,
@@ -365,6 +366,7 @@ export const RUNTIME_CAPABILITIES = [
   TASK_SOURCE_CONTEXT_RUNTIME_CAPABILITY,
   WORKSPACE_RUN_CONTEXT_RUNTIME_CAPABILITY,
   WORKTREE_LINKED_WORK_ITEM_CONTEXT_RUNTIME_CAPABILITY,
+  ...WORKSPACE_ATTACHMENT_RUNTIME_CAPABILITIES,
   WORKTREE_GITHUB_PR_SUPPRESSION_RUNTIME_CAPABILITY,
   REPO_SEARCH_QUALIFIED_REFS_RUNTIME_CAPABILITY,
   FOLDER_WORKSPACE_PATH_STATUS_RUNTIME_CAPABILITY,
@@ -373,9 +375,6 @@ export const RUNTIME_CAPABILITIES = [
   AI_VAULT_RUNTIME_CAPABILITY,
   AI_VAULT_SESSION_TITLES_RUNTIME_CAPABILITY,
   TERMINAL_QUERY_REPLY_INPUT_RUNTIME_CAPABILITY,
-  TERMINAL_SESSION_NAVIGATION_RUNTIME_CAPABILITY,
-  TERMINAL_ORIGINATING_PANE_NAVIGATION_RUNTIME_CAPABILITY,
-  TERMINAL_QUESTION_ANSWER_RUNTIME_CAPABILITY,
   TERMINAL_PROMPT_DELIVERY_RUNTIME_CAPABILITY,
   TERMINAL_PAIRED_PARKING_RUNTIME_CAPABILITY,
   TERMINAL_QUICK_COMMANDS_RUNTIME_CAPABILITY,
@@ -398,6 +397,7 @@ export const RUNTIME_CAPABILITIES = [
   // turn starts, so a client may gate on either.
   AGENT_SESSION_ACCEPTED_SEND_RUNTIME_CAPABILITY,
   AGENT_SESSION_SEND_ANSWERS_PROOF_RUNTIME_CAPABILITY,
+  AGENT_SESSION_CONTINUE_INTERRUPTED_RUNTIME_CAPABILITY,
   ...STRUCTURED_AGENT_SESSION_SURFACE_RUNTIME_CAPABILITIES,
   ...AGENT_SESSION_ATTENTION_RUNTIME_CAPABILITIES,
   AGENT_SESSION_REWIND_RUNTIME_CAPABILITY,
@@ -405,6 +405,7 @@ export const RUNTIME_CAPABILITIES = [
   AGENT_SESSION_CONVERSATION_OUTLINE_RUNTIME_CAPABILITY,
   AGENT_SESSION_BACKGROUND_TASK_STOP_CAPABILITY,
   AGENT_SESSION_QUESTION_ANSWERS_RUNTIME_CAPABILITY,
+  AGENT_SESSION_ATTACHMENTS_RUNTIME_CAPABILITY,
   AGENT_SESSION_TURN_ITEM_CAPABILITY,
   AGENT_SESSION_BACKGROUND_TASK_ROW_STOP_CAPABILITY,
   AGENT_SESSION_BACKGROUND_TASK_CHILD_VIEWS_CAPABILITY,
@@ -415,6 +416,7 @@ export const RUNTIME_CAPABILITIES = [
   WORKTREE_VISIBILITY_DEFAULTS_RUNTIME_CAPABILITY,
   WORKTREE_VISIBILITY_SOURCE_DEFAULTS_RUNTIME_CAPABILITY,
   ACCOUNT_IMPORT_RUNTIME_CAPABILITY,
+  CLAUDE_SIGN_IN_RUNTIME_CAPABILITY,
   ANTIGRAVITY_ACCOUNTS_RUNTIME_CAPABILITY,
   DATA_ACCOUNT_RUNTIME_CAPABILITY,
   CODEX_RESET_CREDIT_RUNTIME_CAPABILITY,
@@ -431,7 +433,7 @@ export const RUNTIME_CAPABILITIES = [
   AUTOMATION_OWNER_FENCING_RUNTIME_CAPABILITY,
   AUTOMATION_CREATE_IDEMPOTENCY_RUNTIME_CAPABILITY,
   NOTIFICATIONS_REMOTE_PUSH_RUNTIME_CAPABILITY,
-  ...AGENT_LAUNCH_RUNTIME_CAPABILITIES
+  ...FORK_TERMINAL_AND_AGENT_LAUNCH_RUNTIME_CAPABILITIES
 ] as const
 
 export type RuntimeCapability = (typeof RUNTIME_CAPABILITIES)[number] | (string & {})
diff --git a/src/shared/rate-limit-types.ts b/src/shared/rate-limit-types.ts
index 0a9abf64ab13..7b30956f47c4 100644
--- a/src/shared/rate-limit-types.ts
+++ b/src/shared/rate-limit-types.ts
@@ -67,7 +67,6 @@ export type UsageRateLimitMetadata = {
   failureKind?: UsageRateLimitFailureKind
   credentialSource?: string
   authProvenance?: string
-  deferredByLiveClaudeSession?: boolean
   lastSuccessfulSource?: UsageRateLimitSource
   /** Unix ms timestamp before which usage refetches should not be attempted (from HTTP Retry-After). */
   retryAtMs?: number
diff --git a/src/shared/rpc-contract/accounts-params.ts b/src/shared/rpc-contract/accounts-params.ts
index 7fa31ee6b804..15bd686a79c8 100644
--- a/src/shared/rpc-contract/accounts-params.ts
+++ b/src/shared/rpc-contract/accounts-params.ts
@@ -93,3 +93,16 @@ export const AccountsUnsubscribeParams = z.object({
     .transform((value) => (typeof value === 'string' && value.length > 0 ? value : ''))
     .pipe(z.string().min(1, 'Missing subscriptionId'))
 })
+
+const ClaudeSignInTarget = {
+  runtime: z.enum(['host', 'wsl']).optional(),
+  wslDistro: z.string().nullish()
+}
+
+export const BeginClaudeSignInParams = z
+  .object({ accountId: z.string().min(1).optional(), ...ClaudeSignInTarget })
+  .strict()
+
+export const FinishClaudeSignInParams = z
+  .object({ accountId: z.string().min(1), ...ClaudeSignInTarget })
+  .strict()
diff --git a/src/shared/rpc-contract/agent-session-attachment-params.ts b/src/shared/rpc-contract/agent-session-attachment-params.ts
new file mode 100644
index 000000000000..0288c1e46323
--- /dev/null
+++ b/src/shared/rpc-contract/agent-session-attachment-params.ts
@@ -0,0 +1,36 @@
+import { z } from 'zod'
+import {
+  AGENT_SESSION_ATTACHMENT_CHUNK_BASE64_CHARS,
+  AGENT_SESSION_ATTACHMENT_MAX_BYTES
+} from '../agent-session-attachments'
+import { isValidBase64 } from './clipboard-params'
+import { Identifier, SessionId } from './structured-agent-session-params'
+
+const UploadId = Identifier('Invalid upload id', 128)
+
+export const AttachmentUploadStartParams = z
+  .object({
+    sessionId: SessionId,
+    name: z.string().min(1).max(1024),
+    byteLength: z
+      .number()
+      .int()
+      .nonnegative()
+      .max(AGENT_SESSION_ATTACHMENT_MAX_BYTES, 'Attachment is too large')
+  })
+  .strict()
+
+export const AttachmentUploadAppendParams = z
+  .object({
+    uploadId: UploadId,
+    offset: z.number().int().nonnegative(),
+    contentBase64: z
+      .string()
+      .max(AGENT_SESSION_ATTACHMENT_CHUNK_BASE64_CHARS, 'Attachment chunk is too large')
+      .refine(isValidBase64, 'Attachment chunk must be base64')
+  })
+  .strict()
+
+export const AttachmentUploadIdParams = z.object({ uploadId: UploadId }).strict()
+
+export const AttachmentReadParams = z.object({ path: z.string().min(1).max(4096) }).strict()
diff --git a/src/shared/rpc-contract/agent-session-visual-params.ts b/src/shared/rpc-contract/agent-session-visual-params.ts
new file mode 100644
index 000000000000..bc2e67562615
--- /dev/null
+++ b/src/shared/rpc-contract/agent-session-visual-params.ts
@@ -0,0 +1,42 @@
+import { z } from 'zod'
+import { isNativeChatVisualFileName } from '../native-chat-visual-directive'
+import { SessionId } from './structured-agent-session-identifiers'
+
+// `agentSession.readVisual`: one HTML visual from a structured chat's visuals folder, read on the
+// host that owns the chat. The client names only the session and a bare file name; the host
+// resolves its own folder, so no client path ever reaches another host.
+
+/** Content revision: hex digest of the file's bytes. */
+const Revision = z.string().regex(/^[0-9a-f]{16,64}$/)
+
+export const ReadVisualParams = z
+  .object({
+    sessionId: SessionId,
+    file: z.string().refine(isNativeChatVisualFileName, 'Invalid visual file name'),
+    // The revision the client already holds; a match answers `unchanged` without the bytes.
+    knownRevision: Revision.optional()
+  })
+  .strict()
+
+export type AgentSessionReadVisualParams = z.infer<typeof ReadVisualParams>
+
+/**
+ * Why a visual cannot be shown, as positively observed by the owning host. Transport loss and an
+ * older host are never one of these: the client reads those as unavailable and may retry.
+ */
+export const AGENT_SESSION_VISUAL_READ_ERRORS = [
+  'session_not_found',
+  'unsupported_location',
+  'not_found',
+  'not_a_file',
+  'outside_folder',
+  'too_large',
+  'not_text'
+] as const
+
+export type AgentSessionVisualReadError = (typeof AGENT_SESSION_VISUAL_READ_ERRORS)[number]
+
+export type AgentSessionReadVisualResult =
+  | { ok: true; revision: string; sizeBytes: number; html: string }
+  | { ok: true; revision: string; sizeBytes: number; unchanged: true }
+  | { ok: false; error: AgentSessionVisualReadError }
diff --git a/src/shared/rpc-contract/client-ui-params.ts b/src/shared/rpc-contract/client-ui-params.ts
index 9f41e92674e4..b787d523768b 100644
--- a/src/shared/rpc-contract/client-ui-params.ts
+++ b/src/shared/rpc-contract/client-ui-params.ts
@@ -244,6 +244,7 @@ export const UiUpdateFields = z
     usageEmptyStateDismissed: z.boolean().optional(),
     codexTerminalServerIsolationNoticeSeen: z.boolean().optional(),
     codexSharedSettingsNoticeSeen: z.boolean().optional(),
+    claudeAccountSignInNoticeSeen: z.boolean().optional(),
     petVisible: z.boolean().optional(),
     petId: z.string().optional(),
     customPets: UnknownRecordArray.optional(),
diff --git a/src/shared/rpc-contract/folder-workspace-params.ts b/src/shared/rpc-contract/folder-workspace-params.ts
index 7b416b0083cd..57128672c6e1 100644
--- a/src/shared/rpc-contract/folder-workspace-params.ts
+++ b/src/shared/rpc-contract/folder-workspace-params.ts
@@ -1,5 +1,6 @@
 import { z } from 'zod'
 import { WorkspaceLinkedItemSchema } from '../workspace-linked-item-schema'
+import { WorkspaceAttachmentsSchema } from '../workspace-attachment-schema'
 import { TaskSourceContextSchema } from '../task-source-context-schema'
 import { isWorkspaceLinkedItemSourceContextMatch } from '../workspace-linked-item-source-context'
 import { isTuiAgent } from '../tui-agent-config'
@@ -34,6 +35,8 @@ export const FolderWorkspaceCreate = z
     folderPath: OptionalString.nullable().optional(),
     connectionId: OptionalString.nullable().optional(),
     linkedTask: FolderWorkspaceLinkedTask.optional(),
+    linkedItems: WorkspaceAttachmentsSchema.optional(),
+
     linkedTaskSourceContext: TaskSourceContextSchema.nullable().optional(),
     createdWithAgent: z.string().refine(isTuiAgent).optional(),
     pendingFirstAgentMessageRename: z.boolean().optional()
@@ -47,6 +50,9 @@ export const FolderWorkspaceUpdate = z.object({
       name: OptionalString,
       folderPath: OptionalString,
       linkedTask: FolderWorkspaceLinkedTask.optional(),
+      linkedItems: WorkspaceAttachmentsSchema.optional(),
+      linkedItemsBase: WorkspaceAttachmentsSchema.optional(),
+      linkedItemsSelectionChanged: z.boolean().optional(),
       linkedTaskSourceContext: TaskSourceContextSchema.nullable().optional(),
       comment: z.string().optional(),
       isArchived: z.boolean().optional(),
diff --git a/src/shared/rpc-contract/rpc-params-catalog.generated.ts b/src/shared/rpc-contract/rpc-params-catalog.generated.ts
index 7b6abcd67358..5edf0fe3512f 100644
--- a/src/shared/rpc-contract/rpc-params-catalog.generated.ts
+++ b/src/shared/rpc-contract/rpc-params-catalog.generated.ts
@@ -31,7 +31,9 @@ import {
   AddClaudeFromConfigDirParams,
   AddCodexFromHomeParams,
   AddDataAccountParams,
+  BeginClaudeSignInParams,
   ConsumeCodexResetCreditParams,
+  FinishClaudeSignInParams,
   ListAccountsParams,
   RemoveAccountParams,
   RemoveDataAccountParams,
@@ -41,7 +43,14 @@ import {
 } from './accounts-params'
 import { PrepareCodexForWslPaneParams } from './agent-hooks-params'
 import { AgentLaunch, AgentLaunchReplay } from './agent-launch-params'
+import {
+  AttachmentReadParams,
+  AttachmentUploadAppendParams,
+  AttachmentUploadIdParams,
+  AttachmentUploadStartParams
+} from './agent-session-attachment-params'
 import { CreateAgentSessionParams, EnsureAgentSessionParams } from './agent-session-params'
+import { ReadVisualParams } from './agent-session-visual-params'
 import {
   AiVaultListSessionsParams,
   AiVaultPrepareSessionResumeParams,
@@ -480,6 +489,7 @@ import {
   SpeechModelAction
 } from './speech-params'
 import { SshTarget } from './ssh-params'
+import { ContinueInterruptedParams } from './structured-agent-session-continue-params'
 import {
   AcknowledgeAttentionParams,
   AgentsParams,
@@ -585,7 +595,10 @@ export const RPC_PARAMS_BY_METHOD = {
   'accounts.antigravityList': AntigravityAccountTargetParams,
   'accounts.antigravityRemove': AntigravityAccountMutationParams,
   'accounts.antigravitySelect': AntigravityAccountMutationParams,
+  'accounts.beginClaudeSignIn': BeginClaudeSignInParams,
+  'accounts.cancelClaudeSignIn': FinishClaudeSignInParams,
   'accounts.consumeCodexResetCredit': ConsumeCodexResetCreditParams,
+  'accounts.finishClaudeSignIn': FinishClaudeSignInParams,
   'accounts.list': ListAccountsParams,
   'accounts.listData': null,
   'accounts.removeClaude': RemoveAccountParams,
@@ -605,6 +618,7 @@ export const RPC_PARAMS_BY_METHOD = {
   'agentSession.cancel': CancelParams,
   'agentSession.close': OptionsParams,
   'agentSession.commands': OptionsParams,
+  'agentSession.continueInterrupted': ContinueInterruptedParams,
   'agentSession.conversationCommand': ConversationCommandParams,
   'agentSession.conversationOutline': OptionsParams,
   'agentSession.create': CreateParams,
@@ -618,6 +632,7 @@ export const RPC_PARAMS_BY_METHOD = {
   'agentSession.queuedMessageDelete': QueuedMessageActionParams,
   'agentSession.queuedMessageSend': QueuedMessageActionParams,
   'agentSession.queuedMessagesResume': QueuedMessagesResumeParams,
+  'agentSession.readVisual': ReadVisualParams,
   'agentSession.release': HoldParams,
   'agentSession.respondToApproval': RespondParams,
   'agentSession.respondToQuestion': RespondToQuestionParams,
@@ -634,6 +649,11 @@ export const RPC_PARAMS_BY_METHOD = {
   'agentSession.subscribeTurnCompletions': SubscribeTurnCompletionsParams,
   'agentSession.threadGoal': ThreadGoalParams,
   'agentSession.unsubscribe': UnsubscribeParams,
+  'agentSessionAttachment.read': AttachmentReadParams,
+  'agentSessionAttachment.uploadAbort': AttachmentUploadIdParams,
+  'agentSessionAttachment.uploadAppend': AttachmentUploadAppendParams,
+  'agentSessionAttachment.uploadCommit': AttachmentUploadIdParams,
+  'agentSessionAttachment.uploadStart': AttachmentUploadStartParams,
   'agentTeams.prepareLaunch': AgentTeamsPrepareLaunch,
   'agentTeams.tmuxCompat': AgentTeamsTmuxCompat,
   'aiVault.listSessions': AiVaultListSessionsParams,
diff --git a/src/shared/rpc-contract/structured-agent-session-continue-params.ts b/src/shared/rpc-contract/structured-agent-session-continue-params.ts
new file mode 100644
index 000000000000..fed0bc550a86
--- /dev/null
+++ b/src/shared/rpc-contract/structured-agent-session-continue-params.ts
@@ -0,0 +1,10 @@
+// Split out of structured-agent-session-params.ts, which is at its line limit.
+
+import { z } from 'zod'
+import { SessionId } from './structured-agent-session-params'
+
+/** Continue on the chat's latest turn, which an Orca stop cut off. The host re-checks that this
+ *  turn is still that cut before sending anything, so a stale or second click sends nothing. */
+export const ContinueInterruptedParams = z
+  .object({ sessionId: SessionId, turnItemId: z.string().min(1).max(1024) })
+  .strict()
diff --git a/src/shared/rpc-contract/worktree-create-params.ts b/src/shared/rpc-contract/worktree-create-params.ts
index 04de055a6393..e538b8fbbb1e 100644
--- a/src/shared/rpc-contract/worktree-create-params.ts
+++ b/src/shared/rpc-contract/worktree-create-params.ts
@@ -1,4 +1,5 @@
 import { z } from 'zod'
+import { WorkspaceAttachmentsSchema } from '../workspace-attachment-schema'
 import { WorkspaceLinkedItemSchema } from '../workspace-linked-item-schema'
 import { TaskSourceContextSchema } from '../task-source-context-schema'
 import { workspaceSourceSchema } from '../telemetry-events'
@@ -43,6 +44,7 @@ export const WorktreeCreate = z
     linkedAzureDevOpsPR: TriStateLinkedIssue,
     linkedGiteaPR: TriStateLinkedIssue,
     linkedWorkItem: WorkspaceLinkedItemSchema.nullable().optional(),
+    linkedItems: WorkspaceAttachmentsSchema.optional(),
     linkedTaskSourceContext: TaskSourceContextSchema.nullable().optional(),
     comment: OptionalString,
     displayName: OptionalString,
diff --git a/src/shared/rpc-contract/worktree-params.ts b/src/shared/rpc-contract/worktree-params.ts
index 74b74dd799ca..bf8d79b0ddc4 100644
--- a/src/shared/rpc-contract/worktree-params.ts
+++ b/src/shared/rpc-contract/worktree-params.ts
@@ -11,6 +11,8 @@ import {
 } from './rpc-param-primitives'
 import { RUNTIME_NAVIGATION_TARGETS } from '../runtime-navigation'
 import { WorkspaceLinkedItemSchema } from '../workspace-linked-item-schema'
+import { WorkspaceAttachmentsSchema } from '../workspace-attachment-schema'
+import { DiffCommentSchema, MobileDiffReviewSchema } from '../diff-comment-schema'
 import { TaskSourceContextSchema } from '../task-source-context-schema'
 import { isWorkspaceLinkedItemSourceContextMatch } from '../workspace-linked-item-source-context'
 
@@ -129,6 +131,9 @@ export const WorktreeSet = WorktreeSelector.extend({
   linkedAzureDevOpsPR: TriStateLinkedIssue,
   linkedGiteaPR: TriStateLinkedIssue,
   linkedWorkItem: WorkspaceLinkedItemSchema.nullable().optional(),
+  linkedItems: WorkspaceAttachmentsSchema.optional(),
+  linkedItemsBase: WorkspaceAttachmentsSchema.optional(),
+  linkedItemsSelectionChanged: z.boolean().optional(),
   linkedTaskSourceContext: TaskSourceContextSchema.nullable().optional(),
   isArchived: OptionalBoolean,
   isUnread: OptionalBoolean,
@@ -150,8 +155,9 @@ export const WorktreeSet = WorktreeSelector.extend({
     })
     .nullable()
     .optional(),
-  diffComments: z.array(z.unknown()).optional(),
-  mobileDiffReview: z.unknown().optional(),
+  // Older clients may send unsupported review shapes alongside unrelated metadata edits.
+  diffComments: z.array(DiffCommentSchema).optional().catch(undefined),
+  mobileDiffReview: MobileDiffReviewSchema.optional().catch(undefined),
   parentWorktree: OptionalString,
   noParent: OptionalBoolean
 }).superRefine((params, ctx) => {
diff --git a/src/shared/rpc-contract/worktree-review-metadata-compatibility.test.ts b/src/shared/rpc-contract/worktree-review-metadata-compatibility.test.ts
new file mode 100644
index 000000000000..740443f677a3
--- /dev/null
+++ b/src/shared/rpc-contract/worktree-review-metadata-compatibility.test.ts
@@ -0,0 +1,41 @@
+import { describe, expect, it } from 'vitest'
+import { WorktreeSet } from './worktree-params'
+
+describe('optional review metadata wire compatibility', () => {
+  it.each([
+    { diffComments: [{ id: 'legacy', body: 'older comment shape' }] },
+    { mobileDiffReview: { version: 0, files: [] } },
+    { mobileDiffReview: null }
+  ])('preserves other edits when older review metadata is unsupported: %j', (review) => {
+    const parsed = WorktreeSet.parse({ worktree: 'wt', comment: 'Keep this change', ...review })
+    expect(parsed.comment).toBe('Keep this change')
+    expect(parsed.diffComments).toBeUndefined()
+    expect(parsed.mobileDiffReview).toBeUndefined()
+  })
+
+  it('preserves supported review metadata and explicit empty clears', () => {
+    const diffComments = [
+      {
+        id: 'note',
+        worktreeId: 'wt',
+        filePath: 'app.ts',
+        lineNumber: 1,
+        body: 'Review this',
+        createdAt: 1,
+        side: 'modified'
+      }
+    ]
+    const mobileDiffReview = { version: 1, files: {} }
+    expect(WorktreeSet.parse({ worktree: 'wt', diffComments, mobileDiffReview })).toMatchObject({
+      diffComments,
+      mobileDiffReview
+    })
+    expect(WorktreeSet.parse({ worktree: 'wt', diffComments: [] }).diffComments).toEqual([])
+  })
+
+  it('continues rejecting malformed attachment writes rather than silently dropping them', () => {
+    expect(
+      WorktreeSet.safeParse({ worktree: 'wt', comment: 'Keep', linkedItems: [{}] }).success
+    ).toBe(false)
+  })
+})
diff --git a/src/shared/structured-agent-session-coalescer.test.ts b/src/shared/structured-agent-session-coalescer.test.ts
index 08dbf9ed1f98..5076e6023d14 100644
--- a/src/shared/structured-agent-session-coalescer.test.ts
+++ b/src/shared/structured-agent-session-coalescer.test.ts
@@ -115,10 +115,10 @@ describe('structured agent session event coalescer', () => {
     const events: AgentSessionSubscribeEvent[] = []
     const coalescer = createStructuredAgentSessionEventCoalescer((event) => events.push(event))
 
-    coalescer.push({ ...batch(1), queuedMessages: [], queuePause: { reason: 'cleared' } })
+    coalescer.push({ ...batch(1), queuedMessages: [], queuePause: { reason: 'stopped' } })
     coalescer.push(batch(2))
     coalescer.flush()
-    expect(events[0]).toMatchObject({ queuedMessages: [], queuePause: { reason: 'cleared' } })
+    expect(events[0]).toMatchObject({ queuedMessages: [], queuePause: { reason: 'stopped' } })
 
     coalescer.push({ ...batch(3), queuedMessages: [], queuePause: null })
     coalescer.push({ ...batch(4), queuedMessages: [], queuePause: { reason: 'stopped' } })
diff --git a/src/shared/structured-agent-session-dispatch-rejection.ts b/src/shared/structured-agent-session-dispatch-rejection.ts
index 0b48a32dee52..4aa598339d13 100644
--- a/src/shared/structured-agent-session-dispatch-rejection.ts
+++ b/src/shared/structured-agent-session-dispatch-rejection.ts
@@ -92,6 +92,8 @@ const KIND_CATEGORY = {
   managedAccountUnsupported: 'startFailed',
   launchFolderMissing: 'startFailed',
   historyInOtherAccount: 'startFailed',
+  claudeAccountFolderMissing: 'startFailed',
+  claudeAccountSetupFailed: 'startFailed',
   agentCommandNotRunnable: 'startFailed',
   restartFailed: 'startFailed',
   providerRejected: 'content',
@@ -120,6 +122,8 @@ const KIND_VERDICT = {
   managedAccountUnsupported: 'failure',
   launchFolderMissing: 'failure',
   historyInOtherAccount: 'failure',
+  claudeAccountFolderMissing: 'failure',
+  claudeAccountSetupFailed: 'failure',
   agentCommandNotRunnable: 'failure',
   restartFailed: 'failure',
   providerRejected: 'failure',
diff --git a/src/shared/structured-agent-session-draft-hand-off.test.ts b/src/shared/structured-agent-session-draft-hand-off.test.ts
index 1b42e1a93a1e..eddf27950833 100644
--- a/src/shared/structured-agent-session-draft-hand-off.test.ts
+++ b/src/shared/structured-agent-session-draft-hand-off.test.ts
@@ -3,31 +3,12 @@
 
 import { describe, expect, it } from 'vitest'
 import type { AgentJournalSubmission } from './agent-session-journal-types'
-import {
-  createStructuredAgentSessionOutboxEntry,
-  type StructuredAgentSessionOutboxEntry
-} from './structured-agent-session-outbox'
-import { reconcileStructuredAgentSessionOutboxWithQueue } from './structured-agent-session-draft-hand-off'
-import {
-  disposeStructuredAgentSessionSendResult,
-  journalAnswersInFlightSend
-} from './structured-agent-session-send-disposition'
-import { hasUnsentStructuredAgentSessionOutboxEntry } from './structured-agent-session-outbox-stop-withdrawal'
+import { handedOffQueuedMessageIds } from './structured-agent-session-draft-hand-off'
 
-const entry: StructuredAgentSessionOutboxEntry = {
-  ...createStructuredAgentSessionOutboxEntry({
-    clientMessageId: 'draft',
-    sessionId: 'session-1',
-    text: 'hello',
-    attachments: [],
-    queuedAt: 1
-  }),
-  sentDelivery: 'queue-if-active',
-  state: 'unconfirmed',
-  lastAttemptAt: 5
-}
-
-function handOff(dispatchState: AgentJournalSubmission['dispatchState']): AgentJournalSubmission {
+function handOff(
+  dispatchState: AgentJournalSubmission['dispatchState'],
+  queuedMessageId?: string
+): AgentJournalSubmission {
   return {
     clientMessageId: 'hand-off',
     fence: 1,
@@ -37,38 +18,20 @@ function handOff(dispatchState: AgentJournalSubmission['dispatchState']): AgentJ
     reason: dispatchState === 'rejected' ? 'refused' : null,
     submittedAt: 10,
     resolvedAt: null,
-    queuedMessageId: 'draft'
+    ...(queuedMessageId !== undefined ? { queuedMessageId } : {})
   }
 }
 
 describe('a queued draft handed off under a fresh submission id', () => {
-  it('takes the outbox entry off the client, in every dispatch state', () => {
+  it('is handed off in every dispatch state', () => {
     for (const state of ['pending', 'accepted', 'rejected', 'unknown'] as const) {
-      expect(reconcileStructuredAgentSessionOutboxWithQueue([entry], [handOff(state)], [])).toEqual(
-        []
-      )
+      expect(handedOffQueuedMessageIds([handOff(state, 'draft')])).toEqual(new Set(['draft']))
     }
   })
 
-  it('answers the send in flight and leaves nothing a Stop would withdraw', () => {
-    expect(journalAnswersInFlightSend([handOff('pending')], 'draft')).toBe(true)
-    expect(journalAnswersInFlightSend([handOff('pending')], null)).toBe(false)
-    expect(hasUnsentStructuredAgentSessionOutboxEntry([entry], [handOff('pending')])).toBe(false)
-  })
-
-  it('settles a replayed send answered with the hand-off, with no notice', () => {
-    const disposition = disposeStructuredAgentSessionSendResult({
-      entries: [entry],
-      entry,
-      createOperationId: () => 'rotated',
-      result: {
-        ok: true,
-        replayed: true,
-        fence: 1,
-        cursor: { epoch: 'epoch-1', sequence: 10 },
-        value: { clientMessageId: 'hand-off', submission: handOff('rejected') }
-      }
-    })
-    expect(disposition).toEqual({ entries: [], error: null })
+  it('is never matched by the submission id itself', () => {
+    const ids = handedOffQueuedMessageIds([handOff('pending', 'draft'), handOff('accepted')])
+    expect(ids.has('hand-off')).toBe(false)
+    expect([...ids]).toEqual(['draft'])
   })
 })
diff --git a/src/shared/structured-agent-session-draft-hand-off.ts b/src/shared/structured-agent-session-draft-hand-off.ts
index 4e756d331f75..2238d5a9db9d 100644
--- a/src/shared/structured-agent-session-draft-hand-off.ts
+++ b/src/shared/structured-agent-session-draft-hand-off.ts
@@ -2,12 +2,10 @@
 // under a fresh submission id, so this link, never a draft id compared with a `clientMessageId`,
 // is how a client knows the host has taken a message over.
 
-import type { AgentJournalRenderItem, AgentJournalSubmission } from './agent-session-journal-types'
-import type { StructuredAgentSessionOutboxEntry } from './structured-agent-session-outbox'
-import { reconcileStructuredAgentSessionOutbox } from './structured-agent-session-outbox-reconcile'
+import type { AgentJournalSubmission } from './agent-session-journal-types'
 
-/** Ids of the queued drafts the journal shows handed off, in any dispatch state. An outbox entry
- *  under one of these ids belongs to the host: its card or bubble carries the text from here. */
+/** Ids of the queued drafts the journal shows handed off, in any dispatch state: the host's card or
+ *  bubble carries their text from here. */
 export function handedOffQueuedMessageIds(
   submissions: readonly AgentJournalSubmission[]
 ): Set<string> {
@@ -19,22 +17,3 @@ export function handedOffQueuedMessageIds(
   }
   return ids
 }
-
-/**
- * `reconcileStructuredAgentSessionOutbox` with the queue's rule first: an entry the host handed off
- * as a queued draft belongs to the host, whatever that hand-off's state, so it leaves with no
- * restore and no Retry row. Every reading of the outbox against the journal goes through this.
- */
-export function reconcileStructuredAgentSessionOutboxWithQueue(
-  entries: readonly StructuredAgentSessionOutboxEntry[],
-  submissions: readonly AgentJournalSubmission[],
-  items: readonly AgentJournalRenderItem[]
-): readonly StructuredAgentSessionOutboxEntry[] {
-  const handedOff = handedOffQueuedMessageIds(submissions)
-  const ours = entries.filter((entry) => !handedOff.has(entry.clientMessageId))
-  return reconcileStructuredAgentSessionOutbox(
-    ours.length === entries.length ? entries : ours,
-    submissions,
-    items
-  )
-}
diff --git a/src/shared/structured-agent-session-latest-request.test.ts b/src/shared/structured-agent-session-latest-request.test.ts
index 6bb7f117bf80..6f73d8ecb820 100644
--- a/src/shared/structured-agent-session-latest-request.test.ts
+++ b/src/shared/structured-agent-session-latest-request.test.ts
@@ -319,3 +319,37 @@ describe('the sidebar verdict agrees with the rejection classifier', () => {
     }
   )
 })
+
+describe('the assistant line plain-text surfaces show', () => {
+  function message(
+    itemId: string,
+    sequence: number,
+    role: 'user' | 'assistant',
+    text: string
+  ): AgentJournalRenderItem {
+    return {
+      itemId,
+      revision: 0,
+      sequence,
+      observedAt: sequence,
+      body: { kind: 'message', role, blocks: [{ type: 'text', text }] }
+    }
+  }
+
+  it('keeps a visual line out of the preview every status reader shows', () => {
+    const items = [
+      message('ask', 1, 'user', 'chart it'),
+      message(
+        'said',
+        2,
+        'assistant',
+        'p95 is highest in ap-south.\n\n::orca-visual{file="latency.html" title="p95"}'
+      ),
+      message('only-visual', 3, 'assistant', '::orca-visual{file="table.html"}')
+    ]
+    // A reply that is nothing but a visual leaves the turn's earlier prose as the preview.
+    expect(projectStructuredAgentSessionStatusSummary(items).lastAssistantMessage).toBe(
+      'p95 is highest in ap-south.'
+    )
+  })
+})
diff --git a/src/shared/structured-agent-session-latest-request.ts b/src/shared/structured-agent-session-latest-request.ts
index 35856a21552d..be8bd69ddc47 100644
--- a/src/shared/structured-agent-session-latest-request.ts
+++ b/src/shared/structured-agent-session-latest-request.ts
@@ -18,6 +18,7 @@ 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 { withoutNativeChatVisualDirectiveLines } from './native-chat-visual-directive'
 import { isUnansweredStructuredAgentSessionDispatch } from './structured-agent-session-unanswered-dispatch'
 import {
   isStructuredAgentSessionCommandEntry,
@@ -38,6 +39,19 @@ export type StructuredAgentSessionLatestRequest = {
   settledAt: number | undefined
 }
 
+/** A root row that is no request of its own: a conversation command or a row its turn produced, or
+ *  a send its handover placed inside a running turn (a steer), which that turn answers for. */
+export function isStructuredAgentSessionNonRequestRow(
+  item: Pick<AgentJournalRenderItem, 'itemId' | 'body' | 'turnScope'>,
+  commandTurnItemIds: ReadonlySet<string>
+): boolean {
+  return (
+    commandTurnItemIds.has(item.itemId) ||
+    isStructuredAgentSessionCommandRow(item, commandTurnItemIds) ||
+    (item.body.kind === 'message' && item.body.role === 'user' && item.turnScope?.kind === 'turn')
+  )
+}
+
 /** 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). */
@@ -53,8 +67,7 @@ export function latestStructuredAgentSessionRequest(
     if (
       !item ||
       !isRootAgentJournalItem(item) ||
-      commandTurns.has(item.itemId) ||
-      isStructuredAgentSessionCommandEntry(item.body)
+      isStructuredAgentSessionNonRequestRow(item, commandTurns)
     ) {
       continue
     }
@@ -69,12 +82,7 @@ export function latestStructuredAgentSessionRequest(
       }
     }
     const submission = rejected.get(item.itemId)
-    if (
-      submission &&
-      classifyDispatchRejection(submission).verdict === 'failure' &&
-      // Handed into a running turn (a steer): that turn answers for it.
-      item.turnScope?.kind !== 'turn'
-    ) {
+    if (submission && classifyDispatchRejection(submission).verdict === 'failure') {
       return {
         kind: 'refused-send',
         id: item.itemId,
@@ -187,7 +195,8 @@ export function latestStructuredAgentSessionAssistantMessage(
       return ''
     }
     if (body?.kind === 'message' && body.role === 'assistant') {
-      const prose = messageProse(body.blocks)
+      // A visual line shows only in the transcript; every plain-text reader of this line drops it.
+      const prose = withoutNativeChatVisualDirectiveLines(messageProse(body.blocks))
       if (prose.trim()) {
         return prose
       }
diff --git a/src/shared/structured-agent-session-message-projection.test.ts b/src/shared/structured-agent-session-message-projection.test.ts
index c0829aa02b63..ee292e14fdc1 100644
--- a/src/shared/structured-agent-session-message-projection.test.ts
+++ b/src/shared/structured-agent-session-message-projection.test.ts
@@ -4,7 +4,7 @@
 import { describe, expect, it } from 'vitest'
 import type { AgentJournalRenderItem, AgentJournalSubmission } from './agent-session-journal-types'
 import { agentJournalSubmissionKey } from './agent-session-journal-item-key'
-import { createStructuredAgentSessionOutboxEntry } from './structured-agent-session-outbox'
+import { structuredAgentSessionSendBody } from './structured-agent-session-send-mutation'
 import { projectStructuredAgentSessionMessages } from './structured-agent-session-message-projection'
 
 const KEPT_ID = 'client-kept'
@@ -36,16 +36,11 @@ function userItem(id: string, text: string, sequence: number): AgentJournalRende
   }
 }
 
-/** The sending desktop's own copy, still marked not sent. */
+/** The sending desktop's own bubble, had it not settled yet. */
 const lingeringCopy = {
-  ...createStructuredAgentSessionOutboxEntry({
-    clientMessageId: KEPT_ID,
-    sessionId: 'session-1',
-    text: 'the kept words',
-    attachments: [],
-    queuedAt: 1
-  }),
-  state: 'rejected' as const
+  clientMessageId: KEPT_ID,
+  body: structuredAgentSessionSendBody('the kept words', []),
+  queuedAt: 1
 }
 
 describe('a send kept as a card', () => {
@@ -55,7 +50,7 @@ describe('a send kept as a card', () => {
     expect(projectStructuredAgentSessionMessages(items, [lingeringCopy], [kept], DESKTOP)).toEqual(
       []
     )
-    // A rejection with no card keeps its local copy, marked not sent.
+    // A rejection with no card is drawn from the host's row, marked not sent.
     expect(
       projectStructuredAgentSessionMessages(items, [lingeringCopy], [rejected()], DESKTOP)
     ).toEqual([expect.objectContaining({ id: agentJournalSubmissionKey(KEPT_ID), unsent: true })])
diff --git a/src/shared/structured-agent-session-message-projection.ts b/src/shared/structured-agent-session-message-projection.ts
index 7591a4332c74..041d18e57110 100644
--- a/src/shared/structured-agent-session-message-projection.ts
+++ b/src/shared/structured-agent-session-message-projection.ts
@@ -1,4 +1,8 @@
-import type { AgentJournalRenderItem, AgentJournalSubmission } from './agent-session-journal-types'
+import type {
+  AgentJournalMessageItem,
+  AgentJournalRenderItem,
+  AgentJournalSubmission
+} from './agent-session-journal-types'
 import { agentJournalSubmissionKey } from './agent-session-journal-item-key'
 import { isQueuedAgentJournalSubmission } from './agent-session-queued-submission'
 import { collapseProviderRetryRuns } from './native-chat-provider-retry-runs'
@@ -10,12 +14,17 @@ import {
 import { compareNativeChatTranscriptMessages } from './native-chat-transcript-projection'
 import type { NativeChatMessage } from './native-chat-types'
 import { dispatchWasWithdrawn } from './structured-agent-session-dispatch-rejection'
-import type { StructuredAgentSessionOutboxEntry } from './structured-agent-session-outbox'
-import { structuredAgentSessionEntryHeldForRetry } from './structured-agent-session-outbox-admission'
-import { reconcileStructuredAgentSessionOutboxWithQueue } from './structured-agent-session-draft-hand-off'
-import { awaitsStructuredAgentSessionRetry } from './structured-agent-session-outbox-stop-withdrawal'
 import { projectStructuredItemsToNativeChat } from './structured-agent-session-projection'
 
+/** A message this client sent that the host has not drawn yet: its bubble until the row lands. */
+export type StructuredAgentSessionOptimisticMessage = {
+  clientMessageId: string
+  body: AgentJournalMessageItem
+  queuedAt: number
+  /** Sent while the chat read Stopping: drawn after the turn being stopped. */
+  sentWhileStopping?: true
+}
+
 export type StructuredAgentSessionMessageProjectionOptions = {
   /** Draw a message the host accepted and then rejected where the host recorded it, as not sent.
    *  Off for a client that hands such a message back to its composer instead. */
@@ -84,12 +93,11 @@ export function structuredAgentSessionRejectedShownInPlace(
 
 export function projectStructuredAgentSessionMessages(
   items: readonly AgentJournalRenderItem[],
-  outbox: readonly StructuredAgentSessionOutboxEntry[],
+  optimistic: readonly StructuredAgentSessionOptimisticMessage[],
   submissions: readonly AgentJournalSubmission[],
   options: StructuredAgentSessionMessageProjectionOptions,
   projectItems = projectStructuredItemsToNativeChat
 ): NativeChatMessage[] {
-  const optimistic = reconcileStructuredAgentSessionOutboxWithQueue(outbox, submissions, items)
   // A send a Stop took back before the agent started it stays where it was sent, as the
   // conversation's own history. A queued card's hand-off is left out: the card holds its text.
   const stoppedBeforeStart = new Map(
@@ -168,22 +176,22 @@ export function projectStructuredAgentSessionMessages(
       ? withStopRowsAfterStoppedSends(conversation, shownStopped)
       : conversation),
     ...held,
-    // In no turn, like the outbox's not-sent rows; the journal position keeps their place.
+    // In no turn; the journal position keeps their place.
     ...projectItems(unsentItems).map((message) => ({ ...message, unsent: true as const })),
+    // The host's row draws a message once it has one, under its own id or the provider's.
     ...optimistic
-      .filter((entry) => !journalled.has(agentJournalSubmissionKey(entry.clientMessageId)))
+      .filter(
+        (entry) =>
+          !journalled.has(agentJournalSubmissionKey(entry.clientMessageId)) &&
+          !submissions.some((submission) => submission.clientMessageId === entry.clientMessageId)
+      )
       .map((entry): NativeChatMessage => ({
         id: agentJournalSubmissionKey(entry.clientMessageId),
         role: 'user',
         source: 'transcript',
         timestamp: entry.queuedAt,
         blocks: entry.body.blocks,
-        ...(entry.state === 'rejected' || structuredAgentSessionEntryHeldForRetry(entry)
-          ? { unsent: true as const }
-          : entry.sentWhileStopping
-            ? { sentWhileStopping: true as const }
-            : {}),
-        ...(awaitsStructuredAgentSessionRetry(entry) ? { awaitsRetry: true as const } : {})
+        ...(entry.sentWhileStopping ? { sentWhileStopping: true as const } : {})
       }))
   ]
 }
diff --git a/src/shared/structured-agent-session-outbox-admission.ts b/src/shared/structured-agent-session-outbox-admission.ts
deleted file mode 100644
index 3d7e95889342..000000000000
--- a/src/shared/structured-agent-session-outbox-admission.ts
+++ /dev/null
@@ -1,45 +0,0 @@
-// Which outbox entry goes out next, and which ones wait for the user.
-
-import type { StructuredAgentSessionOutboxEntry } from './structured-agent-session-outbox'
-
-/** A send the user was told did not go through, with a Retry: only that Retry sends it again. Read
- *  from the saved failure, so a relaunch holds it exactly as the refusal did. */
-export function structuredAgentSessionEntryHeldForRetry(
-  entry: StructuredAgentSessionOutboxEntry
-): boolean {
-  return entry.state === 'queued' && entry.lastFailure !== undefined
-}
-
-export type StructuredAgentSessionOutboxAdmission =
-  | { state: 'dispatch'; entry: StructuredAgentSessionOutboxEntry }
-  | { state: 'blocked'; entry: StructuredAgentSessionOutboxEntry }
-  | { state: 'idle'; entry: null }
-
-/**
- * What the queue does next. The drain and the Retry affordance both read it, so neither can
- * disagree with the other about which entry is holding the queue.
- *
- * A `dispatching` entry is not a barrier: the host appended its journal row inside the
- * per-session serialize chain before dispatching, so nothing behind it can overtake it, and
- * waiting for its echo costs delivery of everything queued behind it. An `unconfirmed` entry
- * is a barrier — sending past it would reorder around a message that may yet land. One the
- * user was told did not go through is not: it lands only by its own Retry, so what the user
- * sends after it goes out as they send it.
- */
-export function admitStructuredAgentSessionOutboxEntry(
-  entries: readonly StructuredAgentSessionOutboxEntry[]
-): StructuredAgentSessionOutboxAdmission {
-  for (const entry of entries) {
-    if (entry.state === 'rejected' || structuredAgentSessionEntryHeldForRetry(entry)) {
-      continue
-    }
-    if (entry.state === 'unconfirmed') {
-      return { state: 'blocked', entry }
-    }
-    // A queue send a Stop outlived goes again only on the user's Retry.
-    if (entry.state === 'queued') {
-      return { state: entry.outlivedStop === true ? 'blocked' : 'dispatch', entry }
-    }
-  }
-  return { state: 'idle', entry: null }
-}
diff --git a/src/shared/structured-agent-session-outbox-delivery.test.ts b/src/shared/structured-agent-session-outbox-delivery.test.ts
deleted file mode 100644
index bca184044700..000000000000
--- a/src/shared/structured-agent-session-outbox-delivery.test.ts
+++ /dev/null
@@ -1,91 +0,0 @@
-// The entry keeps only what its first attempt sent; each request decides the wire field from that
-// and the host's capability. Nothing ever waits on the capability.
-
-import { describe, expect, it } from 'vitest'
-import {
-  createStructuredAgentSessionOutboxEntry,
-  parseStructuredAgentSessionOutboxEntry,
-  type StructuredAgentSessionOutboxEntry
-} from './structured-agent-session-outbox'
-import {
-  structuredAgentSessionEntryAttempt,
-  type StructuredAgentSessionQueueCapability
-} from './structured-agent-session-outbox-delivery'
-
-function entry(overrides: Partial<StructuredAgentSessionOutboxEntry> = {}) {
-  return {
-    ...createStructuredAgentSessionOutboxEntry({
-      clientMessageId: 'op-1',
-      sessionId: 'session-1',
-      text: 'hello',
-      attachments: [],
-      queuedAt: 1
-    }),
-    ...overrides
-  }
-}
-
-function host(capability: StructuredAgentSessionQueueCapability, enabled = true) {
-  return { capability, enabled }
-}
-
-describe('a first attempt', () => {
-  it('asks to queue only of a host known to queue, with the setting on, for plain text', () => {
-    const queued = structuredAgentSessionEntryAttempt(entry(), host('supported'))
-    expect(queued.wire.sentDelivery).toBe('queue-if-active')
-    expect(queued.stored.sentDelivery).toBe('queue-if-active')
-    for (const off of [host('unknown'), host('unsupported'), host('supported', false)]) {
-      const plain = structuredAgentSessionEntryAttempt(entry(), off)
-      expect(plain.wire.sentDelivery).toBeNull()
-      expect(plain.stored.sentDelivery).toBeNull()
-    }
-    const image = {
-      ...entry(),
-      body: {
-        kind: 'message' as const,
-        role: 'user' as const,
-        blocks: [{ type: 'image-ref' as const, path: '/tmp/a.png' }]
-      }
-    }
-    expect(
-      structuredAgentSessionEntryAttempt(image, host('supported')).wire.sentDelivery
-    ).toBeNull()
-    const launch = entry({ source: 'launch' })
-    expect(
-      structuredAgentSessionEntryAttempt(launch, host('supported')).wire.sentDelivery
-    ).toBeNull()
-  })
-})
-
-describe('a replay of an attempted id', () => {
-  const sentQueued = entry({ lastAttemptAt: 5, sentDelivery: 'queue-if-active' })
-  const sentPlain = entry({ lastAttemptAt: 5, sentDelivery: null })
-
-  it('sends exactly what it first sent, whatever the capability reads or the setting says', () => {
-    for (const current of [host('unknown'), host('supported', false), host('supported')]) {
-      expect(structuredAgentSessionEntryAttempt(sentQueued, current).wire.sentDelivery).toBe(
-        'queue-if-active'
-      )
-      expect(structuredAgentSessionEntryAttempt(sentPlain, current).wire.sentDelivery).toBeNull()
-      expect(structuredAgentSessionEntryAttempt(sentQueued, current).stored).toBe(sentQueued)
-    }
-  })
-
-  it('drops the field for a host known not to read it, and keeps what was sent', () => {
-    const attempt = structuredAgentSessionEntryAttempt(sentQueued, host('unsupported'))
-    expect(attempt.wire.sentDelivery).toBeNull()
-    expect(attempt.wire.clientMessageId).toBe('op-1')
-    expect(attempt.stored).toBe(sentQueued)
-  })
-
-  it('stores no intent: a stale `delivery` key is dropped on read, and a main entry sends plain', () => {
-    const read = parseStructuredAgentSessionOutboxEntry(
-      { ...entry({ lastAttemptAt: 5 }), delivery: 'queue-if-active' },
-      'session-1'
-    )
-    expect(read !== null && 'delivery' in read).toBe(false)
-    expect(
-      read && structuredAgentSessionEntryAttempt(read, host('supported')).wire.sentDelivery
-    ).toBe(null)
-  })
-})
diff --git a/src/shared/structured-agent-session-outbox-delivery.ts b/src/shared/structured-agent-session-outbox-delivery.ts
deleted file mode 100644
index 067cf2e729ee..000000000000
--- a/src/shared/structured-agent-session-outbox-delivery.ts
+++ /dev/null
@@ -1,73 +0,0 @@
-// Whether an outbox send asks the host to hold it as a draft (`delivery: 'queue-if-active'`).
-//
-// The one stored fact is `sentDelivery`, what the first attempt put on the wire. An attempted id
-// replays it, for fingerprint parity with what the host may have recorded; a never-attempted one
-// decides at attempt time. Nothing here ever holds a send: an unknown capability sends plain, as a
-// host without queueing always has.
-
-import type { StructuredAgentSessionOutboxEntry } from './structured-agent-session-outbox'
-
-/** What the connected host says about queued messages; `unknown` until it has answered, and after
- *  a failed probe. */
-export type StructuredAgentSessionQueueCapability = 'unknown' | 'supported' | 'unsupported'
-
-/** `enabled` is the user's setting. */
-export type StructuredAgentSessionQueueDelivery = {
-  capability: StructuredAgentSessionQueueCapability
-  enabled: boolean
-}
-
-/** Whether a send made now asks to be queued: a host known to queue, with queueing enabled. */
-export function structuredAgentSessionNewSendsQueue(
-  host: StructuredAgentSessionQueueDelivery
-): boolean {
-  return host.capability === 'supported' && host.enabled
-}
-
-/** Whether this entry's next request asks to be queued. An attempted id asks exactly what it sent,
- *  except of a host known not to queue, which rejects the field before its operation ledger, so
- *  nothing there was recorded with it. A first attempt asks only of a host known to queue, with
- *  the setting on, for plain text that is not a launch prompt. */
-export function structuredAgentSessionEntryAsksToQueue(
-  entry: StructuredAgentSessionOutboxEntry,
-  host: StructuredAgentSessionQueueDelivery
-): boolean {
-  if (entry.lastAttemptAt !== null) {
-    return entry.sentDelivery === 'queue-if-active' && host.capability !== 'unsupported'
-  }
-  return (
-    structuredAgentSessionNewSendsQueue(host) &&
-    entry.source !== 'launch' &&
-    entry.body.blocks.every((block) => block.type === 'text')
-  )
-}
-
-/** The next attempt: `stored` is what the entry keeps (a first attempt records what it sent; the
- *  capability never rewrites that), `wire` the request's own copy, carrying what it sends. */
-export function structuredAgentSessionEntryAttempt(
-  entry: StructuredAgentSessionOutboxEntry,
-  host: StructuredAgentSessionQueueDelivery
-): { stored: StructuredAgentSessionOutboxEntry; wire: StructuredAgentSessionOutboxEntry } {
-  const sentDelivery: StructuredAgentSessionOutboxEntry['sentDelivery'] =
-    structuredAgentSessionEntryAsksToQueue(entry, host) ? 'queue-if-active' : null
-  const stored = entry.lastAttemptAt !== null ? entry : { ...entry, sentDelivery }
-  return {
-    stored,
-    wire: stored.sentDelivery === sentDelivery ? stored : { ...stored, sentDelivery }
-  }
-}
-
-/** The queue fields a stored entry carries, read back from storage. */
-export function parseStructuredAgentSessionOutboxQueueFields(entry: {
-  sentDelivery?: unknown
-  outlivedStop?: unknown
-  sentWhileStopping?: unknown
-}): Pick<StructuredAgentSessionOutboxEntry, 'sentDelivery' | 'outlivedStop' | 'sentWhileStopping'> {
-  return {
-    ...(entry.sentDelivery === 'queue-if-active' || entry.sentDelivery === null
-      ? { sentDelivery: entry.sentDelivery }
-      : {}),
-    ...(entry.outlivedStop === true ? { outlivedStop: true as const } : {}),
-    ...(entry.sentWhileStopping === true ? { sentWhileStopping: true as const } : {})
-  }
-}
diff --git a/src/shared/structured-agent-session-outbox-reconcile.test.ts b/src/shared/structured-agent-session-outbox-reconcile.test.ts
deleted file mode 100644
index 64417e6c3dbe..000000000000
--- a/src/shared/structured-agent-session-outbox-reconcile.test.ts
+++ /dev/null
@@ -1,109 +0,0 @@
-// The reconcile runs on every journal batch, so reading an unchanged journal again must change
-// nothing: the same entries, and the same list.
-
-import { expect, it } from 'vitest'
-import { agentJournalSubmissionKey } from './agent-session-journal-item-key'
-import type {
-  AgentJournalDispatchState,
-  AgentJournalRenderItem,
-  AgentJournalSubmission
-} from './agent-session-journal-types'
-import {
-  createStructuredAgentSessionOutboxEntry,
-  type StructuredAgentSessionOutboxEntry
-} from './structured-agent-session-outbox'
-import { reconcileStructuredAgentSessionOutbox } from './structured-agent-session-outbox-reconcile'
-
-function entry(
-  id: string,
-  patch: Partial<StructuredAgentSessionOutboxEntry> = {}
-): StructuredAgentSessionOutboxEntry {
-  return {
-    ...createStructuredAgentSessionOutboxEntry({
-      clientMessageId: id,
-      sessionId: 'session-1',
-      text: id,
-      attachments: [],
-      queuedAt: 1
-    }),
-    ...patch
-  }
-}
-
-function submission(id: string, dispatchState: AgentJournalDispatchState): AgentJournalSubmission {
-  return {
-    clientMessageId: id,
-    fence: 1,
-    payloadFingerprint: id,
-    dispatchState,
-    providerItemId: null,
-    reason: dispatchState === 'unknown' ? 'in doubt' : null,
-    ...(dispatchState === 'rejected' ? { rejection: { kind: 'hostRestarted' } } : {}),
-    submittedAt: 5,
-    resolvedAt: dispatchState === 'pending' ? null : 6
-  }
-}
-
-function row(id: string): AgentJournalRenderItem {
-  return {
-    itemId: agentJournalSubmissionKey(id),
-    revision: 1,
-    sequence: 1,
-    observedAt: 1,
-    body: { kind: 'message', role: 'user', blocks: [{ type: 'text', text: id }] }
-  }
-}
-
-it('returns every kept entry, and the list, as themselves when read again', () => {
-  const entries = [
-    entry('queued'),
-    entry('landing', { state: 'unconfirmed', lastFailure: { kind: 'failed' } }),
-    entry('sending', { state: 'dispatching' }),
-    entry('doubt', { state: 'dispatching', lastFailure: { kind: 'failed' } }),
-    entry('rejected-unloaded', { state: 'dispatching' }),
-    entry('rejected-loaded', { state: 'dispatching' }),
-    entry('delivered', { state: 'dispatching' }),
-    entry('refused', {
-      state: 'rejected',
-      lastFailure: { kind: 'refused', code: 'agent_session_operation_invalid' }
-    })
-  ]
-  const submissions = [
-    submission('landing', 'pending'),
-    submission('sending', 'pending'),
-    submission('doubt', 'unknown'),
-    submission('rejected-unloaded', 'rejected'),
-    submission('rejected-loaded', 'rejected'),
-    submission('delivered', 'accepted')
-  ]
-  const items = [row('rejected-loaded')]
-
-  const first = reconcileStructuredAgentSessionOutbox(entries, submissions, items)
-  expect(first.map((kept) => [kept.clientMessageId, kept.state])).toEqual([
-    ['queued', 'queued'],
-    ['landing', 'dispatching'],
-    ['sending', 'dispatching'],
-    ['doubt', 'unconfirmed'],
-    ['rejected-unloaded', 'rejected'],
-    ['refused', 'rejected']
-  ])
-  const second = reconcileStructuredAgentSessionOutbox(first, submissions, items)
-  expect(second).toBe(first)
-  second.forEach((kept, index) => expect(kept).toBe(first[index]))
-})
-
-it('returns the list it was given when nothing changes', () => {
-  const entries = [entry('queued'), entry('doubt', { state: 'unconfirmed' })]
-  expect(reconcileStructuredAgentSessionOutbox(entries, [submission('doubt', 'unknown')], [])).toBe(
-    entries
-  )
-})
-
-// The card carries the text from here; the copy would draw a "Not sent" row the transcript hides.
-it('drops the copy of a send the host kept as a card, with its row not yet loaded', () => {
-  const kept = { ...submission('kept', 'rejected'), keptAsQueuedMessageId: 'kept' }
-  expect(reconcileStructuredAgentSessionOutbox([entry('kept')], [kept], [])).toEqual([])
-  expect(
-    reconcileStructuredAgentSessionOutbox([entry('kept')], [submission('kept', 'rejected')], [])
-  ).toEqual([expect.objectContaining({ clientMessageId: 'kept', state: 'rejected' })])
-})
diff --git a/src/shared/structured-agent-session-outbox-reconcile.ts b/src/shared/structured-agent-session-outbox-reconcile.ts
deleted file mode 100644
index 30357ac1d06c..000000000000
--- a/src/shared/structured-agent-session-outbox-reconcile.ts
+++ /dev/null
@@ -1,75 +0,0 @@
-// How the journal's view of each submission settles the outbox: the sibling of
-// `disposeStructuredAgentSessionSendResult`, which folds a single send's answer.
-
-import { agentJournalSubmissionKey } from './agent-session-journal-item-key'
-import type { AgentJournalRenderItem, AgentJournalSubmission } from './agent-session-journal-types'
-import { dispatchWasWithdrawn } from './structured-agent-session-dispatch-rejection'
-import {
-  structuredAgentSessionEntryRejectedByHost,
-  structuredAgentSessionRejectedFailure,
-  type StructuredAgentSessionOutboxEntry
-} from './structured-agent-session-outbox'
-
-export function reconcileStructuredAgentSessionOutbox(
-  entries: readonly StructuredAgentSessionOutboxEntry[],
-  submissions: readonly AgentJournalSubmission[],
-  /** The loaded journal rows: a rejected message leaves only once the row that draws it is here. */
-  items: readonly AgentJournalRenderItem[]
-): readonly StructuredAgentSessionOutboxEntry[] {
-  const settled = new Map(submissions.map((entry) => [entry.clientMessageId, entry]))
-  let loaded: Set<string> | undefined
-  // An entry whose reconciled value is unchanged is returned as itself, and so is the list when
-  // none changed: a caller re-reading every journal batch writes nothing then.
-  const next = entries.flatMap((entry) => {
-    const submission = settled.get(entry.clientMessageId)
-    // Settled by the host: its history shows one delivered, and one a Stop took back in place.
-    if (submission?.dispatchState === 'accepted' || dispatchWasWithdrawn(submission)) {
-      return []
-    }
-    // The host kept it as a card, which carries the text from here, edited or deleted included.
-    if (
-      submission?.dispatchState === 'rejected' &&
-      submission.keptAsQueuedMessageId !== undefined
-    ) {
-      return []
-    }
-    if (submission?.dispatchState === 'rejected') {
-      // Its row draws it once loaded; until then the entry does, as the host recorded it. An older
-      // host leaves that row where it was sent, which may be outside the loaded window.
-      loaded ??= new Set(items.map((item) => item.itemId))
-      if (loaded.has(agentJournalSubmissionKey(entry.clientMessageId))) {
-        return []
-      }
-      const lastFailure = structuredAgentSessionRejectedFailure(submission)
-      return [
-        structuredAgentSessionEntryRejectedByHost(entry)
-          ? entry
-          : { ...entry, state: 'rejected' as const, lastFailure }
-      ]
-    }
-    if (submission?.dispatchState === 'pending') {
-      if (entry.state === 'dispatching') {
-        return [entry]
-      }
-      // The host has it, so no failure of an earlier attempt describes it now.
-      const { lastFailure: _landed, ...landed } = entry
-      return [{ ...landed, state: 'dispatching' as const }]
-    }
-    if (
-      submission?.dispatchState === 'unknown' &&
-      entry.retryAfterUnknownSubmittedAt !== -1 &&
-      entry.retryAfterUnknownSubmittedAt !== submission.submittedAt
-    ) {
-      // In doubt now, not failed: the probe's resend decides it, as for any unconfirmed send.
-      if (entry.state === 'unconfirmed' && entry.lastFailure === undefined) {
-        return [entry]
-      }
-      const { lastFailure: _superseded, ...inDoubt } = entry
-      return [{ ...inDoubt, state: 'unconfirmed' as const }]
-    }
-    return [entry]
-  })
-  return next.length === entries.length && next.every((entry, index) => entry === entries[index])
-    ? entries
-    : next
-}
diff --git a/src/shared/structured-agent-session-outbox-retry-hold.test.ts b/src/shared/structured-agent-session-outbox-retry-hold.test.ts
deleted file mode 100644
index cd2bb570b57a..000000000000
--- a/src/shared/structured-agent-session-outbox-retry-hold.test.ts
+++ /dev/null
@@ -1,105 +0,0 @@
-import { describe, expect, it } from 'vitest'
-import type { AgentJournalSubmission } from './agent-session-journal-types'
-import {
-  createStructuredAgentSessionOutboxEntry,
-  type StructuredAgentSessionOutboxEntry
-} from './structured-agent-session-outbox'
-import { reconcileStructuredAgentSessionOutbox } from './structured-agent-session-outbox-reconcile'
-import {
-  admitStructuredAgentSessionOutboxEntry,
-  structuredAgentSessionEntryHeldForRetry
-} from './structured-agent-session-outbox-admission'
-
-function entry(
-  clientMessageId: string,
-  patch: Partial<StructuredAgentSessionOutboxEntry> = {}
-): StructuredAgentSessionOutboxEntry {
-  return {
-    ...createStructuredAgentSessionOutboxEntry({
-      clientMessageId,
-      sessionId: 'session-1',
-      text: clientMessageId,
-      attachments: [],
-      queuedAt: 1
-    }),
-    ...patch
-  }
-}
-
-const REFUSED = { kind: 'refused', code: 'agent_session_journal_unreadable' } as const
-
-describe('a message held for its Retry', () => {
-  it('is one the user was told did not go through, and still queued', () => {
-    expect(structuredAgentSessionEntryHeldForRetry(entry('a', { lastFailure: REFUSED }))).toBe(true)
-    expect(
-      structuredAgentSessionEntryHeldForRetry(entry('a', { lastFailure: { kind: 'failed' } }))
-    ).toBe(true)
-    expect(structuredAgentSessionEntryHeldForRetry(entry('a'))).toBe(false)
-    expect(
-      structuredAgentSessionEntryHeldForRetry(
-        entry('a', { state: 'rejected', lastFailure: { kind: 'rejected', reason: null } })
-      )
-    ).toBe(false)
-  })
-
-  it('is passed over by the drain, which still stops on a message in doubt', () => {
-    const held = entry('held', { lastFailure: REFUSED })
-    expect(admitStructuredAgentSessionOutboxEntry([held])).toEqual({ state: 'idle', entry: null })
-    expect(admitStructuredAgentSessionOutboxEntry([held, entry('next')])).toMatchObject({
-      state: 'dispatch',
-      entry: { clientMessageId: 'next' }
-    })
-    expect(
-      admitStructuredAgentSessionOutboxEntry([
-        held,
-        entry('doubt', { state: 'unconfirmed' }),
-        entry('next')
-      ])
-    ).toMatchObject({ state: 'blocked', entry: { clientMessageId: 'doubt' } })
-  })
-
-  it('is released once the host shows it has the message after all', () => {
-    const submission: AgentJournalSubmission = {
-      clientMessageId: 'held',
-      fence: 1,
-      payloadFingerprint: 'fingerprint',
-      dispatchState: 'pending',
-      providerItemId: null,
-      reason: null,
-      submittedAt: 1,
-      resolvedAt: null
-    }
-    const [landed] = reconcileStructuredAgentSessionOutbox(
-      [entry('held', { lastFailure: REFUSED })],
-      [submission],
-      []
-    )
-    expect(landed?.state).toBe('dispatching')
-    expect(landed?.lastFailure).toBeUndefined()
-  })
-
-  // Any fresh word on where a message stands supersedes an earlier attempt's failure.
-  it('is in doubt, and holds the queue, once the host says it cannot tell whether it landed', () => {
-    const submission: AgentJournalSubmission = {
-      clientMessageId: 'held',
-      fence: 1,
-      payloadFingerprint: 'fingerprint',
-      dispatchState: 'unknown',
-      providerItemId: null,
-      reason: null,
-      submittedAt: 5,
-      resolvedAt: null
-    }
-    const reconciled = reconcileStructuredAgentSessionOutbox(
-      [entry('held', { lastAttemptAt: 2, lastFailure: REFUSED }), entry('next')],
-      [submission],
-      []
-    )
-    expect(reconciled[0]).toMatchObject({ state: 'unconfirmed' })
-    expect(reconciled[0]?.lastFailure).toBeUndefined()
-    expect(admitStructuredAgentSessionOutboxEntry(reconciled)).toMatchObject({
-      state: 'blocked',
-      entry: { clientMessageId: 'held' }
-    })
-  })
-})
diff --git a/src/shared/structured-agent-session-outbox-stop-withdrawal.ts b/src/shared/structured-agent-session-outbox-stop-withdrawal.ts
deleted file mode 100644
index 1e900563fb62..000000000000
--- a/src/shared/structured-agent-session-outbox-stop-withdrawal.ts
+++ /dev/null
@@ -1,83 +0,0 @@
-import type { AgentJournalSubmission } from './agent-session-journal-types'
-import type { StructuredAgentSessionOutboxEntry } from './structured-agent-session-outbox'
-import { structuredAgentSessionEntryHeldForRetry } from './structured-agent-session-outbox-admission'
-import { handedOffQueuedMessageIds } from './structured-agent-session-draft-hand-off'
-
-/** Whether only the user's Retry sends this entry again: a rejected one, one whose send failed or
- *  was refused, one a Stop outlived, or one in doubt the unconfirmed probe leaves alone.
- *  `NativeChatDeliveryRetry` offers it. */
-export function awaitsStructuredAgentSessionRetry(
-  entry: StructuredAgentSessionOutboxEntry
-): boolean {
-  return (
-    entry.state === 'rejected' ||
-    structuredAgentSessionEntryHeldForRetry(entry) ||
-    entry.outlivedStop === true ||
-    (entry.state === 'unconfirmed' && entry.retryAfterUnknownSubmittedAt !== null)
-  )
-}
-
-function unsentStructuredAgentSessionOutboxEntry(
-  submissions: readonly AgentJournalSubmission[]
-): (entry: StructuredAgentSessionOutboxEntry) => boolean {
-  const held = handedOffQueuedMessageIds(submissions)
-  for (const submission of submissions) {
-    held.add(submission.clientMessageId)
-  }
-  return (entry) => !held.has(entry.clientMessageId) && !awaitsStructuredAgentSessionRetry(entry)
-}
-
-/** A queue send that has gone out at least once and was not refused, in whatever state it now
- *  waits: the host may hold it as a paused draft, so a local restore too would put the same text
- *  in two places. Read from what went on the wire (`sentDelivery`). */
-function attemptedQueueSend(entry: StructuredAgentSessionOutboxEntry): boolean {
-  return (
-    entry.sentDelivery === 'queue-if-active' &&
-    entry.lastAttemptAt !== null &&
-    entry.state !== 'rejected'
-  )
-}
-
-/** An attempted queue send a Stop keeps is marked, and its state is left to its answer: nothing
- *  but the user's Retry sends it again (the drain holds a marked `queued` entry, and the probe
- *  skips the mark), since a resend onto the session the user just stopped would start a turn if
- *  the host never got it. */
-function markedOutlivingStop(
-  entry: StructuredAgentSessionOutboxEntry
-): StructuredAgentSessionOutboxEntry {
-  return attemptedQueueSend(entry) && entry.outlivedStop !== true
-    ? { ...entry, outlivedStop: true }
-    : entry
-}
-
-/**
- * What a Stop leaves in the outbox: nothing the journal does not already hold may go out after it,
- * so every such entry leaves it, as any send a Stop withdraws does. 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, and so does an issued queue send
- * that has gone out (a queued receipt or hand-off retires it against the published card), and it
- * waits for the user's Retry from then on.
- */
-export function withdrawUnsentStructuredAgentSessionOutboxEntries(
-  entries: readonly StructuredAgentSessionOutboxEntry[],
-  submissions: readonly AgentJournalSubmission[],
-  inFlightClientMessageId: string | null
-): StructuredAgentSessionOutboxEntry[] {
-  const unsent = unsentStructuredAgentSessionOutboxEntry(submissions)
-  return entries
-    .filter(
-      (entry) =>
-        entry.clientMessageId === inFlightClientMessageId ||
-        !unsent(entry) ||
-        attemptedQueueSend(entry)
-    )
-    .map(markedOutlivingStop)
-}
-
-/** 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[]
-): boolean {
-  return entries.some(unsentStructuredAgentSessionOutboxEntry(submissions))
-}
diff --git a/src/shared/structured-agent-session-outbox-unconfirmed-resend.ts b/src/shared/structured-agent-session-outbox-unconfirmed-resend.ts
deleted file mode 100644
index ee65fed72878..000000000000
--- a/src/shared/structured-agent-session-outbox-unconfirmed-resend.ts
+++ /dev/null
@@ -1,18 +0,0 @@
-// Which send in doubt Orca resends on its own under the same id, without the user's Retry.
-
-import type { AgentJournalSubmission } from './agent-session-journal-types'
-import type { StructuredAgentSessionOutboxEntry } from './structured-agent-session-outbox'
-
-/** Whether the unconfirmed probe resends this entry: in doubt, never retried by the user, not
- *  outlived by a Stop, and with no journal row yet. Any row ends it: the journal answers from there. */
-export function structuredAgentSessionEntryResendsUnconfirmed(
-  entry: StructuredAgentSessionOutboxEntry,
-  submissions: readonly AgentJournalSubmission[]
-): boolean {
-  return (
-    entry.state === 'unconfirmed' &&
-    entry.retryAfterUnknownSubmittedAt === null &&
-    entry.outlivedStop !== true &&
-    !submissions.some((submission) => submission.clientMessageId === entry.clientMessageId)
-  )
-}
diff --git a/src/shared/structured-agent-session-outbox-withdrawn-send.test.ts b/src/shared/structured-agent-session-outbox-withdrawn-send.test.ts
deleted file mode 100644
index 214ed97872aa..000000000000
--- a/src/shared/structured-agent-session-outbox-withdrawn-send.test.ts
+++ /dev/null
@@ -1,78 +0,0 @@
-// A send the host withdrew (a Stop took it back before it ran) leaves the outbox with no notice, so
-// the next queued send goes out. One the host left in doubt holds the queue until its Retry.
-
-import { describe, expect, it } from 'vitest'
-import { agentSessionFailureFact } from './agent-session-failure'
-import { agentSessionFailureWords } from './agent-session-failure-words'
-import type { AgentJournalSubmission } from './agent-session-journal-types'
-import {
-  createStructuredAgentSessionOutboxEntry,
-  type StructuredAgentSessionOutboxEntry
-} from './structured-agent-session-outbox'
-import { reconcileStructuredAgentSessionOutbox } from './structured-agent-session-outbox-reconcile'
-import { admitStructuredAgentSessionOutboxEntry } from './structured-agent-session-outbox-admission'
-
-function entry(
-  clientMessageId: string,
-  patch: Partial<StructuredAgentSessionOutboxEntry> = {}
-): StructuredAgentSessionOutboxEntry {
-  return {
-    ...createStructuredAgentSessionOutboxEntry({
-      clientMessageId,
-      sessionId: 'session-1',
-      text: clientMessageId,
-      attachments: [],
-      queuedAt: 1
-    }),
-    ...patch
-  }
-}
-
-function submission(patch: Partial<AgentJournalSubmission>): AgentJournalSubmission {
-  return {
-    clientMessageId: 'stopped',
-    fence: 1,
-    payloadFingerprint: 'fingerprint',
-    dispatchState: 'pending',
-    providerItemId: null,
-    reason: null,
-    submittedAt: 1,
-    resolvedAt: 2,
-    ...patch
-  }
-}
-
-const OUTBOX = [entry('stopped', { state: 'dispatching', lastAttemptAt: 1 }), entry('next')]
-
-describe('the send a Stop ended before its turn opened', () => {
-  it('leaves the outbox when withdrawn, and the next send goes out', () => {
-    const withdrawn = submission({
-      dispatchState: 'rejected',
-      recovered: true,
-      ...agentSessionFailureWords(agentSessionFailureFact('cancelled'), { surface: 'rejection' })
-    })
-
-    const reconciled = reconcileStructuredAgentSessionOutbox(OUTBOX, [withdrawn], [])
-
-    expect(reconciled.map((each) => each.clientMessageId)).toEqual(['next'])
-    expect(admitStructuredAgentSessionOutboxEntry(reconciled)).toMatchObject({
-      state: 'dispatch',
-      entry: { clientMessageId: 'next' }
-    })
-  })
-
-  it('holds the queue when left in doubt', () => {
-    const inDoubt = submission({
-      dispatchState: 'unknown',
-      recovered: true,
-      reason: 'provider_closed_before_acknowledgement'
-    })
-
-    const reconciled = reconcileStructuredAgentSessionOutbox(OUTBOX, [inDoubt], [])
-
-    expect(admitStructuredAgentSessionOutboxEntry(reconciled)).toMatchObject({
-      state: 'blocked',
-      entry: { clientMessageId: 'stopped' }
-    })
-  })
-})
diff --git a/src/shared/structured-agent-session-outbox.queue-delivery.test.ts b/src/shared/structured-agent-session-outbox.queue-delivery.test.ts
deleted file mode 100644
index 958979d25c1d..000000000000
--- a/src/shared/structured-agent-session-outbox.queue-delivery.test.ts
+++ /dev/null
@@ -1,153 +0,0 @@
-// `delivery: 'queue-if-active'` on a send: recorded as the entry's `sentDelivery` by its first
-// attempt, persisted, replayed identically, and absent — key and all — from any send an incapable
-// host could see (its strict schema refuses unknown keys).
-
-import { describe, expect, it } from 'vitest'
-import { structuredAgentSessionPayloadFingerprint } from './structured-agent-session-mutation'
-import {
-  createStructuredAgentSessionOutboxEntry,
-  parseStructuredAgentSessionOutboxEntry,
-  stageStructuredAgentSessionOutboxEntryForSend,
-  structuredAgentSessionSendMutation,
-  structuredAgentSessionSendRequest,
-  type StructuredAgentSessionOutboxEntry,
-  type StructuredAgentSessionOutboxState
-} from './structured-agent-session-outbox'
-import { admitStructuredAgentSessionOutboxEntry } from './structured-agent-session-outbox-admission'
-import { structuredAgentSessionEntryAttempt } from './structured-agent-session-outbox-delivery'
-import { disposeStructuredAgentSessionSendResult } from './structured-agent-session-send-disposition'
-import { withdrawUnsentStructuredAgentSessionOutboxEntries } from './structured-agent-session-outbox-stop-withdrawal'
-
-function entry(sentDelivery?: 'queue-if-active') {
-  return {
-    ...createStructuredAgentSessionOutboxEntry({
-      clientMessageId: 'client-1',
-      sessionId: 'session-1',
-      text: 'hello',
-      attachments: [],
-      queuedAt: 1
-    }),
-    ...(sentDelivery ? { sentDelivery } : {})
-  }
-}
-
-describe('outbox queue delivery', () => {
-  it('sends `delivery` and digests it into the operation fingerprint, exactly as the host does', () => {
-    const mutation = structuredAgentSessionSendMutation(entry('queue-if-active'), 3)
-    expect(mutation.delivery).toBe('queue-if-active')
-    expect(mutation.envelope.payloadFingerprint).toBe(
-      structuredAgentSessionPayloadFingerprint({
-        method: 'agentSession.send',
-        sessionId: 'session-1',
-        fields: { body: mutation.body, delivery: 'queue-if-active' }
-      })
-    )
-  })
-
-  it('a plain entry keeps exactly the request an older host has always seen', () => {
-    const request = structuredAgentSessionSendRequest(entry(), 3)
-    expect('delivery' in request).toBe(false)
-    const mutation = structuredAgentSessionSendMutation(entry(), 3)
-    expect(mutation.envelope.payloadFingerprint).toBe(
-      structuredAgentSessionPayloadFingerprint({
-        method: 'agentSession.send',
-        sessionId: 'session-1',
-        fields: { body: mutation.body }
-      })
-    )
-  })
-
-  it('persists through a storage round-trip so a retry replays the same operation', () => {
-    const parsed = parseStructuredAgentSessionOutboxEntry(
-      JSON.parse(JSON.stringify(entry('queue-if-active'))),
-      'session-1'
-    )
-    expect(parsed?.sentDelivery).toBe('queue-if-active')
-    const plain = parseStructuredAgentSessionOutboxEntry(
-      JSON.parse(JSON.stringify(entry())),
-      'session-1'
-    )
-    expect(plain !== null && 'sentDelivery' in plain).toBe(false)
-    const foreign = parseStructuredAgentSessionOutboxEntry(
-      { ...JSON.parse(JSON.stringify(entry())), sentDelivery: 'something-newer' },
-      'session-1'
-    )
-    expect(foreign !== null && 'sentDelivery' in foreign).toBe(false)
-  })
-
-  it('Stop keeps every queue send that has gone out, in any state, and marks it for Retry', () => {
-    // An attempted queue send may already be a host-held draft: withdrawing it locally too would
-    // put the same text in the composer AND on a card. Read from what went on the wire.
-    const at = (
-      id: string,
-      state: StructuredAgentSessionOutboxState,
-      sent?: 'queue-if-active' | null
-    ) => ({
-      ...createStructuredAgentSessionOutboxEntry({
-        clientMessageId: id,
-        sessionId: 'session-1',
-        text: `text of ${id}`,
-        attachments: [],
-        queuedAt: 1
-      }),
-      ...(sent !== undefined ? { lastAttemptAt: 2, sentDelivery: sent } : {}),
-      state
-    })
-    const next = withdrawUnsentStructuredAgentSessionOutboxEntries(
-      [
-        at('never-left', 'queued'),
-        // No in-flight id: a `pending` answer freed single-flight before its journal row landed.
-        at('in-flight', 'dispatching', 'queue-if-active'),
-        at('in-doubt', 'unconfirmed', 'queue-if-active'),
-        // Probed back to queued after a lost answer: still out there, not unsent.
-        at('probed', 'queued', 'queue-if-active'),
-        at('sent-plain', 'dispatching', null)
-      ],
-      [],
-      null
-    )
-    // Its state is left to its answer: only the mark holds it back.
-    expect(next.map((entry) => [entry.clientMessageId, entry.state, entry.outlivedStop])).toEqual([
-      ['in-flight', 'dispatching', true],
-      ['in-doubt', 'unconfirmed', true],
-      ['probed', 'queued', true]
-    ])
-    // The drain never admits the marked one it would otherwise send.
-    expect(admitStructuredAgentSessionOutboxEntry(next.slice(2))).toEqual({
-      state: 'blocked',
-      entry: next[2]
-    })
-  })
-
-  it('Stop during a first queue attempt, then a settled refusal: rotated and rejected, as without it', () => {
-    const operations = ['rotated-1', 'rotated-2']
-    const attempt = structuredAgentSessionEntryAttempt(entry(), {
-      capability: 'supported',
-      enabled: true
-    })
-    const staged = stageStructuredAgentSessionOutboxEntryForSend(attempt.stored, 10)
-    const refusal = {
-      ok: false as const,
-      refusal: {
-        code: 'agent_session_operation_invalid' as const,
-        message: 'The message queue is full.'
-      }
-    }
-    const answer = (entries: StructuredAgentSessionOutboxEntry[]) =>
-      disposeStructuredAgentSessionSendResult({
-        entries,
-        entry: attempt.wire,
-        result: refusal,
-        createOperationId: () => operations.shift() ?? 'spent'
-      })
-    const stopped = withdrawUnsentStructuredAgentSessionOutboxEntries([staged], [], 'client-1')
-    const withStop = answer(stopped)
-    const withoutStop = answer([staged])
-    expect(
-      withStop.entries.map((candidate) => [candidate.clientMessageId, candidate.state])
-    ).toEqual([['rotated-1', 'rejected']])
-    expect(
-      withoutStop.entries.map((candidate) => [candidate.clientMessageId, candidate.state])
-    ).toEqual([['rotated-2', 'rejected']])
-  })
-})
diff --git a/src/shared/structured-agent-session-outbox.ts b/src/shared/structured-agent-session-outbox.ts
deleted file mode 100644
index 7db607197044..000000000000
--- a/src/shared/structured-agent-session-outbox.ts
+++ /dev/null
@@ -1,292 +0,0 @@
-import type { AgentSessionFailureFact } from './agent-session-failure'
-import { readWholeAgentSessionFailureFact } from './agent-session-failure'
-import type { AgentJournalMessageItem } from './agent-session-journal-types'
-import {
-  parseAgentSessionWriteFailure,
-  type AgentSessionWriteFailure,
-  type AgentSessionWriteRefusal
-} from './agent-session-write-failure'
-import {
-  agentSessionOwnerVerdictAllowsFreshOperationId,
-  agentSessionRefusalOperationState
-} from './agent-session-refusal-retry'
-import {
-  structuredAgentSessionMessageSendMutation,
-  type StructuredAgentSessionSendMutation
-} from './structured-agent-session-send-mutation'
-import { parseStructuredAgentSessionOutboxQueueFields } from './structured-agent-session-outbox-delivery'
-
-/** `rejected`: settled as not delivered. The drain never sends it again and nothing queues behind
- *  it. One the host refused unrecorded waits for the user's Retry. One it recorded owes no delivery
- *  and leaves on the batch or page that loads its row (`structured-agent-session-outbox-reconcile`). */
-export type StructuredAgentSessionOutboxState =
-  | 'queued'
-  | 'dispatching'
-  | 'unconfirmed'
-  | 'rejected'
-
-export type StructuredAgentSessionOutboxEntry = {
-  clientMessageId: string
-  sessionId: string
-  body: AgentJournalMessageItem
-  previewUris: string[]
-  state: StructuredAgentSessionOutboxState
-  queuedAt: number
-  lastAttemptAt: number | null
-  retryAfterUnknownSubmittedAt: number | null
-  source?: 'launch'
-  /** A Stop landed after this queue send went out: only the user's Retry sends it again, never the
-   *  drain, the unconfirmed probe or an owner change, which would start a turn the user stopped. */
-  outlivedStop?: true
-  /** Whether the first attempt asked the host to hold it as a draft (`null`: plain); every replay
-   *  of this id asks the same (structured-agent-session-outbox-delivery). On a request's own copy,
-   *  what that request carries. */
-  sentDelivery?: 'queue-if-active' | null
-  /** Sent while the chat read Stopping: until the host records it, it is drawn after that turn. */
-  sentWhileStopping?: true
-  /** 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. On a `queued` entry
-   *  it is also the hold (structured-agent-session-outbox-admission). */
-  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 read whole is
- *  dropped, leaving the reason. */
-export function structuredAgentSessionRejectedFailure(submission: {
-  reason: string | null
-  rejection?: unknown
-}): Extract<StructuredAgentSessionAttemptFailure, { kind: 'rejected' }> {
-  const fact = readWholeAgentSessionFailureFact(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 = {
-  path: string
-  previewUri: string
-}
-
-export function structuredAgentSessionSendBody(
-  text: string,
-  attachments: readonly StructuredAgentSessionAttachment[]
-): AgentJournalMessageItem {
-  return {
-    kind: 'message',
-    role: 'user',
-    blocks: [
-      ...(text.trim().length > 0 ? [{ type: 'text' as const, text: text.trimEnd() }] : []),
-      ...attachments.map((attachment) => ({ type: 'image-ref' as const, path: attachment.path }))
-    ]
-  }
-}
-
-export function createStructuredAgentSessionOutboxEntry(args: {
-  clientMessageId: string
-  sessionId: string
-  text: string
-  attachments: readonly StructuredAgentSessionAttachment[]
-  queuedAt: number
-}): StructuredAgentSessionOutboxEntry {
-  return {
-    clientMessageId: args.clientMessageId,
-    sessionId: args.sessionId,
-    body: structuredAgentSessionSendBody(args.text, args.attachments),
-    previewUris: args.attachments.map((attachment) => attachment.previewUri),
-    state: 'queued',
-    queuedAt: args.queuedAt,
-    lastAttemptAt: null,
-    retryAfterUnknownSubmittedAt: null
-  }
-}
-
-export function updateStructuredAgentSessionOutboxEntry(
-  entries: readonly StructuredAgentSessionOutboxEntry[],
-  id: string,
-  update: (entry: StructuredAgentSessionOutboxEntry) => StructuredAgentSessionOutboxEntry | null
-): StructuredAgentSessionOutboxEntry[] {
-  return entries.flatMap((entry) => {
-    if (entry.clientMessageId !== id) {
-      return [entry]
-    }
-    const next = update(entry)
-    return next ? [next] : []
-  })
-}
-
-/** 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 }
-}
-
-/** The host forgot this message's id, a day after it was made, and refuses it for good: only a new
- *  id sends it. The id was kept because an earlier attempt under it may already be in the chat; a
- *  first attempt's was replaced when it was refused. */
-export function structuredAgentSessionEntryIdExpired(
-  entry: StructuredAgentSessionOutboxEntry
-): boolean {
-  return (
-    entry.state === 'queued' &&
-    entry.lastFailure?.kind === 'refused' &&
-    entry.lastFailure.code === 'agent_session_operation_expired'
-  )
-}
-
-/** The host recorded this send and then rejected it: no Retry, since sending it again is a new
- *  message. The reconcile drops it once the client holds the rejected submission. */
-export function structuredAgentSessionEntryRejectedByHost(
-  entry: StructuredAgentSessionOutboxEntry
-): boolean {
-  return entry.state === 'rejected' && entry.lastFailure?.kind === 'rejected'
-}
-
-export function requeueStructuredAgentSessionSendRefusal(
-  entry: StructuredAgentSessionOutboxEntry,
-  refusal: AgentSessionWriteRefusal,
-  createOperationId: () => string,
-  retainOperationId = false
-): StructuredAgentSessionOutboxEntry {
-  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
-  // waits for its Retry, since nothing recorded it.
-  const ownerExited =
-    refusal.code === 'agent_session_ownership_unknown' &&
-    agentSessionOwnerVerdictAllowsFreshOperationId(refusal.details?.ownerVerdict)
-  if (
-    !(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 keep it. Only a settled refusal proves the message never
-  // landed.
-  return {
-    ...entry,
-    clientMessageId: createOperationId(),
-    state: refusalSettled ? 'rejected' : 'queued',
-    lastAttemptAt: null,
-    retryAfterUnknownSubmittedAt: null
-  }
-}
-
-export function parseStructuredAgentSessionOutboxEntry(
-  value: unknown,
-  sessionId: string
-): StructuredAgentSessionOutboxEntry | null {
-  if (typeof value !== 'object' || value === null) {
-    return null
-  }
-  const entry = value as Partial<StructuredAgentSessionOutboxEntry>
-  const body = entry.body
-  if (
-    entry.sessionId !== sessionId ||
-    typeof entry.clientMessageId !== 'string' ||
-    typeof entry.queuedAt !== 'number' ||
-    !body ||
-    body.kind !== 'message' ||
-    body.role !== 'user' ||
-    !Array.isArray(body.blocks) ||
-    !Array.isArray(entry.previewUris) ||
-    !entry.previewUris.every((uri) => typeof uri === 'string') ||
-    !['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,
-    body,
-    previewUris: entry.previewUris,
-    state: entry.state as StructuredAgentSessionOutboxState,
-    queuedAt: entry.queuedAt,
-    lastAttemptAt: typeof entry.lastAttemptAt === 'number' ? entry.lastAttemptAt : null,
-    retryAfterUnknownSubmittedAt:
-      typeof entry.retryAfterUnknownSubmittedAt === 'number'
-        ? entry.retryAfterUnknownSubmittedAt
-        : null,
-    ...(entry.source === 'launch' ? { source: 'launch' as const } : {}),
-    ...parseStructuredAgentSessionOutboxQueueFields(entry),
-    ...(lastFailure ? { lastFailure } : {})
-  }
-}
-
-/** The `agentSession.send` arguments an entry stands for. */
-export function structuredAgentSessionSendMutation(
-  entry: StructuredAgentSessionOutboxEntry,
-  expectedRuntimeFence: number
-): StructuredAgentSessionSendMutation {
-  return structuredAgentSessionMessageSendMutation({
-    sessionId: entry.sessionId,
-    clientOperationId: entry.clientMessageId,
-    expectedRuntimeFence,
-    body: entry.body,
-    delivery: entry.sentDelivery ?? undefined
-  })
-}
-
-export function structuredAgentSessionSendRequest(
-  entry: StructuredAgentSessionOutboxEntry,
-  expectedRuntimeFence: number
-): Record<string, unknown> {
-  return structuredAgentSessionSendMutation(entry, expectedRuntimeFence)
-}
-
-export type StructuredAgentSessionSendFailure = 'delivery-unknown' | 'failed'
-
-export function classifyStructuredAgentSessionSendFailure(
-  error: unknown,
-  isDeliveryUnknown: (error: unknown) => boolean
-): StructuredAgentSessionSendFailure {
-  return isDeliveryUnknown(error) ? 'delivery-unknown' : 'failed'
-}
diff --git a/src/shared/structured-agent-session-projection.ts b/src/shared/structured-agent-session-projection.ts
index d82ec84f6f53..dd5737d1c54e 100644
--- a/src/shared/structured-agent-session-projection.ts
+++ b/src/shared/structured-agent-session-projection.ts
@@ -133,7 +133,7 @@ function itemBlocks(item: AgentJournalRenderItem): {
   if (body.kind !== 'status' || body.turnLifecycle) {
     return null
   }
-  return { role: 'system', blocks: [structuredAgentSessionStatusBlock(body)] }
+  return { role: 'system', blocks: [structuredAgentSessionStatusBlock(body, item.turnScope)] }
 }
 
 function isAgentJournalMessageSendMode(value: string): value is AgentJournalMessageSendMode {
diff --git a/src/shared/structured-agent-session-rejection-words.test.ts b/src/shared/structured-agent-session-rejection-words.test.ts
new file mode 100644
index 000000000000..b984008f42f9
--- /dev/null
+++ b/src/shared/structured-agent-session-rejection-words.test.ts
@@ -0,0 +1,81 @@
+// What a rejection puts on the reader's screen: the desktop row, the phone and a returned card.
+
+import { describe, expect, it } from 'vitest'
+import type { AgentSessionFailureFact } from './agent-session-failure'
+import { agentSessionWriteNoticeEnglish } from './agent-session-refusal-notice'
+import { DISPATCH_REJECTED_QUEUE_FULL } from './structured-agent-session-dispatch-rejection'
+import {
+  structuredAgentSessionRejectionNotice,
+  structuredAgentSessionRejectionParts
+} from './structured-agent-session-rejection-words'
+
+function notice(reason: string | null, fact?: AgentSessionFailureFact): string {
+  return agentSessionWriteNoticeEnglish(structuredAgentSessionRejectionParts(reason, 'send', fact))
+}
+
+describe('what a rejection shows the reader', () => {
+  it('never puts the transport marker on screen', () => {
+    const shown = notice('provider_write_failed: broken pipe')
+    expect(shown).not.toContain('provider_write_failed')
+    expect(shown).not.toContain('broken pipe')
+    expect(shown).toBe("Orca couldn't reach the agent. Your message was not sent.")
+  })
+
+  it("shows a content rejection in the provider's own words", () => {
+    expect(notice('Claude messages support at most 20 images')).toBe(
+      'Claude messages support at most 20 images'
+    )
+  })
+
+  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 a legacy or local-capacity marker on screen', () => {
+    expect(notice('not_delivered')).toBe('Your message was not sent.')
+    expect(notice(DISPATCH_REJECTED_QUEUE_FULL)).toBe('Your message was not sent.')
+  })
+
+  it('claims no cause when the rejection names none', () => {
+    expect(notice(null)).toBe('Your message was not sent.')
+  })
+
+  it('tells the phone how to send it again after a transport failure', () => {
+    const phone = structuredAgentSessionRejectionNotice('provider_write_failed', 'composer-send')
+    expect(phone.startsWith("Orca couldn't reach the agent. Your message was not sent.")).toBe(true)
+    expect(phone.length).toBeGreaterThan(notice('provider_write_failed').length)
+  })
+})
+
+// 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 reader', () => {
+  it('says Orca could not hand the message over, whatever the reason holds', () => {
+    for (const reason of ['provider_write_failed', 'Something unrelated.']) {
+      expect(notice(reason, { 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.'
+    )
+  })
+
+  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.')
+  })
+
+  it('says only that the message was not sent for a fact it cannot place', () => {
+    expect(notice('A sentence a newer host wrote.', JSON.parse('{"kind":"fromTheFuture"}'))).toBe(
+      'Your message was not sent.'
+    )
+    expect(notice('Compaction failed.', { kind: 'compactionFailed' })).toBe(
+      'Your message was not sent.'
+    )
+  })
+})
diff --git a/src/shared/structured-agent-session-rejection-words.ts b/src/shared/structured-agent-session-rejection-words.ts
new file mode 100644
index 000000000000..fcc780a19b18
--- /dev/null
+++ b/src/shared/structured-agent-session-rejection-words.ts
@@ -0,0 +1,82 @@
+// The words for a message the host rejected, shared by the desktop, the phone and the queue's
+// returned cards.
+
+import {
+  agentSessionWriteNoticeEnglish,
+  agentSessionWriteNotDoneParts
+} from './agent-session-refusal-notice'
+import type { AgentSessionWriteNoticePart } from './agent-session-write-notice-copy'
+import type { AgentSessionFailureFact } from './agent-session-failure'
+import type { AgentSessionFailureWordsContext } from './agent-session-failure-words'
+import { classifyDispatchRejection } from './structured-agent-session-dispatch-rejection'
+
+/**
+ * What to put on screen for a rejection.
+ *
+ * A content rejection's reason is the provider explaining itself, so it is shown
+ * verbatim — "Claude does not support the image type .bmp" is the whole answer and
+ * 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 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 and no next step, because at that point we know
+ * neither: all it asserts is the one thing every rejection shares.
+ *
+ * Exported because the phone 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,
+  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 ['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)]
+  }
+  // A fact this build cannot place proves only that the message did not happen.
+  return kind
+    ? [{ failure: { ...fact, kind }, surface: 'rejection', context }]
+    : agentSessionWriteNotDoneParts(write)
+}
+
+/** What a returned queue card says about why the host rejected its message. */
+export function structuredAgentSessionAttemptFailureParts(
+  failure: { kind: 'rejected'; reason: string | null },
+  context: AgentSessionFailureWordsContext = {},
+  /** The journal's whole fact for the rejection, when the host sent one this build can read. */
+  recorded?: AgentSessionFailureFact
+): AgentSessionWriteNoticePart[] {
+  return structuredAgentSessionRejectionParts(failure.reason, 'send', recorded, context)
+}
diff --git a/src/shared/structured-agent-session-send-disposition.test.ts b/src/shared/structured-agent-session-send-disposition.test.ts
deleted file mode 100644
index 9605764b0179..000000000000
--- a/src/shared/structured-agent-session-send-disposition.test.ts
+++ /dev/null
@@ -1,445 +0,0 @@
-// What a rejection puts on the user's screen.
-//
-// The module is pure so this can be asserted directly instead of through the hook,
-// 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 {
-  DISPATCH_REJECTED_CANCELLED,
-  DISPATCH_REJECTED_QUEUE_FULL
-} from './structured-agent-session-dispatch-rejection'
-import { agentSessionWriteNoticeEnglish } from './agent-session-refusal-notice'
-import {
-  disposeStructuredAgentSessionSendFailure,
-  disposeStructuredAgentSessionSendResult,
-  structuredAgentSessionAttemptFailureParts
-} from './structured-agent-session-send-disposition'
-import {
-  createStructuredAgentSessionOutboxEntry,
-  type StructuredAgentSessionOutboxEntry
-} from './structured-agent-session-outbox'
-import { reconcileStructuredAgentSessionOutbox } from './structured-agent-session-outbox-reconcile'
-import { structuredAgentSessionEntryHeldForRetry } from './structured-agent-session-outbox-admission'
-
-const entry: StructuredAgentSessionOutboxEntry = createStructuredAgentSessionOutboxEntry({
-  clientMessageId: 'client-1',
-  sessionId: 'session-1',
-  text: 'hello',
-  attachments: [],
-  queuedAt: 1
-})
-
-function rejectedWith(
-  reason: string | null,
-  extra: { rejection?: AgentSessionFailureFact; replayed?: boolean } = {}
-): AgentSessionMutationResult<AgentSessionSendResult> {
-  const submission: AgentJournalSubmission = {
-    clientMessageId: 'client-1',
-    fence: 1,
-    payloadFingerprint: 'fingerprint',
-    dispatchState: 'rejected',
-    providerItemId: null,
-    reason,
-    submittedAt: 10,
-    resolvedAt: 10,
-    ...(extra.rejection ? { rejection: extra.rejection } : {})
-  }
-  return {
-    ok: true,
-    replayed: extra.replayed ?? false,
-    fence: 1,
-    cursor: { epoch: 'epoch-1', sequence: 10 },
-    value: { clientMessageId: 'client-1', submission }
-  }
-}
-
-function notice(reason: string | null, rejection?: AgentSessionFailureFact): string | undefined {
-  const disposition = disposeStructuredAgentSessionSendResult({
-    entries: [entry],
-    entry,
-    result: rejectedWith(reason, rejection ? { rejection } : {}),
-    createOperationId: () => 'unused'
-  })
-  // 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('a queued draft answer', () => {
-  it('retires the outbox entry: the host-held draft carries any later refusal', () => {
-    const disposition = disposeStructuredAgentSessionSendResult({
-      entries: [entry],
-      entry,
-      result: {
-        ok: true,
-        replayed: false,
-        fence: 1,
-        cursor: { epoch: 'epoch-1', sequence: 10 },
-        value: {
-          clientMessageId: 'client-1',
-          queued: { messageId: 'client-1', position: 1, state: 'waiting' }
-        }
-      },
-      createOperationId: () => 'unused'
-    })
-    expect(disposition.entries).toEqual([])
-    expect(disposition.error).toBeNull()
-  })
-
-  it('a withdrawn replay is spent, not unknown', () => {
-    const disposition = disposeStructuredAgentSessionSendResult({
-      entries: [entry],
-      entry,
-      result: {
-        ok: true,
-        replayed: true,
-        fence: 1,
-        cursor: { epoch: 'epoch-1', sequence: 10 },
-        value: {
-          clientMessageId: 'client-1',
-          queued: { messageId: 'client-1', position: 1, state: 'withdrawn' }
-        }
-      },
-      createOperationId: () => 'unused'
-    })
-    expect(disposition.entries).toEqual([])
-    expect(disposition.error).toBeNull()
-  })
-})
-
-describe('what a rejection shows the user', () => {
-  it('removes a queued message the provider confirms Stop cancelled', () => {
-    const result = rejectedWith(DISPATCH_REJECTED_CANCELLED)
-    if (!result.ok || !('submission' in result.value)) {
-      throw new Error('expected rejected submission fixture')
-    }
-
-    expect(reconcileStructuredAgentSessionOutbox([entry], [result.value.submission], [])).toEqual(
-      []
-    )
-  })
-
-  it('never puts the transport marker on screen', () => {
-    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')
-    expect(shown).toBe("Orca couldn't reach the agent. Your message was not sent.")
-  })
-
-  it('shows a content rejection in the provider own words', () => {
-    // The provider explaining itself IS the answer; a generic string throws it away.
-    expect(notice('Claude messages support at most 20 images')).toBe(
-      'Claude messages support at most 20 images'
-    )
-  })
-
-  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,
-        result: rejectedWith(DISPATCH_REJECTED_CANCELLED, { rejection, replayed }),
-        createOperationId: () => 'unused'
-      })
-      expect(disposition).toEqual({ entries: [], error: null })
-    }
-  })
-
-  it('reads a withdrawal off the typed fact whatever the reason says', () => {
-    const result = rejectedWith('Withdrawn.', { rejection: { kind: 'cancelled' } })
-    if (!result.ok || !('submission' in result.value)) {
-      throw new Error('expected rejected submission fixture')
-    }
-    expect(reconcileStructuredAgentSessionOutbox([entry], [result.value.submission], [])).toEqual(
-      []
-    )
-    expect(
-      disposeStructuredAgentSessionSendResult({
-        entries: [entry],
-        entry,
-        result,
-        createOperationId: () => 'unused'
-      }).error
-    ).toBeNull()
-  })
-
-  it('claims no cause when the rejection names none', () => {
-    expect(notice(null)).toBe('Your message was not sent.')
-  })
-
-  it('never puts a local-capacity marker on screen either', () => {
-    // Neither the provider's words nor a transport failure: a refusal we minted
-    // 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('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,
-      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(structuredAgentSessionEntryHeldForRetry(disposition.entries[0]!)).toBe(true)
-    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,
-      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,
-      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,
-      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 || !('submission' in result.value)) {
-      throw new Error('expected a send result')
-    }
-    result.value.submission = { ...result.value.submission, dispatchState: 'accepted' }
-    const disposition = disposeStructuredAgentSessionSendResult({
-      entries: [refused],
-      entry: refused,
-      result,
-      createOperationId: () => 'unused'
-    })
-
-    expect(disposition.entries).toEqual([])
-    expect(disposition.error).toBeNull()
-  })
-})
-
-describe('ambiguous operation refusals', () => {
-  it.each([
-    { ...entry, state: 'unconfirmed' as const, lastAttemptAt: 10 },
-    { ...entry, state: 'queued' as const, lastAttemptAt: 10, retryAfterUnknownSubmittedAt: 10 }
-  ])(
-    'never rotates $state operation after its host tombstone expires; holds it for its Retry',
-    (ambiguous) => {
-      const disposition = disposeStructuredAgentSessionSendResult({
-        entries: [ambiguous],
-        entry: ambiguous,
-        result: {
-          ok: false,
-          refusal: {
-            code: 'agent_session_operation_expired',
-            message: 'Operation expired.'
-          }
-        },
-        createOperationId: () => 'fresh-id'
-      })
-
-      // An earlier attempt under the kept id may have landed, so no new id goes out on its own.
-      expect(disposition.entries).toMatchObject([
-        {
-          clientMessageId: entry.clientMessageId,
-          state: 'queued',
-          lastFailure: { kind: 'refused', code: 'agent_session_operation_expired' }
-        }
-      ])
-      expect(structuredAgentSessionEntryHeldForRetry(disposition.entries[0]!)).toBe(true)
-      expect(disposition.error).toBeNull()
-    }
-  )
-
-  it('rotates a first attempt the host calls expired, which nothing can have delivered', () => {
-    const disposition = disposeStructuredAgentSessionSendResult({
-      entries: [entry],
-      entry,
-      result: {
-        ok: false,
-        refusal: { code: 'agent_session_operation_expired', message: 'Operation expired.' }
-      },
-      createOperationId: () => 'fresh-id'
-    })
-
-    expect(disposition.entries).toMatchObject([{ clientMessageId: 'fresh-id', state: 'rejected' }])
-  })
-
-  it('parks a recovered missing submission without polling forever', () => {
-    const result = rejectedWith(null)
-    if (!result.ok || !('submission' in result.value)) {
-      throw new Error('expected a send result')
-    }
-    result.value.submission = {
-      ...result.value.submission,
-      dispatchState: 'unknown',
-      reason: 'durable_send_submission_missing',
-      recovered: true
-    }
-
-    const disposition = disposeStructuredAgentSessionSendResult({
-      entries: [entry],
-      entry,
-      result,
-      createOperationId: () => 'unused'
-    })
-
-    expect(disposition.entries).toMatchObject([
-      {
-        clientMessageId: entry.clientMessageId,
-        state: 'unconfirmed',
-        retryAfterUnknownSubmittedAt: -1
-      }
-    ])
-  })
-})
diff --git a/src/shared/structured-agent-session-send-disposition.ts b/src/shared/structured-agent-session-send-disposition.ts
deleted file mode 100644
index 3dad3dc4dc0b..000000000000
--- a/src/shared/structured-agent-session-send-disposition.ts
+++ /dev/null
@@ -1,338 +0,0 @@
-// How one send outcome changes the outbox.
-//
-// The sibling of `reconcileStructuredAgentSessionOutbox`: that one folds the
-// journal's view of a submission into the queue, this one folds the answer to a
-// single `agentSession.send`. Both write the same state, so they live together
-// and speak the same vocabulary. Pure on purpose — the hook that calls this owns
-// 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 {
-  agentSessionWriteNoticeEnglish,
-  agentSessionWriteNoticeParts,
-  agentSessionWriteNotDoneParts
-} from './agent-session-refusal-notice'
-import type { AgentSessionWriteNoticePart } from './agent-session-write-notice-copy'
-import {
-  agentSessionRefusalFailure,
-  type AgentSessionWriteRefusal
-} from './agent-session-write-failure'
-import type { AgentSessionFailureFact } from './agent-session-failure'
-import 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: AgentSessionWriteNoticePart[] | null
-}
-
-/** A message this client couldn't store to send; the composer's draft or the row's Retry still
- *  has it. */
-export const STRUCTURED_AGENT_SESSION_OUTBOX_NOT_SAVED: readonly AgentSessionWriteNoticePart[] = [
-  'messageNotSaved',
-  'tryAgain'
-]
-
-type SendDispositionInput = {
-  entries: readonly StructuredAgentSessionOutboxEntry[]
-  entry: StructuredAgentSessionOutboxEntry
-}
-
-function replaceEntryState(
-  input: SendDispositionInput,
-  state: StructuredAgentSessionOutboxEntry['state'],
-  lastFailure?: StructuredAgentSessionAttemptFailure
-): StructuredAgentSessionOutboxEntry[] {
-  return input.entries.map((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
-  )
-}
-
-/**
- * The user force-retried a host-confirmed `unknown` and got the same submission
- * back. That is now the only answer such a retry can get: `unknown` means the
- * host cannot tell whether the provider has the message, and no reason it
- * records ever makes a second delivery safe. Parking the entry would offer a
- * Retry that does nothing in front of a queue nothing can drain, so it leaves
- * the outbox. Nothing is lost from the conversation: the durable submission row
- * already renders the message.
- *
- * A `rejected` submission is the host's to show, with no Retry: the reconcile
- * drops its entry once the journal carries it.
- */
-function refusedRedelivery(
-  entry: StructuredAgentSessionOutboxEntry,
-  submission: AgentJournalSubmission
-): boolean {
-  return (
-    entry.retryAfterUnknownSubmittedAt !== null &&
-    submission.dispatchState === 'unknown' &&
-    submission.submittedAt === entry.retryAfterUnknownSubmittedAt
-  )
-}
-
-/** Whether the journal already answers a send still in flight, so its own reply adds nothing: the
- *  host holds the message, rejected it, or handed it off as a queued draft — 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') ||
-      (clientMessageId !== null && submission.queuedMessageId === clientMessageId)
-  )
-}
-
-/**
- * What to put on screen for a rejection.
- *
- * A content rejection's reason is the provider explaining itself, so it is shown
- * verbatim — "Claude does not support the image type .bmp" is the whole answer and
- * 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 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 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,
-  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 ['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)]
-  }
-  // A fact this build cannot place proves only that the message did not happen.
-  return kind
-    ? [{ failure: { ...fact, kind }, surface: '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)
-  }
-  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)
-}
-
-/** A send the host refused, whether it returned the refusal or threw it. */
-export function disposeStructuredAgentSessionSendRefusal(
-  input: SendDispositionInput & {
-    refusal: AgentSessionWriteRefusal
-    createOperationId: () => string
-  }
-): StructuredAgentSessionSendDisposition {
-  // The refusal saved on a message it keeps `queued` is what holds it for the user's Retry.
-  const entries: StructuredAgentSessionOutboxEntry[] = input.entries.map((candidate) =>
-    candidate.clientMessageId === input.entry.clientMessageId
-      ? withLastFailure(
-          requeueStructuredAgentSessionSendRefusal(
-            candidate,
-            input.refusal,
-            input.createOperationId,
-            input.entry.lastAttemptAt !== null
-          ),
-          input.refusal
-        )
-      : candidate
-  )
-  return { entries, error: null }
-}
-
-export function disposeStructuredAgentSessionSendResult(
-  input: SendDispositionInput & {
-    result: AgentSessionMutationResult<AgentSessionSendResult>
-    createOperationId: () => string
-  }
-): StructuredAgentSessionSendDisposition {
-  const result = input.result
-  if (!result.ok) {
-    return disposeStructuredAgentSessionSendRefusal({
-      ...input,
-      refusal: agentSessionRefusalFailure(result.refusal)
-    })
-  }
-  if ('queued' in result.value) {
-    // The host holds the draft (or already settled it, on a replay). Either way
-    // the send is spent and the queue owns it now: the outbox entry retires,
-    // and the draft card — not this queue — carries any later refusal.
-    return {
-      entries: dropEntry(input),
-      error: null
-    }
-  }
-  const submission = result.value.submission
-  // A replay of a send the host queued and then handed off answers with that hand-off, under its
-  // own id: the host owns the message, and the entry leaves as the reconcile drops it.
-  if (submission.queuedMessageId === input.entry.clientMessageId) {
-    return {
-      entries: dropEntry(input),
-      error: null
-    }
-  }
-  if (refusedRedelivery(input.entry, submission)) {
-    return {
-      entries: dropEntry(input),
-      error: ['sendOutcomeLost']
-    }
-  }
-  if (submission.dispatchState === 'accepted') {
-    return {
-      entries: dropEntry(input),
-      error: null
-    }
-  }
-  // 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
-    }
-  }
-  // The host kept it as a card, first reply or replay: the card owns the text, so the entry
-  // leaves as the reconcile drops it, with no Retry that could send words the card's Delete took.
-  if (submission.dispatchState === 'rejected' && submission.keptAsQueuedMessageId !== undefined) {
-    return {
-      entries: dropEntry(input),
-      error: null
-    }
-  }
-  // Recorded, so the journal's row shows it once it arrives; until then the entry draws it, saying
-  // why and offering no Retry.
-  if (submission.dispatchState === 'rejected') {
-    return {
-      entries: replaceEntryState(
-        input,
-        'rejected',
-        structuredAgentSessionRejectedFailure(submission)
-      ),
-      error: null
-    }
-  }
-  if (submission.dispatchState === 'unknown' && submission.recovered) {
-    return {
-      entries: input.entries.map((candidate) =>
-        candidate.clientMessageId === input.entry.clientMessageId
-          ? { ...candidate, state: 'unconfirmed', retryAfterUnknownSubmittedAt: -1 }
-          : candidate
-      ),
-      error: null
-    }
-  }
-  // `pending` is the host saying the message was written and is awaiting the
-  // provider's acknowledgement, which cannot arrive until the turn ahead of it
-  // ends. That is not doubt, and keeping order is no longer the reason to hold
-  // the entry -- the host fixed the order when it wrote the row. It stays
-  // because a `pending` can still settle `rejected` or `unknown`, and only the
-  // entry carries the retry state that answer needs.
-  return {
-    entries: replaceEntryState(
-      input,
-      submission.dispatchState === 'unknown' ? 'unconfirmed' : 'dispatching'
-    ),
-    error: null
-  }
-}
-
-export function disposeStructuredAgentSessionSendFailure(
-  input: SendDispositionInput & {
-    cause: unknown
-    isDeliveryUnknown: (error: unknown) => boolean
-  }
-): StructuredAgentSessionSendDisposition {
-  const failure = classifyStructuredAgentSessionSendFailure(input.cause, input.isDeliveryUnknown)
-  const deliveryUnknown = failure === 'delivery-unknown'
-  return {
-    // An unconfirmed entry's Retry row already says delivery is unconfirmed; the saved failure
-    // holds the other for its Retry.
-    entries: deliveryUnknown
-      ? replaceEntryState(input, 'unconfirmed')
-      : replaceEntryState(input, 'queued', { kind: 'failed' }),
-    error: null
-  }
-}
diff --git a/src/shared/structured-agent-session-send-evidence.test.ts b/src/shared/structured-agent-session-send-evidence.test.ts
new file mode 100644
index 000000000000..db8a8a7ee68b
--- /dev/null
+++ b/src/shared/structured-agent-session-send-evidence.test.ts
@@ -0,0 +1,144 @@
+import { describe, expect, it } from 'vitest'
+import type { AgentJournalSubmission } from './agent-session-journal-types'
+import type { AgentSessionWireRefusal } from './agent-session-wire'
+import {
+  structuredAgentSessionSendEvidence,
+  type StructuredAgentSessionSendAnswer
+} from './structured-agent-session-send-evidence'
+
+function refused(code: string, reason?: string): StructuredAgentSessionSendAnswer {
+  // oxlint-disable-next-line typescript/consistent-type-assertions -- SAFETY: test fixture names codes from the wire list.
+  const refusal = {
+    code,
+    message: code,
+    ...(reason ? { details: { reason } } : {})
+  } as AgentSessionWireRefusal
+  return { kind: 'result', result: { ok: false, refusal } }
+}
+
+const recorded: StructuredAgentSessionSendAnswer = {
+  kind: 'result',
+  result: {
+    ok: true,
+    replayed: false,
+    fence: 1,
+    cursor: { epoch: 'e', sequence: 1 },
+    value: { clientMessageId: 'm', queued: { messageId: 'm', position: 0, state: 'waiting' } }
+  }
+}
+
+function withRow(fields: Partial<AgentJournalSubmission>): StructuredAgentSessionSendAnswer {
+  return {
+    kind: 'result',
+    result: {
+      ok: true,
+      replayed: false,
+      fence: 1,
+      cursor: { epoch: 'e', sequence: 1 },
+      value: {
+        clientMessageId: 'm',
+        submission: {
+          clientMessageId: 'm',
+          fence: 1,
+          payloadFingerprint: 'fp',
+          dispatchState: 'accepted',
+          providerItemId: null,
+          reason: null,
+          submittedAt: 1,
+          resolvedAt: 1,
+          ...fields
+        }
+      }
+    }
+  }
+}
+
+function thrown(rpcCode: string | undefined): StructuredAgentSessionSendAnswer {
+  return { kind: 'thrown', error: new Error(rpcCode ?? 'socket closed'), rpcCode }
+}
+
+describe('structuredAgentSessionSendEvidence', () => {
+  it('reads any ok answer as the host holding the message', () => {
+    expect(structuredAgentSessionSendEvidence(recorded).kind).toBe('recorded')
+  })
+
+  it('reads a row the host returns, in any state, as its own from then on', () => {
+    for (const dispatchState of ['pending', 'accepted', 'rejected', 'unknown'] as const) {
+      expect(structuredAgentSessionSendEvidence(withRow({ dispatchState })).kind).toBe('recorded')
+    }
+    // A restart lost its outcome, or a queued card's hand-off: a record, never a probe.
+    const rows: Partial<AgentJournalSubmission>[] = [
+      { dispatchState: 'unknown', recovered: true, reason: 'host_restarted' },
+      { dispatchState: 'rejected', clientMessageId: 'other', queuedMessageId: 'm' },
+      { dispatchState: 'rejected', keptAsQueuedMessageId: 'm' }
+    ]
+    for (const row of rows) {
+      expect(structuredAgentSessionSendEvidence(withRow(row)).kind).toBe('recorded')
+    }
+  })
+
+  it('reads a made-up row for an id the host journal lost as unconfirmed, not recorded', () => {
+    expect(
+      structuredAgentSessionSendEvidence(
+        withRow({
+          dispatchState: 'unknown',
+          reason: 'durable_send_submission_missing',
+          recovered: true
+        })
+      ).kind
+    ).toBe('uncertain')
+  })
+
+  it('reads no thrown error as proof: a timeout, a closed socket or a thrown refusal', () => {
+    for (const rpcCode of [
+      'runtime_timeout',
+      'remote_runtime_unavailable',
+      'runtime_unavailable',
+      undefined
+    ]) {
+      expect(structuredAgentSessionSendEvidence(thrown(rpcCode)).kind).toBe('uncertain')
+    }
+    const thrownRefusal = {
+      response: { error: { data: { refusal: { code: 'agent_session_journal_unreadable' } } } }
+    }
+    expect(
+      structuredAgentSessionSendEvidence({
+        kind: 'thrown',
+        error: thrownRefusal,
+        rpcCode: 'invalid_argument'
+      }).kind
+    ).toBe('uncertain')
+  })
+
+  it('treats a call the host turned away before running it as never written', () => {
+    for (const rpcCode of ['method_not_found', 'invalid_argument', 'unauthorized']) {
+      expect(structuredAgentSessionSendEvidence(thrown(rpcCode)).kind).toBe('not-recorded')
+    }
+  })
+
+  it('reads an unknown outcome or a lost result as unconfirmed, and an unconfirmed rewind as not sent', () => {
+    for (const reason of ['outcomeUnknown', 'resultLost']) {
+      expect(
+        structuredAgentSessionSendEvidence(refused('agent_session_operation_unknown', reason)).kind
+      ).toBe('uncertain')
+    }
+    expect(
+      structuredAgentSessionSendEvidence(
+        refused('agent_session_operation_unknown', 'rewindUnconfirmed')
+      ).kind
+    ).toBe('not-recorded')
+  })
+
+  // The one request is the only one that carried the id, so a refusal of it proves nothing ran.
+  it('reads any other refusal as never written', () => {
+    for (const answer of [
+      refused('agent_session_ownership_unknown', 'sessionNotAttached'),
+      refused('agent_session_conflict'),
+      refused('agent_session_operation_capacity'),
+      refused('agent_session_journal_unreadable'),
+      refused('agent_session_operation_expired', 'operationExpired')
+    ]) {
+      expect(structuredAgentSessionSendEvidence(answer).kind).toBe('not-recorded')
+    }
+  })
+})
diff --git a/src/shared/structured-agent-session-send-evidence.ts b/src/shared/structured-agent-session-send-evidence.ts
new file mode 100644
index 000000000000..8046f21d1e05
--- /dev/null
+++ b/src/shared/structured-agent-session-send-evidence.ts
@@ -0,0 +1,66 @@
+// What the answer to a send's one `agentSession.send` request proves about its message.
+
+import type { AgentSessionMutationResult, AgentSessionSendResult } from './agent-session-wire'
+import {
+  agentSessionRefusalFailure,
+  agentSessionRpcErrorFailure,
+  readAgentSessionErrorRefusal,
+  type AgentSessionWriteFailure
+} from './agent-session-write-failure'
+
+/** The reason a host gives a made-up `unknown` row: its ledger has the id and its journal does not,
+ *  so the message may never have been written. */
+export const STRUCTURED_AGENT_SESSION_SUBMISSION_MISSING = 'durable_send_submission_missing'
+
+export type StructuredAgentSessionSendAnswer =
+  | { kind: 'result'; result: AgentSessionMutationResult<AgentSessionSendResult> }
+  | { kind: 'thrown'; error: unknown; rpcCode: string | undefined }
+
+export type StructuredAgentSessionSendEvidence =
+  /** The host holds the message (a row in any state, or a queued card): it is the host's now. */
+  | { kind: 'recorded' }
+  /** The host holds nothing under this id and runs nothing for it: the text goes back. */
+  | { kind: 'not-recorded'; failure: AgentSessionWriteFailure }
+  /** An answer that proves nothing (a lost one included): it may already be in the chat. */
+  | { kind: 'uncertain' }
+
+// RPC codes a host answers before it runs the method: nothing under the id was written.
+const TURNED_AWAY_RPC_CODES: ReadonlySet<string> = new Set([
+  'method_not_found',
+  'method_not_supported',
+  'invalid_argument',
+  'unauthorized'
+])
+
+/** What the answer to a send's one request proves. Nothing sends it again, so no answer is ever
+ *  read against an earlier attempt. */
+export function structuredAgentSessionSendEvidence(
+  answer: StructuredAgentSessionSendAnswer
+): StructuredAgentSessionSendEvidence {
+  if (answer.kind === 'thrown') {
+    // A thrown error, a thrown refusal included, is never proof: the host may have written first.
+    return answer.rpcCode !== undefined &&
+      TURNED_AWAY_RPC_CODES.has(answer.rpcCode) &&
+      readAgentSessionErrorRefusal(answer.error) === undefined
+      ? { kind: 'not-recorded', failure: agentSessionRpcErrorFailure(answer.rpcCode) }
+      : { kind: 'uncertain' }
+  }
+  const { result } = answer
+  if (result.ok) {
+    const value: AgentSessionSendResult = result.value
+    // A made-up row for an id the host's ledger holds and its journal lost.
+    return 'submission' in value &&
+      value.submission.reason === STRUCTURED_AGENT_SESSION_SUBMISSION_MISSING
+      ? { kind: 'uncertain' }
+      : { kind: 'recorded' }
+  }
+  const failure = agentSessionRefusalFailure(result.refusal)
+  // "Outcome unknown" is never proof; an unconfirmed rewind is the host saying the send never ran.
+  if (failure.kind === 'refused' && failure.code === 'agent_session_operation_unknown') {
+    return failure.details?.reason === 'rewindUnconfirmed'
+      ? { kind: 'not-recorded', failure }
+      : { kind: 'uncertain' }
+  }
+  // This request was the only one that carried the id, so nothing under it is recorded or running.
+  return { kind: 'not-recorded', failure }
+}
diff --git a/src/shared/structured-agent-session-send-mutation.ts b/src/shared/structured-agent-session-send-mutation.ts
index ddefedb5ab54..f5a674213017 100644
--- a/src/shared/structured-agent-session-send-mutation.ts
+++ b/src/shared/structured-agent-session-send-mutation.ts
@@ -53,3 +53,25 @@ export function structuredAgentSessionMessageSendMutation(message: {
     ...delivery
   }
 }
+
+export type StructuredAgentSessionAttachment = {
+  path: string
+  previewUri: string
+  /** The SSH connection a remote image lives on; kept by the client, never sent. */
+  connectionId?: string
+}
+
+/** The journal body for a message a person sends: its text, then its images. */
+export function structuredAgentSessionSendBody(
+  text: string,
+  attachments: readonly StructuredAgentSessionAttachment[]
+): AgentJournalMessageItem {
+  return {
+    kind: 'message',
+    role: 'user',
+    blocks: [
+      ...(text.trim().length > 0 ? [{ type: 'text' as const, text: text.trimEnd() }] : []),
+      ...attachments.map((attachment) => ({ type: 'image-ref' as const, path: attachment.path }))
+    ]
+  }
+}
diff --git a/src/shared/structured-agent-session-status-block.ts b/src/shared/structured-agent-session-status-block.ts
index 58dbbe9131c9..080f3c5de53b 100644
--- a/src/shared/structured-agent-session-status-block.ts
+++ b/src/shared/structured-agent-session-status-block.ts
@@ -1,18 +1,29 @@
 import { readAgentSessionFailureFact } from './agent-session-failure'
-import type { AgentJournalStatusItem } from './agent-session-journal-types'
+import type { AgentJournalStatusItem, AgentJournalTurnScope } from './agent-session-journal-types'
+import { readAgentSessionOrcaStop } from './agent-session-orca-stop'
 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
+  body: AgentJournalStatusItem,
+  turnScope?: AgentJournalTurnScope
 ): NativeChatTextBlock {
   const failure = readAgentSessionFailureFact(body.failure)
+  const orcaStop = readAgentSessionOrcaStop(body.orcaStop)
   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 } : {})
+    ...(failure ? { failure } : {}),
+    ...(orcaStop
+      ? {
+          orcaStop: {
+            ...orcaStop,
+            ...(turnScope?.kind === 'turn' ? { turnItemId: turnScope.turnItemId } : {})
+          }
+        }
+      : {})
   }
 }
diff --git a/src/shared/structured-agent-session-surface-capabilities.ts b/src/shared/structured-agent-session-surface-capabilities.ts
index c04a4851a774..54388dd4fbe3 100644
--- a/src/shared/structured-agent-session-surface-capabilities.ts
+++ b/src/shared/structured-agent-session-surface-capabilities.ts
@@ -6,6 +6,10 @@
 // a client that does not (an older client would list them with an empty pane).
 export const STRUCTURED_AGENT_SESSION_REGISTERED_AGENTS_RUNTIME_CAPABILITY =
   'agent-session.structured.registered-agents.v1' as const
+// Pi's dialog cards have a newer shape than the registered-agents reader alone promises.
+// A client advertises this only after it can render and answer those cards.
+export const PI_STRUCTURED_DIALOGS_RUNTIME_CAPABILITY =
+  'agent-session.structured.pi-dialogs.v1' as const
 // Why: paired structured clients explicitly hold every visible session surface, allowing the host
 // to stop provider children after the last surface closes without tying lifetime to a transport.
 export const STRUCTURED_AGENT_SESSION_HOLD_RUNTIME_CAPABILITY =
@@ -26,5 +30,6 @@ export const STRUCTURED_AGENT_SESSION_SURFACE_RUNTIME_CAPABILITIES = [
   STRUCTURED_AGENT_SESSION_HOLD_RUNTIME_CAPABILITY,
   STRUCTURED_AGENT_SESSION_REVEAL_RUNTIME_CAPABILITY,
   STRUCTURED_AGENT_SESSION_REGISTERED_AGENTS_RUNTIME_CAPABILITY,
+  PI_STRUCTURED_DIALOGS_RUNTIME_CAPABILITY,
   STRUCTURED_AGENT_SESSION_RESUME_HISTORY_RUNTIME_CAPABILITY
 ] as const
diff --git a/src/shared/structured-native-chat-launch-route.test.ts b/src/shared/structured-native-chat-launch-route.test.ts
index cab2d382b4f7..2f7d01017f13 100644
--- a/src/shared/structured-native-chat-launch-route.test.ts
+++ b/src/shared/structured-native-chat-launch-route.test.ts
@@ -121,11 +121,14 @@ describe('agents beyond Claude and Codex', () => {
     STRUCTURED_AGENT_SESSION_REGISTERED_AGENTS_RUNTIME_CAPABILITY
   ]
 
-  it('are offered only by a host that advertises and lists them', () => {
-    expect(
-      support({ agent: 'grok', hostCapabilities: REGISTERED, hostStructuredAgents: ['grok'] })
-    ).toEqual({ supported: true })
-  })
+  it.each(['grok', 'pi'] as const)(
+    '%s is offered only by a host that advertises and lists it',
+    (agent) => {
+      expect(
+        support({ agent, hostCapabilities: REGISTERED, hostStructuredAgents: [agent] })
+      ).toEqual({ supported: true })
+    }
+  )
 
   it('are not offered by a host that does not advertise its registered agents', () => {
     expect(support({ agent: 'grok', hostStructuredAgents: ['grok'] })).toEqual({
diff --git a/src/renderer/src/components/native-chat/structured-session-background-tasks-view.test.ts b/src/shared/structured-session-background-tasks-view.test.ts
similarity index 97%
rename from src/renderer/src/components/native-chat/structured-session-background-tasks-view.test.ts
rename to src/shared/structured-session-background-tasks-view.test.ts
index f814f89e2fdd..285fcce3f1d3 100644
--- a/src/renderer/src/components/native-chat/structured-session-background-tasks-view.test.ts
+++ b/src/shared/structured-session-background-tasks-view.test.ts
@@ -1,5 +1,5 @@
 import { describe, expect, it } from 'vitest'
-import type { AgentChildWorkView } from '../../../../shared/agent-status-child-work-view'
+import type { AgentChildWorkView } from './agent-status-child-work-view'
 import { structuredSessionBackgroundTasksView } from './structured-session-background-tasks-view'
 
 function view(membership: 'live' | 'settled', kind: AgentChildWorkView['kind'] = 'agent') {
diff --git a/src/renderer/src/components/native-chat/structured-session-background-tasks-view.ts b/src/shared/structured-session-background-tasks-view.ts
similarity index 92%
rename from src/renderer/src/components/native-chat/structured-session-background-tasks-view.ts
rename to src/shared/structured-session-background-tasks-view.ts
index f9782d9beb17..14421548755e 100644
--- a/src/renderer/src/components/native-chat/structured-session-background-tasks-view.ts
+++ b/src/shared/structured-session-background-tasks-view.ts
@@ -12,9 +12,9 @@
 import type {
   AgentSessionBackgroundTask,
   AgentSessionBackgroundTaskState
-} from '../../../../shared/agent-session-wire'
-import { agentChildWorkLiveness } from '../../../../shared/agent-status-child-work-liveness'
-import type { AgentChildWorkView } from '../../../../shared/agent-status-child-work-view'
+} from './agent-session-wire'
+import { agentChildWorkLiveness } from './agent-status-child-work-liveness'
+import type { AgentChildWorkView } from './agent-status-child-work-view'
 
 export type StructuredSessionBackgroundTasksView = {
   /** The strip renders whenever the host reports rows — mid-turn included. */
diff --git a/src/shared/task-source-context.test.ts b/src/shared/task-source-context.test.ts
index f73aa3872db7..a3c3141dc40e 100644
--- a/src/shared/task-source-context.test.ts
+++ b/src/shared/task-source-context.test.ts
@@ -117,6 +117,21 @@ describe('task source context', () => {
     expect(local).not.toBe(enterpriseRepo)
   })
 
+  it('separates named task accounts without changing legacy anonymous cache scopes', () => {
+    const source = { provider: 'linear', projectId: 'project', hostId: 'runtime:owner' } as const
+    const legacy = getTaskSourceCacheScope(source)
+    expect(getTaskSourceCacheScope({ ...source, accountLabel: null })).toBe(legacy)
+    expect(getTaskSourceCacheScope({ ...source, accountLabel: ' account-a ' })).toBe(
+      getTaskSourceCacheScope({ ...source, accountLabel: 'account-a' })
+    )
+    const account = getTaskSourceCacheScope({ ...source, accountLabel: 'account-a' })
+    expect(account).not.toBe(legacy)
+    expect(account).not.toBe(getTaskSourceCacheScope({ ...source, accountLabel: 'account-b' }))
+    expect(account).not.toBe(
+      getTaskSourceCacheScope({ ...source, hostId: 'local', accountLabel: 'account-a' })
+    )
+  })
+
   it('serializes provider identities for GitLab, Linear, and Jira cache scopes', () => {
     const base = {
       projectId: 'project-1',
diff --git a/src/shared/task-source-context.ts b/src/shared/task-source-context.ts
index 78f5ec9e8cf2..f6d2ca1532ab 100644
--- a/src/shared/task-source-context.ts
+++ b/src/shared/task-source-context.ts
@@ -155,6 +155,7 @@ export function getTaskSourceCacheScope(
   context: Pick<TaskSourceContext, 'provider' | 'hostId' | 'projectId' | 'projectHostSetupId'> & {
     providerIdentity?: TaskProviderIdentity | null
     repoId?: string | null
+    accountLabel?: string | null
   }
 ): string {
   return [
@@ -163,7 +164,8 @@ export function getTaskSourceCacheScope(
     context.projectId,
     context.projectHostSetupId ?? '',
     context.repoId ?? '',
-    taskProviderIdentityCachePart(context.providerIdentity)
+    taskProviderIdentityCachePart(context.providerIdentity),
+    ...(context.accountLabel?.trim() ? [context.accountLabel.trim()] : [])
   ]
     .map(encodeCachePart)
     .join(':')
diff --git a/src/shared/terminal-navigation-runtime-capabilities.ts b/src/shared/terminal-navigation-runtime-capabilities.ts
new file mode 100644
index 000000000000..7e5fbd5d7412
--- /dev/null
+++ b/src/shared/terminal-navigation-runtime-capabilities.ts
@@ -0,0 +1,21 @@
+import { AGENT_LAUNCH_RUNTIME_CAPABILITIES } from './agent-launch-runtime-capability'
+
+// Why a separate module: protocol-version.ts sits at its max-lines ceiling, so these fork
+// terminal navigation/question capabilities live here and ride the tail of RUNTIME_CAPABILITIES
+// together with upstream's agent-launch list (one spread line in protocol-version.ts).
+export const TERMINAL_SESSION_NAVIGATION_RUNTIME_CAPABILITY =
+  'terminal.session-navigation.v1' as const
+export const TERMINAL_ORIGINATING_PANE_NAVIGATION_RUNTIME_CAPABILITY =
+  'terminal.originating-pane-navigation.v1' as const
+export const TERMINAL_QUESTION_ANSWER_RUNTIME_CAPABILITY = 'terminal.question-answer.v1' as const
+
+export const TERMINAL_NAVIGATION_RUNTIME_CAPABILITIES = [
+  TERMINAL_SESSION_NAVIGATION_RUNTIME_CAPABILITY,
+  TERMINAL_ORIGINATING_PANE_NAVIGATION_RUNTIME_CAPABILITY,
+  TERMINAL_QUESTION_ANSWER_RUNTIME_CAPABILITY
+] as const
+
+export const FORK_TERMINAL_AND_AGENT_LAUNCH_RUNTIME_CAPABILITIES = [
+  ...TERMINAL_NAVIGATION_RUNTIME_CAPABILITIES,
+  ...AGENT_LAUNCH_RUNTIME_CAPABILITIES
+] as const
diff --git a/src/shared/terminal-pane-placement.test.ts b/src/shared/terminal-pane-placement.test.ts
index 71e1c027ea48..1ff106cf846c 100644
--- a/src/shared/terminal-pane-placement.test.ts
+++ b/src/shared/terminal-pane-placement.test.ts
@@ -2,6 +2,7 @@ import { describe, expect, it } from 'vitest'
 import { parseTerminalPanePlacement } from './terminal-pane-placement'
 
 const LEAF = '11111111-1111-4111-8111-111111111111'
+const OTHER_LEAF = '22222222-2222-4222-8222-222222222222'
 
 describe('parseTerminalPanePlacement', () => {
   it('accepts each kind', () => {
@@ -11,6 +12,49 @@ describe('parseTerminalPanePlacement', () => {
     expect(parseTerminalPanePlacement({ kind: 'root' })).toEqual({ kind: 'root' })
   })
 
+  it('keeps a new tab row and a split ratio and proposed tree', () => {
+    const newTab = {
+      kind: 'new-tab',
+      row: {
+        title: 'Terminal 2',
+        customTitle: null,
+        color: '#f97316',
+        createdAt: 1,
+        viewMode: 'chat'
+      }
+    }
+    const split = {
+      kind: 'split',
+      parentLeafId: LEAF,
+      direction: 'horizontal',
+      ratio: 0.3,
+      proposedRoot: {
+        type: 'split',
+        direction: 'horizontal',
+        first: { type: 'leaf', leafId: OTHER_LEAF },
+        second: { type: 'leaf', leafId: LEAF },
+        ratio: 0.3
+      }
+    }
+    expect(parseTerminalPanePlacement(newTab)).toEqual(newTab)
+    expect(parseTerminalPanePlacement(split)).toEqual(split)
+  })
+
+  it('drops only a malformed optional field', () => {
+    expect(parseTerminalPanePlacement({ kind: 'new-tab', row: { createdAt: 'now' } })).toEqual({
+      kind: 'new-tab'
+    })
+    expect(
+      parseTerminalPanePlacement({
+        kind: 'split',
+        parentLeafId: LEAF,
+        direction: 'vertical',
+        ratio: 'half',
+        proposedRoot: { type: 'tree' }
+      })
+    ).toEqual({ kind: 'split', parentLeafId: LEAF, direction: 'vertical' })
+  })
+
   it('strips fields a newer sender adds', () => {
     expect(parseTerminalPanePlacement({ kind: 'root', future: 1 })).toEqual({ kind: 'root' })
     expect(parseTerminalPanePlacement({ kind: 'new-tab', size: { cols: 120, rows: 40 } })).toEqual({
diff --git a/src/shared/terminal-pane-placement.ts b/src/shared/terminal-pane-placement.ts
index 361922446ff3..9627f6d9edc6 100644
--- a/src/shared/terminal-pane-placement.ts
+++ b/src/shared/terminal-pane-placement.ts
@@ -1,7 +1,28 @@
 import { z } from 'zod'
 import { isTerminalLeafId } from './stable-pane-id'
+import { terminalPaneLayoutNodeSchema, terminalTabSchema } from './workspace-session-schema'
 
-const NewTabPlacement = z.object({ kind: z.literal('new-tab') })
+// The creation fields of the tab the renderer made, so main need not wait for its save.
+const NewTabRow = terminalTabSchema
+  .pick({
+    title: true,
+    defaultTitle: true,
+    customTitle: true,
+    color: true,
+    createdAt: true,
+    startupCwd: true,
+    quickCommandLabel: true,
+    launchAgent: true,
+    viewMode: true
+  })
+  .extend({ shellOverride: z.string().optional() })
+  .partial()
+
+// Optional fields degrade alone: a malformed one is dropped, not the whole placement.
+const NewTabPlacement = z.object({
+  kind: z.literal('new-tab'),
+  row: NewTabRow.optional().catch(undefined)
+})
 
 const SplitPlacement = z.object({
   kind: z.literal('split'),
@@ -9,7 +30,10 @@ const SplitPlacement = z.object({
     .string()
     .max(128)
     .refine((value): boolean => isTerminalLeafId(value)),
-  direction: z.enum(['horizontal', 'vertical'])
+  direction: z.enum(['horizontal', 'vertical']),
+  ratio: z.number().optional().catch(undefined),
+  /** The tab's tree after the split, which `parentLeafId` alone can't express (subtrees, before/after). */
+  proposedRoot: terminalPaneLayoutNodeSchema.optional().catch(undefined)
 })
 
 // An existing tab whose layout is still empty.
@@ -21,6 +45,8 @@ const TerminalPanePlacementSchema = z.discriminatedUnion('kind', [
   RootPlacement
 ])
 
+export type TerminalPaneNewTabRow = z.infer<typeof NewTabRow>
+
 /** Which tab and leaf a new PTY joins; a binding reads it only for a leaf it does not know yet. */
 export type TerminalPanePlacement = z.infer<typeof TerminalPanePlacementSchema>
 
diff --git a/src/shared/terminal-partial-escape-tail-ground-scan.test.ts b/src/shared/terminal-partial-escape-tail-ground-scan.test.ts
index fb3c29b65597..7dfa7e39873d 100644
--- a/src/shared/terminal-partial-escape-tail-ground-scan.test.ts
+++ b/src/shared/terminal-partial-escape-tail-ground-scan.test.ts
@@ -26,16 +26,16 @@ describe('partial escape scanning between sequences', () => {
   it.each([
     ['\x1b[38;5;', '196m'],
     ['\x1b]2;building', '\x07'],
-    ['\x1b]2;building\x1b', '\\'],
+    ['\x1b]2;building\x1b', '\\', '\x1b'],
     ['\x1bPqpayload', '\x1b\\'],
-    ['\x1bPqpayload\x1b', '\\'],
+    ['\x1bPqpayload\x1b', '\\', '\x1b'],
     ['\x1b(', 'B']
-  ])('preserves %j through every split after ordinary text', (pending, completion) => {
+  ])('preserves %j through every split after ordinary text', (pending, completion, expected = pending) => {
     const prefix = `\x1b[32m${'build output '.repeat(128)}\x1b[0m`
     for (let split = 0; split <= pending.length; split += 1) {
       const first = advancePartialEscapeTail('', prefix + pending.slice(0, split))
       const continued = advancePartialEscapeTail(first, pending.slice(split))
-      expect(continued).toBe(pending)
+      expect(continued).toBe(expected)
       expect(advancePartialEscapeTail(continued, `${completion}ready`)).toBe('')
     }
   })
diff --git a/src/shared/terminal-partial-escape-tail.fuzz.test.ts b/src/shared/terminal-partial-escape-tail.fuzz.test.ts
index 8fa015d6b035..791d6755d81b 100644
--- a/src/shared/terminal-partial-escape-tail.fuzz.test.ts
+++ b/src/shared/terminal-partial-escape-tail.fuzz.test.ts
@@ -188,6 +188,7 @@ describe('advancePartialEscapeTail differential fuzz', () => {
 
   it('ran the whole corpus', () => {
     expect(checked).toBe(963_819)
-    expect(foldSplits).toBe(6_236_429)
+    // Completed strings retain only ESC, so the same corpus has fewer tail splits.
+    expect(foldSplits).toBe(6_234_666)
   })
 })
diff --git a/src/shared/terminal-partial-escape-tail.ts b/src/shared/terminal-partial-escape-tail.ts
index 5c735dd86ec5..3dba2d4ad52f 100644
--- a/src/shared/terminal-partial-escape-tail.ts
+++ b/src/shared/terminal-partial-escape-tail.ts
@@ -146,6 +146,10 @@ export function extractPartialEscapeTail(stream: string): string {
         break
     }
   }
+  // ESC already ends a string in xterm; replay only its pending escape state.
+  if (state === 'oscEsc' || state === 'stringEsc') {
+    return '\x1b'
+  }
   return state === 'ground' ? '' : stream.slice(start)
 }
 
diff --git a/src/shared/workspace-attachment-capabilities.ts b/src/shared/workspace-attachment-capabilities.ts
new file mode 100644
index 000000000000..05827689d575
--- /dev/null
+++ b/src/shared/workspace-attachment-capabilities.ts
@@ -0,0 +1,7 @@
+export const WORKTREE_LINKED_ITEMS_RUNTIME_CAPABILITY = 'worktree.linked-items.v1'
+export const WORKTREE_LINKED_ITEMS_DELTA_RUNTIME_CAPABILITY = 'worktree.linked-items-delta.v1'
+
+export const WORKSPACE_ATTACHMENT_RUNTIME_CAPABILITIES = [
+  WORKTREE_LINKED_ITEMS_RUNTIME_CAPABILITY,
+  WORKTREE_LINKED_ITEMS_DELTA_RUNTIME_CAPABILITY
+] as const
diff --git a/src/shared/workspace-attachment-legacy.ts b/src/shared/workspace-attachment-legacy.ts
new file mode 100644
index 000000000000..4535739a5e2a
--- /dev/null
+++ b/src/shared/workspace-attachment-legacy.ts
@@ -0,0 +1,84 @@
+import type { WorktreeMeta } from './worktree/meta-types'
+import type { WorkspaceAttachment } from './worktree/types'
+import { normalizeWorkspaceAttachments } from './workspace-attachment-normalization'
+
+export const WORKSPACE_ATTACHMENT_NUMBER_SLOTS = [
+  ['linkedIssue', 'github', 'issue'],
+  ['linkedPR', 'github', 'pr'],
+  ['linkedGitLabMR', 'gitlab', 'mr'],
+  ['linkedGitLabIssue', 'gitlab', 'issue'],
+  ['linkedBitbucketPR', 'bitbucket', 'pr'],
+  ['linkedAzureDevOpsPR', 'azure-devops', 'pr'],
+  ['linkedGiteaPR', 'gitea', 'pr']
+] as const
+
+export const WORKSPACE_ATTACHMENT_LEGACY_FIELDS = [
+  ...WORKSPACE_ATTACHMENT_NUMBER_SLOTS.map(([slot]) => [slot] as const),
+  ['linkedLinearIssue', 'linkedLinearIssueWorkspaceId', 'linkedLinearIssueOrganizationUrlKey'],
+  ['linkedWorkItem', 'linkedTaskSourceContext']
+] as const
+
+export type WorkspaceAttachmentMetadata = Partial<
+  Pick<
+    WorktreeMeta,
+    (typeof WORKSPACE_ATTACHMENT_LEGACY_FIELDS)[number][number] | 'linkedItems' | 'pushTarget'
+  >
+>
+
+export function getLegacyWorkspaceReviewSelectionUpdates(
+  updates: Partial<WorktreeMeta>
+): Partial<WorktreeMeta> {
+  const reviews = WORKSPACE_ATTACHMENT_NUMBER_SLOTS.filter(([, , type]) => type !== 'issue')
+  const selected = reviews.find(([slot]) => typeof updates[slot] === 'number' && updates[slot] > 0)
+  if (updates.linkedItems !== undefined || !selected) {
+    return updates
+  }
+  return {
+    ...updates,
+    ...Object.fromEntries(
+      reviews.filter(([slot]) => slot !== selected[0]).map(([slot]) => [slot, null])
+    )
+  }
+}
+
+export function pickWorkspaceAttachmentFields(
+  meta: WorkspaceAttachmentMetadata | undefined,
+  fields: readonly (keyof WorkspaceAttachmentMetadata)[]
+): WorkspaceAttachmentMetadata {
+  return Object.fromEntries(fields.map((field) => [field, meta?.[field]]))
+}
+
+export function legacyWorkspaceAttachments(
+  meta: WorkspaceAttachmentMetadata
+): WorkspaceAttachment[] {
+  const items: unknown[] = WORKSPACE_ATTACHMENT_NUMBER_SLOTS.map(([slot, provider, type]) => ({
+    provider,
+    type,
+    number: meta[slot]
+  }))
+  // Rich identities carry the task source before their compatibility slots are folded in.
+  if (meta.linkedWorkItem) {
+    items.unshift({
+      ...meta.linkedWorkItem,
+      taskSourceContext: meta.linkedTaskSourceContext,
+      ...(meta.linkedWorkItem.provider === 'linear'
+        ? {
+            linearWorkspaceId: meta.linkedLinearIssueWorkspaceId,
+            linearOrganizationUrlKey: meta.linkedLinearIssueOrganizationUrlKey
+          }
+        : {})
+    })
+  }
+  if (meta.linkedLinearIssue?.trim()) {
+    items.push({
+      provider: 'linear',
+      type: 'issue',
+      number: 0,
+      identifier: meta.linkedLinearIssue ?? undefined,
+      linearIdentifier: meta.linkedLinearIssue ?? undefined,
+      linearWorkspaceId: meta.linkedLinearIssueWorkspaceId ?? undefined,
+      linearOrganizationUrlKey: meta.linkedLinearIssueOrganizationUrlKey ?? undefined
+    })
+  }
+  return normalizeWorkspaceAttachments(items)
+}
diff --git a/src/shared/workspace-attachment-mutation.ts b/src/shared/workspace-attachment-mutation.ts
new file mode 100644
index 000000000000..2e6f5a4dea62
--- /dev/null
+++ b/src/shared/workspace-attachment-mutation.ts
@@ -0,0 +1,107 @@
+import { rebaseWorkspaceAttachmentOrigins } from './workspace-attachment-origins'
+import type { WorkspaceAttachment } from './worktree/types'
+import {
+  getWorkspaceAttachmentKey,
+  matchesWorkspaceAttachmentIdentity,
+  normalizeWorkspaceAttachments
+} from './workspace-attachment-normalization'
+
+/** Mutation-only snapshot; never persisted with workspace metadata. */
+export type WorkspaceAttachmentMutation = {
+  linkedItemsBase?: WorkspaceAttachment[]
+  linkedItemsSelectionChanged?: boolean
+}
+
+export function mergeWorkspaceAttachmentMutation(
+  base: readonly WorkspaceAttachment[],
+  current: readonly WorkspaceAttachment[],
+  requested: readonly WorkspaceAttachment[]
+): WorkspaceAttachment[] {
+  const currentKeys = new Set(current.map(getWorkspaceAttachmentKey))
+  const baseKey = (item: WorkspaceAttachment): string => {
+    const key = getWorkspaceAttachmentKey(item)
+    if (currentKeys.has(key)) {
+      return key
+    }
+    const matches = current.filter((candidate) =>
+      matchesWorkspaceAttachmentIdentity(candidate, item)
+    )
+    const requestedVersions = requested.filter((candidate) =>
+      matchesWorkspaceAttachmentIdentity(candidate, item)
+    )
+    if (
+      matches.length === 1 &&
+      (requestedVersions.length === 0 ||
+        requestedVersions.some(
+          (candidate) =>
+            matchesWorkspaceAttachmentIdentity(matches[0], candidate) ||
+            matchesWorkspaceAttachmentIdentity(candidate, matches[0])
+        ))
+    ) {
+      return getWorkspaceAttachmentKey(matches[0])
+    }
+    return key
+  }
+  const mutationKey = (item: WorkspaceAttachment): string => {
+    const key = getWorkspaceAttachmentKey(item)
+    if (currentKeys.has(key)) {
+      return key
+    }
+    const previous = base.filter((candidate) => matchesWorkspaceAttachmentIdentity(item, candidate))
+    const original = previous.length === 1 ? previous[0] : undefined
+    return original &&
+      requested.filter((candidate) => matchesWorkspaceAttachmentIdentity(candidate, original))
+        .length === 1
+      ? baseKey(original)
+      : key
+  }
+  const baseByKey = new Map(base.map((item) => [baseKey(item), item]))
+  const requestedByKey = new Map(requested.map((item) => [mutationKey(item), item]))
+  const retained = current
+    .filter((item) => {
+      const key = getWorkspaceAttachmentKey(item)
+      return !baseByKey.has(key) || requestedByKey.has(key)
+    })
+    .map((item) => {
+      const key = getWorkspaceAttachmentKey(item)
+      const changed = requestedByKey.get(key)
+      if (!changed || JSON.stringify(baseByKey.get(key)) === JSON.stringify(changed)) {
+        return item
+      }
+      const previous = baseByKey.get(key)
+      const fields = [
+        'title',
+        'url',
+        'repoId',
+        'identifier',
+        'linearIdentifier',
+        'jiraIdentifier',
+        'linearWorkspaceId',
+        'linearOrganizationUrlKey',
+        'taskSourceContext'
+      ] as const
+      const patch = Object.fromEntries(
+        fields
+          .filter((field) => JSON.stringify(previous?.[field]) !== JSON.stringify(changed[field]))
+          .map((field) => [field, changed[field]])
+      )
+      return {
+        ...item,
+        ...patch,
+        ...(changed.origins !== undefined
+          ? {
+              origins: rebaseWorkspaceAttachmentOrigins(
+                item.origins,
+                previous?.origins,
+                changed.origins
+              )
+            }
+          : {})
+      }
+    })
+  const additions = requested.filter((item) => {
+    const key = mutationKey(item)
+    return !baseByKey.has(key) && !currentKeys.has(key)
+  })
+  return normalizeWorkspaceAttachments([...retained, ...additions])
+}
diff --git a/src/shared/workspace-attachment-normalization.ts b/src/shared/workspace-attachment-normalization.ts
new file mode 100644
index 000000000000..b393f76fc07a
--- /dev/null
+++ b/src/shared/workspace-attachment-normalization.ts
@@ -0,0 +1,227 @@
+import {
+  normalizeWorkspaceAttachmentOrigins,
+  mergeWorkspaceAttachmentOrigins
+} from './workspace-attachment-origins'
+import type { WorkspaceAttachment, WorkspaceLinkedItem } from './worktree/types'
+import { getTaskSourceCacheScope, normalizeStoredTaskSourceContext } from './task-source-context'
+import { normalizeWorkspaceLinkedItem } from './workspace-linked-item'
+import { isWorkspaceLinkedItemSourceContextMatch } from './workspace-linked-item-source-context'
+
+function nonEmpty(value: unknown): string | undefined {
+  return typeof value === 'string' && value.trim() ? value.trim() : undefined
+}
+
+export function normalizeWorkspaceAttachment(value: unknown): WorkspaceAttachment | null {
+  if (!value || typeof value !== 'object' || Array.isArray(value)) {
+    return null
+  }
+  const raw: Record<string, unknown> = Object.fromEntries(Object.entries(value))
+  const provider = raw.provider
+  if (
+    provider !== 'github' &&
+    provider !== 'gitlab' &&
+    provider !== 'linear' &&
+    provider !== 'jira' &&
+    provider !== 'bitbucket' &&
+    provider !== 'azure-devops' &&
+    provider !== 'gitea'
+  ) {
+    return null
+  }
+  const type = raw.type
+  if (type !== 'issue' && type !== 'pr' && type !== 'mr') {
+    return null
+  }
+  if ((provider === 'linear' || provider === 'jira') && type !== 'issue') {
+    return null
+  }
+  if (type === 'mr' && provider !== 'gitlab') {
+    return null
+  }
+  if (typeof raw.number !== 'number' || !Number.isSafeInteger(raw.number) || raw.number < 0) {
+    return null
+  }
+  const identifier =
+    nonEmpty(raw.identifier) ?? nonEmpty(raw.linearIdentifier) ?? nonEmpty(raw.jiraIdentifier)
+  if (raw.number === 0 && (!identifier || (provider !== 'linear' && provider !== 'jira'))) {
+    return null
+  }
+  if (raw.url !== undefined) {
+    try {
+      const url = new URL(String(raw.url))
+      if (typeof raw.url !== 'string' || (url.protocol !== 'https:' && url.protocol !== 'http:')) {
+        return null
+      }
+    } catch {
+      return null
+    }
+  }
+  const item: WorkspaceAttachment = {
+    provider,
+    type,
+    number: raw.number,
+    ...(identifier ? { identifier } : {}),
+    ...(nonEmpty(raw.title) ? { title: nonEmpty(raw.title) } : {}),
+    ...(nonEmpty(raw.url) ? { url: nonEmpty(raw.url) } : {}),
+    ...(raw.origins !== undefined
+      ? { origins: normalizeWorkspaceAttachmentOrigins(raw.origins) }
+      : {}),
+    ...(nonEmpty(raw.repoId) ? { repoId: nonEmpty(raw.repoId) } : {}),
+    ...(nonEmpty(raw.linearIdentifier) ? { linearIdentifier: nonEmpty(raw.linearIdentifier) } : {}),
+    ...(nonEmpty(raw.jiraIdentifier) ? { jiraIdentifier: nonEmpty(raw.jiraIdentifier) } : {}),
+    ...(nonEmpty(raw.linearWorkspaceId)
+      ? { linearWorkspaceId: nonEmpty(raw.linearWorkspaceId) }
+      : {}),
+    ...(nonEmpty(raw.linearOrganizationUrlKey)
+      ? { linearOrganizationUrlKey: nonEmpty(raw.linearOrganizationUrlKey) }
+      : {})
+  }
+  const context = normalizeStoredTaskSourceContext(raw.taskSourceContext)
+  const linkedItem = normalizeWorkspaceLinkedItem({
+    ...item,
+    title: item.title ?? identifier ?? String(item.number),
+    jiraIdentifier: item.jiraIdentifier ?? (provider === 'jira' ? identifier : undefined)
+  })
+  if (
+    context &&
+    context.provider === provider &&
+    (provider !== 'jira' ||
+      (linkedItem && isWorkspaceLinkedItemSourceContextMatch(linkedItem, context)))
+  ) {
+    item.taskSourceContext = context
+  }
+  return item
+}
+
+function attachmentIdentity(item: WorkspaceAttachment): string {
+  return JSON.stringify([
+    item.provider,
+    item.type,
+    item.provider === 'linear' || item.provider === 'jira'
+      ? (item.identifier ?? item.linearIdentifier ?? item.jiraIdentifier ?? item.number)
+      : item.number
+  ])
+}
+
+export function getWorkspaceAttachmentKey(item: WorkspaceAttachment): string {
+  return JSON.stringify([
+    attachmentIdentity(item),
+    item.taskSourceContext ? getTaskSourceCacheScope(item.taskSourceContext) : '',
+    item.repoId ?? '',
+    item.linearWorkspaceId ?? '',
+    item.linearOrganizationUrlKey ?? '',
+    getWorkspaceAttachmentUrlScope(item)
+  ])
+}
+
+export function getWorkspaceAttachmentUrlScope(item: WorkspaceAttachment): string {
+  if (!item.url) {
+    return ''
+  }
+  try {
+    const url = new URL(item.url)
+    return (
+      url.origin +
+      url.pathname
+        .replace(
+          /\/(?:pull|pulls|issues|merge_requests|pull-requests|pullrequest|browse|issue)\/[^/]+(?:\/.*)?$/,
+          ''
+        )
+        .replace(/\/-$/, '')
+    )
+  } catch {
+    return ''
+  }
+}
+
+export function normalizeWorkspaceAttachments(value: unknown): WorkspaceAttachment[] {
+  if (!Array.isArray(value)) {
+    return []
+  }
+  const items = new Map<string, WorkspaceAttachment>()
+  for (const raw of value) {
+    const item = normalizeWorkspaceAttachment(raw)
+    if (!item) {
+      continue
+    }
+    const key = getWorkspaceAttachmentKey(item)
+    const previous = items.get(key)
+    items.set(key, {
+      ...previous,
+      ...item,
+      ...(previous?.origins || item.origins
+        ? { origins: mergeWorkspaceAttachmentOrigins(previous?.origins, item.origins) }
+        : {})
+    })
+  }
+  let normalized = [...items.values()]
+  while (true) {
+    const retained = normalized.filter((item) => {
+      const richer = normalized.filter(
+        (candidate) =>
+          getWorkspaceAttachmentKey(candidate) !== getWorkspaceAttachmentKey(item) &&
+          matchesWorkspaceAttachmentIdentity(candidate, item)
+      )
+      return richer.length !== 1
+    })
+    const retainedItems = new Set(retained)
+    for (const candidate of normalized) {
+      if (retainedItems.has(candidate)) {
+        continue
+      }
+      const matches = retained.filter((item) => matchesWorkspaceAttachmentIdentity(item, candidate))
+      const enriched = matches.length === 1 ? matches[0] : undefined
+      if (enriched) {
+        Object.assign(enriched, {
+          ...candidate,
+          ...enriched,
+          ...(candidate.origins || enriched.origins
+            ? { origins: mergeWorkspaceAttachmentOrigins(candidate.origins, enriched.origins) }
+            : {})
+        })
+      }
+    }
+    if (retained.length === normalized.length) {
+      return retained
+    }
+    normalized = retained
+  }
+}
+
+export function matchesWorkspaceAttachmentIdentity(
+  item: WorkspaceAttachment,
+  legacy: WorkspaceAttachment
+): boolean {
+  if (attachmentIdentity(item) !== attachmentIdentity(legacy)) {
+    return false
+  }
+  if (legacy.taskSourceContext) {
+    return getWorkspaceAttachmentKey(item) === getWorkspaceAttachmentKey(legacy)
+  }
+  if (
+    legacy.url &&
+    getWorkspaceAttachmentUrlScope(item) !== getWorkspaceAttachmentUrlScope(legacy)
+  ) {
+    return false
+  }
+  return (
+    (!legacy.repoId || item.repoId === legacy.repoId) &&
+    (!legacy.linearWorkspaceId || item.linearWorkspaceId === legacy.linearWorkspaceId) &&
+    (!legacy.linearOrganizationUrlKey ||
+      item.linearOrganizationUrlKey === legacy.linearOrganizationUrlKey)
+  )
+}
+
+export function toWorkspaceLinkedItem(
+  item: WorkspaceAttachment | undefined
+): WorkspaceLinkedItem | null {
+  if (!item) {
+    return null
+  }
+  return normalizeWorkspaceLinkedItem({
+    ...item,
+    linearIdentifier:
+      item.linearIdentifier ?? (item.provider === 'linear' ? item.identifier : undefined),
+    jiraIdentifier: item.jiraIdentifier ?? (item.provider === 'jira' ? item.identifier : undefined)
+  })
+}
diff --git a/src/shared/workspace-attachment-origins.test.ts b/src/shared/workspace-attachment-origins.test.ts
new file mode 100644
index 000000000000..1917465ce1d7
--- /dev/null
+++ b/src/shared/workspace-attachment-origins.test.ts
@@ -0,0 +1,35 @@
+import { describe, expect, it } from 'vitest'
+import {
+  normalizeWorkspaceAttachmentOrigins,
+  rebaseWorkspaceAttachmentOrigins
+} from './workspace-attachment-origins'
+import type { WorkspaceAttachmentOrigin } from './worktree/types'
+
+describe('reference origin validation and merging', () => {
+  it('keeps absent legacy hosts but rejects invalid explicit hosts', () => {
+    expect(
+      normalizeWorkspaceAttachmentOrigins([
+        { kind: 'observed', tabId: 'legacy' },
+        { kind: 'observed', tabId: 'local', hostId: 'local' },
+        { kind: 'observed', tabId: 'remote', hostId: 'ssh:dev' },
+        { kind: 'observed', tabId: 'invalid', hostId: 'unsupported-host' },
+        { kind: 'observed', tabId: 'blank', hostId: '' },
+        { kind: 'observed', tabId: 'null', hostId: null },
+        { kind: 'assigned', tabId: 'obsolete-manual-assignment' }
+      ]).map((origin) => origin.tabId)
+    ).toEqual(['legacy', 'local', 'remote'])
+  })
+  it('preserves a concurrently observed terminal when a metadata edit removes another', () => {
+    const first: WorkspaceAttachmentOrigin = { kind: 'observed', tabId: 'first', hostId: 'local' }
+    const other: WorkspaceAttachmentOrigin = { kind: 'observed', tabId: 'other', hostId: 'local' }
+    expect(rebaseWorkspaceAttachmentOrigins([first, other], [first], [])).toEqual([other])
+  })
+  it('keeps identically named tabs on different execution hosts distinct', () => {
+    expect(
+      normalizeWorkspaceAttachmentOrigins([
+        { kind: 'observed', tabId: 'same', hostId: 'local' },
+        { kind: 'observed', tabId: 'same', hostId: 'ssh:dev' }
+      ])
+    ).toHaveLength(2)
+  })
+})
diff --git a/src/shared/workspace-attachment-origins.ts b/src/shared/workspace-attachment-origins.ts
new file mode 100644
index 000000000000..7a29ea3f6226
--- /dev/null
+++ b/src/shared/workspace-attachment-origins.ts
@@ -0,0 +1,68 @@
+import type { WorkspaceAttachmentOrigin } from './worktree/types'
+import { parseExecutionHostId } from './execution-host'
+
+export function getWorkspaceAttachmentOriginKey(origin: WorkspaceAttachmentOrigin): string {
+  return JSON.stringify([
+    origin.hostId ?? '',
+    origin.tabId,
+    origin.paneKey ?? '',
+    origin.agent ?? '',
+    origin.sessionId ?? '',
+    origin.kind
+  ])
+}
+
+function originText(value: unknown): string | undefined {
+  return typeof value === 'string' && value.trim() && value.length <= 512 ? value.trim() : undefined
+}
+
+export function normalizeWorkspaceAttachmentOrigins(value: unknown): WorkspaceAttachmentOrigin[] {
+  if (!Array.isArray(value)) {
+    return []
+  }
+  const origins = new Map<string, WorkspaceAttachmentOrigin>()
+  for (const candidate of value.slice(0, 128)) {
+    if (!candidate || typeof candidate !== 'object') {
+      continue
+    }
+    const raw: Record<string, unknown> = Object.fromEntries(Object.entries(candidate))
+    const tabId = originText(raw.tabId)
+    const hostId = parseExecutionHostId(originText(raw.hostId))?.id
+    if ((raw.hostId !== undefined && !hostId) || !tabId || raw.kind !== 'observed') {
+      continue
+    }
+    const origin: WorkspaceAttachmentOrigin = {
+      kind: raw.kind,
+      tabId,
+      ...(originText(raw.paneKey) ? { paneKey: originText(raw.paneKey) } : {}),
+      ...(hostId ? { hostId } : {}),
+      ...(originText(raw.label) ? { label: originText(raw.label) } : {}),
+      ...(originText(raw.agent) ? { agent: originText(raw.agent) } : {}),
+      ...(originText(raw.sessionId) ? { sessionId: originText(raw.sessionId) } : {})
+    }
+    origins.set(getWorkspaceAttachmentOriginKey(origin), origin)
+  }
+  return [...origins.values()]
+}
+
+export function mergeWorkspaceAttachmentOrigins(
+  current: WorkspaceAttachmentOrigin[] | undefined,
+  incoming: WorkspaceAttachmentOrigin[] | undefined
+): WorkspaceAttachmentOrigin[] {
+  return normalizeWorkspaceAttachmentOrigins([...(current ?? []), ...(incoming ?? [])])
+}
+
+export function rebaseWorkspaceAttachmentOrigins(
+  current: WorkspaceAttachmentOrigin[] | undefined,
+  base: WorkspaceAttachmentOrigin[] | undefined,
+  requested: WorkspaceAttachmentOrigin[] | undefined
+): WorkspaceAttachmentOrigin[] {
+  const requestedKeys = new Set((requested ?? []).map(getWorkspaceAttachmentOriginKey))
+  const removed = new Set(
+    (base ?? []).map(getWorkspaceAttachmentOriginKey).filter((key) => !requestedKeys.has(key))
+  )
+  return mergeWorkspaceAttachmentOrigins(
+    (current ?? []).filter((origin) => !removed.has(getWorkspaceAttachmentOriginKey(origin))),
+    requested
+  )
+}
diff --git a/src/shared/workspace-attachment-removal.ts b/src/shared/workspace-attachment-removal.ts
new file mode 100644
index 000000000000..4e97419243a9
--- /dev/null
+++ b/src/shared/workspace-attachment-removal.ts
@@ -0,0 +1,25 @@
+import type { WorkspaceAttachment } from './worktree/types'
+import {
+  getWorkspaceAttachmentKey,
+  matchesWorkspaceAttachmentIdentity
+} from './workspace-attachment-normalization'
+
+export function removeSelectedWorkspaceAttachments(
+  items: WorkspaceAttachment[],
+  legacyItems: WorkspaceAttachment[],
+  selectedTask?: WorkspaceAttachment
+): WorkspaceAttachment[] {
+  const removedKeys = new Set<string>()
+  for (const legacy of legacyItems) {
+    const candidates = items.filter((item) => matchesWorkspaceAttachmentIdentity(item, legacy))
+    const selected =
+      selectedTask &&
+      candidates.find((item) => matchesWorkspaceAttachmentIdentity(item, selectedTask))
+    // An unscoped compatibility slot cannot choose between same-number sources.
+    const removed = selected ?? (candidates.length === 1 ? candidates[0] : undefined)
+    if (removed) {
+      removedKeys.add(getWorkspaceAttachmentKey(removed))
+    }
+  }
+  return items.filter((item) => !removedKeys.has(getWorkspaceAttachmentKey(item)))
+}
diff --git a/src/shared/workspace-attachment-schema.ts b/src/shared/workspace-attachment-schema.ts
new file mode 100644
index 000000000000..052a584240d6
--- /dev/null
+++ b/src/shared/workspace-attachment-schema.ts
@@ -0,0 +1,39 @@
+import { normalizeWorkspaceAttachmentOrigins } from './workspace-attachment-origins'
+import { z } from 'zod'
+import { normalizeWorkspaceAttachment } from './workspace-attachment-normalization'
+import type { WorkspaceAttachment } from './worktree/types'
+
+export const WorkspaceAttachmentSchema = z
+  .unknown()
+  .transform((value, ctx): WorkspaceAttachment => {
+    const item = normalizeWorkspaceAttachment(value)
+    if (!item) {
+      ctx.addIssue({ code: 'custom', message: 'Invalid workspace attachment' })
+      return z.NEVER
+    }
+    if (
+      value &&
+      typeof value === 'object' &&
+      'taskSourceContext' in value &&
+      value.taskSourceContext !== undefined &&
+      !item.taskSourceContext
+    ) {
+      ctx.addIssue({ code: 'custom', message: 'Invalid attachment task source context' })
+      return z.NEVER
+    }
+    if (
+      value &&
+      typeof value === 'object' &&
+      'origins' in value &&
+      value.origins !== undefined &&
+      (!Array.isArray(value.origins) ||
+        value.origins.length > 128 ||
+        value.origins.some((origin) => normalizeWorkspaceAttachmentOrigins([origin]).length !== 1))
+    ) {
+      ctx.addIssue({ code: 'custom', message: 'Invalid attachment origins' })
+      return z.NEVER
+    }
+    return item
+  })
+
+export const WorkspaceAttachmentsSchema = z.array(WorkspaceAttachmentSchema)
diff --git a/src/shared/workspace-attachments.test.ts b/src/shared/workspace-attachments.test.ts
new file mode 100644
index 000000000000..d5537df2468b
--- /dev/null
+++ b/src/shared/workspace-attachments.test.ts
@@ -0,0 +1,365 @@
+import { describe, expect, it } from 'vitest'
+import type { WorkspaceAttachment } from './worktree/types'
+import {
+  getWorkspaceAttachments,
+  normalizeWorkspaceAttachmentUpdate
+} from './workspace-attachments'
+import {
+  getWorkspaceAttachmentKey,
+  normalizeWorkspaceAttachments
+} from './workspace-attachment-normalization'
+import { WorktreeSet } from './rpc-contract/worktree-params'
+import { FolderWorkspaceUpdate } from './rpc-contract/folder-workspace-params'
+
+const pr = (number: number): WorkspaceAttachment => ({ provider: 'github', type: 'pr', number })
+
+describe('workspace attachments', () => {
+  it('reads old metadata and enriches matching collection entries without duplicate compatibility links', () => {
+    const item = {
+      ...pr(7),
+      title: 'Seven',
+      url: 'https://github.com/a/repo/pull/7',
+      repoId: 'repo-a'
+    }
+    expect(getWorkspaceAttachments({ linkedPR: 7, linkedItems: [item] })).toEqual([item])
+    expect(getWorkspaceAttachments({ linkedPR: 7, linkedIssue: 8 })).toEqual([
+      { provider: 'github', type: 'issue', number: 8 },
+      pr(7)
+    ])
+  })
+
+  it('retains previous attachments when replacing an active scalar and removes only the explicitly unlinked review', () => {
+    const first = normalizeWorkspaceAttachmentUpdate({ linkedPR: 7 }, { linkedPR: 8 })
+    expect(first.linkedItems).toEqual([pr(7), pr(8)])
+    const removed = normalizeWorkspaceAttachmentUpdate(
+      { ...first, linkedPR: 8 },
+      { linkedPR: null }
+    )
+    expect(removed.linkedItems).toEqual([pr(7)])
+    expect(removed.linkedPR).toBeNull()
+  })
+
+  it('uses explicit arrays as authoritative and selects a remaining review after removal', () => {
+    const updated = normalizeWorkspaceAttachmentUpdate(
+      { linkedPR: 7, linkedItems: [pr(7), pr(8)] },
+      { linkedItems: [pr(8)] }
+    )
+    expect(updated.linkedPR).toBe(8)
+    expect(getWorkspaceAttachments(updated)).toEqual([pr(8)])
+    const cleared = normalizeWorkspaceAttachmentUpdate(updated, { linkedItems: [] })
+    expect(cleared.linkedPR).toBeNull()
+    expect(getWorkspaceAttachments(cleared)).toEqual([])
+  })
+
+  it('honors a newly selected review across providers', () => {
+    const mr: WorkspaceAttachment = { provider: 'gitlab', type: 'mr', number: 20 }
+    const updated = normalizeWorkspaceAttachmentUpdate(
+      { linkedPR: 7, linkedItems: [pr(7), mr] },
+      { linkedItems: [pr(7), mr], linkedGitLabMR: 20 }
+    )
+    expect(updated.linkedPR).toBeNull()
+    expect(updated.linkedGitLabMR).toBe(20)
+  })
+
+  it('repairs malformed entries and duplicates while retaining reviews from separate URL/repository scopes', () => {
+    const one = { ...pr(7), url: 'https://github.com/A/one/pull/7' }
+    const two = { ...pr(7), url: 'https://github.com/A/two/pull/7' }
+    expect(
+      normalizeWorkspaceAttachments([
+        null,
+        2,
+        {},
+        pr(0),
+        { ...pr(7), url: 'javascript:alert(1)' },
+        one,
+        one,
+        two
+      ])
+    ).toEqual([one, two])
+    expect(getWorkspaceAttachmentKey(one)).not.toBe(getWorkspaceAttachmentKey(two))
+    expect(normalizeWorkspaceAttachments([pr(7), one])).toEqual([one])
+  })
+
+  it('keeps Linear issue identities distinct across organizations', () => {
+    const one: WorkspaceAttachment = {
+      provider: 'linear',
+      type: 'issue',
+      number: 0,
+      identifier: 'APP-1',
+      linearOrganizationUrlKey: 'one'
+    }
+    const two = { ...one, linearOrganizationUrlKey: 'two' }
+    expect(normalizeWorkspaceAttachments([one, two])).toEqual([one, two])
+  })
+
+  it('leaves unrelated metadata writes untouched', () => {
+    const updates = { comment: 'Ready for review' }
+    expect(normalizeWorkspaceAttachmentUpdate({ linkedPR: 7 }, updates)).toBe(updates)
+  })
+
+  it('clears the other compatibility representation of an unlinked rich task', () => {
+    const item = {
+      provider: 'github' as const,
+      type: 'issue' as const,
+      number: 7,
+      title: 'Task',
+      url: 'https://github.com/a/repo/issues/7'
+    }
+    const existing = { linkedWorkItem: item, linkedIssue: 7 }
+    const removed = normalizeWorkspaceAttachmentUpdate(existing, { linkedIssue: null })
+    expect(removed.linkedWorkItem).toBeNull()
+    expect(getWorkspaceAttachments({ ...existing, ...removed })).toEqual([])
+    const genericRemoved = normalizeWorkspaceAttachmentUpdate(existing, { linkedWorkItem: null })
+    expect(genericRemoved.linkedIssue).toBeNull()
+    expect(getWorkspaceAttachments({ ...existing, ...genericRemoved })).toEqual([])
+  })
+
+  it('accepts optional collections on RPC contracts and rejects invalid collection writes', () => {
+    expect(WorktreeSet.parse({ worktree: 'wt' }).linkedItems).toBeUndefined()
+    expect(
+      WorktreeSet.parse({ worktree: 'wt', linkedItems: [pr(7), pr(8)] }).linkedItems
+    ).toHaveLength(2)
+    expect(
+      WorktreeSet.safeParse({
+        worktree: 'wt',
+        linkedItems: [{ provider: 'github', type: 'pr', number: -2 }]
+      }).success
+    ).toBe(false)
+    expect(
+      WorktreeSet.safeParse({
+        worktree: 'wt',
+        linkedItems: [
+          { ...pr(7), taskSourceContext: { provider: 'jira', projectId: 'wrong', hostId: 'local' } }
+        ]
+      }).success
+    ).toBe(false)
+    expect(
+      FolderWorkspaceUpdate.parse({
+        folderWorkspaceId: 'folder',
+        updates: { linkedItems: [pr(7)] }
+      }).updates.linkedItems
+    ).toEqual([pr(7)])
+  })
+  it('selects a legacy review exclusively without losing other provider references', () => {
+    const mr: WorkspaceAttachment = { provider: 'gitlab', type: 'mr', number: 20 }
+    const updated = normalizeWorkspaceAttachmentUpdate(
+      { linkedPR: 7, linkedItems: [pr(7)] },
+      { linkedGitLabMR: 20 }
+    )
+    expect(updated).toMatchObject({ linkedPR: null, linkedGitLabMR: 20, linkedItems: [pr(7), mr] })
+  })
+
+  it('unlinks only the selected rich source when numbers collide and preserves ambiguous sources', () => {
+    const first: WorkspaceAttachment = {
+      provider: 'github',
+      type: 'issue',
+      number: 42,
+      title: 'A',
+      url: 'https://github.com/a/one/issues/42'
+    }
+    const second: WorkspaceAttachment = {
+      ...first,
+      title: 'B',
+      url: 'https://github.com/b/two/issues/42'
+    }
+    const ambiguous = normalizeWorkspaceAttachmentUpdate(
+      { linkedItems: [first, second], linkedIssue: 42 },
+      { linkedIssue: null }
+    )
+    expect(ambiguous.linkedItems).toEqual([first, second])
+    const selected = normalizeWorkspaceAttachmentUpdate(
+      {
+        linkedItems: [first, second],
+        linkedIssue: 42,
+        linkedWorkItem: {
+          provider: 'github',
+          type: 'issue',
+          number: first.number,
+          title: first.title ?? 'A',
+          url: first.url ?? ''
+        }
+      },
+      { linkedIssue: null }
+    )
+    expect(selected.linkedItems).toEqual([second])
+    expect(selected.linkedWorkItem).toBeNull()
+  })
+
+  it('merges a client delta with current host additions without resurrecting concurrent removals', () => {
+    const result = normalizeWorkspaceAttachmentUpdate(
+      { linkedItems: [pr(2), pr(3)], linkedPR: 3 },
+      { linkedItemsBase: [pr(1), pr(2)], linkedItems: [pr(1), pr(4)] }
+    )
+    expect(result.linkedItems).toEqual([pr(3), pr(4)])
+    expect(result).not.toHaveProperty('linkedItemsBase')
+    expect(
+      WorktreeSet.parse({ worktree: 'wt', linkedItems: [pr(4)], linkedItemsBase: [pr(1)] })
+    ).toHaveProperty('linkedItemsBase', [pr(1)])
+    expect(
+      FolderWorkspaceUpdate.parse({
+        folderWorkspaceId: 'f',
+        updates: { linkedItems: [pr(4)], linkedItemsBase: [pr(1)] }
+      }).updates
+    ).toHaveProperty('linkedItemsBase', [pr(1)])
+  })
+
+  it('merges concurrent origin edits including explicit removal', () => {
+    const a = { kind: 'observed' as const, tabId: 'a' }
+    const b = { kind: 'observed' as const, tabId: 'b' }
+    const c = { kind: 'observed' as const, tabId: 'c' }
+    const result = normalizeWorkspaceAttachmentUpdate(
+      { linkedItems: [{ ...pr(1), origins: [a, b] }] },
+      { linkedItemsBase: [{ ...pr(1), origins: [a] }], linkedItems: [{ ...pr(1), origins: [c] }] }
+    )
+    expect(result.linkedItems?.[0].origins).toEqual([b, c])
+  })
+  it('preserves a concurrent selected review when collection edits did not select another', () => {
+    const result = normalizeWorkspaceAttachmentUpdate(
+      { linkedItems: [pr(1), pr(2)], linkedPR: 2 },
+      {
+        linkedItemsBase: [pr(1), pr(2)],
+        linkedItems: [pr(1), pr(2), pr(3)],
+        linkedPR: 1,
+        linkedItemsSelectionChanged: false
+      }
+    )
+    expect(result.linkedPR).toBe(2)
+    const intentional = normalizeWorkspaceAttachmentUpdate(
+      { linkedItems: [pr(1), pr(2)], linkedPR: 2 },
+      {
+        linkedItemsBase: [pr(1), pr(2)],
+        linkedItems: [pr(1), pr(2)],
+        linkedPR: 1,
+        linkedItemsSelectionChanged: true
+      }
+    )
+    expect(intentional.linkedPR).toBe(1)
+  })
+
+  it('keeps concurrent metadata when only origins were edited', () => {
+    const a = { kind: 'observed' as const, tabId: 'a' }
+    const result = normalizeWorkspaceAttachmentUpdate(
+      { linkedItems: [{ ...pr(1), title: 'Fresh title' }] },
+      {
+        linkedItemsBase: [{ ...pr(1), title: 'Old title' }],
+        linkedItems: [{ ...pr(1), title: 'Old title', origins: [a] }]
+      }
+    )
+    expect(result.linkedItems?.[0]).toMatchObject({ title: 'Fresh title', origins: [a] })
+  })
+  it('removes a reference enriched after the edit began without removing ambiguous sources', () => {
+    const enriched = { ...pr(7), url: 'https://github.com/a/repo/pull/7' }
+    const removed = normalizeWorkspaceAttachmentUpdate(
+      { linkedItems: [enriched], linkedPR: 7 },
+      { linkedItemsBase: [pr(7)], linkedItems: [] }
+    )
+    expect(removed.linkedItems).toEqual([])
+    const other = { ...pr(7), url: 'https://github.com/b/repo/pull/7' }
+    expect(
+      normalizeWorkspaceAttachmentUpdate(
+        { linkedItems: [enriched, other] },
+        { linkedItemsBase: [pr(7)], linkedItems: [] }
+      ).linkedItems
+    ).toEqual([enriched, other])
+  })
+
+  it('keeps title and terminal observations when a richer identity replaces a duplicate', () => {
+    const origin = { kind: 'observed' as const, tabId: 'terminal' }
+    expect(
+      normalizeWorkspaceAttachments([
+        { ...pr(7), title: 'Seven', origins: [origin] },
+        { ...pr(7), url: 'https://github.com/a/repo/pull/7' }
+      ])
+    ).toEqual([
+      { ...pr(7), title: 'Seven', origins: [origin], url: 'https://github.com/a/repo/pull/7' }
+    ])
+  })
+
+  it('preserves concurrent origins when both editors enrich an unscoped reference', () => {
+    const first = { kind: 'observed' as const, tabId: 'first' }
+    const second = { kind: 'observed' as const, tabId: 'second' }
+    const enriched = { ...pr(7), url: 'https://github.com/a/repo/pull/7' }
+    expect(
+      normalizeWorkspaceAttachmentUpdate(
+        { linkedItems: [{ ...enriched, origins: [first] }] },
+        { linkedItemsBase: [pr(7)], linkedItems: [{ ...enriched, origins: [second] }] }
+      ).linkedItems
+    ).toEqual([{ ...enriched, origins: [first, second] }])
+  })
+
+  it('does not resurrect a concurrently removed reference when its identity was enriched', () => {
+    expect(
+      normalizeWorkspaceAttachmentUpdate(
+        { linkedItems: [] },
+        {
+          linkedItemsBase: [pr(7)],
+          linkedItems: [{ ...pr(7), url: 'https://github.com/a/repo/pull/7' }]
+        }
+      ).linkedItems
+    ).toEqual([])
+  })
+
+  it('does not overwrite a different scoped replacement with stale enrichment', () => {
+    const other = { ...pr(7), url: 'https://github.com/b/repo/pull/7' }
+    expect(
+      normalizeWorkspaceAttachmentUpdate(
+        { linkedItems: [other] },
+        {
+          linkedItemsBase: [pr(7)],
+          linkedItems: [{ ...pr(7), url: 'https://github.com/a/repo/pull/7' }]
+        }
+      ).linkedItems
+    ).toEqual([other])
+  })
+
+  it('keeps explicit additional scoped references alongside an enriched original', () => {
+    const first = { ...pr(7), url: 'https://github.com/a/repo/pull/7' }
+    const other = { ...pr(7), url: 'https://github.com/b/repo/pull/7' }
+    expect(
+      normalizeWorkspaceAttachmentUpdate(
+        { linkedItems: [other] },
+        { linkedItemsBase: [pr(7)], linkedItems: [first, other] }
+      ).linkedItems
+    ).toEqual([other, first])
+  })
+
+  it('collapses enrichment chains in one normalization without losing origins', () => {
+    const origin = { kind: 'observed' as const, tabId: 'first' }
+    const withUrl = { ...pr(7), url: 'https://github.com/a/repo/pull/7' }
+    const scoped = {
+      ...withUrl,
+      taskSourceContext: {
+        provider: 'github' as const,
+        hostId: 'local' as const,
+        projectId: 'project'
+      }
+    }
+    const normalized = normalizeWorkspaceAttachments([
+      { ...pr(7), origins: [origin] },
+      withUrl,
+      scoped
+    ])
+    expect(normalized).toHaveLength(1)
+    expect(normalized[0]).toMatchObject({ ...scoped, origins: [origin] })
+    expect(normalizeWorkspaceAttachments(normalized)).toEqual(normalized)
+  })
+  it('keeps an explicitly empty selection when incompatible references remain', () => {
+    const mr: WorkspaceAttachment = { provider: 'gitlab', type: 'mr', number: 2 }
+    const result = normalizeWorkspaceAttachmentUpdate(
+      { linkedItems: [pr(1), mr], linkedPR: 1 },
+      {
+        linkedItemsBase: [pr(1), mr],
+        linkedItems: [mr],
+        linkedItemsSelectionChanged: true,
+        linkedPR: null,
+        linkedGitLabMR: null,
+        linkedBitbucketPR: null,
+        linkedAzureDevOpsPR: null,
+        linkedGiteaPR: null
+      }
+    )
+    expect(result.linkedItems).toEqual([mr])
+    expect(result.linkedPR).toBeNull()
+    expect(result.linkedGitLabMR).toBeNull()
+  })
+})
diff --git a/src/shared/workspace-attachments.ts b/src/shared/workspace-attachments.ts
new file mode 100644
index 000000000000..ad2ef2265161
--- /dev/null
+++ b/src/shared/workspace-attachments.ts
@@ -0,0 +1,206 @@
+import {
+  WORKSPACE_ATTACHMENT_NUMBER_SLOTS,
+  WORKSPACE_ATTACHMENT_LEGACY_FIELDS,
+  pickWorkspaceAttachmentFields,
+  legacyWorkspaceAttachments,
+  type WorkspaceAttachmentMetadata
+} from './workspace-attachment-legacy'
+import { removeSelectedWorkspaceAttachments } from './workspace-attachment-removal'
+import type { WorktreeMeta } from './worktree/meta-types'
+import type { WorkspaceAttachment } from './worktree/types'
+import {
+  mergeWorkspaceAttachmentMutation,
+  type WorkspaceAttachmentMutation
+} from './workspace-attachment-mutation'
+import {
+  normalizeWorkspaceAttachments,
+  toWorkspaceLinkedItem,
+  matchesWorkspaceAttachmentIdentity
+} from './workspace-attachment-normalization'
+
+export function getWorkspaceAttachments(
+  meta: WorkspaceAttachmentMetadata | null | undefined
+): WorkspaceAttachment[] {
+  if (!meta) {
+    return []
+  }
+  const items = normalizeWorkspaceAttachments(meta.linkedItems)
+  for (const legacy of legacyWorkspaceAttachments(meta)) {
+    if (!items.some((item) => matchesWorkspaceAttachmentIdentity(item, legacy))) {
+      items.push(legacy)
+    }
+  }
+  return items
+}
+
+function synchronizeSelection(
+  meta: WorkspaceAttachmentMetadata,
+  items: WorkspaceAttachment[],
+  updates: WorkspaceAttachmentMetadata
+): WorkspaceAttachmentMetadata {
+  const result: WorkspaceAttachmentMetadata = { linkedItems: items }
+  const reviews = items.filter((item) => item.type !== 'issue')
+  const selectionCleared = WORKSPACE_ATTACHMENT_NUMBER_SLOTS.filter(
+    ([, , type]) => type !== 'issue'
+  ).every(([slot]) => updates[slot] === null)
+  const selectedReview = selectionCleared
+    ? undefined
+    : (reviews.find((item) =>
+        WORKSPACE_ATTACHMENT_NUMBER_SLOTS.some(
+          ([slot, provider, type]) =>
+            type !== 'issue' &&
+            item.provider === provider &&
+            item.type === type &&
+            updates[slot] === item.number
+        )
+      ) ??
+      reviews.find((item) =>
+        WORKSPACE_ATTACHMENT_NUMBER_SLOTS.some(
+          ([slot, provider, type]) =>
+            type !== 'issue' &&
+            item.provider === provider &&
+            item.type === type &&
+            meta[slot] === item.number
+        )
+      ) ??
+      reviews[0])
+  for (const [slot, provider, type] of WORKSPACE_ATTACHMENT_NUMBER_SLOTS) {
+    const selected =
+      type !== 'issue'
+        ? selectedReview
+        : (items.find(
+            (item) => item.provider === provider && item.type === type && item.number === meta[slot]
+          ) ?? items.find((item) => item.provider === provider && item.type === type))
+    result[slot] =
+      selected?.provider === provider && selected.type === type ? selected.number : null
+  }
+  const linear =
+    items.find(
+      (item) =>
+        item.provider === 'linear' &&
+        (item.identifier ?? item.linearIdentifier) === meta.linkedLinearIssue
+    ) ?? items.find((item) => item.provider === 'linear')
+  result.linkedLinearIssue = linear?.identifier ?? linear?.linearIdentifier ?? null
+  result.linkedLinearIssueWorkspaceId = linear?.linearWorkspaceId ?? null
+  result.linkedLinearIssueOrganizationUrlKey = linear?.linearOrganizationUrlKey ?? null
+  const previous = legacyWorkspaceAttachments({
+    linkedWorkItem: meta.linkedWorkItem,
+    linkedTaskSourceContext: meta.linkedTaskSourceContext
+  })[0]
+  const rich =
+    (previous && items.find((item) => matchesWorkspaceAttachmentIdentity(item, previous))) ??
+    items.find((item) => item.type === 'issue' && toWorkspaceLinkedItem(item))
+  result.linkedWorkItem = toWorkspaceLinkedItem(rich)
+  result.linkedTaskSourceContext = rich?.taskSourceContext ?? null
+  return result
+}
+
+export function normalizeWorkspaceAttachmentUpdate(
+  existing: WorkspaceAttachmentMetadata | undefined,
+  mutation: Partial<WorktreeMeta> & WorkspaceAttachmentMutation
+): Partial<WorktreeMeta> {
+  const { linkedItemsBase, linkedItemsSelectionChanged, ...updates } = mutation
+  const reviewSlots = WORKSPACE_ATTACHMENT_NUMBER_SLOTS.filter(([, , type]) => type !== 'issue')
+  const preserveSelection =
+    linkedItemsBase !== undefined &&
+    updates.linkedItems !== undefined &&
+    linkedItemsSelectionChanged === false
+  const requested = preserveSelection
+    ? Object.fromEntries(
+        Object.entries(updates).filter(([key]) => !reviewSlots.some(([slot]) => slot === key))
+      )
+    : updates
+  if (
+    !Object.entries(requested).some(
+      ([key, value]) => key.startsWith('linked') && value !== undefined
+    )
+  ) {
+    return 'linkedItemsBase' in mutation || 'linkedItemsSelectionChanged' in mutation
+      ? requested
+      : mutation
+  }
+  const merged = {
+    ...existing,
+    ...Object.fromEntries(Object.entries(requested).filter(([, value]) => value !== undefined))
+  }
+  if (updates.linkedItems !== undefined) {
+    const items =
+      linkedItemsBase === undefined
+        ? normalizeWorkspaceAttachments(updates.linkedItems)
+        : mergeWorkspaceAttachmentMutation(
+            linkedItemsBase,
+            getWorkspaceAttachments(existing),
+            updates.linkedItems
+          )
+    const normalized = { ...requested, ...synchronizeSelection(merged, items, requested) }
+    if (
+      preserveSelection &&
+      Object.hasOwn(updates, 'pushTarget') &&
+      reviewSlots.some(([slot]) => (normalized[slot] ?? null) !== (updates[slot] ?? null))
+    ) {
+      normalized.pushTarget = existing?.pushTarget
+    }
+    return normalized
+  }
+  let items = getWorkspaceAttachments(existing)
+  const selectedTask = legacyWorkspaceAttachments({
+    linkedWorkItem: existing?.linkedWorkItem,
+    linkedTaskSourceContext: existing?.linkedTaskSourceContext
+  })[0]
+  for (const fields of WORKSPACE_ATTACHMENT_LEGACY_FIELDS) {
+    if (updates[fields[0]] === null) {
+      items = removeSelectedWorkspaceAttachments(
+        items,
+        legacyWorkspaceAttachments(pickWorkspaceAttachmentFields(existing, fields)),
+        selectedTask
+      )
+    }
+  }
+  // Do not resurrect a removed rich item through its other compatibility slot.
+  const additions = legacyWorkspaceAttachments({
+    ...updates,
+    ...(updates.linkedWorkItem !== undefined
+      ? { linkedTaskSourceContext: merged.linkedTaskSourceContext }
+      : {}),
+    ...(updates.linkedLinearIssue !== undefined
+      ? {
+          linkedLinearIssueWorkspaceId: merged.linkedLinearIssueWorkspaceId,
+          linkedLinearIssueOrganizationUrlKey: merged.linkedLinearIssueOrganizationUrlKey
+        }
+      : {})
+  })
+  for (const item of additions) {
+    const index = items.findIndex((candidate) =>
+      matchesWorkspaceAttachmentIdentity(candidate, item)
+    )
+    if (index === -1) {
+      items.push(item)
+    } else {
+      items[index] = { ...items[index], ...item }
+    }
+  }
+  const result: WorkspaceAttachmentMetadata = {
+    ...updates,
+    linkedItems: normalizeWorkspaceAttachments(items)
+  }
+  const selectedReviewSlot = WORKSPACE_ATTACHMENT_NUMBER_SLOTS.find(
+    ([slot, , type]) => type !== 'issue' && typeof updates[slot] === 'number'
+  )?.[0]
+  if (selectedReviewSlot) {
+    for (const [slot, , type] of WORKSPACE_ATTACHMENT_NUMBER_SLOTS) {
+      if (type !== 'issue' && slot !== selectedReviewSlot) {
+        result[slot] = null
+      }
+    }
+  }
+  for (const fields of WORKSPACE_ATTACHMENT_LEGACY_FIELDS) {
+    if (updates[fields[0]] !== undefined) {
+      continue
+    }
+    const previous = legacyWorkspaceAttachments(pickWorkspaceAttachmentFields(existing, fields))[0]
+    if (previous && !items.some((item) => matchesWorkspaceAttachmentIdentity(item, previous))) {
+      Object.assign(result, Object.fromEntries(fields.map((field) => [field, null])))
+    }
+  }
+  return result
+}
diff --git a/src/shared/workspace-review-checks.test.ts b/src/shared/workspace-review-checks.test.ts
new file mode 100644
index 000000000000..82a3b5918021
--- /dev/null
+++ b/src/shared/workspace-review-checks.test.ts
@@ -0,0 +1,117 @@
+import { describe, expect, it } from 'vitest'
+import type { WorkspaceAttachment } from './worktree/types'
+import { getWorkspaceAttachmentKey } from './workspace-attachment-normalization'
+import {
+  summarizeWorkspaceReviewChecks,
+  type WorkspaceReviewCheckDetails
+} from './workspace-review-checks'
+
+function attachment(number: number, provider: 'github' | 'gitlab' = 'github'): WorkspaceAttachment {
+  return {
+    provider,
+    type: provider === 'gitlab' ? 'mr' : 'pr',
+    number,
+    url:
+      provider === 'github'
+        ? `https://github.com/acme/orca/pull/${number}`
+        : `https://gitlab.com/acme/orca/-/merge_requests/${number}`
+  }
+}
+function details(
+  item: WorkspaceAttachment,
+  status: 'success' | 'failure' | 'pending' | 'neutral',
+  stale = false
+): WorkspaceReviewCheckDetails {
+  return { stale, review: { provider: item.provider, number: item.number, url: item.url, status } }
+}
+function map(
+  entries: [WorkspaceAttachment, WorkspaceReviewCheckDetails][]
+): Record<string, WorkspaceReviewCheckDetails> {
+  return Object.fromEntries(
+    entries.map(([item, detail]) => [getWorkspaceAttachmentKey(item), detail])
+  )
+}
+
+describe('all workspace review checks', () => {
+  it('aggregates every review rather than a selected compatibility slot', () => {
+    const first = attachment(1)
+    const second = attachment(2)
+    expect(
+      summarizeWorkspaceReviewChecks(
+        [first, second],
+        map([
+          [first, details(first, 'success')],
+          [second, details(second, 'failure')]
+        ])
+      )
+    ).toMatchObject({ state: 'failure', total: 2, known: 2, passed: 1, failed: 1 })
+  })
+  it('keeps all unknown or partially known collections from looking green', () => {
+    const first = attachment(1)
+    const second = attachment(2)
+    expect(summarizeWorkspaceReviewChecks([first, second], {})).toMatchObject({
+      state: 'unknown',
+      unknown: 2
+    })
+    expect(
+      summarizeWorkspaceReviewChecks([first, second], map([[first, details(first, 'success')]]))
+    ).toMatchObject({ state: 'unknown', known: 1, unknown: 1 })
+  })
+  it('gives pending checks precedence over unknown data and passing over neutral', () => {
+    const first = attachment(1)
+    const second = attachment(2)
+    expect(
+      summarizeWorkspaceReviewChecks([first, second], map([[first, details(first, 'pending')]]))
+    ).toMatchObject({ state: 'pending' })
+    expect(
+      summarizeWorkspaceReviewChecks(
+        [first, second],
+        map([
+          [first, details(first, 'neutral')],
+          [second, details(second, 'success')]
+        ])
+      )
+    ).toMatchObject({ state: 'success' })
+  })
+  it('never certifies stale success and conservatively retains stale failure', () => {
+    const item = attachment(1)
+    expect(
+      summarizeWorkspaceReviewChecks([item], map([[item, details(item, 'success', true)]]))
+    ).toMatchObject({ state: 'unknown', stale: 1 })
+    expect(
+      summarizeWorkspaceReviewChecks([item], map([[item, details(item, 'failure', true)]]))
+    ).toMatchObject({ state: 'failure', stale: 1 })
+  })
+  it('isolates equal numbers by provider and repository scope', () => {
+    const github = attachment(1)
+    const gitlab = attachment(1, 'gitlab')
+    const foreign = { ...github, url: 'https://github.com/other/project/pull/1' }
+    expect(
+      summarizeWorkspaceReviewChecks(
+        [github, gitlab],
+        map([
+          [github, details(gitlab, 'success')],
+          [gitlab, details(github, 'failure')]
+        ])
+      )
+    ).toMatchObject({ state: 'unknown', unknown: 2, failed: 0 })
+    expect(
+      summarizeWorkspaceReviewChecks([github], map([[github, details(foreign, 'success')]]))
+    ).toMatchObject({ state: 'unknown', unknown: 1 })
+  })
+  it('ignores tasks and deduplicates review metadata without filtering lifecycle states', () => {
+    const first = attachment(1)
+    const second = attachment(2)
+    const task: WorkspaceAttachment = { provider: 'github', type: 'issue', number: 3 }
+    expect(
+      summarizeWorkspaceReviewChecks(
+        [first, first, second, task],
+        map([
+          [first, details(first, 'failure')],
+          [second, details(second, 'success')]
+        ])
+      )
+    ).toMatchObject({ total: 2, failed: 1, state: 'failure' })
+    expect(summarizeWorkspaceReviewChecks([task], {})).toMatchObject({ state: 'none', total: 0 })
+  })
+})
diff --git a/src/shared/workspace-review-checks.ts b/src/shared/workspace-review-checks.ts
new file mode 100644
index 000000000000..a161f23f55fb
--- /dev/null
+++ b/src/shared/workspace-review-checks.ts
@@ -0,0 +1,74 @@
+import type { CheckStatus, ProviderCheckSummary } from './github/pull-request-types'
+import { resolveProviderCheckState } from './provider-check-summary'
+import type { WorkspaceAttachment } from './worktree/types'
+import {
+  getWorkspaceAttachmentKey,
+  getWorkspaceAttachmentUrlScope,
+  normalizeWorkspaceAttachments
+} from './workspace-attachment-normalization'
+
+export type WorkspaceReviewCheckDetails = {
+  stale?: boolean
+  review?: { provider: string; number: number; url?: string; status?: CheckStatus }
+}
+
+export type WorkspaceReviewChecksSummary = Omit<ProviderCheckSummary, 'state'> & {
+  state: ProviderCheckSummary['state'] | 'unknown'
+  known: number
+  unknown: number
+  stale: number
+}
+
+export function summarizeWorkspaceReviewChecks(
+  attachments: readonly WorkspaceAttachment[],
+  details: Readonly<Record<string, WorkspaceReviewCheckDetails | undefined>>
+): WorkspaceReviewChecksSummary {
+  const reviews = normalizeWorkspaceAttachments(attachments).filter((item) => item.type !== 'issue')
+  const summary: WorkspaceReviewChecksSummary = {
+    state: 'none',
+    total: reviews.length,
+    known: 0,
+    unknown: 0,
+    stale: 0,
+    passed: 0,
+    failed: 0,
+    pending: 0,
+    neutral: 0
+  }
+  for (const item of reviews) {
+    const detail = details[getWorkspaceAttachmentKey(item)]
+    const review = detail?.review
+    const matches =
+      review &&
+      review.provider === item.provider &&
+      review.number === item.number &&
+      (!item.url ||
+        (review.url &&
+          getWorkspaceAttachmentUrlScope(item) ===
+            getWorkspaceAttachmentUrlScope({ ...item, url: review.url })))
+    if (!matches || !review.status) {
+      summary.unknown += 1
+      continue
+    }
+    summary.known += 1
+    if (detail?.stale) {
+      summary.stale += 1
+    }
+    if (review.status === 'failure') {
+      summary.failed += 1
+    } else if (review.status === 'pending') {
+      summary.pending += 1
+    } else if (review.status === 'success') {
+      summary.passed += 1
+    } else {
+      summary.neutral += 1
+    }
+  }
+  const state = resolveProviderCheckState(summary)
+  // Missing or stale reviews cannot certify the workspace green; known failures still count.
+  summary.state =
+    state !== 'failure' && state !== 'pending' && (summary.unknown > 0 || summary.stale > 0)
+      ? 'unknown'
+      : state
+  return summary
+}
diff --git a/src/shared/workspace-session-schema.ts b/src/shared/workspace-session-schema.ts
index 5274cb8be3e9..bf67f580a247 100644
--- a/src/shared/workspace-session-schema.ts
+++ b/src/shared/workspace-session-schema.ts
@@ -51,7 +51,7 @@ const workspaceKeySchema = z.custom<WorkspaceKey>(
 // Why: z.lazy + type annotation keeps the recursive inference working without
 // forcing zod to resolve the whole tree at definition time. Discriminated on `type` because a
 // plain union re-tries the leaf branch for every split node of every restored terminal layout.
-const terminalPaneLayoutNodeSchema: z.ZodType<TerminalPaneLayoutNode> = z.lazy(() =>
+export const terminalPaneLayoutNodeSchema: z.ZodType<TerminalPaneLayoutNode> = z.lazy(() =>
   z.discriminatedUnion('type', [
     z.object({
       type: z.literal('leaf'),
@@ -82,7 +82,7 @@ const terminalLayoutSnapshotSchema = z.object({
 
 // ─── Terminal tab (legacy) ──────────────────────────────────────────
 
-const terminalTabSchema = z.object({
+export const terminalTabSchema = z.object({
   id: terminalTabIdSchema,
   ptyId: z.string().nullable(),
   worktreeId: z.string(),
diff --git a/src/shared/workspace-session-stranded-partition-adoption.ts b/src/shared/workspace-session-stranded-partition-adoption.ts
index 8be7e1f81eb3..c36d35b4bef4 100644
--- a/src/shared/workspace-session-stranded-partition-adoption.ts
+++ b/src/shared/workspace-session-stranded-partition-adoption.ts
@@ -51,7 +51,10 @@ import {
  * that anything was closed (`mergeDirectSshRemoteWorkspaceSession` argues this at length, and
  * docs/reference/ssh-execution-boundary.md makes it general — "we could not see it" is
  * `unverifiable`, never proof of absence). Treating it as the truth is what published an empty tab
- * list and let `replace-session` delete the host's copy (#12721).
+ * list and let `replace-session` delete the host's copy (#12721). Nor is a copy of a workspace the
+ * repo catalog places on this host while the host holds its tabs: the base's rows there are residue
+ * that dropped the host's agent-resume records on the first save (#23390, #25616), so they are
+ * dropped before adoption — except unsaved drafts, which nothing else holds.
  */
 
 type KeyedRecord = Record<string, unknown>
@@ -126,39 +129,17 @@ function collectWorkspaceIds(
       collected.add(workspaceId)
     }
   }
+  // Tab-, pane- and file-keyed rows resolve to nothing here: the worktree-keyed rows they hang
+  // off already name their workspaces.
+  const none = new Map<string, string>()
   for (const field of SESSION_FIELDS) {
-    const ownership: WorkspaceSessionFieldOwnership = WORKSPACE_SESSION_FIELD_OWNERSHIP[field]
-    const value = host[field]
-    switch (ownership) {
-      case 'global':
-      case 'hostPrivate':
-      case 'tabKeyed':
-      case 'paneKeyed':
-      case 'fileKeyed':
-        // Keyed by something the workspaces below already account for.
-        break
-      case 'worktreeKeyed':
-        for (const key of Object.keys(asRecord(value) ?? {})) {
-          consider(key)
-        }
-        break
-      case 'worktreeArray':
-        // oxlint-disable-next-line typescript/consistent-type-assertions -- SAFETY: worktreeArray fields hold worktree ids; the ownership table is what says so, not the value's static type.
-        for (const id of Array.isArray(value) ? (value as string[]) : []) {
-          consider(id)
-        }
-        break
-      case 'sleepingAgentKeyed':
-      case 'surfaceTombstoneKeyed':
-        for (const entry of Object.values(asRecord(value) ?? {})) {
-          consider(recordWorkspaceId(entry))
-        }
-        break
-      case 'browserWorkspaceKeyed':
-        for (const entry of Object.values(asRecord(value) ?? {})) {
-          consider(browserPagesWorkspaceId(entry))
-        }
-        break
+    const workspaceOf = entryWorkspaceResolver(field, none, none)
+    const value: unknown = host[field]
+    const entries = Array.isArray(value)
+      ? value.map((id: unknown) => [id, id] as const)
+      : Object.entries(asRecord(value) ?? {})
+    for (const [key, entry] of entries) {
+      consider(typeof key === 'string' ? workspaceOf?.(key, entry) : null)
     }
   }
   return collected
@@ -250,6 +231,83 @@ export function partitionRowsTheWriteWontReturn(
   return parked as WorkspaceSessionState | null
 }
 
+/** Which workspace an entry of a scoped field belongs to; null for global and host-private fields. */
+function entryWorkspaceResolver(
+  field: keyof WorkspaceSessionState,
+  worktreeIdByTabId: Map<string, string>,
+  worktreeIdByFileId: Map<string, string>
+): ((key: string, entry: unknown) => string | null | undefined) | null {
+  const ownership: WorkspaceSessionFieldOwnership = WORKSPACE_SESSION_FIELD_OWNERSHIP[field]
+  switch (ownership) {
+    case 'global':
+    case 'hostPrivate':
+      return null
+    case 'worktreeKeyed':
+    case 'worktreeArray':
+      return (key) => key
+    case 'tabKeyed':
+      return (key) => worktreeIdByTabId.get(key)
+    case 'paneKeyed':
+      return (key) => worktreeIdForPaneKey(worktreeIdByTabId, key)
+    case 'sleepingAgentKeyed':
+    case 'surfaceTombstoneKeyed':
+      // Keyed opaquely, but each record names its own workspace — the only routing left once the
+      // tab or pane it describes is gone, and the same one `splitWorkspaceSessionByHost` uses.
+      return (_key, entry) => recordWorkspaceId(entry)
+    case 'browserWorkspaceKeyed':
+      return (_key, entry) => browserPagesWorkspaceId(entry)
+    case 'fileKeyed':
+      // Routed by the open file's workspace, through the same index the split routed it by.
+      return (key) => worktreeIdByFileId.get(key)
+  }
+}
+
+/** The base without any rows for these workspaces, routed by the same indexes the split uses. */
+function withoutWorkspaces(
+  base: WorkspaceSessionState,
+  workspaceIds: ReadonlySet<string>
+): WorkspaceSessionState {
+  const worktreeIdByTabId = buildWorktreeIdByTabId(base)
+  const worktreeIdByFileId = buildWorktreeIdByFileId(base)
+  const next: KeyedRecord = { ...base }
+  for (const field of SESSION_FIELDS) {
+    const workspaceOf = entryWorkspaceResolver(field, worktreeIdByTabId, worktreeIdByFileId)
+    const keeps = (key: string, entry: unknown): boolean =>
+      !workspaceIds.has(normalizeWorkspaceSessionKeyToWorkspaceId(workspaceOf?.(key, entry) ?? ''))
+    const value: unknown = base[field]
+    if (!workspaceOf || !value) {
+      continue
+    }
+    next[field] = Array.isArray(value)
+      ? value.filter((id: string) => keeps(id, id))
+      : Object.fromEntries(Object.entries(value).filter(([key, entry]) => keeps(key, entry)))
+  }
+  // oxlint-disable-next-line typescript/consistent-type-assertions -- SAFETY: every field is the base's own value or a filtered copy of it.
+  return next as WorkspaceSessionState
+}
+
+/** Unsaved drafts the base held that the adopted rows lack: no other channel holds one. */
+function keepUnsavedDrafts(next: WorkspaceSessionState, base: WorkspaceSessionState): void {
+  for (const [key, baseFiles] of Object.entries(base.openFilesByWorktree ?? {})) {
+    const files = next.openFilesByWorktree?.[key] ?? []
+    const drafts = new Map(
+      baseFiles.filter((file) => file.dirtyDraftContent !== undefined).map((f) => [f.filePath, f])
+    )
+    if (files === baseFiles || drafts.size === 0) {
+      continue
+    }
+    // A host entry with its own draft wins; a clean one yields to the base's draft for that path.
+    const held = new Set(files.map((file) => file.filePath))
+    const merged = [
+      ...files.map(
+        (file) => (file.dirtyDraftContent === undefined && drafts.get(file.filePath)) || file
+      ),
+      ...[...drafts.values()].filter((file) => !held.has(file.filePath))
+    ]
+    next.openFilesByWorktree = { ...next.openFilesByWorktree, [key]: merged }
+  }
+}
+
 export type StrandedPartitionAdoptionOptions = {
   /** Session keys the read found claimed by more than one partition. */
   contestedSessionKeys?: ReadonlySet<string>
@@ -260,6 +318,8 @@ export type StrandedPartitionAdoptionOptions = {
    * rows stay where they are, which is the leak direction the boundary doc asks for.
    */
   foreignSessionKeys?: ReadonlySet<string>
+  /** Keys the repo catalog attributes to this host. */
+  ownedSessionKeys?: ReadonlySet<string>
 }
 
 export type StrandedPartitionAdoption = {
@@ -271,13 +331,26 @@ export type StrandedPartitionAdoption = {
 const NOTHING_ADOPTED: ReadonlySet<string> = new Set<string>()
 
 export function adoptStrandedHostPartitionSession(
-  base: WorkspaceSessionState,
+  originalBase: WorkspaceSessionState,
   host: WorkspaceSessionState | null | undefined,
   options: StrandedPartitionAdoptionOptions = {}
 ): StrandedPartitionAdoption {
   if (!host) {
-    return { session: base, adoptedWorkspaceIds: NOTHING_ADOPTED }
+    return { session: originalBase, adoptedWorkspaceIds: NOTHING_ADOPTED }
+  }
+  const contested = new Set<string>()
+  for (const key of options.contestedSessionKeys ?? []) {
+    contested.add(normalizeWorkspaceSessionKeyToWorkspaceId(key))
   }
+  // Owned, uncontested and holding tabs: the host's copy is the live one. No tabs is not a close.
+  const superseded = new Set<string>()
+  for (const [key, tabs] of Object.entries(host.tabsByWorktree ?? {})) {
+    const id = normalizeWorkspaceSessionKeyToWorkspaceId(key)
+    if (!hostHasNothingFor(tabs) && !contested.has(id) && options.ownedSessionKeys?.has(id)) {
+      superseded.add(id)
+    }
+  }
+  const base = superseded.size > 0 ? withoutWorkspaces(originalBase, superseded) : originalBase
   const adoptable = adoptableWorkspaceIds(base, host)
   for (const key of options.foreignSessionKeys ?? []) {
     adoptable.delete(normalizeWorkspaceSessionKeyToWorkspaceId(key))
@@ -285,10 +358,6 @@ export function adoptStrandedHostPartitionSession(
   if (adoptable.size === 0) {
     return { session: base, adoptedWorkspaceIds: NOTHING_ADOPTED }
   }
-  const contested = new Set<string>()
-  for (const key of options.contestedSessionKeys ?? []) {
-    contested.add(normalizeWorkspaceSessionKeyToWorkspaceId(key))
-  }
   const adopts = (key: string): boolean =>
     adoptable.has(normalizeWorkspaceSessionKeyToWorkspaceId(key))
   const isContested = (key: string): boolean =>
@@ -314,9 +383,6 @@ export function adoptStrandedHostPartitionSession(
   // the keyed fields do not depend on the ownership table's declaration order.
   const worktreeIdByTabId = buildWorktreeIdByTabId(host)
   const worktreeIdByFileId = buildWorktreeIdByFileId(host)
-  const adoptsResolved = (worktreeId: string | undefined): boolean =>
-    worktreeId !== undefined && adopts(worktreeId)
-
   for (const field of SESSION_FIELDS) {
     const ownership: WorkspaceSessionFieldOwnership = WORKSPACE_SESSION_FIELD_OWNERSHIP[field]
     switch (ownership) {
@@ -357,34 +423,18 @@ export function adoptStrandedHostPartitionSession(
         break
       }
       case 'tabKeyed':
-        adoptRecord(next, host, field, (key) => adoptsResolved(worktreeIdByTabId.get(key)))
-        break
       case 'paneKeyed':
-        adoptRecord(next, host, field, (key) =>
-          adoptsResolved(worktreeIdForPaneKey(worktreeIdByTabId, key))
-        )
-        break
       case 'sleepingAgentKeyed':
       case 'surfaceTombstoneKeyed':
-        // Keyed opaquely, but each record names its own workspace — the only routing left once the
-        // tab or pane it describes is gone, and the same one `splitWorkspaceSessionByHost` uses.
-        adoptRecord(next, host, field, (_key, entry) => {
-          const workspaceId = recordWorkspaceId(entry)
-          return workspaceId !== null && adopts(workspaceId)
-        })
-        break
       case 'browserWorkspaceKeyed':
-        adoptRecord(next, host, field, (_key, entry) => {
-          const workspaceId = browserPagesWorkspaceId(entry)
-          return workspaceId !== null && adopts(workspaceId)
-        })
-        break
-      case 'fileKeyed':
-        // Routed by the open file's workspace, through the same index the split routed it by.
-        adoptRecord(next, host, field, (key) => adoptsResolved(worktreeIdByFileId.get(key)))
+      case 'fileKeyed': {
+        const workspaceOf = entryWorkspaceResolver(field, worktreeIdByTabId, worktreeIdByFileId)
+        adoptRecord(next, host, field, (key, entry) => adopts(workspaceOf?.(key, entry) ?? ''))
         break
+      }
     }
   }
+  keepUnsavedDrafts(next, originalBase)
   // Why contested ids are withheld: the write path would route the whole bare id here, carrying the
   // co-claimant's rows into this host's partition — the loss the gap-fill above exists to prevent.
   const adoptedWorkspaceIds = new Set(
diff --git a/src/shared/worktree/create-types.ts b/src/shared/worktree/create-types.ts
index ca5dbe469720..08b9241e881a 100644
--- a/src/shared/worktree/create-types.ts
+++ b/src/shared/worktree/create-types.ts
@@ -10,6 +10,7 @@ import type {
   GitPushTarget,
   GitWorktreeInfo,
   WorkspaceLinkedItem,
+  WorkspaceAttachment,
   WorkspaceStatus,
   Worktree
 } from './types'
@@ -122,6 +123,7 @@ export type CreateWorktreeArgs = {
   linkedAzureDevOpsPR?: number | null
   linkedGiteaPR?: number | null
   linkedWorkItem?: WorkspaceLinkedItem | null
+  linkedItems?: WorkspaceAttachment[]
   linkedTaskSourceContext?: TaskSourceContext | null
   pushTarget?: GitPushTarget
   workspaceStatus?: WorkspaceStatus
diff --git a/src/shared/worktree/meta-types.ts b/src/shared/worktree/meta-types.ts
index 1f49291fce82..3263804fe512 100644
--- a/src/shared/worktree/meta-types.ts
+++ b/src/shared/worktree/meta-types.ts
@@ -7,6 +7,7 @@ import type {
   GitPushTarget,
   WorkspaceCreatorProvenance,
   WorkspaceLinkedItem,
+  WorkspaceAttachment,
   WorkspaceStatus
 } from './types'
 import type { TuiAgent } from '../tui-agent'
@@ -49,6 +50,7 @@ export type WorktreeMeta = {
   /** Optional for backward compatibility — see Worktree.linkedGiteaPR. */
   linkedGiteaPR?: number | null
   linkedWorkItem?: WorkspaceLinkedItem | null
+  linkedItems?: WorkspaceAttachment[]
   linkedTaskSourceContext?: TaskSourceContext | null
   isArchived: boolean
   isUnread: boolean
diff --git a/src/shared/worktree/types.ts b/src/shared/worktree/types.ts
index 85419632cefa..b379a43c1637 100644
--- a/src/shared/worktree/types.ts
+++ b/src/shared/worktree/types.ts
@@ -9,6 +9,32 @@ import type { BuiltInWorktreeVisibilitySourceId } from '../repo-types'
 import type { WorktreeIdentity } from './identity'
 import type { WorktreeScanFailureKind } from '../worktree-scan-failure'
 
+export type WorkspaceAttachmentOrigin = {
+  kind: 'observed'
+  tabId: string
+  paneKey?: string
+  hostId?: ExecutionHostId
+  label?: string
+  agent?: string
+  sessionId?: string
+}
+
+export type WorkspaceAttachment = {
+  provider: 'github' | 'gitlab' | 'linear' | 'jira' | 'bitbucket' | 'azure-devops' | 'gitea'
+  type: 'issue' | 'pr' | 'mr'
+  number: number
+  identifier?: string
+  title?: string
+  url?: string
+  repoId?: string
+  linearIdentifier?: string
+  jiraIdentifier?: string
+  linearWorkspaceId?: string
+  linearOrganizationUrlKey?: string
+  taskSourceContext?: TaskSourceContext
+  origins?: WorkspaceAttachmentOrigin[]
+}
+
 export type WorkspaceLinkedItem = {
   provider: 'github' | 'gitlab' | 'linear' | 'jira'
   type: 'issue' | 'pr' | 'mr'
@@ -106,6 +132,8 @@ export type Worktree = {
   linkedAzureDevOpsPR?: number | null
   linkedGiteaPR?: number | null
   linkedWorkItem?: WorkspaceLinkedItem | null
+  /** All attachments; singular fields select the active review/task for older readers. */
+  linkedItems?: WorkspaceAttachment[]
   linkedTaskSourceContext?: TaskSourceContext | null
   isArchived: boolean
   isUnread: boolean
diff --git a/src/shared/wsl-login-shell-command.ts b/src/shared/wsl-login-shell-command.ts
index fd0f0b505c98..fded4982e089 100644
--- a/src/shared/wsl-login-shell-command.ts
+++ b/src/shared/wsl-login-shell-command.ts
@@ -1,3 +1,4 @@
+import { getFishClaudeShellFunction } from './claude-shell-function'
 export function quotePosixShell(value: string): string {
   return `'${value.replace(/'/g, "'\\''")}'`
 }
@@ -130,6 +131,10 @@ export function buildWslInteractiveLoginShellCommand(): string {
     '      exec "$_orca_wsl_shell" --rcfile "${_orca_shell_ready_root}/bash/rcfile"',
     '    fi',
     '    ;;',
+    // Why: a WSL fish pane gets no shell-ready wrapper or XDG handoff, so this is its only `claude`.
+    '  fish)',
+    `    exec "$_orca_wsl_shell" -l -C ${quotePosixShell(getFishClaudeShellFunction())}`,
+    '    ;;',
     '  zsh)',
     '    if [ -n "${_orca_shell_ready_root:-}" ] && [ -d "${_orca_shell_ready_root}/zsh" ]; then',
     '      export ZDOTDIR="${_orca_shell_ready_root}/zsh"',
diff --git a/tests/AGENTS.md b/tests/AGENTS.md
index 54aae2dc1ba1..03e175fbefef 100644
--- a/tests/AGENTS.md
+++ b/tests/AGENTS.md
@@ -36,7 +36,7 @@ Keep `ORCA_BACKGROUND_LAUNCH=1`: the application must still suppress automatic r
 `isWindowlessLaunch` describes that automatic launch policy, not the window's current visibility.
 This exception belongs only to this benchmark fixture; do not generalize it to local or self-hosted
 runs, paired-client helpers, native-focus tests, or production window policy. Background terminal
-panes remain hidden. Evidence: `docs/reference/terminal-perf-latency-investigation.md`.
+panes remain hidden.
 
 ## Isolated native IBus presentation
 
diff --git a/tests/e2e/cross-version-wire/agent-session-stop-event-downgrade.unit.test.ts b/tests/e2e/cross-version-wire/agent-session-stop-event-downgrade.unit.test.ts
index ac18fe159869..2d440b4a6ac3 100644
--- a/tests/e2e/cross-version-wire/agent-session-stop-event-downgrade.unit.test.ts
+++ b/tests/e2e/cross-version-wire/agent-session-stop-event-downgrade.unit.test.ts
@@ -31,8 +31,8 @@ import {
   renderJournalState
 } from '../../../src/main/native-chat/agent-session-journal/journal-reducer'
 
-// A release that knows neither the Stop event nor the Resume marker: an unknown row kind would
-// make it delete the journal from that row on, so both ride a tombstone it already reads.
+// A release that knows none of the Stop event, the Resume marker and the reopen mark: an unknown
+// row kind would make it delete the journal from that row on, so each rides a tombstone it reads.
 const BASELINE_REF = 'v1.4.218'
 const JOURNAL = 'src/main/native-chat/agent-session-journal'
 // A main build that shares this one's host database and schema version, so a downgrade to it opens
@@ -143,7 +143,7 @@ type OldReplay = {
 }
 
 // Both downgrade probes load real old builds, including cold extraction and transforms.
-test("an older build keeps every row around a Stop's event and a Resume, and folds the rows after them", async () => {
+test("an older build keeps every row around a Stop's event, a Resume and a reopen mark, and folds the rows after them", async () => {
   const directory = mkdtempSync(join(tmpdir(), 'orca-stop-event-downgrade-'))
   const journals = createTrackedJournalOpener()
   try {
@@ -160,6 +160,7 @@ test("an older build keeps every row around a Stop's event and a Resume, and fol
     await journal.appendStopEvent({ reason: 'user-stop', turnId: 'turn-1', caller: 'client-1' }, 1)
     await journal.appendStopEvent({ reason: 'user-close', turnId: 'turn-1' }, 1)
     await journal.appendQueueResume(1)
+    await journal.appendQueueReopen(1)
     const afterMarks = journal.cursor()
     await append(1, 'after the Stop')
     const since = journal.readSince({ epoch: journal.epoch, sequence: 0 })
@@ -226,7 +227,7 @@ test("an older build keeps every row around a Stop's event and a Resume, and fol
       })
       expect(projected.ok).toBe(true)
       expect(projected.batch?.items).toEqual([])
-      expect(projected.batch?.removedItemIds).toHaveLength(2)
+      expect(projected.batch?.removedItemIds).toHaveLength(3)
       const liveIds = new Set(journal.snapshot().items.map((entry) => entry.itemId))
       expect(projected.batch?.removedItemIds.some((id) => liveIds.has(id))).toBe(false)
     } finally {
@@ -274,9 +275,7 @@ test("an older build opens this build's journal writable and appends to it; the
     await journal.appendStopEvent({ reason: 'user-stop', turnId: 'turn-1', caller: 'client-1' }, 1)
     await journal.appendItem(item(1), { kind: 'status', text: 'after the Stop' }, scope)
     const wrote = { cursor: journal.cursor(), items: itemIds(journal) }
-    expect(journal.queuedMessages.pauses('host-a').map((pause) => pause.reason)).toEqual([
-      'stopped'
-    ])
+    expect(journal.queuedMessages.pauses().map((pause) => pause.reason)).toEqual(['stopped'])
     await journals.closeAll()
     const rowsBefore = storedRows(directory)
 
@@ -303,9 +302,7 @@ test("an older build opens this build's journal writable and appends to it; the
     const upgraded = await journals.open({ identity: IDENTITY, stateDirectory: directory })
     expect(upgraded.cursor().sequence).toBe(wrote.cursor.sequence + 1)
     expect(itemIds(upgraded)).toEqual([...wrote.items, 'codex:thread-1:turn-1:2'])
-    expect(upgraded.queuedMessages.pauses('host-a').map((pause) => pause.reason)).toEqual([
-      'stopped'
-    ])
+    expect(upgraded.queuedMessages.pauses().map((pause) => pause.reason)).toEqual(['stopped'])
   } finally {
     await journals.closeAll()
     rmSync(directory, { recursive: true, force: true })
diff --git a/tests/e2e/cross-version-wire/kept-card-downgrade.unit.test.ts b/tests/e2e/cross-version-wire/kept-card-downgrade.unit.test.ts
index 24b495575fbd..f6ac7f11cb5f 100644
--- a/tests/e2e/cross-version-wire/kept-card-downgrade.unit.test.ts
+++ b/tests/e2e/cross-version-wire/kept-card-downgrade.unit.test.ts
@@ -11,19 +11,17 @@ import { claudeProviderHandle } from '../../../src/shared/agent-session-provider
 import { USER_MESSAGE_SOURCE } from '../../../src/shared/agent-session-message-source'
 import { agentSessionFailureFact } from '../../../src/shared/agent-session-failure'
 import { agentSessionFailureWords } from '../../../src/shared/agent-session-failure-words'
-import { QUEUED_MESSAGE_PAUSED_KEPT } from '../../../src/shared/agent-session-queued-message-wire'
 import { createTrackedJournalOpener } from '../../../src/main/native-chat/agent-session-journal/journal-host-database-test-support'
 import { holdUnsentSends } from '../../../src/main/native-chat/agent-session-journal/journal-unsent-send-hold'
 import { importReleaseCheckoutModule, materializeReleaseCheckout } from './release-checkout'
 
-// A kept send is an ordinary waiting card held by a new value in its existing `hold_reason`
-// column, placed ahead of the queue: no new state or column. A build with the queue but without
-// this change reads an unknown hold as a plain one: it must list the card first and never send it,
-// even after a person's turn ends a restart's pause, and must still settle a send this build's quit
-// left queued. One exception lives in that build's own code: its /clear carries every card over
-// without its hold, so the replacement's next turn sends a carried kept card. The main commit this change branched from, which has the queue; move it to the
-// newest release that has the queue and predates this change. A baseline holding this change tests
-// no downgrade.
+// A kept send is an ordinary waiting card placed ahead of the queue, and the reopen's mark is a
+// tombstone carrier key: no new state, column or row kind. A build with the queue but without
+// either holds a card another host process wrote under its own restart pause, so it must list the
+// kept card first, never send it by itself, send it first once a turn there ends that pause, and
+// still settle a send this build's quit left queued. The main commit the kept send branched from,
+// which has the queue; move it to the newest release that has the queue and predates it. A
+// baseline holding this change tests no downgrade.
 const BASELINE_REF = '5a56636f6679071d6ec68b851ef7932cd3222560'
 const JOURNAL = 'src/main/native-chat/agent-session-journal'
 const HOST_RESTARTED = agentSessionFailureWords(agentSessionFailureFact('hostRestarted'), {
@@ -130,7 +128,7 @@ async function acceptPersonSend(
   })
 }
 
-test('an older build lists a kept card first and never sends it, even after a person’s turn', async () => {
+test('an older build lists a kept card first, holds it, and sends it first once a turn there lifts its pause', async () => {
   const directory = mkdtempSync(join(tmpdir(), 'orca-kept-card-downgrade-'))
   const journals = createTrackedJournalOpener()
   try {
@@ -149,6 +147,7 @@ test('an older build lists a kept card first and never sends it, even after a pe
       hostInstance: 'host-b',
       hold: { cause: 'hostRestarted' }
     })
+    await reopened.markQueueReopen(0)
     expect(reopened.queuedMessages.list().map((card) => card.messageId)).toEqual([
       'kept',
       'queued-card'
@@ -165,25 +164,22 @@ test('an older build lists a kept card first and never sends it, even after a pe
           state,
           holdReason
         }))
+      expect(downgraded.repair).toEqual({ malformedRows: 0 })
       expect(cards()).toEqual([
-        { messageId: 'kept', state: 'waiting', holdReason: QUEUED_MESSAGE_PAUSED_KEPT },
+        { messageId: 'kept', state: 'waiting', holdReason: null },
         { messageId: 'queued-card', state: 'waiting', holdReason: null }
       ])
       expect(downgraded.queuedMessages.list()[0]!.position).toBeLessThan(1)
       expect(downgraded.submission('kept')).toMatchObject({ dispatchState: 'rejected' })
-      // A person's turn there adopts every card into its process, which ends the restart's
-      // pause; the kept card's hold survives it, so its drain never picks it. That build skips a
-      // held card as it skips a failed send's, so the card behind it is the one it sends.
+      // Written by another process, so that build's restart pause holds both: nothing sends.
+      const pauses = () => downgraded.queuedMessages.pauses('host-c')
+      expect(pauses().map((pause) => pause.reason)).toEqual(['restarted'])
+      expect(nextSendable(pauses(), downgraded.queuedMessages.list())).toBeNull()
+      // A person's turn there adopts every card into its process, which ends that pause; the
+      // kept card, first in the queue, is the one it sends first.
       expect(await downgraded.queuedMessages.adopt('host-c')).toBe(true)
-      expect(cards()[0]).toMatchObject({
-        messageId: 'kept',
-        holdReason: QUEUED_MESSAGE_PAUSED_KEPT
-      })
-      expect(downgraded.queuedMessages.pauses('host-c')).toEqual([])
-      expect(
-        nextSendable(downgraded.queuedMessages.pauses('host-c'), downgraded.queuedMessages.list())
-          ?.messageId
-      ).toBe('queued-card')
+      expect(pauses()).toEqual([])
+      expect(nextSendable(pauses(), downgraded.queuedMessages.list())?.messageId).toBe('kept')
     } finally {
       await older.closeAll()
     }
diff --git a/tests/e2e/cross-version-wire/structured-agent-session-host-fixture.ts b/tests/e2e/cross-version-wire/structured-agent-session-host-fixture.ts
index 011664854404..949457d4f63a 100644
--- a/tests/e2e/cross-version-wire/structured-agent-session-host-fixture.ts
+++ b/tests/e2e/cross-version-wire/structured-agent-session-host-fixture.ts
@@ -24,6 +24,7 @@ export function structuredHostStub(
     restartResumableDismiss: vi.fn(async () => 0),
     restartResumeAll: vi.fn(async () => []),
     restartContinueAll: vi.fn(async () => ({ resumed: [], continued: [] })),
+    continueInterrupted: vi.fn(async () => ({ sessionId, outcome: 'superseded' })),
     attach: vi.fn(async () => ({ ok: true, replayed: false, value: { sessionId } })),
     // Attach-shaped entries take a client-supplied location, so the host is asked whether it
     // supports creating there. A real host always answers; leaving it unstubbed made every
@@ -116,7 +117,8 @@ export function installableHost(
       listFailures: hostCalls.restartResumableFailures,
       dismiss: hostCalls.restartResumableDismiss,
       resume: hostCalls.restartResumeAll,
-      continueAfterRestart: hostCalls.restartContinueAll
+      continueAfterRestart: hostCalls.restartContinueAll,
+      continueInterrupted: hostCalls.continueInterrupted
     }
   }
   // oxlint-disable-next-line typescript/consistent-type-assertions -- SAFETY: a spy map standing in for the host; the dispatcher reaches only the members stubbed above, and a missing one fails the call rather than type-checking.
diff --git a/tests/e2e/cross-version-wire/structured-agent-session-surface-calls.ts b/tests/e2e/cross-version-wire/structured-agent-session-surface-calls.ts
new file mode 100644
index 000000000000..f24ea7224509
--- /dev/null
+++ b/tests/e2e/cross-version-wire/structured-agent-session-surface-calls.ts
@@ -0,0 +1,194 @@
+import { expect } from 'vitest'
+
+export const SESSION = 'session-alpha'
+export const WORKSPACE = 'workspace-1'
+export const THREAD = '019fd532-7c11-7a90-b6de-4e1a2c3d5f60'
+export const NOW = 1_800_000_000_000
+export const ATTENTION_READ = {
+  sessionId: SESSION,
+  observedCursor: { epoch: 'attention-epoch', sequence: 7 }
+} as const
+export const REWIND_METHOD = 'agentSession.rewind'
+export const CONVERSATION_OUTLINE_METHOD = 'agentSession.conversationOutline'
+export const STATUS_FEED_METHOD = 'agentSession.subscribeStatus'
+export const TURN_COMPLETION_FEED_METHOD = 'agentSession.subscribeTurnCompletions'
+
+/** Every method the structured surface publishes: the host method it must reach,
+ *  and the result it must hand back. A gate that hides one method and leaks
+ *  another is the bug; so is a method that is registered and answers with an
+ *  error, which is why `result` is declared per method rather than inferred from
+ *  "did not say method_not_found". `result` is omitted only where the method
+ *  legitimately answers with no reply at all. */
+export const STRUCTURED_CALLS: {
+  method: string
+  hostMethod: string | null
+  result?: Record<string, unknown>
+}[] = [
+  { method: 'agentSession.createSupport', hostMethod: null, result: { supported: true } },
+  {
+    method: 'agentSession.create',
+    hostMethod: 'attach',
+    result: { ok: true, replayed: false, value: { sessionId: SESSION } }
+  },
+  {
+    method: 'agentSession.ensure',
+    hostMethod: 'attach',
+    result: { ok: true, replayed: false, value: { sessionId: SESSION } }
+  },
+  {
+    method: 'agentSession.conversationCommand',
+    hostMethod: 'conversationCommand',
+    result: { ok: true, value: { command: 'compact', state: 'completed' } }
+  },
+  { method: 'agentSession.send', hostMethod: 'send', result: { ok: true, replayed: false } },
+  { method: 'agentSession.cancel', hostMethod: 'cancel', result: { ok: true, replayed: false } },
+  // Draft mutations for mid-turn queueing. Methods exist ahead of the
+  // capability's advertisement; only capability-gated clients ever call them.
+  {
+    method: 'agentSession.queuedMessageSend',
+    hostMethod: 'queuedMessageSend',
+    result: { ok: true, replayed: false }
+  },
+  {
+    method: 'agentSession.queuedMessageDelete',
+    hostMethod: 'queuedMessageDelete',
+    result: { ok: true, replayed: false }
+  },
+  {
+    method: 'agentSession.queuedMessagesResume',
+    hostMethod: 'queuedMessagesResume',
+    result: { ok: true, replayed: false }
+  },
+  {
+    method: REWIND_METHOD,
+    hostMethod: 'rewind',
+    result: { ok: true, replayed: false, value: { itemId: 'item-1', epoch: 'rewound-epoch' } }
+  },
+  { method: 'agentSession.close', hostMethod: 'close', result: { ok: true } },
+  {
+    method: 'agentSession.respondToApproval',
+    hostMethod: 'respondToPrompt',
+    result: { ok: true, replayed: false }
+  },
+  {
+    method: 'agentSession.respondToQuestion',
+    hostMethod: 'respondToPrompt',
+    result: { ok: true, replayed: false }
+  },
+  {
+    method: 'agentSession.setOption',
+    hostMethod: 'setOption',
+    result: { ok: true, replayed: false }
+  },
+  {
+    method: 'agentSession.threadGoal',
+    hostMethod: 'changeThreadGoal',
+    result: { ok: true, replayed: false }
+  },
+  {
+    method: 'agentSession.handoffStatus',
+    hostMethod: 'handoffStatus',
+    result: { owner: 'native' }
+  },
+  {
+    method: 'agentSession.options',
+    hostMethod: 'readOptions',
+    result: { current: { model: 'gpt-live' } }
+  },
+  {
+    method: 'agentSession.modelCatalog',
+    hostMethod: 'modelCatalog',
+    result: { origin: 'unknown' }
+  },
+  {
+    method: 'agentSession.commands',
+    hostMethod: 'readCommands',
+    result: { commands: [{ name: 'clear', kind: 'command' }] }
+  },
+  {
+    method: 'agentSession.reveal',
+    hostMethod: 'revealSession',
+    result: { ok: true, sessionId: SESSION, workspaceId: WORKSPACE, agent: 'codex', readable: true }
+  },
+  // A chat's visual, read from the host's own record and state directory. A bare addition: an older
+  // host answers `method_not_found` and the client shows the visual as unavailable. The stub host
+  // holds no record, so the typed refusal is the declared answer.
+  {
+    method: 'agentSession.readVisual',
+    hostMethod: null,
+    result: { ok: false, error: 'session_not_found' }
+  },
+  // 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.
+  {
+    method: 'agentSession.restartResumable',
+    hostMethod: 'restartResumableList',
+    result: { sessions: [] }
+  },
+  {
+    method: 'agentSession.restartResumableDismiss',
+    hostMethod: 'restartResumableDismiss',
+    result: { dismissed: 0 }
+  },
+  // 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: [] }
+  },
+  // Continue on a reply an Orca stop cut off. Clients call it only on a host advertising it.
+  {
+    method: 'agentSession.continueInterrupted',
+    hostMethod: 'continueInterrupted',
+    result: { sessionId: SESSION, outcome: 'superseded' }
+  },
+  { method: 'agentSession.release', hostMethod: null, result: { released: true } },
+  {
+    method: 'agentSession.history',
+    hostMethod: 'history',
+    result: { ok: true, page: { items: [] } }
+  },
+  {
+    method: CONVERSATION_OUTLINE_METHOD,
+    hostMethod: 'journalSnapshot',
+    result: { sessionId: SESSION, entries: [], omittedEntries: 0 }
+  },
+  // A subscription that opens with nothing to say answers with no reply at all,
+  // so reaching the host is the only signal that the gate opened.
+  { method: 'agentSession.subscribe', hostMethod: 'subscribe' },
+  // The status feed opens with a snapshot of every session, so its first reply is the contract.
+  {
+    method: STATUS_FEED_METHOD,
+    hostMethod: 'subscribeStatus',
+    result: { type: 'snapshot', sessions: [] }
+  },
+  // Opens with nothing for the same reason `agentSession.subscribe` does, and unlike the status
+  // feed above: a completion is an edge that has already passed, not state a late subscriber
+  // needs. Reaching the host is the only signal that the gate opened.
+  {
+    method: TURN_COMPLETION_FEED_METHOD,
+    hostMethod: 'subscribeTurnCompletions'
+  },
+  // Reading a chat retires the phone alerts its host pushed, through the runtime's own store, so
+  // its reply is the only signal that the gate opened.
+  {
+    method: 'agentSession.acknowledgeAttention',
+    hostMethod: null,
+    result: { acknowledged: true }
+  },
+  // Teardown runs through the runtime's subscription registry rather than the
+  // host, so its reply is the only signal that the gate opened.
+  { method: 'agentSession.unsubscribe', hostMethod: null, result: { unsubscribed: true } },
+  // The host's registered agents, each with its declared capability record. Builds before
+  // #25845 read them from the installed host; later ones from the registrations that host is
+  // built from, so they answer without installing it. Either way Codex is listed.
+  {
+    method: 'agentSession.agents',
+    hostMethod: null,
+    result: { agents: expect.arrayContaining([expect.objectContaining({ agent: 'codex' })]) }
+  }
+]
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 8ee66ede3b51..3aac5e704dc1 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
@@ -12,22 +12,31 @@ import { attachFingerprintFields } from '../../../src/main/native-chat/agent-ses
 import type { AgentSessionAttachParams } from '../../../src/main/native-chat/agent-session-wire/structured-agent-session-attach'
 import { computeAgentSessionPayloadFingerprint } from '../../../src/shared/agent-session-mutation-envelope'
 import {
-  createStructuredAgentSessionOutboxEntry,
-  structuredAgentSessionSendRequest
-} from '../../../src/shared/structured-agent-session-outbox'
+  structuredAgentSessionMessageSendMutation,
+  structuredAgentSessionSendBody
+} from '../../../src/shared/structured-agent-session-send-mutation'
 
-export const SESSION = 'session-alpha'
-export const WORKSPACE = 'workspace-1'
-export const THREAD = '019fd532-7c11-7a90-b6de-4e1a2c3d5f60'
-export const NOW = 1_800_000_000_000
-export const ATTENTION_READ = {
-  sessionId: SESSION,
-  observedCursor: { epoch: 'attention-epoch', sequence: 7 }
-} as const
-export const REWIND_METHOD = 'agentSession.rewind'
-export const CONVERSATION_OUTLINE_METHOD = 'agentSession.conversationOutline'
-export const STATUS_FEED_METHOD = 'agentSession.subscribeStatus'
-export const TURN_COMPLETION_FEED_METHOD = 'agentSession.subscribeTurnCompletions'
+import {
+  SESSION,
+  WORKSPACE,
+  THREAD,
+  NOW,
+  ATTENTION_READ,
+  REWIND_METHOD
+} from './structured-agent-session-surface-calls'
+
+export {
+  SESSION,
+  WORKSPACE,
+  THREAD,
+  NOW,
+  ATTENTION_READ,
+  REWIND_METHOD,
+  CONVERSATION_OUTLINE_METHOD,
+  STATUS_FEED_METHOD,
+  TURN_COMPLETION_FEED_METHOD,
+  STRUCTURED_CALLS
+} from './structured-agent-session-surface-calls'
 
 let operations = 0
 
@@ -43,170 +52,6 @@ function operationId(): string {
   return `${NOW}-${operations.toString(16).padStart(32, '0')}`
 }
 
-/** Every method the structured surface publishes: the host method it must reach,
- *  and the result it must hand back. A gate that hides one method and leaks
- *  another is the bug; so is a method that is registered and answers with an
- *  error, which is why `result` is declared per method rather than inferred from
- *  "did not say method_not_found". `result` is omitted only where the method
- *  legitimately answers with no reply at all. */
-export const STRUCTURED_CALLS: {
-  method: string
-  hostMethod: string | null
-  result?: Record<string, unknown>
-}[] = [
-  { method: 'agentSession.createSupport', hostMethod: null, result: { supported: true } },
-  {
-    method: 'agentSession.create',
-    hostMethod: 'attach',
-    result: { ok: true, replayed: false, value: { sessionId: SESSION } }
-  },
-  {
-    method: 'agentSession.ensure',
-    hostMethod: 'attach',
-    result: { ok: true, replayed: false, value: { sessionId: SESSION } }
-  },
-  {
-    method: 'agentSession.conversationCommand',
-    hostMethod: 'conversationCommand',
-    result: { ok: true, value: { command: 'compact', state: 'completed' } }
-  },
-  { method: 'agentSession.send', hostMethod: 'send', result: { ok: true, replayed: false } },
-  { method: 'agentSession.cancel', hostMethod: 'cancel', result: { ok: true, replayed: false } },
-  // Draft mutations for mid-turn queueing. Methods exist ahead of the
-  // capability's advertisement; only capability-gated clients ever call them.
-  {
-    method: 'agentSession.queuedMessageSend',
-    hostMethod: 'queuedMessageSend',
-    result: { ok: true, replayed: false }
-  },
-  {
-    method: 'agentSession.queuedMessageDelete',
-    hostMethod: 'queuedMessageDelete',
-    result: { ok: true, replayed: false }
-  },
-  {
-    method: 'agentSession.queuedMessagesResume',
-    hostMethod: 'queuedMessagesResume',
-    result: { ok: true, replayed: false }
-  },
-  {
-    method: REWIND_METHOD,
-    hostMethod: 'rewind',
-    result: { ok: true, replayed: false, value: { itemId: 'item-1', epoch: 'rewound-epoch' } }
-  },
-  { method: 'agentSession.close', hostMethod: 'close', result: { ok: true } },
-  {
-    method: 'agentSession.respondToApproval',
-    hostMethod: 'respondToPrompt',
-    result: { ok: true, replayed: false }
-  },
-  {
-    method: 'agentSession.respondToQuestion',
-    hostMethod: 'respondToPrompt',
-    result: { ok: true, replayed: false }
-  },
-  {
-    method: 'agentSession.setOption',
-    hostMethod: 'setOption',
-    result: { ok: true, replayed: false }
-  },
-  {
-    method: 'agentSession.threadGoal',
-    hostMethod: 'changeThreadGoal',
-    result: { ok: true, replayed: false }
-  },
-  {
-    method: 'agentSession.handoffStatus',
-    hostMethod: 'handoffStatus',
-    result: { owner: 'native' }
-  },
-  {
-    method: 'agentSession.options',
-    hostMethod: 'readOptions',
-    result: { current: { model: 'gpt-live' } }
-  },
-  {
-    method: 'agentSession.modelCatalog',
-    hostMethod: 'modelCatalog',
-    result: { origin: 'unknown' }
-  },
-  {
-    method: 'agentSession.commands',
-    hostMethod: 'readCommands',
-    result: { commands: [{ name: 'clear', kind: 'command' }] }
-  },
-  {
-    method: 'agentSession.reveal',
-    hostMethod: 'revealSession',
-    result: { ok: true, sessionId: SESSION, workspaceId: WORKSPACE, agent: 'codex', readable: 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.
-  {
-    method: 'agentSession.restartResumable',
-    hostMethod: 'restartResumableList',
-    result: { sessions: [] }
-  },
-  {
-    method: 'agentSession.restartResumableDismiss',
-    hostMethod: 'restartResumableDismiss',
-    result: { dismissed: 0 }
-  },
-  // 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: null, result: { released: true } },
-  {
-    method: 'agentSession.history',
-    hostMethod: 'history',
-    result: { ok: true, page: { items: [] } }
-  },
-  {
-    method: CONVERSATION_OUTLINE_METHOD,
-    hostMethod: 'journalSnapshot',
-    result: { sessionId: SESSION, entries: [], omittedEntries: 0 }
-  },
-  // A subscription that opens with nothing to say answers with no reply at all,
-  // so reaching the host is the only signal that the gate opened.
-  { method: 'agentSession.subscribe', hostMethod: 'subscribe' },
-  // The status feed opens with a snapshot of every session, so its first reply is the contract.
-  {
-    method: STATUS_FEED_METHOD,
-    hostMethod: 'subscribeStatus',
-    result: { type: 'snapshot', sessions: [] }
-  },
-  // Opens with nothing for the same reason `agentSession.subscribe` does, and unlike the status
-  // feed above: a completion is an edge that has already passed, not state a late subscriber
-  // needs. Reaching the host is the only signal that the gate opened.
-  {
-    method: TURN_COMPLETION_FEED_METHOD,
-    hostMethod: 'subscribeTurnCompletions'
-  },
-  // Reading a chat retires the phone alerts its host pushed, through the runtime's own store, so
-  // its reply is the only signal that the gate opened.
-  {
-    method: 'agentSession.acknowledgeAttention',
-    hostMethod: null,
-    result: { acknowledged: true }
-  },
-  // Teardown runs through the runtime's subscription registry rather than the
-  // host, so its reply is the only signal that the gate opened.
-  { method: 'agentSession.unsubscribe', hostMethod: null, result: { unsubscribed: true } },
-  // The host's registered agents, each with its declared capability record.
-  {
-    method: 'agentSession.agents',
-    hostMethod: 'agentDefinitions',
-    result: { agents: [{ agent: 'codex', capabilities: { compact: true } }] }
-  }
-]
-
 export function envelope(args: {
   method: string
   fields: Record<string, unknown>
@@ -258,21 +103,20 @@ export function createIntentParams(): Record<string, unknown> {
   return { envelope: envelope({ method: 'agentSession.create', fields, fence: null }), ...fields }
 }
 
-/** Built by the outbox clients send from, so an older host is handed exactly what a current
- *  client puts on the wire, fingerprint included. */
+/** Built by the sender clients use, so an older host is handed exactly what a current client puts
+ *  on the wire, fingerprint included. */
 export function sendParams(
   text: string,
   fence: number,
   sentDelivery?: 'queue-if-active'
 ): Record<string, unknown> {
-  const entry = createStructuredAgentSessionOutboxEntry({
-    clientMessageId: operationId(),
+  return structuredAgentSessionMessageSendMutation({
     sessionId: SESSION,
-    text,
-    attachments: [],
-    queuedAt: NOW
+    clientOperationId: operationId(),
+    expectedRuntimeFence: fence,
+    body: structuredAgentSessionSendBody(text, []),
+    ...(sentDelivery ? { delivery: sentDelivery } : {})
   })
-  return structuredAgentSessionSendRequest({ ...entry, sentDelivery }, fence)
 }
 
 /** Schema-valid params per method; values only need to survive validation. */
@@ -326,6 +170,8 @@ export function paramsFor(method: string): unknown {
       return { ...ATTENTION_READ, observedCursor: { ...ATTENTION_READ.observedCursor } }
     case 'agentSession.modelCatalog':
       return { agent: 'codex', sessionId: SESSION }
+    case 'agentSession.readVisual':
+      return { sessionId: SESSION, file: 'usage-chart.html' }
     case 'agentSession.hold':
     case 'agentSession.release':
       return { sessionId: SESSION, holderId: 'surface-1' }
@@ -336,6 +182,8 @@ export function paramsFor(method: string): unknown {
     case 'agentSession.restartContinue':
       // Whole-surface calls: they name no session, and resume/continue narrow by an optional list.
       return {}
+    case 'agentSession.continueInterrupted':
+      return { sessionId: SESSION, turnItemId: 'legacy:codex:s:turn-1' }
     default:
       return { sessionId: SESSION }
   }
diff --git a/tests/e2e/golden-core-flows.spec.ts b/tests/e2e/golden-core-flows.spec.ts
index 778f475498f2..669e3afa49aa 100644
--- a/tests/e2e/golden-core-flows.spec.ts
+++ b/tests/e2e/golden-core-flows.spec.ts
@@ -209,6 +209,35 @@ async function expectProjectVisible(page: Page, repoPath: string): Promise<void>
   await expect(page.getByText(repoName, { exact: true }).first()).toBeVisible({ timeout: 15_000 })
 }
 
+// Why: this fork browses Add project folders in-app on Linux instead of GTK showOpenDialog,
+// so the native-dialog stub never runs there. Enter the path and select it in that browser.
+async function chooseFolderInAppBrowserIfShown(page: Page, folderPath: string): Promise<void> {
+  const browser = page.getByRole('dialog', { name: /Browse host filesystem/i })
+  const shown = await browser
+    .waitFor({ state: 'visible', timeout: 3_000 })
+    .then(() => true)
+    .catch(() => false)
+  if (!shown) {
+    return
+  }
+  const pathInput = browser.getByPlaceholder(/Type to filter or enter a path/i)
+  const target = folderPath.endsWith('/') ? folderPath : `${folderPath}/`
+  await expect
+    .poll(
+      async () => {
+        if ((await browser.textContent())?.includes(`· ${folderPath}`)) {
+          return true
+        }
+        await pathInput.fill(target)
+        await pathInput.press('Enter')
+        return false
+      },
+      { timeout: 15_000, message: `in-app folder browser did not open ${folderPath}` }
+    )
+    .toBe(true)
+  await browser.getByRole('button', { name: 'Select folder', exact: true }).click()
+}
+
 async function addProjectFromSidebar(
   page: Page,
   electronApp: ElectronApplication,
@@ -219,6 +248,7 @@ async function addProjectFromSidebar(
   const addDialog = page.getByRole('dialog', { name: /Add a project/i })
   await expect(addDialog).toBeVisible()
   await addDialog.getByRole('button', { name: /Browse folder/i }).click()
+  await chooseFolderInAppBrowserIfShown(page, repoPath)
 
   const confirmDialog = page.getByRole('dialog', { name: /^Add Project$/i })
   const needsConfirmation = await confirmDialog
@@ -298,11 +328,15 @@ async function renderedTabIds(page: Page): Promise<string[]> {
 }
 
 async function expectTerminalSurface(page: Page): Promise<void> {
-  await expect
-    .poll(() => page.locator('[data-terminal-tab-id]').count(), { timeout: 30_000 })
-    .toBeGreaterThan(0)
-  const terminalSurface = page.locator('[data-terminal-tab-id]').first()
-  await expect(terminalSurface).toHaveAttribute('data-native-file-drop-target', 'terminal')
+  const terminalSurface = page
+    .locator('[data-terminal-tab-id][data-terminal-layout-leaf-ids]:visible')
+    .first()
+  await expect(terminalSurface).toBeVisible({ timeout: 30_000 })
+  await expect(terminalSurface).not.toHaveAttribute('data-os-file-drop-owner')
+  await expect(terminalSurface.locator('.pane[data-leaf-id]').first()).toHaveAttribute(
+    'data-os-file-drop-owner',
+    ''
+  )
 }
 
 async function waitForTerminalPaneManager(page: Page): Promise<void> {
@@ -451,6 +485,7 @@ test.describe('New-user golden core flow', () => {
     await orcaPage
       .getByRole('button', { name: /Browse for a folder|Open a folder|Browse folder/i })
       .click()
+    await chooseFolderInAppBrowserIfShown(orcaPage, repoPath)
     await waitForRepoLoaded(orcaPage, repoPath)
     await expectProjectVisible(orcaPage, repoPath)
     await waitForActiveWorktree(orcaPage)
diff --git a/tests/e2e/helpers/electron-main-evaluate-retry.unit.test.ts b/tests/e2e/helpers/electron-main-evaluate-retry.unit.test.ts
index c6735e2fd1f8..95b5754e5969 100644
--- a/tests/e2e/helpers/electron-main-evaluate-retry.unit.test.ts
+++ b/tests/e2e/helpers/electron-main-evaluate-retry.unit.test.ts
@@ -1,4 +1,4 @@
-import { describe, expect, it } from 'vitest'
+import { afterEach, describe, expect, it, vi } from 'vitest'
 import { retryTransientMainEvaluate } from './electron-main-evaluate-retry'
 
 const transientMessages = [
@@ -6,6 +6,8 @@ const transientMessages = [
   'electronApplication.evaluate: Resulting promise was garbage collected.'
 ]
 
+afterEach(() => vi.useRealTimers())
+
 describe('retryTransientMainEvaluate', () => {
   it('returns the first successful read without retrying', async () => {
     let calls = 0
@@ -19,8 +21,9 @@ describe('retryTransientMainEvaluate', () => {
   })
 
   it.each(transientMessages)('retries a transient startup failure: %s', async (message) => {
+    vi.useFakeTimers({ toFake: ['setTimeout', 'clearTimeout'] })
     let calls = 0
-    await expect(
+    const outcome = expect(
       retryTransientMainEvaluate(async () => {
         calls += 1
         if (calls < 3) {
@@ -29,6 +32,9 @@ describe('retryTransientMainEvaluate', () => {
         return '/isolated/home'
       })
     ).resolves.toBe('/isolated/home')
+    void outcome.catch(() => undefined)
+    await vi.advanceTimersByTimeAsync(400)
+    await outcome
     expect(calls).toBe(3)
   })
 
@@ -46,13 +52,17 @@ describe('retryTransientMainEvaluate', () => {
   it.each(transientMessages)(
     'bounds retries when evaluation keeps failing: %s',
     async (message) => {
+      vi.useFakeTimers({ toFake: ['setTimeout', 'clearTimeout'] })
       let calls = 0
-      await expect(
+      const outcome = expect(
         retryTransientMainEvaluate(async () => {
           calls += 1
           throw new Error(message)
         })
       ).rejects.toThrow(message)
+      void outcome.catch(() => undefined)
+      await vi.advanceTimersByTimeAsync(800)
+      await outcome
       expect(calls).toBe(5)
     }
   )
diff --git a/tests/e2e/native-chat-context-menu-copy-paste.spec.ts b/tests/e2e/native-chat-context-menu-copy-paste.spec.ts
new file mode 100644
index 000000000000..f396aea341d2
--- /dev/null
+++ b/tests/e2e/native-chat-context-menu-copy-paste.spec.ts
@@ -0,0 +1,114 @@
+import { randomUUID } from 'node:crypto'
+import { mkdtempSync, rmSync, writeFileSync } from 'node:fs'
+import os from 'node:os'
+import path from 'node:path'
+import { test, expect } from './helpers/orca-app'
+import { ensureTerminalVisible, waitForActiveWorktree, waitForSessionReady } from './helpers/store'
+import { waitForActivePaneHookDescriptor, waitForActiveTerminalManager } from './helpers/terminal'
+
+const FIRST = 'Firstparagraph bravo charlie delta.'
+const SECOND = 'Secondparagraph echo foxtrot golf.'
+
+test('chat right-click offers Copy for selected text and Paste in the composer only', async ({
+  orcaPage,
+  electronApp
+}) => {
+  await waitForSessionReady(orcaPage)
+  await waitForActiveWorktree(orcaPage)
+  await ensureTerminalVisible(orcaPage)
+  await waitForActiveTerminalManager(orcaPage, 30_000)
+  const descriptor = await waitForActivePaneHookDescriptor(orcaPage)
+  const [tabId] = descriptor.paneKey.split(':')
+  const sessionId = `e2e-context-menu-${randomUUID()}`
+  const scratchDir = mkdtempSync(path.join(os.tmpdir(), 'orca-e2e-native-chat-menu-'))
+  const transcriptPath = path.join(scratchDir, `${sessionId}.jsonl`)
+  const row = (index: number, role: 'user' | 'assistant', text: string): string =>
+    JSON.stringify({
+      sessionId,
+      uuid: `${sessionId}-${index}`,
+      timestamp: new Date(Date.now() - (10 - index) * 1_000).toISOString(),
+      type: role,
+      message: { role, model: 'claude-opus-4', content: [{ type: 'text', text }] }
+    })
+  writeFileSync(
+    transcriptPath,
+    `${row(0, 'user', 'Question alpha')}\n${row(1, 'assistant', `${FIRST}\n\n${SECOND}`)}\n`
+  )
+  try {
+    // Substitute only the clipboard IPC; never touch the user's system clipboard.
+    await electronApp.evaluate(({ ipcMain }) => {
+      ipcMain.removeHandler('clipboard:writeText')
+      ipcMain.handle('clipboard:writeText', (_event, text: string) => {
+        process.env.ORCA_E2E_COPIED_TEXT = text
+      })
+    })
+    const takeCopiedText = (): Promise<string | null> =>
+      electronApp.evaluate(() => {
+        const text = process.env.ORCA_E2E_COPIED_TEXT ?? null
+        delete process.env.ORCA_E2E_COPIED_TEXT
+        return text
+      })
+    await orcaPage.evaluate(
+      async ({ paneKey, worktreeId, sessionId, transcriptPath, tabId }) => {
+        const settings = await window.api.settings.set({ experimentalNativeChat: true })
+        const store = window.__store
+        if (!store) {
+          throw new Error('Store unavailable')
+        }
+        store.setState({ settings })
+        const state = store.getState()
+        state.setAgentStatus(
+          paneKey,
+          { state: 'done', prompt: 'context menu proof', agentType: 'claude' },
+          'Claude',
+          undefined,
+          { worktreeId },
+          { providerSession: { key: 'session_id', id: sessionId, transcriptPath } }
+        )
+        const tab = (state.unifiedTabsByWorktree[worktreeId] ?? []).find(
+          (candidate) => candidate.contentType === 'terminal' && candidate.entityId === tabId
+        )
+        if (!tab) {
+          throw new Error('Terminal tab unavailable')
+        }
+        state.toggleTabViewMode(tab.id)
+      },
+      { ...descriptor, sessionId, transcriptPath, tabId }
+    )
+    const first = orcaPage.getByText(FIRST)
+    const second = orcaPage.getByText(SECOND)
+    await expect(first).toBeVisible({ timeout: 30_000 })
+    const menu = orcaPage.locator('[data-native-chat-context-menu]')
+    const copy = menu.getByRole('menuitem', { name: /^Copy\s*(⌘C|Ctrl\+C)$/ })
+    const paste = menu.getByRole('menuitem', { name: 'Paste', exact: true })
+
+    // Nothing selected: neither edit action applies to a message.
+    await second.click({ button: 'right' })
+    await expect(menu).toBeVisible()
+    await expect(copy).toHaveCount(0)
+    await expect(paste).toHaveCount(0)
+
+    // Why outside the selection: that press is what collapses it in Chromium when left alone.
+    await first.click({ clickCount: 3 })
+    await second.click({ button: 'right' })
+    await copy.click()
+    await expect.poll(takeCopiedText).toContain(FIRST)
+    await expect
+      .poll(() => orcaPage.evaluate(() => window.getSelection()?.toString() ?? ''))
+      .toContain(FIRST)
+
+    if (process.platform === 'darwin') {
+      await first.click({ clickCount: 3 })
+      await second.click({ modifiers: ['Control'] })
+      await copy.click()
+      await expect.poll(takeCopiedText).toContain(FIRST)
+    }
+
+    await orcaPage.locator('[data-native-chat-root="true"]').getByRole('textbox').click({
+      button: 'right'
+    })
+    await expect(paste).toBeVisible()
+  } finally {
+    rmSync(scratchDir, { recursive: true, force: true })
+  }
+})
diff --git a/tests/e2e/native-chat-long-user-message.spec.ts b/tests/e2e/native-chat-long-user-message.spec.ts
new file mode 100644
index 000000000000..0b39ab36692d
--- /dev/null
+++ b/tests/e2e/native-chat-long-user-message.spec.ts
@@ -0,0 +1,193 @@
+import { randomUUID } from 'node:crypto'
+import { mkdtempSync, writeFileSync } from 'node:fs'
+import os from 'node:os'
+import path from 'node:path'
+import type { Locator, Page } from '@stablyai/playwright-test'
+import { test, expect } from './helpers/orca-app'
+import { ensureTerminalVisible, waitForActiveWorktree, waitForSessionReady } from './helpers/store'
+import { waitForActivePaneHookDescriptor, waitForActiveTerminalManager } from './helpers/terminal'
+
+const LONG_PROMPT_LINES = 80
+
+async function enableNativeChatSetting(page: Page): Promise<void> {
+  await page.evaluate(async () => {
+    const nextSettings = await window.api.settings.set({ experimentalNativeChat: true })
+    window.__store?.setState({ settings: nextSettings })
+  })
+}
+
+async function seedClaudeProviderSession(
+  page: Page,
+  args: { paneKey: string; worktreeId: string; sessionId: string; transcriptPath: string }
+): Promise<void> {
+  await page.evaluate(({ paneKey, worktreeId, sessionId, transcriptPath }) => {
+    window.__store
+      ?.getState()
+      .setAgentStatus(
+        paneKey,
+        { state: 'working', prompt: 'e2e long prompt probe', agentType: 'claude' },
+        'Claude',
+        undefined,
+        { worktreeId },
+        { providerSession: { key: 'session_id', id: sessionId, transcriptPath } }
+      )
+  }, args)
+}
+
+async function toggleTerminalTabToChatView(
+  page: Page,
+  args: { tabId: string; worktreeId: string }
+): Promise<void> {
+  await page.evaluate(({ tabId, worktreeId }) => {
+    const store = window.__store
+    if (!store) {
+      throw new Error('Store unavailable')
+    }
+    const state = store.getState()
+    const unifiedTab = (state.unifiedTabsByWorktree[worktreeId] ?? []).find(
+      (tab) => tab.contentType === 'terminal' && tab.entityId === tabId
+    )
+    if (!unifiedTab) {
+      throw new Error('Unified terminal tab not found for chat toggle')
+    }
+    state.toggleTabViewMode(unifiedTab.id)
+  }, args)
+}
+
+function longPrompt(name: string): string {
+  const lines = Array.from(
+    { length: LONG_PROMPT_LINES },
+    (_unused, line) => `${name} line ${line + 1} of a long prompt.`
+  )
+  return [...lines, `[${name} link](https://example.com)`].join('\n\n')
+}
+
+function transcriptLine(
+  sessionId: string,
+  id: string,
+  role: string,
+  text: string,
+  timestamp = Date.now()
+): string {
+  return `${JSON.stringify({
+    sessionId,
+    uuid: `${sessionId}-${id}`,
+    type: role,
+    timestamp: new Date(timestamp).toISOString(),
+    message: { role, model: 'claude-opus-4', content: [{ type: 'text', text }] }
+  })}\n`
+}
+
+/** Opens a native chat on a transcript of alternating user and assistant turns. */
+async function openChat(page: Page, turns: readonly string[]): Promise<void> {
+  await waitForSessionReady(page)
+  await waitForActiveWorktree(page)
+  await ensureTerminalVisible(page)
+  await waitForActiveTerminalManager(page, 30_000)
+
+  const descriptor = await waitForActivePaneHookDescriptor(page)
+  const [tabId] = descriptor.paneKey.split(':')
+  const sessionId = `e2e-long-prompt-${randomUUID()}`
+  const scratchDir = mkdtempSync(path.join(os.tmpdir(), 'orca-e2e-native-chat-long-prompt-'))
+  const transcriptPath = path.join(scratchDir, `${sessionId}.jsonl`)
+  // Distinct, increasing times: the transcript orders its rows by them.
+  const startedAt = Date.now() - turns.length * 1_000
+  writeFileSync(
+    transcriptPath,
+    turns
+      .map((text, index) =>
+        transcriptLine(
+          sessionId,
+          String(index),
+          index % 2 === 0 ? 'user' : 'assistant',
+          text,
+          startedAt + index * 1_000
+        )
+      )
+      .join('')
+  )
+
+  await enableNativeChatSetting(page)
+  await seedClaudeProviderSession(page, {
+    paneKey: descriptor.paneKey,
+    worktreeId: descriptor.worktreeId,
+    sessionId,
+    transcriptPath
+  })
+  await toggleTerminalTabToChatView(page, { tabId, worktreeId: descriptor.worktreeId })
+  await expect(page.locator('[data-native-chat-window]')).toBeVisible({ timeout: 30_000 })
+}
+
+// Retried: a windowed row can be replaced between resolving it and scrolling to it.
+async function scrollTo(target: Locator): Promise<void> {
+  await expect(async () => {
+    await target.scrollIntoViewIfNeeded({ timeout: 2_000 })
+  }).toPass()
+}
+
+test.describe('Native chat long user message', () => {
+  test('folds a long prompt and opens it on request', async ({ orcaPage }) => {
+    const reply = Array.from(
+      { length: 12 },
+      (_unused, line) => `Answer paragraph ${line + 1}.`
+    ).join('\n\n')
+    // Enough after the long prompt that refolding it cannot be rescued by the scroll clamp.
+    const middle = Array.from({ length: 6 }, () => ['Another short prompt.', reply]).flat()
+    await openChat(orcaPage, ['A short prompt.', reply, longPrompt('Early'), reply, ...middle])
+    const transcriptWindow = orcaPage.locator('[data-native-chat-window]')
+    const scroller = orcaPage.locator('[data-native-chat-scroll]')
+    const promptRow = (name: string) => {
+      const row = transcriptWindow
+        .locator('[data-index]')
+        .filter({ hasText: `${name} line 1 of a long prompt.` })
+      return {
+        line: (line: number) => row.getByText(`${name} line ${line} of`, { exact: false }),
+        folded: row.locator('[data-native-chat-user-message-folded]'),
+        showFull: row.getByRole('button', { name: 'Show full message' }),
+        showLess: row.getByRole('button', { name: 'Show less' }),
+        link: row.getByRole('link', { name: `${name} link` })
+      }
+    }
+
+    // The transcript opens following its end, and only a reader's own scrolling leaves it.
+    const early = promptRow('Early')
+    await scroller.hover()
+    await expect(async () => {
+      await orcaPage.mouse.wheel(0, -4_000)
+      await expect(early.line(1)).toBeAttached({ timeout: 500 })
+    }).toPass()
+    await scrollTo(early.line(1))
+    await expect(transcriptWindow.getByRole('button', { name: 'Show full message' })).toHaveCount(1)
+    await expect(early.folded).toHaveCount(1)
+    expect((await early.folded.boundingBox())?.height).toBeCloseTo(176, 0)
+    await expect(early.line(LONG_PROMPT_LINES)).not.toBeInViewport()
+
+    await early.showFull.click()
+    await expect(early.folded).toHaveCount(0)
+    await scrollTo(early.showLess)
+    await expect(early.line(LONG_PROMPT_LINES)).toBeInViewport()
+
+    await early.showLess.click()
+    await expect(early.folded).toHaveCount(1)
+    await expect(early.showFull).toBeInViewport()
+    await expect(early.line(1)).toBeInViewport()
+
+    // A keyboard user reaching a link under the fold sees it, and gets the top back afterwards.
+    await early.link.focus()
+    await expect(early.link).toBeInViewport()
+    await expect(early.folded).toHaveCount(1)
+    await early.showFull.focus()
+    await expect(early.line(1)).toBeInViewport()
+  })
+
+  test('leaves a prompt alone when its long text already fits the preview', async ({
+    orcaPage
+  }) => {
+    // Nine source lines, so the text rule picks it, yet it renders shorter than the clip.
+    await openChat(orcaPage, [['One.', 'Two.', 'Three.', 'Four.', 'Five.'].join('\n\n'), 'Done.'])
+    const transcriptWindow = orcaPage.locator('[data-native-chat-window]')
+    await expect(transcriptWindow.getByText('Five.')).toBeVisible()
+    await expect(transcriptWindow.getByRole('button', { name: 'Show full message' })).toHaveCount(0)
+    await expect(transcriptWindow.locator('[data-native-chat-user-message-folded]')).toHaveCount(0)
+  })
+})
diff --git a/tests/e2e/native-chat-message-rail.spec.ts b/tests/e2e/native-chat-message-rail.spec.ts
index 16d01060224e..1afd73ff1935 100644
--- a/tests/e2e/native-chat-message-rail.spec.ts
+++ b/tests/e2e/native-chat-message-rail.spec.ts
@@ -1,10 +1,10 @@
-// Exercise the prompt picker and an off-window jump against a real transcript.
+// Exercise the rail's per-tick preview and its jumps against a real transcript.
 
 import { randomUUID } from 'node:crypto'
 import { appendFileSync, mkdirSync, mkdtempSync, writeFileSync } from 'node:fs'
 import os from 'node:os'
 import path from 'node:path'
-import type { Page } from '@stablyai/playwright-test'
+import type { Locator, Page } from '@stablyai/playwright-test'
 import { test, expect } from './helpers/orca-app'
 import { ensureTerminalVisible, waitForActiveWorktree, waitForSessionReady } from './helpers/store'
 import { waitForActivePaneHookDescriptor, waitForActiveTerminalManager } from './helpers/terminal'
@@ -65,10 +65,16 @@ function claudeTranscript(rowCount: number, sessionId: string): string {
     const turn = Math.floor(index / 2)
     const body = isUser
       ? `Question ${turn}: what does the rail do when I scroll a long reply?`
-      : Array.from(
-          { length: 6 + (turn % 7) * 3 },
-          (_unused, line) => `Answer paragraph ${line + 1} for turn ${turn}.`
-        ).join('\n\n')
+      : [
+          // Headings and code draw at heights the row estimate misses, so a jump
+          // crosses rows that resize under it.
+          `## Answer for turn ${turn}`,
+          `\`\`\`ts\n${Array.from({ length: 2 + (turn % 5) * 4 }, (_unused, line) => `const line${line} = ${turn}`).join('\n')}\n\`\`\``,
+          ...Array.from(
+            { length: 6 + (turn % 7) * 3 },
+            (_unused, line) => `Answer paragraph ${line + 1} for turn ${turn}.`
+          )
+        ].join('\n\n')
     return JSON.stringify({
       sessionId,
       uuid: `${sessionId}-${index}`,
@@ -116,43 +122,49 @@ test.describe('Native chat message rail', () => {
     const rail = orcaPage.locator('[data-native-chat-rail]')
     await expect(rail).toBeVisible({ timeout: 30_000 })
 
-    // Sampling cap: 30 user turns must not render 30 bars.
-    const tickCount = await rail.locator(':scope > span').count()
-    expect(tickCount).toBeGreaterThan(2)
-    expect(tickCount).toBeLessThanOrEqual(20)
+    // Every user turn has a tick while the rail fits: a tick is the only way to its message.
+    const ticks = rail.getByRole('button')
+    await expect(ticks).toHaveCount(TRANSCRIPT_ROWS / 2)
 
     await orcaPage.screenshot({
       path: path.join(SHOT_DIR, 'rail-01-app.png'),
       animations: 'disabled'
     })
 
-    await rail.hover()
-    const panel = orcaPage.getByRole('dialog', { name: 'Your messages' })
-    await expect(panel).toBeVisible({ timeout: 10_000 })
-    // The panel lists every user message, not the sampled ticks.
-    await expect(panel.getByRole('button').first()).toBeVisible()
+    // Hovering one tick previews that message and the reply to it, not the whole thread.
+    const tick = rail.getByRole('button', { name: 'Question 5:', exact: false })
+    await tick.hover()
+    const preview = orcaPage.locator('[data-slot="hover-card-content"]')
+    await expect(preview).toBeVisible({ timeout: 10_000 })
+    await expect(preview).toContainText('Question 5:')
+    await expect(preview).not.toContainText('Question 6:')
+    await expect(preview).toContainText('Answer for turn 5')
+    await expect(preview.locator('p')).toHaveCount(2)
     await orcaPage.screenshot({
-      path: path.join(SHOT_DIR, 'rail-02-panel.png'),
+      path: path.join(SHOT_DIR, 'rail-02-preview.png'),
       animations: 'disabled'
     })
 
-    // Exact, not `> ticks`: a panel that listed only the sampled ticks would
-    // still satisfy a loose bound at 20 vs 20.
-    const panelCount = await panel.getByRole('button').count()
-    expect(panelCount).toBe(TRANSCRIPT_ROWS / 2)
-
-    // Activating the hover preview transfers focus into the prompt picker.
-    await rail.press('Enter')
-    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"]')
     const scroller = orcaPage.locator('[data-native-chat-scroll]')
-    const targetOffset = async (): Promise<number> => {
-      const [row, viewport] = await Promise.all([target.boundingBox(), scroller.boundingBox()])
-      return row && viewport ? Math.abs(row.y - viewport.y) : Number.POSITIVE_INFINITY
+    const offsetOf = (row: Locator) => async (): Promise<number> => {
+      const [box, viewport] = await Promise.all([row.boundingBox(), scroller.boundingBox()])
+      return box && viewport ? Math.abs(box.y - viewport.y) : Number.POSITIVE_INFINITY
     }
-    await expect.poll(targetOffset).toBeLessThan(4)
+    // One click lands the message at the top and lights its tick: from the end to a
+    // message near it, then across the thread, with rows resizing under each jump.
+    // Animated and instant jumps take different paths through the list.
+    for (const reducedMotion of ['reduce', 'no-preference'] as const) {
+      await orcaPage.emulateMedia({ reducedMotion })
+      for (const turn of [22, 12, 5]) {
+        const jumped = rail.getByRole('button', { name: `Question ${turn}:`, exact: false })
+        await jumped.click()
+        await expect
+          .poll(offsetOf(transcriptWindow.locator(`[data-index="${turn * 2}"]`)))
+          .toBeLessThan(4)
+        await expect(jumped).toHaveAttribute('aria-current', 'true')
+      }
+    }
+    const targetOffset = offsetOf(transcriptWindow.locator('[data-index="10"]'))
 
     for (let revision = 0; revision < 3; revision += 1) {
       const body = `Later streamed output ${revision}`
@@ -170,6 +182,6 @@ test.describe('Native chat message rail', () => {
       await expect.poll(targetOffset).toBeLessThan(4)
     }
 
-    console.log(`[rail] ticks=${tickCount} panelRows=${panelCount} shots=${SHOT_DIR}`)
+    console.log(`[rail] shots=${SHOT_DIR}`)
   })
 })
diff --git a/tests/e2e/native-chat-prompt-recall.spec.ts b/tests/e2e/native-chat-prompt-recall.spec.ts
new file mode 100644
index 000000000000..dca021e41ab4
--- /dev/null
+++ b/tests/e2e/native-chat-prompt-recall.spec.ts
@@ -0,0 +1,144 @@
+// Up/Down in the composer walk the chat's sent prompts, against real layout and key events.
+
+import { randomUUID } from 'node:crypto'
+import { mkdtempSync, writeFileSync } from 'node:fs'
+import os from 'node:os'
+import path from 'node:path'
+import type { Locator } from '@stablyai/playwright-test'
+import { test, expect } from './helpers/orca-app'
+import { ensureTerminalVisible, waitForActiveWorktree, waitForSessionReady } from './helpers/store'
+import { waitForActivePaneHookDescriptor, waitForActiveTerminalManager } from './helpers/terminal'
+
+const FIRST = 'first prompt'
+const MULTI_LINE = 'line one\nline two\nline three'
+const WRAPPED = Array.from({ length: 60 }, (_, index) => `wrapped${index}`).join(' ')
+const COMMAND = '/clear'
+const PROMPTS = [
+  FIRST,
+  '<task-notification>background task done</task-notification>',
+  MULTI_LINE,
+  WRAPPED,
+  COMMAND
+]
+
+function claudeTranscript(sessionId: string): string {
+  const startedAt = Date.now() - 60_000
+  return `${PROMPTS.flatMap((prompt, turn) =>
+    [
+      ['user', prompt],
+      ['assistant', `Answer ${turn}.`]
+    ].map(([role, text], half) =>
+      JSON.stringify({
+        sessionId,
+        uuid: `${sessionId}-${turn}-${half}`,
+        timestamp: new Date(startedAt + (turn * 2 + half) * 1_000).toISOString(),
+        type: role,
+        message: { role, model: 'claude-opus-4', content: [{ type: 'text', text }] }
+      })
+    )
+  ).join('\n')}\n`
+}
+
+/** The composer's text, one line per paragraph. */
+function draft(composer: Locator): Promise<string> {
+  return composer.evaluate((element) =>
+    Array.from(element.querySelectorAll('p'), (line) => line.textContent ?? '').join('\n')
+  )
+}
+
+test('Up and Down walk the prompts already in the chat', async ({ orcaPage }) => {
+  await waitForSessionReady(orcaPage)
+  await waitForActiveWorktree(orcaPage)
+  await ensureTerminalVisible(orcaPage)
+  await waitForActiveTerminalManager(orcaPage, 30_000)
+  const descriptor = await waitForActivePaneHookDescriptor(orcaPage)
+  const [tabId] = descriptor.paneKey.split(':')
+  const sessionId = `e2e-prompt-recall-${randomUUID()}`
+  const transcriptPath = path.join(
+    mkdtempSync(path.join(os.tmpdir(), 'orca-e2e-prompt-recall-')),
+    `${sessionId}.jsonl`
+  )
+  writeFileSync(transcriptPath, claudeTranscript(sessionId))
+
+  await orcaPage.evaluate(
+    async ({ paneKey, worktreeId, tabId, sessionId, transcriptPath }) => {
+      const settings = await window.api.settings.set({ experimentalNativeChat: true })
+      const store = window.__store
+      if (!store) {
+        throw new Error('Store unavailable')
+      }
+      store.setState({ settings })
+      const state = store.getState()
+      state.setAgentStatus(
+        paneKey,
+        { state: 'done', prompt: 'e2e prompt recall', agentType: 'claude' },
+        'Claude',
+        undefined,
+        { worktreeId },
+        { providerSession: { key: 'session_id', id: sessionId, transcriptPath } }
+      )
+      const tab = (state.unifiedTabsByWorktree[worktreeId] ?? []).find(
+        (candidate) => candidate.contentType === 'terminal' && candidate.entityId === tabId
+      )
+      if (!tab) {
+        throw new Error('Terminal tab unavailable')
+      }
+      state.toggleTabViewMode(tab.id)
+    },
+    { ...descriptor, tabId, sessionId, transcriptPath }
+  )
+
+  const chat = orcaPage.locator('[data-native-chat-root="true"]')
+  await expect(chat.getByText('Answer 4.')).toBeVisible()
+  const composer = chat.getByRole('textbox')
+  await composer.click()
+  const press = async (key: 'ArrowUp' | 'ArrowDown'): Promise<string> => {
+    await orcaPage.keyboard.press(key)
+    // Why: the editor learns of a caret the browser moved a task later; a person never out-types that.
+    await expect
+      .poll(() =>
+        composer.evaluate((element) => {
+          type Mounted = Element & {
+            editor: {
+              state: { selection: { from: number } }
+              view: { posAtDOM: (node: Node, offset: number) => number }
+            }
+          }
+          // Tiptap hangs its editor on the element it mounts.
+          const isMounted = (candidate: Element): candidate is Mounted => 'editor' in candidate
+          const selection = window.getSelection()
+          return isMounted(element) && selection?.anchorNode
+            ? element.editor.view.posAtDOM(selection.anchorNode, selection.anchorOffset) ===
+                element.editor.state.selection.from
+            : false
+        })
+      )
+      .toBe(true)
+    return draft(composer)
+  }
+
+  // Newest first; the recalled command does not hand the arrows to its picker.
+  expect(await press('ArrowUp')).toBe(COMMAND)
+  expect(await press('ArrowUp')).toBe(WRAPPED)
+
+  // Inside a wrapped prompt Up climbs its visual lines before recalling the one before.
+  let climbs = 0
+  while ((await press('ArrowUp')) === WRAPPED) {
+    climbs += 1
+    expect(climbs).toBeLessThan(20)
+  }
+  expect(climbs).toBeGreaterThan(0)
+  expect(await draft(composer)).toBe(MULTI_LINE)
+
+  // Three typed lines: two presses reach the first line, the third recalls. The harness turn is skipped.
+  expect(await press('ArrowUp')).toBe(MULTI_LINE)
+  expect(await press('ArrowUp')).toBe(MULTI_LINE)
+  expect(await press('ArrowUp')).toBe(FIRST)
+  expect(await press('ArrowUp')).toBe(FIRST)
+
+  // Down: each recalled prompt lands with the caret on its last line, so one press moves on.
+  expect(await press('ArrowDown')).toBe(MULTI_LINE)
+  expect(await press('ArrowDown')).toBe(WRAPPED)
+  expect(await press('ArrowDown')).toBe(COMMAND)
+  expect(await press('ArrowDown')).toBe('')
+})
diff --git a/tests/e2e/relay-region-correction.unit.test.ts b/tests/e2e/relay-region-correction.unit.test.ts
index 614e5c08c1d3..7b72eb0df175 100644
--- a/tests/e2e/relay-region-correction.unit.test.ts
+++ b/tests/e2e/relay-region-correction.unit.test.ts
@@ -9,6 +9,9 @@ import {
   readRelayDatabasePoolPressure
 } from '../../cloud/apps/relay/src/database'
 import { createRelayServer } from '../../cloud/apps/relay/src/relay-server'
+import { IDLE_REHOME_MIN_CONTROL_AGE_MS } from '../../cloud/apps/relay/src/host-session-registry'
+import { CONTROL_RENEWAL_BATCH_INTERVAL_MS } from '../../cloud/apps/relay/src/control-renewal-batch'
+import { RELAY_PROTOCOL_LIMITS } from '../../cloud/packages/relay-contract/src/protocol-limits'
 import type { RelayConfig } from '../../cloud/apps/relay/src/config'
 import type * as AdminTokenVerifier from '../../cloud/apps/relay/src/admin-token-verifier'
 import { RelayOriginPool } from '../../src/main/runtime/relay/relay-origin-pool'
@@ -283,15 +286,62 @@ async function topology() {
     pool.closeNow()
   })
   const assignment = await source.assignments.assign(identity, 'us-central1')
-  await pool.openInitial(
-    {
-      v: 1,
-      cellUrl: assignment.cellUrl,
-      assignmentEpoch: assignment.assignmentEpoch,
-      lease: 'synthetic-assignment-lease'
-    },
-    hostId
-  )
+  const controlIntervals = vi.spyOn(globalThis, 'setInterval')
+  let controlHeartbeat: (() => void) | undefined
+  try {
+    await pool.openInitial(
+      {
+        v: 1,
+        cellUrl: assignment.cellUrl,
+        assignmentEpoch: assignment.assignmentEpoch,
+        lease: 'synthetic-assignment-lease'
+      },
+      hostId
+    )
+    const session = source.sessions.get(identity)
+    if (session?.heartbeatTimer) {
+      const intervals = controlIntervals.mock.calls.filter(
+        (call, index) =>
+          controlIntervals.mock.results[index]?.type === 'return' &&
+          controlIntervals.mock.results[index]?.value === session.heartbeatTimer &&
+          call[1] === RELAY_PROTOCOL_LIMITS.controlPingIntervalMs &&
+          typeof call[0] === 'function'
+      )
+      if (intervals.length === 1 && typeof intervals[0]?.[0] === 'function') {
+        controlHeartbeat = intervals[0][0]
+      }
+    }
+  } finally {
+    controlIntervals.mockRestore()
+  }
+  const sourceControl = source.sessions.get(identity)
+  if (!sourceControl || !controlHeartbeat) {
+    throw new Error('missing source control heartbeat')
+  }
+  for (
+    let elapsed = 0;
+    elapsed < IDLE_REHOME_MIN_CONTROL_AGE_MS;
+    elapsed += RELAY_PROTOCOL_LIMITS.controlPingIntervalMs
+  ) {
+    const renewalDueAt = sourceControl.activityRenewalDueAt
+    const completedRenewal = sourceControl.activityRenewalCompletedAttempt
+    clock += Math.min(
+      RELAY_PROTOCOL_LIMITS.controlPingIntervalMs,
+      IDLE_REHOME_MIN_CONTROL_AGE_MS - elapsed
+    )
+    controlHeartbeat()
+    await expect
+      .poll(() => [sourceControl.lastPongAt, sourceControl.pendingPingAt])
+      .toEqual([clock, null])
+    if (clock >= renewalDueAt) {
+      await expect
+        .poll(() => sourceControl.activityRenewalCompletedAttempt, {
+          timeout: CONTROL_RENEWAL_BATCH_INTERVAL_MS * 2
+        })
+        .toBeGreaterThan(completedRenewal)
+    }
+  }
+  await heartbeat()
   const attachPhone = async (cellIndex: number, device: string) => {
     const invite = await source.store.createInvite(identity, device)
     const socket = connect(`${cells[cellIndex]!.url}/v1/connect/${hostId}`)
diff --git a/tests/e2e/ssh-native-chat-phone-history.spec.ts b/tests/e2e/ssh-native-chat-phone-history.spec.ts
new file mode 100644
index 000000000000..6bf8a77cf3e9
--- /dev/null
+++ b/tests/e2e/ssh-native-chat-phone-history.spec.ts
@@ -0,0 +1,253 @@
+/**
+ * A phone paired with the desktop shows the chat history of a Claude session running on an SSH host
+ * (#26057): the transcript lives on the SSH host, so the desktop must read it there, not on itself.
+ *
+ * Run:
+ *   ORCA_E2E_SSH_DOCKER=1 npx playwright test tests/e2e/ssh-native-chat-phone-history.spec.ts \
+ *     --config tests/playwright.config.ts --project electron-headless --workers=1
+ */
+import type { Page, TestInfo } from '@stablyai/playwright-test'
+import { expect, test } from './helpers/orca-app'
+import {
+  cleanupDockerSshRelayTarget,
+  DOCKER_SSH_RELAY_REMOTE_REPO_PATH,
+  startDockerSshRelayTarget,
+  type DockerSshRelayTarget
+} from './helpers/docker-ssh-relay-target'
+import { connectDockerRemote } from './ssh-codex-reconnect-replay-driver'
+import { dockerExec, dockerWriteFile, shellQuote } from './ssh-codex-repro-remote-fixtures'
+import { ensureTerminalVisible, waitForActiveWorktree, waitForSessionReady } from './helpers/store'
+import {
+  execInTerminal,
+  waitForActivePanePtyId,
+  waitForActiveTerminalManager,
+  waitForTerminalOutput
+} from './helpers/terminal'
+import { createRuntimeDesktopPairingOffer } from './helpers/paired-electron-client'
+import { decodePairingOffer, type PairingOffer } from '../../src/shared/pairing'
+import {
+  sendRemoteRuntimeRequest,
+  subscribeRemoteRuntimeRequest
+} from '../../src/shared/remote-runtime-client'
+
+const RUN_DOCKER_SSH = process.env.ORCA_E2E_SSH_DOCKER === '1'
+
+type PhoneTab = {
+  type: string
+  agentStatus?: { providerSession?: { id: string; transcriptPath?: string } } | null
+}
+
+type ChatFrame = {
+  type: string
+  messages?: { blocks?: { type: string; text?: string }[] }[]
+  pending?: boolean
+  error?: string
+}
+
+function claudeTranscript(sessionId: string, prompt: string, reply: string): string {
+  return `${[
+    {
+      sessionId,
+      uuid: `${sessionId}-user`,
+      timestamp: '2026-10-07T03:00:00.000Z',
+      type: 'user',
+      message: { role: 'user', content: prompt }
+    },
+    {
+      sessionId,
+      uuid: `${sessionId}-assistant`,
+      timestamp: '2026-10-07T03:00:01.000Z',
+      type: 'assistant',
+      message: {
+        role: 'assistant',
+        model: 'claude-opus-4',
+        content: [{ type: 'text', text: reply }]
+      }
+    }
+  ]
+    .map((record) => JSON.stringify(record))
+    .join('\n')}\n`
+}
+
+/** What a Claude hook on the execution host reports: its session id and transcript path. */
+async function postClaudeHook(
+  page: Page,
+  ptyId: string,
+  sessionId: string,
+  transcriptPath: string
+): Promise<void> {
+  const posted = `__ORCA_CLAUDE_HOOK_${Date.now()}__`
+  const payload = {
+    hook_event_name: 'UserPromptSubmit',
+    session_id: sessionId,
+    transcript_path: transcriptPath,
+    prompt: 'hello'
+  }
+  // A background subshell, so the shell's command-finished marker does not clear the row.
+  await execInTerminal(
+    page,
+    ptyId,
+    [
+      `hook_payload=${shellQuote(JSON.stringify(payload))}`,
+      '(',
+      '  sleep 0.1',
+      '  if curl -sS -X POST "http://127.0.0.1:${ORCA_AGENT_HOOK_PORT}/hook/claude" \\',
+      '    -H "Content-Type: application/x-www-form-urlencoded" \\',
+      '    -H "X-Orca-Agent-Hook-Token: ${ORCA_AGENT_HOOK_TOKEN}" \\',
+      '    --data-urlencode "paneKey=${ORCA_PANE_KEY}" \\',
+      '    --data-urlencode "tabId=${ORCA_TAB_ID}" \\',
+      '    --data-urlencode "worktreeId=${ORCA_WORKTREE_ID}" \\',
+      '    --data-urlencode "env=${ORCA_AGENT_HOOK_ENV}" \\',
+      '    --data-urlencode "version=${ORCA_AGENT_HOOK_VERSION}" \\',
+      '    --data-urlencode "payload=${hook_payload}" >/dev/null; then',
+      `    printf '%s%s\\n' ${shellQuote(posted.slice(0, 8))} ${shellQuote(posted.slice(8))}`,
+      '  fi',
+      ') &'
+    ].join('\n')
+  )
+  await waitForTerminalOutput(page, posted, 20_000)
+}
+
+/** The provider session the phone's tab list carries for this worktree's agent tab. */
+async function phoneProviderSession(
+  pairing: PairingOffer,
+  worktreeId: string,
+  sessionId: string
+): Promise<{ id: string; transcriptPath?: string }> {
+  let found: { id: string; transcriptPath?: string } | undefined
+  await expect
+    .poll(
+      async () => {
+        const listed = await sendRemoteRuntimeRequest<{ tabs: PhoneTab[] }>(
+          pairing,
+          'session.tabs.list',
+          { worktree: `id:${worktreeId}` },
+          15_000
+        )
+        if (!listed.ok) {
+          return JSON.stringify(listed)
+        }
+        found = listed.result.tabs
+          .map((tab) => tab.agentStatus?.providerSession)
+          .find((session) => session?.id === sessionId)
+        return found ? 'listed' : 'no tab carries the provider session'
+      },
+      { timeout: 20_000 }
+    )
+    .toBe('listed')
+  if (!found) {
+    throw new Error('the phone tab list lost the provider session after listing it')
+  }
+  return found
+}
+
+/** Subscribe as the phone's chat view does; the caller reads frames and closes it. */
+async function subscribePhoneChat(
+  pairing: PairingOffer,
+  session: { id: string; transcriptPath?: string }
+): Promise<{ frames: ChatFrame[]; texts: () => string[]; close: () => void }> {
+  const frames: ChatFrame[] = []
+  const subscription = await subscribeRemoteRuntimeRequest<ChatFrame>(
+    pairing,
+    'nativeChat.subscribe',
+    {
+      agent: 'claude',
+      sessionId: session.id,
+      ...(session.transcriptPath ? { transcriptPath: session.transcriptPath } : {}),
+      subscriptionId: `e2e-phone-${Date.now()}`,
+      capabilities: { transcriptPending: 1 }
+    },
+    30_000,
+    {
+      onResponse: (response) => {
+        if (response.ok) {
+          frames.push(response.result)
+        }
+      },
+      onError: () => {}
+    }
+  )
+  const texts = (): string[] =>
+    frames.flatMap((frame) =>
+      (frame.messages ?? []).flatMap((message) =>
+        (message.blocks ?? []).flatMap((block) => (block.text ? [block.text] : []))
+      )
+    )
+  return { frames, texts, close: () => subscription.close() }
+}
+
+async function expectPhoneText(
+  chat: { frames: ChatFrame[]; texts: () => string[] },
+  text: string
+): Promise<void> {
+  await expect
+    .poll(() => chat.texts(), { timeout: 15_000, message: JSON.stringify(chat.frames) })
+    .toContain(text)
+}
+
+test.describe('Phone chat history for an agent on the execution host (#26057)', () => {
+  test('SSH workspace: the phone shows the Claude conversation stored on the SSH host', async ({
+    orcaPage
+  }, testInfo: TestInfo) => {
+    test.skip(!RUN_DOCKER_SSH, 'Set ORCA_E2E_SSH_DOCKER=1 to run Docker-backed SSH tests.')
+    test.skip(process.platform === 'win32', 'Docker SSH tests use POSIX ssh tooling.')
+    test.slow()
+    const stamp = Date.now()
+    const sessionId = `phone-ssh-${stamp}`
+    const reply = `SSH_REPLY_${stamp}`
+    const projectDir = `/root/.claude/projects/${DOCKER_SSH_RELAY_REMOTE_REPO_PATH.replaceAll('/', '-')}`
+    const transcriptPath = `${projectDir}/${sessionId}.jsonl`
+    let target: DockerSshRelayTarget | null = null
+    try {
+      target = startDockerSshRelayTarget(testInfo)
+      dockerExec(target, `mkdir -p ${shellQuote(projectDir)}`)
+      dockerWriteFile(
+        target,
+        transcriptPath,
+        claudeTranscript(sessionId, 'remote prompt', reply),
+        '600'
+      )
+
+      await waitForSessionReady(orcaPage)
+      await waitForActiveWorktree(orcaPage)
+      const remote = await connectDockerRemote(orcaPage, target)
+      await ensureTerminalVisible(orcaPage)
+      await waitForActiveTerminalManager(orcaPage, 30_000)
+      const ptyId = await waitForActivePanePtyId(orcaPage, 30_000)
+      await postClaudeHook(orcaPage, ptyId, sessionId, transcriptPath)
+
+      const pairing = decodePairingOffer(
+        (await createRuntimeDesktopPairingOffer(orcaPage)).pairingUrl
+      )
+      const session = await phoneProviderSession(pairing, remote.worktreeId, sessionId)
+      expect(session.transcriptPath).toBe(transcriptPath)
+      const chat = await subscribePhoneChat(pairing, session)
+      try {
+        await expectPhoneText(chat, reply)
+        // A turn the agent writes on the SSH host afterwards reaches the open chat.
+        const laterReply = `SSH_LATER_REPLY_${stamp}`
+        dockerExec(
+          target,
+          `printf '%s\\n' ${shellQuote(
+            JSON.stringify({
+              sessionId,
+              uuid: `${sessionId}-later`,
+              timestamp: '2026-10-07T03:00:02.000Z',
+              type: 'assistant',
+              message: {
+                role: 'assistant',
+                model: 'claude-opus-4',
+                content: [{ type: 'text', text: laterReply }]
+              }
+            })
+          )} >> ${shellQuote(transcriptPath)}`
+        )
+        await expectPhoneText(chat, laterReply)
+      } finally {
+        chat.close()
+      }
+    } finally {
+      cleanupDockerSshRelayTarget(target)
+    }
+  })
+})
diff --git a/tests/e2e/ssh-reattach-home-partition.spec.ts b/tests/e2e/ssh-reattach-home-partition.spec.ts
new file mode 100644
index 000000000000..9c5451ccfdf8
--- /dev/null
+++ b/tests/e2e/ssh-reattach-home-partition.spec.ts
@@ -0,0 +1,169 @@
+import type { ElectronApplication, Page } from '@stablyai/playwright-test'
+import { test, expect } from './helpers/orca-app'
+import { waitForActiveWorktree, waitForSessionReady } from './helpers/store'
+import { waitForActivePanePtyId, waitForActiveTerminalManager } from './helpers/terminal'
+import { createRemoteTerminalTab } from './helpers/docker-ssh-relay-terminal-tabs'
+import {
+  cleanupDockerSshRelayTarget,
+  DOCKER_SSH_RELAY_REMOTE_REPO_PATH,
+  startDockerSshRelayTarget,
+  type DockerSshRelayTarget
+} from './helpers/docker-ssh-relay-target'
+import { connectDockerSshRelayTarget } from './helpers/docker-ssh-relay-connection'
+import { dropDockerSshRelayTransport } from './helpers/docker-ssh-relay-faults'
+import { createRestartSession, readRestartRendererState } from './helpers/orca-restart'
+import { readPersistedProfileState } from './helpers/persisted-profile-state'
+import { toSshExecutionHostId } from '../../src/shared/execution-host'
+
+const RUN_DOCKER_SSH = process.env.ORCA_E2E_SSH_DOCKER === '1'
+
+test.use({ seedTestRepo: false })
+
+function isRecord(value: unknown): value is Record<string, unknown> {
+  return typeof value === 'object' && value !== null
+}
+
+async function readWorkspace(page: Page, worktreeId: string): Promise<string | null> {
+  return readRestartRendererState(() =>
+    page.evaluate((id) => {
+      const state = window.__store?.getState()
+      if (!state) {
+        return null
+      }
+      return JSON.stringify({
+        tabs: (state.tabsByWorktree[id] ?? []).length,
+        files: state.openFiles.filter((file) => file.worktreeId === id).map((f) => f.relativePath)
+      })
+    }, worktreeId)
+  ).catch(() => null)
+}
+
+function readPersistedSshOpenFiles(
+  userDataDir: string,
+  targetId: string,
+  worktreeId: string
+): unknown[] {
+  const sessions = readPersistedProfileState(userDataDir).workspaceSessionsByHostId
+  const session = isRecord(sessions) ? sessions[toSshExecutionHostId(targetId)] : undefined
+  const files =
+    isRecord(session) && isRecord(session.openFilesByWorktree)
+      ? session.openFilesByWorktree[worktreeId]
+      : undefined
+  return Array.isArray(files)
+    ? files.map((file) => (isRecord(file) ? file.relativePath : undefined))
+    : []
+}
+
+type PrivateInvokeHandlers = {
+  _invokeHandlers?: Map<string, (event: unknown, args: unknown) => unknown>
+}
+
+/** Main's SSH state, read without a renderer; it reports `connected` only once the relay's
+ *  reattach has finished (the relay override holds `reconnecting` until then). */
+function readMainSshState(app: ElectronApplication, targetId: string): Promise<unknown> {
+  return app.evaluate(({ ipcMain }, id) => {
+    // oxlint-disable-next-line typescript/consistent-type-assertions -- SAFETY: test-only read of Electron's private invoke-handler map; the handler is called only if present.
+    const { _invokeHandlers: handlers } = ipcMain as unknown as PrivateInvokeHandlers
+    return handlers?.get('ssh:getState')?.({}, { targetId: id })
+  }, targetId)
+}
+
+/**
+ * A relay reattach used to bind the SSH pane into the `local` partition. With a window open the
+ * renderer's next save erased that copy within a second, but a reattach with no window (macOS
+ * keeps Orca running after its window closes) left it on disk. Startup then kept the `local` copy
+ * and skipped the SSH partition's rows for that workspace, so its open editor tabs were missing
+ * and its agent-resume records were dropped (STA-9544).
+ */
+test.describe('SSH relay reattach home partition', () => {
+  test.skip(!RUN_DOCKER_SSH, 'Set ORCA_E2E_SSH_DOCKER=1 to run Docker-backed SSH tests.')
+  test.skip(process.platform === 'win32', 'Docker SSH restore uses POSIX SSH tooling.')
+
+  test('a reattach with no window open keeps the SSH workspace on the next launch', async (// oxlint-disable-next-line no-empty-pattern -- This restart test owns every Electron launch.
+  {}, testInfo) => {
+    test.setTimeout(600_000)
+    const restart = createRestartSession(testInfo)
+    let target: DockerSshRelayTarget | null = null
+    let app: ElectronApplication | null = null
+    try {
+      target = startDockerSshRelayTarget(testInfo)
+      const first = await restart.launch()
+      app = first.app
+      let page = first.page
+      await waitForSessionReady(page)
+      const remote = await connectDockerSshRelayTarget(page, target)
+      const { targetId, worktreeId } = remote
+      await expect.poll(() => waitForActiveWorktree(page), { timeout: 30_000 }).toBe(worktreeId)
+      await waitForActiveTerminalManager(page, 60_000)
+      await waitForActivePanePtyId(page, 60_000)
+      await createRemoteTerminalTab(page, worktreeId)
+      await page.evaluate(
+        ({ worktreeId, filePath }) => {
+          window.__store!.getState().openFile({
+            filePath,
+            relativePath: 'README.md',
+            worktreeId,
+            language: 'markdown',
+            mode: 'edit'
+          })
+        },
+        { worktreeId, filePath: `${DOCKER_SSH_RELAY_REMOTE_REPO_PATH}/README.md` }
+      )
+      const expected = JSON.stringify({ tabs: 2, files: ['README.md'] })
+      await expect.poll(() => readWorkspace(page, worktreeId)).toBe(expected)
+      await expect
+        .poll(() => readPersistedSshOpenFiles(restart.userDataDir, targetId, worktreeId))
+        .toEqual(['README.md'])
+      const before = await readMainSshState(first.app, targetId)
+      expect(before).toMatchObject({
+        status: 'connected',
+        connectionGeneration: expect.any(Number)
+      })
+
+      await app.evaluate(({ app: electronApp, BrowserWindow }) => {
+        // Linux/Windows quit when the last window closes; keep running as macOS does.
+        electronApp.removeAllListeners('window-all-closed')
+        electronApp.on('window-all-closed', () => {})
+        for (const window of BrowserWindow.getAllWindows()) {
+          window.close()
+        }
+      })
+      expect(dropDockerSshRelayTransport(target)).toBeGreaterThan(0)
+      // Main reconnects on its own and reattaches both panes; no window is left to save over it.
+      await expect
+        .poll(
+          async () => {
+            const after = await readMainSshState(first.app, targetId)
+            return (
+              isRecord(after) &&
+              isRecord(before) &&
+              after.status === 'connected' &&
+              (after.providerEpoch !== before.providerEpoch ||
+                after.connectionGeneration !== before.connectionGeneration)
+            )
+          },
+          { timeout: 120_000 }
+        )
+        .toBe(true)
+      await restart.close(app)
+      app = null
+      const local = readPersistedProfileState(restart.userDataDir).workspaceSession
+      const localTabs =
+        isRecord(local) && isRecord(local.tabsByWorktree) ? local.tabsByWorktree : {}
+      expect.soft(localTabs[worktreeId] ?? [], 'SSH tabs in `local`').toEqual([])
+
+      const second = await restart.launch()
+      app = second.app
+      page = second.page
+      await expect
+        .poll(() => readWorkspace(page, worktreeId), { timeout: 60_000, intervals: [500] })
+        .toBe(expected)
+    } finally {
+      if (app) {
+        await restart.close(app)
+      }
+      await restart.dispose()
+      cleanupDockerSshRelayTarget(target)
+    }
+  })
+})
diff --git a/tests/e2e/ssh-startup-local-shadow.spec.ts b/tests/e2e/ssh-startup-local-shadow.spec.ts
new file mode 100644
index 000000000000..f561c4ddbc55
--- /dev/null
+++ b/tests/e2e/ssh-startup-local-shadow.spec.ts
@@ -0,0 +1,146 @@
+import type { ElectronApplication, Page } from '@stablyai/playwright-test'
+import { test, expect } from './helpers/orca-app'
+import { waitForActiveWorktree, waitForSessionReady } from './helpers/store'
+import { waitForActivePanePtyId, waitForActiveTerminalManager } from './helpers/terminal'
+import {
+  createRemoteTerminalTab,
+  readRemoteTerminalTabs
+} from './helpers/docker-ssh-relay-terminal-tabs'
+import {
+  cleanupDockerSshRelayTarget,
+  startDockerSshRelayTarget,
+  type DockerSshRelayTarget
+} from './helpers/docker-ssh-relay-target'
+import { connectDockerSshRelayTarget } from './helpers/docker-ssh-relay-connection'
+import { createRestartSession, readRestartRendererState } from './helpers/orca-restart'
+import {
+  mutateStoppedProfileState,
+  readPersistedProfileState
+} from './helpers/persisted-profile-state'
+
+const RUN_DOCKER_SSH = process.env.ORCA_E2E_SSH_DOCKER === '1'
+const STALE_TAB_ID = 'stale-closed-tab'
+
+test.use({ seedTestRepo: false })
+
+type JsonRecord = Record<string, unknown>
+
+function isRecord(value: unknown): value is JsonRecord {
+  return typeof value === 'object' && value !== null && !Array.isArray(value)
+}
+
+function record(parent: JsonRecord, key: string): JsonRecord {
+  const value = parent[key]
+  if (isRecord(value)) {
+    return value
+  }
+  const created: JsonRecord = {}
+  parent[key] = created
+  return created
+}
+
+function sshPartition(state: JsonRecord, targetId: string): JsonRecord {
+  return record(record(state, 'workspaceSessionsByHostId'), `ssh:${targetId}`)
+}
+
+async function readRestoredTabIds(page: Page, worktreeId: string): Promise<string[] | null> {
+  return readRestartRendererState(async () =>
+    (await readRemoteTerminalTabs(page, worktreeId)).map((tab) => tab.id).sort()
+  ).catch(() => null)
+}
+
+/**
+ * A `local` row for an SSH workspace is residue: builds before #19572 wrote it, and relay reattach
+ * wrote it later (#25616). Startup used to keep that copy whenever it held a tab and skip the SSH
+ * partition's own rows, so live tabs vanished, closed ones came back, and the workspace's
+ * agent-resume records were dropped and then erased by the first save (#23390).
+ */
+test.describe('SSH workspace startup with a stray local copy', () => {
+  test.skip(!RUN_DOCKER_SSH, 'Set ORCA_E2E_SSH_DOCKER=1 to run Docker-backed SSH tests.')
+  test.skip(process.platform === 'win32', 'Docker SSH restore uses POSIX SSH tooling.')
+
+  test('the SSH partition wins over a stray local copy at startup', async (// oxlint-disable-next-line no-empty-pattern -- This restart test owns every Electron launch.
+  {}, testInfo) => {
+    test.setTimeout(600_000)
+    const restart = createRestartSession(testInfo)
+    let target: DockerSshRelayTarget | null = null
+    let app: ElectronApplication | null = null
+    try {
+      target = startDockerSshRelayTarget(testInfo)
+      const first = await restart.launch()
+      app = first.app
+      const page = first.page
+      await waitForSessionReady(page)
+      const { worktreeId, targetId } = await connectDockerSshRelayTarget(page, target)
+      await expect.poll(() => waitForActiveWorktree(page), { timeout: 30_000 }).toBe(worktreeId)
+      await waitForActiveTerminalManager(page, 60_000)
+      await waitForActivePanePtyId(page, 60_000)
+      await createRemoteTerminalTab(page, worktreeId)
+      const liveTabIds = (await readRemoteTerminalTabs(page, worktreeId)).map((tab) => tab.id)
+      expect(liveTabIds).toHaveLength(2)
+      // Past the ~1s debounced save, so the SSH partition holds both tabs.
+      await page.waitForTimeout(3_000)
+      await restart.close(app)
+      app = null
+
+      const [olderTabId, newerTabId] = liveTabIds
+      const resumePaneKey = mutateStoppedProfileState(restart.userDataDir, (state) => {
+        const ssh = sshPartition(state, targetId)
+        const layout = record(record(ssh, 'terminalLayoutsByTabId'), newerTabId)
+        const [leafId] = Object.keys(record(layout, 'ptyIdsByLeafId'))
+        if (!leafId) {
+          throw new Error(`Expected a bound leaf for ${newerTabId}: ${JSON.stringify(layout)}`)
+        }
+        const paneKey = `${newerTabId}:${leafId}`
+        const sshTabs = record(ssh, 'tabsByWorktree')[worktreeId]
+        if (!Array.isArray(sshTabs) || sshTabs.length !== 2) {
+          throw new Error(`Expected both tabs in ssh:${targetId}, got ${JSON.stringify(sshTabs)}`)
+        }
+        record(ssh, 'sleepingAgentSessionsByPaneKey')[paneKey] = {
+          paneKey,
+          tabId: newerTabId,
+          worktreeId,
+          agent: 'codex',
+          providerSession: { key: 'session_id', id: 'codex-resume-probe' },
+          prompt: 'continue',
+          state: 'done',
+          capturedAt: 10,
+          updatedAt: 10,
+          origin: 'worktree-sleep'
+        }
+        // The stray copy: the older tab under its creation title, plus a tab closed long ago.
+        const olderRow = sshTabs.find((tab) => isRecord(tab) && tab.id === olderTabId)
+        record(record(state, 'workspaceSession'), 'tabsByWorktree')[worktreeId] = [
+          { ...olderRow, title: 'Terminal 18', customTitle: null },
+          { ...olderRow, id: STALE_TAB_ID, ptyId: null, title: 'Terminal 3', customTitle: null }
+        ]
+        return paneKey
+      })
+
+      const second = await restart.launch()
+      app = second.app
+      await waitForSessionReady(second.page)
+      await expect
+        .poll(() => readRestoredTabIds(second.page, worktreeId), { timeout: 60_000 })
+        .toEqual([...liveTabIds].sort())
+      // Past the debounced save, which is what used to erase the SSH partition's resume record.
+      await second.page.waitForTimeout(3_000)
+      await restart.close(app)
+      app = null
+
+      const persisted = readPersistedProfileState(restart.userDataDir)
+      expect(
+        Object.keys(record(sshPartition(persisted, targetId), 'sleepingAgentSessionsByPaneKey')),
+        'agent-resume record in the SSH partition'
+      ).toContain(resumePaneKey)
+      const localTabs = record(record(persisted, 'workspaceSession'), 'tabsByWorktree')
+      expect(localTabs[worktreeId] ?? [], 'stray local copy after a save').toEqual([])
+    } finally {
+      if (app) {
+        await restart.close(app)
+      }
+      await restart.dispose()
+      cleanupDockerSshRelayTarget(target)
+    }
+  })
+})
diff --git a/tests/e2e/tab-strip-scroll-render-isolation.spec.ts b/tests/e2e/tab-strip-scroll-render-isolation.spec.ts
index ca1336203d54..7b1a1b1de7de 100644
--- a/tests/e2e/tab-strip-scroll-render-isolation.spec.ts
+++ b/tests/e2e/tab-strip-scroll-render-isolation.spec.ts
@@ -243,7 +243,7 @@ test.describe('Tab strip scroll render isolation', () => {
 
     // A narrower pane shrinks the strip and the track without a scroll event.
     await strip.evaluate((el) => {
-      el.closest<HTMLElement>('[data-native-file-drop-target]')!.style.maxWidth = '700px'
+      el.closest<HTMLElement>('[data-os-file-drop-owner]')!.style.maxWidth = '700px'
     })
     await expectThumbToTrackStrip(strip)
   })
diff --git a/tests/e2e/terminal-pane-title-strip-placement.spec.ts b/tests/e2e/terminal-pane-title-strip-placement.spec.ts
index 7d663152c2be..d3e150496b94 100644
--- a/tests/e2e/terminal-pane-title-strip-placement.spec.ts
+++ b/tests/e2e/terminal-pane-title-strip-placement.spec.ts
@@ -88,7 +88,7 @@ test.describe('Terminal Panes', () => {
       .toBe(otherPane.leafId)
 
     const titleBar = orcaPage.locator('.pane-title-bar', { hasText: title }).first()
-    await expect(titleBar).toHaveAttribute('data-native-file-drop-target', 'terminal')
+    await expect(titleBar).toHaveAttribute('data-os-file-drop-owner', '')
     await expect(titleBar).toHaveAttribute('data-terminal-tab-id', splitSnapshot.tabId)
 
     await titleBar.evaluate((element, path) => {
@@ -169,7 +169,7 @@ test.describe('Terminal Panes', () => {
           (element) => element.textContent?.includes(title)
         )
         const titleDragHandle =
-          titleBar.querySelector<HTMLElement>('.pane-title-drag-handle') ?? null
+          titleBar?.querySelector<HTMLElement>('.pane-title-drag-handle') ?? null
         const pane = document.querySelector<HTMLElement>(`.pane[data-leaf-id="${titledLeafId}"]`)
         if (!titleBar || !pane || !titleDragHandle) {
           return null